sfos/kaktus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[sailfish] Offline indicator in pull-down menu

Browse source
This commit is contained in:
mkiol 2014-07-11 21:14:35 +02:00
parent c23035453d
commit 3e6badf1d1
11 changed files with 106 additions and 190 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
i18n/kaktus_en.ts
View file

@ -132,22 +132,22 @@
<context>
<name>EntryDelegate</name>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="249"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="252"/>
<source>Unsave</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="249"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="252"/>
<source>Save</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="259"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="262"/>
<source>Mark as unread</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="259"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="262"/>
<source>Mark as read</source>
<translation type="unfinished"></translation>
</message>
@ -156,21 +156,21 @@
<name>EntryPage</name>
<message>
<location filename="../qml/harmattan/EntryPage.qml" line="83"/>
<location filename="../qml/sailfish/EntryPage.qml" line="100"/>
<location filename="../qml/sailfish/EntryPage.qml" line="102"/>
<location filename="../qml/symbian/EntryPage.qml" line="78"/>
<source>Please wait until Sync finishes</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/harmattan/EntryPage.qml" line="91"/>
<location filename="../qml/sailfish/EntryPage.qml" line="108"/>
<location filename="../qml/sailfish/EntryPage.qml" line="110"/>
<location filename="../qml/symbian/EntryPage.qml" line="86"/>
<source>Offline version not available</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/harmattan/EntryPage.qml" line="99"/>
<location filename="../qml/sailfish/EntryPage.qml" line="116"/>
<location filename="../qml/sailfish/EntryPage.qml" line="118"/>
<location filename="../qml/symbian/EntryPage.qml" line="94"/>
<source>Network connection is unavailable
Switching to Offline mode</source>
@ -178,7 +178,7 @@ Switching to Offline mode</source>
</message>
<message>
<location filename="../qml/harmattan/EntryPage.qml" line="103"/>
<location filename="../qml/sailfish/EntryPage.qml" line="120"/>
<location filename="../qml/sailfish/EntryPage.qml" line="122"/>
<location filename="../qml/symbian/EntryPage.qml" line="98"/>
<source>Network connection is unavailable</source>
<translation type="unfinished"></translation>
@ -209,14 +209,14 @@ Switching to Offline mode</source>
</message>
<message>
<location filename="../qml/harmattan/EntryPage.qml" line="162"/>
<location filename="../qml/sailfish/EntryPage.qml" line="144"/>
<location filename="../qml/sailfish/EntryPage.qml" line="160"/>
<location filename="../qml/symbian/EntryPage.qml" line="122"/>
<source>No unread items</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/harmattan/EntryPage.qml" line="162"/>
<location filename="../qml/sailfish/EntryPage.qml" line="144"/>
<location filename="../qml/sailfish/EntryPage.qml" line="160"/>
<location filename="../qml/symbian/EntryPage.qml" line="122"/>
<source>No items</source>
<translation type="unfinished"></translation>
@ -239,54 +239,26 @@ Switching to Offline mode</source>
<name>FeedPage</name>
<message>
<location filename="../qml/harmattan/FeedPage.qml" line="147"/>
<location filename="../qml/sailfish/FeedPage.qml" line="155"/>
<location filename="../qml/sailfish/FeedPage.qml" line="158"/>
<location filename="../qml/symbian/FeedPage.qml" line="110"/>
<source>Mark all as read</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/harmattan/FeedPage.qml" line="156"/>
<location filename="../qml/sailfish/FeedPage.qml" line="164"/>
<location filename="../qml/sailfish/FeedPage.qml" line="167"/>
<location filename="../qml/symbian/FeedPage.qml" line="119"/>
<source>Mark all as unread</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/harmattan/FeedPage.qml" line="128"/>
<location filename="../qml/sailfish/FeedPage.qml" line="178"/>
<location filename="../qml/sailfish/FeedPage.qml" line="181"/>
<location filename="../qml/symbian/FeedPage.qml" line="91"/>
<source>No feeds</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainMenu</name>
<message>
<location filename="../qml/sailfish/MainMenu.qml" line="27"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/MainMenu.qml" line="35"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/MainMenu.qml" line="43"/>
<source>Sync</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/MainMenu.qml" line="53"/>
<source>Last sync: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/MainMenu.qml" line="55"/>
<source>Not yet synced</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainPage</name>
<message>
@ -313,37 +285,47 @@ Network connection is unavailable</source>
<context>
<name>PageMenu</name>
<message>
<location filename="../qml/sailfish/PageMenu.qml" line="34"/>
<location filename="../qml/sailfish/PageMenu.qml" line="37"/>
<source>Mode: Offline</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/PageMenu.qml" line="37"/>
<source>Mode: Online</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/PageMenu.qml" line="48"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/PageMenu.qml" line="42"/>
<location filename="../qml/sailfish/PageMenu.qml" line="57"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/PageMenu.qml" line="50"/>
<location filename="../qml/sailfish/PageMenu.qml" line="66"/>
<source>Sync</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/PageMenu.qml" line="57"/>
<location filename="../qml/sailfish/PageMenu.qml" line="74"/>
<source>Mark all as read</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/PageMenu.qml" line="64"/>
<location filename="../qml/sailfish/PageMenu.qml" line="81"/>
<source>Mark all as unread</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/PageMenu.qml" line="74"/>
<location filename="../qml/sailfish/PageMenu.qml" line="91"/>
<source>Last sync: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/PageMenu.qml" line="76"/>
<location filename="../qml/sailfish/PageMenu.qml" line="93"/>
<source>Not yet synced</source>
<translation type="unfinished"></translation>
</message>
@ -628,27 +610,27 @@ Network connection is unavailable</source>
<context>
<name>TabPage</name>
<message>
<location filename="../qml/sailfish/TabPage.qml" line="75"/>
<location filename="../qml/sailfish/TabPage.qml" line="79"/>
<source>Tabs</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/harmattan/TabPage.qml" line="158"/>
<location filename="../qml/sailfish/TabPage.qml" line="228"/>
<location filename="../qml/sailfish/TabPage.qml" line="232"/>
<location filename="../qml/symbian/TabPage.qml" line="123"/>
<source>Mark all as read</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/harmattan/TabPage.qml" line="166"/>
<location filename="../qml/sailfish/TabPage.qml" line="236"/>
<location filename="../qml/sailfish/TabPage.qml" line="240"/>
<location filename="../qml/symbian/TabPage.qml" line="131"/>
<source>Mark all as unread</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/harmattan/TabPage.qml" line="178"/>
<location filename="../qml/sailfish/TabPage.qml" line="250"/>
<location filename="../qml/sailfish/TabPage.qml" line="254"/>
<location filename="../qml/symbian/TabPage.qml" line="143"/>
<source>No tabs</source>
<translation type="unfinished"></translation>
@ -660,13 +642,13 @@ Network connection is unavailable</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/TabPage.qml" line="257"/>
<location filename="../qml/sailfish/TabPage.qml" line="261"/>
<source>Pull down to do first Sync</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/harmattan/TabPage.qml" line="179"/>
<location filename="../qml/sailfish/TabPage.qml" line="257"/>
<location filename="../qml/sailfish/TabPage.qml" line="261"/>
<location filename="../qml/symbian/TabPage.qml" line="144"/>
<source>Wait until Sync finish</source>
<translation type="unfinished"></translation>

BIN
i18n/kaktus_pl.qm
View file

Binary file not shown.

77
i18n/kaktus_pl.ts
View file

@ -187,22 +187,22 @@ przeczytane</translation>
<translation type="obsolete">Dodaj do ulubionych</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="249"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="252"/>
<source>Unsave</source>
<translation>Usuń z zapisanych</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="249"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="252"/>
<source>Save</source>
<translation>Zapisz</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="259"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="262"/>
<source>Mark as unread</source>
<translation>Oznacz jako nieprzeczytane</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="259"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="262"/>
<source>Mark as read</source>
<translation>Oznacz jako przeczytane</translation>
</message>
@ -221,21 +221,21 @@ Został włączony tryb Offline!</translation>
</message>
<message>
<location filename="../qml/harmattan/EntryPage.qml" line="83"/>
<location filename="../qml/sailfish/EntryPage.qml" line="100"/>
<location filename="../qml/sailfish/EntryPage.qml" line="102"/>
<location filename="../qml/symbian/EntryPage.qml" line="78"/>
<source>Please wait until Sync finishes</source>
<translation>Zaczekaj do zakończenia aktualizacji</translation>
</message>
<message>
<location filename="../qml/harmattan/EntryPage.qml" line="91"/>
<location filename="../qml/sailfish/EntryPage.qml" line="108"/>
<location filename="../qml/sailfish/EntryPage.qml" line="110"/>
<location filename="../qml/symbian/EntryPage.qml" line="86"/>
<source>Offline version not available</source>
<translation>Brak kopii Offline</translation>
</message>
<message>
<location filename="../qml/harmattan/EntryPage.qml" line="99"/>
<location filename="../qml/sailfish/EntryPage.qml" line="116"/>
<location filename="../qml/sailfish/EntryPage.qml" line="118"/>
<location filename="../qml/symbian/EntryPage.qml" line="94"/>
<source>Network connection is unavailable
Switching to Offline mode</source>
@ -244,7 +244,7 @@ Został włączony tryb Offline</translation>
</message>
<message>
<location filename="../qml/harmattan/EntryPage.qml" line="103"/>
<location filename="../qml/sailfish/EntryPage.qml" line="120"/>
<location filename="../qml/sailfish/EntryPage.qml" line="122"/>
<location filename="../qml/symbian/EntryPage.qml" line="98"/>
<source>Network connection is unavailable</source>
<translation>Brak połączenia sieciowego</translation>
@ -275,14 +275,14 @@ Został włączony tryb Offline</translation>
</message>
<message>
<location filename="../qml/harmattan/EntryPage.qml" line="162"/>
<location filename="../qml/sailfish/EntryPage.qml" line="144"/>
<location filename="../qml/sailfish/EntryPage.qml" line="160"/>
<location filename="../qml/symbian/EntryPage.qml" line="122"/>
<source>No unread items</source>
<translation>Brak nieprzeczytanych artykułów</translation>
</message>
<message>
<location filename="../qml/harmattan/EntryPage.qml" line="162"/>
<location filename="../qml/sailfish/EntryPage.qml" line="144"/>
<location filename="../qml/sailfish/EntryPage.qml" line="160"/>
<location filename="../qml/symbian/EntryPage.qml" line="122"/>
<source>No items</source>
<translation>Brak artykułów</translation>
@ -317,14 +317,14 @@ Został włączony tryb Offline</translation>
</message>
<message>
<location filename="../qml/harmattan/FeedPage.qml" line="147"/>
<location filename="../qml/sailfish/FeedPage.qml" line="155"/>
<location filename="../qml/sailfish/FeedPage.qml" line="158"/>
<location filename="../qml/symbian/FeedPage.qml" line="110"/>
<source>Mark all as read</source>
<translation>Oznacz jako przeczytane</translation>
</message>
<message>
<location filename="../qml/harmattan/FeedPage.qml" line="156"/>
<location filename="../qml/sailfish/FeedPage.qml" line="164"/>
<location filename="../qml/sailfish/FeedPage.qml" line="167"/>
<location filename="../qml/symbian/FeedPage.qml" line="119"/>
<source>Mark all as unread</source>
<translation>Oznacz jako nieprzeczytane</translation>
@ -359,7 +359,7 @@ Został włączony tryb Offline</translation>
</message>
<message>
<location filename="../qml/harmattan/FeedPage.qml" line="128"/>
<location filename="../qml/sailfish/FeedPage.qml" line="178"/>
<location filename="../qml/sailfish/FeedPage.qml" line="181"/>
<location filename="../qml/symbian/FeedPage.qml" line="91"/>
<source>No feeds</source>
<translation>Brak kanałów</translation>
@ -368,29 +368,24 @@ Został włączony tryb Offline</translation>
<context>
<name>MainMenu</name>
<message>
<location filename="../qml/sailfish/MainMenu.qml" line="27"/>
<source>About</source>
<translation>O Programie</translation>
<translation type="obsolete">O Programie</translation>
</message>
<message>
<location filename="../qml/sailfish/MainMenu.qml" line="35"/>
<source>Settings</source>
<translation>Ustawienia</translation>
<translation type="obsolete">Ustawienia</translation>
</message>
<message>
<location filename="../qml/sailfish/MainMenu.qml" line="43"/>
<source>Sync</source>
<translation>Aktualizuj</translation>
<translation type="obsolete">Aktualizuj</translation>
</message>
<message>
<location filename="../qml/sailfish/MainMenu.qml" line="53"/>
<source>Last sync: %1</source>
<translation>Ostatnia aktualizacja: %1</translation>
<translation type="obsolete">Ostatnia aktualizacja: %1</translation>
</message>
<message>
<location filename="../qml/sailfish/MainMenu.qml" line="55"/>
<source>Not yet synced</source>
<translation>Jeszcze nie aktualizowano</translation>
<translation type="obsolete">Jeszcze nie aktualizowano</translation>
</message>
</context>
<context>
@ -440,37 +435,47 @@ Brak połączenia sieciowego</translation>
<context>
<name>PageMenu</name>
<message>
<location filename="../qml/sailfish/PageMenu.qml" line="34"/>
<location filename="../qml/sailfish/PageMenu.qml" line="37"/>
<source>Mode: Offline</source>
<translation>Tryb: Offline</translation>
</message>
<message>
<location filename="../qml/sailfish/PageMenu.qml" line="37"/>
<source>Mode: Online</source>
<translation>Tryb: Online</translation>
</message>
<message>
<location filename="../qml/sailfish/PageMenu.qml" line="48"/>
<source>About</source>
<translation>O Programie</translation>
</message>
<message>
<location filename="../qml/sailfish/PageMenu.qml" line="42"/>
<location filename="../qml/sailfish/PageMenu.qml" line="57"/>
<source>Settings</source>
<translation>Ustawienia</translation>
</message>
<message>
<location filename="../qml/sailfish/PageMenu.qml" line="50"/>
<location filename="../qml/sailfish/PageMenu.qml" line="66"/>
<source>Sync</source>
<translation>Aktualizuj</translation>
</message>
<message>
<location filename="../qml/sailfish/PageMenu.qml" line="57"/>
<location filename="../qml/sailfish/PageMenu.qml" line="74"/>
<source>Mark all as read</source>
<translation>Oznacz jako przeczytane</translation>
</message>
<message>
<location filename="../qml/sailfish/PageMenu.qml" line="64"/>
<location filename="../qml/sailfish/PageMenu.qml" line="81"/>
<source>Mark all as unread</source>
<translation>Oznacz jako nieprzeczytane</translation>
</message>
<message>
<location filename="../qml/sailfish/PageMenu.qml" line="74"/>
<location filename="../qml/sailfish/PageMenu.qml" line="91"/>
<source>Last sync: %1</source>
<translation>Ostatnia aktualizacja: %1</translation>
</message>
<message>
<location filename="../qml/sailfish/PageMenu.qml" line="76"/>
<location filename="../qml/sailfish/PageMenu.qml" line="93"/>
<source>Not yet synced</source>
<translation>Jeszcze nie aktualizowano</translation>
</message>
@ -795,27 +800,27 @@ Brak połączenia sieciowego</translation>
<context>
<name>TabPage</name>
<message>
<location filename="../qml/sailfish/TabPage.qml" line="75"/>
<location filename="../qml/sailfish/TabPage.qml" line="79"/>
<source>Tabs</source>
<translation>Zakładki</translation>
</message>
<message>
<location filename="../qml/harmattan/TabPage.qml" line="158"/>
<location filename="../qml/sailfish/TabPage.qml" line="228"/>
<location filename="../qml/sailfish/TabPage.qml" line="232"/>
<location filename="../qml/symbian/TabPage.qml" line="123"/>
<source>Mark all as read</source>
<translation>Oznacz jako przeczytane</translation>
</message>
<message>
<location filename="../qml/harmattan/TabPage.qml" line="166"/>
<location filename="../qml/sailfish/TabPage.qml" line="236"/>
<location filename="../qml/sailfish/TabPage.qml" line="240"/>
<location filename="../qml/symbian/TabPage.qml" line="131"/>
<source>Mark all as unread</source>
<translation>Oznacz jako nieprzeczytane</translation>
</message>
<message>
<location filename="../qml/harmattan/TabPage.qml" line="178"/>
<location filename="../qml/sailfish/TabPage.qml" line="250"/>
<location filename="../qml/sailfish/TabPage.qml" line="254"/>
<location filename="../qml/symbian/TabPage.qml" line="143"/>
<source>No tabs</source>
<translation>Brak zakładek</translation>
@ -827,13 +832,13 @@ Brak połączenia sieciowego</translation>
<translation>Wykonaj pierwszą aktualizacje kanałów</translation>
</message>
<message>
<location filename="../qml/sailfish/TabPage.qml" line="257"/>
<location filename="../qml/sailfish/TabPage.qml" line="261"/>
<source>Pull down to do first Sync</source>
<translation>Wykonaj pierwszą aktualizacje kanałów</translation>
</message>
<message>
<location filename="../qml/harmattan/TabPage.qml" line="179"/>
<location filename="../qml/sailfish/TabPage.qml" line="257"/>
<location filename="../qml/sailfish/TabPage.qml" line="261"/>
<location filename="../qml/symbian/TabPage.qml" line="144"/>
<source>Wait until Sync finish</source>
<translation>Zaczekaj do zakończenia aktualizacji</translation>

1
qml/sailfish/EntryPage.qml
View file

@ -54,6 +54,7 @@ Page {
}
PageMenu {
showAbout: false
showMarkAsRead: root.readlater ? false : root.unread!=0
showMarkAsUnread: false

1
qml/sailfish/FeedPage.qml
View file

@ -53,6 +53,7 @@ Page {
}
PageMenu {
showAbout: false
showMarkAsRead: root.unread!=0
showMarkAsUnread: false

63
qml/sailfish/MainMenu.qml
View file

@ -1,63 +0,0 @@
/*
Copyright (C) 2014 Michal Kosciesza <michal@mkiol.net>
This file is part of Kaktus.
Kaktus is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Kaktus is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Kaktus. If not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import Sailfish.Silica 1.0
PullDownMenu {
MenuItem {
text: qsTr("About")
onClicked: {
pageStack.push(Qt.resolvedUrl("AboutPage.qml"));
}
}
MenuItem {
text: qsTr("Settings")
onClicked: {
pageStack.push(Qt.resolvedUrl("SettingsPage.qml"));
}
}
MenuItem {
text: qsTr("Sync")
onClicked: fetcher.update()
enabled: !fetcher.busy && !dm.busy
}
onActiveChanged: {
if (active) {
var lastSync = settings.lastUpdateDate;
if (lastSync>0)
label.text = qsTr("Last sync: %1").arg(utils.getHumanFriendlyTimeString(lastSync));
else
label.text = qsTr("Not yet synced");
}
}
MenuLabel {
id: label
}
}

17
qml/sailfish/PageMenu.qml
View file

@ -24,14 +24,29 @@ import Sailfish.Silica 1.0
PullDownMenu {
id: root
property bool showAbout: true
property bool showSettings: true
property bool showSync: true
property bool showMarkAsRead: true
property bool showMarkAsUnread: true
signal markedAsRead
signal markedAsUnread
MenuItem {
text: settings.offlineMode ? qsTr("Mode: Offline") : qsTr("Mode: Online")
enabled: false
}
/*TextSwitch {
text: qsTr("Offline")
checked: settings.offlineMode
onCheckedChanged: settings.offlineMode = checked
}*/
MenuItem {
text: qsTr("About")
visible: root.showAbout
onClicked: {
pageStack.push(Qt.resolvedUrl("AboutPage.qml"));
@ -40,6 +55,7 @@ PullDownMenu {
MenuItem {
text: qsTr("Settings")
visible: root.showSettings
onClicked: {
pageStack.push(Qt.resolvedUrl("SettingsPage.qml"));
@ -48,6 +64,7 @@ PullDownMenu {
MenuItem {
text: qsTr("Sync")
visible: root.showSync
onClicked: fetcher.update()
enabled: !fetcher.busy && !dm.busy

7
qml/sailfish/TabPage.qml
View file

@ -52,7 +52,10 @@ Page {
clip:true
PageMenu {
showMarkAsRead: root.unread!=0
showMarkAsRead: false
showMarkAsUnread: false
/*showMarkAsRead: root.unread!=0
showMarkAsUnread: false
onMarkedAsRead: {
@ -69,7 +72,7 @@ Page {
root.unread = tabModel.countUnread();
//console.log("read: "+root.read+" unread: "+root.unread);
}
}
}*/
}
header: PageHeader {

8
rpm/harbour-kaktus.spec
View file

@ -14,7 +14,7 @@ Name: harbour-kaktus
%{?qtc_builddir:%define _builddir %qtc_builddir}
Summary: Kaktus
Version: 1.1.0
Release: 2
Release: 3
Group: Qt/Qt
License: LICENSE
URL: https://github.com/mkiol/kaktus
@ -75,11 +75,11 @@ desktop-file-install --delete-original \
# << files
%changelog
* Tue Jul 08 2014 Michal Kosciesza 1.1.0-2
- 'Mark as read' in Pull-down menu
* Tue Jun 17 2014 Michal Kosciesza 1.1.0-0
* Fri Jul 11 2014 Michal Kosciesza 1.1.0-3
- Thumbnails in items view
- 'Mark as read' in Pull-down menu
- Offline mode indicator in Pull-down menu
* Sat May 03 2014 Michal Kosciesza 1.0.5-0
- Sigin fix due to change in Netvibes API

30
rpm/harbour-nreader.yaml
View file

@ -1,30 +0,0 @@
Name: harbour-kaktus
Summary: Kaktus
Version: 0.0.1
Release: 1
Group: Qt/Qt
URL: https://github.com/mkiol/kaktus
License: LICENSE
Sources:
- '%{name}-%{version}.tar.bz2'
Description: |
An unofficial Netvibes client for Sailfish OS.
Configure: none
Builder: qtc5
PkgConfigBR:
- Qt5Quick
- Qt5Qml
- Qt5Core
- sailfishapp >= 0.0.10
Requires:
- sailfishsilica-qt5 >= 0.10.9
Files:
-
- '%{_bindir}'
- '%{_datadir}/%{name}/qml'
- '%{_datadir}/applications/%{name}.desktop'
- '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png'
- /usr/bin
- /usr/share/harbour-kaktus
- /usr/share/applications
- /usr/share/icons/hicolor/86x86/apps

2
src/utils.cpp
View file

@ -245,7 +245,7 @@ QString Utils::getHumanFriendlyTimeString(int date)
{
int delta = QDateTime::currentDateTimeUtc().toTime_t()-date;
if (delta==0) {
if (delta<=0) {
return tr("just now");
}
if (delta==1) {