X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=gui%2Fnetworkeditdlg.ui;h=178df87681bddf2b9a15897aa2afa5515f271037;hp=6814051fc0d57d06930c575c41aaeedfcd3762fc;hb=82403b8a8777d44cbc35619e3bbd4feabfad5dc4;hpb=63db3c5de9d76c5abc55b0cba86f66d2aba7745d

diff --git a/gui/networkeditdlg.ui b/gui/networkeditdlg.ui
index 6814051f..178df876 100644
--- a/gui/networkeditdlg.ui
+++ b/gui/networkeditdlg.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>434</width>
-    <height>458</height>
+    <width>385</width>
+    <height>449</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -27,7 +27,7 @@
      <property name="spacing" >
       <number>6</number>
      </property>
-     <item row="2" column="0" >
+     <item row="3" column="0" >
       <widget class="QLabel" name="label_3" >
        <property name="text" >
         <string>Identity:</string>
@@ -41,10 +41,24 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="1" >
-      <widget class="QLineEdit" name="networkName" />
+     <item row="2" column="0" >
+      <widget class="QLabel" name="label_2" >
+       <property name="text" >
+        <string>Group:</string>
+       </property>
+      </widget>
      </item>
      <item row="2" column="1" >
+      <widget class="QComboBox" name="networkGroup" >
+       <property name="editable" >
+        <bool>true</bool>
+       </property>
+       <property name="insertPolicy" >
+        <enum>QComboBox::NoInsert</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1" >
       <layout class="QHBoxLayout" >
        <property name="margin" >
         <number>0</number>
@@ -72,17 +86,16 @@
        </item>
       </layout>
      </item>
+     <item row="0" column="1" >
+      <widget class="QLineEdit" name="networkName" />
+     </item>
      <item row="1" column="1" >
-      <widget class="QComboBox" name="networkGroup" >
-       <property name="insertPolicy" >
-        <enum>QComboBox::NoInsert</enum>
-       </property>
-      </widget>
+      <widget class="QLineEdit" name="networkDesc" />
      </item>
      <item row="1" column="0" >
-      <widget class="QLabel" name="label_2" >
+      <widget class="QLabel" name="label_5" >
        <property name="text" >
-        <string>Group:</string>
+        <string>Comment:</string>
        </property>
       </widget>
      </item>
@@ -91,31 +104,37 @@
    <item>
     <widget class="QCheckBox" name="enableAutoConnect" >
      <property name="text" >
-      <string>Auto-connect at startup</string>
+      <string>Auto-connect on startup</string>
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="QWidget" native="1" name="widget" />
-   </item>
    <item>
     <widget class="QTabWidget" name="tabWidget" >
+     <property name="enabled" >
+      <bool>true</bool>
+     </property>
      <property name="currentIndex" >
       <number>0</number>
      </property>
-     <widget class="QWidget" name="tab" >
+     <widget class="QWidget" name="serversTab" >
+      <property name="enabled" >
+       <bool>true</bool>
+      </property>
       <attribute name="title" >
        <string>Servers</string>
       </attribute>
-      <layout class="QVBoxLayout" >
+      <layout class="QHBoxLayout" >
        <property name="margin" >
-        <number>8</number>
+        <number>9</number>
        </property>
        <property name="spacing" >
         <number>6</number>
        </property>
        <item>
-        <layout class="QHBoxLayout" >
+        <widget class="QListWidget" name="serverList" />
+       </item>
+       <item>
+        <layout class="QVBoxLayout" >
          <property name="margin" >
           <number>0</number>
          </property>
@@ -123,81 +142,58 @@
           <number>6</number>
          </property>
          <item>
-          <widget class="QListWidget" name="serverList" />
+          <widget class="QPushButton" name="addServer" >
+           <property name="text" >
+            <string>&amp;Add...</string>
+           </property>
+          </widget>
          </item>
          <item>
-          <layout class="QVBoxLayout" >
-           <property name="margin" >
-            <number>0</number>
+          <widget class="QPushButton" name="editServer" >
+           <property name="text" >
+            <string>&amp;Edit...</string>
            </property>
-           <property name="spacing" >
-            <number>6</number>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="deleteServer" >
+           <property name="text" >
+            <string>De&amp;lete</string>
            </property>
-           <item>
-            <widget class="QPushButton" name="addServer" >
-             <property name="text" >
-              <string>&amp;Add...</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="editServer" >
-             <property name="text" >
-              <string>&amp;Edit...</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="deleteServer" >
-             <property name="text" >
-              <string>De&amp;lete</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="upServer" >
-             <property name="text" >
-              <string>Move &amp;Up</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="downServer" >
-             <property name="text" >
-              <string>Move &amp;Down</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer>
-             <property name="orientation" >
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" >
-              <size>
-               <width>20</width>
-               <height>40</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="upServer" >
+           <property name="text" >
+            <string>Move &amp;Up</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="downServer" >
+           <property name="text" >
+            <string>Move &amp;Down</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer>
+           <property name="orientation" >
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" >
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
          </item>
         </layout>
        </item>
       </layout>
-      <widget class="QWidget" native="1" name="widget" >
-       <property name="geometry" >
-        <rect>
-         <x>230</x>
-         <y>20</y>
-         <width>87</width>
-         <height>151</height>
-        </rect>
-       </property>
-      </widget>
      </widget>
-     <widget class="QWidget" name="tab" >
+     <widget class="QWidget" name="performTab" >
       <attribute name="title" >
        <string>Perform</string>
       </attribute>
@@ -217,7 +213,17 @@
           <number>6</number>
          </property>
          <item>
-          <widget class="QTextEdit" name="performEdit" />
+          <widget class="QTextEdit" name="performEdit" >
+           <property name="enabled" >
+            <bool>false</bool>
+           </property>
+           <property name="html" >
+            <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-style:italic;">Not implemented yet&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
+           </property>
+          </widget>
          </item>
          <item>
           <widget class="QLabel" name="label_4" >