[Scummvm-cvs-logs] SF.net SVN: scummvm: [26658] scummvm/trunk/backends/platform/wince/ CEActionsPocket.cpp

[knakos at users.sourceforge.net]

Revision: 26658
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26658&view=rev
Author:   knakos
Date:     2007-04-28 10:34:09 -0700 (Sat, 28 Apr 2007)

Log Message:
-----------
cleanup, more meaningful names for actions, fix quit dialog looks, bump action mapping version

Modified Paths:
--------------
    scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp

Modified: scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp	2007-04-28 17:31:41 UTC (rev 26657)
+++ scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp	2007-04-28 17:34:09 UTC (rev 26658)
@@ -1,5 +1,5 @@
 /* ScummVM - Scumm Interpreter
- * Copyright (C) 2001-2006 The ScummVM project
+ * Copyright (C) 2001-2007 The ScummVM project
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,13 +24,9 @@
 #include "common/stdafx.h"
 #include "CEActionsPocket.h"
 #include "EventsBuffer.h"
-
 #include "gui/message.h"
-
 #include "scumm/scumm.h"
-
 #include "common/config-manager.h"
-
 #include "gui/KeysDialog.h"
 
 #ifdef _WIN32_WCE
@@ -42,20 +38,20 @@
 	"Save",
 	"Quit",
 	"Skip",
-	"Hide",
-	"Keyboard",
-	"Sound",
+	"Hide Toolbar",
+	"Show Keyboard",
+	"Sound on/off",
 	"Right click",
-	"Cursor",
+	"Show/Hide Cursor",
 	"Free look",
 	"Zoom up",
 	"Zoom down",
 	"FT Cheat",
 	"Bind Keys",
-	"Up",
-	"Down",
-	"Left",
-	"Right",
+	"Cursor Up",
+	"Cursor Down",
+	"Cursor Left",
+	"Cursor Right",
 	"Left Click",
 };
 
@@ -100,11 +96,11 @@
 	_action_enabled[POCKET_ACTION_DOWN] = true;
 	_action_enabled[POCKET_ACTION_LEFT] = true;
 	_action_enabled[POCKET_ACTION_RIGHT] = true;
-	_action_mapping[POCKET_ACTION_LEFTCLICK] = VK_RETURN;
-	_action_mapping[POCKET_ACTION_UP] = 0x111;
-	_action_mapping[POCKET_ACTION_DOWN] = 0x112;
-	_action_mapping[POCKET_ACTION_LEFT] = 0x114;
-	_action_mapping[POCKET_ACTION_RIGHT] = 0x113;
+	_action_mapping[POCKET_ACTION_LEFTCLICK] = SDLK_RETURN;
+	_action_mapping[POCKET_ACTION_UP] = SDLK_UP;
+	_action_mapping[POCKET_ACTION_DOWN] = SDLK_DOWN;
+	_action_mapping[POCKET_ACTION_LEFT] = SDLK_LEFT;
+	_action_mapping[POCKET_ACTION_RIGHT] = SDLK_RIGHT;
 }
 
 void CEActionsPocket::initInstanceMain(OSystem *mainSystem) {
@@ -270,7 +266,7 @@
 			return true; 
 		case POCKET_ACTION_QUIT:
 			{
-				GUI::MessageDialog alert("Do you want to quit ?", "Yes", "No");
+				GUI::MessageDialog alert("   Are you sure you want to quit ?   ", "Yes", "No");
 				if (alert.runModal() == GUI::kMessageOK)
 					_mainSystem->quit();
 				return true;
@@ -309,4 +305,3 @@
 	else
 		return (_action_mapping[POCKET_ACTION_ZOOM_UP] == 0 || _action_mapping[POCKET_ACTION_ZOOM_DOWN] == 0);
 }
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.