Skip to content

Commit

Permalink
Merge pull request #15 from cnlpete/9-suggestion-add-color-legend
Browse files Browse the repository at this point in the history
feat: add color legend
  • Loading branch information
cnlpete authored Dec 14, 2024
2 parents 30a5b1b + 58e951d commit 71e7f9e
Show file tree
Hide file tree
Showing 7 changed files with 576 additions and 6 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Installable via [Chum](https://build.sailfishos.org/package/show/sailfishos:chum

## Screenshots

| ![screenshot 1](screenshots/photo_5303021482609338239_w.jpg) | ![screenshot 2](screenshots/photo_5303021482609338244_w.jpg) | ![screenshot 3](screenshots/photo_5303021482609338240_w.jpg) |
| :---: | :---: | :---: |
| ![screenshot 1](screenshots/photo_5303021482609338239_w.jpg) | ![screenshot 2](screenshots/photo_5303021482609338244_w.jpg) | ![screenshot 3](screenshots/photo_5303021482609338240_w.jpg) | ![screenshot 4](screenshots/photo_5400178367308883249_w.jpg) |
| :---: | :---: | :---: | :---: |


1 change: 1 addition & 0 deletions harbour-rainviewer.pro
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ DISTFILES += \
qml/components/NetworkCall.js \
qml/cover/CoverPage.qml \
qml/pages/About.qml \
qml/pages/ColorLegend.qml \
qml/pages/Settings.qml \
translations/harbour-rainviewer.ts \
translations/harbour-rainviewer-de_DE.ts \
Expand Down
429 changes: 429 additions & 0 deletions qml/pages/ColorLegend.qml

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions qml/pages/StartPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ Page {
text: qsTr("Settings")
onClicked: pageStack.push(Qt.resolvedUrl("Settings.qml"))
}
MenuItem {
text: qsTr("Color legend")
onClicked: pageStack.push(Qt.resolvedUrl("ColorLegend.qml"))
}
}

RemorsePopup { id: remorse }
Expand Down
Binary file added screenshots/photo_5400178367308883249_w.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
72 changes: 70 additions & 2 deletions translations/harbour-rainviewer-de_DE.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,69 @@
<translation>Webseite</translation>
</message>
</context>
<context>
<name>ColorLegend</name>
<message>
<location filename="../qml/pages/ColorLegend.qml" line="35"/>
<source>Color legend</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/ColorLegend.qml" line="50"/>
<source>Rain</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/ColorLegend.qml" line="53"/>
<source>Snow</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/ColorLegend.qml" line="265"/>
<source>Overcast</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/ColorLegend.qml" line="268"/>
<source>Drizzle</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/ColorLegend.qml" line="271"/>
<source>Light rain</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/ColorLegend.qml" line="274"/>
<source>Moderate rain</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/ColorLegend.qml" line="277"/>
<source>Shower</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/ColorLegend.qml" line="280"/>
<source>Hail</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/ColorLegend.qml" line="290"/>
<source>Light</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/ColorLegend.qml" line="294"/>
<source>Moderate</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/ColorLegend.qml" line="298"/>
<source>Heavy</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Settings</name>
<message>
Expand Down Expand Up @@ -130,12 +193,17 @@
<translation>Einstellungen</translation>
</message>
<message>
<location filename="../qml/pages/StartPage.qml" line="69"/>
<location filename="../qml/pages/StartPage.qml" line="65"/>
<source>Color legend</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/StartPage.qml" line="73"/>
<source>Rainviewer</source>
<translation>Regenradar</translation>
</message>
<message>
<location filename="../qml/pages/StartPage.qml" line="209"/>
<location filename="../qml/pages/StartPage.qml" line="213"/>
<source>Scale: %0 m/pixel ; zoom: %1</source>
<translation>Skalierung: %0 m/Pixel; Zoom: %1</translation>
</message>
Expand Down
72 changes: 70 additions & 2 deletions translations/harbour-rainviewer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,69 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ColorLegend</name>
<message>
<location filename="../qml/pages/ColorLegend.qml" line="35"/>
<source>Color legend</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/ColorLegend.qml" line="50"/>
<source>Rain</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/ColorLegend.qml" line="53"/>
<source>Snow</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/ColorLegend.qml" line="265"/>
<source>Overcast</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/ColorLegend.qml" line="268"/>
<source>Drizzle</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/ColorLegend.qml" line="271"/>
<source>Light rain</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/ColorLegend.qml" line="274"/>
<source>Moderate rain</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/ColorLegend.qml" line="277"/>
<source>Shower</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/ColorLegend.qml" line="280"/>
<source>Hail</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/ColorLegend.qml" line="290"/>
<source>Light</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/ColorLegend.qml" line="294"/>
<source>Moderate</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/ColorLegend.qml" line="298"/>
<source>Heavy</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Settings</name>
<message>
Expand Down Expand Up @@ -130,12 +193,17 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/StartPage.qml" line="69"/>
<location filename="../qml/pages/StartPage.qml" line="65"/>
<source>Color legend</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/StartPage.qml" line="73"/>
<source>Rainviewer</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/StartPage.qml" line="209"/>
<location filename="../qml/pages/StartPage.qml" line="213"/>
<source>Scale: %0 m/pixel ; zoom: %1</source>
<translation type="unfinished"></translation>
</message>
Expand Down

0 comments on commit 71e7f9e

Please sign in to comment.