diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml index aebf817..235cafd 100644 --- a/qml/pages/AboutPage.qml +++ b/qml/pages/AboutPage.qml @@ -156,39 +156,48 @@ Page { } } - Text { - x: Theme.horizontalPageMargin - width: parent.width - ( 2 * Theme.horizontalPageMargin ) - horizontalAlignment: Text.AlignHCenter - text: qsTr("Logged in as %1").arg(Emoji.emojify(aboutPage.userInformation.first_name + " " + aboutPage.userInformation.last_name, Theme.fontSizeSmall)) - font.pixelSize: Theme.fontSizeSmall - wrapMode: Text.Wrap - color: Theme.primaryColor - textFormat: Text.StyledText - anchors { - horizontalCenter: parent.horizontalCenter - } - } + Loader { + active: !!aboutPage.userInformation.phone_number + width: parent.width + sourceComponent: Component { + Column { - ProfileThumbnail { - photoData: aboutPage.userInformation.profile_photo.small - width: Theme.itemSizeExtraLarge - height: Theme.itemSizeExtraLarge - replacementStringHint: aboutPage.userInformation.first_name + " " + aboutPage.userInformation.last_name - anchors { - horizontalCenter: parent.horizontalCenter - } - } + Text { + x: Theme.horizontalPageMargin + width: parent.width - ( 2 * Theme.horizontalPageMargin ) + horizontalAlignment: Text.AlignHCenter + text: qsTr("Logged in as %1").arg(Emoji.emojify(aboutPage.userInformation.first_name + " " + aboutPage.userInformation.last_name + typeof aboutPage.userInformation + JSON.stringify(aboutPage.userInformation), Theme.fontSizeSmall)) + font.pixelSize: Theme.fontSizeSmall + wrapMode: Text.Wrap + color: Theme.primaryColor + textFormat: Text.StyledText + anchors { + horizontalCenter: parent.horizontalCenter + } + } - Label { - x: Theme.horizontalPageMargin - width: parent.width - ( 2 * Theme.horizontalPageMargin ) - horizontalAlignment: Text.AlignHCenter - text: qsTr("Phone number: +%1").arg(aboutPage.userInformation.phone_number) - font.pixelSize: Theme.fontSizeSmall - wrapMode: Text.Wrap - anchors { - horizontalCenter: parent.horizontalCenter + ProfileThumbnail { + photoData: aboutPage.userInformation.profile_photo.small + width: Theme.itemSizeExtraLarge + height: Theme.itemSizeExtraLarge + replacementStringHint: aboutPage.userInformation.first_name + " " + aboutPage.userInformation.last_name + anchors { + horizontalCenter: parent.horizontalCenter + } + } + + Label { + x: Theme.horizontalPageMargin + width: parent.width - ( 2 * Theme.horizontalPageMargin ) + horizontalAlignment: Text.AlignHCenter + text: qsTr("Phone number: +%1").arg(aboutPage.userInformation.phone_number) + font.pixelSize: Theme.fontSizeSmall + wrapMode: Text.Wrap + anchors { + horizontalCenter: parent.horizontalCenter + } + } + } } } diff --git a/qml/pages/InitializationPage.qml b/qml/pages/InitializationPage.qml index 2e839d4..5648151 100644 --- a/qml/pages/InitializationPage.qml +++ b/qml/pages/InitializationPage.qml @@ -105,6 +105,13 @@ Page { Behavior on contentHeight { NumberAnimation {} } anchors.fill: parent + PullDownMenu { + MenuItem { + text: qsTr("About Fernschreiber") + onClicked: pageStack.push(Qt.resolvedUrl("AboutPage.qml")) + } + } + Column { id: content width: parent.width diff --git a/translations/harbour-fernschreiber-de.ts b/translations/harbour-fernschreiber-de.ts index 08b2f79..0d2e9c2 100644 --- a/translations/harbour-fernschreiber-de.ts +++ b/translations/harbour-fernschreiber-de.ts @@ -825,6 +825,10 @@ Use the international format, e.g. %1 Nutzen Sie das internationale Format, z.B. %1 + + About Fernschreiber + Über Fernschreiber + LocationPreview diff --git a/translations/harbour-fernschreiber-en.ts b/translations/harbour-fernschreiber-en.ts index 1422ce1..861e3af 100644 --- a/translations/harbour-fernschreiber-en.ts +++ b/translations/harbour-fernschreiber-en.ts @@ -825,6 +825,10 @@ Use the international format, e.g. %1 Use the international format, e.g. %1 + + About Fernschreiber + About Fernschreiber + LocationPreview @@ -869,7 +873,7 @@ Pin Message - + Pin Message @@ -883,11 +887,11 @@ MessageOverlayFlickable You - You + You This message was forwarded. Original author: %1 - + This message was forwarded. Original author: %1 @@ -947,15 +951,15 @@ PinnedMessageItem You - You + You Pinned Message - + Pinned Message Message unpinned - + Message unpinned @@ -1200,7 +1204,7 @@ Notification turns on the display - + Notification turns on the display diff --git a/translations/harbour-fernschreiber-es.ts b/translations/harbour-fernschreiber-es.ts index a43108d..2761f6f 100644 --- a/translations/harbour-fernschreiber-es.ts +++ b/translations/harbour-fernschreiber-es.ts @@ -815,6 +815,10 @@ Use the international format, e.g. %1 Usar el formato internacional %1 + + About Fernschreiber + Acerca de + LocationPreview diff --git a/translations/harbour-fernschreiber-fi.ts b/translations/harbour-fernschreiber-fi.ts index 5d20a3b..16a2ccc 100644 --- a/translations/harbour-fernschreiber-fi.ts +++ b/translations/harbour-fernschreiber-fi.ts @@ -826,6 +826,10 @@ Use the international format, e.g. %1 Käytä kansainvälistä muotoa, esimerkiksi %1 + + About Fernschreiber + Tietoa Fernschreiberista + LocationPreview diff --git a/translations/harbour-fernschreiber-hu.ts b/translations/harbour-fernschreiber-hu.ts index 4bfef8b..e24b799 100644 --- a/translations/harbour-fernschreiber-hu.ts +++ b/translations/harbour-fernschreiber-hu.ts @@ -815,6 +815,10 @@ Use the international format, e.g. %1 + + About Fernschreiber + A Fernschreiber névjegye + LocationPreview diff --git a/translations/harbour-fernschreiber-it.ts b/translations/harbour-fernschreiber-it.ts index 1929fcf..a01ab6e 100644 --- a/translations/harbour-fernschreiber-it.ts +++ b/translations/harbour-fernschreiber-it.ts @@ -825,6 +825,10 @@ Loading... Carica... + + About Fernschreiber + Informazioni su Fernschreiber + LocationPreview diff --git a/translations/harbour-fernschreiber-pl.ts b/translations/harbour-fernschreiber-pl.ts index f1724c7..f3ec78a 100644 --- a/translations/harbour-fernschreiber-pl.ts +++ b/translations/harbour-fernschreiber-pl.ts @@ -835,6 +835,10 @@ Use the international format, e.g. %1 Użyj międzynarodowego formatu, %1 + + About Fernschreiber + O Fernschreiber + LocationPreview diff --git a/translations/harbour-fernschreiber-ru.ts b/translations/harbour-fernschreiber-ru.ts index a546b6c..aacda7d 100644 --- a/translations/harbour-fernschreiber-ru.ts +++ b/translations/harbour-fernschreiber-ru.ts @@ -835,6 +835,10 @@ Use the international format, e.g. %1 Используйте международный формат, например %1 + + About Fernschreiber + + LocationPreview diff --git a/translations/harbour-fernschreiber-sv.ts b/translations/harbour-fernschreiber-sv.ts index 222847d..834a713 100644 --- a/translations/harbour-fernschreiber-sv.ts +++ b/translations/harbour-fernschreiber-sv.ts @@ -825,6 +825,10 @@ Use the international format, e.g. %1 Använd internationellt format, t.ex. %1 + + About Fernschreiber + Om Fernschreiber + LocationPreview diff --git a/translations/harbour-fernschreiber-zh_CN.ts b/translations/harbour-fernschreiber-zh_CN.ts index 1f4d585..a160764 100644 --- a/translations/harbour-fernschreiber-zh_CN.ts +++ b/translations/harbour-fernschreiber-zh_CN.ts @@ -815,6 +815,10 @@ Use the international format, e.g. %1 请使用国际区号格式,例如 %1 + + About Fernschreiber + 关于 Fernschreiber + LocationPreview diff --git a/translations/harbour-fernschreiber.ts b/translations/harbour-fernschreiber.ts index 1422ce1..8540b65 100644 --- a/translations/harbour-fernschreiber.ts +++ b/translations/harbour-fernschreiber.ts @@ -825,6 +825,10 @@ Use the international format, e.g. %1 Use the international format, e.g. %1 + + About Fernschreiber + About Fernschreiber + LocationPreview