diff --git a/datalocation.h b/datalocation.h
index 9afef96..d8d217a 100644
--- 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
index 6ab75ec..455a16a 100644
--- 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
index 2737829..55f43bf 100755
Binary files a/icons/108x108/harbour-lidderbuch.png and b/icons/108x108/harbour-lidderbuch.png differ
diff --git a/icons/128x128/harbour-lidderbuch.png b/icons/128x128/harbour-lidderbuch.png
index b25b332..acd83e0 100755
Binary files a/icons/128x128/harbour-lidderbuch.png and b/icons/128x128/harbour-lidderbuch.png differ
diff --git a/icons/256x256/harbour-lidderbuch.png b/icons/256x256/harbour-lidderbuch.png
index b436d29..2aec5f8 100755
Binary files a/icons/256x256/harbour-lidderbuch.png and b/icons/256x256/harbour-lidderbuch.png differ
diff --git a/icons/86x86/harbour-lidderbuch.png b/icons/86x86/harbour-lidderbuch.png
index ad316d6..e72098a 100644
Binary files a/icons/86x86/harbour-lidderbuch.png and b/icons/86x86/harbour-lidderbuch.png differ
diff --git a/icons/86x86/harbout-lidderbuch.png b/icons/86x86/harbout-lidderbuch.png
deleted file mode 100644
index 68c353d..0000000
Binary files a/icons/86x86/harbout-lidderbuch.png and /dev/null differ
diff --git a/icons/acel_logo.svg b/icons/acel_logo.svg
deleted file mode 100644
index 7a8bad1..0000000
--- a/icons/acel_logo.svg
+++ /dev/null
@@ -1,441 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/icons/harbour-lidderbuch.png b/icons/harbour-lidderbuch.png
new file mode 100644
index 0000000..8cc44b2
Binary files /dev/null and b/icons/harbour-lidderbuch.png differ
diff --git a/icons/harbour-lidderbuch_alpha.png b/icons/harbour-lidderbuch_alpha.png
new file mode 100644
index 0000000..9a81d26
Binary files /dev/null and b/icons/harbour-lidderbuch_alpha.png differ
diff --git a/icons/icon-launcher-lidderbuch.svg b/icons/icon-launcher-lidderbuch.svg
deleted file mode 100644
index 4676340..0000000
--- a/icons/icon-launcher-lidderbuch.svg
+++ /dev/null
@@ -1,170 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/qml/cover/CoverPage.qml b/qml/cover/CoverPage.qml
index abf3b68..8b2bed9 100755
--- 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
deleted file mode 100644
index 564710c..0000000
Binary files a/qml/cover/acel_logo.png and /dev/null differ
diff --git a/qml/cover/logo.png b/qml/cover/logo.png
new file mode 100644
index 0000000..9a81d26
Binary files /dev/null and b/qml/cover/logo.png differ
diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml
index ab1566e..1e379cb 100644
--- 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 (https://acel.lu) mat Hëllef vun der AcelApi (https://github.com/AcelLuxembourg/AcelApi). 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 GitHub gemellt ginn.
© Scharel Clemens 2017")
}
}
diff --git a/qml/pages/FirstPage.qml b/qml/pages/FirstPage.qml
index d6dd684..0bb5155 100755
--- 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
index fd21699..119ba47 100644
--- 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
new file mode 100644
index 0000000..8cc44b2
Binary files /dev/null and b/qml/pages/harbour-lidderbuch.png differ
diff --git a/translations/harbour-lidderbuch-de.ts b/translations/harbour-lidderbuch-de.ts
index 6dcbac5..259b61c 100644
--- a/translations/harbour-lidderbuch-de.ts
+++ b/translations/harbour-lidderbuch-de.ts
@@ -8,15 +8,26 @@
Header of the About page
+
+ 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.
+ Disclaymer by ACEL
+
+
+
+ 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
+ Possibilities to report issues
+
+
CoverPage
- ACEL
+ Lidderbuch
+ App name on the cover
- Lidderbuch
+ ACEL
@@ -24,18 +35,22 @@
FirstPage
Iwwer d'App
+ Pulldown menu item to About page
Astellungen
+ Pulldown menu item to Settings page
Aktualiséieren
+ Refresh the content from ACEL API
ACEL Lidderbuch
+ Page Header
@@ -48,22 +63,27 @@
Kleng
+ Small font size
Mëttel
+ Medium font size
Grouss
+ Large font size
Ech si voll
+ Extra large font size
Schrëftgréisst
+ Font size
diff --git a/translations/harbour-lidderbuch.ts b/translations/harbour-lidderbuch.ts
index 6dcbac5..259b61c 100644
--- a/translations/harbour-lidderbuch.ts
+++ b/translations/harbour-lidderbuch.ts
@@ -8,15 +8,26 @@
Header of the About page
+
+ 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.
+ Disclaymer by ACEL
+
+
+
+ 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
+ Possibilities to report issues
+
+
CoverPage
- ACEL
+ Lidderbuch
+ App name on the cover
- Lidderbuch
+ ACEL
@@ -24,18 +35,22 @@
FirstPage
Iwwer d'App
+ Pulldown menu item to About page
Astellungen
+ Pulldown menu item to Settings page
Aktualiséieren
+ Refresh the content from ACEL API
ACEL Lidderbuch
+ Page Header
@@ -48,22 +63,27 @@
Kleng
+ Small font size
Mëttel
+ Medium font size
Grouss
+ Large font size
Ech si voll
+ Extra large font size
Schrëftgréisst
+ Font size