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

TransferEngine will not be used in Harbour package

Browse source
This commit is contained in:
Muki 2019-04-22 13:31:53 +02:00
parent f58ebaab3d
commit 74eb200512
6 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sailfish/harbour-kaktus.pro
View file

@ -11,6 +11,7 @@ linux-g++: CONFIG += arm
DEFINES += SAILFISH
DEFINES += ONLINE_CHECK
#DEFINES += HARBOUR
INCLUDEPATH += src

2
sailfish/qml/EntryDelegate.qml
View file

@ -464,10 +464,12 @@ ListItem {
onClicked: root.pocketAdd()
}
// not available in harbour package
IconMenuItem {
text: qsTr("Share link")
icon.source: "image://theme/icon-m-share?" + Theme.primaryColor
onClicked: root.share()
visible: !settings.isHarbour()
}
IconMenuItem {

2
sailfish/qml/FeedWebContentPage.qml
View file

@ -434,10 +434,12 @@ Page {
}
}
// not available in harbour package
IconMenuItem {
text: qsTr("Share link")
icon.source: "image://theme/icon-m-share"
onClicked: root.share()
visible: !settings.isHarbour()
}
IconBarItem {

2
sailfish/qml/ShareLinkPage.qml
View file

@ -19,7 +19,7 @@
import QtQuick 2.0
import Sailfish.Silica 1.0
import Sailfish.TransferEngine 1.0
import Sailfish.TransferEngine 1.0 // not available in harbour package
Page {
id: root

2
sailfish/qml/WebPreviewPage.qml
View file

@ -423,10 +423,12 @@ Page {
}
}
// not available in harbour package
IconMenuItem {
text: qsTr("Share link")
icon.source: "image://theme/icon-m-share"
onClicked: root.share()
visible: !settings.isHarbour()
}
IconBarItem {

9
sailfish/src/settings.h
View file

@ -84,6 +84,7 @@ class Settings: public QObject
Q_PROPERTY (QString pocketTagsHistory READ getPocketTagsHistory WRITE setPocketTagsHistory NOTIFY pocketTagsHistoryChanged)
Q_PROPERTY (bool ignoreSslErrors READ getIgnoreSslErrors WRITE setIgnoreSslErrors NOTIFY ignoreSslErrorsChanged)
Q_PROPERTY (QString imagesDir READ getImagesDir WRITE setImagesDir NOTIFY imagesDirChanged)
public:
static Settings* instance();
Fetcher* fetcher;
@ -289,6 +290,14 @@ public:
Q_INVOKABLE QString pocketConsumerKey();
Q_INVOKABLE inline bool isHarbour() {
#ifdef HARBOUR
return true;
#else
return false;
#endif
}
signals:
void offlineModeChanged();
void autoOfflineChanged();