Diffstat (limited to 'core/pim/addressbook/contacteditor.cpp') (more/less context) (ignore whitespace changes)
-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 | |||
@@ -48,4 +48,6 @@ | |||
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 ); |
@@ -95,4 +97,23 @@ void ContactEditor::init() { | |||
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(""); |
@@ -1177,4 +1198,7 @@ void ContactEditor::setEntry( const OContact &entry ) { | |||
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() ); |
@@ -1198,6 +1222,8 @@ void ContactEditor::setEntry( const OContact &entry ) { | |||
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" ) |