[Scummvm-cvs-logs] SF.net SVN: scummvm:[36285] scummvm/trunk
anotherguest at users.sourceforge.net
anotherguest at users.sourceforge.net
Thu Feb 12 23:05:08 CET 2009
Revision: 36285
http://scummvm.svn.sourceforge.net/scummvm/?rev=36285&view=rev
Author: anotherguest
Date: 2009-02-12 22:05:07 +0000 (Thu, 12 Feb 2009)
Log Message:
-----------
Fixed working Keys button in in game options dialog
Fixed key mappings dialog layout
Modified Paths:
--------------
scummvm/trunk/engines/dialogs.cpp
scummvm/trunk/engines/scumm/dialogs.cpp
scummvm/trunk/gui/themes/default.inc
scummvm/trunk/gui/themes/scummclassic/classic_layout.stx
scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx
scummvm/trunk/gui/themes/scummclassic.zip
scummvm/trunk/gui/themes/scummmodern/scummmodern_layout.stx
scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx
scummvm/trunk/gui/themes/scummmodern.zip
Modified: scummvm/trunk/engines/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/dialogs.cpp 2009-02-12 22:02:09 UTC (rev 36284)
+++ scummvm/trunk/engines/dialogs.cpp 2009-02-12 22:05:07 UTC (rev 36285)
@@ -296,12 +296,6 @@
#ifdef SMALL_SCREEN_DEVICE
new GUI::ButtonWidget(this, "ScummConfig.Keys", "Keys", kKeysCmd, 'K');
-
- //
- // Create the sub dialog(s)
- //
-
- _keysDialog = new GUI::KeysDialog();
#endif
}
@@ -316,7 +310,13 @@
case kKeysCmd:
#ifdef SMALL_SCREEN_DEVICE
- _keysDialog->runModal();
+ //
+ // Create the sub dialog(s)
+ //
+ _keysDialog = new GUI::KeysDialog();
+ _keysDialog->runModal();
+ delete _keysDialog;
+ _keysDialog = NULL;
#endif
break;
default:
Modified: scummvm/trunk/engines/scumm/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/dialogs.cpp 2009-02-12 22:02:09 UTC (rev 36284)
+++ scummvm/trunk/engines/scumm/dialogs.cpp 2009-02-12 22:05:07 UTC (rev 36285)
@@ -591,14 +591,6 @@
#ifdef SMALL_SCREEN_DEVICE
new GUI::ButtonWidget(this, "ScummConfig.Keys", "Keys", kKeysCmd, 'K');
#endif
-
-#ifdef SMALL_SCREEN_DEVICE
- //
- // Create the sub dialog(s)
- //
-
- _keysDialog = new GUI::KeysDialog();
-#endif
}
ConfigDialog::~ConfigDialog() {
@@ -611,7 +603,13 @@
switch (cmd) {
case kKeysCmd:
#ifdef SMALL_SCREEN_DEVICE
+ //
+ // Create the sub dialog(s)
+ //
+ _keysDialog = new GUI::KeysDialog();
_keysDialog->runModal();
+ delete _keysDialog;
+ _keysDialog = NULL;
#endif
break;
default:
Modified: scummvm/trunk/gui/themes/default.inc
===================================================================
--- scummvm/trunk/gui/themes/default.inc 2009-02-12 22:02:09 UTC (rev 36284)
+++ scummvm/trunk/gui/themes/default.inc 2009-02-12 22:05:07 UTC (rev 36285)
@@ -637,7 +637,6 @@
"height='Globals.Line.Height' "
"/> "
"<widget name='List'/> "
-"<space size='Globals.Line.Height'/> "
"<widget name='Mapping' "
"height='Globals.Line.Height' "
"/> "
@@ -884,6 +883,9 @@
"</layout> "
"<space size='60'/> "
"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<widget name='Keys' "
+"type='Button' "
+"/> "
"<space size='Globals.Button.Width' /> "
"<widget name='Cancel' "
"type='Button' "
@@ -1275,7 +1277,6 @@
"height='Globals.Line.Height' "
"/> "
"<widget name='List'/> "
-"<space size='Globals.Line.Height'/> "
"<widget name='Mapping' "
"height='Globals.Line.Height' "
"/> "
@@ -1531,7 +1532,10 @@
"/> "
"</layout> "
"<space size='20'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='4'> "
+"<widget name='Keys' "
+"type='Button' "
+"/> "
"<space size='Globals.Button.Width' /> "
"<widget name='Cancel' "
"type='Button' "
Modified: scummvm/trunk/gui/themes/scummclassic/classic_layout.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_layout.stx 2009-02-12 22:02:09 UTC (rev 36284)
+++ scummvm/trunk/gui/themes/scummclassic/classic_layout.stx 2009-02-12 22:05:07 UTC (rev 36285)
@@ -353,7 +353,6 @@
height='Globals.Line.Height'
/>
<widget name='List'/>
- <space size='Globals.Line.Height'/>
<widget name='Mapping'
height='Globals.Line.Height'
/>
@@ -610,6 +609,9 @@
</layout>
<space size = '60'/>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+ <widget name = 'Keys'
+ type = 'Button'
+ />
<space size = 'Globals.Button.Width' />
<widget name = 'Cancel'
type = 'Button'
Modified: scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx 2009-02-12 22:02:09 UTC (rev 36284)
+++ scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx 2009-02-12 22:05:07 UTC (rev 36285)
@@ -350,7 +350,6 @@
height='Globals.Line.Height'
/>
<widget name='List'/>
- <space size='Globals.Line.Height'/>
<widget name='Mapping'
height='Globals.Line.Height'
/>
@@ -616,7 +615,10 @@
/>
</layout>
<space size = '20'/>
- <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4'>
+ <widget name = 'Keys'
+ type = 'Button'
+ />
<space size = 'Globals.Button.Width' />
<widget name = 'Cancel'
type = 'Button'
Modified: scummvm/trunk/gui/themes/scummclassic.zip
===================================================================
(Binary files differ)
Modified: scummvm/trunk/gui/themes/scummmodern/scummmodern_layout.stx
===================================================================
--- scummvm/trunk/gui/themes/scummmodern/scummmodern_layout.stx 2009-02-12 22:02:09 UTC (rev 36284)
+++ scummvm/trunk/gui/themes/scummmodern/scummmodern_layout.stx 2009-02-12 22:05:07 UTC (rev 36285)
@@ -364,7 +364,6 @@
height='Globals.Line.Height'
/>
<widget name='List'/>
- <space size='Globals.Line.Height'/>
<widget name='Mapping'
height='Globals.Line.Height'
/>
@@ -621,6 +620,9 @@
</layout>
<space size = '60'/>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+ <widget name='Keys'
+ type='Button'
+ />
<space size = 'Globals.Button.Width' />
<widget name = 'Cancel'
type = 'Button'
Modified: scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx
===================================================================
--- scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx 2009-02-12 22:02:09 UTC (rev 36284)
+++ scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx 2009-02-12 22:05:07 UTC (rev 36285)
@@ -348,7 +348,6 @@
height='Globals.Line.Height'
/>
<widget name='List'/>
- <space size='Globals.Line.Height'/>
<widget name='Mapping'
height='Globals.Line.Height'
/>
@@ -607,7 +606,10 @@
/>
</layout>
<space size = '20'/>
- <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4'>
+ <widget name = 'Keys'
+ type = 'Button'
+ />
<space size = 'Globals.Button.Width' />
<widget name = 'Cancel'
type = 'Button'
Modified: scummvm/trunk/gui/themes/scummmodern.zip
===================================================================
(Binary files differ)
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