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

List:       kde-commits
Subject:    kdepim/kmail
From:       Till Adam <till () adam-lilienthal ! de>
Date:       2003-07-02 18:56:27
[Download RAW message or body]

CVS commit by tilladam: 

Fix duplicate actions correctly this time. Hopefully.


  M +1 -1      kmheaders.cpp   1.514
  M +9 -2      kmmainwidget.cpp   1.60
  M +13 -4     kmreaderwin.cpp   1.671


--- kdepim/kmail/kmmainwidget.cpp  #1.59:1.60
@@ -1994,12 +1994,19 @@ void KMMainWidget::setupActions()
   connect( mForwardActionMenu, SIGNAL(activated()), this,
            SLOT(slotForwardMsg()) );
+  
+  mForwardAttachedAction = actionCollection()->action ( "message_forward_as_attachment" );
+  if (!mForwardAttachedAction) {
   mForwardAttachedAction = new KAction( i18n("Message->Forward->","As &Attachment..."),
                                        "mail_forward", Key_F, this,
                                         SLOT(slotForwardAttachedMsg()), actionCollection(),
                                         "message_forward_as_attachment" );
+  }
   mForwardActionMenu->insert( forwardAttachedAction() );
+  mForwardAction = actionCollection()->action ( "message_forward_inline" );
+  if (!mForwardAction) {
   mForwardAction = new KAction( i18n("&Inline..."), "mail_forward",
                                 SHIFT+Key_F, this, SLOT(slotForwardMsg()),
                                 actionCollection(), "message_forward_inline" );
+  }
   mForwardActionMenu->insert( forwardAction() );
   mForwardActionMenu->insert( redirectAction() );

--- kdepim/kmail/kmreaderwin.cpp  #1.670:1.671
@@ -551,13 +551,22 @@ KMReaderWin::KMReaderWin(QWidget *aParen
   connect( mForwardActionMenu, SIGNAL(activated()), this,
            SLOT(slotForwardMsg()) );
+
+  mForwardAction = ac->action( "message_forward_inline" );
+  if (!mForwardAction) {
   mForwardAction = new KAction( i18n("&Inline..."), "mail_forward",
                                 SHIFT+Key_F, this, SLOT(slotForwardMsg()),
                                 ac, "message_forward_inline" );
+  }
   mForwardActionMenu->insert( mForwardAction );
+  
+  mForwardAttachedAction = ac->action( "message_forward_as_attachment" );
+  if (!mForwardAttachedAction) {
   mForwardAttachedAction = new KAction( i18n("Message->Forward->","As &Attachment..."),
                                        "mail_forward", Key_F, this,
                                         SLOT(slotForwardAttachedMsg()), ac,
                                         "message_forward_as_attachment" );
+  }
   mForwardActionMenu->insert( mForwardAttachedAction );
+
   mRedirectAction = new KAction( i18n("Message->Forward->","&Redirect..."),
                                  Key_E, this, SLOT(slotRedirectMsg()),


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