pixmap update fix

4 files changed, 13 insertions, 12 deletions

diff --git a/kmicromail/mailistviewitem.cpp b/kmicromail/mailistviewitem.cpp
index 137c482..5119744 100644
--- a/kmicromail/mailistviewitem.cpp
+++ b/kmicromail/mailistviewitem.cpp
@@ -17,2 +17,3 @@ void MailListViewItem::showEntry()
         setPixmap( 0, SmallIcon ( "kmmsgreplied") );
+        mKeyMap.insert(0, "r" );
     } else if ( mail_data->getFlags().testBit( FLAG_SEEN ) == true )  {
@@ -21,4 +22,6 @@ void MailListViewItem::showEntry()
         //setPixmap( 0,SmallIcon ("kmmsgunseen") );
+        mKeyMap.insert(0, "s" );
     } else  {
         setPixmap( 0,SmallIcon ( "kmmsgnew") );
+        mKeyMap.insert(0, "u" );
     }
@@ -69,3 +72,3 @@ QString MailListViewItem::key(int column, bool) const
     // to make is fast, we use here special cases
-    if ( column == 3  ||  column == 4 ) {
+    if ( column == 3  ||  column == 4 || column == 0) {
         return *mKeyMap.find(column);
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 760e3b0..68f0eb3 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -417,3 +417,5 @@ void OpieMail::displayMail()
     {
-        ( (MailListViewItem*)item )->setPixmap( 0, QPixmap() );
+        QListViewItem*item = mailView->currentItem();
+        if (item)
+            ( (MailListViewItem*)item )->setPixmap( 0, QPixmap() );
     }
diff --git a/kmicromail/viewmail.h b/kmicromail/viewmail.h
index 561989e..fc5edcf 100644
--- a/kmicromail/viewmail.h
+++ b/kmicromail/viewmail.h
@@ -7,2 +7,3 @@
 #include <qdialog.h>
+#include <qapplication.h>
 
@@ -10,2 +11,3 @@
 #include <qmap.h>
+#include <klocale.h>
 #include <qstringlist.h>
@@ -54,3 +56,3 @@ protected:
 protected slots:
-    void slotNextMail() { emit  showNextMail(this); };
+    void slotNextMail() { setCaption(i18n("Displaying next mail...please wait!")); qApp->processEvents();emit  showNextMail(this); };
     void slotReply();
diff --git a/kmicromail/viewmailbase.cpp b/kmicromail/viewmailbase.cpp
index 9365c23..3a41ba0 100644
--- a/kmicromail/viewmailbase.cpp
+++ b/kmicromail/viewmailbase.cpp
@@ -51,6 +51,5 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
 
-
-        showHtml = new QAction( i18n( "Show Html" ), SmallIcon(  "html" ), 0, 0, this, 0, true );
-        showHtml->addTo( toolbar );
-        showHtml->addTo( mailmenu );
+    showHtml = new QAction( i18n( "Show Html" ), SmallIcon(  "html" ), 0, 0, this, 0, true );
+    showHtml->addTo( toolbar );
+    showHtml->addTo( mailmenu );
 
@@ -60,4 +59,2 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
 
-
-
     nextMail = new QAction(i18n("Show next mail"),SmallIcon("enter"), 0, 0, this);
@@ -67,5 +64,2 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
 
-
-
-
   	closeMail = new QAction(i18n("Close"),SmallIcon("exit"), 0, 0, this);