psa: using 2 flickables

[feedingit] / psa_harmattan / feedingit / qml / main.qml

diff --git a/psa_harmattan/feedingit/qml/main.qml b/psa_harmattan/feedingit/qml/main.qml
index efae8d7..0b47445 100644 (file)
--- a/psa_harmattan/feedingit/qml/main.qml
+++ b/psa_harmattan/feedingit/qml/main.qml
@@ -246,13 +246,8 @@ PageStackWindow {
                 ToolIcon { iconId: "toolbar-back";
                     onClicked: {
                         myArticlesMenu.close();
-//                        if (flipper.articleShown) {
-//                            flipper.reload()
-//                            flipper.articleShown = false;
-//                        } else {
-                            window.feedReloadRequest();
-                            pageStack.pop();
-//                        }
+                        window.feedReloadRequest();
+                        pageStack.pop();
                     }
                 }
 
@@ -274,9 +269,11 @@ PageStackWindow {
         Page {
             tools: articleTools
             property string feedid: window.feedid
-            property string mainArticleId: window.articleid
+
 
             Articles {
+                id: articlePage
+                property string mainArticleId: window.articleid;
             }
 
             ToolBarLayout {
@@ -284,34 +281,27 @@ PageStackWindow {
                 visible: false
                 ToolIcon { iconId: "toolbar-back";
                     onClicked: {
-                        myArticlesMenu.close();
                         window.articlesReloadRequest();
                         pageStack.pop();
                     }
                 }
 
-//                ToolIcon {
-//                    platformIconId: "toolbar-previous"
-//                    visible: flipper.articleShown
-//                    //anchors.right: (parent === undefined) ? undefined : parent.right
-//                    onClicked: flipper.prev();
-//                }
+                ToolIcon {
+                    platformIconId: "toolbar-previous"
+                    onClicked: articlePage.prev();
+                }
 
-//                ToolIcon {
-//                    platformIconId: "toolbar-share"
-//                    visible: flipper.articleShown
-//                    //anchors.right: (parent === undefined) ? undefined : parent.right
-//                    onClicked: {
-//                        controller.share(window.feedid, mainArticleId);
-//                    }
-//                }
+                ToolIcon {
+                    platformIconId: "toolbar-share"
+                    onClicked: {
+                        controller.share(window.feedid, articlePage.mainArticleId);
+                    }
+                }
 
-//                ToolIcon {
-//                    platformIconId: "toolbar-next"
-//                    visible: article.articleShown
-//                    //anchors.right: (parent === undefined) ? undefined : parent.right
-//                    onClicked: flipper.next()
-//                }
+                ToolIcon {
+                    platformIconId: "toolbar-next"
+                    onClicked: articlePage.next()
+                }
 
 //                ToolIcon {
 //                    platformIconId: "toolbar-view-menu"