author | zautrix <zautrix> | 2004-12-05 14:38:15 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-12-05 14:38:15 (UTC) |
commit | ea023772f18fa52d2b3d523a68d707576629326f (patch) (unidiff) | |
tree | 5c41a05954c543fefb49a27f256f2995a5a67b2a /kmicromail | |
parent | 06bebf5be01898145c4f721a8d002519141e7f3b (diff) | |
download | kdepimpi-ea023772f18fa52d2b3d523a68d707576629326f.zip kdepimpi-ea023772f18fa52d2b3d523a68d707576629326f.tar.gz kdepimpi-ea023772f18fa52d2b3d523a68d707576629326f.tar.bz2 |
ompi mail view fix
-rw-r--r-- | kmicromail/opiemail.cpp | 16 | ||||
-rw-r--r-- | kmicromail/opiemail.h | 2 | ||||
-rw-r--r-- | kmicromail/viewmail.cpp | 3 | ||||
-rw-r--r-- | kmicromail/viewmail.h | 4 | ||||
-rw-r--r-- | kmicromail/viewmailbase.cpp | 13 | ||||
-rw-r--r-- | kmicromail/viewmailbase.h | 4 |
6 files changed, 37 insertions, 5 deletions
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index c20c7ce..ec192ea 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp | |||
@@ -298,8 +298,23 @@ void OpieMail::replyMail() | |||
298 | } | 298 | } |
299 | delete settings; | 299 | delete settings; |
300 | 300 | ||
301 | } | 301 | } |
302 | void OpieMail::displayNextMail(ViewMail * vm) | ||
303 | { | ||
304 | QListViewItem*item = mailView->currentItem(); | ||
305 | if (!item) return; | ||
306 | item = item->itemBelow(); | ||
307 | if (!item) { | ||
308 | vm->setCaption(i18n("End of List" )); | ||
309 | return; | ||
310 | } | ||
311 | mailView->setCurrentItem(item); | ||
312 | RecMailP mail = ((MailListViewItem*)item)->data(); | ||
313 | RecBodyP body = folderView->fetchBody(mail); | ||
314 | vm->setBody( body ); | ||
315 | vm->setMail( mail ); | ||
316 | } | ||
302 | void OpieMail::displayMail() | 317 | void OpieMail::displayMail() |
303 | { | 318 | { |
304 | QListViewItem*item = mailView->currentItem(); | 319 | QListViewItem*item = mailView->currentItem(); |
305 | if (!item) return; | 320 | if (!item) return; |
@@ -312,8 +327,9 @@ void OpieMail::displayMail() | |||
312 | readMail.showMaximized(); | 327 | readMail.showMaximized(); |
313 | #else | 328 | #else |
314 | readMail.resize( 640, 480); | 329 | readMail.resize( 640, 480); |
315 | #endif | 330 | #endif |
331 | connect( &readMail,SIGNAL( showNextMail(ViewMail *) ), this, SLOT( displayNextMail(ViewMail *) ) ); | ||
316 | readMail.exec(); | 332 | readMail.exec(); |
317 | 333 | ||
318 | if ( readMail.deleted ) | 334 | if ( readMail.deleted ) |
319 | { | 335 | { |
diff --git a/kmicromail/opiemail.h b/kmicromail/opiemail.h index 44ab1ec..30968a7 100644 --- a/kmicromail/opiemail.h +++ b/kmicromail/opiemail.h | |||
@@ -6,8 +6,9 @@ | |||
6 | #include <libmailwrapper/settings.h> | 6 | #include <libmailwrapper/settings.h> |
7 | 7 | ||
8 | #include <opie2/osmartpointer.h> | 8 | #include <opie2/osmartpointer.h> |
9 | #include <libmailwrapper/mailtypes.h> | 9 | #include <libmailwrapper/mailtypes.h> |
10 | #include <viewmail.h> | ||
10 | 11 | ||
11 | class OpieMail : public MainWindow | 12 | class OpieMail : public MainWindow |
12 | { | 13 | { |
13 | Q_OBJECT | 14 | Q_OBJECT |
@@ -24,8 +25,9 @@ public slots: | |||
24 | virtual void slotExtAppHandler(); | 25 | virtual void slotExtAppHandler(); |
25 | virtual void appMessage(const QCString &msg, const QByteArray &data); | 26 | virtual void appMessage(const QCString &msg, const QByteArray &data); |
26 | virtual void message(const QCString &msg, const QByteArray &data); | 27 | virtual void message(const QCString &msg, const QByteArray &data); |
27 | protected slots: | 28 | protected slots: |
29 | virtual void displayNextMail(ViewMail * vm); | ||
28 | virtual void slotSendQueued(); | 30 | virtual void slotSendQueued(); |
29 | virtual void slotSearchMails(); | 31 | virtual void slotSearchMails(); |
30 | virtual void slotEditSettings(); | 32 | virtual void slotEditSettings(); |
31 | virtual void slotEditAccounts(); | 33 | virtual void slotEditAccounts(); |
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp index 3bd6f41..60c764c 100644 --- a/kmicromail/viewmail.cpp +++ b/kmicromail/viewmail.cpp | |||
@@ -324,9 +324,10 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl) | |||
324 | connect( reply, SIGNAL(activated()), SLOT(slotReply())); | 324 | connect( reply, SIGNAL(activated()), SLOT(slotReply())); |
325 | connect( forward, SIGNAL(activated()), SLOT(slotForward())); | 325 | connect( forward, SIGNAL(activated()), SLOT(slotForward())); |
326 | connect( deleteMail, SIGNAL( activated() ), SLOT( slotDeleteMail() ) ); | 326 | connect( deleteMail, SIGNAL( activated() ), SLOT( slotDeleteMail() ) ); |
327 | connect( showHtml, SIGNAL( toggled(bool) ), SLOT( slotShowHtml(bool) ) ); | 327 | connect( showHtml, SIGNAL( toggled(bool) ), SLOT( slotShowHtml(bool) ) ); |
328 | connect( closeMail, SIGNAL( activated() ), SLOT( close() ) ); | 328 | connect( closeMail, SIGNAL( activated() ), SLOT( close() ) ); |
329 | connect( nextMail, SIGNAL( activated() ), SLOT( slotNextMail() ) ); | ||
329 | 330 | ||
330 | attachments->setEnabled(m_gotBody); | 331 | attachments->setEnabled(m_gotBody); |
331 | connect( attachments, SIGNAL( clicked(QListViewItem*,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem*,const QPoint&, int) ) ); | 332 | connect( attachments, SIGNAL( clicked(QListViewItem*,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem*,const QPoint&, int) ) ); |
332 | 333 | ||
diff --git a/kmicromail/viewmail.h b/kmicromail/viewmail.h index 194ac8e..c2c2ce3 100644 --- a/kmicromail/viewmail.h +++ b/kmicromail/viewmail.h | |||
@@ -41,15 +41,17 @@ public: | |||
41 | void exec(); | 41 | void exec(); |
42 | void setMail(const RecMailP&mail ); | 42 | void setMail(const RecMailP&mail ); |
43 | void setBody(const RecBodyP&body); | 43 | void setBody(const RecBodyP&body); |
44 | bool deleted; | 44 | bool deleted; |
45 | 45 | signals: | |
46 | void showNextMail(ViewMail*); | ||
46 | protected: | 47 | protected: |
47 | QString deHtml(const QString &string); | 48 | QString deHtml(const QString &string); |
48 | AttachItem* searchParent(const QValueList<int>&path); | 49 | AttachItem* searchParent(const QValueList<int>&path); |
49 | AttachItem* lastChild(AttachItem*parent); | 50 | AttachItem* lastChild(AttachItem*parent); |
50 | 51 | ||
51 | protected slots: | 52 | protected slots: |
53 | void slotNextMail() { emit showNextMail(this); }; | ||
52 | void slotReply(); | 54 | void slotReply(); |
53 | void slotForward(); | 55 | void slotForward(); |
54 | void setText(); | 56 | void setText(); |
55 | void slotItemClicked( QListViewItem * item , const QPoint & point, int c ); | 57 | void slotItemClicked( QListViewItem * item , const QPoint & point, int c ); |
diff --git a/kmicromail/viewmailbase.cpp b/kmicromail/viewmailbase.cpp index 3d7ed42..c4731a7 100644 --- a/kmicromail/viewmailbase.cpp +++ b/kmicromail/viewmailbase.cpp | |||
@@ -48,10 +48,21 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) | |||
48 | 48 | ||
49 | deleteMail = new QAction(i18n("Delete Mail"),SmallIcon("trash"), 0, 0, this); | 49 | deleteMail = new QAction(i18n("Delete Mail"),SmallIcon("trash"), 0, 0, this); |
50 | deleteMail->addTo(toolbar); | 50 | deleteMail->addTo(toolbar); |
51 | deleteMail->addTo(mailmenu); | 51 | deleteMail->addTo(mailmenu); |
52 | closeMail = new QAction(i18n("Close"),SmallIcon("exit"), 0, 0, this); | 52 | |
53 | |||
54 | |||
55 | nextMail = new QAction(i18n("Show next mail"),SmallIcon("add"), 0, 0, this); | ||
53 | QLabel *spacer = new QLabel(toolbar); | 56 | QLabel *spacer = new QLabel(toolbar); |
57 | nextMail->addTo(toolbar); | ||
58 | nextMail->addTo(mailmenu); | ||
59 | |||
60 | |||
61 | |||
62 | |||
63 | closeMail = new QAction(i18n("Close"),SmallIcon("exit"), 0, 0, this); | ||
64 | //QLabel *spacer = new QLabel(toolbar); | ||
54 | spacer->setBackgroundMode(QWidget::PaletteButton); | 65 | spacer->setBackgroundMode(QWidget::PaletteButton); |
55 | toolbar->setStretchableWidget(spacer); | 66 | toolbar->setStretchableWidget(spacer); |
56 | closeMail->addTo(toolbar); | 67 | closeMail->addTo(toolbar); |
57 | closeMail->addTo(mailmenu); | 68 | closeMail->addTo(mailmenu); |
diff --git a/kmicromail/viewmailbase.h b/kmicromail/viewmailbase.h index 1c8948a..c97e9e3 100644 --- a/kmicromail/viewmailbase.h +++ b/kmicromail/viewmailbase.h | |||
@@ -19,15 +19,15 @@ class ViewMailBase : public QMainWindow | |||
19 | public: | 19 | public: |
20 | ViewMailBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0); | 20 | ViewMailBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0); |
21 | 21 | ||
22 | protected: | 22 | protected: |
23 | QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml, *closeMail; | 23 | QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml, *closeMail, *nextMail; |
24 | QListView *attachments; | 24 | QListView *attachments; |
25 | QToolBar *toolbar; | 25 | QToolBar *toolbar; |
26 | QTextBrowser *browser; | 26 | QTextBrowser *browser; |
27 | OpenDiag *openDiag; | 27 | OpenDiag *openDiag; |
28 | QMenuBar *menubar; | 28 | QMenuBar *menubar; |
29 | QPopupMenu *mailmenu; | 29 | QPopupMenu *mailmenu; |
30 | 30 | ||
31 | protected slots: | 31 | protected slots: |
32 | void slotChangeAttachview(bool state); | 32 | void slotChangeAttachview(bool state); |
33 | virtual void keyPressEvent ( QKeyEvent * e ); | 33 | virtual void keyPressEvent ( QKeyEvent * e ); |