From f888cd7ee8fc6958dc4e29d4c2ddd2e08421e069 Mon Sep 17 00:00:00 2001 From: Alexander von Renteln Date: Tue, 25 Mar 2008 18:40:43 +0000 Subject: [PATCH] make animation of the tray icon and the displaying of the popup messages configurable --- src/qtui/mainwin.cpp | 14 +++++++-- .../settingspages/generalsettingspage.cpp | 19 +++++++++++- src/qtui/settingspages/generalsettingspage.ui | 31 ++++++++++++++++++- version.inc | 2 +- 4 files changed, 60 insertions(+), 6 deletions(-) diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 4b1c38f7..f5afc10c 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -430,9 +430,17 @@ void MainWin::receiveMessage(const Message &msg) { title += QString(" - %1").arg(sender); } QString text = QtUi::style()->styleString(Message::mircToInternal(msg.text())).text; - displayTrayIconMessage(title, text); - QApplication::alert(this); - setTrayIconActivity(true); + + UiSettings uiSettings; + + if(uiSettings.value("DisplayPopupMessages", QVariant(true)).toBool()) { + displayTrayIconMessage(title, text); + } + + if(uiSettings.value("AnimateTrayIcon", QVariant(true)).toBool()) { + QApplication::alert(this); + setTrayIconActivity(true); + } } } diff --git a/src/qtui/settingspages/generalsettingspage.cpp b/src/qtui/settingspages/generalsettingspage.cpp index 1e11e49d..5111b4ec 100644 --- a/src/qtui/settingspages/generalsettingspage.cpp +++ b/src/qtui/settingspages/generalsettingspage.cpp @@ -43,6 +43,9 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget *parent) connect(ui.minimizeOnMinimize, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); connect(ui.minimizeOnClose, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); + connect(ui.animateTrayIcon, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); + connect(ui.displayPopupMessages, 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())); @@ -56,12 +59,14 @@ 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.animateTrayIcon->setChecked(true); + ui.displayPopupMessages->setChecked(true); + ui.userMessagesInStatusBuffer->setChecked(true); ui.userMessagesInQueryBuffer->setChecked(false); ui.userMessagesInCurrentBuffer->setChecked(false); @@ -88,6 +93,12 @@ void GeneralSettingsPage::load() { settings["MouseWheelChangesBuffers"] = uiSettings.value("MouseWheelChangesBuffers", QVariant(true)); ui.mouseWheelChangesBuffers->setChecked(settings["MouseWheelChangesBuffers"].toBool()); + settings["AnimateTrayIcon"] = uiSettings.value("AnimateTrayIcon", QVariant(true)); + ui.animateTrayIcon->setChecked(settings["AnimateTrayIcon"].toBool()); + + settings["DisplayPopupMessages"] = uiSettings.value("DisplayPopupMessages", QVariant(true)); + ui.displayPopupMessages->setChecked(settings["DisplayPopupMessages"].toBool()); + // bufferSettings: BufferSettings bufferSettings; settings["UserMessagesInStatusBuffer"] = bufferSettings.value("UserMessagesInStatusBuffer", QVariant(true)); @@ -112,6 +123,9 @@ void GeneralSettingsPage::save() { uiSettings.setValue("MinimizeOnClose", ui.minimizeOnClose->isChecked()); uiSettings.setValue("MouseWheelChangesBuffers", ui.mouseWheelChangesBuffers->isChecked()); + uiSettings.setValue("AnimateTrayIcon", ui.animateTrayIcon->isChecked()); + uiSettings.setValue("DisplayPopupMessages", ui.displayPopupMessages->isChecked()); + BufferSettings bufferSettings; bufferSettings.setValue("UserMessagesInStatusBuffer", ui.userMessagesInStatusBuffer->isChecked()); bufferSettings.setValue("UserMessagesInQueryBuffer", ui.userMessagesInQueryBuffer->isChecked()); @@ -133,6 +147,9 @@ bool GeneralSettingsPage::testHasChanged() { if(settings["MinimizeOnMinimize"].toBool() != ui.minimizeOnMinimize->isChecked()) return true; if(settings["MinimizeOnClose"].toBool() != ui.minimizeOnClose->isChecked()) return true; + if(settings["AnimateTrayIcon"].toBool() != ui.animateTrayIcon->isChecked()) return true; + if(settings["DisplayPopupMessages"].toBool() != ui.displayPopupMessages->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; diff --git a/src/qtui/settingspages/generalsettingspage.ui b/src/qtui/settingspages/generalsettingspage.ui index 4620bb42..03feae5d 100644 --- a/src/qtui/settingspages/generalsettingspage.ui +++ b/src/qtui/settingspages/generalsettingspage.ui @@ -6,7 +6,7 @@ 0 0 448 - 480 + 488 @@ -58,6 +58,35 @@ + + + + User Notification: + + + + + + Animate tray icon + + + true + + + + + + + Display pop-up messages + + + true + + + + + + diff --git a/version.inc b/version.inc index 98a81336..60d47a7a 100644 --- a/version.inc +++ b/version.inc @@ -5,7 +5,7 @@ quasselVersion = "0.2.0-alpha4-pre"; quasselDate = "2008-03-25"; - quasselBuild = 657; + quasselBuild = 659; //! Minimum client build number the core needs clientBuildNeeded = 642; -- 2.20.1