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

Fix Apply button getting disabled when changing tabs

Browse source 
BUG: 163817

svn path=/trunk/KDE/kdebase/workspace/; revision=1062180
This commit is contained in:
Christoph Feck 2009-12-14 03:18:43 +00:00
parent c5c464226d
commit 12bba19ee1
4 changed files with 61 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
kcmkwin/kwinoptions/mouse.cpp
View file

@ -567,6 +567,16 @@ const char* KTitleBarActionsConfig::functionMax( int i )
return tbl_num_lookup( tbl_Max, i ); return tbl_num_lookup( tbl_Max, i );
} }
void KTitleBarActionsConfig::showEvent( QShowEvent *ev )
{
if ( !standAlone ) {
// Workaround KCModule::showEvent() calling load(), see bug 163817
QWidget::showEvent( ev );
return;
}
KCModule::showEvent( ev );
}
void KTitleBarActionsConfig::load() void KTitleBarActionsConfig::load()
{ {
KConfigGroup windowsConfig(config, "Windows"); KConfigGroup windowsConfig(config, "Windows");
@ -915,6 +925,15 @@ const char* KWindowActionsConfig::functionAllW(int i)
return tbl_num_lookup( tbl_AllW, i ); return tbl_num_lookup( tbl_AllW, i );
} }
void KWindowActionsConfig::showEvent( QShowEvent *ev )
{
if ( !standAlone ) {
QWidget::showEvent( ev );
return;
}
KCModule::showEvent( ev );
}
void KWindowActionsConfig::load() void KWindowActionsConfig::load()
{ {
KConfigGroup cg(config, "MouseBindings"); KConfigGroup cg(config, "MouseBindings");

6
kcmkwin/kwinoptions/mouse.h
View file

@ -60,6 +60,9 @@ public:
void save(); void save();
void defaults(); void defaults();
protected:
void showEvent( QShowEvent *ev );
public slots: public slots:
void changed() { emit KCModule::changed(true); } void changed() { emit KCModule::changed(true); }
@ -106,6 +109,9 @@ public:
void save(); void save();
void defaults(); void defaults();
protected:
void showEvent( QShowEvent *ev );
public slots: public slots:
void changed() { emit KCModule::changed(true); } void changed() { emit KCModule::changed(true); }

27
kcmkwin/kwinoptions/windows.cpp
View file

@ -381,6 +381,15 @@ void KFocusConfig::updateActiveMouseScreen()
setActiveMouseScreen( focusCombo->currentIndex() != 0 ); setActiveMouseScreen( focusCombo->currentIndex() != 0 );
} }
void KFocusConfig::showEvent( QShowEvent *ev )
{
if ( !standAlone ) {
QWidget::showEvent( ev );
return;
}
KCModule::showEvent( ev );
}
void KFocusConfig::load( void ) void KFocusConfig::load( void )
{ {
QString key; QString key;
@ -653,6 +662,15 @@ void KAdvancedConfig::shadeHoverChanged(bool a) {
} }
void KAdvancedConfig::showEvent( QShowEvent *ev )
{
if ( !standAlone ) {
QWidget::showEvent( ev );
return;
}
KCModule::showEvent( ev );
}
void KAdvancedConfig::load( void ) void KAdvancedConfig::load( void )
{ {
KConfigGroup cg(config, "Windows"); KConfigGroup cg(config, "Windows");
@ -982,6 +1000,15 @@ void KMovingConfig::slotCntrSnapChanged(int value) {
CntrSnap->setSuffix(i18np(" pixel", " pixels", value)); CntrSnap->setSuffix(i18np(" pixel", " pixels", value));
} }
void KMovingConfig::showEvent( QShowEvent *ev )
{
if ( !standAlone ) {
QWidget::showEvent( ev );
return;
}
KCModule::showEvent( ev );
}
void KMovingConfig::load( void ) void KMovingConfig::load( void )
{ {
QString key; QString key;

9
kcmkwin/kwinoptions/windows.h
View file

@ -76,6 +76,9 @@ public:
void save(); void save();
void defaults(); void defaults();
protected:
void showEvent( QShowEvent *ev );
private slots: private slots:
void setDelayFocusEnabled(); void setDelayFocusEnabled();
void focusPolicyChanged(); void focusPolicyChanged();
@ -132,6 +135,9 @@ public:
void save(); void save();
void defaults(); void defaults();
protected:
void showEvent( QShowEvent *ev );
private slots: private slots:
void changed() { emit KCModule::changed(true); } void changed() { emit KCModule::changed(true); }
void slotBrdrSnapChanged( int ); void slotBrdrSnapChanged( int );
@ -182,6 +188,9 @@ public:
void save(); void save();
void defaults(); void defaults();
protected:
void showEvent( QShowEvent *ev );
private slots: private slots:
void shadeHoverChanged(bool); void shadeHoverChanged(bool);