[Scummvm-cvs-logs] SF.net SVN: scummvm:[38981] scummvm/trunk

[anotherguest at users.sourceforge.net]

Revision: 38981
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38981&view=rev
Author:   anotherguest
Date:     2009-02-28 21:05:21 +0000 (Sat, 28 Feb 2009)

Log Message:
-----------
Added keyboard mapping for global menu. 

Modified Paths:
--------------
    scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp
    scummvm/trunk/backends/platform/symbian/src/SymbianActions.h
    scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
    scummvm/trunk/engines/dialogs.cpp

Modified: scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp	2009-02-28 20:49:32 UTC (rev 38980)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp	2009-02-28 21:05:21 UTC (rev 38981)
@@ -52,17 +52,18 @@
 	"Pause",
 	"Fast mode",
 	"Quit",
-	"Debugger"
+	"Debugger",
+	"Global menu"
 };
 
 #ifdef UIQ
-static const int ACTIONS_DEFAULT[ACTION_LAST] = { SDLK_UP, SDLK_DOWN, SDLK_LEFT, SDLK_RIGHT, SDLK_F1, SDLK_F2, SDLK_F5, SDLK_PAGEDOWN, '9', 0, 0, SDLK_PAGEUP, 0, 0, 0, 0};
+static const int ACTIONS_DEFAULT[ACTION_LAST] = { SDLK_UP, SDLK_DOWN, SDLK_LEFT, SDLK_RIGHT, SDLK_F1, SDLK_F2, SDLK_F5, SDLK_PAGEDOWN, '9', 0, 0, SDLK_PAGEUP, 0, 0, 0, 0, 0};
 #elif defined (S60)
-const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, 0, 0, '*', '#', '9', 0, 0, 0, 0, 0, 0, 0};
+const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, 0, 0, '*', '#', '9', 0, 0, 0, 0, 0, 0, 0, '1'};
 #elif defined (S90)
-const int ACTIONS_DEFAULT[ACTION_LAST] = { SDLK_UP, SDLK_DOWN, SDLK_LEFT, SDLK_RIGHT, 0, 0, SDLK_MENU, SDLK_ESCAPE, 0, 0 , 0, 0, 0, 0, 0, 0};
+const int ACTIONS_DEFAULT[ACTION_LAST] = { SDLK_UP, SDLK_DOWN, SDLK_LEFT, SDLK_RIGHT, 0, 0, SDLK_MENU, SDLK_ESCAPE, 0, 0 , 0, 0, 0, 0, 0, 0, 0};
 #else
-const int ACTIONS_DEFAULT[ACTION_LAST] = { SDLK_UP, SDLK_DOWN, SDLK_LEFT, SDLK_RIGHT, SDLK_F1, SDLK_F2, SDLK_MENU, SDLK_ESCAPE, 0, 0, 0, 0, 0, 0, 0, 0};
+const int ACTIONS_DEFAULT[ACTION_LAST] = { SDLK_UP, SDLK_DOWN, SDLK_LEFT, SDLK_RIGHT, SDLK_F1, SDLK_F2, SDLK_MENU, SDLK_ESCAPE, 0, 0, 0, 0, 0, 0, 0, 0, '1'};
 #endif
 
 // creator function according to Factory Pattern
@@ -213,8 +214,9 @@
 	_action_enabled[ACTION_DEBUGGER] = true;
 	_key_action[ACTION_DEBUGGER].setKey('d', Common::KEYCODE_d, KMOD_CTRL);
 
-
-
+	// Enable global menu
+	_action_enabled[ACTION_MAINMENU] = true;
+	_key_action[ACTION_MAINMENU].setKey(Common::ASCII_F5, Common::KEYCODE_F5, KMOD_CTRL);
 }
 
 

Modified: scummvm/trunk/backends/platform/symbian/src/SymbianActions.h
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianActions.h	2009-02-28 20:49:32 UTC (rev 38980)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianActions.h	2009-02-28 21:05:21 UTC (rev 38981)
@@ -52,6 +52,7 @@
 		ACTION_FASTMODE,
 		ACTION_QUIT,
 		ACTION_DEBUGGER,
+		ACTION_MAINMENU,
 		ACTION_LAST
 };
 

Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp	2009-02-28 20:49:32 UTC (rev 38980)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp	2009-02-28 21:05:21 UTC (rev 38981)
@@ -426,7 +426,8 @@
 			case GUI::ACTION_PAUSE:
 			case GUI::ACTION_SWAPCHAR:
 			case GUI::ACTION_FASTMODE:
-			case GUI::ACTION_DEBUGGER: {
+			case GUI::ACTION_DEBUGGER:
+			case GUI::ACTION_MAINMENU:{
 					GUI::Key &key = GUI::Actions::Instance()->getKeyAction(loop);
 					ev.key.keysym.sym = (SDLKey) key.keycode();
 					ev.key.keysym.scancode = 0;

Modified: scummvm/trunk/engines/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/dialogs.cpp	2009-02-28 20:49:32 UTC (rev 38980)
+++ scummvm/trunk/engines/dialogs.cpp	2009-02-28 21:05:21 UTC (rev 38981)
@@ -296,6 +296,7 @@
 
 #ifdef SMALL_SCREEN_DEVICE
 	new GUI::ButtonWidget(this, "ScummConfig.Keys", "Keys", kKeysCmd, 'K');
+	_keysDialog = NULL;
 #endif
 }
 


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