From 34ae127bf2c04b8b810362737ba9157a6810e78d Mon Sep 17 00:00:00 2001
From: ronie <ronie@users.noreply.github.com>
Date: Thu, 14 Jan 2016 18:06:40 +0100
Subject: [PATCH] [Confluence] add DialogConfirm.xml and remove others

---
 addons/skin.confluence/720p/DialogConfirm.xml | 78 +++++++++++++++++++
 addons/skin.confluence/720p/DialogOK.xml      | 48 ------------
 .../skin.confluence/720p/DialogProgress.xml   | 65 ----------------
 addons/skin.confluence/720p/DialogYesNo.xml   | 64 ---------------
 4 files changed, 78 insertions(+), 177 deletions(-)
 create mode 100644 addons/skin.confluence/720p/DialogConfirm.xml
 delete mode 100644 addons/skin.confluence/720p/DialogOK.xml
 delete mode 100644 addons/skin.confluence/720p/DialogProgress.xml
 delete mode 100644 addons/skin.confluence/720p/DialogYesNo.xml

diff --git a/addons/skin.confluence/720p/DialogConfirm.xml b/addons/skin.confluence/720p/DialogConfirm.xml
new file mode 100644
index 0000000000000..297cfeca712e0
--- /dev/null
+++ b/addons/skin.confluence/720p/DialogConfirm.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<window>
+	<coordinates>
+		<left>315</left>
+		<top>230</top>
+	</coordinates>
+	<include>dialogeffect</include>
+	<depth>DepthDialog+</depth>
+	<controls>
+		<include name="DialogBackgroundCommons">
+			<param name="DialogBackgroundWidth" value="650" />
+			<param name="DialogBackgroundHeight" value="240" />
+			<param name="DialogHeaderWidth" value="570" />
+			<param name="DialogHeaderLabel" value="" />
+			<param name="DialogHeaderId" value="1" />
+			<param name="CloseButtonLeft" value="560" />
+			<param name="CloseButtonNav" value="9000" />
+		</include>
+		<control type="textbox" id="9">
+			<description>text</description>
+			<left>30</left>
+			<top>62</top>
+			<width>590</width>
+			<height>78</height>
+			<align>left</align>
+			<label>-</label>
+			<font>font13</font>
+			<autoscroll time="3000" delay="4000" repeat="5000">true</autoscroll>
+		</control>
+		<control type="progress" id="20">
+			<description>Progressbar</description>
+			<left>30</left>
+			<top>148</top>
+			<width>590</width>
+			<height>16</height>
+			<info>System.Progressbar</info>
+		</control>
+		<control type="grouplist" id="9000">
+			<left>25</left>
+			<top>175</top>
+			<width>600</width>
+			<height>40</height>
+			<align>center</align>
+			<itemgap>0</itemgap>
+			<orientation>horizontal</orientation>
+			<control type="button" id="11">
+				<description>OK button</description>
+				<width>200</width>
+				<height>40</height>
+				<label>107</label>
+				<font>font12_title</font>
+				<textcolor>white</textcolor>
+				<focusedcolor>white</focusedcolor>
+				<align>center</align>
+			</control>
+			<control type="button" id="10">
+				<description>Cancel button</description>
+				<width>200</width>
+				<height>40</height>
+				<label>106</label>
+				<font>font12_title</font>
+				<textcolor>white</textcolor>
+				<focusedcolor>white</focusedcolor>
+				<align>center</align>
+			</control>
+			<control type="button" id="12">
+				<description>Custom button</description>
+				<width>200</width>
+				<height>40</height>
+				<label>106</label>
+				<font>font12_title</font>
+				<textcolor>white</textcolor>
+				<focusedcolor>white</focusedcolor>
+				<align>center</align>
+			</control>
+		</control>
+	</controls>
+</window>
diff --git a/addons/skin.confluence/720p/DialogOK.xml b/addons/skin.confluence/720p/DialogOK.xml
deleted file mode 100644
index b906c701a17a0..0000000000000
--- a/addons/skin.confluence/720p/DialogOK.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window>
-	<defaultcontrol always="true">10</defaultcontrol>
-	<coordinates>
-		<left>335</left>
-		<top>230</top>
-	</coordinates>
-	<include>dialogeffect</include>
-	<depth>DepthDialog+</depth>
-	<controls>
-		<include name="DialogBackgroundCommons">
-			<param name="DialogBackgroundWidth" value="610" />
-			<param name="DialogBackgroundHeight" value="240" />
-			<param name="DialogHeaderWidth" value="530" />
-			<param name="DialogHeaderLabel" value="$LOCALIZE[13406]" />
-			<param name="DialogHeaderId" value="1" />
-			<param name="CloseButtonLeft" value="520" />
-			<param name="CloseButtonNav" value="10" />
-		</include>
-		<control type="textbox" id="9">
-			<description>text</description>
-			<left>30</left>
-			<top>62</top>
-			<width>550</width>
-			<height>98</height>
-			<align>left</align>
-			<label>-</label>
-			<font>font13</font>
-			<autoscroll time="3000" delay="4000" repeat="5000">true</autoscroll>
-		</control>
-		<control type="button" id="10">
-			<description>OK button</description>
-			<left>205</left>
-			<top>175</top>
-			<width>200</width>
-			<height>40</height>
-			<label>186</label>
-			<font>font12_title</font>
-			<textcolor>white</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<align>center</align>
-			<onleft>10</onleft>
-			<onright>10</onright>
-			<onup>10</onup>
-			<ondown>10</ondown>
-		</control>
-	</controls>
-</window>
diff --git a/addons/skin.confluence/720p/DialogProgress.xml b/addons/skin.confluence/720p/DialogProgress.xml
deleted file mode 100644
index 7d6d2a6352f8a..0000000000000
--- a/addons/skin.confluence/720p/DialogProgress.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window>
-	<defaultcontrol always="true">10</defaultcontrol>
-	<coordinates>
-		<left>335</left>
-		<top>230</top>
-	</coordinates>
-	<include>dialogeffect</include>
-	<depth>DepthDialog+</depth>
-	<controls>
-		<include name="DialogBackgroundCommons">
-			<param name="DialogBackgroundWidth" value="610" />
-			<param name="DialogBackgroundHeight" value="240" />
-			<param name="DialogHeaderWidth" value="530" />
-			<param name="DialogHeaderLabel" value="$INFO[Control.GetLabel(1)] $INFO[System.Progressbar,- ,%]" />
-			<param name="DialogHeaderId" value="0" />
-			<param name="CloseButtonLeft" value="520" />
-			<param name="CloseButtonNav" value="10" />
-		</include>
-		<control type="label" id="1">
-			<description>fake heading label</description>
-			<left>0</left>
-			<top>0</top>
-			<width>0</width>
-			<height>0</height>
-			<font>-</font>
-			<visible>false</visible>
-		</control>
-		<control type="textbox" id="9">
-			<description>text</description>
-			<left>30</left>
-			<top>62</top>
-			<width>550</width>
-			<height>78</height>
-			<align>left</align>
-			<label>-</label>
-			<font>font13</font>
-			<autoscroll time="3000" delay="4000" repeat="5000">true</autoscroll>
-		</control>
-		<control type="progress" id="20">
-			<description>Progressbar</description>
-			<left>30</left>
-			<top>148</top>
-			<width>550</width>
-			<height>16</height>
-			<info>System.Progressbar</info>
-		</control>
-		<control type="button" id="10">
-			<description>Cancel button</description>
-			<left>205</left>
-			<top>175</top>
-			<width>200</width>
-			<height>40</height>
-			<label>222</label>
-			<font>font12_title</font>
-			<textcolor>white</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<align>center</align>
-			<onleft>10</onleft>
-			<onright>10</onright>
-			<onup>10</onup>
-			<ondown>10</ondown>
-		</control>
-	</controls>
-</window>
diff --git a/addons/skin.confluence/720p/DialogYesNo.xml b/addons/skin.confluence/720p/DialogYesNo.xml
deleted file mode 100644
index a19828dc4be0d..0000000000000
--- a/addons/skin.confluence/720p/DialogYesNo.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window>
-	<defaultcontrol always="true">10</defaultcontrol>
-	<coordinates>
-		<left>335</left>
-		<top>230</top>
-	</coordinates>
-	<include>dialogeffect</include>
-	<depth>DepthDialog+</depth>
-	<controls>
-		<include name="DialogBackgroundCommons">
-			<param name="DialogBackgroundWidth" value="610" />
-			<param name="DialogBackgroundHeight" value="240" />
-			<param name="DialogHeaderWidth" value="530" />
-			<param name="DialogHeaderLabel" value="$LOCALIZE[13406]" />
-			<param name="DialogHeaderId" value="1" />
-			<param name="CloseButtonLeft" value="520" />
-			<param name="CloseButtonNav" value="10" />
-		</include>
-		<control type="textbox" id="9">
-			<description>text</description>
-			<left>30</left>
-			<top>62</top>
-			<width>550</width>
-			<height>98</height>
-			<align>left</align>
-			<label>-</label>
-			<font>font13</font>
-			<autoscroll time="3000" delay="4000" repeat="5000">true</autoscroll>
-		</control>
-		<control type="button" id="11">
-			<description>Yes button</description>
-			<left>95</left>
-			<top>175</top>
-			<width>200</width>
-			<height>40</height>
-			<label>107</label>
-			<font>font12_title</font>
-			<textcolor>white</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<align>center</align>
-			<onleft>10</onleft>
-			<onright>10</onright>
-			<onup>11</onup>
-			<ondown>11</ondown>
-		</control>
-		<control type="button" id="10">
-			<description>No button</description>
-			<left>305</left>
-			<top>175</top>
-			<width>200</width>
-			<height>40</height>
-			<label>106</label>
-			<font>font12_title</font>
-			<textcolor>white</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<align>center</align>
-			<onleft>11</onleft>
-			<onright>11</onright>
-			<onup>10</onup>
-			<ondown>10</ondown>
-		</control>
-	</controls>
-</window>