psa: improve selection of items not to be displayed on event feed

diff --git a/psa_harmattan/feedingit/pysrc/feedingit.py b/psa_harmattan/feedingit/pysrc/feedingit.py
index b401a0c..6978740 100644 (file)
--- a/psa_harmattan/feedingit/pysrc/feedingit.py
+++ b/psa_harmattan/feedingit/pysrc/feedingit.py
@@ -258,12 +258,12 @@ class Controller(QtCore.QObject):
         
     @QtCore.Slot(str, result=bool)
     def getFeedEventStatus(self, key):
-        from gconf import client_get_defaults
-        return client_get_default().get_bool('/apps/ControlPanel/FeedingIt/EnableFeed/'+key)
+        from gconf import client_get_default
+        return client_get_default().get_bool('/apps/ControlPanel/FeedingIt/EventFeed/Hide/'+key)
     
     @QtCore.Slot(str)
     def switchEventFeedStatus(self, key):
-        from gconf import client_get_defaults
+        from gconf import client_get_default
         value = client_get_default().get_bool('/apps/ControlPanel/FeedingIt/EventFeed/Hide/'+key)
         if value:
             client_get_default().unset('/apps/ControlPanel/FeedingIt/EventFeed/Hide/'+key)

diff --git a/psa_harmattan/feedingit/qml/main.qml b/psa_harmattan/feedingit/qml/main.qml
index 4d53500..48703b1 100644 (file)
--- a/psa_harmattan/feedingit/qml/main.qml
+++ b/psa_harmattan/feedingit/qml/main.qml
@@ -45,8 +45,7 @@ PageStackWindow {
     }
 
     onLongPressFeed: {
-        unsubscribeFeedMenu.key = key
-        unsubscribeFeedMenu.open()
+        unsubscribeFeedMenu.openMenu(key)
     }
 
     onLongPressCategory: {
@@ -104,13 +103,20 @@ PageStackWindow {
         id: unsubscribeFeedMenu
         visualParent: pageStack
         property string key
+
+        function openMenu(feedid) {
+            unsubscribeFeedMenu.key = feedid
+            menuItemEventFeed.text = controller.getFeedEventStatus(unsubscribeFeedMenu.key) ? qsTr("Show on Event Feed"): qsTr("Do not show on Event Feed")
+            unsubscribeFeedMenu.open()
+        }
+
         MenuLayout {
             //MenuItem { text: qsTr("Update"); onClicked: controller.updateFeed(parent.feedid); }
             MenuItem {
-                text: controller.getFeedEventStatus(key) ? qsTr("Show on Event Feed"): qsTr("Do not show on Event Feed")
+                id: menuItemEventFeed
+                //text: controller.getFeedEventStatus(unsubscribeFeedMenu.key) ? qsTr("Show on Event Feed"): qsTr("Do not show on Event Feed")
                 onClicked: {
-                    controller.switchEventFeedStatus(key)
-                    text = controller.getFeedEventStatus(key) ? qsTr("Show on Event Feed"): qsTr("Do not show on Event Feed")
+                    controller.switchEventFeedStatus(unsubscribeFeedMenu.key)
                     unsubscribeFeedMenu.close()
                 }
             }