diff --git a/gui/ui_united.py b/gui/ui_united.py index 2cec33c..e93d7eb 100644 --- a/gui/ui_united.py +++ b/gui/ui_united.py @@ -44,8 +44,6 @@ def setupUi(self, MainWindow): self.actionClear_Log = QAction(MainWindow) self.actionClear_Log.setObjectName(u"actionClear_Log") self.actionClear_Log.setEnabled(False) - self.actionDownload_HBB_Client_Latest = QAction(MainWindow) - self.actionDownload_HBB_Client_Latest.setObjectName(u"actionDownload_HBB_Client_Latest") self.actionCheck_for_Updates = QAction(MainWindow) self.actionCheck_for_Updates.setObjectName(u"actionCheck_for_Updates") self.actionClose_the_shop = QAction(MainWindow) @@ -453,10 +451,6 @@ def setupUi(self, MainWindow): self.menuDebug.setObjectName(u"menuDebug") self.menuExperimental = QMenu(self.menuDebug) self.menuExperimental.setObjectName(u"menuExperimental") - self.menuClients = QMenu(self.menubar) - self.menuClients.setObjectName(u"menuClients") - self.menuHomebrew_Browser = QMenu(self.menuClients) - self.menuHomebrew_Browser.setObjectName(u"menuHomebrew_Browser") MainWindow.setMenuBar(self.menubar) self.statusBar = QStatusBar(MainWindow) self.statusBar.setObjectName(u"statusBar") @@ -464,22 +458,18 @@ def setupUi(self, MainWindow): MainWindow.setStatusBar(self.statusBar) self.menubar.addAction(self.menuAbout.menuAction()) - self.menubar.addAction(self.menuClients.menuAction()) self.menubar.addAction(self.menuDebug.menuAction()) self.menuAbout.addAction(self.actionAbout_OSC_DL) self.menuAbout.addAction(self.actionIcons_provided_by) + self.menuDebug.addAction(self.actionRefresh) self.menuDebug.addAction(self.actionCopy_Direct_Link) self.menuDebug.addSeparator() self.menuDebug.addAction(self.actionEnable_Log_File) self.menuDebug.addAction(self.actionClear_Log) self.menuDebug.addSeparator() self.menuDebug.addAction(self.menuExperimental.menuAction()) + self.menuDebug.addAction(self.actionCheck_for_Updates) self.menuExperimental.addAction(self.actionSelect_Theme) - self.menuClients.addAction(self.menuHomebrew_Browser.menuAction()) - self.menuClients.addSeparator() - self.menuClients.addAction(self.actionCheck_for_Updates) - self.menuClients.addAction(self.actionRefresh) - self.menuHomebrew_Browser.addAction(self.actionDownload_HBB_Client_Latest) self.retranslateUi(MainWindow) @@ -498,7 +488,6 @@ def retranslateUi(self, MainWindow): self.actionEnable_Log_File.setShortcut(QCoreApplication.translate("MainWindow", u"Ctrl+L", None)) #endif // QT_CONFIG(shortcut) self.actionClear_Log.setText(QCoreApplication.translate("MainWindow", u"Clear GUI Log", None)) - self.actionDownload_HBB_Client_Latest.setText(QCoreApplication.translate("MainWindow", u"Download Homebrew Browser", None)) self.actionCheck_for_Updates.setText(QCoreApplication.translate("MainWindow", u"Check for Updates", None)) self.actionClose_the_shop.setText(QCoreApplication.translate("MainWindow", u"Close the shop", None)) self.actionRefresh.setText(QCoreApplication.translate("MainWindow", u"Refresh List", None)) @@ -569,7 +558,5 @@ def retranslateUi(self, MainWindow): self.menuAbout.setTitle(QCoreApplication.translate("MainWindow", u"About", None)) self.menuDebug.setTitle(QCoreApplication.translate("MainWindow", u"Options", None)) self.menuExperimental.setTitle(QCoreApplication.translate("MainWindow", u"Experimental", None)) - self.menuClients.setTitle(QCoreApplication.translate("MainWindow", u"Clients", None)) - self.menuHomebrew_Browser.setTitle(QCoreApplication.translate("MainWindow", u"Homebrew Browser", None)) # retranslateUi diff --git a/gui/united.ui b/gui/united.ui index b2d1a45..4ff5586 100644 --- a/gui/united.ui +++ b/gui/united.ui @@ -882,30 +882,16 @@ color: rgb(255, 255, 255); + - - - - Clients - - - - Homebrew Browser - - - - - - - @@ -937,11 +923,6 @@ color: rgb(255, 255, 255); Clear GUI Log - - - Download Homebrew Browser - - Check for Updates diff --git a/xosc_dl.py b/xosc_dl.py index effcbb4..d4ee56d 100644 --- a/xosc_dl.py +++ b/xosc_dl.py @@ -74,8 +74,6 @@ def __init__(self, app=None, splash=None, test_mode=False): self.ui.actionAbout_OSC_DL.setIcon(QIcon(resource_path("assets/gui/icons/about-open-version.png"))) self.ui.actionIcons_provided_by.setIcon(QIcon(resource_path("assets/gui/icons/iconsprovider.png"))) # CLIENTS - self.ui.menuHomebrew_Browser.setIcon(QIcon(resource_path("assets/gui/icons/hbb-icon.png"))) - self.ui.actionDownload_HBB_Client_Latest.setIcon(QIcon(resource_path("assets/gui/icons/download.png"))) self.ui.actionCheck_for_Updates.setIcon(QIcon(resource_path("assets/gui/icons/check-for-updates.png"))) self.ui.actionRefresh.setIcon(QIcon(resource_path("assets/gui/icons/refresh.png"))) # OPTIONS @@ -176,16 +174,11 @@ def assign_initial_actions(self): # Actions # -- About self.ui.actionAbout_OSC_DL.triggered.connect(self.about_dialog) - # -- Debug - self.ui.actionEnable_Log_File.triggered.connect(self.turn_log_on) - self.ui.actionSelect_Theme.triggered.connect(self.select_theme_action) - # -- Clients - # ---- Homebrew Browser - self.ui.actionDownload_HBB_Client_Latest.triggered.connect( - lambda: QDesktopServices().openUrl("https://oscwii.org/")) - # ---- OSCDL + # -- Options self.ui.actionCheck_for_Updates.triggered.connect(partial(self.check_for_updates_action)) self.ui.actionRefresh.triggered.connect(partial(self.repopulate)) + self.ui.actionEnable_Log_File.triggered.connect(self.turn_log_on) + self.ui.actionSelect_Theme.triggered.connect(self.select_theme_action) # When user selects a different homebrew from the list def selection_changed(self):