aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMarvin Borner2020-04-23 22:46:49 +0200
committerMarvin Borner2020-04-23 22:46:49 +0200
commit593e8b36614de8fc796123ffca11030b46843af6 (patch)
tree0bde92577d8d0054c303fcc34d34c3d5ef8df1b8
parent7af9769b48321376153b5ceee5c17050eb7d211e (diff)
Added awesome about page
-rw-r--r--harbour-binaryfun.pro1
-rw-r--r--qml/pages/About.qml130
-rw-r--r--qml/pages/Game.qml4
-rw-r--r--qml/pages/Menu.qml4
-rw-r--r--qml/pages/donation.pngbin0 -> 1954 bytes
-rw-r--r--rpm/harbour-binaryfun.spec2
-rw-r--r--rpm/harbour-binaryfun.yaml2
-rw-r--r--translations/harbour-binaryfun-de.ts52
-rw-r--r--translations/harbour-binaryfun.ts52
9 files changed, 245 insertions, 2 deletions
diff --git a/harbour-binaryfun.pro b/harbour-binaryfun.pro
index cc79a76..7ef3048 100644
--- a/harbour-binaryfun.pro
+++ b/harbour-binaryfun.pro
@@ -20,6 +20,7 @@ DISTFILES += qml/harbour-binaryfun.qml \
../harbour-sailchess/qml/Functions.qml \
qml/Bit.qml \
qml/cover/CoverPage.qml \
+ qml/pages/About.qml \
qml/pages/Game.qml \
qml/pages/Menu.qml \
rpm/harbour-binaryfun.changes.in \
diff --git a/qml/pages/About.qml b/qml/pages/About.qml
new file mode 100644
index 0000000..da2752f
--- /dev/null
+++ b/qml/pages/About.qml
@@ -0,0 +1,130 @@
+// Written by Bill Halley
+import QtQuick 2.2
+import Sailfish.Silica 1.0
+
+Page {
+ id: page
+ SilicaFlickable {
+ id: flickable
+ anchors.fill: page
+ contentHeight: column.height
+ Column {
+ id: column
+ width: parent.width - Theme.paddingLarge * 2
+ spacing: 20
+ anchors {
+ left: parent.left
+ leftMargin: Theme.paddingLarge
+ top: page.top
+ }
+
+ Label {
+ topPadding: Theme.paddingLarge
+ width: parent.width
+ text: qsTr("Fun with Binary numbers!")
+ color: Theme.primaryColor
+ font.pixelSize: Theme.fontSizeMedium
+ horizontalAlignment: Text.AlignLeft
+ wrapMode: Text.WordWrap
+ }
+ Label {
+ width: parent.width
+ text: qsTr("The challenge of this game is to type a given decimal number in binary as fast as possible. You can also compete with people from all over the world via the leaderboard which is accessible from the pulley menu.")
+ color: Theme.secondaryColor
+ font.pixelSize: Theme.fontSizeSmall
+ horizontalAlignment: Text.AlignJustify
+ wrapMode: Text.WordWrap
+ }
+
+ Label {
+ width: parent.width
+ text: qsTr("If you aren't that comfortable with the binary system yet, I suggest to start with the very easy mode and step up after some time.\nThere are also serveral help modes available:")
+ color: Theme.secondaryColor
+ font.pixelSize: Theme.fontSizeSmall
+ horizontalAlignment: Text.AlignJustify
+ wrapMode: Text.WordWrap
+ }
+ Label {
+ width: parent.width
+ text: qsTr("1. None: No helping bar and no process indicator. Play this together with the god-like mode and you'll get frustrated very quickly!")
+ color: Theme.secondaryColor
+ font.pixelSize: Theme.fontSizeSmall
+ horizontalAlignment: Text.AlignJustify
+ wrapMode: Text.WordWrap
+ }
+ Label {
+ width: parent.width
+ text: qsTr("2. Counter: Adds a process indicator/counter showing you how many lines you've got right.")
+ color: Theme.secondaryColor
+ font.pixelSize: Theme.fontSizeSmall
+ horizontalAlignment: Text.AlignJustify
+ wrapMode: Text.WordWrap
+ }
+ Label {
+ width: parent.width
+ text: qsTr("3. Bar: Replaces the top bar/line with a helping numbers, showing you the decimal representation of the corresponding bit.")
+ color: Theme.secondaryColor
+ font.pixelSize: Theme.fontSizeSmall
+ horizontalAlignment: Text.AlignJustify
+ wrapMode: Text.WordWrap
+ }
+ Label {
+ width: parent.width
+ text: qsTr("4. Both: Activates both 2. and 3. - recommended for beginners.")
+ color: Theme.secondaryColor
+ font.pixelSize: Theme.fontSizeSmall
+ horizontalAlignment: Text.AlignJustify
+ wrapMode: Text.WordWrap
+ }
+ Label {
+ width: parent.width
+ text: qsTr("All in all, I think that Binary Fun turned out great and I play it myself everyday while travelling with the train. Thanks you for playing too and I hope you learn to love the binary system as much as I do :)")
+ color: Theme.secondaryColor
+ font.pixelSize: Theme.fontSizeSmall
+ horizontalAlignment: Text.AlignJustify
+ wrapMode: Text.WordWrap
+ }
+ Row {
+ spacing: Theme.paddingLarge
+ Label {
+ id: imageText
+ width: column.width / 2 - Theme.paddingMedium
+ textFormat: Text.RichText
+ text: "<style>a:link { color: " + Theme.highlightColor + "; }</style>" + qsTr(
+ "Follow the development on ")
+ + "<a href=https://openrepos.net/content/melvin/binary-fun>OpenRepos.net</a>" + qsTr(
+ " and check Warehouse for updates. This app is completely written by melvin/marvinborner. If you like it, please consider making a small donation, I would really appreciate it!")
+ color: Theme.secondaryColor
+ font.pixelSize: Theme.fontSizeSmall - 6
+ horizontalAlignment: Text.AlignJustify
+ wrapMode: Text.WordWrap
+ onLinkActivated: Qt.openUrlExternally(
+ "https://openrepos.net/content/melvin/binary-fun")
+ }
+ Item {
+ height: imageText.height
+ width: imageText.width
+ Image {
+ id: image
+ height: imageText.height
+ width: imageText.width
+ fillMode: Image.PreserveAspectFit
+ source: "donation.png"
+ }
+ MouseArea {
+ width: image.width
+ height: image.height
+ anchors.fill: image
+ onClicked: {
+ Qt.openUrlExternally("https://www.paypal.me/marvinborner/")
+ }
+ }
+ }
+ }
+ }
+
+ VerticalScrollDecorator {
+ flickable: flickable
+ }
+ }
+}
diff --git a/qml/pages/Game.qml b/qml/pages/Game.qml
index 9e89765..d99682f 100644
--- a/qml/pages/Game.qml
+++ b/qml/pages/Game.qml
@@ -18,6 +18,10 @@ Page {
PullDownMenu {
MenuItem {
+ text: qsTr("About")
+ onClicked: pageStack.push(Qt.resolvedUrl("About.qml"))
+ }
+ MenuItem {
text: qsTr("Leaderboard")
onClicked: pageStack.push(Qt.resolvedUrl("LeaderBoard.qml"), {modes: root.help_modes})
}
diff --git a/qml/pages/Menu.qml b/qml/pages/Menu.qml
index 938d95c..c17c2a9 100644
--- a/qml/pages/Menu.qml
+++ b/qml/pages/Menu.qml
@@ -11,6 +11,10 @@ Page {
PullDownMenu {
MenuItem {
+ text: qsTr("About")
+ onClicked: pageStack.push(Qt.resolvedUrl("About.qml"))
+ }
+ MenuItem {
text: qsTr("Leaderboard")
onClicked: pageStack.push(Qt.resolvedUrl("LeaderBoard.qml"), {modes: menu.help_modes})
}
diff --git a/qml/pages/donation.png b/qml/pages/donation.png
new file mode 100644
index 0000000..028af34
--- /dev/null
+++ b/qml/pages/donation.png
Binary files differ
diff --git a/rpm/harbour-binaryfun.spec b/rpm/harbour-binaryfun.spec
index 0eb220d..bcb0e64 100644
--- a/rpm/harbour-binaryfun.spec
+++ b/rpm/harbour-binaryfun.spec
@@ -13,7 +13,7 @@ Name: harbour-binaryfun
%{!?qtc_make:%define qtc_make make}
%{?qtc_builddir:%define _builddir %qtc_builddir}
Summary: An awesome binary game
-Version: 1.2.0
+Version: 1.5.0
Release: 1
Group: Qt/Qt
License: MIT
diff --git a/rpm/harbour-binaryfun.yaml b/rpm/harbour-binaryfun.yaml
index d6b45be..a552ba4 100644
--- a/rpm/harbour-binaryfun.yaml
+++ b/rpm/harbour-binaryfun.yaml
@@ -1,6 +1,6 @@
Name: harbour-binaryfun
Summary: An awesome binary game
-Version: 1.2.0
+Version: 1.5.0
Release: 1
# The contents of the Group field should be one of the groups listed here:
# https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
diff --git a/translations/harbour-binaryfun-de.ts b/translations/harbour-binaryfun-de.ts
index df80fc5..b069333 100644
--- a/translations/harbour-binaryfun-de.ts
+++ b/translations/harbour-binaryfun-de.ts
@@ -2,6 +2,50 @@
<!DOCTYPE TS>
<TS version="2.1">
<context>
+ <name>About</name>
+ <message>
+ <source>Follow the development on </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Fun with Binary numbers!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>The challenge of this game is to type a given decimal number in binary as fast as possible. You can also compete with people from all over the world via the leaderboard which is accessible from the pulley menu.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>1. None: No helping bar and no process indicator. Play this together with the god-like mode and you&apos;ll get frustrated very quickly!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>2. Counter: Adds a process indicator/counter showing you how many lines you&apos;ve got right.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>3. Bar: Replaces the top bar/line with a helping numbers, showing you the decimal representation of the corresponding bit.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>4. Both: Activates both 2. and 3. - recommended for beginners.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>If you aren&apos;t that comfortable with the binary system yet, I suggest to start with the very easy mode and step up after some time.
+There are also serveral help modes available:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All in all, I think that Binary Fun turned out great and I play it myself everyday while travelling with the train. Thanks you for playing too and I hope you learn to love the binary system as much as I do :)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source> and check Warehouse for updates. This app is completely written by melvin/marvinborner. If you like it, please consider making a small donation, I would really appreciate it!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CoverPage</name>
<message>
<source>Binary Fun</source>
@@ -26,6 +70,10 @@
<source>Play again</source>
<translation>Nochmal spielen</translation>
</message>
+ <message>
+ <source>About</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>LeaderBoard</name>
@@ -132,5 +180,9 @@
<source>Both</source>
<translation>Beides</translation>
</message>
+ <message>
+ <source>About</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
diff --git a/translations/harbour-binaryfun.ts b/translations/harbour-binaryfun.ts
index f70be9e..3113c90 100644
--- a/translations/harbour-binaryfun.ts
+++ b/translations/harbour-binaryfun.ts
@@ -2,6 +2,50 @@
<!DOCTYPE TS>
<TS version="2.1">
<context>
+ <name>About</name>
+ <message>
+ <source>Follow the development on </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Fun with Binary numbers!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>The challenge of this game is to type a given decimal number in binary as fast as possible. You can also compete with people from all over the world via the leaderboard which is accessible from the pulley menu.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>1. None: No helping bar and no process indicator. Play this together with the god-like mode and you&apos;ll get frustrated very quickly!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>2. Counter: Adds a process indicator/counter showing you how many lines you&apos;ve got right.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>3. Bar: Replaces the top bar/line with a helping numbers, showing you the decimal representation of the corresponding bit.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>4. Both: Activates both 2. and 3. - recommended for beginners.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>If you aren&apos;t that comfortable with the binary system yet, I suggest to start with the very easy mode and step up after some time.
+There are also serveral help modes available:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All in all, I think that Binary Fun turned out great and I play it myself everyday while travelling with the train. Thanks you for playing too and I hope you learn to love the binary system as much as I do :)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source> and check Warehouse for updates. This app is completely written by melvin/marvinborner. If you like it, please consider making a small donation, I would really appreciate it!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CoverPage</name>
<message>
<source>Binary Fun</source>
@@ -26,6 +70,10 @@
<source>Play again</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>About</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>LeaderBoard</name>
@@ -132,5 +180,9 @@
<source>Both</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>About</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>