Added translation hints. New Icon and Logo. Updated About page.

scharel · Jan 2, 2017 · 770a881 · 770a881
1 parent 1bfbff1
commit 770a881
Show file tree

Hide file tree

Showing 20 changed files with 90 additions and 623 deletions.
diff --git a/datalocation.h b/datalocation.h
@@ -11,7 +11,8 @@ class DataLocation : public QObject
     Q_OBJECT
     Q_PROPERTY(QString path READ path)
 public:
-    DataLocation(QObject* parent = 0) {
+    DataLocation(QObject* parent = 0) : QObject(parent)
+    {
         QDir dir(QStandardPaths::writableLocation(QStandardPaths::DataLocation));
         if (!dir.exists()) {
             dir.mkpath(".");

diff --git a/harbour-lidderbuch.pro b/harbour-lidderbuch.pro
@@ -41,7 +41,8 @@ DISTFILES += \
     qml/pages/AboutPage.qml \
     qml/pages/SettingsPage.qml \
     qml/pages/SongModel.qml \
-    qml/pages/SongPage.qml
+    qml/pages/SongPage.qml \
+    qml/cover/logo.png
 
 HEADERS += \
     datalocation.h
diff --git a/icons/108x108/harbour-lidderbuch.png b/icons/108x108/harbour-lidderbuch.png
diff --git a/icons/128x128/harbour-lidderbuch.png b/icons/128x128/harbour-lidderbuch.png
diff --git a/icons/256x256/harbour-lidderbuch.png b/icons/256x256/harbour-lidderbuch.png
diff --git a/icons/86x86/harbour-lidderbuch.png b/icons/86x86/harbour-lidderbuch.png
diff --git a/icons/86x86/harbout-lidderbuch.png b/icons/86x86/harbout-lidderbuch.png
diff --git a/icons/acel_logo.svg b/icons/acel_logo.svg
diff --git a/icons/harbour-lidderbuch.png b/icons/harbour-lidderbuch.png
diff --git a/icons/harbour-lidderbuch_alpha.png b/icons/harbour-lidderbuch_alpha.png
diff --git a/icons/icon-launcher-lidderbuch.svg b/icons/icon-launcher-lidderbuch.svg
diff --git a/qml/cover/CoverPage.qml b/qml/cover/CoverPage.qml
@@ -4,9 +4,9 @@ import Sailfish.Silica 1.0
 CoverBackground {
     Column {
         width: parent.width
-        spacing: Theme.paddingLarge
+        spacing: Theme.paddingMedium
         Image {
-            source: "acel_logo.png"
+            source: "logo.png"
             anchors.horizontalCenter: parent.horizontalCenter
             width: parent.width - 2*Theme.horizontalPageMargin
             fillMode: Image.PreserveAspectFit
@@ -17,6 +17,7 @@ CoverBackground {
             horizontalAlignment: Text.AlignHCenter
         }
         Label {
+            //: App name on the cover
             text: qsTr("Lidderbuch")
             width: parent.width
             horizontalAlignment: Text.AlignHCenter

diff --git a/qml/cover/acel_logo.png b/qml/cover/acel_logo.png
diff --git a/qml/cover/logo.png b/qml/cover/logo.png
diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml
@@ -19,13 +19,39 @@ Page {
                 title: qsTr("Iwwer d'App")
             }
 
-            Label {
+            Image {
+                source: "harbour-lidderbuch.png"
+                anchors.horizontalCenter: parent.horizontalCenter
+                width: Theme.iconSizeExtraLarge
+                fillMode: Image.PreserveAspectFit
+            }
+            Text {
                 x: Theme.horizontalPageMargin
-                text: "© Scharel Clemens 2016"
+                width: parent.width - x
+                color: Theme.secondaryColor
+                linkColor: Theme.highlightColor
+                font.family: Theme.fontFamily
+                font.pixelSize: Theme.fontSizeMedium
+                wrapMode: Text.Wrap
+                onLinkActivated: Qt.openUrlExternally(link)
+                //: Disclaymer by ACEL
+                text: qsTr("Dës App benotzt Liddtexter vun der ACEL (<a href=\"https://acel.lu\">https://acel.lu</a>) mat Hëllef vun der AcelApi (<a href=\"https://github.com/AcelLuxembourg/AcelApi\">https://github.com/AcelLuxembourg/AcelApi</a>). D'ACEL ass net den Entwéckler an domadder och net Verantwortlech fir den Ënnerhalt vun der App.")
+            }
+            Separator {
+                width: parent.width
+                color: Theme.secondaryColor
             }
-            Label {
+            Text {
                 x: Theme.horizontalPageMargin
-                text: "Content provided by ACEL"
+                width: parent.width - x
+                color: Theme.secondaryColor
+                linkColor: Theme.highlightColor
+                font.family: Theme.fontFamily
+                font.pixelSize: Theme.fontSizeMedium
+                wrapMode: Text.Wrap
+                onLinkActivated: Qt.openUrlExternally(link)
+                //: Possibilities to report issues
+                text: qsTr("Fehler oder Verbesserungsvirschléi kennen am Jolla Store oder op <a href=\"https://github.com/scharel/harbour-lidderbuch/issues\">GitHub</a> gemellt ginn.<br />© Scharel Clemens 2017")
             }
         }
 

diff --git a/qml/pages/FirstPage.qml b/qml/pages/FirstPage.qml
@@ -17,20 +17,24 @@ Page {
         PullDownMenu {
             busy: songModel.busy
             MenuItem {
+                //: Pulldown menu item to About page
                 text: qsTr("Iwwer d'App")
                 onClicked: pageStack.push(Qt.resolvedUrl("AboutPage.qml"))
             }
             MenuItem {
+                //: Pulldown menu item to Settings page
                 text: qsTr("Astellungen")
                 onClicked: pageStack.push(Qt.resolvedUrl("SettingsPage.qml"))
             }
             MenuItem {
+                //: Refresh the content from ACEL API
                 text: qsTr("Aktualiséieren")
                 onClicked: songModel.update()
             }
         }
 
         header: PageHeader {
+            //: Page Header
             title: qsTr("ACEL Lidderbuch")
             /*SearchField {
             width: parent.width

diff --git a/qml/pages/SettingsPage.qml b/qml/pages/SettingsPage.qml
@@ -40,13 +40,18 @@ Page {
                 }
             }*/
             ComboBox {
+                //: Font size
                 label: qsTr("Schrëftgréisst")
                 currentIndex: appSettings.fontSize
 
                 menu: ContextMenu {
+                    //: Small font size
                     MenuItem { text: qsTr("Kleng") }
+                    //: Medium font size
                     MenuItem { text: qsTr("Mëttel") }
+                    //: Large font size
                     MenuItem { text: qsTr("Grouss") }
+                    //: Extra large font size
                     MenuItem { text: qsTr("Ech si voll") }
                     onActivated: appSettings.setValue("fontSize", index)
                 }

diff --git a/qml/pages/harbour-lidderbuch.png b/qml/pages/harbour-lidderbuch.png
diff --git a/translations/harbour-lidderbuch-de.ts b/translations/harbour-lidderbuch-de.ts
@@ -8,34 +8,49 @@
         <extracomment>Header of the About page</extracomment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Dës App benotzt Liddtexter vun der ACEL (&lt;a href=&quot;https://acel.lu&quot;&gt;https://acel.lu&lt;/a&gt;) mat Hëllef vun der AcelApi (&lt;a href=&quot;https://github.com/AcelLuxembourg/AcelApi&quot;&gt;https://github.com/AcelLuxembourg/AcelApi&lt;/a&gt;). D&apos;ACEL ass net den Entwéckler an domadder och net Verantwortlech fir den Ënnerhalt vun der App.</source>
+        <extracomment>Disclaymer by ACEL</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fehler oder Verbesserungsvirschléi kennen am Jolla Store oder op &lt;a href=&quot;https://github.com/scharel/harbour-lidderbuch/issues&quot;&gt;GitHub&lt;/a&gt; gemellt ginn.&lt;br /&gt;© Scharel Clemens 2017</source>
+        <extracomment>Possibilities to report issues</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CoverPage</name>
     <message>
-        <source>ACEL</source>
+        <source>Lidderbuch</source>
+        <extracomment>App name on the cover</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lidderbuch</source>
+        <source>ACEL</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FirstPage</name>
     <message>
         <source>Iwwer d&apos;App</source>
+        <extracomment>Pulldown menu item to About page</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Astellungen</source>
+        <extracomment>Pulldown menu item to Settings page</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aktualiséieren</source>
+        <extracomment>Refresh the content from ACEL API</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ACEL Lidderbuch</source>
+        <extracomment>Page Header</extracomment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -48,22 +63,27 @@
     </message>
     <message>
         <source>Kleng</source>
+        <extracomment>Small font size</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mëttel</source>
+        <extracomment>Medium font size</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grouss</source>
+        <extracomment>Large font size</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ech si voll</source>
+        <extracomment>Extra large font size</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Schrëftgréisst</source>
+        <extracomment>Font size</extracomment>
         <translation type="unfinished"></translation>
     </message>
 </context>