Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #2022 from ronie/skin-startup

Always load Startup.xml
  • Loading branch information...
commit d27da6cfedbb38ad59f40f7220a1da0ee933f415 2 parents 67dc2a9 + 5d836ce
Arne Morten Kvarving authored
View
6 addons/skin.confluence/720p/Startup.xml
@@ -4,7 +4,7 @@
<controls>
<control type="button" id="10">
<description>trigger</description>
- <onfocus>ReplaceWindow(Home)</onfocus>
+ <onfocus>ReplaceWindow($INFO[System.StartupWindow])</onfocus>
<texturenofocus>-</texturenofocus>
<texturefocus>-</texturefocus>
<visible>!Skin.HasSetting(Use_Startup_Playlist)</visible>
@@ -12,11 +12,11 @@
<control type="button" id="10">
<description>trigger with startup Playlist</description>
<onfocus>XBMC.PlayMedia($INFO[Skin.String(Startup_Playlist_Path)])</onfocus>
- <onfocus>ReplaceWindow(Home)</onfocus>
+ <onfocus>ReplaceWindow($INFO[System.StartupWindow])</onfocus>
<texturenofocus>-</texturenofocus>
<texturefocus>-</texturefocus>
<visible>Skin.HasSetting(Use_Startup_Playlist)</visible>
</control>
<include>CommonBackground</include>
</controls>
-</window>
+</window>
View
6 xbmc/GUIInfoManager.cpp
@@ -275,7 +275,8 @@ const infomap system_labels[] = {{ "hasnetwork", SYSTEM_ETHERNET_LINK_ACT
{ "alarmpos", SYSTEM_ALARM_POS },
{ "isinhibit", SYSTEM_ISINHIBIT },
{ "hasshutdown", SYSTEM_HAS_SHUTDOWN },
- { "haspvr", SYSTEM_HAS_PVR }};
+ { "haspvr", SYSTEM_HAS_PVR },
+ { "startupwindow", SYSTEM_STARTUP_WINDOW }};
const infomap system_param[] = {{ "hasalarm", SYSTEM_HAS_ALARM },
{ "hascoreid", SYSTEM_HAS_CORE_ID },
@@ -1646,6 +1647,9 @@ CStdString CGUIInfoManager::GetLabel(int info, int contextWindow, CStdString *fa
case SYSTEM_CURRENT_WINDOW:
return g_localizeStrings.Get(g_windowManager.GetFocusedWindow());
break;
+ case SYSTEM_STARTUP_WINDOW:
+ strLabel.Format("%i", g_guiSettings.GetInt("lookandfeel.startupwindow"));
+ break;
case SYSTEM_CURRENT_CONTROL:
{
CGUIWindow *window = g_windowManager.GetWindow(g_windowManager.GetFocusedWindow());
View
1  xbmc/GUIInfoManager.h
@@ -169,6 +169,7 @@ namespace INFO
#define SYSTEM_ISINHIBIT 184
#define SYSTEM_HAS_SHUTDOWN 185
#define SYSTEM_HAS_PVR 186
+#define SYSTEM_STARTUP_WINDOW 187
#define NETWORK_IP_ADDRESS 190
#define NETWORK_MAC_ADDRESS 191
View
4 xbmc/addons/Skin.cpp
@@ -91,7 +91,6 @@ CSkinInfo::CSkinInfo(const cp_extension_t *ext)
str = CAddonMgr::Get().GetExtValue(ext->configuration, "@debugging");
m_debugging = !strcmp(str.c_str(), "true");
- m_onlyAnimateToHome = true;
LoadStartupWindows(ext);
m_Version = 2.11;
}
@@ -221,7 +220,6 @@ bool CSkinInfo::LoadStartupWindows(const cp_extension_t *ext)
m_startupWindows.push_back(CStartupWindow(WINDOW_FILES, "7"));
m_startupWindows.push_back(CStartupWindow(WINDOW_SETTINGS_MENU, "5"));
m_startupWindows.push_back(CStartupWindow(WINDOW_WEATHER, "8"));
- m_onlyAnimateToHome = true;
return true;
}
@@ -257,7 +255,7 @@ bool CSkinInfo::TranslateResolution(const CStdString &name, RESOLUTION_INFO &res
int CSkinInfo::GetFirstWindow() const
{
int startWindow = GetStartWindow();
- if (HasSkinFile("Startup.xml") && (!m_onlyAnimateToHome || startWindow == WINDOW_HOME))
+ if (HasSkinFile("Startup.xml"))
startWindow = WINDOW_STARTUP_ANIM;
return startWindow;
}
View
1  xbmc/addons/Skin.h
@@ -137,7 +137,6 @@ class CSkinInfo : public CAddon
CStdString m_currentAspect;
std::vector<CStartupWindow> m_startupWindows;
- bool m_onlyAnimateToHome;
bool m_debugging;
};
Please sign in to comment.
Something went wrong with that request. Please try again.