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

* Use true/false instead of on/off in kwinrc, since this no longer

Browse source 
works. Update script for migrating old kwinrc included.

svn path=/trunk/KDE/kdebase/workspace/; revision=714020
This commit is contained in:
Luca Gugelmann 2007-09-18 14:44:41 +00:00
parent 89b9872eef
commit a9f43bbf30
4 changed files with 20 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/CMakeLists.txt
View file

@ -28,6 +28,6 @@ install(TARGETS kwin_update_default_rules DESTINATION ${LIB_INSTALL_DIR}/kconf_u
install( FILES fsp_workarounds_1.kwinrules DESTINATION ${DATA_INSTALL_DIR}/kwin/default_rules ) install( FILES fsp_workarounds_1.kwinrules DESTINATION ${DATA_INSTALL_DIR}/kwin/default_rules )
install( FILES pop.wav DESTINATION ${SOUND_INSTALL_DIR} ) install( FILES pop.wav DESTINATION ${SOUND_INSTALL_DIR} )
install( FILES kwin.upd kwinsticky.upd kwiniconify.upd kwin3_plugin.upd kwin_focus1.upd kwinupdatewindowsettings.upd kwin_focus2.upd kwin_fsp_workarounds_1.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) install( FILES kwin.upd kwinsticky.upd kwiniconify.upd kwin3_plugin.upd kwin_focus1.upd kwinupdatewindowsettings.upd kwin_focus2.upd kwin_fsp_workarounds_1.upd kwin_on_off.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
install(PROGRAMS pluginlibFix.pl kwin3_plugin.pl kwin_focus1.sh kwin_focus2.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) install( PROGRAMS pluginlibFix.pl kwin3_plugin.pl kwin_focus1.sh kwin_focus2.sh on-off_to_true-false.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )

5
data/kwin_on_off.upd Normal file
View file

@ -0,0 +1,5 @@
Id=kwin_on_off
File=kwinrc
Group=Windows
Options=overwrite
Script=on-off_to_true-false.sh,sh

5
data/on-off_to_true-false.sh Normal file
View file

@ -0,0 +1,5 @@
#!/bin/sh
while read line; do
echo "$line" | sed 's@=\s*on\s*$@=true@g' | sed 's@=\s*off\s*$@=false@g'
done

31
kcmkwin/kwinoptions/windows.cpp
View file

@ -456,15 +456,12 @@ void KFocusConfig::load( void )
k = cg.readEntry(KWIN_DELAYFOCUS_INTERVAL,750); k = cg.readEntry(KWIN_DELAYFOCUS_INTERVAL,750);
setDelayFocusInterval(k); setDelayFocusInterval(k);
key = cg.readEntry(KWIN_AUTORAISE); setAutoRaise( cg.readEntry(KWIN_AUTORAISE, false));
setAutoRaise(key == "on"); setDelayFocus( cg.readEntry(KWIN_DELAYFOCUS, false));
key = cg.readEntry(KWIN_DELAYFOCUS); setClickRaise( cg.readEntry(KWIN_CLICKRAISE, true));
setDelayFocus(key == "on");
key = cg.readEntry(KWIN_CLICKRAISE);
setClickRaise(key != "off");
setAutoRaiseEnabled(); // this will disable/hide the auto raise delay widget if focus==click setAutoRaiseEnabled(); // this will disable/hide the auto raise delay widget if focus==click
setDelayFocusEnabled(); setDelayFocusEnabled();
setSeparateScreenFocus( cg.readEntry(KWIN_SEPARATE_SCREEN_FOCUS, true)); setSeparateScreenFocus( cg.readEntry(KWIN_SEPARATE_SCREEN_FOCUS, true));
// on by default for non click to focus policies // on by default for non click to focus policies
setActiveMouseScreen( cg.readEntry(KWIN_ACTIVE_MOUSE_SCREEN, focusCombo->currentIndex() != 0 )); setActiveMouseScreen( cg.readEntry(KWIN_ACTIVE_MOUSE_SCREEN, focusCombo->currentIndex() != 0 ));
@ -505,20 +502,11 @@ void KFocusConfig::save( void )
if (v <0) v = 0; if (v <0) v = 0;
cg.writeEntry(KWIN_DELAYFOCUS_INTERVAL,v); cg.writeEntry(KWIN_DELAYFOCUS_INTERVAL,v);
if (autoRaiseOn->isChecked()) cg.writeEntry(KWIN_AUTORAISE, autoRaiseOn->isChecked());
cg.writeEntry(KWIN_AUTORAISE, "on");
else
cg.writeEntry(KWIN_AUTORAISE, "off");
if (delayFocusOn->isChecked()) cg.writeEntry(KWIN_DELAYFOCUS, delayFocusOn->isChecked());
cg.writeEntry(KWIN_DELAYFOCUS, "on");
else
cg.writeEntry(KWIN_DELAYFOCUS, "off");
if (clickRaiseOn->isChecked()) cg.writeEntry(KWIN_CLICKRAISE, clickRaiseOn->isChecked());
cg.writeEntry(KWIN_CLICKRAISE, "on");
else
cg.writeEntry(KWIN_CLICKRAISE, "off");
cg.writeEntry(KWIN_SEPARATE_SCREEN_FOCUS, separateScreenFocus->isChecked()); cg.writeEntry(KWIN_SEPARATE_SCREEN_FOCUS, separateScreenFocus->isChecked());
cg.writeEntry(KWIN_ACTIVE_MOUSE_SCREEN, activeMouseScreen->isChecked()); cg.writeEntry(KWIN_ACTIVE_MOUSE_SCREEN, activeMouseScreen->isChecked());
@ -751,10 +739,7 @@ void KAdvancedConfig::save( void )
KConfigGroup cg(config, "Windows"); KConfigGroup cg(config, "Windows");
cg.writeEntry(KWIN_ANIMSHADE, animateShade->isChecked()); cg.writeEntry(KWIN_ANIMSHADE, animateShade->isChecked());
if (shadeHoverOn->isChecked()) cg.writeEntry(KWIN_SHADEHOVER, shadeHoverOn->isChecked());
cg.writeEntry(KWIN_SHADEHOVER, "on");
else
cg.writeEntry(KWIN_SHADEHOVER, "off");
v = getShadeHoverInterval(); v = getShadeHoverInterval();
if (v<0) v = 0; if (v<0) v = 0;