From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sun, 15 Feb 2009 22:51:07 +0000 (+0100)
Subject: Fix layout issues in SimpleNetworkEditor
X-Git-Tag: 0.4.0~26
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=619019336137e74eea45fc7217e9201904fcbe00;ds=sidebyside

Fix layout issues in SimpleNetworkEditor
---

diff --git a/src/qtui/ui/simplenetworkeditor.ui b/src/qtui/ui/simplenetworkeditor.ui
index 2c4c62ae..7e503296 100644
--- a/src/qtui/ui/simplenetworkeditor.ui
+++ b/src/qtui/ui/simplenetworkeditor.ui
@@ -1,42 +1,47 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>SimpleNetworkEditor</class>
- <widget class="QWidget" name="SimpleNetworkEditor" >
-  <property name="geometry" >
+ <widget class="QWidget" name="SimpleNetworkEditor">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>467</width>
-    <height>413</height>
+    <width>334</width>
+    <height>333</height>
    </rect>
   </property>
-  <property name="sizePolicy" >
-   <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2" >
+  <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout" >
+    <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QLabel" name="label" >
-       <property name="text" >
-        <string>Networkname:</string>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Network name:</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QLineEdit" name="networkNameEdit" />
+      <widget class="QLineEdit" name="networkNameEdit">
+       <property name="toolTip">
+        <string>The name of the IRC network you are configuring</string>
+       </property>
+      </widget>
      </item>
      <item>
-      <spacer name="horizontalSpacer" >
-       <property name="orientation" >
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
@@ -47,88 +52,106 @@
     </layout>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="title" >
+    <widget class="QGroupBox" name="groupBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
       <string>Servers</string>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_2" >
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
       <item>
-       <widget class="QListWidget" name="serverList" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+       <widget class="QListWidget" name="serverList">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
           <horstretch>1</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="maximumSize" >
+        <property name="maximumSize">
          <size>
-          <width>170</width>
+          <width>16777215</width>
           <height>16777215</height>
          </size>
         </property>
+        <property name="toolTip">
+         <string>A list of IRC servers belonging to this network</string>
+        </property>
        </widget>
       </item>
       <item>
-       <layout class="QVBoxLayout" name="_2" >
+       <layout class="QVBoxLayout" name="verticalLayout_2">
         <item>
-         <widget class="QPushButton" name="editServer" >
-          <property name="sizePolicy" >
-           <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+         <widget class="QPushButton" name="editServer">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="text" >
+          <property name="toolTip">
+           <string>Edit this server entry</string>
+          </property>
+          <property name="text">
            <string>&amp;Edit...</string>
           </property>
-          <property name="icon" >
+          <property name="icon">
            <iconset>
             <normaloff>../settingspages</normaloff>../settingspages</iconset>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QPushButton" name="addServer" >
-          <property name="sizePolicy" >
-           <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+         <widget class="QPushButton" name="addServer">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="text" >
+          <property name="toolTip">
+           <string>Add another IRC server</string>
+          </property>
+          <property name="text">
            <string>&amp;Add...</string>
           </property>
-          <property name="icon" >
+          <property name="icon">
            <iconset>
             <normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QPushButton" name="deleteServer" >
-          <property name="sizePolicy" >
-           <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+         <widget class="QPushButton" name="deleteServer">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="text" >
+          <property name="toolTip">
+           <string>Remove this server entry from the list</string>
+          </property>
+          <property name="text">
            <string>De&amp;lete</string>
           </property>
-          <property name="icon" >
+          <property name="icon">
            <iconset>
             <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
           </property>
          </widget>
         </item>
         <item>
-         <layout class="QHBoxLayout" name="_3" >
+         <layout class="QHBoxLayout" name="_3">
           <item>
            <spacer>
-            <property name="orientation" >
+            <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" stdset="0" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>0</width>
               <height>20</height>
@@ -137,28 +160,28 @@
            </spacer>
           </item>
           <item>
-           <widget class="QToolButton" name="upServer" >
-            <property name="toolTip" >
+           <widget class="QToolButton" name="upServer">
+            <property name="toolTip">
              <string>Move upwards in list</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>...</string>
             </property>
-            <property name="icon" >
+            <property name="icon">
              <iconset>
               <normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</iconset>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QToolButton" name="downServer" >
-            <property name="toolTip" >
+           <widget class="QToolButton" name="downServer">
+            <property name="toolTip">
              <string>Move downwards in list</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>...</string>
             </property>
-            <property name="icon" >
+            <property name="icon">
              <iconset>
               <normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</iconset>
             </property>
@@ -166,10 +189,10 @@
           </item>
           <item>
            <spacer>
-            <property name="orientation" >
+            <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" stdset="0" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>0</width>
               <height>20</height>
@@ -180,11 +203,11 @@
          </layout>
         </item>
         <item>
-         <spacer>
-          <property name="orientation" >
+         <spacer name="verticalSpacer_2">
+          <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
-          <property name="sizeHint" stdset="0" >
+          <property name="sizeHint" stdset="0">
            <size>
             <width>20</width>
             <height>40</height>
@@ -198,60 +221,36 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox_2" >
-     <property name="title" >
-      <string>Channels</string>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Join Channels Automatically</string>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_3" >
+     <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="QTextEdit" name="channelList" >
-        <property name="maximumSize" >
+       <widget class="QTextEdit" name="channelList">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
          <size>
-          <width>170</width>
+          <width>0</width>
+          <height>80</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
           <height>16777215</height>
          </size>
         </property>
+        <property name="toolTip">
+         <string>A list of IRC channels you will join automatically after connecting to the network</string>
+        </property>
        </widget>
       </item>
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout" >
-        <item>
-         <widget class="QLabel" name="label_2" >
-          <property name="sizePolicy" >
-           <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize" >
-           <size>
-            <width>120</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text" >
-           <string>Enter a list of channels you want to join after the IRC connection has been established.</string>
-          </property>
-          <property name="wordWrap" >
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="verticalSpacer" >
-          <property name="orientation" >
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0" >
-           <size>
-            <width>20</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
      </layout>
     </widget>
    </item>