author | zautrix <zautrix> | 2005-06-03 13:37:47 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-03 13:37:47 (UTC) |
commit | 7aa43257ffb63e772342f24c1f7945e285171ee6 (patch) (unidiff) | |
tree | 7d68896cbbd5ae699bce7905e17824939022a488 /kabc/addresseeview.cpp | |
parent | f0554322b2f27e1fa60dc79a5d76ef0741bf3423 (diff) | |
download | kdepimpi-7aa43257ffb63e772342f24c1f7945e285171ee6.zip kdepimpi-7aa43257ffb63e772342f24c1f7945e285171ee6.tar.gz kdepimpi-7aa43257ffb63e772342f24c1f7945e285171ee6.tar.bz2 |
export kapi fix
-rw-r--r-- | kabc/addresseeview.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp index 9118c3d..667a5e2 100644 --- a/kabc/addresseeview.cpp +++ b/kabc/addresseeview.cpp | |||
@@ -38,16 +38,17 @@ | |||
38 | #include <qpushbutton.h> | 38 | #include <qpushbutton.h> |
39 | #ifdef DESKTOP_VERSION | 39 | #ifdef DESKTOP_VERSION |
40 | #include <qpaintdevicemetrics.h> | 40 | #include <qpaintdevicemetrics.h> |
41 | #include <qprinter.h> | 41 | #include <qprinter.h> |
42 | #include <qpainter.h> | 42 | #include <qpainter.h> |
43 | #endif | 43 | #endif |
44 | 44 | ||
45 | 45 | ||
46 | #include <qstylesheet.h> | ||
46 | #include "externalapphandler.h" | 47 | #include "externalapphandler.h" |
47 | #include <kabc/addresseeview.h> | 48 | #include <kabc/addresseeview.h> |
48 | 49 | ||
49 | 50 | ||
50 | //US #ifndef DESKTOP_VERSION | 51 | //US #ifndef DESKTOP_VERSION |
51 | //US #include <qtopia/qcopenvelope_qws.h> | 52 | //US #include <qtopia/qcopenvelope_qws.h> |
52 | //US #include <qpe/qpeapplication.h> | 53 | //US #include <qpe/qpeapplication.h> |
53 | //US #endif | 54 | //US #endif |
@@ -65,16 +66,17 @@ AddresseeView::AddresseeView( QWidget *parent, const char *name ) | |||
65 | setLinkUnderline( false ); | 66 | setLinkUnderline( false ); |
66 | // setVScrollBarMode( QScrollView::AlwaysOff ); | 67 | // setVScrollBarMode( QScrollView::AlwaysOff ); |
67 | //setHScrollBarMode( QScrollView::AlwaysOff ); | 68 | //setHScrollBarMode( QScrollView::AlwaysOff ); |
68 | 69 | ||
69 | //US QStyleSheet *sheet = styleSheet(); | 70 | //US QStyleSheet *sheet = styleSheet(); |
70 | //US QStyleSheetItem *link = sheet->item( "a" ); | 71 | //US QStyleSheetItem *link = sheet->item( "a" ); |
71 | //US link->setColor( KGlobalSettings::linkColor() ); | 72 | //US link->setColor( KGlobalSettings::linkColor() ); |
72 | 73 | ||
74 | |||
73 | } | 75 | } |
74 | void AddresseeView::printMe() | 76 | void AddresseeView::printMe() |
75 | { | 77 | { |
76 | #ifdef DESKTOP_VERSION | 78 | #ifdef DESKTOP_VERSION |
77 | QPrinter printer; | 79 | QPrinter printer; |
78 | if (!printer.setup() ) | 80 | if (!printer.setup() ) |
79 | return; | 81 | return; |
80 | QPainter p; | 82 | QPainter p; |
@@ -120,18 +122,22 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) | |||
120 | // mAddressee = addr; | 122 | // mAddressee = addr; |
121 | // clear view | 123 | // clear view |
122 | //setText( QString::null ); | 124 | //setText( QString::null ); |
123 | 125 | ||
124 | if ( mAddressee.isEmpty() ) { | 126 | if ( mAddressee.isEmpty() ) { |
125 | setText( QString::null); | 127 | setText( QString::null); |
126 | return; | 128 | return; |
127 | } | 129 | } |
130 | #if 0 | ||
128 | QString name = ( mAddressee.assembledName().isEmpty() ? | 131 | QString name = ( mAddressee.assembledName().isEmpty() ? |
129 | mAddressee.formattedName() : mAddressee.assembledName() ); | 132 | mAddressee.formattedName() : mAddressee.assembledName() ); |
133 | #endif | ||
134 | |||
135 | QString name = mAddressee.realName(); | ||
130 | 136 | ||
131 | QString dynamicPart; | 137 | QString dynamicPart; |
132 | 138 | ||
133 | dynamicPart += getPhoneNumbers( mAddressee.phoneNumbers(),true ); | 139 | dynamicPart += getPhoneNumbers( mAddressee.phoneNumbers(),true ); |
134 | QStringList emails = mAddressee.emails(); | 140 | QStringList emails = mAddressee.emails(); |
135 | QStringList::ConstIterator emailIt; | 141 | QStringList::ConstIterator emailIt; |
136 | QString type = i18n( "Email" ); | 142 | QString type = i18n( "Email" ); |
137 | emailIt = emails.begin(); | 143 | emailIt = emails.begin(); |