Skip to content

Commit

Permalink
Add window sizing option
Browse files Browse the repository at this point in the history
  • Loading branch information
jpattWPC committed Sep 15, 2023
1 parent e8d936b commit e848a93
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
2 changes: 1 addition & 1 deletion dist/vdiclient.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"upgrade_guid" : "46cbad92-353e-4b28-9bee-83950991dad8",
"version" : "1.2.01",
"version" : "1.2.02",
"product_name" : "VDI Client",
"manufacturer" : "Josh Patten",
"name" : "VDI Client",
Expand Down
3 changes: 3 additions & 0 deletions vdiclient.ini.example
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ inidebug = False
guest_type = both
# Show VM option for resetting VM
#show_reset = True
# Set Window Dimensions. Only use if window isn't sizing properly
#window_width = 800
#window_height = 600

[Authentication]
# This is the authentication backend that will be used to authenticate
Expand Down
14 changes: 10 additions & 4 deletions vdiclient.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ class G:
addl_params = None
theme = 'LightBlue'
guest_type = 'both'
width = None
height = None

def loadconfig(config_location = None):
if config_location:
Expand Down Expand Up @@ -100,6 +102,10 @@ def loadconfig(config_location = None):
G.guest_type = config['General']['guest_type']
if 'show_reset' in config['General']:
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:
win_popup_button(f'Unable to read supplied configuration:\nNo `Authentication` section defined!', 'OK')
return False
Expand Down Expand Up @@ -507,9 +513,9 @@ def showvms():
layout = setvmlayout(vms)

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:
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()
while True:
if (datetime.now() - timer).total_seconds() > 5:
Expand All @@ -521,9 +527,9 @@ def showvms():
layout = setvmlayout(vms)
window.close()
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:
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()
else: # Refresh existing vm status
newvms = getvms()
Expand Down

0 comments on commit e848a93

Please sign in to comment.