Use pageNo for page variable as page means something other now in Sai…

…lfishOS 4, fixes #29
walokra · Nov 14, 2021 · a83ce5a · a83ce5a
1 parent 0df7bc5
commit a83ce5a
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 24 deletions.
diff --git a/qml/components/imgur.js b/qml/components/imgur.js
@@ -672,29 +672,29 @@ function getAuthorizationHeader() {
     }
 }
 
-function processGalleryMode(query, model, page, settings, onSuccess, onFailure) {
+function processGalleryMode(query, model, pageNo, settings, onSuccess, onFailure) {
     // Global accesor used to use the correct URL base for getGalleryImage()
     redditModeActive = false;
 
     if (query) {
-        getGallerySearch(query, model, page, settings, onSuccess, onFailure);
+        getGallerySearch(query, model, pageNo, settings, onSuccess, onFailure);
     }
     else if (settings.mode === "main" || settings.mode === "user" || settings.mode === "score") {
-        getGallery(model, page, settings, onSuccess, onFailure);
+        getGallery(model, pageNo, settings, onSuccess, onFailure);
     } else if (settings.mode === "random") {
-        getRandomGalleryImages(model, page, onSuccess, onFailure);
+        getRandomGalleryImages(model, pageNo, onSuccess, onFailure);
     } else if (settings.mode === "memes") {
-        getMemesSubGallery(model, page, settings, onSuccess, onFailure);
+        getMemesSubGallery(model, pageNo, settings, onSuccess, onFailure);
     } else if (settings.mode === "reddit") {
         redditModeActive = true;
-        getRedditSubGallery(model, page, settings, onSuccess, onFailure);
+        getRedditSubGallery(model, pageNo, settings, onSuccess, onFailure);
 
     } else if (settings.mode === "favorites") {
         getFavorites(model, onSuccess, onFailure);
     } else if (settings.mode === "albums") {
-        getAlbums(model, page, onSuccess, onFailure);
+        getAlbums(model, pageNo, onSuccess, onFailure);
     } else if (settings.mode === "images") {
-        getImages(model, page, onSuccess, onFailure);
+        getImages(model, pageNo, onSuccess, onFailure);
     }
 }
 
diff --git a/qml/main.qml b/qml/main.qml
@@ -8,7 +8,7 @@ ApplicationWindow {
 
     property Page currentPage: pageStack.currentPage
 
-    property int page : 0;
+    property int pageNo : 0;
     property int currentIndex : 0;
     property bool loggedIn : false;
 

diff --git a/qml/pages/AccountPage.qml b/qml/pages/AccountPage.qml
@@ -275,7 +275,7 @@ Page {
 
         function setCommonValues() {
             currentIndex = 0;
-            page = 0;
+            pageNo = 0;
             galleryModel.query = "";
             galleryModel.clear();
             galleryModel.processGalleryMode();

diff --git a/qml/pages/GalleryContentPage.qml b/qml/pages/GalleryContentPage.qml
@@ -14,7 +14,7 @@ Page {
 
     property string galleryContentPageTitle : constant.appName;
 
-    property bool prevEnabled: currentIndex > 0 || page > 0;
+    property bool prevEnabled: currentIndex > 0 || pageNo > 0;
 
     GalleryContentModel {
         id: galleryContentModel;
@@ -77,7 +77,7 @@ Page {
     }
 
     function setPrevButton() {
-        if (currentIndex === 0 && page === 0) {
+        if (currentIndex === 0 && pageNo === 0) {
             prevEnabled = false;
         } else {
             prevEnabled = true;

diff --git a/qml/pages/GalleryMode.qml b/qml/pages/GalleryMode.qml
@@ -276,7 +276,7 @@ Row {
 
         function setModeCommon() {
             settings.saveSetting("mode", settings.mode);
-            page = 0;
+            pageNo = 0;
             galleryModel.query = "";
             toolbar.searchVisible = false;
             galgrid.scrollToTop();

diff --git a/qml/pages/GalleryModel.qml b/qml/pages/GalleryModel.qml
@@ -29,7 +29,7 @@ ListModel {
 
         signInPage.init();
 
-       Imgur.processGalleryMode(query, listModel, page, settings,
+       Imgur.processGalleryMode(query, listModel, pageNo, settings,
             onSuccess(),
             onFailure()
         );

diff --git a/qml/pages/GalleryNavigation.qml b/qml/pages/GalleryNavigation.qml
@@ -15,17 +15,17 @@ Item {
 
     z: 2;
 
-    visible: galleryModel.count > 1 || page > 0;
+    visible: galleryModel.count > 1 || pageNo > 0;
 
     function previous() {
-        //console.log("Previous clicked! curr=" + currentIndex + "; page=" + page);
-        if (currentIndex > 0 && page >= 0) {
+        //console.log("Previous clicked! curr=" + currentIndex + "; page=" + pageNo);
+        if (currentIndex > 0 && pageNo >= 0) {
             currentIndex -= 1;
             load();
         }
-        if (currentIndex === 0 && page >= 1) {
+        if (currentIndex === 0 && pageNo >= 1) {
             //console.log("Getting previous list of images");
-            page -= 1;
+            pageNo -= 1;
 
             loadingRect.visible = true;
             galleryModel.clear();
@@ -36,15 +36,15 @@ Item {
     }
 
     function next() {
-        //console.log("Next clicked! curr=" + currentIndex + "; model=" + galleryModel.count);
+        //console.log("Next clicked! curr=", + currentIndex + "; count=" + galleryModel.count);
         if (currentIndex < galleryModel.count - 1) {
             //console.log("Getting next image");
             currentIndex += 1;
             load();
         }
         else if (currentIndex === galleryModel.count - 1) {
             //console.log("Getting new list of images");
-            page += 1;
+            pageNo += 1;
             currentIndex = 0;
 
             loadingRect.visible = true;

diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml
@@ -217,7 +217,7 @@ Page {
 
 //                    if (page > 0) {
 //                        page -= 1;
-//                        console.log("atYBeginning: " + page);
+//                        console.log("atYBeginning: " + pageNo);
 //                        statusLabel.text = qsTr("Loading previous page");
 //                        galleryModel.prevPage(galleryModel.query);
 //                        galgrid.scrollToBottom();
@@ -226,7 +226,7 @@ Page {
 
                 if(atYEnd) {
                     page += 1;
-//                    console.log("atYEnd: " + page);
+//                    console.log("atYEnd: " + pageNo);
                     statusLabel.text = qsTr("Loading next page");
                     galleryModel.nextPage(galleryModel.query);
                 }

diff --git a/qml/pages/Toolbar.qml b/qml/pages/Toolbar.qml
@@ -44,7 +44,7 @@ Column {
                 settings.saveSetting("mode", settings.mode);
                 modeChanged("main");
 
-                page = 0;
+                pageNo = 0;
                 galleryModel.query = "";
                 searchPanel.visible = false;
                 galgrid.scrollToTop();