summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libkdepim/externalapphandler.h18
-rw-r--r--libkdepim/kcmconfigs/kdepimconfigwidget.cpp15
2 files changed, 21 insertions, 12 deletions
diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h
index efcdd89..3cf9e06 100644
--- a/libkdepim/externalapphandler.h
+++ b/libkdepim/externalapphandler.h
@@ -81,11 +81,17 @@ class ExternalAppHandler
81 AVAILABLE = 1 81 AVAILABLE = 1
82 }; 82 };
83 83
84 //calls the emailapplication with a number of attachments that need to be send 84 //calls the emailapplication with a number of attachments that need to be send.
85 bool mailAttachments( const QString& urls ); 85 //either parameter can be left empty.
86 bool mailToMultipleContacts( const QString& recipients, const QString& attachmenturls );
86 87
87 //calls the emailapplication and creates a mail with parameter emails as recipients 88 //calls the emailapplication and creates a mail with parameter emailadress as recipients
88 bool mailToContacts( const QString& emails ); 89 bool mailToOneContact( const QString& name, const QString& emailadress );
90
91 //calls the emailapplication and creates a mail with parameter as recipients
92 // parameters format is
93 // NAME <EMAIL>:SUBJECT
94 bool mailToOneContact( const QString& adressline );
89 95
90 //calls the phoneapplication with the number 96 //calls the phoneapplication with the number
91 bool callByPhone( const QString& phonenumber ); 97 bool callByPhone( const QString& phonenumber );
@@ -127,8 +133,8 @@ class ExternalAppHandler
127 133
128 void addDefaultAppItem(Types type, int id, const QString& label, const QString& channel, const QString& message, const QString& parameters, const QString& message2, const QString& parameters2); 134 void addDefaultAppItem(Types type, int id, const QString& label, const QString& channel, const QString& message, const QString& parameters, const QString& message2, const QString& parameters2);
129 135
130 QString& translateMessage(QString& message, const QString& emails) const; 136 QString& translateMessage(QString& message, const QString& param1, const QString& param2) const;
131 void passParameter(QCopEnvelope* e, const QString& parameters, const QString& param1) const; 137 void passParameters(QCopEnvelope* e, const QString& parameters, const QString& param1, const QString& param2) const;
132 138
133 139
134 static ExternalAppHandler *sInstance; 140 static ExternalAppHandler *sInstance;
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
index c8b94db..4f4cc6a 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
@@ -141,20 +141,23 @@ KDEPIMConfigWidget::KDEPIMConfigWidget( QWidget *parent, const char *name )
141 mParameters->setReadOnly(true); 141 mParameters->setReadOnly(true);
142 boxLayout->addWidget( mParameters, 4, 1 ); 142 boxLayout->addWidget( mParameters, 4, 1 );
143 143
144 lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox);
145 boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 );
146
144 lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox); 147 lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox);
145 boxLayout->addWidget( lab, 5, 0 ); 148 boxLayout->addWidget( lab, 6, 0 );
146 mMessage2 = new QLineEdit(mExternalAppGroupBox); 149 mMessage2 = new QLineEdit(mExternalAppGroupBox);
147 mMessage2->setReadOnly(true); 150 mMessage2->setReadOnly(true);
148 boxLayout->addWidget( mMessage2 , 6, 0); 151 boxLayout->addWidget( mMessage2 , 7, 0);
149 152
150 lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox); 153 lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox);
151 boxLayout->addWidget( lab, 5, 1 ); 154 boxLayout->addWidget( lab, 6, 1 );
152 mParameters2 = new QLineEdit(mExternalAppGroupBox); 155 mParameters2 = new QLineEdit(mExternalAppGroupBox);
153 mParameters2->setReadOnly(true); 156 mParameters2->setReadOnly(true);
154 boxLayout->addWidget( mParameters2, 6, 1 ); 157 boxLayout->addWidget( mParameters2, 7, 1 );
155 158
156 lab = new QLabel( i18n("HINT: Delimiter=; Data=%1 "), mExternalAppGroupBox); 159 lab = new QLabel( i18n("HINT: Emails=%1,Attachments=%2"), mExternalAppGroupBox);
157 boxLayout->addMultiCellWidget( lab, 7, 7, 0, 1 ); 160 boxLayout->addMultiCellWidget( lab, 8, 8, 0, 1 );
158 161
159 162
160 connect( mChannel, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); 163 connect( mChannel, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );