|
[-]
[+]
|
Added |
_service:tar_git:harbour-spritradar.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-spritradar.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/poetaster/harbour-spritradar.git</param>
<param name="branch">master</param>
- <param name="revision">0.2.1 </param>
+ <param name="revision">0.2.2</param>
<param name="debian">N</param>
<param name="dumb">N</param>
</service>
|
|
|
Deleted |
_service:tar_git:harbour-spritradar-0.2.1.tar.bz2/icons/172x172/harbour-spritradar.png
^
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-spritradar-0.2.2.tar.bz2/.github/workflows/build.yaml
^
|
| @@ -0,0 +1,76 @@
+name: Build RPMs
+
+on:
+ push:
+ tags:
+ - "v*"
+
+env:
+ OS_VERSION: 4.4.0.68
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ name: Build App
+ strategy:
+ matrix:
+ arch: ['armv7hl', 'aarch64', 'i486']
+
+ steps:
+ - uses: actions/checkout@v3
+
+ - name: Prepare
+ run: docker pull coderus/sailfishos-platform-sdk:$OS_VERSION && mkdir output
+
+ - name: Build ${{ matrix.arch }}
+ run: docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:$OS_VERSION /bin/bash -c "
+ mkdir -p build ;
+ cd build ;
+ cp -r /share/* . ;
+ mb2 -t SailfishOS-$OS_VERSION-${{ matrix.arch }} build ;
+ sudo cp -r RPMS/*.rpm /share/output"
+
+ - name: Upload RPM (${{ matrix.arch }})
+ uses: actions/upload-artifact@v3
+ with:
+ name: rpm-${{ matrix.arch }}
+ path: output
+ release:
+ name: Release
+ if: startsWith(github.ref, 'refs/tags/v')
+ needs:
+ - build
+ runs-on: ubuntu-latest
+ steps:
+ - name: Download armv7hl
+ uses: actions/download-artifact@v3
+ with:
+ name: rpm-armv7hl
+ continue-on-error: true
+ - name: Download aarch64
+ uses: actions/download-artifact@v3
+ with:
+ name: rpm-aarch64
+ continue-on-error: true
+ - name: Download i486
+ uses: actions/download-artifact@v3
+ with:
+ name: rpm-i486
+ continue-on-error: true
+ - name: Extract Version Name
+ id: extract_name
+ uses: actions/github-script@v4
+ with:
+ result-encoding: string
+ script: |
+ return context.payload.ref.replace(/refs\/tags\//, '');
+ - name: Create a Release
+ uses: softprops/action-gh-release@v1
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ with:
+ name: ${{ steps.extract_name.outputs.result }}
+ draft: false
+ prerelease: false
+ body: This release was autogenerated.
+ files: '*.rpm'
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-spritradar-0.2.2.tar.bz2/harbour-spritradar.desktop
^
|
| @@ -6,5 +6,7 @@
Name=SpritRadar
[X-Sailjail]
-Sandboxing=Disabled
+OrganizationName=harbour-spritradar
+ApplicationName=harbour-spritradar
+Permissions=Privileged;UserDirs;Location;Internet
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-spritradar-0.2.2.tar.bz2/harbour-spritradar.pro
^
|
| @@ -29,7 +29,7 @@
harbour-spritradar.desktop \
rpm/harbour-spritradar.changes
-SAILFISHAPP_ICONS = 86x86 108x108 128x128 172x172
+SAILFISHAPP_ICONS = 86x86 108x108 128x128 256x256
# to disable building translations every time, comment out the
# following CONFIG line
|
|
|
Changed |
_service:tar_git:harbour-spritradar-0.2.2.tar.bz2/icons/108x108/harbour-spritradar.png
^
|
|
|
Changed |
_service:tar_git:harbour-spritradar-0.2.2.tar.bz2/icons/128x128/harbour-spritradar.png
^
|
|
|
Added |
_service:tar_git:harbour-spritradar-0.2.2.tar.bz2/icons/256x256/harbour-spritradar.png
^
|
|
|
Changed |
_service:tar_git:harbour-spritradar-0.2.2.tar.bz2/icons/86x86/harbour-spritradar.png
^
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-spritradar-0.2.2.tar.bz2/qml/harbour-spritradar.qml
^
|
| @@ -72,11 +72,11 @@
try {
switch( getValue( "plugin" ) ) {
case tk.name: selectedPlugin = tk; selectedPluginNum = 0; break
- case sv.name: selectedPlugin = sv; selectedPluginNum = 1; break
+ //case sv.name: selectedPlugin = sv; selectedPluginNum = 1; break
case gg.name: selectedPlugin = gg; selectedPluginNum = 2;break
- case gf.name: selectedPlugin = gf; selectedPluginNum = 4;break
+ //case gf.name: selectedPlugin = gf; selectedPluginNum = 4;break
case sr.name: selectedPlugin = sr; selectedPluginNum = 5; break
- default: selectedPlugin = tk;
+ default: selectedPlugin = gg;
}
launchToList = getValue( "launchToList" )==1
favsOnCover = getValue( "favsOnCover" )==1
@@ -100,9 +100,9 @@
}
property Plugin selectedPlugin;
TankerKoenig { id: tk }
- Sviluppoeconomico { id: sv }
+ //Sviluppoeconomico { id: sv }
GeoportalGasolineras { id: gg }
- PrixCarburants { id: gf }
+ //PrixCarburants { id: gf }
SpritpreisRechner { id: sr }
function changePlugin( plugin ) {
plugin.pluginReady = false
@@ -120,10 +120,10 @@
text: tk.name
onClicked: { changePlugin( tk ); selectedPluginNum = 0 }
}
- MenuItem {
- text: sv.name
- onClicked: { changePlugin( sv ); selectedPluginNum = 1 }
- }
+// MenuItem {
+// text: sv.name
+// onClicked: { changePlugin( sv ); selectedPluginNum = 1 }
+// }
MenuItem {
text: gg.name
onClicked: { changePlugin( gg ); selectedPluginNum = 2 }
@@ -132,10 +132,10 @@
text: sr.name
onClicked: { changePlugin( sr ); selectedPluginNum = 3 }
}
- MenuItem {
- text: gf.name
- onClicked: { changePlugin( gf ); selectedPluginNum = 4 }
- }
+// MenuItem {
+// text: gf.name
+// onClicked: { changePlugin( gf ); selectedPluginNum = 4 }
+// }
}
property bool gpsActive: false
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-spritradar-0.2.2.tar.bz2/qml/pages/Plugin/GeoportalGasolineras.qml
^
|
| @@ -13,8 +13,9 @@
type: "1"
//types: ['GPR', 'G98', 'GOA', 'NGO', 'GOB', 'GOC', 'BIO', 'G95', 'BIE', 'GLP', 'GNC']
//names: [qsTr('Gasolina 95 (G.Protecctión)'), qsTr('Gasolina 98'), qsTr('Gasóleo A habitual'), qsTr('Nuevo gasóleo'), qsTr('Gasóleo B'), qsTr('Gasóleo C'), qsTr('Biodiésel'), qsTr('Gasolina 95'), qsTr('Bioetanol'), qsTr('(GLP) - Gases licuados del petróleo'), qsTr('(GNC) - Gases natural comprimido')]
- types: ["1","2","3","4","5","6","7","8","9","10","11","12","13","14","15"]
- names: ["Gasolina 95 E5","Gasolina 95 E10","Gasolina 95 E5 Premium","Gasolina 98 E5","Gasolina 98 E10","Gasóleo A habitual","Gasóleo Premium","Gasóleo B","Gasóleo C","Bioetanol","Biodiésel","Gases licuados del petróleo","Gas natural comprimido","Gas natural licuado","Hidrógeno"]
+
+ types: ["1","3","4","5","6"]
+ names: ["Gasolina 95 (G. Protección)","Gasolina 98 E5","Gasóleo A habitual","Gasóleo Premium","Gasóleo B"]
settings: Settings {
name: "GeoportalGasolineras"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-spritradar-0.2.2.tar.bz2/qml/pages/Plugin/Plugin.qml
^
|
| @@ -111,7 +111,7 @@
}
function getItemsByAddress(callback) {
var req = new XMLHttpRequest()
- req.open( "GET", "https://nominatim.openstreetmap.org/search/"+address+"?format=json&limit=1&accept-language="+countryCode+"&countrycodes="+countryCode )
+ req.open( "GET", "https://nominatim.openstreetmap.org/search?q="+address+"&format=json&limit=1&accept-language="+countryCode+"&countrycodes="+countryCode )
req.setRequestHeader("user-agent", "harbour-spritradar/2.11")
req.setRequestHeader("referer", "harbour-spritradar/2.11")
req.onreadystatechange = function() {
@@ -282,6 +282,7 @@
Item {
width: parent.width
height: apiKey.height
+ visible: selectedPlugin==tk
TextField {
id: apiKey
placeholderText: qsTr("API Key")
@@ -368,6 +369,7 @@
}
ComboBox {
+ //id:comboxPlugin
width: page.width-2*x
x: Theme.horizontalPageMargin
label: qsTr("Plugin")
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-spritradar-0.2.2.tar.bz2/translations/harbour-spritradar-es.ts
^
|
| @@ -24,19 +24,19 @@
</message>
<message>
<source>Set as Cover</source>
- <translation type="unfinished">Configurado como Cover</translation>
+ <translation>Configurar como portada</translation>
</message>
<message>
<source>Sort by</source>
- <translation type="unfinished">Ordena por</translation>
+ <translation>Ordena por</translation>
</message>
<message>
<source>Price</source>
- <translation type="unfinished">Precio</translation>
+ <translation>Precio</translation>
</message>
<message>
<source>Settings</source>
- <translation type="unfinished"></translation>
+ <translation>Ajustes</translation>
</message>
</context>
<context>
@@ -51,22 +51,22 @@
</message>
<message>
<source>Coordinates Copied to Clipboard</source>
- <translation type="unfinished"></translation>
+ <translation>Coordenadas copiadas al portapapeles</translation>
</message>
</context>
<context>
<name>GeoportalGasolineras</name>
<message>
<source>Info</source>
- <translation type="unfinished"></translation>
+ <translation>Info</translation>
</message>
<message>
<source>Opening Times</source>
- <translation type="unfinished">Horario de apertura</translation>
+ <translation>Horario de apertura</translation>
</message>
<message>
<source>Prices</source>
- <translation type="unfinished">Precios</translation>
+ <translation>Precios</translation>
</message>
</context>
<context>
@@ -109,34 +109,34 @@
</message>
<message>
<source>Set as Cover</source>
- <translation type="unfinished">Configurado como Cover</translation>
+ <translation>Configurar como portada</translation>
</message>
</context>
<context>
<name>MyGasFeed</name>
<message>
<source>Regular</source>
- <translation type="unfinished"></translation>
+ <translation>Regular</translation>
</message>
<message>
<source>Mid-Grade</source>
- <translation type="unfinished"></translation>
+ <translation>Grado medio</translation>
</message>
<message>
<source>Premium</source>
- <translation type="unfinished"></translation>
+ <translation>Premium</translation>
</message>
<message>
<source>Diesel</source>
- <translation type="unfinished"></translation>
+ <translation>Diésel</translation>
</message>
<message>
<source>Prices</source>
- <translation type="unfinished">Precios</translation>
+ <translation>Precios</translation>
</message>
<message>
<source>Updated</source>
- <translation type="unfinished">Actualizado</translation>
+ <translation>Actualizado</translation>
</message>
</context>
<context>
@@ -231,83 +231,83 @@
</message>
<message>
<source>Disabled</source>
- <translation type="unfinished"></translation>
+ <translation>Desactivado</translation>
</message>
<message>
<source>Every %1</source>
- <translation type="unfinished"></translation>
+ <translation>Cada %1</translation>
</message>
<message numerus="yes">
<source>%n Kilometers</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n kilómetro</numerusform>
+ <numerusform>%n kilómetros</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n Minutes</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n minuto</numerusform>
+ <numerusform>%n minutos</numerusform>
</translation>
</message>
<message>
<source>At distance</source>
- <translation type="unfinished"></translation>
+ <translation>A una distancia</translation>
</message>
<message>
<source>At time</source>
- <translation type="unfinished"></translation>
+ <translation>A una hora</translation>
</message>
<message>
<source>API Key</source>
- <translation type="unfinished"></translation>
+ <translation>Clave API</translation>
</message>
</context>
<context>
<name>PrixCarburants</name>
<message>
- <source>Opening times</source>
+ <source>Gazole</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Daily</source>
+ <source>SP95</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Except</source>
+ <source>E10</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Prices</source>
- <translation type="unfinished">Precios</translation>
+ <source>E85</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Services</source>
+ <source>GPLc</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Gazole</source>
+ <source>SP98</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>SP95</source>
+ <source>Daily</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>E85</source>
+ <source>Except</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>GPLc</source>
+ <source>Opening times</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>SP98</source>
- <translation type="unfinished"></translation>
+ <source>Prices</source>
+ <translation>Precios</translation>
</message>
<message>
- <source>E10</source>
+ <source>Services</source>
<translation type="unfinished"></translation>
</message>
|
