[Scummvm-cvs-logs] SF.net SVN: scummvm:[35416] scummvm/trunk/gui
anotherguest at users.sourceforge.net
anotherguest at users.sourceforge.net
Wed Dec 17 22:19:46 CET 2008
Revision: 35416
http://scummvm.svn.sourceforge.net/scummvm/?rev=35416&view=rev
Author: anotherguest
Date: 2008-12-17 21:19:46 +0000 (Wed, 17 Dec 2008)
Log Message:
-----------
Added KeyConfiguration dialog to classic theme(320 and normal). Updated KeysDialog to follow xml syntax properly.
Modified Paths:
--------------
scummvm/trunk/gui/KeysDialog.cpp
scummvm/trunk/gui/options.cpp
scummvm/trunk/gui/themes/default.inc
scummvm/trunk/gui/themes/scummclassic/classic_layout.stx
scummvm/trunk/gui/themes/scummclassic/classic_layout_320.stx
scummvm/trunk/gui/themes/scummclassic.zip
Modified: scummvm/trunk/gui/KeysDialog.cpp
===================================================================
--- scummvm/trunk/gui/KeysDialog.cpp 2008-12-17 21:17:15 UTC (rev 35415)
+++ scummvm/trunk/gui/KeysDialog.cpp 2008-12-17 21:19:46 UTC (rev 35416)
@@ -39,17 +39,17 @@
};
KeysDialog::KeysDialog(const Common::String &title)
- : GUI::Dialog("keysdialog") {
+ : GUI::Dialog("KeysDialog") {
- new ButtonWidget(this, "keysdialog_map", "Map", kMapCmd, 0);
- new ButtonWidget(this, "keysdialog_ok", "OK", kOKCmd, 0);
- new ButtonWidget(this, "keysdialog_cancel", "Cancel", kCloseCmd, 0);
+ new ButtonWidget(this, "KeysDialog.Map", "Map", kMapCmd, 0);
+ new ButtonWidget(this, "KeysDialog.Ok", "OK", kOKCmd, 0);
+ new ButtonWidget(this, "KeysDialog.Cancel", "Cancel", kCloseCmd, 0);
- _actionsList = new ListWidget(this, "keysdialog_list");
+ _actionsList = new ListWidget(this, "KeysDialog.List");
_actionsList->setNumberingMode(kListNumberingZero);
- _actionTitle = new StaticTextWidget(this, "keysdialog_action", title);
- _keyMapping = new StaticTextWidget(this, "keysdialog_mapping", "Select an action and click 'Map'");
+ _actionTitle = new StaticTextWidget(this, "KeysDialog.Action", title);
+ _keyMapping = new StaticTextWidget(this, "KeysDialog.Mapping", "Select an action and click 'Map'");
_actionTitle->setFlags(WIDGET_CLEARBG);
_keyMapping->setFlags(WIDGET_CLEARBG);
Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp 2008-12-17 21:17:15 UTC (rev 35415)
+++ scummvm/trunk/gui/options.cpp 2008-12-17 21:19:46 UTC (rev 35416)
@@ -720,10 +720,6 @@
#endif
#endif
-#ifdef SMALL_SCREEN_DEVICE
- new ButtonWidget(tab, "GlobalOptions_Paths.KeysButton", "Keys", kChooseKeyMappingCmd, 0);
-#endif
-
tab->addTab("Misc");
new ButtonWidget(tab, "GlobalOptions_Misc.ThemeButton", "Theme:", kChooseThemeCmd, 0);
@@ -743,6 +739,10 @@
_autosavePeriodPopUp->appendEntry(savePeriodLabels[i], savePeriodValues[i]);
}
+#ifdef SMALL_SCREEN_DEVICE
+ new ButtonWidget(tab, "GlobalOptions_Misc.KeysButton", "Keys", kChooseKeyMappingCmd, 0);
+#endif
+
// TODO: joystick setting
Modified: scummvm/trunk/gui/themes/default.inc
===================================================================
--- scummvm/trunk/gui/themes/default.inc 2008-12-17 21:17:15 UTC (rev 35415)
+++ scummvm/trunk/gui/themes/default.inc 2008-12-17 21:19:46 UTC (rev 35416)
@@ -607,8 +607,34 @@
"<widget name='AutosavePeriod' "
"type='PopUp' "
"/> "
+"<widget name='KeysButton' "
+"type='Button' "
+"/> "
"</layout> "
"</dialog> "
+"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'> "
+"<layout type='vertical' padding='8,8,8,8' center='true'> "
+"<widget name='List'/> "
+"<widget name='Action' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='Mapping' "
+"height='Globals.Line.Height' "
+"/> "
+"<layout type='horizontal' padding='0,0,16,0'> "
+"<widget name='Map' "
+"type='Button' "
+"/> "
+"<space/> "
+"<widget name='Cancel' "
+"type='Button' "
+"/> "
+"<widget name='Ok' "
+"type='Button' "
+"/> "
+"</layout> "
+"</layout> "
+"</dialog> "
"<dialog name='GameOptions' overlays='Dialog.Launcher.GameList' shading='dim'> "
"<layout type='vertical' padding='0,0,0,0' spacing='16'> "
"<widget name='TabWidget'/> "
@@ -1217,8 +1243,34 @@
"<widget name='AutosavePeriod' "
"type='PopUp' "
"/> "
+"<widget name='KeysButton' "
+"type='Button' "
+"/> "
"</layout> "
"</dialog> "
+"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'> "
+"<layout type='vertical' padding='8,8,8,8' center='true'> "
+"<widget name='List'/> "
+"<widget name='Action' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='Mapping' "
+"height='Globals.Line.Height' "
+"/> "
+"<layout type='horizontal' padding='0,0,16,0'> "
+"<widget name='Map' "
+"type='Button' "
+"/> "
+"<space/> "
+"<widget name='Cancel' "
+"type='Button' "
+"/> "
+"<widget name='Ok' "
+"type='Button' "
+"/> "
+"</layout> "
+"</layout> "
+"</dialog> "
"<dialog name='GameOptions' overlays='screen' inset='16' shading='dim'> "
"<layout type='vertical' padding='0,0,0,0' spacing='16'> "
"<widget name='TabWidget'/> "
Modified: scummvm/trunk/gui/themes/scummclassic/classic_layout.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_layout.stx 2008-12-17 21:17:15 UTC (rev 35415)
+++ scummvm/trunk/gui/themes/scummclassic/classic_layout.stx 2008-12-17 21:19:46 UTC (rev 35416)
@@ -341,8 +341,35 @@
<widget name = 'AutosavePeriod'
type = 'PopUp'
/>
+ <widget name='KeysButton'
+ type='Button'
+ />
</layout>
</dialog>
+
+ <dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'>
+ <layout type='vertical' padding='8,8,8,8' center='true'>
+ <widget name='List'/>
+ <widget name='Action'
+ height='Globals.Line.Height'
+ />
+ <widget name='Mapping'
+ height='Globals.Line.Height'
+ />
+ <layout type='horizontal' padding='0,0,16,0'>
+ <widget name='Map'
+ type='Button'
+ />
+ <space/>
+ <widget name='Cancel'
+ type='Button'
+ />
+ <widget name='Ok'
+ type='Button'
+ />
+ </layout>
+ </layout>
+ </dialog>
<dialog name = 'GameOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '16'>
Modified: scummvm/trunk/gui/themes/scummclassic/classic_layout_320.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_layout_320.stx 2008-12-17 21:17:15 UTC (rev 35415)
+++ scummvm/trunk/gui/themes/scummclassic/classic_layout_320.stx 2008-12-17 21:19:46 UTC (rev 35416)
@@ -338,9 +338,36 @@
<widget name = 'AutosavePeriod'
type = 'PopUp'
/>
+ <widget name='KeysButton'
+ type='Button'
+ />
</layout>
</dialog>
+ <dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'>
+ <layout type='vertical' padding='8,8,8,8' center='true'>
+ <widget name='List'/>
+ <widget name='Action'
+ height='Globals.Line.Height'
+ />
+ <widget name='Mapping'
+ height='Globals.Line.Height'
+ />
+ <layout type='horizontal' padding='0,0,16,0'>
+ <widget name='Map'
+ type='Button'
+ />
+ <space/>
+ <widget name='Cancel'
+ type='Button'
+ />
+ <widget name='Ok'
+ type='Button'
+ />
+ </layout>
+ </layout>
+ </dialog>
+
<dialog name = 'GameOptions' overlays = 'screen' inset = '16' shading = 'dim'>
<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '16'>
<widget name = 'TabWidget'/>
Modified: scummvm/trunk/gui/themes/scummclassic.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