libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-11 11:45:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed working Keys button in in game options dialog

Browse Source 
Fixed key mappings dialog layout

svn-id: r36285
This commit is contained in:
Lars Persson 2009-02-12 22:05:07 +00:00
parent 3c163dbb4e
commit adbc453163
9 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engines/dialogs.cpp
View File

@ -296,12 +296,6 @@ ConfigDialog::ConfigDialog(bool subtitleControls)
#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 @@ void ConfigDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data)
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:

14
engines/scumm/dialogs.cpp
View File

@ -591,14 +591,6 @@ ConfigDialog::ConfigDialog()
#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 @@ void ConfigDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data)
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:

10
gui/themes/default.inc
View File

@ -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' "

BIN
gui/themes/scummclassic.zip
View File

Binary file not shown.

4
gui/themes/scummclassic/classic_layout.stx
View File

@ -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'

6
gui/themes/scummclassic/classic_layout_lowres.stx
View File

@ -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'

BIN
gui/themes/scummmodern.zip
View File

Binary file not shown.

4
gui/themes/scummmodern/scummmodern_layout.stx
View File

@ -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'

6
gui/themes/scummmodern/scummmodern_layout_lowres.stx
View File

@ -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'