diff --git a/clients/oxygen/config/oxygenconfigwidget.cpp b/clients/oxygen/config/oxygenconfigwidget.cpp
index e36212d55e..7ffc4d9ddf 100644
--- a/clients/oxygen/config/oxygenconfigwidget.cpp
+++ b/clients/oxygen/config/oxygenconfigwidget.cpp
@@ -70,7 +70,6 @@ namespace Oxygen
connect( ui.titleAlignment, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) );
connect( ui.buttonSize, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) );
connect( ui.frameBorder, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) );
- connect( ui.blendColor, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) );
connect( ui.titleOutline, SIGNAL(clicked()), SLOT(updateChanged()) );
connect( ui.drawSizeGrip, SIGNAL(clicked()), SLOT(updateChanged()) );
@@ -104,7 +103,6 @@ namespace Oxygen
if( !_configuration ) return;
ui.titleAlignment->setCurrentIndex( _configuration->titleAlignment() );
ui.buttonSize->setCurrentIndex( _configuration->buttonSize() );
- ui.blendColor->setCurrentIndex( _configuration->blendStyle() );
ui.frameBorder->setCurrentIndex( _configuration->frameBorder() );
ui.separatorMode->setCurrentIndex( _configuration->separatorMode() );
ui.drawSizeGrip->setChecked( _configuration->drawSizeGrip() );
@@ -127,7 +125,6 @@ namespace Oxygen
// apply modifications from ui
_configuration->setTitleAlignment( ui.titleAlignment->currentIndex() );
_configuration->setButtonSize( ui.buttonSize->currentIndex() );
- _configuration->setBlendStyle( ui.blendColor->currentIndex() );
_configuration->setFrameBorder( ui.frameBorder->currentIndex() );
_configuration->setSeparatorMode( ui.separatorMode->currentIndex() );
_configuration->setDrawSizeGrip( ui.drawSizeGrip->isChecked() );
@@ -228,7 +225,6 @@ namespace Oxygen
if( ui.titleAlignment->currentIndex() != _configuration->titleAlignment() ) modified = true;
else if( ui.buttonSize->currentIndex() != _configuration->buttonSize() ) modified = true;
- else if( ui.blendColor->currentIndex() != _configuration->blendStyle() ) modified = true;
else if( ui.frameBorder->currentIndex() != _configuration->frameBorder() ) modified = true;
else if( ui.separatorMode->currentIndex() != _configuration->separatorMode() ) modified = true;
else if( ui.drawSizeGrip->isChecked() != _configuration->drawSizeGrip() ) modified = true;
diff --git a/clients/oxygen/config/oxygenexceptiondialog.cpp b/clients/oxygen/config/oxygenexceptiondialog.cpp
index 1d2b1b6dbf..3a7d3df603 100644
--- a/clients/oxygen/config/oxygenexceptiondialog.cpp
+++ b/clients/oxygen/config/oxygenexceptiondialog.cpp
@@ -45,7 +45,6 @@ namespace Oxygen
// store checkboxes from ui into list
_checkBoxes.insert( FrameBorder, ui.frameBorderCheckBox );
- _checkBoxes.insert( BlendColor, ui.blendColorCheckBox );
_checkBoxes.insert( SizeGripMode, ui.sizeGripCheckBox );
_checkBoxes.insert( TitleOutline, ui.titleOutlineCheckBox );
_checkBoxes.insert( DrawSeparator, ui.separatorCheckBox );
@@ -57,7 +56,6 @@ namespace Oxygen
connect( ui.exceptionType, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) );
connect( ui.exceptionEditor, SIGNAL(textChanged(QString)), SLOT(updateChanged()) );
connect( ui.frameBorderComboBox, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) );
- connect( ui.blendColorComboBox, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) );
connect( ui.sizeGripComboBox, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) );
connect( ui.titleOutlineComboBox, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) );
connect( ui.separatorComboBox, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) );
@@ -79,7 +77,6 @@ namespace Oxygen
ui.exceptionType->setCurrentIndex(_exception->exceptionType() );
ui.exceptionEditor->setText( _exception->exceptionPattern() );
ui.frameBorderComboBox->setCurrentIndex( _exception->frameBorder() );
- ui.blendColorComboBox->setCurrentIndex( _exception->blendStyle() );
ui.sizeGripComboBox->setCurrentIndex( _exception->drawSizeGrip() );
ui.separatorComboBox->setCurrentIndex( _exception->separatorMode() );
ui.titleOutlineComboBox->setCurrentIndex( _exception->drawTitleOutline() );
@@ -99,7 +96,6 @@ namespace Oxygen
_exception->setExceptionType( ui.exceptionType->currentIndex() );
_exception->setExceptionPattern( ui.exceptionEditor->text() );
_exception->setFrameBorder( ui.frameBorderComboBox->currentIndex() );
- _exception->setBlendStyle( ui.blendColorComboBox->currentIndex() );
_exception->setDrawSizeGrip( ui.sizeGripComboBox->currentIndex() );
_exception->setSeparatorMode( ui.separatorComboBox->currentIndex() );
_exception->setDrawTitleOutline( ui.titleOutlineComboBox->currentIndex() );
@@ -123,7 +119,6 @@ namespace Oxygen
if( _exception->exceptionType() != ui.exceptionType->currentIndex() ) modified = true;
else if( _exception->exceptionPattern() != ui.exceptionEditor->text() ) modified = true;
else if( _exception->frameBorder() != ui.frameBorderComboBox->currentIndex() ) modified = true;
- else if( _exception->blendStyle() != ui.blendColorComboBox->currentIndex() ) modified = true;
else if( _exception->drawSizeGrip() != ui.sizeGripComboBox->currentIndex() ) modified = true;
else if( _exception->separatorMode() != ui.separatorComboBox->currentIndex() ) modified = true;
else if( _exception->drawTitleOutline() != ui.titleOutlineComboBox->currentIndex() ) modified = true;
diff --git a/clients/oxygen/config/ui/oxygenconfigurationui.ui b/clients/oxygen/config/ui/oxygenconfigurationui.ui
index 41c94a119a..293aa72f11 100644
--- a/clients/oxygen/config/ui/oxygenconfigurationui.ui
+++ b/clients/oxygen/config/ui/oxygenconfigurationui.ui
@@ -132,19 +132,6 @@
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
@@ -207,6 +194,19 @@
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
@@ -217,7 +217,20 @@
4
- -
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
-
@@ -236,7 +249,7 @@
- -
+
-
Separator display:
@@ -249,80 +262,35 @@
- -
-
-
- Background style:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- blendColor
-
-
-
- -
-
-
-
-
- Solid Color
-
-
- -
-
- Radial Gradient
-
-
- -
-
- Follow Style Hint
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
+
-
Outline active window title
- -
+
-
Use narrow space between decoration buttons
- -
+
-
Add handle to resize windows with no border
- -
+
-
Close windows by double clicking the menu button
- -
+
-
Qt::Vertical
@@ -450,7 +418,6 @@
buttonSize
animationsEnabled
_expertModeButton
- blendColor
separatorMode
titleOutline
narrowButtonSpacing
diff --git a/clients/oxygen/config/ui/oxygenexceptiondialog.ui b/clients/oxygen/config/ui/oxygenexceptiondialog.ui
index 6ecadb5a33..09c45515a6 100644
--- a/clients/oxygen/config/ui/oxygenexceptiondialog.ui
+++ b/clients/oxygen/config/ui/oxygenexceptiondialog.ui
@@ -80,49 +80,28 @@
Decoration Options
-
-
-
-
- Border size:
-
-
-
-
-
-
- Add handle to resize windows with no border
-
-
-
- -
Outline active window title:
- -
+
-
Separator display:
- -
-
-
- Background style:
-
-
-
- -
+
-
Hide window title bar
- -
+
-
QFrame::HLine
@@ -184,29 +163,21 @@
- -
-
-
- false
+
-
+
+
+ Border size:
-
-
-
- Solid Color
-
-
- -
-
- Radial Gradient
-
-
- -
-
- Follow Style Hint
-
-
- -
+
-
+
+
+ Add handle to resize windows with no border
+
+
+
+ -
false
@@ -223,7 +194,7 @@
- -
+
-
false
@@ -240,7 +211,7 @@
- -
+
-
false
@@ -285,8 +256,6 @@
detectDialogButton
frameBorderCheckBox
frameBorderComboBox
- blendColorCheckBox
- blendColorComboBox
sizeGripCheckBox
sizeGripComboBox
titleOutlineCheckBox
@@ -313,22 +282,6 @@
-
- blendColorCheckBox
- toggled(bool)
- blendColorComboBox
- setEnabled(bool)
-
-
- 99
- 217
-
-
- 315
- 217
-
-
-
sizeGripCheckBox
toggled(bool)
diff --git a/clients/oxygen/oxygenclient.cpp b/clients/oxygen/oxygenclient.cpp
index 9b9a710301..536684b636 100644
--- a/clients/oxygen/oxygenclient.cpp
+++ b/clients/oxygen/oxygenclient.cpp
@@ -607,17 +607,9 @@ namespace Oxygen
{
// window background
- if(
- _configuration->blendStyle() == Configuration::BlendNone ||
- ( _configuration->blendStyle() == Configuration::BlendFromStyle &&
- !helper().hasBackgroundGradient( windowId() )
- ) )
+ if( helper().hasBackgroundGradient( windowId() ) )
{
- painter->fillRect( rect, palette.color( QPalette::Window ) );
-
- } else {
-
int offset = layoutMetric( LM_OuterPaddingTop );
// radial gradient positionning
@@ -627,6 +619,10 @@ namespace Oxygen
const QWidget* window( isPreview() ? this->widget() : widget->window() );
helper().renderWindowBackground(painter, rect, widget, window, palette, offset, height );
+ } else {
+
+ painter->fillRect( rect, palette.color( QPalette::Window ) );
+
}
// background pixmap
diff --git a/clients/oxygen/oxygenconfigdata.kcfg b/clients/oxygen/oxygenconfigdata.kcfg
index 14be20824d..d84d151420 100644
--- a/clients/oxygen/oxygenconfigdata.kcfg
+++ b/clients/oxygen/oxygenconfigdata.kcfg
@@ -50,15 +50,6 @@
BorderTiny
-
-
-
-
-
-
- BlendFromStyle
-
-
true
diff --git a/clients/oxygen/oxygendecorationdefines.h b/clients/oxygen/oxygendecorationdefines.h
index abdab33152..dd383eb5f7 100644
--- a/clients/oxygen/oxygendecorationdefines.h
+++ b/clients/oxygen/oxygendecorationdefines.h
@@ -75,7 +75,6 @@ namespace Oxygen
DrawSeparator = 1<<2,
TitleOutline = 1<<3,
FrameBorder = 1<<4,
- BlendColor = 1<<5,
SizeGripMode = 1<<6
};
diff --git a/clients/oxygen/oxygenexceptionlist.cpp b/clients/oxygen/oxygenexceptionlist.cpp
index 3087e3d9bb..cf54f0a29f 100644
--- a/clients/oxygen/oxygenexceptionlist.cpp
+++ b/clients/oxygen/oxygenexceptionlist.cpp
@@ -60,7 +60,6 @@ namespace Oxygen
// propagate all features found in mask to the output configuration
if( exception.mask() & FrameBorder ) configuration->setFrameBorder( exception.frameBorder() );
- if( exception.mask() & BlendColor ) configuration->setBlendStyle( exception.blendStyle() );
if( exception.mask() & DrawSeparator ) configuration->setSeparatorMode( exception.separatorMode() );
if( exception.mask() & TitleOutline ) configuration->setDrawTitleOutline( exception.drawTitleOutline() );
if( exception.mask() & SizeGripMode ) configuration->setDrawSizeGrip( exception.drawSizeGrip() );