ompi mail view fix

8 files changed, 43 insertions, 6 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 6be5222..5021212 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -5,7 +5,7 @@ Info about the changes in new versions of KDE-Pim/Pi
 Fixed some problems with the dialog sizes when switching 
 portrait/landscape mode on 640x480 PDA display.
 
-Fixed some other small bugs.
+Fixed some other small bugs in KA/Pi KO/Pi and OM/Pi and PwM/Pi.
 
 Fixed an ugly bug in KOpieMail: 
 KOpieMail was not able to write files (mails) to MSDOS file system, 
@@ -31,6 +31,11 @@ Added missing German translation.
 
 Fixed icons of executeable on Wintendo.
 
+Added a "Show next Mail" button to the OM/Pi 
+mail viewer such that the mail below the current mail
+in the mail list view of the current folder
+can be read with a single click.
+
 
 ********** VERSION 1.9.13 ************
 
diff --git a/bin/kdepim/kopiemail/germantranslation.txt b/bin/kdepim/kopiemail/germantranslation.txt
index 1abe14a..5039848 100644
--- a/bin/kdepim/kopiemail/germantranslation.txt
+++ b/bin/kdepim/kopiemail/germantranslation.txt
@@ -238,8 +238,8 @@
 { "Define a smtp\n account first!\n","Bitte zuerst einen\nSMTP Account anlegen!\n" },
 { "Mail queue flushed","Gespeicherte Mails gesendet!" },
 { "Please create an\nSMTP account first.\nThe SMTP is needed\nfor sending mail.\n","Bitte legen Sie einen\nSMTP Account an.\nDer SMTP Account wird\nfür das Versenden von\nMails benötigt!" },
-{ "","" },
-{ "","" },
+{ "Show next mail","Zeige nächste Mail" },
+{ "End of List","Ende der Liste" },
 { "","" },
 { "","" },
 { "","" },
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index c20c7ce..ec192ea 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -299,6 +299,21 @@ void OpieMail::replyMail()
     delete settings;
 
 }
+void OpieMail::displayNextMail(ViewMail * vm)
+{
+    QListViewItem*item = mailView->currentItem();
+    if (!item) return;
+    item = item->itemBelow();
+    if (!item) {
+        vm->setCaption(i18n("End of List" ));
+        return;
+    }
+    mailView->setCurrentItem(item);
+    RecMailP mail = ((MailListViewItem*)item)->data();
+    RecBodyP body = folderView->fetchBody(mail);
+    vm->setBody( body );
+    vm->setMail( mail );
+}
 void OpieMail::displayMail()
 {
     QListViewItem*item = mailView->currentItem();
@@ -313,6 +328,7 @@ void OpieMail::displayMail()
 #else
     readMail.resize( 640, 480);
 #endif
+    connect(  &readMail,SIGNAL( showNextMail(ViewMail *)  ), this, SLOT( displayNextMail(ViewMail *) ) );
     readMail.exec();
 
     if (  readMail.deleted )
diff --git a/kmicromail/opiemail.h b/kmicromail/opiemail.h
index 44ab1ec..30968a7 100644
--- a/kmicromail/opiemail.h
+++ b/kmicromail/opiemail.h
@@ -7,6 +7,7 @@
 
 #include <opie2/osmartpointer.h>
 #include <libmailwrapper/mailtypes.h>
+#include <viewmail.h>
 
 class OpieMail : public MainWindow
 {
@@ -25,6 +26,7 @@ public slots:
     virtual void appMessage(const QCString &msg, const QByteArray &data);
     virtual void message(const QCString &msg, const QByteArray &data);
 protected slots:
+    virtual void displayNextMail(ViewMail * vm);
     virtual void slotSendQueued();
     virtual void slotSearchMails();
     virtual void slotEditSettings();
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp
index 3bd6f41..60c764c 100644
--- a/kmicromail/viewmail.cpp
+++ b/kmicromail/viewmail.cpp
@@ -326,6 +326,7 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
     connect( deleteMail, SIGNAL( activated() ),  SLOT( slotDeleteMail() ) );
     connect( showHtml, SIGNAL( toggled(bool) ), SLOT( slotShowHtml(bool) ) ); 
     connect( closeMail, SIGNAL( activated() ), SLOT( close() ) );
+    connect( nextMail, SIGNAL( activated() ), SLOT( slotNextMail() ) );
 
     attachments->setEnabled(m_gotBody);
     connect( attachments,  SIGNAL( clicked(QListViewItem*,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem*,const QPoint&, int) ) );
diff --git a/kmicromail/viewmail.h b/kmicromail/viewmail.h
index 194ac8e..c2c2ce3 100644
--- a/kmicromail/viewmail.h
+++ b/kmicromail/viewmail.h
@@ -42,13 +42,15 @@ public:
     void setMail(const RecMailP&mail );
     void setBody(const RecBodyP&body);
     bool deleted;
-
+ signals:
+    void showNextMail(ViewMail*);
 protected:
     QString deHtml(const QString &string);
     AttachItem* searchParent(const QValueList<int>&path);
     AttachItem* lastChild(AttachItem*parent);
 
 protected slots:
+    void slotNextMail() { emit  showNextMail(this); };
     void slotReply();
     void slotForward();
     void setText();
diff --git a/kmicromail/viewmailbase.cpp b/kmicromail/viewmailbase.cpp
index 3d7ed42..c4731a7 100644
--- a/kmicromail/viewmailbase.cpp
+++ b/kmicromail/viewmailbase.cpp
@@ -49,8 +49,19 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
     deleteMail = new QAction(i18n("Delete Mail"),SmallIcon("trash"), 0, 0, this);
 	deleteMail->addTo(toolbar);
 	deleteMail->addTo(mailmenu);
-  	closeMail = new QAction(i18n("Close"),SmallIcon("exit"), 0, 0, this);
+
+
+
+    nextMail = new QAction(i18n("Show next mail"),SmallIcon("add"), 0, 0, this);
 	QLabel *spacer = new QLabel(toolbar);
+	nextMail->addTo(toolbar);
+	nextMail->addTo(mailmenu);
+
+
+
+
+  	closeMail = new QAction(i18n("Close"),SmallIcon("exit"), 0, 0, this);
+	//QLabel *spacer = new QLabel(toolbar);
 	spacer->setBackgroundMode(QWidget::PaletteButton);
 	toolbar->setStretchableWidget(spacer);
 	closeMail->addTo(toolbar);
diff --git a/kmicromail/viewmailbase.h b/kmicromail/viewmailbase.h
index 1c8948a..c97e9e3 100644
--- a/kmicromail/viewmailbase.h
+++ b/kmicromail/viewmailbase.h
@@ -20,7 +20,7 @@ public:
 	ViewMailBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
 
 protected:
-	QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml, *closeMail;
+	QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml, *closeMail, *nextMail;
 	QListView *attachments;
 	QToolBar *toolbar;
 	QTextBrowser *browser;