Merge v1.4.1.469-47a90f01

RasPlex · May 20, 2015 · e3e81c1 · e3e81c1
2 parents 10613fc + 47a90f0
commit e3e81c1
Show file tree

Hide file tree

Showing 169 changed files with 3,869 additions and 1,573 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1248,6 +1248,7 @@ plex/Dependencies/*darwin-i686
 plex/build
 plex/build_xc
 plex/Dependencies/built-depends/*
+.idea
 
 *.autosave
 /plex-home-theater

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,8 +30,8 @@ else()
 endif()
 
 set(PLEX_VERSION_MAJOR 1)
-set(PLEX_VERSION_MINOR 3)
-set(PLEX_VERSION_PATCH 5)
+set(PLEX_VERSION_MINOR 4)
+set(PLEX_VERSION_PATCH 1)
 if(DEFINED ENV{BUILD_NUMBER})
   set(PLEX_VERSION_BUILD "$ENV{BUILD_NUMBER}")
   set(PLEX_VERSION_BUILD_NR "$ENV{BUILD_NUMBER}")
@@ -147,7 +147,7 @@ endif()
 
 if(ENABLE_PYTHON)
     if(EXTERNAL_PYTHON_HOME)
-      if(TARGET_LINUX OR TARGET_OSX OR TARGET_RPI)
+      if(TARGET_LINUX OR TARGET_OSX OR TARGET_RPI OR TARGET_FREEBSD)
         install(DIRECTORY ${EXTERNAL_PYTHON_HOME}/lib/python${PYTHON_VERSION} DESTINATION ${LIBPATH}/lib/ COMPONENT RUNTIME
           PATTERN python${PYTHON_VERSION}/test EXCLUDE
           REGEX .*\\.pyc$ EXCLUDE
@@ -156,7 +156,7 @@ if(ENABLE_PYTHON)
         install(FILES ${PYTHON_INCLUDE_DIRS}/pyconfig.h DESTINATION "${LIBPATH}/include/python${PYTHON_VERSION}" COMPONENT RUNTIME)
       endif()
     elseif()
-      if(TARGET_LINUX OR TARGET_OSX)
+      if(TARGET_LINUX OR TARGET_OSX OR TARGET_FREEBSD)
         install(DIRECTORY /usr/lib/python${PYTHON_VERSION} DESTINATION ${LIBPATH}/lib/ COMPONENT RUNTIME
           PATTERN python${PYTHON_VERSION}/test EXCLUDE
           REGEX .*\\.pyc$ EXCLUDE

diff --git a/README-BUILD-PLEX.md b/README-BUILD-PLEX.md
@@ -1,4 +1,4 @@
-# Buliding instructions for Plex Home Theater
+# Building instructions for Plex Home Theater
 
 ## Generic instructions
 
@@ -100,4 +100,4 @@ Now you have a Visual Studio project that you can open and right click to build.
 
 ## Linux
 
-TBA
+TBA
diff --git a/addons/skin.plex/720p/Debug.xml b/addons/skin.plex/720p/Debug.xml
@@ -353,6 +353,19 @@
 					<label>System.NoPlexServers : [COLOR=orangeLight]1[/COLOR]</label>
 					<visible>System.NoPlexServers</visible>
 				</control>
+				<control type="label">
+					<include>debugFont</include>
+					<label>Container.Property(LoginFailed) : [COLOR=orangeLight]$INFO[Container.Property(LoginFailed)][/COLOR]</label>
+				</control>
+				<control type="label">
+					<include>debugFont</include>
+					<label>System.PlexPlayQueue : [COLOR=orangeLight]Video[/COLOR]</label>
+					<visible>System.PlexPlayQueue(Video)</visible>
+				</control>
+				<control type="label">
+					<include>debugFont</include>
+					<label>Container.OnNext : [COLOR=orangeLight]$INFO[Control.IsVisible(30)][/COLOR]</label>
+				</control>
 				<control type="label">
 					<include>debugFont</include>
 					<label/>

diff --git a/addons/skin.plex/720p/DialogNumeric.xml b/addons/skin.plex/720p/DialogNumeric.xml
@@ -8,10 +8,9 @@
 		<posx>0</posx>
 		<posy>0</posy>
 	</coordinates>
-	<onload>XBMC.Dialog.Close(selectuser)</onload>
 	<controls>
 		<include condition="!Window.IsActive(home) + !Window.IsActive(startup)">KeyboardNumeric</include>
-		<include condition="Window.IsActive(startup) | Window.IsActive(home)">KeyboardPIN</include>
+		<include condition="Window.IsActive(startup) | Window.IsActive(home)">KbPIN</include>
 		<include>debugInfos</include>
 		<include>Grid</include>
 	</controls>

diff --git a/addons/skin.plex/720p/HomeMenu.xml b/addons/skin.plex/720p/HomeMenu.xml
@@ -171,15 +171,37 @@
 					<control type="label">
 						<posx>363</posx>
 						<posy>75</posy>
-						<width>250</width>
+						<width>353</width>
 						<height>20</height>
 						<label>$INFO[ListItem.Label2]</label>
 						<align>right</align>
 						<aligny>center</aligny>
 						<font>Bold-16</font>
 						<textcolor>white</textcolor>
 						<shadowcolor>FF222222</shadowcolor>
-						<visible>!IsEmpty(ListItem.Property(SectionNameCollision))</visible>
+						<visible>[!Skin.HasSetting(DontIndicateSecureServers) + IsEmpty(ListItem.Property(isSecure))] | [Skin.HasSetting(DontIndicateSecureServers) + !IsEmpty(ListItem.Property(SectionNameCollision))]</visible>
+					</control>
+					<control type="label">
+						<posx>336</posx>
+						<posy>75</posy>
+						<width>323</width>
+						<height>20</height>
+						<label>$INFO[ListItem.Label2]</label>
+						<align>right</align>
+						<aligny>center</aligny>
+						<font>Bold-16</font>
+						<textcolor>white</textcolor>
+						<shadowcolor>FF222222</shadowcolor>
+						<visible>!IsEmpty(ListItem.Property(isSecure)) + !Skin.HasSetting(DontIndicateSecureServers)</visible>
+					</control>
+					<control type="image">
+						<posy>75</posy>
+						<posx>344</posx>
+						<width>18</width>
+						<height>18</height>
+						<texture>icon-lock-round-simplified.png</texture>
+						<colordiffuse>CC5CB85C</colordiffuse>
+						<visible>!IsEmpty(ListItem.Property(isSecure)) + !Skin.HasSetting(DontIndicateSecureServers)</visible>
 					</control>
 				</focusedlayout>
 				<!-- additional menu items -->

diff --git a/addons/skin.plex/720p/Includes.xml b/addons/skin.plex/720p/Includes.xml
@@ -22,4 +22,5 @@
 	<include file="ViewsDialogs.xml"/>	
 	<include file="ViewsFullInfoCard.xml"/>
 	<include file="ViewsPlayListSelection.xml"/>
+	<include file="ViewsUserSwitchLogin.xml"/>
 </includes>
diff --git a/addons/skin.plex/720p/IncludesGlobals.xml b/addons/skin.plex/720p/IncludesGlobals.xml
@@ -128,6 +128,10 @@
 		<textcolor>white</textcolor>
 		<shadowcolor>FF444444</shadowcolor>
 	</include>
+	<include name="OrangeFont">
+		<textcolor>orange</textcolor>
+		<shadowcolor>FF444444</shadowcolor>
+	</include>
 	<include name="WhiteShadow">
 		<textcolor>white</textcolor>
 		<shadowcolor>FF444444</shadowcolor>
@@ -411,7 +415,10 @@
 		<value condition="Container.PlexContent(Episode)">$LOCALIZE[31114]</value>
 		<value condition="Container.PlexContent(Channels)">$LOCALIZE[32107]</value>
 		<value condition="Container.PlexContent(Clip) | Container.PlexContent(Homemovies)">$LOCALIZE[31144]</value>
-		<value condition="Window.IsActive(mysharedcontent)">$LOCALIZE[32108]</value>
+		<value condition="Window.IsActive(mysharedcontent)">$LOCALIZE[32108]</value>		
+		<value condition="Container.PlexContent(MixedContent) + ListItem.Type(episode)">$LOCALIZE[31143]</value>
+		<value condition="Container.PlexContent(MixedContent) + ListItem.Type(movie)">$LOCALIZE[31142]</value>
+		<value condition="Container.PlexContent(MixedContent) + ListItem.Type(clip)">$LOCALIZE[31144]</value>
 		<value>Item</value>
 	</variable>
 	<include name="TopBar">

diff --git a/addons/skin.plex/720p/LeftSideMenu.xml b/addons/skin.plex/720p/LeftSideMenu.xml
@@ -3,7 +3,7 @@
 	<include name="leftMenuInitSlide">
 		<animation effect="slide" start="-74" end="0" time="400">Visible</animation>
 		<animation effect="slide" start="0" end="-74" time="400">Hidden</animation>
-		<animation effect="slide" start="0" end="-74" time="0" condition="Skin.String(SectionType,playqueue) + [Player.HasAudio | Player.HasVideo]">Conditional</animation>
+		<animation effect="slide" start="0" end="-104" time="0" condition="Skin.String(SectionType,playqueue) + [Player.HasAudio | Player.HasVideo]">Conditional</animation>
 	</include>
 	<include name="leftMenuSlide">
 		<animation effect="slide" start="0" end="246" time="500" condition="ControlGroup(1300).HasFocus()">Conditional</animation>
@@ -71,7 +71,7 @@
 				<aspectratio>scale</aspectratio>
 				<texture flipx="true">left-menu-indicator-arrow.png</texture>
 				<animation effect="rotate" end="-180" center="36,689" time="500" condition="ControlGroup(1300).HasFocus">Conditional</animation>
-				<visible>[!Container.PlexContent(Albums) | [Container.PlexContent(Albums) + !IsEmpty(Container.Property(primaryFilterActivated))]] + !Container.PlexContent(Songs) + !Container.PlexContent(Seasons) + [!Container.PlexContent(Episodes) | [Container.PlexContent(Episodes) + !IsEmpty(Container.Property(primaryFilterActivated)) + IsEmpty(Container.Property(PlexPreplay))]] + ![Container.PlexContent(Channel) + [ListItem.Type(clip) | ListItem.Type(episode)]]</visible>
+				<visible>[!Container.PlexContent(Albums) | [Container.PlexContent(Albums) + !IsEmpty(Container.Property(primaryFilterActivated))]] + !Container.PlexContent(Songs) + !Container.PlexContent(Seasons) + [!Container.PlexContent(Episodes) | [Container.PlexContent(Episodes) + !IsEmpty(Container.Property(primaryFilterActivated)) + IsEmpty(Container.Property(PlexPreplay))]] + ![Container.PlexContent(Channel) + [ListItem.Type(clip) | ListItem.Type(episode)]] + ![Control.IsVisible(88)]</visible>
 			</control>
 		</control>
 	</include>
@@ -277,7 +277,7 @@
 		<radiowidth>16</radiowidth>
 		<radioposy>6</radioposy>
 	</include>
-	<!-- preplay buttons -->
+	<!-- buttons -->
 	<include name="leftMenuBarIcon">
 		<width>74</width>
 		<height>30</height>
@@ -292,9 +292,110 @@
 	<include name="leftMenuBarButton">
 		<width>74</width>
 		<height>30</height>
-		<onleft condition="[!Container.PlexContent(Albums) | [Container.PlexContent(Albums) + [Container.PlexFilter(Albums) | Container.PlexFilter(recentlyAdded)]]] + !Container.PlexContent(Songs) + !Container.PlexContent(Movie) + !Container.PlexContent(Seasons) + [!Container.PlexContent(Episodes) | [Container.PlexContent(Episodes) + !IsEmpty(Container.Property(primaryFilterActivated)) + IsEmpty(Container.Property(PlexPreplay))]] + !Container.PlexContent(Episode) + !Container.PlexContent(Clip) + ![Container.PlexContent(Channel) + [ListItem.Type(clip) | ListItem.Type(episode) | ListItem.Type(song)]]">1300</onleft>
+		<onleft condition="[!Container.PlexContent(Albums) | [Container.PlexContent(Albums) + [Container.PlexFilter(Albums) | Container.PlexFilter(recentlyAdded)]]] + !Container.PlexContent(Songs) + !Container.PlexContent(Movie) + !Container.PlexContent(Seasons) + [!Container.PlexContent(Episodes) | [Container.PlexContent(Episodes) + !IsEmpty(Container.Property(primaryFilterActivated)) + IsEmpty(Container.Property(PlexPreplay))]] + !Container.PlexContent(Episode) + !Container.PlexContent(Clip) + ![Container.PlexContent(Channel) + [ListItem.Type(clip) | ListItem.Type(episode) | ListItem.Type(song)]] + !Control.IsVisible(88)">1300</onleft>
 		<onright>777</onright>
 	</include>
+	<include name="leftBarButtonFilters">
+		<texturefocus>left-menu-filters-icon-s.png</texturefocus>
+		<texturenofocus>left-menu-filters-icon-u.png</texturenofocus>
+		<onclick>Control.SetFocus(1300)</onclick>
+		<include>leftMenuBarButton</include>
+	</include>
+	<include name="leftBarButtonPlay">
+		<texturefocus>b-pp-play-s2.png</texturefocus>
+		<texturenofocus>b-pp-play2.png</texturenofocus>
+		<onclick>Plex.PlayAll()</onclick>
+		<include>leftMenuBarButton</include>
+	</include>
+	<include name="leftBarButtonShuffle">
+		<texturefocus>left-menu-shuffle-icon-s2.png</texturefocus>
+		<texturenofocus>left-menu-shuffle-icon-u2.png</texturenofocus>
+		<onclick>Plex.ShuffleAll()</onclick>
+		<include>leftMenuBarButton</include>
+	</include>
+	<include name="leftBarButtonAudio">
+		<texturefocus>b-pp-audio-s2.png</texturefocus>
+		<texturenofocus>b-pp-audio2.png</texturenofocus>
+		<onright>XBMC.NextItem</onright>
+		<onleft>XBMC.PrevItem</onleft>
+		<onclick>ActivateWindow(10205)</onclick>
+		<include>leftMenuBarButton</include>
+		<onfocus>Skin.SetString(DialogPos,audiostreampicker)</onfocus>
+		<onunfocus>Skin.Reset(DialogPos)</onunfocus>
+	</include>
+	<include name="leftBarButtonSubtitles">
+		<texturefocus>b-pp-subtitles-s.png</texturefocus>
+		<texturenofocus>b-pp-subtitles.png</texturenofocus>
+		<onright>XBMC.NextItem</onright>
+		<onleft>XBMC.PrevItem</onleft>
+		<onclick>ActivateWindow(10204)</onclick>
+		<include>leftMenuBarButton</include>
+		<onfocus>Skin.SetString(DialogPos,subtitlestreampicker)</onfocus>
+		<onunfocus>Skin.Reset(DialogPos)</onunfocus>
+	</include>
+	<include name="leftBarButtonExtras">
+		<texturefocus>b-pp-extras-s.png</texturefocus>
+		<texturenofocus>b-pp-extras.png</texturenofocus>
+		<onright>XBMC.NextItem</onright>
+		<onleft>XBMC.PrevItem</onleft>
+		<onclick>SetFocus(3)</onclick>
+		<include>leftMenuBarButton</include>
+	</include>
+	<include name="leftBarButtonRate">
+		<texturefocus>b-pp-rate-s.png</texturefocus>
+		<texturenofocus>b-pp-rate.png</texturenofocus>
+		<onright>XBMC.NextItem</onright>
+		<onleft>XBMC.PrevItem</onleft>
+		<onclick>ActivateWindow(10200,$INFO[ListItem(0).Path])</onclick>
+		<include>leftMenuBarButton</include>
+		<onfocus>Skin.SetString(DialogPos,rate)</onfocus>
+		<onunfocus>Skin.Reset(DialogPos)</onunfocus>
+	</include>
+	<include name="leftBarButtonRecommend">
+		<texturefocus>b-pp-recommend-s.png</texturefocus>
+		<texturenofocus>b-pp-recommend.png</texturenofocus>
+		<onup>105</onup>
+		<ondown>107</ondown>
+		<include>leftMenuBarButton</include>
+		<visible>!IsEmpty(ListItem(0).Property(canRecommend))</visible>
+		<onfocus>Skin.SetString(DialogPos,recommend)</onfocus>
+		<onunfocus>Skin.Reset(DialogPos)</onunfocus>
+	</include>
+	<include name="leftBarButtonShare">
+		<texturefocus>b-pp-share-s.png</texturefocus>
+		<texturenofocus>b-pp-share.png</texturenofocus>
+		<onright>XBMC.NextItem</onright>
+		<onleft>XBMC.PrevItem</onleft>
+		<include>leftMenuBarButton</include>
+		<visible>!IsEmpty(ListItem(0).Property(canShare))</visible>
+		<onfocus>Skin.SetString(DialogPos,share)</onfocus>
+		<onunfocus>Skin.Reset(DialogPos)</onunfocus>
+	</include>
+	<include name="leftBarButtonWatched">
+		<texturefocus>b-pp-watched-s.png</texturefocus>
+		<texturenofocus>b-pp-watched.png</texturenofocus>
+		<onright>XBMC.NextItem</onright>
+		<onleft>XBMC.PrevItem</onleft>
+		<onclick>markaswatched</onclick>
+		<include>leftMenuBarButton</include>
+		<visible>ListItem.Status(unwatched) | ListItem.Status(inprogress)</visible>
+	</include>
+	<include name="leftBarButtonUnwatched">
+		<texturefocus>b-pp-unwatched-s.png</texturefocus>
+		<texturenofocus>b-pp-unwatched.png</texturenofocus>
+		<onright>XBMC.NextItem</onright>
+		<onleft>XBMC.PrevItem</onleft>
+		<onclick>markasunwatched</onclick>
+		<include>leftMenuBarButton</include>
+		<visible>ListItem.Status(watched)</visible>
+	</include>
+	<include name="leftBarButtonNowPlaying">
+		<texturefocus>-</texturefocus>
+		<texturenofocus>-</texturenofocus>
+		<onclick>fullscreen</onclick>
+		<include>leftMenuBarButton</include>
+		<visible>Player.HasAudio | Player.HasVideo</visible>
+	</include>
 	<!-- Home menu -->
 	<include name="PivotMenuHome">
 		<!-- Main Menu -->
@@ -524,11 +625,9 @@
 			<include>leftMenuInitSlide</include>
 			<include>leftMenuSlide</include>
 			<include>leftMenuBg</include>
-			<!-- global search-->
-			<!--><include>GlobalSearch</include>-->
-			<!-- sidebar global -->
+			<!-- sidebar video & photos -->
 			<control type="grouplist" id="998">
-				<visible>!Container.PlexContent(Movie) + !Container.PlexContent(Episode) + !Container.PlexContent(Clip) + Control.IsVisible(995)</visible>
+				<visible>Container.PlexContent(Movies) | Container.PlexContent(TVShows) | Container.PlexContent(Seasons) | Container.PlexContent(Clips) | Container.PlexContent(Episodes) | Container.PlexContent(Homemovies) | Container.PlexContent(Channel) | Container.PlexContent(Photos)</visible>
 				<posy>40</posy>
 				<posx>0</posx>
 				<width>74</width>
@@ -543,23 +642,23 @@
 					<texturenofocus>left-menu-filters-icon-u.png</texturenofocus>
 					<onclick>Control.SetFocus(1300)</onclick>
 					<include>leftMenuBarButton</include>
-					<visible>[!Container.PlexContent(Albums) | [Container.PlexContent(Albums) + [Container.PlexFilter(Albums) | Container.PlexFilter(recentlyAdded)]]] + !Container.PlexContent(Songs) + !Container.PlexContent(Seasons) + [!Container.PlexContent(Episodes) | [Container.PlexContent(Episodes) + !IsEmpty(Container.Property(primaryFilterActivated)) + IsEmpty(Container.Property(PlexPreplay))]] + ![Container.PlexContent(Channel) + [ListItem.Type(clip) | ListItem.Type(episode) | ListItem.Type(song)]]</visible>
+					<visible>Container.PlexContent(Movies) | Container.PlexContent(TVShows) | Container.PlexContent(Homemovies) | Container.PlexContent(Clips) | [Container.PlexContent(Channel) + !ListItem.Type(Clip)] | Container.PlexContent(Photos) | [Container.PlexContent(Episodes) + !IsEmpty.Container.Property(primaryFilterActivated)]</visible>
 				</control>
 				<!-- Play All -->
 				<control type="button" id="104">
 					<texturefocus>b-pp-play-s2.png</texturefocus>
 					<texturenofocus>b-pp-play2.png</texturenofocus>
 					<onclick>Plex.PlayAll()</onclick>
 					<include>leftMenuBarButton</include>
-					<visible>![Window.IsActive(501) + Container.PlexFilter(recentlyAdded)] + !Container.PlexFilter(recentlyViewedShows)</visible>
+					<visible>!Container.PlexFilter(recentlyViewedShows)</visible>
 				</control>
 				<!-- Shuffle All -->
 				<control type="button" id="105">
 					<texturefocus>left-menu-shuffle-icon-s2.png</texturefocus>
 					<texturenofocus>left-menu-shuffle-icon-u2.png</texturenofocus>
 					<onclick>Plex.ShuffleAll()</onclick>
 					<include>leftMenuBarButton</include>
-					<visible>![Window.IsActive(501) + Container.PlexFilter(recentlyAdded)] + !Container.PlexFilter(recentlyViewedShows)</visible>
+					<visible>!Container.PlexFilter(recentlyViewedShows)</visible>
 				</control>
 				<!-- Now Playing -->
 				<control type="button" id="106">
@@ -570,6 +669,32 @@
 					<visible>Player.HasAudio | Player.HasVideo</visible>
 				</control>
 			</control>
+			<!-- sidebar music -->
+			<control type="grouplist" id="998">
+				<visible>Container.PlexContent(Artists) | Container.PlexContent(Albums) | Container.PlexContent(Songs)</visible>
+				<posy>40</posy>
+				<posx>0</posx>
+				<width>74</width>
+				<aligny>top</aligny>
+				<onup>998</onup>
+				<ondown>998</ondown>
+				<orientation>vertical</orientation>
+				<itemgap>20</itemgap>
+				<control type="button" id="101">
+					<include>leftBarButtonFilters</include>
+					<visible>Container.PlexContent(Artists)</visible>
+				</control>
+				<control type="button" id="102">
+					<include>leftBarButtonPlay</include>
+				</control>
+				<control type="button" id="103">
+					<include>leftBarButtonShuffle</include>
+				</control>
+				<control type="button" id="104">
+					<include>leftBarButtonExtras</include>
+					<visible>!IsEmpty(Container.Property(PlexExtras))</visible>
+				</control>
+			</control>
 			<!-- sidebar preplay -->
 			<control type="grouplist" id="998">
 				<visible>[Container.PlexContent(Movie) | Container.PlexContent(Episode) | Container.PlexContent(Clip)] | [Container.PlexContent(Channel) + !IsEmpty(Container.Property(PlexPreplay))]</visible>
@@ -618,7 +743,7 @@
 					<texturenofocus>b-pp-extras.png</texturenofocus>
 					<onright>XBMC.NextItem</onright>
 					<onleft>XBMC.PrevItem</onleft>
-					<onclick>SetFocus(3)</onclick>
+					<onclick>SetFocus(30)</onclick>
 					<include>leftMenuBarButton</include>
 					<visible>!IsEmpty(ListItem.Property(PlexExtras))</visible>
 				</control>
@@ -661,17 +786,19 @@
 					<texturenofocus>b-pp-watched.png</texturenofocus>
 					<onright>XBMC.NextItem</onright>
 					<onleft>XBMC.PrevItem</onleft>
-					<onclick>markasunwatched</onclick>
+					<onclick>markaswatched</onclick>
 					<include>leftMenuBarButton</include>
+					<visible>ListItem.Status(unwatched) | ListItem.Status(inprogress)</visible>
 				</control>
 				<!-- Unwatched -->
 				<control type="button" id="109">
 					<texturefocus>b-pp-unwatched-s.png</texturefocus>
 					<texturenofocus>b-pp-unwatched.png</texturenofocus>
 					<onright>XBMC.NextItem</onright>
 					<onleft>XBMC.PrevItem</onleft>
-					<onclick>markaswatched</onclick>
+					<onclick>markasunwatched</onclick>
 					<include>leftMenuBarButton</include>
+					<visible>ListItem.Status(watched)</visible>
 				</control>
 			</control>
 			<!-- filters & sorting menu -->