From 98d6eaa3d8b2e832fd09a04e2e72b5dd8a9f4f34 Mon Sep 17 00:00:00 2001 From: Dusko Angirevic Date: Fri, 9 Jun 2017 16:56:16 +0200 Subject: [PATCH] New toot feedback to user. --- harbour-tooter.pro.user | 26 +++++++++++++------------- qml/cover/CoverPage.qml | 6 +++--- qml/pages/Conversation.qml | 5 ++++- rpm/harbour-tooter.spec | 2 +- rpm/harbour-tooter.yaml | 2 +- translations/harbour-tooter-de.ts | 7 +++++++ translations/harbour-tooter.ts | 7 +++++++ 7 files changed, 36 insertions(+), 19 deletions(-) diff --git a/harbour-tooter.pro.user b/harbour-tooter.pro.user index 56f6146..08f8bd5 100644 --- a/harbour-tooter.pro.user +++ b/harbour-tooter.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {41ec03ca-9430-48f3-b421-990d428b2838} + {25497605-1bff-4134-a878-76c1475dd8e3} ProjectExplorer.Project.ActiveTarget @@ -61,12 +61,12 @@ MerSDK-SailfishOS-i486 MerSDK-SailfishOS-i486 - {fd18ca89-dfc9-4054-9c53-c67be7689951} + {f49c1b5a-d715-401a-9a10-0e5fe9e5b72a} 0 2 0 - /Users/dysko/GIT/build-harbour-tooter-MerSDK_SailfishOS_i486-Debug + C:/Users/dysko/SF/build-harbour-tooter-MerSDK_SailfishOS_i486-Debug true @@ -138,7 +138,7 @@ true - /Users/dysko/GIT/build-harbour-tooter-MerSDK_SailfishOS_i486-Release + C:/Users/dysko/SF/build-harbour-tooter-MerSDK_SailfishOS_i486-Release true @@ -210,7 +210,7 @@ true - /Users/dysko/GIT/build-harbour-tooter-MerSDK_SailfishOS_i486-Profile + C:/Users/dysko/SF/build-harbour-tooter-MerSDK_SailfishOS_i486-Profile true @@ -396,7 +396,7 @@ 13 14 - /Users/dysko/GIT/harbour-tooter + C:/Users/dysko/SF/harbour-tooter false 10234 3 @@ -426,12 +426,12 @@ MerSDK-SailfishOS-armv7hl MerSDK-SailfishOS-armv7hl - {f895389d-b51a-4d4f-8b03-5ec64bda6f66} + {588087e2-ecc1-41aa-b652-86f16cba9351} 0 2 0 - /Users/dysko/GIT/build-harbour-tooter-MerSDK_SailfishOS_armv7hl-Debug + C:/Users/dysko/SF/build-harbour-tooter-MerSDK_SailfishOS_armv7hl-Debug true @@ -503,7 +503,7 @@ true - /Users/dysko/GIT/build-harbour-tooter-MerSDK_SailfishOS_armv7hl-Release + C:/Users/dysko/SF/build-harbour-tooter-MerSDK_SailfishOS_armv7hl-Release true @@ -575,7 +575,7 @@ true - /Users/dysko/GIT/build-harbour-tooter-MerSDK_SailfishOS_armv7hl-Profile + C:/Users/dysko/SF/build-harbour-tooter-MerSDK_SailfishOS_armv7hl-Profile true @@ -761,7 +761,7 @@ 13 14 - /Users/dysko/GIT/harbour-tooter + C:/Users/dysko/SF/harbour-tooter false 10234 3 @@ -779,7 +779,7 @@ 3768 false true - true + false false true diff --git a/qml/cover/CoverPage.qml b/qml/cover/CoverPage.qml index 355cc23..f4544df 100644 --- a/qml/cover/CoverPage.qml +++ b/qml/cover/CoverPage.qml @@ -36,10 +36,10 @@ CoverBackground { Label { id: label anchors.centerIn: parent - text: Logic.test //qsTr("My Cover") + text: qsTr("Tooter") } - CoverActionList { + /*CoverActionList { id: coverAction CoverAction { @@ -52,6 +52,6 @@ CoverBackground { CoverAction { iconSource: "image://theme/icon-cover-pause" } - } + }*/ } diff --git a/qml/pages/Conversation.qml b/qml/pages/Conversation.qml index 8466d11..a265a3d 100644 --- a/qml/pages/Conversation.qml +++ b/qml/pages/Conversation.qml @@ -113,6 +113,7 @@ Page { right: parent.right rightMargin: Theme.paddingLarge } + enabled: toot.text !== "" onClicked: { var visibility = [ "public", "unlisted", "private", "direct"]; var msg = { @@ -132,8 +133,10 @@ Page { msg.params['spoiler_text'] = warningContent.text } - worker.sendMessage(msg); + worker.sendMessage(msg); console.log(JSON.stringify(msg)); + warningContent.text = "" + toot.text = "" } } } diff --git a/rpm/harbour-tooter.spec b/rpm/harbour-tooter.spec index 5fdc28e..a7ffa5c 100644 --- a/rpm/harbour-tooter.spec +++ b/rpm/harbour-tooter.spec @@ -13,7 +13,7 @@ Name: harbour-tooter %{!?qtc_make:%define qtc_make make} %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: Tooter -Version: 0.1.2 +Version: 0.1.3 Release: 1 Group: Qt/Qt License: LICENSE diff --git a/rpm/harbour-tooter.yaml b/rpm/harbour-tooter.yaml index 3abde91..edf09d6 100644 --- a/rpm/harbour-tooter.yaml +++ b/rpm/harbour-tooter.yaml @@ -1,6 +1,6 @@ Name: harbour-tooter Summary: Tooter -Version: 0.1.2 +Version: 0.1.3 Release: # The contents of the Group field should be one of the groups listed here: # http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS diff --git a/translations/harbour-tooter-de.ts b/translations/harbour-tooter-de.ts index 445e36c..a147acc 100644 --- a/translations/harbour-tooter-de.ts +++ b/translations/harbour-tooter-de.ts @@ -50,6 +50,13 @@ + + CoverPage + + Tooter + + + MainPage diff --git a/translations/harbour-tooter.ts b/translations/harbour-tooter.ts index 215a83e..d1a8531 100644 --- a/translations/harbour-tooter.ts +++ b/translations/harbour-tooter.ts @@ -50,6 +50,13 @@ + + CoverPage + + Tooter + + + MainPage