[Scummvm-git-logs] scummvm master -> 92580561472e53ea11113015d4996cfbff2de482

[aquadran]

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:
9258056147 THEMES: Reorder gui options


Commit: 92580561472e53ea11113015d4996cfbff2de482
    https://github.com/scummvm/scummvm/commit/92580561472e53ea11113015d4996cfbff2de482
Author: Paweł Kołodziejski (aquadran at users.sourceforge.net)
Date: 2020-10-14T21:44:38+02:00

Commit Message:
THEMES: Reorder gui options

Changed paths:
    gui/themes/default.inc
    gui/themes/residualvm.zip
    gui/themes/residualvm/residualvm_layout.stx
    gui/themes/residualvm/residualvm_layout_lowres.stx
    gui/themes/scummclassic.zip
    gui/themes/scummclassic/classic_layout.stx
    gui/themes/scummclassic/classic_layout_lowres.stx
    gui/themes/scummmodern.zip
    gui/themes/scummmodern/scummmodern_layout.stx
    gui/themes/scummmodern/scummmodern_layout_lowres.stx
    gui/themes/scummremastered.zip
    gui/themes/scummremastered/remastered_layout.stx
    gui/themes/scummremastered/remastered_layout_lowres.stx


diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 11614a651a..5f85cded76 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1703,10 +1703,10 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "<widget name='grFullscreenCheckbox' "
 "type='Checkbox' "
 "/>"
-"<widget name='grVSyncCheckbox' "
+"<widget name='grFilteringCheckbox' "
 "type='Checkbox' "
 "/>"
-"<widget name='grFilteringCheckbox' "
+"<widget name='grVSyncCheckbox' "
 "type='Checkbox' "
 "/>"
 "<layout type='horizontal' padding='0,0,0,0' spacing='10' align='center'>"
diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip
index 075c966414..a59b162893 100644
Binary files a/gui/themes/residualvm.zip and b/gui/themes/residualvm.zip differ
diff --git a/gui/themes/residualvm/residualvm_layout.stx b/gui/themes/residualvm/residualvm_layout.stx
index 1ea8288c10..853d635a48 100644
--- a/gui/themes/residualvm/residualvm_layout.stx
+++ b/gui/themes/residualvm/residualvm_layout.stx
@@ -346,10 +346,10 @@
 			<widget name = 'grFullscreenCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grVSyncCheckbox'
+			<widget name = 'grFilteringCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grFilteringCheckbox'
+			<widget name = 'grVSyncCheckbox'
 					type = 'Checkbox'
 			/>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
diff --git a/gui/themes/residualvm/residualvm_layout_lowres.stx b/gui/themes/residualvm/residualvm_layout_lowres.stx
index 53a51e3074..c90a023cf9 100644
--- a/gui/themes/residualvm/residualvm_layout_lowres.stx
+++ b/gui/themes/residualvm/residualvm_layout_lowres.stx
@@ -325,10 +325,10 @@
 			<widget name = 'grFullscreenCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grVSyncCheckbox'
+			<widget name = 'grFilteringCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grFilteringCheckbox'
+			<widget name = 'grVSyncCheckbox'
 					type = 'Checkbox'
 			/>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' align = 'center'>
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index d943bfe9dd..41529a85da 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 c6984df880..9fe13917d3 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -330,10 +330,10 @@
 			<widget name = 'grFullscreenCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grVSyncCheckbox'
+			<widget name = 'grFilteringCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grFilteringCheckbox'
+			<widget name = 'grVSyncCheckbox'
 					type = 'Checkbox'
 			/>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' align = 'center'>
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 1f37dc2012..1f465270d7 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -327,10 +327,10 @@
 			<widget name = 'grFullscreenCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grVSyncCheckbox'
+			<widget name = 'grFilteringCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grFilteringCheckbox'
+			<widget name = 'grVSyncCheckbox'
 					type = 'Checkbox'
 			/>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 4465e5a3ef..8cc40629f8 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 1ea8288c10..853d635a48 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -346,10 +346,10 @@
 			<widget name = 'grFullscreenCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grVSyncCheckbox'
+			<widget name = 'grFilteringCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grFilteringCheckbox'
+			<widget name = 'grVSyncCheckbox'
 					type = 'Checkbox'
 			/>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index 53a51e3074..c90a023cf9 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -325,10 +325,10 @@
 			<widget name = 'grFullscreenCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grVSyncCheckbox'
+			<widget name = 'grFilteringCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grFilteringCheckbox'
+			<widget name = 'grVSyncCheckbox'
 					type = 'Checkbox'
 			/>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' align = 'center'>
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index f34eea967b..5ce71c156a 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 1ea8288c10..853d635a48 100644
--- a/gui/themes/scummremastered/remastered_layout.stx
+++ b/gui/themes/scummremastered/remastered_layout.stx
@@ -346,10 +346,10 @@
 			<widget name = 'grFullscreenCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grVSyncCheckbox'
+			<widget name = 'grFilteringCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grFilteringCheckbox'
+			<widget name = 'grVSyncCheckbox'
 					type = 'Checkbox'
 			/>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
diff --git a/gui/themes/scummremastered/remastered_layout_lowres.stx b/gui/themes/scummremastered/remastered_layout_lowres.stx
index 53a51e3074..c90a023cf9 100644
--- a/gui/themes/scummremastered/remastered_layout_lowres.stx
+++ b/gui/themes/scummremastered/remastered_layout_lowres.stx
@@ -325,10 +325,10 @@
 			<widget name = 'grFullscreenCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grVSyncCheckbox'
+			<widget name = 'grFilteringCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grFilteringCheckbox'
+			<widget name = 'grVSyncCheckbox'
 					type = 'Checkbox'
 			/>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' align = 'center'>