Fixing/tweaking various UIs, mostly icons

diff --git a/src/qtui/ui/aboutdlg.ui b/src/qtui/ui/aboutdlg.ui
index 96841a7..a4f863a 100644 (file)
--- a/src/qtui/ui/aboutdlg.ui
+++ b/src/qtui/ui/aboutdlg.ui
@@ -15,6 +15,10 @@
   <property name="windowTitle" >
    <string>About Quassel</string>
   </property>
+  <property name="windowIcon" >
+   <iconset resource="../../icons/quassel-icons.qrc" >
+    <normaloff>:/quassel/16x16/apps/quassel.png</normaloff>:/quassel/16x16/apps/quassel.png</iconset>
+  </property>
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QFrame" name="frame" >
@@ -107,8 +111,8 @@ p, li { white-space: pre-wrap; }
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>458</width>
-        <height>261</height>
+        <width>472</width>
+        <height>296</height>
        </rect>
       </property>
       <attribute name="title" >

diff --git a/src/qtui/ui/channellistdlg.ui b/src/qtui/ui/channellistdlg.ui
index ceef19f..70c3c21 100644 (file)
--- a/src/qtui/ui/channellistdlg.ui
+++ b/src/qtui/ui/channellistdlg.ui
@@ -12,6 +12,10 @@
   <property name="windowTitle" >
    <string>Channel List</string>
   </property>
+  <property name="windowIcon" >
+   <iconset resource="../../icons/icons.qrc" >
+    <normaloff>:/16x16/actions/oxygen/16x16/actions/format-list-unordered.png</normaloff>:/16x16/actions/oxygen/16x16/actions/format-list-unordered.png</iconset>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout" >
    <property name="spacing" >
     <number>2</number>
@@ -78,6 +82,8 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../../icons/icons.qrc" />
+ </resources>
  <connections/>
 </ui>

diff --git a/src/qtui/ui/coreconfigwizardadminuserpage.ui b/src/qtui/ui/coreconfigwizardadminuserpage.ui
index cb6cc92..261d5f8 100644 (file)
--- a/src/qtui/ui/coreconfigwizardadminuserpage.ui
+++ b/src/qtui/ui/coreconfigwizardadminuserpage.ui
@@ -68,9 +68,9 @@
       <string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 &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:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;">
-&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;">Note: Adding more users and changing your username/password is not possible via Quassel's interface yet.&lt;/span>&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-style:italic;">If you need to do these things have a look at the manageusers.py script which is located in the /scripts directory.&lt;/p>&lt;/body>&lt;/html></string>
+&lt;/style>&lt;/head>&lt;body style=" font-family:'DejaVu Sans'; font-size:8pt; font-weight:400; font-style:normal;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;">&lt;span style=" font-size:10pt; font-weight:600;">Note: &lt;/span>&lt;span style=" font-size:10pt;">Adding more users and changing your username/password is not possible via Quassel's interface yet.&lt;/span>&lt;/p>
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:10pt;">If you need to do these things have a look at the manageusers.py script which is located in the /scripts directory.&lt;/p>&lt;/body>&lt;/html></string>
      </property>
      <property name="alignment" >
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>

diff --git a/src/qtui/ui/coreconnectdlg.ui b/src/qtui/ui/coreconnectdlg.ui
index 8204ac9..10b28ab 100644 (file)
--- a/src/qtui/ui/coreconnectdlg.ui
+++ b/src/qtui/ui/coreconnectdlg.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>496</width>
-    <height>316</height>
+    <width>519</width>
+    <height>325</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -18,6 +18,10 @@
   <property name="windowTitle" >
    <string>Connect to Quassel Core</string>
   </property>
+  <property name="windowIcon" >
+   <iconset resource="../../icons/icons.qrc" >
+    <normaloff>:/16x16/actions/network-disconnect</normaloff>:/16x16/actions/network-disconnect</iconset>
+  </property>
   <layout class="QHBoxLayout" >
    <item>
     <widget class="QStackedWidget" name="stackedWidget" >
@@ -28,9 +32,17 @@
       </sizepolicy>
      </property>
      <property name="currentIndex" >
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="accountPage" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>511</width>
+        <height>317</height>
+       </rect>
+      </property>
       <layout class="QVBoxLayout" >
        <item>
         <widget class="QGroupBox" name="groupBox" >
@@ -53,7 +65,8 @@
                <string>Edit...</string>
               </property>
               <property name="icon" >
-               <iconset/>
+               <iconset resource="../../icons/icons.qrc" >
+                <normaloff>:/16x16/actions/oxygen/16x16/actions/document-properties.png</normaloff>:/16x16/actions/oxygen/16x16/actions/document-properties.png</iconset>
               </property>
              </widget>
             </item>
@@ -63,7 +76,8 @@
                <string>Add...</string>
               </property>
               <property name="icon" >
-               <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
+               <iconset resource="../../icons/icons.qrc" >
+                <normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
               </property>
              </widget>
             </item>
@@ -73,7 +87,8 @@
                <string>Delete</string>
               </property>
               <property name="icon" >
-               <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/list-remove.png</iconset>
+               <iconset resource="../../icons/icons.qrc" >
+                <normaloff>:/16x16/actions/oxygen/16x16/actions/list-remove.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-remove.png</iconset>
               </property>
              </widget>
             </item>
@@ -82,7 +97,7 @@
               <property name="orientation" >
                <enum>Qt::Vertical</enum>
               </property>
-              <property name="sizeHint" >
+              <property name="sizeHint" stdset="0" >
                <size>
                 <width>20</width>
                 <height>40</height>
@@ -110,7 +125,7 @@
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="standardButtons" >
-            <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+            <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
            </property>
           </widget>
          </item>
@@ -119,6 +134,14 @@
       </layout>
      </widget>
      <widget class="QWidget" name="loginPage" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>511</width>
+        <height>317</height>
+       </rect>
+      </property>
       <layout class="QVBoxLayout" >
        <item>
         <widget class="QGroupBox" name="groupBox_2" >
@@ -135,16 +158,7 @@
           <property name="spacing" >
            <number>0</number>
           </property>
-          <property name="leftMargin" >
-           <number>4</number>
-          </property>
-          <property name="topMargin" >
-           <number>4</number>
-          </property>
-          <property name="rightMargin" >
-           <number>4</number>
-          </property>
-          <property name="bottomMargin" >
+          <property name="margin" >
            <number>4</number>
           </property>
           <item>
@@ -177,7 +191,7 @@
               <property name="orientation" >
                <enum>Qt::Horizontal</enum>
               </property>
-              <property name="sizeHint" >
+              <property name="sizeHint" stdset="0" >
                <size>
                 <width>358</width>
                 <height>21</height>
@@ -231,13 +245,21 @@ space</string>
              <number>0</number>
             </property>
             <widget class="QWidget" name="loginCredentialsPage" >
+             <property name="geometry" >
+              <rect>
+               <x>0</x>
+               <y>0</y>
+               <width>485</width>
+               <height>147</height>
+              </rect>
+             </property>
              <layout class="QVBoxLayout" >
               <item>
                <spacer>
                 <property name="orientation" >
                  <enum>Qt::Vertical</enum>
                 </property>
-                <property name="sizeHint" >
+                <property name="sizeHint" stdset="0" >
                  <size>
                   <width>20</width>
                   <height>40</height>
@@ -250,7 +272,7 @@ space</string>
                 <property name="orientation" >
                  <enum>Qt::Vertical</enum>
                 </property>
-                <property name="sizeHint" >
+                <property name="sizeHint" stdset="0" >
                  <size>
                   <width>20</width>
                   <height>40</height>
@@ -270,16 +292,7 @@ space</string>
                  <string>Login</string>
                 </property>
                 <layout class="QVBoxLayout" >
-                 <property name="leftMargin" >
-                  <number>4</number>
-                 </property>
-                 <property name="topMargin" >
-                  <number>4</number>
-                 </property>
-                 <property name="rightMargin" >
-                  <number>4</number>
-                 </property>
-                 <property name="bottomMargin" >
+                 <property name="margin" >
                   <number>4</number>
                  </property>
                  <item>
@@ -327,6 +340,14 @@ space</string>
              </layout>
             </widget>
             <widget class="QWidget" name="coreConfigPage" >
+             <property name="geometry" >
+              <rect>
+               <x>0</x>
+               <y>0</y>
+               <width>100</width>
+               <height>30</height>
+              </rect>
+             </property>
              <layout class="QVBoxLayout" >
               <item>
                <widget class="QGroupBox" name="groupBox_4" >
@@ -360,7 +381,7 @@ space</string>
                      <property name="orientation" >
                       <enum>Qt::Horizontal</enum>
                      </property>
-                     <property name="sizeHint" >
+                     <property name="sizeHint" stdset="0" >
                       <size>
                        <width>40</width>
                        <height>20</height>
@@ -380,7 +401,7 @@ space</string>
                      <property name="orientation" >
                       <enum>Qt::Horizontal</enum>
                      </property>
-                     <property name="sizeHint" >
+                     <property name="sizeHint" stdset="0" >
                       <size>
                        <width>40</width>
                        <height>20</height>
@@ -398,7 +419,7 @@ space</string>
                 <property name="orientation" >
                  <enum>Qt::Vertical</enum>
                 </property>
-                <property name="sizeHint" >
+                <property name="sizeHint" stdset="0" >
                  <size>
                   <width>20</width>
                   <height>40</height>
@@ -408,7 +429,16 @@ space</string>
               </item>
              </layout>
             </widget>
-            <widget class="QWidget" name="loginEmptyPage" />
+            <widget class="QWidget" name="loginEmptyPage" >
+             <property name="geometry" >
+              <rect>
+               <x>0</x>
+               <y>0</y>
+               <width>100</width>
+               <height>30</height>
+              </rect>
+             </property>
+            </widget>
            </widget>
           </item>
          </layout>
@@ -417,13 +447,21 @@ space</string>
        <item>
         <widget class="QDialogButtonBox" name="loginButtonBox" >
          <property name="standardButtons" >
-          <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+          <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="syncPage" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>511</width>
+        <height>317</height>
+       </rect>
+      </property>
       <layout class="QVBoxLayout" >
        <item>
         <widget class="QGroupBox" name="groupBox_3" >
@@ -535,7 +573,7 @@ space</string>
               <property name="orientation" >
                <enum>Qt::Vertical</enum>
               </property>
-              <property name="sizeHint" >
+              <property name="sizeHint" stdset="0" >
                <size>
                 <width>483</width>
                 <height>61</height>

diff --git a/src/qtui/ui/mainwin.ui b/src/qtui/ui/mainwin.ui
index 6f61c66..5a6cf54 100644 (file)
--- a/src/qtui/ui/mainwin.ui
+++ b/src/qtui/ui/mainwin.ui
@@ -16,9 +16,9 @@
    <property name="geometry" >
     <rect>
      <x>0</x>
-     <y>22</y>
+     <y>24</y>
      <width>800</width>
-     <height>556</height>
+     <height>555</height>
     </rect>
    </property>
    <property name="sizePolicy" >
@@ -42,7 +42,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>22</height>
+     <height>24</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile" >
@@ -59,9 +59,7 @@
     <addaction name="actionDisconnectCore" />
     <addaction name="separator" />
     <addaction name="menuNetworks" />
-    <addaction name="separator" />
     <addaction name="actionJoinChannel" />
-    <addaction name="separator" />
     <addaction name="actionSetAwayGlobally" />
     <addaction name="separator" />
     <addaction name="actionQuit" />
@@ -102,9 +100,9 @@
    <property name="geometry" >
     <rect>
      <x>0</x>
-     <y>578</y>
+     <y>579</y>
      <width>800</width>
-     <height>22</height>
+     <height>21</height>
     </rect>
    </property>
   </widget>
@@ -150,6 +148,9 @@
    <property name="text" >
     <string>Join Channel...</string>
    </property>
+   <property name="visible" >
+    <bool>false</bool>
+   </property>
   </action>
   <action name="actionSetAwayGlobally" >
    <property name="enabled" >
@@ -158,6 +159,9 @@
    <property name="text" >
     <string>Set Away globally</string>
    </property>
+   <property name="visible" >
+    <bool>false</bool>
+   </property>
   </action>
   <action name="actionQuit" >
    <property name="icon" >
@@ -178,9 +182,8 @@
   </action>
   <action name="actionSettingsDlg" >
    <property name="icon" >
-    <iconset>
-     <normaloff/>
-    </iconset>
+    <iconset resource="../../icons/icons.qrc" >
+     <normaloff>:/16x16/actions/configure</normaloff>:/16x16/actions/configure</iconset>
    </property>
    <property name="text" >
     <string>Configure Quassel...</string>
@@ -193,6 +196,10 @@
    <property name="enabled" >
     <bool>true</bool>
    </property>
+   <property name="icon" >
+    <iconset resource="../../icons/icons.qrc" >
+     <normaloff>:/16x16/actions/oxygen/16x16/actions/view-tree.png</normaloff>:/16x16/actions/oxygen/16x16/actions/view-tree.png</iconset>
+   </property>
    <property name="text" >
     <string>Manage Views...</string>
    </property>
@@ -239,9 +246,8 @@
     <bool>false</bool>
    </property>
    <property name="icon" >
-    <iconset>
-     <normaloff/>
-    </iconset>
+    <iconset resource="../../icons/icons.qrc" >
+     <normaloff>:/16x16/actions/network-disconnect</normaloff>:/16x16/actions/network-disconnect</iconset>
    </property>
    <property name="text" >
     <string>Disconnect from Core</string>
@@ -252,9 +258,8 @@
     <bool>false</bool>
    </property>
    <property name="icon" >
-    <iconset>
-     <normaloff/>
-    </iconset>
+    <iconset resource="../../icons/icons.qrc" >
+     <normaloff>:/16x16/actions/network-connect</normaloff>:/16x16/actions/network-connect</iconset>
    </property>
    <property name="text" >
     <string>Connect to Core...</string>

diff --git a/src/qtui/ui/settingsdlg.ui b/src/qtui/ui/settingsdlg.ui
index 97d41de..1a70467 100644 (file)
--- a/src/qtui/ui/settingsdlg.ui
+++ b/src/qtui/ui/settingsdlg.ui
@@ -12,6 +12,10 @@
   <property name="windowTitle" >
    <string>Configure Quassel</string>
   </property>
+  <property name="windowIcon" >
+   <iconset resource="../../icons/icons.qrc" >
+    <normaloff>:/16x16/actions/configure</normaloff>:/16x16/actions/configure</iconset>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout_2" >
    <item>
     <widget class="QSplitter" name="splitter" >
@@ -31,7 +35,7 @@
        </property>
       </column>
      </widget>
-     <widget class="QWidget" name="" >
+     <widget class="QWidget" name="layoutWidget" >
       <layout class="QVBoxLayout" name="verticalLayout" >
        <item>
         <widget class="QLabel" name="pageTitle" >
@@ -60,8 +64,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>492</width>
-            <height>466</height>
+            <width>509</width>
+            <height>507</height>
            </rect>
           </property>
          </widget>
@@ -83,6 +87,8 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../../icons/icons.qrc" />
+ </resources>
  <connections/>
 </ui>

diff --git a/src/qtui/ui/settingspagedlg.ui b/src/qtui/ui/settingspagedlg.ui
index 3de25a4..2069f6a 100644 (file)
--- a/src/qtui/ui/settingspagedlg.ui
+++ b/src/qtui/ui/settingspagedlg.ui
@@ -10,7 +10,11 @@
    </rect>
   </property>
   <property name="windowTitle" >
-   <string>Dialog</string>
+   <string>Configure Quassel</string>
+  </property>
+  <property name="windowIcon" >
+   <iconset resource="../../icons/icons.qrc" >
+    <normaloff>:/16x16/actions/configure</normaloff>:/16x16/actions/configure</iconset>
   </property>
   <layout class="QVBoxLayout" >
    <item>
@@ -55,20 +59,14 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons" >
-      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok|QDialogButtonBox::Reset|QDialogButtonBox::RestoreDefaults</set>
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset|QDialogButtonBox::RestoreDefaults</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>QScrollArea</class>
-   <extends>QFrame</extends>
-   <header>QScrollArea</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
+ <resources>
+  <include location="../../icons/icons.qrc" />
+ </resources>
  <connections/>
 </ui>