From c899f5fbc3dfbaf8886c2b4f2438e372bbe18f2d Mon Sep 17 00:00:00 2001
From: Jaromir Wysoglad
Date: Sun, 14 Jul 2019 21:06:54 +0200
Subject: TTS: Add Accessibility tab to all themes

---
 gui/themes/default.inc                             | 287 ++++++++++++++++++---
 gui/themes/scummclassic.zip                        | Bin 137446 -> 139019 bytes
 gui/themes/scummclassic/classic_layout.stx         | 104 ++++++++
 gui/themes/scummclassic/classic_layout_lowres.stx  |  98 +++++++
 gui/themes/scummmodern.zip                         | Bin 266213 -> 267511 bytes
 gui/themes/scummmodern/scummmodern_layout.stx      | 104 ++++++++
 .../scummmodern/scummmodern_layout_lowres.stx      |  99 +++++++
 gui/themes/scummremastered.zip                     | Bin 266151 -> 267436 bytes
 gui/themes/scummremastered/remastered_layout.stx   | 103 ++++++++
 .../scummremastered/remastered_layout_lowres.stx   |  99 +++++++
 10 files changed, 856 insertions(+), 38 deletions(-)

(limited to 'gui')

diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 2982bf22ce..3e09b49851 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -644,12 +644,21 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "<widget name='SmallLabel' "
 "size='24,Globals.Line.Height' "
 "/>"
+"<widget name='CloudTabLabel' "
+"size='200,Globals.Line.Height' "
+"/>"
+"<widget name='CloudTabLabelValue' "
+"size='200,Globals.Line.Height' "
+"/>"
 "<widget name='ShortOptionsLabel' "
 "size='60,Globals.Line.Height' "
 "/>"
 "<widget name='Button' "
 "size='108,24' "
 "/>"
+"<widget name='WideButton' "
+"size='216,24' "
+"/>"
 "<widget name='Slider' "
 "size='128,18' "
 "/>"
@@ -1170,49 +1179,136 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "</dialog>"
 "<dialog name='GlobalOptions_Cloud_Container' overlays='GlobalOptions_Cloud.Container'>"
 "<layout type='vertical' padding='16,16,16,16' spacing='8'>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
+"<layout type='horizontal' padding='-19,7,0,0' spacing='10'>"
+"<layout type='vertical' padding='0,0,2,0' spacing='2'>"
 "<widget name='StoragePopupDesc' "
 "type='OptionsLabel' "
+"height='Globals.Line.Height' "
 "/>"
+"</layout>"
+"<layout type='vertical' padding='0,0,0,0' spacing='2'>"
 "<widget name='StoragePopup' "
 "type='PopUp' "
 "/>"
 "</layout>"
+"</layout>"
 "<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
+"<layout type='vertical' padding='0,0,8,0' spacing='4'>"
+"<widget name='StorageDisabledHint' "
+"height='Globals.Line.Height' "
+"/>"
+"<widget name='StorageEnableButton' "
+"type='Button' "
+"/>"
+"</layout>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
+"<layout type='vertical' padding='0,0,6,0' spacing='2'>"
 "<widget name='StorageUsernameDesc' "
-"type='OptionsLabel' "
+"type='CloudTabLabel' "
 "/>"
 "<widget name='StorageUsernameLabel' "
-"height='Globals.Line.Height' "
+"type='CloudTabLabelValue' "
 "/>"
 "</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
+"<layout type='vertical' padding='0,0,6,0' spacing='2'>"
 "<widget name='StorageUsedSpaceDesc' "
-"type='OptionsLabel' "
+"type='CloudTabLabel' "
 "/>"
 "<widget name='StorageUsedSpaceLabel' "
-"height='Globals.Line.Height' "
+"type='CloudTabLabelValue' "
 "/>"
 "</layout>"
+"</layout>"
 "<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
+"<layout type='vertical' padding='0,0,6,0' spacing='2'>"
 "<widget name='StorageLastSyncDesc' "
-"type='OptionsLabel' "
+"type='CloudTabLabel' "
 "/>"
 "<widget name='StorageLastSyncLabel' "
+"type='CloudTabLabelValue' "
+"/>"
+"</layout>"
+"<layout type='vertical' padding='0,0,7,0' spacing='2'>"
+"<widget name='SyncSavesButton' "
+"type='Button' "
+"/>"
+"</layout>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,-4,0' spacing='10' center='true'>"
+"<widget name='StorageSyncHint' "
 "height='Globals.Line.Height' "
 "/>"
 "</layout>"
 "<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='ConnectButton' "
+"<layout type='vertical' padding='0,0,6,0' spacing='4'>"
+"<widget name='StorageDownloadHint' "
+"height='Globals.Line.Height' "
+"/>"
+"<widget name='DownloadButton' "
+"type='WideButton' "
+"/>"
+"</layout>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
+"<layout type='vertical' padding='0,0,8,0' spacing='4'>"
+"<widget name='StorageDisconnectHint' "
+"height='Globals.Line.Height' "
+"/>"
+"<widget name='DisconnectButton' "
 "type='Button' "
 "/>"
-"<widget name='RefreshButton' "
+"</layout>"
+"</layout>"
+"<layout type='vertical' padding='0,0,6,0' spacing='2'>"
+"<widget name='StorageWizardNotConnectedHint' "
+"height='Globals.Line.Height' "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,-2,0' spacing='10' center='true'>"
+"<layout type='vertical' padding='0,0,2,0' spacing='4'>"
+"<widget name='StorageWizardOpenLinkHint' "
+"width='106' "
+"height='Globals.Line.Height' "
+"/>"
+"</layout>"
+"<layout type='vertical' padding='0,0,1,0' spacing='4'>"
+"<widget name='StorageWizardLink' "
+"width='192' "
+"height='Globals.Line.Height' "
+"/>"
+"</layout>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,-2,0' spacing='10' center='true'>"
+"<widget name='StorageWizardCodeHint' "
+"height='Globals.Line.Height' "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
+"<layout type='vertical' padding='0,0,-2,0' spacing='2'>"
+"<widget name='StorageWizardCodeBox' "
+"width='108' "
+"height='24' "
+"/>"
+"</layout>"
+"<layout type='vertical' padding='0,0,-2,0' spacing='2'>"
+"<widget name='StorageWizardPasteButton' "
 "type='Button' "
 "/>"
-"<widget name='DownloadButton' "
+"</layout>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,-2,0' spacing='10' center='true'>"
+"<widget name='StorageWizardConnectButton' "
 "type='Button' "
 "/>"
+"<widget name='StorageWizardConnectionStatusHint' "
+"height='Globals.Line.Height' "
+"/>"
+"</layout>"
 "</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_Network' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
 "<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='RunServerButton' "
 "type='Button' "
@@ -1246,6 +1342,14 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "width='Globals.Line.Height' "
 "/>"
 "</layout>"
+"<layout type='vertical' padding='0,0,0,0' spacing='4' center='true'>"
+"<widget name='FeatureDescriptionLine1' "
+"height='Globals.Line.Height' "
+"/>"
+"<widget name='FeatureDescriptionLine2' "
+"height='Globals.Line.Height' "
+"/>"
+"</layout>"
 "</layout>"
 "</dialog>"
 "<dialog name='GlobalOptions_Cloud_DownloadDialog' overlays='Dialog.GlobalOptions'>"
@@ -1373,6 +1477,16 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "</layout>"
 "</layout>"
 "</dialog>"
+"<dialog name='GlobalOptions_Accessibility' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='16'>"
+"<widget name='TTSCheckbox' "
+"type='Checkbox' "
+"/>"
+"<widget name='TTSVoiceSelection' "
+"type='PopUp' "
+"/>"
+"</layout>"
+"</dialog>"
 "<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'>"
 "<layout type='vertical' padding='8,8,8,8' center='true'>"
 "<widget name='Action' "
@@ -1553,16 +1667,6 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "/>"
 "</layout>"
 "</dialog>"
-"<dialog name='GlobalOptions_Accessibility' overlays='Dialog.GlobalOptions.TabWidget'>"
-"<layout type='vertical' padding='16,16,16,16' spacing='16'>"
-"<widget name='TTSCheckbox' "
-"type='Checkbox' "
-"/>"
-"<widget name='TTSVoiceSelection' "
-"type='PopUp' "
-"/>"
-"</layout>"
-"</dialog>"
 "<dialog name='GlobalMenu' overlays='screen_center'>"
 "<layout type='vertical' padding='16,16,16,16' center='true'>"
 "<widget name='Title' "
@@ -2263,6 +2367,9 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "<widget name='Button' "
 "size='72,16' "
 "/>"
+"<widget name='WideButton' "
+"size='144,16' "
+"/>"
 "<widget name='Slider' "
 "size='85,12' "
 "/>"
@@ -2273,6 +2380,12 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "<widget name='SmallLabel' "
 "size='18,Globals.Line.Height' "
 "/>"
+"<widget name='CloudTabLabel' "
+"size='180,Globals.Line.Height' "
+"/>"
+"<widget name='CloudTabLabelValue' "
+"size='180,Globals.Line.Height' "
+"/>"
 "<widget name='PopUp' "
 "size='-1,15' "
 "/>"
@@ -2795,58 +2908,138 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "</layout>"
 "</dialog>"
 "<dialog name='GlobalOptions_Cloud_Container' overlays='GlobalOptions_Cloud.Container'>"
-"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
+"<layout type='vertical' padding='10,13,10,10' spacing='8'>"
+"<layout type='horizontal' padding='-10,1,0,0' spacing='6'>"
+"<layout type='vertical' padding='0,0,1,0' spacing='1'>"
 "<widget name='StoragePopupDesc' "
-"width='80' "
+"width='100' "
 "height='Globals.Line.Height' "
 "textalign='right' "
 "/>"
+"</layout>"
+"<layout type='vertical' padding='0,0,0,0' spacing='1'>"
 "<widget name='StoragePopup' "
 "type='PopUp' "
 "/>"
 "</layout>"
+"</layout>"
 "<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
-"<widget name='StorageUsernameDesc' "
-"width='80' "
+"<layout type='vertical' padding='0,0,3,0' spacing='4'>"
+"<widget name='StorageDisabledHint' "
 "height='Globals.Line.Height' "
-"textalign='right' "
 "/>"
-"<widget name='StorageUsernameLabel' "
-"height='Globals.Line.Height' "
+"<widget name='StorageEnableButton' "
+"type='Button' "
 "/>"
 "</layout>"
+"</layout>"
 "<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
+"<layout type='vertical' padding='0,0,3,0' spacing='1'>"
+"<widget name='StorageUsernameDesc' "
+"type='CloudTabLabel' "
+"/>"
+"<widget name='StorageUsernameLabel' "
+"type='CloudTabLabelValue' "
+"/>"
+"</layout>"
+"<layout type='vertical' padding='0,0,3,0' spacing='1'>"
 "<widget name='StorageUsedSpaceDesc' "
-"width='80' "
-"height='Globals.Line.Height' "
-"textalign='right' "
+"type='CloudTabLabel' "
 "/>"
 "<widget name='StorageUsedSpaceLabel' "
-"height='Globals.Line.Height' "
+"type='CloudTabLabelValue' "
 "/>"
 "</layout>"
+"</layout>"
 "<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
+"<layout type='vertical' padding='0,0,3,0' spacing='1'>"
 "<widget name='StorageLastSyncDesc' "
-"width='80' "
-"height='Globals.Line.Height' "
-"textalign='right' "
+"type='CloudTabLabel' "
 "/>"
 "<widget name='StorageLastSyncLabel' "
+"type='CloudTabLabelValue' "
+"/>"
+"</layout>"
+"<layout type='vertical' padding='0,0,5,0' spacing='1'>"
+"<widget name='SyncSavesButton' "
+"type='Button' "
+"/>"
+"</layout>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,-3,0' spacing='6' center='true'>"
+"<widget name='StorageSyncHint' "
 "height='Globals.Line.Height' "
 "/>"
 "</layout>"
 "<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
-"<widget name='ConnectButton' "
+"<layout type='vertical' padding='0,0,3,0' spacing='4'>"
+"<widget name='StorageDownloadHint' "
+"height='Globals.Line.Height' "
+"/>"
+"<widget name='DownloadButton' "
+"type='WideButton' "
+"/>"
+"</layout>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
+"<layout type='vertical' padding='0,0,3,0' spacing='4'>"
+"<widget name='StorageDisconnectHint' "
+"height='Globals.Line.Height' "
+"/>"
+"<widget name='DisconnectButton' "
 "type='Button' "
 "/>"
-"<widget name='RefreshButton' "
+"</layout>"
+"</layout>"
+"<layout type='vertical' padding='0,0,3,0' spacing='1'>"
+"<widget name='StorageWizardNotConnectedHint' "
+"height='Globals.Line.Height' "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,-3,0' spacing='6' center='true'>"
+"<layout type='vertical' padding='0,0,1,0' spacing='2'>"
+"<widget name='StorageWizardOpenLinkHint' "
+"width='90' "
+"height='Globals.Line.Height' "
+"/>"
+"</layout>"
+"<layout type='vertical' padding='0,0,1,0' spacing='4'>"
+"<widget name='StorageWizardLink' "
+"width='150' "
+"height='Globals.Line.Height' "
+"/>"
+"</layout>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,-2,0' spacing='6' center='true'>"
+"<widget name='StorageWizardCodeHint' "
+"height='Globals.Line.Height' "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
+"<layout type='vertical' padding='0,0,-2,0' spacing='2'>"
+"<widget name='StorageWizardCodeBox' "
+"width='72' "
+"height='16' "
+"/>"
+"</layout>"
+"<layout type='vertical' padding='0,0,-2,0' spacing='2'>"
+"<widget name='StorageWizardPasteButton' "
 "type='Button' "
 "/>"
-"<widget name='DownloadButton' "
+"</layout>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,-2,0' spacing='6' center='true'>"
+"<widget name='StorageWizardConnectButton' "
 "type='Button' "
 "/>"
+"<widget name='StorageWizardConnectionStatusHint' "
+"height='Globals.Line.Height' "
+"/>"
+"</layout>"
 "</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_Network' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
 "<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='RunServerButton' "
 "type='Button' "
@@ -2882,6 +3075,14 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "width='Globals.Line.Height' "
 "/>"
 "</layout>"
+"<layout type='vertical' padding='0,0,0,0' spacing='2' center='true'>"
+"<widget name='FeatureDescriptionLine1' "
+"height='Globals.Line.Height' "
+"/>"
+"<widget name='FeatureDescriptionLine2' "
+"height='Globals.Line.Height' "
+"/>"
+"</layout>"
 "</layout>"
 "</dialog>"
 "<dialog name='GlobalOptions_Cloud_DownloadDialog' overlays='Dialog.GlobalOptions'>"
@@ -3004,6 +3205,16 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "</layout>"
 "</layout>"
 "</dialog>"
+"<dialog name='GlobalOptions_Accessibility' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='16'>"
+"<widget name='TTSCheckbox' "
+"type='Checkbox' "
+"/>"
+"<widget name='TTSVoiceSelection' "
+"type='PopUp' "
+"/>"
+"</layout>"
+"</dialog>"
 "<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'>"
 "<layout type='vertical' padding='8,8,8,8' center='true'>"
 "<widget name='Action' "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 0eba01ad6f..dd5aa320f8 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 1ed4f6b2c6..14f1bb733c 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -823,6 +823,110 @@
 		</layout>
 	</dialog>
 
+	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard' overlays = 'Dialog.GlobalOptions'>
+		<layout type = 'vertical' padding = '0, 0, 0, 0'>		
+			<widget name = 'Container'/>
+		</layout>
+	</dialog>
+
+	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard_Container' overlays = 'GlobalOptions_Cloud_ConnectionWizard.Container'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '0'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '6'>
+					<widget name = 'Picture'
+							width = '109'
+							height = '109'
+					/>
+					<widget name = 'OpenUrlButton'
+							type = 'Button'
+					/>
+					<widget name = 'PasteCodeButton'
+							type = 'Button'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '6'>
+					<widget name = 'Headline'
+							height = 'Globals.Line.Height'
+					/>
+					<space size = '4' />
+					<widget name = 'NavigateLine'
+							height = 'Globals.Line.Height'
+					/>
+					<widget name = 'URLLine'
+							height = 'Globals.Line.Height'
+					/>
+					<space size = '4' />
+					<widget name = 'ReturnLine1'
+							height = 'Globals.Line.Height'
+					/>
+					<widget name = 'ReturnLine2'
+							height = 'Globals.Line.Height'
+					/>
+					<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
+						<widget name = 'CodeBox1'
+							width = '70'
+							height = 'Globals.Line.Height'
+						/>
+						<widget name = 'CodeBox2'
+							width = '70'
+							height = 'Globals.Line.Height'
+						/>
+						<widget name = 'CodeBox3'
+							width = '70'
+							height = 'Globals.Line.Height'
+						/>
+						<widget name = 'CodeBox4'
+							width = '70'
+							height = 'Globals.Line.Height'
+						/>
+					</layout>
+					<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
+						<widget name = 'CodeBox5'
+							width = '70'
+							height = 'Globals.Line.Height'
+						/>
+						<widget name = 'CodeBox6'
+							width = '70'
+							height = 'Globals.Line.Height'
+						/>
+						<widget name = 'CodeBox7'
+							width = '70'
+							height = 'Globals.Line.Height'
+						/>
+						<widget name = 'CodeBox8'
+							width = '70'
+							height = 'Globals.Line.Height'
+						/>
+					</layout>
+					<widget name = 'MessageLine'
+							height = 'Globals.Line.Height'
+					/>
+					<space size = '6' />
+				</layout>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'CancelButton'
+						type = 'Button'
+				/>
+				<space />
+				<widget name = 'ConnectButton'
+						type = 'Button'
+				/>
+			</layout>
+		</layout>
+	</dialog>
+
+	<dialog name='GlobalOptions_Accessibility' overlays='Dialog.GlobalOptions.TabWidget'>
+		<layout type='vertical' padding='16,16,16,16' spacing='16'>
+			<widget name='TTSCheckbox' 
+				type='Checkbox' 
+				/>
+			<widget name='TTSVoiceSelection' 
+				type='PopUp' 
+				/>
+			</layout>
+		</dialog>
+
 	<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'>
 		<layout type='vertical' padding='8,8,8,8' center='true'>
 			<widget name='Action'
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index d73327d2fa..f2bbb00e95 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -830,6 +830,104 @@
 		</layout>
 	</dialog>
 
+	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard' overlays = 'Dialog.GlobalOptions'>
+		<layout type = 'vertical' padding = '0, 0, 0, 0'>
+			<widget name = 'Container'/>
+		</layout>
+	</dialog>
+
+	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard_Container' overlays = 'GlobalOptions_Cloud_ConnectionWizard.Container'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+			<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '4'>
+				<widget name = 'Headline'
+						height = 'Globals.Line.Height'
+				/>
+				<space size = '2' />
+				<widget name = 'NavigateLine'
+						height = 'Globals.Line.Height'
+				/>
+				<widget name = 'URLLine'
+						height = 'Globals.Line.Height'
+				/>
+				<space size = '2' />
+				<widget name = 'ReturnLine1'
+						height = 'Globals.Line.Height'
+				/>
+				<widget name = 'ReturnLine2'
+						height = 'Globals.Line.Height'
+				/>
+				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
+					<widget name = 'CodeBox1'
+						width = '60'
+						height = '16'
+					/>
+					<widget name = 'CodeBox2'
+						width = '60'
+						height = '16'
+					/>
+					<widget name = 'CodeBox3'
+						width = '60'
+						height = '16'
+					/>
+					<widget name = 'CodeBox4'
+						width = '60'
+						height = '16'
+					/>
+				</layout>
+				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
+					<widget name = 'CodeBox5'
+						width = '60'
+						height = '16'
+					/>
+					<widget name = 'CodeBox6'
+						width = '60'
+						height = '16'
+					/>
+					<widget name = 'CodeBox7'
+						width = '60'
+						height = '16'
+					/>
+					<widget name = 'CodeBox8'
+						width = '60'
+						height = '16'
+					/>
+				</layout>
+				<widget name = 'MessageLine'
+						height = 'Globals.Line.Height'
+				/>
+				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
+					<widget name = 'OpenUrlButton'
+							type = 'Button'
+					/>
+					<widget name = 'PasteCodeButton'
+							type = 'Button'
+					/>
+				</layout>
+				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
+					<widget name = 'CancelButton'
+							type = 'Button'
+					/>
+					<space />
+					<widget name = 'ConnectButton'
+							type = 'Button'
+					/>
+				</layout>
+				<space size = '6' />
+				<widget name = 'Picture' width = '1' height = '1' />
+			</layout>
+		</layout>
+	</dialog>
+	<dialog name='GlobalOptions_Accessibility' overlays='Dialog.GlobalOptions.TabWidget'>
+		<layout type='vertical' padding='16,16,16,16' spacing='16'>
+			<widget name='TTSCheckbox' 
+				type='Checkbox' 
+				/>
+			<widget name='TTSVoiceSelection' 
+				type='PopUp' 
+				/>
+		</layout>
+	</dialog>
+
 	<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'>
 		<layout type='vertical' padding='8,8,8,8' center='true'>
 			<widget name='Action'
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index cf5938805d..64f42f5dac 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index ad4f6d71ca..28a72659c3 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -837,6 +837,110 @@
 		</layout>
 	</dialog>
 
+	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard' overlays = 'Dialog.GlobalOptions'>
+		<layout type = 'vertical' padding = '0, 0, 0, 0'>		
+			<widget name = 'Container'/>
+		</layout>
+	</dialog>
+
+	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard_Container' overlays = 'GlobalOptions_Cloud_ConnectionWizard.Container'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '0'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '6'>
+					<widget name = 'Picture'
+							width = '109'
+							height = '109'
+					/>
+					<widget name = 'OpenUrlButton'
+							type = 'Button'
+					/>
+					<widget name = 'PasteCodeButton'
+							type = 'Button'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '6'>
+					<widget name = 'Headline'
+							height = 'Globals.Line.Height'
+					/>
+					<space size = '4' />
+					<widget name = 'NavigateLine'
+							height = 'Globals.Line.Height'
+					/>
+					<widget name = 'URLLine'
+							height = 'Globals.Line.Height'
+					/>
+					<space size = '4' />
+					<widget name = 'ReturnLine1'
+							height = 'Globals.Line.Height'
+					/>
+					<widget name = 'ReturnLine2'
+							height = 'Globals.Line.Height'
+					/>
+					<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
+						<widget name = 'CodeBox1'
+							width = '70'
+							height = 'Globals.Line.Height'
+						/>
+						<widget name = 'CodeBox2'
+							width = '70'
+							height = 'Globals.Line.Height'
+						/>
+						<widget name = 'CodeBox3'
+							width = '70'
+							height = 'Globals.Line.Height'
+						/>
+						<widget name = 'CodeBox4'
+							width = '70'
+							height = 'Globals.Line.Height'
+						/>
+					</layout>
+					<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
+						<widget name = 'CodeBox5'
+							width = '70'
+							height = 'Globals.Line.Height'
+						/>
+						<widget name = 'CodeBox6'
+							width = '70'
+							height = 'Globals.Line.Height'
+						/>
+						<widget name = 'CodeBox7'
+							width = '70'
+							height = 'Globals.Line.Height'
+						/>
+						<widget name = 'CodeBox8'
+							width = '70'
+							height = 'Globals.Line.Height'
+						/>
+					</layout>
+					<widget name = 'MessageLine'
+							height = 'Globals.Line.Height'
+					/>
+					<space size = '6' />
+				</layout>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'CancelButton'
+						type = 'Button'
+				/>
+				<space />
+				<widget name = 'ConnectButton'
+						type = 'Button'
+				/>
+			</layout>
+		</layout>
+	</dialog>
+
+	<dialog name='GlobalOptions_Accessibility' overlays='Dialog.GlobalOptions.TabWidget'>
+		<layout type='vertical' padding='16,16,16,16' spacing='16'>
+			<widget name='TTSCheckbox' 
+				type='Checkbox' 
+				/>
+			<widget name='TTSVoiceSelection' 
+				type='PopUp' 
+				/>
+			</layout>
+		</dialog>
+
 	<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'>
 		<layout type='vertical' padding='8,8,8,8' center='true'>
 			<widget name='Action'
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index bb06082017..85745349e4 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -828,6 +828,105 @@
 		</layout>
 	</dialog>
 
+	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard' overlays = 'Dialog.GlobalOptions'>
+		<layout type = 'vertical' padding = '0, 0, 0, 0'>
+			<widget name = 'Container'/>
+		</layout>
+	</dialog>
+
+	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard_Container' overlays = 'GlobalOptions_Cloud_ConnectionWizard.Container'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+			<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '4'>
+				<widget name = 'Headline'
+						height = 'Globals.Line.Height'
+				/>
+				<space size = '2' />
+				<widget name = 'NavigateLine'
+						height = 'Globals.Line.Height'
+				/>
+				<widget name = 'URLLine'
+						height = 'Globals.Line.Height'
+				/>
+				<space size = '2' />
+				<widget name = 'ReturnLine1'
+						height = 'Globals.Line.Height'
+				/>
+				<widget name = 'ReturnLine2'
+						height = 'Globals.Line.Height'
+				/>
+				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
+					<widget name = 'CodeBox1'
+						width = '60'
+						height = '16'
+					/>
+					<widget name = 'CodeBox2'
+						width = '60'
+						height = '16'
+					/>
+					<widget name = 'CodeBox3'
+						width = '60'
+						height = '16'
+					/>
+					<widget name = 'CodeBox4'
+						width = '60'
+						height = '16'
+					/>
+				</layout>
+				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
+					<widget name = 'CodeBox5'
+						width = '60'
+						height = '16'
+					/>
+					<widget name = 'CodeBox6'
+						width = '60'
+						height = '16'
+					/>
+					<widget name = 'CodeBox7'
+						width = '60'
+						height = '16'
+					/>
+					<widget name = 'CodeBox8'
+						width = '60'
+						height = '16'
+					/>
+				</layout>
+				<widget name = 'MessageLine'
+						height = 'Globals.Line.Height'
+				/>
+				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
+					<widget name = 'OpenUrlButton'
+							type = 'Button'
+					/>
+					<widget name = 'PasteCodeButton'
+							type = 'Button'
+					/>
+				</layout>
+				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
+					<widget name = 'CancelButton'
+							type = 'Button'
+					/>
+					<space />
+					<widget name = 'ConnectButton'
+							type = 'Button'
+					/>
+				</layout>
+				<space size = '6' />
+				<widget name = 'Picture' width = '1' height = '1' />
+			</layout>
+		</layout>
+	</dialog>
+
+	<dialog name='GlobalOptions_Accessibility' overlays='Dialog.GlobalOptions.TabWidget'>
+		<layout type='vertical' padding='16,16,16,16' spacing='16'>
+			<widget name='TTSCheckbox' 
+				type='Checkbox' 
+				/>
+			<widget name='TTSVoiceSelection' 
+				type='PopUp' 
+				/>
+			</layout>
+		</dialog>
+
 	<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'>
 		<layout type='vertical' padding='8,8,8,8' center='true'>
 			<widget name='Action'
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index f9bf2e4559..f0e7839216 100644
Binary files a/gui/themes/scummremastered.zip and b/gui/themes/scummremastered.zip differ
diff --git a/gui/themes/scummremastered/remastered_layout.stx b/gui/themes/scummremastered/remastered_layout.stx
index ad4f6d71ca..7543304541 100644
--- a/gui/themes/scummremastered/remastered_layout.stx
+++ b/gui/themes/scummremastered/remastered_layout.stx
@@ -837,6 +837,109 @@
 		</layout>
 	</dialog>
 
+	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard' overlays = 'Dialog.GlobalOptions'>
+		<layout type = 'vertical' padding = '0, 0, 0, 0'>		
+			<widget name = 'Container'/>
+		</layout>
+	</dialog>
+
+	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard_Container' overlays = 'GlobalOptions_Cloud_ConnectionWizard.Container'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '0'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '6'>
+					<widget name = 'Picture'
+							width = '109'
+							height = '109'
+					/>
+					<widget name = 'OpenUrlButton'
+							type = 'Button'
+					/>
+					<widget name = 'PasteCodeButton'
+							type = 'Button'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '6'>
+					<widget name = 'Headline'
+							height = 'Globals.Line.Height'
+					/>
+					<space size = '4' />
+					<widget name = 'NavigateLine'
+							height = 'Globals.Line.Height'
+					/>
+					<widget name = 'URLLine'
+							height = 'Globals.Line.Height'
+					/>
+					<space size = '4' />
+					<widget name = 'ReturnLine1'
+							height = 'Globals.Line.Height'
+					/>
+					<widget name = 'ReturnLine2'
+							height = 'Globals.Line.Height'
+					/>
+					<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
+						<widget name = 'CodeBox1'
+							width = '70'
+							height = 'Globals.Line.Height'
+						/>
+						<widget name = 'CodeBox2'
+							width = '70'
+							height = 'Globals.Line.Height'
+						/>
+						<widget name = 'CodeBox3'
+							width = '70'
+							height = 'Globals.Line.Height'
+						/>
+						<widget name = 'CodeBox4'
+							width = '70'
+							height = 'Globals.Line.Height'
+						/>
+					</layout>
+					<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
+						<widget name = 'CodeBox5'
+							width = '70'
+							height = 'Globals.Line.Height'
+						/>
+						<widget name = 'CodeBox6'
+							width = '70'
+							height = 'Globals.Line.Height'
+						/>
+						<widget name = 'CodeBox7'
+							width = '70'
+							height = 'Globals.Line.Height'
+						/>
+						<widget name = 'CodeBox8'
+							width = '70'
+							height = 'Globals.Line.Height'
+						/>
+					</layout>
+					<widget name = 'MessageLine'
+							height = 'Globals.Line.Height'
+					/>
+					<space size = '6' />
+				</layout>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'CancelButton'
+						type = 'Button'
+				/>
+				<space />
+				<widget name = 'ConnectButton'
+						type = 'Button'
+				/>
+			</layout>
+		</layout>
+	</dialog>
+
+	<dialog name='GlobalOptions_Accessibility' overlays='Dialog.GlobalOptions.TabWidget'>
+		<layout type='vertical' padding='16,16,16,16' spacing='16'>
+			<widget name='TTSCheckbox'
+				type='Checkbox'
+			/>
+			<widget name='TTSVoiceSelection'
+				type='PopUp'
+			/>
+		</layout>
+	</dialog>
 	<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'>
 		<layout type='vertical' padding='8,8,8,8' center='true'>
 			<widget name='Action'
diff --git a/gui/themes/scummremastered/remastered_layout_lowres.stx b/gui/themes/scummremastered/remastered_layout_lowres.stx
index 5a265e208a..3edd2e2043 100644
--- a/gui/themes/scummremastered/remastered_layout_lowres.stx
+++ b/gui/themes/scummremastered/remastered_layout_lowres.stx
@@ -828,6 +828,105 @@
 		</layout>
 	</dialog>
 
+	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard' overlays = 'Dialog.GlobalOptions'>
+		<layout type = 'vertical' padding = '0, 0, 0, 0'>
+			<widget name = 'Container'/>
+		</layout>
+	</dialog>
+
+	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard_Container' overlays = 'GlobalOptions_Cloud_ConnectionWizard.Container'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+			<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '4'>
+				<widget name = 'Headline'
+						height = 'Globals.Line.Height'
+				/>
+				<space size = '2' />
+				<widget name = 'NavigateLine'
+						height = 'Globals.Line.Height'
+				/>
+				<widget name = 'URLLine'
+						height = 'Globals.Line.Height'
+				/>
+				<space size = '2' />
+				<widget name = 'ReturnLine1'
+						height = 'Globals.Line.Height'
+				/>
+				<widget name = 'ReturnLine2'
+						height = 'Globals.Line.Height'
+				/>
+				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
+					<widget name = 'CodeBox1'
+						width = '60'
+						height = '16'
+					/>
+					<widget name = 'CodeBox2'
+						width = '60'
+						height = '16'
+					/>
+					<widget name = 'CodeBox3'
+						width = '60'
+						height = '16'
+					/>
+					<widget name = 'CodeBox4'
+						width = '60'
+						height = '16'
+					/>
+				</layout>
+				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
+					<widget name = 'CodeBox5'
+						width = '60'
+						height = '16'
+					/>
+					<widget name = 'CodeBox6'
+						width = '60'
+						height = '16'
+					/>
+					<widget name = 'CodeBox7'
+						width = '60'
+						height = '16'
+					/>
+					<widget name = 'CodeBox8'
+						width = '60'
+						height = '16'
+					/>
+				</layout>
+				<widget name = 'MessageLine'
+						height = 'Globals.Line.Height'
+				/>
+				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
+					<widget name = 'OpenUrlButton'
+							type = 'Button'
+					/>
+					<widget name = 'PasteCodeButton'
+							type = 'Button'
+					/>
+				</layout>
+				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
+					<widget name = 'CancelButton'
+							type = 'Button'
+					/>
+					<space />
+					<widget name = 'ConnectButton'
+							type = 'Button'
+					/>
+				</layout>
+				<space size = '6' />
+				<widget name = 'Picture' width = '1' height = '1' />
+			</layout>
+		</layout>
+	</dialog>
+
+	<dialog name='GlobalOptions_Accessibility' overlays='Dialog.GlobalOptions.TabWidget'>
+		<layout type='vertical' padding='16,16,16,16' spacing='16'>
+			<widget name='TTSCheckbox'
+				type='Checkbox'
+			/>
+			<widget name='TTSVoiceSelection'
+				type='PopUp'
+			/>
+		</layout>
+	</dialog>
+
 	<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'>
 		<layout type='vertical' padding='8,8,8,8' center='true'>
 			<widget name='Action'
-- 
cgit v1.2.3