Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new views #68

Merged
merged 14 commits into from Mar 20, 2019

Add new views

Includes.xml:
- add new include files

MyVideoNav.xml:
- add new list info view to video
- add new wall info view to video
- add new scrollbars for new views

Viewtype56.xml:
- rename to Viewtype521

Viewtype57.xml:
- rename to Viewtype533

Viewtype58.xml:
- rename to Viewtype532

Viewtype511.xml:
- new list info view

Viewtype531.xml:
- new wall info view

strings.po:
- change localizes for views (31112, 31113, 31114)
- add new localizes for new views (31116, 31117)

addon.xml:
- update changelog

Changelog.md:
- update changelog
  • Loading branch information...
Ch1llb0 committed Mar 8, 2019
commit ef2473199b90ef7c013c0a31af8d7f06daf0fe97
Copy path View file
@@ -8,13 +8,15 @@
<include file="Include_DialogSettings.xml" />
<include file="Viewtype50.xml" />
<include file="Viewtype51.xml" />
<include file="Viewtype511.xml" />
<include file="Viewtype52.xml" />
<include file="Viewtype521.xml" />
<include file="Viewtype53.xml" />
<include file="Viewtype531.xml" />
<include file="Viewtype532.xml" />
<include file="Viewtype533.xml" />
<include file="Viewtype54.xml" />
<include file="Viewtype55.xml" />
<include file="Viewtype56.xml" />
<include file="Viewtype57.xml" />
<include file="Viewtype58.xml" />
<include file="Variables.xml" />

<!-- Fullscreen dimensions -->
@@ -927,7 +929,7 @@
<include name="SubmenuIndicator">
<definition>
<control type="group">
<visible>!ControlGroup(9002).HasFocus + !Window.IsVisible(contextmenu) + !Skin.HasSetting(KioskMode) + [Control.IsVisible(50) | Control.IsVisible(51) | Control.IsVisible(53) | Control.IsVisible(54) | Control.IsVisible(55) | Control.IsVisible(57) | Control.IsVisible(58)]</visible>
<visible>!ControlGroup(9002).HasFocus + !Window.IsVisible(contextmenu) + !Skin.HasSetting(KioskMode) + [Control.IsVisible(50) | Control.IsVisible(51) | Control.IsVisible(511) | Control.IsVisible(53) | Control.IsVisible(531) | Control.IsVisible(532) | Control.IsVisible(533) | Control.IsVisible(54) | Control.IsVisible(55)]</visible>
<animation effect="fade" start="0" end="100" time="200">VisibleChange</animation>
<animation effect="slide" time="200" start="-200,0" end="0,0">WindowOpen</animation>
<animation effect="slide" time="200" start="0,0" end="-200,0">WindowClose</animation>
@@ -940,7 +942,7 @@
</control>
</control>
<control type="group">
<visible>!ControlGroup(9002).HasFocus + !Window.IsVisible(contextmenu) + !Skin.HasSetting(KioskMode) + [Control.IsVisible(52) | Control.IsVisible(56)]</visible>
<visible>!ControlGroup(9002).HasFocus + !Window.IsVisible(contextmenu) + !Skin.HasSetting(KioskMode) + [Control.IsVisible(52) | Control.IsVisible(521)]</visible>
<animation effect="fade" start="0" end="100" time="200">VisibleChange</animation>
<animation effect="slide" time="200" start="0,200" end="0,0">WindowOpen</animation>
<animation effect="slide" time="200" start="0,0" end="0,200">WindowClose</animation>
Copy path View file
@@ -4,7 +4,7 @@
<backgroundcolor>0x00000000</backgroundcolor>
<defaultcontrol always="true">50</defaultcontrol>
<onload condition="System.HasAddon(script.tvtunes)">XBMC.RunScript(script.tvtunes,backend=True)</onload>
<views>52,56,53,58,57,51,50</views>
<views>52,521,53,531,532,533,51,50,511</views>

<controls>

@@ -18,11 +18,13 @@
<!-- Views -->
<include>Viewtype50</include>
<include>Viewtype51</include>
<include>Viewtype511</include>
<include>Viewtype52</include>
<include>Viewtype521</include>
<include>Viewtype53</include>
<include>Viewtype56</include>
<include>Viewtype57</include>
<include>Viewtype58</include>
<include>Viewtype531</include>
<include>Viewtype532</include>
<include>Viewtype533</include>

<!-- Scrollbar (list) -->
<control type="scrollbar" id="60">
@@ -40,7 +42,7 @@
<texturesliderbarfocus border="11,1,1,1" colordiffuse="$VAR[DialogColor1]">common/ScrollbarGripFO.png</texturesliderbarfocus>
<textureslidernib></textureslidernib>
<textureslidernibfocus></textureslidernibfocus>
<visible>!Skin.HasSetting(Scrollbars) + [Control.IsVisible(50) | Control.IsVisible(51)]</visible>
<visible>!Skin.HasSetting(Scrollbars) + [Control.IsVisible(50) | Control.IsVisible(51) | Control.IsVisible(511) | Control.IsVisible(531)]</visible>
</control>

<!-- Scrollbar (poster) -->
@@ -97,7 +99,7 @@
<texturesliderbarfocus border="1,12,1,1" colordiffuse="$VAR[DialogColor1]">common/ScrollbarGripHorizontalFO.png</texturesliderbarfocus>
<textureslidernib></textureslidernib>
<textureslidernibfocus></textureslidernibfocus>
<visible>!Skin.HasSetting(Scrollbars) + Control.IsVisible(56)</visible>
<visible>!Skin.HasSetting(Scrollbars) + Control.IsVisible(521)</visible>
</control>

<!-- Scrollbar (wall low) -->
@@ -116,7 +118,7 @@
<texturesliderbarfocus border="8,1,6,1" colordiffuse="$VAR[DialogColor1]">common/ScrollbarGripFO.png</texturesliderbarfocus>
<textureslidernib></textureslidernib>
<textureslidernibfocus></textureslidernibfocus>
<visible>!Skin.HasSetting(Scrollbars) + Control.IsVisible(57)</visible>
<visible>!Skin.HasSetting(Scrollbars) + Control.IsVisible(533)</visible>
</control>

<!-- Scrollbar (wall small) -->
@@ -135,7 +137,7 @@
<texturesliderbarfocus border="8,1,6,1" colordiffuse="$VAR[DialogColor1]">common/ScrollbarGripFO.png</texturesliderbarfocus>
<textureslidernib></textureslidernib>
<textureslidernibfocus></textureslidernibfocus>
<visible>!Skin.HasSetting(Scrollbars) + Control.IsVisible(58)</visible>
<visible>!Skin.HasSetting(Scrollbars) + Control.IsVisible(532)</visible>
</control>

<!-- Media flags -->
Copy path View file
@@ -0,0 +1,184 @@
<?xml version="1.0" encoding="UTF-8"?>
<includes>

<include name="Viewtype511">

<control type="group">
<visible>Control.IsVisible(511)</visible>

<!-- Media image -->
<control type="group">
<visible>Container.Content(movies) | Container.Content(tvshows)</visible>
<!-- Image - Movies -->
<include content="image-511">
<param name="fallback">DefaultMovies.png</param>
<param name="visible">Container.Content(movies)</param>
</include>
<!-- Image - TV -->
<include content="image-511">
<param name="fallback">DefaultTVShows.png</param>
<param name="visible">!Container.Content(movies)</param>
</include>
<!-- Collection -->
<control type="group">
<left>214</left>
<top>225</top>
<width>263</width>
<height>394</height>
<control type="image">
<left>0</left>
<bottom>0</bottom>
<width>57</width>
<height>57</height>
<fadetime>200</fadetime>
<texture background="true">views/OverlayCornerLeft.png</texture>
<visible>ListItem.IsCollection</visible>
</control>
<control type="image">
<left>0</left>
<bottom>0</bottom>
<width>57</width>
<height>57</height>
<fadetime>200</fadetime>
<texture background="true">views/OverlayCollection.png</texture>
<visible>ListItem.IsCollection</visible>
</control>
</control>
</control>

<!-- Plot -->
<control type="group">
<left>120</left>
<top>664</top>
<width>450</width>
<height>190</height>
<visible>Container.Content(movies) | Container.Content(tvshows)</visible>
<control type="textbox">
<label>$VAR[Plot]</label>
<textcolor>$VAR[TextColor1]</textcolor>
<autoscroll delay="5000" time="1400" repeat="10000">true</autoscroll>
<visible>Skin.String(PlotFont,S) | Skin.String(PlotFont,S light)</visible>
</control>
<control type="textbox">
<font>Font30</font>
<label>$VAR[Plot]</label>
<textcolor>$VAR[TextColor1]</textcolor>
<autoscroll delay="5000" time="1300" repeat="10000">true</autoscroll>
<visible>Skin.String(PlotFont,M) | Skin.String(PlotFont,M light)</visible>
</control>
<control type="textbox">
<font>Font33</font>
<label>$VAR[Plot]</label>
<textcolor>$VAR[TextColor1]</textcolor>
<autoscroll delay="5000" time="1200" repeat="10000">true</autoscroll>
<visible>Skin.String(PlotFont,L) | Skin.String(PlotFont,XL) | Skin.String(PlotFont,L light) | Skin.String(PlotFont,XL light)</visible>
</control>
</control>

<!-- List -->
<control type="fixedlist" id="511">
<left>750</left>
<centertop>50%</centertop>
<width>1050</width>
<height>720</height>
<onup>511</onup>
<ondown>511</ondown>
<onleft>60</onleft>
<pagecontrol>60</pagecontrol>
<focusposition>4</focusposition>
<orientation>vertical</orientation>
<viewtype label="$LOCALIZE[31117]">icon</viewtype>
<scrolltime tween="sine" easing="out">240</scrolltime>
<visible>Container.Content(movies) | Container.Content(tvshows)</visible>

<itemlayout height="72" width="1050">
<control type="label">
<left>32</left>
<top>0</top>
<width>1018</width>
<height>72</height>
<font>Font36</font>
<label>[LIGHT]$VAR[Label1][/LIGHT]</label>
<textcolor>$VAR[TextColor2]</textcolor>
</control>
<!-- Watched status -->
<control type="image">
<left>0</left>
<top>29</top>
<width>14</width>
<height>14</height>
<texture>$VAR[StatusOverlay]</texture>
<colordiffuse>$VAR[TextColor2]</colordiffuse>
<animation effect="fade" start="50" end="50" condition="true">Conditional</animation>
<visible>!ListItem.IsCollection</visible>
</control>
</itemlayout>

<focusedlayout height="144" width="1050">
<control type="label">
<left>32</left>
<top>25</top>
<width>1018</width>
<height>48</height>
<font>Font49</font>
<label>$VAR[Label1]</label>
<textcolor>$VAR[TextColor1]</textcolor>
<scroll>True</scroll>
<animation effect="fade" start="100" end="50" time="200" tween="cubic" easing="out" reversible="true" condition="!Control.HasFocus(511)">Conditional</animation>
</control>
<control type="image">
<left>32</left>
<top>25</top>
<width>1018</width>
<height>58</height>
<texture colordiffuse="$VAR[TextColor1]">$VAR[focus58]</texture>
<animation effect="fade" start="100" end="50" time="200" tween="cubic" easing="out" reversible="true" condition="!Control.HasFocus(511)">Conditional</animation>
<visible>!ListItem.IsParentFolder</visible>
</control>
<control type="label">
<left>32</left>
<top>82</top>
<width>1018</width>
<height>27</height>
<font>Font27</font>
<label>$VAR[Label2]</label>
<textcolor>$VAR[TextColor1]</textcolor>
<animation effect="fade" start="100" end="50" time="200" tween="cubic" easing="out" reversible="true" condition="!Control.HasFocus(511)">Conditional</animation>
</control>
<!-- Watched status -->
<control type="image">
<left>0</left>
<top>43</top>
<width>14</width>
<height>14</height>
<texture>$VAR[StatusOverlay]</texture>
<colordiffuse>$VAR[TextColor1]</colordiffuse>
<animation effect="fade" start="100" end="50" time="200" tween="cubic" easing="out" reversible="true" condition="!Control.HasFocus(511)">Conditional</animation>
<visible>!ListItem.IsCollection</visible>
</control>
</focusedlayout>

</control>

</control>

</include>

<include name="image-511">
<param name="fallback">DefaultVideos.png</param>
<param name="visible">False</param>
<definition>
<control type="image">
<left>214</left>
<top>225</top>
<width>263</width>
<height>394</height>
<fadetime>200</fadetime>
<texture fallback="$PARAM[fallback]" background="true">$VAR[mediaImages]</texture>
<aspectratio aligny="center">keep</aspectratio>
<visible>$PARAM[visible]</visible>
</control>
</definition>
</include>

</includes>
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<includes>

<include name="Viewtype56">
<include name="Viewtype521">

<control type="group">
<visible>Control.IsVisible(56)</visible>
<visible>Control.IsVisible(521)</visible>

<!-- Wide list low -->
<control type="fixedlist" id="56">
<control type="fixedlist" id="521">
<left>0</left>
<top>546</top>
<width>1920</width>
<height>274</height>
<ondown>66</ondown>
<onleft>56</onleft>
<onright>56</onright>
<onleft>521</onleft>
<onright>521</onright>
<pagecontrol>66</pagecontrol>
<preloaditems>6</preloaditems>
<focusposition>5</focusposition>
@@ -25,12 +25,12 @@

<itemlayout width="174" height="274">
<!-- Image - Movies -->
<include content="image-56">
<include content="image-521">
<param name="fallback">DefaultMovie.png</param>
<param name="visible">Container.Content(movies)</param>
</include>
<!-- Image - TV Shows -->
<include content="image-56">
<include content="image-521">
<param name="fallback">DefaultTVShows.png</param>
<param name="visible">!Container.Content(movies)</param>
</include>
@@ -73,12 +73,12 @@
<control type="group">
<animation effect="zoom" start="73" end="100" center="90,137" time="300" tween="back" easing="out" reversible="false">Focus</animation>
<!-- Image - Movies -->
<include content="image-56-focus">
<include content="image-521-focus">
<param name="fallback">DefaultMovie.png</param>
<param name="visible">Container.Content(movies)</param>
</include>
<!-- Image - TV Shows -->
<include content="image-56-focus">
<include content="image-521-focus">
<param name="fallback">DefaultTVShows.png</param>
<param name="visible">!Container.Content(movies)</param>
</include>
@@ -134,7 +134,7 @@
<align>center</align>
<textcolor>$VAR[TextColor1]</textcolor>
<label>$VAR[Label1]</label>
<animation effect="fade" start="100" end="50" time="200" tween="cubic" easing="out" reversible="false" condition="!Control.HasFocus(56)">Conditional</animation>
<animation effect="fade" start="100" end="50" time="200" tween="cubic" easing="out" reversible="false" condition="!Control.HasFocus(521)">Conditional</animation>
</control>

<!-- Details -->
@@ -148,7 +148,7 @@
<aligny>top</aligny>
<label>$VAR[Label2]</label>
<textcolor>$VAR[TextColor1]</textcolor>
<animation effect="fade" start="100" end="50" time="200" tween="cubic" easing="out" reversible="false" condition="!Control.HasFocus(56)">Conditional</animation>
<animation effect="fade" start="100" end="50" time="200" tween="cubic" easing="out" reversible="false" condition="!Control.HasFocus(521)">Conditional</animation>
</control>

</control>
@@ -157,7 +157,7 @@

</include>

<include name="image-56">
<include name="image-521">
<param name="fallback">DefaultVideos.png</param>
<param name="visible">False</param>
<definition>
@@ -174,7 +174,7 @@
</definition>
</include>

<include name="image-56-focus">
<include name="image-521-focus">
<param name="fallback">DefaultVideos.png</param>
<param name="visible">False</param>
<definition>
Oops, something went wrong.
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.