diff --git a/clients/oxygen/config/oxygenconfig.cpp b/clients/oxygen/config/oxygenconfig.cpp
index a9477e6571..a570025e0a 100644
--- a/clients/oxygen/config/oxygenconfig.cpp
+++ b/clients/oxygen/config/oxygenconfig.cpp
@@ -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() );
diff --git a/clients/oxygen/config/oxygenconfigurationui.cpp b/clients/oxygen/config/oxygenconfigurationui.cpp
index 94a0b8da88..3234b7b22b 100644
--- a/clients/oxygen/config/oxygenconfigurationui.cpp
+++ b/clients/oxygen/config/oxygenconfigurationui.cpp
@@ -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 );
diff --git a/clients/oxygen/config/ui/oxygenconfigurationui.ui b/clients/oxygen/config/ui/oxygenconfigurationui.ui
index 84f5c9fc28..3a08405f4c 100644
--- a/clients/oxygen/config/ui/oxygenconfigurationui.ui
+++ b/clients/oxygen/config/ui/oxygenconfigurationui.ui
@@ -92,20 +92,13 @@
-
-
-
- Enable window grouping
-
-
-
- -
Enable animations
- -
+
-
false
@@ -115,7 +108,7 @@
- -
+
-
Qt::Vertical
diff --git a/clients/oxygen/oxygenclient.cpp b/clients/oxygen/oxygenclient.cpp
index c490b79aac..8cd3be9096 100644
--- a/clients/oxygen/oxygenclient.cpp
+++ b/clients/oxygen/oxygenclient.cpp
@@ -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() )
diff --git a/clients/oxygen/oxygenconfiguration.cpp b/clients/oxygen/oxygenconfiguration.cpp
index 53fc0f6868..7515fc639c 100644
--- a/clients/oxygen/oxygenconfiguration.cpp
+++ b/clients/oxygen/oxygenconfiguration.cpp
@@ -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();
}
diff --git a/clients/oxygen/oxygenconfiguration.h b/clients/oxygen/oxygenconfiguration.h
index 89562111d5..20485e16b3 100644
--- a/clients/oxygen/oxygenconfiguration.h
+++ b/clients/oxygen/oxygenconfiguration.h
@@ -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;
diff --git a/clients/oxygen/oxygenfactory.cpp b/clients/oxygen/oxygenfactory.cpp
index eec549c018..790fdbc742 100644
--- a/clients/oxygen/oxygenfactory.cpp
+++ b/clients/oxygen/oxygenfactory.cpp
@@ -172,7 +172,7 @@ namespace Oxygen
// tabs
case AbilityClientGrouping:
- return defaultConfiguration().tabsEnabled();
+ return true;
// no colors supported at this time
default: