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

List:       kde-bugs-dist
Subject:    [Bug 74993] Send again action strips attachments with load on
From:       Carsten Burghardt <cb () magic-shop ! de>
Date:       2004-03-07 16:14:20
Message-ID: 20040307161420.29771.qmail () ktown ! kde ! org
[Download RAW message or body]

------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
      
http://bugs.kde.org/show_bug.cgi?id=74993      
cb magic-shop de changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From cb magic-shop de  2004-03-07 17:14 -------
CVS commit by burghard: 

Refactor resend message as command.
CCMAIL: 74993-done bugs kde org


  M +21 -0     kmcommands.cpp   1.111
  M +11 -0     kmcommands.h   1.27
  M +0 -20     kmheaders.cpp   1.621
  M +0 -1      kmheaders.h   1.146
  M +2 -1      kmmainwidget.cpp   1.152


--- kdepim/kmail/kmmainwidget.cpp  #1.151:1.152
 @ -1183,5 +1183,6  @ void KMMainWidget::slotEditMsg()
 void KMMainWidget::slotResendMsg()
 {
-  mHeaders->resendMsg();
+  KMCommand *command = new KMResendMessageCommand( this, mHeaders->currentMsg() );
+  command->start();
 }
 

--- kdepim/kmail/kmcommands.h  #1.26:1.27
 @ -635,3 +635,14  @ private:
 };
 
+class KMResendMessageCommand : public KMCommand
+{
+  Q_OBJECT
+
+public:
+  KMResendMessageCommand( QWidget *parent, KMMessage *msg=0 );
+
+private:
+  virtual void execute();
+};
+
 #endif /*KMCommands_h*/

--- kdepim/kmail/kmcommands.cpp  #1.110:1.111
 @ -1950,2 +1950,23  @ void KMLoadPartsCommand::execute()
 }
 
+KMResendMessageCommand::KMResendMessageCommand( QWidget *parent,
+   KMMessage *msg )
+  :KMCommand( parent, msg )
+{
+}
+
+void KMResendMessageCommand::execute()
+{
+  KMComposeWin *win;
+  KMMessage *msg = retrievedMessage();
+
+  KMMessage *newMsg = new KMMessage(*msg);
+  newMsg->setCharset(msg->codec()->mimeName());
+  // the message needs a new Message-Id
+  newMsg->removeHeaderField( "Message-Id" );
+
+  win = new KMComposeWin();
+  win->setMsg(newMsg, false, true);
+  win->show();
+}
+

--- kdepim/kmail/kmheaders.h  #1.145:1.146
 @ -69,5 +69,4  @ public:
   virtual void undo();
   virtual bool canUndo() const;
-  virtual void resendMsg();
   virtual KMHeaderItem * prepareMove( int *contentX, int *contentY );
   virtual void finalizeMove( KMHeaderItem *item, int contentX, int contentY );

--- kdepim/kmail/kmheaders.cpp  #1.620:1.621
 @ -1647,24 +1647,4  @ void KMHeaders::deleteMsg ()
 
 //-----------------------------------------------------------------------------
-void KMHeaders::resendMsg ()
-{
-  KMComposeWin *win;
-  KMMessage *newMsg, *msg = currentMsg();
-  if (!msg || !msg->codec()) return;
-
-  KCursorSaver busy(KBusyPtr::busy());
-  newMsg = new KMMessage;
-  newMsg->fromString(msg->asString());
-  newMsg->setCharset(msg->codec()->mimeName());
-  // the message needs a new Message-Id
-  newMsg->removeHeaderField( "Message-Id" );
-
-  win = new KMComposeWin();
-  win->setMsg(newMsg, false, true);
-  win->show();
-}
-
-
-//-----------------------------------------------------------------------------
 void KMHeaders::moveSelectedToFolder( int menuId )
 {
[prev in list] [next in list] [prev in thread] [next in thread]