diff --git a/AboutPage.qml.in b/AboutPage.qml.in
new file mode 100644
index 0000000..ffba184
--- /dev/null
+++ b/AboutPage.qml.in
@@ -0,0 +1,129 @@
+import QtQuick 2.7
+import Ubuntu.Components 1.3
+
+Page {
+ id: aboutPage
+
+ property string appIcon: "../assets/logo.svg"
+ property string appName: "@APP_NAME@"
+ property string version: "version @APP_VERSION@"
+ property string license: "Apache Software License 2.0"
+ property string source: "git.sr.ht/~thrrgilag/pantalaimon-ut"
+
+ header: PageHeader {
+ id: pageHeader
+ title: i18n.tr("About")
+ }
+
+ Flickable {
+ id: scrollView
+
+ anchors {
+ top: aboutPage.header.bottom
+ bottom: parent.bottom
+ left: parent.left
+ right: parent.right
+ leftMargin: units.gu(2)
+ rightMargin: units.gu(2)
+ }
+ contentHeight: aboutColumn.height + units.gu(4)
+
+ clip: true
+
+ Column {
+ id: aboutColumn
+ spacing: units.gu(2)
+
+ anchors {
+ top: parent.top;
+ left: parent.left;
+ right: parent.right;
+ }
+
+ Label {
+ text: " "
+ }
+
+ UbuntuShape {
+ width: units.gu(12)
+ height: units.gu(12)
+ radius: "medium"
+ anchors.topMargin: units.gu(12)
+ anchors.horizontalCenter: parent.horizontalCenter
+ image: Image {
+ source: appIcon
+ }
+ }
+
+ Label {
+ width: parent.width
+ horizontalAlignment: Text.AlignHCenter
+ text: i18n.tr(appName)
+ wrapMode: Text.WordWrap
+ fontSize: "x-large"
+ }
+
+ Label {
+ width: parent.width
+ horizontalAlignment: Text.AlignHCenter
+ text: i18n.tr("End-to-end encryption aware Matrix reverse proxy daemon for Ubuntu Touch")
+ wrapMode: Text.WordWrap
+ }
+
+ Label {
+ width: parent.width
+ horizontalAlignment: Text.AlignHCenter
+ text: i18n.tr(version)
+ wrapMode: Text.WordWrap
+ }
+
+ Label {
+ width: parent.width
+ horizontalAlignment: Text.AlignHCenter
+ text: i18n.tr("Copyright (c) 2020 Morgan McMillian <thrrgilag@dreamfall.space>")
+ wrapMode: Text.WordWrap
+ }
+
+ Label {
+ width: parent.width
+ horizontalAlignment: Text.AlignHCenter
+ text: i18n.tr(source)
+ wrapMode: Text.WordWrap
+ }
+
+ Label {
+ width: parent.width
+ horizontalAlignment: Text.AlignHCenter
+ text: i18n.tr("Pantalaimon v0.6.5")
+ wrapMode: Text.WordWrap
+ fontSize: "large"
+ }
+
+ Label {
+ width: parent.width
+ horizontalAlignment: Text.AlignHCenter
+ text: i18n.tr("Copyright (c) 2019 The Matrix.org Foundation CIC")
+ wrapMode: Text.WordWrap
+ }
+
+ Label {
+ width: parent.width
+ horizontalAlignment: Text.AlignHCenter
+ text: i18n.tr("github.com/matrix-org/pantalaimon")
+ wrapMode: Text.WordWrap
+ }
+
+ Label {
+ width: parent.width
+ horizontalAlignment: Text.AlignHCenter
+ text: i18n.tr("Released under the terms of " + license)
+ wrapMode: Text.WordWrap
+ }
+
+ Label {
+ text: " "
+ }
+ }
+ }
+
+}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c83535..9cda0be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,8 @@ execute_process(
set(QT_IMPORTS_DIR "lib/${ARCH_TRIPLET}")
+set(APP_NAME "Pantalaimon UT")
+set(APP_VERSION "0.2.0")
set(PROJECT_NAME "pantalaimon")
set(FULL_PROJECT_NAME "pantalaimon.thrrgilag")
set(CMAKE_INSTALL_PREFIX /)
@@ -38,12 +40,14 @@ else()
endif()
configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
+configure_file(AboutPage.qml.in ${CMAKE_CURRENT_BINARY_DIR}/AboutPage.qml)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
install(FILES ${PROJECT_NAME}.apparmor DESTINATION ${DATA_DIR})
install(DIRECTORY assets DESTINATION ${DATA_DIR})
install(DIRECTORY src DESTINATION ${DATA_DIR})
install(DIRECTORY qml DESTINATION ${DATA_DIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/AboutPage.qml DESTINATION ${DATA_DIR}qml/)
# example config file for local testing
# install(FILES example.conf DESTINATION ${CMAKE_INSTALL_PREFIX} RENAME pantalaimon.conf)
diff --git a/README.md b/README.md
index 1a4a1f4..030a6af 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ End-to-end encryption aware Matrix reverse proxy daemon for Ubuntu Touch.
## TODO
-- [ ] About page
+- [x] About page
- [x] App icon
- [ ] Cross compile python+pantalaimon
- [ ] Release on open-store.io
diff --git a/manifest.json.in b/manifest.json.in
index 74fcd31..38b39d3 100644
--- a/manifest.json.in
+++ b/manifest.json.in
@@ -2,14 +2,14 @@
"name": "pantalaimon.thrrgilag",
"description": "End-to-end encryption aware Matrix reverse proxy daemon for Ubuntu Touch",
"architecture": "@CLICK_ARCH@",
- "title": "Pantalaimon UT",
+ "title": "@APP_NAME@",
"hooks": {
"pantalaimon": {
"apparmor": "pantalaimon.apparmor",
"desktop": "pantalaimon.desktop"
}
},
- "version": "0.1.0",
+ "version": "@APP_VERSION@",
"maintainer": "Morgan McMillian ",
"framework" : "ubuntu-sdk-16.04"
}
diff --git a/po/pantalaimon.thrrgilag.pot b/po/pantalaimon.thrrgilag.pot
index 2888c39..1f78e02 100644
--- a/po/pantalaimon.thrrgilag.pot
+++ b/po/pantalaimon.thrrgilag.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pantalaimon.thrrgilag\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-14 02:28+0000\n"
+"POT-Creation-Date: 2020-07-26 01:40+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -45,22 +45,22 @@ msgstr ""
msgid "About"
msgstr ""
-#: ../qml/SettingsPage.qml:35
+#: ../qml/SettingsPage.qml:38
msgid "Service start disabled"
msgstr ""
-#: ../qml/SettingsPage.qml:35
+#: ../qml/SettingsPage.qml:38
msgid "Service start enabled"
msgstr ""
-#: ../qml/SettingsPage.qml:105
+#: ../qml/SettingsPage.qml:108
msgid "Delete homeserver"
msgstr ""
-#: ../qml/SettingsPage.qml:123
+#: ../qml/SettingsPage.qml:126
msgid "No homeservers"
msgstr ""
-#: ../qml/SettingsPage.qml:176
+#: ../qml/SettingsPage.qml:179
msgid "Add Homeserver"
msgstr ""
diff --git a/qml/SettingsPage.qml b/qml/SettingsPage.qml
index cc95777..299cb8a 100644
--- a/qml/SettingsPage.qml
+++ b/qml/SettingsPage.qml
@@ -21,6 +21,9 @@ Page {
Action {
iconName: 'info'
text: i18n.tr('About')
+ onTriggered: {
+ pageStack.push(Qt.resolvedUrl("AboutPage.qml"));
+ }
}
]
}