Auth bug fix

diff --git a/qml/ubi/FilesPage.qml b/qml/ubi/FilesPage.qml
index 8af530b..5a55fa8 100644 (file)
--- a/qml/ubi/FilesPage.qml
+++ b/qml/ubi/FilesPage.qml
@@ -55,6 +55,8 @@ Page {
     function onErr(status)
     {
         mask.state = "idle";
+        initPage.hide();
+
         if(status==401) {
             tip.show(qsTr("Ubuntu One authorization has failed. Try once again or check login settings."));
         } else if(status==0) {
@@ -62,8 +64,14 @@ Page {
         } else {
             tip.show(qsTr("Unknown error: ")+status);
         }
-        pageStack.pop();
-        initPage.hide()
+
+        console.log("index="+pageStack.index);
+
+        if(pageStack.index>0) {
+            pageStack.pop();
+        } else {
+            pageStack.initialPage = "LoginPage.qml";
+        }
     }
 
 

diff --git a/qml/ubi/InitPage.qml b/qml/ubi/InitPage.qml
index 3c9fdbc..7cec8a2 100644 (file)
--- a/qml/ubi/InitPage.qml
+++ b/qml/ubi/InitPage.qml
@@ -80,7 +80,7 @@ Showable {
             anchors.horizontalCenter: parent.horizontalCenter
             font.pixelSize: 20
             color: "white"
-            text: "v0.9.3-1 © 2012 Michal Kosciesza"
+            text: "v0.9.3-2 © 2012 Michal Kosciesza"
         }
 
         Text {

diff --git a/qml/ubi/LoginPage.qml b/qml/ubi/LoginPage.qml
index d951800..4b55018 100644 (file)
--- a/qml/ubi/LoginPage.qml
+++ b/qml/ubi/LoginPage.qml
@@ -47,6 +47,7 @@ Page {
             id: content
             spacing: Const.DEFAULT_MARGIN
             x: Const.TEXT_MARGIN
+            width: root.width-2*Const.TEXT_MARGIN
 
             Spacer {}
 
@@ -61,14 +62,16 @@ Page {
             TextField {
                 id: user
                 placeholderText: qsTr("User ID")
-                width: 400
+                anchors.left: parent.left
+                anchors.right: parent.right
             }
 
             TextField {
                 id: pass
-                width: 400
                 placeholderText: qsTr("Password")
                 echoMode: TextInput.Password
+                anchors.left: parent.left
+                anchors.right: parent.right
             }
 
             Spacer {}
@@ -76,6 +79,7 @@ Page {
             Button {
                 label: qsTr("Save")
                 onButtonClicked: root.getToken()
+                anchors.left: parent.left
             }
         }
     }

diff --git a/qtc_packaging/debian_fremantle/changelog b/qtc_packaging/debian_fremantle/changelog
index 995f576..559b422 100644 (file)
--- a/qtc_packaging/debian_fremantle/changelog
+++ b/qtc_packaging/debian_fremantle/changelog
@@ -1,3 +1,9 @@
+ubi (0.9.3-2) unstable; urgency=low
+
+  * Patch for authorization bug
+
+ -- Michal Kosciesza <mkiol@o2.pl>  Sat, 19 May 2012 14:40:25 +0200
+
 ubi (0.9.3-1) unstable; urgency=low
 
   * UTF-8 encoding support

diff --git a/qtc_packaging/debian_fremantle/changelog~ b/qtc_packaging/debian_fremantle/changelog~
index fbc5105..995f576 100644 (file)
--- a/qtc_packaging/debian_fremantle/changelog~
+++ b/qtc_packaging/debian_fremantle/changelog~
@@ -2,7 +2,7 @@ ubi (0.9.3-1) unstable; urgency=low
 
   * UTF-8 encoding support
   * New icons
-  * New UI
+  * Updated GUI
 
  -- Michal Kosciesza <mkiol@o2.pl>  Fri, 18 May 2012 22:10:09 +0200
 

diff --git a/qtc_packaging/debian_harmattan/changelog b/qtc_packaging/debian_harmattan/changelog
index 995f576..559b422 100644 (file)
--- a/qtc_packaging/debian_harmattan/changelog
+++ b/qtc_packaging/debian_harmattan/changelog
@@ -1,3 +1,9 @@
+ubi (0.9.3-2) unstable; urgency=low
+
+  * Patch for authorization bug
+
+ -- Michal Kosciesza <mkiol@o2.pl>  Sat, 19 May 2012 14:40:25 +0200
+
 ubi (0.9.3-1) unstable; urgency=low
 
   * UTF-8 encoding support

diff --git a/qtc_packaging/debian_harmattan/changelog~ b/qtc_packaging/debian_harmattan/changelog~
index fbc5105..995f576 100644 (file)
--- a/qtc_packaging/debian_harmattan/changelog~
+++ b/qtc_packaging/debian_harmattan/changelog~
@@ -2,7 +2,7 @@ ubi (0.9.3-1) unstable; urgency=low
 
   * UTF-8 encoding support
   * New icons
-  * New UI
+  * Updated GUI
 
  -- Michal Kosciesza <mkiol@o2.pl>  Fri, 18 May 2012 22:10:09 +0200
 

diff --git a/ubi.pro.user b/ubi.pro.user
index d9962f0..f4b57b1 100644 (file)
--- a/ubi.pro.user
+++ b/ubi.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by Qt Creator 2.4.1, 2012-05-18T23:03:34. -->
+<!-- Written by Qt Creator 2.4.1, 2012-05-19T15:04:52. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -444,6 +444,7 @@
        <value type="QString">/home/mkiol/dev/Qt/ubi-build-maemo-Maemo_Qt_4_7_0__fremantle-pr13__Release/ubi_0_0_2_armel.deb</value>
        <value type="QString">/home/mkiol/dev/Qt/ubi-build-maemo-Maemo_Qt_4_7_0__fremantle-pr13__Release/ubi_0_9_0-2_armel.deb</value>
        <value type="QString">/home/mkiol/dev/Qt/ubi-build-maemo-Maemo_Qt_4_7_0__fremantle-pr13__Release/ubi_0_9_1-1_armel.deb</value>
+       <value type="QString">/home/mkiol/dev/Qt/ubi-build-maemo-Maemo_Qt_4_7_0__fremantle-pr13__Release/ubi_0_9_3-2_armel.deb</value>
        <value type="QString">/home/mkiol/dev/Qt/ubi-build-maemo-Maemo_Qt_4_7_0__fremantle-pr13__Release/ubi_0_9_1-2_armel.deb</value>
        <value type="QString">/home/mkiol/dev/Qt/ubi-build-maemo-Maemo_Qt_4_7_0__fremantle-pr13__Release/ubi_0_9_2-1_armel.deb</value>
       </valuelist>
@@ -458,6 +459,7 @@
        <value type="QString">192.168.2.101</value>
        <value type="QString">192.168.2.101</value>
        <value type="QString">192.168.2.101</value>
+       <value type="QString">192.168.2.101</value>
       </valuelist>
       <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths">
        <value type="QString"></value>
@@ -470,6 +472,7 @@
        <value type="QString"></value>
        <value type="QString"></value>
        <value type="QString"></value>
+       <value type="QString"></value>
       </valuelist>
       <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes">
        <value type="QDateTime">2012-02-12T21:15:32</value>
@@ -480,6 +483,7 @@
        <value type="QDateTime">2012-04-20T23:23:40</value>
        <value type="QDateTime">2012-04-28T10:41:48</value>
        <value type="QDateTime">2012-05-03T18:56:53</value>
+       <value type="QDateTime">2012-05-19T14:49:00</value>
        <value type="QDateTime">2012-05-05T14:55:15</value>
        <value type="QDateTime">2012-05-18T21:37:42</value>
       </valuelist>
@@ -1066,10 +1070,10 @@
       <value type="QString" key="RemoteCompiler.BuildStep.CertKeyFile"></value>
       <value type="QString" key="RemoteCompiler.BuildStep.CertKeyPass"></value>
       <value type="int" key="RemoteCompiler.BuildStep.PkgOpt">0</value>
-      <value type="int" key="RemoteCompiler.BuildStep.PostOp">1</value>
-      <value type="QString" key="RemoteCompiler.BuildStep.QtVersion">4_7_3</value>
+      <value type="int" key="RemoteCompiler.BuildStep.PostOp">2</value>
+      <value type="QString" key="RemoteCompiler.BuildStep.QtVersion">4_7_4</value>
       <value type="int" key="RemoteCompiler.BuildStep.SisOpt">1</value>
-      <value type="QString" key="RemoteCompiler.BuildStep.Target">symbian3</value>
+      <value type="QString" key="RemoteCompiler.BuildStep.Target">symbianBelle</value>
      </valuemap>
      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>

diff --git a/ubi.zip b/ubi.zip
index b64fcad..d2fe6c5 100644 (file)
Binary files a/ubi.zip and b/ubi.zip differ

diff --git a/www/index.html b/www/index.html
index 72839e4..4dc682a 100644 (file)
--- a/www/index.html
+++ b/www/index.html
@@ -97,7 +97,7 @@ Contacts synchronization.
 <p>In <a href="https://garage.maemo.org/frs/?group_id=2327">Download</a> section also an experimental release for Nokia N9/950 and Symbian was published. Please note that these apps have not been tested on real devices.</p>
 
 <h1>Download</h1>
-<p>The latest release is version <strong>0.9.3-1</strong></p>
+<p>The latest release is version <strong>0.9.3-2</strong></p>
 <h2>Nokia N900</h2>
 <p>The application can be downloaded via the Application Manager under the
 Network section if you have the <i>extras-devel</i> repository enabled.</p>

diff --git a/www/index.html~ b/www/index.html~
index 98c1bc3..72839e4 100644 (file)
--- a/www/index.html~
+++ b/www/index.html~
@@ -97,7 +97,7 @@ Contacts synchronization.
 <p>In <a href="https://garage.maemo.org/frs/?group_id=2327">Download</a> section also an experimental release for Nokia N9/950 and Symbian was published. Please note that these apps have not been tested on real devices.</p>
 
 <h1>Download</h1>
-<p>The latest release is version 0.9.3-1</p>
+<p>The latest release is version <strong>0.9.3-1</strong></p>
 <h2>Nokia N900</h2>
 <p>The application can be downloaded via the Application Manager under the
 Network section if you have the <i>extras-devel</i> repository enabled.</p>