author | zautrix <zautrix> | 2004-09-07 18:13:35 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-07 18:13:35 (UTC) |
commit | 9d5c8750ae671e73ec8ebc0a71f30fd30680f2c0 (patch) (unidiff) | |
tree | 57644161d6aa1bb0820a5fff0330568db50806f4 | |
parent | dd1e64eda9500a424d83738db5cd5f7a7a208e3b (diff) | |
download | kdepimpi-9d5c8750ae671e73ec8ebc0a71f30fd30680f2c0.zip kdepimpi-9d5c8750ae671e73ec8ebc0a71f30fd30680f2c0.tar.gz kdepimpi-9d5c8750ae671e73ec8ebc0a71f30fd30680f2c0.tar.bz2 |
bigfix in addresseeview
-rw-r--r-- | libkdepim/addresseeview.cpp | 10 |
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 | |||
@@ -102,106 +102,108 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) | |||
102 | QString dynamicPart; | 102 | QString dynamicPart; |
103 | 103 | ||
104 | QStringList emails = mAddressee.emails(); | 104 | QStringList emails = mAddressee.emails(); |
105 | QStringList::ConstIterator emailIt; | 105 | QStringList::ConstIterator emailIt; |
106 | QString type = i18n( "Email" ); | 106 | QString type = i18n( "Email" ); |
107 | emailIt = emails.begin(); | 107 | emailIt = emails.begin(); |
108 | if ( emailIt != emails.end() ) { | 108 | if ( emailIt != emails.end() ) { |
109 | if ( kemailAvail ) { | 109 | if ( kemailAvail ) { |
110 | dynamicPart += QString( | 110 | dynamicPart += QString( |
111 | "<tr><td align=\"right\"><b>%1</b></td>" | 111 | "<tr><td align=\"right\"><b>%1</b></td>" |
112 | "<td align=\"left\"><a href=\"mailto:%2 <%3> \">%4</a></td></tr>" ) | 112 | "<td align=\"left\"><a href=\"mailto:%2 <%3> \">%4</a></td></tr>" ) |
113 | .arg( type ) | 113 | .arg( type ) |
114 | .arg( name ) | 114 | .arg( name ) |
115 | .arg( *emailIt ) | 115 | .arg( *emailIt ) |
116 | .arg( *emailIt ); | 116 | .arg( *emailIt ); |
117 | ++emailIt; | 117 | ++emailIt; |
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( |
192 | "<tr><td align=\"right\"><b>%1</b></td>" | 194 | "<tr><td align=\"right\"><b>%1</b></td>" |
193 | "<td align=\"left\">%2</td></tr>" ) | 195 | "<td align=\"left\">%2</td></tr>" ) |
194 | .arg( type ) | 196 | .arg( type ) |
195 | .arg( *emailIt ); | 197 | .arg( *emailIt ); |
196 | } | 198 | } |
197 | } | 199 | } |
198 | 200 | ||
199 | if ( !mAddressee.url().url().isEmpty() ) { | 201 | if ( !mAddressee.url().url().isEmpty() ) { |
200 | dynamicPart += QString( | 202 | dynamicPart += QString( |
201 | "<tr><td align=\"right\"><b>%1</b></td>" | 203 | "<tr><td align=\"right\"><b>%1</b></td>" |
202 | "<td align=\"left\">%2</td></tr>" ) | 204 | "<td align=\"left\">%2</td></tr>" ) |
203 | .arg( i18n( "Homepage" ) ) | 205 | .arg( i18n( "Homepage" ) ) |
204 | //US .arg( KStringHandler::tagURLs( mAddressee.url().url() ) ); | 206 | //US .arg( KStringHandler::tagURLs( mAddressee.url().url() ) ); |
205 | .arg( mAddressee.url().url() ); | 207 | .arg( mAddressee.url().url() ); |
206 | //qDebug("AddresseeView::setAddressee has to be verified."); | 208 | //qDebug("AddresseeView::setAddressee has to be verified."); |
207 | } | 209 | } |