From 79d70e1c13b308400c22a8723053cd2c890c0350 Mon Sep 17 00:00:00 2001 From: leminlimez <59540996+leminlimez@users.noreply.github.com> Date: Wed, 4 Dec 2024 14:45:30 -0500 Subject: [PATCH] move thermalmonitord to Risky + version via code --- gui/main_window.py | 15 ++++ qt/mainwindow.ui | 29 ++++---- qt/mainwindow_ui.py | 33 +++++---- qt/ui_mainwindow.py | 177 ++++++++++++++++++++++---------------------- 4 files changed, 139 insertions(+), 115 deletions(-) diff --git a/gui/main_window.py b/gui/main_window.py index cf8c528..45bd8a4 100644 --- a/gui/main_window.py +++ b/gui/main_window.py @@ -15,6 +15,9 @@ from gui.gestalt_dialog import GestaltDialog from tweaks.tweaks import tweaks from tweaks.custom_gestalt_tweaks import CustomGestaltTweaks, ValueTypeStrings +App_Version = "4.2" +App_Build = 4 + class Page(Enum): Home = 0 Gestalt = 1 @@ -36,6 +39,9 @@ class MainWindow(QtWidgets.QMainWindow): self.show_uuid = False self.loadSettings() + # Update the app version/build number label + self.updateAppVersionLabel() + ## DEVICE BAR self.refresh_devices() @@ -183,6 +189,15 @@ class MainWindow(QtWidgets.QMainWindow): def updateInterfaceForNewDevice(self): # update the home page self.updatePhoneInfo() + + def updateAppVersionLabel(self): + new_text: str = self.ui.appVersionLbl.text() + new_text = new_text.replace("%VERSION", App_Version) + if App_Build > 0: + new_text = new_text.replace("%BETATAG", f"(beta {App_Build})") + else: + new_text = new_text.replace("%BETATAG", "") + self.ui.appVersionLbl.setText(new_text) ## DEVICE BAR FUNCTIONS diff --git a/qt/mainwindow.ui b/qt/mainwindow.ui index ebcb297..2e02154 100644 --- a/qt/mainwindow.ui +++ b/qt/mainwindow.ui @@ -1572,9 +1572,9 @@ QToolButton:pressed { - + - Nugget GUI - Version 4.2 (beta 3) + Nugget GUI - Version %VERSION %BETATAG Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -3695,16 +3695,6 @@ QComboBox QAbstractItemView::item:hover { 0 - - - - Disables temperature monitoring daemon to reduce system checks. - - - Disable thermalmonitord - - - @@ -3963,8 +3953,21 @@ Nugget is not responsible if you mess up your device, especially with resolution + + Uses the file method. Recommended to disable the daemon instead in the Daemons tab. + - Disable OTA Updates + Disable OTA Updates (file) + + + + + + + Disables temperature monitoring daemon to reduce system checks. + + + Disable thermalmonitord diff --git a/qt/mainwindow_ui.py b/qt/mainwindow_ui.py index 6ccf50c..d01de3c 100644 --- a/qt/mainwindow_ui.py +++ b/qt/mainwindow_ui.py @@ -869,11 +869,11 @@ class Ui_Nugget(object): self.verticalLayout_2.addWidget(self.verticalWidget_2) - self.label = QLabel(self.homePage) - self.label.setObjectName(u"label") - self.label.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + self.appVersionLbl = QLabel(self.homePage) + self.appVersionLbl.setObjectName(u"appVersionLbl") + self.appVersionLbl.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) - self.verticalLayout_2.addWidget(self.label) + self.verticalLayout_2.addWidget(self.appVersionLbl) self.pages.addWidget(self.homePage) self.gestaltPage = QWidget() @@ -1973,11 +1973,6 @@ class Ui_Nugget(object): self.verticalLayout_132 = QVBoxLayout(self.daemonsPageContent) self.verticalLayout_132.setObjectName(u"verticalLayout_132") self.verticalLayout_132.setContentsMargins(0, 0, 0, 0) - self.thermalmonitordChk = QCheckBox(self.daemonsPageContent) - self.thermalmonitordChk.setObjectName(u"thermalmonitordChk") - - self.verticalLayout_132.addWidget(self.thermalmonitordChk) - self.otadChk = QCheckBox(self.daemonsPageContent) self.otadChk.setObjectName(u"otadChk") @@ -2103,6 +2098,11 @@ class Ui_Nugget(object): self.verticalLayout_133.addWidget(self.disableOTAChk) + self.thermalmonitordChk = QCheckBox(self.advancedOptionsPageContent) + self.thermalmonitordChk.setObjectName(u"thermalmonitordChk") + + self.verticalLayout_133.addWidget(self.thermalmonitordChk) + self.line_181 = QFrame(self.advancedOptionsPageContent) self.line_181.setObjectName(u"line_181") self.line_181.setStyleSheet(u"QFrame {\n" @@ -3083,7 +3083,7 @@ class Ui_Nugget(object): self.toolButton_15.setText(QCoreApplication.translate("Nugget", u"Additional Thanks", None)) self.libiBtn.setText(QCoreApplication.translate("Nugget", u"pymobiledevice3", None)) self.qtBtn.setText(QCoreApplication.translate("Nugget", u"Qt Creator", None)) - self.label.setText(QCoreApplication.translate("Nugget", u"Nugget GUI - Version 4.2 (beta 3)", None)) + self.appVersionLbl.setText(QCoreApplication.translate("Nugget", u"Nugget GUI - Version %VERSION %BETATAG", None)) self.statusBarLbl.setText(QCoreApplication.translate("Nugget", u"Mobile Gestalt", None)) self.mgaWarningLbl.setText(QCoreApplication.translate("Nugget", u"! You will need a MobileGestalt file for this feature. Please select it in the Apply page !", None)) self.label_9.setText(QCoreApplication.translate("Nugget", u"Device Subtype Preset", None)) @@ -3201,10 +3201,6 @@ class Ui_Nugget(object): self.notifyPastesChk.setText(QCoreApplication.translate("Nugget", u"Show Notifications for System Pastes", None)) self.daemonsLbl.setText(QCoreApplication.translate("Nugget", u"Daemons", None)) self.modifyDaemonsChk.setText(QCoreApplication.translate("Nugget", u"Modify", None)) -#if QT_CONFIG(tooltip) - self.thermalmonitordChk.setToolTip(QCoreApplication.translate("Nugget", u"Disables temperature monitoring daemon to reduce system checks.", None)) -#endif // QT_CONFIG(tooltip) - self.thermalmonitordChk.setText(QCoreApplication.translate("Nugget", u"Disable thermalmonitord", None)) #if QT_CONFIG(tooltip) self.otadChk.setToolTip(QCoreApplication.translate("Nugget", u"Stops over-the-air updates to prevent auto-downloads.", None)) #endif // QT_CONFIG(tooltip) @@ -3236,7 +3232,14 @@ class Ui_Nugget(object): "your device resolution has the potential to brick your device when used improperly.\n" "\n" "Nugget is not responsible if you mess up your device, especially with resolution changer.", None)) - self.disableOTAChk.setText(QCoreApplication.translate("Nugget", u"Disable OTA Updates", None)) +#if QT_CONFIG(tooltip) + self.disableOTAChk.setToolTip(QCoreApplication.translate("Nugget", u"Uses the file method. Recommended to disable the daemon instead in the Daemons tab.", None)) +#endif // QT_CONFIG(tooltip) + self.disableOTAChk.setText(QCoreApplication.translate("Nugget", u"Disable OTA Updates (file)", None)) +#if QT_CONFIG(tooltip) + self.thermalmonitordChk.setToolTip(QCoreApplication.translate("Nugget", u"Disables temperature monitoring daemon to reduce system checks.", None)) +#endif // QT_CONFIG(tooltip) + self.thermalmonitordChk.setText(QCoreApplication.translate("Nugget", u"Disable thermalmonitord", None)) self.enableResolutionChk.setText(QCoreApplication.translate("Nugget", u"Set a Custom Device Resolution", None)) self.resHeightLbl.setText(QCoreApplication.translate("Nugget", u"Height:", None)) self.resHeightTxt.setPlaceholderText(QCoreApplication.translate("Nugget", u"Resolution Height", None)) diff --git a/qt/ui_mainwindow.py b/qt/ui_mainwindow.py index 6ccf50c..dce7086 100644 --- a/qt/ui_mainwindow.py +++ b/qt/ui_mainwindow.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'mainwindow.ui' ## -## Created by: Qt User Interface Compiler version 6.6.3 +## Created by: Qt User Interface Compiler version 6.8.1 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -190,7 +190,7 @@ class Ui_Nugget(object): " border-bottom-right-radius: 0px;\n" "}") icon = QIcon() - icon.addFile(u":/icon/phone.svg", QSize(), QIcon.Normal, QIcon.Off) + icon.addFile(u":/icon/phone.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.toolButton_6.setIcon(icon) self.horizontalLayout_15.addWidget(self.toolButton_6) @@ -244,7 +244,7 @@ class Ui_Nugget(object): " border-radius: 0px;\n" "}") icon1 = QIcon() - icon1.addFile(u":/icon/arrow-clockwise.svg", QSize(), QIcon.Normal, QIcon.Off) + icon1.addFile(u":/icon/arrow-clockwise.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.refreshBtn.setIcon(icon1) self.refreshBtn.setCheckable(False) self.refreshBtn.setToolButtonStyle(Qt.ToolButtonIconOnly) @@ -297,7 +297,7 @@ class Ui_Nugget(object): sizePolicy2.setHeightForWidth(self.homePageBtn.sizePolicy().hasHeightForWidth()) self.homePageBtn.setSizePolicy(sizePolicy2) icon2 = QIcon() - icon2.addFile(u":/icon/house.svg", QSize(), QIcon.Normal, QIcon.Off) + icon2.addFile(u":/icon/house.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.homePageBtn.setIcon(icon2) self.homePageBtn.setCheckable(True) self.homePageBtn.setChecked(True) @@ -312,7 +312,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.sidebarDiv1.setFrameShadow(QFrame.Plain) - self.sidebarDiv1.setFrameShape(QFrame.HLine) + self.sidebarDiv1.setFrameShape(QFrame.Shape.HLine) self.verticalLayout.addWidget(self.sidebarDiv1) @@ -321,7 +321,7 @@ class Ui_Nugget(object): sizePolicy2.setHeightForWidth(self.gestaltPageBtn.sizePolicy().hasHeightForWidth()) self.gestaltPageBtn.setSizePolicy(sizePolicy2) icon3 = QIcon() - icon3.addFile(u":/icon/iphone-island.svg", QSize(), QIcon.Normal, QIcon.Off) + icon3.addFile(u":/icon/iphone-island.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.gestaltPageBtn.setIcon(icon3) self.gestaltPageBtn.setIconSize(QSize(24, 28)) self.gestaltPageBtn.setCheckable(True) @@ -339,7 +339,7 @@ class Ui_Nugget(object): font.setFamilies([u".AppleSystemUIFont"]) self.featureFlagsPageBtn.setFont(font) icon4 = QIcon() - icon4.addFile(u":/icon/flag.svg", QSize(), QIcon.Normal, QIcon.Off) + icon4.addFile(u":/icon/flag.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.featureFlagsPageBtn.setIcon(icon4) self.featureFlagsPageBtn.setCheckable(True) self.featureFlagsPageBtn.setAutoExclusive(True) @@ -352,7 +352,7 @@ class Ui_Nugget(object): sizePolicy2.setHeightForWidth(self.euEnablerPageBtn.sizePolicy().hasHeightForWidth()) self.euEnablerPageBtn.setSizePolicy(sizePolicy2) icon5 = QIcon() - icon5.addFile(u":/icon/geo-alt.svg", QSize(), QIcon.Normal, QIcon.Off) + icon5.addFile(u":/icon/geo-alt.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.euEnablerPageBtn.setIcon(icon5) self.euEnablerPageBtn.setCheckable(True) self.euEnablerPageBtn.setAutoExclusive(True) @@ -365,7 +365,7 @@ class Ui_Nugget(object): sizePolicy2.setHeightForWidth(self.springboardOptionsPageBtn.sizePolicy().hasHeightForWidth()) self.springboardOptionsPageBtn.setSizePolicy(sizePolicy2) icon6 = QIcon() - icon6.addFile(u":/icon/app-indicator.svg", QSize(), QIcon.Normal, QIcon.Off) + icon6.addFile(u":/icon/app-indicator.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.springboardOptionsPageBtn.setIcon(icon6) self.springboardOptionsPageBtn.setCheckable(True) self.springboardOptionsPageBtn.setAutoExclusive(True) @@ -378,7 +378,7 @@ class Ui_Nugget(object): sizePolicy2.setHeightForWidth(self.internalOptionsPageBtn.sizePolicy().hasHeightForWidth()) self.internalOptionsPageBtn.setSizePolicy(sizePolicy2) icon7 = QIcon() - icon7.addFile(u":/icon/hdd.svg", QSize(), QIcon.Normal, QIcon.Off) + icon7.addFile(u":/icon/hdd.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.internalOptionsPageBtn.setIcon(icon7) self.internalOptionsPageBtn.setCheckable(True) self.internalOptionsPageBtn.setAutoExclusive(True) @@ -392,7 +392,7 @@ class Ui_Nugget(object): sizePolicy2.setHeightForWidth(self.daemonsPageBtn.sizePolicy().hasHeightForWidth()) self.daemonsPageBtn.setSizePolicy(sizePolicy2) icon8 = QIcon() - icon8.addFile(u":/icon/toggles.svg", QSize(), QIcon.Normal, QIcon.Off) + icon8.addFile(u":/icon/toggles.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.daemonsPageBtn.setIcon(icon8) self.daemonsPageBtn.setCheckable(True) self.daemonsPageBtn.setAutoExclusive(True) @@ -405,7 +405,7 @@ class Ui_Nugget(object): sizePolicy2.setHeightForWidth(self.advancedPageBtn.sizePolicy().hasHeightForWidth()) self.advancedPageBtn.setSizePolicy(sizePolicy2) icon9 = QIcon() - icon9.addFile(u":/icon/star.svg", QSize(), QIcon.Normal, QIcon.Off) + icon9.addFile(u":/icon/star.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.advancedPageBtn.setIcon(icon9) self.advancedPageBtn.setCheckable(True) self.advancedPageBtn.setAutoExclusive(True) @@ -419,7 +419,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.sidebarDiv2.setFrameShadow(QFrame.Plain) - self.sidebarDiv2.setFrameShape(QFrame.HLine) + self.sidebarDiv2.setFrameShape(QFrame.Shape.HLine) self.verticalLayout.addWidget(self.sidebarDiv2) @@ -428,7 +428,7 @@ class Ui_Nugget(object): sizePolicy2.setHeightForWidth(self.applyPageBtn.sizePolicy().hasHeightForWidth()) self.applyPageBtn.setSizePolicy(sizePolicy2) icon10 = QIcon() - icon10.addFile(u":/icon/check-circle.svg", QSize(), QIcon.Normal, QIcon.Off) + icon10.addFile(u":/icon/check-circle.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.applyPageBtn.setIcon(icon10) self.applyPageBtn.setCheckable(True) self.applyPageBtn.setAutoExclusive(True) @@ -441,7 +441,7 @@ class Ui_Nugget(object): sizePolicy2.setHeightForWidth(self.settingsPageBtn.sizePolicy().hasHeightForWidth()) self.settingsPageBtn.setSizePolicy(sizePolicy2) icon11 = QIcon() - icon11.addFile(u":/icon/gear.svg", QSize(), QIcon.Normal, QIcon.Off) + icon11.addFile(u":/icon/gear.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.settingsPageBtn.setIcon(icon11) self.settingsPageBtn.setCheckable(True) self.settingsPageBtn.setAutoExclusive(True) @@ -511,7 +511,7 @@ class Ui_Nugget(object): self.phoneVersionLbl = QLabel(self.verticalWidget) self.phoneVersionLbl.setObjectName(u"phoneVersionLbl") - self.phoneVersionLbl.setCursor(QCursor(Qt.PointingHandCursor)) + self.phoneVersionLbl.setCursor(QCursor(Qt.CursorShape.PointingHandCursor)) self.phoneVersionLbl.setTextFormat(Qt.RichText) self.phoneVersionLbl.setOpenExternalLinks(False) @@ -533,7 +533,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_4.setFrameShadow(QFrame.Plain) - self.line_4.setFrameShape(QFrame.HLine) + self.line_4.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_2.addWidget(self.line_4) @@ -554,7 +554,7 @@ class Ui_Nugget(object): " padding: 0px;\n" "}") icon12 = QIcon() - icon12.addFile(u":/credits/big_nugget.png", QSize(), QIcon.Normal, QIcon.Off) + icon12.addFile(u":/credits/big_nugget.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.bigNuggetBtn.setIcon(icon12) self.bigNuggetBtn.setIconSize(QSize(150, 200)) @@ -591,7 +591,7 @@ class Ui_Nugget(object): self.discordBtn = QToolButton(self.verticalWidget1) self.discordBtn.setObjectName(u"discordBtn") icon13 = QIcon() - icon13.addFile(u":/icon/discord.svg", QSize(), QIcon.Normal, QIcon.Off) + icon13.addFile(u":/icon/discord.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.discordBtn.setIcon(icon13) self.discordBtn.setToolButtonStyle(Qt.ToolButtonTextBesideIcon) @@ -642,7 +642,7 @@ class Ui_Nugget(object): " background: none;\n" "}") icon14 = QIcon() - icon14.addFile(u":/credits/LeminLimez.png", QSize(), QIcon.Normal, QIcon.Off) + icon14.addFile(u":/credits/LeminLimez.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.leminBtn.setIcon(icon14) self.leminBtn.setToolButtonStyle(Qt.ToolButtonTextBesideIcon) @@ -662,7 +662,7 @@ class Ui_Nugget(object): " color: #FFFFFF;\n" "}") icon15 = QIcon() - icon15.addFile(u":/icon/twitter.svg", QSize(), QIcon.Normal, QIcon.Off) + icon15.addFile(u":/icon/twitter.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.leminTwitterBtn.setIcon(icon15) self.horizontalLayout_6.addWidget(self.leminTwitterBtn) @@ -681,7 +681,7 @@ class Ui_Nugget(object): " color: #FFFFFF;\n" "}") icon16 = QIcon() - icon16.addFile(u":/icon/github.svg", QSize(), QIcon.Normal, QIcon.Off) + icon16.addFile(u":/icon/github.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.leminGithubBtn.setIcon(icon16) self.horizontalLayout_6.addWidget(self.leminGithubBtn) @@ -701,7 +701,7 @@ class Ui_Nugget(object): " color: #FFFFFF;\n" "}") icon17 = QIcon() - icon17.addFile(u":/icon/currency-dollar.svg", QSize(), QIcon.Normal, QIcon.Off) + icon17.addFile(u":/icon/currency-dollar.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.leminKoFiBtn.setIcon(icon17) self.horizontalLayout_6.addWidget(self.leminKoFiBtn) @@ -869,11 +869,11 @@ class Ui_Nugget(object): self.verticalLayout_2.addWidget(self.verticalWidget_2) - self.label = QLabel(self.homePage) - self.label.setObjectName(u"label") - self.label.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + self.appVersionLbl = QLabel(self.homePage) + self.appVersionLbl.setObjectName(u"appVersionLbl") + self.appVersionLbl.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) - self.verticalLayout_2.addWidget(self.label) + self.verticalLayout_2.addWidget(self.appVersionLbl) self.pages.addWidget(self.homePage) self.gestaltPage = QWidget() @@ -934,7 +934,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_8.setFrameShadow(QFrame.Plain) - self.line_8.setFrameShape(QFrame.HLine) + self.line_8.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_4.addWidget(self.line_8) @@ -1062,7 +1062,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_7.setFrameShadow(QFrame.Plain) - self.line_7.setFrameShape(QFrame.HLine) + self.line_7.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_8.addWidget(self.line_7) @@ -1107,7 +1107,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_9.setFrameShadow(QFrame.Plain) - self.line_9.setFrameShape(QFrame.HLine) + self.line_9.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_8.addWidget(self.line_9) @@ -1127,7 +1127,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_10.setFrameShadow(QFrame.Plain) - self.line_10.setFrameShape(QFrame.HLine) + self.line_10.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_8.addWidget(self.line_10) @@ -1147,7 +1147,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_22.setFrameShadow(QFrame.Plain) - self.line_22.setFrameShape(QFrame.HLine) + self.line_22.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_8.addWidget(self.line_22) @@ -1164,7 +1164,7 @@ class Ui_Nugget(object): self.addGestaltKeyBtn.setObjectName(u"addGestaltKeyBtn") self.addGestaltKeyBtn.setEnabled(True) icon18 = QIcon() - icon18.addFile(u":/icon/plus.svg", QSize(), QIcon.Normal, QIcon.Off) + icon18.addFile(u":/icon/plus.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.addGestaltKeyBtn.setIcon(icon18) self.addGestaltKeyBtn.setCheckable(False) self.addGestaltKeyBtn.setToolButtonStyle(Qt.ToolButtonTextBesideIcon) @@ -1185,7 +1185,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_23.setFrameShadow(QFrame.Plain) - self.line_23.setFrameShape(QFrame.HLine) + self.line_23.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_8.addWidget(self.line_23) @@ -1271,7 +1271,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_12.setFrameShadow(QFrame.Plain) - self.line_12.setFrameShape(QFrame.HLine) + self.line_12.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_14.addWidget(self.line_12) @@ -1298,7 +1298,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.div.setFrameShadow(QFrame.Plain) - self.div.setFrameShape(QFrame.HLine) + self.div.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_13.addWidget(self.div) @@ -1377,7 +1377,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_13.setFrameShadow(QFrame.Plain) - self.line_13.setFrameShape(QFrame.HLine) + self.line_13.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_17.addWidget(self.line_13) @@ -1459,7 +1459,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_16.setFrameShadow(QFrame.Plain) - self.line_16.setFrameShape(QFrame.HLine) + self.line_16.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_36.addWidget(self.line_16) @@ -1503,7 +1503,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_21.setFrameShadow(QFrame.Plain) - self.line_21.setFrameShape(QFrame.HLine) + self.line_21.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_34.addWidget(self.line_21) @@ -1655,7 +1655,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_11.setFrameShadow(QFrame.Plain) - self.line_11.setFrameShape(QFrame.HLine) + self.line_11.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_10.addWidget(self.line_11) @@ -1682,7 +1682,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_6.setFrameShadow(QFrame.Plain) - self.line_6.setFrameShape(QFrame.HLine) + self.line_6.setFrameShape(QFrame.Shape.HLine) self._2.addWidget(self.line_6) @@ -1781,7 +1781,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_121.setFrameShadow(QFrame.Plain) - self.line_121.setFrameShape(QFrame.HLine) + self.line_121.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_141.addWidget(self.line_121) @@ -1808,7 +1808,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.div1.setFrameShadow(QFrame.Plain) - self.div1.setFrameShape(QFrame.HLine) + self.div1.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_131.addWidget(self.div1) @@ -1838,7 +1838,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_17.setFrameShadow(QFrame.Plain) - self.line_17.setFrameShape(QFrame.HLine) + self.line_17.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_131.addWidget(self.line_17) @@ -1858,7 +1858,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_18.setFrameShadow(QFrame.Plain) - self.line_18.setFrameShape(QFrame.HLine) + self.line_18.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_131.addWidget(self.line_18) @@ -1883,7 +1883,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_19.setFrameShadow(QFrame.Plain) - self.line_19.setFrameShape(QFrame.HLine) + self.line_19.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_131.addWidget(self.line_19) @@ -1963,7 +1963,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_122.setFrameShadow(QFrame.Plain) - self.line_122.setFrameShape(QFrame.HLine) + self.line_122.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_142.addWidget(self.line_122) @@ -1973,11 +1973,6 @@ class Ui_Nugget(object): self.verticalLayout_132 = QVBoxLayout(self.daemonsPageContent) self.verticalLayout_132.setObjectName(u"verticalLayout_132") self.verticalLayout_132.setContentsMargins(0, 0, 0, 0) - self.thermalmonitordChk = QCheckBox(self.daemonsPageContent) - self.thermalmonitordChk.setObjectName(u"thermalmonitordChk") - - self.verticalLayout_132.addWidget(self.thermalmonitordChk) - self.otadChk = QCheckBox(self.daemonsPageContent) self.otadChk.setObjectName(u"otadChk") @@ -2073,7 +2068,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_123.setFrameShadow(QFrame.Plain) - self.line_123.setFrameShape(QFrame.HLine) + self.line_123.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_143.addWidget(self.line_123) @@ -2094,7 +2089,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_191.setFrameShadow(QFrame.Plain) - self.line_191.setFrameShape(QFrame.HLine) + self.line_191.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_133.addWidget(self.line_191) @@ -2103,13 +2098,18 @@ class Ui_Nugget(object): self.verticalLayout_133.addWidget(self.disableOTAChk) + self.thermalmonitordChk = QCheckBox(self.advancedOptionsPageContent) + self.thermalmonitordChk.setObjectName(u"thermalmonitordChk") + + self.verticalLayout_133.addWidget(self.thermalmonitordChk) + self.line_181 = QFrame(self.advancedOptionsPageContent) self.line_181.setObjectName(u"line_181") self.line_181.setStyleSheet(u"QFrame {\n" " color: #414141;\n" "}") self.line_181.setFrameShadow(QFrame.Plain) - self.line_181.setFrameShape(QFrame.HLine) + self.line_181.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_133.addWidget(self.line_181) @@ -2265,7 +2265,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_5.setFrameShadow(QFrame.Plain) - self.line_5.setFrameShape(QFrame.HLine) + self.line_5.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_24.addWidget(self.line_5) @@ -2291,7 +2291,7 @@ class Ui_Nugget(object): self.chooseGestaltBtn = QToolButton(self.verticalWidget2) self.chooseGestaltBtn.setObjectName(u"chooseGestaltBtn") icon19 = QIcon() - icon19.addFile(u":/icon/folder.svg", QSize(), QIcon.Normal, QIcon.Off) + icon19.addFile(u":/icon/folder.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.chooseGestaltBtn.setIcon(icon19) self.chooseGestaltBtn.setToolButtonStyle(Qt.ToolButtonTextBesideIcon) @@ -2422,7 +2422,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_111.setFrameShadow(QFrame.Plain) - self.line_111.setFrameShape(QFrame.HLine) + self.line_111.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_101.addWidget(self.line_111) @@ -2456,7 +2456,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_24.setFrameShadow(QFrame.Plain) - self.line_24.setFrameShape(QFrame.HLine) + self.line_24.setFrameShape(QFrame.Shape.HLine) self._21.addWidget(self.line_24) @@ -2493,7 +2493,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_20.setFrameShadow(QFrame.Plain) - self.line_20.setFrameShape(QFrame.HLine) + self.line_20.setFrameShape(QFrame.Shape.HLine) self._21.addWidget(self.line_20) @@ -2579,7 +2579,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_2.setFrameShadow(QFrame.Plain) - self.line_2.setFrameShape(QFrame.HLine) + self.line_2.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_28.addWidget(self.line_2) @@ -2680,7 +2680,7 @@ class Ui_Nugget(object): " border-radius: 0px;\n" "}") icon20 = QIcon() - icon20.addFile(u":/icon/pencil.svg", QSize(), QIcon.Normal, QIcon.Off) + icon20.addFile(u":/icon/pencil.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.toolButton_12.setIcon(icon20) self.toolButton_12.setIconSize(QSize(25, 25)) @@ -2719,7 +2719,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_14.setFrameShadow(QFrame.Plain) - self.line_14.setFrameShape(QFrame.HLine) + self.line_14.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_20.addWidget(self.line_14) @@ -2743,7 +2743,7 @@ class Ui_Nugget(object): self.importOperationBtn.setObjectName(u"importOperationBtn") self.importOperationBtn.setEnabled(True) icon21 = QIcon() - icon21.addFile(u":/icon/import.svg", QSize(), QIcon.Normal, QIcon.Off) + icon21.addFile(u":/icon/import.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.importOperationBtn.setIcon(icon21) self.importOperationBtn.setIconSize(QSize(20, 20)) self.importOperationBtn.setToolButtonStyle(Qt.ToolButtonTextBesideIcon) @@ -2804,7 +2804,7 @@ class Ui_Nugget(object): " border-radius: 0px;\n" "}") icon22 = QIcon() - icon22.addFile(u":/icon/compass.svg", QSize(), QIcon.Normal, QIcon.Off) + icon22.addFile(u":/icon/compass.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.toolButton_16.setIcon(icon22) self.horizontalLayout_31.addWidget(self.toolButton_16) @@ -2842,7 +2842,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_3.setFrameShadow(QFrame.Plain) - self.line_3.setFrameShape(QFrame.HLine) + self.line_3.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_31.addWidget(self.line_3) @@ -2922,7 +2922,7 @@ class Ui_Nugget(object): self.importThemeZipBtn = QToolButton(self.horizontalWidget7) self.importThemeZipBtn.setObjectName(u"importThemeZipBtn") icon23 = QIcon() - icon23.addFile(u":/icon/file-earmark-zip.svg", QSize(), QIcon.Normal, QIcon.Off) + icon23.addFile(u":/icon/file-earmark-zip.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.importThemeZipBtn.setIcon(icon23) self.horizontalLayout_26.addWidget(self.importThemeZipBtn) @@ -2939,7 +2939,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line_15.setFrameShadow(QFrame.Plain) - self.line_15.setFrameShape(QFrame.HLine) + self.line_15.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_23.addWidget(self.line_15) @@ -2960,7 +2960,7 @@ class Ui_Nugget(object): " color: #414141;\n" "}") self.line.setFrameShadow(QFrame.Plain) - self.line.setFrameShape(QFrame.HLine) + self.line.setFrameShape(QFrame.Shape.HLine) self.verticalLayout_22.addWidget(self.line) @@ -3035,30 +3035,30 @@ class Ui_Nugget(object): def retranslateUi(self, Nugget): Nugget.setWindowTitle(QCoreApplication.translate("Nugget", u"Nugget", None)) - self.centralwidget.setProperty("cls", QCoreApplication.translate("Nugget", u"central", None)) + self.centralwidget.setProperty(u"cls", QCoreApplication.translate("Nugget", u"central", None)) self.devicePicker.setPlaceholderText(QCoreApplication.translate("Nugget", u"None", None)) - self.refreshBtn.setProperty("cls", QCoreApplication.translate("Nugget", u"btn", None)) + self.refreshBtn.setProperty(u"cls", QCoreApplication.translate("Nugget", u"btn", None)) self.titleBar.setText(QCoreApplication.translate("Nugget", u"Nugget", None)) self.homePageBtn.setText(QCoreApplication.translate("Nugget", u" Home", None)) - self.homePageBtn.setProperty("cls", QCoreApplication.translate("Nugget", u"sidebarBtn", None)) + self.homePageBtn.setProperty(u"cls", QCoreApplication.translate("Nugget", u"sidebarBtn", None)) self.gestaltPageBtn.setText(QCoreApplication.translate("Nugget", u" Mobile Gestalt", None)) - self.gestaltPageBtn.setProperty("cls", QCoreApplication.translate("Nugget", u"sidebarBtn", None)) + self.gestaltPageBtn.setProperty(u"cls", QCoreApplication.translate("Nugget", u"sidebarBtn", None)) self.featureFlagsPageBtn.setText(QCoreApplication.translate("Nugget", u" Feature Flags", None)) - self.featureFlagsPageBtn.setProperty("cls", QCoreApplication.translate("Nugget", u"sidebarBtn", None)) + self.featureFlagsPageBtn.setProperty(u"cls", QCoreApplication.translate("Nugget", u"sidebarBtn", None)) self.euEnablerPageBtn.setText(QCoreApplication.translate("Nugget", u" Eligibility", None)) - self.euEnablerPageBtn.setProperty("cls", QCoreApplication.translate("Nugget", u"sidebarBtn", None)) + self.euEnablerPageBtn.setProperty(u"cls", QCoreApplication.translate("Nugget", u"sidebarBtn", None)) self.springboardOptionsPageBtn.setText(QCoreApplication.translate("Nugget", u" Springboard Options", None)) - self.springboardOptionsPageBtn.setProperty("cls", QCoreApplication.translate("Nugget", u"sidebarBtn", None)) + self.springboardOptionsPageBtn.setProperty(u"cls", QCoreApplication.translate("Nugget", u"sidebarBtn", None)) self.internalOptionsPageBtn.setText(QCoreApplication.translate("Nugget", u" Internal Options", None)) - self.internalOptionsPageBtn.setProperty("cls", QCoreApplication.translate("Nugget", u"sidebarBtn", None)) + self.internalOptionsPageBtn.setProperty(u"cls", QCoreApplication.translate("Nugget", u"sidebarBtn", None)) self.daemonsPageBtn.setText(QCoreApplication.translate("Nugget", u" Daemons", None)) - self.daemonsPageBtn.setProperty("cls", QCoreApplication.translate("Nugget", u"sidebarBtn", None)) + self.daemonsPageBtn.setProperty(u"cls", QCoreApplication.translate("Nugget", u"sidebarBtn", None)) self.advancedPageBtn.setText(QCoreApplication.translate("Nugget", u" Risky Options", None)) - self.advancedPageBtn.setProperty("cls", QCoreApplication.translate("Nugget", u"sidebarBtn", None)) + self.advancedPageBtn.setProperty(u"cls", QCoreApplication.translate("Nugget", u"sidebarBtn", None)) self.applyPageBtn.setText(QCoreApplication.translate("Nugget", u" Apply", None)) - self.applyPageBtn.setProperty("cls", QCoreApplication.translate("Nugget", u"sidebarBtn", None)) + self.applyPageBtn.setProperty(u"cls", QCoreApplication.translate("Nugget", u"sidebarBtn", None)) self.settingsPageBtn.setText(QCoreApplication.translate("Nugget", u" Settings", None)) - self.settingsPageBtn.setProperty("cls", QCoreApplication.translate("Nugget", u"sidebarBtn", None)) + self.settingsPageBtn.setProperty(u"cls", QCoreApplication.translate("Nugget", u"sidebarBtn", None)) self.phoneNameLbl.setText(QCoreApplication.translate("Nugget", u"Phone", None)) self.phoneVersionLbl.setText(QCoreApplication.translate("Nugget", u"Version", None)) self.bigNuggetBtn.setText(QCoreApplication.translate("Nugget", u"...", None)) @@ -3083,7 +3083,7 @@ class Ui_Nugget(object): self.toolButton_15.setText(QCoreApplication.translate("Nugget", u"Additional Thanks", None)) self.libiBtn.setText(QCoreApplication.translate("Nugget", u"pymobiledevice3", None)) self.qtBtn.setText(QCoreApplication.translate("Nugget", u"Qt Creator", None)) - self.label.setText(QCoreApplication.translate("Nugget", u"Nugget GUI - Version 4.2 (beta 3)", None)) + self.appVersionLbl.setText(QCoreApplication.translate("Nugget", u"Nugget GUI - Version %VERSION %BETATAG", None)) self.statusBarLbl.setText(QCoreApplication.translate("Nugget", u"Mobile Gestalt", None)) self.mgaWarningLbl.setText(QCoreApplication.translate("Nugget", u"! You will need a MobileGestalt file for this feature. Please select it in the Apply page !", None)) self.label_9.setText(QCoreApplication.translate("Nugget", u"Device Subtype Preset", None)) @@ -3201,10 +3201,6 @@ class Ui_Nugget(object): self.notifyPastesChk.setText(QCoreApplication.translate("Nugget", u"Show Notifications for System Pastes", None)) self.daemonsLbl.setText(QCoreApplication.translate("Nugget", u"Daemons", None)) self.modifyDaemonsChk.setText(QCoreApplication.translate("Nugget", u"Modify", None)) -#if QT_CONFIG(tooltip) - self.thermalmonitordChk.setToolTip(QCoreApplication.translate("Nugget", u"Disables temperature monitoring daemon to reduce system checks.", None)) -#endif // QT_CONFIG(tooltip) - self.thermalmonitordChk.setText(QCoreApplication.translate("Nugget", u"Disable thermalmonitord", None)) #if QT_CONFIG(tooltip) self.otadChk.setToolTip(QCoreApplication.translate("Nugget", u"Stops over-the-air updates to prevent auto-downloads.", None)) #endif // QT_CONFIG(tooltip) @@ -3236,7 +3232,14 @@ class Ui_Nugget(object): "your device resolution has the potential to brick your device when used improperly.\n" "\n" "Nugget is not responsible if you mess up your device, especially with resolution changer.", None)) - self.disableOTAChk.setText(QCoreApplication.translate("Nugget", u"Disable OTA Updates", None)) +#if QT_CONFIG(tooltip) + self.disableOTAChk.setToolTip(QCoreApplication.translate("Nugget", u"Uses the file method. Recommended to disable the daemon instead in the Daemons tab.", None)) +#endif // QT_CONFIG(tooltip) + self.disableOTAChk.setText(QCoreApplication.translate("Nugget", u"Disable OTA Updates (file)", None)) +#if QT_CONFIG(tooltip) + self.thermalmonitordChk.setToolTip(QCoreApplication.translate("Nugget", u"Disables temperature monitoring daemon to reduce system checks.", None)) +#endif // QT_CONFIG(tooltip) + self.thermalmonitordChk.setText(QCoreApplication.translate("Nugget", u"Disable thermalmonitord", None)) self.enableResolutionChk.setText(QCoreApplication.translate("Nugget", u"Set a Custom Device Resolution", None)) self.resHeightLbl.setText(QCoreApplication.translate("Nugget", u"Height:", None)) self.resHeightTxt.setPlaceholderText(QCoreApplication.translate("Nugget", u"Resolution Height", None))