Merge pull request #8910 from phil65/merge_playlist_windows

[gui] merge skin XMLs for MusicPlaylist and VideoPlaylist
xbmc · Jan 26, 2016 · e66ee42 · e66ee42
2 parents d857f48 + 2a4b795
commit e66ee42
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 99 deletions.
diff --git a/.../skin.confluence/720p/MyMusicPlaylist.xml → addons/skin.confluence/720p/MyPlaylist.xml b/.../skin.confluence/720p/MyMusicPlaylist.xml → addons/skin.confluence/720p/MyPlaylist.xml
@@ -24,7 +24,11 @@
 		<include>MainWindowMouseButtons</include>
 		<include>BehindDialogFadeOut</include>
 		<include>ScrollOffsetLabel</include>
-		<include name="CommonWindowHeader">
+		<include name="CommonWindowHeader" condition="Window.IsActive(videoplaylist)">
+			<param name="Icon" value="icon_video" />
+			<param name="Label" value="$LOCALIZE[10522]" />
+		</include>
+		<include name="CommonWindowHeader" condition="Window.IsActive(musicplaylist)">
 			<param name="Icon" value="icon_music" />
 			<param name="Label" value="$LOCALIZE[10517]" />
 		</include>
@@ -86,7 +90,8 @@
 				<control type="button" id="22">
 					<description>Clear button</description>
 					<label>192</label>
-					<onclick>ReplaceWindow(music)</onclick>
+					<onclick condition="Window.IsActive(musicplaylist)">ReplaceWindow(music)</onclick>
+					<onclick condition="Window.IsActive(videoplaylist)">ReplaceWindow(Videos)</onclick>
 					<textwidth>235</textwidth>
 					<include>ButtonCommonValues</include>
 				</control>

diff --git a/addons/skin.confluence/720p/MyVideoPlaylist.xml b/addons/skin.confluence/720p/MyVideoPlaylist.xml
diff --git a/xbmc/music/windows/GUIWindowMusicPlaylist.cpp b/xbmc/music/windows/GUIWindowMusicPlaylist.cpp
@@ -59,7 +59,7 @@ using namespace PLAYLIST;
 #define CONTROL_BTNREPEAT         26
 
 CGUIWindowMusicPlayList::CGUIWindowMusicPlayList(void)
-    : CGUIWindowMusicBase(WINDOW_MUSIC_PLAYLIST, "MyMusicPlaylist.xml")
+    : CGUIWindowMusicBase(WINDOW_MUSIC_PLAYLIST, "MyPlaylist.xml")
 {
   m_musicInfoLoader.SetObserver(this);
   m_movingFrom = -1;

diff --git a/xbmc/video/windows/GUIWindowVideoPlaylist.cpp b/xbmc/video/windows/GUIWindowVideoPlaylist.cpp
@@ -55,7 +55,7 @@ using namespace PLAYLIST;
 #define CONTROL_BTNREPEAT         26
 
 CGUIWindowVideoPlaylist::CGUIWindowVideoPlaylist()
-: CGUIWindowVideoBase(WINDOW_VIDEO_PLAYLIST, "MyVideoPlaylist.xml")
+: CGUIWindowVideoBase(WINDOW_VIDEO_PLAYLIST, "MyPlaylist.xml")
 {
   m_movingFrom = -1;
 }