X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fbufferviewsettingspage.cpp;h=6c059246109b7e76e6acc0d1be9e8cfc8c8dff14;hb=335c0c0196da3ef371662b3c754f0516991906f4;hp=00faf0c00b85fe153377feb6262c7a94983efb92;hpb=332069a1830ed3a055ac6f2d7661bae1cc83e40c;p=quassel.git 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];