summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/addresseeview.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/libkdepim/addresseeview.cpp b/libkdepim/addresseeview.cpp
index 5c4f538..d710541 100644
--- a/libkdepim/addresseeview.cpp
+++ b/libkdepim/addresseeview.cpp
@@ -118,74 +118,76 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr )
118 } else { 118 } else {
119 dynamicPart += QString( 119 dynamicPart += QString(
120 "<tr><td align=\"right\"><b>%1</b></td>" 120 "<tr><td align=\"right\"><b>%1</b></td>"
121 "<td align=\"left\">%2</td></tr>" ) 121 "<td align=\"left\">%2</td></tr>" )
122 .arg( type ) 122 .arg( type )
123 .arg( *emailIt ); 123 .arg( *emailIt );
124 ++emailIt; 124 ++emailIt;
125 } 125 }
126 } 126 }
127 127
128 KABC::PhoneNumber::List phones = mAddressee.phoneNumbers(); 128 KABC::PhoneNumber::List phones = mAddressee.phoneNumbers();
129 KABC::PhoneNumber::List::ConstIterator phoneIt; 129 KABC::PhoneNumber::List::ConstIterator phoneIt;
130 QString extension; 130 QString extension;
131 int phonetype; 131 int phonetype;
132 QString sms; 132 QString sms;
133 for ( phoneIt = phones.begin(); phoneIt != phones.end(); ++phoneIt ) { 133 for ( phoneIt = phones.begin(); phoneIt != phones.end(); ++phoneIt ) {
134 phonetype = (*phoneIt).type(); 134 phonetype = (*phoneIt).type();
135 if (ksmsAvail && 135 if (ksmsAvail &&
136 ( 136 (
137 ((phonetype & KABC::PhoneNumber::Car) == KABC::PhoneNumber::Car) || 137 ((phonetype & KABC::PhoneNumber::Car) == KABC::PhoneNumber::Car) ||
138 ((phonetype & KABC::PhoneNumber::Cell) == KABC::PhoneNumber::Cell) 138 ((phonetype & KABC::PhoneNumber::Cell) == KABC::PhoneNumber::Cell)
139 ) 139 )
140 ) 140 )
141 { 141 {
142 sms = QString("<a href=\"smsto:%1 \">(sms)</a>" ) 142 sms = QString("<a href=\"smsto:%1 \">(sms)</a>" )
143 .arg( (*phoneIt).number() ); 143 .arg( (*phoneIt).number() );
144 144
145 } 145 }
146 else 146 else
147 sms = ""; 147 sms = "";
148 148
149 extension = QString::null; 149 extension = QString::null;
150 if ((phonetype & KABC::PhoneNumber::Fax) == KABC::PhoneNumber::Fax) 150 if ((phonetype & KABC::PhoneNumber::Fax) == KABC::PhoneNumber::Fax) {
151 if (kfaxAvail) extension = "faxto:"; 151 if (kfaxAvail) extension = "faxto:";
152 else if ((phonetype & KABC::PhoneNumber::Pager) == KABC::PhoneNumber::Pager) 152 }
153 else if ((phonetype & KABC::PhoneNumber::Pager) == KABC::PhoneNumber::Pager) {
153 if (kpagerAvail) extension = "pagerto:"; 154 if (kpagerAvail) extension = "pagerto:";
154 else if (kphoneAvail) 155 }
156 else if (kphoneAvail) {
155 extension = "phoneto:"; 157 extension = "phoneto:";
158 }
156 else 159 else
157 extension = QString::null; 160 extension = QString::null;
158 161
159
160 if ( !extension.isEmpty() ) { 162 if ( !extension.isEmpty() ) {
161 dynamicPart += QString( 163 dynamicPart += QString(
162 "<tr><td align=\"right\"><b>%1</b></td>" 164 "<tr><td align=\"right\"><b>%1</b></td>"
163 "<td align=\"left\"><a href=\"%2%3 \">%4</a> %5</td></tr>" ) 165 "<td align=\"left\"><a href=\"%2%3 \">%4</a> %5</td></tr>" )
164 .arg( KABC::PhoneNumber::typeLabel( phonetype ) ) 166 .arg( KABC::PhoneNumber::typeLabel( phonetype ) )
165 .arg( extension ) 167 .arg( extension )
166 .arg( (*phoneIt).number() ) 168 .arg( (*phoneIt).number() )
167 .arg( (*phoneIt).number() ) 169 .arg( (*phoneIt).number() )
168 .arg( sms ); 170 .arg( sms );
169 171
170 } else { 172 } else {
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 %3</td></tr>" ) 175 "<td align=\"left\">%2 %3</td></tr>" )
174 .arg( KABC::PhoneNumber::typeLabel( phonetype ) ) 176 .arg( KABC::PhoneNumber::typeLabel( phonetype ) )
175 .arg( (*phoneIt).number() ) 177 .arg( (*phoneIt).number() )
176 .arg( sms ); 178 .arg( sms );
177 } 179 }
178 } 180 }
179 181
180 182
181 for ( ; emailIt != emails.end(); ++emailIt ) { 183 for ( ; emailIt != emails.end(); ++emailIt ) {
182 if ( kemailAvail ) { 184 if ( kemailAvail ) {
183 dynamicPart += QString( 185 dynamicPart += QString(
184 "<tr><td align=\"right\"><b>%1</b></td>" 186 "<tr><td align=\"right\"><b>%1</b></td>"
185 "<td align=\"left\"><a href=\"mailto:%2 <%3> \">%4</a></td></tr>" ) 187 "<td align=\"left\"><a href=\"mailto:%2 <%3> \">%4</a></td></tr>" )
186 .arg( type ) 188 .arg( type )
187 .arg( name ) 189 .arg( name )
188 .arg( *emailIt ) 190 .arg( *emailIt )
189 .arg( *emailIt ); 191 .arg( *emailIt );
190 } else { 192 } else {
191 dynamicPart += QString( 193 dynamicPart += QString(