New GUI

[ubi] / qml / ubi / LoginPage.qml

diff --git a/qml/ubi/LoginPage.qml b/qml/ubi/LoginPage.qml
index deee992..0b8b3d6 100644 (file)
--- a/qml/ubi/LoginPage.qml
+++ b/qml/ubi/LoginPage.qml
@@ -8,6 +8,8 @@ Page {
     title: qsTr("Login")
     orientation: "auto"
 
+    //property alias taskMenu: taskMenu
+
     function getToken() {
         mask.state = "busy";
         U1.getToken(user.text,pass.text,root)
@@ -22,26 +24,29 @@ Page {
         Utils.setName(account.username);
 
         tip.show(qsTr("Logged in!"));
-        pageStack.initialPage = "StartPage.qml";
+        //pageStack.initialPage = "StartPage.qml";
+        pageStack.initialPage = "FilesPage.qml";
+        pageStack.currentPage.init();
     }
 
     function onErr(status) {
         mask.state = "idle";
         //console.log("onErr");
         if(status==401) {
-            tip.show(qsTr("Authorization failed!"));
+            tip.show(qsTr("Ubuntu One authorization has failed. Try once again or check login settings."));
         } else if(status==0) {
-            tip.show(qsTr("Unable to connect!"));
+            tip.show(qsTr("Unable to connect. Check internet connection."));
         } else {
-            tip.show(qsTr("Error: ")+status);
+            tip.show(qsTr("Unknown error: ")+status);
         }
     }
 
     Flickable {
         width: root.width
         height: root.height
-        contentHeight: content.height+Const.SYSTEM_BAR_HEIGHT+Const.TEXT_MARGIN
-        y: Const.SYSTEM_BAR_HEIGHT+2*Const.TEXT_MARGIN
+
+        contentHeight: content.height+Const.TOP_BAR_HEIGHT+Const.SYSTEM_BAR_HEIGHT+Const.TEXT_MARGIN
+        y: Const.TOP_BAR_HEIGHT
 
         Column {
             id: content
@@ -77,4 +82,16 @@ Page {
             }
         }
     }
+
+    /*TaskMenu {
+        z: 200
+        id: taskMenu
+        menuHeight: menuFixed.height+4*Const.DEFAULT_MARGIN
+
+        menuDynamic: _menuDyn
+        Flow {
+            y: root.height-taskMenu.menuHeight-Const.SYSTEM_BAR_HEIGHT+1*Const.DEFAULT_MARGIN
+            id: _menuDyn
+        }
+    }*/
 }