summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/unsupported/mail2/mainwindow.cpp44
-rw-r--r--noncore/unsupported/mail2/mainwindow.h6
2 files changed, 47 insertions, 3 deletions
diff --git a/noncore/unsupported/mail2/mainwindow.cpp b/noncore/unsupported/mail2/mainwindow.cpp
index 047c54b..a596653 100644
--- a/noncore/unsupported/mail2/mainwindow.cpp
+++ b/noncore/unsupported/mail2/mainwindow.cpp
@@ -1,5 +1,6 @@
1#include <qmessagebox.h> 1#include <qmessagebox.h>
2#include <qaction.h> 2#include <qaction.h>
3#include <qpe/qcopenvelope_qws.h>
3 4
4#include "mailstatusbar.h" 5#include "mailstatusbar.h"
5#include "folderwidget.h" 6#include "folderwidget.h"
@@ -10,6 +11,7 @@
10#include "mailtable.h" 11#include "mailtable.h"
11#include "composer.h" 12#include "composer.h"
12#include "viewmail.h" 13#include "viewmail.h"
14#include "mailfactory.h"
13 15
14MainWindow::MainWindow(QWidget *parent, const char *name, WFlags fl) 16MainWindow::MainWindow(QWidget *parent, const char *name, WFlags fl)
15 : MainWindowBase(parent, name, fl) 17 : MainWindowBase(parent, name, fl)
@@ -28,19 +30,57 @@ MainWindow::MainWindow(QWidget *parent, const char *name, WFlags fl)
28 30
29 connect(status, SIGNAL(stop()), mailView, SLOT(stop())); 31 connect(status, SIGNAL(stop()), mailView, SLOT(stop()));
30 32
31 connect(compose, SIGNAL(activated()), SLOT(slotCompose())); 33 connect(compose, SIGNAL(activated()), SLOT(slotComposeNoParams()));
32 connect(sendQueue, SIGNAL(activated()), SLOT(slotSendQueued())); 34 connect(sendQueue, SIGNAL(activated()), SLOT(slotSendQueued()));
33 connect(findmails, SIGNAL(activated()), SLOT(slotSearch())); 35 connect(findmails, SIGNAL(activated()), SLOT(slotSearch()));
34 connect(configure, SIGNAL(activated()), SLOT(slotConfigure())); 36 connect(configure, SIGNAL(activated()), SLOT(slotConfigure()));
37
38 // Added by Stefan Eilers to allow starting by addressbook..
39#if !defined(QT_NO_COP)
40 QCopChannel *addressChannel = new QCopChannel("QPE/Application/mail" , this );
41 connect (addressChannel, SIGNAL( received(const QCString &, const QByteArray &)),
42 this, SLOT ( appMessage(const QCString &, const QByteArray &) ) );
43#endif
35} 44}
36 45
37void MainWindow::slotCompose() 46// Added by Stefan Eilers to allow starting by addressbook..
47void MainWindow::appMessage(const QCString &msg, const QByteArray &data)
48{
49 if (msg == "writeMail(QString,QString)") {
50 QDataStream stream(data,IO_ReadOnly);
51 QString name, email;
52 stream >> name >> email;
53
54 qWarning("opie-mail:: Should send mail to %s with address %s", name.latin1(), email.latin1() );
55
56 slotCompose( name, email );
57
58 }else{
59 QString str_message = msg;
60 qWarning("opie-mail:: Received unknown QCop-Message: %s", str_message.latin1() );
61 }
62}
63
64void MainWindow::slotCompose( const QString& name, const QString& email )
38{ 65{
39 Composer composer(this, 0, true); 66 Composer composer(this, 0, true);
67
68 // If there is a mailaddress given, create message..
69 if ( ! name.isEmpty() ){
70 qWarning("opie-mail:: Compose mail for %s with address %s", name.latin1(), email.latin1() );
71 SendMail compMail;
72 compMail.setTo( "\"" + name + "\"" + " " + "<"+ email + ">");
73 composer.setSendMail( compMail );
74 }
40 composer.showMaximized(); 75 composer.showMaximized();
41 composer.exec(); 76 composer.exec();
42} 77}
43 78
79void MainWindow::slotComposeNoParams()
80{
81 slotCompose( 0l, 0l);
82}
83
44void MainWindow::slotSendQueued() 84void MainWindow::slotSendQueued()
45{ 85{
46 Composer composer(this, 0, true, true); 86 Composer composer(this, 0, true, true);
diff --git a/noncore/unsupported/mail2/mainwindow.h b/noncore/unsupported/mail2/mainwindow.h
index 27b527d..1ed0559 100644
--- a/noncore/unsupported/mail2/mainwindow.h
+++ b/noncore/unsupported/mail2/mainwindow.h
@@ -3,6 +3,8 @@
3 3
4#include "mainwindowbase.h" 4#include "mainwindowbase.h"
5 5
6#include <qstring.h>
7
6class IMAPHandler; 8class IMAPHandler;
7class IMAPResponseFETCH; 9class IMAPResponseFETCH;
8 10
@@ -14,11 +16,13 @@ public:
14 MainWindow(QWidget *parent = 0, const char *name = 0, WFlags fl = 0); 16 MainWindow(QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
15 17
16protected slots: 18protected slots:
17 void slotCompose(); 19 void slotCompose( const QString& name, const QString& email );
20 void slotComposeNoParams();
18 void slotSendQueued(); 21 void slotSendQueued();
19 void slotSearch(); 22 void slotSearch();
20 void slotConfigure(); 23 void slotConfigure();
21 void mailClicked(IMAPResponseFETCH mail, IMAPHandler *handler); 24 void mailClicked(IMAPResponseFETCH mail, IMAPHandler *handler);
25 void appMessage(const QCString &msg, const QByteArray &data);
22 26
23}; 27};
24 28