Add window sizing option
This commit is contained in:
		
							parent
							
								
									e8d936b297
								
							
						
					
					
						commit
						e848a938df
					
				
							
								
								
									
										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.2.01",
 | 
						"version" : "1.2.02",
 | 
				
			||||||
	"product_name" : "VDI Client",
 | 
						"product_name" : "VDI Client",
 | 
				
			||||||
	"manufacturer" : "Josh Patten",
 | 
						"manufacturer" : "Josh Patten",
 | 
				
			||||||
	"name" : "VDI Client",
 | 
						"name" : "VDI Client",
 | 
				
			||||||
 | 
				
			|||||||
@ -17,6 +17,9 @@ inidebug = False
 | 
				
			|||||||
guest_type = both
 | 
					guest_type = both
 | 
				
			||||||
# Show VM option for resetting VM
 | 
					# Show VM option for resetting VM
 | 
				
			||||||
#show_reset = True
 | 
					#show_reset = True
 | 
				
			||||||
 | 
					# Set Window Dimensions. Only use if window isn't sizing properly
 | 
				
			||||||
 | 
					#window_width = 800
 | 
				
			||||||
 | 
					#window_height = 600
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[Authentication]
 | 
					[Authentication]
 | 
				
			||||||
# This is the authentication backend that will be used to authenticate
 | 
					# This is the authentication backend that will be used to authenticate
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										14
									
								
								vdiclient.py
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								vdiclient.py
									
									
									
									
									
								
							@ -39,6 +39,8 @@ class G:
 | 
				
			|||||||
	addl_params = None
 | 
						addl_params = None
 | 
				
			||||||
	theme = 'LightBlue'
 | 
						theme = 'LightBlue'
 | 
				
			||||||
	guest_type = 'both'
 | 
						guest_type = 'both'
 | 
				
			||||||
 | 
						width = None
 | 
				
			||||||
 | 
						height = None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def loadconfig(config_location = None):
 | 
					def loadconfig(config_location = None):
 | 
				
			||||||
	if config_location:
 | 
						if config_location:
 | 
				
			||||||
@ -100,6 +102,10 @@ def loadconfig(config_location = None):
 | 
				
			|||||||
			G.guest_type = config['General']['guest_type']
 | 
								G.guest_type = config['General']['guest_type']
 | 
				
			||||||
		if 'show_reset' in config['General']:
 | 
							if 'show_reset' in config['General']:
 | 
				
			||||||
			G.show_reset = config['General'].getboolean('show_reset')
 | 
								G.show_reset = config['General'].getboolean('show_reset')
 | 
				
			||||||
 | 
							if 'window_width' in config['General']:
 | 
				
			||||||
 | 
								G.width = config['General'].getint('window_width')
 | 
				
			||||||
 | 
							if 'window_height' in config['General']:
 | 
				
			||||||
 | 
								G.height = config['General'].getint('window_height')
 | 
				
			||||||
	if not 'Authentication' in config:
 | 
						if not 'Authentication' in config:
 | 
				
			||||||
		win_popup_button(f'Unable to read supplied configuration:\nNo `Authentication` section defined!', 'OK')
 | 
							win_popup_button(f'Unable to read supplied configuration:\nNo `Authentication` section defined!', 'OK')
 | 
				
			||||||
		return False
 | 
							return False
 | 
				
			||||||
@ -507,9 +513,9 @@ def showvms():
 | 
				
			|||||||
	layout = setvmlayout(vms)
 | 
						layout = setvmlayout(vms)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if G.icon:
 | 
						if G.icon:
 | 
				
			||||||
		window = sg.Window(G.title, layout, return_keyboard_events=True, finalize=True, resizable=False, no_titlebar=G.kiosk, icon=G.icon)
 | 
							window = sg.Window(G.title, layout, return_keyboard_events=True, finalize=True, resizable=False, no_titlebar=G.kiosk, size=(G.width, G.height), icon=G.icon)
 | 
				
			||||||
	else:
 | 
						else:
 | 
				
			||||||
		window = sg.Window(G.title, layout, return_keyboard_events=True, finalize=True, resizable=False, no_titlebar=G.kiosk)
 | 
							window = sg.Window(G.title, layout, return_keyboard_events=True, finalize=True, resizable=False, size=(G.width, G.height), no_titlebar=G.kiosk)
 | 
				
			||||||
	timer = datetime.now()
 | 
						timer = datetime.now()
 | 
				
			||||||
	while True:
 | 
						while True:
 | 
				
			||||||
		if (datetime.now() - timer).total_seconds() > 5:
 | 
							if (datetime.now() - timer).total_seconds() > 5:
 | 
				
			||||||
@ -521,9 +527,9 @@ def showvms():
 | 
				
			|||||||
				layout = setvmlayout(vms)
 | 
									layout = setvmlayout(vms)
 | 
				
			||||||
				window.close()
 | 
									window.close()
 | 
				
			||||||
				if G.icon:
 | 
									if G.icon:
 | 
				
			||||||
					window = sg.Window(G.title, layout, return_keyboard_events=True, finalize=True, resizable=False, no_titlebar=G.kiosk, icon=G.icon)
 | 
										window = sg.Window(G.title, layout, return_keyboard_events=True, finalize=True, resizable=False, no_titlebar=G.kiosk, size=(G.width, G.height), icon=G.icon)
 | 
				
			||||||
				else:
 | 
									else:
 | 
				
			||||||
					window = sg.Window(G.title, layout, return_keyboard_events=True,finalize=True, resizable=False, no_titlebar=G.kiosk)
 | 
										window = sg.Window(G.title, layout, return_keyboard_events=True,finalize=True, resizable=False, no_titlebar=G.kiosk, size=(G.width, G.height))
 | 
				
			||||||
				window.bring_to_front()
 | 
									window.bring_to_front()
 | 
				
			||||||
			else: # Refresh existing vm status
 | 
								else: # Refresh existing vm status
 | 
				
			||||||
				newvms = getvms()
 | 
									newvms = getvms()
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user