diff options
author | Eugene Sandulenko | 2006-03-09 02:54:02 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2006-03-09 02:54:02 +0000 |
commit | 51495fb199346508aad26e623d38d60778a0e104 (patch) | |
tree | df0a1ac6fedd7ecf4e15b44b37fce237fe36d11c /gui/themes | |
parent | 86565fcca57454e91124410cfd6864ef1e202dc0 (diff) | |
download | scummvm-rg350-51495fb199346508aad26e623d38d60778a0e104.tar.gz scummvm-rg350-51495fb199346508aad26e623d38d60778a0e104.tar.bz2 scummvm-rg350-51495fb199346508aad26e623d38d60778a0e104.zip |
Moved keys mapping dialog to new scheme. Made it generic. Fixed several
compilation errors associated with it.
svn-id: r21151
Diffstat (limited to 'gui/themes')
-rw-r--r-- | gui/themes/default-theme.ini | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/gui/themes/default-theme.ini b/gui/themes/default-theme.ini index 74b8e0c138..fb3b20c67e 100644 --- a/gui/themes/default-theme.ini +++ b/gui/themes/default-theme.ini @@ -223,7 +223,7 @@ yoffset=(yoffset + buttonHeight + 4) globaloptions_extrabutton=5 yoffset (buttonWidth + 5) buttonHeight globaloptions_extrapath=(prev.x2 + 20) (vBorder + 3) (parent.w - (prev.w + 20) - 10) kLineHeight yoffset=(yoffset + buttonHeight + 4) -globaloptions_keysbutton=5 yoffset buttonWidth buttonHeight +globaloptions_keysbutton=5 yoffset (buttonWidth + 5) buttonHeight globaloptions_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeight - 8) buttonWidth buttonHeight globaloptions_ok=(prev.x2 + 10) prev.y prev.w prev.h @@ -242,6 +242,16 @@ useWithPrefix=volumeControls gameoptions_ opYoffset=(vBorder + buttonHeight) useWithPrefix=midiControls gameoptions_ +### keys dialog +keysdialog=(w / 20) (h / 10) (w - w / 10) (h - h / 5) +set_parent=keysdialog +keysdialog_map=(parent.w - buttonWidth - 10) 20 buttonWidth buttonHeight +keysdialog_ok=prev.x (prev.y2 + 4) prev.w prev.h +keysdialog_cancel=prev.x (prev.y2 + 4) prev.w prev.h +keysdialog_list=10 10 (prev.x - 20) (parent.h - kLineHeight * 4 - self.y) +keysdialog_action=prev.x (parent.h - kLineHeight * 3) (parent.w - self.x * 2) kLineHeight +keysdialog_mapping=prev.x (prev.y + kLineHeight) prev.w prev.h + ##### SCUMM dialogs scummDummyDialog=0 80 0 16 @@ -279,8 +289,8 @@ opYoffset=(opYoffset + buttonHeight) scummconfig_speechCheckbox=prev.x opYoffset (kFontHeight + 10 + 85) buttonHeight opYoffset=(opYoffset + buttonHeight + 4) soWidth=(8 + 3 * buttonWidth + 4) -scummconfig_keys=(soWidth - 3 * (buttonWidth + 4) - 4) opYoffset buttonWidth buttonHeight -scummconfig_cancel=(prev.x2 + 4) prev.y prev.w prev.h +scummconfig_keys=(soWidth - 3 * (buttonWidth + 4) + 6) opYoffset (buttonWidth - 10) buttonHeight +scummconfig_cancel=(prev.x2 + 4) prev.y (prev.w + 10) prev.h scummconfig_ok=(prev.x2 + 4) prev.y prev.w prev.h opYoffset=(opYoffset + buttonHeight) scummconfig=((w - soWidth) / 2) ((h - opYoffset) / 2) soWidth (opYoffset + 8) |