-rw-r--r-- | libkdepim/addresseeview.cpp | 18 | ||||
-rw-r--r-- | libkdepim/addresseeview.h | 2 | ||||
-rw-r--r-- | libkdepim/kincidenceformatter.cpp | 6 |
3 files changed, 22 insertions, 4 deletions
diff --git a/libkdepim/addresseeview.cpp b/libkdepim/addresseeview.cpp index deafd34..70fc57c 100644 --- a/libkdepim/addresseeview.cpp +++ b/libkdepim/addresseeview.cpp | |||
@@ -32,12 +32,19 @@ | |||
32 | #include <qfile.h> | 32 | #include <qfile.h> |
33 | #include <qapplication.h> | 33 | #include <qapplication.h> |
34 | 34 | ||
35 | 35 | ||
36 | #include "addresseeview.h" | 36 | #include "addresseeview.h" |
37 | 37 | ||
38 | |||
39 | #ifndef DESKTOP_VERSION | ||
40 | #include <qtopia/qcopenvelope_qws.h> | ||
41 | #endif | ||
42 | |||
43 | |||
44 | |||
38 | using namespace KPIM; | 45 | using namespace KPIM; |
39 | 46 | ||
40 | AddresseeView::AddresseeView( QWidget *parent, const char *name ) | 47 | AddresseeView::AddresseeView( QWidget *parent, const char *name ) |
41 | //US : KTextBrowser( parent, name ) | 48 | //US : KTextBrowser( parent, name ) |
42 | : QTextBrowser( parent, name ) | 49 | : QTextBrowser( parent, name ) |
43 | 50 | ||
@@ -50,13 +57,21 @@ AddresseeView::AddresseeView( QWidget *parent, const char *name ) | |||
50 | 57 | ||
51 | //US QStyleSheet *sheet = styleSheet(); | 58 | //US QStyleSheet *sheet = styleSheet(); |
52 | //US QStyleSheetItem *link = sheet->item( "a" ); | 59 | //US QStyleSheetItem *link = sheet->item( "a" ); |
53 | //US link->setColor( KGlobalSettings::linkColor() ); | 60 | //US link->setColor( KGlobalSettings::linkColor() ); |
54 | 61 | ||
55 | } | 62 | } |
63 | void AddresseeView::setSource(const QString& n) | ||
64 | { | ||
65 | //qDebug("********AddresseeView::setSource %s", n.mid(7).latin1()); | ||
66 | #ifndef DESKTOP_VERSION | ||
67 | QCopEnvelope e("QPE/Application/kmpi", "newMail(QString)"); | ||
68 | e << n.mid(7); | ||
69 | #endif | ||
56 | 70 | ||
71 | } | ||
57 | void AddresseeView::setAddressee( const KABC::Addressee& addr ) | 72 | void AddresseeView::setAddressee( const KABC::Addressee& addr ) |
58 | { | 73 | { |
59 | mAddressee = addr; | 74 | mAddressee = addr; |
60 | 75 | ||
61 | // clear view | 76 | // clear view |
62 | setText( QString::null ); | 77 | setText( QString::null ); |
@@ -82,14 +97,15 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) | |||
82 | QStringList emails = mAddressee.emails(); | 97 | QStringList emails = mAddressee.emails(); |
83 | QStringList::ConstIterator emailIt; | 98 | QStringList::ConstIterator emailIt; |
84 | QString type = i18n( "Email" ); | 99 | QString type = i18n( "Email" ); |
85 | for ( emailIt = emails.begin(); emailIt != emails.end(); ++emailIt ) { | 100 | for ( emailIt = emails.begin(); emailIt != emails.end(); ++emailIt ) { |
86 | dynamicPart += QString( | 101 | dynamicPart += QString( |
87 | "<tr><td align=\"right\"><b>%1</b></td>" | 102 | "<tr><td align=\"right\"><b>%1</b></td>" |
88 | "<td align=\"left\"><a href=\"mailto:%2\">%3</a></td></tr>" ) | 103 | "<td align=\"left\"><a href=\"mailto:%2 <%3> \">%4</a></td></tr>" ) |
89 | .arg( type ) | 104 | .arg( type ) |
105 | .arg( name ) | ||
90 | .arg( *emailIt ) | 106 | .arg( *emailIt ) |
91 | .arg( *emailIt ); | 107 | .arg( *emailIt ); |
92 | type = i18n( "Other" ); | 108 | type = i18n( "Other" ); |
93 | } | 109 | } |
94 | 110 | ||
95 | if ( !mAddressee.url().url().isEmpty() ) { | 111 | if ( !mAddressee.url().url().isEmpty() ) { |
diff --git a/libkdepim/addresseeview.h b/libkdepim/addresseeview.h index 598ef0d..1865fc4 100644 --- a/libkdepim/addresseeview.h +++ b/libkdepim/addresseeview.h | |||
@@ -38,13 +38,13 @@ class AddresseeView : public QTextBrowser | |||
38 | /** | 38 | /** |
39 | Sets the addressee object. The addressee is displayed immediately. | 39 | Sets the addressee object. The addressee is displayed immediately. |
40 | 40 | ||
41 | @param addr The addressee object. | 41 | @param addr The addressee object. |
42 | */ | 42 | */ |
43 | void setAddressee( const KABC::Addressee& addr ); | 43 | void setAddressee( const KABC::Addressee& addr ); |
44 | 44 | void setSource(const QString& n); | |
45 | /** | 45 | /** |
46 | Returns the current addressee object. | 46 | Returns the current addressee object. |
47 | */ | 47 | */ |
48 | KABC::Addressee addressee() const; | 48 | KABC::Addressee addressee() const; |
49 | 49 | ||
50 | private: | 50 | private: |
diff --git a/libkdepim/kincidenceformatter.cpp b/libkdepim/kincidenceformatter.cpp index 4815519..2f41409 100644 --- a/libkdepim/kincidenceformatter.cpp +++ b/libkdepim/kincidenceformatter.cpp | |||
@@ -245,13 +245,14 @@ void KIncidenceFormatter::formatAttendees(Incidence *event) | |||
245 | { | 245 | { |
246 | QPtrList<Attendee> attendees = event->attendees(); | 246 | QPtrList<Attendee> attendees = event->attendees(); |
247 | if (attendees.count()) { | 247 | if (attendees.count()) { |
248 | QString iconPath = KGlobal::iconLoader()->iconPath("mailappt",KIcon::Small); | 248 | QString iconPath = KGlobal::iconLoader()->iconPath("mailappt",KIcon::Small); |
249 | addTag("h3",i18n("Organizer")); | 249 | addTag("h3",i18n("Organizer")); |
250 | mText.append("<ul><li>"); | 250 | mText.append("<ul><li>"); |
251 | #ifndef KORG_NOKABC | 251 | #if 0 |
252 | //ndef KORG_NOKABC | ||
252 | 253 | ||
253 | KABC::AddressBook *add_book = KABC::StdAddressBook::self(); | 254 | KABC::AddressBook *add_book = KABC::StdAddressBook::self(); |
254 | KABC::Addressee::List addressList; | 255 | KABC::Addressee::List addressList; |
255 | addressList = add_book->findByEmail(event->organizer()); | 256 | addressList = add_book->findByEmail(event->organizer()); |
256 | KABC::Addressee o = addressList.first(); | 257 | KABC::Addressee o = addressList.first(); |
257 | if (!o.isEmpty() && addressList.size()<2) { | 258 | if (!o.isEmpty() && addressList.size()<2) { |
@@ -272,13 +273,14 @@ void KIncidenceFormatter::formatAttendees(Incidence *event) | |||
272 | mText.append("</li></ul>"); | 273 | mText.append("</li></ul>"); |
273 | 274 | ||
274 | addTag("h3",i18n("Attendees")); | 275 | addTag("h3",i18n("Attendees")); |
275 | Attendee *a; | 276 | Attendee *a; |
276 | mText.append("<ul>"); | 277 | mText.append("<ul>"); |
277 | for(a=attendees.first();a;a=attendees.next()) { | 278 | for(a=attendees.first();a;a=attendees.next()) { |
278 | #ifndef KORG_NOKABC | 279 | #if 0 |
280 | //ndef KORG_NOKABC | ||
279 | if (a->name().isEmpty()) { | 281 | if (a->name().isEmpty()) { |
280 | addressList = add_book->findByEmail(a->email()); | 282 | addressList = add_book->findByEmail(a->email()); |
281 | KABC::Addressee o = addressList.first(); | 283 | KABC::Addressee o = addressList.first(); |
282 | if (!o.isEmpty() && addressList.size()<2) { | 284 | if (!o.isEmpty() && addressList.size()<2) { |
283 | mText += "<a href=\"uid:" + o.uid() + "\">"; | 285 | mText += "<a href=\"uid:" + o.uid() + "\">"; |
284 | mText += o.formattedName(); | 286 | mText += o.formattedName(); |