| -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 @@ #include <qfile.h> #include <qapplication.h> #include "addresseeview.h" + +#ifndef DESKTOP_VERSION +#include <qtopia/qcopenvelope_qws.h> +#endif + + + using namespace KPIM; AddresseeView::AddresseeView( QWidget *parent, const char *name ) //US : KTextBrowser( parent, name ) : QTextBrowser( parent, name ) @@ -50,13 +57,21 @@ AddresseeView::AddresseeView( QWidget *parent, const char *name ) //US QStyleSheet *sheet = styleSheet(); //US QStyleSheetItem *link = sheet->item( "a" ); //US link->setColor( KGlobalSettings::linkColor() ); } +void AddresseeView::setSource(const QString& n) +{ + //qDebug("********AddresseeView::setSource %s", n.mid(7).latin1()); +#ifndef DESKTOP_VERSION + QCopEnvelope e("QPE/Application/kmpi", "newMail(QString)"); + e << n.mid(7); +#endif +} void AddresseeView::setAddressee( const KABC::Addressee& addr ) { mAddressee = addr; // clear view setText( QString::null ); @@ -82,14 +97,15 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) QStringList emails = mAddressee.emails(); QStringList::ConstIterator emailIt; QString type = i18n( "Email" ); for ( emailIt = emails.begin(); emailIt != emails.end(); ++emailIt ) { dynamicPart += QString( "<tr><td align=\"right\"><b>%1</b></td>" - "<td align=\"left\"><a href=\"mailto:%2\">%3</a></td></tr>" ) + "<td align=\"left\"><a href=\"mailto:%2 <%3> \">%4</a></td></tr>" ) .arg( type ) + .arg( name ) .arg( *emailIt ) .arg( *emailIt ); type = i18n( "Other" ); } 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 /** Sets the addressee object. The addressee is displayed immediately. @param addr The addressee object. */ void setAddressee( const KABC::Addressee& addr ); - + void setSource(const QString& n); /** Returns the current addressee object. */ KABC::Addressee addressee() const; 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) { QPtrList<Attendee> attendees = event->attendees(); if (attendees.count()) { QString iconPath = KGlobal::iconLoader()->iconPath("mailappt",KIcon::Small); addTag("h3",i18n("Organizer")); mText.append("<ul><li>"); -#ifndef KORG_NOKABC +#if 0 + //ndef KORG_NOKABC KABC::AddressBook *add_book = KABC::StdAddressBook::self(); KABC::Addressee::List addressList; addressList = add_book->findByEmail(event->organizer()); KABC::Addressee o = addressList.first(); if (!o.isEmpty() && addressList.size()<2) { @@ -272,13 +273,14 @@ void KIncidenceFormatter::formatAttendees(Incidence *event) mText.append("</li></ul>"); addTag("h3",i18n("Attendees")); Attendee *a; mText.append("<ul>"); for(a=attendees.first();a;a=attendees.next()) { -#ifndef KORG_NOKABC +#if 0 +//ndef KORG_NOKABC if (a->name().isEmpty()) { addressList = add_book->findByEmail(a->email()); KABC::Addressee o = addressList.first(); if (!o.isEmpty() && addressList.size()<2) { mText += "<a href=\"uid:" + o.uid() + "\">"; mText += o.formattedName(); |