Add ability to disable remote-viewer kiosk mode

This commit is contained in:
jpattWPC 2023-10-13 16:04:19 -05:00
parent cd83be7680
commit 9d7540248b
3 changed files with 7 additions and 2 deletions

2
dist/vdiclient.json vendored
View File

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

View File

@ -11,6 +11,8 @@ logo = vdiclient.png
kiosk = False kiosk = False
# Enable/Disable Fullscreen mode (not applicable in Kiosk mode) # Enable/Disable Fullscreen mode (not applicable in Kiosk mode)
fullscreen = True fullscreen = True
# Disable viewer_kiosk mode if kiosk is set to true, this allows overriding remote_viewer kiosk mode
#viewer_kiosk = False
# Enable displaying SPICE ini file before opening virt-viewer # Enable displaying SPICE ini file before opening virt-viewer
inidebug = False inidebug = False
# Select which guest types to display. Acceptable values: both, lxc, qemu # Select which guest types to display. Acceptable values: both, lxc, qemu

View File

@ -30,6 +30,7 @@ class G:
totp = False totp = False
imagefile = None imagefile = None
kiosk = False kiosk = False
viewer_kiosk = True
fullscreen = True fullscreen = True
verify_ssl = True verify_ssl = True
icon = None icon = None
@ -96,6 +97,8 @@ def loadconfig(config_location = None):
G.imagefile = config['General']['logo'] G.imagefile = config['General']['logo']
if 'kiosk' in config['General']: if 'kiosk' in config['General']:
G.kiosk = config['General'].getboolean('kiosk') G.kiosk = config['General'].getboolean('kiosk')
if 'viewer_kiosk' in config['General']:
G.viewer_kiosk = config['General'].getboolean('viewer_kiosk')
if 'fullscreen' in config['General']: if 'fullscreen' in config['General']:
G.fullscreen = config['General'].getboolean('fullscreen') G.fullscreen = config['General'].getboolean('fullscreen')
if 'inidebug' in config['General']: if 'inidebug' in config['General']:
@ -396,7 +399,7 @@ def vmaction(vmnode, vmid, vmtype, action='connect'):
closed = iniwin(inistring) closed = iniwin(inistring)
connpop = win_popup(f'Connecting to {vmstatus["name"]}...') connpop = win_popup(f'Connecting to {vmstatus["name"]}...')
pcmd = [G.vvcmd] pcmd = [G.vvcmd]
if G.kiosk: if G.kiosk and G.viewer_kiosk:
pcmd.append('--kiosk') pcmd.append('--kiosk')
pcmd.append('--kiosk-quit') pcmd.append('--kiosk-quit')
pcmd.append('on-disconnect') pcmd.append('on-disconnect')