Eliminated flicker when changing folders.

Ignore .directory files. Respect colors when deleting last message in folder. svn path=/trunk/kdenetwork/kmail/; revision=35576
27 years ago · 4bc762264f
parent fc2f1fa3af
commit 4bc762264f
5 changed files with 21 additions and 7 deletions
--- a/kmaccount.cpp
+++ b/kmaccount.cpp
@ -158,7 +158,7 @@ bool KMAccount::processNewMsg(KMMessage* aMsg)
    warning(i18n("Critical error: Unable to collect mail (out of space?)"));
    return false;
  }
-  else
+  else if (processResult == 1)
  {
    rc = mFolder->addMsg(aMsg);
    if (rc) {
--- a/kmfiltermgr.cpp
+++ b/kmfiltermgr.cpp
@ -76,14 +76,16 @@ int KMFilterMgr::process(KMMessage* msg)
 {
  KMFilter* filter;
  bool stopIt = FALSE;
-  int status = 0;
+  int status = -1;
  int result;

  for (filter=first(); !stopIt && filter; filter=next())
  {
    if (!filter->matches(msg)) continue;
    //    debug("KMFilterMgr: filter %s matches message %s", filter->name().data(),
-    //	  msg->subject().data());
+    //    msg->subject().data());
+    if (status < 0)
+      status = 0;
    result = filter->execActions(msg, stopIt);
    if (result == 2) { // Critical error
      status = 2;
@ -93,6 +95,9 @@ int KMFilterMgr::process(KMMessage* msg)
      status = 1;
  }

+  if (status < 0) // No filters matched, keep copy of message
+    status = 1;
+
  return status;
 }

--- a/kmfolderdir.cpp
+++ b/kmfolderdir.cpp
@ -159,9 +159,10 @@ bool KMFolderDir::reload(void)
    fname = fileInfo->fileName();

    if ((fname[0]=='.') && 
-	!(fname.right(10)==".directory")) // skip table of contents files
+	!(fname.right(10)==".directory"))
      continue;
-    
+    else if (fname == ".directory")
+      continue;    
    else if (fileInfo->isDir()) // a directory
      diList.append(fname);
    
--- a/kmmainwin.cpp
+++ b/kmmainwin.cpp
@ -768,7 +768,7 @@ void KMMainWin::folderSelected(KMFolder* aFolder)

  kbp->busy();
  mFolder = (KMFolder*)aFolder;
-  mMsgView->clear();
+  //  mMsgView->clear();
  mHeaders->setFolder(mFolder);
  kbp->idle();
 }
--- a/kmreaderwin.cpp
+++ b/kmreaderwin.cpp
@ -285,7 +285,15 @@ void KMReaderWin::updateReaderWin()
  else
  {
    mViewer->begin();
-    mViewer->write("<HTML><BODY></BODY></HTML>");
+    mViewer->write("<HTML><BODY" +
+		   QString(" TEXT=#%1").arg(colorToString(c1)) +
+		   QString(" LINK=#%1").arg(colorToString(c2)) +
+		   QString(" VLINK=#%1").arg(colorToString(c3)) +
+		   QString(" BGCOLOR=#%1").arg(colorToString(c4)));
+
+    if (mBackingPixmapOn)
+      mViewer->write(" background=\"file://" + mBackingPixmapStr + "\"");
+    mViewer->write("></BODY></HTML>");
    mViewer->end();
  }