From e88baf8334b8ff7ce92e555cbaffee949672d4b8 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 9 Jan 2013 16:39:31 -0600
Subject: Automatically deactivate disconnected display devices Notify user on
 display add/remove/change Add advanced display configuration option to krandr
 menu Add option to autohide kicker panels on inactive Xinerama screens and
 enable by default Update hwmanager treeview on device change

---
 kcontrol/displayconfig/displayconfigbase.ui | 79 +++++++++++++++++++----------
 1 file changed, 51 insertions(+), 28 deletions(-)

(limited to 'kcontrol/displayconfig/displayconfigbase.ui')

diff --git a/kcontrol/displayconfig/displayconfigbase.ui b/kcontrol/displayconfig/displayconfigbase.ui
index 3ea1c57e7..dfa7e57fd 100644
--- a/kcontrol/displayconfig/displayconfigbase.ui
+++ b/kcontrol/displayconfig/displayconfigbase.ui
@@ -26,7 +26,12 @@
 			    <property name="name">
 				    <cstring>unnamed</cstring>
 			    </property>
-			    <widget class="TQGroupBox" row="0" column="0">
+			    <widget class="TQLabel" row="0" column="0">
+				    <property name="name">
+					    <cstring>nonRootWarningLabel</cstring>
+				    </property>
+			    </widget>
+			    <widget class="TQGroupBox" row="1" column="0">
 				    <property name="name">
 					    <cstring>groupSystemSettings</cstring>
 				    </property>
@@ -47,7 +52,7 @@
 					    </widget>
 				    </grid>
 			    </widget>
-			    <spacer row="1" column="0">
+			    <spacer row="2" column="0">
 				    <property name="name" stdset="0">
 					    <cstring>Spacer4</cstring>
 				    </property>
@@ -225,7 +230,15 @@
 						    <property name="name">
 							    <cstring>unnamed</cstring>
 						    </property>
-						    <widget class="KComboBox" row="0" column="0" colspan="1">
+						    <widget class="TQLabel" row="0" column="0" colspan="1">
+							    <property name="name">
+								    <cstring>textLabel7_9</cstring>
+							    </property>
+							    <property name="text">
+								    <string>Rotate screen by:</string>
+							    </property>
+						    </widget>
+						    <widget class="KComboBox" row="1" column="0" colspan="1">
 							    <property name="name">
 								    <cstring>rotationSelectDD</cstring>
 							    </property>
@@ -265,36 +278,46 @@
 					    </property>
 				    </widget>
 				    <widget class="KPushButton" row="8" column="0" colspan="1">
-					    <property name="name">
-						    <cstring>rescanHardware</cstring>
-					    </property>
-					    <property name="text">
-						    <string>&amp;Rescan Displays</string>
-					    </property>
+					<property name="name">
+						<cstring>rescanHardware</cstring>
+					</property>
+					<property name="text">
+						<string>&amp;Rescan Displays</string>
+					</property>
 				    </widget>
 				    <widget class="KPushButton" row="8" column="1" colspan="1">
-					    <property name="name">
-						    <cstring>loadExistingProfile</cstring>
-					    </property>
-					    <property name="text">
-						    <string>Load &amp;Existing Profile</string>
-					    </property>
+					<property name="name">
+						<cstring>loadExistingProfile</cstring>
+					</property>
+					<property name="text">
+						<string>Load &amp;Existing Profile</string>
+					</property>
 				    </widget>
-				    <widget class="KPushButton" row="8" column="2" colspan="1">
+				    <widget class="TQLayoutWidget" row="8" column="3" colspan="1">
 					    <property name="name">
-						    <cstring>previewConfiguration</cstring>
-					    </property>
-					    <property name="text">
-						    <string>&amp;Test Settings</string>
-					    </property>
-				    </widget>
-				    <widget class="KPushButton" row="8" column="3" colspan="1">
-					    <property name="name">
-						    <cstring>identifyMonitors</cstring>
-					    </property>
-					    <property name="text">
-						    <string>&amp;Identify</string>
+						    <cstring>layout7</cstring>
 					    </property>
+					    <hbox>
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						</property>
+						<widget class="KPushButton" row="8" column="0" colspan="1">
+							<property name="name">
+								<cstring>previewConfiguration</cstring>
+							</property>
+							<property name="text">
+								<string>&amp;Test Settings</string>
+							</property>
+						</widget>
+						<widget class="KPushButton" row="8" column="1" colspan="1">
+							<property name="name">
+								<cstring>identifyMonitors</cstring>
+							</property>
+							<property name="text">
+								<string>&amp;Identify</string>
+							</property>
+						</widget>
+					</hbox>
 				    </widget>
 			    </grid>
 		    </widget>
-- 
cgit v1.2.3