diff options
| author | ronie <ronie@users.noreply.github.com> | 2020-09-20 01:50:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-20 01:50:13 +0200 |
| commit | 1a35deb1f68d410bbdc56fb9ef560d2cc6dc9699 (patch) | |
| tree | 535274174f499a955f35d7fa0ee7df348dfef3ff | |
| parent | 642d8e154a00a2d58cbc5c243d2f2e5cdecda46b (diff) | |
| parent | e0fe5b1871c02f93eabe9abc3ba2fd8d34a91db2 (diff) | |
Merge pull request #18419 from ronie/estouchy-addonlifecycle
[estouchy] replace AddonBroken with AddonLifecycleType(Desc) infolabels
| -rw-r--r-- | addons/skin.estouchy/xml/DialogAddonInfo.xml | 27 | ||||
| -rw-r--r-- | addons/skin.estouchy/xml/ViewsWide.xml | 26 |
2 files changed, 26 insertions, 27 deletions
diff --git a/addons/skin.estouchy/xml/DialogAddonInfo.xml b/addons/skin.estouchy/xml/DialogAddonInfo.xml index c78fc7f52d..44b7d3c573 100644 --- a/addons/skin.estouchy/xml/DialogAddonInfo.xml +++ b/addons/skin.estouchy/xml/DialogAddonInfo.xml @@ -193,7 +193,7 @@ <aligny>center</aligny> <font>font20_title</font> <textcolor>selected</textcolor> - <visible>String.IsEmpty(ListItem.AddonBroken)</visible> + <visible>String.IsEqual(ListItem.AddonLifecycleType,$LOCALIZE[24169])</visible> </control> <control type="textbox"> <description>Disclaimer</description> @@ -205,7 +205,7 @@ <label fallback="231">$INFO[ListItem.AddonDisclaimer]</label> <textcolor>selected</textcolor> <autoscroll time="2000" delay="3000" repeat="5000">true</autoscroll> - <visible>String.IsEmpty(ListItem.AddonBroken)</visible> + <visible>String.IsEqual(ListItem.AddonLifecycleType,$LOCALIZE[24169])</visible> </control> <control type="label"> <description>Broken label</description> @@ -214,11 +214,24 @@ <width>200</width> <height>25</height> <font>font20_title</font> - <label>$LOCALIZE[24098]:</label> + <label>$LOCALIZE[24171]:</label> <align>right</align> <aligny>center</aligny> <textcolor>selected</textcolor> - <visible>!String.IsEmpty(ListItem.AddonBroken)</visible> + <visible>String.IsEqual(ListItem.AddonLifecycleType,$LOCALIZE[24171])</visible> + </control> + <control type="label"> + <description>Deprecated label</description> + <posx>200</posx> + <posy>120</posy> + <width>200</width> + <height>25</height> + <font>font20_title</font> + <label>$LOCALIZE[24170]:</label> + <align>right</align> + <aligny>center</aligny> + <textcolor>selected</textcolor> + <visible>String.IsEqual(ListItem.AddonLifecycleType,$LOCALIZE[24170])</visible> </control> <control type="textbox"> <description>Reason label</description> @@ -227,12 +240,11 @@ <width>730</width> <height>50</height> <font>font20</font> - <label>$INFO[ListItem.Addonbroken]</label> + <label>$INFO[ListItem.AddonLifecycleDesc]</label> <align>left</align> - <aligny>center</aligny> <textcolor>selected</textcolor> <autoscroll time="2000" delay="3000" repeat="5000">true</autoscroll> - <visible>!String.IsEmpty(ListItem.AddonBroken)</visible> + <visible>String.IsEqual(ListItem.AddonLifecycleType,$LOCALIZE[24170]) | String.IsEqual(ListItem.AddonLifecycleType,$LOCALIZE[24171])</visible> </control> </control> </control> @@ -275,6 +287,7 @@ <align>left</align> <include>ButtonInfoDialogsCommonValues</include> <label>21340</label> + <textwidth>150</textwidth> </control> <control type="button" id="12"> <description>Changelog button</description> diff --git a/addons/skin.estouchy/xml/ViewsWide.xml b/addons/skin.estouchy/xml/ViewsWide.xml index 02a800d420..c8b0e2610f 100644 --- a/addons/skin.estouchy/xml/ViewsWide.xml +++ b/addons/skin.estouchy/xml/ViewsWide.xml @@ -730,7 +730,7 @@ <posy>45</posy> <width>840</width> <height>20</height> - <font>font20</font> + <font>font24</font> <selectedcolor>selected</selectedcolor> <align>left</align> <aligny>center</aligny> @@ -741,19 +741,12 @@ <posy>7</posy> <width>870</width> <height>30</height> - <font>font20</font> + <font>font24</font> <selectedcolor>selected</selectedcolor> <align>right</align> <aligny>center</aligny> <label>$INFO[ListItem.AddonVersion]$INFO[ListItem.Property(Addon.Status), - ]</label> </control> - <control type="image"> - <posx>40r</posx> - <posy>20</posy> - <width>30</width> - <height>30</height> - <texture>$INFO[ListItem.Overlay]</texture> - </control> <control type="textbox"> <posx>250</posx> <posy>75</posy> @@ -761,7 +754,7 @@ <height>145</height> <font>font25</font> <align>justify</align> - <label>$INFO[ListItem.AddonBroken,[COLOR=blue][B],[/B][/COLOR][CR]]$INFO[ListItem.AddonDisclaimer,[COLOR=blue][B],[/B][/COLOR][CR]]$INFO[ListItem.AddonDescription]</label> + <label>$INFO[ListItem.AddonLifecycleDesc,[COLOR=selected][B],[/B][/COLOR][CR]]$INFO[ListItem.AddonDisclaimer,[COLOR=blue][B],[/B][/COLOR][CR]]$INFO[ListItem.AddonDescription]</label> </control> </itemlayout> <focusedlayout condition="Container.Content(Addons)" height="240" width="$PARAM[panel-width]"> @@ -796,7 +789,7 @@ <posy>45</posy> <width>840</width> <height>20</height> - <font>font20</font> + <font>font24</font> <selectedcolor>selected</selectedcolor> <align>left</align> <aligny>center</aligny> @@ -807,19 +800,12 @@ <posy>7</posy> <width>870</width> <height>30</height> - <font>font20</font> + <font>font24</font> <selectedcolor>selected</selectedcolor> <align>right</align> <aligny>center</aligny> <label>$INFO[ListItem.AddonVersion]$INFO[ListItem.Property(Addon.Status), - ]</label> </control> - <control type="image"> - <posx>40r</posx> - <posy>20</posy> - <width>30</width> - <height>30</height> - <texture>$INFO[ListItem.Overlay]</texture> - </control> <control type="textbox"> <posx>250</posx> <posy>75</posy> @@ -827,7 +813,7 @@ <height>145</height> <font>font25</font> <align>justify</align> - <label>$INFO[ListItem.AddonBroken,[COLOR=blue][B],[/B][/COLOR][CR]]$INFO[ListItem.AddonDisclaimer,[COLOR=blue][B],[/B][/COLOR][CR]]$INFO[ListItem.AddonDescription]</label> + <label>$INFO[ListItem.AddonLifecycleDesc,[COLOR=selected][B],[/B][/COLOR][CR]]$INFO[ListItem.AddonDisclaimer,[COLOR=blue][B],[/B][/COLOR][CR]]$INFO[ListItem.AddonDescription]</label> <autoscroll delay="2000" time="2000" repeat="2000">True</autoscroll> </control> </focusedlayout> |