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

List:       kde-commits
Subject:    branches/kdepim/proko2/kdepim/kmail
From:       Pradeepto Bhattacharya <pradeepto () kde ! org>
Date:       2007-04-11 6:46:24
Message-ID: 1176273984.536925.4205.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 652490 by pradeepto:

Backport of 

SVN commit 652140 by pradeepto:

Issue/1530 - make preferred form of forwarding configurable. Right now, works only \
with the context menu from the  header view. Needs more work if the same is need for \
readerwin and mainwidget.

(+ changed the name of the actions to keep them in sync with enterprise)


 M  +4 -0      kmail.kcfg  
 M  +18 -9     kmmainwidget.cpp  
 M  +2 -2      kmmainwidget.h  
 M  +18 -8     kmreadermainwin.cpp  
 M  +1 -1      kmreadermainwin.h  


--- branches/kdepim/proko2/kdepim/kmail/kmail.kcfg #652489:652490
@@ -266,6 +266,10 @@
     </group>
 
     <group name="Composer">
+       <entry name="ForwardingInlineByDefault" type="Bool">
+         <default>true</default>
+         <label>Forward Inline As Default.</label>
+       </entry>
         <entry name="AllowSemicolonAsAddressSeparator" type="Bool">
             <default>true</default>
             <label>Allow the semicolon charactor (';') to be used as separator in \
                the message composer.</label>
--- branches/kdepim/proko2/kdepim/kmail/kmmainwidget.cpp #652489:652490
@@ -2302,16 +2302,25 @@
   connect( mForwardActionMenu, SIGNAL(activated()), this,
 	   SLOT(slotForwardAttachedMsg()) );
 
+  mForwardInlineAction = new KAction( i18n("&Inline..."),
+                                      "mail_forward", SHIFT+Key_F, this,
+                                      SLOT(slotForwardInlineMsg()),
+                                      actionCollection(),
+                                      "message_forward_inline" );
+
   mForwardAttachedAction = new KAction( i18n("Message->Forward->","As \
                &Attachment..."),
-				       "mail_forward", Key_F, this,
-					SLOT(slotForwardAttachedMsg()), actionCollection(),
-					"message_forward_as_attachment" );
-  mForwardActionMenu->insert( forwardAttachedAction() );
-  mForwardAction = new KAction( i18n("&Inline..."), "mail_forward",
-				SHIFT+Key_F, this, SLOT(slotForwardMsg()),
-				actionCollection(), "message_forward_inline" );
+                                        "mail_forward", Key_F, this,
+                                        SLOT(slotForwardAttachedMsg()),
+                                        actionCollection(),
+                                        "message_forward_as_attachment" );
 
-  mForwardActionMenu->insert( forwardAction() );
+  if ( GlobalSettings::self()->forwardingInlineByDefault() ) {
+      mForwardActionMenu->insert( mForwardInlineAction );
+      mForwardActionMenu->insert( mForwardAttachedAction );
+  } else {
+        mForwardActionMenu->insert( mForwardAttachedAction );
+        mForwardActionMenu->insert( mForwardInlineAction );
+  }
 
   mSendAgainAction = new KAction( i18n("Send A&gain..."), 0, this,
 		      SLOT(slotResendMsg()), actionCollection(), "send_again" );
@@ -2926,7 +2935,7 @@
     mTrashAction->setEnabled( mass_actions && !mFolder->isReadOnly() );
     mDeleteAction->setEnabled( mass_actions && !mFolder->isReadOnly() );
     mFindInMessageAction->setEnabled( mass_actions );
-    mForwardAction->setEnabled( mass_actions );
+    mForwardInlineAction->setEnabled( mass_actions );
     mForwardAttachedAction->setEnabled( mass_actions );
 
     forwardMenu()->setEnabled( mass_actions );
--- branches/kdepim/proko2/kdepim/kmail/kmmainwidget.h #652489:652490
@@ -102,7 +102,7 @@
   KAction *replyListAction() const { return mReplyListAction; }
   KActionMenu * replyMenu() const { return mReplyActionMenu; }
   KActionMenu *forwardMenu() const { return mForwardActionMenu; }
-  KAction *forwardAction() const { return mForwardAction; }
+  KAction *forwardInlineAction() const { return mForwardInlineAction; }
   KAction *forwardAttachedAction() const { return mForwardAttachedAction; }
   KAction *redirectAction() const { return mRedirectAction; }
   KAction *bounceAction() const { return mBounceAction; }
@@ -402,7 +402,7 @@
   // Composition actions
   KAction *mPrintAction, *mReplyAction, *mReplyAllAction, *mReplyAuthorAction,
       *mReplyListAction,
-      *mForwardAction, *mForwardAttachedAction, *mRedirectAction,
+      *mForwardInlineAction, *mForwardAttachedAction, *mRedirectAction,
       *mBounceAction, *mNoQuoteReplyAction;
   KActionMenu *mReplyActionMenu;
   KActionMenu *mForwardActionMenu;
--- branches/kdepim/proko2/kdepim/kmail/kmreadermainwin.cpp #652489:652490
@@ -30,6 +30,7 @@
 #include <kedittoolbar.h> //for saveMainWindowSettings() applyMainWindowSettings()
 #include <kmainwindow.h>
 #include <kcharsets.h>
+#include "globalsettings.h"
 
 #include "kmreadermainwin.h"
 #include "kmreadermainwin.moc"
@@ -212,17 +213,26 @@
   connect( mForwardActionMenu, SIGNAL( activated() ), this,
            SLOT( slotForwardAttachedMsg() ) );
 
-  mForwardAction = new KAction( i18n("&Inline..."), "mail_forward",
-				SHIFT+Key_F, this, SLOT(slotForwardMsg()),
-				actionCollection(), "message_forward_inline" );
-  mForwardActionMenu->insert( mForwardAction );
+  mForwardInlineAction = new KAction( i18n("&Inline..."),
+                                      "mail_forward", SHIFT+Key_F, this,
+                                      SLOT(slotForwardInlineMsg()),
+                                      actionCollection(),
+                                      "message_forward_inline" );
 
   mForwardAttachedAction = new KAction( i18n("Message->Forward->","As \
                &Attachment..."),
-				       "mail_forward", Key_F, this,
-					SLOT(slotForwardAttachedMsg()), actionCollection(),
-					"message_forward_as_attachment" );
-  mForwardActionMenu->insert( mForwardAttachedAction );
+                                        "mail_forward", Key_F, this,
+                                        SLOT(slotForwardAttachedMsg()),
+                                        actionCollection(),
+                                        "message_forward_as_attachment" );
 
+  if ( GlobalSettings::self()->forwardingInlineByDefault() ) {
+      mForwardActionMenu->insert( mForwardInlineAction );
+      mForwardActionMenu->insert( mForwardAttachedAction );
+  } else {
+        mForwardActionMenu->insert( mForwardAttachedAction );
+        mForwardActionMenu->insert( mForwardInlineAction );
+  }
+
   mRedirectAction = new KAction( i18n("Message->Forward->","&Redirect..."),
 				 Key_E, this, SLOT(slotRedirectMsg()),
 				 actionCollection(), "message_forward_redirect" );
--- branches/kdepim/proko2/kdepim/kmail/kmreadermainwin.h #652489:652490
@@ -61,7 +61,7 @@
   QMap<int,KMFolder*> mMenuToFolder;
   // a few actions duplicated from kmmainwidget
   KAction *mPrintAction, *mReplyAction, *mReplyAllAction, *mReplyAuthorAction,
-          *mReplyListAction, *mForwardAction,
+          *mReplyListAction, *mForwardInlineAction,
           *mForwardAttachedAction, *mRedirectAction, *mBounceAction;
   KAction *mCopyMsgTextAction, *mSelectAllTextAction;
   KActionMenu *mReplyActionMenu;


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