Merged revisions 953962 via svnmerge from

svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r953962 | winterz | 2009-04-14 22:46:18 +0200 (Tue, 14 Apr 2009) | 13 lines
  
  Merged revisions 953868 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r953868 | mlaurent | 2009-04-14 12:28:42 -0400 (Tue, 14 Apr 2009) | 6 lines
    
    Fix kolab issue 2130
    Displayed header type in the mail display is wrong
    when we changed header type and double click on mail
    header type was not good because we didn't save config.
    But we mustn't save config when it's an external dialog
  ........
................

svn path=/trunk/KDE/kdepim/; revision=957686

kmreaderwin.cpp

@@ -498,6 +498,8 @@ KMReaderWin::KMReaderWin(QWidget *aParent,
   mUpdateReaderWinTimer.setObjectName( "mUpdateReaderWinTimer" );
   mDelayedMarkTimer.setObjectName( "mDelayedMarkTimer" );
   mResizeTimer.setObjectName( "mResizeTimer" );
+
+  mExternalWindow  = ( aParent == mainWindow );
   mSplitterSizes << 180 << 100;
   mMimeTreeMode = 1;
   mMimeTreeAtBottom = true;
@@ -795,31 +797,42 @@ KToggleAction *KMReaderWin::actionForAttachmentStrategy( const AttachmentStrateg
 void KMReaderWin::slotEnterpriseHeaders() {
   setHeaderStyleAndStrategy( HeaderStyle::enterprise(),
                              HeaderStrategy::rich() );
+  if( !mExternalWindow )
+    writeConfig();
 }
 
 void KMReaderWin::slotFancyHeaders() {
   setHeaderStyleAndStrategy( HeaderStyle::fancy(),
                              HeaderStrategy::rich() );
+  if( !mExternalWindow )
+    writeConfig();
 }
 
 void KMReaderWin::slotBriefHeaders() {
   setHeaderStyleAndStrategy( HeaderStyle::brief(),
                              HeaderStrategy::brief() );
+  if( !mExternalWindow )
+    writeConfig();
 }
 
 void KMReaderWin::slotStandardHeaders() {
   setHeaderStyleAndStrategy( HeaderStyle::plain(),
                              HeaderStrategy::standard());
+  writeConfig();
 }
 
 void KMReaderWin::slotLongHeaders() {
   setHeaderStyleAndStrategy( HeaderStyle::plain(),
                              HeaderStrategy::rich() );
+  if( !mExternalWindow )
+    writeConfig();
 }
 
 void KMReaderWin::slotAllHeaders() {
   setHeaderStyleAndStrategy( HeaderStyle::plain(),
                              HeaderStrategy::all() );
+  if( !mExternalWindow )
+    writeConfig();
 }
 
 void KMReaderWin::slotLevelQuote( int l )

kmreaderwin.h

@@ -566,6 +566,7 @@ private:
   bool mDecrytMessageOverwrite;
   bool mShowSignatureDetails;
   bool mShowAttachmentQuicklist;
+  bool mExternalWindow;
 };