From 5f7b085f12e4cd841c5d035d82fcc3216be14ee1 Mon Sep 17 00:00:00 2001 From: John Maguire Date: Thu, 26 May 2011 13:13:38 +0000 Subject: [PATCH] Disable popup delay settings when Growl is selected. Fixes issue #1891 --- src/ui/settingsdialog.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/ui/settingsdialog.cpp b/src/ui/settingsdialog.cpp index b96395564..fc7a6a81e 100644 --- a/src/ui/settingsdialog.cpp +++ b/src/ui/settingsdialog.cpp @@ -615,6 +615,10 @@ void SettingsDialog::showEvent(QShowEvent*) { ui_->notifications_custom_text2->setText(s.value("CustomText2").toString()); s.endGroup(); +#ifdef Q_OS_DARWIN + ui_->notifications_options->setEnabled(ui_->notifications_pretty->isChecked()); +#endif + // Pretty OSD pretty_popup_->ReloadSettings(); ui_->notifications_opacity->setValue(pretty_popup_->background_opacity() * 100); @@ -681,6 +685,10 @@ void SettingsDialog::NotificationTypeChanged() { ui_->notifications_general->setEnabled(enabled); ui_->notifications_pretty_group->setEnabled(pretty); ui_->notifications_custom_text_group->setEnabled(enabled); + +#ifdef Q_OS_DARWIN + ui_->notifications_options->setEnabled(ui_->notifications_pretty->isChecked()); +#endif } void SettingsDialog::PrettyOpacityChanged(int value) {