[Scummvm-cvs-logs] CVS: scummvm/gui options.h,1.21,1.21.2.1 options.cpp,1.62,1.62.2.1

Nicolas Bacca arisme at users.sourceforge.net
Mon Jan 10 12:35:10 CET 2005


Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16004

Modified Files:
      Tag: branch-0-7-0
	options.h options.cpp 
Log Message:
Add keys mapping option to the main option dialog for WinCE - useful for Smartphones and non Scumm games

Index: options.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.h,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -d -r1.21 -r1.21.2.1
--- options.h	15 Nov 2004 04:41:51 -0000	1.21
+++ options.h	10 Jan 2005 20:34:26 -0000	1.21.2.1
@@ -24,6 +24,10 @@
 #include "gui/dialog.h"
 #include "common/str.h"
 
+#ifdef _WIN32_WCE
+#include "backends/wince/CEKeysDialog.h"
+#endif
+
 class GameDetector;
 
 namespace GUI {
@@ -108,6 +112,9 @@
 
 protected:
 	BrowserDialog *_browser;
+#ifdef _WIN32_WCE
+	CEKeysDialog *_keysDialog;
+#endif
 	StaticTextWidget *_savePath;
 	StaticTextWidget *_extraPath;
 };

Index: options.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.cpp,v
retrieving revision 1.62
retrieving revision 1.62.2.1
diff -u -d -r1.62 -r1.62.2.1
--- options.cpp	2 Dec 2004 00:33:39 -0000	1.62
+++ options.cpp	10 Jan 2005 20:34:26 -0000	1.62.2.1
@@ -58,11 +58,17 @@
 	kMasterVolumeChanged	= 'mavc',
 	kMusicVolumeChanged		= 'muvc',
 	kSfxVolumeChanged		= 'sfvc',
-	kSpeechVolumeChanged		= 'vcvc',
+	kSpeechVolumeChanged	= 'vcvc',
 	kChooseSaveDirCmd		= 'chos',
 	kChooseExtraDirCmd		= 'chex'
 };
 
+#ifdef _WIN32_WCE
+enum {
+	kChooseKeyMappingCmd    = 'chma'
+};
+#endif
+
 OptionsDialog::OptionsDialog(const String &domain, int x, int y, int w, int h)
 	: Dialog(x, y, w, h),
 	_domain(domain),
@@ -416,6 +422,11 @@
 	yoffset += 18;
 #endif
 
+#ifdef _WIN32_WCE
+	new ButtonWidget(tab, 5, yoffset, kButtonWidth + 14, 16, "Keys", kChooseKeyMappingCmd, 0);
+	yoffset += 18;
+#endif
+
 	// TODO: joystick setting
 
 
@@ -428,10 +439,18 @@
 
 	// Create file browser dialog
 	_browser = new BrowserDialog("Select directory for savegames");
+
+#ifdef _WIN32_WCE
+	_keysDialog = new CEKeysDialog();
+#endif
 }
 
 GlobalOptionsDialog::~GlobalOptionsDialog() {
 	delete _browser;
+
+#ifdef _WIN32_WCE
+	delete _keysDialog;
+#endif
 }
 
 void GlobalOptionsDialog::open() {
@@ -488,6 +507,11 @@
 			_extraPath->setLabel(dir.path());
 		}
 		break;
+#ifdef _WIN32_WCE
+	case kChooseKeyMappingCmd:
+		_keysDialog->runModal();
+		break;
+#endif
 	default:
 		OptionsDialog::handleCommand(sender, cmd, data);
 	}





More information about the Scummvm-git-logs mailing list