diff --git a/kmcomposewin.cpp b/kmcomposewin.cpp index 647dcd09d..3559aa951 100644 --- a/kmcomposewin.cpp +++ b/kmcomposewin.cpp @@ -563,7 +563,7 @@ void KMComposeWin::readColorConfig( void ) } //----------------------------------------------------------------------------- -void KMComposeWin::readConfig( void ) +void KMComposeWin::readConfig( bool reload /* = false */ ) { mDefCharset = KMMessage::defaultCharset(); mBtnIdentity->setChecked( GlobalSettings::self()->stickyIdentity() ); @@ -594,24 +594,25 @@ void KMComposeWin::readConfig( void ) mEdtReplyTo->setFont( mBodyFont ); mEdtSubject->setFont( mBodyFont ); - QSize siz = GlobalSettings::self()->composerSize(); - if ( siz.width() < 200 ) { - siz.setWidth( 200 ); - } - if ( siz.height() < 200 ) { - siz.setHeight( 200 ); - } - resize( siz ); + if ( !reload ) { + QSize siz = GlobalSettings::self()->composerSize(); + if ( siz.width() < 200 ) { + siz.setWidth( 200 ); + } + if ( siz.height() < 200 ) { + siz.setHeight( 200 ); + } + resize( siz ); - if ( !GlobalSettings::self()->snippetSplitterPosition().isEmpty() ) { - mSnippetSplitter->setSizes( GlobalSettings::self()->snippetSplitterPosition() ); - } else { - QList defaults; - defaults << (int)(width() * 0.8) << (int)(width() * 0.2); - mSnippetSplitter->setSizes( defaults ); + if ( !GlobalSettings::self()->snippetSplitterPosition().isEmpty() ) { + mSnippetSplitter->setSizes( GlobalSettings::self()->snippetSplitterPosition() ); + } else { + QList defaults; + defaults << (int)(width() * 0.8) << (int)(width() * 0.2); + mSnippetSplitter->setSizes( defaults ); + } } - mIdentity->setCurrentIdentity( mId ); kDebug(5006) << mIdentity->currentIdentityName(); @@ -4105,7 +4106,7 @@ void KMComposeWin::slotCompletionModeChanged( KGlobalSettings::Completion mode ) void KMComposeWin::slotConfigChanged() { - readConfig(); + readConfig( true /*reload*/); updateAutoSave(); rethinkFields(); slotWordWrapToggled( mWordWrapAction->isChecked() ); diff --git a/kmcomposewin.h b/kmcomposewin.h index 9c0d7e1f5..33b622d5b 100644 --- a/kmcomposewin.h +++ b/kmcomposewin.h @@ -370,7 +370,7 @@ class KMComposeWin : public KMail::Composer /** * Read settings from app's config file. */ - void readConfig( void ); + void readConfig( bool reload = false ); /** * Change window title to given string.