GUI: Add Container in StorageWizardDialog

It now looks fine in both 640x400 and 320x200!

6 files changed, 136 insertions, 106 deletions

diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 42c6b10b73..86d5c497a0 100644
--- a/gui/themes/scummclassic.zip
+++ b/gui/themes/scummclassic.zip
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 3284f7d565..0b030ff799 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -635,7 +635,13 @@
 	</dialog>
 
 	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard' overlays = 'Dialog.GlobalOptions'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+		<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'
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 7666aeb585..9bdea8fa8d 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -650,6 +650,12 @@
 	</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'
@@ -670,60 +676,63 @@
 						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'
+					<widget name = 'CodeBox1'
+						width = '60'
+						height = '16'
 					/>
-				<space size = '4' />
-				<widget name = 'Picture' width = '1' height = '1' />
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
-				<widget name = 'CancelButton'
-						type = 'Button'
-				/>
-				<widget name = 'OpenUrlButton'
-						type = 'Button'
-				/>
-				<widget name = 'PasteCodeButton'
-						type = 'Button'
-				/>
-				<widget name = 'ConnectButton'
-						type = 'Button'
+					<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>
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index b433aaae7a..23662b1da8 100644
--- a/gui/themes/scummmodern.zip
+++ b/gui/themes/scummmodern.zip
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index a242229dff..f1fd702c06 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -649,7 +649,13 @@
 	</dialog>
 
 	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard' overlays = 'Dialog.GlobalOptions'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+		<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'
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index 26f7fab465..3f7e263306 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -648,6 +648,12 @@
 	</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'
@@ -668,60 +674,63 @@
 						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'
+					<widget name = 'CodeBox1'
+						width = '60'
+						height = '16'
 					/>
-				<space size = '4' />
-				<widget name = 'Picture' width = '1' height = '1' />
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
-				<widget name = 'CancelButton'
-						type = 'Button'
-				/>
-				<widget name = 'OpenUrlButton'
-						type = 'Button'
-				/>
-				<widget name = 'PasteCodeButton'
-						type = 'Button'
-				/>
-				<widget name = 'ConnectButton'
-						type = 'Button'
+					<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>