yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show label "Options" when we don't have options

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=777389
This commit is contained in:
Laurent Montel 2008-02-20 12:50:39 +00:00
parent c12a07e11a
commit e484ffff66
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
kcmkwin/kwindecoration/kwindecoration.cpp
View file

@ -105,7 +105,7 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const QVariantList &
decorationList->setWhatsThis( whatsThis); decorationList->setWhatsThis( whatsThis);
pluginLayout->addWidget(decorationList); pluginLayout->addWidget(decorationList);
QGroupBox *pluginSettingsGrp = new QGroupBox( i18n("Decoration Options"), pluginPage ); pluginSettingsGrp = new QGroupBox( i18n("Decoration Options"), pluginPage );
QGridLayout *pluginSettingsLayout = new QGridLayout(); QGridLayout *pluginSettingsLayout = new QGridLayout();
pluginSettingsGrp->setFlat( true ); pluginSettingsGrp->setFlat( true );
pluginSettingsLayout->setMargin( 0 ); pluginSettingsLayout->setMargin( 0 );
@ -415,7 +415,6 @@ void KWinDecorationModule::resetPlugin( KConfigGroup& conf, const QString& curre
if (library != NULL) if (library != NULL)
{ {
KLibrary::void_function_ptr alloc_ptr = library->resolveFunction("allocate_config"); KLibrary::void_function_ptr alloc_ptr = library->resolveFunction("allocate_config");
if (alloc_ptr != NULL) if (alloc_ptr != NULL)
{ {
allocatePlugin = (QObject* (*)(KConfigGroup& conf, QWidget* parent))alloc_ptr; allocatePlugin = (QObject* (*)(KConfigGroup& conf, QWidget* parent))alloc_ptr;
@ -426,12 +425,14 @@ void KWinDecorationModule::resetPlugin( KConfigGroup& conf, const QString& curre
connect( this, SIGNAL(pluginLoad(const KConfigGroup&)), pluginObject, SLOT(load(const KConfigGroup&)) ); connect( this, SIGNAL(pluginLoad(const KConfigGroup&)), pluginObject, SLOT(load(const KConfigGroup&)) );
connect( this, SIGNAL(pluginSave(KConfigGroup &)), pluginObject, SLOT(save(KConfigGroup &)) ); connect( this, SIGNAL(pluginSave(KConfigGroup &)), pluginObject, SLOT(save(KConfigGroup &)) );
connect( this, SIGNAL(pluginDefaults()), pluginObject, SLOT(defaults()) ); connect( this, SIGNAL(pluginDefaults()), pluginObject, SLOT(defaults()) );
pluginConfigWidget->show(); pluginSettingsGrp->show();
return; return;
} }
} }
if ( cBorder->isHidden() )
pluginConfigWidget->hide(); pluginSettingsGrp->hide();
else if (pluginSettingsGrp->isHidden() )
pluginSettingsGrp->show();
} }

1
kcmkwin/kwindecoration/kwindecoration.h
View file

@ -124,6 +124,7 @@ class KWinDecorationModule : public KCModule, public KDecorationDefines
// Page 2 // Page 2
ButtonPositionWidget *buttonPositionWidget; ButtonPositionWidget *buttonPositionWidget;
KVBox* buttonPage; KVBox* buttonPage;
QGroupBox *pluginSettingsGrp;
}; };