[Scummvm-cvs-logs] SF.net SVN: scummvm:[41355] scummvm/trunk/gui
sev at users.sourceforge.net
sev at users.sourceforge.net
Mon Jun 8 00:19:51 CEST 2009
Revision: 41355
http://scummvm.svn.sourceforge.net/scummvm/?rev=41355&view=rev
Author: sev
Date: 2009-06-07 22:19:48 +0000 (Sun, 07 Jun 2009)
Log Message:
-----------
Added Clear button for search box. Looks a bit off, but we do not yet have
skinned buttons.
Modified Paths:
--------------
scummvm/trunk/gui/launcher.cpp
scummvm/trunk/gui/launcher.h
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/gui/launcher.cpp
===================================================================
--- scummvm/trunk/gui/launcher.cpp 2009-06-07 22:17:44 UTC (rev 41354)
+++ scummvm/trunk/gui/launcher.cpp 2009-06-07 22:19:48 UTC (rev 41355)
@@ -66,6 +66,7 @@
kQuitCmd = 'QUIT',
kSearchCmd = 'SRCH',
kListSearchCmd = 'LSSR',
+ kSearchClearCmd = 'SRCL',
kCmdGlobalGraphicsOverride = 'OGFX',
kCmdGlobalAudioOverride = 'OSFX',
@@ -524,6 +525,7 @@
_searchDesc = new StaticTextWidget(this, "Launcher.SearchDesc", "Search:");
_searchWidget = new EditTextWidget(this, "Launcher.Search", _search, kSearchCmd);
+ _searchClearButton = new ButtonWidget(this, "Launcher.SearchClearButton", "C", kSearchClearCmd, 0);
// Add list with game titles
_list = new ListWidget(this, "Launcher.GameList", kListSearchCmd);
@@ -936,6 +938,10 @@
case kSearchCmd:
_list->setFilter(_searchWidget->getEditString());
break;
+ case kSearchClearCmd:
+ _searchWidget->setEditString("");
+ _list->setFilter("");
+ break;
default:
Dialog::handleCommand(sender, cmd, data);
}
Modified: scummvm/trunk/gui/launcher.h
===================================================================
--- scummvm/trunk/gui/launcher.h 2009-06-07 22:17:44 UTC (rev 41354)
+++ scummvm/trunk/gui/launcher.h 2009-06-07 22:19:48 UTC (rev 41355)
@@ -63,6 +63,7 @@
GraphicsWidget *_searchPic;
#endif
StaticTextWidget *_searchDesc;
+ ButtonWidget *_searchClearButton;
StringList _domains;
BrowserDialog *_browser;
SaveLoadChooser *_loadDialog;
Modified: scummvm/trunk/gui/themes/default.inc
===================================================================
--- scummvm/trunk/gui/themes/default.inc 2009-06-07 22:17:44 UTC (rev 41354)
+++ scummvm/trunk/gui/themes/default.inc 2009-06-07 22:19:48 UTC (rev 41355)
@@ -334,6 +334,9 @@
"<def var='ShowGlobalMenuLogo' value='0'/> "
"<def var='ShowSearchPic' value='0'/> "
"<def var='ScummSaveLoad.ExtInfo.Visible' value='1'/> "
+"<def var='KeyRemapper.Spacing' value='10'/> "
+"<def var='KeyRemapper.LabelWidth' value='100'/> "
+"<def var='KeyRemapper.ButtonWidth' value='80'/> "
"<widget name='OptionsLabel' "
"size='110,Globals.Line.Height' "
"textalign='right' "
@@ -395,6 +398,10 @@
"width='150' "
"height='Globals.Line.Height' "
"/> "
+"<widget name='SearchClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
+"/> "
"<space /> "
"</layout> "
"<widget name='GameList'/> "
@@ -1048,6 +1055,27 @@
"</layout> "
"</layout> "
"</dialog> "
+"<dialog name='KeyRemapper' overlays='screen_center' shading='dim'> "
+"<layout type='vertical' padding='8,8,32,8' spacing='10' center='true'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='PopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='Popup' "
+"type='PopUp' "
+"width='400' "
+"height='Globals.Line.Height' "
+"/> "
+"</layout> "
+"<widget name='KeymapArea' "
+"width='600' "
+"height='280' "
+"/> "
+"<widget name='Close' "
+"type='Button' "
+"/> "
+"</layout> "
+"</dialog> "
"</layout_info> "
"<layout_info resolution='320xY,256x240,Xx272'> "
"<globals> "
@@ -1059,6 +1087,9 @@
"<def var='ShowGlobalMenuLogo' value='0'/> "
"<def var='ShowSearchPic' value='0'/> "
"<def var='ScummSaveLoad.ExtInfo.Visible' value='0'/> "
+"<def var='KeyRemapper.Spacing' value='5'/> "
+"<def var='KeyRemapper.LabelWidth' value='80'/> "
+"<def var='KeyRemapper.ButtonWidth' value='60'/> "
"<widget name='Button' "
"size='72,16' "
"/> "
@@ -1117,6 +1148,10 @@
"width='150' "
"height='Globals.Line.Height' "
"/> "
+"<widget name='SearchClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
+"/> "
"<space /> "
"</layout> "
"<widget name='GameList'/> "
@@ -1777,4 +1812,25 @@
"</layout> "
"</layout> "
"</dialog> "
+"<dialog name='KeyRemapper' overlays='screen_center' shading='dim'> "
+"<layout type='vertical' padding='8,8,8,8' spacing='10' center='true'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='PopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='Popup' "
+"type='PopUp' "
+"width='150' "
+"height='Globals.Line.Height' "
+"/> "
+"</layout> "
+"<widget name='KeymapArea' "
+"width='300' "
+"height='120' "
+"/> "
+"<widget name='Close' "
+"type='Button' "
+"/> "
+"</layout> "
+"</dialog> "
"</layout_info> "
Modified: scummvm/trunk/gui/themes/scummclassic/classic_layout.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_layout.stx 2009-06-07 22:17:44 UTC (rev 41354)
+++ scummvm/trunk/gui/themes/scummclassic/classic_layout.stx 2009-06-07 22:19:48 UTC (rev 41355)
@@ -106,6 +106,10 @@
width = '150'
height = 'Globals.Line.Height'
/>
+ <widget name = 'SearchClearButton'
+ height = 'Globals.Line.Height'
+ width = 'Globals.Line.Height'
+ />
<space />
</layout>
<widget name = 'GameList'/>
Modified: scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx 2009-06-07 22:17:44 UTC (rev 41354)
+++ scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx 2009-06-07 22:19:48 UTC (rev 41355)
@@ -103,6 +103,10 @@
width = '150'
height = 'Globals.Line.Height'
/>
+ <widget name = 'SearchClearButton'
+ height = 'Globals.Line.Height'
+ width = 'Globals.Line.Height'
+ />
<space />
</layout>
<widget name = 'GameList'/>
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-06-07 22:17:44 UTC (rev 41354)
+++ scummvm/trunk/gui/themes/scummmodern/scummmodern_layout.stx 2009-06-07 22:19:48 UTC (rev 41355)
@@ -114,6 +114,10 @@
width = '150'
height = 'Globals.Line.Height'
/>
+ <widget name = 'SearchClearButton'
+ height = 'Globals.Line.Height'
+ width = 'Globals.Line.Height'
+ />
<space />
</layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
Modified: scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx
===================================================================
--- scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx 2009-06-07 22:17:44 UTC (rev 41354)
+++ scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx 2009-06-07 22:19:48 UTC (rev 41355)
@@ -101,6 +101,10 @@
width = '150'
height = 'Globals.Line.Height'
/>
+ <widget name = 'SearchClearButton'
+ height = 'Globals.Line.Height'
+ width = 'Globals.Line.Height'
+ />
<space />
</layout>
<widget name = 'GameList'/>
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