Revert to the last displayed status message after moving away from a link in

the mail.

svn path=/trunk/kdenetwork/kmail/; revision=128436

kmmainwin.cpp

@@ -351,7 +351,7 @@ void KMMainWin::createWidgets(void)
   // create HTML reader widget
   mMsgView = new KMReaderWin(pnrMsgView);
   connect(mMsgView, SIGNAL(statusMsg(const QString&)),
-	  this, SLOT(statusMsg(const QString&)));
+	  this, SLOT(htmlStatusMsg(const QString&)));
   connect(mMsgView, SIGNAL(popupMenu(KMMessage&,const KURL&,const QPoint&)),
 	  this, SLOT(slotMsgPopup(KMMessage&,const KURL&,const QPoint&)));
   connect(mMsgView, SIGNAL(urlClicked(const KURL&,int)),
@@ -487,8 +487,22 @@ void KMMainWin::slotSetEncoding()
     return;
 }
 
+//-----------------------------------------------------------------------------
+void KMMainWin::htmlStatusMsg(const QString &aText)
+{
+  if (aText.isEmpty()) displayStatusMsg(mLastStatusMsg);
+  else displayStatusMsg(aText);
+}
+
 //-----------------------------------------------------------------------------
 void KMMainWin::statusMsg(const QString& aText)
+{
+  mLastStatusMsg = aText;
+  displayStatusMsg(aText);
+}
+
+//-----------------------------------------------------------------------------
+void KMMainWin::displayStatusMsg(const QString& aText)
 {
   QString text = " " + aText + " ";
   int statusWidth = mStatusBar->width() - littleProgress->width()

kmmainwin.h

@@ -99,7 +99,8 @@ public slots:
   void slotAtmMsg(KMMessage *msg);
 
   /** Output given message in the statusbar message field. */
-  void statusMsg(const QString& text);
+  void statusMsg(const QString&);
+  void htmlStatusMsg(const QString&);
   void folderSelected(KMFolder*);
   void folderSelectedUnread( KMFolder* );
 
@@ -125,6 +126,7 @@ protected:
   virtual bool queryClose();
 
 protected slots:
+  void displayStatusMsg(const QString&);
   void slotCheckOneAccount(int);
   void slotMailChecked(bool newMail, bool sendOnCheck);
   void getAccountMenu();
@@ -235,6 +237,7 @@ protected slots:
 
 protected:
   KStatusBar   *mStatusBar;
+  QString      mLastStatusMsg;
   KMFolderTree *mFolderTree;
   KMReaderWin  *mMsgView;
   QSplitter    *mHorizPanner, *mVertPanner;