Remove PySimpleGuiQT support
- Remove PySimpleGUIQt support, as it requires breaking changes for Python 3.11 - Build MSI based off Python 3.11 (significantly smaller due to removing Qt requirement) - Bump version to 1.1.0
This commit is contained in:
		
							parent
							
								
									ef95a822c5
								
							
						
					
					
						commit
						696b8c7cd2
					
				
							
								
								
									
										2
									
								
								dist/vdiclient.json
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/vdiclient.json
									
									
									
									
										vendored
									
									
								
							@ -1,6 +1,6 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
	"upgrade_guid" : "46cbad92-353e-4b28-9bee-83950991dad8",
 | 
						"upgrade_guid" : "46cbad92-353e-4b28-9bee-83950991dad8",
 | 
				
			||||||
	"version" : "1.0.9",
 | 
						"version" : "1.1.0",
 | 
				
			||||||
	"product_name" : "VDI Client",
 | 
						"product_name" : "VDI Client",
 | 
				
			||||||
	"manufacturer" : "Josh Patten",
 | 
						"manufacturer" : "Josh Patten",
 | 
				
			||||||
	"name" : "VDI Client",
 | 
						"name" : "VDI Client",
 | 
				
			||||||
 | 
				
			|||||||
@ -1,6 +1,6 @@
 | 
				
			|||||||
@echo off
 | 
					@echo off
 | 
				
			||||||
pip install pyinstaller
 | 
					pip install pyinstaller
 | 
				
			||||||
pip install proxmoxer
 | 
					pip install proxmoxer
 | 
				
			||||||
pip install PySimpleGUIQt
 | 
					pip install PySimpleGUI
 | 
				
			||||||
pip install requests
 | 
					pip install requests
 | 
				
			||||||
pip install pywin32
 | 
					pip install pywin32
 | 
				
			||||||
@ -1,6 +1,4 @@
 | 
				
			|||||||
#!/bin/bash
 | 
					#!/bin/bash
 | 
				
			||||||
pip3 install proxmoxer
 | 
					pip3 install proxmoxer
 | 
				
			||||||
pip3 install PySimpleGUIQt
 | 
					 | 
				
			||||||
# If PySimpleGUIQt fails, VDIClient will fall back to PySimpleGUI
 | 
					 | 
				
			||||||
pip3 install PySimpleGUI
 | 
					pip3 install PySimpleGUI
 | 
				
			||||||
pip3 install requests
 | 
					pip3 install requests
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										13
									
								
								vdiclient.py
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								vdiclient.py
									
									
									
									
									
								
							@ -1,11 +1,7 @@
 | 
				
			|||||||
#!/usr/bin/python3
 | 
					#!/usr/bin/python3
 | 
				
			||||||
import proxmoxer # pip install proxmoxer
 | 
					import proxmoxer # pip install proxmoxer
 | 
				
			||||||
try:
 | 
					import PySimpleGUI as sg # pip install PySimpleGUI
 | 
				
			||||||
	import PySimpleGUIQt as sg # pip install PySimpleGUIQt
 | 
					gui = 'TK'
 | 
				
			||||||
	gui = 'QT'
 | 
					 | 
				
			||||||
except ImportError:
 | 
					 | 
				
			||||||
	import PySimpleGUI as sg # pip install PySimpleGUI
 | 
					 | 
				
			||||||
	gui = 'TK'
 | 
					 | 
				
			||||||
import requests
 | 
					import requests
 | 
				
			||||||
from configparser import ConfigParser
 | 
					from configparser import ConfigParser
 | 
				
			||||||
import random
 | 
					import random
 | 
				
			||||||
@ -154,6 +150,7 @@ def win_popup(message):
 | 
				
			|||||||
	layout = [[sg.Text(message)]]
 | 
						layout = [[sg.Text(message)]]
 | 
				
			||||||
	window = sg.Window('Message', layout, no_titlebar=True, keep_on_top=True, finalize=True)
 | 
						window = sg.Window('Message', layout, no_titlebar=True, keep_on_top=True, finalize=True)
 | 
				
			||||||
	window.bring_to_front()
 | 
						window.bring_to_front()
 | 
				
			||||||
 | 
						_, _ = window.read(timeout=1) # Fixes a black screen bug
 | 
				
			||||||
	return window
 | 
						return window
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
def win_popup_button(message, button):
 | 
					def win_popup_button(message, button):
 | 
				
			||||||
@ -484,4 +481,6 @@ def main():
 | 
				
			|||||||
						return 0
 | 
											return 0
 | 
				
			||||||
				else:
 | 
									else:
 | 
				
			||||||
					return
 | 
										return
 | 
				
			||||||
sys.exit(main())
 | 
					
 | 
				
			||||||
 | 
					if __name__ == '__main__':
 | 
				
			||||||
 | 
						sys.exit(main())
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user