removed shadowCacheMode option.
Default mode (variable) is what's kept.icc-effect-5.14.5
parent
335dd073cd
commit
5c95478e56
|
@ -114,7 +114,6 @@ namespace Oxygen
|
||||||
else if( ui->ui.blendColor->currentIndex() != ui->ui.blendColor->findText( configuration.blendColorName( true ) ) ) modified = true;
|
else if( ui->ui.blendColor->currentIndex() != ui->ui.blendColor->findText( configuration.blendColorName( true ) ) ) modified = true;
|
||||||
else if( ui->ui.frameBorder->currentIndex() != ui->ui.frameBorder->findText( configuration.frameBorderName( true ) ) ) modified = true;
|
else if( ui->ui.frameBorder->currentIndex() != ui->ui.frameBorder->findText( configuration.frameBorderName( true ) ) ) modified = true;
|
||||||
else if( ui->ui.sizeGripMode->currentIndex() != ui->ui.sizeGripMode->findText( configuration.sizeGripModeName( true ) ) ) modified = true;
|
else if( ui->ui.sizeGripMode->currentIndex() != ui->ui.sizeGripMode->findText( configuration.sizeGripModeName( true ) ) ) modified = true;
|
||||||
else if( ui->ui.shadowCacheMode->currentIndex() != ui->ui.shadowCacheMode->findText( configuration.shadowCacheModeName( true ) ) ) modified = true;
|
|
||||||
|
|
||||||
else if( ui->ui.separatorMode->currentIndex() != configuration.separatorMode() ) modified = true;
|
else if( ui->ui.separatorMode->currentIndex() != configuration.separatorMode() ) modified = true;
|
||||||
else if( ui->ui.titleOutline->isChecked() != configuration.drawTitleOutline() ) modified = true;
|
else if( ui->ui.titleOutline->isChecked() != configuration.drawTitleOutline() ) modified = true;
|
||||||
|
@ -150,7 +149,6 @@ namespace Oxygen
|
||||||
configuration.setBlendColor( Configuration::blendColor( ui->ui.blendColor->currentText(), true ) );
|
configuration.setBlendColor( Configuration::blendColor( ui->ui.blendColor->currentText(), true ) );
|
||||||
configuration.setFrameBorder( Configuration::frameBorder( ui->ui.frameBorder->currentText(), true ) );
|
configuration.setFrameBorder( Configuration::frameBorder( ui->ui.frameBorder->currentText(), true ) );
|
||||||
configuration.setSizeGripMode( Configuration::sizeGripMode( ui->ui.sizeGripMode->currentText(), true ) );
|
configuration.setSizeGripMode( Configuration::sizeGripMode( ui->ui.sizeGripMode->currentText(), true ) );
|
||||||
configuration.setShadowCacheMode( Configuration::shadowCacheMode( ui->ui.shadowCacheMode->currentText(), true ) );
|
|
||||||
configuration.setSeparatorMode( (Oxygen::Configuration::SeparatorMode) ui->ui.separatorMode->currentIndex() );
|
configuration.setSeparatorMode( (Oxygen::Configuration::SeparatorMode) ui->ui.separatorMode->currentIndex() );
|
||||||
configuration.setDrawTitleOutline( ui->ui.titleOutline->isChecked() );
|
configuration.setDrawTitleOutline( ui->ui.titleOutline->isChecked() );
|
||||||
configuration.setUseDropShadows( ui->shadowConfigurations[1]->isChecked() );
|
configuration.setUseDropShadows( ui->shadowConfigurations[1]->isChecked() );
|
||||||
|
@ -237,7 +235,6 @@ namespace Oxygen
|
||||||
ui->ui.useAnimations->setChecked( configuration.useAnimations() );
|
ui->ui.useAnimations->setChecked( configuration.useAnimations() );
|
||||||
ui->ui.animateTitleChange->setChecked( configuration.animateTitleChange() );
|
ui->ui.animateTitleChange->setChecked( configuration.animateTitleChange() );
|
||||||
ui->ui.narrowButtonSpacing->setChecked( configuration.useNarrowButtonSpacing() );
|
ui->ui.narrowButtonSpacing->setChecked( configuration.useNarrowButtonSpacing() );
|
||||||
ui->ui.shadowCacheMode->setCurrentIndex( ui->ui.shadowCacheMode->findText( configuration.shadowCacheModeName( true ) ) );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//_______________________________________________________________________
|
//_______________________________________________________________________
|
||||||
|
|
|
@ -86,16 +86,10 @@ namespace Oxygen
|
||||||
<< Configuration::sizeGripModeName( Configuration::SizeGripWhenNeeded, true )
|
<< Configuration::sizeGripModeName( Configuration::SizeGripWhenNeeded, true )
|
||||||
);
|
);
|
||||||
|
|
||||||
ui.shadowCacheMode->insertItems(0, QStringList()
|
|
||||||
<< Configuration::shadowCacheModeName( Configuration::CacheDisabled, true )
|
|
||||||
<< Configuration::shadowCacheModeName( Configuration::CacheVariable, true )
|
|
||||||
<< Configuration::shadowCacheModeName( Configuration::CacheMaximum, true ) );
|
|
||||||
|
|
||||||
shadowConfigurations.push_back( ui.activeShadowConfiguration );
|
shadowConfigurations.push_back( ui.activeShadowConfiguration );
|
||||||
shadowConfigurations.push_back( ui.inactiveShadowConfiguration );
|
shadowConfigurations.push_back( ui.inactiveShadowConfiguration );
|
||||||
|
|
||||||
// connections
|
// connections
|
||||||
connect( ui.shadowCacheMode, SIGNAL( currentIndexChanged(int)), SIGNAL(changed()) );
|
|
||||||
connect( ui.titleOutline, SIGNAL(toggled( bool )), ui.separatorMode, SLOT( setDisabled( bool ) ) );
|
connect( ui.titleOutline, SIGNAL(toggled( bool )), ui.separatorMode, SLOT( setDisabled( bool ) ) );
|
||||||
|
|
||||||
connect( shadowConfigurations[0], SIGNAL( changed() ), SIGNAL( changed() ) );
|
connect( shadowConfigurations[0], SIGNAL( changed() ), SIGNAL( changed() ) );
|
||||||
|
@ -152,9 +146,6 @@ namespace Oxygen
|
||||||
ui.sizeGripModeLabel->setVisible( _expertMode );
|
ui.sizeGripModeLabel->setVisible( _expertMode );
|
||||||
ui.sizeGripMode->setVisible( _expertMode );
|
ui.sizeGripMode->setVisible( _expertMode );
|
||||||
|
|
||||||
// shadow mode
|
|
||||||
ui.shadowsExpertWidget->setVisible( _expertMode );
|
|
||||||
|
|
||||||
if( _expertMode ) ui.shadowSpacer->changeSize(0,0, QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
|
if( _expertMode ) ui.shadowSpacer->changeSize(0,0, QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
|
||||||
else ui.shadowSpacer->changeSize(0,0, QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
|
else ui.shadowSpacer->changeSize(0,0, QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
|
||||||
|
|
||||||
|
|
|
@ -250,44 +250,6 @@
|
||||||
</attribute>
|
</attribute>
|
||||||
<layout class="QGridLayout" name="gridLayout_4">
|
<layout class="QGridLayout" name="gridLayout_4">
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QWidget" name="shadowsExpertWidget" native="true">
|
|
||||||
<layout class="QGridLayout" name="gridLayout_3">
|
|
||||||
<property name="margin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<item row="1" column="0">
|
|
||||||
<widget class="QLabel" name="shadowCacheModeLabel">
|
|
||||||
<property name="text">
|
|
||||||
<string>Shadow caching:</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
|
||||||
</property>
|
|
||||||
<property name="buddy">
|
|
||||||
<cstring>shadowCacheMode</cstring>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="1">
|
|
||||||
<widget class="KComboBox" name="shadowCacheMode"/>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="2">
|
|
||||||
<spacer name="horizontalSpacer_7">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>308</width>
|
|
||||||
<height>20</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="0">
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_7">
|
<layout class="QHBoxLayout" name="horizontalLayout_7">
|
||||||
<item>
|
<item>
|
||||||
<widget class="Oxygen::ShadowConfigurationUi" name="inactiveShadowConfiguration">
|
<widget class="Oxygen::ShadowConfigurationUi" name="inactiveShadowConfiguration">
|
||||||
|
@ -311,7 +273,7 @@
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="0">
|
<item row="1" column="0">
|
||||||
<spacer name="shadowSpacer">
|
<spacer name="shadowSpacer">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Vertical</enum>
|
<enum>Qt::Vertical</enum>
|
||||||
|
|
|
@ -51,8 +51,7 @@ namespace Oxygen
|
||||||
_animateTitleChange( true ),
|
_animateTitleChange( true ),
|
||||||
_animationsDuration( 150 ),
|
_animationsDuration( 150 ),
|
||||||
_tabsEnabled( true ),
|
_tabsEnabled( true ),
|
||||||
_useNarrowButtonSpacing( false ),
|
_useNarrowButtonSpacing( false )
|
||||||
_shadowCacheMode( CacheVariable )
|
|
||||||
{}
|
{}
|
||||||
|
|
||||||
//__________________________________________________
|
//__________________________________________________
|
||||||
|
@ -148,10 +147,6 @@ namespace Oxygen
|
||||||
OxygenConfig::NARROW_BUTTON_SPACING,
|
OxygenConfig::NARROW_BUTTON_SPACING,
|
||||||
defaultConfiguration.useNarrowButtonSpacing() ) );
|
defaultConfiguration.useNarrowButtonSpacing() ) );
|
||||||
|
|
||||||
// shadow cache mode
|
|
||||||
setShadowCacheMode( shadowCacheMode( group.readEntry(
|
|
||||||
OxygenConfig::SHADOW_CACHE_MODE, defaultConfiguration.shadowCacheModeName( false ) ), false ) );
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//__________________________________________________
|
//__________________________________________________
|
||||||
|
@ -195,7 +190,6 @@ namespace Oxygen
|
||||||
if( animationsDuration() != defaultConfiguration.animationsDuration() ) group.writeEntry( OxygenConfig::ANIMATIONS_DURATION, animationsDuration() );
|
if( animationsDuration() != defaultConfiguration.animationsDuration() ) group.writeEntry( OxygenConfig::ANIMATIONS_DURATION, animationsDuration() );
|
||||||
if( tabsEnabled() != defaultConfiguration.tabsEnabled() ) group.writeEntry( OxygenConfig::TABS_ENABLED, tabsEnabled() );
|
if( tabsEnabled() != defaultConfiguration.tabsEnabled() ) group.writeEntry( OxygenConfig::TABS_ENABLED, tabsEnabled() );
|
||||||
if( useNarrowButtonSpacing() != defaultConfiguration.useNarrowButtonSpacing() ) group.writeEntry( OxygenConfig::NARROW_BUTTON_SPACING, useNarrowButtonSpacing() );
|
if( useNarrowButtonSpacing() != defaultConfiguration.useNarrowButtonSpacing() ) group.writeEntry( OxygenConfig::NARROW_BUTTON_SPACING, useNarrowButtonSpacing() );
|
||||||
if( shadowCacheMode() != defaultConfiguration.shadowCacheMode() ) group.writeEntry( OxygenConfig::SHADOW_CACHE_MODE, shadowCacheModeName( false ) );
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -379,34 +373,8 @@ namespace Oxygen
|
||||||
animateTitleChange() == other.animateTitleChange() &&
|
animateTitleChange() == other.animateTitleChange() &&
|
||||||
animationsDuration() == other.animationsDuration() &&
|
animationsDuration() == other.animationsDuration() &&
|
||||||
tabsEnabled() == other.tabsEnabled() &&
|
tabsEnabled() == other.tabsEnabled() &&
|
||||||
useNarrowButtonSpacing() == other.useNarrowButtonSpacing() &&
|
useNarrowButtonSpacing() == other.useNarrowButtonSpacing();
|
||||||
shadowCacheMode() == other.shadowCacheMode();
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//__________________________________________________
|
|
||||||
QString Configuration::shadowCacheModeName( ShadowCacheMode value, bool translated )
|
|
||||||
{
|
|
||||||
QString out;
|
|
||||||
switch( value )
|
|
||||||
{
|
|
||||||
case CacheDisabled: out = translated ? i18n( "Disabled" ):"Disabled"; break;
|
|
||||||
case CacheVariable: out = translated ? i18n( "Variable" ):"Variable"; break;
|
|
||||||
case CacheMaximum: out = translated ? i18n( "Maximum" ):"Maximum"; break;
|
|
||||||
default: return Configuration().shadowCacheModeName( translated );
|
|
||||||
}
|
|
||||||
|
|
||||||
return out;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
//__________________________________________________
|
|
||||||
Configuration::ShadowCacheMode Configuration::shadowCacheMode( QString value, bool translated )
|
|
||||||
{
|
|
||||||
if( value == shadowCacheModeName( CacheDisabled, translated ) ) return CacheDisabled;
|
|
||||||
else if( value == shadowCacheModeName( CacheVariable, translated ) ) return CacheVariable;
|
|
||||||
else if( value == shadowCacheModeName( CacheMaximum, translated ) ) return CacheMaximum;
|
|
||||||
else return Configuration().shadowCacheMode();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -95,18 +95,6 @@ namespace Oxygen
|
||||||
SizeGripWhenNeeded
|
SizeGripWhenNeeded
|
||||||
};
|
};
|
||||||
|
|
||||||
//! shadow cache mode
|
|
||||||
enum ShadowCacheMode {
|
|
||||||
//! no shadow cache
|
|
||||||
CacheDisabled,
|
|
||||||
|
|
||||||
//! shadow cache depends on animation duration
|
|
||||||
CacheVariable,
|
|
||||||
|
|
||||||
//! shadow cache has maximum size
|
|
||||||
CacheMaximum
|
|
||||||
};
|
|
||||||
|
|
||||||
//! decide when separator is to be drawn
|
//! decide when separator is to be drawn
|
||||||
enum SeparatorMode {
|
enum SeparatorMode {
|
||||||
|
|
||||||
|
@ -193,23 +181,6 @@ namespace Oxygen
|
||||||
|
|
||||||
//@}
|
//@}
|
||||||
|
|
||||||
//!@name shadow mode cache mode
|
|
||||||
//@{
|
|
||||||
|
|
||||||
static QString shadowCacheModeName( ShadowCacheMode, bool translated );
|
|
||||||
static ShadowCacheMode shadowCacheMode( QString, bool translated );
|
|
||||||
|
|
||||||
QString shadowCacheModeName( bool translated ) const
|
|
||||||
{ return shadowCacheModeName( shadowCacheMode(), translated ); }
|
|
||||||
|
|
||||||
void setShadowCacheMode( ShadowCacheMode mode )
|
|
||||||
{ _shadowCacheMode = mode; }
|
|
||||||
|
|
||||||
ShadowCacheMode shadowCacheMode( void ) const
|
|
||||||
{ return _shadowCacheMode; }
|
|
||||||
|
|
||||||
//@]
|
|
||||||
|
|
||||||
//!@name frame border
|
//!@name frame border
|
||||||
//@{
|
//@{
|
||||||
|
|
||||||
|
@ -396,9 +367,6 @@ namespace Oxygen
|
||||||
//! narrow button spacing
|
//! narrow button spacing
|
||||||
bool _useNarrowButtonSpacing;
|
bool _useNarrowButtonSpacing;
|
||||||
|
|
||||||
//! shadow cache mode
|
|
||||||
ShadowCacheMode _shadowCacheMode;
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue