Merge pull request #13 from cnlpete/12-suggestion-add-snow-setting

feat: add snow settings toggle
cnlpete · Dec 2, 2024 · cc9ae84 · cc9ae84
2 parents c8efb8a + f5e7cf4
commit cc9ae84
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 15 deletions.
diff --git a/qml/harbour-rainviewer.qml b/qml/harbour-rainviewer.qml
@@ -36,6 +36,7 @@ ApplicationWindow {
         property int tileSize: 256
         property bool immediateSlider: true
         property bool antialiasing: true
+        property bool snow: true
         property int rainColorScheme: 2
         property bool useGps: true
         property bool followGps: true

diff --git a/qml/pages/Settings.qml b/qml/pages/Settings.qml
@@ -114,6 +114,12 @@ Dialog {
                 checked: settings.antialiasing
             }
 
+            TextSwitch {
+                id: snowSetting
+                text: qsTr('Enable snow')
+                checked: settings.snow
+            }
+
             ComboBox {
                 id: rainResolutionSetting
                 label: qsTr("Rain resolution")
@@ -178,6 +184,7 @@ Dialog {
         settings.rainColorScheme = rainColorSetting.currentIndex
         //settings.immediateSlider = true // TODO
         settings.antialiasing = antialiasingSetting.checked
+        settings.snow = snowSetting.checked
 
         settings.useGps = gpsSetting.checked
         if (gpsFollowSetting.visible) {

diff --git a/qml/pages/StartPage.qml b/qml/pages/StartPage.qml
@@ -33,7 +33,8 @@ Page {
     property bool loading: false
 
     readonly property string smoothOpt: settings.antialiasing ? "1" : "0"
-    readonly property string urlPostFix: settings.tileSize + "/{z}/{x}/{y}/" + settings.rainColorScheme + "/" + smoothOpt + "_0.png"
+    readonly property string snowOpt: settings.snow ? "1" : "0"
+    readonly property string urlPostFix: settings.tileSize + "/{z}/{x}/{y}/" + settings.rainColorScheme + "/" + smoothOpt + "_" + snowOpt + ".png"
     onUrlPostFixChanged: {
         console.log("url-postfix changed")
         loader.reload()

diff --git a/translations/harbour-rainviewer-de_DE.ts b/translations/harbour-rainviewer-de_DE.ts
@@ -103,44 +103,49 @@
     </message>
     <message>
         <location filename="../qml/pages/Settings.qml" line="119"/>
+        <source>Enable snow</source>
+        <translation>Schnee</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Settings.qml" line="125"/>
         <source>Rain resolution</source>
         <translation>Auflösung</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings.qml" line="136"/>
+        <location filename="../qml/pages/Settings.qml" line="142"/>
         <source>Rain color scheme</source>
         <translation>Farbschema</translation>
     </message>
 </context>
 <context>
     <name>StartPage</name>
     <message>
-        <location filename="../qml/pages/StartPage.qml" line="48"/>
+        <location filename="../qml/pages/StartPage.qml" line="49"/>
         <source>Clear Map Cache</source>
         <translation>Räume Karten Cache auf</translation>
     </message>
     <message>
-        <location filename="../qml/pages/StartPage.qml" line="50"/>
+        <location filename="../qml/pages/StartPage.qml" line="51"/>
         <source>Clearing map cache</source>
         <translation>Räume Karten Cache auf</translation>
     </message>
     <message>
-        <location filename="../qml/pages/StartPage.qml" line="56"/>
+        <location filename="../qml/pages/StartPage.qml" line="57"/>
         <source>About</source>
         <translation>Über</translation>
     </message>
     <message>
-        <location filename="../qml/pages/StartPage.qml" line="60"/>
+        <location filename="../qml/pages/StartPage.qml" line="61"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../qml/pages/StartPage.qml" line="68"/>
+        <location filename="../qml/pages/StartPage.qml" line="69"/>
         <source>Rainviewer</source>
         <translation>Regenradar</translation>
     </message>
     <message>
-        <location filename="../qml/pages/StartPage.qml" line="254"/>
+        <location filename="../qml/pages/StartPage.qml" line="255"/>
         <source>Scale: %0 m/pixel ; zoom: %1</source>
         <translation>Skalierung: %0 m/Pixel; Zoom: %1</translation>
     </message>

diff --git a/translations/harbour-rainviewer.ts b/translations/harbour-rainviewer.ts
@@ -103,44 +103,49 @@
     </message>
     <message>
         <location filename="../qml/pages/Settings.qml" line="119"/>
+        <source>Enable snow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Settings.qml" line="125"/>
         <source>Rain resolution</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings.qml" line="136"/>
+        <location filename="../qml/pages/Settings.qml" line="142"/>
         <source>Rain color scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StartPage</name>
     <message>
-        <location filename="../qml/pages/StartPage.qml" line="48"/>
+        <location filename="../qml/pages/StartPage.qml" line="49"/>
         <source>Clear Map Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/StartPage.qml" line="50"/>
+        <location filename="../qml/pages/StartPage.qml" line="51"/>
         <source>Clearing map cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/StartPage.qml" line="56"/>
+        <location filename="../qml/pages/StartPage.qml" line="57"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/StartPage.qml" line="60"/>
+        <location filename="../qml/pages/StartPage.qml" line="61"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/StartPage.qml" line="68"/>
+        <location filename="../qml/pages/StartPage.qml" line="69"/>
         <source>Rainviewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/StartPage.qml" line="254"/>
+        <location filename="../qml/pages/StartPage.qml" line="255"/>
         <source>Scale: %0 m/pixel ; zoom: %1</source>
         <translation type="unfinished"></translation>
     </message>