Skip to content

Commit

Permalink
Update looks, remove unused stuff, use new call for TV Shelf
Browse files Browse the repository at this point in the history
  • Loading branch information
pecinko committed Feb 23, 2015
1 parent d7e0834 commit 43f368d
Show file tree
Hide file tree
Showing 45 changed files with 36 additions and 77 deletions.
21 changes: 9 additions & 12 deletions 1080i/DialogSeekBar.xml
View file
Expand Up @@ -32,25 +32,22 @@
<control type="label" description="End time">
<posx>60r</posx>
<posy>0</posy>
<width>195</width>
<width>300</width>
<height>60</height>
<align>right</align>
<aligny>center</aligny>
<font>size18</font>
<textcolor>Silver</textcolor>
<label>$INFO[Player.FinishTime,(,)]</label>
<label>[COLOR=FF636363]$LOCALIZE[31049]:[/COLOR] $INFO[Player.FinishTime]</label>
</control>
<control type="label" description="Next item">
<visible>!IsEmpty(VideoPlayer.NextTitle)</visible>
<posx>300</posx>
<posy>1</posy>
<width>1320</width>
<control type="label" description="title">
<centerleft>960</centerleft>
<posy>0</posy>
<width>1200</width>
<height>60</height>
<align>center</align>
<aligny>center</aligny>
<font>size17</font>
<textcolor>Silver</textcolor>
<label>$INFO[VideoPlayer.NextTitle,[COLOR=Grey]$LOCALIZE[209]: [/COLOR]]</label>
<label>$INFO[VideoPlayer.TVShowTitle,,[COLOR=HL] • [/COLOR]]$INFO[VideoPlayer.Season,,.]$INFO[VideoPlayer.Episode,,[COLOR=HL] • [/COLOR]]$INFO[VideoPlayer.ChannelNumber,,.]$INFO[VideoPlayer.ChannelName,,: ]$INFO[VideoPlayer.Artist,, - ]$INFO[VideoPlayer.Album,, - ]$INFO[VideoPlayer.Title]</label>
</control>
</control>
<control type="group">
Expand Down Expand Up @@ -114,7 +111,7 @@
</control>
</control>
<control type="group">
<posy>1028</posy>
<posy>1014</posy>
<!--<control type="image" description="Real Background">
<posx>299</posx>
<posy>6</posy>
Expand Down Expand Up @@ -189,7 +186,7 @@
</control>
</control>
<control type="group">
<posy>1022</posy>
<posy>1008</posy>
<posx>0</posx>
<control type="image" description="Buffer icon">
<visible>Player.Caching</visible>
Expand Down
31 changes: 0 additions & 31 deletions 1080i/Includes.xml
View file
Expand Up @@ -52,7 +52,6 @@
<texture background="true" fallback="img/BlackDot.png">$INFO[ListItem.Art(fanart)]</texture>
</control>
<control type="image" description="BG">
<visible>![Control.IsVisible(56) | Control.IsVisible(58) | Control.IsVisible(510)]</visible>
<posx>0</posx>
<posy>0</posy>
<width>100%</width>
Expand All @@ -61,36 +60,6 @@
<texture>img/BGOverlay.png</texture>
<colordiffuse>Overlay</colordiffuse>
</control>
<control type="image">
<visible>Control.IsVisible(56)</visible>
<include>Dimensions_Fullscreen</include>
<texture>img/Vignette_57.png</texture>
<aspectratio>stretch</aspectratio>
<colordiffuse>Overlay</colordiffuse>
</control>
<control type="image">
<visible>Control.IsVisible(58)</visible>
<include>Dimensions_Fullscreen</include>
<texture>img/Vignette_58.png</texture>
<aspectratio>stretch</aspectratio>
<colordiffuse>Overlay</colordiffuse>
</control>
<control type="image">
<visible>Control.IsVisible(510)</visible>
<visible>Container.Content(episodes)</visible>
<include>Dimensions_Fullscreen</include>
<texture>img/Vignette_500.png</texture>
<colordiffuse>Overlay</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<control type="image">
<visible>Control.IsVisible(510)</visible>
<visible>!Container.Content(episodes)</visible>
<include>Dimensions_Fullscreen</include>
<texture>img/Vignette_58.png</texture>
<colordiffuse>Overlay</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
</include>
<include name="MiniBackground">
<control type="image" description="Default BG">
Expand Down
3 changes: 2 additions & 1 deletion 1080i/Includes_Shelf_Items.xml
View file
Expand Up @@ -91,7 +91,8 @@
<content target="video">special://skin/playlists/episodes.xsp</content>
</include>
<include name="TV_NextUp_Items">
<content target="video">plugin://service.quartz.tvshelf/?reload=$INFO[Window.Property(recentepisodes)]</content>
<!--<content target="video">plugin://service.quartz.tvshelf/?reload=$INFO[Window.Property(quartz_tvshelf)]</content>-->
<content target="video">plugin://service.quartz.tvshelf/,$INFO[Window.Property(quartz_tvshelf)]</content>
</include>
<include name="TV_Custom_Items">
<content>
Expand Down
6 changes: 3 additions & 3 deletions 1080i/MyVideoNav.xml
View file
Expand Up @@ -28,7 +28,7 @@
<width>201</width>
<height>210</height>
<texturenofocus>-</texturenofocus>
<texturefocus border="12">HUD/HUDBackground.png</texturefocus>
<texturefocus border="12">HUD/ScrollVertical.png</texturefocus>
<label>$INFO[ListItem.SortLetter]</label>
<font>Scroll</font>
<onleft>50</onleft>
Expand All @@ -46,7 +46,7 @@
<width>201</width>
<height>210</height>
<texturenofocus>-</texturenofocus>
<texturefocus border="12">HUD/HUDBackground.png</texturefocus>
<texturefocus border="12">HUD/ScrollVertical.png</texturefocus>
<label>$INFO[ListItem.SortLetter]</label>
<font>Scroll</font>
<onup>50</onup>
Expand All @@ -64,7 +64,7 @@
<width>201</width>
<height>210</height>
<texturenofocus>-</texturenofocus>
<texturefocus border="12">HUD/HUDBackground.png</texturefocus>
<texturefocus border="12">HUD/ScrollHorizontal.png</texturefocus>
<label>$INFO[ListItem.SortLetter]</label>
<font>Scroll</font>
<onup>50</onup>
Expand Down
14 changes: 7 additions & 7 deletions 1080i/VideoOSD.xml
View file
Expand Up @@ -31,7 +31,7 @@
<height>57</height>
<texturenofocus>OSD/Stop.png</texturenofocus>
<texturefocus>OSD/StopFocused.png</texturefocus>
<onup>607</onup>
<onup>606</onup>
<onleft>607</onleft>
<onright>601</onright>
<onclick>XBMC.PlayerControl(Stop)</onclick>
Expand All @@ -42,7 +42,7 @@
<height>57</height>
<texturenofocus>OSD/SkipBack.png</texturenofocus>
<texturefocus>OSD/SkipBackFocused.png</texturefocus>
<onup>607</onup>
<onup>606</onup>
<onleft>600</onleft>
<onright>602</onright>
<onclick>XBMC.PlayerControl(Previous)</onclick>
Expand All @@ -55,7 +55,7 @@
<texturefocus>OSD/RewindFocused.png</texturefocus>
<onleft>601</onleft>
<onright>603</onright>
<onup>607</onup>
<onup>606</onup>
<onclick>XBMC.PlayerControl(Rewind)</onclick>
</control>
<control type="togglebutton" id="603">
Expand All @@ -69,7 +69,7 @@
<alttexturefocus>OSD/PauseFocused.png</alttexturefocus>
<onleft>602</onleft>
<onright>604</onright>
<onup>607</onup>
<onup>606</onup>
<onclick>XBMC.PlayerControl(Play)</onclick>
</control>
<control type="button" id="604">
Expand All @@ -80,7 +80,7 @@
<texturefocus>OSD/FastForwardFocused.png</texturefocus>
<onleft>603</onleft>
<onright>605</onright>
<onup>607</onup>
<onup>606</onup>
<onclick>XBMC.PlayerControl(Forward)</onclick>
</control>
<control type="button" id="605">
Expand All @@ -91,7 +91,7 @@
<texturefocus>OSD/SkipForwardFocused.png</texturefocus>
<onleft>604</onleft>
<onright>606</onright>
<onup>607</onup>
<onup>606</onup>
<onclick>XBMC.PlayerControl(Next)</onclick>
</control>
<control type="button" id="606">
Expand All @@ -102,7 +102,7 @@
<texturefocus>OSD/DVDFocused.png</texturefocus>
<onleft>605</onleft>
<onright>607</onright>
<onup>607</onup>
<onup>606</onup>
<onclick allowhiddenfocus="true">Control.SetFocus(101)</onclick>
</control>
<!--<control type="button" id="607">
Expand Down
12 changes: 6 additions & 6 deletions 1080i/VideoOSDSettings.xml
View file
Expand Up @@ -5,27 +5,27 @@
<include>OpenClose</include>
<controls>
<control type="group">
<posx>1020</posx>
<centerleft>50%</centerleft>
<posy>0</posy>
<width>1110</width>
<animation effect="fade" end="0" time="400" condition="Window.IsVisible(SliderDialog) | Window.IsVisible(FileBrowser)">Conditional</animation>
<control type="image" description="background image">
<centerright>465</centerright>
<centertop>50%</centertop>
<centertop>50%</centertop>
<posy>0</posy>
<width>1110</width>
<height>1200</height>
<texture border="128">img/DialogPanelST.png</texture>
<aspectratio>stretch</aspectratio>
</control>
<control type="label" id="2" description="Settings">
<posx>45</posx>
<posx>30</posx>
<posy>0</posy>
<width>780</width>
<width>1050</width>
<font>size24B</font>
<align>center</align>
</control>
<control type="grouplist" id="5" description="Control Area">
<posx>15</posx>
<posx>135</posx>
<posy>84</posy>
<width>840</width>
<height>920</height>
Expand Down
20 changes: 6 additions & 14 deletions 1080i/View_500.xml
View file
Expand Up @@ -3,14 +3,6 @@
<include name="View_500" description="All Video Views">
<control type="group" description="Fanart 3">
<visible>Control.IsVisible(500)</visible>
<control type="image" description="Line Split">
<top>645</top>
<centerleft>960</centerleft>
<width>2400</width>
<height>1</height>
<texture>img/Line.png</texture>
<aspectratio>stretch</aspectratio>
</control>
<control type="fixedlist" id="500" description="TOP Shortcuts">
<visible>Container.content(movies) | container.content(seasons) | Container.content(tvshows)</visible>
<pagecontrol>60</pagecontrol>
Expand Down Expand Up @@ -100,39 +92,39 @@
</control>
<control type="group" description="Media Info">
<left>82</left>
<top>162</top>
<top>132</top>
<control type="label" description="Item Title">
<top>96</top>
<font>size22B</font>
<textcolor>HL</textcolor>
<width>789</width>
<width>900</width>
<include>Genre51Commons</include>
<info>ListItem.Label</info>
</control>
<control type="label" description="MPAA">
<top>157</top>
<height>33</height>
<width>1100</width>
<width>900</width>
<include>Genre500Commons</include>
<label>$INFO[ListItem.MPAA]</label>
</control>
<control type="label" description="Details">
<top>198</top>
<height>33</height>
<width>1100</width>
<width>900</width>
<include>Genre500Commons</include>
<label>$VAR[500TopLabel]$VAR[Trailer, • ]</label>
</control>
<control type="label" description="Genre">
<top>236</top>
<width>1100</width>
<width>900</width>
<include>Genre500Commons</include>
<label>$INFO[ListItem.Genre]</label>
</control>
<control type="textbox" description="Plot">
<top>290</top>
<posx>0</posx>
<width>1200</width>
<width>900</width>
<height>170</height>
<align>left</align>
<label>$VAR[Plots]</label>
Expand Down
4 changes: 2 additions & 2 deletions addon.xml
View file
@@ -1,4 +1,4 @@
<addon id="skin.quartz" version="5.1.6" name="Quartz" provider-name="Pecinko">
<addon id="skin.quartz" version="5.1.7" name="Quartz" provider-name="Pecinko">
<requires>
<import addon="xbmc.gui" version="5.3.0"/>
<import addon="script.favourites" version="4.0.4"/>
Expand All @@ -10,6 +10,6 @@
<extension point="xbmc.addon.metadata">
<platform>all</platform>
<summary lang="en">Apple TV style skin</summary>
<description lang="en">Inspired by Apple TV interface Quartz brings easy to use, fast and flexible user interface. If you believe that sometimes less means more, you might feel right at home with Quartz. Skin graphics by CloudDweller and Pecinko.</description>
<description lang="en">Easy to use, fast and flexible user interface. If you believe that sometimes less means more, you might feel right at home with Quartz. Skin graphics by CloudDweller and Pecinko.</description>
</extension>
</addon>
2 changes: 1 addition & 1 deletion language/English/strings.xml
View file
Expand Up @@ -37,7 +37,7 @@
<string id="31046">Audio Properties</string>
<string id="31047">Current Preset</string>
<string id="31048">Visualization Presets</string>
<string id="31049">End Time</string>
<string id="31049">Ends</string><!--Time when currently playing video will end -->


<!-- Playlist Editor labels -->
Expand Down
Binary file added media/HUD/ScrollHorizontal.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/HUD/ScrollVertical.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed media/HUD/_Notification copy.png
View file
Binary file not shown.
Binary file added media/img/FanartInfo.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/img/FanartInfo2.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed media/img/Vignette_500 copy.png
View file
Binary file not shown.
Binary file removed media/img/Vignette_500.png
View file
Binary file not shown.
Binary file removed media/img/Vignette_57 copy.png
View file
Binary file not shown.
Binary file removed media/img/Vignette_57.png
View file
Binary file not shown.
Binary file removed media/img/Vignette_58 copy.png
View file
Binary file not shown.
Binary file removed media/img/Vignette_58.png
View file
Binary file not shown.
Binary file removed media/img/Vignette_Coverflow.png
View file
Binary file not shown.
Binary file removed media/img/Vignette_Info.png
View file
Binary file not shown.
Binary file removed media/img/Vignette_MoviesCoverflow.png
View file
Binary file not shown.
Binary file removed media/img/Vignette_VideoInfo.png
View file
Binary file not shown.
Binary file modified media/img/WhiteDotT.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed media/img/_ _HomeBarFO.png
View file
Binary file not shown.
Binary file removed media/img/_BaseBGD copy.png
View file
Binary file not shown.
Binary file removed media/img/_DialogNew copy.png
View file
Binary file not shown.
Binary file removed media/img/_DialogPanel copy.png
View file
Binary file not shown.
Binary file removed media/img/_DialogPanel.png
View file
Binary file not shown.
Binary file removed media/img/_Frame25.png
View file
Binary file not shown.
Binary file removed media/img/_HomeBarFO.png
View file
Binary file not shown.
Binary file removed media/img/_HomeBarNF.png
View file
Binary file not shown.
Binary file removed media/img/_MediaButton.png
View file
Binary file not shown.
Binary file removed media/img/_PlainDialog2.png
View file
Diff not rendered.
Binary file removed media/img/_SettingsButtonFO.png
View file
Diff not rendered.
Binary file removed media/img/_SettingsButtonNF.png
View file
Diff not rendered.
Binary file removed media/img/_ThumbBG.png
View file
Diff not rendered.
Binary file removed media/img/_ThumbBGWide.png
View file
Diff not rendered.
Binary file removed media/img/_XBMCHomeLogo.png
View file
Diff not rendered.
Binary file removed media/img/_XBMCLogo.png
View file
Diff not rendered.
Binary file removed media/img/__HomeBarFO.png
View file
Diff not rendered.
Binary file removed media/img/__HomeBarNF.png
View file
Diff not rendered.
Binary file removed media/img/__PlainDialog.png
View file
Diff not rendered.
Binary file removed media/img/__SettingsButtonFO.png
View file
Diff not rendered.

0 comments on commit 43f368d

Please sign in to comment.