psa: fix updateBar

[feedingit] / psa_harmattan / feedingit / qml / Categories.qml

diff --git a/psa_harmattan/feedingit/qml/Categories.qml b/psa_harmattan/feedingit/qml/Categories.qml
index 6af2f1e..3ecd3b0 100644 (file)
--- a/psa_harmattan/feedingit/qml/Categories.qml
+++ b/psa_harmattan/feedingit/qml/Categories.qml
@@ -1,18 +1,35 @@
 import Qt 4.7
+import com.nokia.meego 1.0
 
 Item {
 //    anchors.fill: parent;
     width: parent.width; height: parent.height;
     //anchors.top: parent.top; anchors.bottom: parent.bottom
-    property bool inEditMode: true
+    property bool inEditMode: false
+    signal categoryClicked(string cat)
 
     function reload() {
-        categories.reload();
+        //categories.reload();
+        categories.xml = controller.getCategoryXml()
+        //console.log(controller.getCategoryXml())
     }
 
     ListView {
         id: categoryList; model: categories; delegate: categoryDelegate; z: 6;
-        cacheBuffer: 100; width: parent.width; height: parent.height;
+        cacheBuffer: 100; width: parent.width;
+        height: updateBarCategories.visible? parent.height-updateBarCategories.height : parent.height;
+        clip: true
+        /*height: parent.height;*/
+    }
+
+    ProgressBar {
+        id: updateBarCategories
+        minimumValue: 0
+        maximumValue: 100
+        value: window.updateProgressValue
+        visible: window.isUpdateInProgress
+        anchors.bottom: parent.bottom
+        width: parent.width
     }
 
     XmlListModel {
@@ -24,6 +41,7 @@ Item {
 
         XmlRole { name: "title"; query: "catname/string()" }
         XmlRole { name: "catid"; query: "catid/string()"; isKey: true }
+        XmlRole { name: "unread"; query: "unread/string()" }
     }
 
     Component {
@@ -35,38 +53,68 @@ Item {
             Item {
                 id: moveMe
                 height: parent.height
-                Rectangle { color: "black"; opacity: index % 2 ? 0.2 : 0.4; height: 84; width: wrapper.width; y: 1 }
-                Rectangle {
-                    x: 6; y: 4; width: 77; height: parent.height - 9; color: "white"; smooth: true
+                Rectangle { color: settings.backColour; opacity: index % 2 ? 0.2 : 0.4; height: 84; width: wrapper.width; y: 1 }
+//                Rectangle {
+//                    x: 6; y: 4; width: 77; height: parent.height - 9; color: "white"; smooth: true
 
-                }
+//                }
                 Column {
-                    x: 92; width: wrapper.ListView.view.width - 95; y: 15; spacing: 2
-                    Text { text: title; color: "white"; width: parent.width; font.bold: true; elide: Text.ElideRight; style: Text.Raised; styleColor: "black" }
+                    x: 15;
+                    width: wrapper.ListView.view.width /*- 95;*/
+                    y: 15; spacing: 2
+                    anchors.margins: 5
+                    height: parent.height
+
+                    Text { text: title; color: settings.mainTextColour; width: parent.width; font.bold: true;
+                        //height: parent.height
+                        elide: Text.ElideRight; style: Text.Raised;
+                        styleColor: settings.mainShadowColour;
+                        font.pointSize: settings.mainTextSize
+                        verticalAlignment: Text.AlignVCenter;
+                    }
+                    Text {
+                        text: qsTr("%1 unread items").arg(unread);
+                        color: (unread=="0") ? settings.mainTextColour : settings.secondaryTextColour;
+                        width: parent.width; font.bold: false;
+                        elide: Text.ElideRight;
+                        //style: Text.Raised; styleColor: settings.mainShadowColour;
+                        font.pointSize: settings.secondaryTextSize
+                    }
                     //Text { text: feedname; width: parent.width; elide: Text.ElideLeft; color: "#cccccc"; style: Text.Raised; styleColor: "black" }
                 }
-                Item {
-                    x: wrapper.ListView.view.width - 128; y: 12
-                    height: 58; width: 58;
-                    //anchors.horizontalCenter: parent.horizontalCenter;
-                    Image { source: "common/images/wmEditIcon.png" }
-                    MouseArea {
-                        anchors.fill: parent; onClicked: { container.categoryEdit(catname, catid); }
-                    }
-                    visible: inEditMode
+//                Item {
+//                    x: wrapper.ListView.view.width - 128; y: 12
+//                    height: 58; width: 58;
+//                    //anchors.horizontalCenter: parent.horizontalCenter;
+//                    Image { source: "common/images/wmEditIcon.png" }
+//                    MouseArea {
+//                        anchors.fill: parent; onClicked: { container.categoryEdit(catname, catid); }
+//                    }
+//                    visible: inEditMode
+//                }
+//                Item {
+//                    x: wrapper.ListView.view.width - 64; y: 12
+//                    height: 58; width: 58;
+//                    //anchors.horizontalCenter: parent.horizontalCenter;
+//                    Image { source: "common/images/delete.png" }
+//                    MouseArea {
+//                        anchors.fill: parent; onClicked: { container.categoryDeleted(catid); }
+//                    }
+//                    visible: inEditMode
+//                }
+            }
+            MouseArea {
+                enabled: !inEditMode; anchors.fill: wrapper;
+                onClicked: { categoryClicked(catid); }
+                onPressAndHold: {
+                    window.longPressCategory(catid)
                 }
-                Item {
-                    x: wrapper.ListView.view.width - 64; y: 12
-                    height: 58; width: 58;
-                    //anchors.horizontalCenter: parent.horizontalCenter;
-                    Image { source: "common/images/delete.png" }
-                    MouseArea {
-                        anchors.fill: parent; onClicked: { container.categoryDeleted(catid); }
-                    }
-                    visible: inEditMode
+            }
+            Component.onCompleted: {
+                if (categories.count == 1) {
+                    categoryClicked(catid)
                 }
             }
-            MouseArea { enabled: !inEditMode; anchors.fill: wrapper; onClicked: { container.categoryClicked(catid); } }
         }
     }
 }