mirror of
https://github.com/KeksPirates/SoftwareManager.git
synced 2026-08-04 09:59:41 +02:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0d631e0ab8 | |||
| 1c1ce3e69d | |||
| b5931f5590 | |||
| 84ea030e2a |
@@ -67,7 +67,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
python -m pip install --upgrade pip
|
python -m pip install --upgrade pip
|
||||||
pip install -r requirements.txt
|
pip install -r requirements.txt
|
||||||
pip install pyinstaller backports.tarfile
|
pip install pyinstaller backports.tarfile pillow
|
||||||
|
|
||||||
- name: Generate version
|
- name: Generate version
|
||||||
id: version
|
id: version
|
||||||
@@ -103,8 +103,13 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
pyinstaller --onefile --windowed \
|
pyinstaller --onefile --windowed \
|
||||||
--add-data "build_info.json;." \
|
--add-data "build_info.json;." \
|
||||||
|
--add-data "build_info.json;core" \
|
||||||
|
--add-data "build_info.json;core/interface" \
|
||||||
--add-data "deps/aria2c.exe;." \
|
--add-data "deps/aria2c.exe;." \
|
||||||
--add-data "core/interface/assets;core/interface/assets" \
|
--add-data "core/interface/assets;core/interface/assets" \
|
||||||
|
--icon "core/interface/assets/logo.png" \
|
||||||
|
--exclude-module PyQt6 \
|
||||||
|
--exclude-module PyQt5 \
|
||||||
--hidden-import=backports.tarfile \
|
--hidden-import=backports.tarfile \
|
||||||
--hidden-import=backports \
|
--hidden-import=backports \
|
||||||
--hidden-import=jaraco.context \
|
--hidden-import=jaraco.context \
|
||||||
@@ -119,7 +124,12 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
pyinstaller --onefile --windowed \
|
pyinstaller --onefile --windowed \
|
||||||
--add-data "build_info.json:." \
|
--add-data "build_info.json:." \
|
||||||
|
--add-data "build_info.json:core" \
|
||||||
|
--add-data "build_info.json:core/interface" \
|
||||||
--add-data "core/interface/assets:core/interface/assets" \
|
--add-data "core/interface/assets:core/interface/assets" \
|
||||||
|
--icon "core/interface/assets/logo.png" \
|
||||||
|
--exclude-module PyQt6 \
|
||||||
|
--exclude-module PyQt5 \
|
||||||
--hidden-import=backports.tarfile \
|
--hidden-import=backports.tarfile \
|
||||||
--hidden-import=backports \
|
--hidden-import=backports \
|
||||||
--hidden-import=jaraco.context \
|
--hidden-import=jaraco.context \
|
||||||
|
|||||||
@@ -214,3 +214,7 @@ __marimo__/
|
|||||||
*.sublime-project
|
*.sublime-project
|
||||||
*.code-workspace
|
*.code-workspace
|
||||||
*.swp
|
*.swp
|
||||||
|
|
||||||
|
# Local build files
|
||||||
|
build-local.ps1
|
||||||
|
build-local.bat
|
||||||
+17
-3
@@ -70,7 +70,21 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
|||||||
super().__init__()
|
super().__init__()
|
||||||
MainWindow._instance = self
|
MainWindow._instance = self
|
||||||
self.log_signal.connect(self._on_log_signal)
|
self.log_signal.connect(self._on_log_signal)
|
||||||
self.setWindowIcon(QIcon(os.path.join('core/interface/assets/logo.png')))
|
|
||||||
|
def get_asset_path(filename):
|
||||||
|
if getattr(sys, 'frozen', False):
|
||||||
|
base_path = sys._MEIPASS
|
||||||
|
else:
|
||||||
|
base_path = os.path.dirname(__file__)
|
||||||
|
|
||||||
|
asset_path = os.path.join(base_path, 'core', 'interface', 'assets', filename)
|
||||||
|
if os.path.exists(asset_path):
|
||||||
|
return asset_path
|
||||||
|
|
||||||
|
return os.path.join('core', 'interface', 'assets', filename)
|
||||||
|
|
||||||
|
self.setWindowIcon(QIcon(get_asset_path("logo.png")))
|
||||||
|
|
||||||
|
|
||||||
if platform.system() == "Windows":
|
if platform.system() == "Windows":
|
||||||
try:
|
try:
|
||||||
@@ -248,9 +262,9 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
|||||||
self.tracker_list.activated.connect(self.set_tracker)
|
self.tracker_list.activated.connect(self.set_tracker)
|
||||||
|
|
||||||
if darkdetect.isDark():
|
if darkdetect.isDark():
|
||||||
settings_action = QAction(QIcon("core/interface/assets/settings_white.png"), "Settings", self)
|
settings_action = QAction(QIcon(get_asset_path("settings_white.png")), "Settings", self)
|
||||||
else:
|
else:
|
||||||
settings_action = QAction(QIcon("core/interface/assets/settings_black.png"), "Settings", self)
|
settings_action = QAction(QIcon(get_asset_path("settings_black.png")), "Settings", self)
|
||||||
|
|
||||||
settings_action.triggered.connect(lambda: settings_dialog(self))
|
settings_action.triggered.connect(lambda: settings_dialog(self))
|
||||||
toolbar.addAction(settings_action)
|
toolbar.addAction(settings_action)
|
||||||
|
|||||||
Reference in New Issue
Block a user