From 35a4f221d8384dd2ce975dd2c79c316b5d937fe7 Mon Sep 17 00:00:00 2001 From: molan-git Date: Thu, 7 May 2020 16:42:07 +0200 Subject: [PATCH 01/25] Added topMargin padding --- qml/images/tooter.svg | 71 +++++++++++++++++-------------- qml/pages/Conversation.qml | 1 + translations/harbour-tooter-it.ts | 14 +++--- 3 files changed, 46 insertions(+), 40 deletions(-) diff --git a/qml/images/tooter.svg b/qml/images/tooter.svg index 62c8550..705b6fa 100644 --- a/qml/images/tooter.svg +++ b/qml/images/tooter.svg @@ -1,33 +1,38 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/qml/pages/Conversation.qml b/qml/pages/Conversation.qml index 5da692c..767955e 100644 --- a/qml/pages/Conversation.qml +++ b/qml/pages/Conversation.qml @@ -390,6 +390,7 @@ Page { + (pressed ? Theme.highlightColor : Theme.primaryColor) anchors { top: toot.bottom + topMargin: -Theme.paddingSmall * 2 right: parent.right rightMargin: Theme.paddingSmall } diff --git a/translations/harbour-tooter-it.ts b/translations/harbour-tooter-it.ts index 7f50712..7ef928a 100644 --- a/translations/harbour-tooter-it.ts +++ b/translations/harbour-tooter-it.ts @@ -43,37 +43,37 @@ A cosa stai pensando? - + Delete Elimina - + Public Pubblico - + Unlisted Non elencato - + Followers-only Solo ai seguaci - + Direct Diretto - + Emojis Emojis - + Tap to insert Tap per inserire From 37d74229a3e26e7fc4264f1d9bd5ccf90f230b73 Mon Sep 17 00:00:00 2001 From: molan-git Date: Thu, 7 May 2020 16:58:06 +0200 Subject: [PATCH 02/25] Update Conversation.qml --- qml/pages/Conversation.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/Conversation.qml b/qml/pages/Conversation.qml index 02e8e5c..3fed799 100644 --- a/qml/pages/Conversation.qml +++ b/qml/pages/Conversation.qml @@ -393,7 +393,7 @@ Page { + (pressed ? Theme.highlightColor : Theme.primaryColor) anchors { top: toot.bottom - topMargin: -Theme.paddingSmall * 2 + topMargin: -Theme.paddingSmall * 1.5 right: parent.right rightMargin: Theme.paddingSmall } From f8b12cc95be804b7b5b7e8b5eb50b55d369fa1d8 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Thu, 7 May 2020 17:07:28 +0200 Subject: [PATCH 03/25] Revert icon --- qml/images/tooter.svg | 71 ++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 38 deletions(-) diff --git a/qml/images/tooter.svg b/qml/images/tooter.svg index 705b6fa..62c8550 100644 --- a/qml/images/tooter.svg +++ b/qml/images/tooter.svg @@ -1,38 +1,33 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + From f82bf51ad64c44184d265b1d01fd37f746a53d69 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Fri, 8 May 2020 10:11:49 +0200 Subject: [PATCH 04/25] Text.RichText for lblContent Toots are now displayed with proper text style (paragraph spacing) --- qml/pages/components/VisualContainer.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/components/VisualContainer.qml b/qml/pages/components/VisualContainer.qml index a7bc245..072f816 100644 --- a/qml/pages/components/VisualContainer.qml +++ b/qml/pages/components/VisualContainer.qml @@ -145,7 +145,7 @@ BackgroundItem { text: content.replace(new RegExp(" Date: Fri, 8 May 2020 10:17:10 +0200 Subject: [PATCH 05/25] Text.RichText for lblContent Toots are now displayed with proper text style (paragraph spacing) --- qml/pages/components/Toot.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/components/Toot.qml b/qml/pages/components/Toot.qml index 7809e7a..5999e40 100644 --- a/qml/pages/components/Toot.qml +++ b/qml/pages/components/Toot.qml @@ -170,7 +170,7 @@ BackgroundItem { } text: content - textFormat: Text.StyledText + textFormat: Text.RichText linkColor : Theme.highlightColor wrapMode: Text.Wrap maximumLineCount: 6 From c4820adaf2ca38ef8052368cacd420b32f7c1236 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 11 May 2020 09:05:45 +0200 Subject: [PATCH 06/25] Fix playerIcons Show pause button when playingState Show play button when pausingState --- qml/pages/components/ImageFullScreen.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qml/pages/components/ImageFullScreen.qml b/qml/pages/components/ImageFullScreen.qml index 37b9eaa..dba23a8 100644 --- a/qml/pages/components/ImageFullScreen.qml +++ b/qml/pages/components/ImageFullScreen.qml @@ -57,10 +57,10 @@ Page { console.log(playbackState) switch (playbackState){ case MediaPlayer.PlayingState: - playerIcon.icon.source = "image://theme/icon-m-play" + playerIcon.icon.source = "image://theme/icon-m-pause" return; case MediaPlayer.PausedState: - playerIcon.icon.source = "image://theme/icon-m-pause" + playerIcon.icon.source = "image://theme/icon-m-play" return; case MediaPlayer.StoppedState: playerIcon.icon.source = "image://theme/icon-m-stop" From 705933c4afe241c17d219ef16c80a6aed714c076 Mon Sep 17 00:00:00 2001 From: molan-git Date: Mon, 11 May 2020 09:48:52 +0200 Subject: [PATCH 07/25] Update locales es, fr --- translations/harbour-tooter-es.ts | 8 ++++---- translations/harbour-tooter-fr.ts | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/translations/harbour-tooter-es.ts b/translations/harbour-tooter-es.ts index a226c0c..fe77cd8 100644 --- a/translations/harbour-tooter-es.ts +++ b/translations/harbour-tooter-es.ts @@ -40,7 +40,7 @@ Write your warning here - Escribe aquí tu aviso + Escribe aquí tu advertencia Public @@ -60,7 +60,7 @@ What's on your mind? - ¿Qué tienes en mente? + ¿En qué estás pensando? @@ -85,7 +85,7 @@ Instance - Instancia> + Instancia Enter a valid Mastodon instance URL @@ -221,7 +221,7 @@ Open Profile in Browser - Abrir perfil en navegador + Abrir perfil en el navegador diff --git a/translations/harbour-tooter-fr.ts b/translations/harbour-tooter-fr.ts index 520174c..341f2a4 100644 --- a/translations/harbour-tooter-fr.ts +++ b/translations/harbour-tooter-fr.ts @@ -40,7 +40,7 @@ Write your warning here - Avertissement du contenu + Rédigez votre alerte ici Public @@ -81,7 +81,7 @@ LoginPage Login - Login + Connexion Instance @@ -93,7 +93,7 @@ Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust — whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly. - Mastodon est un réseau libre et open source. Il s’agit d'une alternative aux plateformes commerciales, pour éviter qu'une seule entreprise monopolise vos communications. Choisissez un serveur dans lequel vous avez confiance - quelque que soit votre choix vous pourrez interagir avec d’autres personnes. Tout le monde peut monter sa propre instance Mastodon et participer rendre le réseau plus robuste. + Mastodon est un réseau libre et open source : une alternative décentralisée aux plateformes commerciales, afin d’éviter le contrôle monopolistique de vos communications par une entreprise. Choisissez un serveur dans lequel vous avez confiance - quelque que soit votre choix vous pourrez interagir avec tous les utilisateurs du réseau Mastodon. Tout le monde peut monter sa propre instance Mastodon et ainsi contribuer à la croissance du réseau. Reload @@ -116,7 +116,7 @@ Search - Chercher + Rechercher @user or #term @@ -173,7 +173,7 @@ Follow request sent! - Demande de suivi envoyée ! + Demande d’abonnement envoyée ! Following @@ -232,7 +232,7 @@ Remove Account - Enlever compte + Déconnecter votre compte Add Account @@ -244,7 +244,7 @@ Authorize this app to access your Mastodon account - Autoriser cette application d'utiliser votre compte + Autoriser l’accès à votre compte pour cette application Disable this option if you want to preserve your data connection @@ -280,7 +280,7 @@ Added README file - Ajouté fichier README + Fichier README ajouté Load images in toots @@ -292,7 +292,7 @@ Use Transifex to help with app translation to your language - Utiliser Transifex pour aider avec les traductions de l'application + Utiliser Transifex pour aider à traduire cette application Development and translations @@ -326,11 +326,11 @@ Unfavorite - Défavoriser + Retirer des favoris Favorite - Ajouter au favoris + Ajouter aux favoris From 8c7fb2d90fc28bef18fe625b54dc4bb34f05ab9d Mon Sep 17 00:00:00 2001 From: molan-git Date: Mon, 11 May 2020 10:28:51 +0200 Subject: [PATCH 08/25] Update harbour-tooterb.pro.user --- harbour-tooterb.pro.user | 185 ++++++++++++++++++--------------------- 1 file changed, 87 insertions(+), 98 deletions(-) diff --git a/harbour-tooterb.pro.user b/harbour-tooterb.pro.user index 9baea29..45942ad 100644 --- a/harbour-tooterb.pro.user +++ b/harbour-tooterb.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -8,7 +8,7 @@ ProjectExplorer.Project.ActiveTarget - 0 + 1 ProjectExplorer.Project.EditorSettings @@ -54,19 +54,24 @@ ProjectExplorer.Project.PluginSettings - + + + -fno-delayed-template-parsing + + true + ProjectExplorer.Project.Target.0 - SailfishOS-3.2.1.20-i486 (in Sailfish OS Build Engine) - SailfishOS-3.2.1.20-i486 (in Sailfish OS Build Engine) - SailfishOS-3.2.1.20-i486 - 1 - 1 + SailfishOS-3.3.0.16-armv7hl (in Sailfish OS Build Engine) + SailfishOS-3.3.0.16-armv7hl (in Sailfish OS Build Engine) + SailfishOS-3.3.0.16-armv7hl + 0 + 0 0 - C:/Users/XPAM/Github/build-harbour-tooterb-SailfishOS_3_2_1_20_i486_in_Sailfish_OS_Build_Engine-Debug + C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_3_3_0_16_armv7hl_in_Sailfish_OS_Build_Engine-Debug true @@ -134,7 +139,7 @@ true - C:/Users/XPAM/Github/build-harbour-tooterb-SailfishOS_3_2_1_20_i486_in_Sailfish_OS_Build_Engine-Release + C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_3_3_0_16_armv7hl_in_Sailfish_OS_Build_Engine-Release true @@ -202,7 +207,7 @@ true - C:/Users/XPAM/Github/build-harbour-tooterb-SailfishOS_3_2_1_20_i486_in_Sailfish_OS_Build_Engine-Profile + C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_3_3_0_16_armv7hl_in_Sailfish_OS_Build_Engine-Profile true @@ -271,6 +276,30 @@ 3 + + + true + Prepare Target + + QmakeProjectManager.MerPrepareTargetStep + + + true + RPM + + QmakeProjectManager.MerRpmDeployStep + + 2 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy As RPM Package + + QmakeProjectManager.MerRpmDeployConfiguration + + true @@ -278,13 +307,7 @@ QmakeProjectManager.MerRpmBuildStep - - true - RPM Validation - - QmakeProjectManager.MerRpmValidationStep - - 2 + 1 Deploy ProjectExplorer.BuildSteps.Deploy @@ -294,7 +317,7 @@ QmakeProjectManager.MerMb2RpmBuildConfiguration - + true @@ -318,30 +341,6 @@ QmakeProjectManager.MerRSyncDeployConfiguration - - - - true - Prepare Target - - QmakeProjectManager.MerPrepareTargetStep - - - true - RPM - - QmakeProjectManager.MerRpmDeployStep - - 2 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy As RPM Package - - QmakeProjectManager.MerRpmDeployConfiguration - 3 @@ -394,19 +393,17 @@ 13 14 - C:/Users/XPAM/Github/harbour-tooter-master + C:/Users/XPAM/Github/Github-App/harbour-tooter false -1 3 - 1 + 2 - - harbour-tooterb (on Sailfish OS Emulator 3.2.1.20) - QmakeProjectManager.MerRunConfiguration:C:/Users/XPAM/Github/harbour-tooter-master/harbour-tooterb.pro - 1 - - false + + Custom Executable + + ProjectExplorer.CustomExecutableRunConfiguration 3768 false @@ -423,14 +420,14 @@ ProjectExplorer.Project.Target.1 - SailfishOS-3.2.1.20-armv7hl (in Sailfish OS Build Engine) - SailfishOS-3.2.1.20-armv7hl (in Sailfish OS Build Engine) - SailfishOS-3.2.1.20-armv7hl - 1 + SailfishOS-3.3.0.16-i486 (in Sailfish OS Build Engine) + SailfishOS-3.3.0.16-i486 (in Sailfish OS Build Engine) + SailfishOS-3.3.0.16-i486 + 0 0 0 - C:/Users/XPAM/Github/build-harbour-tooterb-SailfishOS_3_2_1_20_armv7hl_in_Sailfish_OS_Build_Engine-Debug + C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_3_3_0_16_i486_in_Sailfish_OS_Build_Engine-Debug true @@ -498,7 +495,7 @@ true - C:/Users/XPAM/Github/build-harbour-tooterb-SailfishOS_3_2_1_20_armv7hl_in_Sailfish_OS_Build_Engine-Release + C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_3_3_0_16_i486_in_Sailfish_OS_Build_Engine-Release true @@ -566,7 +563,7 @@ true - C:/Users/XPAM/Github/build-harbour-tooterb-SailfishOS_3_2_1_20_armv7hl_in_Sailfish_OS_Build_Engine-Profile + C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_3_3_0_16_i486_in_Sailfish_OS_Build_Engine-Profile true @@ -635,6 +632,30 @@ 3 + + + true + Prepare Target + + QmakeProjectManager.MerPrepareTargetStep + + + true + RPM + + QmakeProjectManager.MerRpmDeployStep + + 2 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy As RPM Package + + QmakeProjectManager.MerRpmDeployConfiguration + + true @@ -642,13 +663,7 @@ QmakeProjectManager.MerRpmBuildStep - - true - RPM Validation - - QmakeProjectManager.MerRpmValidationStep - - 2 + 1 Deploy ProjectExplorer.BuildSteps.Deploy @@ -658,7 +673,7 @@ QmakeProjectManager.MerMb2RpmBuildConfiguration - + true @@ -682,30 +697,6 @@ QmakeProjectManager.MerRSyncDeployConfiguration - - - - true - Prepare Target - - QmakeProjectManager.MerPrepareTargetStep - - - true - RPM - - QmakeProjectManager.MerRpmDeployStep - - 2 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy As RPM Package - - QmakeProjectManager.MerRpmDeployConfiguration - 3 @@ -758,19 +749,17 @@ 13 14 - C:/Users/XPAM/Github/harbour-tooter-master + C:/Users/XPAM/Github/Github-App/harbour-tooter false -1 3 - 1 + 2 - - harbour-tooterb (on Sailfish OS Emulator 3.2.1.20) - QmakeProjectManager.MerRunConfiguration:C:/Users/XPAM/Github/harbour-tooter-master/harbour-tooterb.pro - 1 - - false + + Custom Executable + + ProjectExplorer.CustomExecutableRunConfiguration 3768 false From e634a80e5ec1ee72169b1469ce52a69fb31d7f0e Mon Sep 17 00:00:00 2001 From: molan-git Date: Mon, 11 May 2020 10:29:39 +0200 Subject: [PATCH 09/25] Update harbour-tooterb.pro.user --- harbour-tooterb.pro.user | 52 ++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/harbour-tooterb.pro.user b/harbour-tooterb.pro.user index 45942ad..a74221b 100644 --- a/harbour-tooterb.pro.user +++ b/harbour-tooterb.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -8,7 +8,7 @@ ProjectExplorer.Project.ActiveTarget - 1 + 0 ProjectExplorer.Project.EditorSettings @@ -67,8 +67,8 @@ SailfishOS-3.3.0.16-armv7hl (in Sailfish OS Build Engine) SailfishOS-3.3.0.16-armv7hl (in Sailfish OS Build Engine) SailfishOS-3.3.0.16-armv7hl - 0 - 0 + 1 + 1 0 C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_3_3_0_16_armv7hl_in_Sailfish_OS_Build_Engine-Debug @@ -307,7 +307,13 @@ QmakeProjectManager.MerRpmBuildStep - 1 + + true + RPM Validation + + QmakeProjectManager.MerRpmValidationStep + + 2 Deploy ProjectExplorer.BuildSteps.Deploy @@ -398,12 +404,14 @@ -1 3 - 2 + 1 - - Custom Executable - - ProjectExplorer.CustomExecutableRunConfiguration + + harbour-tooterb (on Sailfish OS Emulator 3.3.0.16) + QmakeProjectManager.MerRunConfiguration:C:/Users/XPAM/Github/Github-App/harbour-tooter/harbour-tooterb.pro + 1 + + false 3768 false @@ -423,8 +431,8 @@ SailfishOS-3.3.0.16-i486 (in Sailfish OS Build Engine) SailfishOS-3.3.0.16-i486 (in Sailfish OS Build Engine) SailfishOS-3.3.0.16-i486 - 0 - 0 + 1 + 2 0 C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_3_3_0_16_i486_in_Sailfish_OS_Build_Engine-Debug @@ -663,7 +671,13 @@ QmakeProjectManager.MerRpmBuildStep - 1 + + true + RPM Validation + + QmakeProjectManager.MerRpmValidationStep + + 2 Deploy ProjectExplorer.BuildSteps.Deploy @@ -754,12 +768,14 @@ -1 3 - 2 + 1 - - Custom Executable - - ProjectExplorer.CustomExecutableRunConfiguration + + harbour-tooterb (on Sailfish OS Emulator 3.3.0.16) + QmakeProjectManager.MerRunConfiguration:C:/Users/XPAM/Github/Github-App/harbour-tooter/harbour-tooterb.pro + 1 + + false 3768 false From e83ea42881257120cf112adcbc56b4c0aebba215 Mon Sep 17 00:00:00 2001 From: molan-git Date: Mon, 11 May 2020 10:39:21 +0200 Subject: [PATCH 10/25] Update harbour-tooter-it.ts --- translations/harbour-tooter-it.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/translations/harbour-tooter-it.ts b/translations/harbour-tooter-it.ts index 5704e88..6689a88 100644 --- a/translations/harbour-tooter-it.ts +++ b/translations/harbour-tooter-it.ts @@ -43,37 +43,37 @@ A cosa stai pensando? - + Delete Elimina - + Public Pubblico - + Unlisted Non elencato - + Followers-only Solo ai seguaci - + Direct Diretto - + Emojis Emojis - 1 + Tap to insert Tap per inserire From e986b58993c49c3b8218a8b10a0a76bd531d2479 Mon Sep 17 00:00:00 2001 From: molan-git Date: Mon, 11 May 2020 10:46:59 +0200 Subject: [PATCH 11/25] Update harbour-tooterb-it.ts --- translations/harbour-tooterb-it.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/translations/harbour-tooterb-it.ts b/translations/harbour-tooterb-it.ts index 54e41ff..e168a6f 100644 --- a/translations/harbour-tooterb-it.ts +++ b/translations/harbour-tooterb-it.ts @@ -43,37 +43,37 @@ A cosa stai pensando? - + Delete Elimina - + Public Pubblico - + Unlisted Non elencato - + Followers-only Solo ai seguaci - + Direct Diretto - + Emojis Emojis - 1 + Tap to insert Tap per inserire From 091ebc60cdeae2623263122f585e5988cc9ccbaa Mon Sep 17 00:00:00 2001 From: molan-git Date: Mon, 11 May 2020 11:01:10 +0200 Subject: [PATCH 12/25] Update harbour-tooterb.changes --- rpm/harbour-tooterb.changes | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/rpm/harbour-tooterb.changes b/rpm/harbour-tooterb.changes index 3b567e5..d9e95c5 100644 --- a/rpm/harbour-tooterb.changes +++ b/rpm/harbour-tooterb.changes @@ -1,5 +1,18 @@ -*Wed May 06 2020 molan 1.0.4-2 -- Beta release +*Mon May 11 2020 molan 1.0.4-2 +- Beta release by molan +- Login / Settings Page: Small changes in text wording +- Login Page: Use of correct label coloring and text alignment +- Login Page: Highlight login confirmation button + 'accept' icon on Sailfish keyboard +- Media Page: Switched play / pause buttons during media playback +- Conversation Page: Improved alignment of elements in 'New Toot' (no more overlapping) +- Settings Page: Replaced icons in Settings page for consistency and clarity +- Settings Page: Added missing language contributor +- Translations: Completed and fixed German and French translations +- Translations: Added complete Italian translation +- Translations: Added missing/lost strings and updates to other translation files +- Timeline: Better text formatting in toots (show paragraph breaks) +- Timeline: Use shortend username if display_name isn't provided in ProfileHeader and MiniHeader +- Timeline: Created new placeholder for profile avatars if instance doesn't provide valid image * Thu Apr 16 2020 Dusko Angirevic 1.0.4-1 - Merge with molan code From 64c78b88e8e310d4b5d6f956dd612809bdea7036 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 11 May 2020 11:47:48 +0200 Subject: [PATCH 13/25] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index d43db48..97c1df6 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,6 @@ Clone / download this repository and import it in your SailfishOS IDE using the ## Repository branches: - master: default (Beta release version) -- develop: commits WIP - upstream: commits for Tooter release ## Contributions From 004b72b6f837cef62db1dea51e99bc182f8b0796 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 11 May 2020 12:14:01 +0200 Subject: [PATCH 14/25] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 97c1df6..3548b55 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,8 @@ Releases from this forked repository (branch 'master') can be found here: https: Clone / download this repository and import it in your SailfishOS IDE using the harbour-tooter.pro project file. No additional configuration needed. ## Repository branches: -- master: default (Beta release version) -- upstream: commits for Tooter release +- master: default (Beta release version, harbour-tooterb) +- upstream: commits for Tooter release (harbour-tooter) ## Contributions Contributions to this project are very welcome, since I don't have the resources and time to implement and fix everything Tooter still misses or lacks. Thank you! From 25def137442388526665db3f5b250ed01555e9ae Mon Sep 17 00:00:00 2001 From: molan-git Date: Mon, 11 May 2020 12:24:44 +0200 Subject: [PATCH 15/25] Update ProfileHeader.qml --- qml/pages/components/ProfileHeader.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/components/ProfileHeader.qml b/qml/pages/components/ProfileHeader.qml index ac76884..c1b53ae 100644 --- a/qml/pages/components/ProfileHeader.qml +++ b/qml/pages/components/ProfileHeader.qml @@ -69,7 +69,7 @@ Item { } Label { height: description === "" ? 0 : contentHeight - text: description + text: "@"+description color: Theme.secondaryHighlightColor font.pixelSize: Theme.fontSizeSmall font.family: Theme.fontFamilyHeading From da296e28216dfe04fba08974b7ca548d04c6b92c Mon Sep 17 00:00:00 2001 From: molan-git Date: Mon, 11 May 2020 12:27:48 +0200 Subject: [PATCH 16/25] Update ProfileHeader.qml --- qml/pages/components/ProfileHeader.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/components/ProfileHeader.qml b/qml/pages/components/ProfileHeader.qml index a4c9a8d..2183842 100644 --- a/qml/pages/components/ProfileHeader.qml +++ b/qml/pages/components/ProfileHeader.qml @@ -69,7 +69,7 @@ Item { } Label { height: description === "" ? 0 : contentHeight - text: description + text: "@"+description color: Theme.secondaryHighlightColor font.pixelSize: Theme.fontSizeSmall font.family: Theme.fontFamilyHeading From 4ad51e553aaf05c85d446fc9c9a8a3e6b72263a0 Mon Sep 17 00:00:00 2001 From: molan-git Date: Mon, 11 May 2020 15:12:13 +0200 Subject: [PATCH 17/25] status_uri link Possibility to open conversations in Browser or copy link with Pulley menu. --- qml/pages/Conversation.qml | 13 +++++++++- qml/pages/components/VisualContainer.qml | 3 ++- translations/harbour-tooter-de.ts | 8 +++++++ translations/harbour-tooter-el.ts | 10 +++++++- translations/harbour-tooter-es.ts | 8 +++++++ translations/harbour-tooter-fi.ts | 8 +++++++ translations/harbour-tooter-fr.ts | 8 +++++++ translations/harbour-tooter-it.ts | 30 ++++++++++++++++-------- translations/harbour-tooter-nl.ts | 8 +++++++ translations/harbour-tooter-nl_BE.ts | 8 +++++++ translations/harbour-tooter-oc.ts | 8 +++++++ translations/harbour-tooter-pl.ts | 8 +++++++ translations/harbour-tooter-ru.ts | 8 +++++++ translations/harbour-tooter-sr.ts | 8 +++++++ translations/harbour-tooter-sv.ts | 8 +++++++ translations/harbour-tooter-zh_CN.ts | 8 +++++++ translations/harbour-tooter.ts | 8 +++++++ 17 files changed, 147 insertions(+), 13 deletions(-) diff --git a/qml/pages/Conversation.qml b/qml/pages/Conversation.qml index 3fed799..7c7da51 100644 --- a/qml/pages/Conversation.qml +++ b/qml/pages/Conversation.qml @@ -12,7 +12,8 @@ Page { property alias avatar: header.image property string suggestedUser: "" property ListModel suggestedModel - property string toot_id: "" + property string toot_id: "" + property string uri: "" property int tootMaxChar: 500; property ListModel mdl allowedOrientations: Orientation.All @@ -90,6 +91,16 @@ Page { } } } + PullDownMenu { + MenuItem { + text: qsTr("Open in Browser") + onClicked: Qt.openUrlExternally(uri); + } + MenuItem { + text: qsTr("Copy URL to Clipboard") + onClicked: Clipboard.text = uri; + } + } } Rectangle { id: predictionList diff --git a/qml/pages/components/VisualContainer.qml b/qml/pages/components/VisualContainer.qml index 072f816..8482ee6 100644 --- a/qml/pages/components/VisualContainer.qml +++ b/qml/pages/components/VisualContainer.qml @@ -278,11 +278,12 @@ BackgroundItem { m.append(mdl.get(index)) pageStack.push(Qt.resolvedUrl("../Conversation.qml"), { toot_id: status_id, + uri: status_uri, title: account_display_name, description: '@'+account_acct, avatar: account_avatar, mdl: m, - type: "reply" + type: "reply", }) } onPressAndHold: { diff --git a/translations/harbour-tooter-de.ts b/translations/harbour-tooter-de.ts index d2a2c44..6c31a46 100644 --- a/translations/harbour-tooter-de.ts +++ b/translations/harbour-tooter-de.ts @@ -62,6 +62,14 @@ What's on your mind? Was gibt's Neues? + + Open in Browser + Im Browser öffnen + + + Copy URL to Clipboard + Link in Zwischenablage kopieren + ImageFullScreen diff --git a/translations/harbour-tooter-el.ts b/translations/harbour-tooter-el.ts index 6f47211..32602ff 100644 --- a/translations/harbour-tooter-el.ts +++ b/translations/harbour-tooter-el.ts @@ -62,6 +62,14 @@ What's on your mind? + + Open in Browser + + + + Copy URL to Clipboard + + ImageFullScreen @@ -318,7 +326,7 @@ VisualContainer Unboost - Αναίρεση προώθησης + Αναίρεση προώθηση Boost diff --git a/translations/harbour-tooter-es.ts b/translations/harbour-tooter-es.ts index fe77cd8..237c1cd 100644 --- a/translations/harbour-tooter-es.ts +++ b/translations/harbour-tooter-es.ts @@ -62,6 +62,14 @@ What's on your mind? ¿En qué estás pensando? + + Open in Browser + Abrir en el navegador + + + Copy URL to Clipboard + Copiar enlace + ImageFullScreen diff --git a/translations/harbour-tooter-fi.ts b/translations/harbour-tooter-fi.ts index f1444ea..9a0dedd 100644 --- a/translations/harbour-tooter-fi.ts +++ b/translations/harbour-tooter-fi.ts @@ -62,6 +62,14 @@ What's on your mind? + + Open in Browser + + + + Copy URL to Clipboard + + ImageFullScreen diff --git a/translations/harbour-tooter-fr.ts b/translations/harbour-tooter-fr.ts index 341f2a4..a8e9d4a 100644 --- a/translations/harbour-tooter-fr.ts +++ b/translations/harbour-tooter-fr.ts @@ -62,6 +62,14 @@ What's on your mind? Qu'avez-vous en tête? + + Open in Browser + Ouvrir dans le navigateur + + + Copy URL to Clipboard + Copier le lien + ImageFullScreen diff --git a/translations/harbour-tooter-it.ts b/translations/harbour-tooter-it.ts index 6689a88..a44b911 100644 --- a/translations/harbour-tooter-it.ts +++ b/translations/harbour-tooter-it.ts @@ -28,52 +28,62 @@ Conversation - + Conversation Conversazione - + + Open in Browser + Aprire nel browser + + + + Copy URL to Clipboard + Copia link + + + Write your warning here Contenuto avviso - + What's on your mind? A cosa stai pensando? - + Delete Elimina - + Public Pubblico - + Unlisted Non elencato - + Followers-only Solo ai seguaci - + Direct Diretto - + Emojis Emojis - + Tap to insert Tap per inserire diff --git a/translations/harbour-tooter-nl.ts b/translations/harbour-tooter-nl.ts index 6ff67ed..eb9aa5a 100644 --- a/translations/harbour-tooter-nl.ts +++ b/translations/harbour-tooter-nl.ts @@ -62,6 +62,14 @@ What's on your mind? + + Open in Browser + + + + Copy URL to Clipboard + + ImageFullScreen diff --git a/translations/harbour-tooter-nl_BE.ts b/translations/harbour-tooter-nl_BE.ts index cf8d937..73037f8 100644 --- a/translations/harbour-tooter-nl_BE.ts +++ b/translations/harbour-tooter-nl_BE.ts @@ -62,6 +62,14 @@ What's on your mind? + + Open in Browser + + + + Copy URL to Clipboard + + ImageFullScreen diff --git a/translations/harbour-tooter-oc.ts b/translations/harbour-tooter-oc.ts index 2bb86d9..125efa0 100644 --- a/translations/harbour-tooter-oc.ts +++ b/translations/harbour-tooter-oc.ts @@ -62,6 +62,14 @@ What's on your mind? + + Open in Browser + + + + Copy URL to Clipboard + + ImageFullScreen diff --git a/translations/harbour-tooter-pl.ts b/translations/harbour-tooter-pl.ts index 952b1b2..b202e27 100644 --- a/translations/harbour-tooter-pl.ts +++ b/translations/harbour-tooter-pl.ts @@ -62,6 +62,14 @@ What's on your mind? + + Open in Browser + + + + Copy URL to Clipboard + + ImageFullScreen diff --git a/translations/harbour-tooter-ru.ts b/translations/harbour-tooter-ru.ts index 277a582..8594169 100644 --- a/translations/harbour-tooter-ru.ts +++ b/translations/harbour-tooter-ru.ts @@ -62,6 +62,14 @@ What's on your mind? + + Open in Browser + + + + Copy URL to Clipboard + + ImageFullScreen diff --git a/translations/harbour-tooter-sr.ts b/translations/harbour-tooter-sr.ts index 3091e3e..1729d96 100644 --- a/translations/harbour-tooter-sr.ts +++ b/translations/harbour-tooter-sr.ts @@ -62,6 +62,14 @@ What's on your mind? + + Open in Browser + + + + Copy URL to Clipboard + + ImageFullScreen diff --git a/translations/harbour-tooter-sv.ts b/translations/harbour-tooter-sv.ts index 43b1866..cc7ea04 100644 --- a/translations/harbour-tooter-sv.ts +++ b/translations/harbour-tooter-sv.ts @@ -62,6 +62,14 @@ What's on your mind? + + Open in Browser + + + + Copy URL to Clipboard + + ImageFullScreen diff --git a/translations/harbour-tooter-zh_CN.ts b/translations/harbour-tooter-zh_CN.ts index 04ddc89..2e2d9e0 100644 --- a/translations/harbour-tooter-zh_CN.ts +++ b/translations/harbour-tooter-zh_CN.ts @@ -62,6 +62,14 @@ What's on your mind? 有何想法? + + Open in Browser + + + + Copy URL to Clipboard + + ImageFullScreen diff --git a/translations/harbour-tooter.ts b/translations/harbour-tooter.ts index b119e7e..c7f0ef2 100644 --- a/translations/harbour-tooter.ts +++ b/translations/harbour-tooter.ts @@ -62,6 +62,14 @@ What's on your mind? + + Open in Browser + + + + Copy URL to Clipboard + + ImageFullScreen From 423ba338a68053daf8b1e41d36337f6eacd7780e Mon Sep 17 00:00:00 2001 From: molan-git Date: Mon, 11 May 2020 15:37:32 +0200 Subject: [PATCH 18/25] Syntax fix --- qml/pages/components/VisualContainer.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/components/VisualContainer.qml b/qml/pages/components/VisualContainer.qml index 8482ee6..994990f 100644 --- a/qml/pages/components/VisualContainer.qml +++ b/qml/pages/components/VisualContainer.qml @@ -283,7 +283,7 @@ BackgroundItem { description: '@'+account_acct, avatar: account_avatar, mdl: m, - type: "reply", + type: "reply" }) } onPressAndHold: { From baac47eb6b54f31574bc7d3bcab32a90ab143a6d Mon Sep 17 00:00:00 2001 From: dashinfantry <45334556+dashinfantry@users.noreply.github.com> Date: Tue, 12 May 2020 00:33:59 +0800 Subject: [PATCH 19/25] Update harbour-tooterb-zh_CN.ts --- translations/harbour-tooterb-zh_CN.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/translations/harbour-tooterb-zh_CN.ts b/translations/harbour-tooterb-zh_CN.ts index 2e2d9e0..b21c4e3 100644 --- a/translations/harbour-tooterb-zh_CN.ts +++ b/translations/harbour-tooterb-zh_CN.ts @@ -64,11 +64,11 @@ Open in Browser - + 在浏览器打开 Copy URL to Clipboard - + 复制链接到剪切板 @@ -136,7 +136,7 @@ Federated - 联合的 + 联合 @@ -300,18 +300,18 @@ Use Transifex to help with app translation to your language - + 使用 Transifex 以帮助翻译软件为你的语言 Development and translations - + 开发及翻译 Toot boosted - 推起的 + 推起 favourited @@ -319,7 +319,7 @@ followed you - 关注你的 + 关注你 From b177884567c798c79cbdb784415912f2efa6cbd6 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Tue, 12 May 2020 08:17:15 +0200 Subject: [PATCH 20/25] Update harbour-tooter-zh_CN.ts --- translations/harbour-tooter-zh_CN.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/translations/harbour-tooter-zh_CN.ts b/translations/harbour-tooter-zh_CN.ts index 04ddc89..d25e9f9 100644 --- a/translations/harbour-tooter-zh_CN.ts +++ b/translations/harbour-tooter-zh_CN.ts @@ -128,7 +128,7 @@ Federated - 联合的 + 联合 @@ -292,18 +292,18 @@ Use Transifex to help with app translation to your language - + 使用 Transifex 以帮助翻译软件为你的语言 Development and translations - + 开发及翻译 Toot boosted - 推起的 + 推起 favourited @@ -311,7 +311,7 @@ followed you - 关注你的 + 关注你 From 708c9e4344c50e9b0d2a8bba771e332c37af8aa0 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Tue, 12 May 2020 08:28:32 +0200 Subject: [PATCH 21/25] Update README.md --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3548b55..ca54a60 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@ ## About Tooter is Mastodon client for Sailfish OS. It is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. -This fork is being used to further develop and maintain the Tooter app by dysko (https://github.com/dysk0/harbour-tooter). The development branch 'upstream' is being for merge requests with the original repository. Releases by dysko can be found on the Jolla store and on https://openrepos.net/content/dysko/tooter +This fork is being used to further develop and maintain the Tooter app by dysko (https://github.com/dysk0/harbour-tooter). The development branch 'upstream' is being used for merge pull requests to the original repository. Releases by dysko can be found on the Jolla store and on https://openrepos.net/content/dysko/tooter -Releases from this forked repository (branch 'master') can be found here: https://openrepos.net/content/molan/tooter-fork. +Releases from this forked repository (branch 'master') can be found here: https://openrepos.net/content/molan/tooter-v-fork. ## Build Clone / download this repository and import it in your SailfishOS IDE using the harbour-tooter.pro project file. No additional configuration needed. @@ -15,7 +15,8 @@ Clone / download this repository and import it in your SailfishOS IDE using the - upstream: commits for Tooter release (harbour-tooter) ## Contributions -Contributions to this project are very welcome, since I don't have the resources and time to implement and fix everything Tooter still misses or lacks. Thank you! +Contributions to this project are very welcome, since there are still many things which can be done for Tooter. +- please fork the upstream branch if you want to contribute to this project. ## Screenshots From c8ad3f02cc12da45fd3c6b5c73f1306622551452 Mon Sep 17 00:00:00 2001 From: molan-git Date: Sun, 24 May 2020 19:54:46 +0200 Subject: [PATCH 22/25] sentBanner Adds a confirmation banner when sending a Toot --- harbour-tooter.pro | 233 ++++++++++--------- qml/pages/Conversation.qml | 22 +- qml/pages/MainPage.qml | 2 +- qml/pages/components/InfoBanner.qml | 62 +++++ qml/pages/components/InfoBanner.qml.autosave | 61 +++++ qml/pages/components/VisualContainer.qml | 1 + translations/harbour-tooter-de.ts | 8 +- translations/harbour-tooter-el.ts | 8 +- translations/harbour-tooter-es.ts | 8 +- translations/harbour-tooter-fi.ts | 8 +- translations/harbour-tooter-fr.ts | 8 +- translations/harbour-tooter-it.ts | 28 +-- translations/harbour-tooter-nl.ts | 8 +- translations/harbour-tooter-nl_BE.ts | 8 +- translations/harbour-tooter-oc.ts | 8 +- translations/harbour-tooter-pl.ts | 8 +- translations/harbour-tooter-ru.ts | 8 +- translations/harbour-tooter-sr.ts | 8 +- translations/harbour-tooter-sv.ts | 8 +- translations/harbour-tooter-zh_CN.ts | 8 +- translations/harbour-tooter.ts | 8 +- 21 files changed, 325 insertions(+), 196 deletions(-) create mode 100644 qml/pages/components/InfoBanner.qml create mode 100644 qml/pages/components/InfoBanner.qml.autosave diff --git a/harbour-tooter.pro b/harbour-tooter.pro index 6a1b13c..026fe41 100644 --- a/harbour-tooter.pro +++ b/harbour-tooter.pro @@ -1,116 +1,117 @@ -# NOTICE: -# -# Application name defined in TARGET has a corresponding QML filename. -# If name defined in TARGET is changed, the following needs to be done -# to match new name: -# - corresponding QML filename must be changed -# - desktop icon filename must be changed -# - desktop filename must be changed -# - icon definition filename in desktop file must be changed -# - translation filenames have to be changed - -# The name of your application -TARGET = harbour-tooter - -CONFIG += sailfishapp - -QT += network dbus sql -CONFIG += link_pkgconfig -PKGCONFIG += sailfishapp -PKGCONFIG += \ - nemonotifications-qt5 - -DEFINES += "APPVERSION=\\\"$${SPECVERSION}\\\"" -DEFINES += "APPNAME=\\\"$${TARGET}\\\"" - -!exists( src/dbusAdaptor.h ) { - system(qdbusxml2cpp config/ba.dysko.harbour.tooter.xml -i dbus.h -a src/dbusAdaptor) -} - -config.path = /usr/share/$${TARGET}/config/ -config.files = config/icon-lock-harbour-tooter.png - -notification_categories.path = /usr/share/lipstick/notificationcategories -notification_categories.files = config/x-harbour.tooter.activity.* - -dbus_services.path = /usr/share/dbus-1/services/ -dbus_services.files = config/ba.dysko.harbour.tooter.service - -interfaces.path = /usr/share/dbus-1/interfaces/ -interfaces.files = config/ba.dysko.harbour.tooter.xml - -SOURCES += src/harbour-tooter.cpp -SOURCES += src/imageuploader.cpp -SOURCES += src/filedownloader.cpp -SOURCES += src/notifications.cpp -SOURCES += src/dbusAdaptor.cpp -SOURCES += src/dbus.cpp - -HEADERS += src/imageuploader.h -HEADERS += src/filedownloader.h -HEADERS += src/notifications.h -HEADERS += src/dbusAdaptor.h -HEADERS += src/dbus.h - -DISTFILES += qml/harbour-tooter.qml \ - qml/pages/components/VisualContainer.qml \ - qml/pages/components/MiniStatus.qml \ - qml/pages/components/MiniHeader.qml \ - qml/pages/components/ItemUser.qml \ - qml/pages/components/MyList.qml \ - qml/pages/components/Navigation.qml \ - qml/pages/components/ProfileHeader.qml \ - qml/pages/components/MediaBlock.qml \ - qml/pages/components/MyImage.qml \ - qml/pages/components/ImageFullScreen.qml \ - qml/cover/CoverPage.qml \ - qml/pages/MainPage.qml \ - qml/pages/LoginPage.qml \ - qml/pages/Conversation.qml \ - qml/pages/components/Toot.qml \ - qml/pages/Browser.qml \ - qml/pages/Profile.qml \ - qml/pages/Settings.qml \ - qml/lib/API.js \ - qml/images/notification.svg \ - qml/images/verified.svg \ - qml/images/boosted.svg \ - qml/images/tooter.svg \ - qml/images/emojiselect.svg \ - qml/images/icon-m-profile.svg \ - qml/images/icon-l-profile.svg \ - qml/lib/Mastodon.js \ - qml/lib/Worker.js \ - config/icon-lock-harbour-tooter.png \ - config/x-harbour.tooter.activity.conf \ - rpm/harbour-tooter.changes \ - rpm/harbour-tooter.changes.run.in \ - rpm/harbour-tooter.spec \ - rpm/harbour-tooter.yaml \ - translations/*.ts \ - harbour-tooter.desktop - -SAILFISHAPP_ICONS = 86x86 108x108 128x128 172x172 - -# to disable building translations every time, comment out the -# following CONFIG line -CONFIG += sailfishapp_i18n - -# German translation is enabled as an example. If you aren't -# planning to localize your app, remember to comment out the -# following TRANSLATIONS line. And also do not forget to -# modify the localized app name in the the .desktop file. -TRANSLATIONS += translations/harbour-tooter-de.ts -TRANSLATIONS += translations/harbour-tooter-el.ts -TRANSLATIONS += translations/harbour-tooter-es.ts -TRANSLATIONS += translations/harbour-tooter-fi.ts -TRANSLATIONS += translations/harbour-tooter-fr.ts -TRANSLATIONS += translations/harbour-tooter-nl.ts -TRANSLATIONS += translations/harbour-tooter-nl_BE.ts -TRANSLATIONS += translations/harbour-tooter-oc.ts -TRANSLATIONS += translations/harbour-tooter-pl.ts -TRANSLATIONS += translations/harbour-tooter-ru.ts -TRANSLATIONS += translations/harbour-tooter-sr.ts -TRANSLATIONS += translations/harbour-tooter-sv.ts -TRANSLATIONS += translations/harbour-tooter-zh_CN.ts -TRANSLATIONS += translations/harbour-tooter-it.ts +# NOTICE: +# +# Application name defined in TARGET has a corresponding QML filename. +# If name defined in TARGET is changed, the following needs to be done +# to match new name: +# - corresponding QML filename must be changed +# - desktop icon filename must be changed +# - desktop filename must be changed +# - icon definition filename in desktop file must be changed +# - translation filenames have to be changed + +# The name of your application +TARGET = harbour-tooter + +CONFIG += sailfishapp + +QT += network dbus sql +CONFIG += link_pkgconfig +PKGCONFIG += sailfishapp +PKGCONFIG += \ + nemonotifications-qt5 + +DEFINES += "APPVERSION=\\\"$${SPECVERSION}\\\"" +DEFINES += "APPNAME=\\\"$${TARGET}\\\"" + +!exists( src/dbusAdaptor.h ) { + system(qdbusxml2cpp config/ba.dysko.harbour.tooter.xml -i dbus.h -a src/dbusAdaptor) +} + +config.path = /usr/share/$${TARGET}/config/ +config.files = config/icon-lock-harbour-tooter.png + +notification_categories.path = /usr/share/lipstick/notificationcategories +notification_categories.files = config/x-harbour.tooter.activity.* + +dbus_services.path = /usr/share/dbus-1/services/ +dbus_services.files = config/ba.dysko.harbour.tooter.service + +interfaces.path = /usr/share/dbus-1/interfaces/ +interfaces.files = config/ba.dysko.harbour.tooter.xml + +SOURCES += src/harbour-tooter.cpp +SOURCES += src/imageuploader.cpp +SOURCES += src/filedownloader.cpp +SOURCES += src/notifications.cpp +SOURCES += src/dbusAdaptor.cpp +SOURCES += src/dbus.cpp + +HEADERS += src/imageuploader.h +HEADERS += src/filedownloader.h +HEADERS += src/notifications.h +HEADERS += src/dbusAdaptor.h +HEADERS += src/dbus.h + +DISTFILES += qml/harbour-tooter.qml \ + qml/pages/components/InfoBanner.qml \ + qml/pages/components/VisualContainer.qml \ + qml/pages/components/MiniStatus.qml \ + qml/pages/components/MiniHeader.qml \ + qml/pages/components/ItemUser.qml \ + qml/pages/components/MyList.qml \ + qml/pages/components/Navigation.qml \ + qml/pages/components/ProfileHeader.qml \ + qml/pages/components/MediaBlock.qml \ + qml/pages/components/MyImage.qml \ + qml/pages/components/ImageFullScreen.qml \ + qml/cover/CoverPage.qml \ + qml/pages/MainPage.qml \ + qml/pages/LoginPage.qml \ + qml/pages/Conversation.qml \ + qml/pages/components/Toot.qml \ + qml/pages/Browser.qml \ + qml/pages/Profile.qml \ + qml/pages/Settings.qml \ + qml/lib/API.js \ + qml/images/notification.svg \ + qml/images/verified.svg \ + qml/images/boosted.svg \ + qml/images/tooter.svg \ + qml/images/emojiselect.svg \ + qml/images/icon-m-profile.svg \ + qml/images/icon-l-profile.svg \ + qml/lib/Mastodon.js \ + qml/lib/Worker.js \ + config/icon-lock-harbour-tooter.png \ + config/x-harbour.tooter.activity.conf \ + rpm/harbour-tooter.changes \ + rpm/harbour-tooter.changes.run.in \ + rpm/harbour-tooter.spec \ + rpm/harbour-tooter.yaml \ + translations/*.ts \ + harbour-tooter.desktop + +SAILFISHAPP_ICONS = 86x86 108x108 128x128 172x172 + +# to disable building translations every time, comment out the +# following CONFIG line +CONFIG += sailfishapp_i18n + +# German translation is enabled as an example. If you aren't +# planning to localize your app, remember to comment out the +# following TRANSLATIONS line. And also do not forget to +# modify the localized app name in the the .desktop file. +TRANSLATIONS += translations/harbour-tooter-de.ts +TRANSLATIONS += translations/harbour-tooter-el.ts +TRANSLATIONS += translations/harbour-tooter-es.ts +TRANSLATIONS += translations/harbour-tooter-fi.ts +TRANSLATIONS += translations/harbour-tooter-fr.ts +TRANSLATIONS += translations/harbour-tooter-nl.ts +TRANSLATIONS += translations/harbour-tooter-nl_BE.ts +TRANSLATIONS += translations/harbour-tooter-oc.ts +TRANSLATIONS += translations/harbour-tooter-pl.ts +TRANSLATIONS += translations/harbour-tooter-ru.ts +TRANSLATIONS += translations/harbour-tooter-sr.ts +TRANSLATIONS += translations/harbour-tooter-sv.ts +TRANSLATIONS += translations/harbour-tooter-zh_CN.ts +TRANSLATIONS += translations/harbour-tooter-it.ts diff --git a/qml/pages/Conversation.qml b/qml/pages/Conversation.qml index 3fed799..2aac1ad 100644 --- a/qml/pages/Conversation.qml +++ b/qml/pages/Conversation.qml @@ -4,9 +4,11 @@ import harbour.tooter.Uploader 1.0 import "../lib/API.js" as Logic import "./components/" + Page { id: conversationPage - property string type + property string headerTitle: "" + property string type property alias title: header.title property alias description: header.description property alias avatar: header.image @@ -40,6 +42,10 @@ Page { } } + InfoBanner { + id: sentBanner + } + ListModel { id: mediaModel onCountChanged: { @@ -62,7 +68,7 @@ Page { SilicaListView { id: conversationList header: PageHeader { - title: qsTr("Conversation") + title: headerTitle // pageTitle pushed from MainPage.qml or VisualContainer.qml } clip: true anchors { @@ -208,7 +214,6 @@ Page { || description.charAt( 0) == '#') ? description + ' ' : '' height: Math.max(270, Math.min(900, implicitHeight)) - //height: implicitHeight horizontalAlignment: Text.AlignLeft placeholderText: qsTr("What's on your mind?") font.pixelSize: Theme.fontSizeSmall @@ -304,7 +309,6 @@ Page { } } IconButton { - id: btnContentWarning anchors { top: toot.bottom @@ -426,11 +430,11 @@ Page { msg.params['spoiler_text'] = warningContent.text } - worker.sendMessage(msg) - warningContent.text = "" - toot.text = "" - mediaModel.clear() - pageStack.pop() + worker.sendMessage(msg) + warningContent.text = "" + toot.text = "" + mediaModel.clear() + sentBanner.showText(qsTr("Toot sent!")) } } diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml index e676870..463b305 100644 --- a/qml/pages/MainPage.qml +++ b/qml/pages/MainPage.qml @@ -246,7 +246,7 @@ Page { visible: !isPortrait ? true : !infoPanel.open icon.source: "image://theme/icon-l-add" onClicked: { - pageStack.push(Qt.resolvedUrl("Conversation.qml"), {title: qsTr("New Toot"), type: "new"}) + pageStack.push(Qt.resolvedUrl("Conversation.qml"), {headerTitle: qsTr("New Toot"), type: "new"}) } } diff --git a/qml/pages/components/InfoBanner.qml b/qml/pages/components/InfoBanner.qml new file mode 100644 index 0000000..3696c59 --- /dev/null +++ b/qml/pages/components/InfoBanner.qml @@ -0,0 +1,62 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 + + +DockedPanel { + id: root + z: 100; + width: parent.width //- Theme.paddingLarge*4 + //x: Theme.paddingLarge*2 + height: content.height + dock: Dock.Bottom + + Rectangle { + id: content + width: root.width + height: infoLabel.height + 4*Theme.paddingMedium + //anchors.topMargin: 20 + color: Theme.highlightBackgroundColor + opacity: 1.0 + + Label { + id: infoLabel + text : "" + color: Theme.primaryColor + font.family: Theme.fontFamilyHeading + font.pixelSize: Theme.fontSizeMedium + //font.weight: Font.Bold + width: parent.width + wrapMode: Text.WrapAnywhere + anchors { + left: parent.left + leftMargin: Theme.horizontalPageMargin + right: parent.right + rightMargin: Theme.horizontalPageMargin + verticalCenter: parent.verticalCenter + } + } + MouseArea { + anchors.fill: parent + onClicked: { + root.hide() + autoClose.stop() + } + } + } + + function showText(text) { + infoLabel.text = text + root.show() + autoClose.start() + } + + Timer { + id: autoClose + interval: 6000 + running: false + onTriggered: { + root.hide() + stop() + } + } +} diff --git a/qml/pages/components/InfoBanner.qml.autosave b/qml/pages/components/InfoBanner.qml.autosave new file mode 100644 index 0000000..7921d05 --- /dev/null +++ b/qml/pages/components/InfoBanner.qml.autosave @@ -0,0 +1,61 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 + + +DockedPanel { + id: root + z: 100; + width: parent.width + height: content.height + dock: Dock.Bottom + + Rectangle { + id: content + width: root.width + height: infoLabel.height + 4*Theme.paddingMedium + //anchors.topMargin: 20 + color: Theme.highlightBackgroundColor + opacity: 1.0 + + Label { + id: infoLabel + text : "" + color: Theme.primaryColor + font.family: Theme.fontFamilyHeading + font.pixelSize: Theme.fontSizeMedium + //font.weight: Font.Bold + width: parent.width + wrapMode: Text.WrapAnywhere + anchors { + left: parent.left + leftMargin: Theme.horizontalPageMargin + right: parent.right + rightMargin: Theme.ho rizontalPageMargin + verticalCenter: parent.verticalCenter + } + } + MouseArea { + anchors.fill: parent + onClicked: { + root.hide() + autoClose.stop() + } + } + } + + function showText(text) { + infoLabel.text = text + root.show() + autoClose.start() + } + + Timer { + id: autoClose + interval: 6000 + running: false + onTriggered: { + root.hide() + stop() + } + } +} diff --git a/qml/pages/components/VisualContainer.qml b/qml/pages/components/VisualContainer.qml index 072f816..d3a06e2 100644 --- a/qml/pages/components/VisualContainer.qml +++ b/qml/pages/components/VisualContainer.qml @@ -277,6 +277,7 @@ BackgroundItem { if (typeof mdl !== "undefined") m.append(mdl.get(index)) pageStack.push(Qt.resolvedUrl("../Conversation.qml"), { + headerTitle: "Conversation", toot_id: status_id, title: account_display_name, description: '@'+account_acct, diff --git a/translations/harbour-tooter-de.ts b/translations/harbour-tooter-de.ts index d2a2c44..210e07b 100644 --- a/translations/harbour-tooter-de.ts +++ b/translations/harbour-tooter-de.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - Konversation - Delete Löschen @@ -62,6 +58,10 @@ What's on your mind? Was gibt's Neues? + + Toot sent! + + ImageFullScreen diff --git a/translations/harbour-tooter-el.ts b/translations/harbour-tooter-el.ts index 6f47211..c926c14 100644 --- a/translations/harbour-tooter-el.ts +++ b/translations/harbour-tooter-el.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - Συνομιλία - Delete Διαγραφή @@ -62,6 +58,10 @@ What's on your mind? + + Toot sent! + + ImageFullScreen diff --git a/translations/harbour-tooter-es.ts b/translations/harbour-tooter-es.ts index fe77cd8..c52d603 100644 --- a/translations/harbour-tooter-es.ts +++ b/translations/harbour-tooter-es.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - Conversación - Delete Borrar @@ -62,6 +58,10 @@ What's on your mind? ¿En qué estás pensando? + + Toot sent! + + ImageFullScreen diff --git a/translations/harbour-tooter-fi.ts b/translations/harbour-tooter-fi.ts index f1444ea..a1ec939 100644 --- a/translations/harbour-tooter-fi.ts +++ b/translations/harbour-tooter-fi.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - - Delete @@ -62,6 +58,10 @@ What's on your mind? + + Toot sent! + + ImageFullScreen diff --git a/translations/harbour-tooter-fr.ts b/translations/harbour-tooter-fr.ts index 341f2a4..b3835ab 100644 --- a/translations/harbour-tooter-fr.ts +++ b/translations/harbour-tooter-fr.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - Conversation - Delete Supprimer @@ -62,6 +58,10 @@ What's on your mind? Qu'avez-vous en tête? + + Toot sent! + + ImageFullScreen diff --git a/translations/harbour-tooter-it.ts b/translations/harbour-tooter-it.ts index 6689a88..e62798d 100644 --- a/translations/harbour-tooter-it.ts +++ b/translations/harbour-tooter-it.ts @@ -28,52 +28,52 @@ Conversation - - Conversation - Conversazione - - - + Write your warning here Contenuto avviso - + What's on your mind? A cosa stai pensando? - + Delete Elimina - + Public Pubblico - + Unlisted Non elencato - + Followers-only Solo ai seguaci - + Direct Diretto - + + Toot sent! + + + + Emojis Emojis - + Tap to insert Tap per inserire diff --git a/translations/harbour-tooter-nl.ts b/translations/harbour-tooter-nl.ts index 6ff67ed..768c5a8 100644 --- a/translations/harbour-tooter-nl.ts +++ b/translations/harbour-tooter-nl.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - Gesprek - Delete Verwijderen @@ -62,6 +58,10 @@ What's on your mind? + + Toot sent! + + ImageFullScreen diff --git a/translations/harbour-tooter-nl_BE.ts b/translations/harbour-tooter-nl_BE.ts index cf8d937..035f8b9 100644 --- a/translations/harbour-tooter-nl_BE.ts +++ b/translations/harbour-tooter-nl_BE.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - Gesprek - Delete Verwijderen @@ -62,6 +58,10 @@ What's on your mind? + + Toot sent! + + ImageFullScreen diff --git a/translations/harbour-tooter-oc.ts b/translations/harbour-tooter-oc.ts index 2bb86d9..cf6f401 100644 --- a/translations/harbour-tooter-oc.ts +++ b/translations/harbour-tooter-oc.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - Discutida - Delete Escafar @@ -62,6 +58,10 @@ What's on your mind? + + Toot sent! + + ImageFullScreen diff --git a/translations/harbour-tooter-pl.ts b/translations/harbour-tooter-pl.ts index 952b1b2..7e97caa 100644 --- a/translations/harbour-tooter-pl.ts +++ b/translations/harbour-tooter-pl.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - Konwersacja - Delete Usuń @@ -62,6 +58,10 @@ What's on your mind? + + Toot sent! + + ImageFullScreen diff --git a/translations/harbour-tooter-ru.ts b/translations/harbour-tooter-ru.ts index 277a582..724ec09 100644 --- a/translations/harbour-tooter-ru.ts +++ b/translations/harbour-tooter-ru.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - Беседа - Delete Удалить @@ -62,6 +58,10 @@ What's on your mind? + + Toot sent! + + ImageFullScreen diff --git a/translations/harbour-tooter-sr.ts b/translations/harbour-tooter-sr.ts index 3091e3e..6080c74 100644 --- a/translations/harbour-tooter-sr.ts +++ b/translations/harbour-tooter-sr.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - Разговор - Delete Обриши @@ -62,6 +58,10 @@ What's on your mind? + + Toot sent! + + ImageFullScreen diff --git a/translations/harbour-tooter-sv.ts b/translations/harbour-tooter-sv.ts index 43b1866..3e411bf 100644 --- a/translations/harbour-tooter-sv.ts +++ b/translations/harbour-tooter-sv.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - Konversation - Delete Radera @@ -62,6 +58,10 @@ What's on your mind? + + Toot sent! + + ImageFullScreen diff --git a/translations/harbour-tooter-zh_CN.ts b/translations/harbour-tooter-zh_CN.ts index d25e9f9..fa8b314 100644 --- a/translations/harbour-tooter-zh_CN.ts +++ b/translations/harbour-tooter-zh_CN.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - 对话 - Delete 删除 @@ -62,6 +58,10 @@ What's on your mind? 有何想法? + + Toot sent! + + ImageFullScreen diff --git a/translations/harbour-tooter.ts b/translations/harbour-tooter.ts index b119e7e..bf8ce75 100644 --- a/translations/harbour-tooter.ts +++ b/translations/harbour-tooter.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - Conversation - Delete Delete @@ -62,6 +58,10 @@ What's on your mind? + + Toot sent! + + ImageFullScreen From 41041a77aa35a92f0df906078c70b3660b1166f3 Mon Sep 17 00:00:00 2001 From: molan-git Date: Mon, 25 May 2020 17:54:02 +0200 Subject: [PATCH 23/25] ui-improvements New image/video viewer Send-message Profile background images --- qml/lib/Worker.js | 6 +- qml/pages/Conversation.qml | 16 ++++- qml/pages/LoginPage.qml | 10 +-- qml/pages/MainPage.qml | 4 +- qml/pages/Profile.qml | 13 ++-- qml/pages/components/ImageFullScreen.qml | 52 +++++++++------- qml/pages/components/InfoBanner.qml | 11 ++-- qml/pages/components/InfoBanner.qml.autosave | 61 ------------------ qml/pages/components/MediaBlock.qml | 2 - qml/pages/components/MiniHeader.qml | 1 - qml/pages/components/Navigation.qml | 2 - qml/pages/components/ProfileHeader.qml | 19 +++--- qml/pages/components/VisualContainer.qml | 26 ++++---- translations/harbour-tooter-de.ts | 8 ++- translations/harbour-tooter-el.ts | 6 +- translations/harbour-tooter-es.ts | 6 +- translations/harbour-tooter-fi.ts | 4 ++ translations/harbour-tooter-fr.ts | 8 ++- translations/harbour-tooter-it.ts | 65 +++++++++++--------- translations/harbour-tooter-nl.ts | 6 +- translations/harbour-tooter-nl_BE.ts | 6 +- translations/harbour-tooter-oc.ts | 6 +- translations/harbour-tooter-pl.ts | 6 +- translations/harbour-tooter-ru.ts | 6 +- translations/harbour-tooter-sr.ts | 6 +- translations/harbour-tooter-sv.ts | 6 +- translations/harbour-tooter-zh_CN.ts | 6 +- translations/harbour-tooter.ts | 6 +- 28 files changed, 197 insertions(+), 177 deletions(-) delete mode 100644 qml/pages/components/InfoBanner.qml.autosave diff --git a/qml/lib/Worker.js b/qml/lib/Worker.js index 15c13fd..8b53e8c 100644 --- a/qml/lib/Worker.js +++ b/qml/lib/Worker.js @@ -132,11 +132,13 @@ function parseAccounts(collection, prefix, data){ res[prefix + 'account_username'] = data["username"] res[prefix + 'account_acct'] = data["acct"] res[prefix + 'account_display_name'] = data["display_name"] + res[prefix + 'account_discoverable'] = data["discoverable"] res[prefix + 'account_locked'] = data["locked"] res[prefix + 'account_created_at'] = data["created_at"] res[prefix + 'account_avatar'] = data["avatar"] + res[prefix + 'account_header'] = data["header"] - // /console.log(JSON.stringify(res)) + // console.log(JSON.stringify(res)) return (res); } @@ -226,6 +228,7 @@ function parseToot (data){ item['highlight'] = false item['status_id'] = data["id"] item['status_uri'] = data["uri"] + item['status_url'] = data["url"] item['status_in_reply_to_id'] = data["in_reply_to_id"] item['status_in_reply_to_account_id'] = data["in_reply_to_account_id"] item['status_reblog'] = data["reblog"] ? true : false @@ -236,6 +239,7 @@ function parseToot (data){ item['favourites_count'] = data["favourites_count"] item['reblogged'] = data["reblogged"] item['favourited'] = data["favourited"] + item['bookmarked'] = data["bookmarked"] item['status_sensitive'] = data["sensitive"] item['status_spoiler_text'] = data["spoiler_text"] item['status_visibility'] = data["visibility"] diff --git a/qml/pages/Conversation.qml b/qml/pages/Conversation.qml index 2aac1ad..0fb4c91 100644 --- a/qml/pages/Conversation.qml +++ b/qml/pages/Conversation.qml @@ -15,6 +15,7 @@ Page { property string suggestedUser: "" property ListModel suggestedModel property string toot_id: "" + property string toot_url: "" property int tootMaxChar: 500; property ListModel mdl allowedOrientations: Orientation.All @@ -96,6 +97,18 @@ Page { } } } + PullDownMenu { + visible: type == "reply" && toot_url != "" + /* MenuItem { + text: qsTr("Open in Browser") + onClicked: Qt.openUrlExternally(toot_url); + } */ + // ! url isn't always fetched. Needs a solution. + MenuItem { + text: qsTr("Copy Link to Clipboard") + onClicked: Clipboard.text = toot_url; + } + } } Rectangle { id: predictionList @@ -110,7 +123,6 @@ Page { anchors.fill: parent model: suggestedModel clip: true - delegate: ItemUser { onClicked: { var start = toot.cursorPosition @@ -433,7 +445,7 @@ Page { worker.sendMessage(msg) warningContent.text = "" toot.text = "" - mediaModel.clear() + mediaModel.clear(); sentBanner.showText(qsTr("Toot sent!")) } } diff --git a/qml/pages/LoginPage.qml b/qml/pages/LoginPage.qml index c3874fb..b1d2064 100644 --- a/qml/pages/LoginPage.qml +++ b/qml/pages/LoginPage.qml @@ -34,15 +34,11 @@ import Sailfish.Silica 1.0 import "../lib/API.js" as Logic - Page { id: loginPage - // The effective value will be restricted by ApplicationWindow.allowedOrientations allowedOrientations: Orientation.All - - SilicaFlickable { anchors.fill: parent contentHeight: column.height + Theme.paddingLarge @@ -52,8 +48,9 @@ Page { Column { id: column width: parent.width - - PageHeader { title: qsTr("Login") } + PageHeader { + title: qsTr("Login") + } SectionHeader { text: qsTr("Instance") @@ -83,7 +80,6 @@ Page { conf.instance = instance.text; conf.login = false; - /*conf['login'] = false; conf['mastodon_client_id'] = data['mastodon_client_id']; conf['mastodon_client_secret'] = data['mastodon_client_secret']; diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml index 463b305..e273c23 100644 --- a/qml/pages/MainPage.qml +++ b/qml/pages/MainPage.qml @@ -57,6 +57,7 @@ Page { } } } + VisualItemModel { id: visualModel MyList{ @@ -188,7 +189,8 @@ Page { "display_name": model.account_display_name, "username": model.account_acct, "user_id": model.account_id, - "profileImage": model.account_avatar + "profileImage": model.account_avatar, + "profileBackground": model.account_header }) } } diff --git a/qml/pages/Profile.qml b/qml/pages/Profile.qml index 6d56f44..3f39db7 100644 --- a/qml/pages/Profile.qml +++ b/qml/pages/Profile.qml @@ -16,7 +16,7 @@ Page { property int favourites_count; property int reblogs_count; property int count_moments; - property string profile_background: ""; + property string profileBackground: ""; property string note: ""; property string url: ""; @@ -42,6 +42,7 @@ Page { username = messageObject.data.acct display_name = messageObject.data.display_name profileImage = messageObject.data.avatar_static + profileBackground = messageObject.data.header_static var msg = { 'action' : "accounts/relationships/", @@ -135,7 +136,6 @@ Page { } - MyList { id: list header: ProfileHeader { @@ -143,6 +143,7 @@ Page { title: display_name description: username image: profileImage + bg: profileBackground } anchors { @@ -159,7 +160,6 @@ Page { conf: Logic.conf } - ExpandingSectionGroup { id: expander //currentIndex: 0 @@ -275,10 +275,8 @@ Page { })); send(link) - } else if (test.length === 4 && test[3][0] === "@" ) { - tlSearch.search = decodeURIComponent("@"+test[3].substring(1)+"@"+test[2]) - slideshow.positionViewAtIndex(4, ListView.SnapToItem) - navigation.navigateTo('search') + // function still missing for user accounts + // } else if (test.length === 4 && test[3][0] === "@" ) { } else { Qt.openUrlExternally(link); @@ -290,7 +288,6 @@ Page { spacing: Theme.paddingMedium anchors.horizontalCenter: parent.horizontalCenter Button { - id: btnUrl text: qsTr("Open Profile in Browser") onClicked: { Qt.openUrlExternally(url); diff --git a/qml/pages/components/ImageFullScreen.qml b/qml/pages/components/ImageFullScreen.qml index dba23a8..5384804 100644 --- a/qml/pages/components/ImageFullScreen.qml +++ b/qml/pages/components/ImageFullScreen.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import QtMultimedia 5.0 -Page { +FullscreenContentPage { id: imagePage property string type: "" property string previewURL: "" @@ -22,6 +22,26 @@ Page { videoFlickable.visible = true; } } + + Item { + id: overlay + z: 100 + property bool active: true + enabled: active + anchors.fill: parent + opacity: active ? 1.0 : 0.0 + Behavior on opacity { FadeAnimator {}} + IconButton { + y: Theme.paddingLarge + anchors { + right: parent.right + rightMargin: Theme.horizontalPageMargin + } + icon.source: "image://theme/icon-m-dismiss" + onClicked: pageStack.pop() + } + } + Flickable { id: videoFlickable visible: false @@ -49,7 +69,6 @@ Page { case MediaPlayer.EndOfMedia: console.log("EndOfMedia") return; - } } @@ -68,7 +87,6 @@ Page { } } - onPositionChanged: function(){ //console.log(duration) //console.log(bufferProgress) @@ -81,15 +99,17 @@ Page { } } + onStopped: function(){ play() } + IconButton { id: playerIcon anchors.left: parent.left anchors.bottom: parent.bottom anchors.leftMargin: Theme.paddingLarge - anchors.bottomMargin: Theme.paddingMedium + anchors.bottomMargin: Theme.paddingLarge*1.5 icon.source: "image://theme/icon-m-play" onClicked: function() { if (video.playbackState === MediaPlayer.PlayingState) @@ -104,10 +124,9 @@ Page { id: playerProgress anchors.left: playerIcon.right anchors.right: videoDlBtn.left - anchors.verticalCenter: playerIcon.verticalCenter anchors.leftMargin: 0 - anchors.bottomMargin: Theme.paddingMedium + anchors.bottomMargin: Theme.paddingLarge*1.5 } IconButton { id: videoDlBtn @@ -115,9 +134,9 @@ Page { anchors.right: parent.right anchors.bottom: parent.bottom anchors.rightMargin: Theme.paddingLarge - anchors.bottomMargin: Theme.paddingMedium - //width: Theme.iconSizeMedium+Theme.paddingMedium*2 - icon.source: "image://theme/icon-m-cloud-download" + anchors.bottomMargin: Theme.paddingLarge*1.5 + icon.source: "image://theme/icon-m-device-download" + icon.opacity: 0.0 onClicked: { var filename = mediaURL.split("/"); FileDownloader.downloadFile(mediaURL, filename[filename.length-1]); @@ -135,7 +154,7 @@ Page { anchors.centerIn: parent id: videoError width: parent.width - 2*Theme.paddingMedium - wrapMode: Text.WordWrap + wrapMode: Text.Wrap height: contentHeight visible: false; font.pixelSize: Theme.fontSizeSmall; @@ -165,7 +184,6 @@ Page { clip: true onHeightChanged: if (imagePreview.status === Image.Ready) imagePreview.fitToScreen(); - Item { id: imageContainer width: Math.max(imagePreview.width * imagePreview.scale, imageFlickable.width) @@ -173,22 +191,18 @@ Page { Image { id: imagePreview - property real prevScale - function fitToScreen() { scale = Math.min(imageFlickable.width / width, imageFlickable.height / height, 1) pinchArea.minScale = scale prevScale = scale } - anchors.centerIn: parent fillMode: Image.PreserveAspectFit cache: true asynchronous: true sourceSize.height: 1000; smooth: false - onStatusChanged: { if (status == Image.Ready) { fitToScreen() @@ -224,7 +238,6 @@ Page { opacity: 0.3 property real minScale: 1.0 property real maxScale: 3.0 - anchors.fill: parent enabled: imagePreview.status === Image.Ready pinch.target: imagePreview @@ -267,11 +280,9 @@ Page { Component { id: loadingIndicator - Item { height: childrenRect.height width: imagePage.width - ProgressCircle { id: imageLoadingIndicator anchors.horizontalCenter: parent.horizontalCenter @@ -293,9 +304,8 @@ Page { anchors.right: parent.right anchors.bottom: parent.bottom anchors.rightMargin: Theme.paddingLarge - anchors.bottomMargin: Theme.paddingMedium - //width: Theme.iconSizeMedium+Theme.paddingMedium*2 - icon.source: "image://theme/icon-m-cloud-download" + anchors.bottomMargin: Theme.paddingLarge*1.5 + icon.source: "image://theme/icon-m-device-download" onClicked: { var filename = mediaURL.split("/"); FileDownloader.downloadFile(mediaURL, filename[filename.length-1]); diff --git a/qml/pages/components/InfoBanner.qml b/qml/pages/components/InfoBanner.qml index 3696c59..a9a0148 100644 --- a/qml/pages/components/InfoBanner.qml +++ b/qml/pages/components/InfoBanner.qml @@ -4,16 +4,15 @@ import Sailfish.Silica 1.0 DockedPanel { id: root - z: 100; - width: parent.width //- Theme.paddingLarge*4 - //x: Theme.paddingLarge*2 + z: 100 + width: parent.width height: content.height - dock: Dock.Bottom + dock: Dock.Top Rectangle { id: content width: root.width - height: infoLabel.height + 4*Theme.paddingMedium + height: infoLabel.height + 5*Theme.paddingMedium //anchors.topMargin: 20 color: Theme.highlightBackgroundColor opacity: 1.0 @@ -29,7 +28,7 @@ DockedPanel { wrapMode: Text.WrapAnywhere anchors { left: parent.left - leftMargin: Theme.horizontalPageMargin + leftMargin: Theme.horizontalPageMargin*2 right: parent.right rightMargin: Theme.horizontalPageMargin verticalCenter: parent.verticalCenter diff --git a/qml/pages/components/InfoBanner.qml.autosave b/qml/pages/components/InfoBanner.qml.autosave deleted file mode 100644 index 7921d05..0000000 --- a/qml/pages/components/InfoBanner.qml.autosave +++ /dev/null @@ -1,61 +0,0 @@ -import QtQuick 2.0 -import Sailfish.Silica 1.0 - - -DockedPanel { - id: root - z: 100; - width: parent.width - height: content.height - dock: Dock.Bottom - - Rectangle { - id: content - width: root.width - height: infoLabel.height + 4*Theme.paddingMedium - //anchors.topMargin: 20 - color: Theme.highlightBackgroundColor - opacity: 1.0 - - Label { - id: infoLabel - text : "" - color: Theme.primaryColor - font.family: Theme.fontFamilyHeading - font.pixelSize: Theme.fontSizeMedium - //font.weight: Font.Bold - width: parent.width - wrapMode: Text.WrapAnywhere - anchors { - left: parent.left - leftMargin: Theme.horizontalPageMargin - right: parent.right - rightMargin: Theme.ho rizontalPageMargin - verticalCenter: parent.verticalCenter - } - } - MouseArea { - anchors.fill: parent - onClicked: { - root.hide() - autoClose.stop() - } - } - } - - function showText(text) { - infoLabel.text = text - root.show() - autoClose.start() - } - - Timer { - id: autoClose - interval: 6000 - running: false - onTriggered: { - root.hide() - stop() - } - } -} diff --git a/qml/pages/components/MediaBlock.qml b/qml/pages/components/MediaBlock.qml index e31af8d..069f954 100644 --- a/qml/pages/components/MediaBlock.qml +++ b/qml/pages/components/MediaBlock.qml @@ -74,8 +74,6 @@ Item { } } - - MyImage { id: placeholder1 width: 2 diff --git a/qml/pages/components/MiniHeader.qml b/qml/pages/components/MiniHeader.qml index 6a9f6f9..06c420a 100644 --- a/qml/pages/components/MiniHeader.qml +++ b/qml/pages/components/MiniHeader.qml @@ -41,7 +41,6 @@ Item { : Theme.primaryColor) } - Label { id: lblScreenName anchors { diff --git a/qml/pages/components/Navigation.qml b/qml/pages/components/Navigation.qml index 30e5e81..b054e76 100644 --- a/qml/pages/components/Navigation.qml +++ b/qml/pages/components/Navigation.qml @@ -169,7 +169,5 @@ SilicaGridView { } - - VerticalScrollDecorator {} } diff --git a/qml/pages/components/ProfileHeader.qml b/qml/pages/components/ProfileHeader.qml index c1b53ae..f2a4ddf 100644 --- a/qml/pages/components/ProfileHeader.qml +++ b/qml/pages/components/ProfileHeader.qml @@ -10,21 +10,22 @@ Item { property string bg: ""; width: parent.width height: icon.height + Theme.paddingLarge*2 - /*Image { - anchors.fill: parent - asynchronous: true - fillMode: Image.PreserveAspectCrop - source: bg - opacity: 0.3 - }*/ + Rectangle { + id: bgImage anchors.fill: parent opacity: 0.2 gradient: Gradient { GradientStop { position: 0.0; color: Theme.highlightBackgroundColor } - GradientStop { position: 1.0; color: Theme.highlightBackgroundColor } + GradientStop { position: 1.0; color: Theme.highlightBackgroundColor } + } + Image { + anchors.fill: bgImage + asynchronous: true + fillMode: Image.PreserveAspectCrop + source: bg + opacity: 0.8 } - } Image { id: icon diff --git a/qml/pages/components/VisualContainer.qml b/qml/pages/components/VisualContainer.qml index d3a06e2..d05f36a 100644 --- a/qml/pages/components/VisualContainer.qml +++ b/qml/pages/components/VisualContainer.qml @@ -3,7 +3,6 @@ import Sailfish.Silica 1.0 import "../../lib/API.js" as Logic BackgroundItem { - id: delegate signal send (string notice) signal navigateTo(string link) @@ -28,6 +27,7 @@ BackgroundItem { topMargin: Theme.paddingMedium } } + Image { id: avatar anchors { @@ -50,7 +50,6 @@ BackgroundItem { ? Theme.highlightColor : Theme.primaryColor) } - MouseArea { anchors.fill: parent onClicked: { @@ -58,12 +57,12 @@ BackgroundItem { "display_name": model.account_display_name, "username": model.account_acct, "user_id": model.account_id, - "profileImage": model.account_avatar + "profileImage": model.account_avatar, + "profileBackground": model.account_header }) } } - Image { id: iconTR anchors { @@ -75,7 +74,7 @@ BackgroundItem { width: Theme.iconSizeExtraSmall height: width source: "image://theme/icon-s-retweet" - } + } Rectangle { color: Theme.highlightDimmerColor width: Theme.iconSizeSmall @@ -137,14 +136,19 @@ BackgroundItem { tlSearch.search = decodeURIComponent("@"+test[3].substring(1)+"@"+test[2]) slideshow.positionViewAtIndex(4, ListView.SnapToItem) navigation.navigateTo('search') - + // Original component + /* pageStack.push(Qt.resolvedUrl("../Profile.qml"), { + "name": "", + "username": test[3].substring(1)+"@"+test[2], + "profileImage": "" + }) */ } else { Qt.openUrlExternally(link); } } text: content.replace(new RegExp(" Toot sent! - + Toot gesendet! + + + Copy Link to Clipboard + Link kopieren ImageFullScreen Error loading - Fehler beim Laden + Ladefehler diff --git a/translations/harbour-tooter-el.ts b/translations/harbour-tooter-el.ts index c926c14..df485eb 100644 --- a/translations/harbour-tooter-el.ts +++ b/translations/harbour-tooter-el.ts @@ -62,12 +62,16 @@ Toot sent! + + Copy Link to Clipboard + + ImageFullScreen Error loading - Σφάλμα φόρτωσης + diff --git a/translations/harbour-tooter-es.ts b/translations/harbour-tooter-es.ts index c52d603..195b8f5 100644 --- a/translations/harbour-tooter-es.ts +++ b/translations/harbour-tooter-es.ts @@ -62,12 +62,16 @@ Toot sent! + + Copy Link to Clipboard + + ImageFullScreen Error loading - Error al cargar + diff --git a/translations/harbour-tooter-fi.ts b/translations/harbour-tooter-fi.ts index a1ec939..50a5f73 100644 --- a/translations/harbour-tooter-fi.ts +++ b/translations/harbour-tooter-fi.ts @@ -62,6 +62,10 @@ Toot sent! + + Copy Link to Clipboard + + ImageFullScreen diff --git a/translations/harbour-tooter-fr.ts b/translations/harbour-tooter-fr.ts index b3835ab..baafe35 100644 --- a/translations/harbour-tooter-fr.ts +++ b/translations/harbour-tooter-fr.ts @@ -60,14 +60,18 @@ Toot sent! - + Pouet envoyé ! + + + Copy Link to Clipboard + Copier le lien ImageFullScreen Error loading - Erreur de chargement + diff --git a/translations/harbour-tooter-it.ts b/translations/harbour-tooter-it.ts index e62798d..5b5be12 100644 --- a/translations/harbour-tooter-it.ts +++ b/translations/harbour-tooter-it.ts @@ -28,52 +28,57 @@ Conversation - + + Copy Link to Clipboard + Copia link + + + Write your warning here Contenuto avviso - + What's on your mind? A cosa stai pensando? - + Delete Elimina - + Public Pubblico - + Unlisted Non elencato - + Followers-only Solo ai seguaci - + Direct Diretto - + Toot sent! - + Toot è stato pubblicato! - + Emojis Emojis - + Tap to insert Tap per inserire @@ -81,9 +86,9 @@ ImageFullScreen - + Error loading - Errore caricamento + Errore durante caricamento @@ -97,27 +102,27 @@ LoginPage - + Login Accesso - + Instance Istanza - + Enter a valid Mastodon instance URL Inserire URL di una istanza Mastodon valida - + Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust — whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly. Mastodon è un servizio di rete sociale in software libero, costituito in una federazione d'istanze. Mastodon fa parte del più ampio Fediverso, permettendo ai suoi utenti di interagire anche con utenti su diverse piattaforme aperte che supportano lo stesso protocollo. - + Reload Ricarica @@ -125,37 +130,37 @@ MainPage - + Home Home - + Notifications Notifiche - + Local Locale - + Federated Federazione - + Search Cerca - + @user or #term @utente o #termine - + New Toot Nuovo toot @@ -269,7 +274,7 @@ Biografia - + Open Profile in Browser Aprire profile nel browser @@ -388,22 +393,22 @@ VisualContainer - + Unboost Annulla condivisione - + Boost Condividi - + Unfavorite Annulla apprezzamento - + Favorite Apprezzato diff --git a/translations/harbour-tooter-nl.ts b/translations/harbour-tooter-nl.ts index 768c5a8..9c3e4b0 100644 --- a/translations/harbour-tooter-nl.ts +++ b/translations/harbour-tooter-nl.ts @@ -62,12 +62,16 @@ Toot sent! + + Copy Link to Clipboard + + ImageFullScreen Error loading - Fout bij laden + diff --git a/translations/harbour-tooter-nl_BE.ts b/translations/harbour-tooter-nl_BE.ts index 035f8b9..25d9369 100644 --- a/translations/harbour-tooter-nl_BE.ts +++ b/translations/harbour-tooter-nl_BE.ts @@ -62,12 +62,16 @@ Toot sent! + + Copy Link to Clipboard + + ImageFullScreen Error loading - Fout bij laden + diff --git a/translations/harbour-tooter-oc.ts b/translations/harbour-tooter-oc.ts index cf6f401..3319228 100644 --- a/translations/harbour-tooter-oc.ts +++ b/translations/harbour-tooter-oc.ts @@ -62,12 +62,16 @@ Toot sent! + + Copy Link to Clipboard + + ImageFullScreen Error loading - Error en cargar + diff --git a/translations/harbour-tooter-pl.ts b/translations/harbour-tooter-pl.ts index 7e97caa..4d7fe81 100644 --- a/translations/harbour-tooter-pl.ts +++ b/translations/harbour-tooter-pl.ts @@ -62,12 +62,16 @@ Toot sent! + + Copy Link to Clipboard + + ImageFullScreen Error loading - Błąd ładowania + diff --git a/translations/harbour-tooter-ru.ts b/translations/harbour-tooter-ru.ts index 724ec09..d47095f 100644 --- a/translations/harbour-tooter-ru.ts +++ b/translations/harbour-tooter-ru.ts @@ -62,12 +62,16 @@ Toot sent! + + Copy Link to Clipboard + + ImageFullScreen Error loading - Ошибка при загрузке + diff --git a/translations/harbour-tooter-sr.ts b/translations/harbour-tooter-sr.ts index 6080c74..52a0d2c 100644 --- a/translations/harbour-tooter-sr.ts +++ b/translations/harbour-tooter-sr.ts @@ -62,12 +62,16 @@ Toot sent! + + Copy Link to Clipboard + + ImageFullScreen Error loading - Greška u učitavanju + diff --git a/translations/harbour-tooter-sv.ts b/translations/harbour-tooter-sv.ts index 3e411bf..5cd3f54 100644 --- a/translations/harbour-tooter-sv.ts +++ b/translations/harbour-tooter-sv.ts @@ -62,12 +62,16 @@ Toot sent! + + Copy Link to Clipboard + + ImageFullScreen Error loading - Problem att ladda + diff --git a/translations/harbour-tooter-zh_CN.ts b/translations/harbour-tooter-zh_CN.ts index fa8b314..b92289e 100644 --- a/translations/harbour-tooter-zh_CN.ts +++ b/translations/harbour-tooter-zh_CN.ts @@ -62,12 +62,16 @@ Toot sent! + + Copy Link to Clipboard + 复制链接到剪切板 + ImageFullScreen Error loading - 加载错误 + diff --git a/translations/harbour-tooter.ts b/translations/harbour-tooter.ts index bf8ce75..0bf8406 100644 --- a/translations/harbour-tooter.ts +++ b/translations/harbour-tooter.ts @@ -62,12 +62,16 @@ Toot sent! + + Copy Link to Clipboard + + ImageFullScreen Error loading - + From a7816701f2e4d35a424160fc26281f02d61398d2 Mon Sep 17 00:00:00 2001 From: molan-git Date: Mon, 25 May 2020 18:44:58 +0200 Subject: [PATCH 24/25] push-release --- harbour-tooterb.pro | 24 ++++++++++---------- qml/images/tooter.svg | 33 --------------------------- rpm/harbour-tooterb.changes | 8 +++++++ rpm/harbour-tooterb.spec | 2 +- rpm/harbour-tooterb.yaml | 2 +- translations/harbour-tooterb-it.ts | 36 +++++++++++++++--------------- 6 files changed, 40 insertions(+), 65 deletions(-) delete mode 100644 qml/images/tooter.svg diff --git a/harbour-tooterb.pro b/harbour-tooterb.pro index 0a7baa2..ff9a7c3 100644 --- a/harbour-tooterb.pro +++ b/harbour-tooterb.pro @@ -9,8 +9,8 @@ # - icon definition filename in desktop file must be changed # - translation filenames have to be changed -# The name of your application -TARGET = harbour-tooterb +# The name of your application +TARGET = harbour-tooterb CONFIG += sailfishapp @@ -23,7 +23,7 @@ PKGCONFIG += \ DEFINES += "APPVERSION=\\\"$${SPECVERSION}\\\"" DEFINES += "APPNAME=\\\"$${TARGET}\\\"" -!exists( src/dbusAdaptor.h ) { +!exists( src/dbusAdaptor.h ) { system(qdbusxml2cpp config/ba.dysko.harbour.tooterb.xml -i dbus.h -a src/dbusAdaptor) } @@ -37,9 +37,9 @@ dbus_services.path = /usr/share/dbus-1/services/ dbus_services.files = config/ba.dysko.harbour.tooterb.service interfaces.path = /usr/share/dbus-1/interfaces/ -interfaces.files = config/ba.dysko.harbourb.tooter.xml +interfaces.files = config/ba.dysko.harbourb.tooterb.xml -SOURCES += src/harbour-tooterb.cpp +SOURCES += src/harbour-tooterb.cpp SOURCES += src/imageuploader.cpp SOURCES += src/filedownloader.cpp SOURCES += src/notifications.cpp @@ -51,9 +51,9 @@ HEADERS += src/filedownloader.h HEADERS += src/notifications.h HEADERS += src/dbusAdaptor.h HEADERS += src/dbus.h - + DISTFILES += qml/harbour-tooterb.qml \ - qml/pages/components/InfoBanner.qml \ + qml/pages/components/InfoBanner.qml \ qml/pages/components/VisualContainer.qml \ qml/pages/components/MiniStatus.qml \ qml/pages/components/MiniHeader.qml \ @@ -75,13 +75,13 @@ DISTFILES += qml/harbour-tooterb.qml \ qml/lib/API.js \ qml/images/notification.svg \ qml/images/verified.svg \ - qml/images/boosted.svg \ - qml/images/tooter.svg \ + qml/images/boosted.svg \ + qml/images/tooterb.svg \ qml/images/emojiselect.svg \ qml/images/icon-m-profile.svg \ qml/images/icon-l-profile.svg \ qml/lib/Mastodon.js \ - qml/lib/Worker.js \ + qml/lib/Worker.js \ config/icon-lock-harbour-tooterb.png \ config/x-harbour.tooterb.activity.conf \ rpm/harbour-tooterb.changes \ @@ -89,7 +89,7 @@ DISTFILES += qml/harbour-tooterb.qml \ rpm/harbour-tooterb.spec \ rpm/harbour-tooterb.yaml \ translations/*.ts \ - harbour-tooter.desktop + harbour-tooterb.desktop SAILFISHAPP_ICONS = 86x86 108x108 128x128 172x172 @@ -100,7 +100,7 @@ CONFIG += sailfishapp_i18n # German translation is enabled as an example. If you aren't # planning to localize your app, remember to comment out the # following TRANSLATIONS line. And also do not forget to -# modify the localized app name in the the .desktop file. +# modify the localized app name in the the .desktop file. TRANSLATIONS += translations/harbour-tooterb-de.ts TRANSLATIONS += translations/harbour-tooterb-el.ts TRANSLATIONS += translations/harbour-tooterb-es.ts diff --git a/qml/images/tooter.svg b/qml/images/tooter.svg deleted file mode 100644 index 62c8550..0000000 --- a/qml/images/tooter.svg +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/rpm/harbour-tooterb.changes b/rpm/harbour-tooterb.changes index d9e95c5..a42114a 100644 --- a/rpm/harbour-tooterb.changes +++ b/rpm/harbour-tooterb.changes @@ -1,3 +1,11 @@ +*Mon May 25 2020 molan 1.0.4-3 +- Show user profile background image (if available) +- New Sailfish 3-styled image/video viewer page (WIP) +- Added "Toot sent!" notification banner +- Show Pulley Menu for copying Toot-link only if link is provided (WIP) +- Distiction between "New Toot" and "Conversation" page +- some small fixes + *Mon May 11 2020 molan 1.0.4-2 - Beta release by molan - Login / Settings Page: Small changes in text wording diff --git a/rpm/harbour-tooterb.spec b/rpm/harbour-tooterb.spec index 42b36d8..60fef1f 100644 --- a/rpm/harbour-tooterb.spec +++ b/rpm/harbour-tooterb.spec @@ -14,7 +14,7 @@ Name: harbour-tooterb %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: Tooter β Version: 1.0.4 -Release: 2 +Release: 3 Group: Qt/Qt License: LICENSE URL: http://example.org/ diff --git a/rpm/harbour-tooterb.yaml b/rpm/harbour-tooterb.yaml index c7f90b9..5e38bbb 100644 --- a/rpm/harbour-tooterb.yaml +++ b/rpm/harbour-tooterb.yaml @@ -1,7 +1,7 @@ Name: harbour-tooterb Summary: Tooter β Version: 1.0.4 -Release: 2 +Release: 3 # The contents of the Group field should be one of the groups listed here: # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS Group: Qt/Qt diff --git a/translations/harbour-tooterb-it.ts b/translations/harbour-tooterb-it.ts index b8739d0..b761706 100644 --- a/translations/harbour-tooterb-it.ts +++ b/translations/harbour-tooterb-it.ts @@ -209,72 +209,72 @@ Profile - + Summary Sintesi - + Followers Seguaci - + Following Segue - + Statuses Toots - + Favourites Apprezzati - + Unfollow Smetti di seguire - + Follow request sent! Richiesta di seguito inviata! - + Follow Segui - + Unmute Non silenziare - + Mute Silenzia - + Unblock Sblocca - + Block Blocca - + Bio Biografia - + Open Profile in Browser Aprire profile nel browser @@ -393,22 +393,22 @@ VisualContainer - + Unboost Annulla condivisione - + Boost Condividi - + Unfavorite Annulla apprezzamento - + Favorite Apprezzato From 893bae4b9372a59131203eb75d5c3a93ff67d22b Mon Sep 17 00:00:00 2001 From: molan-git Date: Mon, 25 May 2020 18:54:43 +0200 Subject: [PATCH 25/25] syntax fix --- qml/pages/Profile.qml | 4 +++- qml/pages/components/ProfileHeader.qml | 2 +- translations/harbour-tooterb-it.ts | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/qml/pages/Profile.qml b/qml/pages/Profile.qml index 3bd6832..1d6692c 100644 --- a/qml/pages/Profile.qml +++ b/qml/pages/Profile.qml @@ -9,7 +9,6 @@ Page { property string display_name : ""; property string username : ""; property string profileImage : ""; - property string discoverable : ""; property int user_id; property int statuses_count; property int following_count; @@ -135,6 +134,7 @@ Page { } } + MyList { id: list header: ProfileHeader { @@ -250,6 +250,7 @@ Page { Text { x: Theme.horizontalPageMargin width: parent.width - ( 2 * Theme.horizontalPageMargin ) + id: txtnote text: note font.pixelSize: Theme.fontSizeExtraSmall color: Theme.secondaryColor @@ -280,6 +281,7 @@ Page { Qt.openUrlExternally(link); } } + } Column { spacing: Theme.paddingMedium diff --git a/qml/pages/components/ProfileHeader.qml b/qml/pages/components/ProfileHeader.qml index 46e499a..f2a4ddf 100644 --- a/qml/pages/components/ProfileHeader.qml +++ b/qml/pages/components/ProfileHeader.qml @@ -7,7 +7,7 @@ Item { property string title: ""; property string description: ""; property string image: ""; - //property string bg: ""; + property string bg: ""; width: parent.width height: icon.height + Theme.paddingLarge*2 diff --git a/translations/harbour-tooterb-it.ts b/translations/harbour-tooterb-it.ts index b761706..67a9a56 100644 --- a/translations/harbour-tooterb-it.ts +++ b/translations/harbour-tooterb-it.ts @@ -274,7 +274,7 @@ Biografia - + Open Profile in Browser Aprire profile nel browser