- Consistent order of tabs between global and game options

- Consistent order of paths on paths tab in global and game options

svn-id: r23118

3 files changed, 41 insertions, 41 deletions

diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index b3ac2bb973..a52d61bf3b 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -192,35 +192,9 @@ EditGameDialog::EditGameDialog(const String &domain, const String &desc)
 	}
 
 	//
-	// 2) The 'Path' tab
-	//
-	tab->addTab("Paths");
-
-	// These buttons have to be extra wide, or the text will be truncated
-	// in the small version of the GUI.
-
-	// GUI:  Button + Label for the game path
-	new ButtonWidget(tab, "gameoptions_gamepath", "Game Path: ", kCmdGameBrowser, 0);
-	_gamePathWidget = new StaticTextWidget(tab, "gameoptions_gamepathText", gamePath);
-
-	// GUI:  Button + Label for the additional path
-	new ButtonWidget(tab, "gameoptions_extrapath", "Extra Path:", kCmdExtraBrowser, 0);
-	_extraPathWidget = new StaticTextWidget(tab, "gameoptions_extrapathText", extraPath);
-	if (extraPath.empty() || !ConfMan.hasKey("extrapath", _domain)) {
-		_extraPathWidget->setLabel("None");
-	}
-
-	// GUI:  Button + Label for the save path
-	new ButtonWidget(tab, "gameoptions_savepath", "Save Path: ", kCmdSaveBrowser, 0);
-	_savePathWidget = new StaticTextWidget(tab, "gameoptions_savepathText", savePath);
-	if (savePath.empty() || !ConfMan.hasKey("savepath", _domain)) {
-		_savePathWidget->setLabel("Default");
-	}
-
-	//
 	// 3) The graphics tab
 	//
-	tab->addTab("Gfx");
+	tab->addTab("Graphics");
 
 	_globalGraphicsOverride = new CheckboxWidget(tab, "gameoptions_graphicsCheckbox", "Override global graphic settings", kCmdGlobalGraphicsOverride, 0);
 
@@ -254,6 +228,32 @@ EditGameDialog::EditGameDialog(const String &domain, const String &desc)
 
 	addMIDIControls(tab, "gameoptions_");
 
+	//
+	// 2) The 'Path' tab
+	//
+	tab->addTab("Paths");
+
+	// These buttons have to be extra wide, or the text will be truncated
+	// in the small version of the GUI.
+
+	// GUI:  Button + Label for the game path
+	new ButtonWidget(tab, "gameoptions_gamepath", "Game Path: ", kCmdGameBrowser, 0);
+	_gamePathWidget = new StaticTextWidget(tab, "gameoptions_gamepathText", gamePath);
+
+	// GUI:  Button + Label for the additional path
+	new ButtonWidget(tab, "gameoptions_extrapath", "Extra Path:", kCmdExtraBrowser, 0);
+	_extraPathWidget = new StaticTextWidget(tab, "gameoptions_extrapathText", extraPath);
+	if (extraPath.empty() || !ConfMan.hasKey("extrapath", _domain)) {
+		_extraPathWidget->setLabel("None");
+	}
+
+	// GUI:  Button + Label for the save path
+	new ButtonWidget(tab, "gameoptions_savepath", "Save Path: ", kCmdSaveBrowser, 0);
+	_savePathWidget = new StaticTextWidget(tab, "gameoptions_savepathText", savePath);
+	if (savePath.empty() || !ConfMan.hasKey("savepath", _domain)) {
+		_savePathWidget->setLabel("Default");
+	}
+
 	// Activate the first tab
 	tab->setActiveTab(0);
 
diff --git a/gui/theme-config.cpp b/gui/theme-config.cpp
index 174bccd38c..494ffc0a39 100644
--- a/gui/theme-config.cpp
+++ b/gui/theme-config.cpp
@@ -173,12 +173,12 @@ const char *Theme::_defaultConfigINI =
 "globaloptions_savebutton=10 yoffset (buttonWidth + 5) buttonHeight\n"
 "globaloptions_savepath=(prev.x2 + 20) (yoffset + glOff) (parent.w - (prev.w + 20) - 15) kLineHeight\n"
 "yoffset=(yoffset + buttonHeight + 4)\n"
-"globaloptions_themebutton=10 yoffset (buttonWidth + 5) buttonHeight\n"
-"globaloptions_themepath=(prev.x2 + 20) (yoffset + glOff) (parent.w - (prev.w + 20) - 15) kLineHeight\n"
-"yoffset=(yoffset + buttonHeight + 4)\n"
 "globaloptions_extrabutton=10 yoffset (buttonWidth + 5) buttonHeight\n"
 "globaloptions_extrapath=(prev.x2 + 20) (yoffset + glOff) (parent.w - (prev.w + 20) - 15) kLineHeight\n"
 "yoffset=(yoffset + buttonHeight + 4)\n"
+"globaloptions_themebutton=10 yoffset (buttonWidth + 5) buttonHeight\n"
+"globaloptions_themepath=(prev.x2 + 20) (yoffset + glOff) (parent.w - (prev.w + 20) - 15) kLineHeight\n"
+"yoffset=(yoffset + buttonHeight + 4)\n"
 "globaloptions_keysbutton=10 yoffset (buttonWidth + 5) buttonHeight\n"
 "\n"
 "globaloptions_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeight - 8) buttonWidth buttonHeight\n"
@@ -211,14 +211,14 @@ const char *Theme::_defaultConfigINI =
 "# paths tab\n"
 "opYoffset=vBorder\n"
 "goOff=((buttonHeight - kLineHeight) / 2 + 2)\n"
-"gameoptions_gamepath=gox opYoffset (buttonWidth + 5) buttonHeight\n"
-"gameoptions_gamepathText=(prev.x2 + 20) (opYoffset + goOff) (parent.w - self.x - 10) kLineHeight\n"
+"gameoptions_savepath=gox opYoffset (buttonWidth + 5) buttonHeight\n"
+"gameoptions_savepathText=(prev.x2 + 20) (opYoffset + goOff) (parent.w - self.x - 10) kLineHeight\n"
 "opYoffset=(opYoffset + buttonHeight + 4)\n"
 "gameoptions_extrapath=gox opYoffset (buttonWidth + 5) buttonHeight\n"
 "gameoptions_extrapathText=(prev.x2 + 20) (opYoffset + goOff) (parent.w - self.x - 10) kLineHeight\n"
 "opYoffset=(opYoffset + buttonHeight + 4)\n"
-"gameoptions_savepath=gox opYoffset (buttonWidth + 5) buttonHeight\n"
-"gameoptions_savepathText=(prev.x2 + 20) (opYoffset + goOff) (parent.w - self.x - 10) kLineHeight\n"
+"gameoptions_gamepath=gox opYoffset (buttonWidth + 5) buttonHeight\n"
+"gameoptions_gamepathText=(prev.x2 + 20) (opYoffset + goOff) (parent.w - self.x - 10) kLineHeight\n"
 "opYoffset=(opYoffset + buttonHeight + 4)\n"
 "\n"
 "# graphics tab\n"
diff --git a/gui/themes/modern.ini b/gui/themes/modern.ini
index cc0e26b5da..c0030e7f02 100644
--- a/gui/themes/modern.ini
+++ b/gui/themes/modern.ini
@@ -289,11 +289,11 @@ glOff=((buttonHeight - kLineHeight) / 2 + 2)
 globaloptions_savebutton=10 yoffset buttonWidth buttonHeight
 globaloptions_savepath=(prev.x2 + 20) (yoffset + glOff) (parent.w - (prev.w + 20) - 10) kLineHeight
 yoffset=(yoffset + buttonHeight + 8)
-globaloptions_themebutton=10 yoffset buttonWidth buttonHeight
-globaloptions_themepath=(prev.x2 + 20) (yoffset + glOff) (parent.w - (prev.w + 20) - 10) kLineHeight
-yoffset=(yoffset + buttonHeight + 8)
 globaloptions_extrabutton=10 yoffset buttonWidth buttonHeight
 globaloptions_extrapath=(prev.x2 + 20) (yoffset + glOff) (parent.w - (prev.w + 20) - 10) kLineHeight
+yoffset=(yoffset + buttonHeight + 8)
+globaloptions_themebutton=10 yoffset buttonWidth buttonHeight
+globaloptions_themepath=(prev.x2 + 20) (yoffset + glOff) (parent.w - (prev.w + 20) - 10) kLineHeight
 yoffset=(yoffset + buttonHeight + 12)
 globaloptions_keysbutton=5 yoffset buttonWidth buttonHeight
 
@@ -327,14 +327,14 @@ opYoffset=(opYoffset + kLineHeight + 8)
 # paths tab
 opYoffset=optionsVPad
 goOff=((buttonHeight - kLineHeight) / 2 + 2)
-gameoptions_gamepath=gox opYoffset buttonWidth buttonHeight
-gameoptions_gamepathText=(prev.x2 + 20) (opYoffset + goOff) (parent.w - self.x - 10) kLineHeight
+gameoptions_savepath=gox opYoffset buttonWidth buttonHeight
+gameoptions_savepathText=(prev.x2 + 20) (opYoffset + goOff) (parent.w - self.x - 10) kLineHeight
 opYoffset=(opYoffset + buttonHeight + 8)
 gameoptions_extrapath=gox opYoffset buttonWidth buttonHeight
 gameoptions_extrapathText=(prev.x2 + 20) (opYoffset + goOff) (parent.w - self.x - 10) kLineHeight
 opYoffset=(opYoffset + buttonHeight + 8)
-gameoptions_savepath=gox opYoffset buttonWidth buttonHeight
-gameoptions_savepathText=(prev.x2 + 20) (opYoffset + goOff) (parent.w - self.x - 10) kLineHeight
+gameoptions_gamepath=gox opYoffset buttonWidth buttonHeight
+gameoptions_gamepathText=(prev.x2 + 20) (opYoffset + goOff) (parent.w - self.x - 10) kLineHeight
 opYoffset=(opYoffset + buttonHeight + 8)
 
 # graphics tab