From d0ba2ee2c45293a9b2845d2653c5132f2b06ca5e Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 20 Feb 2022 02:55:13 +0100 Subject: [PATCH 1/2] PatchmanagerPage: Reorder pulley menu entries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … "Settings" shall be below "About" and easier to reach, plus "Deactivate all Patches" the hardest to reach (i.e., topmost) --- src/qml/PatchManagerPage.qml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qml/PatchManagerPage.qml b/src/qml/PatchManagerPage.qml index 33f0d88b..b04c3a4e 100644 --- a/src/qml/PatchManagerPage.qml +++ b/src/qml/PatchManagerPage.qml @@ -139,8 +139,9 @@ Page { busy: view.busy enabled: !busy MenuItem { - text: qsTranslate("", "Settings") - onClicked: pageStack.push(Qt.resolvedUrl("SettingsPage.qml")) + text: qsTranslate("", "Deactivate all Patches") + onClicked: menuRemorse.execute( text, function() { PatchManager.call(PatchManager.unapplyAllPatches()) } ) + visible: PatchManager.loaded } MenuItem { @@ -149,9 +150,8 @@ Page { } MenuItem { - text: qsTranslate("", "Deactivate all Patches") - onClicked: menuRemorse.execute( text, function() { PatchManager.call(PatchManager.unapplyAllPatches()) } ) - visible: PatchManager.loaded + text: qsTranslate("", "Settings") + onClicked: pageStack.push(Qt.resolvedUrl("SettingsPage.qml")) } MenuItem { From e140cfded7178548f4386c22d81050ecd409588d Mon Sep 17 00:00:00 2001 From: olf Date: Wed, 23 Feb 2022 02:01:26 +0100 Subject: [PATCH 2/2] PatchManagerPage: Disable "Deactivate all Patches" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … pulley menu entry. --- src/qml/PatchManagerPage.qml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qml/PatchManagerPage.qml b/src/qml/PatchManagerPage.qml index b04c3a4e..c1434f8a 100644 --- a/src/qml/PatchManagerPage.qml +++ b/src/qml/PatchManagerPage.qml @@ -138,11 +138,16 @@ Page { PullDownMenu { busy: view.busy enabled: !busy + + /* + Disabled due to discussion at https://github.com/sailfishos-patches/patchmanager/pull/272#issuecomment-1047685536 + MenuItem { text: qsTranslate("", "Deactivate all Patches") onClicked: menuRemorse.execute( text, function() { PatchManager.call(PatchManager.unapplyAllPatches()) } ) visible: PatchManager.loaded } + */ MenuItem { text: qsTranslate("", "About Patchmanager")