0.9.3-1 release
authorMuki <mkiol@o2.pl>
Sat, 19 May 2012 06:12:43 +0000 (08:12 +0200)
committerMuki <mkiol@o2.pl>
Sat, 19 May 2012 06:12:43 +0000 (08:12 +0200)
39 files changed:
main.cpp
qml/ubi/AccountPage.qml
qml/ubi/DownloadArea.qml
qml/ubi/DownloadProgressBar.qml [deleted file]
qml/ubi/FileSelector.qml [deleted file]
qml/ubi/FilesPage.qml
qml/ubi/InitPage.qml
qml/ubi/LoginPage.qml
qml/ubi/Page.qml
qml/ubi/PageStack.qml
qml/ubi/PropertiesPage.qml
qml/ubi/SettingsPage.qml
qml/ubi/StartPage.qml [deleted file]
qml/ubi/SystemBar.qml
qml/ubi/TaskMenu.qml
qml/ubi/TopBar.qml
qml/ubi/components/Bar.qml
qml/ubi/components/BusyIndicator.qml
qml/ubi/components/Button.qml
qml/ubi/components/ButtonGlass.qml [deleted file]
qml/ubi/components/ButtonNew.qml
qml/ubi/components/ButtonResizable.qml
qml/ubi/components/File.qml
qml/ubi/components/Line.qml
qml/ubi/components/Mask.qml
qml/ubi/components/Notification.qml [deleted file]
qml/ubi/components/NotificationNew.qml
qml/ubi/components/Showable.qml
qml/ubi/components/Spacer.qml
qml/ubi/components/ToolIcon.qml [deleted file]
qml/ubi/main.qml
qtc_packaging/debian_fremantle/changelog
qtc_packaging/debian_fremantle/changelog~
qtc_packaging/debian_harmattan/changelog
qtc_packaging/debian_harmattan/changelog~
ubi.pro
ubi.pro.user
ubi.qrc
ubi.zip

index c51513a..b30bc56 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -17,22 +17,19 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
 
     QString locale = settings.value("locale").toString();
 
-    //qDebug() << "locale1=" << locale;
     if(locale!="pl_PL" && locale!="en_US") {
         locale = QLocale::system().name();
-        //qDebug() << "locale2=" << locale;
         if(locale!="pl_PL") {
             locale="en_US";
         }
         settings.setValue("locale",locale);
     }
 
-    //qDebug() << "locale3=" << locale;
     QTranslator translator;
-    QString dir = "translations";
-    //QString dir = ":/translations";
+    //QString dir = "translations";
+    QString dir = ":/translations";
 #if defined(Q_WS_MAEMO_5)
-    dir = "/opt/ubi/"+dir;
+    //dir = "/opt/ubi/"+dir;
 #endif
     if (translator.load(QString("ubi.")+locale,dir)) {
         app->installTranslator(&translator);
@@ -48,8 +45,8 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
 #if defined(Q_WS_MAEMO_5)
     //viewer.engine()->addImportPath(QString("/opt/qtm12/imports"));
 #endif
-    viewer.setMainQmlFile(QLatin1String("qml/ubi/main.qml"));
-    //viewer.setSource(QUrl("qrc:///qml/ubi/main.qml"));
+    //viewer.setMainQmlFile(QLatin1String("qml/ubi/main.qml"));
+    viewer.setSource(QUrl("qrc:///qml/ubi/main.qml"));
     viewer.setWindowTitle(QString("Ubi"));
 
 #if defined(Q_WS_MAEMO_5)
index 44a000a..81bccb4 100644 (file)
@@ -27,25 +27,17 @@ Page {
 
     function onResp(secrets,account)
     {
-        //console.log("onResp");
         mask.state = "idle";
-
-        //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);
     }
 
     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);
@@ -54,7 +46,6 @@ Page {
 
     function onErr(status)
     {
-        //console.log("onErr");
         mask.state = "idle";
         if(status==401) {
             tip.show(qsTr("Ubuntu One authorization has failed. Try once again or check login settings."));
@@ -78,23 +69,12 @@ Page {
             spacing: Const.DEFAULT_MARGIN
             x: Const.TEXT_MARGIN
 
-            /*Text {
-                font.pixelSize: 30
-                color: "white"
-                text: "Id:"
-            }
-            Text {
-                id: uid
-                font.pixelSize: 30
-                color: "black"
-                wrapMode: Text.Wrap
-                width: root.width - 6*Const.DEFAULT_MARGIN
-            }*/
             Text {
                 font.pixelSize: 30
                 color: "white"
                 text: qsTr("User name:")
             }
+
             Text {
                 id: username
                 font.pixelSize: 30
@@ -102,26 +82,17 @@ 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("Nickname:")
-            }
-            Text {
-                id: nick
-                font.pixelSize: 30
-                color: "black"
-                wrapMode: Text.Wrap
-                width: root.width - 6*Const.DEFAULT_MARGIN
-            }*/
+
             Text {
                 font.pixelSize: 30
                 color: "white"
                 text: qsTr("Email:")
             }
+
             Text {
                 id: email
                 font.pixelSize: 30
@@ -129,14 +100,17 @@ 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("Total storage:")
             }
+
             Text {
                 id: storage
                 font.pixelSize: 30
@@ -144,14 +118,17 @@ 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
@@ -159,6 +136,7 @@ Page {
                 wrapMode: Text.Wrap
                 width: root.width - 6*Const.DEFAULT_MARGIN
             }
+
             Spacer{}
         }
     }
index 62554a6..f010c3b 100644 (file)
@@ -7,19 +7,10 @@ Item {
 
     property int count: 0
 
-    /*Rectangle {
-        anchors.fill: parent
-        color: "red"
-    }*/
-
     height: taskView.height+Const.DEFAULT_MARGIN
 
     function addTask(type,filename)
     {
-        //emptyLabel.visible = Utils.emptyQuee();
-        //emptyLabel.visible = false;
-        //console.log("1. taskView.childrens.length: "+taskView.children.length);
-        //console.log("1. taskView.height: "+taskView.height);
         var comp = Qt.createComponent("components/Bar.qml");
         //var obj = comp.createObject(taskView,{"width": root.width});
         var obj = comp.createObject(taskView);
@@ -37,8 +28,6 @@ Item {
             if(type=="upload")
                 obj.isUpload = true;
         }
-        //console.log("2. taskView.childrens.length: "+taskView.children.length);
-        //console.log("2. taskView.height: "+taskView.height);
     }
 
     function setProgress(filename, progress)
@@ -67,8 +56,6 @@ Item {
 
     function stop(filename)
     {
-        //console.log("stop task");
-        //console.log("3. taskView.childrens.length: "+taskView.children.length);
         var l = taskView.children.length;
         for(var i=0;i<l;++i) {
             var item = taskView.children[i];
@@ -79,8 +66,6 @@ Item {
                 return;
             }
         }
-        //console.log("4. taskView.childrens.length: "+taskView.children.length);
-        //emptyLabel.visible = Utils.emptyQuee();
     }
 
     Column {
@@ -88,8 +73,6 @@ Item {
         width: parent.width
         spacing: Const.DEFAULT_MARGIN
 
-        //onHeightChanged: console.log("takView.height: "+height)
-
         Text {
             font.pixelSize: Const.DEFAULT_FONT_PIXEL_SIZE
             color: Const.DEFAULT_FOREGROUND_COLOR
diff --git a/qml/ubi/DownloadProgressBar.qml b/qml/ubi/DownloadProgressBar.qml
deleted file mode 100644 (file)
index 082cc80..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-import QtQuick 1.0 // to target S60 5th Edition or Maemo 5
-import "UIConstants.js" as Const
-
-Rectangle {
-    id: root
-    height: 20
-    width: 200
-    state: "invisible"
-    color: Const.TRANSPARENT
-    border.width: 1
-    radius: 5
-    border.color: Const.DEFAULT_FOREGROUND_COLOR
-
-    Rectangle {
-        id: bar
-        height: parent.height
-        width: root.width/2
-        x:0
-        radius: 5
-        color: Const.DEFAULT_FOREGROUND_COLOR
-        state: "right"
-
-        states: [
-            State {
-                name: "right"
-            },
-            State {
-                name: "left"
-            },
-            State {
-                name: "progress"
-            }
-        ]
-    }
-
-    function setProgres(progress) {
-        //console.log("proggress = "+progress);
-        if(bar.state!="progress") {
-            time.stop();
-            bar.state = "progress"
-            bar.x=0;
-        }
-        bar.width = root.width*progress;
-        if(progress==1)
-            stopDownload();
-    }
-    function startDownload() {
-        //console.log("start download");
-        bar.width=root.width/2;
-        bar.x=0;
-        state = "visible";
-        time.restart();
-    }
-    function stopDownload() {
-        //console.log("stop download");
-        state = "invisible";
-    }
-
-    Timer {
-        id: time
-        interval: 10
-        repeat: true
-        onTriggered: {
-            if(bar.x+bar.width>=root.width)
-                bar.state = "left";
-            if(bar.x<=0)
-                bar.state = "right";
-
-            if(bar.state=="right")
-                bar.x += 6;
-            else if(bar.state=="left")
-                bar.x -= 6;
-        }
-    }
-
-    states: [
-        State {
-            name: "visible"
-            PropertyChanges { target: root; opacity: 1 }
-        },
-        State {
-            name: "invisible"
-            PropertyChanges { target: root; opacity: 0 }
-        }
-    ]
-
-    transitions: Transition {
-        NumberAnimation { properties: "opacity"; easing.type: Easing.InOutQuad }
-    }
-}
diff --git a/qml/ubi/FileSelector.qml b/qml/ubi/FileSelector.qml
deleted file mode 100644 (file)
index 5c0d2cb..0000000
+++ /dev/null
@@ -1,224 +0,0 @@
-import QtQuick 1.0 // to target S60 5th Edition or Maemo 5
-import "components"
-import "UIConstants.js" as Const
-import Qt 4.7
-import Qt.labs.folderlistmodel 1.0
-
-
-Item {
-    id: root
-
-    property string currentFilePath: fileSelector.currentFilePath
-    property bool load: fileSelector.load
-    property alias folder: folderModel.folder
-    property bool folderOnly: true
-
-    state: "invisible"
-
-    signal folderSelected(string folder)
-    signal fileSelected(string folder, string file)
-
-    height: parent.height
-    width: parent.width
-
-    function fixPath(path) {
-        path = path.toString();
-        //console.log(path);
-        var ind = path.lastIndexOf("/");
-        if(ind>=0) {
-            path = path.substr(ind+1);
-        }
-        if(path=="") path = "/";
-
-        return path;
-    }
-
-    function open() {
-        state = "visible";
-    }
-
-    function close() {
-        state = "invisible";
-    }
-
-    Rectangle {
-        id: fileSelector
-
-        width: parent.width
-        height: parent.height
-        radius: 10
-
-        property string currentFilePath: folderModel.folder
-        property bool load: true
-        property string folder: folderModel.folder
-
-        state: "invisible"
-        color: Const.DEFAULT_DIALOG_BACKGROUND_COLOR
-
-        function setFolder(folder)
-        {
-            console.log(root.folder);
-            console.log(folder);
-
-            folderAnimation.folderToChange = folder;
-            folderAnimation.start();
-        }
-
-        function loadFile(filePath) {
-            engine.clearModels();
-            storageThread.loadByUrl(filePath);
-            fileSelector.currentFilePath = filePath;
-            gestureListView.currentSetFilename =
-                    helper.extractFilenameFromPath(filePath);
-
-            if (!viewSwitcher.running) {
-                viewSwitcher.switchView(gestureListView, true);
-            }
-        }
-
-        function saveFile(filePath) {
-            helper.saveGestures(filePath, engine);
-            gestureListView.currentSetFilename =
-                    helper.extractFilenameFromPath(filePath);
-
-            if (!viewSwitcher.running) {
-                viewSwitcher.switchView(gestureListView, true);
-            }
-        }
-
-        Rectangle {
-            id: pathController
-            width: parent.width
-            height: 80
-            anchors.top: parent.top
-            z: 1
-            color: Const.LIGHT_AUBERGINE_COLOR
-
-            Column {
-                anchors.horizontalCenter: parent.horizontalCenter
-                width: parent.width - 2 * Const.DEFAULT_MARGIN
-                height: parent.height - Const.DEFAULT_MARGIN
-
-                Spacer {}
-
-                Row {
-                    width: parent.width
-                    spacing: Const.DEFAULT_MARGIN
-
-                    Button {
-                        id: currentFolderButton
-                        maxSize: 12
-                        label: fixPath(folderModel.folder)
-                        width: pathController.width-folderUpButton.width-cancelButton.width-4*Const.DEFAULT_MARGIN
-                        onButtonClicked: root.folderSelected(folderModel.folder)
-                        disabled: !root.folderOnly
-                    }
-                    Button {
-                        id: folderUpButton
-                        label: "up"
-                        iconSource: "images/up.png"
-                        onButtonClicked: fileSelector.setFolder(folderModel.parentFolder);
-                    }
-                    Button {
-                        id: cancelButton
-                        label: "cancel"
-                        iconSource: "images/close.png"
-                        onButtonClicked: {
-                            root.close();
-                            mask.state = "idle";
-                        }
-                    }
-                }
-            }
-
-        } // pathController
-
-        Shadow {
-            y: pathController.height
-            z: 1
-        }
-
-        Rectangle {
-            id: folderModelContainer
-            width: parent.width
-            anchors.top: pathController.bottom;
-            anchors.bottom: parent.bottom
-            color: Const.TRANSPARENT
-            radius: 30
-
-            FolderListModel {
-                id: folderModel
-                //folder: "/"
-                //nameFilters: [ "*.*" ]
-            }
-
-            Component {
-                id: folderModelDelegate
-
-                Rectangle {
-                    width: parent.width;
-                    height: folderModel.isFolder(index)? file.height + Const.DEFAULT_MARGIN : root.folderOnly? 0 : file.height + Const.DEFAULT_MARGIN
-                    color: Const.TRANSPARENT
-                    visible: root.folderOnly? folderModel.isFolder(index) : true
-
-                    FileOld {
-                        id: file
-                        anchors.verticalCenter: parent.verticalCenter
-                        name: fileName
-                        filename: fileName
-                        isDirectory: folderModel.isFolder(index)
-                        textMax: root.width/18
-                        onClicked: {
-                            if(isDirectory)
-                                fileSelector.setFolder(filePath);
-                            else
-                                root.fileSelected(folderModel.folder,filename)
-                        }
-                    }
-                }
-            } // Component
-
-            ListView {
-                id: folderModelView
-
-                anchors {
-                    fill: parent;
-                    margins: Const.TEXT_MARGIN
-                }
-
-                model: folderModel
-                delegate: folderModelDelegate
-
-                SequentialAnimation {
-                    id: folderAnimation
-
-                    property string folderToChange
-
-                    PropertyAnimation { target: folderModelView; property: "opacity"; to: 0; duration: 100 }
-                    PropertyAction { target: folderModel; property: "folder"; value: folderAnimation.folderToChange }
-                    PropertyAnimation { target: folderModelView; property: "opacity"; to: 1.0; duration: 100 }
-                }
-            }
-
-        } // folderModelContainer
-    }
-
-    states: [
-        State {
-            name: "visible"
-            PropertyChanges { target: root; opacity: 1 }
-            PropertyChanges { target: root; y: Const.SYSTEM_BAR_HEIGHT }
-        },
-        State {
-            name: "invisible"
-            PropertyChanges { target: root; opacity: 0 }
-            PropertyChanges { target: root; y: root.parent.height }
-        }
-    ]
-
-    transitions: Transition {
-        NumberAnimation { properties: "opacity"; easing.type: Easing.InOutQuad }
-        NumberAnimation { properties: "y"; easing.type: Easing.InOutQuad }
-    }
-}
-
index ebbf02e..8af530b 100644 (file)
@@ -54,7 +54,6 @@ Page {
 
     function onErr(status)
     {
-        //console.log("onErr");
         mask.state = "idle";
         if(status==401) {
             tip.show(qsTr("Ubuntu One authorization has failed. Try once again or check login settings."));
@@ -70,7 +69,6 @@ Page {
 
     function onRespRename()
     {
-        //console.log("onRespRename");
         pageStack.prevPage().init();
         mask.state = "idle";
         tip.show(qsTr("Folder renamed!"));
@@ -78,7 +76,6 @@ Page {
 
     function onErrRename(status)
     {
-        //console.log("onErrRenamed");
         mask.state = "idle";
         if(status==401) {
             tip.show(qsTr("Ubuntu One authorization has failed. Try once again or check login settings."));
@@ -89,7 +86,6 @@ Page {
 
     function onRespNew()
     {
-        //console.log("onRespNew");
         pageStack.currentPage.init();
         mask.state = "idle";
         tip.show(qsTr("New folder created!"));
@@ -111,12 +107,9 @@ Page {
         }
         var component = Qt.createComponent("components/File.qml");
         l = nodes.length;
-        //console.log("l="+l);
         for (i=0; i<l; i++) {
             var object = component.createObject(files);
             var ind = nodes[i].path.lastIndexOf("/");
-            //object.textMax = root.width/17;
-            //console.log("ind="+ind);
             if(ind>=0) {
                 object.name = nodes[i].path.substr(ind+1);
             }  else {
@@ -124,12 +117,7 @@ Page {
             }
             object.isDirectory = nodes[i].kind == "directory";
             object.properties = nodes[i];
-            //object.width = root.width;
-            //object.height = 50;
             if(object.isDirectory) {
-                /*if(!nodes[i].has_children) {
-                    object.description = "Empty";
-                }*/
                 object.clicked.connect(function(prop) {
                             pageStack.push("FilesPage.qml");
                             pageStack.currentPage.init(prop);
@@ -178,12 +166,6 @@ Page {
             mask.state = "idle";
         }
 
-        /*if(files.children.length==0) {
-            empty.visible = true;
-        } else {
-            empty.visible = false;
-        }*/
-
         if(l==0) {
             empty.visible = true;
         } else {
@@ -224,23 +206,6 @@ Page {
         visible: false
     }
 
-    /*FileSelector {
-        id: fileSelector
-        z: 200
-        folder: Utils.lastFolder()=="" ? Const.DEFAULT_FOLDER : Utils.lastFolder()
-        folderOnly: false
-        onFileSelected: {
-            mask.state = "idle";
-            //console.log("selected: "+file+" "+U1.fixFolder(folder));
-            fileSelector.close();
-            Utils.setLastFolder(folder);
-            var path = content_path+"/"+file;
-            //console.log(path);
-            U1.uploadFile(secrets,root,path,file,folder,Utils);
-        }
-
-    }*/
-
     FileDialog {
         id: fileSelector
         z: 200
@@ -257,15 +222,12 @@ Page {
     }
 
     function getParentPath(path) {
-        //console.log(path);
         var ppath;
         var ind = path.lastIndexOf("/");
         if(ind>=0) {
             ppath = path.substr(0,ind);
         }
         if(path=="") ppath = "/";
-
-        //console.log(ppath);
         return ppath;
     }
 
@@ -331,7 +293,6 @@ Page {
                 mask.state = "busy";
                 var currentPath = root.properties.resource_path;
                 var targetPath = getParentPath(root.properties.path)+"/"+resp;
-                //console.log("targetPath: "+targetPath);
                 U1.renameFile(secrets,currentPath,targetPath,root);
             } else {
                 tip.show(qsTr("Invalid folder name!"))
@@ -363,7 +324,6 @@ Page {
                 else
                     rpath = root.resource_path;
                 var newPath = rpath+"/"+resp;
-                //console.log("newPath: "+newPath);
                 U1.newFolder(secrets,newPath,root);
             } else {
                 tip.show(qsTr("Invalid folder name!"))
@@ -374,39 +334,6 @@ Page {
         }
     }
 
-    /*[qsTr("Upload file"),false],
-    [qsTr("Rename"),false],
-    [qsTr("Delete"),false],
-    [qsTr("New folder"),false],
-    [qsTr("Refresh"),false]
-    function menuFun(id) {
-        if(id==qsTr("Upload file")) {
-            mask.state = "dialog";
-            fileSelector.open();
-        }
-        if(id==qsTr("Refresh")) {
-            init(root.properties);
-        }
-        if(id==qsTr("Rename")) {
-            if(root.path=="/") {
-                tip.show(qsTr("Root folder can't be renamed!"));
-            } else {
-                dialogRename.open();
-            }
-        }
-        if(id==qsTr("Delete")) {
-            if(root.path=="/") {
-                tip.show(qsTr("Root folder can't be deleted!"));
-            } else {
-                dialogDelete.open();
-            }
-        }
-        if(id==qsTr("New folder")) {
-            dialogNew.open();
-        }
-    }
-*/
-
     TaskMenu {
         z: 200
         id: taskMenu
index 577f29f..3c9fdbc 100644 (file)
@@ -21,14 +21,6 @@ Showable {
     }
 
     function login() {
-        /*var secrets = {
-            token: Utils.token(),
-            secret: Utils.tokenSecret(),
-            consumer_key : Utils.customerKey(),
-            consumer_secret: Utils.customerSecret()
-        };
-        U1.getRootNode(secrets,root);
-        */
         pageStack.currentPage.init();
     }
 
@@ -67,13 +59,10 @@ Showable {
                 source: "images/ubi100.png"
                 width: 104; height: 70
                 anchors.horizontalCenter: parent.horizontalCenter
-                //y: (box.height-height)/3
             }
 
             Text {
                 id: loading
-                //anchors.top: pic.bottom
-                //anchors.margins: Const.TEXT_MARGIN
                 anchors.horizontalCenter: parent.horizontalCenter
                 font.pixelSize: 25
                 color: "white"
@@ -81,8 +70,6 @@ Showable {
             }
 
             BusyIndicator {
-                //anchors.top: loading.bottom
-                //anchors.margins: 2*Const.TEXT_MARGIN
                 anchors.horizontalCenter: parent.horizontalCenter
                 running: true
             }
index 0b8b3d6..d951800 100644 (file)
@@ -8,8 +8,6 @@ Page {
     title: qsTr("Login")
     orientation: "auto"
 
-    //property alias taskMenu: taskMenu
-
     function getToken() {
         mask.state = "busy";
         U1.getToken(user.text,pass.text,root)
@@ -24,14 +22,12 @@ Page {
         Utils.setName(account.username);
 
         tip.show(qsTr("Logged in!"));
-        //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("Ubuntu One authorization has failed. Try once again or check login settings."));
         } else if(status==0) {
@@ -46,13 +42,14 @@ Page {
         height: root.height
 
         contentHeight: content.height+Const.TOP_BAR_HEIGHT+Const.SYSTEM_BAR_HEIGHT+Const.TEXT_MARGIN
-        y: Const.TOP_BAR_HEIGHT
 
         Column {
             id: content
             spacing: Const.DEFAULT_MARGIN
             x: Const.TEXT_MARGIN
 
+            Spacer {}
+
             Text {
                 font.pixelSize: 30
                 color: "white"
@@ -83,15 +80,4 @@ 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
-        }
-    }*/
 }
index b0d3a81..1ffd7d5 100644 (file)
@@ -28,49 +28,5 @@ Item {
 
     Component.onCompleted: {
         Utils.setOrientation(orientation);
-        //reloadMenu();
     }
-
-    /*function reloadMenu() {
-        var buttons = root.menu;
-
-        var menu = taskBar.getMenu();
-        var comp = Qt.createComponent("components/Button.qml");
-
-        var i,l;
-        if(menu.children.length>0) {
-            l = menu.children.length;
-            for(i=0;i<l;++i) {
-                menu.children[i].destroy();
-            }
-        }
-        if(buttons && buttons.length>0) {
-            l = buttons.length;
-            for(i=0;i<l;++i) {
-                var obj = comp.createObject(menu);
-                if (obj==null) {
-                    console.log("Error creating menu Button!");
-                } else {
-                    var b = buttons[i];
-                    obj.label = b[0];
-                    obj.disabled = b[1];
-                    obj.buttonClicked.connect(function(name){
-                        taskBar.close();
-                        menuFun(name);
-                    });
-                }
-            }
-        }
-    }*/
-
-    /*SystemBar {
-        z: 100
-        id: systemBar
-        onClicked: {
-            var mask = pageStack.currentPage.mask;
-            if(mask.state=="idle") {
-                taskBar.open();
-            }
-        }
-    }*/
 }
index 96fefe4..79123b2 100644 (file)
@@ -36,9 +36,6 @@ Item {
         pageView.decrementCurrentIndex();
         pageModel.children[i].source = "";
         currentPage.taskMenu.close();
-        //taskBar.close();
-        //root.currentPage.reloadMenu();
-        //mask.state = "idle";
     }
 
     function clear(immediate) {
index 3b00ae7..8dfebd1 100644 (file)
@@ -92,11 +92,11 @@ Page {
         }
     }
 
-    function setContentType(type)
+    /*function setContentType(type)
     {
-        //ctype.text = type;
-        //ctype.font.italic = false;
-    }
+        ctype.text = type;
+        ctype.font.italic = false;
+    }*/
 
     function onErr(status)
     {
@@ -112,7 +112,6 @@ Page {
 
     function onRespRename(prop)
     {
-        //console.log("onRespRename");
         mask.state = "idle";
         init(prop); pageStack.prevPage().init();
         tip.show(qsTr("File renamed!"));
@@ -125,7 +124,6 @@ Page {
 
     function onRespStopPublishing(prop)
     {
-        //console.log("onRespStopPublishing");
         mask.state = "idle";
         init(prop); pageStack.prevPage().init();
         tip.show(qsTr("Publishing stopped!"));
@@ -138,7 +136,6 @@ Page {
 
     function onRespStartPublishing(prop)
     {
-        //console.log("onRespStartPublishing");
         mask.state = "idle";
         init(prop); pageStack.prevPage().init();
         tip.show(qsTr("Publishing started!"));
@@ -240,36 +237,11 @@ Page {
                 }
             }
 
-            /*Text {
-                font.pixelSize: 30
-                color: "white"
-                text: qsTr("Preview:")
-            }
-            Rectangle {
-                color: Const.TRANSPARENT
-                height: 200; width: 200
-                border.color: Const.DEFAULT_FOREGROUND_COLOR
-                border.width: 1
-                radius: 5
-            }*/
-
             Spacer{}
 
         }
     }
 
-    /*FileSelector {
-        id: fileSelector
-        z: 200
-        y: 200
-        folder: Utils.lastFolder()=="" ? Const.DEFAULT_FOLDER : Utils.lastFolder()
-        onFolderSelected: {
-            fileSelector.state = "invisible";
-            U1.getFileContent(secrets,root,properties.content_path,folder,properties.size,Utils);
-            Utils.setLastFolder(folder);
-        }
-    }*/
-
     FileDialog {
         id: fileSelector
         z: 200
@@ -333,15 +305,12 @@ Page {
 
 
     function getParentPath(path) {
-        //console.log(path);
         var ppath;
         var ind = path.lastIndexOf("/");
         if(ind>=0) {
             ppath = path.substr(0,ind);
         }
         if(path=="") ppath = "/";
-
-        //console.log(ppath);
         return ppath;
     }
 
@@ -373,7 +342,6 @@ Page {
                 mask.state = "busy";
                 var currentPath = root.properties.resource_path;
                 var targetPath = getParentPath(root.properties.path)+"/"+resp;
-                //console.log("targetPath: "+targetPath);
                 U1.renameFile(secrets,currentPath,targetPath,root);;
             } else {
                 tip.show(qsTr("Invalid file name!"))
@@ -385,33 +353,6 @@ Page {
         }
     }
 
-    /*
-    menu: [
-        [qsTr("Download"),false],
-        [qsTr("Publish"),false],
-        [qsTr("Rename"),false],
-        [qsTr("Delete"),false]
-    ]
-
-    function menuFun(id) {
-        if(id==qsTr("Download")) {
-            fileSelector.state = "visible";
-        }
-        if(id==qsTr("Publish")) {
-            if(isPublic) {
-                dialogStopPublish.open();
-            } else {
-                dialogStartPublish.open();
-            }
-        }
-        if(id==qsTr("Rename")) {
-            dialogRename.open();
-        }
-        if(id==qsTr("Delete")) {
-            dialogDelete.open();
-        }
-    }*/
-
     TaskMenu {
         z: 200
         id: taskMenu
index eae6a8e..2e29b09 100644 (file)
@@ -22,7 +22,8 @@ Page {
         width: root.width
         height: root.height
 
-        contentHeight: content.height+Const.TOP_BAR_HEIGHT+Const.SYSTEM_BAR_HEIGHT+Const.TEXT_MARGIN
+        contentHeight: content.height+Const.TOP_BAR_HEIGHT
+                       +Const.SYSTEM_BAR_HEIGHT+Const.TEXT_MARGIN
         y: Const.TOP_BAR_HEIGHT
 
         Column {
@@ -65,8 +66,6 @@ Page {
                     Utils.resetAuthorization();
                     pageStack.initialPage = "LoginPage.qml";
                     pageStack.clear();
-                    //pageStack.pop();
-                    //pageStack.currentPage.init();
                 }
             }
         }
diff --git a/qml/ubi/StartPage.qml b/qml/ubi/StartPage.qml
deleted file mode 100644 (file)
index 4d1d479..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-import QtQuick 1.0 // to target S60 5th Edition or Maemo 5
-import "UIConstants.js" as Const
-import "u1.js" as U1
-import "components"
-
-Page {
-    id: root
-    title: "Ubi"
-
-    //Component.onCompleted: init()
-
-    /*function init() {
-        if(Utils.isAuthorized()) {
-            //title = "Hi, "+Utils.name();
-        } else {
-            console.log("not authorized!");
-            pageStack.initialPage = "LoginPage.qml";
-        }
-    }*/
-
-    menu: [
-        [qsTr("About Ubi"),false]
-    ]
-
-    function menuFun(id) {
-        if(id==qsTr("About Ubi")) {
-            dialog.open();
-        }
-    }
-
-    Column {
-        spacing: 10
-        anchors.centerIn: parent
-
-        /*Image {
-            source: "images/cloud.png"
-            width: 150; height: 98
-        }
-
-        Spacer{}
-        Spacer{}
-        */
-
-        Spacer{}
-        Spacer{}
-
-        ButtonNew {
-            height: 100; width: 250
-            label: qsTr("Files")
-            //iconSource: "images/files.png"
-            anchors.horizontalCenter: parent.horizontalCenter
-            onButtonClicked: {
-                pageStack.push("FilesPage.qml");
-                pageStack.currentPage.init();
-            }
-        }
-
-        /*Button {
-            label: "Contacts"
-            disabled: true
-        }
-        Button {
-            label: "Notes"
-            disabled: true
-        }*/
-
-        ButtonNew {
-            height: 100; width: 250
-            label: qsTr("Account")
-            //iconSource: "images/account.png"
-            anchors.horizontalCenter: parent.horizontalCenter
-            onButtonClicked: {
-                pageStack.push("AccountPage.qml");
-            }
-        }
-        ButtonNew {
-            height: 100; width: 250
-            label: qsTr("Settings")
-            //iconSource: "images/settings.png"
-            anchors.horizontalCenter: parent.horizontalCenter
-            onButtonClicked: pageStack.push("SettingsPage.qml");
-        }
-        /*Button {
-            label: "Test"
-            //onButtonClicked: tip.show("Ala ma kota!")
-            //onButtonClicked: dialog.open()
-            //onButtonClicked: U1.getAccount()
-        }*/
-
-        //Spacer{}
-
-    }
-
-    /*FileDialog {
-        z: 200
-        hidden: false
-        folderOnly: false
-    }*/
-
-    DialogInfo {
-        id: dialog
-        z: 200
-        fontSize: 28
-        iconSource: "images/ubi50.png"
-        textHeader: qsTr("<b>Ubi</b>")
-
-        text: qsTr("<p>An unofficial Ubuntu One app for Maemo 5 "
-              +"and other Qt-enabled platforms.</p>"
-              +"<p><small>http://ubi.garage.maemo.org</small></p>"
-              +"<p><small>© 2012 Michal Kosciesza</small></p>")
-
-        onOpened: mask.state = "dialog"
-        onCanceled: mask.state = "idle"
-    }
-}
index eefc449..1f8fafd 100644 (file)
@@ -12,20 +12,6 @@ Item {
     signal clicked()
     signal clickedOnMask()
 
-    /*Shadow {
-        id: shadow
-        y:0
-        visible: false
-    }*/
-
-    /*Rectangle {
-        id: bor
-        color: Const.WARM_GREY_COLOR
-        //color: Const.TRANSPARENT
-        height: 2; width: root.width
-        anchors.top: box.top
-    }*/
-
     Rectangle {
         id: box
         width: root.width
@@ -39,18 +25,6 @@ Item {
         }
     }
 
-    /*Row {
-        id: box
-        y: 3
-        Repeater {
-            model: root.width
-            Image {
-                id: img
-                source: "images/bg.png"
-            }
-        }
-    }*/
-
     Shadow {
         anchors.bottom: box.top
     }
@@ -67,14 +41,6 @@ Item {
             text: pageStack.currentPage.title
         }
 
-        /*Image {
-            source: mouse.pressed? "images/menu-arrow-grey.png" : "images/menu-arrow.png"
-            anchors.verticalCenter: title.verticalCenter
-            visible: !taskBar.isEmpty && !progressIcon.visible
-            width: 18
-            height: 14
-        }*/
-
         Image {
             id: progressIcon
             source: "images/progress-small.png"
@@ -105,35 +71,6 @@ Item {
         onClicked: root.clicked()
     }
 
-    /*Rectangle {
-        id: leftSeparator
-
-        width: 1
-        height: 40
-        anchors { left: parent.left; leftMargin: 80; verticalCenter: parent.verticalCenter }
-        color: "white"
-        opacity: 0.5
-    }
-
-    Rectangle {
-        id: rightSeparator
-
-        width: 1
-        height: 40
-        anchors { right: parent.right; rightMargin: 80; verticalCenter: parent.verticalCenter }
-        color: "white"
-        opacity: 0.5
-    }*/
-
-    /*ToolIcon {
-        id: minimizeButton
-
-        width: 80
-        anchors { verticalCenter: parent.verticalCenter; left: parent.left }
-        iconSource: "images/minimize.png"
-        onClicked: Utils.minimizeWindow()
-    }*/
-
     Button {
         id: minimizeButton
         iconSource: pageStack.index > 0 ?  "images/back.png" : "images/close.png"
index 1808156..5feaf7f 100644 (file)
@@ -6,10 +6,8 @@ DialogBlank {
     id: root
 
     property alias menuHeight: root.boxHeight
-
     property alias menuFixed: _menuFixed
     property Flow menuDynamic
-
     property bool contexMenu: false
 
     onOpened: {
@@ -30,8 +28,6 @@ DialogBlank {
     Flow {
         id: _menuFixed
 
-        //y: root.height-root.menuHeight+1*Const.DEFAULT_MARGIN
-
         anchors.top: root.contexMenu ? line.bottom : root.menuDynamic.bottom
         anchors.topMargin: Const.DEFAULT_MARGIN
 
index 9b57f7f..d2a1240 100644 (file)
@@ -19,8 +19,6 @@ Item {
     Item {
         width: 50
         height: width
-        //color: mouseArea1.pressed ? "white" : "black"
-        //opacity: 0.2
         anchors.left: root.left
 
         MouseArea {
@@ -33,8 +31,6 @@ Item {
     Item {
         width: 50
         height: width
-        //color: mouseArea2.pressed ? "white" : "black"
-        //opacity: 0.2
         anchors.right: root.right
 
         MouseArea {
@@ -43,68 +39,6 @@ Item {
             onClicked: Qt.quit()
         }
     }
-
-
-    /*Rectangle {
-        width: box.width/2-16
-        height: 2
-        color: "white"
-        x: 8
-        y: (box.width/4)-1
-    }*/
-
-    /*Rectangle {
-        width: parent.width
-        height: root.height
-        color: Const.TRANSPARENT
-        //color: "black"
-    }
-
-    Item {
-        id: minimizeButton
-        width: 80;
-        height: 60
-        anchors { verticalCenter: parent.verticalCenter; left: parent.left; margins: 5 }
-
-        Rectangle {
-            id: background
-            anchors { fill: parent; margins: 6 }
-            color: "black"
-            opacity: 0.2
-            radius: 10
-        }
-
-        Rectangle {
-            anchors { fill: parent; margins: 6 }
-            color: "white"
-            opacity: 0.5
-            radius: 10
-            visible: mouseArea.pressed
-        }
-
-        Image {
-            id: icon
-            anchors.centerIn: parent
-            source: "images/minimize.png"
-            sourceSize.width: width
-            sourceSize.height: height
-        }
-
-        MouseArea {
-            id: mouseArea
-            anchors.fill: parent
-            onClicked: Utils.minimizeWindow()
-        }
-    }*/
-
-    /*ToolIcon {
-        id: backButton
-        width: 80
-        anchors { verticalCenter: parent.verticalCenter; right: parent.right; margins: 5 }
-        iconSource: "images/close.png"
-        onClicked: Qt.quit()
-    }*/
-
 }
 
 
index ff0df97..9d67f47 100644 (file)
@@ -31,13 +31,11 @@ Item {
             anchors.verticalCenter: parent.verticalCenter
             color: Const.TRANSPARENT
             border.width: 2
-            //radius: 5
             border.color: Const.DEFAULT_FOREGROUND_COLOR
             height: 40
             width: icon.visible?
                        root.width-icon.width-button.width-2*Const.DEFAULT_MARGIN :
                        root.width-button.width-1*Const.DEFAULT_MARGIN
-            //x: icon.visible? icon.width+5 : 0
 
             Rectangle {
                 id: bar
@@ -64,7 +62,6 @@ Item {
                 id: caption
                 font.pixelSize: 25
                 anchors.centerIn: parent
-                //color: Const.DEFAULT_FOREGROUND_COLOR
                 text: root.label
                 width: bbar.width
                 elide: Text.ElideRight
index 27a2a7d..a0af1bf 100644 (file)
@@ -1,5 +1,4 @@
 import QtQuick 1.0 // to target S60 5th Edition or Maemo 5
-//import "../UIConstants.js" as Const
 
 Image {
     id: icon
index 3eb5ad8..32b75e0 100644 (file)
@@ -28,7 +28,6 @@ Item {
         id: box
         color: root.disabled ? Const.COOL_GREY_COLOR : "black"
         height: root.iconSource=="" ? textbox.height+20 : icon.height+20
-        //width: textbox.width<100 ? 120 : textbox.width+20
         width: root.iconSource=="" ? textbox.width+30 : icon.width+30
         radius: 10
     }
@@ -41,8 +40,6 @@ Item {
         color: Const.WARM_GREY_COLOR
         radius: 10
         visible: root.state == "pressed"
-        //border.color: "black"
-        //border.width: Const.SHADOW_OFFSET
     }
 
     Image {
@@ -57,9 +54,6 @@ 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)
             textbox.text = root.label.substring(0,root.maxSize-3)+"...";
         } else {
             textbox.text = root.label;
diff --git a/qml/ubi/components/ButtonGlass.qml b/qml/ubi/components/ButtonGlass.qml
deleted file mode 100644 (file)
index acce2c6..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-import QtQuick 1.0 // to target S60 5th Edition or Maemo 5
-import "../UIConstants.js" as Const
-
-Item {
-    id: root
-    property string label
-    property bool disabled: false
-    property int fontSize: 30
-    property int maxSize: 27
-    property string iconSource
-
-    state: mouseArea.pressed && !root.disabled ? "pressed" : "unpressed"
-
-    width: box.width
-    height: box.height
-
-    signal buttonClicked(string label)
-
-    Rectangle {
-        id: shadow
-        width: box.width
-        height: box.height
-        color: Const.SHADOW_COLOR;
-        radius: 10
-        visible: false
-    }
-
-    Rectangle {
-        id: box
-        color: root.disabled ? Const.COOL_GREY_COLOR : "black"
-        height: root.iconSource=="" ? textbox.height+20 : icon.height+20
-        //width: textbox.width<100 ? 120 : textbox.width+20
-        width: root.iconSource=="" ? textbox.width+30 : icon.width+30
-        radius: 10
-        visible: false
-    }
-
-    Image {
-        source: root.state != "pressed" ?
-                    "../images/pushbutton_normal.png" :
-                    "../images/pushbutton_disabled.png"
-    }
-
-    Rectangle {
-        width: box.width
-        height: box.height
-        x: box.x
-        y: box.y
-        color: Const.WARM_GREY_COLOR
-        radius: 10
-        //visible: root.state == "pressed"
-        visible: false
-        //border.color: "black"
-        //border.width: Const.SHADOW_OFFSET
-    }
-
-    Image {
-        id: icon
-        //width: 30
-        //height: 30
-        anchors.centerIn: box
-        source: root.iconSource == "" ? "" : "../" + root.iconSource
-        sourceSize.width: width
-        sourceSize.height: height
-    }
-
-    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)
-            textbox.text = root.label.substring(0,root.maxSize-3)+"...";
-        } else {
-            textbox.text = root.label;
-        }
-    }
-
-    Text {
-        id: textbox
-        font.pixelSize: root.fontSize
-        color: root.disabled ? "gray" : "white"
-        anchors.centerIn: box
-        visible: root.iconSource == ""
-    }
-
-    MouseArea {
-        id: mouseArea
-        width: box.width
-        height: box.height
-        onClicked: root.buttonClicked(root.label)
-        enabled: !root.disabled
-    }
-
-    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}
-        }
-    ]
-}
-
-
-
index cbb438c..23bdb82 100644 (file)
@@ -10,9 +10,6 @@ Item {
 
     state: mouseArea.pressed && !root.disabled ? "pressed" : "unpressed"
 
-    //width: box.width
-    //height: box.height
-
     signal buttonClicked(string label)
 
     Rectangle {
@@ -26,9 +23,7 @@ Item {
     Rectangle {
         id: box
         color: root.disabled ? Const.COOL_GREY_COLOR : "black"
-        //height: textbox.height+20
         height: root.height
-        //width: textbox.width<100 ? 120 : textbox.width+20
         width: root.width
         radius: 10
     }
@@ -41,15 +36,10 @@ Item {
         color: Const.WARM_GREY_COLOR
         radius: 10
         visible: root.state == "pressed"
-        //border.color: "black"
-        //border.width: Const.SHADOW_OFFSET
     }
 
     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)
             textbox.text = root.label.substring(0,root.maxSize-3)+"...";
         } else {
             textbox.text = root.label;
@@ -71,8 +61,6 @@ Item {
 
         Text {
             id: textbox
-            //x: 10
-            //y: 10
             font.pixelSize: 30
             color: root.disabled ? "gray" : "white"
         }
index e9c0270..0fa2b0a 100644 (file)
@@ -36,8 +36,6 @@ Item {
         color: Const.WARM_GREY_COLOR
         radius: 10
         visible: root.state == "pressed"
-        //border.color: "black"
-        //border.width: Const.SHADOW_OFFSET
     }
 
     Image {
@@ -58,7 +56,6 @@ Item {
         anchors.left: box.left; anchors.right: box.right
         anchors.margins: Const.DEFAULT_MARGIN
         anchors.verticalCenter: box.verticalCenter
-        //visible: root.iconSource == ""
     }
 
     MouseArea {
index 55a3bd2..f459cb3 100644 (file)
@@ -21,16 +21,6 @@ Item {
 
     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: Const.TRANSPARENT
@@ -38,26 +28,14 @@ Item {
         width: root.width
     }
 
-    /*Rectangle {
-        color: Const.DEFAULT_FOREGROUND_COLOR
-        height: 1
-        anchors.bottom: box.bottom;
-        anchors.left: box.left;
-        anchors.right: box.right;
-    }*/
-
     Rectangle {
         id: boxShadow
-        //width: box.width-2*Const.TEXT_MARGIN+2*Const.DEFAULT_MARGIN
         width: box.width
         height: box.height
         y: 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
     }
 
@@ -140,21 +118,4 @@ Item {
             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}
-        }
-    ]*/
 }
index f97c455..2ea04e6 100644 (file)
@@ -3,7 +3,7 @@ import "../UIConstants.js" as Const
 
 Item {
     id: root
-    height: 10
+    height: 2
 
     Row {
         anchors.bottom: root.bottom
@@ -18,21 +18,4 @@ Item {
             }
         }
     }
-
-    /*Rectangle {
-        y:0
-        color: "black"
-        height: 1
-        width: root.width
-        opacity: 0.5
-        //anchors.bottom: root.bottom
-    }
-    Rectangle {
-        y:3
-        color: "black"
-        height: 1
-        width: root.width
-        opacity: 0.2
-        //anchors.bottom: root.bottom
-    }*/
 }
index b9f68a7..c1ce927 100644 (file)
@@ -14,6 +14,12 @@ Item {
         } else {
             busy.running = false;
         }
+
+        if(root.state=="idle") {
+            systemBar.state = "active";
+        } else {
+            systemBar.state = "inactive";
+        }
     }
 
     Rectangle {
diff --git a/qml/ubi/components/Notification.qml b/qml/ubi/components/Notification.qml
deleted file mode 100644 (file)
index aec3d22..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-import QtQuick 1.0 // to target S60 5th Edition or Maemo 5
-import Qt 4.7
-//import QtMultimediaKit 1.1
-import "../UIConstants.js" as Const
-
-Item {
-    id: root
-    state: "invisible"
-    width: box.width; height: box.height
-
-    Rectangle {
-        width: box.width
-        height: box.height
-        color: Const.SHADOW_COLOR;
-        radius: 10
-        x: 2*Const.SHADOW_OFFSET;
-        y: 2*Const.SHADOW_OFFSET;
-    }
-
-    Rectangle {
-        id: box
-        width: text.width+30
-        height: text.height+30
-        color: Const.DEFAULT_DIALOG_FOREGROUND_COLOR
-        radius: 10
-        border.color: Const.WARM_GREY_COLOR
-        border.width: 4
-
-        Text {
-            anchors.centerIn: parent
-            id: text
-            color: Const.DEFAULT_BACKGROUND_COLOR
-            wrapMode: Text.WordWrap
-            font.pixelSize: Const.DEFAULT_FONT_PIXEL_SIZE
-        }
-
-        MouseArea {
-            anchors.fill: parent
-            onClicked: tip.state = "invisible"
-        }
-    }
-
-    function show(_text)
-    {
-        text.text= _text;
-        time.interval = 3000;
-        state = "visible"
-        //sound.play();
-        time.restart();
-    }
-
-    function show2(_text,interval)
-    {
-        text.text= _text;
-        time.interval = interval;
-        state = "visible"
-        //sound.play();
-        time.restart();
-    }
-
-    function hide()
-    {
-        text.text="";
-        state="invisible";
-    }
-
-    /*Audio {
-         id: sound
-         source: "../sound/message.wav"
-    }*/
-
-    Timer {
-        id: time
-        interval: 3000
-        onTriggered: {
-            //console.log("time");
-            tip.state = "invisible";
-        }
-    }
-
-    states: [
-        State {
-            name: "visible"
-            PropertyChanges { target: root; opacity: 1 }
-        },
-        State {
-            name: "invisible"
-            PropertyChanges { target: root; opacity: 0 }
-            PropertyChanges { target: root; x: 0 }
-            PropertyChanges { target: root; y: 0 }
-        }
-    ]
-
-    transitions: Transition {
-        NumberAnimation { properties: "opacity"; easing.type: Easing.InOutQuad }
-        NumberAnimation { properties: "x"; easing.type: Easing.InOutQuad }
-        NumberAnimation { properties: "y"; easing.type: Easing.InOutQuad }
-    }
-
-}
index 56baecb..10b5ef9 100644 (file)
@@ -22,7 +22,6 @@ Item {
         id: box
         height: text.height+4*Const.DEFAULT_MARGIN
         width: root.width
-        //color: Const.DEFAULT_DIALOG_FOREGROUND_COLOR
         color: Const.COOL_GREY_COLOR
         radius: 5
 
index 69c7390..77edddb 100644 (file)
@@ -9,7 +9,6 @@ Item {
     property int speed: 1
 
     state: hidden ? "closed" : "opened"
-    //visible: !hidden
 
     Component.onCompleted: {
         if(hidden) state = "closed";
@@ -32,7 +31,6 @@ Item {
         State {
             name: "closed"
             PropertyChanges { target: root; y: root.height }
-            //PropertyChanges { target: root; visible: false }
         }
     ]
 
@@ -50,7 +48,6 @@ Item {
         id: time
         interval: root.speed*root.height/2
         onTriggered: {
-            //console.log("aaa");
             root.visible = false;
         }
     }
index 59986bc..237eacd 100644 (file)
@@ -2,7 +2,6 @@ import QtQuick 1.0 // to target S60 5th Edition or Maemo 5
 import "../UIConstants.js" as Const
 
 Rectangle {
-    //property int size: height
     width: Const.DEFAULT_MARGIN
     height: Const.DEFAULT_MARGIN
     color: "#00000000"
diff --git a/qml/ubi/components/ToolIcon.qml b/qml/ubi/components/ToolIcon.qml
deleted file mode 100644 (file)
index 6632be4..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-import QtQuick 1.0 // to target S60 5th Edition or Maemo 5
-import "../UIConstants.js" as Const
-
-Item {
-    id: root
-
-    property string iconSource
-    property bool pressed: mouseArea.pressed
-    property string color: Const.TRANSPARENT
-
-    signal clicked
-    signal pressAndHold
-
-    width: 56
-    height: 56
-
-    Rectangle {
-        id: background
-        anchors { fill: parent; margins: 6 }
-        //color: root.color
-        color: "black"
-        opacity: 0.1
-        radius: 10
-    }
-
-    Rectangle {
-        anchors { fill: parent; margins: 6 }
-        color: "white"
-        opacity: 0.5
-        radius: 10
-        visible: mouseArea.pressed
-    }
-
-    Image {
-        id: icon
-        width: 30
-        height: 30
-        anchors.centerIn: parent
-        source: iconSource == "" ? "" : "../" + iconSource
-        sourceSize.width: width
-        sourceSize.height: height
-    }
-
-    MouseArea {
-        id: mouseArea
-
-        anchors.fill: parent
-        enabled: root.enabled
-        onClicked: parent.clicked()
-        onPressAndHold: parent.pressAndHold()
-    }
-}
index 91cc567..60cd7ab 100644 (file)
@@ -12,19 +12,11 @@ Rectangle {
 
     PageStack {
         id: pageStack
-        //initialPage: Qt.resolvedUrl("StartPage.qml")
         initialPage: Qt.resolvedUrl("FilesPage.qml")
     }
 
     TopBar {
         id: topbar
-        /*Component.onCompleted: {
-            //visible = Utils.isMaemo();
-        }
-        onVisibleChanged: {
-            if(visible)
-                visible = Utils.isMaemo();
-        }*/
     }
 
     NotificationNew {
@@ -34,10 +26,6 @@ Rectangle {
         y: mainWindow.height-height-Const.SYSTEM_BAR_HEIGHT-Const.TEXT_MARGIN
     }
 
-    /*TaskBar {
-        id: taskBar
-    }*/
-
     Connections {
         target: Utils
         onFileDownloaded: tip.show(qsTr("File downloaded."))
@@ -80,8 +68,6 @@ Rectangle {
             anchors.horizontalCenter: parent.horizontalCenter
             id: progressArea
             width: parent.width-3*Const.DEFAULT_MARGIN
-
-            //onHeightChanged: console.log("height: "+height);
         }
     }
 
index 5fc6d58..995f576 100644 (file)
@@ -1,3 +1,11 @@
+ubi (0.9.3-1) unstable; urgency=low
+
+  * UTF-8 encoding support
+  * New icons
+  * Updated GUI
+
+ -- Michal Kosciesza <mkiol@o2.pl>  Fri, 18 May 2012 22:10:09 +0200
+
 ubi (0.9.2-1) unstable; urgency=low
 
   * Added "publishing" feature
index 5fc6d58..fbc5105 100644 (file)
@@ -1,3 +1,11 @@
+ubi (0.9.3-1) unstable; urgency=low
+
+  * UTF-8 encoding support
+  * New icons
+  * New UI
+
+ -- Michal Kosciesza <mkiol@o2.pl>  Fri, 18 May 2012 22:10:09 +0200
+
 ubi (0.9.2-1) unstable; urgency=low
 
   * Added "publishing" feature
index 5fc6d58..995f576 100644 (file)
@@ -1,3 +1,11 @@
+ubi (0.9.3-1) unstable; urgency=low
+
+  * UTF-8 encoding support
+  * New icons
+  * Updated GUI
+
+ -- Michal Kosciesza <mkiol@o2.pl>  Fri, 18 May 2012 22:10:09 +0200
+
 ubi (0.9.2-1) unstable; urgency=low
 
   * Added "publishing" feature
index a31c309..fbc5105 100644 (file)
@@ -1,4 +1,12 @@
-ubi (0.9.1-3) unstable; urgency=low
+ubi (0.9.3-1) unstable; urgency=low
+
+  * UTF-8 encoding support
+  * New icons
+  * New UI
+
+ -- Michal Kosciesza <mkiol@o2.pl>  Fri, 18 May 2012 22:10:09 +0200
+
+ubi (0.9.2-1) unstable; urgency=low
 
   * Added "publishing" feature
 
diff --git a/ubi.pro b/ubi.pro
index c399160..23ea7d4 100644 (file)
--- a/ubi.pro
+++ b/ubi.pro
@@ -1,11 +1,11 @@
 # Add more folders to ship with the application, here
-folder_01.source = qml/ubi
-folder_01.target = qml
-DEPLOYMENTFOLDERS = folder_01
+#folder_01.source = qml/ubi
+#folder_01.target = qml
+#DEPLOYMENTFOLDERS = folder_01
 
-folder_02.source = translations/ubi.pl.qm
-folder_02.target = translations
-DEPLOYMENTFOLDERS += folder_02
+#folder_02.source = translations/ubi.pl.qm
+#folder_02.target = translations
+#DEPLOYMENTFOLDERS += folder_02
 
 # Additional import path used to resolve QML modules in Creator's code model
 QML_IMPORT_PATH =
@@ -43,7 +43,7 @@ SOURCES += main.cpp \
     utils.cpp
 
 # evil_hack_to_fool_lupdate
-include(translation.pri)
+#include(translation.pri)
 
 # Please do not modify the following two lines. Required for deployment.
 include(qmlapplicationviewer/qmlapplicationviewer.pri)
@@ -70,5 +70,5 @@ HEADERS += \
 
 TRANSLATIONS += translations/ubi.pl.ts
 
-#RESOURCES += \
-#    ubi.qrc
+RESOURCES += \
+    ubi.qrc
index acd9bfe..d9962f0 100644 (file)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by Qt Creator 2.4.1, 2012-05-16T05:47:05. -->
+<!-- Written by Qt Creator 2.4.1, 2012-05-18T23:03:34. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
-  <value type="int">1</value>
+  <value type="int">4</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.EditorSettings</variable>
        <value type="QString">/home/mkiol/dev/Qt/ubi-build-maemo-Maemo_Qt_4_7_0__fremantle-pr13__Release/ubi_0_0_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_0_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_3-1_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_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">192.168.2.101</value>
        <value type="QString">192.168.2.101</value>
        <value type="QString">192.168.2.102</value>
+       <value type="QString">192.168.2.101</value>
        <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"></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>
        <value type="QDateTime">2012-04-27T23:16:36</value>
        <value type="QDateTime">2012-02-23T12:56:54</value>
+       <value type="QDateTime">2012-05-18T22:20:33</value>
        <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-03T18:56:53</value>
        <value type="QDateTime">2012-05-05T14:55:15</value>
-       <value type="QDateTime">2012-05-16T05:43:04</value>
+       <value type="QDateTime">2012-05-18T21:37:42</value>
       </valuelist>
      </valuemap>
      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">3</value>
    <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">Qt4ProjectManager.ToolChain.Maemo:/home/mkiol/dev/QtSDK/Madde/targets/harmattan_10.2011.34-1_rt1.0/bin/gcc.arm-linux-generic-elf-32bit./home/mkiol/dev/QtSDK/debugger/Maemo/gdb</value>
+    <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">Qt4ProjectManager.ToolChain.Maemo:/home/mkiol/dev/QtSDK/Madde/targets/harmattan_10.2011.34-1_rt1.2/bin/gcc.arm-linux-generic-elf-32bit./home/mkiol/dev/QtSDK/debugger/Maemo/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>
     <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
     <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
     <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Harmattan Target - QEmu PR1.0 (Qt SDK) Release</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Harmattan Target - QEmu PR1.2 (Qt SDK) Release</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
     <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
     <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory"></value>
-    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">10</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">9</value>
     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
       <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_2_m1_1_1</value>
+      <value type="QString" key="RemoteCompiler.BuildStep.QtVersion">4_7_3</value>
       <value type="int" key="RemoteCompiler.BuildStep.SisOpt">1</value>
-      <value type="QString" key="RemoteCompiler.BuildStep.Target">s60_5_0_n97</value>
+      <value type="QString" key="RemoteCompiler.BuildStep.Target">symbian3</value>
      </valuemap>
      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
diff --git a/ubi.qrc b/ubi.qrc
index d92407e..9e57c8b 100644 (file)
--- a/ubi.qrc
+++ b/ubi.qrc
@@ -1,65 +1,88 @@
 <RCC>
     <qresource prefix="/">
-        <file>qml/ubi/AccountPage.qml</file>
-        <file>qml/ubi/bytesconv.js</file>
-        <file>qml/ubi/DownloadArea.qml</file>
-        <file>qml/ubi/DownloadProgressBar.qml</file>
-        <file>qml/ubi/FileSelector.qml</file>
-        <file>qml/ubi/FilesPage.qml</file>
-        <file>qml/ubi/ISOdate.js</file>
-        <file>qml/ubi/LoginPage.qml</file>
-        <file>qml/ubi/main.qml</file>
-        <file>qml/ubi/PageStack.qml</file>
-        <file>qml/ubi/PropertiesPage.qml</file>
-        <file>qml/ubi/SettingsPage.qml</file>
-        <file>qml/ubi/Shadow.qml</file>
-        <file>qml/ubi/StartPage.qml</file>
-        <file>qml/ubi/SystemBar.qml</file>
-        <file>qml/ubi/TaskBar.qml</file>
-        <file>qml/ubi/u1.js</file>
-        <file>qml/ubi/UIConstants.js</file>
         <file>qml/ubi/components/Bar.qml</file>
+        <file>qml/ubi/components/BusyIndicator.qml</file>
         <file>qml/ubi/components/Button.qml</file>
         <file>qml/ubi/components/ButtonNew.qml</file>
+        <file>qml/ubi/components/ButtonResizable.qml</file>
+        <file>qml/ubi/components/DialogBlank.qml</file>
         <file>qml/ubi/components/DialogBox.qml</file>
         <file>qml/ubi/components/DialogCombo.qml</file>
         <file>qml/ubi/components/DialogInfo.qml</file>
         <file>qml/ubi/components/DialogInput.qml</file>
         <file>qml/ubi/components/DialogYesNo.qml</file>
         <file>qml/ubi/components/File.qml</file>
-        <file>qml/ubi/components/FileOld.qml</file>
+        <file>qml/ubi/components/FileSmall.qml</file>
         <file>qml/ubi/components/Line.qml</file>
         <file>qml/ubi/components/Mask.qml</file>
-        <file>qml/ubi/components/Notification.qml</file>
-        <file>qml/ubi/components/Page.qml</file>
+        <file>qml/ubi/components/NotificationNew.qml</file>
+        <file>qml/ubi/components/Showable.qml</file>
         <file>qml/ubi/components/Spacer.qml</file>
         <file>qml/ubi/components/TextField.qml</file>
-        <file>qml/ubi/components/ToolIcon.qml</file>
         <file>qml/ubi/images/account.png</file>
         <file>qml/ubi/images/back.png</file>
+        <file>qml/ubi/images/back-old.png</file>
+        <file>qml/ubi/images/bg.png</file>
         <file>qml/ubi/images/close.png</file>
+        <file>qml/ubi/images/close-old.png</file>
         <file>qml/ubi/images/document.png</file>
+        <file>qml/ubi/images/document-small.png</file>
         <file>qml/ubi/images/down.png</file>
         <file>qml/ubi/images/download.png</file>
+        <file>qml/ubi/images/download-old.png</file>
         <file>qml/ubi/images/files.png</file>
         <file>qml/ubi/images/folder.png</file>
+        <file>qml/ubi/images/folder-small.png</file>
         <file>qml/ubi/images/internet.png</file>
         <file>qml/ubi/images/menu-arrow.png</file>
         <file>qml/ubi/images/menu-arrow-grey.png</file>
         <file>qml/ubi/images/menu-arrow-orange.png</file>
         <file>qml/ubi/images/minimize.png</file>
+        <file>qml/ubi/images/minimize-old.png</file>
+        <file>qml/ubi/images/music.png</file>
+        <file>qml/ubi/images/music-small.png</file>
         <file>qml/ubi/images/next.png</file>
+        <file>qml/ubi/images/options.png</file>
         <file>qml/ubi/images/photo.png</file>
+        <file>qml/ubi/images/photo-small.png</file>
         <file>qml/ubi/images/progress.png</file>
         <file>qml/ubi/images/progress-small.png</file>
+        <file>qml/ubi/images/pushbutton_disabled.png</file>
+        <file>qml/ubi/images/pushbutton_normal.png</file>
+        <file>qml/ubi/images/refresh.png</file>
         <file>qml/ubi/images/settings.png</file>
         <file>qml/ubi/images/share.png</file>
         <file>qml/ubi/images/ubi50.png</file>
+        <file>qml/ubi/images/ubi100.png</file>
         <file>qml/ubi/images/up.png</file>
         <file>qml/ubi/images/upload.png</file>
+        <file>qml/ubi/images/upload-old.png</file>
+        <file>qml/ubi/images/up-old.png</file>
+        <file>qml/ubi/images/video.png</file>
+        <file>qml/ubi/images/video-small.png</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/AccountPage.qml</file>
+        <file>qml/ubi/bytesconv.js</file>
+        <file>qml/ubi/DownloadArea.qml</file>
+        <file>qml/ubi/FileDialog.qml</file>
+        <file>qml/ubi/FilesPage.qml</file>
+        <file>qml/ubi/InitPage.qml</file>
+        <file>qml/ubi/ISOdate.js</file>
+        <file>qml/ubi/LoginPage.qml</file>
+        <file>qml/ubi/main.qml</file>
+        <file>qml/ubi/Page.qml</file>
+        <file>qml/ubi/PageStack.qml</file>
+        <file>qml/ubi/PropertiesPage.qml</file>
+        <file>qml/ubi/SettingsPage.qml</file>
+        <file>qml/ubi/Shadow.qml</file>
+        <file>qml/ubi/SystemBar.qml</file>
+        <file>qml/ubi/TaskBar.qml</file>
+        <file>qml/ubi/TaskMenu.qml</file>
+        <file>qml/ubi/TopBar.qml</file>
+        <file>qml/ubi/u1.js</file>
+        <file>qml/ubi/UIConstants.js</file>
         <file>translations/ubi.pl.qm</file>
     </qresource>
 </RCC>
diff --git a/ubi.zip b/ubi.zip
index e2c24bb..b64fcad 100644 (file)
Binary files a/ubi.zip and b/ubi.zip differ