[Scummvm-cvs-logs] CVS: scummvm/gui launcher.cpp,1.96,1.97
Max Horn
fingolfin at users.sourceforge.net
Mon Jul 26 11:13:01 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.230,1.231 scumm.cpp,1.108,1.109 scumm.h,1.432,1.433 sound.cpp,1.357,1.358
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.109,1.110
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28984
Modified Files:
launcher.cpp
Log Message:
Fix label width; properly distinguish between a global default extrapath/savepath, and a target specific one
Index: launcher.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/launcher.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- launcher.cpp 1 Jul 2004 10:24:42 -0000 1.96
+++ launcher.cpp 26 Jul 2004 18:11:55 -0000 1.97
@@ -174,21 +174,21 @@
yoffset = vBorder;
// GUI: Button + Label for the game path
new ButtonWidget(tab, x, yoffset, kButtonWidth + 14, 16, "Game Path:", kCmdGameBrowser, 0);
- _gamePathWidget = new StaticTextWidget(tab, x + kButtonWidth + 20, yoffset, _w - labelWidth - 10, kLineHeight, gamePath, kTextAlignLeft);
+ _gamePathWidget = new StaticTextWidget(tab, x + kButtonWidth + 20, yoffset + 3, _w - (x + kButtonWidth + 20) - 10, kLineHeight, gamePath, kTextAlignLeft);
yoffset += 18;
// GUI: Button + Label for the additional path
new ButtonWidget(tab, x, yoffset, kButtonWidth + 14, 16, "Extra Path:", kCmdExtraBrowser, 0);
- _extraPathWidget = new StaticTextWidget(tab, x + kButtonWidth + 20, yoffset, _w - labelWidth - 10, kLineHeight, extraPath, kTextAlignLeft);
- if (extraPath.isEmpty()) {
+ _extraPathWidget = new StaticTextWidget(tab, x + kButtonWidth + 20, yoffset + 3, _w - (x + kButtonWidth + 20) - 10, kLineHeight, extraPath, kTextAlignLeft);
+ if (extraPath.isEmpty() || !ConfMan.hasKey("extrapath", _domain)) {
_extraPathWidget->setLabel("None");
}
yoffset += 18;
// GUI: Button + Label for the save path
new ButtonWidget(tab, x, yoffset, kButtonWidth + 14, 16, "Save Path:", kCmdSaveBrowser, 0);
- _savePathWidget = new StaticTextWidget(tab, x + kButtonWidth + 20, yoffset, _w - labelWidth - 10, kLineHeight, savePath, kTextAlignLeft);
- if (savePath.isEmpty()) {
+ _savePathWidget = new StaticTextWidget(tab, x + kButtonWidth + 20, yoffset + 3, _w - (x + kButtonWidth + 20) - 10, kLineHeight, savePath, kTextAlignLeft);
+ if (savePath.isEmpty() || !ConfMan.hasKey("savepath", _domain)) {
_savePathWidget->setLabel("Default");
}
yoffset += 18;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.230,1.231 scumm.cpp,1.108,1.109 scumm.h,1.432,1.433 sound.cpp,1.357,1.358
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.109,1.110
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list