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

* we don't have kdesktop around in kde4, so don't bother with its config file

Browse source 
* kwin doesn't seem to have a top level menu display impl anymore; we have a non-working one in playground for plasma, but that hardly counts; since this is breaking things for people upgrading, disable the setting until we get this sorted out properly

svn path=/trunk/KDE/kdebase/workspace/; revision=867480
This commit is contained in:
Aaron J. Seigo 2008-10-03 15:49:45 +00:00
parent e8490cd2ea
commit 893c2c4c1d
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
options.cpp
View file

@ -178,15 +178,16 @@ unsigned long Options::updateSettings()
// Since we want to allow users to enable window decoration tooltips // Since we want to allow users to enable window decoration tooltips
// and not kstyle tooltips and vise-versa, we don't read the // and not kstyle tooltips and vise-versa, we don't read the
// "EffectNoTooltip" setting from kdeglobals. // "EffectNoTooltip" setting from kdeglobals.
KConfig _globalConfig( "kdeglobals" );
KConfigGroup globalConfig(&_globalConfig, "KDE");
topmenus = globalConfig.readEntry( "macStyle", false);
KConfig _kdesktopcfg( "kdesktoprc" ); #if 0
KConfigGroup kdesktopcfg(&_kdesktopcfg, "Menubar" ); FIXME: we have no mac style menu implementation in kwin anymore, so this just breaks
desktop_topmenu = kdesktopcfg.readEntry( "ShowMenubar", false); things for people!
if( desktop_topmenu ) KConfig _globalConfig("kdeglobals");
topmenus = true; KConfigGroup globalConfig(&_globalConfig, "KDE");
topmenus = globalConfig.readEntry("macStyle", false);
#else
topmenus = false;
#endif
// QToolTip::setGloballyEnabled( d->show_tooltips ); // QToolTip::setGloballyEnabled( d->show_tooltips );
// KDE4 this probably needs to be done manually in clients // KDE4 this probably needs to be done manually in clients