summaryrefslogtreecommitdiffstats
path: root/kcontrol/smserver
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/smserver')
-rw-r--r--kcontrol/smserver/kcmsmserver.cpp4
-rw-r--r--kcontrol/smserver/kcmsmserver.h2
-rw-r--r--kcontrol/smserver/smserverconfigdlg.ui57
-rw-r--r--kcontrol/smserver/smserverconfigimpl.cpp18
-rw-r--r--kcontrol/smserver/smserverconfigimpl.h3
5 files changed, 47 insertions, 37 deletions
diff --git a/kcontrol/smserver/kcmsmserver.cpp b/kcontrol/smserver/kcmsmserver.cpp
index 99f1b729a..3d165a577 100644
--- a/kcontrol/smserver/kcmsmserver.cpp
+++ b/kcontrol/smserver/kcmsmserver.cpp
@@ -48,7 +48,7 @@ SMServerConfig::SMServerConfig( TQWidget *parent, const char* name, const TQStri
TQVBoxLayout *topLayout = new TQVBoxLayout(this);
dialog = new SMServerConfigImpl(this);
- connect(dialog, TQT_SIGNAL(changed()), TQT_SLOT(changed()));
+ connect(dialog, TQ_SIGNAL(changed()), TQ_SLOT(changed()));
dialog->show();
topLayout->add(dialog);
@@ -94,6 +94,7 @@ void SMServerConfig::load(bool useDefaults )
c->setGroup("Logout");
dialog->showLogoutStatusDialog->setChecked(c->readBoolEntry("showLogoutStatusDlg", true));
+ dialog->showUbuntuStyleDialog->setChecked(c->readBoolEntry("doUbuntuLogout", false));
dialog->showFadeAway->setChecked(c->readBoolEntry("doFadeaway", true));
dialog->showFancyFadeAway->setChecked(c->readBoolEntry("doFancyLogout", true));
dialog->showFancyFadeAway->setEnabled(dialog->confirmLogoutCheck->isChecked() && dialog->showFadeAway->isChecked()),
@@ -126,6 +127,7 @@ void SMServerConfig::save()
c->writeEntry("excludeApps", dialog->excludeLineedit->text());
c->setGroup("Logout");
c->writeEntry( "showLogoutStatusDlg", dialog->showLogoutStatusDialog->isChecked());
+ c->writeEntry( "doUbuntuLogout", dialog->showUbuntuStyleDialog->isChecked());
c->writeEntry( "doFadeaway", dialog->showFadeAway->isChecked());
c->writeEntry( "doFancyLogout", dialog->showFancyFadeAway->isChecked());
c->sync();
diff --git a/kcontrol/smserver/kcmsmserver.h b/kcontrol/smserver/kcmsmserver.h
index c346033c6..31ea4d360 100644
--- a/kcontrol/smserver/kcmsmserver.h
+++ b/kcontrol/smserver/kcmsmserver.h
@@ -28,7 +28,7 @@ class SMServerConfigImpl;
class SMServerConfig : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
SMServerConfig( TQWidget *parent=0, const char* name=0, const TQStringList &list=TQStringList() );
diff --git a/kcontrol/smserver/smserverconfigdlg.ui b/kcontrol/smserver/smserverconfigdlg.ui
index 1449e9d6f..9179722c7 100644
--- a/kcontrol/smserver/smserverconfigdlg.ui
+++ b/kcontrol/smserver/smserverconfigdlg.ui
@@ -62,10 +62,10 @@
<bool>false</bool>
</property>
<property name="text">
- <string>Show &amp;logout fadeaway</string>
+ <string>Fadeaway screen during &amp;logout</string>
</property>
<property name="whatsThis" stdset="0">
- <string>Check this option if you want to see a fadeaway when displaying a logout confirmation dialog box.</string>
+ <string>Check this option if you want screen to be faded when displaying a logout confirmation dialog box.</string>
</property>
</widget>
<widget class="TQCheckBox">
@@ -76,10 +76,10 @@
<bool>false</bool>
</property>
<property name="text">
- <string>Sho&amp;w fancy logout fadeaway</string>
+ <string>Use effects for logout fadea&amp;way</string>
</property>
<property name="whatsThis" stdset="0">
- <string>Check this option if you want to see a fancy fadeaway when displaying a logout confirmation dialog box.</string>
+ <string>Check this option if you want to enable additional graphical effects for fadeaway during logout process. Namely the fadeaway will be smoothly animated and semitransparent.</string>
</property>
</widget>
<widget class="TQCheckBox">
@@ -104,6 +104,17 @@
<string>Check this option if you want to see a dialog box showing the logout status.</string>
</property>
</widget>
+ <widget class="TQCheckBox">
+ <property name="name">
+ <cstring>showUbuntuStyleDialog</cstring>
+ </property>
+ <property name="text">
+ <string>Use &amp;alternative shutdown dialog layout</string>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>Check this option if you want to use an alternative shutdown dialog, where buttons are arranged in rows rathen then columns. This layout is popular in Ubuntu and therefore it is also known as 'Ubuntu style' shutdown dialog.</string>
+ </property>
+ </widget>
</vbox>
</widget>
<widget class="TQButtonGroup">
@@ -243,40 +254,22 @@
</widget>
<connections>
<connection>
- <sender>confirmLogoutCheck</sender>
- <signal>toggled(bool)</signal>
- <receiver>SMServerConfigDlg</receiver>
- <slot>configChanged()</slot>
- </connection>
- <connection>
<sender>confirmLogoutCheck</sender>
<signal>toggled(bool)</signal>
- <receiver>showFadeAway</receiver>
- <slot>setEnabled(bool)</slot>
- </connection>
- <connection>
- <sender>confirmLogoutCheck</sender>
- <signal>toggled(bool)</signal>
- <receiver>showFancyFadeAway</receiver>
- <slot>setEnabled(bool)</slot>
- </connection>
- <connection>
- <sender>showFadeAway</sender>
- <signal>toggled(bool)</signal>
- <receiver>showFancyFadeAway</receiver>
- <slot>setEnabled(bool)</slot>
+ <receiver>SMServerConfigDlg</receiver>
+ <slot>fadeAwayConfigChanged()</slot>
</connection>
<connection>
<sender>showFadeAway</sender>
<signal>toggled(bool)</signal>
<receiver>SMServerConfigDlg</receiver>
- <slot>configChanged()</slot>
+ <slot>fadeAwayConfigChanged()</slot>
</connection>
<connection>
<sender>showFancyFadeAway</sender>
<signal>toggled(bool)</signal>
<receiver>SMServerConfigDlg</receiver>
- <slot>configChanged()</slot>
+ <slot>fadeAwayConfigChanged()</slot>
</connection>
<connection>
<sender>showLogoutStatusDialog</sender>
@@ -285,6 +278,12 @@
<slot>configChanged()</slot>
</connection>
<connection>
+ <sender>showUbuntuStyleDialog</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>SMServerConfigDlg</receiver>
+ <slot>configChanged()</slot>
+ </connection>
+ <connection>
<sender>loginGroup</sender>
<signal>clicked(int)</signal>
<receiver>SMServerConfigDlg</receiver>
@@ -316,12 +315,14 @@
</connection>
</connections>
<includes>
+ <include location="global" impldecl="in declaration">tqcheckbox.h</include>
<include location="global" impldecl="in implementation">kdialog.h</include>
<include location="global" impldecl="in implementation">klineedit.h</include>
</includes>
-<Q_SLOTS>
+<slots>
<slot>configChanged()</slot>
-</Q_SLOTS>
+ <slot>fadeAwayConfigChanged()</slot>
+</slots>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
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 b516617cf..2e1186936 100644
--- a/kcontrol/smserver/smserverconfigimpl.h
+++ b/kcontrol/smserver/smserverconfigimpl.h
@@ -26,13 +26,14 @@
*/
class SMServerConfigImpl : public SMServerConfigDlg {
- Q_OBJECT
+ TQ_OBJECT
public:
SMServerConfigImpl(TQWidget *parent=0, const char *name=0);
~SMServerConfigImpl();
public slots: // Public slots
/** No descriptions */
void configChanged();
+ void fadeAwayConfigChanged();
signals: // Signals
/** No descriptions */
void changed();
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 21:19:55 +0000