-rw-r--r-- | kaddressbook/kabcore.cpp | 4 | ||||
-rw-r--r-- | kmicromail/composemail.cpp | 9 | ||||
-rw-r--r-- | kmicromail/opiemail.cpp | 56 | ||||
-rw-r--r-- | kmicromail/opiemail.h | 2 |
4 files changed, 45 insertions, 26 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index d1d385c..74e5cf7 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2059,26 +2059,26 @@ void KABCore::requestForDetails(const QString& sourceChannel, const QString& ses | |||
2059 | if ( ! uid.isEmpty() ) { | 2059 | if ( ! uid.isEmpty() ) { |
2060 | Addressee adrr = mAddressBook->findByUid( uid ); | 2060 | Addressee adrr = mAddressBook->findByUid( uid ); |
2061 | if ( !adrr.isEmpty() ) { | 2061 | if ( !adrr.isEmpty() ) { |
2062 | foundUid = uid; | 2062 | foundUid = uid; |
2063 | } | 2063 | } |
2064 | if ( email == "sendbacklist" ) { | 2064 | if ( email == "sendbacklist" ) { |
2065 | qDebug("ssssssssssssssssssssssend "); | 2065 | //qDebug("ssssssssssssssssssssssend "); |
2066 | QStringList nameList; | 2066 | QStringList nameList; |
2067 | QStringList emailList; | 2067 | QStringList emailList; |
2068 | QStringList uidList; | 2068 | QStringList uidList; |
2069 | nameList.append(adrr.realName()); | 2069 | nameList.append(adrr.realName()); |
2070 | emailList = adrr.emails(); | 2070 | emailList = adrr.emails(); |
2071 | uidList.append( adrr.preferredEmail()); | 2071 | uidList.append( adrr.preferredEmail()); |
2072 | bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI("QPE/Application/ompi", uid, nameList, emailList, uidList); | 2072 | bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI("QPE/Application/ompi", uid, nameList, emailList, uidList); |
2073 | return; | 2073 | return; |
2074 | } | 2074 | } |
2075 | 2075 | ||
2076 | } | 2076 | } |
2077 | 2077 | ||
2078 | if ( email == "sendback" ) | 2078 | if ( email == "sendbacklist" ) |
2079 | return; | 2079 | return; |
2080 | if (foundUid.isEmpty()) | 2080 | if (foundUid.isEmpty()) |
2081 | { | 2081 | { |
2082 | //find the uid of the person first | 2082 | //find the uid of the person first |
2083 | Addressee::List namelist; | 2083 | Addressee::List namelist; |
2084 | Addressee::List emaillist; | 2084 | Addressee::List emaillist; |
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp index 01dd406..9efa932 100644 --- a/kmicromail/composemail.cpp +++ b/kmicromail/composemail.cpp | |||
@@ -47,19 +47,22 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m | |||
47 | this, SLOT(insertAttendees(const QString&, const QStringList&, const QStringList&, const QStringList&))); | 47 | this, SLOT(insertAttendees(const QString&, const QStringList&, const QStringList&, const QStringList&))); |
48 | settings = s; | 48 | settings = s; |
49 | m_replyid = ""; | 49 | m_replyid = ""; |
50 | KConfig config( locateLocal("config", "kabcrc") ); | 50 | KConfig config( locateLocal("config", "kabcrc") ); |
51 | config.setGroup( "General" ); | 51 | config.setGroup( "General" ); |
52 | QString whoami_uid = config.readEntry( "WhoAmI" ); | 52 | QString whoami_uid = config.readEntry( "WhoAmI" ); |
53 | |||
53 | if ( whoami_uid.isEmpty() ) { | 54 | if ( whoami_uid.isEmpty() ) { |
54 | QMessageBox::information( 0, tr( "Hint" ), | 55 | QMessageBox::information( 0, tr( "Hint" ), |
55 | tr( "Please apply\n\"Set Who Am I\"\nin KA/Pi to get the from\nfield automatically filled out!\n" ), | 56 | tr( "Please apply\n\"Set Who Am I\"\nin KA/Pi to get the from\nfield automatically filled out!\n" ), |
56 | tr( "Ok" ) ); | 57 | tr( "Ok" ) ); |
57 | 58 | ||
58 | } else | 59 | } else |
59 | bool res = ExternalAppHandler::instance()->requestDetailsFromKAPI("", "sendbacklist", whoami_uid); | 60 | ExternalAppHandler::instance()->requestDetailsFromKAPI("", "sendbacklist", whoami_uid); |
61 | |||
62 | |||
60 | #ifdef DESKTOP_VERSION | 63 | #ifdef DESKTOP_VERSION |
61 | KABC::Addressee con = KABC::StdAddressBook::self()->whoAmI( ); | 64 | KABC::Addressee con = KABC::StdAddressBook::self()->whoAmI( ); |
62 | QStringList mails = con.emails(); | 65 | QStringList mails = con.emails(); |
63 | QString defmail = con.preferredEmail(); | 66 | QString defmail = con.preferredEmail(); |
64 | if ( mails.count() == 0) | 67 | if ( mails.count() == 0) |
65 | QMessageBox::information( 0, tr( "Hint" ), | 68 | QMessageBox::information( 0, tr( "Hint" ), |
@@ -79,13 +82,12 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m | |||
79 | Config cfg( "mail" ); | 82 | Config cfg( "mail" ); |
80 | cfg.setGroup( "Compose" ); | 83 | cfg.setGroup( "Compose" ); |
81 | checkBoxLater->setChecked( cfg.readBoolEntry( "sendLater", false ) ); | 84 | checkBoxLater->setChecked( cfg.readBoolEntry( "sendLater", false ) ); |
82 | 85 | ||
83 | attList->addColumn( tr( "Name" ) ); | 86 | attList->addColumn( tr( "Name" ) ); |
84 | attList->addColumn( tr( "Size" ) ); | 87 | attList->addColumn( tr( "Size" ) ); |
85 | |||
86 | QList<Account> accounts = settings->getAccounts(); | 88 | QList<Account> accounts = settings->getAccounts(); |
87 | 89 | ||
88 | Account *it; | 90 | Account *it; |
89 | for ( it = accounts.first(); it; it = accounts.next() ) { | 91 | for ( it = accounts.first(); it; it = accounts.next() ) { |
90 | if ( it->getType()==MAILLIB::A_SMTP ) { | 92 | if ( it->getType()==MAILLIB::A_SMTP ) { |
91 | SMTPaccount *smtp = static_cast<SMTPaccount *>(it); | 93 | SMTPaccount *smtp = static_cast<SMTPaccount *>(it); |
@@ -194,17 +196,16 @@ void ComposeMail::pickAddress( ) | |||
194 | // the result should now arrive through method insertAttendees | 196 | // the result should now arrive through method insertAttendees |
195 | #endif | 197 | #endif |
196 | } | 198 | } |
197 | //the map includes name/email pairs, that comes from Ka/Pi | 199 | //the map includes name/email pairs, that comes from Ka/Pi |
198 | void ComposeMail::insertAttendees(const QString& uid,const QStringList& nameList,const QStringList& emailList,const QStringList& uidList) | 200 | void ComposeMail::insertAttendees(const QString& uid,const QStringList& nameList,const QStringList& emailList,const QStringList& uidList) |
199 | { | 201 | { |
200 | qDebug("ComposeMail::insertAttendees "); | 202 | //qDebug("ComposeMail::insertAttendees "); |
201 | raise(); | 203 | raise(); |
202 | 204 | ||
203 | if ( mPickLineEdit == 0 ) { //whoami received | 205 | if ( mPickLineEdit == 0 ) { //whoami received |
204 | qDebug("returnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn "); | ||
205 | QString defmail = uidList[0]; | 206 | QString defmail = uidList[0]; |
206 | if ( emailList.count() == 0 ) | 207 | if ( emailList.count() == 0 ) |
207 | QMessageBox::information( 0, tr( "Hint" ), | 208 | QMessageBox::information( 0, tr( "Hint" ), |
208 | tr( "Please apply\n\"Set Who Am I\"\nin KA/Pi to get the from\nfield automatically filled out!\n" ), | 209 | tr( "Please apply\n\"Set Who Am I\"\nin KA/Pi to get the from\nfield automatically filled out!\n" ), |
209 | tr( "Ok" ) ); | 210 | tr( "Ok" ) ); |
210 | if (defmail.length()!=0) { | 211 | if (defmail.length()!=0) { |
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index 0c581c0..b2119e6 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp | |||
@@ -8,12 +8,13 @@ | |||
8 | #include "mailistviewitem.h" | 8 | #include "mailistviewitem.h" |
9 | #include "viewmail.h" | 9 | #include "viewmail.h" |
10 | #include "selectstore.h" | 10 | #include "selectstore.h" |
11 | #include "selectsmtp.h" | 11 | #include "selectsmtp.h" |
12 | 12 | ||
13 | #include <qmessagebox.h> | 13 | #include <qmessagebox.h> |
14 | #include <qtimer.h> | ||
14 | #include <libkdepim/externalapphandler.h> | 15 | #include <libkdepim/externalapphandler.h> |
15 | 16 | ||
16 | #include <qpe/qpeapplication.h> | 17 | #include <qpe/qpeapplication.h> |
17 | #include <libmailwrapper/smtpwrapper.h> | 18 | #include <libmailwrapper/smtpwrapper.h> |
18 | #include <libmailwrapper/mailtypes.h> | 19 | #include <libmailwrapper/mailtypes.h> |
19 | #include <libmailwrapper/abstractmail.h> | 20 | #include <libmailwrapper/abstractmail.h> |
@@ -45,52 +46,59 @@ void OpieMail::appMessage(const QCString &msg, const QByteArray &data) | |||
45 | } | 46 | } |
46 | #include <stdlib.h> | 47 | #include <stdlib.h> |
47 | void OpieMail::message(const QCString &msg, const QByteArray &data) | 48 | void OpieMail::message(const QCString &msg, const QByteArray &data) |
48 | { | 49 | { |
49 | // copied from old mail2 | 50 | // copied from old mail2 |
50 | static int ii = 0; | 51 | static int ii = 0; |
51 | qDebug("call ############################# %d ", ii); | 52 | //qDebug("QCOP CALL ############################# %d ", ii); |
52 | // block second call | 53 | //QString mess ( msg ); |
53 | if ( ii < 2 ) { | 54 | //qDebug("Message = %s ",mess.latin1()); |
54 | //++ii; | ||
55 | if ( ii > 1 ) { | ||
56 | qDebug("qcop call blocked "); | ||
57 | //return; | ||
58 | } | ||
59 | } | ||
60 | ++ii; | 55 | ++ii; |
61 | //qDebug("KM:appMessage %d *%s* %x", ii, msg.data(), this); | 56 | //qDebug("KM:appMessage %d *%s* %x", ii, msg.data(), this); |
57 | |||
58 | mPendingEmail = QString::null; | ||
59 | mPendingName = QString::null; | ||
62 | if (msg == "writeMail(QString,QString)") | 60 | if (msg == "writeMail(QString,QString)") |
63 | { | 61 | { |
62 | //qDebug("writeMail(QString,QString) "); | ||
64 | QDataStream stream(data,IO_ReadOnly); | 63 | QDataStream stream(data,IO_ReadOnly); |
65 | QString name, email; | 64 | stream >> mPendingName >> mPendingEmail; |
66 | stream >> name >> email; | ||
67 | // removing the whitespaces at beginning and end is needed! | 65 | // removing the whitespaces at beginning and end is needed! |
68 | slotwriteMail(name.stripWhiteSpace(),email.stripWhiteSpace()); | 66 | QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); |
69 | } | 67 | } |
70 | else if (msg == "newMail()") | 68 | else if (msg == "newMail()") |
71 | { | 69 | { |
72 | slotComposeMail(); | 70 | //qDebug("slotComposeMail() "); |
71 | // we cannot call slotComposeMail(); directly, because may be executing a QCOP call | ||
72 | // and a QCOP call does not like a processevents in his execution | ||
73 | // with the Qtimer we call slotComposeMail() after we reached the main event loop | ||
74 | QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); | ||
75 | // slotComposeMail(); | ||
73 | } | 76 | } |
74 | else if (msg == "newMail(QString)") | 77 | else if (msg == "newMail(QString)") |
75 | { | 78 | { |
79 | //qDebug(" newMail(QString)"); | ||
76 | QDataStream stream(data,IO_ReadOnly); | 80 | QDataStream stream(data,IO_ReadOnly); |
77 | QString nameemail; | 81 | stream >> mPendingName; |
78 | stream >> nameemail; | ||
79 | // the format is | 82 | // the format is |
80 | // NAME <EMAIL>:SUBJECT | 83 | // NAME <EMAIL>:SUBJECT |
81 | //qDebug("message %s ", nameemail.latin1()); | 84 | QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); |
82 | 85 | } else { | |
83 | slotwriteMail2( nameemail ); | 86 | if ( ii == 1 ) { |
84 | } else | 87 | qDebug("Kopiemail::Error:: Initial QCOP call for ExternalAppHandler not supported "); |
88 | return; | ||
89 | } | ||
85 | ExternalAppHandler::instance()->appMessage ( msg, data); | 90 | ExternalAppHandler::instance()->appMessage ( msg, data); |
86 | } | 91 | } |
92 | |||
93 | //qDebug("END OpieMail::message "); | ||
94 | } | ||
87 | void OpieMail::slotwriteMail2(const QString& namemail ) | 95 | void OpieMail::slotwriteMail2(const QString& namemail ) |
88 | { | 96 | { |
89 | // qDebug("OpieMail::slotwriteMail2 "); | 97 | // qDebug("OpieMail::slotwriteMail2 "); |
90 | qApp->processEvents(); | 98 | //qApp->processEvents(); |
91 | ComposeMail compose( settings, this, 0, true ); | 99 | ComposeMail compose( settings, this, 0, true ); |
92 | if ( !namemail.isEmpty() ) { | 100 | if ( !namemail.isEmpty() ) { |
93 | QString to = namemail; | 101 | QString to = namemail; |
94 | if ( namemail.find( " <") > 1 ) { | 102 | if ( namemail.find( " <") > 1 ) { |
95 | to = "\"" +to.replace( QRegExp( " <"), "\" <") ; | 103 | to = "\"" +to.replace( QRegExp( " <"), "\" <") ; |
96 | } else | 104 | } else |
@@ -125,17 +133,25 @@ void OpieMail::slotwriteMail(const QString&name,const QString&email) | |||
125 | compose.setTo(email); | 133 | compose.setTo(email); |
126 | } | 134 | } |
127 | } | 135 | } |
128 | compose.slotAdjustColumns(); | 136 | compose.slotAdjustColumns(); |
129 | compose.showMaximized(); | 137 | compose.showMaximized(); |
130 | compose.exec(); | 138 | compose.exec(); |
139 | raise(); | ||
131 | } | 140 | } |
132 | 141 | ||
133 | void OpieMail::slotComposeMail() | 142 | void OpieMail::slotComposeMail() |
134 | { | 143 | { |
144 | if ( mPendingEmail == QString::null && mPendingName == QString::null) | ||
135 | slotwriteMail2( QString () ); | 145 | slotwriteMail2( QString () ); |
146 | else { | ||
147 | if ( mPendingEmail == QString::null ) | ||
148 | slotwriteMail2( mPendingName ); | ||
149 | else | ||
150 | slotwriteMail( mPendingName, mPendingEmail ); | ||
151 | } | ||
136 | //slotwriteMail(0l,0l); | 152 | //slotwriteMail(0l,0l); |
137 | } | 153 | } |
138 | 154 | ||
139 | void OpieMail::slotSendQueued() | 155 | void OpieMail::slotSendQueued() |
140 | { | 156 | { |
141 | SMTPaccount *smtp = 0; | 157 | SMTPaccount *smtp = 0; |
diff --git a/kmicromail/opiemail.h b/kmicromail/opiemail.h index 7434e59..1de5f6b 100644 --- a/kmicromail/opiemail.h +++ b/kmicromail/opiemail.h | |||
@@ -38,11 +38,13 @@ protected slots: | |||
38 | virtual void slotMoveCopyMail(); | 38 | virtual void slotMoveCopyMail(); |
39 | virtual void slotMoveCopyAllMail(); | 39 | virtual void slotMoveCopyAllMail(); |
40 | virtual void reEditMail(); | 40 | virtual void reEditMail(); |
41 | void clearSelection(); | 41 | void clearSelection(); |
42 | 42 | ||
43 | private: | 43 | private: |
44 | QString mPendingEmail; | ||
45 | QString mPendingName; | ||
44 | Settings *settings; | 46 | Settings *settings; |
45 | 47 | ||
46 | }; | 48 | }; |
47 | 49 | ||
48 | #endif | 50 | #endif |