diff --git a/gui/main_window.py b/gui/main_window.py index 36983c9..e1ab9aa 100644 --- a/gui/main_window.py +++ b/gui/main_window.py @@ -305,7 +305,7 @@ class MainWindow(QtWidgets.QMainWindow): # remove the new dynamic island options MinTweakVersions = { "no_patch": [self.ui.chooseGestaltBtn, self.ui.gestaltPageBtn, self.ui.resetGestaltBtn, self.ui.gestaltLocationLbl, self.ui.showAllSpoofableChk], - "exploit": [("18.0", self.ui.featureFlagsPageBtn), ("18.1", self.ui.eligFileChk)], + "exploit": [("18.0", self.ui.featureFlagsPageBtn), ("18.1", self.ui.eligFileChk), ("1.0", self.ui.regularDomainsLbl)], "18.1": [self.ui.enableAIChk, self.ui.aiEnablerContent], "18.0": [self.ui.aodChk, self.ui.aodVibrancyChk, self.ui.iphone16SettingsChk] } @@ -394,6 +394,12 @@ class MainWindow(QtWidgets.QMainWindow): self.ui.supervisionChk.setChecked(supervised) self.ui.supervisionOrganization.setText(organization_name) + # hide/show the warning label + if skip_setup: + self.ui.skipSetupOnLbl.show() + else: + self.ui.skipSetupOnLbl.hide() + self.device_manager.apply_over_wifi = apply_over_wifi self.device_manager.auto_reboot = auto_reboot self.device_manager.allow_risky_tweaks = risky_tweaks @@ -838,6 +844,11 @@ class MainWindow(QtWidgets.QMainWindow): self.device_manager.skip_setup = checked # save the setting self.settings.setValue("skip_setup", checked) + # hide/show the warning label + if checked: + self.ui.skipSetupOnLbl.show() + else: + self.ui.skipSetupOnLbl.hide() def on_supervisionOrgTxt_textEdited(self, text: str): self.device_manager.organization_name = text self.settings.setValue("organization_name", text) diff --git a/qt/mainwindow.ui b/qt/mainwindow.ui index de72aa2..2ed77b8 100644 --- a/qt/mainwindow.ui +++ b/qt/mainwindow.ui @@ -2615,7 +2615,7 @@ Only works on iOS 18.0 beta 1-2. 0 - -129 + 0 660 573 @@ -3803,6 +3803,14 @@ QComboBox QAbstractItemView::item:hover { + + + + Note: Even on Sparserestore versions, this uses regular domains. Skip Setup will be applied if you have +it enabled. + + + @@ -4594,6 +4602,23 @@ Warning: Disabling will cause the battery to show "Unknown Part" or &q + + + + + -1 + false + + + + Note: Skip Setup is currently turned on. +It can be turned off in the Settings tab. + + + Qt::AlignCenter + + + diff --git a/qt/mainwindow_ui.py b/qt/mainwindow_ui.py index 9d13708..b84c56e 100644 --- a/qt/mainwindow_ui.py +++ b/qt/mainwindow_ui.py @@ -1395,7 +1395,7 @@ class Ui_Nugget(object): self.scrollArea_2.setWidgetResizable(True) self.scrollAreaWidgetContents_2 = QWidget() self.scrollAreaWidgetContents_2.setObjectName(u"scrollAreaWidgetContents_2") - self.scrollAreaWidgetContents_2.setGeometry(QRect(0, -129, 660, 573)) + self.scrollAreaWidgetContents_2.setGeometry(QRect(0, 0, 660, 573)) self.verticalLayout_37 = QVBoxLayout(self.scrollAreaWidgetContents_2) self.verticalLayout_37.setObjectName(u"verticalLayout_37") self.euEnablerPageContent = QWidget(self.scrollAreaWidgetContents_2) @@ -2000,6 +2000,11 @@ class Ui_Nugget(object): self.verticalLayout_142.addWidget(self.line_122) + self.regularDomainsLbl = QLabel(self.daemonsPage) + self.regularDomainsLbl.setObjectName(u"regularDomainsLbl") + + self.verticalLayout_142.addWidget(self.regularDomainsLbl) + self.daemonsPageContent = QWidget(self.daemonsPage) self.daemonsPageContent.setObjectName(u"daemonsPageContent") self.daemonsPageContent.setEnabled(False) @@ -2399,6 +2404,13 @@ class Ui_Nugget(object): self.verticalLayout_24.addWidget(self.restoreProgressBar, 0, Qt.AlignHCenter) + self.skipSetupOnLbl = QLabel(self.verticalWidget2) + self.skipSetupOnLbl.setObjectName(u"skipSetupOnLbl") + self.skipSetupOnLbl.setFont(font1) + self.skipSetupOnLbl.setAlignment(Qt.AlignCenter) + + self.verticalLayout_24.addWidget(self.skipSetupOnLbl) + self.verticalSpacer_2 = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding) self.verticalLayout_24.addItem(self.verticalSpacer_2) @@ -3348,6 +3360,8 @@ 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)) + self.regularDomainsLbl.setText(QCoreApplication.translate("Nugget", u"Note: Even on Sparserestore versions, this uses regular domains. Skip Setup will be applied if you have\n" +"it enabled.", 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) @@ -3428,6 +3442,8 @@ class Ui_Nugget(object): self.chooseGestaltBtn.setText(QCoreApplication.translate("Nugget", u" Choose Gestalt File", None)) self.applyTweaksBtn.setText(QCoreApplication.translate("Nugget", u" Apply Changes", None)) self.statusLbl.setText(QCoreApplication.translate("Nugget", u"Ready!", None)) + self.skipSetupOnLbl.setText(QCoreApplication.translate("Nugget", u"Note: Skip Setup is currently turned on.\n" +"It can be turned off in the Settings tab.", None)) self.removeTweaksBtn.setText(QCoreApplication.translate("Nugget", u"Remove All Tweaks", None)) self.resetGestaltBtn.setText(QCoreApplication.translate("Nugget", u"Reset Mobile Gestalt", None)) self.springboardOptionsLbl1.setText(QCoreApplication.translate("Nugget", u"Nugget Settings", None)) diff --git a/qt/ui_mainwindow.py b/qt/ui_mainwindow.py index 069a288..0c3a69b 100644 --- a/qt/ui_mainwindow.py +++ b/qt/ui_mainwindow.py @@ -1395,7 +1395,7 @@ class Ui_Nugget(object): self.scrollArea_2.setWidgetResizable(True) self.scrollAreaWidgetContents_2 = QWidget() self.scrollAreaWidgetContents_2.setObjectName(u"scrollAreaWidgetContents_2") - self.scrollAreaWidgetContents_2.setGeometry(QRect(0, -129, 660, 573)) + self.scrollAreaWidgetContents_2.setGeometry(QRect(0, 0, 660, 573)) self.verticalLayout_37 = QVBoxLayout(self.scrollAreaWidgetContents_2) self.verticalLayout_37.setObjectName(u"verticalLayout_37") self.euEnablerPageContent = QWidget(self.scrollAreaWidgetContents_2) @@ -2000,6 +2000,11 @@ class Ui_Nugget(object): self.verticalLayout_142.addWidget(self.line_122) + self.regularDomainsLbl = QLabel(self.daemonsPage) + self.regularDomainsLbl.setObjectName(u"regularDomainsLbl") + + self.verticalLayout_142.addWidget(self.regularDomainsLbl) + self.daemonsPageContent = QWidget(self.daemonsPage) self.daemonsPageContent.setObjectName(u"daemonsPageContent") self.daemonsPageContent.setEnabled(False) @@ -2399,6 +2404,13 @@ class Ui_Nugget(object): self.verticalLayout_24.addWidget(self.restoreProgressBar, 0, Qt.AlignHCenter) + self.skipSetupOnLbl = QLabel(self.verticalWidget2) + self.skipSetupOnLbl.setObjectName(u"skipSetupOnLbl") + self.skipSetupOnLbl.setFont(font1) + self.skipSetupOnLbl.setAlignment(Qt.AlignCenter) + + self.verticalLayout_24.addWidget(self.skipSetupOnLbl) + self.verticalSpacer_2 = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding) self.verticalLayout_24.addItem(self.verticalSpacer_2) @@ -3348,6 +3360,8 @@ 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)) + self.regularDomainsLbl.setText(QCoreApplication.translate("Nugget", u"Note: Even on Sparserestore versions, this uses regular domains. Skip Setup will be applied if you have\n" +"it enabled.", 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) @@ -3428,6 +3442,8 @@ class Ui_Nugget(object): self.chooseGestaltBtn.setText(QCoreApplication.translate("Nugget", u" Choose Gestalt File", None)) self.applyTweaksBtn.setText(QCoreApplication.translate("Nugget", u" Apply Changes", None)) self.statusLbl.setText(QCoreApplication.translate("Nugget", u"Ready!", None)) + self.skipSetupOnLbl.setText(QCoreApplication.translate("Nugget", u"Note: Skip Setup is currently turned on.\n" +"It can be turned off in the Settings tab.", None)) self.removeTweaksBtn.setText(QCoreApplication.translate("Nugget", u"Remove All Tweaks", None)) self.resetGestaltBtn.setText(QCoreApplication.translate("Nugget", u"Reset Mobile Gestalt", None)) self.springboardOptionsLbl1.setText(QCoreApplication.translate("Nugget", u"Nugget Settings", None))