diff --git a/dist/vdiclient.json b/dist/vdiclient.json index b31fd3a..3f5ac34 100644 --- a/dist/vdiclient.json +++ b/dist/vdiclient.json @@ -1,6 +1,6 @@ { "upgrade_guid" : "46cbad92-353e-4b28-9bee-83950991dad8", - "version" : "1.0.9", + "version" : "1.1.0", "product_name" : "VDI Client", "manufacturer" : "Josh Patten", "name" : "VDI Client", diff --git a/requirements.bat b/requirements.bat index 9a17ff0..2a3fefd 100644 --- a/requirements.bat +++ b/requirements.bat @@ -1,6 +1,6 @@ @echo off pip install pyinstaller pip install proxmoxer -pip install PySimpleGUIQt +pip install PySimpleGUI pip install requests pip install pywin32 \ No newline at end of file diff --git a/requirements.sh b/requirements.sh index b0e012e..c4adf2d 100644 --- a/requirements.sh +++ b/requirements.sh @@ -1,6 +1,4 @@ #!/bin/bash pip3 install proxmoxer -pip3 install PySimpleGUIQt -# If PySimpleGUIQt fails, VDIClient will fall back to PySimpleGUI pip3 install PySimpleGUI pip3 install requests diff --git a/vdiclient.py b/vdiclient.py index 80d2a47..3084e87 100644 --- a/vdiclient.py +++ b/vdiclient.py @@ -1,11 +1,7 @@ #!/usr/bin/python3 import proxmoxer # pip install proxmoxer -try: - import PySimpleGUIQt as sg # pip install PySimpleGUIQt - gui = 'QT' -except ImportError: - import PySimpleGUI as sg # pip install PySimpleGUI - gui = 'TK' +import PySimpleGUI as sg # pip install PySimpleGUI +gui = 'TK' import requests from configparser import ConfigParser import random @@ -154,6 +150,7 @@ def win_popup(message): layout = [[sg.Text(message)]] window = sg.Window('Message', layout, no_titlebar=True, keep_on_top=True, finalize=True) window.bring_to_front() + _, _ = window.read(timeout=1) # Fixes a black screen bug return window def win_popup_button(message, button): @@ -484,4 +481,6 @@ def main(): return 0 else: return -sys.exit(main()) + +if __name__ == '__main__': + sys.exit(main())