GUI: Move the FluidSynth reset button from Misc tab to bottom

This should make it clearer that Reset applies to all of the
FluidSynth settings, not just the Misc tab.

12 files changed, 26 insertions, 26 deletions

diff --git a/dists/bada/Res/scummmobile/scummmobile_layout.stx b/dists/bada/Res/scummmobile/scummmobile_layout.stx
index abac4e28a5..5da293a131 100644
--- a/dists/bada/Res/scummmobile/scummmobile_layout.stx
+++ b/dists/bada/Res/scummmobile/scummmobile_layout.stx
@@ -795,6 +795,9 @@
 			<widget name = 'TabWidget'/>
 			<layout type = 'horizontal' padding = '16, 16, 16, 16'>
 				<space/>
+				<widget name = 'ResetSettings'
+					type = 'Button'
+				/>
 				<widget name = 'Cancel'
 						type = 'Button'
 				/>
@@ -935,9 +938,6 @@
 					type = 'PopUp'
 				/>
 			</layout>
-			<widget name = 'ResetSettings'
-				type = 'Button'
-			/>
 		</layout>
 	</dialog>
 
diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index c422ed5253..dda9f2c2b5 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -35,7 +35,7 @@
 #include "graphics/pixelformat.h"
 
 
-#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.18"
+#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.19"
 
 class OSystem;
 
diff --git a/gui/fluidsynth-dialog.cpp b/gui/fluidsynth-dialog.cpp
index d97b3d75dd..662518b557 100644
--- a/gui/fluidsynth-dialog.cpp
+++ b/gui/fluidsynth-dialog.cpp
@@ -144,10 +144,10 @@ FluidSynthSettingsDialog::FluidSynthSettingsDialog()
 	_miscInterpolationPopUp->appendEntry(_("Fourth-order"), kInterpolation4thOrder);
 	_miscInterpolationPopUp->appendEntry(_("Seventh-order"), kInterpolation7thOrder);
 
-	new ButtonWidget(_tabWidget, "FluidSynthSettings_Misc.ResetSettings", _("Reset"), _("Reset all FluidSynth settings to their default values."), kResetSettingsCmd);
-
 	_tabWidget->setActiveTab(0);
 
+	new ButtonWidget(this, "FluidSynthSettings.ResetSettings", _("Reset"), _("Reset all FluidSynth settings to their default values."), kResetSettingsCmd);
+
 	new ButtonWidget(this, "FluidSynthSettings.Cancel", _("Cancel"), 0, kCloseCmd);
 	new ButtonWidget(this, "FluidSynthSettings.Ok", _("OK"), 0, kOKCmd);
 }
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 5298732154..78c04f14c6 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1368,6 +1368,9 @@
 "<widget name='TabWidget'/> "
 "<layout type='horizontal' padding='8,8,8,8'> "
 "<space/> "
+"<widget name='ResetSettings' "
+"type='Button' "
+"/> "
 "<widget name='Cancel' "
 "type='Button' "
 "/> "
@@ -1505,9 +1508,6 @@
 "type='PopUp' "
 "/> "
 "</layout> "
-"<widget name='ResetSettings' "
-"type='Button' "
-"/> "
 "</layout> "
 "</dialog> "
 "<dialog name='SaveLoadChooser' overlays='screen' inset='8' shading='dim'> "
@@ -2483,6 +2483,9 @@
 "<widget name='TabWidget'/> "
 "<layout type='horizontal' padding='16,16,16,16'> "
 "<space/> "
+"<widget name='ResetSettings' "
+"type='Button' "
+"/> "
 "<widget name='Cancel' "
 "type='Button' "
 "/> "
@@ -2620,9 +2623,6 @@
 "type='PopUp' "
 "/> "
 "</layout> "
-"<widget name='ResetSettings' "
-"type='Button' "
-"/> "
 "</layout> "
 "</dialog> "
 "<dialog name='SaveLoadChooser' overlays='screen' inset='8' shading='dim'> "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 6ff035b5b7..3183417db9 100644
--- a/gui/themes/scummclassic.zip
+++ b/gui/themes/scummclassic.zip
diff --git a/gui/themes/scummclassic/THEMERC b/gui/themes/scummclassic/THEMERC
index e60278629d..36eaacd168 100644
--- a/gui/themes/scummclassic/THEMERC
+++ b/gui/themes/scummclassic/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.18:ScummVM Classic Theme:No Author]
+[SCUMMVM_STX0.8.19:ScummVM Classic Theme:No Author]
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 8e26096869..312a90e78f 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -803,6 +803,9 @@
 			<widget name = 'TabWidget'/>
 			<layout type = 'horizontal' padding = '16, 16, 16, 16'>
 				<space/>
+				<widget name = 'ResetSettings'
+					type = 'Button'
+				/>
 				<widget name = 'Cancel'
 						type = 'Button'
 				/>
@@ -943,9 +946,6 @@
 					type = 'PopUp'
 				/>
 			</layout>
-			<widget name = 'ResetSettings'
-				type = 'Button'
-			/>
 		</layout>
 	</dialog>
 
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 325ac8896e..d42efb5aa4 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -814,6 +814,9 @@
 			<widget name = 'TabWidget'/>
 			<layout type = 'horizontal' padding = '8, 8, 8, 8'>
 				<space/>
+				<widget name = 'ResetSettings'
+					type = 'Button'
+				/>
 				<widget name = 'Cancel'
 						type = 'Button'
 				/>
@@ -954,9 +957,6 @@
 					type = 'PopUp'
 				/>
 			</layout>
-			<widget name = 'ResetSettings'
-				type = 'Button'
-			/>
 		</layout>
 	</dialog>
 
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index aadd3eac18..412ed6a96f 100644
--- a/gui/themes/scummmodern.zip
+++ b/gui/themes/scummmodern.zip
diff --git a/gui/themes/scummmodern/THEMERC b/gui/themes/scummmodern/THEMERC
index ce4e4ab0ff..9e8776263b 100644
--- a/gui/themes/scummmodern/THEMERC
+++ b/gui/themes/scummmodern/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.18:ScummVM Modern Theme:No Author]
+[SCUMMVM_STX0.8.19:ScummVM Modern Theme:No Author]
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index ba723aee40..fa57e62c54 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -817,6 +817,9 @@
 			<widget name = 'TabWidget'/>
 			<layout type = 'horizontal' padding = '16, 16, 16, 16'>
 				<space/>
+				<widget name = 'ResetSettings'
+					type = 'Button'
+				/>
 				<widget name = 'Cancel'
 						type = 'Button'
 				/>
@@ -957,9 +960,6 @@
 					type = 'PopUp'
 				/>
 			</layout>
-			<widget name = 'ResetSettings'
-				type = 'Button'
-			/>
 		</layout>
 	</dialog>
 
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index ab96c14ad5..5c3cc8357e 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -813,6 +813,9 @@
 			<widget name = 'TabWidget'/>
 			<layout type = 'horizontal' padding = '8, 8, 8, 8'>
 				<space/>
+				<widget name = 'ResetSettings'
+					type = 'Button'
+				/>
 				<widget name = 'Cancel'
 						type = 'Button'
 				/>
@@ -953,9 +956,6 @@
 					type = 'PopUp'
 				/>
 			</layout>
-			<widget name = 'ResetSettings'
-				type = 'Button'
-			/>
 		</layout>
 	</dialog>