New release 0.9.1-1

diff --git a/main.cpp b/main.cpp
index 10c7a09..4bdceea 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -16,6 +16,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
     Utils utils(&viewer,&settings);
 
     QString locale = settings.value("locale").toString();
+
     //qDebug() << "locale1=" << locale;
     if(locale!="pl_PL" && locale!="en_US") {
         locale = QLocale::system().name();

diff --git a/qml/ubi/About.qml b/qml/ubi/About.qml
deleted file mode 100644 (file)
index 2f26659..0000000
--- a/qml/ubi/About.qml
+++ /dev/null
@@ -1,24 +0,0 @@
-import QtQuick 1.0 // to target S60 5th Edition or Maemo 5
-import "UIConstants.js" as Const
-
-Item {
-    id: root
-    anchors.right: parent.right
-    anchors.left: parent.left
-
-    Rectangle {
-        anchors.right: parent.right
-        anchors.left: parent.left
-
-        height: Const.SHADOW_OFFSET
-        color: "black"
-        opacity: 0.4
-
-        /*height: Const.SYSTEM_BAR_HEIGHT + 3
-        y: 0
-        gradient: Gradient {
-            GradientStop { position: 0.9; color: "black" }
-            GradientStop { position: 1.0; color: Const.TRANSPARENT }
-        }*/
-    }
-}

diff --git a/qml/ubi/AccountPage.qml b/qml/ubi/AccountPage.qml
index 5354ef8..b5901b8 100644 (file)
--- a/qml/ubi/AccountPage.qml
+++ b/qml/ubi/AccountPage.qml
@@ -34,6 +34,17 @@ Page {
         //nick.text = account.nickname;
         email.text = account.email;
         storage.text = Conv.bytesToSize(account.total_storage);
+
+        U1.getRootNode(secrets,root);
+    }
+
+    function onRespRootNode(resp)
+    {
+        //console.log("onResp");
+        mask.state = "idle";
+        var ubytes = Conv.bytesToSize(resp.used_bytes);
+        var uprec = Math.round((resp.used_bytes/resp.max_bytes)*100);
+        used.text = ubytes+" ("+uprec+"%)";
     }
 
     function onErr(status)
@@ -127,6 +138,21 @@ Page {
                 wrapMode: Text.Wrap
                 width: root.width - 6*Const.DEFAULT_MARGIN
             }
+            Line {
+                width: root.width-2*Const.TEXT_MARGIN
+            }
+            Text {
+                font.pixelSize: 30
+                color: "white"
+                text: qsTr("Used:")
+            }
+            Text {
+                id: used
+                font.pixelSize: 30
+                color: "black"
+                wrapMode: Text.Wrap
+                width: root.width - 6*Const.DEFAULT_MARGIN
+            }
             Spacer{}
         }
     }

diff --git a/qml/ubi/FileSelector.qml b/qml/ubi/FileSelector.qml
index 6c534f8..24649b1 100644 (file)
--- a/qml/ubi/FileSelector.qml
+++ b/qml/ubi/FileSelector.qml
@@ -161,7 +161,7 @@ Item {
                     color: Const.TRANSPARENT
                     visible: root.folderOnly? folderModel.isFolder(index) : true
 
-                    File {
+                    FileOld {
                         id: file
                         anchors.verticalCenter: parent.verticalCenter
                         name: fileName

diff --git a/qml/ubi/FilesPage.qml b/qml/ubi/FilesPage.qml
index 52f5909..3eb523c 100644 (file)
--- a/qml/ubi/FilesPage.qml
+++ b/qml/ubi/FilesPage.qml
@@ -155,6 +155,8 @@ Page {
             }
             object.isDirectory = nodes[i].kind == "directory";
             object.properties = nodes[i];
+            object.width = root.width;
+            //object.height = 50;
             if(object.isDirectory) {
                 object.clicked.connect(function(prop) {
                             pageStack.push("FilesPage.qml");
@@ -170,6 +172,10 @@ Page {
         if(mask.state!="defocused") {
             mask.state = "idle";
         }
+
+        if(files.children.length==0) {
+            empty.visible = true;
+        }
     }
 
     Connections {
@@ -182,27 +188,30 @@ Page {
         width: parent.width
         height: parent.height
         contentHeight: files.height+Const.SYSTEM_BAR_HEIGHT+2*Const.TEXT_MARGIN
-        y: Const.SYSTEM_BAR_HEIGHT+Const.TEXT_MARGIN
+        //y: Const.SYSTEM_BAR_HEIGHT+Const.TEXT_MARGIN
+        y: Const.SYSTEM_BAR_HEIGHT+Const.DEFAULT_MARGIN
         contentWidth: parent.width
 
         Column {
             id: files
-            spacing: Const.DEFAULT_MARGIN
-            x: Const.TEXT_MARGIN
+            //spacing: Const.DEFAULT_MARGIN
+            //x: Const.TEXT_MARGIN
             add: Transition {
                 NumberAnimation { properties: "opacity"; easing.type: Easing.InOutQuad }
             }
-
-            /*Text {
-                font.pixelSize: Const.DEFAULT_FONT_PIXEL_SIZE
-                color: Const.DEFAULT_FOREGROUND_COLOR
-                text: "Empty"
-                font.italic: true
-                visible: files.children.length==1
-            }*/
         }
     }
 
+    Text {
+        id: empty
+        font.pixelSize: Const.DEFAULT_FONT_PIXEL_SIZE
+        color: Const.DEFAULT_FOREGROUND_COLOR
+        text: qsTr("Folder is empty.")
+        anchors.centerIn: parent
+        font.italic: true
+        visible: false
+    }
+
     FileSelector {
         id: fileSelector
         z: 200

diff --git a/qml/ubi/StartPage.qml b/qml/ubi/StartPage.qml
index 7e2b88c..532e9b2 100644 (file)
--- a/qml/ubi/StartPage.qml
+++ b/qml/ubi/StartPage.qml
@@ -111,6 +111,6 @@ Page {
         anchors.horizontalCenter: parent.horizontalCenter
         font.pixelSize: 18
         color: "white"
-        text: "ver. 0.9.0-2"
+        text: "ver. 0.9.1-1"
     }
 }

diff --git a/qml/ubi/components/Button.qml b/qml/ubi/components/Button.qml
index 77402fa..8c6cb6d 100644 (file)
--- a/qml/ubi/components/Button.qml
+++ b/qml/ubi/components/Button.qml
@@ -55,9 +55,9 @@ Item {
 
     onLabelChanged: {
         if(root.label.length>root.maxSize) {
-            console.log("root.label: "+root.label)
-            console.log("root.label.length: "+root.label.length)
-            console.log("root.maxSize: "+root.maxSize)
+            //console.log("root.label: "+root.label)
+            //console.log("root.label.length: "+root.label.length)
+            //console.log("root.maxSize: "+root.maxSize)
             textbox.text = root.label.substring(0,root.maxSize-3)+"...";
         } else {
             textbox.text = root.label;

diff --git a/qml/ubi/components/ButtonNew.qml b/qml/ubi/components/ButtonNew.qml
index fe9d6e7..2e752f2 100644 (file)
--- a/qml/ubi/components/ButtonNew.qml
+++ b/qml/ubi/components/ButtonNew.qml
@@ -57,9 +57,9 @@ Item {
 
     onLabelChanged: {
         if(root.label.length>root.maxSize) {
-            console.log("root.label: "+root.label)
-            console.log("root.label.length: "+root.label.length)
-            console.log("root.maxSize: "+root.maxSize)
+            //console.log("root.label: "+root.label)
+            //console.log("root.label.length: "+root.label.length)
+            //console.log("root.maxSize: "+root.maxSize)
             textbox.text = root.label.substring(0,root.maxSize-3)+"...";
         } else {
             textbox.text = root.label;

diff --git a/qml/ubi/components/File.qml b/qml/ubi/components/File.qml
index 8dff818..8b5dde8 100644 (file)
--- a/qml/ubi/components/File.qml
+++ b/qml/ubi/components/File.qml
@@ -12,12 +12,12 @@ Item {
 
     state: mouseArea.pressed && !root.disabled ? "pressed" : "unpressed"
 
-    width: box.width
+    //width: box.width
     height: box.height
 
     signal clicked(variant prop)
 
-    Rectangle {
+    /*Rectangle {
         id: shadow
         width: box.width
         height: box.height
@@ -25,40 +25,68 @@ Item {
         radius: 10
         x: Const.SHADOW_OFFSET;
         y: Const.SHADOW_OFFSET;
-    }
+    }*/
 
     Rectangle {
         id: box
-        color: root.isDirectory ? "black" : "white"
-        height: label.height+20
-        width: label.width<=100 ? 120 : label.width+20
-        radius: 10
+        color: Const.TRANSPARENT
+        height: label.height+3*Const.DEFAULT_MARGIN
+        width: root.width
     }
 
     Rectangle {
-        width: box.width
+        width: box.width-2*Const.TEXT_MARGIN+2*Const.DEFAULT_MARGIN
         height: box.height
         x: box.x
         y: box.y
-        color: root.isDirectory ? "white" : "black"
-        opacity: 0.5
+        //color: root.isDirectory ? "white" : "black"
+        color: Const.DEFAULT_DIALOG_FOREGROUND_COLOR
+        anchors.verticalCenter: box.verticalCenter
+        anchors.horizontalCenter: box.horizontalCenter
+        opacity: 0.4
         radius: 10
         visible: mouseArea.pressed
     }
 
+    Image {
+        id: icon
+        width: 40
+        height: 40
+        x: Const.TEXT_MARGIN
+        source: root.isDirectory ? "../images/folder.png" : "../images/file-black.png"
+        sourceSize.width: width
+        sourceSize.height: height
+        anchors.verticalCenter: box.verticalCenter
+    }
+
     Text {
         id: label
-        x: 10
-        y: 10
+        x: Const.TEXT_MARGIN + icon.width + Const.DEFAULT_MARGIN
         font.pixelSize: 30
         color: root.isDirectory ? "white" : "black"
-        elide: Text.ElideLeft
-        anchors.centerIn: box
+        //color: "white"
+        elide: Text.ElideRight
         wrapMode: Text.Wrap
-        onTextChanged: {
+        width: root.width-x-Const.TEXT_MARGIN-Const.DEFAULT_MARGIN-arrow.width
+
+        //width: root.width
+        anchors.verticalCenter: box.verticalCenter
+        /*onTextChanged: {
             if(text.length>root.textMax)
                 root.name = text.substring(0,root.textMax-3)+"...";
-        }
+        }*/
+    }
+
+    Image {
+        id: arrow
+        width: 12
+        height: 20
+        anchors.right: box.right
+        anchors.margins: Const.TEXT_MARGIN
+        source: root.isDirectory ? "../images/arrow-frw.png" : "../images/arrow-frw-black.png"
+        sourceSize.width: width
+        sourceSize.height: height
+        anchors.verticalCenter: box.verticalCenter
     }
 
     MouseArea {
@@ -70,7 +98,7 @@ Item {
         }
     }
 
-    states: [
+    /*states: [
         State {
             name: "unpressed"
             PropertyChanges {target: shadow; x: Const.SHADOW_OFFSET}
@@ -85,5 +113,5 @@ Item {
             PropertyChanges {target: box; x: Const.SHADOW_OFFSET}
             PropertyChanges {target: box; y: Const.SHADOW_OFFSET}
         }
-    ]
+    ]*/
 }

diff --git a/qml/ubi/components/FileOld.qml b/qml/ubi/components/FileOld.qml
new file mode 100644 (file)
index 0000000..8dff818
--- /dev/null
+++ b/qml/ubi/components/FileOld.qml
@@ -0,0 +1,89 @@
+import QtQuick 1.0 // to target S60 5th Edition or Maemo 5
+import "../UIConstants.js" as Const
+
+
+Item {
+    id: root
+    property alias name: label.text
+    property bool isDirectory: false
+    property variant properties: null
+    property string filename: ""
+    property int textMax: 27
+
+    state: mouseArea.pressed && !root.disabled ? "pressed" : "unpressed"
+
+    width: box.width
+    height: box.height
+
+    signal clicked(variant prop)
+
+    Rectangle {
+        id: shadow
+        width: box.width
+        height: box.height
+        color: Const.SHADOW_COLOR;
+        radius: 10
+        x: Const.SHADOW_OFFSET;
+        y: Const.SHADOW_OFFSET;
+    }
+
+    Rectangle {
+        id: box
+        color: root.isDirectory ? "black" : "white"
+        height: label.height+20
+        width: label.width<=100 ? 120 : label.width+20
+        radius: 10
+    }
+
+    Rectangle {
+        width: box.width
+        height: box.height
+        x: box.x
+        y: box.y
+        color: root.isDirectory ? "white" : "black"
+        opacity: 0.5
+        radius: 10
+        visible: mouseArea.pressed
+    }
+
+    Text {
+        id: label
+        x: 10
+        y: 10
+        font.pixelSize: 30
+        color: root.isDirectory ? "white" : "black"
+        elide: Text.ElideLeft
+        anchors.centerIn: box
+        wrapMode: Text.Wrap
+        onTextChanged: {
+            if(text.length>root.textMax)
+                root.name = text.substring(0,root.textMax-3)+"...";
+        }
+    }
+
+    MouseArea {
+        id: mouseArea
+        width: box.width
+        height: box.height
+        onClicked: {
+            root.clicked(root.properties);
+        }
+    }
+
+    states: [
+        State {
+            name: "unpressed"
+            PropertyChanges {target: shadow; x: Const.SHADOW_OFFSET}
+            PropertyChanges {target: shadow; y: Const.SHADOW_OFFSET}
+            PropertyChanges {target: box; x: 0}
+            PropertyChanges {target: box; y: 0}
+        },
+        State {
+            name: "pressed"
+            PropertyChanges {target: shadow; x: Const.SHADOW_OFFSET}
+            PropertyChanges {target: shadow; y: Const.SHADOW_OFFSET}
+            PropertyChanges {target: box; x: Const.SHADOW_OFFSET}
+            PropertyChanges {target: box; y: Const.SHADOW_OFFSET}
+        }
+    ]
+}

diff --git a/qml/ubi/images/arrow-frw-black.png b/qml/ubi/images/arrow-frw-black.png
new file mode 100644 (file)
index 0000000..c64b2cc
Binary files /dev/null and b/qml/ubi/images/arrow-frw-black.png differ

diff --git a/qml/ubi/images/arrow-frw.png b/qml/ubi/images/arrow-frw.png
new file mode 100644 (file)
index 0000000..af4e39e
Binary files /dev/null and b/qml/ubi/images/arrow-frw.png differ

diff --git a/qml/ubi/images/file-black.png b/qml/ubi/images/file-black.png
new file mode 100644 (file)
index 0000000..760776c
Binary files /dev/null and b/qml/ubi/images/file-black.png differ

diff --git a/qml/ubi/images/file.png b/qml/ubi/images/file.png
new file mode 100644 (file)
index 0000000..7873bc9
Binary files /dev/null and b/qml/ubi/images/file.png differ

diff --git a/qml/ubi/images/folder.png b/qml/ubi/images/folder.png
new file mode 100644 (file)
index 0000000..2ac114e
Binary files /dev/null and b/qml/ubi/images/folder.png differ

diff --git a/qml/ubi/main.qml b/qml/ubi/main.qml
index 918c2e9..4f7021a 100644 (file)
--- a/qml/ubi/main.qml
+++ b/qml/ubi/main.qml
@@ -48,7 +48,7 @@ Rectangle {
 
     Rectangle {
         color: "black"
-        width: 2
+        width: 1
         anchors.left: parent.left
         anchors.top: parent.top
         anchors.bottom: parent.bottom

diff --git a/qml/ubi/u1.js b/qml/ubi/u1.js
index bd5094d..0cc3521 100644 (file)
--- a/qml/ubi/u1.js
+++ b/qml/ubi/u1.js
@@ -148,6 +148,25 @@ function getFiles(secrets,rootNode,root)
     xhr.send();
 }
 
+function getRootNode(secrets,root)
+{
+    var url = "https://one.ubuntu.com/api/file_storage/v1";
+    var xhr = oAuthRequest(url,secrets);
+    xhr.onreadystatechange = function() {
+                if(xhr.readyState===4) {
+                    if(xhr.status>=400||xhr.status===0) {
+                        console.log(xhr.status);
+                        root.onErr(xhr.status);
+                    } else {
+                        //console.log(xhr.responseText);
+                        var resp = eval('('+xhr.responseText+')');
+                        root.onRespRootNode(resp);
+                    }
+                }
+            }
+    xhr.send();
+}
+
 function getFileTree(secrets,root)
 {
     var url = "https://one.ubuntu.com/api/file_storage/v1";

diff --git a/qtc_packaging/debian_fremantle/changelog b/qtc_packaging/debian_fremantle/changelog
index 8806fd6..ed0359a 100644 (file)
--- a/qtc_packaging/debian_fremantle/changelog
+++ b/qtc_packaging/debian_fremantle/changelog
@@ -1,3 +1,10 @@
+ubi (0.9.1-1) unstable; urgency=low
+
+  * Used storage information in Account tab
+  * Redesign of files presentation
+
+ -- Michal Kosciesza <mkiol@o2.pl>  Wed, 02 May 2012 13:50:34 +0200
+
 ubi (0.9.0-2) unstable; urgency=low
 
   * Update pl_PL translation

diff --git a/qtc_packaging/debian_fremantle/changelog~ b/qtc_packaging/debian_fremantle/changelog~
index 2ff6e80..ed0359a 100644 (file)
--- a/qtc_packaging/debian_fremantle/changelog~
+++ b/qtc_packaging/debian_fremantle/changelog~
@@ -1,3 +1,16 @@
+ubi (0.9.1-1) unstable; urgency=low
+
+  * Used storage information in Account tab
+  * Redesign of files presentation
+
+ -- Michal Kosciesza <mkiol@o2.pl>  Wed, 02 May 2012 13:50:34 +0200
+
+ubi (0.9.0-2) unstable; urgency=low
+
+  * Update pl_PL translation
+
+ -- Michal Kosciesza <mkiol@o2.pl>  Sat, 28 Apr 2012 10:39:53 +0200
+
 ubi (0.9.0-1) unstable; urgency=low
 
   * Update Icon and Section information

diff --git a/qtc_packaging/debian_harmattan/changelog b/qtc_packaging/debian_harmattan/changelog
index 8806fd6..ed0359a 100644 (file)
--- a/qtc_packaging/debian_harmattan/changelog
+++ b/qtc_packaging/debian_harmattan/changelog
@@ -1,3 +1,10 @@
+ubi (0.9.1-1) unstable; urgency=low
+
+  * Used storage information in Account tab
+  * Redesign of files presentation
+
+ -- Michal Kosciesza <mkiol@o2.pl>  Wed, 02 May 2012 13:50:34 +0200
+
 ubi (0.9.0-2) unstable; urgency=low
 
   * Update pl_PL translation

diff --git a/translations/ubi.pl.qm b/translations/ubi.pl.qm
index 39bf0d0..c6d0546 100644 (file)
Binary files a/translations/ubi.pl.qm and b/translations/ubi.pl.qm differ

diff --git a/translations/ubi.pl.ts b/translations/ubi.pl.ts
index 471e08b..7d5fcdd 100644 (file)
--- a/translations/ubi.pl.ts
+++ b/translations/ubi.pl.ts
@@ -31,6 +31,10 @@
         <source>Unable to connect!</source>
         <translation>Błąd połączenia!</translation>
     </message>
+    <message>
+        <source>Used:</source>
+        <translation>Wykorzystano:</translation>
+    </message>
 </context>
 <context>
     <name>DialogYesNo</name>
@@ -124,6 +128,10 @@
         <source>Enter new folder name:</source>
         <translation>Podaj nową nazwę folderu:</translation>
     </message>
+    <message>
+        <source>Folder is empty.</source>
+        <translation>Folder jest pusty.</translation>
+    </message>
 </context>
 <context>
     <name>LoginPage</name>

diff --git a/ubi.pro b/ubi.pro
index 7f89259..6879a5b 100644 (file)
--- a/ubi.pro
+++ b/ubi.pro
@@ -42,24 +42,24 @@ maemo5 {
 SOURCES += main.cpp \
     utils.cpp
 
-evil_hack_to_fool_lupdate {
-    SOURCES += \
-    qml/ubi/AccountPage.qml \
-    qml/ubi/DownloadArea.qml \
-    qml/ubi/FileSelector.qml \
-    qml/ubi/FilesPage.qml \
-    qml/ubi/LoginPage.qml \
-    qml/ubi/main.qml \
-    qml/ubi/PageStack.qml \
-    qml/ubi/PropertiesPage.qml \
-    qml/ubi/SettingsPage.qml \
-    qml/ubi/Shadow.qml \
-    qml/ubi/StartPage.qml \
-    qml/ubi/SystemBar.qml \
-    qml/ubi/TaskBar.qml \
-    qml/ubi/DownloadProgressBar.qml \
-    qml/ubi/components/DialogYesNo.qml
-}
+#evil_hack_to_fool_lupdate {
+#    SOURCES += \
+#    qml/ubi/AccountPage.qml \
+#    qml/ubi/DownloadArea.qml \
+#    qml/ubi/FileSelector.qml \
+#    qml/ubi/FilesPage.qml \
+#    qml/ubi/LoginPage.qml \
+#    qml/ubi/main.qml \
+#    qml/ubi/PageStack.qml \
+#    qml/ubi/PropertiesPage.qml \
+#    qml/ubi/SettingsPage.qml \
+#    qml/ubi/Shadow.qml \
+#    qml/ubi/StartPage.qml \
+#    qml/ubi/SystemBar.qml \
+#    qml/ubi/TaskBar.qml \
+#    qml/ubi/DownloadProgressBar.qml \
+#    qml/ubi/components/DialogYesNo.qml
+#}
 
 # Please do not modify the following two lines. Required for deployment.
 include(qmlapplicationviewer/qmlapplicationviewer.pri)
@@ -83,7 +83,7 @@ OTHER_FILES += \
 HEADERS += \
     utils.h
 
-TRANSLATIONS += translations/ubi.pl.ts
+#TRANSLATIONS += translations/ubi.pl.ts
 
 RESOURCES += \
     ubi.qrc

diff --git a/ubi.pro.user b/ubi.pro.user
index e28048b..6a64e4d 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-04-30T08:53:31. -->
+<!-- Written by Qt Creator 2.4.1, 2012-05-02T15:16:25. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -56,7 +56,7 @@
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
-    <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value>
+    <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./home/mkiol/dev/QtSDK/debugger/Desktop/bin/gdb</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
@@ -106,7 +106,7 @@
     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
-    <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value>
+    <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./home/mkiol/dev/QtSDK/debugger/Desktop/bin/gdb</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
@@ -156,7 +156,7 @@
     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
-    <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value>
+    <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./home/mkiol/dev/QtSDK/debugger/Desktop/bin/gdb</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
@@ -206,7 +206,7 @@
     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.3">
-    <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value>
+    <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./home/mkiol/dev/QtSDK/debugger/Desktop/bin/gdb</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
@@ -442,6 +442,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_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>
       </valuelist>
       <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts">
        <value type="QString">192.168.2.101</value>
@@ -450,6 +451,7 @@
        <value type="QString">192.168.2.100</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>
@@ -458,6 +460,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>
@@ -466,6 +469,7 @@
        <value type="QDateTime">2012-04-22T22:36:27</value>
        <value type="QDateTime">2012-04-20T23:23:40</value>
        <value type="QDateTime">2012-04-28T10:41:48</value>
+       <value type="QDateTime">2012-05-02T14:37:35</value>
       </valuelist>
      </valuemap>
      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">3</value>
@@ -824,7 +828,7 @@
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
-    <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value>
+    <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./home/mkiol/dev/QtSDK/debugger/Desktop/bin/gdb</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
@@ -874,7 +878,7 @@
     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
-    <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value>
+    <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./home/mkiol/dev/QtSDK/debugger/Desktop/bin/gdb</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>

diff --git a/ubi.qrc b/ubi.qrc
index 3bb3040..9bc05f2 100644 (file)
--- a/ubi.qrc
+++ b/ubi.qrc
@@ -1,7 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>translations/ubi.pl.qm</file>
-        <file>qml/ubi/About.qml</file>
         <file>qml/ubi/AccountPage.qml</file>
         <file>qml/ubi/bytesconv.js</file>
         <file>qml/ubi/DownloadArea.qml</file>
@@ -20,6 +18,9 @@
         <file>qml/ubi/TaskBar.qml</file>
         <file>qml/ubi/u1.js</file>
         <file>qml/ubi/UIConstants.js</file>
+        <file>qml/ubi/oauth/oauth.js</file>
+        <file>qml/ubi/oauth/README.txt</file>
+        <file>qml/ubi/oauth/sha1.js</file>
         <file>qml/ubi/components/Bar.qml</file>
         <file>qml/ubi/components/Button.qml</file>
         <file>qml/ubi/components/ButtonNew.qml</file>
@@ -36,13 +37,15 @@
         <file>qml/ubi/components/Spacer.qml</file>
         <file>qml/ubi/components/TextField.qml</file>
         <file>qml/ubi/components/ToolIcon.qml</file>
-        <file>qml/ubi/oauth/oauth.js</file>
-        <file>qml/ubi/oauth/README.txt</file>
-        <file>qml/ubi/oauth/sha1.js</file>
+        <file>qml/ubi/images/arrow-frw.png</file>
+        <file>qml/ubi/images/arrow-frw-black.png</file>
         <file>qml/ubi/images/back.png</file>
         <file>qml/ubi/images/close.png</file>
         <file>qml/ubi/images/down.png</file>
         <file>qml/ubi/images/download.png</file>
+        <file>qml/ubi/images/file.png</file>
+        <file>qml/ubi/images/file-black.png</file>
+        <file>qml/ubi/images/folder.png</file>
         <file>qml/ubi/images/menu.png</file>
         <file>qml/ubi/images/menu-arrow.png</file>
         <file>qml/ubi/images/menu-arrow-grey.png</file>
@@ -54,5 +57,7 @@
         <file>qml/ubi/images/ubi50.png</file>
         <file>qml/ubi/images/up.png</file>
         <file>qml/ubi/images/upload.png</file>
+        <file>translations/ubi.pl.qm</file>
+        <file>qml/ubi/components/FileOld.qml</file>
     </qresource>
 </RCC>

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

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

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

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

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

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

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

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

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

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

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

diff --git a/www/index.html b/www/index.html
index bf9bc9a..835798e 100644 (file)
--- a/www/index.html
+++ b/www/index.html
@@ -15,6 +15,10 @@ a {
   text-decoration: none;
   border-bottom: 1px dotted white;
 }
+#screenshots a {
+  text-decoration: none;
+  border: 0
+}
 ul {
   list-style: square;
 }
@@ -77,18 +81,18 @@ Links:
 </ul>
 </p>
 
-<div>
+<div id="screenshots">
 <br/>
-<img src="screenshot00.png"/>
-<img src="screenshot04.png"/>
-<img src="screenshot05.png"/>
-<img src="screenshot06.png"/>
-<img src="screenshot09.png"/>
-<img src="screenshot10.png"/>
-<img src="screenshot11.png"/>
-<img src="screenshot12.png"/>
-<img src="screenshot13.png"/>
-<img src="screenshot14.png"/>
+<a href="big/screenshot00.png"><img src="screenshot00.png"/></a>
+<a href="big/screenshot04.png"><img src="screenshot04.png"/></a>
+<a href="big/screenshot05.png"><img src="screenshot05.png"/></a>
+<a href="big/screenshot06.png"><img src="screenshot06.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/screenshot12.png"><img src="screenshot12.png"/></a>
+<a href="big/screenshot13.png"><img src="screenshot13.png"/></a>
+<a href="big/screenshot14.png"><img src="screenshot14.png"/></a>
 </div>
 
 <div id="foot">

diff --git a/www/screenshot04.png b/www/screenshot04.png
index 7d78b71..aae7e62 100644 (file)
Binary files a/www/screenshot04.png and b/www/screenshot04.png differ

diff --git a/www/screenshot09.png b/www/screenshot09.png
index ccf2ccd..a26f7f7 100644 (file)
Binary files a/www/screenshot09.png and b/www/screenshot09.png differ

diff --git a/www/screenshot10.png b/www/screenshot10.png
index 818ff66..b4939c9 100644 (file)
Binary files a/www/screenshot10.png and b/www/screenshot10.png differ