From a0d0b876b6447c5be26a50a0b295e91cd95a8ceb Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 17 Jan 2013 14:34:51 -0600
Subject: Fix taskbar configuration issues Fix Kicker menu button layout in
 Deep Buttons mode

---
 kcontrol/taskbar/kcmtaskbarui.ui | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

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

diff --git a/kcontrol/taskbar/kcmtaskbarui.ui b/kcontrol/taskbar/kcmtaskbarui.ui
index ce0ddb6fe..a522ef683 100644
--- a/kcontrol/taskbar/kcmtaskbarui.ui
+++ b/kcontrol/taskbar/kcmtaskbarui.ui
@@ -462,16 +462,34 @@ By default, this option is selected and all windows are shown.</string>
                 </widget>
             </grid>
         </widget>
-	<widget class="TQLabel" rowspan="1" colspan="2">
+	<widget class="TQGroupBox">
 		<property name="name">
-			<cstring>globalConfigWarning</cstring>
+			<cstring>GroupBox2</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>
-		<property name="buddy" stdset="0">
-			<cstring>kcfg_ShowTaskStates</cstring>
+		<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">
-- 
cgit v1.2.1