From 7c83acaac6919083cf292d12abee3fd4dc00bd28 Mon Sep 17 00:00:00 2001 From: un1versal Date: Tue, 26 Apr 2016 14:35:47 +0100 Subject: OptionsWidget_notify: refactor and make in seconds a spinbox suffix (#1957) * OptionsWidget_notify: formatting + indenting cleanup * OptionsWidget_notify: add suffix sec to spinbox + remove in seconds from label * OptionsWidget_notify: fix connecting slot this is a consistency issue and a major pet peeve. all similar spin boxes sec is suffixed, except for these... * OptionsWidget_notify: fix connecting slot --- src/modules/options/OptionsWidget_notify.cpp | 90 ++++++++++++---------------- 1 file changed, 38 insertions(+), 52 deletions(-) (limited to 'src/modules/options/OptionsWidget_notify.cpp') diff --git a/src/modules/options/OptionsWidget_notify.cpp b/src/modules/options/OptionsWidget_notify.cpp index d1c99aab3..d14a98743 100644 --- a/src/modules/options/OptionsWidget_notify.cpp +++ b/src/modules/options/OptionsWidget_notify.cpp @@ -34,67 +34,53 @@ OptionsWidget_notify::OptionsWidget_notify(QWidget * parent) : KviOptionsWidget(parent) { setObjectName("notify_options_widget"); - createLayout(); - KviBoolSelector * b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Use online notify list","options"),KviOption_boolUseNotifyList); - KviTalGroupBox *g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Configuration","options")); + KviBoolSelector * b; + KviTalGroupBox * g; + KviUIntSelector * u; + + KviBoolSelector* notifyEnableBox = addBoolSelector(0,0,0,0,__tr2qs_ctx("Use online notify list","options"),KviOption_boolUseNotifyList); + b = notifyEnableBox; + + g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Configuration","options")); connect(b,SIGNAL(toggled(bool)),g,SLOT(setEnabled(bool))); - connect(b, - SIGNAL(toggled(bool)), - addBoolSelector(g,__tr2qs_ctx("Show notifications in active window","options"), - KviOption_boolNotifyListChangesToActiveWindow,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)), - SLOT(setEnabled(bool))); - connect(b, - SIGNAL(toggled(bool)), - addBoolSelector(g,__tr2qs_ctx("Flash window when users are going online","options"), - KviOption_boolFlashWindowOnNotifyOnLine,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)), - SLOT(setEnabled(bool))); - connect(b, - SIGNAL(toggled(bool)), - addBoolSelector(g,__tr2qs_ctx("Popup notifier when users are going online","options"), - KviOption_boolPopupNotifierOnNotifyOnLine,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)), - SLOT(setEnabled(bool))); + b = addBoolSelector(g,__tr2qs_ctx("Show notifications in active window","options"),KviOption_boolNotifyListChangesToActiveWindow,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); + connect(notifyEnableBox,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool))); + + b = addBoolSelector(g,__tr2qs_ctx("Flash window when users are going online","options"),KviOption_boolFlashWindowOnNotifyOnLine,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); + connect(notifyEnableBox,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool))); + + b = addBoolSelector(g,__tr2qs_ctx("Popup notifier when users are going online","options"),KviOption_boolPopupNotifierOnNotifyOnLine,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); + connect(notifyEnableBox,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool))); g = addGroupBox(0,2,0,2,Qt::Horizontal,__tr2qs_ctx("Advanced Configuration","options")); - connect(b,SIGNAL(toggled(bool)),g,SLOT(setEnabled(bool))); + connect(notifyEnableBox,SIGNAL(toggled(bool)),g,SLOT(setEnabled(bool))); - connect(b, - SIGNAL(toggled(bool)), - addBoolSelector(g,__tr2qs_ctx("Check USERHOST for online users","options"), - KviOption_boolNotifyListSendUserhostForOnlineUsers,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)), - SLOT(setEnabled(bool))); - connect(b, - SIGNAL(toggled(bool)), - addBoolSelector(g,__tr2qs_ctx("Use \"smart\" notify list manager","options"), - KviOption_boolUseIntelligentNotifyListManager,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)), - SLOT(setEnabled(bool))); - connect(b, - SIGNAL(toggled(bool)), - addBoolSelector(g,__tr2qs_ctx("Use the WATCH method if available","options"), - KviOption_boolUseWatchListIfAvailable,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)), - SLOT(setEnabled(bool))); - connect(b, - SIGNAL(toggled(bool)), - addUIntSelector(g,__tr2qs_ctx("Check interval (in seconds):","options"), - KviOption_uintNotifyListCheckTimeInSecs, - 5,3600,180,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)), - SLOT(setEnabled(bool))); - connect(b, - SIGNAL(toggled(bool)), - addUIntSelector(g,__tr2qs_ctx("ISON delay (in seconds):","options"), - KviOption_uintNotifyListIsOnDelayTimeInSecs, - 5,180,6,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)), - SLOT(setEnabled(bool))); - connect(b, - SIGNAL(toggled(bool)), - addUIntSelector(g,__tr2qs_ctx("USERHOST delay (in seconds):","options"), - KviOption_uintNotifyListUserhostDelayTimeInSecs, - 5,180,6,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)), - SLOT(setEnabled(bool))); + b = addBoolSelector(g,__tr2qs_ctx("Check USERHOST for online users","options"),KviOption_boolNotifyListSendUserhostForOnlineUsers,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); + connect(notifyEnableBox,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool))); + + b = addBoolSelector(g,__tr2qs_ctx("Use \"smart\" notify list manager","options"),KviOption_boolUseIntelligentNotifyListManager,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); + connect(notifyEnableBox,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool))); + + b = addBoolSelector(g,__tr2qs_ctx("Use the WATCH method if available","options"),KviOption_boolUseWatchListIfAvailable,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); + connect(notifyEnableBox,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool))); + + u = addUIntSelector(g,__tr2qs_ctx("Check interval:","options"),KviOption_uintNotifyListCheckTimeInSecs,5,3600,180,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); + u->setSuffix(__tr2qs_ctx(" sec","options")); + connect(notifyEnableBox,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); + + u = addUIntSelector(g,__tr2qs_ctx("ISON delay:","options"),KviOption_uintNotifyListIsOnDelayTimeInSecs,5,180,6,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); + u->setSuffix(__tr2qs_ctx(" sec","options")); + connect(notifyEnableBox,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); + + u = addUIntSelector(g,__tr2qs_ctx("USERHOST delay:","options"),KviOption_uintNotifyListUserhostDelayTimeInSecs,5,180,6,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); + u->setSuffix(__tr2qs_ctx(" sec","options")); + connect(notifyEnableBox,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); addLabel(0,3,0,3,__tr2qs_ctx("

Note:
The notify list is managed using the \"Registered Users\" settings.

","options")); + addRowSpacer(0,4,0,4); } -- cgit v1.3.1-10-gc9f91