diff options
| author | Martijn Kaijser <martijn@xbmc.org> | 2018-10-13 14:12:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-13 14:12:22 +0200 |
| commit | 9c9880116660e055eceadab85f02ee2533e0bb10 (patch) | |
| tree | e1ef7fa776906e69fa92f99f324780dac4b3a2c1 /addons/skin.estouchy | |
| parent | d50c0516f1571eed2268274e58bf3323b7ed3d0b (diff) | |
| parent | 0db7198e93017d54fa9820d16e7ba9c2bd709213 (diff) | |
Merge pull request #14596 from ronie/getout
[Estouchy] prevent from getting locked in
Diffstat (limited to 'addons/skin.estouchy')
| -rw-r--r-- | addons/skin.estouchy/xml/DialogConfirm.xml | 30 | ||||
| -rw-r--r-- | addons/skin.estouchy/xml/Home.xml | 4 | ||||
| -rw-r--r-- | addons/skin.estouchy/xml/Includes.xml | 59 |
3 files changed, 61 insertions, 32 deletions
diff --git a/addons/skin.estouchy/xml/DialogConfirm.xml b/addons/skin.estouchy/xml/DialogConfirm.xml index 84d938f75d..226b2dc497 100644 --- a/addons/skin.estouchy/xml/DialogConfirm.xml +++ b/addons/skin.estouchy/xml/DialogConfirm.xml @@ -52,33 +52,7 @@ <height>10</height> <info>System.Progressbar</info> </control> - <control type="grouplist" id="9000"> - <posx>20</posx> - <posy>240</posy> - <width>660</width> - <height>60</height> - <itemgap>10</itemgap> - <align>center</align> - <orientation>horizontal</orientation> - <onleft>9000</onleft> - <onright>9000</onright> - <onup>9000</onup> - <ondown>9000</ondown> - <control type="button" id="10"> - <description>OK button</description> - <width>200</width> - <include>ButtonInfoDialogsCommonValues</include> - </control> - <control type="button" id="11"> - <description>Cancel button</description> - <width>200</width> - <include>ButtonInfoDialogsCommonValues</include> - </control> - <control type="button" id="12"> - <description>Custom button</description> - <width>200</width> - <include>ButtonInfoDialogsCommonValues</include> - </control> - </control> + <include condition="!Window.IsVisible(yesnodialog)">YesNoExtendedButtons</include> + <include condition="Window.IsVisible(yesnodialog)">YesNoDefaultButtons</include> </controls> </window> diff --git a/addons/skin.estouchy/xml/Home.xml b/addons/skin.estouchy/xml/Home.xml index 0e5412fe98..9979e08a59 100644 --- a/addons/skin.estouchy/xml/Home.xml +++ b/addons/skin.estouchy/xml/Home.xml @@ -146,8 +146,8 @@ <height>120</height> <onleft>9002</onleft> <onright>9002</onright> - <onup>9001</onup> - <ondown>20</ondown> + <onup>9000</onup> + <ondown>9000</ondown> <pagecontrol></pagecontrol> <scrolltime>300</scrolltime> <orientation>Horizontal</orientation> diff --git a/addons/skin.estouchy/xml/Includes.xml b/addons/skin.estouchy/xml/Includes.xml index 4a63cc6015..5a714b9054 100644 --- a/addons/skin.estouchy/xml/Includes.xml +++ b/addons/skin.estouchy/xml/Includes.xml @@ -792,8 +792,8 @@ <height>760</height> <onleft>9000</onleft> <onright>9003</onright> - <onup>10</onup> - <ondown>10</ondown> + <onup>9002</onup> + <ondown>9002</ondown> <scrolltime>300</scrolltime> <orientation>vertical</orientation> <focusposition>1</focusposition> @@ -2521,6 +2521,61 @@ <include>MenuButtonCommonValues</include> </control> </include> + <include name="YesNoDefaultButtons"> + <control type="group"> + <posx>145</posx> + <posy>240</posy> + <width>660</width> + <height>60</height> + <visible>Window.IsVisible(yesnodialog)</visible> + <control type="button" id="11"> + <description>Yes button</description> + <posx>0</posx> + <posy>0</posy> + <width>200</width> + <include>ButtonInfoDialogsCommonValues</include> + </control> + <control type="button" id="10"> + <description>No button</description> + <posx>210</posx> + <posy>0</posy> + <width>200</width> + <include>ButtonInfoDialogsCommonValues</include> + </control> + </control> + </include> + <include name="YesNoExtendedButtons"> + <control type="grouplist" id="9000"> + <posx>20</posx> + <posy>240</posy> + <width>660</width> + <height>60</height> + <itemgap>10</itemgap> + <align>center</align> + <orientation>horizontal</orientation> + <onleft>9000</onleft> + <onright>9000</onright> + <onup>9000</onup> + <ondown>9000</ondown> + <visible>!Window.IsVisible(yesnodialog)</visible> + <control type="button" id="10"> + <description>OK button</description> + <width>200</width> + <include>ButtonInfoDialogsCommonValues</include> + </control> + <control type="button" id="11"> + <description>Cancel button</description> + <width>200</width> + <include>ButtonInfoDialogsCommonValues</include> + </control> + <control type="button" id="12"> + <description>Custom button</description> + <width>200</width> + <include>ButtonInfoDialogsCommonValues</include> + </control> + </control> + </include> + <include name="16x9_xPos_Relocation"> <animation effect="slide" start="0,0" end="213,0" time="0" condition="String.IsEqual(Skin.AspectRatio,16:9)">conditional</animation> </include> |