diff --git a/blipblop/main.py b/blipblop/main.py index faa5d03..6e339d9 100644 --- a/blipblop/main.py +++ b/blipblop/main.py @@ -1,24 +1,24 @@ import sys +import platform from PyQt5.QtGui import QIcon from PyQt5.QtWidgets import QApplication from PyQt5.QtCore import QSettings from blipblop.ui.mainwindow import BlipBlop import blipblop.constants as cnst -try: - # Include in try/except block if you're also targeting Mac/Linux +if platform.system() == "Windows": from PyQt5.QtWinExtras import QtWin myappid = "%s.%s" %(cnst.organization_name, cnst.application_version) QtWin.setCurrentProcessExplicitAppUserModelID(myappid) -except ImportError: - pass + def main(): app = QApplication(sys.argv) app.setApplicationName(cnst.application_name) app.setApplicationVersion(str(cnst.application_version)) app.setOrganizationDomain(cnst.organization_name) - # app.setWindowIcon(QIcon(":/icons/app_icon_png")) + if platform.system() == 'Linux': + app.setWindowIcon(QIcon(":/icons/app_icon_png")) settings = QSettings() width = int(settings.value("app/width", 1024)) height = int(settings.value("app/height", 768)) diff --git a/blipblop_linux.spec b/blipblop_linux.spec index 2fe33f9..a181153 100644 --- a/blipblop_linux.spec +++ b/blipblop_linux.spec @@ -4,7 +4,7 @@ block_cipher = None a = Analysis(['blipblop_main.py'], - pathex=['.'], + pathex=['/home/grewe/projects/programming/blipblop'], binaries=[], datas=[('docs/index.md', "docs"), ('docs/visual_task.md', "docs"), @@ -32,26 +32,20 @@ a = Analysis(['blipblop_main.py'], win_private_assemblies=False, cipher=block_cipher, noarchive=False) - pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher) - exe = EXE(pyz, a.scripts, + a.binaries, + a.zipfiles, + a.datas, [], - exclude_binaries=True, name='BlipBlop', debug=False, bootloader_ignore_signals=False, strip=False, upx=True, - console=False ) - -coll = COLLECT(exe, - a.binaries, - a.zipfiles, - a.datas, - strip=False, - upx=True, - upx_exclude=[], - name='BlipBlop') + upx_exclude=[], + runtime_tmpdir=None, + console=False, + icon='icons/blipblop_logo.png')