From: Manuel Nickschas Date: Fri, 26 Sep 2008 23:08:33 +0000 (+0200) Subject: Even more icon fixes... X-Git-Tag: 0.3.1~243 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=e493c43cc455c1f7842f2ce90a1d0e0f72fb43c0 Even more icon fixes... --- diff --git a/src/qtui/chatviewsearchbar.cpp b/src/qtui/chatviewsearchbar.cpp index 55246919..250e277a 100644 --- a/src/qtui/chatviewsearchbar.cpp +++ b/src/qtui/chatviewsearchbar.cpp @@ -22,12 +22,17 @@ #include "action.h" #include "actioncollection.h" +#include "iconloader.h" #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(); diff --git a/src/qtui/coreconfigwizard.cpp b/src/qtui/coreconfigwizard.cpp index 799801a3..6aed97a0 100644 --- a/src/qtui/coreconfigwizard.cpp +++ b/src/qtui/coreconfigwizard.cpp @@ -22,9 +22,7 @@ #include #include "coreconfigwizard.h" - -//#include "client.h" -//#include "identitiessettingspage.h" +#include "iconloader.h" CoreConfigWizard::CoreConfigWizard(const QList &backends, QWidget *parent) : QWizard(parent) { foreach(QVariant v, backends) _backends[v.toMap()["DisplayName"].toString()] = v; @@ -58,7 +56,7 @@ CoreConfigWizard::CoreConfigWizard(const QList &backends, QWidget *par setModal(true); setWindowTitle(tr("Core Configuration Wizard")); - setPixmap(QWizard::LogoPixmap, QPixmap(":icons/quassel-icon.png")); + setPixmap(QWizard::LogoPixmap, DesktopIcon("quassel")); } QHash CoreConfigWizard::backends() const { diff --git a/src/qtui/topicwidget.cpp b/src/qtui/topicwidget.cpp index 7d2d90bd..c8c5aaeb 100644 --- a/src/qtui/topicwidget.cpp +++ b/src/qtui/topicwidget.cpp @@ -23,12 +23,15 @@ #include #include "client.h" +#include "iconloader.h" #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(); @@ -51,7 +54,7 @@ void TopicWidget::dataChanged(const QModelIndex &topLeft, const QModelIndex &bot void TopicWidget::setTopic(const QString &newtopic) { if(_topic == newtopic) return; - + _topic = newtopic; ui.topicLabel->setText(newtopic); ui.topicLineEdit->setText(newtopic); @@ -110,6 +113,6 @@ bool TopicWidget::eventFilter(QObject *obj, QEvent *event) { switchPlain(); return true; } - + return false; } diff --git a/src/qtui/ui/channellistdlg.ui b/src/qtui/ui/channellistdlg.ui index 8b12aeff..5993d402 100644 --- a/src/qtui/ui/channellistdlg.ui +++ b/src/qtui/ui/channellistdlg.ui @@ -13,7 +13,7 @@ Channel List - + :/16x16/actions/oxygen/16x16/actions/format-list-unordered.png:/16x16/actions/oxygen/16x16/actions/format-list-unordered.png @@ -51,7 +51,7 @@ Advanced mode allows to pass search strings to the IRC Server. - :/22x22/actions/oxygen/22x22/actions/edit-clear-locationbar-rtl.png + :/22x22/actions/oxygen/22x22/actions/edit-clear-locationbar-rtl.png @@ -131,9 +131,9 @@ Advanced mode allows to pass search strings to the IRC Server. <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> -<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</p> -<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;"></p></body></html> +</style></head><body style=" font-family:'DejaVu Sans'; font-size:8pt; font-weight:400; font-style:normal;"> +<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</p> +<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;"></p></body></html> diff --git a/src/uisupport/clearablelineedit.cpp b/src/uisupport/clearablelineedit.cpp index 0ba26d5c..0c5b35ac 100644 --- a/src/uisupport/clearablelineedit.cpp +++ b/src/uisupport/clearablelineedit.cpp @@ -23,20 +23,22 @@ #include #include +#include "iconloader.h" + 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(); - + 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();