-rw-r--r-- | kabc/addresseeview.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp index aae923c..5c24acf 100644 --- a/kabc/addresseeview.cpp +++ b/kabc/addresseeview.cpp | |||
@@ -119,63 +119,65 @@ void AddresseeView::setSource(const QString& n) | |||
119 | ExternalAppHandler::instance()->callBySMS( n.mid(6) ); | 119 | ExternalAppHandler::instance()->callBySMS( n.mid(6) ); |
120 | else if ( n.left( 7 ) == "pagerto" ) | 120 | else if ( n.left( 7 ) == "pagerto" ) |
121 | ExternalAppHandler::instance()->callByPager( n.mid(8) ); | 121 | ExternalAppHandler::instance()->callByPager( n.mid(8) ); |
122 | else if ( n.left( 5 ) == "sipto" ) | 122 | else if ( n.left( 5 ) == "sipto" ) |
123 | ExternalAppHandler::instance()->callBySIP( n.mid(6) ); | 123 | ExternalAppHandler::instance()->callBySIP( n.mid(6) ); |
124 | 124 | ||
125 | } | 125 | } |
126 | void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) | 126 | void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) |
127 | { | 127 | { |
128 | bool kemailAvail = ExternalAppHandler::instance()->isEmailAppAvailable(); | 128 | bool kemailAvail = ExternalAppHandler::instance()->isEmailAppAvailable(); |
129 | // mAddressee = addr; | 129 | // mAddressee = addr; |
130 | // clear view | 130 | // clear view |
131 | //setText( QString::null ); | 131 | //setText( QString::null ); |
132 | mCurrentContact = mAddressee; | 132 | mCurrentContact = mAddressee; |
133 | if ( mAddressee.isEmpty() ) { | 133 | if ( mAddressee.isEmpty() ) { |
134 | setText( QString::null); | 134 | setText( QString::null); |
135 | return; | 135 | return; |
136 | } | 136 | } |
137 | #if 0 | 137 | #if 0 |
138 | QString name = ( mAddressee.assembledName().isEmpty() ? | 138 | QString name = ( mAddressee.assembledName().isEmpty() ? |
139 | mAddressee.formattedName() : mAddressee.assembledName() ); | 139 | mAddressee.formattedName() : mAddressee.assembledName() ); |
140 | #endif | 140 | #endif |
141 | 141 | ||
142 | QString name = mAddressee.realName(); | 142 | QString name = mAddressee.realName(); |
143 | 143 | QString assName = mAddressee.assembledName(); | |
144 | if ( assName.isEmpty() ) | ||
145 | assName = name; | ||
144 | QString dynamicPart; | 146 | QString dynamicPart; |
145 | 147 | ||
146 | dynamicPart += getPhoneNumbers( mAddressee.phoneNumbers(),true ); | 148 | dynamicPart += getPhoneNumbers( mAddressee.phoneNumbers(),true ); |
147 | QStringList emails = mAddressee.emails(); | 149 | QStringList emails = mAddressee.emails(); |
148 | QStringList::ConstIterator emailIt; | 150 | QStringList::ConstIterator emailIt; |
149 | QString type = i18n( "Email" ); | 151 | QString type = i18n( "Email" ); |
150 | emailIt = emails.begin(); | 152 | emailIt = emails.begin(); |
151 | if ( emailIt != emails.end() ) { | 153 | if ( emailIt != emails.end() ) { |
152 | if ( kemailAvail ) { | 154 | if ( kemailAvail ) { |
153 | dynamicPart += QString( | 155 | dynamicPart += QString( |
154 | "<tr><td align=\"right\"><b>%1</b></td>" | 156 | "<tr><td align=\"right\"><b>%1</b></td>" |
155 | "<td align=\"left\"><a href=\"mailto:%2 <%3> \">%4</a></td></tr>" ) | 157 | "<td align=\"left\"><a href=\"mailto:%2 <%3> \">%4</a></td></tr>" ) |
156 | .arg( type ) | 158 | .arg( type ) |
157 | .arg( name ) | 159 | .arg( assName ) |
158 | .arg( *emailIt ) | 160 | .arg( *emailIt ) |
159 | .arg( *emailIt ); | 161 | .arg( *emailIt ); |
160 | ++emailIt; | 162 | ++emailIt; |
161 | } else { | 163 | } else { |
162 | dynamicPart += QString( | 164 | dynamicPart += QString( |
163 | "<tr><td align=\"right\"><b>%1</b></td>" | 165 | "<tr><td align=\"right\"><b>%1</b></td>" |
164 | "<td align=\"left\">%2</td></tr>" ) | 166 | "<td align=\"left\">%2</td></tr>" ) |
165 | .arg( type ) | 167 | .arg( type ) |
166 | .arg( *emailIt ); | 168 | .arg( *emailIt ); |
167 | ++emailIt; | 169 | ++emailIt; |
168 | } | 170 | } |
169 | } | 171 | } |
170 | if ( mAddressee.birthday().date().isValid() ) { | 172 | if ( mAddressee.birthday().date().isValid() ) { |
171 | dynamicPart += QString( | 173 | dynamicPart += QString( |
172 | "<tr><td align=\"right\"><b>%1</b></td>" | 174 | "<tr><td align=\"right\"><b>%1</b></td>" |
173 | "<td align=\"left\">%2</td></tr>" ) | 175 | "<td align=\"left\">%2</td></tr>" ) |
174 | .arg( i18n ("Birthday") ) | 176 | .arg( i18n ("Birthday") ) |
175 | .arg( KGlobal::locale()->formatDate( mAddressee.birthday().date() ,true) ); | 177 | .arg( KGlobal::locale()->formatDate( mAddressee.birthday().date() ,true) ); |
176 | } | 178 | } |
177 | dynamicPart += getPhoneNumbers( mAddressee.phoneNumbers(), false ); | 179 | dynamicPart += getPhoneNumbers( mAddressee.phoneNumbers(), false ); |
178 | 180 | ||
179 | for ( ; emailIt != emails.end(); ++emailIt ) { | 181 | for ( ; emailIt != emails.end(); ++emailIt ) { |
180 | if ( kemailAvail ) { | 182 | if ( kemailAvail ) { |
181 | dynamicPart += QString( | 183 | dynamicPart += QString( |