From a7dc4c51d5edb098aab42d57d177f9968545926e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 21 Mar 2024 18:33:33 +0900 Subject: Fix update of fade away checkboxes in TCC session manager module Signed-off-by: Michele Calgaro --- kcontrol/smserver/smserverconfigdlg.ui | 28 ++++++---------------------- kcontrol/smserver/smserverconfigimpl.cpp | 18 ++++++++++++------ kcontrol/smserver/smserverconfigimpl.h | 1 + 3 files changed, 19 insertions(+), 28 deletions(-) diff --git a/kcontrol/smserver/smserverconfigdlg.ui b/kcontrol/smserver/smserverconfigdlg.ui index 7d68e3ddf..574422bc3 100644 --- a/kcontrol/smserver/smserverconfigdlg.ui +++ b/kcontrol/smserver/smserverconfigdlg.ui @@ -242,41 +242,23 @@ - - confirmLogoutCheck - toggled(bool) - SMServerConfigDlg - configChanged() - - - confirmLogoutCheck - toggled(bool) - showFadeAway - setEnabled(bool) - confirmLogoutCheck toggled(bool) - showFancyFadeAway - setEnabled(bool) - - - showFadeAway - toggled(bool) - showFancyFadeAway - setEnabled(bool) + SMServerConfigDlg + fadeAwayConfigChanged() showFadeAway toggled(bool) SMServerConfigDlg - configChanged() + fadeAwayConfigChanged() showFancyFadeAway toggled(bool) SMServerConfigDlg - configChanged() + fadeAwayConfigChanged() showLogoutStatusDialog @@ -316,11 +298,13 @@ + tqcheckbox.h kdialog.h klineedit.h configChanged() + fadeAwayConfigChanged() diff --git a/kcontrol/smserver/smserverconfigimpl.cpp b/kcontrol/smserver/smserverconfigimpl.cpp index d9507a9d8..af04d774a 100644 --- a/kcontrol/smserver/smserverconfigimpl.cpp +++ b/kcontrol/smserver/smserverconfigimpl.cpp @@ -18,14 +18,20 @@ #include "smserverconfigimpl.h" #include "smserverconfigimpl.moc" -SMServerConfigImpl::SMServerConfigImpl(TQWidget *parent, const char *name ) : SMServerConfigDlg(parent,name) { +SMServerConfigImpl::SMServerConfigImpl(TQWidget *parent, const char *name ) : SMServerConfigDlg(parent,name) {} +SMServerConfigImpl::~SMServerConfigImpl() {} + +void SMServerConfigImpl::configChanged() +{ + emit changed(); } -SMServerConfigImpl::~SMServerConfigImpl(){ -} -/** No descriptions */ -void SMServerConfigImpl::configChanged(){ - emit changed(); +void SMServerConfigImpl::fadeAwayConfigChanged() +{ + // Update showFadeAway and showFancyFadeAway status correctly + showFadeAway->setEnabled(confirmLogoutCheck->isChecked()); + showFancyFadeAway->setEnabled(confirmLogoutCheck->isChecked() && showFadeAway->isChecked()); + configChanged(); } diff --git a/kcontrol/smserver/smserverconfigimpl.h b/kcontrol/smserver/smserverconfigimpl.h index 592609e9e..2e1186936 100644 --- a/kcontrol/smserver/smserverconfigimpl.h +++ b/kcontrol/smserver/smserverconfigimpl.h @@ -33,6 +33,7 @@ public: public slots: // Public slots /** No descriptions */ void configChanged(); + void fadeAwayConfigChanged(); signals: // Signals /** No descriptions */ void changed(); -- cgit v1.2.1