author | eilers <eilers> | 2002-12-27 12:25:08 (UTC) |
---|---|---|
committer | eilers <eilers> | 2002-12-27 12:25:08 (UTC) |
commit | 36c8b8ffff2c8a7a454aa1b8afbe96bd9b1535f9 (patch) (unidiff) | |
tree | 82c1e5d1763f7f3afbc9b02f48894f2ca24ef764 /core | |
parent | eea5575187d95968ad76b49e4334e1165952163c (diff) | |
download | opie-36c8b8ffff2c8a7a454aa1b8afbe96bd9b1535f9.zip opie-36c8b8ffff2c8a7a454aa1b8afbe96bd9b1535f9.tar.gz opie-36c8b8ffff2c8a7a454aa1b8afbe96bd9b1535f9.tar.bz2 |
Children and nickname was not shown .. fixed !
-rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp index 254cff7..1b83308 100644 --- a/core/pim/addressbook/contacteditor.cpp +++ b/core/pim/addressbook/contacteditor.cpp | |||
@@ -47,6 +47,8 @@ | |||
47 | #include <qaction.h> | 47 | #include <qaction.h> |
48 | #include <qiconset.h> | 48 | #include <qiconset.h> |
49 | 49 | ||
50 | #include <assert.h> | ||
51 | |||
50 | static inline bool containsAlphaNum( const QString &str ); | 52 | static inline bool containsAlphaNum( const QString &str ); |
51 | static inline bool constainsWhiteSpace( const QString &str ); | 53 | static inline bool constainsWhiteSpace( const QString &str ); |
52 | 54 | ||
@@ -94,6 +96,25 @@ void ContactEditor::init() { | |||
94 | slChooserNames = OContactFields::untrphonefields( false ); | 96 | slChooserNames = OContactFields::untrphonefields( false ); |
95 | slDynamicEntries = OContactFields::untrdetailsfields( false ); | 97 | slDynamicEntries = OContactFields::untrdetailsfields( false ); |
96 | trlDynamicEntries = OContactFields::trdetailsfields( false ); | 98 | trlDynamicEntries = OContactFields::trdetailsfields( false ); |
99 | |||
100 | // Ok, we have to remove elements from the list of dynamic entries | ||
101 | // which are now stored in special (not dynamic) widgets.. | ||
102 | // Otherwise we will get problems with field assignments! (se) | ||
103 | slDynamicEntries.remove("Anniversary"); | ||
104 | slDynamicEntries.remove("Birthday"); | ||
105 | slDynamicEntries.remove("Gender"); | ||
106 | |||
107 | // The same with translated fields.. But I will | ||
108 | // use the translation map to avoid mismatches.. | ||
109 | QMap<int, QString> translMap = OContactFields::idToTrFields(); | ||
110 | trlDynamicEntries.remove( translMap[Qtopia::Anniversary] ); | ||
111 | trlDynamicEntries.remove( translMap[Qtopia::Birthday] ); | ||
112 | trlDynamicEntries.remove( translMap[Qtopia::Gender] ); | ||
113 | |||
114 | // Last Check to be sure.. | ||
115 | assert( slDynamicEntries.count() == trlDynamicEntries.count() ); | ||
116 | assert( slChooserNames.count() == trlChooserNames.count() ); | ||
117 | |||
97 | for (i = 0; i < slChooserNames.count(); i++) | 118 | for (i = 0; i < slChooserNames.count(); i++) |
98 | slChooserValues.append(""); | 119 | slChooserValues.append(""); |
99 | 120 | ||
@@ -1176,6 +1197,9 @@ void ContactEditor::setEntry( const OContact &entry ) { | |||
1176 | QStringList::ConstIterator it; | 1197 | QStringList::ConstIterator it; |
1177 | QListIterator<QLineEdit> itLE( listValue ); | 1198 | QListIterator<QLineEdit> itLE( listValue ); |
1178 | for ( it = slDynamicEntries.begin(); itLE.current()/* != slDynamicEntries.end()*/; ++it, ++itLE) { | 1199 | for ( it = slDynamicEntries.begin(); itLE.current()/* != slDynamicEntries.end()*/; ++it, ++itLE) { |
1200 | |||
1201 | qWarning(" Filling dynamic Field: %s", (*it).latin1() ); | ||
1202 | |||
1179 | if ( *it == "Department" ) | 1203 | if ( *it == "Department" ) |
1180 | (*itLE)->setText( ent.department() ); | 1204 | (*itLE)->setText( ent.department() ); |
1181 | 1205 | ||
@@ -1197,8 +1221,10 @@ void ContactEditor::setEntry( const OContact &entry ) { | |||
1197 | if ( *it == "Spouse" ) | 1221 | if ( *it == "Spouse" ) |
1198 | (*itLE)->setText( ent.spouse() ); | 1222 | (*itLE)->setText( ent.spouse() ); |
1199 | 1223 | ||
1200 | if ( *it == "Nickname" ) | 1224 | if ( *it == "Nickname" ){ |
1225 | qWarning("**** Nichname: %s", ent.nickname().latin1() ); | ||
1201 | (*itLE)->setText( ent.nickname() ); | 1226 | (*itLE)->setText( ent.nickname() ); |
1227 | } | ||
1202 | 1228 | ||
1203 | if ( *it == "Children" ) | 1229 | if ( *it == "Children" ) |
1204 | (*itLE)->setText( ent.children() ); | 1230 | (*itLE)->setText( ent.children() ); |