psa: improved add feed/categories dialog

[feedingit] / psa_harmattan / feedingit / deb_dist / feedingit-0.1.0 / debian / feedingit / usr / share / feedingit / qml / main.qml

diff --git a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/main.qml b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/main.qml
index e38c12a..2fda083 100644 (file)
--- a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/main.qml
+++ b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/main.qml
@@ -6,12 +6,25 @@ PageStackWindow {
     id: window
     initialPage: categoryPage
 
-    signal articleClosed()
+    signal longPressCategory(string catid)
+    signal longPressFeed(string key)
+    signal categoryReloadRequest()
+    signal feedReloadRequest()
     property string feedid
     property string catid
 
     Component.onCompleted: theme.inverted= true
 
+    onLongPressFeed: {
+        unsubscribeFeedMenu.key = key
+        unsubscribeFeedMenu.open()
+    }
+
+    onLongPressCategory: {
+        unsubscribeCategoryMenu.catid = catid
+        unsubscribeCategoryMenu.open()
+    }
+
     ToolBarLayout {
         id: commonTools
         visible: false
@@ -29,6 +42,7 @@ PageStackWindow {
         visualParent: pageStack
         MenuLayout {
             MenuItem { text: qsTr("Settings"); onClicked: {}  }
+            MenuItem { text: qsTr("Invert Theme"); onClicked: { theme.inverted = !theme.inverted }  }
             MenuItem { text: qsTr("Add Feeds"); onClicked: { pageStack.push(addFeedPage)  } }
             MenuItem { text: qsTr("Update All Categories"); onClicked: controller.updateAll(); }
             MenuItem { text: qsTr("About FeedingIt"); onClicked: query.open(); }
@@ -39,8 +53,8 @@ PageStackWindow {
         id: myFeedsMenu
         visualParent: pageStack
         MenuLayout {
-            MenuItem { text: qsTr("Update All Feeds"); onClicked: controller.updateAll(); }
-            MenuItem { text: qsTr("About FeedingIt"); onClicked: query.open(); }
+            MenuItem { text: qsTr("Update All Feeds"); onClicked: controller.updateCategory(catid); }
+            //MenuItem { text: qsTr("About FeedingIt"); onClicked: query.open(); }
         }
     }
 
@@ -50,7 +64,61 @@ PageStackWindow {
         MenuLayout {
             MenuItem { text: qsTr("Mark All As Read"); onClicked: controller.markAllAsRead(feedid); }
             MenuItem { text: qsTr("Update Feed"); onClicked: controller.updateFeed(feedid); }
-            MenuItem { text: qsTr("About FeedingIt"); onClicked: query.open(); }
+            //MenuItem { text: qsTr("About FeedingIt"); onClicked: query.open(); }
+        }
+    }
+
+    Menu {
+        id: unsubscribeFeedMenu
+        visualParent: pageStack
+        property string key
+        MenuLayout {
+            //MenuItem { text: qsTr("Update"); onClicked: controller.updateFeed(parent.feedid); }
+            MenuItem { text: qsTr("Delete");
+                onClicked: {
+                    feedConfirm.open()
+                    unsubscribeFeedMenu.close()
+                }
+            }
+        }
+        QueryDialog {
+            id: feedConfirm
+            //icon: "common/images/feedingit.png"
+            //titleText: "Delete Feed?"
+            message: "Delete this feed?"
+            acceptButtonText: "OK"
+            rejectButtonText: "Cancel"
+            onAccepted: {
+                controller.removeFeed(unsubscribeFeedMenu.key);
+                window.feedReloadRequest()
+            }
+        }
+    }
+
+    Menu {
+        id: unsubscribeCategoryMenu
+        visualParent: pageStack
+        property string catid
+        MenuLayout {
+            //MenuItem { text: qsTr("Update"); onClicked: controller.updateFeed(parent.feedid); }
+            MenuItem { text: qsTr("Delete");
+                onClicked: {
+                    categoryConfirm.open()
+                    unsubscribeFeedMenu.close()
+                }
+            }
+        }
+        QueryDialog {
+            id: categoryConfirm
+            //icon: "common/images/feedingit.png"
+            //titleText: "Delete Feed?"
+            message: "Delete this category?"
+            acceptButtonText: "OK"
+            rejectButtonText: "Cancel"
+            onAccepted: {
+                controller.removeCategory(unsubscribeCategoryMenu.catid);
+                window.categoryReloadRequest()
+            }
         }
     }
 
@@ -65,23 +133,24 @@ PageStackWindow {
         acceptButtonText: "OK"
     }
 
-//    Page{
-//        id: mainPage
-//        Component.onCompleted: {
-//            var main = Qt.createComponent("FeedingIt.qml");
-//            main.createObject(mainPage);
-//        }
-//    }
-
     Component {
         id: categoryPage
         Page {
             tools: commonTools
             Categories {
+                id: categoriesItem
                 onCategoryClicked: {
                     window.catid = cat
                     pageStack.push(feedsPage)
                 }
+
+            }
+            Connections {
+                target: window
+                onCategoryReloadRequest: {
+                    console.log("category reloaded")
+                    categoriesItem.reload()
+                }
             }
         }
     }
@@ -99,6 +168,7 @@ PageStackWindow {
                     window.feedid = feedid
                     pageStack.push(articlesPage)
                 }
+
             }
             ToolBarLayout {
                 id: feedsTools
@@ -117,7 +187,7 @@ PageStackWindow {
             }
             Connections {
                  target: window
-                 onArticleClosed: feedsItem.reload()
+                 onFeedReloadRequest: feedsItem.reload()
              }
         }
     }
@@ -141,7 +211,7 @@ PageStackWindow {
                             flipper.articleShown = false;
                             flipper.reload()
                         } else {
-                            window.articleClosed();
+                            window.feedReloadRequest();
                             pageStack.pop();
                         }
                     }
@@ -174,4 +244,8 @@ PageStackWindow {
         id: addFeedPage
         AddFeed {}
     }
+
+    Settings {
+        id: settings
+    }
 }