Compare commits

..

No commits in common. "e379b4a7e248914cf4e42a796e937dcc3196d968" and "ace96dfc3abaf20de24d4e97599f5b57c9c61dc3" have entirely different histories.

6 changed files with 7 additions and 12 deletions

View File

@ -5,7 +5,7 @@ a = Analysis(
['src\\main.py'], ['src\\main.py'],
pathex=[], pathex=[],
binaries=[], binaries=[],
datas=[('gui/*.ui', 'gui'), ('icon2.ico', '.')], datas=[('gui/*.ui', 'gui')],
hiddenimports=[], hiddenimports=[],
hookspath=[], hookspath=[],
hooksconfig={}, hooksconfig={},
@ -32,7 +32,6 @@ exe = EXE(
target_arch=None, target_arch=None,
codesign_identity=None, codesign_identity=None,
entitlements_file=None, entitlements_file=None,
icon="icon2.ico"
) )
coll = COLLECT( coll = COLLECT(
exe, exe,

View File

@ -7,19 +7,19 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>420</width> <width>420</width>
<height>240</height> <height>228</height>
</rect> </rect>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>420</width> <width>420</width>
<height>240</height> <height>228</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>420</width> <width>420</width>
<height>240</height> <height>228</height>
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -35,7 +35,7 @@
<x>10</x> <x>10</x>
<y>0</y> <y>0</y>
<width>401</width> <width>401</width>
<height>184</height> <height>176</height>
</rect> </rect>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">

BIN
icon2.ico

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

View File

@ -1,4 +1,4 @@
from PyQt6.QtGui import QIntValidator, QIcon from PyQt6.QtGui import QIntValidator
from PyQt6.QtWidgets import QMainWindow, QWidget from PyQt6.QtWidgets import QMainWindow, QWidget
from PyQt6 import uic from PyQt6 import uic
@ -12,7 +12,6 @@ class SIPPCompare(QMainWindow):
super().__init__() super().__init__()
# Import Qt Designer UI XML file # Import Qt Designer UI XML file
uic.loadUi(resource_finder.get_res_path("gui/main_gui.ui"), self) uic.loadUi(resource_finder.get_res_path("gui/main_gui.ui"), self)
self.setWindowIcon(QIcon(resource_finder.get_res_path("icon2.ico")))
# Initialise class variables # Initialise class variables
# Inputs # Inputs

View File

@ -1,4 +1,3 @@
from PyQt6.QtGui import QIcon
from PyQt6.QtWidgets import QWidget from PyQt6.QtWidgets import QWidget
from PyQt6 import uic from PyQt6 import uic
@ -13,7 +12,6 @@ class OutputWindow(QWidget):
super().__init__() super().__init__()
# Import Qt Designer UI XML file # Import Qt Designer UI XML file
uic.loadUi(resource_finder.get_res_path("gui/output_window.ui"), self) uic.loadUi(resource_finder.get_res_path("gui/output_window.ui"), self)
self.setWindowIcon(QIcon(resource_finder.get_res_path("icon2.ico")))
# Initialise class variables # Initialise class variables
self.results_str = "" self.results_str = ""

View File

@ -1,5 +1,5 @@
from PyQt6.QtCore import QRegularExpression from PyQt6.QtCore import QRegularExpression
from PyQt6.QtGui import QRegularExpressionValidator, QFont, QIcon from PyQt6.QtGui import QRegularExpressionValidator, QFont
from PyQt6.QtWidgets import QWidget, QLabel from PyQt6.QtWidgets import QWidget, QLabel
from PyQt6 import uic from PyQt6 import uic
@ -13,7 +13,6 @@ class PlatformEdit(QWidget):
super().__init__() super().__init__()
# Import Qt Designer UI XML file # Import Qt Designer UI XML file
uic.loadUi(resource_finder.get_res_path("gui/platform_edit.ui"), self) uic.loadUi(resource_finder.get_res_path("gui/platform_edit.ui"), self)
self.setWindowIcon(QIcon(resource_finder.get_res_path("icon2.ico")))
# Initialise class variables # Initialise class variables
# Create main window object, passing this instance as param # Create main window object, passing this instance as param