diff options
| author | Jonathan Marshall <jmarshall@never.you.mind> | 2011-06-12 21:06:27 +1200 |
|---|---|---|
| committer | Jonathan Marshall <jmarshall@never.you.mind> | 2011-06-13 19:48:33 +1200 |
| commit | dad234d4d61aa9a50c55ca2c05f403d45ebccbd1 (patch) | |
| tree | efc5c312288b2711d4e3f55a95bb5c55b8bdc888 | |
| parent | acc21ca77d29061feacd75be1dafaef27ca39af6 (diff) | |
add canwindowed advanced setting
| -rw-r--r-- | xbmc/settings/AdvancedSettings.cpp | 3 | ||||
| -rw-r--r-- | xbmc/settings/AdvancedSettings.h | 1 | ||||
| -rw-r--r-- | xbmc/settings/GUIWindowSettingsCategory.cpp | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp index 335840a139..f236821b4c 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -278,6 +278,8 @@ void CAdvancedSettings::Initialize() m_jsonTcpPort = 9090; m_enableMultimediaKeys = false; + + m_canWindowed = true; } bool CAdvancedSettings::Load() @@ -645,6 +647,7 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) #endif XMLUtils::GetBoolean(pRootElement, "splash", m_splashImage); XMLUtils::GetBoolean(pRootElement, "showexitbutton", m_showExitButton); + XMLUtils::GetBoolean(pRootElement, "canwindowed", m_canWindowed); XMLUtils::GetInt(pRootElement, "songinfoduration", m_songInfoDuration, 0, INT_MAX); XMLUtils::GetInt(pRootElement, "busydialogdelay", m_busyDialogDelay, 0, 5000); diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h index 7a8b7cc442..c1e04f5684 100644 --- a/xbmc/settings/AdvancedSettings.h +++ b/xbmc/settings/AdvancedSettings.h @@ -249,6 +249,7 @@ class CAdvancedSettings bool m_fullScreen; bool m_startFullScreen; bool m_showExitButton; /* Ideal for appliances to hide a 'useless' button */ + bool m_canWindowed; bool m_splashImage; bool m_alwaysOnTop; /* makes xbmc to run always on top .. osx/win32 only .. */ int m_playlistRetries; diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/GUIWindowSettingsCategory.cpp index c7f68366cf..11acbbfd75 100644 --- a/xbmc/settings/GUIWindowSettingsCategory.cpp +++ b/xbmc/settings/GUIWindowSettingsCategory.cpp @@ -2322,7 +2322,8 @@ DisplayMode CGUIWindowSettingsCategory::FillInScreens(CStdString strSetting, RES pControl->Clear(); CStdString strScreen; - pControl->AddLabel(g_localizeStrings.Get(242), -1); + if (g_advancedSettings.m_canWindowed) + pControl->AddLabel(g_localizeStrings.Get(242), -1); for (int idx = 0; idx < g_Windowing.GetNumScreens(); idx++) { |