diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 21:13:34 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-03-04 19:57:11 +0100 |
| commit | b71d74b498ef2fa5e8902574732ebed3114886a9 (patch) | |
| tree | 07ae9f35cf422d2b463ada5effa53358ec05a573 /kcontrol | |
| parent | ad594443d82411f35fabf360fcdf2c2043461f2a (diff) | |
| download | tdebase-b71d74b498ef2fa5e8902574732ebed3114886a9.tar.gz tdebase-b71d74b498ef2fa5e8902574732ebed3114886a9.zip | |
Add GUI check box for tdmrc[X-:*-Core] TerminateServer setting located at
KControl->System Administration->Login Manager->Shutdown->Restart X-server with session exit.
(cherry picked from commit 882522b23ab809294c32b0ea4da628c80100c3da)
Diffstat (limited to 'kcontrol')
| -rw-r--r-- | kcontrol/kdm/kdm-shut.cpp | 11 | ||||
| -rw-r--r-- | kcontrol/kdm/kdm-shut.h | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/kcontrol/kdm/kdm-shut.cpp b/kcontrol/kdm/kdm-shut.cpp index 3b442956a..ba9fc4882 100644 --- a/kcontrol/kdm/kdm-shut.cpp +++ b/kcontrol/kdm/kdm-shut.cpp @@ -45,7 +45,6 @@ KDMSessionsWidget::KDMSessionsWidget(TQWidget *parent, const char *name) { TQString wtstr; - TQGroupBox *group0 = new TQGroupBox( i18n("Allow Shutdown"), this ); sdlcombo = new TQComboBox( FALSE, group0 ); @@ -101,6 +100,11 @@ KDMSessionsWidget::KDMSessionsWidget(TQWidget *parent, const char *name) TQWhatsThis::add( bm_label, wtstr ); TQWhatsThis::add( bm_combo, wtstr ); + tsbox = new TQCheckBox( i18n("Restart X-Server with session exit"), this ); + connect( tsbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) ); + wtstr = i18n("Whether the login manager should restart the local X-Server after a session exit instead of resetting. Use this when the X-Server leaks memory, crashes the system on reset attempts, or otherwise exhibits display issues."); + TQWhatsThis::add( tsbox, wtstr ); + TQBoxLayout *main = new TQVBoxLayout( this, 10 ); TQGridLayout *lgroup0 = new TQGridLayout( group0, 1, 1, 10); TQGridLayout *lgroup1 = new TQGridLayout( group1, 1, 1, 10); @@ -109,6 +113,7 @@ KDMSessionsWidget::KDMSessionsWidget(TQWidget *parent, const char *name) main->addWidget(group0); main->addWidget(group1); main->addWidget(group4); + main->addWidget(tsbox); main->addStretch(); lgroup0->addRowSpacing(0, group0->fontMetrics().height()/2); @@ -149,6 +154,7 @@ void KDMSessionsWidget::makeReadOnly() shutdown_lined->button()->setEnabled(false); bm_combo->setEnabled(false); + tsbox->setEnabled(false); } void KDMSessionsWidget::writeSD(TQComboBox *combo) @@ -166,6 +172,7 @@ void KDMSessionsWidget::save() { config->setGroup("X-:*-Core"); writeSD(sdlcombo); + config->writeEntry( "TerminateServer", tsbox->isChecked() ); config->setGroup("X-*-Core"); writeSD(sdrcombo); @@ -194,6 +201,8 @@ void KDMSessionsWidget::load() { config->setGroup("X-:*-Core"); readSD(sdlcombo, "All"); + tsbox->setChecked(config->readBoolEntry("TerminateServer", false)); + config->setGroup("X-*-Core"); readSD(sdrcombo, "Root"); diff --git a/kcontrol/kdm/kdm-shut.h b/kcontrol/kdm/kdm-shut.h index 0e7cdb654..c96d3b78d 100644 --- a/kcontrol/kdm/kdm-shut.h +++ b/kcontrol/kdm/kdm-shut.h @@ -56,6 +56,7 @@ private: TQLabel *sdllabel, *sdrlabel; KURLRequester *restart_lined, *shutdown_lined; KBackedComboBox *bm_combo; + TQCheckBox *tsbox; }; |