[Scummvm-cvs-logs] SF.net SVN: scummvm:[34802] scummvm/trunk
tanoku at users.sourceforge.net
tanoku at users.sourceforge.net
Tue Oct 14 19:53:52 CEST 2008
Revision: 34802
http://scummvm.svn.sourceforge.net/scummvm/?rev=34802&view=rev
Author: tanoku
Date: 2008-10-14 17:53:52 +0000 (Tue, 14 Oct 2008)
Log Message:
-----------
Added "Mass Add" dialog.
Modified Paths:
--------------
scummvm/trunk/common/xmlparser.cpp
scummvm/trunk/gui/massadd.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
scummvm/trunk/gui/themes/scummmodern/scummodern_layout.stx
scummvm/trunk/gui/themes/scummmodern/scummodern_layout_320.stx
scummvm/trunk/gui/themes/scummmodern.zip
Modified: scummvm/trunk/common/xmlparser.cpp
===================================================================
--- scummvm/trunk/common/xmlparser.cpp 2008-10-14 17:29:48 UTC (rev 34801)
+++ scummvm/trunk/common/xmlparser.cpp 2008-10-14 17:53:52 UTC (rev 34802)
@@ -116,10 +116,10 @@
}
if (keyCount > 0)
- return parserError("Unhandled property inside key '%s': '%s'", key->name.c_str(), localMap.begin()->_key.c_str());
+ return parserError("Unhandled property inside key '%s'.", key->name.c_str());
} else {
- return parserError("Unexpected key in the active scope: '%s'.", key->name.c_str());
+ return parserError("Unexpected key in the active scope ('%s').", key->name.c_str());
}
// check if any of the parents must be ignored.
Modified: scummvm/trunk/gui/massadd.cpp
===================================================================
--- scummvm/trunk/gui/massadd.cpp 2008-10-14 17:29:48 UTC (rev 34801)
+++ scummvm/trunk/gui/massadd.cpp 2008-10-14 17:53:52 UTC (rev 34802)
@@ -59,7 +59,7 @@
MassAddDialog::MassAddDialog(const Common::FSNode &startDir)
- : Dialog("massadddialog"),
+ : Dialog("MassAdd"),
_dirsScanned(0),
_okButton(0),
_dirProgressText(0),
@@ -68,27 +68,22 @@
// The dir we start our scan at
_scanStack.push(startDir);
+// Removed for now... Why would you put a title on mass add dialog called "Mass Add Dialog"?
+// new StaticTextWidget(this, "massadddialog_caption", "Mass Add Dialog");
- // Create dialog items
- // We need:
- // - "OK" button, only enabled after the scan has finished
- // - "Cancel" / "Abort" button, always active
- // - static text as headline for the dialog
- // - static text displaying the progress text
- // - (future) a listbox showing all the games we added/are going to add
-
- new StaticTextWidget(this, "massadddialog_caption", "Mass Add Dialog");
-
- _dirProgressText = new StaticTextWidget(this, "massadddialog_dirprogress",
+ _dirProgressText = new StaticTextWidget(this, "MassAdd.DirProgressText",
"... progress ...");
- _gameProgressText = new StaticTextWidget(this, "massadddialog_gameprogress",
+ _gameProgressText = new StaticTextWidget(this, "MassAdd.GameProgressText",
"... progress ...");
+
+ _dirProgressText->setAlign(Graphics::kTextAlignCenter);
+ _gameProgressText->setAlign(Graphics::kTextAlignCenter);
- _okButton = new ButtonWidget(this, "massadddialog_ok", "OK", kOkCmd, Common::ASCII_RETURN);
+ _okButton = new ButtonWidget(this, "MassAdd.Ok", "OK", kOkCmd, Common::ASCII_RETURN);
_okButton->setEnabled(false);
- new ButtonWidget(this, "massadddialog_cancel", "Cancel", kCancelCmd, Common::ASCII_ESCAPE);
+ new ButtonWidget(this, "MassAdd.Cancel", "Cancel", kCancelCmd, Common::ASCII_ESCAPE);
// Build a map from all configured game paths to the targets using them
const Common::ConfigManager::DomainMap &domains = ConfMan.getGameDomains();
Modified: scummvm/trunk/gui/themes/default.inc
===================================================================
--- scummvm/trunk/gui/themes/default.inc 2008-10-14 17:29:48 UTC (rev 34801)
+++ scummvm/trunk/gui/themes/default.inc 2008-10-14 17:53:52 UTC (rev 34802)
@@ -885,6 +885,27 @@
"</layout> "
"</layout> "
"</dialog> "
+"<dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'> "
+"<layout type = 'vertical' padding = '8, 8, 32, 8' center = 'true'> "
+"<widget name = 'DirProgressText' "
+"width = '250' "
+"height = 'Globals.Line.Height' "
+"/> "
+"<widget name = 'GameProgressText' "
+"width = '250' "
+"height = 'Globals.Line.Height' "
+"/> "
+"<space size = '32' /> "
+"<layout type = 'horizontal' padding = '8, 8, 8, 8'> "
+"<widget name = 'Ok' "
+"type = 'Button' "
+"/> "
+"<widget name = 'Cancel' "
+"type = 'Button' "
+"/> "
+"</layout> "
+"</layout> "
+"</dialog> "
"</layout_info> "
"<layout_info resolution = '320xY, 256x240'> "
"<globals> "
@@ -1459,4 +1480,25 @@
"</layout> "
"</layout> "
"</dialog> "
+"<dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'> "
+"<layout type = 'vertical' padding = '4, 4, 16, 4' center = 'true'> "
+"<widget name = 'DirProgressText' "
+"width = '240' "
+"height = 'Globals.Line.Height' "
+"/> "
+"<widget name = 'GameProgressText' "
+"width = '240' "
+"height = 'Globals.Line.Height' "
+"/> "
+"<space size = '16' /> "
+"<layout type = 'horizontal' padding = '4, 4, 4, 4'> "
+"<widget name = 'Ok' "
+"type = 'Button' "
+"/> "
+"<widget name = 'Cancel' "
+"type = 'Button' "
+"/> "
+"</layout> "
+"</layout> "
+"</dialog> "
"</layout_info> "
Modified: scummvm/trunk/gui/themes/scummclassic/classic_layout.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_layout.stx 2008-10-14 17:29:48 UTC (rev 34801)
+++ scummvm/trunk/gui/themes/scummclassic/classic_layout.stx 2008-10-14 17:53:52 UTC (rev 34802)
@@ -632,4 +632,26 @@
</layout>
</layout>
</dialog>
+
+ <dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'>
+ <layout type = 'vertical' padding = '8, 8, 32, 8' center = 'true'>
+ <widget name = 'DirProgressText'
+ width = '250'
+ height = 'Globals.Line.Height'
+ />
+ <widget name = 'GameProgressText'
+ width = '250'
+ height = 'Globals.Line.Height'
+ />
+ <space size = '32' />
+ <layout type = 'horizontal' padding = '8, 8, 8, 8'>
+ <widget name = 'Ok'
+ type = 'Button'
+ />
+ <widget name = 'Cancel'
+ type = 'Button'
+ />
+ </layout>
+ </layout>
+ </dialog>
</layout_info>
\ No newline at end of file
Modified: scummvm/trunk/gui/themes/scummclassic/classic_layout_320.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_layout_320.stx 2008-10-14 17:29:48 UTC (rev 34801)
+++ scummvm/trunk/gui/themes/scummclassic/classic_layout_320.stx 2008-10-14 17:53:52 UTC (rev 34802)
@@ -625,4 +625,26 @@
</layout>
</layout>
</dialog>
+
+ <dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'>
+ <layout type = 'vertical' padding = '4, 4, 16, 4' center = 'true'>
+ <widget name = 'DirProgressText'
+ width = '240'
+ height = 'Globals.Line.Height'
+ />
+ <widget name = 'GameProgressText'
+ width = '240'
+ height = 'Globals.Line.Height'
+ />
+ <space size = '16' />
+ <layout type = 'horizontal' padding = '4, 4, 4, 4'>
+ <widget name = 'Ok'
+ type = 'Button'
+ />
+ <widget name = 'Cancel'
+ type = 'Button'
+ />
+ </layout>
+ </layout>
+ </dialog>
</layout_info>
\ No newline at end of file
Modified: scummvm/trunk/gui/themes/scummmodern/scummodern_layout.stx
===================================================================
--- scummvm/trunk/gui/themes/scummmodern/scummodern_layout.stx 2008-10-14 17:29:48 UTC (rev 34801)
+++ scummvm/trunk/gui/themes/scummmodern/scummodern_layout.stx 2008-10-14 17:53:52 UTC (rev 34802)
@@ -644,4 +644,26 @@
</layout>
</layout>
</dialog>
+
+ <dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'>
+ <layout type = 'vertical' padding = '8, 8, 32, 8' center = 'true'>
+ <widget name = 'DirProgressText'
+ width = '250'
+ height = 'Globals.Line.Height'
+ />
+ <widget name = 'GameProgressText'
+ width = '250'
+ height = 'Globals.Line.Height'
+ />
+ <space size = '32' />
+ <layout type = 'horizontal' padding = '8, 8, 8, 8'>
+ <widget name = 'Ok'
+ type = 'Button'
+ />
+ <widget name = 'Cancel'
+ type = 'Button'
+ />
+ </layout>
+ </layout>
+ </dialog>
</layout_info>
\ No newline at end of file
Modified: scummvm/trunk/gui/themes/scummmodern/scummodern_layout_320.stx
===================================================================
--- scummvm/trunk/gui/themes/scummmodern/scummodern_layout_320.stx 2008-10-14 17:29:48 UTC (rev 34801)
+++ scummvm/trunk/gui/themes/scummmodern/scummodern_layout_320.stx 2008-10-14 17:53:52 UTC (rev 34802)
@@ -622,4 +622,26 @@
</layout>
</layout>
</dialog>
+
+ <dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'>
+ <layout type = 'vertical' padding = '4, 4, 16, 4' center = 'true'>
+ <widget name = 'DirProgressText'
+ width = '240'
+ height = 'Globals.Line.Height'
+ />
+ <widget name = 'GameProgressText'
+ width = '240'
+ height = 'Globals.Line.Height'
+ />
+ <space size = '16' />
+ <layout type = 'horizontal' padding = '4, 4, 4, 4'>
+ <widget name = 'Ok'
+ type = 'Button'
+ />
+ <widget name = 'Cancel'
+ type = 'Button'
+ />
+ </layout>
+ </layout>
+ </dialog>
</layout_info>
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