summaryrefslogtreecommitdiffstats
path: root/twin/kcmtwin/twindecoration
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-04 20:19:11 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-04 20:19:11 -0600
commit901e0cd538c26e8d21020915cd6469c95a96855f (patch)
tree0d2a41df2fccd851655f808060077d36883d69bd /twin/kcmtwin/twindecoration
parent4f07a40969e2655f6b3ae4843a1c801a384cf3a8 (diff)
downloadtdebase-901e0cd538c26e8d21020915cd6469c95a96855f.tar.gz
tdebase-901e0cd538c26e8d21020915cd6469c95a96855f.zip
Improve handling of selected WM when a WM is removed from the list
Diffstat (limited to 'twin/kcmtwin/twindecoration')
-rw-r--r--twin/kcmtwin/twindecoration/twindecoration.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp
index b782e3be7..89e6134d5 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.cpp
+++ b/twin/kcmtwin/twindecoration/twindecoration.cpp
@@ -151,7 +151,7 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
TQVBoxLayout* previewLayout = new TQVBoxLayout(layout, KDialog::spacingHint() );
previewLayout->setMargin( KDialog::marginHint() );
- disabledNotice = new TQLabel("<b>" + i18n("NOTICE") + "</b><br>" + i18n("A third party Window Manager has been selected for use with TDE.") + "<br>" + i18n("As a result, the built-in Window Manager configuration system will not function and has been disabled."), this);
+ disabledNotice = new TQLabel("<b>" + i18n("NOTICE:") + "</b><br>" + i18n("A third party Window Manager has been selected for use with TDE.") + "<br>" + i18n("As a result, the built-in Window Manager configuration system will not function and has been disabled."), this);
previewLayout->addWidget(disabledNotice);
disabledNotice->hide();
@@ -756,7 +756,12 @@ void KWinDecorationModule::readConfig( KConfig* conf )
break;
}
}
- thirdpartyWMList->setCurrentItem(swm);
+ if (found == FALSE) {
+ thirdpartyWMList->setCurrentItem(0);
+ }
+ else {
+ thirdpartyWMList->setCurrentItem(swm);
+ }
thirdpartyWMArguments->setText(wmArguments);
processEnabledDisabledTabs();