diff --git a/.gitignore b/.gitignore index b249ac9..e449db7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ relational_gui/survey.py relational_gui/maingui.py relational_gui/rel_edit.py - +relational_gui/resources.py diff --git a/Makefile b/Makefile index 138f13f..aea6c7d 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ pyqt: pyuic5 relational_gui/survey.ui > relational_gui/survey.py pyuic5 relational_gui/maingui.ui > relational_gui/maingui.py pyuic5 relational_gui/rel_edit.ui > relational_gui/rel_edit.py + pyrcc5 relational_gui/resources.qrc > relational_gui/resources.py uninstall: rm -rf /opt/relational diff --git a/relational_gui.py b/relational_gui.py index f75edc1..cb84710 100755 --- a/relational_gui.py +++ b/relational_gui.py @@ -85,7 +85,7 @@ if __name__ == "__main__": import sip # needed on windows from PyQt5 import QtGui, QtWidgets try: - from relational_gui import maingui, guihandler, about, surveyForm + from relational_gui import maingui, guihandler, about, surveyForm, resources except: print ( "Module relational_gui is missing.\nPlease install relational package.", diff --git a/relational_gui/maingui.ui b/relational_gui/maingui.ui index 4dee74b..b285533 100644 --- a/relational_gui/maingui.ui +++ b/relational_gui/maingui.ui @@ -20,6 +20,10 @@ Relational + + + :/icon:/icon + diff --git a/relational_gui/resources.qrc b/relational_gui/resources.qrc new file mode 100644 index 0000000..0c98c9c --- /dev/null +++ b/relational_gui/resources.qrc @@ -0,0 +1,5 @@ + + + resources/relational.png + + diff --git a/relational_gui/resources/relational.png b/relational_gui/resources/relational.png new file mode 100644 index 0000000..6929fd1 Binary files /dev/null and b/relational_gui/resources/relational.png differ