From 137c3446f89fe808518981f974714161f794b364 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 10 Apr 2013 16:55:58 -0500
Subject: Overhaul taskbar configuration system This resolves Bug 1399

---
 kcontrol/taskbar/kcmtaskbarui.ui | 82 +++++++++++++++++++++++++---------------
 1 file changed, 52 insertions(+), 30 deletions(-)

(limited to 'kcontrol/taskbar/kcmtaskbarui.ui')

diff --git a/kcontrol/taskbar/kcmtaskbarui.ui b/kcontrol/taskbar/kcmtaskbarui.ui
index a522ef683..871badd75 100644
--- a/kcontrol/taskbar/kcmtaskbarui.ui
+++ b/kcontrol/taskbar/kcmtaskbarui.ui
@@ -24,6 +24,57 @@
         <property name="margin">
             <number>0</number>
         </property>
+	<widget class="TQGroupBox">
+		<property name="name">
+			<cstring>GroupBox2</cstring>
+		</property>
+		<property name="title">
+			<string>Settings</string>
+		</property>
+		<grid>
+			<property name="name">
+				<cstring>unnamed</cstring>
+			</property>
+			<widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
+				<property name="name">
+					<cstring>globalConfigWarning</cstring>
+				</property>
+				<property name="text">
+					<string>&lt;b&gt;NOTE: This module is currently editing the global floating taskbar configuration.&lt;/b&gt;&lt;br&gt;To change the configuration of a specific Kicker taskbar applet, please use the corresponding Configure Taskbar menu option.</string>
+				</property>
+			</widget>
+			<widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2">
+				<property name="name">
+					<cstring>kcfg_UseGlobalSettings</cstring>
+				</property>
+				<property name="text">
+					<string>Use global floating taskbar configuration</string>
+				</property>
+				<property name="checked">
+					<bool>true</bool>
+				</property>
+				<property name="whatsThis" stdset="0">
+					<string>Selecting this option causes the taskbar to use the global taskbar configuration.</string>
+				</property>
+			</widget>
+			<widget class="TQPushButton" row="1" column="0" rowspan="1" colspan="2">
+				<property name="name">
+					<cstring>globalConfigReload</cstring>
+				</property>
+				<property name="text">
+					<string>Overwrite current configuration with the current global floating taskbar configuration</string>
+				</property>
+			</widget>
+			<widget class="TQPushButton" row="2" column="0" rowspan="1" colspan="2">
+				<property name="name">
+					<cstring>globalConfigEdit</cstring>
+				</property>
+				<property name="text">
+					<string>Edt global floating taskbar configuration</string>
+				</property>
+			</widget>
+		</grid>
+	</widget>
         <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>taskbarGroup</cstring>
@@ -379,7 +430,7 @@ By default, this option is selected and all windows are shown.</string>
         </widget>
         <widget class="TQGroupBox">
             <property name="name">
-                <cstring>GroupBox1</cstring>
+                <cstring>actionsGroup</cstring>
             </property>
             <property name="title">
                 <string>Actions</string>
@@ -462,35 +513,6 @@ By default, this option is selected and all windows are shown.</string>
                 </widget>
             </grid>
         </widget>
-	<widget class="TQGroupBox">
-		<property name="name">
-			<cstring>GroupBox2</cstring>
-		</property>
-		<property name="title">
-			<string>Settings</string>
-		</property>
-		<grid>
-			<property name="name">
-				<cstring>unnamed</cstring>
-			</property>
-			<widget class="TQLabel" rowspan="1" colspan="2">
-				<property name="name">
-					<cstring>globalConfigWarning</cstring>
-				</property>
-				<property name="text">
-					<string>NOTE: This module is currently editing the global floating taskbar configuration.&lt;br&gt;To change the configuration of a specific Kicker taskbar applet, please use the Configure Taskbar menu option.</string>
-				</property>
-			</widget>
-			<widget class="TQPushButton" rowspan="1" colspan="2">
-				<property name="name">
-					<cstring>globalConfigReload</cstring>
-				</property>
-				<property name="text">
-					<string>Use current global floating taskbar configuration</string>
-				</property>
-			</widget>
-		</grid>
-	</widget>
         <spacer>
             <property name="name">
                 <cstring>Spacer1</cstring>
-- 
cgit v1.2.1