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

always enable window grouping, when available.

Browse source 
removed corresponding config option.
This commit is contained in:
Hugo Pereira Da Costa 2011-07-17 16:12:30 +02:00
parent 7ca4d15919
commit 0ae4d9489f
7 changed files with 3 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
clients/oxygen/config/oxygenconfig.cpp
View file

@ -117,7 +117,6 @@ namespace Oxygen
else if( ui->ui.separatorMode->currentIndex() != configuration.separatorMode() ) modified = true;
else if( ui->ui.titleOutline->isChecked() != configuration.drawTitleOutline() ) modified = true;
else if( ui->ui.tabsEnabled->isChecked() != configuration.tabsEnabled() ) modified = true;
else if( ui->ui.useAnimations->isChecked() != configuration.useAnimations() ) modified = true;
else if( ui->ui.animateTitleChange->isChecked() != configuration.animateTitleChange() ) modified = true;
else if( ui->ui.narrowButtonSpacing->isChecked() != configuration.useNarrowButtonSpacing() ) modified = true;
@ -153,7 +152,6 @@ namespace Oxygen
configuration.setDrawTitleOutline( ui->ui.titleOutline->isChecked() );
configuration.setUseDropShadows( ui->shadowConfigurations[1]->isChecked() );
configuration.setUseOxygenShadows( ui->shadowConfigurations[0]->isChecked() );
configuration.setTabsEnabled( ui->ui.tabsEnabled->isChecked() );
configuration.setUseAnimations( ui->ui.useAnimations->isChecked() );
configuration.setAnimateTitleChange( ui->ui.animateTitleChange->isChecked() );
configuration.setUseNarrowButtonSpacing( ui->ui.narrowButtonSpacing->isChecked() );
@ -231,7 +229,6 @@ namespace Oxygen
ui->ui.titleOutline->setChecked( configuration.drawTitleOutline() );
ui->shadowConfigurations[0]->setChecked( configuration.useOxygenShadows() );
ui->shadowConfigurations[1]->setChecked( configuration.useDropShadows() );
ui->ui.tabsEnabled->setChecked( configuration.tabsEnabled() );
ui->ui.useAnimations->setChecked( configuration.useAnimations() );
ui->ui.animateTitleChange->setChecked( configuration.animateTitleChange() );
ui->ui.narrowButtonSpacing->setChecked( configuration.useNarrowButtonSpacing() );

2
clients/oxygen/config/oxygenconfigurationui.cpp
View file

@ -104,7 +104,6 @@ namespace Oxygen
connect( ui.blendColor, SIGNAL(currentIndexChanged(int)), SIGNAL(changed()) );
connect( ui.sizeGripMode, SIGNAL(currentIndexChanged(int)), SIGNAL(changed()) );
connect( ui.tabsEnabled, SIGNAL(clicked()), SIGNAL(changed()) );
connect( ui.useAnimations, SIGNAL(clicked()), SIGNAL(changed()) );
connect( ui.animateTitleChange, SIGNAL(clicked()), SIGNAL(changed()) );
connect( ui.narrowButtonSpacing, SIGNAL(clicked()), SIGNAL(changed()) );
@ -138,7 +137,6 @@ namespace Oxygen
// update button text
ui._expertModeButton->setText( _expertMode ? i18n( "Hide Advanced Configuration Options" ):i18n( "Show Advanced Configuration Options" ) );
ui.tabsEnabled->setVisible( _expertMode );
ui.animateTitleChange->setVisible( _expertMode );
ui.narrowButtonSpacing->setVisible( _expertMode );

11
clients/oxygen/config/ui/oxygenconfigurationui.ui
View file

@ -92,20 +92,13 @@
<widget class="KComboBox" name="buttonSize"/>
</item>
<item row="3" column="0" colspan="3">
<widget class="QCheckBox" name="tabsEnabled">
<property name="text">
<string>Enable window grouping</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="3">
<widget class="QCheckBox" name="useAnimations">
<property name="text">
<string>Enable animations</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="4">
<item row="4" column="0" colspan="4">
<widget class="QCheckBox" name="animateTitleChange">
<property name="enabled">
<bool>false</bool>
@ -115,7 +108,7 @@
</property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<item row="5" column="0" colspan="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>

3
clients/oxygen/oxygenclient.cpp
View file

@ -1296,9 +1296,6 @@ namespace Oxygen
{
// all dedicated event filtering is here to handle multiple tabs.
// if tabs are disabled, do nothing
if( !configuration().tabsEnabled() )
{ return KCommonDecorationUnstable::eventFilter( object, event ); }
bool state = false;
switch( event->type() )

8
clients/oxygen/oxygenconfiguration.cpp
View file

@ -50,7 +50,6 @@ namespace Oxygen
_useAnimations( true ),
_animateTitleChange( true ),
_animationsDuration( 150 ),
_tabsEnabled( true ),
_useNarrowButtonSpacing( false )
{}
@ -137,11 +136,6 @@ namespace Oxygen
OxygenConfig::ANIMATIONS_DURATION,
defaultConfiguration.animationsDuration() ) );
// tabbing
setTabsEnabled( group.readEntry(
OxygenConfig::TABS_ENABLED,
defaultConfiguration.tabsEnabled() ) );
// buttonSpacing
setUseNarrowButtonSpacing( group.readEntry(
OxygenConfig::NARROW_BUTTON_SPACING,
@ -188,7 +182,6 @@ namespace Oxygen
if( useAnimations() != defaultConfiguration.useAnimations() ) group.writeEntry( OxygenConfig::USE_ANIMATIONS, useAnimations() );
if( animateTitleChange() != defaultConfiguration.animateTitleChange() ) group.writeEntry( OxygenConfig::ANIMATE_TITLE_CHANGE, animateTitleChange() );
if( animationsDuration() != defaultConfiguration.animationsDuration() ) group.writeEntry( OxygenConfig::ANIMATIONS_DURATION, animationsDuration() );
if( tabsEnabled() != defaultConfiguration.tabsEnabled() ) group.writeEntry( OxygenConfig::TABS_ENABLED, tabsEnabled() );
if( useNarrowButtonSpacing() != defaultConfiguration.useNarrowButtonSpacing() ) group.writeEntry( OxygenConfig::NARROW_BUTTON_SPACING, useNarrowButtonSpacing() );
}
@ -372,7 +365,6 @@ namespace Oxygen
useAnimations() == other.useAnimations() &&
animateTitleChange() == other.animateTitleChange() &&
animationsDuration() == other.animationsDuration() &&
tabsEnabled() == other.tabsEnabled() &&
useNarrowButtonSpacing() == other.useNarrowButtonSpacing();
}

12
clients/oxygen/oxygenconfiguration.h
View file

@ -44,7 +44,6 @@ namespace OxygenConfig
static const QString HIDE_TITLEBAR = "HideTitleBar";
static const QString USE_ANIMATIONS = "UseAnimations";
static const QString ANIMATE_TITLE_CHANGE = "AnimateTitleChange";
static const QString TABS_ENABLED = "TabsEnabled";
static const QString NARROW_BUTTON_SPACING = "UseNarrowButtonSpacing";
}
@ -309,14 +308,6 @@ namespace Oxygen
virtual void setAnimationsDuration( int value )
{ _animationsDuration = value; }
//! tabbing
virtual bool tabsEnabled( void ) const
{ return _tabsEnabled; }
//! tabbing
virtual void setTabsEnabled( bool value )
{ _tabsEnabled = value; }
private:
//! title alignment
@ -361,9 +352,6 @@ namespace Oxygen
//! animations
int _animationsDuration;
//! tabbing
bool _tabsEnabled;
//! narrow button spacing
bool _useNarrowButtonSpacing;

2
clients/oxygen/oxygenfactory.cpp
View file

@ -172,7 +172,7 @@ namespace Oxygen
// tabs
case AbilityClientGrouping:
return defaultConfiguration().tabsEnabled();
return true;
// no colors supported at this time
default: