Moar icon fixes

diff --git a/icons/missing_icons b/icons/missing_icons
index c935877..aacace0 100644 (file)
--- a/icons/missing_icons
+++ b/icons/missing_icons
@@ -1,2 +1,3 @@
 # Icons we'd like to have in an icon theme
 status/network-connecting
 # Icons we'd like to have in an icon theme
 status/network-connecting

+toggle advanced/simple mode

diff --git a/src/qtui/aboutdlg.cpp b/src/qtui/aboutdlg.cpp
index 3085f5b..de4e72f 100644 (file)
--- a/src/qtui/aboutdlg.cpp
+++ b/src/qtui/aboutdlg.cpp
@@ -19,10 +19,13 @@
  ***************************************************************************/
 
 #include "aboutdlg.h"
  ***************************************************************************/
 
 #include "aboutdlg.h"

+#include "icon.h"
+#include "iconloader.h"

 #include "quassel.h"
 
 AboutDlg::AboutDlg(QWidget *parent) : QDialog(parent) {
   ui.setupUi(this);
 #include "quassel.h"
 
 AboutDlg::AboutDlg(QWidget *parent) : QDialog(parent) {
   ui.setupUi(this);

+  ui.quasselLogo->setPixmap(DesktopIcon("quassel", IconLoader::SizeHuge));

 
   ui.versionLabel->setText(QString(tr("<b>Version %1</b><br>Protocol version: %2<br>Built: %3 %4")).arg(Global::quasselVersion)
                           .arg(Global::protocolVersion)
 
   ui.versionLabel->setText(QString(tr("<b>Version %1</b><br>Protocol version: %2<br>Built: %3 %4")).arg(Global::quasselVersion)
                           .arg(Global::protocolVersion)


@@ -32,6 +35,7 @@ AboutDlg::AboutDlg(QWidget *parent) : QDialog(parent) {
   ui.contributorTextBrowser->setHtml(contributors());
   ui.thanksToTextBrowser->setHtml(thanksTo());
 
   ui.contributorTextBrowser->setHtml(contributors());
   ui.thanksToTextBrowser->setHtml(thanksTo());
 

+  setWindowIcon(Icon("quassel"));

 }
 
 QString AboutDlg::about() const {
 }
 
 QString AboutDlg::about() const {

diff --git a/src/qtui/channellistdlg.cpp b/src/qtui/channellistdlg.cpp
index 2eab404..6cf58eb 100644 (file)
--- a/src/qtui/channellistdlg.cpp
+++ b/src/qtui/channellistdlg.cpp
@@ -20,13 +20,15 @@
 
 #include "channellistdlg.h"
 
 
 #include "channellistdlg.h"
 

-#include "client.h"
-#include "clientirclisthelper.h"
-

 #include <QHeaderView>
 #include <QHBoxLayout>
 #include <QSpacerItem>
 
 #include <QHeaderView>
 #include <QHBoxLayout>
 #include <QSpacerItem>
 

+#include "client.h"
+#include "clientirclisthelper.h"
+#include "icon.h"
+#include "iconloader.h"
+

 ChannelListDlg::ChannelListDlg(QWidget *parent)
   : QDialog(parent),
     _listFinished(true),
 ChannelListDlg::ChannelListDlg(QWidget *parent)
   : QDialog(parent),
     _listFinished(true),


@@ -38,8 +40,10 @@ ChannelListDlg::ChannelListDlg(QWidget *parent)
   _sortFilter.setSourceModel(&_ircListModel);
   _sortFilter.setFilterCaseSensitivity(Qt::CaseInsensitive);
   _sortFilter.setFilterKeyColumn(-1);
   _sortFilter.setSourceModel(&_ircListModel);
   _sortFilter.setFilterCaseSensitivity(Qt::CaseInsensitive);
   _sortFilter.setFilterKeyColumn(-1);

-  
+

   ui.setupUi(this);
   ui.setupUi(this);

+  ui.advancedModeLabel->setPixmap(BarIcon("edit-rename"));
+

   ui.channelListView->setSelectionBehavior(QAbstractItemView::SelectRows);
   ui.channelListView->setSelectionMode(QAbstractItemView::SingleSelection);
   ui.channelListView->setAlternatingRowColors(true);
   ui.channelListView->setSelectionBehavior(QAbstractItemView::SelectRows);
   ui.channelListView->setSelectionMode(QAbstractItemView::SingleSelection);
   ui.channelListView->setAlternatingRowColors(true);


@@ -51,6 +55,8 @@ ChannelListDlg::ChannelListDlg(QWidget *parent)
 
   ui.searchChannelsButton->setAutoDefault(false);
 
 
   ui.searchChannelsButton->setAutoDefault(false);
 

+  setWindowIcon(Icon("format-list-unordered"));
+

   connect(ui.advancedModeLabel, SIGNAL(clicked()), this, SLOT(toggleMode()));
   connect(ui.searchChannelsButton, SIGNAL(clicked()), this, SLOT(requestSearch()));
   connect(ui.channelNameLineEdit, SIGNAL(returnPressed()), this, SLOT(requestSearch()));
   connect(ui.advancedModeLabel, SIGNAL(clicked()), this, SLOT(toggleMode()));
   connect(ui.searchChannelsButton, SIGNAL(clicked()), this, SLOT(requestSearch()));
   connect(ui.channelNameLineEdit, SIGNAL(returnPressed()), this, SLOT(requestSearch()));


@@ -70,7 +76,7 @@ ChannelListDlg::ChannelListDlg(QWidget *parent)
 void ChannelListDlg::setNetwork(NetworkId netId) {
   if(_netId == netId)
     return;
 void ChannelListDlg::setNetwork(NetworkId netId) {
   if(_netId == netId)
     return;

-  
+

   _netId = netId;
   _ircListModel.setChannelList();
   showFilterLine(false);
   _netId = netId;
   _ircListModel.setChannelList();
   showFilterLine(false);


@@ -109,24 +115,21 @@ void ChannelListDlg::enableQuery(bool enable) {
 void ChannelListDlg::setAdvancedMode(bool advanced) {
   _advancedMode = advanced;
 
 void ChannelListDlg::setAdvancedMode(bool advanced) {
   _advancedMode = advanced;
 

-#if QT_VERSION >=  0x040400
-  // FIXME: remove if macro when we depend on Qt 4.4

   if(advanced) {
     if(_simpleModeSpacer) {
       ui.searchLayout->removeItem(_simpleModeSpacer);
       delete _simpleModeSpacer;
       _simpleModeSpacer = 0;
     }
   if(advanced) {
     if(_simpleModeSpacer) {
       ui.searchLayout->removeItem(_simpleModeSpacer);
       delete _simpleModeSpacer;
       _simpleModeSpacer = 0;
     }

-    ui.advancedModeLabel->setPixmap(QPixmap(QString::fromUtf8(":/22x22/actions/oxygen/22x22/actions/edit-clear-locationbar-rtl.png")));
+    ui.advancedModeLabel->setPixmap(BarIcon("edit-clear-locationbar-rtl"));

   } else {
     if(!_simpleModeSpacer) {
       _simpleModeSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
       ui.searchLayout->insertSpacerItem(0, _simpleModeSpacer);
     }
   } else {
     if(!_simpleModeSpacer) {
       _simpleModeSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
       ui.searchLayout->insertSpacerItem(0, _simpleModeSpacer);
     }

-    ui.advancedModeLabel->setPixmap(QPixmap(QString::fromUtf8(":/22x22/actions/oxygen/22x22/actions/edit-clear.png")));
+    ui.advancedModeLabel->setPixmap(BarIcon("edit-rename"));

   }
   }

-#endif
-  
+

   ui.channelNameLineEdit->clear();
   ui.channelNameLineEdit->setVisible(advanced);
   ui.searchPatternLabel->setVisible(advanced);
   ui.channelNameLineEdit->clear();
   ui.channelNameLineEdit->setVisible(advanced);
   ui.searchPatternLabel->setVisible(advanced);

diff --git a/src/qtui/ui/aboutdlg.ui b/src/qtui/ui/aboutdlg.ui
index a4f863a..60e0575 100644 (file)
--- a/src/qtui/ui/aboutdlg.ui
+++ b/src/qtui/ui/aboutdlg.ui
@@ -16,7 +16,7 @@
    <string>About Quassel</string>
   </property>
   <property name="windowIcon" >
    <string>About Quassel</string>
   </property>
   <property name="windowIcon" >

-   <iconset resource="../../icons/quassel-icons.qrc" >
+   <iconset>

     <normaloff>:/quassel/16x16/apps/quassel.png</normaloff>:/quassel/16x16/apps/quassel.png</iconset>
   </property>
   <layout class="QVBoxLayout" >
     <normaloff>:/quassel/16x16/apps/quassel.png</normaloff>:/quassel/16x16/apps/quassel.png</iconset>
   </property>
   <layout class="QVBoxLayout" >


@@ -35,12 +35,12 @@
       <item>
        <layout class="QHBoxLayout" >
         <item>
       <item>
        <layout class="QHBoxLayout" >
         <item>

-         <widget class="QLabel" name="label_2" >
+         <widget class="QLabel" name="quasselLogo" >

           <property name="text" >
            <string/>
           </property>
           <property name="pixmap" >
           <property name="text" >
            <string/>
           </property>
           <property name="pixmap" >

-           <pixmap resource="../../icons/quassel-icons.qrc" >:/quassel/64x64/apps/quassel.png</pixmap>
+           <pixmap>:/quassel/64x64/apps/quassel.png</pixmap>

           </property>
           <property name="scaledContents" >
            <bool>false</bool>
           </property>
           <property name="scaledContents" >
            <bool>false</bool>


@@ -107,14 +107,6 @@ p, li { white-space: pre-wrap; }
       <number>0</number>
      </property>
      <widget class="QWidget" name="aboutTab" >
       <number>0</number>
      </property>
      <widget class="QWidget" name="aboutTab" >

-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>472</width>
-        <height>296</height>
-       </rect>
-      </property>

       <attribute name="title" >
        <string>&amp;About</string>
       </attribute>
       <attribute name="title" >
        <string>&amp;About</string>
       </attribute>


@@ -135,14 +127,6 @@ p, li { white-space: pre-wrap; }
       </layout>
      </widget>
      <widget class="QWidget" name="authorsTab" >
       </layout>
      </widget>
      <widget class="QWidget" name="authorsTab" >

-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>458</width>
-        <height>288</height>
-       </rect>
-      </property>

       <attribute name="title" >
        <string>A&amp;uthors</string>
       </attribute>
       <attribute name="title" >
        <string>A&amp;uthors</string>
       </attribute>


@@ -163,14 +147,6 @@ p, li { white-space: pre-wrap; }
       </layout>
      </widget>
      <widget class="QWidget" name="tab_2" >
       </layout>
      </widget>
      <widget class="QWidget" name="tab_2" >

-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>458</width>
-        <height>288</height>
-       </rect>
-      </property>

       <attribute name="title" >
        <string>&amp;Contributors</string>
       </attribute>
       <attribute name="title" >
        <string>&amp;Contributors</string>
       </attribute>


@@ -191,14 +167,6 @@ p, li { white-space: pre-wrap; }
       </layout>
      </widget>
      <widget class="QWidget" name="tab" >
       </layout>
      </widget>
      <widget class="QWidget" name="tab" >

-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>458</width>
-        <height>288</height>
-       </rect>
-      </property>

       <attribute name="title" >
        <string>&amp;Thanks To</string>
       </attribute>
       <attribute name="title" >
        <string>&amp;Thanks To</string>
       </attribute>