Merge branch 'KDE/4.8'
This commit is contained in:
commit
15f9e80937
1 changed files with 4 additions and 2 deletions
|
@ -46,9 +46,11 @@ int main( int argc, char* argv[] )
|
||||||
KComponentData inst( &about );
|
KComponentData inst( &about );
|
||||||
Q_UNUSED( KGlobal::locale() ); // jump-start locales to get to translated descriptions
|
Q_UNUSED( KGlobal::locale() ); // jump-start locales to get to translated descriptions
|
||||||
KConfig config("kwinrc");
|
KConfig config("kwinrc");
|
||||||
|
KConfigGroup plugins = config.group("Plugins");
|
||||||
|
const bool boxSwitchEnabled = plugins.readEntry<bool>("kwin4_effect_boxswitchEnabled", true);
|
||||||
KConfigGroup boxswitch = config.group("Effect-BoxSwitch");
|
KConfigGroup boxswitch = config.group("Effect-BoxSwitch");
|
||||||
const bool boxSwitchPrimary = boxswitch.readEntry<bool>("TabBox", true);
|
const bool boxSwitchPrimary = boxSwitchEnabled && boxswitch.hasKey("TabBox") && boxswitch.readEntry<bool>("TabBox", true);
|
||||||
const bool boxSwitchAlternative = boxswitch.readEntry<bool>("TabBoxAlternative", false);
|
const bool boxSwitchAlternative = boxSwitchEnabled && boxswitch.hasKey("TabBoxAlternative") && boxswitch.readEntry<bool>("TabBoxAlternative", false);
|
||||||
boxswitch.writeEntry("TabBox", false);
|
boxswitch.writeEntry("TabBox", false);
|
||||||
boxswitch.writeEntry("TabBoxAlternative", false);
|
boxswitch.writeEntry("TabBoxAlternative", false);
|
||||||
boxswitch.sync();
|
boxswitch.sync();
|
||||||
|
|
Loading…
Reference in a new issue