mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-23 06:41:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'scrawl/master'

Browse Source
This commit is contained in:
Marc Zinnschlag 2012-08-31 09:22:32 +02:00
commit e2bf4694cb
7 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/openmw/mwbase/windowmanager.hpp
View File

@ -181,6 +181,7 @@ namespace MWBase
virtual void showCrosshair(bool show) = 0; virtual void showCrosshair(bool show) = 0;
virtual bool getSubtitlesEnabled() = 0; virtual bool getSubtitlesEnabled() = 0;
virtual void toggleHud() = 0;
virtual void disallowMouse() = 0; virtual void disallowMouse() = 0;
virtual void allowMouse() = 0; virtual void allowMouse() = 0;

7
apps/openmw/mwgui/windowmanagerimp.cpp
View File

@ -86,6 +86,7 @@ WindowManager::WindowManager(
, mBatchCount(0) , mBatchCount(0)
, mCrosshairEnabled(Settings::Manager::getBool ("crosshair", "HUD")) , mCrosshairEnabled(Settings::Manager::getBool ("crosshair", "HUD"))
, mSubtitlesEnabled(Settings::Manager::getBool ("subtitles", "GUI")) , mSubtitlesEnabled(Settings::Manager::getBool ("subtitles", "GUI"))
, mHudEnabled(true)
{ {
// Set up the GUI system // Set up the GUI system
@ -875,3 +876,9 @@ bool WindowManager::getSubtitlesEnabled ()
{ {
return mSubtitlesEnabled; return mSubtitlesEnabled;
} }
void WindowManager::toggleHud ()
{
mHudEnabled = !mHudEnabled;
mHud->setVisible (mHudEnabled);
}

2
apps/openmw/mwgui/windowmanagerimp.hpp
View File

@ -162,6 +162,7 @@ namespace MWGui
virtual void showCrosshair(bool show); virtual void showCrosshair(bool show);
virtual bool getSubtitlesEnabled(); virtual bool getSubtitlesEnabled();
virtual void toggleHud();
virtual void disallowMouse(); virtual void disallowMouse();
virtual void allowMouse(); virtual void allowMouse();
@ -223,6 +224,7 @@ namespace MWGui
bool mCrosshairEnabled; bool mCrosshairEnabled;
bool mSubtitlesEnabled; bool mSubtitlesEnabled;
bool mHudEnabled;
/// \todo get rid of this stuff. Move it to the respective UI element classes, if needed. /// \todo get rid of this stuff. Move it to the respective UI element classes, if needed.
// Various stats about player as needed by window manager // Various stats about player as needed by window manager

4
apps/openmw/mwinput/inputmanagerimp.cpp
View File

@ -226,6 +226,9 @@ namespace MWInput
case A_QuickKeysMenu: case A_QuickKeysMenu:
showQuickKeysMenu(); showQuickKeysMenu();
break; break;
case A_ToggleHUD:
mWindows.toggleHud();
break;
} }
} }
} }
@ -676,6 +679,7 @@ namespace MWInput
defaultKeyBindings[A_QuickKey9] = OIS::KC_9; defaultKeyBindings[A_QuickKey9] = OIS::KC_9;
defaultKeyBindings[A_QuickKey10] = OIS::KC_0; defaultKeyBindings[A_QuickKey10] = OIS::KC_0;
defaultKeyBindings[A_Screenshot] = OIS::KC_SYSRQ; defaultKeyBindings[A_Screenshot] = OIS::KC_SYSRQ;
defaultKeyBindings[A_ToggleHUD] = OIS::KC_F12;
std::map<int, int> defaultMouseButtonBindings; std::map<int, int> defaultMouseButtonBindings;
defaultMouseButtonBindings[A_Inventory] = OIS::MB_Right; defaultMouseButtonBindings[A_Inventory] = OIS::MB_Right;

2
apps/openmw/mwinput/inputmanagerimp.hpp
View File

@ -234,6 +234,8 @@ namespace MWInput
A_QuickKeysMenu, A_QuickKeysMenu,
A_ToggleHUD,
A_Last // Marker for the last item A_Last // Marker for the last item
}; };
}; };

25
files/mygui/core_layouteditor.xml Normal file
View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI>
<MyGUI type="List">
<List file="core.skin" />
<List file="openmw_resources.xml" />
<List file="openmw.font.xml" />
<List file="openmw_text.skin.xml" />
<List file="openmw_windows.skin.xml" />
<List file="openmw_button.skin.xml" />
<List file="openmw_list.skin.xml" />
<List file="openmw_edit.skin.xml" />
<List file="openmw_box.skin.xml" />
<List file="openmw_progress.skin.xml" />
<List file="openmw_hud_energybar.skin.xml" />
<List file="openmw_hud_box.skin.xml" />
<List file="openmw_mainmenu_skin.xml" />
<List file="openmw_console.skin.xml" />
<List file="openmw_journal_skin.xml" />
<List file="openmw_map_window_skin.xml" />
<List file="openmw_dialogue_window_skin.xml" />
<List file="openmw_scroll_skin.xml" />
<List file="openmw_settings.xml" />
</MyGUI>
</MyGUI>

1
files/mygui/openmw.font.xml
View File

@ -12,6 +12,7 @@
<Code range="192 382"/> <!-- Central and Eastern European languages glyphs --> <Code range="192 382"/> <!-- Central and Eastern European languages glyphs -->
<Code range="1025 1105"/> <Code range="1025 1105"/>
<Code range="8470"/> <Code range="8470"/>
<Code range="8211"/> <!-- Minus -->
<Code range="8216 8217"/> <!-- Single quotes --> <Code range="8216 8217"/> <!-- Single quotes -->
<Code range="8220 8221"/> <!-- Right and Left Double Quotation mark --> <Code range="8220 8221"/> <!-- Right and Left Double Quotation mark -->
<Code hide="128"/> <Code hide="128"/>