Even more icon fixes...

diff --git a/src/qtui/chatviewsearchbar.cpp b/src/qtui/chatviewsearchbar.cpp
index 5524691..250e277 100644 (file)
--- a/src/qtui/chatviewsearchbar.cpp
+++ b/src/qtui/chatviewsearchbar.cpp
@@ -22,12 +22,17 @@
 
 #include "action.h"
 #include "actioncollection.h"
 
 #include "action.h"
 #include "actioncollection.h"

+#include "iconloader.h"

 #include "qtui.h"
 
 ChatViewSearchBar::ChatViewSearchBar(QWidget *parent)
   : QWidget(parent)
 {
   ui.setupUi(this);
 #include "qtui.h"
 
 ChatViewSearchBar::ChatViewSearchBar(QWidget *parent)
   : QWidget(parent)
 {
   ui.setupUi(this);

+  ui.hideButton->setIcon(BarIcon("dialog-close"));
+  ui.searchUpButton->setIcon(SmallIcon("go-up"));
+  ui.searchDownButton->setIcon(SmallIcon("go-down"));
+

   layout()->setContentsMargins(0, 0, 0, 0);
 
   hide();
   layout()->setContentsMargins(0, 0, 0, 0);
 
   hide();

diff --git a/src/qtui/coreconfigwizard.cpp b/src/qtui/coreconfigwizard.cpp
index 799801a..6aed97a 100644 (file)
--- a/src/qtui/coreconfigwizard.cpp
+++ b/src/qtui/coreconfigwizard.cpp
@@ -22,9 +22,7 @@
 #include <QAbstractButton>
 
 #include "coreconfigwizard.h"
 #include <QAbstractButton>
 
 #include "coreconfigwizard.h"

-
-//#include "client.h"
-//#include "identitiessettingspage.h"
+#include "iconloader.h"

 
 CoreConfigWizard::CoreConfigWizard(const QList<QVariant> &backends, QWidget *parent) : QWizard(parent) {
   foreach(QVariant v, backends) _backends[v.toMap()["DisplayName"].toString()] = v;
 
 CoreConfigWizard::CoreConfigWizard(const QList<QVariant> &backends, QWidget *parent) : QWizard(parent) {
   foreach(QVariant v, backends) _backends[v.toMap()["DisplayName"].toString()] = v;


@@ -58,7 +56,7 @@ CoreConfigWizard::CoreConfigWizard(const QList<QVariant> &backends, QWidget *par
   setModal(true);
 
   setWindowTitle(tr("Core Configuration Wizard"));
   setModal(true);
 
   setWindowTitle(tr("Core Configuration Wizard"));

-  setPixmap(QWizard::LogoPixmap, QPixmap(":icons/quassel-icon.png"));
+  setPixmap(QWizard::LogoPixmap, DesktopIcon("quassel"));

 }
 
 QHash<QString, QVariant> CoreConfigWizard::backends() const {
 }
 
 QHash<QString, QVariant> CoreConfigWizard::backends() const {

diff --git a/src/qtui/topicwidget.cpp b/src/qtui/topicwidget.cpp
index 7d2d90b..c8c5aae 100644 (file)
--- a/src/qtui/topicwidget.cpp
+++ b/src/qtui/topicwidget.cpp
@@ -23,12 +23,15 @@
 #include <QDebug>
 
 #include "client.h"
 #include <QDebug>
 
 #include "client.h"

+#include "iconloader.h"

 #include "networkmodel.h"
 
 TopicWidget::TopicWidget(QWidget *parent)
   : AbstractItemView(parent)
 {
   ui.setupUi(this);
 #include "networkmodel.h"
 
 TopicWidget::TopicWidget(QWidget *parent)
   : AbstractItemView(parent)
 {
   ui.setupUi(this);

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

   ui.topicLineEdit->hide();
   ui.topicLineEdit->installEventFilter(this);
   ui.topicLabel->show();
   ui.topicLineEdit->hide();
   ui.topicLineEdit->installEventFilter(this);
   ui.topicLabel->show();


@@ -51,7 +54,7 @@ void TopicWidget::dataChanged(const QModelIndex &topLeft, const QModelIndex &bot
 void TopicWidget::setTopic(const QString &newtopic) {
   if(_topic == newtopic)
     return;
 void TopicWidget::setTopic(const QString &newtopic) {
   if(_topic == newtopic)
     return;

-  
+

   _topic = newtopic;
   ui.topicLabel->setText(newtopic);
   ui.topicLineEdit->setText(newtopic);
   _topic = newtopic;
   ui.topicLabel->setText(newtopic);
   ui.topicLineEdit->setText(newtopic);


@@ -110,6 +113,6 @@ bool TopicWidget::eventFilter(QObject *obj, QEvent *event) {
     switchPlain();
     return true;
   }
     switchPlain();
     return true;
   }

-  
+

   return false;
 }
   return false;
 }

diff --git a/src/qtui/ui/channellistdlg.ui b/src/qtui/ui/channellistdlg.ui
index 8b12aef..5993d40 100644 (file)
--- a/src/qtui/ui/channellistdlg.ui
+++ b/src/qtui/ui/channellistdlg.ui
@@ -13,7 +13,7 @@
    <string>Channel List</string>
   </property>
   <property name="windowIcon" >
    <string>Channel List</string>
   </property>
   <property name="windowIcon" >

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

     <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" >
     <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" >


@@ -51,7 +51,7 @@ Advanced mode allows to pass search strings to the IRC Server.</string>
         <string/>
        </property>
        <property name="pixmap" >
         <string/>
        </property>
        <property name="pixmap" >

-        <pixmap resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/edit-clear-locationbar-rtl.png</pixmap>
+        <pixmap>:/22x22/actions/oxygen/22x22/actions/edit-clear-locationbar-rtl.png</pixmap>

        </property>
       </widget>
      </item>
        </property>
       </widget>
      </item>


@@ -131,9 +131,9 @@ Advanced mode allows to pass search strings to the IRC Server.</string>
       <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; }
       <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;">SUPER EVIL CATASTROPHIC ERROR!!11&lt;/p>
-&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;">&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;">SUPER EVIL CATASTROPHIC ERROR!!11&lt;/p>
+&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:'Lucida Grande'; font-size:13pt;">&lt;/p>&lt;/body>&lt;/html></string>

      </property>
     </widget>
    </item>
      </property>
     </widget>
    </item>

diff --git a/src/uisupport/clearablelineedit.cpp b/src/uisupport/clearablelineedit.cpp
index 0ba26d5..0c5b35a 100644 (file)
--- a/src/uisupport/clearablelineedit.cpp
+++ b/src/uisupport/clearablelineedit.cpp
@@ -23,20 +23,22 @@
 #include <QToolButton>
 #include <QStyle>
 
 #include <QToolButton>
 #include <QStyle>
 

+#include "iconloader.h"
+

 ClearableLineEdit::ClearableLineEdit(QWidget *parent)
   : QLineEdit(parent)
 {
   clearButton = new QToolButton(this);
 ClearableLineEdit::ClearableLineEdit(QWidget *parent)
   : QLineEdit(parent)
 {
   clearButton = new QToolButton(this);

-  clearButton->setIcon(QIcon(":/22x22/actions/oxygen/22x22/actions/edit-clear-locationbar-rtl.png"));
+  clearButton->setIcon(SmallIcon("edit-clear-locationbar-rtl"));

 #ifndef Q_WS_QWS
   clearButton->setCursor(Qt::ArrowCursor);
 #endif
   clearButton->setStyleSheet("QToolButton { border: none; padding: 0px; }");
   clearButton->hide();
 #ifndef Q_WS_QWS
   clearButton->setCursor(Qt::ArrowCursor);
 #endif
   clearButton->setStyleSheet("QToolButton { border: none; padding: 0px; }");
   clearButton->hide();

-  
+

   connect(clearButton, SIGNAL(clicked()), this, SLOT(clear()));
   connect(this, SIGNAL(textChanged(const QString&)), this, SLOT(updateClearButton(const QString&)));
   connect(clearButton, SIGNAL(clicked()), this, SLOT(clear()));
   connect(this, SIGNAL(textChanged(const QString&)), this, SLOT(updateClearButton(const QString&)));

-  
+

   int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
   setStyleSheet(QString("QLineEdit { padding-right: %1px; } ").arg(clearButton->sizeHint().width() + frameWidth + 1));
   QSize msz = minimumSizeHint();
   int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
   setStyleSheet(QString("QLineEdit { padding-right: %1px; } ").arg(clearButton->sizeHint().width() + frameWidth + 1));
   QSize msz = minimumSizeHint();