From: Manuel Nickschas Date: Wed, 3 Mar 2010 01:34:39 +0000 (+0100) Subject: Prettify notifications settingspage X-Git-Tag: 0.6-rc1~22 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=ffc0d75cea1690acb5428fb4f1ee0e82b5f4c9ef Prettify notifications settingspage The new look (for !KDE) is very similar to KNotify's configuration widget (albeit it has (still) way fewer options). Looks better and is more consistent. --- diff --git a/src/qtui/indicatornotificationbackend.cpp b/src/qtui/indicatornotificationbackend.cpp index df7b5340..281fe98b 100644 --- a/src/qtui/indicatornotificationbackend.cpp +++ b/src/qtui/indicatornotificationbackend.cpp @@ -25,6 +25,7 @@ #include "client.h" #include "clientsettings.h" +#include "iconloader.h" #include "mainwin.h" #include "networkmodel.h" #include "qtui.h" @@ -154,6 +155,8 @@ IndicatorNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent) : SettingsPage("Internal", "IndicatorNotification", parent) { ui.setupUi(this); + // FIXME find proper icon (this one is used by the plasmoid as well) + ui.enabled->setIcon(SmallIcon("mail-message-new")); connect(ui.enabled, SIGNAL(toggled(bool)), SLOT(widgetChanged())); } diff --git a/src/qtui/phononnotificationbackend.cpp b/src/qtui/phononnotificationbackend.cpp index 7006f5e6..1a106d4b 100644 --- a/src/qtui/phononnotificationbackend.cpp +++ b/src/qtui/phononnotificationbackend.cpp @@ -89,6 +89,7 @@ PhononNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent) audioPreview(0) { ui.setupUi(this); + ui.enabled->setIcon(SmallIcon("media-playback-start")); ui.play->setIcon(SmallIcon("media-playback-start")); ui.open->setIcon(SmallIcon("document-open")); diff --git a/src/qtui/settingspages/notificationssettingspage.cpp b/src/qtui/settingspages/notificationssettingspage.cpp index a473bc83..6ac1e0b7 100644 --- a/src/qtui/settingspages/notificationssettingspage.cpp +++ b/src/qtui/settingspages/notificationssettingspage.cpp @@ -40,7 +40,7 @@ NotificationsSettingsPage::NotificationsSettingsPage(QWidget *parent) _hasDefaults |= cw->hasDefaults(); } } - layout->addStretch(1); + layout->addStretch(20); load(); } diff --git a/src/qtui/systraynotificationbackend.cpp b/src/qtui/systraynotificationbackend.cpp index 82d9f96d..b6d1ff5f 100644 --- a/src/qtui/systraynotificationbackend.cpp +++ b/src/qtui/systraynotificationbackend.cpp @@ -21,13 +21,14 @@ #include #include #include -#include +#include #include "systraynotificationbackend.h" #include "client.h" #include "clientsettings.h" #include "icon.h" +#include "iconloader.h" #include "mainwin.h" #include "networkmodel.h" #include "qtui.h" @@ -130,23 +131,17 @@ SettingsPage *SystrayNotificationBackend::createConfigWidget() const { /***************************************************************************/ SystrayNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent) : SettingsPage("Internal", "SystrayNotification", parent) { - QGroupBox *groupBox = new QGroupBox(tr("System Tray Icon"), this); - _animateBox = new QCheckBox(tr("Animate")); - connect(_animateBox, SIGNAL(toggled(bool)), this, SLOT(widgetChanged())); - _showBubbleBox = new QCheckBox(tr("Show bubble")); + _showBubbleBox = new QCheckBox(tr("Show a message in a popup")); + _showBubbleBox->setIcon(SmallIcon("dialog-information")); connect(_showBubbleBox, SIGNAL(toggled(bool)), this, SLOT(widgetChanged())); - QVBoxLayout *layout = new QVBoxLayout(groupBox); - layout->addWidget(_animateBox); + QHBoxLayout *layout = new QHBoxLayout(this); layout->addWidget(_showBubbleBox); - layout->addStretch(1); - QVBoxLayout *globalLayout = new QVBoxLayout(this); - globalLayout->addWidget(groupBox); - } void SystrayNotificationBackend::ConfigWidget::widgetChanged() { - bool changed = (_showBubble != _showBubbleBox->isChecked() || _animate != _animateBox->isChecked()); - if(changed != hasChanged()) setChangedState(changed); + bool changed = (_showBubble != _showBubbleBox->isChecked()); + if(changed != hasChanged()) + setChangedState(changed); } bool SystrayNotificationBackend::ConfigWidget::hasDefaults() const { @@ -154,23 +149,19 @@ bool SystrayNotificationBackend::ConfigWidget::hasDefaults() const { } void SystrayNotificationBackend::ConfigWidget::defaults() { - _animateBox->setChecked(true); _showBubbleBox->setChecked(false); widgetChanged(); } void SystrayNotificationBackend::ConfigWidget::load() { NotificationSettings s; - _animate = s.value("Systray/Animate", true).toBool(); _showBubble = s.value("Systray/ShowBubble", false).toBool(); - _animateBox->setChecked(_animate); _showBubbleBox->setChecked(_showBubble); setChangedState(false); } void SystrayNotificationBackend::ConfigWidget::save() { NotificationSettings s; - s.setValue("Systray/Animate", _animateBox->isChecked()); s.setValue("Systray/ShowBubble", _showBubbleBox->isChecked()); load(); } diff --git a/src/qtui/systraynotificationbackend.h b/src/qtui/systraynotificationbackend.h index 3a685337..319942bf 100644 --- a/src/qtui/systraynotificationbackend.h +++ b/src/qtui/systraynotificationbackend.h @@ -71,8 +71,8 @@ private slots: void widgetChanged(); private: - QCheckBox *_showBubbleBox, *_animateBox; - bool _showBubble, _animate; + QCheckBox *_showBubbleBox; + bool _showBubble; }; #endif diff --git a/src/qtui/taskbarnotificationbackend.cpp b/src/qtui/taskbarnotificationbackend.cpp index 142c308c..f99706b1 100644 --- a/src/qtui/taskbarnotificationbackend.cpp +++ b/src/qtui/taskbarnotificationbackend.cpp @@ -23,6 +23,7 @@ #include #include "clientsettings.h" +#include "iconloader.h" #include "mainwin.h" #include "qtui.h" @@ -68,15 +69,19 @@ TaskbarNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent) : Settin #else layout->addWidget(enabledBox = new QCheckBox(tr("Mark taskbar entry, timeout:"), this)); #endif + enabledBox->setIcon(SmallIcon("flag-blue")); + enabledBox->setEnabled(true); + timeoutBox = new QSpinBox(this); - timeoutBox->setMinimum(0); + timeoutBox->setMinimum(1); timeoutBox->setMaximum(99); timeoutBox->setSpecialValueText(tr("Unlimited")); - timeoutBox->setSuffix(tr(" s")); + timeoutBox->setSuffix(tr(" seconds")); layout->addWidget(timeoutBox); - layout->addStretch(1); + layout->addStretch(20); connect(enabledBox, SIGNAL(toggled(bool)), SLOT(widgetChanged())); + connect(enabledBox, SIGNAL(toggled(bool)), timeoutBox, SLOT(setEnabled(bool))); connect(timeoutBox, SIGNAL(valueChanged(int)), SLOT(widgetChanged())); } diff --git a/src/qtui/ui/indicatornotificationconfigwidget.ui b/src/qtui/ui/indicatornotificationconfigwidget.ui index 69f2778f..3f2c5066 100644 --- a/src/qtui/ui/indicatornotificationconfigwidget.ui +++ b/src/qtui/ui/indicatornotificationconfigwidget.ui @@ -6,7 +6,7 @@ 0 0 - 435 + 438 35 @@ -16,8 +16,11 @@ + + This enables support for the Ayatana Project's application indicator (libindicate). + - Show messages in indicator + Show messages in application indicator diff --git a/src/qtui/ui/phononnotificationconfigwidget.ui b/src/qtui/ui/phononnotificationconfigwidget.ui index 8d3b066a..d6536dd7 100644 --- a/src/qtui/ui/phononnotificationconfigwidget.ui +++ b/src/qtui/ui/phononnotificationconfigwidget.ui @@ -1,59 +1,113 @@ - + + PhononNotificationConfigWidget - - + + 0 0 - 482 - 78 + 439 + 36 - + Form - + - - - Audio Notification (via Phonon) - - - true - - - - - - Play File: - - - - - - - - - - false - - - - - - - - - - - - - - + + + Play a sound + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + + + + + false + + + Prelisten to the selected sound + + + + + + + + + + false + + + Select the sound file to play + + + + + + + false + + + Select the sound file to play + + + + - + + + enabled + toggled(bool) + filename + setEnabled(bool) + + + 59 + 15 + + + 246 + 20 + + + + + enabled + toggled(bool) + open + setEnabled(bool) + + + 89 + 18 + + + 426 + 22 + + + +