Make KDE default deco work again.
Rename "KDE Default" to "KDE Classic" to avoid confusion. svn path=/trunk/kdebase/kwin/; revision=186362
This commit is contained in:
parent
de4206660d
commit
60f752e61f
1 changed files with 4 additions and 9 deletions
|
@ -184,7 +184,7 @@ void KWinDecorationModule::createDecorationList()
|
||||||
QValueList<DecorationInfo>::ConstIterator it;
|
QValueList<DecorationInfo>::ConstIterator it;
|
||||||
|
|
||||||
// Sync with kwin hardcoded KDE2 style which has no desktop item
|
// Sync with kwin hardcoded KDE2 style which has no desktop item
|
||||||
decorationListBox->insertItem( i18n("KDE Default") );
|
decorationListBox->insertItem( i18n("KDE Classic") );
|
||||||
|
|
||||||
for (it = decorations.begin(); it != decorations.end(); ++it)
|
for (it = decorations.begin(); it != decorations.end(); ++it)
|
||||||
{
|
{
|
||||||
|
@ -253,12 +253,7 @@ QString KWinDecorationModule::decorationLibName( const QString& name )
|
||||||
}
|
}
|
||||||
|
|
||||||
if (libName.isEmpty())
|
if (libName.isEmpty())
|
||||||
{
|
libName = "kwin_default"; // KDE Classic
|
||||||
if (QPixmap::defaultDepth() > 8)
|
|
||||||
libName = "kwin_keramik";
|
|
||||||
else
|
|
||||||
libName = "kwin_quartz";
|
|
||||||
}
|
|
||||||
|
|
||||||
return libName;
|
return libName;
|
||||||
}
|
}
|
||||||
|
@ -339,7 +334,7 @@ void KWinDecorationModule::readConfig( KConfig* conf )
|
||||||
|
|
||||||
// If we are using the "default" kde client, use the "default" entry.
|
// If we are using the "default" kde client, use the "default" entry.
|
||||||
if (decoName.isEmpty())
|
if (decoName.isEmpty())
|
||||||
decorationListBox->setSelected( decorationListBox->findItem( i18n("KDE Default") ), true );
|
decorationListBox->setSelected( decorationListBox->findItem( i18n("KDE Classic") ), true );
|
||||||
else
|
else
|
||||||
// Update the decoration listbox
|
// Update the decoration listbox
|
||||||
decorationListBox->setSelected( decorationListBox->findItem( decoName ), true);
|
decorationListBox->setSelected( decorationListBox->findItem( decoName ), true);
|
||||||
|
@ -439,7 +434,7 @@ void KWinDecorationModule::defaults()
|
||||||
// cbUseMiniWindows->setChecked( false);
|
// cbUseMiniWindows->setChecked( false);
|
||||||
// Don't set default for now
|
// Don't set default for now
|
||||||
// decorationListBox->setSelected(
|
// decorationListBox->setSelected(
|
||||||
// decorationListBox->findItem( i18n("KDE Default") ), true ); // KDE default client
|
// decorationListBox->findItem( i18n("KDE Classic") ), true ); // KDE classic client
|
||||||
|
|
||||||
dropSite->buttonsLeft = "MS";
|
dropSite->buttonsLeft = "MS";
|
||||||
dropSite->buttonsRight= "HIAX";
|
dropSite->buttonsRight= "HIAX";
|
||||||
|
|
Loading…
Reference in a new issue