projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add new ItemView settingspage
[quassel.git]
/
src
/
qtui
/
settingspages
/
generalsettingspage.cpp
diff --git
a/src/qtui/settingspages/generalsettingspage.cpp
b/src/qtui/settingspages/generalsettingspage.cpp
index
9f34b59
..
9888235
100644
(file)
--- a/
src/qtui/settingspages/generalsettingspage.cpp
+++ b/
src/qtui/settingspages/generalsettingspage.cpp
@@
-50,8
+50,6
@@
GeneralSettingsPage::GeneralSettingsPage(QWidget *parent)
connect(ui.errorMsgsInStatusBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
connect(ui.errorMsgsInCurrentBuffer, 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.completionSuffix, SIGNAL(textEdited(const QString&)), this, SLOT(widgetHasChanged()));
}
@@
-76,9
+74,6
@@
void GeneralSettingsPage::defaults() {
ui.errorMsgsInStatusBuffer->setChecked(false);
ui.errorMsgsInCurrentBuffer->setChecked(false);
ui.errorMsgsInStatusBuffer->setChecked(false);
ui.errorMsgsInCurrentBuffer->setChecked(false);
- ui.displayTopicInTooltip->setChecked(false);
- ui.mouseWheelChangesBuffers->setChecked(false);
-
ui.completionSuffix->setText(": ");
widgetHasChanged();
ui.completionSuffix->setText(": ");
widgetHasChanged();
@@
-95,9
+90,6
@@
void GeneralSettingsPage::load() {
settings["MinimizeOnClose"] = qtuiSettings.value("MinimizeOnClose", QVariant(false));
ui.minimizeOnClose->setChecked(settings["MinimizeOnClose"].toBool());
settings["MinimizeOnClose"] = qtuiSettings.value("MinimizeOnClose", QVariant(false));
ui.minimizeOnClose->setChecked(settings["MinimizeOnClose"].toBool());
- settings["MouseWheelChangesBuffers"] = uiSettings.value("MouseWheelChangesBuffers", QVariant(false));
- ui.mouseWheelChangesBuffers->setChecked(settings["MouseWheelChangesBuffers"].toBool());
-
// bufferSettings:
BufferSettings bufferSettings;
int redirectTarget = bufferSettings.userNoticesTarget();
// bufferSettings:
BufferSettings bufferSettings;
int redirectTarget = bufferSettings.userNoticesTarget();
@@
-115,10
+107,6
@@
void GeneralSettingsPage::load() {
SettingsPage::load(ui.errorMsgsInStatusBuffer, redirectTarget & BufferSettings::StatusBuffer);
SettingsPage::load(ui.errorMsgsInCurrentBuffer, redirectTarget & BufferSettings::CurrentBuffer);
SettingsPage::load(ui.errorMsgsInStatusBuffer, redirectTarget & BufferSettings::StatusBuffer);
SettingsPage::load(ui.errorMsgsInCurrentBuffer, redirectTarget & BufferSettings::CurrentBuffer);
-
- settings["DisplayTopicInTooltip"] = bufferSettings.value("DisplayTopicInTooltip", QVariant(false));
- ui.displayTopicInTooltip->setChecked(settings["DisplayTopicInTooltip"].toBool());
-
// completion settings
TabCompletionSettings completionSettings;
settings["CompletionSuffix"] = completionSettings.completionSuffix();
// completion settings
TabCompletionSettings completionSettings;
settings["CompletionSuffix"] = completionSettings.completionSuffix();
@@
-136,9
+124,6
@@
void GeneralSettingsPage::save() {
#endif
qtuiSettings.setValue("MinimizeOnClose", ui.minimizeOnClose->isChecked());
#endif
qtuiSettings.setValue("MinimizeOnClose", ui.minimizeOnClose->isChecked());
- UiSettings uiSettings;
- uiSettings.setValue("MouseWheelChangesBuffers", ui.mouseWheelChangesBuffers->isChecked());
-
BufferSettings bufferSettings;
int redirectTarget = 0;
if(ui.userNoticesInDefaultBuffer->isChecked())
BufferSettings bufferSettings;
int redirectTarget = 0;
if(ui.userNoticesInDefaultBuffer->isChecked())
@@
-167,8
+152,6
@@
void GeneralSettingsPage::save() {
redirectTarget |= BufferSettings::CurrentBuffer;
bufferSettings.setErrorMsgsTarget(redirectTarget);
redirectTarget |= BufferSettings::CurrentBuffer;
bufferSettings.setErrorMsgsTarget(redirectTarget);
- bufferSettings.setValue("DisplayTopicInTooltip", ui.displayTopicInTooltip->isChecked());
-
TabCompletionSettings completionSettings;
completionSettings.setCompletionSuffix(ui.completionSuffix->text());
TabCompletionSettings completionSettings;
completionSettings.setCompletionSuffix(ui.completionSuffix->text());
@@
-202,9
+185,6
@@
bool GeneralSettingsPage::testHasChanged() {
if(SettingsPage::hasChanged(ui.errorMsgsInDefaultBuffer)) return true;
if(SettingsPage::hasChanged(ui.errorMsgsInCurrentBuffer)) 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;
if(settings["CompletionSuffix"].toString() != ui.completionSuffix->text()) return true;
return false;