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

Diff #1

Open
wants to merge 2 commits into
base: omega
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Expand Up @@ -9,4 +9,5 @@
*.DS_Store
*.sh
16x9/script-skinshortcuts-includes.xml
16x9/Custom_Overlay.xml
16x9/Custom_Overlay.xml
16x9/Custom_Debug_Overlay.xml
4 changes: 2 additions & 2 deletions 16x9/Custom_1115_ViewSettings.xml
Expand Up @@ -28,8 +28,8 @@
<include condition="String.IsEqual(Container.Viewmode,$LOCALIZE[31219])">View53SettingsInfoList1</include>
<include condition="String.IsEqual(Container.Viewmode,$LOCALIZE[31221])">View54SettingsInfoList2</include>
<include condition="String.IsEqual(Container.Viewmode,$LOCALIZE[31223])">View55SettingsLowList</include>
<include condition="String.IsEqual(Container.Viewmode,$LOCALIZE[31225])">View56Settings3Panel</include>
<include condition="String.IsEqual(Container.Viewmode,$LOCALIZE[31233])">View57Settings3PanelSquare</include>
<include condition="String.IsEqual(Container.Viewmode,$LOCALIZE[31233])">View56Settings3Panel</include>
<include condition="String.IsEqual(Container.Viewmode,$LOCALIZE[31225])">View57Settings3PanelSquare</include>
<include condition="String.IsEqual(Container.Viewmode,$LOCALIZE[31071])">View58SettingsRightList</include>
<include condition="String.IsEqual(Container.Viewmode,$LOCALIZE[31239])">View500SettingsPortrait</include>
<include condition="String.IsEqual(Container.Viewmode,$LOCALIZE[31241])">View501SettingsSquare</include>
Expand Down
8 changes: 4 additions & 4 deletions 16x9/Custom_1116_ViewMode.xml
Expand Up @@ -53,28 +53,28 @@
<control type="button" id="155">
<visible>Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(artists) | Container.Content(albums) | Container.Content(songs) | Container.Content(addons) | Container.Content(musicvideos)</visible>
<visible>!Window.IsVisible(MyPlaylist.xml) + !Skin.HasSetting(DisableViewLow)</visible>
<label>$LOCALIZE[391]</label>
<label>$LOCALIZE[31972]</label>
<onclick>Container.SetViewMode(55)</onclick>
<include>MediaMenuButtonViewType</include>
</control>
<control type="button" id="156">
<visible>Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes)</visible>
<visible>!Window.IsVisible(MyPlaylist.xml) + !Skin.HasSetting(DisableView3Panel)</visible>
<label>$LOCALIZE[31225]</label>
<label>$LOCALIZE[31233]</label>
<onclick>Container.SetViewMode(56)</onclick>
<include>MediaMenuButtonViewType</include>
</control>
<control type="button" id="157">
<visible>Container.Content(artists) | Container.Content(albums) | Container.Content(songs) | Container.Content(addons) | Container.Content(musicvideos)</visible>
<visible>!Window.IsVisible(MyPlaylist.xml) + !Skin.HasSetting(DisableView3PanelSquare)</visible>
<label>$LOCALIZE[31233]</label>
<label>$LOCALIZE[31225]</label>
<onclick>Container.SetViewMode(57)</onclick>
<include>MediaMenuButtonViewType</include>
</control>
<control type="button" id="158">
<visible>Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(artists) | Container.Content(albums) | Container.Content(songs) | Container.Content(musicvideos)</visible>
<visible>!Window.IsVisible(MyPlaylist.xml) + !Skin.HasSetting(DisableViewRightList)</visible>
<label>$LOCALIZE[31279]</label>
<label>$LOCALIZE[31071]</label>
<onclick>Container.SetViewMode(58)</onclick>
<include>MediaMenuButtonViewType</include>
</control>
Expand Down
2 changes: 1 addition & 1 deletion 16x9/Custom_1118_ViewModePVR.xml
Expand Up @@ -30,7 +30,7 @@
<include>MediaMenuButtonViewType</include>
</control>
<control type="button" id="151">
<label>$LOCALIZE[535]</label>
<label>$LOCALIZE[31215]</label>
<onclick>Container.SetViewMode(51)</onclick>
<include>MediaMenuButtonViewType</include>
</control>
Expand Down
102 changes: 102 additions & 0 deletions 16x9/DialogColorPicker.xml
@@ -0,0 +1,102 @@
<?xml version="1.0" encoding="UTF-8"?>
<window>
<defaultcontrol>6</defaultcontrol>
<include>AnimationDialogPopupWindow</include>
<onunload>ClearProperty(colorstring)</onunload>
<controls>
<control type="group">
<include content="DialogBackground">
<description>Window Header Label</description>
<param name="width" value="953"/>
<param name="height" value="535"/>
<param name="id">1</param>
<param name="diffusetexture">diffuse/rounded10-877x470.png</param>
</include>
<!-- Left Side Panel -->
<control type="grouplist" id="9">
<left>20</left>
<top>90</top>
<width>350</width>
<height>420</height>
<onright>60</onright>
<control type="button" id="7">
<description>Cancel Button</description>
<width>350</width>
<include>DialogButton</include>
</control>
</control>
<control type="image">
<top>90</top>
<left>370</left>
<bottom>71</bottom>
<width>4</width>
<texture colordiffuse="$VAR[PanelListSeparatorColorVar]">panels/line-vertical.png</texture>
</control>
<control type="image">
<bottom>70</bottom>
<left>20</left>
<right>20</right>
<height>70</height>
<texture border="30" colordiffuse="$VAR[PanelListSeparatorColorVar]">buttons/list-select-nofocus.png</texture>
</control>
<!-- Color picker panel -->
<control type="panel" id="6">
<left>391</left>
<top>110</top>
<width>504</width>
<height>336</height>
<pagecontrol>60</pagecontrol>
<onleft>60</onleft>
<include>ContainerScrollTime</include>
<viewtype label="100">icon</viewtype>
<itemlayout height="84" width="84">
<control type="image">
<width>84</width>
<height>84</height>
<bordersize>1</bordersize>
<texture colordiffuse="$INFO[ListItem.Label2]">colors/white.png</texture>
</control>
</itemlayout>
<focusedlayout height="84" width="84">
<control type="group">
<animation effect="zoom" time="200" tween="sine" easing="inout" start="100" end="124" center="auto">Focus</animation>
<control type="image">
<width>84</width>
<height>84</height>
<texture colordiffuse="$INFO[ListItem.Label2]">colors/white.png</texture>
<bordertexture border="5">colors/black.png</bordertexture>
<bordersize>5</bordersize>
</control>
</control>
</focusedlayout>
</control>
<control type="label">
<description>Color pallette page counter</description>
<bottom>21</bottom>
<right>60</right>
<width>460</width>
<height>50</height>
<align>right</align>
<font>Font25_Cond</font>
<textcolor>$VAR[PanelSubTextColorVar]</textcolor>
<label>$INFO[Container(6).NumItems,, $LOCALIZE[14078]]$INFO[Container(6).CurrentPage, - $LOCALIZE[31000] (]$INFO[Container(6).NumPages,/,)]</label>
</control>
<control type="label">
<description>Selected color label</description>
<bottom>21</bottom>
<left>60</left>
<width>460</width>
<height>50</height>
<font>Font25_Cond</font>
<textcolor>$VAR[PanelSubTextColorVar]</textcolor>
<label>$INFO[ListItem.Label]$INFO[ListItem.Label2, #]</label>
</control>
<control type="scrollbar" id="60">
<onleft>9</onleft>
<onright>6</onright>
<left>350</left>
<include>DialogScrollBar</include>
</control>
</control>
</controls>
</window>
206 changes: 31 additions & 175 deletions 16x9/DialogContextMenu.xml
@@ -1,183 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<window>
<defaultcontrol>996</defaultcontrol>
<controls>
<control type="group">
<defaultcontrol>1000</defaultcontrol>
<controls>
<include>AnimationDialogPopupWindow</include>
<include>DialogBackgroundFade</include>
<control type="image" id="999">
<width>500</width>
<height>1040</height>
<texture colordiffuse="$VAR[PanelStyleColorVar]" border="30">$VAR[DialogStyleVar]</texture>
</control>
<control type="grouplist" id="996">
<width>500</width>
<height>720</height>
<include content="DialogContextMenuShadow">
<param name="height">180</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,1)</param>
</include>
<include content="DialogContextMenuShadow">
<param name="height">240</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,2)</param>
</include>
<include content="DialogContextMenuShadow">
<param name="height">300</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,3)</param>
</include>
<include content="DialogContextMenuShadow">
<param name="height">360</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,4)</param>
</include>
<include content="DialogContextMenuShadow">
<param name="height">420</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,5)</param>
</include>
<include content="DialogContextMenuShadow">
<param name="height">480</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,6)</param>
</include>
<include content="DialogContextMenuShadow">
<param name="height">540</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,7)</param>
</include>
<include content="DialogContextMenuShadow">
<param name="height">600</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,8)</param>
</include>
<include content="DialogContextMenuShadow">
<param name="height">660</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,9)</param>
</include>
<include content="DialogContextMenuShadow">
<param name="height">720</param>
<param name="visible">Integer.IsGreater(Container(996).NumItems,9)</param>
</include>
<control type="image" id="999">
<left>0</left>
<top>0</top>
<width>500</width>
<height>720</height>
<texture colordiffuse="$VAR[PanelStyleColorVar]" border="30">$VAR[DialogStyleVar]</texture>
</control>
<include content="DialogContextMenuTexture">
<param name="height">140</param>
<param name="diffuse">diffuse/rounded10-460x140.png</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,1)</param>
</include>
<include content="DialogContextMenuTexture">
<param name="height">200</param>
<param name="diffuse">diffuse/rounded10-460x200.png</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,2)</param>
</include>
<include content="DialogContextMenuTexture">
<param name="height">260</param>
<param name="diffuse">diffuse/rounded10-460x260.png</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,3)</param>
</include>
<include content="DialogContextMenuTexture">
<param name="height">320</param>
<param name="diffuse">diffuse/rounded10-460x320.png</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,4)</param>
</include>
<include content="DialogContextMenuTexture">
<param name="height">380</param>
<param name="diffuse">diffuse/rounded10-460x380.png</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,5)</param>
</include>
<include content="DialogContextMenuTexture">
<param name="height">440</param>
<param name="diffuse">diffuse/rounded10-460x440.png</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,6)</param>
</include>
<include content="DialogContextMenuTexture">
<param name="height">500</param>
<param name="diffuse">diffuse/rounded10-460x500.png</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,7)</param>
</include>
<include content="DialogContextMenuTexture">
<param name="height">560</param>
<param name="diffuse">diffuse/rounded10-460x560.png</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,8)</param>
</include>
<include content="DialogContextMenuTexture">
<param name="height">620</param>
<param name="diffuse">diffuse/rounded10-460x620.png</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,9)</param>
</include>
<include content="DialogContextMenuTexture">
<param name="height">680</param>
<param name="diffuse">diffuse/rounded10-460x680.png</param>
<param name="visible">Integer.IsGreater(Container(996).NumItems,9)</param>
</include>
<include content="DialogContextMenuEmboss">
<param name="height">180</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,1)</param>
</include>
<include content="DialogContextMenuEmboss">
<param name="height">240</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,2)</param>
</include>
<include content="DialogContextMenuEmboss">
<param name="height">300</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,3)</param>
</include>
<include content="DialogContextMenuEmboss">
<param name="height">360</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,4)</param>
</include>
<include content="DialogContextMenuEmboss">
<param name="height">420</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,5)</param>
</include>
<include content="DialogContextMenuEmboss">
<param name="height">480</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,6)</param>
</include>
<include content="DialogContextMenuEmboss">
<param name="height">540</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,7)</param>
</include>
<include content="DialogContextMenuEmboss">
<param name="height">600</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,8)</param>
</include>
<include content="DialogContextMenuEmboss">
<param name="height">660</param>
<param name="visible">Integer.IsEqual(Container(996).NumItems,9)</param>
</include>
<include content="DialogContextMenuEmboss">
<param name="height">720</param>
<param name="visible">Integer.IsGreater(Container(996).NumItems,9)</param>
</include>
<control type="image">
<top>-10</top>
<height max="1000">auto</height>
<left>20</left>
<usecontrolcoords>true</usecontrolcoords>
<include>ContainerScrollTime</include>
<control type="image">
<top>-20</top>
<include>DialogHorizontalSeparator</include>
</control>
<control type="image">
<left>230</left>
<top>20</top>
<width>40</width>
<height>40</height>
<texture flipy="true" colordiffuse="$VAR[PanelHighlightColorVar]">icons/default/arrowdown.png</texture>
<include>AnimationVisibleFade</include>
<visible>Container(996).HasPrevious</visible>
</control>
<control type="image">
<left>230</left>
<top>660</top>
<width>40</width>
<height>40</height>
<texture colordiffuse="$VAR[PanelHighlightColorVar]">icons/default/arrowdown.png</texture>
<include>AnimationVisibleFade</include>
<visible>Container(996).HasNext</visible>
</control>
<control type="grouplist" id="996">
<top>60</top>
<bottom>20</bottom>
<left>20</left>
<width>460</width>
<height max="600">auto</height>
<usecontrolcoords>true</usecontrolcoords>
<include>ContainerScrollTime</include>
</control>
<control type="button" id="1000">
</control>
<control type="button" id="2007">
<include>DialogButtonContextMenu</include>
</control>
</control>
</controls>
<label>$LOCALIZE[31976]</label>
<visible>Container.Content(artists) | Container.Content(actors) | Container.Content(directors)</visible>
<onclick>ActivateWindow(videos,plugin://plugin.video.youtube/kodion/search/query/?q=$INFO[ListItem.Label],return)</onclick>
</control>
<control type="button" id="2009">
<include>DialogButtonContextMenu</include>
<label>$LOCALIZE[31976]</label>
<visible>Container.Content(albums) | Container.Content(songs)</visible>
<onclick>ActivateWindow(videos,plugin://plugin.video.youtube/kodion/search/query/?q=$INFO[ListItem.Artist] $INFO[ListItem.Label],return)</onclick>
</control>
</control>
<control type="button" id="1000">
<include>DialogButtonContextMenu</include>
</control>
</controls>
</window>