psa: fix updateBar

diff --git a/psa_harmattan/feedingit/qml/ArticleViewer.qml b/psa_harmattan/feedingit/qml/ArticleViewer.qml
index 9bb29b4..6da3b6e 100644 (file)
--- a/psa_harmattan/feedingit/qml/ArticleViewer.qml
+++ b/psa_harmattan/feedingit/qml/ArticleViewer.qml
@@ -71,7 +71,7 @@ Item {
         delegate: viewer
         orientation: ListView.Horizontal
         width: parent.width;
-        height: updateBarFeeds.visible? parent.height-updateBarFeeds.height : parent.height;
+        height: updateBarArticles.visible? parent.height-updateBarArticles.height : parent.height;
         visible: false; z:8
         //onCurrentIndexChanged: photosGridView.positionViewAtIndex(currentIndex, GridView.Contain)
         highlightRangeMode: ListView.StrictlyEnforceRange; snapMode: ListView.SnapOneItem
@@ -82,7 +82,7 @@ Item {
     }
 
     ProgressBar {
-        id: updateBar
+        id: updateBarArticles
         minimumValue: 0
         maximumValue: 100
         value: window.updateProgressValue

diff --git a/psa_harmattan/feedingit/qml/Categories.qml b/psa_harmattan/feedingit/qml/Categories.qml
index be7205e..3ecd3b0 100644 (file)
--- a/psa_harmattan/feedingit/qml/Categories.qml
+++ b/psa_harmattan/feedingit/qml/Categories.qml
@@ -17,13 +17,13 @@ Item {
     ListView {
         id: categoryList; model: categories; delegate: categoryDelegate; z: 6;
         cacheBuffer: 100; width: parent.width;
-        height: updateBarFeeds.visible? parent.height-updateBarFeeds.height : parent.height;
+        height: updateBarCategories.visible? parent.height-updateBarCategories.height : parent.height;
         clip: true
         /*height: parent.height;*/
     }
 
     ProgressBar {
-        id: updateBar
+        id: updateBarCategories
         minimumValue: 0
         maximumValue: 100
         value: window.updateProgressValue