[Scummvm-git-logs] scummvm master -> ccbccaf947779fb85e38e86fdbd08d80da2f3666

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ccbccaf947 GUI: Move "Update Icons" button to the bottom of Misc tab


Commit: ccbccaf947779fb85e38e86fdbd08d80da2f3666
    https://github.com/scummvm/scummvm/commit/ccbccaf947779fb85e38e86fdbd08d80da2f3666
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-11-22T23:51:06+01:00

Commit Message:
GUI: Move "Update Icons" button to the bottom of Misc tab

Changed paths:
    gui/themes/common/highres_layout.stx
    gui/themes/common/lowres_layout.stx
    gui/themes/default.inc
    gui/themes/residualvm.zip
    gui/themes/scummclassic.zip
    gui/themes/scummclassic/classic_layout.stx
    gui/themes/scummclassic/classic_layout_lowres.stx
    gui/themes/scummmodern.zip
    gui/themes/scummremastered.zip


diff --git a/gui/themes/common/highres_layout.stx b/gui/themes/common/highres_layout.stx
index 5a3cc9d8e8..6a60972486 100644
--- a/gui/themes/common/highres_layout.stx
+++ b/gui/themes/common/highres_layout.stx
@@ -819,9 +819,6 @@
 						type = 'Checkbox'
 				/>
 			</layout>
-			<widget name = 'UpdateIconsButton'
-					type = 'Button'
-			/>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
 				<widget name = 'DiscordRpc'
 						type = 'Checkbox'
@@ -838,6 +835,9 @@
 						type = 'Button'
 				/>
 			</layout>
+			<widget name = 'UpdateIconsButton'
+					type = 'Button'
+			/>
 		</layout>
 	</dialog>
 
diff --git a/gui/themes/common/lowres_layout.stx b/gui/themes/common/lowres_layout.stx
index 262c1d19fa..3d17693637 100644
--- a/gui/themes/common/lowres_layout.stx
+++ b/gui/themes/common/lowres_layout.stx
@@ -789,9 +789,6 @@
 						type = 'Checkbox'
 				/>
 			</layout>
-			<widget name = 'UpdateIconsButton'
-					type = 'Button'
-			/>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
 				<widget name = 'DiscordRpc'
 						type = 'Checkbox'
@@ -810,6 +807,9 @@
 						type = 'Button'
 				/>
 			</layout>
+			<widget name = 'UpdateIconsButton'
+					type = 'Button'
+			/>
 		</layout>
 	</dialog>
 
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 9f8490f794..8701c68eec 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -2078,9 +2078,6 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "type='Checkbox' "
 "/>"
 "</layout>"
-"<widget name='UpdateIconsButton' "
-"type='Button' "
-"/>"
 "<layout type='horizontal' padding='0,0,0,0' spacing='10' align='center'>"
 "<widget name='DiscordRpc' "
 "type='Checkbox' "
@@ -2097,6 +2094,9 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "type='Button' "
 "/>"
 "</layout>"
+"<widget name='UpdateIconsButton' "
+"type='Button' "
+"/>"
 "</layout>"
 "</dialog>"
 "<dialog name='GlobalOptions_Cloud' overlays='Dialog.GlobalOptions.TabWidget'>"
@@ -4000,9 +4000,6 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "type='Checkbox' "
 "/>"
 "</layout>"
-"<widget name='UpdateIconsButton' "
-"type='Button' "
-"/>"
 "<layout type='horizontal' padding='0,0,0,0' spacing='10' align='center'>"
 "<widget name='DiscordRpc' "
 "type='Checkbox' "
@@ -4021,6 +4018,9 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "type='Button' "
 "/>"
 "</layout>"
+"<widget name='UpdateIconsButton' "
+"type='Button' "
+"/>"
 "</layout>"
 "</dialog>"
 "<dialog name='GlobalOptions_Cloud' overlays='Dialog.GlobalOptions.TabWidget'>"
diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip
index f153fefbc7..d3fc5dce66 100644
Binary files a/gui/themes/residualvm.zip and b/gui/themes/residualvm.zip differ
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 5266de3741..a947d9c840 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 96e283e46a..671aa88a97 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -702,9 +702,6 @@
 						type = 'Checkbox'
 				/>
 			</layout>
-			<widget name = 'UpdateIconsButton'
-					type = 'Button'
-			/>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
 				<widget name = 'DiscordRpc'
 						type = 'Checkbox'
@@ -721,6 +718,9 @@
 						type = 'Button'
 				/>
 			</layout>
+			<widget name = 'UpdateIconsButton'
+					type = 'Button'
+			/>
 		</layout>
 	</dialog>
 
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index e214895463..850fb72567 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -706,9 +706,6 @@
 						type = 'Checkbox'
 				/>
 			</layout>
-			<widget name = 'UpdateIconsButton'
-					type = 'Button'
-			/>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
 				<widget name = 'DiscordRpc'
 						type = 'Checkbox'
@@ -727,6 +724,9 @@
 						type = 'Button'
 				/>
 			</layout>
+			<widget name = 'UpdateIconsButton'
+					type = 'Button'
+			/>
 		</layout>
 	</dialog>
 
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index c68df0b873..21716d9cad 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index fe8c752162..26a0034450 100644
Binary files a/gui/themes/scummremastered.zip and b/gui/themes/scummremastered.zip differ