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
@@ -16,10 +16,13 @@ void MailListViewItem::showEntry()
     if ( mail_data->getFlags().testBit( FLAG_ANSWERED ) == true) {
         setPixmap( 0, SmallIcon ( "kmmsgreplied") );
+        mKeyMap.insert(0, "r" );
     } else if ( mail_data->getFlags().testBit( FLAG_SEEN ) == true )  {
         /* I think it looks nicer if there are not such a log of icons but only on mails
            replied or new - Alwin*/ 
         //setPixmap( 0,SmallIcon ("kmmsgunseen") );
+        mKeyMap.insert(0, "s" );
     } else  {
         setPixmap( 0,SmallIcon ( "kmmsgnew") );
+        mKeyMap.insert(0, "u" );
     }
     QString fsize = mail_data->MsgsizeString();
@@ -68,5 +71,5 @@ 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
@@ -416,5 +416,7 @@ void OpieMail::displayMail()
     else
     {
-        ( (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
@@ -6,7 +6,9 @@
 
 #include <qdialog.h>
+#include <qapplication.h>
 
 #include <qlistview.h>
 #include <qmap.h>
+#include <klocale.h>
 #include <qstringlist.h>
 #include <qvaluelist.h>
@@ -53,5 +55,5 @@ protected:
 
 protected slots:
-    void slotNextMail() { emit  showNextMail(this); };
+    void slotNextMail() { setCaption(i18n("Displaying next mail...please wait!")); qApp->processEvents();emit  showNextMail(this); };
     void slotReply();
     void slotForward();
diff --git a/kmicromail/viewmailbase.cpp b/kmicromail/viewmailbase.cpp
index 9365c23..3a41ba0 100644
--- a/kmicromail/viewmailbase.cpp
+++ b/kmicromail/viewmailbase.cpp
@@ -50,8 +50,7 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
         connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool)));
 
-
-        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 );
 
     deleteMail = new QAction(i18n("Delete Mail"),SmallIcon("trash"), 0, 0, this);
@@ -59,6 +58,4 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
         deleteMail->addTo(mailmenu);
 
-
-
     nextMail = new QAction(i18n("Show next mail"),SmallIcon("enter"), 0, 0, this);
         QLabel *spacer = new QLabel(toolbar);
@@ -66,7 +63,4 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
         nextMail->addTo(mailmenu);
 
-
-
-
           closeMail = new QAction(i18n("Close"),SmallIcon("exit"), 0, 0, this);
         //QLabel *spacer = new QLabel(toolbar);