mail send

9 files changed, 114 insertions, 8 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 8af7da2..e24ee43 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -8,4 +8,7 @@ Open list view (or search dialog), select the desired items and choose in
 the popup menu: Set alarm for selected...
 
+Added to the event/todo viewer the option to send an email to 
+all attendees or all selected (with RSVP) attendees. 
+
 ********** VERSION 2.0.2 ************
 
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 12b70a0..8c3b1e4 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1212,4 +1212,9 @@
 { "Set Alarm!","Setze Alarm!" },
 { "Canged alarm for %1 items","Alarm für %1 Items geändert" },
+{ " and "," und " },
+{ "<IMG src="%1"> only )","nur <IMG src="%1"> )" },
+{ "Mail to selected","Mail an Ausgewählte" },
+{ "Mail to all","Mail an Alle" },
+{ "","" },
 { "","" },
 { "","" },
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 702eaa3..a8e4de5 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2498,5 +2498,5 @@ void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QSt
         uidList.append(list[i].uid());
   }
-
+  //qDebug("%s %s ", sourceChannel.latin1(), uid.latin1());
   bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(sourceChannel, uid, nameList, emailList, uidList);
 
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index ed8a2ee..3231b45 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -56,6 +56,7 @@ ComposeMail::ComposeMail( Settings *sett, QWidget *parent, const char *name, boo
     mPickLineEdit = 0;
     mEncoding = KOPrefs::instance()->mCurrentCodeName;
-    connect(ExternalAppHandler::instance(), SIGNAL(receivedNameEmailUidListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&)),
-          this, SLOT(insertAttendees(const QString&, const QStringList&, const QStringList&, const QStringList&)));
+    //managed from opiemail now
+    //connect(ExternalAppHandler::instance(), SIGNAL(receivedNameEmailUidListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&)),
+    //     this, SLOT(insertAttendees(const QString&, const QStringList&, const QStringList&, const QStringList&)));
     settings = sett;
     m_replyid = ""; 
@@ -261,4 +262,11 @@ void  ComposeMail::insertAttendees(const QString& uid,const QStringList& nameLis
     raise();
 
+    QString UID = uid;
+    if ( uid.left( 18 ) == (this->name() +QString("pick2")) ) {
+        mPickLineEdit = toLine;
+        UID = this->name();
+        subjectLine->setText( uid.mid( 18 ) );
+    }
+    //qDebug("ccc %s %s ", uid.latin1(), this->name());
     if ( mPickLineEdit == 0 ) { //whoami received
         QString defmail = uidList[0];
@@ -282,5 +290,5 @@ void  ComposeMail::insertAttendees(const QString& uid,const QStringList& nameLis
     QString names ;
     QLineEdit *line = mPickLineEdit;
-    if (uid == this->name())
+    if (UID == this->name())
         {
             for ( int i = 0; i < nameList.count(); i++)
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index f56711d..e159b73 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -47,9 +47,11 @@ OpieMail::OpieMail( QWidget *parent, const char *name )
     : MainWindow( parent, name) //, WStyle_ContextHelp )
 {
+    mCurrentComposer = 0;
     settings = new Settings();
     tb = 0;
     setIcon(SmallIcon( "kmicromail" )  );
     folderView->populate( settings->getAccounts() );
-  
+   connect(ExternalAppHandler::instance(), SIGNAL(receivedNameEmailUidListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&)),
+       this, SLOT(insertAttendees(const QString&, const QStringList&, const QStringList&, const QStringList&)));
 }
 
@@ -139,5 +141,7 @@ void OpieMail::slotwriteMail2(const QString& namemail )
     compose.showMaximized();
 #endif
+    mCurrentComposer = &compose;
     compose.exec();
+    mCurrentComposer = 0;
     raise();
     //qDebug("retttich ");
@@ -162,5 +166,8 @@ void OpieMail::slotwriteMail(const QString&name,const QString&email)
     compose.showMaximized();
 #endif
+
+    mCurrentComposer = &compose;
     compose.exec();
+    mCurrentComposer = 0;
     raise();
 }
@@ -301,8 +308,11 @@ void OpieMail::replyMail()
     composer.setInReplyTo( mail->Msgid());
     composer.setCharset( body->getCharset() );
+
+    mCurrentComposer = &composer;
     if ( QDialog::Accepted == KApplication::execDialog( &composer ) )
     {
         mail->Wrapper()->answeredMail(mail);
     }
+    mCurrentComposer = 0;
     delete settings;
 
@@ -638,4 +648,25 @@ void OpieMail::reEditMail()
     compose.resize(640,480);
 #endif
+    mCurrentComposer = &compose;
     compose.exec();
+    mCurrentComposer = 0;
+}
+
+void OpieMail::insertAttendees(const QString& uid,const QStringList& nameList,const QStringList& emailList,const QStringList& uidList)
+{
+    
+    if ( mCurrentComposer ) {
+        mCurrentComposer->insertAttendees(uid,nameList,emailList,uidList);
+    } else {
+        ComposeMail compose( settings, this, 0, true );
+        compose.slotAdjustColumns();
+#ifndef DESKTOP_VERSION
+        compose.showMaximized();
+#endif
+        mCurrentComposer = &compose;
+        mCurrentComposer->insertAttendees(uid,nameList,emailList,uidList);
+        compose.exec();
+        mCurrentComposer = 0;
+        raise();
+    }
 }
diff --git a/kmicromail/opiemail.h b/kmicromail/opiemail.h
index b8a527f..4f75b3f 100644
--- a/kmicromail/opiemail.h
+++ b/kmicromail/opiemail.h
@@ -9,4 +9,7 @@
 #include <libmailwrapper/mailtypes.h>
 #include <viewmail.h>
+#include <qstringlist.h>
+
+class ComposeMail;
 
 class OpieMail : public MainWindow
@@ -26,4 +29,5 @@ public slots:
     virtual void appMessage(const QCString &msg, const QByteArray &data);
     virtual void message(const QCString &msg, const QByteArray &data);
+    void insertAttendees(const QString&, const QStringList& namelist, const QStringList& emaillist, const QStringList& uidlist);
 protected slots:
     virtual void deleteAndDisplayNextMail(ViewMail * vm);
@@ -49,4 +53,5 @@ protected slots:
     void slotDownloadMail();
 private:
+    ComposeMail* mCurrentComposer; 
     void closeViewMail(ViewMail * vm);
     QString mPendingEmail;
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 7dc1880..bf41edb 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -127,6 +127,14 @@ void KOEventViewer::setSource(const QString& n)
         // qDebug("KOEventViewer::setSource %s ", n.mid(7).latin1());
 #ifndef DESKTOP_VERSION
+        if ( n.mid(7,3) == "ALL" ) {
+            qDebug("all ");
+            mailToAttendees( true );
+        } else if ( n.mid(7,4) == "RSVP"  ) {
+            mailToAttendees( false );
+            qDebug("rsvp ");
+        } else {
         QCopEnvelope e("QPE/Application/ompi", "newMail(QString)" );
         e << n.mid(7);
+        }
 #endif
 
@@ -175,5 +183,24 @@ void KOEventViewer::setSource(const QString& n)
 #endif
 }
+void KOEventViewer::mailToAttendees( bool all )
+{
+    QPtrList<Attendee> attendees = mCurrentIncidence->attendees();
+    if (attendees.count() == 0) return;
+    QStringList nameList;
+    QStringList emailList;
+    QStringList uidList;
+    Attendee* a;
+    for(a=attendees.first();a;a=attendees.next()) {
+        if ( !all && !a->RSVP() ) continue;
+        if (!a->email().isEmpty()) {
+            nameList.append (a->name() );
+            emailList.append (a->email() );
+            uidList.append (a->uid() );
+        }
+    }
+    QString uid = "ComposeMailUIpick2"+mMailSubject;
+    bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI("QPE/Application/ompi", uid, nameList, emailList, uidList);
 
+}
 void KOEventViewer::addTag(const QString & tag,const QString & text)
 {
@@ -463,4 +490,7 @@ void KOEventViewer::formatAttendees(Incidence *event)
         Attendee *a;
         mText.append("<ul>");
+        int a_count = 0;
+        int a_count_nr = 0;
+
         for(a=attendees.first();a;a=attendees.next()) {
 #ifndef KORG_NOKABC
@@ -502,8 +532,12 @@ void KOEventViewer::formatAttendees(Incidence *event)
                 if (iconPath) {
                     mText += "<a href=\"mailto:" + a->name() +" <" + a->email() + ">:" + mMailSubject + "\">";
-                    if ( a->RSVP() )
+                    if ( a->RSVP() ) {
+                        ++a_count;
                         mText += "<IMG src=\"" + iconPath + "\">";
-                    else
+                    }
+                    else {
+                    ++a_count_nr;
                         mText += "<IMG src=\"" + NOiconPath + "\">";
+                    }
                     mText += "</a>\n";
                 }
@@ -515,4 +549,22 @@ void KOEventViewer::formatAttendees(Incidence *event)
         }
         mText.append("</li></ul>");
+        if ( a_count > 1 ) {
+                mText += "<a href=\"mailto:ALL\">";
+                mText += i18n( "Mail to all" );
+                mText += "</a> ( ";
+                mText += "<IMG src=\"" + iconPath + "\">";
+                mText += i18n( " and " );
+                mText += "<IMG src=\"" + NOiconPath + "\"> )";
+                mText += "<br>\n";
+
+
+        }
+        if ( a_count_nr > 1 ) {
+                mText += "<a href=\"mailto:RSVP\">";
+                mText += i18n( "Mail to selected" );
+                mText += "</a> ( ";
+                mText += i18n( "<IMG src=\"%1\"> only )").arg ( iconPath );
+                mText += "\n";
+        }
     }
 
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h
index 0cd3f33..cf44284 100644
--- a/korganizer/koeventviewer.h
+++ b/korganizer/koeventviewer.h
@@ -52,4 +52,5 @@ class KOEventViewer : public QTextBrowser {
     void setSyncMode( bool );
     void setColorMode( int );
+    void mailToAttendees( bool all );
 
   protected:
@@ -67,5 +68,5 @@ class KOEventViewer : public QTextBrowser {
     QString mText;
     QString mMailSubject;
-    Incidence* mCurrentIncidence;
+    Incidence* mCurrentIncidence;  
   signals:
     void launchaddressbook(QString uid);    
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index 3079141..7200da9 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -1132,4 +1132,5 @@ void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& dat
 
     if ( cmsg == "nextView()" ) {
+        qDebug("nextView()");
         emit nextView();
         return;