Skip to content
This repository has been archived by the owner on Oct 9, 2024. It is now read-only.

Commit

Permalink
change media source dialog layout - #92
Browse files Browse the repository at this point in the history
  • Loading branch information
@jurialmunkey
jurialmunkey committed Jun 7, 2022
1 parent debbdee commit 964e66f
Show file tree
Hide file tree
Showing 4 changed files with 114 additions and 113 deletions.
1 change: 1 addition & 0 deletions 1080i/DialogKeyboard.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<include content="Object_Keyboard_Button" description="Text Entry">
<param name="id" value="312" />
<param name="control" value="edit" />
<align>center</align>
<width>100%</width>
<ondown>9002</ondown>
<font>font_medium</font>
Expand Down
222 changes: 110 additions & 112 deletions 1080i/DialogMediaSource.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<window>
<defaultcontrol always="true">10</defaultcontrol>
<defaultcontrol always="true">11</defaultcontrol>
<controls>

<include>Object_Overlay</include>
Expand All @@ -12,136 +12,134 @@
<visible>!$EXP[Exp_OverlayDialogs]</visible>
</include>
<control type="group">
<right>dialog_button_width_padded</right>
<control type="group">
<height>row_height_x200</height>
<include content="Dialog_Group">
<include content="Object_Keyboard_Button" description="Text Entry">
<param name="id" value="12" />
<param name="control" value="edit" />
<width>100%</width>
<onup>SetFocus(10,9999,absolute)</onup>
<ondown>SetFocus(10,0,absolute)</ondown>
<textoffsetx>dialog_pad</textoffsetx>
</include>
<height>row_height_x200</height>
<include content="Dialog_Group">
<include content="Object_Keyboard_Button" description="Text Entry">
<param name="id" value="12" />
<param name="control" value="edit" />
<width>100%</width>
<ondown>11</ondown>
<textoffsetx>dialog_pad</textoffsetx>
</include>
</control>
</include>
</control>
<control type="group">
<top>row_height_x200</top>
<include>Dialog_Overlay_V</include>
<include>Object_Separator_V</include>
<control type="group">
<top>row_height_x200</top>
<include>Dialog_Overlay_V</include>
<include>Object_Separator_V</include>
<control type="group">
<include content="List_DialogSelect">
<param name="id" value="10" />
<param name="altfocus" value="Control.HasFocus(10) | Control.HasFocus(11) | Control.HasFocus(13) | Control.HasFocus(14)" />
<param name="itemlayout_include" value="Layout_DialogBasic" />
<pagecontrol>61</pagecontrol>
<onleft>11</onleft>
<onright>61</onright>
<onup>12</onup>
<ondown>12</ondown>
</include>
<include content="List_DialogSelect">
<param name="id" value="10" />
<param name="altfocus" value="Control.HasFocus(10) | Control.HasFocus(11) | Control.HasFocus(13) | Control.HasFocus(14) | Control.HasFocus(9001)" />
<param name="itemlayout_include" value="Layout_DialogBasic" />
<param name="misc" value="320" />
<onleft>13</onleft>
<onright>11</onright>
<onup>12</onup>
<ondown>9000</ondown>
<bottom>row_height_x200</bottom>
</include>

<control type="grouplist">
<orientation>horizontal</orientation>
<height>row_height</height>
<align>right</align>
<right>row_height_x50</right>
<itemgap>48</itemgap>
<onleft>14</onleft>
<onright>10</onright>
<onup condition="Container(10).Position(0)">12</onup>
<onup condition="!Container(10).Position(0)">Control.Move(10,-1)</onup>
<ondown condition="!String.IsEmpty(Container(10).ListItemNoWrap(1).Label)">Control.Move(10,1)</ondown>
<ondown condition="String.IsEmpty(Container(10).ListItemNoWrap(1).Label)">12</ondown>
<animation effect="slide" start="0" end="0,row_height" condition="Container(10).Position(1)">Conditional</animation>
<animation effect="slide" start="0" end="0,row_height_x200" condition="Container(10).Position(2)">Conditional</animation>
<animation effect="slide" start="0" end="0,row_height_x300" condition="Container(10).Position(3)">Conditional</animation>
<animation effect="slide" start="0" end="0,row_height_x400" condition="Container(10).Position(4)">Conditional</animation>
<animation effect="slide" start="0" end="0,row_height_x500" condition="Container(10).Position(5)">Conditional</animation>
<animation effect="slide" start="0" end="0,row_height_x600" condition="Container(10).Position(6)">Conditional</animation>
<animation effect="slide" start="0" end="0,row_height_x700" condition="Container(10).Position(7)">Conditional</animation>
<animation effect="slide" start="0" end="0,row_height_x800" condition="Container(10).Position(8)">Conditional</animation>
<visible allowhiddenfocus="true">Control.HasFocus(10) | Control.HasFocus(11) | Control.HasFocus(13) | Control.HasFocus(14)</visible>
<control type="button" id="14">
<width>32</width>
<height>32</height>
<centertop>50%</centertop>
<hitrect x="-24" y="-24" w="80" h="80" />
<texturenofocus colordiffuse="80ffffff">buttons/cross.png</texturenofocus>
<texturefocus colordiffuse="$VAR[ColorSelected]">buttons/cross.png</texturefocus>
<font />
<textcolor>00ffffff</textcolor>
<selectedcolor>00ffffff</selectedcolor>
<focusedcolor>00ffffff</focusedcolor>
<visible>Control.IsEnabled(14)</visible>
</control>
<control type="button" id="13">
<width>32</width>
<height>32</height>
<centertop>50%</centertop>
<hitrect x="-24" y="-24" w="80" h="80" />
<texturenofocus colordiffuse="80ffffff">buttons/plus.png</texturenofocus>
<texturefocus colordiffuse="$VAR[ColorSelected]">buttons/plus.png</texturefocus>
<font />
<textcolor>00ffffff</textcolor>
<selectedcolor>00ffffff</selectedcolor>
<focusedcolor>00ffffff</focusedcolor>
<visible>Control.IsEnabled(13)</visible>
</control>
<control type="button" id="11">
<width>32</width>
<height>32</height>
<centertop>50%</centertop>
<hitrect x="-24" y="-24" w="80" h="80" />
<texturenofocus colordiffuse="80ffffff">buttons/browse.png</texturenofocus>
<texturefocus colordiffuse="$VAR[ColorSelected]">buttons/browse.png</texturefocus>
<font />
<textcolor>00ffffff</textcolor>
<selectedcolor>00ffffff</selectedcolor>
<focusedcolor>00ffffff</focusedcolor>
<visible>Control.IsEnabled(11)</visible>
</control>
<control type="group" id="1000">
<width>32</width>
<height>32</height>
<centertop>50%</centertop>
<control type="image">
<texture colordiffuse="80ffffff">buttons/editname.png</texture>
<visible>!Control.HasFocus(10)</visible>
</control>
<control type="image">
<texture colordiffuse="$VAR[ColorSelected]">buttons/editname.png</texture>
<visible>Control.HasFocus(10)</visible>
</control>
</control>
<control type="grouplist">
<orientation>horizontal</orientation>
<height>row_height</height>
<align>right</align>
<right>row_height_x50</right>
<itemgap>48</itemgap>
<onleft>14</onleft>
<onright>11</onright>
<onup condition="Integer.IsEqual(Container(10).CurrentItem,1)">12</onup>
<onup condition="!Integer.IsEqual(Container(10).CurrentItem,1)">Control.Move(10,-1)</onup>
<ondown condition="!String.IsEmpty(Container(10).ListItemNoWrap(1).Label)">Control.Move(10,1)</ondown>
<ondown condition="String.IsEmpty(Container(10).ListItemNoWrap(1).Label)">9000</ondown>
<animation effect="slide" start="0" end="0,row_height" condition="Container(10).Position(1)">Conditional</animation>
<animation effect="slide" start="0" end="0,row_height_x200" condition="Container(10).Position(2)">Conditional</animation>
<animation effect="slide" start="0" end="0,row_height_x300" condition="Container(10).Position(3)">Conditional</animation>
<animation effect="slide" start="0" end="0,row_height_x400" condition="Container(10).Position(4)">Conditional</animation>
<animation effect="slide" start="0" end="0,row_height_x500" condition="Container(10).Position(5)">Conditional</animation>
<animation effect="slide" start="0" end="0,row_height_x600" condition="Container(10).Position(6)">Conditional</animation>
<animation effect="slide" start="0" end="0,row_height_x700" condition="Container(10).Position(7)">Conditional</animation>
<animation effect="slide" start="0" end="0,row_height_x800" condition="Container(10).Position(8)">Conditional</animation>
<visible allowhiddenfocus="true">Control.HasFocus(10) | Control.HasFocus(11) | Control.HasFocus(13) | Control.HasFocus(14) | Control.HasFocus(9001)</visible>
<control type="button" id="14">
<width>32</width>
<height>32</height>
<centertop>50%</centertop>
<hitrect x="-24" y="-24" w="80" h="80" />
<texturenofocus colordiffuse="80ffffff">buttons/cross.png</texturenofocus>
<texturefocus colordiffuse="$VAR[ColorSelected]">buttons/cross.png</texturefocus>
<font />
<textcolor>00ffffff</textcolor>
<selectedcolor>00ffffff</selectedcolor>
<focusedcolor>00ffffff</focusedcolor>
<visible>Control.IsEnabled(14)</visible>
</control>
<control type="button" id="13">
<width>32</width>
<height>32</height>
<centertop>50%</centertop>
<hitrect x="-24" y="-24" w="80" h="80" />
<texturenofocus colordiffuse="80ffffff">buttons/plus.png</texturenofocus>
<texturefocus colordiffuse="$VAR[ColorSelected]">buttons/plus.png</texturefocus>
<font />
<textcolor>00ffffff</textcolor>
<selectedcolor>00ffffff</selectedcolor>
<focusedcolor>00ffffff</focusedcolor>
<visible>Control.IsEnabled(13)</visible>
</control>
<control type="togglebutton" id="9001">
<width>32</width>
<height>32</height>
<centertop>50%</centertop>
<hitrect x="-24" y="-24" w="80" h="80" />
<texturenofocus colordiffuse="80ffffff">buttons/editname.png</texturenofocus>
<texturefocus colordiffuse="$VAR[ColorSelected]">buttons/editname.png</texturefocus>
<alttexturefocus colordiffuse="$VAR[ColorSelected]">buttons/editname.png</alttexturefocus>
<alttexturenofocus colordiffuse="$VAR[ColorSelected]">buttons/editname.png</alttexturenofocus>
<font />
<usealttexture>Control.HasFocus(10)</usealttexture>
<textcolor>00ffffff</textcolor>
<selectedcolor>00ffffff</selectedcolor>
<focusedcolor>00ffffff</focusedcolor>
<onfocus>SetFocus(10)</onfocus>
</control>
<control type="button" id="11">
<width>32</width>
<height>32</height>
<centertop>50%</centertop>
<hitrect x="-24" y="-24" w="80" h="80" />
<texturenofocus colordiffuse="80ffffff">buttons/browse.png</texturenofocus>
<texturefocus colordiffuse="$VAR[ColorSelected]">buttons/browse.png</texturefocus>
<font />
<textcolor>00ffffff</textcolor>
<selectedcolor>00ffffff</selectedcolor>
<focusedcolor>00ffffff</focusedcolor>
<visible>Control.IsEnabled(11)</visible>
</control>

<include content="Dialog_Scrollbar">
<onright>9000</onright>
<onleft>10</onleft>
</include>
</control>
</control>
</control>

<control type="group">
<right>0</right>
<width>dialog_button_width_padded</width>
<include>Dialog_Overlay</include>
<include>Dialog_Overlay</include>
<include>Object_Separator</include>
<bottom>0</bottom>
<height>row_height_x200</height>
<include>Dialog_Overlay_V</include>
<include>Object_Separator_V</include>
<include content="Dialog_Group">
<control type="grouplist" id="9000">
<onleft>61</onleft>
<onup>11</onup>
<itemgap>20</itemgap>
<orientation>horizontal</orientation>
<align>center</align>
<control type="button" id="18" description="OK">
<height>row_height</height>
<label>$LOCALIZE[186]</label>
<width>dialog_button_width</width>
</control>
<control type="button" id="19" description="Cancel">
<height>row_height</height>
<label>$LOCALIZE[222]</label>
<width>dialog_button_width</width>
</control>
</control>
</include>
Expand Down
2 changes: 2 additions & 0 deletions 1080i/Layouts.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,13 +279,15 @@
<include name="Layout_DialogBasic">
<param name="detailed" default="false" />
<param name="selected" default="false" />
<param name="misc" default="0" />
<definition>
<include content="Object_Control" condition="$PARAM[selected]">
<param name="control" value="image" />
<include>Texture_Highlight</include>
</include>
<control type="group">
<left>dialog_pad</left>
<right>$PARAM[misc]</right>
<include content="Object_Control">
<param name="control" value="label" />
<include condition="$PARAM[selected]">Color_SelectedText</include>
Expand Down
2 changes: 1 addition & 1 deletion addon.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<addon id="skin.arctic.horizon.2" name="Arctic Horizon 2" provider-name="jurialmunkey" version="0.1.14">
<addon id="skin.arctic.horizon.2" name="Arctic Horizon 2" provider-name="jurialmunkey" version="0.1.15">
<requires>
<import addon="xbmc.gui" version="5.15.0" />
<import addon="script.skinshortcuts" version="0.4.0" />
Expand Down

0 comments on commit 964e66f

Please sign in to comment.