* Thu Jul 4 2019 Rudi Timmermans <rudi.timmer@mail.ch> 11.0-4

- [MINOR BUGFIX] Fixed Search page - [MINOR BUGFIX] Fixed translation link into translation page - [MINOR BUGFIX] Removed broke telegram group link into about page - [NEW] Facebook refresh possible to show into the Pulldown menu or not to show
DylanVanAssche · Jul 4, 2019 · e7036cf · e7036cf
1 parent 9fcb9eb
commit e7036cf
Show file tree

Hide file tree

Showing 30 changed files with 150 additions and 88 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/harbour-sailbook.desktop b/harbour-sailbook.desktop
diff --git a/harbour-sailbook.pro b/harbour-sailbook.pro
diff --git a/qml/components/ExternalWebview.qml b/qml/components/ExternalWebview.qml
@@ -71,7 +71,7 @@ Item {
         enabled: !loading
         experimental.preferences.javascriptEnabled: true
         experimental.transparentBackground: true
-        experimental.userAgent: "Mozilla/5.0 (iPhone; CPU iPhone OS 10_0_1 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) Version/10.0 Mobile/14A403 Safari/602.1"
+        experimental.userAgent: "Mozilla/5.0 (Linux; U; Android 2.3.5; zh-cn; HTC_IncredibleS_S710e Build/GRJ90) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1"
         experimental.userStyleSheets: [Qt.resolvedUrl("qrc:///css/external.css")]
         experimental.userScripts: Qt.resolvedUrl("qrc:///js/external.js")
         experimental.customLayoutWidth: parent.width / devicePixelRatio

diff --git a/qml/components/FBWebview.qml b/qml/components/FBWebview.qml
@@ -161,6 +161,13 @@ Item {
                 onClicked: pageStack.push(Qt.resolvedUrl("../pages/SettingsPage.qml"))
             }
 
+            MenuItem {
+                color: Util.getPrimaryColor(settings.theme)
+                text: qsTr("Facebook refresh")
+                visible: settings.showRefresh
+                onClicked: webview.reload()
+            }
+
             MenuItem {
                 color: Util.getPrimaryColor(settings.theme)
                 text: qsTr("Back")

diff --git a/qml/harbour-sailbook.qml b/qml/harbour-sailbook.qml
@@ -45,7 +45,7 @@ ApplicationWindow
 
     property variant notifications: [0,0,0,0,0,0,0,0,0]
     property string appName: "Sailbook"
-    property string version: "11.0-0"
+    property string version: "11.0-4"
     property string userAgentName
     property string userAgent
 
@@ -66,6 +66,7 @@ ApplicationWindow
         property bool showGroups: false
         property bool showLikedPages: false
         property bool showSettings: false
+        property bool showRefresh: false
         property bool showLogout: false
         property bool enableVideoPlayer: true
         property bool enableNightmode: false

diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml
@@ -27,17 +27,7 @@ Page {
                 anchors.horizontalCenter: parent.horizontalCenter
                 text: qsTr("GitHub")
                 iconSource: "qrc:///images/icon-github.png"
-                onClicked: { Qt.openUrlExternally("https://github.com/Sailbook/harbour-sailbook");
-                }
-            }
-
-            SectionHeader { text: "Telegram" }
-
-            IconTextButton {
-                anchors.horizontalCenter: parent.horizontalCenter
-                text: qsTr("Telegram Sailbook Group")
-                iconSource: "qrc:///images/icon-telegram.png"
-                onClicked: { Qt.openUrlExternally("https://t.me/joinchat/Fcodjwu4wFLZDSO_AsMQaQ");
+                onClicked: { Qt.openUrlExternally("https://github.com/DylanVanAssche/harbour-sailbook");
                 }
             }
 
@@ -47,7 +37,7 @@ Page {
                 anchors.horizontalCenter: parent.horizontalCenter
                 text: qsTr("Rudi Timmermans")
                 iconSource: "qrc:///images/image-rudi.png"
-                onClicked: { Qt.openUrlExternally("https://www.twitter.com/xray20001");
+                onClicked: { Qt.openUrlExternally("https://twitter.com/Xray20001");
                 }
             }
 

diff --git a/qml/pages/FirstPage.qml b/qml/pages/FirstPage.qml
@@ -29,7 +29,7 @@ Page {
             NavigationButton { onClicked: fbWebview.setUrl("https://m.facebook.com/friends"); notifyIndicator: app.notifications[1]; iconSource: "qrc:///images/icon-requests.svg"; visible: settings.showFriends }
             NavigationButton { onClicked: fbWebview.setUrl("https://m.facebook.com/messages"); notifyIndicator: app.notifications[2]; iconSource: "qrc:///images/icon-messages.svg"; visible: settings.showMessages }
             NavigationButton { onClicked: fbWebview.setUrl("https://m.facebook.com/notifications"); notifyIndicator: app.notifications[3]; iconSource: "qrc:///images/icon-notifications.svg"; visible: settings.showNotifications }
-            NavigationButton { onClicked: fbWebview.setUrl("https://m.facebook.com/search/top?soft=search"); notifyIndicator: app.notifications[4]; iconSource: "qrc:///images/icon-search.svg"; visible: settings.showSearch }
+            NavigationButton { onClicked: fbWebview.setUrl("https://m.facebook.com/search?q=?"); notifyIndicator: app.notifications[4]; iconSource: "qrc:///images/icon-search.svg"; visible: settings.showSearch }
             NavigationButton { onClicked: fbWebview.setUrl("https://m.facebook.com/events/upcoming"); notifyIndicator: app.notifications[5]; iconSource: "qrc:///images/icon-events.svg"; visible: settings.showEvents }
             NavigationButton { onClicked: fbWebview.setUrl("https://m.facebook.com/groups"); notifyIndicator: app.notifications[6]; iconSource: "qrc:///images/icon-groups.svg"; visible: settings.showGroups }
             NavigationButton { onClicked: fbWebview.setUrl("https://m.facebook.com/pages/?category=liked"); notifyIndicator: app.notifications[7]; iconSource: "qrc:///images/icon-pages.svg"; visible: settings.showLikedPages }

diff --git a/qml/pages/SettingsPage.qml b/qml/pages/SettingsPage.qml
@@ -19,6 +19,7 @@ Dialog {
         settings.showLikedPages = showLikedPages.checked
         settings.showSettings = showSettings.checked
         settings.showLogout = showLogout.checked
+        settings.showRefresh = showRefresh.checked
         settings.placeBack = placeBack.currentIndex
         settings.theme = theme.currentIndex
         settings.externalLink = externalLink.currentIndex
@@ -129,6 +130,12 @@ Dialog {
                 checked: settings.showSettings
             }
 
+            TextSwitch {
+                id: showRefresh
+                text: qsTr("Show Facebook refresh pulldown menu")
+                checked: settings.showRefresh
+            }
+
             TextSwitch {
                 id: showLogout
                 text: qsTr("Show Facebook logout pulldown menu")

diff --git a/qml/pages/TranslationsPage.qml b/qml/pages/TranslationsPage.qml
@@ -15,7 +15,7 @@ Page {
             MenuItem
             {
                 text: qsTr("Translation Platform")
-                onClicked: Qt.openUrlExternally("https://www.transifex.com/sailbook/sailbook")
+                onClicked: Qt.openUrlExternally("https://www.transifex.com/dylanvanassche/sailbook/")
             }
         }
 
@@ -28,10 +28,16 @@ Page {
 
             IconTextButton {
                 anchors.horizontalCenter: parent.horizontalCenter
-                text: "pljmn"
+                text: "Pljmn"
                 iconSource: "qrc:///images/icon-belgium.png"
             }
 
+            IconTextButton {
+                anchors.horizontalCenter: parent.horizontalCenter
+                text: "Dashinfantry"
+                iconSource: "qrc:///images/icon-china.png"
+            }
+
             IconTextButton {
                 anchors.horizontalCenter: parent.horizontalCenter
                 text: "Mikko Kokkonen"
@@ -68,12 +74,6 @@ Page {
                 iconSource: "qrc:///images/icon-spain.png"
             }
 
-            IconTextButton {
-                anchors.horizontalCenter: parent.horizontalCenter
-                text: "Jimmy Chen"
-                iconSource: "qrc:///images/icon-taiwan.png"
-            }
-
             IconTextButton {
                 anchors.horizontalCenter: parent.horizontalCenter
                 text: "Sebastian Nilsson"

diff --git a/qml/resources/images/icon-china.png b/qml/resources/images/icon-china.png
diff --git a/qml/resources/images/icon-taiwan.png b/qml/resources/images/icon-taiwan.png
diff --git a/qml/resources/images/icon-telegram.png b/qml/resources/images/icon-telegram.png
diff --git a/qml/resources/resources.qrc b/qml/resources/resources.qrc
@@ -5,11 +5,11 @@
         <file>images/icon-back.svg</file>
         <file>images/icon-belgium.png</file>
         <file>images/icon-spain.png</file>
-        <file>images/icon-taiwan.png</file>
         <file>images/icon-cover.svg</file>
         <file>images/icon-events.svg</file>
         <file>images/icon-external.png</file>
         <file>images/icon-finland.png</file>
+        <file>images/icon-china.png</file>
         <file>images/icon-fontawesome.png</file>
         <file>images/icon-french.png</file>
         <file>images/icon-germany.png</file>
@@ -30,7 +30,6 @@
         <file>images/icon-sailbook.svg</file>
         <file>images/icon-search.svg</file>
         <file>images/icon-settings.svg</file>
-        <file>images/icon-telegram.png</file>
         <file>images/icon-trans.png</file>
         <file>images/icon-twitter.png</file>
         <file>images/image-dylan.png</file>

diff --git a/rpm/harbour-sailbook.changes b/rpm/harbour-sailbook.changes
@@ -8,6 +8,12 @@
 # * date Author's Name <author's email> version-release
 # - Summary of changes
 
+* Thu Jul 4 2019 Rudi Timmermans <rudi.timmer@mail.ch> 11.0-4
+- [MINOR BUGFIX] Fixed Search page
+- [MINOR BUGFIX] Fixed translation link into translation page
+- [MINOR BUGFIX] Removed broke telegram group link into about page
+- [NEW] Facebook refresh possible to show into the Pulldown menu or not to show
+
 * Wed Feb 1 2018 Dylan Van Assche <dylan.van.assche@protonmail.com> 10.1-2
 - [MINOR BUGFIX] Fixed Hungarian translation include
 

diff --git a/rpm/harbour-sailbook.spec b/rpm/harbour-sailbook.spec
@@ -14,7 +14,7 @@ Name:       harbour-sailbook
 %{?qtc_builddir:%define _builddir %qtc_builddir}
 Summary:    Sailbook
 Version:    11.0
-Release:    3
+Release:    4
 Group:      Qt/Qt
 License:    GPLv3
 URL:        https://github.com/DylanVanAssche/harbour-sailbook

diff --git a/rpm/harbour-sailbook.yaml b/rpm/harbour-sailbook.yaml
@@ -1,7 +1,7 @@
 Name: harbour-sailbook
 Summary: Sailbook
 Version: 11.0
-Release: 3
+Release: 4
 # 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
 Group: Qt/Qt

diff --git a/translations/harbour-sailbook-de.ts b/translations/harbour-sailbook-de.ts
@@ -51,10 +51,6 @@
         <source>GitHub</source>
         <translation>GitHub</translation>
     </message>
-    <message>
-        <source>Telegram Sailbook Group</source>
-        <translation>Telegramm-Sailbook-Gruppe</translation>
-    </message>
     <message>
         <source>Rudi Timmermans</source>
         <translation>Rudi Timmermans</translation>
@@ -112,6 +108,10 @@
         <source>No network</source>
         <translation>Keine Verbindung</translation>
     </message>
+    <message>
+        <source>Facebook refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImagePage</name>
@@ -277,6 +277,10 @@
         <source>%1 will send you notifications when you have a new Facebook notification.</source>
         <translation>%1 benachrichtigt dich automatisch, wenn du neue Facebook-Benachrichtigungen erhältst.</translation>
     </message>
+    <message>
+        <source>Show Facebook refresh pulldown menu</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TranslationsPage</name>

diff --git a/translations/harbour-sailbook-es.ts b/translations/harbour-sailbook-es.ts
@@ -51,10 +51,6 @@
         <source>GitHub</source>
         <translation>Github</translation>
     </message>
-    <message>
-        <source>Telegram Sailbook Group</source>
-        <translation>Grupo de telegram de Sailbook</translation>
-    </message>
     <message>
         <source>Rudi Timmermans</source>
         <translation>Rudi Timmermans</translation>
@@ -112,6 +108,10 @@
         <source>No network</source>
         <translation>No hay red</translation>
     </message>
+    <message>
+        <source>Facebook refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImagePage</name>
@@ -277,6 +277,10 @@
         <source>%1 will send you notifications when you have a new Facebook notification.</source>
         <translation>%1 te avisará cuando haya una nueva notificación de Facebook.</translation>
     </message>
+    <message>
+        <source>Show Facebook refresh pulldown menu</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TranslationsPage</name>

diff --git a/translations/harbour-sailbook-fi.ts b/translations/harbour-sailbook-fi.ts
@@ -51,10 +51,6 @@
         <source>GitHub</source>
         <translation>GitHub</translation>
     </message>
-    <message>
-        <source>Telegram Sailbook Group</source>
-        <translation>Telegram Sailbook Group</translation>
-    </message>
     <message>
         <source>Rudi Timmermans</source>
         <translation>Rudi Timmermans</translation>
@@ -112,6 +108,10 @@
         <source>No network</source>
         <translation>Ei verkkoa</translation>
     </message>
+    <message>
+        <source>Facebook refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImagePage</name>
@@ -277,6 +277,10 @@
         <source>%1 will send you notifications when you have a new Facebook notification.</source>
         <translation>%1 lähettää sinulle ilmoituksen kun saat uuden Facebook ilmoituksen</translation>
     </message>
+    <message>
+        <source>Show Facebook refresh pulldown menu</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TranslationsPage</name>

diff --git a/translations/harbour-sailbook-fr.ts b/translations/harbour-sailbook-fr.ts
@@ -51,10 +51,6 @@
         <source>GitHub</source>
         <translation>GitHub</translation>
     </message>
-    <message>
-        <source>Telegram Sailbook Group</source>
-        <translation>Groupe Telegram dédié à Sailbook</translation>
-    </message>
     <message>
         <source>Rudi Timmermans</source>
         <translation>Rudi Timmermans</translation>
@@ -112,6 +108,10 @@
         <source>No network</source>
         <translation>Aucun réseau</translation>
     </message>
+    <message>
+        <source>Facebook refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImagePage</name>
@@ -277,6 +277,10 @@
         <source>%1 will send you notifications when you have a new Facebook notification.</source>
         <translation>%1 vous enverra une alerte pour toute nouvelle notification Facebook reçue.</translation>
     </message>
+    <message>
+        <source>Show Facebook refresh pulldown menu</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TranslationsPage</name>

diff --git a/translations/harbour-sailbook-hu.ts b/translations/harbour-sailbook-hu.ts
@@ -51,10 +51,6 @@
         <source>GitHub</source>
         <translation>GitHub</translation>
     </message>
-    <message>
-        <source>Telegram Sailbook Group</source>
-        <translation>Telegram Sailbook csoport</translation>
-    </message>
     <message>
         <source>Rudi Timmermans</source>
         <translation>Rudi Timmermans</translation>
@@ -112,6 +108,10 @@
         <source>No network</source>
         <translation>Nincs hálózat</translation>
     </message>
+    <message>
+        <source>Facebook refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImagePage</name>
@@ -277,6 +277,10 @@
         <source>%1 will send you notifications when you have a new Facebook notification.</source>
         <translation>A %1 értesítést küld, ha új Facebook-értesítést kapsz.</translation>
     </message>
+    <message>
+        <source>Show Facebook refresh pulldown menu</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TranslationsPage</name>

diff --git a/translations/harbour-sailbook-it.ts b/translations/harbour-sailbook-it.ts
@@ -51,10 +51,6 @@
         <source>GitHub</source>
         <translation>GitHub</translation>
     </message>
-    <message>
-        <source>Telegram Sailbook Group</source>
-        <translation>Telegram Sailbook Group</translation>
-    </message>
     <message>
         <source>Rudi Timmermans</source>
         <translation>Rudi Timmermans</translation>
@@ -112,6 +108,10 @@
         <source>No network</source>
         <translation>Nessuna rete</translation>
     </message>
+    <message>
+        <source>Facebook refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImagePage</name>
@@ -277,6 +277,10 @@
         <source>%1 will send you notifications when you have a new Facebook notification.</source>
         <translation>%1 ti invierà notifiche quando hai una nuova notifica di Facebook.</translation>
     </message>
+    <message>
+        <source>Show Facebook refresh pulldown menu</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TranslationsPage</name>