/***************************************************************************
- * Copyright (C) 2005-08 by the Quassel IRC Team *
+ * Copyright (C) 2005-09 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "qtui.h"
#include "qtuisettings.h"
-#include "backlogsettings.h"
#include "buffersettings.h"
GeneralSettingsPage::GeneralSettingsPage(QWidget *parent)
- : SettingsPage(tr("Behaviour"), tr("General"), parent) {
+ : SettingsPage(tr("Misc"), QString(), parent) {
ui.setupUi(this);
#ifdef Q_WS_MAC
ui.macOnly->hide();
#endif
-#ifdef Q_WS_WIN
- ui.minimizeOnMinimize->hide();
-#endif
-
connect(ui.useSystemTrayIcon, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
connect(ui.showSystemTrayIcon, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
- connect(ui.minimizeOnMinimize, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
connect(ui.minimizeOnClose, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
connect(ui.userNoticesInDefaultBuffer, 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()));
+
connect(ui.completionSuffix, SIGNAL(textEdited(const QString&)), this, SLOT(widgetHasChanged()));
- connect(ui.fixedBacklogAmount, SIGNAL(valueChanged(int)), this, SLOT(widgetHasChanged()));
- connect(ui.dynamicBacklogAmount, SIGNAL(valueChanged(int)), this, SLOT(widgetHasChanged()));
}
bool GeneralSettingsPage::hasDefaults() const {
void GeneralSettingsPage::defaults() {
ui.useSystemTrayIcon->setChecked(true);
ui.showSystemTrayIcon->setChecked(true);
- ui.minimizeOnMinimize->setChecked(false);
ui.minimizeOnClose->setChecked(false);
ui.userNoticesInDefaultBuffer->setChecked(true);
ui.errorMsgsInStatusBuffer->setChecked(false);
ui.errorMsgsInCurrentBuffer->setChecked(false);
- ui.displayTopicInTooltip->setChecked(false);
- ui.mouseWheelChangesBuffers->setChecked(true);
-
ui.completionSuffix->setText(": ");
widgetHasChanged();
ui.useSystemTrayIcon->setChecked(settings["UseSystemTrayIcon"].toBool());
ui.showSystemTrayIcon->setChecked(settings["UseSystemTrayIcon"].toBool());
- settings["MinimizeOnMinimize"] = qtuiSettings.value("MinimizeOnMinimize", QVariant(false));
- ui.minimizeOnMinimize->setChecked(settings["MinimizeOnMinimize"].toBool());
-
settings["MinimizeOnClose"] = qtuiSettings.value("MinimizeOnClose", QVariant(false));
ui.minimizeOnClose->setChecked(settings["MinimizeOnClose"].toBool());
- settings["MouseWheelChangesBuffers"] = uiSettings.value("MouseWheelChangesBuffers", QVariant(true));
- ui.mouseWheelChangesBuffers->setChecked(settings["MouseWheelChangesBuffers"].toBool());
-
// bufferSettings:
BufferSettings bufferSettings;
- 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());
-
- 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["DisplayTopicInTooltip"] = bufferSettings.value("DisplayTopicInTooltip", QVariant(false));
- ui.displayTopicInTooltip->setChecked(settings["DisplayTopicInTooltip"].toBool());
-
- // inputline settings
- settings["CompletionSuffix"] = uiSettings.value("CompletionSuffix", QString(": "));
+ int redirectTarget = bufferSettings.userNoticesTarget();
+ SettingsPage::load(ui.userNoticesInDefaultBuffer, redirectTarget & BufferSettings::DefaultBuffer);
+ SettingsPage::load(ui.userNoticesInStatusBuffer, redirectTarget & BufferSettings::StatusBuffer);
+ SettingsPage::load(ui.userNoticesInCurrentBuffer, redirectTarget & BufferSettings::CurrentBuffer);
+
+ redirectTarget = bufferSettings.serverNoticesTarget();
+ SettingsPage::load(ui.serverNoticesInDefaultBuffer, redirectTarget & BufferSettings::DefaultBuffer);
+ SettingsPage::load(ui.serverNoticesInStatusBuffer, redirectTarget & BufferSettings::StatusBuffer);
+ SettingsPage::load(ui.serverNoticesInCurrentBuffer, redirectTarget & BufferSettings::CurrentBuffer);
+
+ redirectTarget = bufferSettings.errorMsgsTarget();
+ SettingsPage::load(ui.errorMsgsInDefaultBuffer, redirectTarget & BufferSettings::DefaultBuffer);
+ SettingsPage::load(ui.errorMsgsInStatusBuffer, redirectTarget & BufferSettings::StatusBuffer);
+ SettingsPage::load(ui.errorMsgsInCurrentBuffer, redirectTarget & BufferSettings::CurrentBuffer);
+
+ // completion settings
+ TabCompletionSettings completionSettings;
+ settings["CompletionSuffix"] = completionSettings.completionSuffix();
ui.completionSuffix->setText(settings["CompletionSuffix"].toString());
- // backlogSettings:
- BacklogSettings backlogSettings;
- settings["FixedBacklogAmount"] = backlogSettings.fixedBacklogAmount();
- ui.fixedBacklogAmount->setValue(backlogSettings.fixedBacklogAmount());
-
- settings["DynamicBacklogAmount"] = backlogSettings.dynamicBacklogAmount();
- ui.dynamicBacklogAmount->setValue(backlogSettings.dynamicBacklogAmount());
-
setChangedState(false);
}
void GeneralSettingsPage::save() {
QtUiSettings qtuiSettings;
+#ifdef Q_WS_MAC
+ qtuiSettings.setValue("UseSystemTrayIcon", ui.showSystemTrayIcon->isChecked());
+#else
qtuiSettings.setValue("UseSystemTrayIcon", ui.useSystemTrayIcon->isChecked());
- qtuiSettings.setValue("MinimizeOnMinimize", ui.minimizeOnMinimize->isChecked());
+#endif
qtuiSettings.setValue("MinimizeOnClose", ui.minimizeOnClose->isChecked());
- UiSettings uiSettings;
- uiSettings.setValue("MouseWheelChangesBuffers", ui.mouseWheelChangesBuffers->isChecked());
-
BufferSettings bufferSettings;
- 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());
+ int redirectTarget = 0;
+ if(ui.userNoticesInDefaultBuffer->isChecked())
+ redirectTarget |= BufferSettings::DefaultBuffer;
+ if(ui.userNoticesInStatusBuffer->isChecked())
+ redirectTarget |= BufferSettings::StatusBuffer;
+ if(ui.userNoticesInCurrentBuffer->isChecked())
+ redirectTarget |= BufferSettings::CurrentBuffer;
+ bufferSettings.setUserNoticesTarget(redirectTarget);
+
+ redirectTarget = 0;
+ if(ui.serverNoticesInDefaultBuffer->isChecked())
+ redirectTarget |= BufferSettings::DefaultBuffer;
+ if(ui.serverNoticesInStatusBuffer->isChecked())
+ redirectTarget |= BufferSettings::StatusBuffer;
+ if(ui.serverNoticesInCurrentBuffer->isChecked())
+ redirectTarget |= BufferSettings::CurrentBuffer;
+ bufferSettings.setServerNoticesTarget(redirectTarget);
+
+ redirectTarget = 0;
+ if(ui.errorMsgsInDefaultBuffer->isChecked())
+ redirectTarget |= BufferSettings::DefaultBuffer;
+ if(ui.errorMsgsInStatusBuffer->isChecked())
+ redirectTarget |= BufferSettings::StatusBuffer;
+ if(ui.errorMsgsInCurrentBuffer->isChecked())
+ redirectTarget |= BufferSettings::CurrentBuffer;
+ bufferSettings.setErrorMsgsTarget(redirectTarget);
+
+ TabCompletionSettings completionSettings;
+ completionSettings.setCompletionSuffix(ui.completionSuffix->text());
- uiSettings.setValue("CompletionSuffix", ui.completionSuffix->text());
-
- BacklogSettings backlogSettings;
- backlogSettings.setFixedBacklogAmount(ui.fixedBacklogAmount->value());
- backlogSettings.setDynamicBacklogAmount(ui.dynamicBacklogAmount->value());
-
load();
setChangedState(false);
}
}
bool GeneralSettingsPage::testHasChanged() {
+#ifdef Q_WS_MAC
+ if(settings["UseSystemTrayIcon"].toBool() != ui.showSystemTrayIcon->isChecked()) return true;
+#else
if(settings["UseSystemTrayIcon"].toBool() != ui.useSystemTrayIcon->isChecked()) return true;
- if(settings["MinimizeOnMinimize"].toBool() != ui.minimizeOnMinimize->isChecked()) return true;
+#endif
if(settings["MinimizeOnClose"].toBool() != ui.minimizeOnClose->isChecked()) return true;
if(SettingsPage::hasChanged(ui.userNoticesInStatusBuffer)) 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;
- if(settings["FixedBacklogAmount"].toInt() != ui.fixedBacklogAmount->value()) return true;
- if(settings["DynamicBacklogAmount"].toInt() != ui.dynamicBacklogAmount->value()) return true;
-
return false;
}
projects / quassel.git / blobdiff