Merged the fs branch with trunk. r26949:27031

svn-id: r27032

55 files changed, 300 insertions, 149 deletions

diff --git a/gui/Actions.cpp b/gui/Actions.cpp
index 53ebdfd720..6157603ab0 100644
--- a/gui/Actions.cpp
+++ b/gui/Actions.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/Actions.h b/gui/Actions.h
index 5f90a2f864..240f8d2295 100644
--- a/gui/Actions.h
+++ b/gui/Actions.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/EditTextWidget.cpp b/gui/EditTextWidget.cpp
index 98e29c49b8..71ca23afb2 100644
--- a/gui/EditTextWidget.cpp
+++ b/gui/EditTextWidget.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/EditTextWidget.h b/gui/EditTextWidget.h
index 1d61e7becb..7fabb52d8d 100644
--- a/gui/EditTextWidget.h
+++ b/gui/EditTextWidget.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/Key.cpp b/gui/Key.cpp
index d9c37f116c..3d6fe9f05b 100644
--- a/gui/Key.cpp
+++ b/gui/Key.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/Key.h b/gui/Key.h
index 4a1891f550..5b7db903ba 100644
--- a/gui/Key.h
+++ b/gui/Key.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/KeysDialog.cpp b/gui/KeysDialog.cpp
index db70f0dbfb..6093af684d 100644
--- a/gui/KeysDialog.cpp
+++ b/gui/KeysDialog.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001-2007 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -32,16 +35,13 @@
 namespace GUI {
 
 enum {
-	kMapCmd					= 'map ',
-	kOKCmd					= 'ok  '
+	kMapCmd	= 'map ',
+	kOKCmd	= 'ok  '
 };
 
 KeysDialog::KeysDialog(const Common::String &title)
 	: GUI::Dialog("keysdialog") {
 
-//tmp
-//	addButton(this, _w - (buttonWidth + 10), _h - buttonHeight - 8, "Choose", kChooseCmd, 0, ws);
-//tmp
 	new ButtonWidget(this, "keysdialog_map", "Map", kMapCmd, 0);
 	new ButtonWidget(this, "keysdialog_ok", "OK", kOKCmd, 0);
 	new ButtonWidget(this, "keysdialog_cancel", "Cancel", kCloseCmd, 0);
@@ -73,23 +73,18 @@ void KeysDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
 	case kListSelectionChangedCmd:
 		if (_actionsList->getSelected() >= 0) {
 			char selection[100];
-#ifdef __SYMBIAN32__
-			uint16 key = Actions::Instance()->getMapping(_actionsList->getSelected());
-
-			if (key != 0) {
-				// ScummVM mappings for F1-F9 are different from SDL so remap back to sdl
-				if (key >= 315 && key <= 323) {
-					key = key - 315 + SDLK_F1;
-				}
-			}
 
+			uint16 key = Actions::Instance()->getMapping(_actionsList->getSelected());
+#ifdef __SYMBIAN32__
+			// ScummVM mappings for F1-F9 are different from SDL so remap back to sdl
+			if (key >= 315 && key <= 323)
+				key = key - 315 + SDLK_F1;
+#endif
 			if (key != 0)
 				sprintf(selection, "Associated key : %s", SDL_GetKeyName((SDLKey)key));
 			else
 				sprintf(selection, "Associated key : none");
-#else
-			sprintf(selection, "Associated key : %s", CEDevice::getKeyName(Actions::Instance()->getMapping((ActionType)(_actionsList->getSelected()))).c_str());
-#endif
+
 			_keyMapping->setLabel(selection);
 			_keyMapping->draw();
 		}
@@ -102,21 +97,17 @@ void KeysDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
 			char selection[100];
 
 			_actionSelected = _actionsList->getSelected();
-#ifdef __SYMBIAN32__
 			uint16 key = Actions::Instance()->getMapping(_actionSelected);
-			if (key != 0) {
-				// ScummVM mappings for F1-F9 are different from SDL so remap back to sdl
-				if (key >= 315 && key <= 323) {
-					key = key - 315 + SDLK_F1;
-				}
-
+#ifdef __SYMBIAN32__
+			// ScummVM mappings for F1-F9 are different from SDL so remap back to sdl
+			if (key >= 315 && key <= 323)
+				key = key - 315 + SDLK_F1;
+#endif
+			if (key != 0) 
 				sprintf(selection, "Associated key : %s", SDL_GetKeyName((SDLKey)key));
-			}
 			else
 				sprintf(selection, "Associated key : none");
-#else
-			sprintf(selection, "Associated key : %s", CEDevice::getKeyName(Actions::Instance()->getMapping((ActionType)_actionSelected)).c_str());
-#endif
+
 			_actionTitle->setLabel("Press the key to associate");
 			_keyMapping->setLabel(selection);
 			_keyMapping->draw();
@@ -137,29 +128,25 @@ void KeysDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
 }
 
 void KeysDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers){
-	if (!Actions::Instance()->mappingActive()) {
+	if (!Actions::Instance()->mappingActive())
 		Dialog::handleKeyDown(ascii,keycode,modifiers);
-	}
 }
 
 void KeysDialog::handleKeyUp(uint16 ascii, int keycode, int modifiers) {
 #ifdef __SYMBIAN32__
 	if (Actions::Instance()->mappingActive()) {
 #else
-		// GAPI key was selected
-		if (modifiers == 0xff  && Actions::Instance()->mappingActive()) {
+	if (modifiers == 0xff  && Actions::Instance()->mappingActive()) {	// GAPI key was selected
 #endif
 		char selection[100];
 
 		Actions::Instance()->setMapping((ActionType)_actionSelected, ascii);
-#ifdef __SYMBIAN32__
+
 		if (ascii != 0)
 			sprintf(selection, "Associated key : %s", SDL_GetKeyName((SDLKey) keycode));
 		else
 			sprintf(selection, "Associated key : none");
-#else
-		sprintf(selection, "Associated key : %s", CEDevice::getKeyName(Actions::Instance()->getMapping((ActionType)_actionSelected)).c_str());
-#endif
+
 		_actionTitle->setLabel("Choose an action to map");
 		_keyMapping->setLabel(selection);
 		_keyMapping->draw();
@@ -167,10 +154,8 @@ void KeysDialog::handleKeyUp(uint16 ascii, int keycode, int modifiers) {
 		_actionSelected = -1;
 		_actionsList->setEnabled(true);
 		Actions::Instance()->beginMapping(false);
-	}
-	else {
+	} else 
 		Dialog::handleKeyUp(ascii,keycode,modifiers);
-	}
 }
 
 } // namespace GUI
diff --git a/gui/KeysDialog.h b/gui/KeysDialog.h
index 75f49100fa..f4fa4d9419 100644
--- a/gui/KeysDialog.h
+++ b/gui/KeysDialog.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/ListWidget.cpp b/gui/ListWidget.cpp
index ed8cd9c38b..9d7494115b 100644
--- a/gui/ListWidget.cpp
+++ b/gui/ListWidget.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/ListWidget.h b/gui/ListWidget.h
index a51452e8e5..a8656061d3 100644
--- a/gui/ListWidget.h
+++ b/gui/ListWidget.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/PopUpWidget.cpp b/gui/PopUpWidget.cpp
index b9a13e203b..1bdce8a24e 100644
--- a/gui/PopUpWidget.cpp
+++ b/gui/PopUpWidget.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/PopUpWidget.h b/gui/PopUpWidget.h
index b2bdf463af..89801fc8d3 100644
--- a/gui/PopUpWidget.h
+++ b/gui/PopUpWidget.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/ScrollBarWidget.cpp b/gui/ScrollBarWidget.cpp
index 1875854ca0..615a05d7ac 100644
--- a/gui/ScrollBarWidget.cpp
+++ b/gui/ScrollBarWidget.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/ScrollBarWidget.h b/gui/ScrollBarWidget.h
index c7c7d44109..e926f1d424 100644
--- a/gui/ScrollBarWidget.h
+++ b/gui/ScrollBarWidget.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/TabWidget.cpp b/gui/TabWidget.cpp
index a6b4eee8fb..8159147c83 100644
--- a/gui/TabWidget.cpp
+++ b/gui/TabWidget.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/TabWidget.h b/gui/TabWidget.h
index 7ccf6f3d2f..bb836e0999 100644
--- a/gui/TabWidget.h
+++ b/gui/TabWidget.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/ThemeClassic.cpp b/gui/ThemeClassic.cpp
index eb0da48ce2..c46965c191 100644
--- a/gui/ThemeClassic.cpp
+++ b/gui/ThemeClassic.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/ThemeClassic.h b/gui/ThemeClassic.h
index df7ad7b2d6..97cc3ff098 100644
--- a/gui/ThemeClassic.h
+++ b/gui/ThemeClassic.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/ThemeModern.cpp b/gui/ThemeModern.cpp
index 80edc9702d..a5b6e682cb 100644
--- a/gui/ThemeModern.cpp
+++ b/gui/ThemeModern.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/ThemeModern.h b/gui/ThemeModern.h
index b83bec9425..ed5e29fdfc 100644
--- a/gui/ThemeModern.h
+++ b/gui/ThemeModern.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/about.cpp b/gui/about.cpp
index 1014eefd39..2098d91aae 100644
--- a/gui/about.cpp
+++ b/gui/about.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/about.h b/gui/about.h
index 23c130905f..a1ee96b090 100644
--- a/gui/about.h
+++ b/gui/about.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/browser.cpp b/gui/browser.cpp
index 2d27e1f1ee..b9cae7d923 100644
--- a/gui/browser.cpp
+++ b/gui/browser.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/browser.h b/gui/browser.h
index 66400bfc07..d330e32269 100644
--- a/gui/browser.h
+++ b/gui/browser.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/chooser.cpp b/gui/chooser.cpp
index aa3dc8f5ca..a189e3b07b 100644
--- a/gui/chooser.cpp
+++ b/gui/chooser.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/chooser.h b/gui/chooser.h
index cb2e5b63c6..ef36d1e59a 100644
--- a/gui/chooser.h
+++ b/gui/chooser.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/console.cpp b/gui/console.cpp
index 494721e242..9186c7b405 100644
--- a/gui/console.cpp
+++ b/gui/console.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/console.h b/gui/console.h
index 587be82f04..ea28e5b449 100644
--- a/gui/console.h
+++ b/gui/console.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/debugger.cpp b/gui/debugger.cpp
index 38a2ef7d15..11d5d28e59 100644
--- a/gui/debugger.cpp
+++ b/gui/debugger.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/debugger.h b/gui/debugger.h
index 34665cf645..da0253c148 100644
--- a/gui/debugger.h
+++ b/gui/debugger.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/dialog.cpp b/gui/dialog.cpp
index c0c8d50430..3bcf770ff3 100644
--- a/gui/dialog.cpp
+++ b/gui/dialog.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/dialog.h b/gui/dialog.h
index 098cf88278..1c97b4b185 100644
--- a/gui/dialog.h
+++ b/gui/dialog.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/editable.cpp b/gui/editable.cpp
index b1d08c7fad..6199ea67fa 100644
--- a/gui/editable.cpp
+++ b/gui/editable.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2005-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/editable.h b/gui/editable.h
index 520c4cf689..a56b079662 100644
--- a/gui/editable.h
+++ b/gui/editable.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2005-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/eval.cpp b/gui/eval.cpp
index 773770b5be..89577cc51d 100644
--- a/gui/eval.cpp
+++ b/gui/eval.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/eval.h b/gui/eval.h
index 7db048809b..d63caae291 100644
--- a/gui/eval.h
+++ b/gui/eval.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 8ba3f0f538..eba5498318 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/launcher.h b/gui/launcher.h
index 0ea7c5995c..5ccf9cb422 100644
--- a/gui/launcher.h
+++ b/gui/launcher.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/massadd.cpp b/gui/massadd.cpp
index e3f0e63e6e..de54cada26 100644
--- a/gui/massadd.cpp
+++ b/gui/massadd.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/massadd.h b/gui/massadd.h
index 7fd2d2f10d..5723f5a6f8 100644
--- a/gui/massadd.h
+++ b/gui/massadd.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/message.cpp b/gui/message.cpp
index 2453c9506b..114d4f38c5 100644
--- a/gui/message.cpp
+++ b/gui/message.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/message.h b/gui/message.h
index 53afa67387..912e3b0785 100644
--- a/gui/message.h
+++ b/gui/message.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/newgui.cpp b/gui/newgui.cpp
index bd7315add5..eefb3e2f64 100644
--- a/gui/newgui.cpp
+++ b/gui/newgui.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -32,6 +35,8 @@
 
 #include "common/config-manager.h"
 
+DECLARE_SINGLETON(GUI::NewGui);
+
 namespace GUI {
 
 /*
@@ -307,6 +312,8 @@ void NewGui::runLoop() {
 			case Common::EVENT_SCREEN_CHANGED:
 				screenChange();
 				break;
+			default:
+				break;
 			}
 		}
 
diff --git a/gui/newgui.h b/gui/newgui.h
index 70658abcb4..6a2920048f 100644
--- a/gui/newgui.h
+++ b/gui/newgui.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/object.cpp b/gui/object.cpp
index ec3167c9a3..28caf6c380 100644
--- a/gui/object.cpp
+++ b/gui/object.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2007 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/object.h b/gui/object.h
index bc87ad65ec..7a8d626db5 100644
--- a/gui/object.h
+++ b/gui/object.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2007 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/options.cpp b/gui/options.cpp
index c010587300..76a40f5f50 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/options.h b/gui/options.h
index 67b4a40ebd..8743528f12 100644
--- a/gui/options.h
+++ b/gui/options.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/theme-config.cpp b/gui/theme-config.cpp
index 72e71a0414..55a9ca9600 100644
--- a/gui/theme-config.cpp
+++ b/gui/theme-config.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2006-2007 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/theme.cpp b/gui/theme.cpp
index 446f746cf3..6aef7d1e37 100644
--- a/gui/theme.cpp
+++ b/gui/theme.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/theme.h b/gui/theme.h
index b8055819d5..e64b65645c 100644
--- a/gui/theme.h
+++ b/gui/theme.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/themebrowser.cpp b/gui/themebrowser.cpp
index 515c6d83f7..8f72127a75 100644
--- a/gui/themebrowser.cpp
+++ b/gui/themebrowser.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/themebrowser.h b/gui/themebrowser.h
index ce38bead9d..9351648d24 100644
--- a/gui/themebrowser.h
+++ b/gui/themebrowser.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/widget.cpp b/gui/widget.cpp
index dcf9156165..bb4b0b87ed 100644
--- a/gui/widget.cpp
+++ b/gui/widget.cpp
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/widget.h b/gui/widget.h
index 4ff8ad5409..bf15081f79 100644
--- a/gui/widget.h
+++ b/gui/widget.h
@@ -1,5 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License