[Scummvm-cvs-logs] scummvm master -> da4b03139d83dd08f39b7eda7579395436feda7d

[tsoliman]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
da4b03139d KEYMAPPER: Added Toggle FullScreen action


Commit: da4b03139d83dd08f39b7eda7579395436feda7d
    https://github.com/scummvm/scummvm/commit/da4b03139d83dd08f39b7eda7579395436feda7d
Author: Tarek Soliman (tsoliman at scummvm.org)
Date: 2012-02-04T17:53:57-08:00

Commit Message:
KEYMAPPER: Added Toggle FullScreen action

Changed paths:
    base/main.cpp
    gui/gui-manager.cpp



diff --git a/base/main.cpp b/base/main.cpp
index c6f29bc..9bf67a3 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -292,6 +292,9 @@ static void setupKeymapper(OSystem &system) {
 	act = new Action(globalMap, "REMP", _("Remap keys"), kKeyRemapActionType);
 	act->addKeyEvent(KeyState(KEYCODE_F8, ASCII_F8, 0));
 
+	act = new Action(globalMap, "FULS", _("Toggle FullScreen"), kKeyRemapActionType);
+	act->addKeyEvent(KeyState(KEYCODE_RETURN, ASCII_RETURN, KBD_ALT));
+
 	mapper->addGlobalKeymap(globalMap);
 
 	mapper->pushKeymap(kGlobalKeymapName, true);
diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
index 5b8c03c..9fa4179 100644
--- a/gui/gui-manager.cpp
+++ b/gui/gui-manager.cpp
@@ -124,6 +124,9 @@ void GuiManager::initKeymap() {
 	act = new Action(guiMap, "REMP", _("Remap keys"), kKeyRemapActionType);
 	act->addKeyEvent(KeyState(KEYCODE_F8, ASCII_F8, 0));
 
+	act = new Action(guiMap, "FULS", _("Toggle FullScreen"), kKeyRemapActionType);
+	act->addKeyEvent(KeyState(KEYCODE_RETURN, ASCII_RETURN, KBD_ALT));
+
 	mapper->addGlobalKeymap(guiMap);
 }