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

List:       kde-commits
Subject:    KDE/kdepim (merge)
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2010-01-26 12:44:33
Message-ID: 1264509873.000700.22365.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1080558 by tmcguire:

SVN_MERGE:
Merged revisions 1080529 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r1080529 | tmcguire | 2010-01-26 12:21:11 +0100 (Tue, 26 Jan 2010) | 4 lines
  
  Add config option to close the seperate reader window after replying/forwarding.
  
  No UI to change the config option yet, that will come next.
........


 _M            . (directory)  
 MM +14 -10    kmail/kmail.kcfg.cmake  
 M  +3 -1      kmail/kmreadermainwin.cpp  


** trunk/KDE/kdepim/kmail/kmail.kcfg.cmake #property svn:mergeinfo
   - 
--- trunk/KDE/kdepim/kmail/kmail.kcfg.cmake #1080557:1080558
@@ -486,20 +486,24 @@
     </group>
 
     <group name="Reader">
+     <entry name="CloseAfterReplyOrForward" type="Bool">
+       <label>Close message window after replying or forwarding the message.</label>
+       <default>false</default>
+     </entry>
      <entry name="MimePaneHeight" type="Int">
-      <default>100</default>
+       <default>100</default>
      </entry>
      <entry name="MessagePaneHeight" type="Int">
-      <default>180</default>
+       <default>180</default>
      </entry>
-      <entry name="headerStyle" type="String" key="header-style">
-        <label>What style of headers should be displayed</label>
-        <default>fancy</default>
-      </entry>
-      <entry name="headerSetDisplayed" type="String" key="header-set-displayed">
-        <label>How much of headers should be displayed</label>
-        <default>rich</default>
-      </entry>
+     <entry name="headerStyle" type="String" key="header-style">
+       <label>What style of headers should be displayed</label>
+       <default>fancy</default>
+     </entry>
+     <entry name="headerSetDisplayed" type="String" key="header-set-displayed">
+       <label>How much of headers should be displayed</label>
+       <default>rich</default>
+     </entry>
      <entry name="UseDefaultColors" type="Bool" key="defaultColors">
        <default>true</default>
      </entry>
--- trunk/KDE/kdepim/kmail/kmreadermainwin.cpp #1080557:1080558
@@ -141,7 +141,9 @@
 
 void KMReaderMainWin::slotReplyOrForwardFinished()
 {
-  kDebug() << "Reply or forward done!";
+  if ( GlobalSettings::self()->closeAfterReplyOrForward() ) {
+    close();
+  }
 }
 
 //-----------------------------------------------------------------------------
[prev in list] [next in list] [prev in thread] [next in thread]