From 10e41144596fc9ced40fc349d9ecd099b1c2ea19 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 11 Dec 2009 20:21:27 +0000
Subject: Initial import of Trinity 3.5.11 to kdebase Extends krandrtray, adds
 iccconfig kcontrol module, adds run dialog autocomplete and lots of bugfixes
 Will need to check for commit warnings and repair as encountered Also needs
 full compile test

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1061475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kcontrol/dnssd/configdialog.ui | 120 +++++++++++++++++++++++++----------------
 1 file changed, 73 insertions(+), 47 deletions(-)

(limited to 'kcontrol/dnssd/configdialog.ui')

diff --git a/kcontrol/dnssd/configdialog.ui b/kcontrol/dnssd/configdialog.ui
index 83808d1bb..848457a44 100644
--- a/kcontrol/dnssd/configdialog.ui
+++ b/kcontrol/dnssd/configdialog.ui
@@ -44,45 +44,17 @@
                 <attribute name="title">
                     <string>&amp;General</string>
                 </attribute>
-                <vbox>
+                <grid>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QCheckBox">
-                        <property name="name">
-                            <cstring>kcfg_BrowseLocal</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Browse local networ&amp;k</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>Browse local network (domain .local) using multicast DNS.</string>
-                        </property>
-                    </widget>
-                    <widget class="KEditListBox">
-                        <property name="name">
-                            <cstring>kcfg_DomainList</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>7</hsizetype>
-                                <vsizetype>7</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="title">
-                            <string>Additional Domains</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>List of Internet domains  that will be browsed for services. Do not put .local here - it
-is configured with 'Browse local network' option above.</string>
-                        </property>
-                    </widget>
-                    <widget class="QButtonGroup">
+                    <widget class="QButtonGroup" row="3" column="0">
                         <property name="name">
                             <cstring>kcfg_PublishType</cstring>
                         </property>
+                        <property name="enabled">
+                            <bool>true</bool>
+                        </property>
                         <property name="sizePolicy">
                             <sizepolicy>
                                 <hsizetype>5</hsizetype>
@@ -96,50 +68,104 @@ is configured with 'Browse local network' option above.</string>
                         </property>
                         <widget class="QRadioButton">
                             <property name="name">
-                                <cstring>LANButtor</cstring>
+                                <cstring>WANButton</cstring>
+                            </property>
+                            <property name="enabled">
+                                <bool>true</bool>
                             </property>
                             <property name="geometry">
                                 <rect>
                                     <x>11</x>
-                                    <y>23</y>
+                                    <y>51</y>
                                     <width>618</width>
                                     <height>22</height>
                                 </rect>
                             </property>
                             <property name="text">
-                                <string>Loc&amp;al network</string>
+                                <string>&amp;Wide area network</string>
                             </property>
-                            <property name="checked">
-                                <bool>false</bool>
+                            <property name="accel">
+                                <string>Alt+W</string>
                             </property>
                             <property name="whatsThis" stdset="0">
-                                <string>Advertise services on local network (in domain .local) using multicast DNS.</string>
+                                <string>Advertise services on Internet domain using public IP. To have this option working you need to configure wide area operation in using administrator mode</string>
                             </property>
                         </widget>
                         <widget class="QRadioButton">
                             <property name="name">
-                                <cstring>WANButton</cstring>
-                            </property>
-                            <property name="enabled">
-                                <bool>true</bool>
+                                <cstring>LANButtor</cstring>
                             </property>
                             <property name="geometry">
                                 <rect>
                                     <x>11</x>
-                                    <y>51</y>
+                                    <y>23</y>
                                     <width>618</width>
                                     <height>22</height>
                                 </rect>
                             </property>
                             <property name="text">
-                                <string>&amp;Wide area network</string>
+                                <string>Loc&amp;al network</string>
+                            </property>
+                            <property name="accel">
+                                <string>Alt+A</string>
+                            </property>
+                            <property name="checked">
+                                <bool>false</bool>
                             </property>
                             <property name="whatsThis" stdset="0">
-                                <string>Advertise services on Internet domain using public IP. To have this option working you need to configure wide area operation in using administrator mode</string>
+                                <string>Advertise services on local network (in domain .local) using multicast DNS.</string>
                             </property>
                         </widget>
                     </widget>
-                </vbox>
+                    <widget class="QCheckBox" row="1" column="0">
+                        <property name="name">
+                            <cstring>kcfg_BrowseLocal</cstring>
+                        </property>
+                        <property name="text">
+                            <string>Browse local networ&amp;k</string>
+                        </property>
+                        <property name="accel">
+                            <string>Alt+K</string>
+                        </property>
+                        <property name="whatsThis" stdset="0">
+                            <string>Browse local network (domain .local) using multicast DNS.</string>
+                        </property>
+                    </widget>
+                    <widget class="QCheckBox" row="0" column="0">
+                        <property name="name">
+                            <cstring>enableZeroconf</cstring>
+                        </property>
+                        <property name="text">
+                            <string>Enable &amp;Zeroconf network browsing</string>
+                        </property>
+                        <property name="accel">
+                            <string>Alt+Z</string>
+                        </property>
+                        <property name="whatsThis" stdset="0">
+                            <string>Browse local network (domain .local) using multicast DNS.</string>
+                        </property>
+                    </widget>
+                    <widget class="KEditListBox" row="2" column="0">
+                        <property name="name">
+                            <cstring>kcfg_DomainList</cstring>
+                        </property>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>7</hsizetype>
+                                <vsizetype>7</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
+                        <property name="title">
+                            <string>Additional Domains</string>
+                        </property>
+                        <property name="whatsThis" stdset="0">
+                            <string>List of Internet domains  that will be browsed for services. Do not put .local here - it
+is configured with 'Browse local network' option above.</string>
+                        </property>
+                    </widget>
+                </grid>
             </widget>
             <widget class="QWidget">
                 <property name="name">
-- 
cgit v1.2.1