wouter/Artemis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set a png icon for linux compatitlity

Browse Source
This commit is contained in:
alessandro90
2019-05-28 19:52:16 +02:00
parent c35cfa7e9b
commit 27ee2c78d0
5 changed files with 2733 additions and 20283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
artemis.py
View File

@@ -59,7 +59,6 @@ class Artemis(QMainWindow, Ui_MainWindow):
super().__init__() super().__init__()
self.setupUi(self) self.setupUi(self)
self.set_initial_size() self.set_initial_size()
self.setWindowIcon(QtGui.QIcon(":/icon/default_pics/Artemis3.500px.png")) # TODO: Not clear if necessary.
self.closing = False self.closing = False
self.download_window = DownloadWindow() self.download_window = DownloadWindow()
self.download_window.complete.connect(self.show_downloaded_signals) self.download_window.complete.connect(self.show_downloaded_signals)
@@ -1594,9 +1593,8 @@ class Artemis(QMainWindow, Ui_MainWindow):
if __name__ == '__main__': if __name__ == '__main__':
my_app = QApplication(sys.argv) my_app = QApplication(sys.argv)
img = QPixmap(os.path.join( ARTEMIS_ICON = os.path.join(":", "icon", "default_pics", "Artemis3.500px.png")
":", "icon", "default_pics", "Artemis3.500px.png") img = QPixmap(ARTEMIS_ICON)
)
splash = QSplashScreen(img) splash = QSplashScreen(img)
splash.show() splash.show()
start= time() start= time()

2
artemis.ui
View File

@@ -21,7 +21,7 @@
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="default_imgs.qrc"> <iconset resource="default_imgs.qrc">
<normaloff>:/icon/default_pics/Artemis3.ico</normaloff>:/icon/default_pics/Artemis3.ico</iconset> <normaloff>:/icon/default_pics/Artemis3.500px.png</normaloff>:/icon/default_pics/Artemis3.500px.png</iconset>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true"/> <string notr="true"/>

2
default_imgs.qrc
View File

@@ -1,8 +1,6 @@
<RCC> <RCC>
<qresource prefix="icon"> <qresource prefix="icon">
<file>default_pics/Artemis3.500px.png</file> <file>default_pics/Artemis3.500px.png</file>
<file>default_pics/Artemis3.ico</file>
<file>default_pics/Artemis3.png</file>
</qresource> </qresource>
<qresource prefix="pics"> <qresource prefix="pics">
<file>default_pics/nosignalselected.png</file> <file>default_pics/nosignalselected.png</file>

23004
default_imgs_rc.py
View File

File diff suppressed because it is too large Load Diff

2
download_db_window.ui
View File

@@ -15,7 +15,7 @@
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="default_imgs.qrc"> <iconset resource="default_imgs.qrc">
<normaloff>:/icon/default_pics/Artemis3.ico</normaloff>:/icon/default_pics/Artemis3.ico</iconset> <normaloff>:/icon/default_pics/Artemis3.500px.png</normaloff>:/icon/default_pics/Artemis3.500px.png</iconset>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true"/> <string notr="true"/>