[Scummvm-cvs-logs] SF.net SVN: scummvm:[50983] scummvm/branches/gsoc2010-testbed/engines/ testbed
sud03r at users.sourceforge.net
sud03r at users.sourceforge.net
Sun Jul 18 09:53:05 CEST 2010
Revision: 50983
http://scummvm.svn.sourceforge.net/scummvm/?rev=50983&view=rev
Author: sud03r
Date: 2010-07-18 07:53:05 +0000 (Sun, 18 Jul 2010)
Log Message:
-----------
a few more modifications in the testsuite selection widget
Modified Paths:
--------------
scummvm/branches/gsoc2010-testbed/engines/testbed/config.cpp
scummvm/branches/gsoc2010-testbed/engines/testbed/config.h
scummvm/branches/gsoc2010-testbed/engines/testbed/testbed.cpp
Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/config.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/config.cpp 2010-07-18 07:03:14 UTC (rev 50982)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/config.cpp 2010-07-18 07:53:05 UTC (rev 50983)
@@ -22,8 +22,8 @@
* $Id$
*/
+#include "engines/engine.h"
#include "testbed/config.h"
-#include "engines/engine.h"
namespace Testbed {
@@ -31,7 +31,8 @@
_testbedConfMan = tsConfMan;
- new GUI::StaticTextWidget(this, "Browser.Headline", "Select testsuites to Execute, selected entries are shown in dark");
+ new GUI::StaticTextWidget(this, "Browser.Headline", "Select Testsuites to Execute");
+ new GUI::StaticTextWidget(this, "Browser.Path", "Selected entries shown in dark, click to select");
_testListDisplay = new TestbedListWidget(this, "Browser.List");
_testListDisplay->setNumberingMode(GUI::kListNumberingOff);
@@ -45,9 +46,10 @@
_testListDisplay->setList(_testSuiteArray, &_colors);
- new GUI::ButtonWidget(this, "Browser.Cancel", "Continue", GUI::kCloseCmd, 'C');
+ new GUI::ButtonWidget(this, "Browser.Up", "Select All", kTestbedSelectAll, 0);
+ new GUI::ButtonWidget(this, "Browser.Cancel", "Continue", GUI::kCloseCmd);
// XXX: Add more commands for this
- new GUI::ButtonWidget(this, "Browser.Choose", "Exit", GUI::kCloseCmd, 'X');
+ new GUI::ButtonWidget(this, "Browser.Choose", "Exit Testbed", kTestbedQuitCmd);
}
TestbedOptionsDialog::~TestbedOptionsDialog() {}
@@ -61,6 +63,20 @@
ts->enable(!ts->isEnabled());
_testListDisplay->changeColor();
}
+ break;
+ case kTestbedQuitCmd:
+ Engine::quitGame();
+ close();
+ break;
+ case kTestbedSelectAll:
+ for (uint i = 0; i < _testSuiteArray.size(); i++) {
+ ts = _testbedConfMan->getTestsuiteByName(_testSuiteArray[i]);
+ if (ts) {
+ ts->enable(true);
+ }
+ }
+ _testListDisplay->setColorAll(GUI::ThemeEngine::kFontColorNormal);
+ break;
default:
GUI::Dialog::handleCommand(sender, cmd, data);
}
@@ -121,10 +137,7 @@
TestbedOptionsDialog tbd(_testsuiteList, this);
tbd.runModal();
- // check if user wanted to exit.
- if (Engine::shouldQuit()) {
- return;
- }
+
}
}
Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/config.h
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/config.h 2010-07-18 07:03:14 UTC (rev 50982)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/config.h 2010-07-18 07:53:05 UTC (rev 50983)
@@ -39,7 +39,9 @@
namespace Testbed {
enum {
- kSelectionToggle = 99 // Some random Number
+ kSelectionToggle = 16799, // Some random Number (A better way to do this?)
+ kTestbedQuitCmd,
+ kTestbedSelectAll
};
class TestbedConfigManager {
@@ -76,6 +78,19 @@
}
}
+ void setColorAll(GUI::ThemeEngine::FontColor color) {
+ for (uint i = 0; i < _listColors.size(); i++) {
+ _listColors[i] = color;
+ }
+ draw();;
+ }
+
+ void setColor(uint32 indx, GUI::ThemeEngine::FontColor color) {
+ assert(indx < _listColors.size());
+ _listColors[indx] = color;
+ draw();
+ }
+
};
class TestbedOptionsDialog : public GUI::Dialog {
Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/testbed.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/testbed.cpp 2010-07-18 07:03:14 UTC (rev 50982)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/testbed.cpp 2010-07-18 07:53:05 UTC (rev 50983)
@@ -104,7 +104,12 @@
TestbedConfigManager cfMan(_testsuiteList);
cfMan.selectTestsuites();
-
+
+ // check if user wanted to exit.
+ if (Engine::shouldQuit()) {
+ return Common::kNoError;
+ }
+
invokeTestsuites();
return Common::kNoError;
}
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