psa: improved add feed/categories dialog

[feedingit] / psa_harmattan / feedingit / deb_dist / feedingit-0.1.0 / qml / Feeds.qml

diff --git a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/qml/Feeds.qml b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/qml/Feeds.qml
index 32b5919..5131cbc 100644 (file)
--- a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/qml/Feeds.qml
+++ b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/qml/Feeds.qml
@@ -56,21 +56,34 @@ Item {
 
             Item {
                 id: moveMe
-                Rectangle { color: "#dddddd"; opacity: index % 2 ? 0.2 : 0.4; height: 84; width: wrapper.width; y: 1 }
+                Rectangle { color: settings.backColour; opacity: index % 2 ? 0.2 : 0.4; height: 84; width: wrapper.width; y: 1 }
                 Rectangle {
-                    x: 3; y: 4; width: 77; height: 77; color: "#000000"; smooth: true
-                    Image { width:32; height: 32; anchors.verticalCenter: parent.verticalCenter; anchors.horizontalCenter: parent.horizontalCenter;
-                        source: (updating=="True")? "common/images/loading.png" : (icon == "False") ? "common/images/feedingit.png" : icon;
-                        NumberAnimation on rotation {
-                            from: 0; to: 360; running: (updating=="True"); loops: Animation.Infinite; duration: 900
-                        }
+                    x: 3; y: 4; width: 77; height: 77;
+                    color: "#000000"; smooth: true
+                    Image { width:32; height: 32; anchors.verticalCenter: parent.verticalCenter;
+                        anchors.horizontalCenter: parent.horizontalCenter;
+                        source: (icon == "False") ? "common/images/feedingit.png" : icon
+                            // (updating=="True")? "common/images/loading.png" : (icon == "False") ? "common/images/feedingit.png" : icon;
+//                        NumberAnimation on rotation {
+//                            from: 0; to: 360; running: (updating=="True"); loops: Animation.Infinite; duration: 900
+//                        }
                     }
                 }
 
                 Column {
                     x: 92; width: wrapper.ListView.view.width - 95; y: 5; spacing: 2
-                    Text { text: title; color: "white"; width: parent.width; font.bold: true; elide: Text.ElideRight; style: Text.Raised; styleColor: "black"; font.pointSize: 18 }
-                    Text { text: updatedDate + " / " + qsTr("%1 unread items").arg(unread); color: (unread=="0") ? "white" : "#7b97fd"; width: parent.width; font.bold: false; elide: Text.ElideRight; style: Text.Raised; styleColor: "black"; font.pointSize: 12 }
+                    Text { text: title; color: settings.mainTextColour;
+                        width: parent.width;
+                        font.bold: true; elide: Text.ElideRight; style: Text.Raised; styleColor: settings.mainShadowColour;
+                        font.pointSize: settings.mainTextSize
+                    }
+                    Text {
+                        text: updatedDate + " / " + 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 {
@@ -101,6 +114,9 @@ Item {
                     feedClicked(feedid)
                     
                 }
+                onPressAndHold: {
+                    window.longPressFeed(feedid)
+                }
             }
 
         }