summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/addressbook.cpp24
-rw-r--r--core/pim/addressbook/contacteditor.cpp176
2 files changed, 102 insertions, 98 deletions
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index cf2eddf..472b13e 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -809,16 +809,18 @@ void AddressbookWindow::initFields()
809{ 809{
810 // we really don't need the things from the configuration, anymore 810 // we really don't need the things from the configuration, anymore
811 // only thing that is important are the important categories. So, 811 // only thing that is important are the important categories. So,
812 // Call the contact functions that correspond to these old functions... 812 // Call the contact functions that correspond to these old functions...
813 813
814 QStringList xmlFields = OContact::fields(); 814 QStringList xmlFields = OContact::fields();
815 QStringList visibleFields = OContact::trfields(); 815 QStringList visibleFields = OContact::untrfields();
816 // QStringList trFields = OContact::trfields();
817
816 xmlFields.remove( "Title" ); 818 xmlFields.remove( "Title" );
817 visibleFields.remove( tr("Name Title") ); 819 visibleFields.remove( "Name Title" );
818 visibleFields.remove( tr("Notes") ); 820 visibleFields.remove( "Notes" );
819 821
820 int i, version; 822 int i, version;
821 Config cfg( "AddressBook" ); 823 Config cfg( "AddressBook" );
822 QString zn; 824 QString zn;
823 825
824 // ### Write a function to keep this from happening again... 826 // ### Write a function to keep this from happening again...
@@ -835,13 +837,13 @@ void AddressbookWindow::initFields()
835 if ( version >= ADDRESSVERSION ) { 837 if ( version >= ADDRESSVERSION ) {
836 838
837 cfg.setGroup( "ImportantCategory" ); 839 cfg.setGroup( "ImportantCategory" );
838 840
839 zn = cfg.readEntry( "Category" + QString::number(i), QString::null ); 841 zn = cfg.readEntry( "Category" + QString::number(i), QString::null );
840 while ( !zn.isNull() ) { 842 while ( !zn.isNull() ) {
841 if ( zn.contains( tr("Work") ) || zn.contains( tr("Mb") ) ) { 843 if ( zn.contains( "Work" ) || zn.contains( "Mb" ) ) {
842 slOrderedFields.clear(); 844 slOrderedFields.clear();
843 break; 845 break;
844 } 846 }
845 slOrderedFields.append( zn ); 847 slOrderedFields.append( zn );
846 zn = cfg.readEntry( "Category" + QString::number(++i), QString::null ); 848 zn = cfg.readEntry( "Category" + QString::number(++i), QString::null );
847 } 849 }
@@ -882,19 +884,19 @@ void AddressbookWindow::initFields()
882 orderedFields.remove( Qtopia::FirstName ); 884 orderedFields.remove( Qtopia::FirstName );
883 orderedFields.remove( Qtopia::LastName ); 885 orderedFields.remove( Qtopia::LastName );
884 orderedFields.remove( Qtopia::DefaultEmail ); 886 orderedFields.remove( Qtopia::DefaultEmail );
885 orderedFields.remove( Qtopia::FileAs ); 887 orderedFields.remove( Qtopia::FileAs );
886 orderedFields.remove( Qtopia::Notes ); 888 orderedFields.remove( Qtopia::Notes );
887 orderedFields.remove( Qtopia::Gender ); 889 orderedFields.remove( Qtopia::Gender );
888 slOrderedFields.remove( tr("Name Title") ); 890 slOrderedFields.remove( "Name Title" );
889 slOrderedFields.remove( tr("First Name") ); 891 slOrderedFields.remove( "First Name" );
890 slOrderedFields.remove( tr("Last Name") ); 892 slOrderedFields.remove( "Last Name" );
891 slOrderedFields.remove( tr("File As") ); 893 slOrderedFields.remove( "File As" );
892 slOrderedFields.remove( tr("Default Email") ); 894 slOrderedFields.remove( "Default Email" );
893 slOrderedFields.remove( tr("Notes") ); 895 slOrderedFields.remove( "Notes" );
894 slOrderedFields.remove( tr("Gender") ); 896 slOrderedFields.remove( "Gender" );
895 897
896 } 898 }
897} 899}
898 900
899 901
900AbLabel *AddressbookWindow::abView() 902AbLabel *AddressbookWindow::abView()
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 12d7421..b01583f 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -102,36 +102,36 @@ void ContactEditor::init() {
102 hasZip = FALSE; 102 hasZip = FALSE;
103 hasCountry = FALSE; 103 hasCountry = FALSE;
104 104
105 QStringList::ConstIterator it = slOrdered.begin(); 105 QStringList::ConstIterator it = slOrdered.begin();
106 for ( i = 0; it != slOrdered.end(); i++, ++it ) { 106 for ( i = 0; it != slOrdered.end(); i++, ++it ) {
107 107
108 if ( (*it) == tr( "Business Fax" ) ) { 108 if ( (*it) == "Business Fax" ) {
109 slChooserNames.append( *it ); 109 slChooserNames.append( tr( "Business Fax" ) );
110 slChooserValues.append("" ); 110 slChooserValues.append("" );
111 //slDynamicEntries->remove( it ); 111 //slDynamicEntries->remove( it );
112 continue; 112 continue;
113 } 113 }
114 114
115 if ( (*it) == tr( "Home Fax" ) ) { 115 if ( (*it) == "Home Fax" ) {
116 slChooserNames.append( *it ); 116 slChooserNames.append( tr( "Home Fax" ) );
117 slChooserValues.append("" ); 117 slChooserValues.append("" );
118 //slDynamicEntries->remove( it ); 118 //slDynamicEntries->remove( it );
119 continue; 119 continue;
120 } 120 }
121 121
122 122
123 if ( (*it) == tr( "Business Phone" ) ) { 123 if ( (*it) == "Business Phone" ) {
124 slChooserNames.append( *it ); 124 slChooserNames.append( tr( "Business Phone" ) );
125 slChooserValues.append( "" ); 125 slChooserValues.append( "" );
126 //slDynamicEntries->remove( it ); 126 //slDynamicEntries->remove( it );
127 continue; 127 continue;
128 } 128 }
129 129
130 if ( (*it) == tr( "Home Phone" ) ) { 130 if ( (*it) == "Home Phone" ) {
131 slChooserNames.append( *it ); 131 slChooserNames.append( tr( "Home Phone" ) );
132 slChooserValues.append( "" ); 132 slChooserValues.append( "" );
133 //slDynamicEntries->remove( it ); 133 //slDynamicEntries->remove( it );
134 continue; 134 continue;
135 } 135 }
136 136
137/* 137/*
@@ -139,131 +139,131 @@ void ContactEditor::init() {
139 slChooserNames.append( *it ); 139 slChooserNames.append( *it );
140 slChooserValues.append( "" ); 140 slChooserValues.append( "" );
141 //slDynamicEntries->remove( it ); 141 //slDynamicEntries->remove( it );
142 continue; 142 continue;
143 } */ 143 } */
144 144
145 if ( (*it) == tr( "Business Mobile" ) ) { 145 if ( (*it) == "Business Mobile" ) {
146 slChooserNames.append( *it ); 146 slChooserNames.append( tr( "Business Mobile" ) );
147 slChooserValues.append( "" ); 147 slChooserValues.append( "" );
148 //slDynamicEntries->remove( it ); 148 //slDynamicEntries->remove( it );
149 continue; 149 continue;
150 } 150 }
151 151
152 if ( (*it) == tr( "Home Mobile" ) ) { 152 if ( (*it) == "Home Mobile" ) {
153 slChooserNames.append( *it ); 153 slChooserNames.append( tr( "Home Mobile" ) );
154 slChooserValues.append( "" ); 154 slChooserValues.append( "" );
155 //slDynamicEntries->remove( it ); 155 //slDynamicEntries->remove( it );
156 continue; 156 continue;
157 } 157 }
158 158
159 159
160 if ( (*it) == tr( "Business WebPage" ) ) { 160 if ( (*it) == "Business WebPage" ) {
161 slChooserNames.append( *it ); 161 slChooserNames.append( tr( "Business WebPage" ) );
162 slChooserValues.append( "" ); 162 slChooserValues.append( "" );
163 //slDynamicEntries->remove( it ); 163 //slDynamicEntries->remove( it );
164 continue; 164 continue;
165 } 165 }
166 166
167 if ( (*it) == tr( "Home Web Page" ) ) { 167 if ( (*it) == "Home Web Page" ) {
168 slChooserNames.append( *it ); 168 slChooserNames.append( tr( "Home Web Page" ) );
169 slChooserValues.append( "" ); 169 slChooserValues.append( "" );
170 //slDynamicEntries->remove( it ); 170 //slDynamicEntries->remove( it );
171 continue; 171 continue;
172 } 172 }
173 173
174 if ( (*it) == tr( "Business Pager" ) ) { 174 if ( (*it) == "Business Pager" ) {
175 slChooserNames.append( *it ); 175 slChooserNames.append( tr( "Business Pager" ) );
176 slChooserValues.append( "" ); 176 slChooserValues.append( "" );
177 //slDynamicEntries->remove( it ); 177 //slDynamicEntries->remove( it );
178 continue; 178 continue;
179 } 179 }
180 180
181 if ( *it == tr( "Default Email" ) ) { 181 if ( *it == "Default Email" ) {
182 slChooserNames.append( *it ); 182 slChooserNames.append( tr( "Default Email" ) );
183 slChooserValues.append( "" ); 183 slChooserValues.append( "" );
184 //slDynamicEntries->remove( it ); 184 //slDynamicEntries->remove( it );
185 continue; 185 continue;
186 } 186 }
187 187
188 if ( *it == tr( "Emails" ) ) { 188 if ( *it == "Emails" ) {
189 slChooserNames.append( *it ); 189 slChooserNames.append( tr( "Emails" ) );
190 slChooserValues.append( "" ); 190 slChooserValues.append( "" );
191 //slDynamicEntries->remove( it ); 191 //slDynamicEntries->remove( it );
192 continue; 192 continue;
193 } 193 }
194 194
195 if ( *it == "Name Title" || *it == "First Name" || *it == "Middle Name" || *it == "Last Name" || *it == "File As" || *it == "Default Email" || *it == "Emails" || *it == "Groups" ) 195 if ( *it == "Name Title" || *it == "First Name" || *it == "Middle Name" || *it == "Last Name" || *it == "File As" || *it == "Default Email" || *it == "Emails" || *it == "Groups" )
196 continue; 196 continue;
197 197
198 if ( *it == tr( "Name Title" ) ) { 198 if ( *it == "Name Title" ) {
199 //slDynamicEntries->remove( it ); 199 //slDynamicEntries->remove( it );
200 continue; 200 continue;
201 } 201 }
202 202
203 if ( *it == tr( "First Name" ) ) { 203 if ( *it == "First Name" ) {
204 //slDynamicEntries->remove( it ); 204 //slDynamicEntries->remove( it );
205 continue; 205 continue;
206 } 206 }
207 207
208 if ( *it == tr( "Middle Name" ) ) { 208 if ( *it == "Middle Name" ) {
209 //slDynamicEntries->remove( it ); 209 //slDynamicEntries->remove( it );
210 continue; 210 continue;
211 } 211 }
212 212
213 if ( *it == tr( "Last Name" ) ) { 213 if ( *it == "Last Name" ) {
214 //slDynamicEntries->remove( it ); 214 //slDynamicEntries->remove( it );
215 continue; 215 continue;
216 } 216 }
217 217
218 if ( *it == tr( "Suffix" ) ) { 218 if ( *it == "Suffix" ) {
219 //slDynamicEntries->remove( it ); 219 //slDynamicEntries->remove( it );
220 continue; 220 continue;
221 } 221 }
222 222
223 if ( *it == tr( "File As" ) ) { 223 if ( *it == "File As" ) {
224 //slDynamicEntries->remove( it ); 224 //slDynamicEntries->remove( it );
225 continue; 225 continue;
226 } 226 }
227 227
228 if ( *it == tr( "Gender" ) ) { 228 if ( *it == "Gender" ) {
229 hasGender = TRUE; 229 hasGender = TRUE;
230 //slDynamicEntries->remove( it ); 230 //slDynamicEntries->remove( it );
231 continue; 231 continue;
232 } 232 }
233 233
234 if ( *it == tr( "Job Title" ) ) { 234 if ( *it == "Job Title" ) {
235 hasTitle = TRUE; 235 hasTitle = TRUE;
236 //slDynamicEntries->remove( it ); 236 //slDynamicEntries->remove( it );
237 continue; 237 continue;
238 } 238 }
239 239
240 if ( *it == tr( "Company") || *it == tr( "Organization" ) ) { 240 if ( ( *it == "Company") || (*it == "Organization" ) ) {
241 hasCompany = TRUE; 241 hasCompany = TRUE;
242 //slDynamicEntries->remove( it ); 242 //slDynamicEntries->remove( it );
243 continue; 243 continue;
244 } 244 }
245 245
246 if ( *it == tr( "Notes" ) ) { 246 if ( *it == "Notes" ) {
247 hasNotes = TRUE; 247 hasNotes = TRUE;
248 //slDynamicEntries->remove( it ); 248 //slDynamicEntries->remove( it );
249 continue; 249 continue;
250 } 250 }
251 251
252 if ( *it == tr( "Groups" ) ) { 252 if ( *it == "Groups" ) {
253 //slDynamicEntries->remove( it ); 253 //slDynamicEntries->remove( it );
254 continue; 254 continue;
255 } 255 }
256 256
257 if ( (*it) == tr( "Business Street" ) ) { 257 if ( (*it) == "Business Street" ) {
258 hasStreet = TRUE; 258 hasStreet = TRUE;
259 //slDynamicEntries->remove( it ); 259 //slDynamicEntries->remove( it );
260 continue; 260 continue;
261 } 261 }
262 262
263 if ( (*it) == tr( "Home Street" ) ) { 263 if ( (*it) == "Home Street" ) {
264 hasStreet = TRUE; 264 hasStreet = TRUE;
265 //slDynamicEntries->remove( it ); 265 //slDynamicEntries->remove( it );
266 continue; 266 continue;
267 } 267 }
268/* 268/*
269 if ( (*it).right( 8 ) == tr( "Street 2" ) ) { 269 if ( (*it).right( 8 ) == tr( "Street 2" ) ) {
@@ -275,55 +275,55 @@ void ContactEditor::init() {
275 if ( (*it).right( 8 ) == tr( "P.O. Box" ) ) { 275 if ( (*it).right( 8 ) == tr( "P.O. Box" ) ) {
276 hasPOBox = TRUE; 276 hasPOBox = TRUE;
277 //slDynamicEntries->remove( it ); 277 //slDynamicEntries->remove( it );
278 continue; 278 continue;
279 } */ 279 } */
280 280
281 if ( (*it) == tr( "Business City" ) ) { 281 if ( (*it) == "Business City" ) {
282 hasCity = TRUE; 282 hasCity = TRUE;
283 //slDynamicEntries->remove( it ); 283 //slDynamicEntries->remove( it );
284 continue; 284 continue;
285 } 285 }
286 286
287 if ( (*it) == tr( "Business State" ) ) { 287 if ( (*it) == "Business State" ) {
288 hasState = TRUE; 288 hasState = TRUE;
289 //slDynamicEntries->remove( it ); 289 //slDynamicEntries->remove( it );
290 continue; 290 continue;
291 } 291 }
292 292
293 if ( (*it) == tr( "Business Zip" ) ) { 293 if ( (*it) == "Business Zip" ) {
294 hasZip = TRUE; 294 hasZip = TRUE;
295 //slDynamicEntries->remove( it ); 295 //slDynamicEntries->remove( it );
296 continue; 296 continue;
297 } 297 }
298 298
299 if ( (*it) == tr( "Business Country" ) ) { 299 if ( (*it) == "Business Country" ) {
300 hasCountry = TRUE; 300 hasCountry = TRUE;
301 //slDynamicEntries->remove( it ); 301 //slDynamicEntries->remove( it );
302 continue; 302 continue;
303 } 303 }
304 304
305 if ( (*it) == tr( "Home City" ) ) { 305 if ( (*it) == "Home City" ) {
306 hasCity = TRUE; 306 hasCity = TRUE;
307 //slDynamicEntries->remove( it ); 307 //slDynamicEntries->remove( it );
308 continue; 308 continue;
309 } 309 }
310 310
311 if ( (*it) == tr( "Home State" ) ) { 311 if ( (*it) == "Home State" ) {
312 hasState = TRUE; 312 hasState = TRUE;
313 //slDynamicEntries->remove( it ); 313 //slDynamicEntries->remove( it );
314 continue; 314 continue;
315 } 315 }
316 316
317 if ( (*it) == tr( "Home Zip" ) ) { 317 if ( (*it) == "Home Zip" ) {
318 hasZip = TRUE; 318 hasZip = TRUE;
319 //slDynamicEntries->remove( it ); 319 //slDynamicEntries->remove( it );
320 continue; 320 continue;
321 } 321 }
322 322
323 if ( (*it) == tr( "Home Country" ) ) { 323 if ( (*it) == "Home Country" ) {
324 hasCountry = TRUE; 324 hasCountry = TRUE;
325 //slDynamicEntries->remove( it ); 325 //slDynamicEntries->remove( it );
326 continue; 326 continue;
327 } 327 }
328 328
329 329
@@ -1357,93 +1357,93 @@ void ContactEditor::setEntry( const OContact &entry ) {
1357 slBusinessAddress[6] = ent.businessCountry(); 1357 slBusinessAddress[6] = ent.businessCountry();
1358 } 1358 }
1359 1359
1360 QStringList::ConstIterator it; 1360 QStringList::ConstIterator it;
1361 QListIterator<QLineEdit> itLE( listValue ); 1361 QListIterator<QLineEdit> itLE( listValue );
1362 for ( it = slDynamicEntries.begin(); it != slDynamicEntries.end(); ++it, ++itLE) { 1362 for ( it = slDynamicEntries.begin(); it != slDynamicEntries.end(); ++it, ++itLE) {
1363 if ( *it == tr("Department") ) 1363 if ( *it =="Department" )
1364 (*itLE)->setText( ent.department() ); 1364 (*itLE)->setText( ent.department() );
1365 1365
1366 if ( *it == tr("Company" )) 1366 if ( *it == "Company" )
1367 (*itLE)->setText( ent.company() ); 1367 (*itLE)->setText( ent.company() );
1368 1368
1369 if ( *it == tr("Office" )) 1369 if ( *it == "Office" )
1370 (*itLE)->setText( ent.office() ); 1370 (*itLE)->setText( ent.office() );
1371 1371
1372 if ( *it == tr("Profession" )) 1372 if ( *it == "Profession" )
1373 (*itLE)->setText( ent.profession() ); 1373 (*itLE)->setText( ent.profession() );
1374 1374
1375 if ( *it == tr("Assistant" )) 1375 if ( *it == "Assistant" )
1376 (*itLE)->setText( ent.assistant() ); 1376 (*itLE)->setText( ent.assistant() );
1377 1377
1378 if ( *it == tr("Manager" )) 1378 if ( *it == "Manager" )
1379 (*itLE)->setText( ent.manager() ); 1379 (*itLE)->setText( ent.manager() );
1380 1380
1381 if ( *it == tr("Spouse" )) 1381 if ( *it == "Spouse" )
1382 (*itLE)->setText( ent.spouse() ); 1382 (*itLE)->setText( ent.spouse() );
1383 1383
1384 if ( *it == tr("Birthday" )) 1384 if ( *it == "Birthday" )
1385 (*itLE)->setText( ent.birthday() ); 1385 (*itLE)->setText( ent.birthday() );
1386 1386
1387 if ( *it == tr("Anniversary" )) 1387 if ( *it == "Anniversary" )
1388 (*itLE)->setText( ent.anniversary() ); 1388 (*itLE)->setText( ent.anniversary() );
1389 1389
1390 if ( *it == tr("Nickname" )) 1390 if ( *it == "Nickname" )
1391 (*itLE)->setText( ent.nickname() ); 1391 (*itLE)->setText( ent.nickname() );
1392 1392
1393 if ( *it == tr("Children" )) 1393 if ( *it == "Children" )
1394 (*itLE)->setText( ent.children() ); 1394 (*itLE)->setText( ent.children() );
1395 1395
1396 } 1396 }
1397 1397
1398 QStringList::Iterator itV; 1398 QStringList::Iterator itV;
1399 for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) { 1399 for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) {
1400 1400
1401 if ( *it == tr("Business Phone") || *it == tr("Work Phone" )) 1401 if ( ( *it == "Business Phone") || ( *it == "Work Phone" ) )
1402 *itV = ent.businessPhone(); 1402 *itV = ent.businessPhone();
1403/* 1403/*
1404 if ( *it == "Business 2 Phone" ) 1404 if ( *it == "Business 2 Phone" )
1405 *itV = ent.business2Phone(); 1405 *itV = ent.business2Phone();
1406*/ 1406*/
1407 if ( *it == tr("Business Fax") || *it == tr("Work Fax" )) 1407 if ( ( *it == "Business Fax") || ( *it == "Work Fax" ) )
1408 *itV = ent.businessFax(); 1408 *itV = ent.businessFax();
1409 1409
1410 if ( *it == tr("Business Mobile") || *it == tr("work Mobile" )) 1410 if ( ( *it == "Business Mobile" ) || ( *it == "work Mobile" ) )
1411 *itV = ent.businessMobile(); 1411 *itV = ent.businessMobile();
1412/* 1412/*
1413 if ( *it == "Company Phone" ) 1413 if ( *it == "Company Phone" )
1414 *itV = ent.companyPhone(); 1414 *itV = ent.companyPhone();
1415*/ 1415*/
1416 if ( *it == tr("Default Email" )) 1416 if ( *it == "Default Email" )
1417 *itV = ent.defaultEmail(); 1417 *itV = ent.defaultEmail();
1418 1418
1419 if ( *it == tr("Emails" )) 1419 if ( *it == "Emails" )
1420 *itV = ent.emailList().join(", "); // :SX 1420 *itV = ent.emailList().join(", "); // :SX
1421 1421
1422 if ( *it == tr("Home Phone" )) 1422 if ( *it == "Home Phone" )
1423 *itV = ent.homePhone(); 1423 *itV = ent.homePhone();
1424/* 1424/*
1425 if ( *it == "Home 2 Phone" ) 1425 if ( *it == "Home 2 Phone" )
1426 *itV = ent.home2Phone(); 1426 *itV = ent.home2Phone();
1427*/ 1427*/
1428 if ( *it == tr("Home Fax" )) 1428 if ( *it == "Home Fax" )
1429 *itV = ent.homeFax(); 1429 *itV = ent.homeFax();
1430 1430
1431 if ( *it == tr("Home Mobile" )) 1431 if ( *it == "Home Mobile" )
1432 *itV = ent.homeMobile(); 1432 *itV = ent.homeMobile();
1433/* 1433/*
1434 if ( *it == "Car Phone" ) 1434 if ( *it == "Car Phone" )
1435 *itV = ent.carPhone(); 1435 *itV = ent.carPhone();
1436 1436
1437 if ( *it == "ISDN Phone" ) 1437 if ( *it == "ISDN Phone" )
1438 *itV = ent.ISDNPhone(); 1438 *itV = ent.ISDNPhone();
1439 1439
1440 if ( *it == "Other Phone" ) 1440 if ( *it == "Other Phone" )
1441 *itV = ent.otherPhone(); 1441 *itV = ent.otherPhone();
1442*/ 1442*/
1443 if ( *it == tr("Business Pager") || *it == tr("Work Pager" )) 1443 if ( ( *it == "Business Pager" ) || ( *it == "Work Pager" ) )
1444 *itV = ent.businessPager(); 1444 *itV = ent.businessPager();
1445/* 1445/*
1446 if ( *it == "Home Pager") 1446 if ( *it == "Home Pager")
1447 *itV = ent.homePager(); 1447 *itV = ent.homePager();
1448 1448
1449 if ( *it == "AIM IM" ) 1449 if ( *it == "AIM IM" )
@@ -1458,15 +1458,16 @@ void ContactEditor::setEntry( const OContact &entry ) {
1458 if ( *it == "MSN IM" ) 1458 if ( *it == "MSN IM" )
1459 *itV = ent.MSNIM(); 1459 *itV = ent.MSNIM();
1460 1460
1461 if ( *it == "Yahoo IM" ) 1461 if ( *it == "Yahoo IM" )
1462 *itV = ent.yahooIM(); 1462 *itV = ent.yahooIM();
1463*/ 1463*/
1464 if ( *it == tr("Home Web Page") ) 1464 if ( *it == "Home Web Page" )
1465 *itV = ent.homeWebpage(); 1465 *itV = ent.homeWebpage();
1466 if ( *it == tr("Business WebPage") || *it == tr("Work Web Page") ) 1466
1467 if ( ( *it == "Business WebPage" ) || ( *it == "Work Web Page" ) )
1467 *itV = ent.businessWebpage(); 1468 *itV = ent.businessWebpage();
1468 1469
1469 1470
1470 } 1471 }
1471 1472
1472 cmbCat->setCategories( ent.categories(), "Contacts", tr("Contacts") ); 1473 cmbCat->setCategories( ent.categories(), "Contacts", tr("Contacts") );
@@ -1490,13 +1491,13 @@ void ContactEditor::saveEntry() {
1490 txtFirstName->setText( parseName( txtFullName->text(), NAME_F ) ); 1491 txtFirstName->setText( parseName( txtFullName->text(), NAME_F ) );
1491 txtMiddleName->setText( parseName( txtFullName->text(), NAME_M ) ); 1492 txtMiddleName->setText( parseName( txtFullName->text(), NAME_M ) );
1492 txtLastName->setText( parseName( txtFullName->text(), NAME_L ) ); 1493 txtLastName->setText( parseName( txtFullName->text(), NAME_L ) );
1493 txtSuffix->setText( parseName( txtFullName->text(), NAME_S ) ); 1494 txtSuffix->setText( parseName( txtFullName->text(), NAME_S ) );
1494 1495
1495 useFullName = FALSE; 1496 useFullName = FALSE;
1496 } 1497}
1497 1498
1498 /*if ( ent.firstName() != txtFirstName->text() || 1499 /*if ( ent.firstName() != txtFirstName->text() ||
1499 ent.lastName != txtLastName->text() || 1500 ent.lastName != txtLastName->text() ||
1500 ent.middleName != txtMiddleName->text() ) { 1501 ent.middleName != txtMiddleName->text() ) {
1501 */ 1502 */
1502 ent.setFirstName( txtFirstName->text() ); 1503 ent.setFirstName( txtFirstName->text() );
@@ -1554,99 +1555,99 @@ void ContactEditor::saveEntry() {
1554 ent.setBusinessCountry( slBusinessAddress[6] ); 1555 ent.setBusinessCountry( slBusinessAddress[6] );
1555 } 1556 }
1556 1557
1557 QStringList::ConstIterator it; 1558 QStringList::ConstIterator it;
1558 QListIterator<QLineEdit> itLE( listValue ); 1559 QListIterator<QLineEdit> itLE( listValue );
1559 for ( it = slDynamicEntries.begin(); it != slDynamicEntries.end(); ++it, ++itLE) { 1560 for ( it = slDynamicEntries.begin(); it != slDynamicEntries.end(); ++it, ++itLE) {
1560 if ( *it == tr("Department" )) 1561 if ( *it == "Department" )
1561 ent.setDepartment( (*itLE)->text() ); 1562 ent.setDepartment( (*itLE)->text() );
1562 1563
1563 if ( *it == tr("Company" )) 1564 if ( *it == "Company" )
1564 ent.setCompany( (*itLE)->text() ); 1565 ent.setCompany( (*itLE)->text() );
1565 1566
1566 if ( *it == tr("Office" )) 1567 if ( *it == "Office" )
1567 ent.setOffice( (*itLE)->text() ); 1568 ent.setOffice( (*itLE)->text() );
1568 1569
1569 if ( *it == tr("Profession" )) 1570 if ( *it == "Profession" )
1570 ent.setProfession( (*itLE)->text() ); 1571 ent.setProfession( (*itLE)->text() );
1571 1572
1572 if ( *it == tr("Assistant" )) 1573 if ( *it == "Assistant" )
1573 ent.setAssistant( (*itLE)->text() ); 1574 ent.setAssistant( (*itLE)->text() );
1574 1575
1575 if ( *it == tr("Manager" )) 1576 if ( *it == "Manager" )
1576 ent.setManager( (*itLE)->text() ); 1577 ent.setManager( (*itLE)->text() );
1577 1578
1578 if ( *it == tr("Spouse" )) 1579 if ( *it == "Spouse" )
1579 ent.setSpouse( (*itLE)->text() ); 1580 ent.setSpouse( (*itLE)->text() );
1580 1581
1581 if ( *it == tr("Birthday" )) 1582 if ( *it == "Birthday" )
1582 ent.setBirthday( (*itLE)->text() ); 1583 ent.setBirthday( (*itLE)->text() );
1583 1584
1584 if ( *it == tr("Anniversary" )) 1585 if ( *it == "Anniversary" )
1585 ent.setAnniversary( (*itLE)->text() ); 1586 ent.setAnniversary( (*itLE)->text() );
1586 1587
1587 if ( *it == tr("Nickname" )) 1588 if ( *it == "Nickname" )
1588 ent.setNickname( (*itLE)->text() ); 1589 ent.setNickname( (*itLE)->text() );
1589 1590
1590 if ( *it == tr("Children" )) 1591 if ( *it == "Children" )
1591 ent.setChildren( (*itLE)->text() ); 1592 ent.setChildren( (*itLE)->text() );
1592 1593
1593 } 1594 }
1594 1595
1595 QStringList::ConstIterator itV; 1596 QStringList::ConstIterator itV;
1596 for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) { 1597 for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) {
1597 1598
1598 if ( *it == tr("Business Phone") || *it == tr("Work Phone" )) 1599 if ( ( *it == "Business Phone" ) || ( *it == "Work Phone" ) )
1599 ent.setBusinessPhone( *itV ); 1600 ent.setBusinessPhone( *itV );
1600/* 1601/*
1601 if ( *it == tr("Business 2 Phone" ) 1602 if ( *it == tr("Business 2 Phone" )
1602 ent.setBusiness2Phone( *itV ); 1603 ent.setBusiness2Phone( *itV );
1603*/ 1604*/
1604 if ( *it == tr("Business Fax") || *it == tr("Work Fax" )) 1605 if ( ( *it == "Business Fax" ) || ( *it == "Work Fax" ) )
1605 ent.setBusinessFax( *itV ); 1606 ent.setBusinessFax( *itV );
1606 1607
1607 if ( *it == tr("Business Mobile") || *it == tr("Work Mobile" )) 1608 if ( ( *it == "Business Mobile" ) || ( *it == "Work Mobile" ) )
1608 ent.setBusinessMobile( *itV ); 1609 ent.setBusinessMobile( *itV );
1609/* 1610/*
1610 if ( *it == "Company Phone" ) 1611 if ( *it == "Company Phone" )
1611 ent.setCompanyPhone( *itV ); 1612 ent.setCompanyPhone( *itV );
1612*/ 1613*/
1613 //if ( *it == "Default Email" ) 1614 //if ( *it == "Default Email" )
1614 //ent.setDefaultEmail( *itV ); 1615 //ent.setDefaultEmail( *itV );
1615 1616
1616 if ( *it == tr("Emails" )) { 1617 if ( *it == "Emails" ){
1617 QString allemail; 1618 QString allemail;
1618 QString defaultmail; 1619 QString defaultmail;
1619 parseEmailFrom( *itV, defaultmail, allemail ); 1620 parseEmailFrom( *itV, defaultmail, allemail );
1620 // ent.clearEmails(); 1621 // ent.clearEmails();
1621 ent.setDefaultEmail( defaultmail ); 1622 ent.setDefaultEmail( defaultmail );
1622 ent.setEmails( allemail ); 1623 ent.setEmails( allemail );
1623 } 1624 }
1624 1625
1625 if ( *it == tr("Home Phone" )) 1626 if ( *it == "Home Phone" )
1626 ent.setHomePhone( *itV ); 1627 ent.setHomePhone( *itV );
1627/* 1628/*
1628 if ( *it == "Home 2 Phone" ) 1629 if ( *it == "Home 2 Phone" )
1629 ent.setHome2Phone( *itV ); 1630 ent.setHome2Phone( *itV );
1630*/ 1631*/
1631 if ( *it == tr("Home Fax" )) 1632 if ( *it == "Home Fax" )
1632 ent.setHomeFax( *itV ); 1633 ent.setHomeFax( *itV );
1633 1634
1634 if ( *it == tr("Home Mobile" )) 1635 if ( *it == "Home Mobile" )
1635 ent.setHomeMobile( *itV ); 1636 ent.setHomeMobile( *itV );
1636/* 1637/*
1637 if ( *it == "Car Phone" ) 1638 if ( *it == "Car Phone" )
1638 ent.setCarPhone( *itV ); 1639 ent.setCarPhone( *itV );
1639 1640
1640 if ( *it == "ISDN Phone" ) 1641 if ( *it == "ISDN Phone" )
1641 ent.setISDNPhone( *itV ); 1642 ent.setISDNPhone( *itV );
1642 1643
1643 if ( *it == "Other Phone" ) 1644 if ( *it == "Other Phone" )
1644 ent.setOtherPhone( *itV ); 1645 ent.setOtherPhone( *itV );
1645*/ 1646*/
1646 if ( *it == tr("Business Pager") || *it == tr("Work Pager") ) 1647 if ( ( *it == "Business Pager" ) || ( *it == "Work Pager" ) )
1647 ent.setBusinessPager( *itV ); 1648 ent.setBusinessPager( *itV );
1648/* 1649/*
1649 if ( *it == "Home Pager" ) 1650 if ( *it == "Home Pager" )
1650 ent.setHomePager( *itV ); 1651 ent.setHomePager( *itV );
1651 1652
1652 if ( *it == "AIM IM" ) 1653 if ( *it == "AIM IM" )
@@ -1661,15 +1662,16 @@ void ContactEditor::saveEntry() {
1661 if ( *it == "MSN IM" ) 1662 if ( *it == "MSN IM" )
1662 ent.setMSNIM( *itV ); 1663 ent.setMSNIM( *itV );
1663 1664
1664 if ( *it == "Yahoo IM" ) 1665 if ( *it == "Yahoo IM" )
1665 ent.setYahooIM( *itV ); 1666 ent.setYahooIM( *itV );
1666*/ 1667*/
1667 if ( *it == tr("Home Web Page") ) 1668 if ( *it == "Home Web Page" )
1668 ent.setHomeWebpage( *itV ); 1669 ent.setHomeWebpage( *itV );
1669 if ( *it == tr("Business WebPage") || *it == tr("Work Web Page" )) 1670
1671 if ( ( *it == "Business WebPage" ) || ( *it == "Work Web Page" ) )
1670 ent.setBusinessWebpage( *itV ); 1672 ent.setBusinessWebpage( *itV );
1671 1673
1672 1674
1673 } 1675 }
1674 1676
1675 int gender = cmbGender->currentItem(); 1677 int gender = cmbGender->currentItem();