[Scummvm-cvs-logs] SF.net SVN: scummvm: [23118] scummvm/trunk/gui
sev at users.sourceforge.net
sev at users.sourceforge.net
Thu Jun 15 04:30:27 CEST 2006
Revision: 23118
Author: sev
Date: 2006-06-14 19:30:05 -0700 (Wed, 14 Jun 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=23118&view=rev
Log Message:
-----------
- Consistent order of tabs between global and game options
- Consistent order of paths on paths tab in global and game options
Modified Paths:
--------------
scummvm/trunk/gui/launcher.cpp
scummvm/trunk/gui/theme-config.cpp
scummvm/trunk/gui/themes/modern.ini
Modified: scummvm/trunk/gui/launcher.cpp
===================================================================
--- scummvm/trunk/gui/launcher.cpp 2006-06-15 02:20:26 UTC (rev 23117)
+++ scummvm/trunk/gui/launcher.cpp 2006-06-15 02:30:05 UTC (rev 23118)
@@ -192,35 +192,9 @@
}
//
- // 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 @@
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);
Modified: scummvm/trunk/gui/theme-config.cpp
===================================================================
--- scummvm/trunk/gui/theme-config.cpp 2006-06-15 02:20:26 UTC (rev 23117)
+++ scummvm/trunk/gui/theme-config.cpp 2006-06-15 02:30:05 UTC (rev 23118)
@@ -173,12 +173,12 @@
"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_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_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_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 @@
"# 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"
Modified: scummvm/trunk/gui/themes/modern.ini
===================================================================
--- scummvm/trunk/gui/themes/modern.ini 2006-06-15 02:20:26 UTC (rev 23117)
+++ scummvm/trunk/gui/themes/modern.ini 2006-06-15 02:30:05 UTC (rev 23118)
@@ -289,11 +289,11 @@
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_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 + 8)
-globaloptions_extrabutton=10 yoffset buttonWidth buttonHeight
-globaloptions_extrapath=(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 @@
# 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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list