[Scummvm-cvs-logs] CVS: scummvm/gui options.h,1.23,1.24 options.cpp,1.65,1.66

[Nicolas Bacca]

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

Modified Files:
	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.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- options.h	1 Jan 2005 16:09:07 -0000	1.23
+++ options.h	10 Jan 2005 20:53:16 -0000	1.24
@@ -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 {
@@ -105,6 +109,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.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- options.cpp	1 Jan 2005 16:09:07 -0000	1.65
+++ options.cpp	10 Jan 2005 20:53:16 -0000	1.66
@@ -397,6 +397,11 @@
 	yoffset += 18;
 #endif
 
+#ifdef _WIN32_WCE
+	new ButtonWidget(tab, 5, yoffset, kButtonWidth + 14, 16, "Keys", kChooseKeyMappingCmd, 0);
+	yoffset += 18;
+#endif
+
 	// TODO: joystick setting
 
 
@@ -409,10 +414,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() {
@@ -469,6 +482,11 @@
 			_extraPath->setLabel(dir.path());
 		}
 		break;
+#ifdef _WIN32_WCE
+	case kChooseKeyMappingCmd:
+		_keysDialog->runModal();
+		break;
+#endif
 	default:
 		OptionsDialog::handleCommand(sender, cmd, data);
 	}