summaryrefslogtreecommitdiff
authoreilers <eilers>2002-10-13 11:22:01 (UTC)
committer eilers <eilers>2002-10-13 11:22:01 (UTC)
commit5f9fb52583eb399c79a108b8e79c1a558a730422 (patch) (unidiff)
treed578ce7167053003e1cc5c5e3821bd4ac26fe122
parent1cbed80910293516879d9b9308ae36072033f70e (diff)
downloadopie-5f9fb52583eb399c79a108b8e79c1a558a730422.zip
opie-5f9fb52583eb399c79a108b8e79c1a558a730422.tar.gz
opie-5f9fb52583eb399c79a108b8e79c1a558a730422.tar.bz2
First attempt to fix language translation bug. Comboboxes should now
work if translation is broken... Some translations should be reenabled in next fix..
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
@@ -814,6 +814,8 @@ void AddressbookWindow::initFields()
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
@@ -840,3 +842,3 @@ void AddressbookWindow::initFields()
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();
@@ -887,9 +889,9 @@ void AddressbookWindow::initFields()
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
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
@@ -107,4 +107,4 @@ void ContactEditor::init() {
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("" );
@@ -114,4 +114,4 @@ void ContactEditor::init() {
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("" );
@@ -122,4 +122,4 @@ void ContactEditor::init() {
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( "" );
@@ -129,4 +129,4 @@ void ContactEditor::init() {
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( "" );
@@ -144,4 +144,4 @@ void ContactEditor::init() {
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( "" );
@@ -151,4 +151,4 @@ void ContactEditor::init() {
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( "" );
@@ -159,4 +159,4 @@ void ContactEditor::init() {
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( "" );
@@ -166,4 +166,4 @@ void ContactEditor::init() {
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( "" );
@@ -173,4 +173,4 @@ void ContactEditor::init() {
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( "" );
@@ -180,4 +180,4 @@ void ContactEditor::init() {
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( "" );
@@ -187,4 +187,4 @@ void ContactEditor::init() {
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( "" );
@@ -197,3 +197,3 @@ void ContactEditor::init() {
197 197
198 if ( *it == tr( "Name Title" ) ) { 198 if ( *it == "Name Title" ) {
199 //slDynamicEntries->remove( it ); 199 //slDynamicEntries->remove( it );
@@ -202,3 +202,3 @@ void ContactEditor::init() {
202 202
203 if ( *it == tr( "First Name" ) ) { 203 if ( *it == "First Name" ) {
204 //slDynamicEntries->remove( it ); 204 //slDynamicEntries->remove( it );
@@ -207,3 +207,3 @@ void ContactEditor::init() {
207 207
208 if ( *it == tr( "Middle Name" ) ) { 208 if ( *it == "Middle Name" ) {
209 //slDynamicEntries->remove( it ); 209 //slDynamicEntries->remove( it );
@@ -212,3 +212,3 @@ void ContactEditor::init() {
212 212
213 if ( *it == tr( "Last Name" ) ) { 213 if ( *it == "Last Name" ) {
214 //slDynamicEntries->remove( it ); 214 //slDynamicEntries->remove( it );
@@ -217,3 +217,3 @@ void ContactEditor::init() {
217 217
218 if ( *it == tr( "Suffix" ) ) { 218 if ( *it == "Suffix" ) {
219 //slDynamicEntries->remove( it ); 219 //slDynamicEntries->remove( it );
@@ -222,3 +222,3 @@ void ContactEditor::init() {
222 222
223 if ( *it == tr( "File As" ) ) { 223 if ( *it == "File As" ) {
224 //slDynamicEntries->remove( it ); 224 //slDynamicEntries->remove( it );
@@ -227,3 +227,3 @@ void ContactEditor::init() {
227 227
228 if ( *it == tr( "Gender" ) ) { 228 if ( *it == "Gender" ) {
229 hasGender = TRUE; 229 hasGender = TRUE;
@@ -233,3 +233,3 @@ void ContactEditor::init() {
233 233
234 if ( *it == tr( "Job Title" ) ) { 234 if ( *it == "Job Title" ) {
235 hasTitle = TRUE; 235 hasTitle = TRUE;
@@ -239,3 +239,3 @@ void ContactEditor::init() {
239 239
240 if ( *it == tr( "Company") || *it == tr( "Organization" ) ) { 240 if ( ( *it == "Company") || (*it == "Organization" ) ) {
241 hasCompany = TRUE; 241 hasCompany = TRUE;
@@ -245,3 +245,3 @@ void ContactEditor::init() {
245 245
246 if ( *it == tr( "Notes" ) ) { 246 if ( *it == "Notes" ) {
247 hasNotes = TRUE; 247 hasNotes = TRUE;
@@ -251,3 +251,3 @@ void ContactEditor::init() {
251 251
252 if ( *it == tr( "Groups" ) ) { 252 if ( *it == "Groups" ) {
253 //slDynamicEntries->remove( it ); 253 //slDynamicEntries->remove( it );
@@ -256,3 +256,3 @@ void ContactEditor::init() {
256 256
257 if ( (*it) == tr( "Business Street" ) ) { 257 if ( (*it) == "Business Street" ) {
258 hasStreet = TRUE; 258 hasStreet = TRUE;
@@ -262,3 +262,3 @@ void ContactEditor::init() {
262 262
263 if ( (*it) == tr( "Home Street" ) ) { 263 if ( (*it) == "Home Street" ) {
264 hasStreet = TRUE; 264 hasStreet = TRUE;
@@ -280,3 +280,3 @@ void ContactEditor::init() {
280 280
281 if ( (*it) == tr( "Business City" ) ) { 281 if ( (*it) == "Business City" ) {
282 hasCity = TRUE; 282 hasCity = TRUE;
@@ -286,3 +286,3 @@ void ContactEditor::init() {
286 286
287 if ( (*it) == tr( "Business State" ) ) { 287 if ( (*it) == "Business State" ) {
288 hasState = TRUE; 288 hasState = TRUE;
@@ -292,3 +292,3 @@ void ContactEditor::init() {
292 292
293 if ( (*it) == tr( "Business Zip" ) ) { 293 if ( (*it) == "Business Zip" ) {
294 hasZip = TRUE; 294 hasZip = TRUE;
@@ -298,3 +298,3 @@ void ContactEditor::init() {
298 298
299 if ( (*it) == tr( "Business Country" ) ) { 299 if ( (*it) == "Business Country" ) {
300 hasCountry = TRUE; 300 hasCountry = TRUE;
@@ -304,3 +304,3 @@ void ContactEditor::init() {
304 304
305 if ( (*it) == tr( "Home City" ) ) { 305 if ( (*it) == "Home City" ) {
306 hasCity = TRUE; 306 hasCity = TRUE;
@@ -310,3 +310,3 @@ void ContactEditor::init() {
310 310
311 if ( (*it) == tr( "Home State" ) ) { 311 if ( (*it) == "Home State" ) {
312 hasState = TRUE; 312 hasState = TRUE;
@@ -316,3 +316,3 @@ void ContactEditor::init() {
316 316
317 if ( (*it) == tr( "Home Zip" ) ) { 317 if ( (*it) == "Home Zip" ) {
318 hasZip = TRUE; 318 hasZip = TRUE;
@@ -322,3 +322,3 @@ void ContactEditor::init() {
322 322
323 if ( (*it) == tr( "Home Country" ) ) { 323 if ( (*it) == "Home Country" ) {
324 hasCountry = TRUE; 324 hasCountry = TRUE;
@@ -1362,33 +1362,33 @@ void ContactEditor::setEntry( const OContact &entry ) {
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() );
@@ -1400,3 +1400,3 @@ void ContactEditor::setEntry( const OContact &entry ) {
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();
@@ -1406,6 +1406,6 @@ void ContactEditor::setEntry( const OContact &entry ) {
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();
@@ -1415,9 +1415,9 @@ void ContactEditor::setEntry( const OContact &entry ) {
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();
@@ -1427,6 +1427,6 @@ void ContactEditor::setEntry( const OContact &entry ) {
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();
@@ -1442,3 +1442,3 @@ void ContactEditor::setEntry( const OContact &entry ) {
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();
@@ -1463,5 +1463,6 @@ void ContactEditor::setEntry( const OContact &entry ) {
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();
@@ -1495,3 +1496,3 @@ void ContactEditor::saveEntry() {
1495 useFullName = FALSE; 1496 useFullName = FALSE;
1496 } 1497}
1497 1498
@@ -1559,33 +1560,33 @@ void ContactEditor::saveEntry() {
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() );
@@ -1597,3 +1598,3 @@ void ContactEditor::saveEntry() {
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 );
@@ -1603,6 +1604,6 @@ void ContactEditor::saveEntry() {
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 );
@@ -1615,3 +1616,3 @@ void ContactEditor::saveEntry() {
1615 1616
1616 if ( *it == tr("Emails" )) { 1617 if ( *it == "Emails" ){
1617 QString allemail; 1618 QString allemail;
@@ -1624,3 +1625,3 @@ void ContactEditor::saveEntry() {
1624 1625
1625 if ( *it == tr("Home Phone" )) 1626 if ( *it == "Home Phone" )
1626 ent.setHomePhone( *itV ); 1627 ent.setHomePhone( *itV );
@@ -1630,6 +1631,6 @@ void ContactEditor::saveEntry() {
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 );
@@ -1645,3 +1646,3 @@ void ContactEditor::saveEntry() {
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 );
@@ -1666,5 +1667,6 @@ void ContactEditor::saveEntry() {
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 );