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

renamed shadowconfigurationui into shadowconfigwidget, for consistency with rest of the code

Browse source 
fixed updateChanged for closeWindowfromMenuButton
temporarily disabled updateChanged from exceptionLists.
This commit is contained in:
Hugo Pereira Da Costa 2012-11-26 22:51:17 +01:00
parent ea639a0ec2
commit 30df048632
4 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -94,7 +94,7 @@ namespace Oxygen
loadConfiguration( configuration );
// load shadows
foreach( ShadowConfigurationUi* ui, _configWidget->shadowConfigurations )
foreach( ShadowConfigWidget* ui, _configWidget->shadowConfigurations )
{ ui->readConfig( _configuration ); }
// load exceptions
@ -115,7 +115,7 @@ namespace Oxygen
// exceptions
if( _configWidget->isChanged() ) modified = true;
else if( exceptionListChanged() ) modified = true;
// else if( exceptionListChanged() ) modified = true;
// emit relevant signals
if( modified ) emit changed();
@ -143,7 +143,7 @@ namespace Oxygen
ExceptionList( exceptions ).writeConfig( *_configuration );
// write shadow configuration
foreach( ShadowConfigurationUi* ui, _configWidget->shadowConfigurations )
foreach( ShadowConfigWidget* ui, _configWidget->shadowConfigurations )
{ ui->writeConfig( _configuration ); }
// sync configuration
@ -164,7 +164,7 @@ namespace Oxygen
loadConfiguration( configuration );
// load shadows
foreach( ShadowConfigurationUi* ui, _configWidget->shadowConfigurations )
foreach( ShadowConfigWidget* ui, _configWidget->shadowConfigurations )
{ ui->readDefaults( _configuration ); }
updateChanged();

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

@ -133,6 +133,8 @@ namespace Oxygen
_configuration->setUseNarrowButtonSpacing( ui.narrowButtonSpacing->isChecked() );
_configuration->setCloseWindowFromMenuButton( ui.closeFromMenuButton->isChecked() );
setChanged( false );
if( _expertMode )
{ _animationConfigWidget->save(); }
@ -229,6 +231,7 @@ namespace Oxygen
else if( ui.drawSizeGrip->isChecked() != _configuration->drawSizeGrip() ) modified = true;
else if( ui.titleOutline->isChecked() != _configuration->drawTitleOutline() ) modified = true;
else if( ui.narrowButtonSpacing->isChecked() != _configuration->useNarrowButtonSpacing() ) modified = true;
else if( ui.closeFromMenuButton->isChecked() != _configuration->closeWindowFromMenuButton() ) modified = true;
// shadow configurations
else if( shadowConfigurations[0]->isModified() ) modified = true;

4
clients/oxygen/config/oxygenconfigwidget.h
View file

@ -26,7 +26,7 @@
//////////////////////////////////////////////////////////////////////////////
#include "ui_oxygenconfigurationui.h"
#include "oxygenshadowconfigurationui.h"
#include "oxygenshadowconfigwidget.h"
#include "oxygenexceptionlistwidget.h"
#include "../oxygendecorationdefines.h"
@ -73,7 +73,7 @@ namespace Oxygen
{ return ui.exceptions; }
//! shadow configuration
QVector<ShadowConfigurationUi*> shadowConfigurations;
QVector<ShadowConfigWidget*> shadowConfigurations;
//! toggle expert mode
void toggleExpertMode( bool );

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

@ -345,7 +345,7 @@
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<widget class="Oxygen::ShadowConfigurationUi" name="inactiveShadowConfiguration">
<widget class="Oxygen::ShadowConfigWidget" name="inactiveShadowConfiguration">
<property name="title">
<string>Window Drop-Down Shadow</string>
</property>
@ -355,7 +355,7 @@
</widget>
</item>
<item>
<widget class="Oxygen::ShadowConfigurationUi" name="activeShadowConfiguration">
<widget class="Oxygen::ShadowConfigWidget" name="activeShadowConfiguration">
<property name="title">
<string>Active Window Glow</string>
</property>
@ -431,9 +431,9 @@
<container>1</container>
</customwidget>
<customwidget>
<class>Oxygen::ShadowConfigurationUi</class>
<class>Oxygen::ShadowConfigWidget</class>
<extends>QGroupBox</extends>
<header>oxygenshadowconfigurationui.h</header>
<header>oxygenshadowconfigwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>