From: Manuel Nickschas Date: Fri, 26 Sep 2008 23:30:42 +0000 (+0200) Subject: Fix the remaining icons. Hope I didn't overlook anything :) X-Git-Tag: 0.3.1~242 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=f429bd6dfbea50ad4690875f1466a920f7a3b509 Fix the remaining icons. Hope I didn't overlook anything :) --- diff --git a/src/qtui/settingspages/aliasessettingspage.cpp b/src/qtui/settingspages/aliasessettingspage.cpp index 1b943d6f..8f8ac9b3 100644 --- a/src/qtui/settingspages/aliasessettingspage.cpp +++ b/src/qtui/settingspages/aliasessettingspage.cpp @@ -23,10 +23,14 @@ #include #include +#include "iconloader.h" + AliasesSettingsPage::AliasesSettingsPage(QWidget *parent) : SettingsPage(tr("Behaviour"), tr("Aliases"), parent) { ui.setupUi(this); + ui.newAliasButton->setIcon(SmallIcon("list-add")); + ui.deleteAliasButton->setIcon(SmallIcon("edit-delete")); ui.aliasesView->setSelectionBehavior(QAbstractItemView::SelectRows); ui.aliasesView->setSelectionMode(QAbstractItemView::SingleSelection); diff --git a/src/qtui/settingspages/bufferviewsettingspage.cpp b/src/qtui/settingspages/bufferviewsettingspage.cpp index 00faf0c0..6c059246 100644 --- a/src/qtui/settingspages/bufferviewsettingspage.cpp +++ b/src/qtui/settingspages/bufferviewsettingspage.cpp @@ -23,6 +23,7 @@ #include #include "client.h" +#include "iconloader.h" #include "network.h" #include "bufferviewconfig.h" #include "bufferviewfilter.h" @@ -35,6 +36,10 @@ BufferViewSettingsPage::BufferViewSettingsPage(QWidget *parent) _ignoreWidgetChanges(false) { ui.setupUi(this); + ui.renameBufferView->setIcon(SmallIcon("edit-rename")); + ui.addBufferView->setIcon(SmallIcon("list-add")); + ui.deleteBufferView->setIcon(SmallIcon("edit-delete")); + reset(); ui.bufferViewList->setSortingEnabled(true); @@ -81,7 +86,7 @@ void BufferViewSettingsPage::reset() { } _deleteBufferViews.clear(); - + setChangedState(false); } @@ -108,7 +113,7 @@ void BufferViewSettingsPage::load() { ui.networkSelector->setItemData(ui.networkSelector->count() - 1, qVariantFromValue(net->networkId())); } _ignoreWidgetChanges = false; - + ui.bufferViewList->setCurrentRow(0); } @@ -125,7 +130,7 @@ void BufferViewSettingsPage::save() { if(Client::bufferViewManager()) { Client::bufferViewManager()->requestDeleteBufferViews(deleteConfigs); } - + QHash::iterator changedConfigIter = _changedBufferViews.begin(); QHash::iterator changedConfigIterEnd = _changedBufferViews.end(); BufferViewConfig *config, *changedConfig; @@ -206,7 +211,7 @@ void BufferViewSettingsPage::newBufferView(const QString &bufferViewName) { addBufferView(config); ui.bufferViewList->setCurrentRow(listPos(config)); } - + int BufferViewSettingsPage::listPos(BufferViewConfig *config) { QObject *obj; for(int i = 0; i < ui.bufferViewList->count(); i++) { @@ -244,7 +249,7 @@ void BufferViewSettingsPage::updateBufferView() { void BufferViewSettingsPage::on_addBufferView_clicked() { if(!Client::bufferViewManager()) return; - + QStringList existing; foreach(BufferViewConfig *bufferConfig, Client::bufferViewManager()->bufferViewConfigs()) { existing << bufferConfig->bufferViewName(); @@ -263,7 +268,7 @@ void BufferViewSettingsPage::on_renameBufferView_clicked() { if(!Client::bufferViewManager()) return; - + BufferViewConfig *config = bufferView(ui.bufferViewList->currentRow()); if(!config) return; @@ -319,7 +324,7 @@ void BufferViewSettingsPage::bufferViewSelectionChanged(const QItemSelection &cu void BufferViewSettingsPage::loadConfig(BufferViewConfig *config) { if(!config) return; - + _ignoreWidgetChanges = true; ui.onlyStatusBuffers->setChecked(BufferInfo::StatusBuffer & config->allowedBufferTypes()); ui.onlyChannelBuffers->setChecked(BufferInfo::ChannelBuffer & config->allowedBufferTypes()); @@ -346,14 +351,14 @@ void BufferViewSettingsPage::loadConfig(BufferViewConfig *config) { ui.minimumActivitySelector->setCurrentIndex(activityIndex); ui.bufferViewPreview->setFilteredModel(Client::bufferModel(), config); - + _ignoreWidgetChanges = false; } void BufferViewSettingsPage::saveConfig(BufferViewConfig *config) { if(!config) return; - + int allowedBufferTypes = 0; if(ui.onlyStatusBuffers->isChecked()) allowedBufferTypes |= BufferInfo::StatusBuffer; @@ -414,7 +419,7 @@ bool BufferViewSettingsPage::testHasChanged() { BufferViewConfig *BufferViewSettingsPage::cloneConfig(BufferViewConfig *config) { if(!config || config->bufferViewId() < 0) return config; - + if(_changedBufferViews.contains(config)) return _changedBufferViews[config]; diff --git a/src/qtui/settingspages/identitiessettingspage.cpp b/src/qtui/settingspages/identitiessettingspage.cpp index 825d8335..a5ec4f94 100644 --- a/src/qtui/settingspages/identitiessettingspage.cpp +++ b/src/qtui/settingspages/identitiessettingspage.cpp @@ -24,11 +24,21 @@ #include "identitiessettingspage.h" #include "client.h" +#include "iconloader.h" IdentitiesSettingsPage::IdentitiesSettingsPage(QWidget *parent) : SettingsPage(tr("General"), tr("Identities"), parent) { ui.setupUi(this); + ui.renameIdentity->setIcon(BarIcon("edit-rename")); + ui.addIdentity->setIcon(BarIcon("list-add-user")); + ui.deleteIdentity->setIcon(BarIcon("list-remove-user")); + ui.addNick->setIcon(SmallIcon("list-add")); + ui.deleteNick->setIcon(SmallIcon("edit-delete")); + ui.renameNick->setIcon(SmallIcon("edit-rename")); + ui.nickUp->setIcon(SmallIcon("go-up")); + ui.nickDown->setIcon(SmallIcon("go-down")); + setEnabled(Client::isConnected()); // need a core connection! setWidgetStates(); connect(Client::instance(), SIGNAL(coreConnectionStateChanged(bool)), this, SLOT(coreConnectionStateChanged(bool))); @@ -446,6 +456,8 @@ void CreateIdentityDlg::on_identityName_textChanged(const QString &text) { SaveIdentitiesDlg::SaveIdentitiesDlg(const QList &toCreate, const QList &toUpdate, const QList &toRemove, QWidget *parent) : QDialog(parent) { //, toCreate(tocreate), toUpdate(toupdate), toRemove(toremove) { ui.setupUi(this); + ui.abort->setIcon(SmallIcon("dialog-cancel")); + numevents = toCreate.count() + toUpdate.count() + toRemove.count(); rcvevents = 0; if(numevents) { diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index d93a6172..5f33df45 100644 --- a/src/uisupport/bufferview.cpp +++ b/src/uisupport/bufferview.cpp @@ -24,6 +24,7 @@ #include "bufferviewfilter.h" #include "buffersyncer.h" #include "client.h" +#include "iconloader.h" #include "mappedselectionmodel.h" #include "network.h" #include "networkmodel.h" @@ -77,7 +78,7 @@ BufferView::BufferView(QWidget *parent) _hideQuitAction.setEnabled(false); _hideModeAction.setEnabled(false); - showChannelList.setIcon(QIcon(":/16x16/actions/oxygen/16x16/actions/format-list-unordered.png")); + showChannelList.setIcon(SmallIcon("format-list-unordered")); connect(this, SIGNAL(collapsed(const QModelIndex &)), this, SLOT(on_collapse(const QModelIndex &))); connect(this, SIGNAL(expanded(const QModelIndex &)), this, SLOT(on_expand(const QModelIndex &))); @@ -409,14 +410,14 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) { const Network *network = Client::network(index.data(NetworkModel::NetworkIdRole).value()); Q_CHECK_PTR(network); - QIcon connectionStateIcon; + QPixmap connectionStateIcon; if(network) { if(network->connectionState() == Network::Initialized) { - connectionStateIcon = QIcon(":/22x22/actions/network-connect"); + connectionStateIcon = SmallIcon("network-connect"); } else if(network->connectionState() == Network::Disconnected) { - connectionStateIcon = QIcon(":/22x22/actions/network-disconnect"); + connectionStateIcon = SmallIcon("network-disconnect"); } else { - connectionStateIcon = QIcon(":/22x22/actions/gear"); + connectionStateIcon = SmallIcon("network-wired"); // FIXME network-connecting } }