update WWW

diff --git a/qml/ubi/AccountPage.qml b/qml/ubi/AccountPage.qml
index 6065bb7..44a000a 100644 (file)
--- a/qml/ubi/AccountPage.qml
+++ b/qml/ubi/AccountPage.qml
@@ -32,8 +32,12 @@ Page {
 
         //uid.text = account.id;
         username.text = account.username;
+        //username.text = "Molly";
+
         //nick.text = account.nickname;
+
         email.text = account.email;
+        //email.text = "molly@ponny.eu";
         storage.text = Conv.bytesToSize(account.total_storage);
 
         U1.getRootNode(secrets,root);

diff --git a/qml/ubi/InitPage.qml b/qml/ubi/InitPage.qml
index 9803d27..577f29f 100644 (file)
--- a/qml/ubi/InitPage.qml
+++ b/qml/ubi/InitPage.qml
@@ -13,7 +13,7 @@ Showable {
     function init() {
         if(Utils.isAuthorized()) {
             //title = "Hi, "+Utils.name();
-            //login();
+            login();
         } else {
             pageStack.initialPage = "LoginPage.qml";
             hide();

diff --git a/qml/ubi/SystemBar.qml b/qml/ubi/SystemBar.qml
index 23258f1..eefc449 100644 (file)
--- a/qml/ubi/SystemBar.qml
+++ b/qml/ubi/SystemBar.qml
@@ -20,22 +20,26 @@ Item {
 
     /*Rectangle {
         id: bor
-        //color: Const.WARM_GREY_COLOR
-        color: Const.TRANSPARENT
-        height: 1; width: root.width
-        anchors.top: shadow.bottom
+        color: Const.WARM_GREY_COLOR
+        //color: Const.TRANSPARENT
+        height: 2; width: root.width
+        anchors.top: box.top
     }*/
 
-    /*Rectangle {
+    Rectangle {
         id: box
         width: root.width
         height: root.height
-        anchors.top: shadow.bottom
+        y:3
         color: Const.TRANSPARENT
         //color: Const.COOL_GREY_COLOR
-    }*/
+        gradient: Gradient {
+            GradientStop {position: 0.0; color: "#333333"}
+            GradientStop {position: 1.0; color: "#151515"}
+        }
+    }
 
-    Row {
+    /*Row {
         id: box
         y: 3
         Repeater {
@@ -45,7 +49,7 @@ Item {
                 source: "images/bg.png"
             }
         }
-    }
+    }*/
 
     Shadow {
         anchors.bottom: box.top

diff --git a/qml/ubi/TopBar.qml b/qml/ubi/TopBar.qml
index 24e4b7e..9b57f7f 100644 (file)
--- a/qml/ubi/TopBar.qml
+++ b/qml/ubi/TopBar.qml
@@ -16,30 +16,42 @@ Item {
         visible = true;
     }
 
-    Rectangle {
-        id: box
+    Item {
         width: 50
         height: width
-        radius: 5
-        color: mouseArea.pressed ? "white" : "black"
-        opacity: 0.2
-        x: -width/2
-        y: -width/2
+        //color: mouseArea1.pressed ? "white" : "black"
+        //opacity: 0.2
+        anchors.left: root.left
 
         MouseArea {
-            id: mouseArea
+            id: mouseArea1
             anchors.fill: parent
             onClicked: Utils.minimizeWindow()
         }
     }
 
-    Rectangle {
+    Item {
+        width: 50
+        height: width
+        //color: mouseArea2.pressed ? "white" : "black"
+        //opacity: 0.2
+        anchors.right: root.right
+
+        MouseArea {
+            id: mouseArea2
+            anchors.fill: parent
+            onClicked: Qt.quit()
+        }
+    }
+
+
+    /*Rectangle {
         width: box.width/2-16
         height: 2
         color: "white"
         x: 8
         y: (box.width/4)-1
-    }
+    }*/
 
     /*Rectangle {
         width: parent.width

diff --git a/qml/ubi/main.qml b/qml/ubi/main.qml
index 80d0160..91cc567 100644 (file)
--- a/qml/ubi/main.qml
+++ b/qml/ubi/main.qml
@@ -18,17 +18,18 @@ Rectangle {
 
     TopBar {
         id: topbar
-        Component.onCompleted: {
-            visible = Utils.isMaemo();
+        /*Component.onCompleted: {
+            //visible = Utils.isMaemo();
         }
         onVisibleChanged: {
             if(visible)
                 visible = Utils.isMaemo();
-        }
+        }*/
     }
 
     NotificationNew {
         id: tip
+        z: 201
         anchors.horizontalCenter: mainWindow.horizontalCenter
         y: mainWindow.height-height-Const.SYSTEM_BAR_HEIGHT-Const.TEXT_MARGIN
     }

diff --git a/ubi.pro.user b/ubi.pro.user
index af67d63..acd9bfe 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-15T22:53:24. -->
+<!-- Written by Qt Creator 2.4.1, 2012-05-16T05:47:05. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -477,7 +477,7 @@
        <value type="QDateTime">2012-04-28T10:41:48</value>
        <value type="QDateTime">2012-05-03T18:56:53</value>
        <value type="QDateTime">2012-05-05T14:55:15</value>
-       <value type="QDateTime">2012-05-15T22:51:39</value>
+       <value type="QDateTime">2012-05-16T05:43:04</value>
       </valuelist>
      </valuemap>
      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">3</value>

diff --git a/www/big/org/screenshot04.png b/www/big/org/screenshot04.png
new file mode 100644 (file)
index 0000000..2b5ee0a
Binary files /dev/null and b/www/big/org/screenshot04.png differ

diff --git a/www/big/org/screenshot08.png b/www/big/org/screenshot08.png
new file mode 100644 (file)
index 0000000..46ffee1
Binary files /dev/null and b/www/big/org/screenshot08.png differ

diff --git a/www/big/org/screenshot09.png b/www/big/org/screenshot09.png
new file mode 100644 (file)
index 0000000..4c540c3
Binary files /dev/null and b/www/big/org/screenshot09.png differ

diff --git a/www/big/org/screenshot10.png b/www/big/org/screenshot10.png
new file mode 100644 (file)
index 0000000..95cf45c
Binary files /dev/null and b/www/big/org/screenshot10.png differ

diff --git a/www/big/org/screenshot12.png b/www/big/org/screenshot12.png
new file mode 100644 (file)
index 0000000..690473f
Binary files /dev/null and b/www/big/org/screenshot12.png differ

diff --git a/www/big/org/screenshot21.png b/www/big/org/screenshot21.png
new file mode 100644 (file)
index 0000000..a1ff38c
Binary files /dev/null and b/www/big/org/screenshot21.png differ

diff --git a/www/big/org/screenshot22.png b/www/big/org/screenshot22.png
new file mode 100644 (file)
index 0000000..5655dcb
Binary files /dev/null and b/www/big/org/screenshot22.png differ

diff --git a/www/big/org/screenshot23.png b/www/big/org/screenshot23.png
new file mode 100644 (file)
index 0000000..4e7f955
Binary files /dev/null and b/www/big/org/screenshot23.png differ

diff --git a/www/big/org/screenshot24.png b/www/big/org/screenshot24.png
new file mode 100644 (file)
index 0000000..de46579
Binary files /dev/null and b/www/big/org/screenshot24.png differ

diff --git a/www/big/org/screenshot25.png b/www/big/org/screenshot25.png
new file mode 100644 (file)
index 0000000..e303536
Binary files /dev/null and b/www/big/org/screenshot25.png differ

diff --git a/www/big/org/screenshot26.png b/www/big/org/screenshot26.png
new file mode 100644 (file)
index 0000000..070aa03
Binary files /dev/null and b/www/big/org/screenshot26.png differ

diff --git a/www/big/screenshot001.png b/www/big/screenshot001.png
new file mode 100644 (file)
index 0000000..a1ff38c
Binary files /dev/null and b/www/big/screenshot001.png differ

diff --git a/www/big/screenshot002.png b/www/big/screenshot002.png
new file mode 100644 (file)
index 0000000..5655dcb
Binary files /dev/null and b/www/big/screenshot002.png differ

diff --git a/www/big/screenshot003.png b/www/big/screenshot003.png
new file mode 100644 (file)
index 0000000..4e7f955
Binary files /dev/null and b/www/big/screenshot003.png differ

diff --git a/www/big/screenshot004.png b/www/big/screenshot004.png
new file mode 100644 (file)
index 0000000..de46579
Binary files /dev/null and b/www/big/screenshot004.png differ

diff --git a/www/big/screenshot005.png b/www/big/screenshot005.png
new file mode 100644 (file)
index 0000000..e303536
Binary files /dev/null and b/www/big/screenshot005.png differ

diff --git a/www/big/screenshot006.png b/www/big/screenshot006.png
new file mode 100644 (file)
index 0000000..070aa03
Binary files /dev/null and b/www/big/screenshot006.png differ

diff --git a/www/index.html b/www/index.html
index bb5216b..72839e4 100644 (file)
--- a/www/index.html
+++ b/www/index.html
@@ -97,6 +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>
 <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>
@@ -115,12 +116,12 @@ Network section if you have the <i>extras-devel</i> repository enabled.</p>
 <br/>
 <h1>Screenshots</h1>
 <div id="screenshots">
-<a href="big/screenshot22.png"><img src="screenshot22.png"/></a>
-<a href="big/screenshot06.png"><img src="screenshot06.png"/></a>
-<a href="big/screenshot05.png"><img src="screenshot05.png"/></a>
-<a href="big/screenshot09.png"><img src="screenshot09.png"/></a>
-<a href="big/screenshot10.png"><img src="screenshot10.png"/></a>
-<a href="big/screenshot11.png"><img src="screenshot11.png"/></a>
+<a href="big/screenshot001.png"><img src="screenshot001.png"/></a>
+<a href="big/screenshot002.png"><img src="screenshot002.png"/></a>
+<a href="big/screenshot003.png"><img src="screenshot003.png"/></a>
+<a href="big/screenshot004.png"><img src="screenshot004.png"/></a>
+<a href="big/screenshot005.png"><img src="screenshot005.png"/></a>
+<a href="big/screenshot006.png"><img src="screenshot006.png"/></a>
 </div>
 &copy; 2012 Michal Kosciesza
 </div>

diff --git a/www/index.html~ b/www/index.html~
index bb5216b..98c1bc3 100644 (file)
--- a/www/index.html~
+++ b/www/index.html~
@@ -97,6 +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>
 <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>
@@ -115,12 +116,12 @@ Network section if you have the <i>extras-devel</i> repository enabled.</p>
 <br/>
 <h1>Screenshots</h1>
 <div id="screenshots">
-<a href="big/screenshot22.png"><img src="screenshot22.png"/></a>
-<a href="big/screenshot06.png"><img src="screenshot06.png"/></a>
-<a href="big/screenshot05.png"><img src="screenshot05.png"/></a>
-<a href="big/screenshot09.png"><img src="screenshot09.png"/></a>
-<a href="big/screenshot10.png"><img src="screenshot10.png"/></a>
-<a href="big/screenshot11.png"><img src="screenshot11.png"/></a>
+<a href="big/screenshot001.png"><img src="screenshot001.png"/></a>
+<a href="big/screenshot002.png"><img src="screenshot002.png"/></a>
+<a href="big/screenshot003.png"><img src="screenshot003.png"/></a>
+<a href="big/screenshot004.png"><img src="screenshot004.png"/></a>
+<a href="big/screenshot005.png"><img src="screenshot005.png"/></a>
+<a href="big/screenshot006.png"><img src="screenshot006.png"/></a>
 </div>
 &copy; 2012 Michal Kosciesza
 </div>

diff --git a/www/screenshot001.png b/www/screenshot001.png
new file mode 100644 (file)
index 0000000..d6c9600
Binary files /dev/null and b/www/screenshot001.png differ

diff --git a/www/screenshot002.png b/www/screenshot002.png
new file mode 100644 (file)
index 0000000..60b9d84
Binary files /dev/null and b/www/screenshot002.png differ

diff --git a/www/screenshot003.png b/www/screenshot003.png
new file mode 100644 (file)
index 0000000..71dcfc4
Binary files /dev/null and b/www/screenshot003.png differ

diff --git a/www/screenshot004.png b/www/screenshot004.png
new file mode 100644 (file)
index 0000000..0a01c0f
Binary files /dev/null and b/www/screenshot004.png differ

diff --git a/www/screenshot005.png b/www/screenshot005.png
new file mode 100644 (file)
index 0000000..9192e8e
Binary files /dev/null and b/www/screenshot005.png differ

diff --git a/www/screenshot006.png b/www/screenshot006.png
new file mode 100644 (file)
index 0000000..aed2e28
Binary files /dev/null and b/www/screenshot006.png differ