Release 2.0.2, various fixes

vranki · Dec 30, 2013 · 76753c3 · 76753c3
1 parent 0267458
commit 76753c3
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 9 deletions.
diff --git a/qml/siilihai-mobile-nocomponents/CredentialsDialog.qml b/qml/siilihai-mobile-nocomponents/CredentialsDialog.qml
@@ -33,5 +33,6 @@ SimpleDialog {
             siilihaimobile.credentialsEntered(upf.username, upf.password, remember.checked && upf.checked)
             upf.reset()
         }
+        Component.onCompleted: mainItem.backPressed.connect(clicked)
     }
 }
diff --git a/qml/siilihai-mobile-nocomponents/InactiveScreen.qml b/qml/siilihai-mobile-nocomponents/InactiveScreen.qml
@@ -40,13 +40,22 @@ Rectangle {
             height: parent.height
             width: totalforums ? parent.width * ((totalforums - busyforums) / totalforums) : 0
             color: "white"
+            Behavior on width { SmoothedAnimation { velocity: 30 } }
+        }
+        Text {
+            anchors.centerIn: parent
+            font.pixelSize: parent.height / 3
+            text: "Updating.."
+            color: "white"
+            opacity: 0.5
         }
     }
 
     Timer {
         running: parent.visible
         repeat: true
-        onTriggered: {
+        triggeredOnStart: true
+        onTriggered:  {
             var busycount = 0
             for(var i=0;i<subscriptions.length;i++) {
                 if(subscriptions[i].beingUpdated || subscriptions[i].beingSynced || subscriptions[i].scheduledForUpdate) busycount++;

diff --git a/qml/siilihai-mobile-nocomponents/MessageDialog.qml b/qml/siilihai-mobile-nocomponents/MessageDialog.qml
@@ -32,6 +32,7 @@ SimpleDialog {
                 anchors.centerIn: parent
                 text: "Ok"
                 onClicked: siilihaimobile.dismissMessages()
+                Component.onCompleted: mainItem.backPressed.connect(clicked)
             }
         }
 

diff --git a/qml/siilihai-mobile-nocomponents/SettingsDialog.qml b/qml/siilihai-mobile-nocomponents/SettingsDialog.qml
@@ -23,6 +23,7 @@ SimpleDialog {
             text: "Close"
             onClicked: topItem = false
             anchors.horizontalCenter: parent.horizontalCenter
+            Component.onCompleted: mainItem.backPressed.connect(clicked)
         }
     }
 }
diff --git a/qml/siilihai-mobile-nocomponents/Toolbar.qml b/qml/siilihai-mobile-nocomponents/Toolbar.qml
@@ -24,6 +24,7 @@ Item {
                     siilihaimobile.selectedGroupId = ""
                 }
             }
+            Component.onCompleted: mainItem.backPressed.connect(clicked)
         }
         ToolbarButton {
             image: "gfx/Gnome-view-refresh.svg"

diff --git a/qml/siilihai-mobile-nocomponents/forum/ForumSettingsDialog.qml b/qml/siilihai-mobile-nocomponents/forum/ForumSettingsDialog.qml
@@ -57,6 +57,7 @@ SimpleDialog {
                     siilihaimobile.applyGroupSubscriptions()
                     forumSettingsDialog.topItem = false
                 }
+                Component.onCompleted: mainItem.backPressed.connect(clicked)
             }
             Item {width: 1; height: 50} // Spacer
         }

diff --git a/qml/siilihai-mobile-nocomponents/main.qml b/qml/siilihai-mobile-nocomponents/main.qml
@@ -3,6 +3,7 @@ import "forum"
 import "account"
 
 Item {
+    id: mainItem
     property string color1: "#7d7dc0"
     property string color2: "#ffd884"
     property string colorDark: "#003e5e"
@@ -19,6 +20,8 @@ Item {
 
     property int defaultButtonHeight: 32
     property int tallButtonHeight: 42
+    signal backPressed
+
     Image {
         source: "gfx/backbround-dark.png"
         fillMode: Image.Tile
@@ -80,7 +83,19 @@ Item {
     MessageDialog {}
     InactiveScreen {}
 
+    // Hide the virtual keyboard if it is open
     function hideVkb() {
         Qt.inputMethod.hide();
     }
+
+    // Android back button handling
+    focus: true // important - otherwise we'll get no key events
+
+    Keys.onReleased: {
+        if (event.key === Qt.Key_Back) {
+            console.log("Back button captured - wunderbar !")
+            event.accepted = true
+            backPressed()
+        }
+    }
 }
diff --git a/qml/siilihai-mobile-nocomponents/widgets/SimpleButton.qml b/qml/siilihai-mobile-nocomponents/widgets/SimpleButton.qml
@@ -1,6 +1,7 @@
 import QtQuick 2.0
 
 Rectangle {
+    id: simpleButton
     property string text: ""
     property bool enabled: true
     property bool outline: true
@@ -10,7 +11,7 @@ Rectangle {
     property bool boldText: false
     signal clicked
     clip: true
-    radius: 10
+    radius: 6
     color: bgColor
     border.color: outline ? buttonColor : "transparent"
     border.width: 2
@@ -30,4 +31,21 @@ Rectangle {
         anchors.fill: parent
         onClicked: if(enabled) parent.clicked()
     }
+    // Bg fill
+    Rectangle {
+        anchors.fill: parent
+        radius: parent.radius
+        gradient: Gradient {
+            GradientStop {
+                position: 0;
+                color: "transparent"
+            }
+            GradientStop {
+                position: 1;
+                color: simpleButton.border.color;
+            }
+        }
+        opacity: 0.3
+        z: -100
+    }
 }
diff --git a/rpm/siilihai-mobile.yaml b/rpm/siilihai-mobile.yaml
@@ -1,6 +1,6 @@
 Name: harbour-siilihai-mobile
 Summary: Siilihai
-Version: 2.0.1
+Version: 2.0.2
 Release: 1
 Group: Qt/Qt
 License: GPLv2

diff --git a/siilihaimobile.pro b/siilihaimobile.pro
@@ -2,10 +2,12 @@ TARGET=harbour-siilihai-mobile
 CONFIG += sailfishapp
 QT += core quick xml network svg
 
-# Required for android
-qmlfolder.source = qml/siilihai-mobile-nocomponents
-qmlfolder.target = qml
-DEPLOYMENTFOLDERS = qmlfolder
+android {
+    # Required for android
+    qmlfolder.source = qml/siilihai-mobile-nocomponents
+    qmlfolder.target = qml
+    DEPLOYMENTFOLDERS = qmlfolder
+}
 
 # Always on
 CONFIG += with_lib
@@ -39,8 +41,7 @@ SOURCES += main.cpp siilihaimobile.cpp
 HEADERS += siilihaimobile.h
 
 OTHER_FILES += \
-    rpm/harbour-siilihai-mobile.spec \
-    rpm/harbour-siilihai-mobile.yaml \
+    rpm/siilihai-mobile.yaml \
     harbour-siilihai-mobile.desktop \
     qml/siilihai-mobile-nocomponents/InactiveScreen.qml \
     qml/siilihai-mobile-nocomponents/widgets/ConfirmationButton.qml