[Orxonox-commit 3065] r7760 - in code/branches/presentation: data/gui/schemes data/gui/scripts src/libraries/core
dafrick at orxonox.net
dafrick at orxonox.net
Wed Dec 15 10:59:11 CET 2010
Author: dafrick
Date: 2010-12-15 10:59:10 +0100 (Wed, 15 Dec 2010)
New Revision: 7760
Added:
code/branches/presentation/data/gui/schemes/OrxonoxHUDWidgets.scheme
code/branches/presentation/data/gui/schemes/OrxonoxMenuWidgets.scheme
Removed:
code/branches/presentation/data/gui/schemes/OrxonoxLookHUDWidgets.scheme
code/branches/presentation/data/gui/schemes/OrxonoxLookMenuWidgets.scheme
Modified:
code/branches/presentation/data/gui/scripts/InitialiseGUI.lua
code/branches/presentation/src/libraries/core/GUIManager.cc
code/branches/presentation/src/libraries/core/GUIManager.h
Log:
Making the GUI scheme configurable through a config value.
Copied: code/branches/presentation/data/gui/schemes/OrxonoxHUDWidgets.scheme (from rev 7759, code/branches/presentation/data/gui/schemes/OrxonoxLookHUDWidgets.scheme)
===================================================================
--- code/branches/presentation/data/gui/schemes/OrxonoxHUDWidgets.scheme (rev 0)
+++ code/branches/presentation/data/gui/schemes/OrxonoxHUDWidgets.scheme 2010-12-15 09:59:10 UTC (rev 7760)
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+<GUIScheme Name="OrxonoxHUDWidgets">
+ <WindowAlias Alias="HUDWidgets/StaticImage" Target="OrxonoxLook/StaticImage" />
+ <WindowAlias Alias="HUDWidgets/StaticText" Target="OrxonoxLook/StaticText" />
+ <WindowAlias Alias="HUDWidgets/TabButtonPane" Target="OrxonoxLook/TabButtonPane" />
+ <WindowAlias Alias="HUDWidgets/TabContentPane" Target="OrxonoxLook/TabContentPane" />
+ <WindowAlias Alias="HUDWidgets/Checkbox" Target="OrxonoxLook/Checkbox" />
+ <WindowAlias Alias="HUDWidgets/Combobox" Target="OrxonoxLook/Combobox" />
+ <WindowAlias Alias="HUDWidgets/ComboDropList" Target="OrxonoxLook/ComboDropList" />
+ <WindowAlias Alias="HUDWidgets/ComboEditbox" Target="OrxonoxLook/ComboEditbox" />
+ <WindowAlias Alias="HUDWidgets/Editbox" Target="OrxonoxLook/Editbox" />
+ <WindowAlias Alias="HUDWidgets/FrameWindow" Target="OrxonoxLook/FrameWindow" />
+ <WindowAlias Alias="HUDWidgets/GroupBox" Target="OrxonoxLook/GroupBox" />
+ <WindowAlias Alias="HUDWidgets/ItemListbox" Target="OrxonoxLook/ItemListbox" />
+ <WindowAlias Alias="HUDWidgets/ListboxItem" Target="OrxonoxLook/ListboxItem" />
+ <WindowAlias Alias="HUDWidgets/Listbox" Target="OrxonoxLook/Listbox" />
+ <WindowAlias Alias="HUDWidgets/ListHeader" Target="OrxonoxLook/ListHeader" />
+ <WindowAlias Alias="HUDWidgets/ListHeaderSegment" Target="OrxonoxLook/ListHeaderSegment" />
+ <WindowAlias Alias="HUDWidgets/MultiLineEditbox" Target="OrxonoxLook/MultiLineEditbox" />
+ <WindowAlias Alias="HUDWidgets/Menubar" Target="OrxonoxLook/Menubar" />
+ <WindowAlias Alias="HUDWidgets/MenuItem" Target="OrxonoxLook/MenuItem" />
+ <WindowAlias Alias="HUDWidgets/MultiColumnList" Target="OrxonoxLook/MultiColumnList" />
+ <WindowAlias Alias="HUDWidgets/PopupMenu" Target="OrxonoxLook/PopupMenu" />
+ <WindowAlias Alias="HUDWidgets/ProgressBar" Target="OrxonoxLook/ProgressBar" />
+ <WindowAlias Alias="HUDWidgets/Button" Target="OrxonoxLook/Button" />
+ <WindowAlias Alias="HUDWidgets/ImageButton" Target="OrxonoxLook/ImageButton" />
+ <WindowAlias Alias="HUDWidgets/RadioButton" Target="OrxonoxLook/RadioButton" />
+ <WindowAlias Alias="HUDWidgets/SystemButton" Target="OrxonoxLook/SystemButton" />
+ <WindowAlias Alias="HUDWidgets/ScrollablePane" Target="OrxonoxLook/ScrollablePane" />
+ <WindowAlias Alias="HUDWidgets/HorizontalScrollbar" Target="OrxonoxLook/HorizontalScrollbar" />
+ <WindowAlias Alias="HUDWidgets/VerticalScrollbar" Target="OrxonoxLook/VerticalScrollbar" />
+ <WindowAlias Alias="HUDWidgets/Slider" Target="OrxonoxLook/Slider" />
+ <WindowAlias Alias="HUDWidgets/Spinner" Target="OrxonoxLook/Spinner" />
+ <WindowAlias Alias="HUDWidgets/TabButton" Target="OrxonoxLook/TabButton" />
+ <WindowAlias Alias="HUDWidgets/TabControl" Target="OrxonoxLook/TabControl" />
+ <WindowAlias Alias="HUDWidgets/HorizontalScrollbarThumb" Target="OrxonoxLook/HorizontalScrollbarThumb" />
+ <WindowAlias Alias="HUDWidgets/SliderThumb" Target="OrxonoxLook/SliderThumb" />
+ <WindowAlias Alias="HUDWidgets/VerticalScrollbarThumb" Target="OrxonoxLook/VerticalScrollbarThumb" />
+ <WindowAlias Alias="HUDWidgets/Titlebar" Target="OrxonoxLook/Titlebar" />
+ <WindowAlias Alias="HUDWidgets/Tooltip" Target="OrxonoxLook/Tooltip" />
+ <WindowAlias Alias="HUDWidgets/Tree" Target="OrxonoxLook/Tree" />
+</GUIScheme>
Deleted: code/branches/presentation/data/gui/schemes/OrxonoxLookHUDWidgets.scheme
===================================================================
--- code/branches/presentation/data/gui/schemes/OrxonoxLookHUDWidgets.scheme 2010-12-14 19:54:00 UTC (rev 7759)
+++ code/branches/presentation/data/gui/schemes/OrxonoxLookHUDWidgets.scheme 2010-12-15 09:59:10 UTC (rev 7760)
@@ -1,42 +0,0 @@
-<?xml version="1.0" ?>
-<GUIScheme Name="OrxonoxLookHUDWidgets">
- <WindowAlias Alias="HUDWidgets/StaticImage" Target="OrxonoxLook/StaticImage" />
- <WindowAlias Alias="HUDWidgets/StaticText" Target="OrxonoxLook/StaticText" />
- <WindowAlias Alias="HUDWidgets/TabButtonPane" Target="OrxonoxLook/TabButtonPane" />
- <WindowAlias Alias="HUDWidgets/TabContentPane" Target="OrxonoxLook/TabContentPane" />
- <WindowAlias Alias="HUDWidgets/Checkbox" Target="OrxonoxLook/Checkbox" />
- <WindowAlias Alias="HUDWidgets/Combobox" Target="OrxonoxLook/Combobox" />
- <WindowAlias Alias="HUDWidgets/ComboDropList" Target="OrxonoxLook/ComboDropList" />
- <WindowAlias Alias="HUDWidgets/ComboEditbox" Target="OrxonoxLook/ComboEditbox" />
- <WindowAlias Alias="HUDWidgets/Editbox" Target="OrxonoxLook/Editbox" />
- <WindowAlias Alias="HUDWidgets/FrameWindow" Target="OrxonoxLook/FrameWindow" />
- <WindowAlias Alias="HUDWidgets/GroupBox" Target="OrxonoxLook/GroupBox" />
- <WindowAlias Alias="HUDWidgets/ItemListbox" Target="OrxonoxLook/ItemListbox" />
- <WindowAlias Alias="HUDWidgets/ListboxItem" Target="OrxonoxLook/ListboxItem" />
- <WindowAlias Alias="HUDWidgets/Listbox" Target="OrxonoxLook/Listbox" />
- <WindowAlias Alias="HUDWidgets/ListHeader" Target="OrxonoxLook/ListHeader" />
- <WindowAlias Alias="HUDWidgets/ListHeaderSegment" Target="OrxonoxLook/ListHeaderSegment" />
- <WindowAlias Alias="HUDWidgets/MultiLineEditbox" Target="OrxonoxLook/MultiLineEditbox" />
- <WindowAlias Alias="HUDWidgets/Menubar" Target="OrxonoxLook/Menubar" />
- <WindowAlias Alias="HUDWidgets/MenuItem" Target="OrxonoxLook/MenuItem" />
- <WindowAlias Alias="HUDWidgets/MultiColumnList" Target="OrxonoxLook/MultiColumnList" />
- <WindowAlias Alias="HUDWidgets/PopupMenu" Target="OrxonoxLook/PopupMenu" />
- <WindowAlias Alias="HUDWidgets/ProgressBar" Target="OrxonoxLook/ProgressBar" />
- <WindowAlias Alias="HUDWidgets/Button" Target="OrxonoxLook/Button" />
- <WindowAlias Alias="HUDWidgets/ImageButton" Target="OrxonoxLook/ImageButton" />
- <WindowAlias Alias="HUDWidgets/RadioButton" Target="OrxonoxLook/RadioButton" />
- <WindowAlias Alias="HUDWidgets/SystemButton" Target="OrxonoxLook/SystemButton" />
- <WindowAlias Alias="HUDWidgets/ScrollablePane" Target="OrxonoxLook/ScrollablePane" />
- <WindowAlias Alias="HUDWidgets/HorizontalScrollbar" Target="OrxonoxLook/HorizontalScrollbar" />
- <WindowAlias Alias="HUDWidgets/VerticalScrollbar" Target="OrxonoxLook/VerticalScrollbar" />
- <WindowAlias Alias="HUDWidgets/Slider" Target="OrxonoxLook/Slider" />
- <WindowAlias Alias="HUDWidgets/Spinner" Target="OrxonoxLook/Spinner" />
- <WindowAlias Alias="HUDWidgets/TabButton" Target="OrxonoxLook/TabButton" />
- <WindowAlias Alias="HUDWidgets/TabControl" Target="OrxonoxLook/TabControl" />
- <WindowAlias Alias="HUDWidgets/HorizontalScrollbarThumb" Target="OrxonoxLook/HorizontalScrollbarThumb" />
- <WindowAlias Alias="HUDWidgets/SliderThumb" Target="OrxonoxLook/SliderThumb" />
- <WindowAlias Alias="HUDWidgets/VerticalScrollbarThumb" Target="OrxonoxLook/VerticalScrollbarThumb" />
- <WindowAlias Alias="HUDWidgets/Titlebar" Target="OrxonoxLook/Titlebar" />
- <WindowAlias Alias="HUDWidgets/Tooltip" Target="OrxonoxLook/Tooltip" />
- <WindowAlias Alias="HUDWidgets/Tree" Target="OrxonoxLook/Tree" />
-</GUIScheme>
Deleted: code/branches/presentation/data/gui/schemes/OrxonoxLookMenuWidgets.scheme
===================================================================
--- code/branches/presentation/data/gui/schemes/OrxonoxLookMenuWidgets.scheme 2010-12-14 19:54:00 UTC (rev 7759)
+++ code/branches/presentation/data/gui/schemes/OrxonoxLookMenuWidgets.scheme 2010-12-15 09:59:10 UTC (rev 7760)
@@ -1,42 +0,0 @@
-<?xml version="1.0" ?>
-<GUIScheme Name="OrxonoxLookMenuWidgets">
- <WindowAlias Alias="MenuWidgets/StaticImage" Target="OrxonoxLook/StaticImage" />
- <WindowAlias Alias="MenuWidgets/StaticText" Target="OrxonoxLook/StaticText" />
- <WindowAlias Alias="MenuWidgets/TabButtonPane" Target="OrxonoxLook/TabButtonPane" />
- <WindowAlias Alias="MenuWidgets/TabContentPane" Target="OrxonoxLook/TabContentPane" />
- <WindowAlias Alias="MenuWidgets/Checkbox" Target="OrxonoxLook/Checkbox" />
- <WindowAlias Alias="MenuWidgets/Combobox" Target="OrxonoxLook/Combobox" />
- <WindowAlias Alias="MenuWidgets/ComboDropList" Target="OrxonoxLook/ComboDropList" />
- <WindowAlias Alias="MenuWidgets/ComboEditbox" Target="OrxonoxLook/ComboEditbox" />
- <WindowAlias Alias="MenuWidgets/Editbox" Target="OrxonoxLook/Editbox" />
- <WindowAlias Alias="MenuWidgets/FrameWindow" Target="OrxonoxLook/FrameWindow" />
- <WindowAlias Alias="MenuWidgets/GroupBox" Target="OrxonoxLook/GroupBox" />
- <WindowAlias Alias="MenuWidgets/ItemListbox" Target="OrxonoxLook/ItemListbox" />
- <WindowAlias Alias="MenuWidgets/ListboxItem" Target="OrxonoxLook/ListboxItem" />
- <WindowAlias Alias="MenuWidgets/Listbox" Target="OrxonoxLook/Listbox" />
- <WindowAlias Alias="MenuWidgets/ListHeader" Target="OrxonoxLook/ListHeader" />
- <WindowAlias Alias="MenuWidgets/ListHeaderSegment" Target="OrxonoxLook/ListHeaderSegment" />
- <WindowAlias Alias="MenuWidgets/MultiLineEditbox" Target="OrxonoxLook/MultiLineEditbox" />
- <WindowAlias Alias="MenuWidgets/Menubar" Target="OrxonoxLook/Menubar" />
- <WindowAlias Alias="MenuWidgets/MenuItem" Target="OrxonoxLook/MenuItem" />
- <WindowAlias Alias="MenuWidgets/MultiColumnList" Target="OrxonoxLook/MultiColumnList" />
- <WindowAlias Alias="MenuWidgets/PopupMenu" Target="OrxonoxLook/PopupMenu" />
- <WindowAlias Alias="MenuWidgets/ProgressBar" Target="OrxonoxLook/ProgressBar" />
- <WindowAlias Alias="MenuWidgets/Button" Target="OrxonoxLook/Button" />
- <WindowAlias Alias="MenuWidgets/ImageButton" Target="OrxonoxLook/ImageButton" />
- <WindowAlias Alias="MenuWidgets/RadioButton" Target="OrxonoxLook/RadioButton" />
- <WindowAlias Alias="MenuWidgets/SystemButton" Target="OrxonoxLook/SystemButton" />
- <WindowAlias Alias="MenuWidgets/ScrollablePane" Target="OrxonoxLook/ScrollablePane" />
- <WindowAlias Alias="MenuWidgets/HorizontalScrollbar" Target="OrxonoxLook/HorizontalScrollbar" />
- <WindowAlias Alias="MenuWidgets/VerticalScrollbar" Target="OrxonoxLook/VerticalScrollbar" />
- <WindowAlias Alias="MenuWidgets/Slider" Target="OrxonoxLook/Slider" />
- <WindowAlias Alias="MenuWidgets/Spinner" Target="OrxonoxLook/Spinner" />
- <WindowAlias Alias="MenuWidgets/TabButton" Target="OrxonoxLook/TabButton" />
- <WindowAlias Alias="MenuWidgets/TabControl" Target="OrxonoxLook/TabControl" />
- <WindowAlias Alias="MenuWidgets/HorizontalScrollbarThumb" Target="OrxonoxLook/HorizontalScrollbarThumb" />
- <WindowAlias Alias="MenuWidgets/SliderThumb" Target="OrxonoxLook/SliderThumb" />
- <WindowAlias Alias="MenuWidgets/VerticalScrollbarThumb" Target="OrxonoxLook/VerticalScrollbarThumb" />
- <WindowAlias Alias="MenuWidgets/Titlebar" Target="OrxonoxLook/Titlebar" />
- <WindowAlias Alias="MenuWidgets/Tooltip" Target="OrxonoxLook/Tooltip" />
- <WindowAlias Alias="MenuWidgets/Tree" Target="OrxonoxLook/Tree" />
-</GUIScheme>
Copied: code/branches/presentation/data/gui/schemes/OrxonoxMenuWidgets.scheme (from rev 7759, code/branches/presentation/data/gui/schemes/OrxonoxLookMenuWidgets.scheme)
===================================================================
--- code/branches/presentation/data/gui/schemes/OrxonoxMenuWidgets.scheme (rev 0)
+++ code/branches/presentation/data/gui/schemes/OrxonoxMenuWidgets.scheme 2010-12-15 09:59:10 UTC (rev 7760)
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+<GUIScheme Name="OrxonoxMenuWidgets">
+ <WindowAlias Alias="MenuWidgets/StaticImage" Target="OrxonoxLook/StaticImage" />
+ <WindowAlias Alias="MenuWidgets/StaticText" Target="OrxonoxLook/StaticText" />
+ <WindowAlias Alias="MenuWidgets/TabButtonPane" Target="OrxonoxLook/TabButtonPane" />
+ <WindowAlias Alias="MenuWidgets/TabContentPane" Target="OrxonoxLook/TabContentPane" />
+ <WindowAlias Alias="MenuWidgets/Checkbox" Target="OrxonoxLook/Checkbox" />
+ <WindowAlias Alias="MenuWidgets/Combobox" Target="OrxonoxLook/Combobox" />
+ <WindowAlias Alias="MenuWidgets/ComboDropList" Target="OrxonoxLook/ComboDropList" />
+ <WindowAlias Alias="MenuWidgets/ComboEditbox" Target="OrxonoxLook/ComboEditbox" />
+ <WindowAlias Alias="MenuWidgets/Editbox" Target="OrxonoxLook/Editbox" />
+ <WindowAlias Alias="MenuWidgets/FrameWindow" Target="OrxonoxLook/FrameWindow" />
+ <WindowAlias Alias="MenuWidgets/GroupBox" Target="OrxonoxLook/GroupBox" />
+ <WindowAlias Alias="MenuWidgets/ItemListbox" Target="OrxonoxLook/ItemListbox" />
+ <WindowAlias Alias="MenuWidgets/ListboxItem" Target="OrxonoxLook/ListboxItem" />
+ <WindowAlias Alias="MenuWidgets/Listbox" Target="OrxonoxLook/Listbox" />
+ <WindowAlias Alias="MenuWidgets/ListHeader" Target="OrxonoxLook/ListHeader" />
+ <WindowAlias Alias="MenuWidgets/ListHeaderSegment" Target="OrxonoxLook/ListHeaderSegment" />
+ <WindowAlias Alias="MenuWidgets/MultiLineEditbox" Target="OrxonoxLook/MultiLineEditbox" />
+ <WindowAlias Alias="MenuWidgets/Menubar" Target="OrxonoxLook/Menubar" />
+ <WindowAlias Alias="MenuWidgets/MenuItem" Target="OrxonoxLook/MenuItem" />
+ <WindowAlias Alias="MenuWidgets/MultiColumnList" Target="OrxonoxLook/MultiColumnList" />
+ <WindowAlias Alias="MenuWidgets/PopupMenu" Target="OrxonoxLook/PopupMenu" />
+ <WindowAlias Alias="MenuWidgets/ProgressBar" Target="OrxonoxLook/ProgressBar" />
+ <WindowAlias Alias="MenuWidgets/Button" Target="OrxonoxLook/Button" />
+ <WindowAlias Alias="MenuWidgets/ImageButton" Target="OrxonoxLook/ImageButton" />
+ <WindowAlias Alias="MenuWidgets/RadioButton" Target="OrxonoxLook/RadioButton" />
+ <WindowAlias Alias="MenuWidgets/SystemButton" Target="OrxonoxLook/SystemButton" />
+ <WindowAlias Alias="MenuWidgets/ScrollablePane" Target="OrxonoxLook/ScrollablePane" />
+ <WindowAlias Alias="MenuWidgets/HorizontalScrollbar" Target="OrxonoxLook/HorizontalScrollbar" />
+ <WindowAlias Alias="MenuWidgets/VerticalScrollbar" Target="OrxonoxLook/VerticalScrollbar" />
+ <WindowAlias Alias="MenuWidgets/Slider" Target="OrxonoxLook/Slider" />
+ <WindowAlias Alias="MenuWidgets/Spinner" Target="OrxonoxLook/Spinner" />
+ <WindowAlias Alias="MenuWidgets/TabButton" Target="OrxonoxLook/TabButton" />
+ <WindowAlias Alias="MenuWidgets/TabControl" Target="OrxonoxLook/TabControl" />
+ <WindowAlias Alias="MenuWidgets/HorizontalScrollbarThumb" Target="OrxonoxLook/HorizontalScrollbarThumb" />
+ <WindowAlias Alias="MenuWidgets/SliderThumb" Target="OrxonoxLook/SliderThumb" />
+ <WindowAlias Alias="MenuWidgets/VerticalScrollbarThumb" Target="OrxonoxLook/VerticalScrollbarThumb" />
+ <WindowAlias Alias="MenuWidgets/Titlebar" Target="OrxonoxLook/Titlebar" />
+ <WindowAlias Alias="MenuWidgets/Tooltip" Target="OrxonoxLook/Tooltip" />
+ <WindowAlias Alias="MenuWidgets/Tree" Target="OrxonoxLook/Tree" />
+</GUIScheme>
Modified: code/branches/presentation/data/gui/scripts/InitialiseGUI.lua
===================================================================
--- code/branches/presentation/data/gui/scripts/InitialiseGUI.lua 2010-12-14 19:54:00 UTC (rev 7759)
+++ code/branches/presentation/data/gui/scripts/InitialiseGUI.lua 2010-12-15 09:59:10 UTC (rev 7760)
@@ -4,9 +4,10 @@
schemeMgr = CEGUI.SchemeManager:getSingleton()
winMgr = CEGUI.WindowManager:getSingleton()
+local scheme = orxonox.CommandExecutor:query("getConfig GUIManager guiScheme_")
-- Load all required skins
-schemeMgr:loadScheme("TaharezGreenLook.scheme")
---schemeMgr:loadScheme("OrxonoxLook.scheme")
+--schemeMgr:loadScheme("TaharezGreenLook.scheme")
+schemeMgr:loadScheme(scheme .. "Look.scheme")
--schemeMgr:loadScheme("TaharezLook.scheme")
--schemeMgr:loadScheme("WindowsLook.scheme")
--schemeMgr:loadScheme("VanillaLook.scheme")
@@ -15,14 +16,14 @@
-- Connect skin specific window types with our own window types
-- By loading a different file (if there is) you can change the skin
-- of the menus or the HUD independently
-schemeMgr:loadScheme("TaharezGreenMenuWidgets.scheme")
-menuImageSet = "TaharezGreenLook"
-schemeMgr:loadScheme("TaharezGreenHUDWidgets.scheme")
-hudImageSet = "TaharezGreenLook"
---schemeMgr:loadScheme("OrxonoxLookMenuWidgets.scheme")
---menuImageSet = "OrxonoxLook"
---schemeMgr:loadScheme("OrxonoxLookHUDWidgets.scheme")
---hudImageSet = "OrxonoxLook"
+--schemeMgr:loadScheme("TaharezGreenMenuWidgets.scheme")
+--menuImageSet = "TaharezGreenLook"
+--schemeMgr:loadScheme("TaharezGreenHUDWidgets.scheme")
+--hudImageSet = "TaharezGreenLook"
+schemeMgr:loadScheme(scheme .. "MenuWidgets.scheme")
+menuImageSet = scheme .. "Look"
+schemeMgr:loadScheme(scheme .. "HUDWidgets.scheme")
+hudImageSet = scheme .. "Look"
-- Just a remaining test hack
schemeMgr:loadScheme("OrxonoxGUIScheme.scheme")
Modified: code/branches/presentation/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/presentation/src/libraries/core/GUIManager.cc 2010-12-14 19:54:00 UTC (rev 7759)
+++ code/branches/presentation/src/libraries/core/GUIManager.cc 2010-12-15 09:59:10 UTC (rev 7760)
@@ -58,7 +58,9 @@
#include "util/Debug.h"
#include "util/Exception.h"
#include "util/OrxAssert.h"
+#include "ConfigValueIncludes.h"
#include "Core.h"
+#include "CoreIncludes.h"
#include "GraphicsManager.h"
#include "LuaState.h"
#include "PathConfig.h"
@@ -99,6 +101,7 @@
static CEGUI::MouseButton convertButton(MouseButtonCode::ByEnum button);
GUIManager* GUIManager::singletonPtr_s = 0;
+ /*static*/ const std::string GUIManager::defaultScheme_ = "TaharezGreen";
SetConsoleCommand("showGUI", &GUIManager::showGUI).defaultValue(1, false).defaultValue(2, false);
SetConsoleCommand("hideGUI", &GUIManager::hideGUI);
@@ -117,6 +120,9 @@
: resourceProvider_(NULL)
, camera_(NULL)
{
+ RegisterRootObject(GUIManager);
+ this->setConfigValues();
+
using namespace CEGUI;
COUT(3) << "Initialising CEGUI." << std::endl;
@@ -176,6 +182,16 @@
{
}
+ void GUIManager::setConfigValues(void)
+ {
+ SetConfigValue(guiScheme_, GUIManager::defaultScheme_) .description("Changes the current GUI scheme.") .callback(this, &GUIManager::changedGUIScheme);
+ }
+
+ void GUIManager::changedGUIScheme(void)
+ {
+
+ }
+
/**
@brief
used to tick the GUI
Modified: code/branches/presentation/src/libraries/core/GUIManager.h
===================================================================
--- code/branches/presentation/src/libraries/core/GUIManager.h 2010-12-14 19:54:00 UTC (rev 7759)
+++ code/branches/presentation/src/libraries/core/GUIManager.h 2010-12-15 09:59:10 UTC (rev 7760)
@@ -48,6 +48,7 @@
#include "util/TriBool.h"
#include "util/Singleton.h"
#include "input/InputHandler.h"
+#include "OrxonoxClass.h"
// Tolua includes (have to be relative to the current directory)
/*
@@ -69,13 +70,16 @@
Those input events are then injected into CEGUI in Lua.
*/
class _CoreExport GUIManager // tolua_export
- : public Singleton<GUIManager>, public InputHandler
+ : public Singleton<GUIManager>, public InputHandler, public OrxonoxClass
{ // tolua_export
friend class Singleton<GUIManager>;
public:
GUIManager(const std::pair<int, int>& mousePosition);
~GUIManager();
+ void setConfigValues(void);
+ void changedGUIScheme(void);
+
void preUpdate(const Clock& time);
void loadGUI(const std::string& name);
@@ -142,6 +146,10 @@
static GUIManager* singletonPtr_s; //!< Singleton reference to GUIManager
+ // The used CEGUI scheme.
+ static const std::string defaultScheme_;
+ std::string guiScheme_;
+
}; // tolua_export
} // tolua_export
More information about the Orxonox-commit
mailing list