|
[-]
[+]
|
Changed |
_service:tar_git:harbour-spritradar.spec
|
|
|
|
|
Changed |
_service
^
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-spritradar-0.2.1.tar.bz2/harbour-spritradar.desktop
^
|
| @@ -6,7 +6,5 @@
Name=SpritRadar
[X-Sailjail]
-OrganizationName=harbour-spritradar
-ApplicationName=harbour-spritradar
-Permissions=UserDirs;Location;Internet
+Sandboxing=Disabled
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-spritradar-0.2.1.tar.bz2/qml/pages/Plugin/Plugin.qml
^
|
| @@ -186,7 +186,9 @@
property alias searchRadius: sradius.value
property alias address: postalCode.text
property alias useGps: gpsSwitchh.checked
- //property alias apiKey
+ property alias apiInput: apiKey
+ property alias apiKey: apiKey.text
+
onUseGpsChanged: main.gpsActive = useGps
property string type: ""
@@ -277,19 +279,26 @@
anchors.verticalCenter: postalCode.verticalCenter
}
}
- /*Item {
+ Item {
width: parent.width
- height: apiKeyText.height
+ height: apiKey.height
TextField {
- id: apiKeyText
+ id: apiKey
placeholderText: qsTr("API Key")
label: placeholderText
anchors.left: parent.left
- readOnly: apiKey
- EnterKey.enabled: text.length > 0
- EnterKey.onClicked: focus = false
+ //readOnly: apiKey
+ //EnterKey.enabled: text.length > 0
+ //EnterKey.onClicked: focus = false
}
- }*/
+ IconButton {
+ id: clear_apikey_btn
+ icon.source: "image://theme/icon-m-clear?" + (pressed? Theme.highlightColor: Theme.primaryColor)
+ onClicked: apiKey.text = ""
+ anchors.right: parent.right
+ anchors.verticalCenter: apiKey.verticalCenter
+ }
+ }
ComboBox {
id: autoUpdateSelector
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-spritradar-0.2.1.tar.bz2/qml/pages/Plugin/TankerKoenig.qml
^
|
| @@ -20,7 +20,7 @@
function save() {
// set from the Favs page settings.
- //setValue("apiKey", apiKey) //tankerkoenig_apikey = getValue("apiKey")
+ setValue("apiKey", apiKey) //tankerkoenig_apikey = getValue("apiKey")
setValue( "radius", searchRadius )
setValue( "type", type )
setValue( "sort", main.sort )
@@ -30,8 +30,8 @@
}
function load() {
try {
- //apiKey = getValue("apiKey")
- tankerkoenig_apikey = getValue("apiKey")
+ apiKey = getValue("apiKey")
+ tankerkoenig_apikey = apiKey
console.debug(tankerkoenig_apikey)
searchRadius = getValue( "radius" )
type = getValue( "type" )
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-spritradar-0.2.1.tar.bz2/qml/pages/SettingsPage.qml
^
|
| @@ -28,20 +28,8 @@
setValue( "apiKey", apiKey )
}
function load() {
- try {
- apiKey = getValue( "apiKey" )
- tKapiKeyText.text = apiKey
- }
- catch(e) {
-console.log(e.message)
- //assign()
- load()
- save()
- }
- }
- function assign() {
- //setValue( "radius", 1 )
-
+ apiKey = getValue( "apiKey" )
+ tKapiKeyText.text = apiKey
}
}
@@ -55,7 +43,6 @@
Column {
id: column
width: parent.width
- //height: childRect.height
PageHeader { title: qsTr("Settings") }
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-spritradar-0.2.1.tar.bz2/src/harbour-spritradar.cpp
^
|
| @@ -49,25 +49,21 @@
// - SailfishApp::pathTo(QString) to get a QUrl to a resource file
//
// To display the view, call "show()" (will show fullscreen on device).
+
// move to github https://github.com/xXSparkeyy
+ QGuiApplication* app = SailfishApp::application(argc, argv);
+
QCoreApplication::setOrganizationName("harbour-spritradar");
QCoreApplication::setApplicationName("harbour-spritradar");
-/*
- QString sFile = QDir(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation))
- .filePath(QCoreApplication::organizationName())+"/harbour-spritradar/harbour-spritradar";
- QSettings settings(sFile);
- qDebug() << 'sFile: ' << sFile;
+ QQuickView* view = SailfishApp::createView();
+ QObject::connect(view->engine(), SIGNAL(quit()), app, SLOT(quit()));
- //QSettings::setPath(QSettings::NativeFormat, QSettings::UserScope, sFile);
-*/
qmlRegisterType<Settings>("harbour.spritradar.Util", 1, 0, "Settings");
- QGuiApplication* app = SailfishApp::application(argc, argv);
- QQuickView* view = SailfishApp::createView();
- QObject::connect(view->engine(), SIGNAL(quit()), app, SLOT(quit()));
//view->rootContext()->setContextProperty("tankerkoenig_apikey", apiKey); //QString(TANKERKOENIG_APIKEY));
//Claim here: https://creativecommons.tankerkoenig.de/#register
+
view->setSource(SailfishApp::pathTo("qml/harbour-spritradar.qml"));
view->show();
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-spritradar-0.2.1.tar.bz2/src/settings.cpp
^
|
| @@ -12,5 +12,10 @@
}
-void Settings::setValue(QString path, QVariant value) { QSettings sttngs; sttngs.setValue( getname()+"/"+path, value ); }
-QVariant Settings::getValue(QString path) { QSettings sttngs; return sttngs.value( getname()+"/"+path ); }
+void Settings::setValue(QString path, QVariant value) {
+ QSettings sttngs; sttngs.setValue( getname()+"/"+path, value );
+}
+
+QVariant Settings::getValue(QString path) {
+ QSettings sttngs; return sttngs.value( getname()+"/"+path );
+}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-spritradar-0.2.1.tar.bz2/translations/harbour-spritradar-de.ts
^
|
| @@ -259,6 +259,10 @@
<source>At time</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>API Key</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PrixCarburants</name>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-spritradar-0.2.1.tar.bz2/translations/harbour-spritradar-es.ts
^
|
| @@ -259,6 +259,10 @@
<source>At time</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>API Key</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PrixCarburants</name>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-spritradar-0.2.1.tar.bz2/translations/harbour-spritradar-it.ts
^
|
| @@ -259,6 +259,10 @@
<source>At time</source>
<translation type="unfinished">Distante</translation>
</message>
+ <message>
+ <source>API Key</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PrixCarburants</name>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-spritradar-0.2.1.tar.bz2/translations/harbour-spritradar.ts
^
|
| @@ -251,6 +251,10 @@
<source>At time</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>API Key</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PrixCarburants</name>
|
