#include "generalsettingspage.h"
#include "qtui.h"
-#include "uisettings.h"
+#include "qtuisettings.h"
#include "buffersettings.h"
GeneralSettingsPage::GeneralSettingsPage(QWidget *parent)
connect(ui.minimizeOnMinimize, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
connect(ui.minimizeOnClose, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
- connect(ui.userMessagesInStatusBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
- connect(ui.userMessagesInQueryBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
- connect(ui.userMessagesInCurrentBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
+ connect(ui.userNoticesInDefaultBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
+ connect(ui.userNoticesInStatusBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
+ connect(ui.userNoticesInCurrentBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
+
+ connect(ui.serverNoticesInDefaultBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
+ connect(ui.serverNoticesInStatusBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
+ connect(ui.serverNoticesInCurrentBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
+
+ connect(ui.errorMsgsInDefaultBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
+ connect(ui.errorMsgsInStatusBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
+ connect(ui.errorMsgsInCurrentBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
connect(ui.displayTopicInTooltip, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
connect(ui.mouseWheelChangesBuffers, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
-
- ui.userMessagesInStatusBuffer->setEnabled(false);
- ui.userMessagesInQueryBuffer->setEnabled(false);
- ui.userMessagesInCurrentBuffer->setEnabled(false);
+ connect(ui.completionSuffix, SIGNAL(textEdited(const QString&)), this, SLOT(widgetHasChanged()));
}
bool GeneralSettingsPage::hasDefaults() const {
}
void GeneralSettingsPage::defaults() {
- qDebug() << "defaults in generalsettingspage";
ui.useSystemTrayIcon->setChecked(true);
ui.showSystemTrayIcon->setChecked(true);
ui.minimizeOnMinimize->setChecked(false);
ui.minimizeOnClose->setChecked(false);
- ui.userMessagesInStatusBuffer->setChecked(true);
- ui.userMessagesInQueryBuffer->setChecked(false);
- ui.userMessagesInCurrentBuffer->setChecked(false);
+ ui.userNoticesInDefaultBuffer->setChecked(true);
+ ui.userNoticesInStatusBuffer->setChecked(false);
+ ui.userNoticesInCurrentBuffer->setChecked(false);
+
+ ui.serverNoticesInDefaultBuffer->setChecked(false);
+ ui.serverNoticesInStatusBuffer->setChecked(true);
+ ui.serverNoticesInCurrentBuffer->setChecked(false);
+
+ ui.errorMsgsInDefaultBuffer->setChecked(true);
+ ui.errorMsgsInStatusBuffer->setChecked(false);
+ ui.errorMsgsInCurrentBuffer->setChecked(false);
ui.displayTopicInTooltip->setChecked(false);
- ui.mouseWheelChangesBuffers->setChecked(true);
+ ui.mouseWheelChangesBuffers->setChecked(false);
+
+ ui.completionSuffix->setText(": ");
widgetHasChanged();
}
void GeneralSettingsPage::load() {
// uiSettings:
- UiSettings uiSettings("Ui");
- settings["UseSystemTrayIcon"] = uiSettings.value("UseSystemTrayIcon", QVariant(true));
+ QtUiSettings qtuiSettings;
+ UiSettings uiSettings;
+ settings["UseSystemTrayIcon"] = qtuiSettings.value("UseSystemTrayIcon", QVariant(true));
ui.useSystemTrayIcon->setChecked(settings["UseSystemTrayIcon"].toBool());
ui.showSystemTrayIcon->setChecked(settings["UseSystemTrayIcon"].toBool());
- settings["MinimizeOnMinimize"] = uiSettings.value("MinimizeOnMinimize", QVariant(false));
+ settings["MinimizeOnMinimize"] = qtuiSettings.value("MinimizeOnMinimize", QVariant(false));
ui.minimizeOnMinimize->setChecked(settings["MinimizeOnMinimize"].toBool());
- settings["MinimizeOnClose"] = uiSettings.value("MinimizeOnClose", QVariant(false));
+ settings["MinimizeOnClose"] = qtuiSettings.value("MinimizeOnClose", QVariant(false));
ui.minimizeOnClose->setChecked(settings["MinimizeOnClose"].toBool());
- settings["MouseWheelChangesBuffers"] = uiSettings.value("mouseWheelChangesBuffers", QVariant(true));
+ settings["MouseWheelChangesBuffers"] = uiSettings.value("MouseWheelChangesBuffers", QVariant(false));
ui.mouseWheelChangesBuffers->setChecked(settings["MouseWheelChangesBuffers"].toBool());
// bufferSettings:
BufferSettings bufferSettings;
- settings["UserMessagesInStatusBuffer"] = bufferSettings.value("UserMessagesInStatusBuffer", QVariant(true));
- ui.userMessagesInStatusBuffer->setChecked(settings["UserMessagesInStatusBuffer"].toBool());
+ SettingsPage::load(ui.userNoticesInDefaultBuffer, bufferSettings.value("UserNoticesInDefaultBuffer", QVariant(true)).toBool());
+ SettingsPage::load(ui.userNoticesInStatusBuffer, bufferSettings.value("UserNoticesInStatusBuffer", QVariant(false)).toBool());
+ SettingsPage::load(ui.userNoticesInCurrentBuffer, bufferSettings.value("UserNoticesInCurrentBuffer", QVariant(false)).toBool());
+
+ SettingsPage::load(ui.serverNoticesInDefaultBuffer, bufferSettings.value("ServerNoticesInDefaultBuffer", QVariant(false)).toBool());
+ SettingsPage::load(ui.serverNoticesInStatusBuffer, bufferSettings.value("ServerNoticesInStatusBuffer", QVariant(true)).toBool());
+ SettingsPage::load(ui.serverNoticesInCurrentBuffer, bufferSettings.value("ServerNoticesInCurrentBuffer", QVariant(false)).toBool());
- settings["UserMessagesInQueryBuffer"] = bufferSettings.value("UserMessagesInQueryBuffer", QVariant(false));
- ui.userMessagesInQueryBuffer->setChecked(settings["UserMessagesInQueryBuffer"].toBool());
+ SettingsPage::load(ui.errorMsgsInDefaultBuffer, bufferSettings.value("ErrorMsgsInDefaultBuffer", QVariant(true)).toBool());
+ SettingsPage::load(ui.errorMsgsInStatusBuffer, bufferSettings.value("ErrorMsgsInStatusBuffer", QVariant(false)).toBool());
+ SettingsPage::load(ui.errorMsgsInCurrentBuffer, bufferSettings.value("ErrorMsgsInCurrentBuffer", QVariant(false)).toBool());
- settings["UserMessagesInCurrentBuffer"] = bufferSettings.value("UserMessagesInCurrentBuffer", QVariant(false));
- ui.userMessagesInCurrentBuffer->setChecked(settings["UserMessagesInCurrentBuffer"].toBool());
settings["DisplayTopicInTooltip"] = bufferSettings.value("DisplayTopicInTooltip", QVariant(false));
ui.displayTopicInTooltip->setChecked(settings["DisplayTopicInTooltip"].toBool());
+ // inputline settings
+ settings["CompletionSuffix"] = uiSettings.value("CompletionSuffix", QString(": "));
+ ui.completionSuffix->setText(settings["CompletionSuffix"].toString());
+
setChangedState(false);
}
void GeneralSettingsPage::save() {
- UiSettings uiSettings("Ui");
- uiSettings.setValue("UseSystemTrayIcon", ui.useSystemTrayIcon->isChecked());
- uiSettings.setValue("MinimizeOnMinimize", ui.minimizeOnMinimize->isChecked());
- uiSettings.setValue("MinimizeOnClose", ui.minimizeOnClose->isChecked());
+ QtUiSettings qtuiSettings;
+ qtuiSettings.setValue("UseSystemTrayIcon", ui.useSystemTrayIcon->isChecked());
+ qtuiSettings.setValue("MinimizeOnMinimize", ui.minimizeOnMinimize->isChecked());
+ qtuiSettings.setValue("MinimizeOnClose", ui.minimizeOnClose->isChecked());
+
+ UiSettings uiSettings;
uiSettings.setValue("MouseWheelChangesBuffers", ui.mouseWheelChangesBuffers->isChecked());
BufferSettings bufferSettings;
- bufferSettings.setValue("UserMessagesInStatusBuffer", ui.userMessagesInStatusBuffer->isChecked());
- bufferSettings.setValue("UserMessagesInQueryBuffer", ui.userMessagesInQueryBuffer->isChecked());
- bufferSettings.setValue("UserMessagesInCurrentBuffer", ui.userMessagesInCurrentBuffer->isChecked());
+ bufferSettings.setValue("UserNoticesInDefaultBuffer", ui.userNoticesInDefaultBuffer->isChecked());
+ bufferSettings.setValue("UserNoticesInStatusBuffer", ui.userNoticesInStatusBuffer->isChecked());
+ bufferSettings.setValue("UserNoticesInCurrentBuffer", ui.userNoticesInCurrentBuffer->isChecked());
+
+ bufferSettings.setValue("ServerNoticesInDefaultBuffer", ui.serverNoticesInDefaultBuffer->isChecked());
+ bufferSettings.setValue("ServerNoticesInStatusBuffer", ui.serverNoticesInStatusBuffer->isChecked());
+ bufferSettings.setValue("ServerNoticesInCurrentBuffer", ui.serverNoticesInCurrentBuffer->isChecked());
+
+ bufferSettings.setValue("ErrorMsgsInDefaultBuffer", ui.errorMsgsInDefaultBuffer->isChecked());
+ bufferSettings.setValue("ErrorMsgsInStatusBuffer", ui.errorMsgsInStatusBuffer->isChecked());
+ bufferSettings.setValue("ErrorMsgsInCurrentBuffer", ui.errorMsgsInCurrentBuffer->isChecked());
bufferSettings.setValue("DisplayTopicInTooltip", ui.displayTopicInTooltip->isChecked());
+ uiSettings.setValue("CompletionSuffix", ui.completionSuffix->text());
+
+
load();
setChangedState(false);
}
if(settings["MinimizeOnMinimize"].toBool() != ui.minimizeOnMinimize->isChecked()) return true;
if(settings["MinimizeOnClose"].toBool() != ui.minimizeOnClose->isChecked()) return true;
- if(settings["UserMessagesInStatusBuffer"].toBool() != ui.userMessagesInStatusBuffer->isChecked()) return true;
- if(settings["UserMessagesInQueryBuffer"].toBool() != ui.userMessagesInQueryBuffer->isChecked()) return true;
- if(settings["UserMessagesInCurrentBuffer"].toBool() != ui.userMessagesInCurrentBuffer->isChecked()) return true;
+ if(SettingsPage::hasChanged(ui.userNoticesInStatusBuffer)) return true;
+ if(SettingsPage::hasChanged(ui.userNoticesInDefaultBuffer)) return true;
+ if(SettingsPage::hasChanged(ui.userNoticesInCurrentBuffer)) return true;
+
+ if(SettingsPage::hasChanged(ui.serverNoticesInStatusBuffer)) return true;
+ if(SettingsPage::hasChanged(ui.serverNoticesInDefaultBuffer)) return true;
+ if(SettingsPage::hasChanged(ui.serverNoticesInCurrentBuffer)) return true;
+
+ if(SettingsPage::hasChanged(ui.errorMsgsInStatusBuffer)) return true;
+ if(SettingsPage::hasChanged(ui.errorMsgsInDefaultBuffer)) return true;
+ if(SettingsPage::hasChanged(ui.errorMsgsInCurrentBuffer)) return true;
if(settings["DisplayTopicInTooltip"].toBool() != ui.displayTopicInTooltip->isChecked()) return true;
if(settings["MouseWheelChangesBuffers"].toBool() != ui.mouseWheelChangesBuffers->isChecked()) return true;
+ if(settings["CompletionSuffix"].toString() != ui.completionSuffix->text()) return true;
+
return false;
}
-
-
-
-
projects / quassel.git / blobdiff