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

Remove quick tile and quick maximize checkbox from screenedges ui as it is not implemented for 4.3.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=962763
This commit is contained in:
Martin Gräßlin 2009-05-03 10:01:31 +00:00
parent 20a7f2079c
commit f52d9dffa2
2 changed files with 7 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
kcmkwin/kwinscreenedges/main.cpp
View file

@ -54,15 +54,11 @@ KWinScreenEdgesConfig::KWinScreenEdgesConfig( QWidget* parent, const QVariantLis
connect( m_ui->monitor, SIGNAL( changed() ), this, SLOT( changed() ));
connect( m_ui->desktopSwitchCombo, SIGNAL( currentIndexChanged(int) ), this, SLOT( changed() ));
connect( m_ui->quickTileBox, SIGNAL( stateChanged(int) ), this, SLOT( changed() ));
connect( m_ui->quickMaximizeBox, SIGNAL( stateChanged(int) ), this, SLOT( changed() ));
connect( m_ui->activationDelaySpin, SIGNAL( valueChanged(int) ), this, SLOT( changed() ));
connect( m_ui->triggerCooldownSpin, SIGNAL( valueChanged(int) ), this, SLOT( changed() ));
// Visual feedback of action group conflicts
connect( m_ui->desktopSwitchCombo, SIGNAL( currentIndexChanged(int) ), this, SLOT( groupChanged() ));
connect( m_ui->quickTileBox, SIGNAL( stateChanged(int) ), this, SLOT( groupChanged() ));
connect( m_ui->quickMaximizeBox, SIGNAL( stateChanged(int) ), this, SLOT( groupChanged() ));
if( CompositingPrefs::compositingPossible() )
m_defaultPrefs.detect(); // Driver-specific config detection
@ -80,23 +76,14 @@ void KWinScreenEdgesConfig::groupChanged()
bool hide = false;
if( m_ui->desktopSwitchCombo->currentIndex() == 2 )
hide = true;
monitorHideEdge( ElectricTop, hide || m_ui->quickMaximizeBox->isChecked() );
monitorHideEdge( ElectricRight, hide || m_ui->quickTileBox->isChecked() );
monitorHideEdge( ElectricTop, hide );
monitorHideEdge( ElectricRight, hide );
monitorHideEdge( ElectricBottom, hide );
monitorHideEdge( ElectricLeft, hide || m_ui->quickTileBox->isChecked() );
monitorHideEdge( ElectricLeft, hide );
// Desktop switch conflicts
if( m_ui->quickTileBox->isChecked() || m_ui->quickMaximizeBox->isChecked() )
{
m_ui->desktopSwitchLabel->setEnabled( false );
m_ui->desktopSwitchCombo->setEnabled( false );
m_ui->desktopSwitchCombo->setCurrentIndex( 0 );
}
else
{
m_ui->desktopSwitchLabel->setEnabled( true );
m_ui->desktopSwitchCombo->setEnabled( true );
}
m_ui->desktopSwitchLabel->setEnabled( true );
m_ui->desktopSwitchCombo->setEnabled( true );
}
void KWinScreenEdgesConfig::load()
@ -108,8 +95,6 @@ void KWinScreenEdgesConfig::load()
KConfigGroup config( m_config, "Windows" );
m_ui->desktopSwitchCombo->setCurrentIndex( config.readEntry( "ElectricBorders", 0 ));
m_ui->quickTileBox->setChecked( config.readEntry( "QuickTile", false ));
m_ui->quickMaximizeBox->setChecked( config.readEntry( "QuickMaximize", false ));
m_ui->activationDelaySpin->setValue( config.readEntry( "ElectricBorderDelay", 150 ));
m_ui->triggerCooldownSpin->setValue( config.readEntry( "ElectricBorderCooldown", 350 ));
@ -125,8 +110,6 @@ void KWinScreenEdgesConfig::save()
KConfigGroup config( m_config, "Windows" );
config.writeEntry( "ElectricBorders", m_ui->desktopSwitchCombo->currentIndex() );
config.writeEntry( "QuickTile", m_ui->quickTileBox->isChecked() );
config.writeEntry( "QuickMaximize", m_ui->quickMaximizeBox->isChecked() );
config.writeEntry( "ElectricBorderDelay", m_ui->activationDelaySpin->value() );
config.writeEntry( "ElectricBorderCooldown", m_ui->triggerCooldownSpin->value() );
@ -144,8 +127,6 @@ void KWinScreenEdgesConfig::defaults()
monitorDefaults();
m_ui->desktopSwitchCombo->setCurrentIndex( 0 );
m_ui->quickTileBox->setChecked( false );
m_ui->quickMaximizeBox->setChecked( false );
m_ui->activationDelaySpin->setValue( 150 );
m_ui->triggerCooldownSpin->setValue( 350 );

26
kcmkwin/kwinscreenedges/main.ui
View file

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>582</width>
<height>428</height>
<width>713</width>
<height>439</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
@ -119,27 +119,7 @@
<string>Action Groups</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="quickTileBox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>&amp;Tile windows by dragging them to the side of the screen</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="quickMaximizeBox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Ma&amp;ximize windows by dragging them to the top of the screen</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
@ -267,8 +247,6 @@
<tabstops>
<tabstop>monitor</tabstop>
<tabstop>desktopSwitchCombo</tabstop>
<tabstop>quickTileBox</tabstop>
<tabstop>quickMaximizeBox</tabstop>
<tabstop>activationDelaySpin</tabstop>
<tabstop>triggerCooldownSpin</tabstop>
</tabstops>