From: Adam Tulinius <mail@adamtulinius.dk>
Date: Wed, 2 Jan 2008 23:41:28 +0000 (+0000)
Subject: Cleaned up window titles of widgets etc. Bu-bye "Forms", nice to know ya.
X-Git-Tag: 0.2.0-alpha1~261
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=012e3de3c07f201ec337ebe586190281c83c9e5b

Cleaned up window titles of widgets etc. Bu-bye "Forms", nice to know ya.
---

diff --git a/src/qtui/ui/aboutdlg.ui b/src/qtui/ui/aboutdlg.ui
index 9740c85c..7448a6ca 100644
--- a/src/qtui/ui/aboutdlg.ui
+++ b/src/qtui/ui/aboutdlg.ui
@@ -13,7 +13,7 @@
    </rect>
   </property>
   <property name="windowTitle" >
-   <string>Dialog</string>
+   <string>About Quassel</string>
   </property>
   <widget class="QLabel" name="label" >
    <property name="geometry" >
diff --git a/src/qtui/ui/buffermgmtpage.ui b/src/qtui/ui/buffermgmtpage.ui
index 34505a87..2518ad06 100644
--- a/src/qtui/ui/buffermgmtpage.ui
+++ b/src/qtui/ui/buffermgmtpage.ui
@@ -6,19 +6,28 @@
     <x>0</x>
     <y>0</y>
     <width>672</width>
-    <height>488</height>
+    <height>492</height>
    </rect>
   </property>
   <property name="windowTitle" >
-   <string>Form</string>
+   <string/>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
    <property name="spacing" >
     <number>6</number>
    </property>
+   <property name="leftMargin" >
+    <number>9</number>
+   </property>
+   <property name="topMargin" >
+    <number>9</number>
+   </property>
+   <property name="rightMargin" >
+    <number>9</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>9</number>
+   </property>
    <item>
     <widget class="QLabel" name="label" >
      <property name="frameShape" >
@@ -41,27 +50,50 @@ p, li { white-space: pre-wrap; }
    </item>
    <item>
     <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
      <property name="spacing" >
       <number>6</number>
      </property>
+     <property name="leftMargin" >
+      <number>0</number>
+     </property>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
+     </property>
      <item>
       <widget class="QTreeWidget" name="tree" >
        <property name="rootIsDecorated" >
         <bool>false</bool>
        </property>
+       <column>
+        <property name="text" >
+         <string>1</string>
+        </property>
+       </column>
       </widget>
      </item>
      <item>
       <layout class="QVBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
        <property name="spacing" >
         <number>6</number>
        </property>
+       <property name="leftMargin" >
+        <number>0</number>
+       </property>
+       <property name="topMargin" >
+        <number>0</number>
+       </property>
+       <property name="rightMargin" >
+        <number>0</number>
+       </property>
+       <property name="bottomMargin" >
+        <number>0</number>
+       </property>
        <item>
         <widget class="QGroupBox" name="groupBox" >
          <property name="title" >
@@ -71,12 +103,21 @@ p, li { white-space: pre-wrap; }
           <bool>false</bool>
          </property>
          <layout class="QVBoxLayout" >
-          <property name="margin" >
-           <number>9</number>
-          </property>
           <property name="spacing" >
            <number>6</number>
           </property>
+          <property name="leftMargin" >
+           <number>9</number>
+          </property>
+          <property name="topMargin" >
+           <number>9</number>
+          </property>
+          <property name="rightMargin" >
+           <number>9</number>
+          </property>
+          <property name="bottomMargin" >
+           <number>9</number>
+          </property>
           <item>
            <widget class="QLabel" name="label_2" >
             <property name="text" >
@@ -105,12 +146,21 @@ Lines:     1234
            <string>Local Display</string>
           </attribute>
           <layout class="QVBoxLayout" >
-           <property name="margin" >
-            <number>9</number>
-           </property>
            <property name="spacing" >
             <number>6</number>
            </property>
+           <property name="leftMargin" >
+            <number>9</number>
+           </property>
+           <property name="topMargin" >
+            <number>9</number>
+           </property>
+           <property name="rightMargin" >
+            <number>9</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>9</number>
+           </property>
            <item>
             <widget class="QGroupBox" name="groupBox_2" >
              <property name="title" >
@@ -123,12 +173,21 @@ Lines:     1234
               <bool>false</bool>
              </property>
              <layout class="QVBoxLayout" >
-              <property name="margin" >
-               <number>9</number>
-              </property>
               <property name="spacing" >
                <number>6</number>
               </property>
+              <property name="leftMargin" >
+               <number>9</number>
+              </property>
+              <property name="topMargin" >
+               <number>9</number>
+              </property>
+              <property name="rightMargin" >
+               <number>9</number>
+              </property>
+              <property name="bottomMargin" >
+               <number>9</number>
+              </property>
               <item>
                <widget class="QRadioButton" name="radioButton" >
                 <property name="text" >
@@ -138,18 +197,25 @@ Lines:     1234
               </item>
               <item>
                <layout class="QHBoxLayout" >
-                <property name="margin" >
-                 <number>0</number>
-                </property>
                 <property name="spacing" >
                  <number>6</number>
                 </property>
+                <property name="leftMargin" >
+                 <number>0</number>
+                </property>
+                <property name="topMargin" >
+                 <number>0</number>
+                </property>
+                <property name="rightMargin" >
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin" >
+                 <number>0</number>
+                </property>
                 <item>
                  <widget class="QRadioButton" name="radioButton_2" >
                   <property name="sizePolicy" >
-                   <sizepolicy>
-                    <hsizetype>5</hsizetype>
-                    <vsizetype>0</vsizetype>
+                   <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                    </sizepolicy>
@@ -162,19 +228,17 @@ Lines:     1234
                 <item>
                  <widget class="QSpinBox" name="spinBox" >
                   <property name="sizePolicy" >
-                   <sizepolicy>
-                    <hsizetype>5</hsizetype>
-                    <vsizetype>0</vsizetype>
+                   <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                    </sizepolicy>
                   </property>
-                  <property name="maximum" >
-                   <number>99999</number>
-                  </property>
                   <property name="minimum" >
                    <number>1</number>
                   </property>
+                  <property name="maximum" >
+                   <number>99999</number>
+                  </property>
                   <property name="value" >
                    <number>1000</number>
                   </property>
@@ -204,12 +268,21 @@ Lines:     1234
               </item>
               <item>
                <layout class="QHBoxLayout" >
-                <property name="margin" >
-                 <number>0</number>
-                </property>
                 <property name="spacing" >
                  <number>6</number>
                 </property>
+                <property name="leftMargin" >
+                 <number>0</number>
+                </property>
+                <property name="topMargin" >
+                 <number>0</number>
+                </property>
+                <property name="rightMargin" >
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin" >
+                 <number>0</number>
+                </property>
                 <item>
                  <widget class="QRadioButton" name="radioButton_3" >
                   <property name="text" >
@@ -219,12 +292,12 @@ Lines:     1234
                 </item>
                 <item>
                  <widget class="QSpinBox" name="spinBox_2" >
-                  <property name="maximum" >
-                   <number>1000</number>
-                  </property>
                   <property name="minimum" >
                    <number>1</number>
                   </property>
+                  <property name="maximum" >
+                   <number>1000</number>
+                  </property>
                   <property name="value" >
                    <number>30</number>
                   </property>
@@ -277,12 +350,21 @@ Lines:     1234
               </item>
               <item>
                <layout class="QHBoxLayout" >
-                <property name="margin" >
-                 <number>0</number>
-                </property>
                 <property name="spacing" >
                  <number>6</number>
                 </property>
+                <property name="leftMargin" >
+                 <number>0</number>
+                </property>
+                <property name="topMargin" >
+                 <number>0</number>
+                </property>
+                <property name="rightMargin" >
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin" >
+                 <number>0</number>
+                </property>
                 <item>
                  <spacer>
                   <property name="orientation" >
@@ -315,12 +397,21 @@ Lines:     1234
            <string>Backlog Storage</string>
           </attribute>
           <layout class="QVBoxLayout" >
-           <property name="margin" >
-            <number>9</number>
-           </property>
            <property name="spacing" >
             <number>6</number>
            </property>
+           <property name="leftMargin" >
+            <number>9</number>
+           </property>
+           <property name="topMargin" >
+            <number>9</number>
+           </property>
+           <property name="rightMargin" >
+            <number>9</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>9</number>
+           </property>
            <item>
             <widget class="QLabel" name="label_7" >
              <property name="text" >
@@ -349,12 +440,21 @@ p, li { white-space: pre-wrap; }
               <bool>false</bool>
              </property>
              <layout class="QVBoxLayout" >
-              <property name="margin" >
-               <number>9</number>
-              </property>
               <property name="spacing" >
                <number>6</number>
               </property>
+              <property name="leftMargin" >
+               <number>9</number>
+              </property>
+              <property name="topMargin" >
+               <number>9</number>
+              </property>
+              <property name="rightMargin" >
+               <number>9</number>
+              </property>
+              <property name="bottomMargin" >
+               <number>9</number>
+              </property>
               <item>
                <widget class="QRadioButton" name="radioButton_5" >
                 <property name="text" >
@@ -364,18 +464,25 @@ p, li { white-space: pre-wrap; }
               </item>
               <item>
                <layout class="QHBoxLayout" >
-                <property name="margin" >
-                 <number>0</number>
-                </property>
                 <property name="spacing" >
                  <number>6</number>
                 </property>
+                <property name="leftMargin" >
+                 <number>0</number>
+                </property>
+                <property name="topMargin" >
+                 <number>0</number>
+                </property>
+                <property name="rightMargin" >
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin" >
+                 <number>0</number>
+                </property>
                 <item>
                  <widget class="QRadioButton" name="radioButton_6" >
                   <property name="sizePolicy" >
-                   <sizepolicy>
-                    <hsizetype>5</hsizetype>
-                    <vsizetype>0</vsizetype>
+                   <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                    </sizepolicy>
@@ -388,19 +495,17 @@ p, li { white-space: pre-wrap; }
                 <item>
                  <widget class="QSpinBox" name="spinBox_3" >
                   <property name="sizePolicy" >
-                   <sizepolicy>
-                    <hsizetype>5</hsizetype>
-                    <vsizetype>0</vsizetype>
+                   <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                    </sizepolicy>
                   </property>
-                  <property name="maximum" >
-                   <number>99999</number>
-                  </property>
                   <property name="minimum" >
                    <number>1</number>
                   </property>
+                  <property name="maximum" >
+                   <number>99999</number>
+                  </property>
                   <property name="value" >
                    <number>1000</number>
                   </property>
@@ -430,12 +535,21 @@ p, li { white-space: pre-wrap; }
               </item>
               <item>
                <layout class="QHBoxLayout" >
-                <property name="margin" >
-                 <number>0</number>
-                </property>
                 <property name="spacing" >
                  <number>6</number>
                 </property>
+                <property name="leftMargin" >
+                 <number>0</number>
+                </property>
+                <property name="topMargin" >
+                 <number>0</number>
+                </property>
+                <property name="rightMargin" >
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin" >
+                 <number>0</number>
+                </property>
                 <item>
                  <widget class="QRadioButton" name="radioButton_7" >
                   <property name="text" >
@@ -445,12 +559,12 @@ p, li { white-space: pre-wrap; }
                 </item>
                 <item>
                  <widget class="QSpinBox" name="spinBox_4" >
-                  <property name="maximum" >
-                   <number>1000</number>
-                  </property>
                   <property name="minimum" >
                    <number>1</number>
                   </property>
+                  <property name="maximum" >
+                   <number>1000</number>
+                  </property>
                   <property name="value" >
                    <number>30</number>
                   </property>
@@ -496,12 +610,21 @@ p, li { white-space: pre-wrap; }
               </item>
               <item>
                <layout class="QHBoxLayout" >
-                <property name="margin" >
-                 <number>0</number>
-                </property>
                 <property name="spacing" >
                  <number>6</number>
                 </property>
+                <property name="leftMargin" >
+                 <number>0</number>
+                </property>
+                <property name="topMargin" >
+                 <number>0</number>
+                </property>
+                <property name="rightMargin" >
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin" >
+                 <number>0</number>
+                </property>
                 <item>
                  <spacer>
                   <property name="orientation" >
@@ -529,12 +652,21 @@ p, li { white-space: pre-wrap; }
            </item>
            <item>
             <layout class="QHBoxLayout" >
-             <property name="margin" >
-              <number>0</number>
-             </property>
              <property name="spacing" >
               <number>6</number>
              </property>
+             <property name="leftMargin" >
+              <number>0</number>
+             </property>
+             <property name="topMargin" >
+              <number>0</number>
+             </property>
+             <property name="rightMargin" >
+              <number>0</number>
+             </property>
+             <property name="bottomMargin" >
+              <number>0</number>
+             </property>
              <item>
               <spacer>
                <property name="orientation" >
diff --git a/src/qtui/ui/bufferwidget.ui b/src/qtui/ui/bufferwidget.ui
index 7ecd29b1..9a809559 100644
--- a/src/qtui/ui/bufferwidget.ui
+++ b/src/qtui/ui/bufferwidget.ui
@@ -25,7 +25,7 @@
    <enum>Qt::DefaultContextMenu</enum>
   </property>
   <property name="windowTitle" >
-   <string>YourNickname #quassel Network: The Topic</string>
+   <string/>
   </property>
   <layout class="QVBoxLayout" >
    <property name="spacing" >
diff --git a/src/qtui/ui/channelwidget.ui b/src/qtui/ui/channelwidget.ui
index e1831c55..3dd865e9 100644
--- a/src/qtui/ui/channelwidget.ui
+++ b/src/qtui/ui/channelwidget.ui
@@ -10,9 +10,7 @@
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>3</hsizetype>
-    <vsizetype>3</vsizetype>
+   <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -27,23 +25,41 @@
    <enum>Qt::DefaultContextMenu</enum>
   </property>
   <property name="windowTitle" >
-   <string>YourNickname #quassel Network: The Topic</string>
+   <string/>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>1</number>
-   </property>
    <property name="spacing" >
     <number>6</number>
    </property>
+   <property name="leftMargin" >
+    <number>1</number>
+   </property>
+   <property name="topMargin" >
+    <number>1</number>
+   </property>
+   <property name="rightMargin" >
+    <number>1</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>1</number>
+   </property>
    <item>
     <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
      <property name="spacing" >
       <number>6</number>
      </property>
+     <property name="leftMargin" >
+      <number>0</number>
+     </property>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
+     </property>
      <item>
       <widget class="QLineEdit" name="topicEdit" >
        <property name="focusPolicy" >
@@ -60,9 +76,7 @@
         <enum>Qt::NonModal</enum>
        </property>
        <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>0</hsizetype>
-         <vsizetype>0</vsizetype>
+        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -80,9 +94,7 @@
    <item>
     <widget class="QSplitter" name="splitter" >
      <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>7</hsizetype>
-       <vsizetype>5</vsizetype>
+      <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -95,9 +107,7 @@
      </property>
      <widget class="QTextBrowser" name="chatWidget" >
       <property name="sizePolicy" >
-       <sizepolicy>
-        <hsizetype>7</hsizetype>
-        <vsizetype>5</vsizetype>
+       <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
         <horstretch>4</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
@@ -113,15 +123,13 @@
       <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:'Bitstream Vera Sans Mono'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Bitstream Vera Sans Mono'; font-size:8pt; font-weight:400; font-style:normal;">
 &lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Mono L';">&lt;/p>&lt;/body>&lt;/html></string>
       </property>
      </widget>
      <widget class="QTreeWidget" name="nickTree" >
       <property name="sizePolicy" >
-       <sizepolicy>
-        <hsizetype>5</hsizetype>
-        <vsizetype>5</vsizetype>
+       <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
         <horstretch>1</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
@@ -222,12 +230,21 @@ p, li { white-space: pre-wrap; }
    </item>
    <item>
     <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
      <property name="spacing" >
       <number>6</number>
      </property>
+     <property name="leftMargin" >
+      <number>0</number>
+     </property>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
+     </property>
      <item>
       <widget class="QComboBox" name="ownNick" >
        <property name="sizeAdjustPolicy" >
@@ -238,9 +255,7 @@ p, li { white-space: pre-wrap; }
      <item>
       <widget class="ChannelWidgetInput" name="inputEdit" >
        <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>3</hsizetype>
-         <vsizetype>0</vsizetype>
+        <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
diff --git a/src/qtui/ui/connectionpage.ui b/src/qtui/ui/connectionpage.ui
index 82fff87d..6c8da18c 100644
--- a/src/qtui/ui/connectionpage.ui
+++ b/src/qtui/ui/connectionpage.ui
@@ -10,7 +10,7 @@
    </rect>
   </property>
   <property name="windowTitle" >
-   <string>Form</string>
+   <string/>
   </property>
  </widget>
  <resources/>
diff --git a/src/qtui/ui/coresettingspage.ui b/src/qtui/ui/coresettingspage.ui
index 2e632703..792c87ba 100644
--- a/src/qtui/ui/coresettingspage.ui
+++ b/src/qtui/ui/coresettingspage.ui
@@ -10,7 +10,7 @@
    </rect>
   </property>
   <property name="windowTitle" >
-   <string>Form</string>
+   <string/>
   </property>
  </widget>
  <resources/>
diff --git a/src/qtui/ui/nicklistwidget.ui b/src/qtui/ui/nicklistwidget.ui
index 31a0edcc..3d1150d3 100644
--- a/src/qtui/ui/nicklistwidget.ui
+++ b/src/qtui/ui/nicklistwidget.ui
@@ -16,7 +16,7 @@
    </sizepolicy>
   </property>
   <property name="windowTitle" >
-   <string>Form</string>
+   <string/>
   </property>
   <layout class="QVBoxLayout" >
    <property name="leftMargin" >
diff --git a/src/qtui/ui/settingsdlg.ui b/src/qtui/ui/settingsdlg.ui
index ed001158..0dbb5e57 100644
--- a/src/qtui/ui/settingsdlg.ui
+++ b/src/qtui/ui/settingsdlg.ui
@@ -10,7 +10,7 @@
    </rect>
   </property>
   <property name="windowTitle" >
-   <string>Dialog</string>
+   <string/>
   </property>
   <layout class="QVBoxLayout" >
    <item>
@@ -37,7 +37,7 @@
        </property>
       </column>
      </widget>
-     <widget class="QWidget" name="" >
+     <widget class="QWidget" name="layoutWidget" >
       <layout class="QVBoxLayout" >
        <item>
         <widget class="QLabel" name="pageTitle" >
diff --git a/src/qtui/ui/topicwidget.ui b/src/qtui/ui/topicwidget.ui
index 9d3edb1d..e06b7e3c 100644
--- a/src/qtui/ui/topicwidget.ui
+++ b/src/qtui/ui/topicwidget.ui
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>568</width>
-    <height>25</height>
+    <height>31</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -28,7 +28,7 @@
    </size>
   </property>
   <property name="windowTitle" >
-   <string>Form</string>
+   <string/>
   </property>
   <layout class="QHBoxLayout" >
    <property name="leftMargin" >
diff --git a/src/qtui/ui/usermgmtpage.ui b/src/qtui/ui/usermgmtpage.ui
index f9f31eda..b2702200 100644
--- a/src/qtui/ui/usermgmtpage.ui
+++ b/src/qtui/ui/usermgmtpage.ui
@@ -10,7 +10,7 @@
    </rect>
   </property>
   <property name="windowTitle" >
-   <string>Form</string>
+   <string/>
   </property>
   <layout class="QVBoxLayout" >
    <item>