Update vdiclient.json

Update release version

build_vdiclient.bat

@@ -1,5 +1,5 @@
 @echo off
-pyinstaller --noconsole --noconfirm --hidden-import proxmoxer.backends --hidden-import proxmoxer.backends.https --hidden-import proxmoxer.backends.https.AuthenticationError --hidden-import proxmoxer.core --hidden-import proxmoxer.core.ResourceException --hidden-import subprocess.TimeoutExpired --hidden-import subprocess.CalledProcessError --hidden-import requests.exceptions --hidden-import requests.exceptions.ConnectTimeout --hidden-import requests.exceptions.ConnectionError -i vdiicon.ico vdiclient.py
+pyinstaller --noconsole --noconfirm --hidden-import proxmoxer.backends --hidden-import proxmoxer.backends.https --hidden-import proxmoxer.backends.https.AuthenticationError --hidden-import proxmoxer.core --hidden-import proxmoxer.core.ResourceException --hidden-import subprocess.TimeoutExpired --hidden-import subprocess.CalledProcessError --hidden-import requests.exceptions --hidden-import requests.exceptions.ReadTimeout --hidden-import requests.exceptions.ConnectTimeout --hidden-import requests.exceptions.ConnectionError -i vdiicon.ico vdiclient.py
 copy vdiclient.png dist\vdiclient
 copy vdiicon.ico dist\vdiclient
 del dist\vdiclient\opengl32sw.dll

dist/vdiclient.json

@@ -1,6 +1,6 @@
 {
 	"upgrade_guid" : "46cbad92-353e-4b28-9bee-83950991dad8",
-	"version" : "1.0.1",
+	"version" : "1.0.4",
 	"product_name" : "VDI Client",
 	"manufacturer" : "Josh Patten",
 	"name" : "VDI Client",

requirements.bat

@@ -3,3 +3,4 @@ pip install pyinstaller
 pip install proxmoxer
 pip install PySimpleGUIQt
 pip install requests
+pip install pywin32

requirements.sh

@@ -1,3 +1,6 @@
 #!/bin/bash
 pip3 install proxmoxer
 pip3 install PySimpleGUIQt
+# If PySimpleGUIQt fails, VDIClient will fall back to PySimpleGUI
+pip3 install PySimpleGUI
+pip3 install requests

vdiclient.ini.example

@@ -34,4 +34,6 @@ pve1.example.com = 8006
 [SpiceProxyRedirect]
 # The Spice Proxy provided by the Proxmox API may need to have it's host/port rewritten
 # These rewrite rules are written `IP:port = IP:port`
+# 1. Use the inidebug and read the current proxy=pve1.example.com:3128
+# 2. Add your proxmox ip to the right side e.g. 123.123.123.123:6000
 pve1.example.com:3128 = 123.123.123.123:6000

vdiclient.py

@@ -1,6 +1,11 @@
 #!/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 requests
 from configparser import ConfigParser
 import random
@@ -11,11 +16,13 @@ from time import sleep
 from io import StringIO
 
 
+
 class G:
 	hostpool = []
 	spiceproxy_conv = {}
 	proxmox = None
 	vvcmd = None
+	scaling = 1
 	#########
 	title = 'VDI Login'
 	backend = 'pve'
@@ -30,7 +37,23 @@ class G:
 	inidebug = False
 	theme = 'LightBlue'
 
-sg.theme(G.theme)
+def get_dpi():
+	import ctypes
+	import win32api # pip install pywin32
+	shcore = ctypes.windll.shcore
+	monitors = win32api.EnumDisplayMonitors()
+	hresult = shcore.SetProcessDpiAwareness(2)
+	assert hresult == 0
+	dpiX = ctypes.c_uint()
+	dpiY = ctypes.c_uint()
+	for i, monitor in enumerate(monitors):
+		shcore.GetDpiForMonitor(
+			monitor[0].handle,
+			0,
+			ctypes.byref(dpiX),
+			ctypes.byref(dpiY)
+		)
+		return dpiX.value/96
 
 def loadconfig(config_location = None):
 	if config_location:
@@ -45,11 +68,13 @@ def loadconfig(config_location = None):
 			config_location = f'{os.getenv("APPDATA")}\\VDIClient\\vdiclient.ini'
 			if not os.path.exists(config_location):
 				config_location = f'{os.getenv("PROGRAMFILES")}\\VDIClient\\vdiclient.ini'
+			if not os.path.exists(config_location):
+				config_location = f'{os.getenv("PROGRAMFILES(x86)")}\\VDIClient\\vdiclient.ini'
 			if not os.path.exists(config_location):
 				win_popup_button(f'Unable to read supplied configuration from any location!', 'OK')
 				return False
 		elif os.name == 'posix': #Linux
-			config_location = '~/.config/VDIClient/vdiclient.ini'
+			config_location = os.path.expanduser('~/.config/VDIClient/vdiclient.ini')
 			if not os.path.exists(config_location):
 				config_location = '/etc/vdiclient/vdiclient.ini'
 			if not os.path.exists(config_location):
@@ -114,6 +139,7 @@ def loadconfig(config_location = None):
 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()
 	return window
 	
 def win_popup_button(message, button):
@@ -132,14 +158,14 @@ def win_popup_button(message, button):
 def setmainlayout():
 	layout = []
 	if G.imagefile:
-		layout.append([sg.Image(G.imagefile), sg.Text(G.title, size =(18, 1), justification='c', font=["Helvetica", 18])])
+		layout.append([sg.Image(G.imagefile), sg.Text(G.title, size =(18*G.scaling, 1*G.scaling), justification='c', font=["Helvetica", 18])])
 	else:
-		layout.append([sg.Text(G.title, size =(30, 1), justification='c', font=["Helvetica", 18])])
+		layout.append([sg.Text(G.title, size =(30*G.scaling, 1*G.scaling), justification='c', font=["Helvetica", 18])])
-	layout.append([sg.Text("Username", size =(12, 1), font=["Helvetica", 12]), sg.InputText(default_text=G.user,key='-username-', font=["Helvetica", 12])])
+	layout.append([sg.Text("Username", size =(12*G.scaling, 1*G.scaling), font=["Helvetica", 12]), sg.InputText(default_text=G.user,key='-username-', font=["Helvetica", 12])])
-	layout.append([sg.Text("Password", size =(12, 1),font=["Helvetica", 12]), sg.InputText(key='-password-', password_char='*', font=["Helvetica", 12])])
+	layout.append([sg.Text("Password", size =(12*G.scaling, 1*G.scaling),font=["Helvetica", 12]), sg.InputText(key='-password-', password_char='*', font=["Helvetica", 12])])
 	
 	if G.totp:
-		layout.append([sg.Text("OTP Key", size =(12, 1), font=["Helvetica", 12]), sg.InputText(key='-totp-', font=["Helvetica", 12])])
+		layout.append([sg.Text("OTP Key", size =(12*G.scaling, 1), font=["Helvetica", 12]), sg.InputText(key='-totp-', font=["Helvetica", 12])])
 	if G.kiosk:
 		layout.append([sg.Button("Log In", font=["Helvetica", 14])])
 	else:
@@ -155,10 +181,10 @@ def getvms():
 def setvmlayout(vms):
 	layout = []
 	if G.imagefile:
-		layout.append([sg.Image(G.imagefile), sg.Text(G.title, size =(18, 1), justification='c', font=["Helvetica", 18])])
+		layout.append([sg.Image(G.imagefile), sg.Text(G.title, size =(18*G.scaling, 1*G.scaling), justification='c', font=["Helvetica", 18])])
 	else:
-		layout.append([sg.Text(G.title, size =(30, 1), justification='c', font=["Helvetica", 18])])
+		layout.append([sg.Text(G.title, size =(30*G.scaling, 1*G.scaling), justification='c', font=["Helvetica", 18])])
-	layout.append([sg.Text('Please select a desktop instance to connect to', size =(40, 1), justification='c', font=["Helvetica", 10])])
+	layout.append([sg.Text('Please select a desktop instance to connect to', size =(40*G.scaling, 1*G.scaling), justification='c', font=["Helvetica", 10])])
 	layoutcolumn = []
 	for vm in vms:
 		if not vm["status"] == "unknown":
@@ -166,7 +192,7 @@ def setvmlayout(vms):
 			layoutcolumn.append([sg.Text(vm['name'], font=["Helvetica", 14]), sg.Button('Connect', font=["Helvetica", 14], key=connkeyname)])
 			layoutcolumn.append([sg.HorizontalSeparator()])
 	if len(vms) > 5: # We need a scrollbar
-		layout.append([sg.Column(layoutcolumn, scrollable = True, size = [450, None] )])
+		layout.append([sg.Column(layoutcolumn, scrollable = True, size = [450*G.scaling, None] )])
 	else:
 		for row in layoutcolumn:
 			layout.append(row)
@@ -175,7 +201,7 @@ def setvmlayout(vms):
 
 def iniwin(inistring):
 	inilayout = [
-			[sg.Multiline(default_text=inistring, size=(800, 600))]
+			[sg.Multiline(default_text=inistring, size=(800*G.scaling, 600*G.scaling))]
 	]
 	iniwindow = sg.Window('INI debug', inilayout)
 	while True:
@@ -229,7 +255,7 @@ def vmaction(vmnode, vmid, vmtype):
 	confignode['virt-viewer'] = {}
 	for key,value in spiceconfig.items():
 		if key == 'proxy':
-			val = value[7:]
+			val = value[7:].lower()
 			if val in G.spiceproxy_conv:
 				confignode['virt-viewer'][key] = f'http://{G.spiceproxy_conv[val]}'
 			else:
@@ -310,7 +336,7 @@ def pveauth(username, passwd, totp):
 				err = e
 				connected = True
 				return connected, authenticated, err
-			except (requests.exceptions.ConnectTimeout, requests.exceptions.ConnectionError) as e:
+			except (requests.exceptions.ReadTimeout, requests.exceptions.ConnectTimeout, requests.exceptions.ConnectionError) as e:
 				err = e
 				connected = False
 	return connected, authenticated, err
@@ -374,6 +400,13 @@ def showvms():
 	return True
 
 def main():
+	if os.name == 'nt' and gui == 'QT':
+		G.scaling = get_dpi()
+	else:
+		if gui == 'QT':
+			G.scaling = 1.0 #TODO FIXME: Figure out scaling on Linux
+		else:
+			G.scaling = 1 # TKinter requires integers
 	config_location = None
 	if len(sys.argv) > 1:
 		if sys.argv[1] == '--list_themes':
@@ -388,6 +421,7 @@ def main():
 	setcmd()
 	if not loadconfig(config_location):
 		return False
+	sg.theme(G.theme)
 	loggedin = False
 	while True:
 		if not loggedin: