[Scummvm-cvs-logs] SF.net SVN: scummvm:[48564] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Tue Apr 6 11:26:44 CEST 2010
Revision: 48564
http://scummvm.svn.sourceforge.net/scummvm/?rev=48564&view=rev
Author: fingolfin
Date: 2010-04-06 09:26:43 +0000 (Tue, 06 Apr 2010)
Log Message:
-----------
GUI: Unify various definitions of kOKCmd and move it to namespace GUI
Modified Paths:
--------------
scummvm/trunk/engines/dialogs.cpp
scummvm/trunk/engines/mohawk/dialogs.cpp
scummvm/trunk/engines/scumm/dialogs.cpp
scummvm/trunk/gui/KeysDialog.cpp
scummvm/trunk/gui/dialog.h
scummvm/trunk/gui/options.h
Modified: scummvm/trunk/engines/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/dialogs.cpp 2010-04-06 09:26:20 UTC (rev 48563)
+++ scummvm/trunk/engines/dialogs.cpp 2010-04-06 09:26:43 UTC (rev 48564)
@@ -48,7 +48,6 @@
using GUI::CommandSender;
using GUI::StaticTextWidget;
-using GUI::kCloseCmd;
enum {
kSaveCmd = 'SAVE',
@@ -235,10 +234,6 @@
}
enum {
- kOKCmd = 'ok '
-};
-
-enum {
kKeysCmd = 'KEYS'
};
@@ -291,8 +286,8 @@
// Add the buttons
//
- new GUI::ButtonWidget(this, "ScummConfig.Ok", "OK", GUI::OptionsDialog::kOKCmd, 'O');
- new GUI::ButtonWidget(this, "ScummConfig.Cancel", "Cancel", kCloseCmd, 'C');
+ new GUI::ButtonWidget(this, "ScummConfig.Ok", "OK", GUI::kOKCmd, 'O');
+ new GUI::ButtonWidget(this, "ScummConfig.Cancel", "Cancel", GUI::kCloseCmd, 'C');
#ifdef SMALL_SCREEN_DEVICE
new GUI::ButtonWidget(this, "ScummConfig.Keys", "Keys", kKeysCmd, 'K');
Modified: scummvm/trunk/engines/mohawk/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/dialogs.cpp 2010-04-06 09:26:20 UTC (rev 48563)
+++ scummvm/trunk/engines/mohawk/dialogs.cpp 2010-04-06 09:26:43 UTC (rev 48564)
@@ -71,7 +71,6 @@
}
enum {
- kCloseCmd = 'CLOS',
kZipCmd = 'ZIPM',
kTransCmd = 'TRAN',
kWaterCmd = 'WATR'
@@ -81,8 +80,8 @@
_zipModeCheckbox = new GUI::CheckboxWidget(this, 15, 10, 300, 15, "Zip Mode Activated", kZipCmd, 'Z');
_transistionsCheckbox = new GUI::CheckboxWidget(this, 15, 30, 300, 15, "Transistions Enabled", kTransCmd, 'T');
- new GUI::ButtonWidget(this, 95, 160, 120, 25, "OK", GUI::OptionsDialog::kOKCmd, 'O');
- new GUI::ButtonWidget(this, 225, 160, 120, 25, "Cancel", kCloseCmd, 'C');
+ new GUI::ButtonWidget(this, 95, 160, 120, 25, "OK", GUI::kOKCmd, 'O');
+ new GUI::ButtonWidget(this, 225, 160, 120, 25, "Cancel", GUI::kCloseCmd, 'C');
}
MystOptionsDialog::~MystOptionsDialog() {
@@ -103,7 +102,7 @@
case kTransCmd:
_vm->_transitionsEnabled = _transistionsCheckbox->getState();
break;
- case kCloseCmd:
+ case GUI::kCloseCmd:
close();
break;
default:
@@ -115,8 +114,8 @@
_zipModeCheckbox = new GUI::CheckboxWidget(this, 15, 10, 300, 15, "Zip Mode Activated", kZipCmd, 'Z');
_waterEffectCheckbox = new GUI::CheckboxWidget(this, 15, 30, 300, 15, "Water Effect Enabled", kWaterCmd, 'W');
- new GUI::ButtonWidget(this, 95, 160, 120, 25, "OK", GUI::OptionsDialog::kOKCmd, 'O');
- new GUI::ButtonWidget(this, 225, 160, 120, 25, "Cancel", kCloseCmd, 'C');
+ new GUI::ButtonWidget(this, 95, 160, 120, 25, "OK", GUI::kOKCmd, 'O');
+ new GUI::ButtonWidget(this, 225, 160, 120, 25, "Cancel", GUI::kCloseCmd, 'C');
}
RivenOptionsDialog::~RivenOptionsDialog() {
@@ -137,7 +136,7 @@
case kWaterCmd:
*_vm->matchVarToString("waterenabled") = _waterEffectCheckbox->getState() ? 1 : 0;
break;
- case kCloseCmd:
+ case GUI::kCloseCmd:
close();
break;
default:
Modified: scummvm/trunk/engines/scumm/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/dialogs.cpp 2010-04-06 09:26:20 UTC (rev 48563)
+++ scummvm/trunk/engines/scumm/dialogs.cpp 2010-04-06 09:26:43 UTC (rev 48564)
@@ -59,7 +59,6 @@
using GUI::CommandSender;
using GUI::StaticTextWidget;
-using GUI::kCloseCmd;
using Graphics::kTextAlignCenter;
using Graphics::kTextAlignLeft;
using GUI::WIDGET_ENABLED;
@@ -391,10 +390,6 @@
#pragma mark -
enum {
- kOKCmd = 'ok '
-};
-
-enum {
kKeysCmd = 'KEYS'
};
@@ -443,8 +438,8 @@
// Add the buttons
//
- new GUI::ButtonWidget(this, "ScummConfig.Ok", "OK", GUI::OptionsDialog::kOKCmd, 'O');
- new GUI::ButtonWidget(this, "ScummConfig.Cancel", "Cancel", kCloseCmd, 'C');
+ new GUI::ButtonWidget(this, "ScummConfig.Ok", "OK", GUI::kOKCmd, 'O');
+ new GUI::ButtonWidget(this, "ScummConfig.Cancel", "Cancel", GUI::kCloseCmd, 'C');
#ifdef SMALL_SCREEN_DEVICE
new GUI::ButtonWidget(this, "ScummConfig.Keys", "Keys", kKeysCmd, 'K');
_keysDialog = NULL;
@@ -495,7 +490,7 @@
_prevButton = new GUI::ButtonWidget(this, "ScummHelp.Prev", "Previous", kPrevCmd, 'P');
_nextButton = new GUI::ButtonWidget(this, "ScummHelp.Next", "Next", kNextCmd, 'N');
- new GUI::ButtonWidget(this, "ScummHelp.Close", "Close", kCloseCmd, 'C');
+ new GUI::ButtonWidget(this, "ScummHelp.Close", "Close", GUI::kCloseCmd, 'C');
_prevButton->clearFlags(WIDGET_ENABLED);
_numLines = HELP_NUM_LINES;
Modified: scummvm/trunk/gui/KeysDialog.cpp
===================================================================
--- scummvm/trunk/gui/KeysDialog.cpp 2010-04-06 09:26:20 UTC (rev 48563)
+++ scummvm/trunk/gui/KeysDialog.cpp 2010-04-06 09:26:43 UTC (rev 48564)
@@ -34,8 +34,7 @@
namespace GUI {
enum {
- kMapCmd = 'map ',
- kOKCmd = 'ok '
+ kMapCmd = 'map '
};
KeysDialog::KeysDialog(const Common::String &title)
Modified: scummvm/trunk/gui/dialog.h
===================================================================
--- scummvm/trunk/gui/dialog.h 2010-04-06 09:26:20 UTC (rev 48563)
+++ scummvm/trunk/gui/dialog.h 2010-04-06 09:26:43 UTC (rev 48564)
@@ -38,7 +38,8 @@
// Some "common" commands sent to handleCommand()
enum {
- kCloseCmd = 'clos'
+ kCloseCmd = 'clos',
+ kOKCmd = 'ok '
};
class Dialog : public GuiObject {
Modified: scummvm/trunk/gui/options.h
===================================================================
--- scummvm/trunk/gui/options.h 2010-04-06 09:26:20 UTC (rev 48563)
+++ scummvm/trunk/gui/options.h 2010-04-06 09:26:43 UTC (rev 48564)
@@ -57,10 +57,6 @@
virtual void reflowLayout();
- enum {
- kOKCmd = 'ok '
- };
-
protected:
/** Config domain this dialog is used to edit. */
String _domain;
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