diff --git a/kstyle/breeze.kcfg b/kstyle/breeze.kcfg index c9d498ed..055a32fd 100644 --- a/kstyle/breeze.kcfg +++ b/kstyle/breeze.kcfg @@ -71,8 +71,8 @@ - - true + + false diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp index 8777db71..64aeea64 100644 --- a/kstyle/breezestyle.cpp +++ b/kstyle/breezestyle.cpp @@ -368,7 +368,7 @@ namespace Breeze } // alter palette for dock widgets - else if( qobject_cast( widget ) && StyleConfigData::dockWidgetDrawFrame() ) + else if( qobject_cast( widget ) && StyleConfigData::sidePanelDrawFrame() ) { const QPalette palette( _helper->framePalette( QApplication::palette() ) ); widget->setPalette( palette ); @@ -1041,7 +1041,7 @@ namespace Breeze { _helper->renderMenuFrame( &painter, rect, background, outline, false ); - } else if( StyleConfigData::dockWidgetDrawFrame() || (dockWidget->features()&QDockWidget::AllDockWidgetFeatures) ) { + } else if( StyleConfigData::sidePanelDrawFrame() || (dockWidget->features()&QDockWidget::AllDockWidgetFeatures) ) { _helper->renderFrame( &painter, rect, background, outline ); diff --git a/kstyle/config/breezestyleconfig.cpp b/kstyle/config/breezestyleconfig.cpp index df85cff9..a2424759 100644 --- a/kstyle/config/breezestyleconfig.cpp +++ b/kstyle/config/breezestyleconfig.cpp @@ -47,7 +47,7 @@ namespace Breeze load(); connect( _toolBarDrawItemSeparator, SIGNAL(toggled(bool)), SLOT(updateChanged()) ); - connect( _dockWidgetDrawFrame, SIGNAL(toggled(bool)), SLOT(updateChanged()) ); + connect( _sidePanelDrawFrame, SIGNAL(toggled(bool)), SLOT(updateChanged()) ); connect( _sliderDrawTickMarks, SIGNAL(toggled(bool)), SLOT(updateChanged()) ); connect( _splitterProxyEnabled, SIGNAL(toggled(bool)), SLOT(updateChanged()) ); connect( _mnemonicsMode, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) ); @@ -63,7 +63,7 @@ namespace Breeze void StyleConfig::save( void ) { StyleConfigData::setToolBarDrawItemSeparator( _toolBarDrawItemSeparator->isChecked() ); - StyleConfigData::setDockWidgetDrawFrame( _dockWidgetDrawFrame->isChecked() ); + StyleConfigData::setSidePanelDrawFrame( _sidePanelDrawFrame->isChecked() ); StyleConfigData::setSliderDrawTickMarks( _sliderDrawTickMarks->isChecked() ); StyleConfigData::setSplitterProxyEnabled( _splitterProxyEnabled->isChecked() ); StyleConfigData::setMnemonicsMode( _mnemonicsMode->currentIndex() ); @@ -113,7 +113,7 @@ namespace Breeze // check if any value was modified if( _toolBarDrawItemSeparator->isChecked() != StyleConfigData::toolBarDrawItemSeparator() ) modified = true; - else if( _dockWidgetDrawFrame->isChecked() != StyleConfigData::dockWidgetDrawFrame() ) modified = true; + else if( _sidePanelDrawFrame->isChecked() != StyleConfigData::sidePanelDrawFrame() ) modified = true; else if( _sliderDrawTickMarks->isChecked() != StyleConfigData::sliderDrawTickMarks() ) modified = true; else if( _mnemonicsMode->currentIndex() != StyleConfigData::mnemonicsMode() ) modified = true; else if( _scrollBarAddLineButtons->currentIndex() != StyleConfigData::scrollBarAddLineButtons() ) modified = true; @@ -132,7 +132,7 @@ namespace Breeze { _toolBarDrawItemSeparator->setChecked( StyleConfigData::toolBarDrawItemSeparator() ); - _dockWidgetDrawFrame->setChecked( StyleConfigData::dockWidgetDrawFrame() ); + _sidePanelDrawFrame->setChecked( StyleConfigData::sidePanelDrawFrame() ); _sliderDrawTickMarks->setChecked( StyleConfigData::sliderDrawTickMarks() ); _mnemonicsMode->setCurrentIndex( StyleConfigData::mnemonicsMode() ); _splitterProxyEnabled->setChecked( StyleConfigData::splitterProxyEnabled() ); diff --git a/kstyle/config/ui/breezestyleconfig.ui b/kstyle/config/ui/breezestyleconfig.ui index b48e4d0d..06748a93 100644 --- a/kstyle/config/ui/breezestyleconfig.ui +++ b/kstyle/config/ui/breezestyleconfig.ui @@ -165,7 +165,7 @@ - + Draw frames around side panels