summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
77397f5)
Read/Write settings from/to correct subcategory and cleanup
#include "chatmonitorsettingspage.h"
#include "chatmonitorsettingspage.h"
#include "client.h"
#include "networkmodel.h"
#include "bufferviewconfig.h"
#include "client.h"
#include "networkmodel.h"
#include "bufferviewconfig.h"
#include "bufferview.h"
#include "bufferviewfilter.h"
#include "iconloader.h"
#include "bufferview.h"
#include "bufferviewfilter.h"
#include "iconloader.h"
-//#include "chatmonitorsettings.h"
#include "chatviewsettings.h"
#include <QVariant>
#include "chatviewsettings.h"
#include <QVariant>
}
void ChatMonitorSettingsPage::loadSettings() {
}
void ChatMonitorSettingsPage::loadSettings() {
- ChatViewSettings chatViewSettings;
+ ChatViewSettings chatViewSettings("ChatMonitor");
settings["OperationMode"] = static_cast<ChatViewSettings::OperationMode>(chatViewSettings.value("OperationMode", QVariant()).toInt());
settings["OperationMode"] = static_cast<ChatViewSettings::OperationMode>(chatViewSettings.value("OperationMode", QVariant()).toInt());
// Load default behavior if no or invalid settings found
if (settings["OperationMode"] == ChatViewSettings::InvalidMode) {
switchOperationMode(ui.operationMode->findData(ChatViewSettings::OptOut));
// Load default behavior if no or invalid settings found
if (settings["OperationMode"] == ChatViewSettings::InvalidMode) {
switchOperationMode(ui.operationMode->findData(ChatViewSettings::OptOut));
}
void ChatMonitorSettingsPage::save() {
}
void ChatMonitorSettingsPage::save() {
- ChatViewSettings chatViewSettings;
+ ChatViewSettings chatViewSettings("ChatMonitor");
// save operation mode
chatViewSettings.setValue("OperationMode", settings["OperationMode"]);
chatViewSettings.setValue("HighlightAlways", settings["HighlightAlways"]);
// save operation mode
chatViewSettings.setValue("OperationMode", settings["OperationMode"]);
chatViewSettings.setValue("HighlightAlways", settings["HighlightAlways"]);
toggleBuffers takes each a bufferView and its config for "input" and "output".
Any selected item will be moved over from the input to the output bufferview.
*/
toggleBuffers takes each a bufferView and its config for "input" and "output".
Any selected item will be moved over from the input to the output bufferview.
*/
-void ChatMonitorSettingsPage::toggleBuffers(BufferView &inView, BufferViewConfig &inCfg, BufferView &outView, BufferViewConfig &outCfg) {
+void ChatMonitorSettingsPage::toggleBuffers(BufferView *inView, BufferViewConfig *inCfg, BufferView *outView, BufferViewConfig *outCfg) {
// Fill QMap with selected items ordered by selection row
QMap<int, QList<BufferId> > selectedBuffers;
// Fill QMap with selected items ordered by selection row
QMap<int, QList<BufferId> > selectedBuffers;
- foreach (QModelIndex index, inView.selectionModel()->selectedIndexes()) {
+ foreach (QModelIndex index, inView->selectionModel()->selectedIndexes()) {
BufferId inBufferId = index.data(NetworkModel::BufferIdRole).value<BufferId>();
if(index.data(NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType) {
// TODO:
BufferId inBufferId = index.data(NetworkModel::BufferIdRole).value<BufferId>();
if(index.data(NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType) {
// TODO:
}
// clear selection to be able to remove the bufferIds without errors
}
// clear selection to be able to remove the bufferIds without errors
- inView.selectionModel()->clearSelection();
+ inView->selectionModel()->clearSelection();
/*
Invalidate the BufferViewFilters' configs to get constant add/remove times
/*
Invalidate the BufferViewFilters' configs to get constant add/remove times
This can probably be removed whenever BufferViewConfig::bulkAdd or something
like that is available.
*/
This can probably be removed whenever BufferViewConfig::bulkAdd or something
like that is available.
*/
- qobject_cast<BufferViewFilter *>(outView.model())->setConfig(0);
- qobject_cast<BufferViewFilter *>(inView.model())->setConfig(0);
+ qobject_cast<BufferViewFilter *>(outView->model())->setConfig(0);
+ qobject_cast<BufferViewFilter *>(inView->model())->setConfig(0);
// actually move the ids
foreach (QList<BufferId> list, selectedBuffers) {
foreach (BufferId buffer, list) {
// actually move the ids
foreach (QList<BufferId> list, selectedBuffers) {
foreach (BufferId buffer, list) {
- outCfg.addBuffer(buffer,0);
- inCfg.removeBuffer(buffer);
+ outCfg->addBuffer(buffer,0);
+ inCfg->removeBuffer(buffer);
- outView.setFilteredModel(Client::bufferModel(), &outCfg);
- inView.setFilteredModel(Client::bufferModel(), &inCfg);
+ outView->setFilteredModel(Client::bufferModel(), outCfg);
+ inView->setFilteredModel(Client::bufferModel(), inCfg);
widgetHasChanged();
}
void ChatMonitorSettingsPage::on_activateBuffer_clicked() {
if (ui.availableBuffers->currentIndex().isValid() && ui.availableBuffers->selectionModel()->hasSelection()) {
widgetHasChanged();
}
void ChatMonitorSettingsPage::on_activateBuffer_clicked() {
if (ui.availableBuffers->currentIndex().isValid() && ui.availableBuffers->selectionModel()->hasSelection()) {
- toggleBuffers(*ui.availableBuffers, *configAvailable, *ui.activeBuffers, *configActive);
+ toggleBuffers(ui.availableBuffers, configAvailable, ui.activeBuffers, configActive);
widgetHasChanged();
}
}
void ChatMonitorSettingsPage::on_deactivateBuffer_clicked() {
if (ui.activeBuffers->currentIndex().isValid() && ui.activeBuffers->selectionModel()->hasSelection()) {
widgetHasChanged();
}
}
void ChatMonitorSettingsPage::on_deactivateBuffer_clicked() {
if (ui.activeBuffers->currentIndex().isValid() && ui.activeBuffers->selectionModel()->hasSelection()) {
- toggleBuffers(*ui.activeBuffers, *configActive, *ui.availableBuffers, *configAvailable);
+ toggleBuffers(ui.activeBuffers, configActive, ui.availableBuffers, configAvailable);
#include "settingspage.h"
#include "ui_chatmonitorsettingspage.h"
#include "settingspage.h"
#include "ui_chatmonitorsettingspage.h"
-// replace with forward declaration
-#include "bufferviewconfig.h"
-
+class BufferViewConfig;
+
class ChatMonitorSettingsPage : public SettingsPage {
Q_OBJECT
class ChatMonitorSettingsPage : public SettingsPage {
Q_OBJECT
Ui::ChatMonitorSettingsPage ui;
QHash<QString, QVariant> settings;
bool testHasChanged();
Ui::ChatMonitorSettingsPage ui;
QHash<QString, QVariant> settings;
bool testHasChanged();
- void toggleBuffers(BufferView &inView, BufferViewConfig &inCfg, BufferView &outView, BufferViewConfig &outCfg);
+ void toggleBuffers(BufferView *inView, BufferViewConfig *inCfg, BufferView *outView, BufferViewConfig *outCfg);
BufferViewConfig *configAvailable;
BufferViewConfig *configActive;
};
BufferViewConfig *configAvailable;
BufferViewConfig *configActive;
};