diff --git a/clients/oxygen/config/oxygenconfigwidget.cpp b/clients/oxygen/config/oxygenconfigwidget.cpp index 34e31358ea..710c286c5a 100644 --- a/clients/oxygen/config/oxygenconfigwidget.cpp +++ b/clients/oxygen/config/oxygenconfigwidget.cpp @@ -71,7 +71,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()) ); @@ -106,7 +105,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() ); @@ -130,7 +128,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() ); @@ -231,7 +228,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 9834b7e3fd..348463956f 100644 --- a/clients/oxygen/config/oxygenexceptiondialog.cpp +++ b/clients/oxygen/config/oxygenexceptiondialog.cpp @@ -42,7 +42,6 @@ namespace Oxygen // store checkboxes from ui into list _checkBoxes.insert( FrameBorder, frameBorderCheckBox ); - _checkBoxes.insert( BlendColor, blendColorCheckBox ); _checkBoxes.insert( SizeGripMode, sizeGripCheckBox ); _checkBoxes.insert( TitleOutline, titleOutlineCheckBox ); _checkBoxes.insert( DrawSeparator, separatorCheckBox ); @@ -54,7 +53,6 @@ namespace Oxygen connect( exceptionType, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) ); connect( exceptionEditor, SIGNAL(textChanged(QString)), SLOT(updateChanged()) ); connect( frameBorderComboBox, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) ); - connect( blendColorComboBox, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) ); connect( sizeGripComboBox, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) ); connect( titleOutlineComboBox, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) ); connect( separatorComboBox, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) ); @@ -76,7 +74,6 @@ namespace Oxygen exceptionType->setCurrentIndex(_exception->exceptionType() ); exceptionEditor->setText( _exception->exceptionPattern() ); frameBorderComboBox->setCurrentIndex( _exception->frameBorder() ); - blendColorComboBox->setCurrentIndex( _exception->blendStyle() ); sizeGripComboBox->setCurrentIndex( _exception->drawSizeGrip() ); separatorComboBox->setCurrentIndex( _exception->separatorMode() ); titleOutlineComboBox->setCurrentIndex( _exception->drawTitleOutline() ); @@ -96,7 +93,6 @@ namespace Oxygen _exception->setExceptionType( exceptionType->currentIndex() ); _exception->setExceptionPattern( exceptionEditor->text() ); _exception->setFrameBorder( frameBorderComboBox->currentIndex() ); - _exception->setBlendStyle( blendColorComboBox->currentIndex() ); _exception->setDrawSizeGrip( sizeGripComboBox->currentIndex() ); _exception->setSeparatorMode( separatorComboBox->currentIndex() ); _exception->setDrawTitleOutline( titleOutlineComboBox->currentIndex() ); @@ -120,7 +116,6 @@ namespace Oxygen if( _exception->exceptionType() != exceptionType->currentIndex() ) modified = true; else if( _exception->exceptionPattern() != exceptionEditor->text() ) modified = true; else if( _exception->frameBorder() != frameBorderComboBox->currentIndex() ) modified = true; - else if( _exception->blendStyle() != blendColorComboBox->currentIndex() ) modified = true; else if( _exception->drawSizeGrip() != sizeGripComboBox->currentIndex() ) modified = true; else if( _exception->separatorMode() != separatorComboBox->currentIndex() ) modified = true; else if( _exception->drawTitleOutline() != titleOutlineComboBox->currentIndex() ) modified = true; diff --git a/clients/oxygen/config/ui/oxygenconfigurationui.ui b/clients/oxygen/config/ui/oxygenconfigurationui.ui index 309b694653..6007ca7603 100644 --- a/clients/oxygen/config/ui/oxygenconfigurationui.ui +++ b/clients/oxygen/config/ui/oxygenconfigurationui.ui @@ -17,16 +17,7 @@ - - 0 - - - 0 - - - 0 - - + 0 @@ -223,16 +214,7 @@ Fine Tuning - - 4 - - - 4 - - - 4 - - + 4 @@ -274,51 +256,6 @@ - - - - Bac&kground style: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - blendColor - - - - - - - - Solid Color - - - - - Radial Gradient - - - - - Follow Style Hint - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -360,6 +297,19 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -469,7 +419,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 ba071706c9..e69e4eec7d 100644 --- a/clients/oxygen/config/ui/oxygenexceptiondialog.ui +++ b/clients/oxygen/config/ui/oxygenexceptiondialog.ui @@ -83,6 +83,45 @@ Decoration Options + + + + false + + + + Disabled + + + + + Enabled + + + + + + + + false + + + + Never Draw Separator + + + + + Draw Separator When Window is Active + + + + + Always Draw Separator + + + + @@ -90,42 +129,35 @@ - + Add handle to resize windows with no border - + Outline active window title: - + Separator display: - - - - Background style: - - - - + Hide window title bar - + QFrame::HLine @@ -188,28 +220,6 @@ - - - false - - - - Solid Color - - - - - Radial Gradient - - - - - Follow Style Hint - - - - - false @@ -226,45 +236,6 @@ - - - - false - - - - Disabled - - - - - Enabled - - - - - - - - false - - - - Never Draw Separator - - - - - Draw Separator When Window is Active - - - - - Always Draw Separator - - - - @@ -342,22 +313,6 @@ - - blendColorCheckBox - toggled(bool) - blendColorComboBox - setEnabled(bool) - - - 136 - 188 - - - 333 - 189 - - - sizeGripCheckBox toggled(bool) diff --git a/clients/oxygen/oxygenclient.cpp b/clients/oxygen/oxygenclient.cpp index 44833f4515..6efe691897 100644 --- a/clients/oxygen/oxygenclient.cpp +++ b/clients/oxygen/oxygenclient.cpp @@ -609,17 +609,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 @@ -629,6 +621,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 4542ab7350..bd65884d98 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() );