projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove FontsSettingsPage - hasn't been used in months
[quassel.git]
/
src
/
qtui
/
settingspages
/
generalsettingspage.cpp
diff --git
a/src/qtui/settingspages/generalsettingspage.cpp
b/src/qtui/settingspages/generalsettingspage.cpp
index
e5bbea2
..
9888235
100644
(file)
--- a/
src/qtui/settingspages/generalsettingspage.cpp
+++ b/
src/qtui/settingspages/generalsettingspage.cpp
@@
-34,13
+34,8
@@
GeneralSettingsPage::GeneralSettingsPage(QWidget *parent)
ui.macOnly->hide();
#endif
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.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.minimizeOnClose, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
connect(ui.userNoticesInDefaultBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
@@
-55,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()));
}
@@
-67,7
+60,6
@@
bool GeneralSettingsPage::hasDefaults() const {
void GeneralSettingsPage::defaults() {
ui.useSystemTrayIcon->setChecked(true);
ui.showSystemTrayIcon->setChecked(true);
void GeneralSettingsPage::defaults() {
ui.useSystemTrayIcon->setChecked(true);
ui.showSystemTrayIcon->setChecked(true);
- ui.minimizeOnMinimize->setChecked(false);
ui.minimizeOnClose->setChecked(false);
ui.userNoticesInDefaultBuffer->setChecked(true);
ui.minimizeOnClose->setChecked(false);
ui.userNoticesInDefaultBuffer->setChecked(true);
@@
-82,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();
@@
-98,15
+87,9
@@
void GeneralSettingsPage::load() {
ui.useSystemTrayIcon->setChecked(settings["UseSystemTrayIcon"].toBool());
ui.showSystemTrayIcon->setChecked(settings["UseSystemTrayIcon"].toBool());
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["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();
@@
-124,12
+107,8
@@
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
// completion settings
-
Nick
CompletionSettings completionSettings;
+
Tab
CompletionSettings completionSettings;
settings["CompletionSuffix"] = completionSettings.completionSuffix();
ui.completionSuffix->setText(settings["CompletionSuffix"].toString());
settings["CompletionSuffix"] = completionSettings.completionSuffix();
ui.completionSuffix->setText(settings["CompletionSuffix"].toString());
@@
-143,12
+122,8
@@
void GeneralSettingsPage::save() {
#else
qtuiSettings.setValue("UseSystemTrayIcon", ui.useSystemTrayIcon->isChecked());
#endif
#else
qtuiSettings.setValue("UseSystemTrayIcon", ui.useSystemTrayIcon->isChecked());
#endif
- qtuiSettings.setValue("MinimizeOnMinimize", ui.minimizeOnMinimize->isChecked());
qtuiSettings.setValue("MinimizeOnClose", ui.minimizeOnClose->isChecked());
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())
@@
-177,9
+152,7
@@
void GeneralSettingsPage::save() {
redirectTarget |= BufferSettings::CurrentBuffer;
bufferSettings.setErrorMsgsTarget(redirectTarget);
redirectTarget |= BufferSettings::CurrentBuffer;
bufferSettings.setErrorMsgsTarget(redirectTarget);
- bufferSettings.setValue("DisplayTopicInTooltip", ui.displayTopicInTooltip->isChecked());
-
- NickCompletionSettings completionSettings;
+ TabCompletionSettings completionSettings;
completionSettings.setCompletionSuffix(ui.completionSuffix->text());
completionSettings.setCompletionSuffix(ui.completionSuffix->text());
@@
-198,7
+171,6
@@
bool GeneralSettingsPage::testHasChanged() {
#else
if(settings["UseSystemTrayIcon"].toBool() != ui.useSystemTrayIcon->isChecked()) return true;
#endif
#else
if(settings["UseSystemTrayIcon"].toBool() != ui.useSystemTrayIcon->isChecked()) return true;
#endif
- if(settings["MinimizeOnMinimize"].toBool() != ui.minimizeOnMinimize->isChecked()) return true;
if(settings["MinimizeOnClose"].toBool() != ui.minimizeOnClose->isChecked()) return true;
if(SettingsPage::hasChanged(ui.userNoticesInStatusBuffer)) return true;
if(settings["MinimizeOnClose"].toBool() != ui.minimizeOnClose->isChecked()) return true;
if(SettingsPage::hasChanged(ui.userNoticesInStatusBuffer)) return true;
@@
-213,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;