Skip to content
This repository has been archived by the owner on Jan 29, 2024. It is now read-only.

Commit

Permalink
Packed icons to resource file.
Browse files Browse the repository at this point in the history
  • Loading branch information
DotBow committed Oct 3, 2018
1 parent bb07e0e commit e74d1f1
Show file tree
Hide file tree
Showing 7 changed files with 3,645 additions and 13 deletions.
7 changes: 7 additions & 0 deletions icons/resources.qrc
@@ -0,0 +1,7 @@
<RCC>
<qresource prefix="icons">
<file>app.ico</file>
<file>app_inv.ico</file>
<file>star.ico</file>
</qresource>
</RCC>
5 changes: 3 additions & 2 deletions main_window.py
Expand Up @@ -9,11 +9,12 @@
from bs4 import BeautifulSoup
from PyQt5 import QtCore, QtWidgets
from PyQt5.QtCore import QSettings, QThread
from PyQt5.QtGui import QIcon
from PyQt5.QtGui import QIcon, QPixmap
from PyQt5.QtWidgets import (QAction, QFileDialog, QLabel, QMainWindow, QMenu,
QMessageBox, QSystemTrayIcon)

import main_window_design
import resources_rc
from build_loader import BuildLoader
from version_layout import B3dVersionItemLayout

Expand All @@ -23,7 +24,7 @@ def __init__(self, app):
super().__init__()
self.app = app
self.setupUi(self)
self.setWindowIcon(QIcon(os.path.join("icons", "app.ico")))
self.setWindowIcon(QIcon(QPixmap(":/icons/app.ico")))

self.settings = QSettings('b3d_version_manager', 'settings')
root_folder = self.settings.value('root_folder')
Expand Down
4 changes: 1 addition & 3 deletions main_window_design.py
Expand Up @@ -82,8 +82,6 @@ def setupUi(self, MainWindow):
self.statusbar = QtWidgets.QStatusBar(MainWindow)
self.statusbar.setObjectName("statusbar")
MainWindow.setStatusBar(self.statusbar)
self.actionSetRootFolder = QtWidgets.QAction(MainWindow)
self.actionSetRootFolder.setObjectName("actionSetRootFolder")
self.actionClearTempFolder = QtWidgets.QAction(MainWindow)
self.actionClearTempFolder.setObjectName("actionClearTempFolder")
self.actionMinimizeToTray = QtWidgets.QAction(MainWindow)
Expand All @@ -109,8 +107,8 @@ def retranslateUi(self, MainWindow):
self.btnUpdate.setText(_translate("MainWindow", "Update"))
self.btnCancel.setText(_translate("MainWindow", "Cancel"))
self.menuFile.setTitle(_translate("MainWindow", "File"))
self.actionSetRootFolder.setText(_translate("MainWindow", "Set Root Folder"))
self.actionClearTempFolder.setText(_translate("MainWindow", "Clear Temp Folder"))
self.actionMinimizeToTray.setText(_translate("MainWindow", "Toggle Minimize to Tray"))
self.actionQuit.setText(_translate("MainWindow", "Quit"))

import resources_rc
9 changes: 3 additions & 6 deletions main_window_design.ui
Expand Up @@ -145,11 +145,6 @@
<addaction name="menuFile"/>
</widget>
<widget class="QStatusBar" name="statusbar"/>
<action name="actionSetRootFolder">
<property name="text">
<string>Set Root Folder</string>
</property>
</action>
<action name="actionClearTempFolder">
<property name="text">
<string>Clear Temp Folder</string>
Expand All @@ -169,6 +164,8 @@
</property>
</action>
</widget>
<resources/>
<resources>
<include location="icons/resources.qrc"/>
</resources>
<connections/>
</ui>
2 changes: 2 additions & 0 deletions qrc_to_py.bat
@@ -0,0 +1,2 @@
pyrcc5 icons/resources.qrc -o resources_rc.py
pause
3,625 changes: 3,625 additions & 0 deletions resources_rc.py

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions version_layout.py
Expand Up @@ -2,9 +2,11 @@
import shutil
import subprocess

from PyQt5.QtGui import QIcon
from PyQt5.QtGui import QIcon, QPixmap
from PyQt5.QtWidgets import QHBoxLayout, QMessageBox, QPushButton, QSizePolicy

import resources_rc


class B3dVersionItemLayout(QHBoxLayout):
def __init__(self, root_folder, version, is_latest, parent=None):
Expand All @@ -17,7 +19,7 @@ def __init__(self, root_folder, version, is_latest, parent=None):
lambda: subprocess.Popen(os.path.join(root_folder, version, "blender.exe")))

if (is_latest):
self.btnOpen.setIcon(QIcon(os.path.join("icons", "star.ico")))
self.btnOpen.setIcon(QIcon(QPixmap(":/icons/star.ico")))

self.btnDelete = QPushButton("Delete")
self.btnDelete.setSizePolicy(
Expand Down

0 comments on commit e74d1f1

Please sign in to comment.