Backport rev 1002067: Fixing a copy&paste error. Screen edges kcm should read cube settings for cube actions, not desktop grid settings.

CCBUG: 201362


svn path=/branches/KDE/4.3/kdebase/workspace/; revision=1002069
This commit is contained in:
Martin Gräßlin 2009-07-24 21:12:13 +00:00
parent be1f18ab35
commit 5617c815d2

View file

@ -271,21 +271,21 @@ void KWinScreenEdgesConfig::monitorLoad()
KConfigGroup cubeConfig( m_config, "Effect-Cube" ); KConfigGroup cubeConfig( m_config, "Effect-Cube" );
list.clear(); list.clear();
list.append( int( ElectricNone ) ); list.append( int( ElectricNone ) );
list = gridConfig.readEntry( "BorderActivate", list ); list = cubeConfig.readEntry( "BorderActivate", list );
foreach( int i, list ) foreach( int i, list )
{ {
monitorChangeEdge( ElectricBorder( i ), int( Cube ) ); monitorChangeEdge( ElectricBorder( i ), int( Cube ) );
} }
list.clear(); list.clear();
list.append( int( ElectricNone ) ); list.append( int( ElectricNone ) );
list = gridConfig.readEntry( "BorderActivateCylinder", list ); list = cubeConfig.readEntry( "BorderActivateCylinder", list );
foreach( int i, list ) foreach( int i, list )
{ {
monitorChangeEdge( ElectricBorder( i ), int( Cylinder ) ); monitorChangeEdge( ElectricBorder( i ), int( Cylinder ) );
} }
list.clear(); list.clear();
list.append( int( ElectricNone ) ); list.append( int( ElectricNone ) );
list = gridConfig.readEntry( "BorderActivateSphere", list ); list = cubeConfig.readEntry( "BorderActivateSphere", list );
foreach( int i, list ) foreach( int i, list )
{ {
monitorChangeEdge( ElectricBorder( i ), int( Sphere ) ); monitorChangeEdge( ElectricBorder( i ), int( Sphere ) );