[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    aegypten_branch: kdepim/kmail
From:       Marc Mutz <Marc.Mutz () uni-bielefeld ! de>
Date:       2004-05-29 16:06:31
Message-ID: 20040529160631.AA3C3126E0 () office ! kde ! org
[Download RAW message or body]

CVS commit by mutz: 

Merge from HEAD: CVS commit by perreaul: 

Make the composer remember its Use


  M +7 -2      kmcomposewin.cpp   1.765.2.39
  M +1 -0      kmcomposewin.h   1.224.2.17


--- kdepim/kmail/kmcomposewin.cpp  #1.765.2.38:1.765.2.39
@@ -458,4 +458,5 @@ void KMComposeWin::readConfig(void)
   mShowHeaders = config->readNumEntry("headers", HDR_STANDARD);
   mWordWrap = config->readBoolEntry("word-wrap", true);
+  mUseFixedFont = config->readBoolEntry("use-fixed-font", false);
   mLineBreak = config->readNumEntry("break-at", 78);
   mBtnIdentity->setChecked(config->readBoolEntry("sticky-identity", false));
@@ -600,4 +601,5 @@ void KMComposeWin::writeConfig(void)
         mTransportHistory.prepend(mTransport->currentText());
     config->writeEntry("transport-history", mTransportHistory );
+    config->writeEntry("use-fixed-font", mUseFixedFont );
   }
 
@@ -951,4 +953,5 @@ void KMComposeWin::setupActions(void)
   mFixedFontAction = new KToggleAction( i18n("Use Fi&xed Font"), 0, this,
                       SLOT(slotUpdateFont()), actionCollection(), "toggle_fixedfont" );
+  mFixedFontAction->setChecked(mUseFixedFont);
 
   //these are checkable!!!
@@ -2464,6 +2467,8 @@ void KMComposeWin::slotReplace()
 void KMComposeWin::slotUpdateFont()
 {
-  mEditor->setFont( mFixedFontAction && (mFixedFontAction->isChecked())
-    ? mFixedFont : mBodyFont );
+  if ( mFixedFontAction ) {
+    mUseFixedFont = mFixedFontAction->isChecked();
+  }
+  mEditor->setFont( mUseFixedFont ? mFixedFont : mBodyFont );
 }
 

--- kdepim/kmail/kmcomposewin.h  #1.224.2.16:1.224.2.17
@@ -745,4 +745,5 @@ protected:
   int mLineBreak;
   int mWordWrap;
+  bool mUseFixedFont;
   QFont mBodyFont, mFixedFont;
   //  QList<QLineEdit> mEdtList;


[prev in list] [next in list] [prev in thread] [next in thread]