[Scummvm-cvs-logs] SF.net SVN: scummvm:[41264] scummvm/trunk/gui
sev at users.sourceforge.net
sev at users.sourceforge.net
Sat Jun 6 19:50:30 CEST 2009
Revision: 41264
http://scummvm.svn.sourceforge.net/scummvm/?rev=41264&view=rev
Author: sev
Date: 2009-06-06 17:50:30 +0000 (Sat, 06 Jun 2009)
Log Message:
-----------
Sync all themes with improvements of mass dialog. Fixed list positioning
Modified Paths:
--------------
scummvm/trunk/gui/launcher.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_lowres.stx
scummvm/trunk/gui/themes/scummmodern.zip
Modified: scummvm/trunk/gui/launcher.cpp
===================================================================
--- scummvm/trunk/gui/launcher.cpp 2009-06-06 17:49:59 UTC (rev 41263)
+++ scummvm/trunk/gui/launcher.cpp 2009-06-06 17:50:30 UTC (rev 41264)
@@ -631,15 +631,18 @@
if (alert.runModal() == GUI::kMessageOK && _browser->runModal() > 0) {
MassAddDialog massAddDlg(_browser->getResult());
+ // Save current game position, so on cancel cursor will move back
ConfMan.set("temp_selection", _domains[_list->getSelected()], ConfigManager::kApplicationDomain);
massAddDlg.runModal();
+ // Update the ListWidget and force a redraw
+ updateListing();
+
+ // Set cursor to first detected game
selectGame(ConfMan.get("temp_selection", ConfigManager::kApplicationDomain));
ConfMan.removeKey("temp_selection", ConfigManager::kApplicationDomain);
- // Update the ListWidget and force a redraw
- updateListing();
draw();
}
Modified: scummvm/trunk/gui/themes/default.inc
===================================================================
--- scummvm/trunk/gui/themes/default.inc 2009-06-06 17:49:59 UTC (rev 41263)
+++ scummvm/trunk/gui/themes/default.inc 2009-06-06 17:50:30 UTC (rev 41264)
@@ -976,7 +976,10 @@
"width='250' "
"height='Globals.Line.Height' "
"/> "
-"<space size='32' /> "
+"<widget name='GameList' "
+"width='480' "
+"height='250' "
+"/> "
"<layout type='horizontal' padding='8,8,8,8'> "
"<widget name='Ok' "
"type='Button' "
@@ -1634,7 +1637,10 @@
"width='240' "
"height='Globals.Line.Height' "
"/> "
-"<space size='16' /> "
+"<widget name='GameList' "
+"width='280' "
+"height='100' "
+"/> "
"<layout type='horizontal' padding='4,4,4,4'> "
"<widget name='Ok' "
"type='Button' "
Modified: scummvm/trunk/gui/themes/scummclassic/classic_layout.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_layout.stx 2009-06-06 17:49:59 UTC (rev 41263)
+++ scummvm/trunk/gui/themes/scummclassic/classic_layout.stx 2009-06-06 17:50:30 UTC (rev 41264)
@@ -706,7 +706,10 @@
width = '250'
height = 'Globals.Line.Height'
/>
- <space size = '32' />
+ <widget name = 'GameList'
+ width = '480'
+ height = '250'
+ />
<layout type = 'horizontal' padding = '8, 8, 8, 8'>
<widget name = 'Ok'
type = 'Button'
Modified: scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx 2009-06-06 17:49:59 UTC (rev 41263)
+++ scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx 2009-06-06 17:50:30 UTC (rev 41264)
@@ -700,7 +700,10 @@
width = '240'
height = 'Globals.Line.Height'
/>
- <space size = '16' />
+ <widget name = 'GameList'
+ width = '280'
+ height = '100'
+ />
<layout type = 'horizontal' padding = '4, 4, 4, 4'>
<widget name = 'Ok'
type = 'Button'
Modified: scummvm/trunk/gui/themes/scummclassic.zip
===================================================================
(Binary files differ)
Modified: scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx
===================================================================
--- scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx 2009-06-06 17:49:59 UTC (rev 41263)
+++ scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx 2009-06-06 17:50:30 UTC (rev 41264)
@@ -691,7 +691,10 @@
width = '240'
height = 'Globals.Line.Height'
/>
- <space size = '16' />
+ <widget name = 'GameList'
+ width = '280'
+ height = '100'
+ />
<layout type = 'horizontal' padding = '4, 4, 4, 4'>
<widget name = 'Ok'
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