Skip to content

Commit

Permalink
Merge pull request #10612 from phil65/estuary_fixes
Browse files Browse the repository at this point in the history 
[estuary] - misc fixes / additions
  • Loading branch information
@ronie
ronie committed Oct 2, 2016
2 parents 27988ab + d7519df commit 150b669
Show file tree
Hide file tree
Showing 8 changed files with 189 additions and 153 deletions.
9 changes: 7 additions & 2 deletions addons/skin.estuary/1080i/Custom_1107_SearchDialog.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<defaultcontrol always="true">5000</defaultcontrol>
<coordinates>
<left>660</left>
<top>300</top>
<top>270</top>
</coordinates>
<include>Animation_DialogPopupOpenClose</include>
<controls>
<include content="DialogBackgroundCommons">
<param name="DialogBackgroundWidth" value="600" />
<param name="DialogBackgroundHeight" value="340" />
<param name="DialogBackgroundHeight" value="410" />
<param name="DialogHeaderLabel" value="$LOCALIZE[137]" />
<param name="DialogHeaderId" value="" />
</include>
Expand All @@ -34,6 +34,11 @@
<onclick condition="System.hasAddon(script.globalsearch)">RunScript(script.globalsearch)</onclick>
<onclick condition="!System.hasAddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
</item>
<item>
<label>$LOCALIZE[31145]</label>
<onclick>Dialog.Close(all)</onclick>
<onclick>ActivateWindow(addonbrowser,addons://search/,return)</onclick>
</item>
<item>
<label>$LOCALIZE[31114]</label>
<onclick>Dialog.Close(all)</onclick>
Expand Down
4 changes: 2 additions & 2 deletions addons/skin.estuary/1080i/Font.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,9 @@
<style>bold</style>
</font>
<font>
<name>Mono30</name>
<name>Mono28</name>
<filename>arial.ttf</filename>
<size>30</size>
<size>28</size>
</font>
</fontset>
</fonts>
35 changes: 26 additions & 9 deletions addons/skin.estuary/1080i/Home.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,14 +377,20 @@
<include content="SubMenu">
<param name="list_id" value="8900"/>
<param name="ondown_id" value="8100"/>
<param name="item1_onclick" value="ActivateWindow(addonbrowser,root)" />
<param name="item1_icon" value="add-ons.png" />
<param name="item1_label" value="$LOCALIZE[10040]" />
<param name="item2_onclick" value="ActivateWindow(systemsettings,addons)" />
<param name="item2_icon" value="settings.png" />
<param name="item2_label" value="$LOCALIZE[5]" />
<param name="item3_vis" value="False" />
<param name="item4_vis" value="False" />
<param name="item1_onclick" value="ActivateWindow(addonbrowser,addons://user/,return)" />
<param name="item1_icon" value="recordings.png" />
<param name="item1_label" value="$LOCALIZE[31146]" />
<param name="item2_onclick" value="ActivateWindow(addonbrowser,addons://repos/,return)" />
<param name="item2_icon" value="add-ons.png" />
<param name="item2_label" value="$LOCALIZE[31147]" />
<param name="item3_onclick" value="ActivateWindow(addonbrowser,addons://search/,return)" />
<param name="item3_icon" value="tv-search.png" />
<param name="item3_label" value="$LOCALIZE[137]" />
<param name="item3_vis" value="true" />
<param name="item4_onclick" value="ActivateWindow(systemsettings,addons)" />
<param name="item4_icon" value="settings.png" />
<param name="item4_label" value="$LOCALIZE[5]" />
<param name="item4_vis" value="true" />
<param name="item5_vis" value="False" />
<param name="item6_vis" value="False" />
<param name="item7_vis" value="False" />
Expand Down Expand Up @@ -455,6 +461,16 @@
<param name="main_label" value=""/>
<param name="sub_label" value=""/>
</include>
<include content="ImageWidget">
<param name="image_path" value="special://skin/extras/home-images/add-ons.jpg"/>
<param name="text_label" value="$LOCALIZE[31119]" />
<param name="button_label" value="$LOCALIZE[31118]" />
<param name="button_onclick" value="ActivateWindow(addonbrowser)"/>
<param name="button_id" value="8600"/>
<param name="onup_id" value="8100"/>
<param name="visible" value="!Integer.IsGreater(Container(8100).NumItems,0) + !Integer.IsGreater(Container(8200).NumItems,0) + !Integer.IsGreater(Container(8300).NumItems,0) + !Integer.IsGreater(Container(8400).NumItems,0) + !Integer.IsGreater(Container(8500).NumItems,0)"/>
<param name="button2_onclick" value="Skin.SetBool(HomeMenuNoProgramsButton)"/>
</include>
</control>
</control>
<control type="group" id="11000">
Expand Down Expand Up @@ -1170,7 +1186,8 @@
</item>
<item>
<label>$LOCALIZE[8]</label>
<onclick>ActivateWindow(Weather)</onclick>
<onclick condition="!String.IsEmpty(Weather.Plugin)">ActivateWindow(Weather)</onclick>
<onclick condition="String.IsEmpty(Weather.Plugin)">ReplaceWindow(servicesettings,weather)</onclick>
<thumb>icons/home/weather.png</thumb>
<property name="id">weather</property>
<visible>!Skin.HasSetting(HomeMenuNoWeatherButton)</visible>
Expand Down
6 changes: 3 additions & 3 deletions addons/skin.estuary/1080i/MyPVRGuide.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@
<progresstexture border="0,60,18,14" colordiffuse="button_focus">windows/pvr/epg_progress.png</progresstexture>
<rulerlayout height="45" width="1400">
<control type="label">
<width>500</width>
<width>365</width>
<height>45</height>
<font>font12</font>
<label>$INFO[ListItem.Label]</label>
<textoffsetx>10</textoffsetx>
<textcolor>button_focus</textcolor>
</control>
</rulerlayout>
<channellayout height="58" width="330">
<channellayout height="58" width="350">
<control type="label">
<left>2</left>
<top>-2</top>
Expand All @@ -69,7 +69,7 @@
<textoffsetx>10</textoffsetx>
</control>
</channellayout>
<focusedchannellayout height="58" width="330">
<focusedchannellayout height="58" width="350">
<control type="label">
<left>2</left>
<top>-2</top>
Expand Down
12 changes: 6 additions & 6 deletions addons/skin.estuary/1080i/MyPVRTimers.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<control type="label">
<left>30</left>
<top>10</top>
<width>680</width>
<width>630</width>
<height>100</height>
<aligny>top</aligny>
<label>$INFO[ListItem.ChannelName][COLOR button_focus]$INFO[ListItem.Label, - ][/COLOR]</label>
Expand All @@ -72,7 +72,7 @@
<top>13</top>
<width>260</width>
<height>70</height>
<font>font12</font>
<font>font10</font>
<align>center</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Timertype]</label>
Expand All @@ -82,7 +82,7 @@
<top>13</top>
<width>120</width>
<height>75</height>
<font>font12</font>
<font>font10</font>
<align>center</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Comment]</label>
Expand Down Expand Up @@ -121,7 +121,7 @@
<control type="label">
<left>30</left>
<top>10</top>
<width>680</width>
<width>630</width>
<height>100</height>
<aligny>top</aligny>
<label>$INFO[ListItem.ChannelName]$INFO[ListItem.Label, - ]</label>
Expand All @@ -140,7 +140,7 @@
<top>13</top>
<width>260</width>
<height>70</height>
<font>font12</font>
<font>font10</font>
<align>center</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Timertype]</label>
Expand All @@ -150,7 +150,7 @@
<top>13</top>
<width>120</width>
<height>75</height>
<font>font12</font>
<font>font10</font>
<align>center</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Comment]</label>
Expand Down
4 changes: 2 additions & 2 deletions addons/skin.estuary/1080i/Settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,11 @@
<onclick>ActivateWindow(filemanager)</onclick>
<icon>icons/settings/filemanager.png</icon>
</item>
<item>
<!-- <item>
<label>$LOCALIZE[24001]</label>
<onclick>ActivateWindow(addonbrowser)</onclick>
<icon>icons/settings/addons.png</icon>
</item>
</item> -->
</content>
</control>
<include content="TopBar">
Expand Down

0 comments on commit 150b669

Please sign in to comment.