Skip to content

Commit

Permalink
Removed experimental themes support
Browse files Browse the repository at this point in the history
  • Loading branch information
dhtdht020 committed Mar 22, 2024
1 parent cda6131 commit 415e2de
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 223 deletions.
182 changes: 0 additions & 182 deletions assets/themes/oscdark.qss

This file was deleted.

8 changes: 0 additions & 8 deletions gui/ui_united.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ def setupUi(self, MainWindow):
self.actionCheck_for_Updates.setObjectName(u"actionCheck_for_Updates")
self.actionRefresh = QAction(MainWindow)
self.actionRefresh.setObjectName(u"actionRefresh")
self.actionSelect_Theme = QAction(MainWindow)
self.actionSelect_Theme.setObjectName(u"actionSelect_Theme")
self.actionIcons_provided_by = QAction(MainWindow)
self.actionIcons_provided_by.setObjectName(u"actionIcons_provided_by")
self.actionIcons_provided_by.setEnabled(False)
Expand Down Expand Up @@ -442,8 +440,6 @@ def setupUi(self, MainWindow):
self.menuAbout.setObjectName(u"menuAbout")
self.menuDebug = QMenu(self.menubar)
self.menuDebug.setObjectName(u"menuDebug")
self.menuExperimental = QMenu(self.menuDebug)
self.menuExperimental.setObjectName(u"menuExperimental")
MainWindow.setMenuBar(self.menubar)
self.statusBar = QStatusBar(MainWindow)
self.statusBar.setObjectName(u"statusBar")
Expand All @@ -457,9 +453,7 @@ def setupUi(self, MainWindow):
self.menuDebug.addAction(self.actionRefresh)
self.menuDebug.addAction(self.actionCopy_Direct_Link)
self.menuDebug.addSeparator()
self.menuDebug.addAction(self.menuExperimental.menuAction())
self.menuDebug.addAction(self.actionCheck_for_Updates)
self.menuExperimental.addAction(self.actionSelect_Theme)

self.retranslateUi(MainWindow)

Expand All @@ -478,7 +472,6 @@ def retranslateUi(self, MainWindow):
#if QT_CONFIG(shortcut)
self.actionRefresh.setShortcut(QCoreApplication.translate("MainWindow", u"F5", None))
#endif // QT_CONFIG(shortcut)
self.actionSelect_Theme.setText(QCoreApplication.translate("MainWindow", u"Select Theme", None))
self.actionIcons_provided_by.setText(QCoreApplication.translate("MainWindow", u"Icons provided by https://icons8.com", None))
self.actionCopy_Direct_Link.setText(QCoreApplication.translate("MainWindow", u"Copy Direct Link to App", None))
self.actionDeveloper_Profile.setText(QCoreApplication.translate("MainWindow", u"Developer Profile", None))
Expand Down Expand Up @@ -541,6 +534,5 @@ def retranslateUi(self, MainWindow):
self.WiiLoadButton.setText(QCoreApplication.translate("MainWindow", u"Send to Wii", None))
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))
# retranslateUi

12 changes: 0 additions & 12 deletions gui/united.ui
Original file line number Diff line number Diff line change
Expand Up @@ -879,16 +879,9 @@ color: rgb(255, 255, 255);</string>
<property name="title">
<string>Options</string>
</property>
<widget class="QMenu" name="menuExperimental">
<property name="title">
<string>Experimental</string>
</property>
<addaction name="actionSelect_Theme"/>
</widget>
<addaction name="actionRefresh"/>
<addaction name="actionCopy_Direct_Link"/>
<addaction name="separator"/>
<addaction name="menuExperimental"/>
<addaction name="actionCheck_for_Updates"/>
</widget>
<addaction name="menuAbout"/>
Expand Down Expand Up @@ -917,11 +910,6 @@ color: rgb(255, 255, 255);</string>
<string>F5</string>
</property>
</action>
<action name="actionSelect_Theme">
<property name="text">
<string>Select Theme</string>
</property>
</action>
<action name="actionIcons_provided_by">
<property name="enabled">
<bool>false</bool>
Expand Down
1 change: 0 additions & 1 deletion oscdl.spec
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ a = Analysis(['oscdl.py'],
('assets/gui/icons/platforms/*.png', './assets/gui/icons/platforms/'),
('assets/gui/icons/category/*.png', './assets/gui/icons/category/'),
('assets/gui/*.png', './assets/gui/'),
('assets/themes/*.qss', './assets/themes/'),
('assets/gui/icons/*.gif', './assets/gui/icons/'),
('assets/gui/icons/*.png', './assets/gui/icons/'),
('assets/gui/icons/status/*.png', './assets/gui/icons/status')],
Expand Down
22 changes: 2 additions & 20 deletions xosc_dl.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import time
import zipfile
from datetime import datetime
from os import listdir
from os.path import isfile, join

import os
import sys
Expand All @@ -20,8 +18,8 @@
from PIL import Image
from PySide6 import QtGui, QtCore
from PySide6.QtCore import Qt, QObject, QSize, QEvent
from PySide6.QtGui import QIcon, QColor, QPixmap, QMovie, QDesktopServices
from PySide6.QtWidgets import QApplication, QMainWindow, QInputDialog, QLineEdit, QMessageBox, \
from PySide6.QtGui import QIcon, QColor, QPixmap, QMovie
from PySide6.QtWidgets import QApplication, QMainWindow, QLineEdit, QMessageBox, \
QListWidgetItem, QFileDialog

import gui.ui_united
Expand Down Expand Up @@ -78,8 +76,6 @@ def __init__(self, app=None, splash=None, test_mode=False):
self.ui.actionRefresh.setIcon(QIcon(resource_path("assets/gui/icons/refresh.png")))
# OPTIONS
self.ui.actionCopy_Direct_Link.setIcon(QIcon(resource_path("assets/gui/icons/copy-link.png")))
self.ui.menuExperimental.setIcon(QIcon(resource_path("assets/gui/icons/experimental.png")))
self.ui.actionSelect_Theme.setIcon(QIcon(resource_path("assets/gui/icons/theme.png")))

# CATEGORIES COMBOBOX
self.ui.CategoriesComboBox.setItemIcon(1, QIcon(resource_path("assets/gui/icons/category/utility.png")))
Expand Down Expand Up @@ -174,7 +170,6 @@ def assign_initial_actions(self):
# -- Options
self.ui.actionCheck_for_Updates.triggered.connect(partial(self.check_for_updates_action))
self.ui.actionRefresh.triggered.connect(partial(self.repopulate))
self.ui.actionSelect_Theme.triggered.connect(self.select_theme_action)

# When user selects a different homebrew from the list
def selection_changed(self):
Expand Down Expand Up @@ -843,19 +838,6 @@ def return_to_all_apps_btn(self):
# count apps
self.search_bar()

# Select theme dialog
def select_theme_action(self):
path = resource_path("assets/themes")
theme_files = [f for f in listdir(path) if isfile(join(path, f))]

theme, ok = QInputDialog.getItem(self, "Experimental: Select Theme",
"Choose theme to use from the list", theme_files, 0, False)
if not ok:
return

with open(resource_path(f"assets/themes/{theme}"), "r") as fh:
self.setStyleSheet(fh.read())

# load all icons from zip
def download_app_icons(self):
# Debug info
Expand Down

0 comments on commit 415e2de

Please sign in to comment.