author | eilers <eilers> | 2002-11-30 18:13:34 (UTC) |
---|---|---|
committer | eilers <eilers> | 2002-11-30 18:13:34 (UTC) |
commit | 6afb59b5950c8fdd24dc93ac4ee370a3c8437f9a (patch) (unidiff) | |
tree | a873946a9b52edaab8f374918c7e0b468c2353b3 | |
parent | fe672fd88ead7a987d66f03439eb860e67aeaca6 (diff) | |
download | opie-6afb59b5950c8fdd24dc93ac4ee370a3c8437f9a.zip opie-6afb59b5950c8fdd24dc93ac4ee370a3c8437f9a.tar.gz opie-6afb59b5950c8fdd24dc93ac4ee370a3c8437f9a.tar.bz2 |
Fixed a lot of usability stuff .. Some minor bugs were fixed, too ..
-rw-r--r-- | core/pim/addressbook/TODO | 35 | ||||
-rw-r--r-- | core/pim/addressbook/ablabel.cpp | 7 | ||||
-rw-r--r-- | core/pim/addressbook/abview.cpp | 55 | ||||
-rw-r--r-- | core/pim/addressbook/abview.h | 2 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 2 | ||||
-rw-r--r-- | core/pim/addressbook/configdlg_base.ui | 10 | ||||
-rw-r--r-- | core/pim/addressbook/ocontactfields.cpp | 4 |
7 files changed, 68 insertions, 47 deletions
diff --git a/core/pim/addressbook/TODO b/core/pim/addressbook/TODO index 1cbee26..93ece13 100644 --- a/core/pim/addressbook/TODO +++ b/core/pim/addressbook/TODO | |||
@@ -1,106 +1,109 @@ | |||
1 | Stuff todo until OPIE 1.0 : | 1 | Stuff todo until OPIE 1.0 : |
2 | =========================== | 2 | =========================== |
3 | 3 | ||
4 | Feature requests: | 4 | Feature requests: |
5 | ----------------- | 5 | ----------------- |
6 | - Dial by mobile phone by tapping the number.. | 6 | - Dial by mobile phone by tapping the number.. |
7 | (Maybe using gsmtool. And we may | 7 | (Maybe using gsmtool. And we may |
8 | add a library class for this) | 8 | add a library class for this) |
9 | - dial with dtmfdial incase it's installed and there's no mobile | 9 | - dial with dtmfdial incase it's installed and there's no mobile |
10 | - 3rd column for 2. Contact | 10 | - 3rd column for 2. Contact |
11 | - Implementing additional Views (Phonebook, ...) | 11 | - Implementing additional Views (Phonebook, ...) |
12 | - Birthday & Anniversary Reminder | 12 | - Birthday & Anniversary Reminder |
13 | - Plugin for Today for Birthdays and Anniversaries | 13 | - Plugin for Today for Birthdays and Anniversaries |
14 | 14 | ||
15 | Known Bugs: | 15 | Known Bugs: |
16 | ----------- | 16 | ----------- |
17 | - OK-Key does not switch from Detailview (ablable) to Listview | 17 | - OK-Key does not switch from Detailview (ablable) to Listview |
18 | - After finising search and after Edit: Clear Picker | ||
19 | - After Edit: Table position back to edited entry. | ||
20 | - Combo in Contacteditor: Field "Default-Email" is not correctly implemented and | ||
21 | should be removed by a picker/combo. | ||
22 | - Name order selected in "contacteditor" not used in list view. | 18 | - Name order selected in "contacteditor" not used in list view. |
19 | |||
23 | - Language not English (tested with german opie-translation): | 20 | - Language not English (tested with german opie-translation): |
24 | 1. Configure nicht übersetzt (alles leer). | 21 | 1. Configure nicht übersetzt (alles leer). |
25 | 2. Contacteditor nur teilweise übersetzt. | 22 | 2. Contacteditor nur teilweise übersetzt. |
26 | 3. Kategorie-Picker geht nicht (nur bei Openzaurus). | 23 | 3. Kategorie-Picker geht nicht. |
27 | 24 | ||
28 | 25 | ||
29 | Bugs but not in addressbook: | 26 | Bugs but not in addressbook: |
30 | ----------------------------- | 27 | ----------------------------- |
31 | - VCARD: Import of Anniversary does not work correctly (currently disabled) | 28 | - VCARD: Import of Anniversary does not work correctly (currently disabled) |
32 | - VCARD: If umlaut (äöüß) in address, the parser gets confused.. | 29 | - VCARD: If umlaut (äöüß) in address, the parser gets confused.. |
33 | - Exporting and reimporting of Jobtitle fails. | 30 | |
31 | - Exporting and reimporting of Jobtitle fails (Could not reproduce this ! (se)) | ||
34 | 32 | ||
35 | 33 | ||
36 | Urgent: | 34 | Urgent: |
37 | -------- | 35 | -------- |
38 | - Contact-Editor is temporarely reanabled. Wait for replacement. | 36 | - Implement Button Pics |
37 | - Fix start of opie-mail | ||
38 | |||
39 | ContactEditor: | ||
40 | - Contact-Editor is temporarely reenabled. Wait for replacement. | ||
39 | - Redesign of Contacteditor | 41 | - Redesign of Contacteditor |
40 | - Store last settings of combo-boxes | 42 | - Store last settings of combo-boxes |
41 | - Category is on the wrong position after changing to personal and back to normal | 43 | - Category is on the wrong position after changing to personal and back to normal |
42 | ( Temporarily workaround: Category is never deactivated.. :S ) | 44 | ( Temporarily workaround: Category is never deactivated.. :S ) |
43 | - Optimize Table Update... | 45 | - Personal and Business Web-page is not editable |
44 | - Change MyDialog to Config | ||
45 | - Implement Button Pics | ||
46 | - Fix start of opie-mail | ||
47 | 46 | ||
48 | Important: | 47 | Important: |
49 | ---------- | 48 | ---------- |
50 | 49 | ||
50 | - Implement a picker/combo for the default email. | ||
51 | - After search (Started with Return): KeyFocus should be on Tabelle | 51 | - After search (Started with Return): KeyFocus should be on Tabelle |
52 | - Searchwidget closed: Selected user is jumping | ||
53 | - Wenn suchen beendet, dann dauert das Tabellenupdate (was überhaupt überflüssig ist) | ||
54 | zu lange.. | ||
55 | |||
56 | - Store position and state of toolbar | ||
57 | 52 | ||
58 | - IRDA Receive: Contact is added, but start of editor with new entry expected.. | 53 | - IRDA Receive: Contact is added, but start of editor with new entry expected.. |
59 | - "What's this" should be added (Deleyed after Feature Freeze) | 54 | - "What's this" should be added (Deleyed after Feature Freeze) |
60 | 55 | ||
61 | Less important: | 56 | Less important: |
62 | --------------- | 57 | --------------- |
63 | - Reload if contacts were changed externally | 58 | - Reload if contacts were changed externally |
64 | - Overview window cleanup needed.. | 59 | - Overview window cleanup needed.. |
65 | - The picker (alphabetical sort widget) should be | 60 | - The picker (alphabetical sort widget) should be |
66 | placed verticaly or horizontally (configurable) | 61 | placed verticaly or horizontally (configurable) |
67 | - Find a smart solution for activating/deactivating the "send email" event | 62 | - Find a smart solution for activating/deactivating the "send email" event |
68 | 63 | ||
69 | Should be Fixed (not absolute sure, need further validation): | 64 | Should be Fixed (not absolute sure, need further validation): |
70 | ------------------------------------------------------------- | 65 | ------------------------------------------------------------- |
66 | - Searchwidget closed: Selected user is jumping | ||
67 | - Wenn suchen beendet, dann dauert das Tabellenupdate (was überhaupt überflüssig ist) | ||
68 | zu lange.. | ||
71 | 69 | ||
72 | 70 | ||
73 | Fixed: | 71 | Fixed: |
74 | ------- | 72 | ------- |
75 | - Syncing: abtable not reloaded after sync. | 73 | - Syncing: abtable not reloaded after sync. |
76 | - Find widget should be replaced by something like | 74 | - Find widget should be replaced by something like |
77 | qpdf has. | 75 | qpdf has. |
78 | - Adding a configuration dialog | 76 | - Adding a configuration dialog |
79 | - Picker: Activated letter schould be more visible | 77 | - Picker: Activated letter schould be more visible |
80 | - Advanced handling of cursor keys (search..) | 78 | - Advanced handling of cursor keys (search..) |
81 | - Mail-Icon is missing | 79 | - Mail-Icon is missing |
82 | - Use opie-mail insted of qt-mail if possible. | 80 | - Use opie-mail insted of qt-mail if possible. |
83 | - Font menu is invisible using german translation | 81 | - Font menu is invisible using german translation |
84 | - Personal contact editor: Disable categories | 82 | - Personal contact editor: Disable categories |
85 | - "Nonenglish" translation bug has to be fixed. | 83 | - "Nonenglish" translation bug has to be fixed. |
86 | - contacteditor: Birthday, annyversary, ... : Use Dateselector | 84 | - contacteditor: Birthday, annyversary, ... : Use Dateselector |
87 | - The names of the countries are sorted by there english names, only.. | 85 | - The names of the countries are sorted by there english names, only.. |
88 | Even if they are translated.. :S | 86 | Even if they are translated.. :S |
89 | - Cursor keys should work in detail-view (ablabel) | 87 | - Cursor keys should work in detail-view (ablabel) |
90 | -> Ablabel should be removed and Abtable should be increased with | 88 | -> Ablabel should be removed and Abtable should be increased with |
91 | different views (as started by darwin zins).. | 89 | different views (as started by darwin zins).. |
92 | - Use advanced database functions in abtable to decrease | 90 | - Use advanced database functions in abtable to decrease |
93 | memory footprint and to make everything more easy ! | 91 | memory footprint and to make everything more easy ! |
94 | (abtable should store Iterator for selected Category) | 92 | (abtable should store Iterator for selected Category) |
95 | - Abtable: Configure Contact column (internally already available, | 93 | - Abtable: Configure Contact column (internally already available, |
96 | need configuration) | 94 | need configuration) |
97 | - Select of primary contact (see #274 on mantis) | 95 | - Select of primary contact (see #274 on mantis) |
98 | - Category-select does not work completely: "Unfiled" is always in listview .. | 96 | - Category-select does not work completely: "Unfiled" is always in listview .. |
99 | - Return from Contacteditor: Category resettet to all | 97 | - Return from Contacteditor: Category resettet to all |
100 | - Personal Details not working | 98 | - Personal Details not working |
101 | - If category changed, the letterpicker should be resetted | 99 | - If category changed, the letterpicker should be resetted |
102 | - There should be some icons for List and Cardview | 100 | - There should be some icons for List and Cardview |
103 | - If in Cardview and a category change removes all entries: | 101 | - If in Cardview and a category change removes all entries: |
104 | There are already entries in Cardview after up/down | 102 | There are already entries in Cardview after up/down |
105 | - Personal Details: Anniversary zeigt Fantasie-Werte | 103 | - Personal Details: Anniversary zeigt Fantasie-Werte |
106 | - Unfiled shown just in Category "All" and "Unfiled". | 104 | - Unfiled shown just in Category "All" and "Unfiled". |
105 | - After finising search and after Edit: Clear Picker | ||
106 | - After Edit: Table position back to edited entry. | ||
107 | - Optimize Table Update... | ||
108 | - Change MyDialog to Config | ||
109 | - Store position and state of toolbar | ||
diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp index 5b40dc1..937aaae 100644 --- a/core/pim/addressbook/ablabel.cpp +++ b/core/pim/addressbook/ablabel.cpp | |||
@@ -22,65 +22,70 @@ | |||
22 | 22 | ||
23 | #include <qpe/stringutil.h> | 23 | #include <qpe/stringutil.h> |
24 | 24 | ||
25 | #include <qregexp.h> | 25 | #include <qregexp.h> |
26 | #include <qstylesheet.h> | 26 | #include <qstylesheet.h> |
27 | 27 | ||
28 | AbLabel::AbLabel( QWidget *parent, const char *name ): | 28 | AbLabel::AbLabel( QWidget *parent, const char *name ): |
29 | QTextView( parent, name ), | 29 | QTextView( parent, name ), |
30 | m_empty( false ) | 30 | m_empty( false ) |
31 | { | 31 | { |
32 | } | 32 | } |
33 | 33 | ||
34 | AbLabel::~AbLabel() | 34 | AbLabel::~AbLabel() |
35 | { | 35 | { |
36 | } | 36 | } |
37 | 37 | ||
38 | void AbLabel::setContacts( const OContactAccess::List& viewList ) | 38 | void AbLabel::setContacts( const OContactAccess::List& viewList ) |
39 | { | 39 | { |
40 | m_viewList = viewList; | 40 | m_viewList = viewList; |
41 | if (m_viewList.count() != 0){ | 41 | if (m_viewList.count() != 0){ |
42 | m_empty = false; | 42 | m_empty = false; |
43 | m_itCurContact = m_viewList.begin(); | 43 | m_itCurContact = m_viewList.begin(); |
44 | sync(); | 44 | sync(); |
45 | }else{ | 45 | }else{ |
46 | // m_itCurContact.clear(); | 46 | // m_itCurContact.clear(); |
47 | m_empty = true; | 47 | m_empty = true; |
48 | setText( "" ); | 48 | setText( "" ); |
49 | } | 49 | } |
50 | } | 50 | } |
51 | 51 | ||
52 | int AbLabel::currentEntry_UID() | 52 | int AbLabel::currentEntry_UID() |
53 | { | 53 | { |
54 | return ( (*m_itCurContact).uid() ); | 54 | OContact contact = *m_itCurContact; |
55 | |||
56 | if ( contact.isEmpty() ) | ||
57 | return 0; | ||
58 | else | ||
59 | return ( contact.uid() ); | ||
55 | } | 60 | } |
56 | 61 | ||
57 | OContact AbLabel::currentEntry() | 62 | OContact AbLabel::currentEntry() |
58 | { | 63 | { |
59 | return ( *m_itCurContact ); | 64 | return ( *m_itCurContact ); |
60 | } | 65 | } |
61 | 66 | ||
62 | 67 | ||
63 | bool AbLabel::selectContact( int UID ) | 68 | bool AbLabel::selectContact( int UID ) |
64 | { | 69 | { |
65 | 70 | ||
66 | for ( m_itCurContact = m_viewList.begin(); m_itCurContact != m_viewList.end(); ++m_itCurContact){ | 71 | for ( m_itCurContact = m_viewList.begin(); m_itCurContact != m_viewList.end(); ++m_itCurContact){ |
67 | if ( (*m_itCurContact).uid() == UID ) | 72 | if ( (*m_itCurContact).uid() == UID ) |
68 | break; | 73 | break; |
69 | } | 74 | } |
70 | sync(); | 75 | sync(); |
71 | 76 | ||
72 | return true; | 77 | return true; |
73 | } | 78 | } |
74 | 79 | ||
75 | 80 | ||
76 | 81 | ||
77 | void AbLabel::sync() | 82 | void AbLabel::sync() |
78 | { | 83 | { |
79 | QString text = (*m_itCurContact).toRichText(); | 84 | QString text = (*m_itCurContact).toRichText(); |
80 | setText( text ); | 85 | setText( text ); |
81 | } | 86 | } |
82 | 87 | ||
83 | void AbLabel::keyPressEvent( QKeyEvent *e ) | 88 | void AbLabel::keyPressEvent( QKeyEvent *e ) |
84 | { | 89 | { |
85 | // Commonly handled keys | 90 | // Commonly handled keys |
86 | if ( !m_empty ){ | 91 | if ( !m_empty ){ |
diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp index 0f4bd5f..7226e82 100644 --- a/core/pim/addressbook/abview.cpp +++ b/core/pim/addressbook/abview.cpp | |||
@@ -95,96 +95,102 @@ AbView::~AbView() | |||
95 | 95 | ||
96 | void AbView::setView( Views view ) | 96 | void AbView::setView( Views view ) |
97 | { | 97 | { |
98 | qWarning("AbView::setView( Views view )"); | 98 | qWarning("AbView::setView( Views view )"); |
99 | m_curr_View = view; | 99 | m_curr_View = view; |
100 | load(); | 100 | load(); |
101 | } | 101 | } |
102 | 102 | ||
103 | void AbView::addEntry( const OContact &newContact ) | 103 | void AbView::addEntry( const OContact &newContact ) |
104 | { | 104 | { |
105 | qWarning("abview:AddContact"); | 105 | qWarning("abview:AddContact"); |
106 | m_contactdb->add ( newContact ); | 106 | m_contactdb->add ( newContact ); |
107 | load(); | 107 | load(); |
108 | 108 | ||
109 | } | 109 | } |
110 | void AbView::removeEntry( const int UID ) | 110 | void AbView::removeEntry( const int UID ) |
111 | { | 111 | { |
112 | qWarning("abview:RemoveContact"); | 112 | qWarning("abview:RemoveContact"); |
113 | m_contactdb->remove( UID ); | 113 | m_contactdb->remove( UID ); |
114 | load(); | 114 | load(); |
115 | } | 115 | } |
116 | 116 | ||
117 | void AbView::replaceEntry( const OContact &contact ) | 117 | void AbView::replaceEntry( const OContact &contact ) |
118 | { | 118 | { |
119 | qWarning("abview:ReplaceContact"); | 119 | qWarning("abview:ReplaceContact"); |
120 | m_contactdb->replace( contact ); | 120 | m_contactdb->replace( contact ); |
121 | load(); | 121 | load(); |
122 | 122 | ||
123 | } | 123 | } |
124 | 124 | ||
125 | OContact AbView::currentEntry() | 125 | OContact AbView::currentEntry() |
126 | { | 126 | { |
127 | OContact currentContact; | ||
128 | |||
127 | switch ( (int) m_curr_View ) { | 129 | switch ( (int) m_curr_View ) { |
128 | case TableView: | 130 | case TableView: |
129 | return ( m_abTable -> currentEntry() ); | 131 | currentContact = m_abTable -> currentEntry(); |
130 | break; | 132 | break; |
131 | case CardView: | 133 | case CardView: |
132 | return ( m_ablabel -> currentEntry() ); | 134 | currentContact = m_ablabel -> currentEntry(); |
133 | break; | 135 | break; |
134 | } | 136 | } |
135 | return OContact(); | 137 | m_curr_Contact = currentContact.uid(); |
138 | return currentContact; | ||
136 | } | 139 | } |
137 | 140 | ||
138 | bool AbView::save() | 141 | bool AbView::save() |
139 | { | 142 | { |
140 | qWarning("abView:Save data"); | 143 | qWarning("abView:Save data"); |
141 | 144 | ||
142 | return m_contactdb->save(); | 145 | return m_contactdb->save(); |
143 | } | 146 | } |
144 | 147 | ||
145 | void AbView::load() | 148 | void AbView::load() |
146 | { | 149 | { |
147 | qWarning("abView:Load data"); | 150 | qWarning("abView:Load data"); |
151 | |||
152 | // Letter Search is stopped at this place | ||
153 | emit signalClearLetterPicker(); | ||
148 | 154 | ||
149 | if ( m_inPersonal ) | 155 | if ( m_inPersonal ) |
150 | m_list = m_contactdb->allRecords(); | 156 | m_list = m_contactdb->allRecords(); |
151 | else | 157 | else{ |
152 | m_list = m_contactdb->sorted( true, 0, 0, 0 ); | 158 | m_list = m_contactdb->sorted( true, 0, 0, 0 ); |
153 | 159 | clearForCategory(); | |
154 | clearForCategory(); | 160 | } |
155 | 161 | ||
156 | qWarning ("Number of contacts: %d", m_list.count()); | 162 | qWarning ("Number of contacts: %d", m_list.count()); |
157 | 163 | ||
158 | updateView(); | 164 | updateView( true ); |
159 | 165 | ||
160 | } | 166 | } |
161 | 167 | ||
162 | void AbView::reload() | 168 | void AbView::reload() |
163 | { | 169 | { |
164 | qWarning( "void AbView::reload()" ); | 170 | qWarning( "void AbView::reload()" ); |
165 | 171 | ||
166 | m_contactdb->reload(); | 172 | m_contactdb->reload(); |
167 | load(); | 173 | load(); |
168 | } | 174 | } |
169 | 175 | ||
170 | void AbView::clear() | 176 | void AbView::clear() |
171 | { | 177 | { |
172 | // :SX | 178 | // :SX |
173 | } | 179 | } |
174 | 180 | ||
175 | void AbView::setShowByCategory( const QString& cat ) | 181 | void AbView::setShowByCategory( const QString& cat ) |
176 | { | 182 | { |
177 | qWarning("AbView::setShowCategory( const QString& cat )"); | 183 | qWarning("AbView::setShowCategory( const QString& cat )"); |
178 | 184 | ||
179 | int intCat = 0; | 185 | int intCat = 0; |
180 | 186 | ||
181 | // All (cat == NULL) will be stored as -1 | 187 | // All (cat == NULL) will be stored as -1 |
182 | if ( cat.isNull() ) | 188 | if ( cat.isNull() ) |
183 | intCat = -1; | 189 | intCat = -1; |
184 | else | 190 | else |
185 | intCat = mCat.id("Contacts", cat ); | 191 | intCat = mCat.id("Contacts", cat ); |
186 | 192 | ||
187 | // Just do anything if we really change the category | 193 | // Just do anything if we really change the category |
188 | if ( intCat != m_curr_category ){ | 194 | if ( intCat != m_curr_category ){ |
189 | qWarning ("Categories: Selected %s.. Number: %d", cat.latin1(), m_curr_category); | 195 | qWarning ("Categories: Selected %s.. Number: %d", cat.latin1(), m_curr_category); |
190 | 196 | ||
@@ -195,65 +201,65 @@ void AbView::setShowByCategory( const QString& cat ) | |||
195 | } | 201 | } |
196 | 202 | ||
197 | } | 203 | } |
198 | 204 | ||
199 | void AbView::setShowToView( Views view ) | 205 | void AbView::setShowToView( Views view ) |
200 | { | 206 | { |
201 | qWarning("void AbView::setShowToView( View %d )", view); | 207 | qWarning("void AbView::setShowToView( View %d )", view); |
202 | 208 | ||
203 | qWarning ("Change the View (Category is: %d)", m_curr_category); | 209 | qWarning ("Change the View (Category is: %d)", m_curr_category); |
204 | 210 | ||
205 | if ( m_curr_View != view ){ | 211 | if ( m_curr_View != view ){ |
206 | m_prev_View = m_curr_View; | 212 | m_prev_View = m_curr_View; |
207 | m_curr_View = view; | 213 | m_curr_View = view; |
208 | 214 | ||
209 | updateView(); | 215 | updateView(); |
210 | } | 216 | } |
211 | 217 | ||
212 | } | 218 | } |
213 | 219 | ||
214 | void AbView::setShowByLetter( char c ) | 220 | void AbView::setShowByLetter( char c ) |
215 | { | 221 | { |
216 | qWarning("void AbView::setShowByLetter( %c )", c ); | 222 | qWarning("void AbView::setShowByLetter( %c )", c ); |
217 | OContact query; | 223 | OContact query; |
218 | if ( c == 0 ){ | 224 | if ( c == 0 ){ |
219 | load(); | 225 | load(); |
220 | return; | 226 | return; |
221 | }else{ | 227 | }else{ |
222 | query.setLastName( QString("%1*").arg(c) ); | 228 | query.setLastName( QString("%1*").arg(c) ); |
223 | m_list = m_contactdb->queryByExample( query, OContactAccess::WildCards ); | 229 | m_list = m_contactdb->queryByExample( query, OContactAccess::WildCards ); |
224 | clearForCategory(); | 230 | clearForCategory(); |
225 | m_curr_Contact = 0; | 231 | m_curr_Contact = 0; |
226 | } | 232 | } |
227 | updateView(); | 233 | updateView( true ); |
228 | } | 234 | } |
229 | 235 | ||
230 | void AbView::setListOrder( const QValueList<int>& ordered ) | 236 | void AbView::setListOrder( const QValueList<int>& ordered ) |
231 | { | 237 | { |
232 | m_orderedFields = ordered; | 238 | m_orderedFields = ordered; |
233 | updateView(); | 239 | updateView(); |
234 | } | 240 | } |
235 | 241 | ||
236 | 242 | ||
237 | QString AbView::showCategory() const | 243 | QString AbView::showCategory() const |
238 | { | 244 | { |
239 | return mCat.label( "Contacts", m_curr_category ); | 245 | return mCat.label( "Contacts", m_curr_category ); |
240 | } | 246 | } |
241 | 247 | ||
242 | void AbView::showPersonal( bool personal ) | 248 | void AbView::showPersonal( bool personal ) |
243 | { | 249 | { |
244 | qWarning ("void AbView::showPersonal( %d )", personal); | 250 | qWarning ("void AbView::showPersonal( %d )", personal); |
245 | 251 | ||
246 | if ( personal ){ | 252 | if ( personal ){ |
247 | 253 | ||
248 | if ( m_inPersonal ) | 254 | if ( m_inPersonal ) |
249 | return; | 255 | return; |
250 | 256 | ||
251 | // Now switch to vCard Backend and load data. | 257 | // Now switch to vCard Backend and load data. |
252 | // The current default backend will be stored | 258 | // The current default backend will be stored |
253 | // to avoid unneeded load/stores. | 259 | // to avoid unneeded load/stores. |
254 | m_storedDB = m_contactdb; | 260 | m_storedDB = m_contactdb; |
255 | 261 | ||
256 | OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, | 262 | OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, |
257 | addressbookPersonalVCardName() ); | 263 | addressbookPersonalVCardName() ); |
258 | m_contactdb = new OContactAccess ( "addressbook", QString::null , vcard_backend, true ); | 264 | m_contactdb = new OContactAccess ( "addressbook", QString::null , vcard_backend, true ); |
259 | 265 | ||
@@ -296,65 +302,65 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, | |||
296 | emit signalClearLetterPicker(); | 302 | emit signalClearLetterPicker(); |
297 | 303 | ||
298 | // Use the current Category if nothing else selected | 304 | // Use the current Category if nothing else selected |
299 | int category = 0; | 305 | int category = 0; |
300 | 306 | ||
301 | if ( cat.isEmpty() ) | 307 | if ( cat.isEmpty() ) |
302 | category = m_curr_category; | 308 | category = m_curr_category; |
303 | else{ | 309 | else{ |
304 | category = mCat.id("Contacts", cat ); | 310 | category = mCat.id("Contacts", cat ); |
305 | } | 311 | } |
306 | 312 | ||
307 | qWarning ("Find in Category %d", category); | 313 | qWarning ("Find in Category %d", category); |
308 | 314 | ||
309 | QRegExp r( str ); | 315 | QRegExp r( str ); |
310 | r.setCaseSensitive( caseSensitive ); | 316 | r.setCaseSensitive( caseSensitive ); |
311 | r.setWildcard( !useRegExp ); | 317 | r.setWildcard( !useRegExp ); |
312 | 318 | ||
313 | // Get all matching entries out of the database | 319 | // Get all matching entries out of the database |
314 | m_list = m_contactdb->matchRegexp( r ); | 320 | m_list = m_contactdb->matchRegexp( r ); |
315 | 321 | ||
316 | qWarning( "found: %d", m_list.count() ); | 322 | qWarning( "found: %d", m_list.count() ); |
317 | if ( m_list.count() == 0 ){ | 323 | if ( m_list.count() == 0 ){ |
318 | emit signalNotFound(); | 324 | emit signalNotFound(); |
319 | return; | 325 | return; |
320 | } | 326 | } |
321 | 327 | ||
322 | // Now remove all contacts with wrong category (if any selected) | 328 | // Now remove all contacts with wrong category (if any selected) |
323 | // This algorithm is a litte bit ineffective, but | 329 | // This algorithm is a litte bit ineffective, but |
324 | // we will not have a lot of matching entries.. | 330 | // we will not have a lot of matching entries.. |
325 | clearForCategory(); | 331 | clearForCategory(); |
326 | 332 | ||
327 | // Now show all found entries | 333 | // Now show all found entries |
328 | updateView(); | 334 | updateView( true ); |
329 | } | 335 | } |
330 | 336 | ||
331 | void AbView::offSearch() | 337 | void AbView::offSearch() |
332 | { | 338 | { |
333 | m_inSearch = false; | 339 | m_inSearch = false; |
334 | 340 | ||
335 | load(); | 341 | load(); |
336 | } | 342 | } |
337 | 343 | ||
338 | void AbView::slotSwitch(){ | 344 | void AbView::slotSwitch(){ |
339 | qWarning("AbView::slotSwitch()"); | 345 | qWarning("AbView::slotSwitch()"); |
340 | 346 | ||
341 | m_prev_View = m_curr_View; | 347 | m_prev_View = m_curr_View; |
342 | switch ( (int) m_curr_View ){ | 348 | switch ( (int) m_curr_View ){ |
343 | case TableView: | 349 | case TableView: |
344 | qWarning("Switching to CardView"); | 350 | qWarning("Switching to CardView"); |
345 | m_curr_View = CardView; | 351 | m_curr_View = CardView; |
346 | break; | 352 | break; |
347 | case CardView: | 353 | case CardView: |
348 | qWarning("Switching to TableView"); | 354 | qWarning("Switching to TableView"); |
349 | m_curr_View = TableView; | 355 | m_curr_View = TableView; |
350 | break; | 356 | break; |
351 | } | 357 | } |
352 | updateView(); | 358 | updateView(); |
353 | 359 | ||
354 | } | 360 | } |
355 | 361 | ||
356 | // END: Slots | 362 | // END: Slots |
357 | 363 | ||
358 | void AbView::clearForCategory() | 364 | void AbView::clearForCategory() |
359 | { | 365 | { |
360 | OContactAccess::List::Iterator it; | 366 | OContactAccess::List::Iterator it; |
@@ -378,82 +384,85 @@ bool AbView::contactCompare( const OContact &cnt, int category ) | |||
378 | 384 | ||
379 | bool returnMe; | 385 | bool returnMe; |
380 | QArray<int> cats; | 386 | QArray<int> cats; |
381 | cats = cnt.categories(); | 387 | cats = cnt.categories(); |
382 | 388 | ||
383 | qWarning ("Number of categories: %d", cats.count() ); | 389 | qWarning ("Number of categories: %d", cats.count() ); |
384 | 390 | ||
385 | returnMe = false; | 391 | returnMe = false; |
386 | if ( cats.count() == 0 && category == 0 ) | 392 | if ( cats.count() == 0 && category == 0 ) |
387 | // Contacts with no category will just shown on "All" and "Unfiled" | 393 | // Contacts with no category will just shown on "All" and "Unfiled" |
388 | returnMe = true; | 394 | returnMe = true; |
389 | else { | 395 | else { |
390 | int i; | 396 | int i; |
391 | for ( i = 0; i < int(cats.count()); i++ ) { | 397 | for ( i = 0; i < int(cats.count()); i++ ) { |
392 | qWarning("Comparing %d with %d",cats[i],category ); | 398 | qWarning("Comparing %d with %d",cats[i],category ); |
393 | if ( cats[i] == category ) { | 399 | if ( cats[i] == category ) { |
394 | returnMe = true; | 400 | returnMe = true; |
395 | break; | 401 | break; |
396 | } | 402 | } |
397 | } | 403 | } |
398 | } | 404 | } |
399 | qWarning ("Return: %d", returnMe); | 405 | qWarning ("Return: %d", returnMe); |
400 | return returnMe; | 406 | return returnMe; |
401 | } | 407 | } |
402 | 408 | ||
403 | // In Some rare cases we have to update all lists.. | 409 | // In Some rare cases we have to update all lists.. |
404 | void AbView::updateListinViews() | 410 | void AbView::updateListinViews() |
405 | { | 411 | { |
406 | m_abTable -> setContacts( m_list ); | 412 | m_abTable -> setContacts( m_list ); |
407 | m_ablabel -> setContacts( m_list ); | 413 | m_ablabel -> setContacts( m_list ); |
408 | } | 414 | } |
409 | 415 | ||
410 | void AbView::updateView() | 416 | void AbView::updateView( bool newdata ) |
411 | { | 417 | { |
412 | qWarning("AbView::updateView()"); | 418 | qWarning("AbView::updateView()"); |
413 | 419 | ||
414 | if ( m_viewStack -> visibleWidget() ){ | 420 | if ( m_viewStack -> visibleWidget() ){ |
415 | m_viewStack -> visibleWidget() -> clearFocus(); | 421 | m_viewStack -> visibleWidget() -> clearFocus(); |
416 | } | 422 | } |
417 | 423 | ||
418 | // If we switching the view, we have to store some information | 424 | // If we switching the view, we have to store some information |
419 | if ( m_list.count() ){ | 425 | if ( !newdata ){ |
420 | switch ( (int) m_prev_View ) { | 426 | if ( m_list.count() ){ |
421 | case TableView: | 427 | switch ( (int) m_prev_View ) { |
422 | m_curr_Contact = m_abTable -> currentEntry_UID(); | 428 | case TableView: |
423 | break; | 429 | m_curr_Contact = m_abTable -> currentEntry_UID(); |
424 | case CardView: | 430 | break; |
425 | m_curr_Contact = m_ablabel -> currentEntry_UID(); | 431 | case CardView: |
426 | break; | 432 | m_curr_Contact = m_ablabel -> currentEntry_UID(); |
427 | } | 433 | break; |
428 | }else | 434 | } |
429 | m_curr_Contact = 0; | 435 | }else |
436 | m_curr_Contact = 0; | ||
437 | } | ||
430 | 438 | ||
431 | // Feed all views with new lists | 439 | // Feed all views with new lists |
432 | updateListinViews(); | 440 | if ( newdata ) |
441 | updateListinViews(); | ||
433 | 442 | ||
434 | // Inform the world that the view is changed | 443 | // Tell the world that the view is changed |
435 | if ( m_curr_View != m_prev_View ) | 444 | if ( m_curr_View != m_prev_View ) |
436 | emit signalViewSwitched ( (int) m_curr_View ); | 445 | emit signalViewSwitched ( (int) m_curr_View ); |
437 | 446 | ||
438 | m_prev_View = m_curr_View; | 447 | m_prev_View = m_curr_View; |
439 | 448 | ||
440 | // Switch to new View | 449 | // Switch to new View |
441 | switch ( (int) m_curr_View ) { | 450 | switch ( (int) m_curr_View ) { |
442 | case TableView: | 451 | case TableView: |
443 | m_abTable -> setChoiceSelection( m_orderedFields ); | 452 | m_abTable -> setChoiceSelection( m_orderedFields ); |
444 | if ( m_curr_Contact != 0 ) | 453 | if ( m_curr_Contact != 0 ) |
445 | m_abTable -> selectContact ( m_curr_Contact ); | 454 | m_abTable -> selectContact ( m_curr_Contact ); |
446 | m_abTable -> setFocus(); | 455 | m_abTable -> setFocus(); |
447 | break; | 456 | break; |
448 | case CardView: | 457 | case CardView: |
449 | if ( m_curr_Contact != 0 ) | 458 | if ( m_curr_Contact != 0 ) |
450 | m_ablabel -> selectContact( m_curr_Contact ); | 459 | m_ablabel -> selectContact( m_curr_Contact ); |
451 | m_ablabel -> setFocus(); | 460 | m_ablabel -> setFocus(); |
452 | break; | 461 | break; |
453 | } | 462 | } |
454 | 463 | ||
455 | // Raise the current View | 464 | // Raise the current View |
456 | m_viewStack -> raiseWidget( m_curr_View ); | 465 | m_viewStack -> raiseWidget( m_curr_View ); |
457 | } | 466 | } |
458 | 467 | ||
459 | 468 | ||
diff --git a/core/pim/addressbook/abview.h b/core/pim/addressbook/abview.h index 2c10cfa..8570fe7 100644 --- a/core/pim/addressbook/abview.h +++ b/core/pim/addressbook/abview.h | |||
@@ -29,59 +29,59 @@ public: | |||
29 | 29 | ||
30 | void setView( Views view ); | 30 | void setView( Views view ); |
31 | void showPersonal( bool personal ); | 31 | void showPersonal( bool personal ); |
32 | void setShowByCategory( const QString& cat ); | 32 | void setShowByCategory( const QString& cat ); |
33 | void setShowToView( Views view ); | 33 | void setShowToView( Views view ); |
34 | void setShowByLetter( char c ); | 34 | void setShowByLetter( char c ); |
35 | void setListOrder( const QValueList<int>& ordered ); | 35 | void setListOrder( const QValueList<int>& ordered ); |
36 | 36 | ||
37 | // Add Entry and put to current | 37 | // Add Entry and put to current |
38 | void addEntry( const OContact &newContact ); | 38 | void addEntry( const OContact &newContact ); |
39 | void removeEntry( const int UID ); | 39 | void removeEntry( const int UID ); |
40 | void replaceEntry( const OContact &contact ); | 40 | void replaceEntry( const OContact &contact ); |
41 | OContact currentEntry(); | 41 | OContact currentEntry(); |
42 | 42 | ||
43 | void inSearch() { m_inSearch = true; } | 43 | void inSearch() { m_inSearch = true; } |
44 | void offSearch(); | 44 | void offSearch(); |
45 | 45 | ||
46 | QString showCategory() const; | 46 | QString showCategory() const; |
47 | QStringList categories(); | 47 | QStringList categories(); |
48 | 48 | ||
49 | signals: | 49 | signals: |
50 | void signalNotFound(); | 50 | void signalNotFound(); |
51 | void signalClearLetterPicker(); | 51 | void signalClearLetterPicker(); |
52 | void signalViewSwitched ( int ); | 52 | void signalViewSwitched ( int ); |
53 | 53 | ||
54 | public slots: | 54 | public slots: |
55 | void slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, | 55 | void slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, |
56 | bool backwards, QString category = QString::null ); | 56 | bool backwards, QString category = QString::null ); |
57 | void slotSwitch(); | 57 | void slotSwitch(); |
58 | 58 | ||
59 | private: | 59 | private: |
60 | void updateListinViews(); | 60 | void updateListinViews(); |
61 | void updateView(); | 61 | void updateView( bool newdata = false ); |
62 | void clearForCategory(); | 62 | void clearForCategory(); |
63 | bool contactCompare( const OContact &cnt, int category ); | 63 | bool contactCompare( const OContact &cnt, int category ); |
64 | void parseName( const QString& name, QString *first, QString *middle, | 64 | void parseName( const QString& name, QString *first, QString *middle, |
65 | QString * last ); | 65 | QString * last ); |
66 | 66 | ||
67 | Categories mCat; | 67 | Categories mCat; |
68 | bool m_inSearch; | 68 | bool m_inSearch; |
69 | bool m_inPersonal; | 69 | bool m_inPersonal; |
70 | int m_curr_category; | 70 | int m_curr_category; |
71 | Views m_curr_View; | 71 | Views m_curr_View; |
72 | Views m_prev_View; | 72 | Views m_prev_View; |
73 | int m_curr_Contact; | 73 | int m_curr_Contact; |
74 | 74 | ||
75 | OContactAccess* m_contactdb; | 75 | OContactAccess* m_contactdb; |
76 | OContactAccess* m_storedDB; | 76 | OContactAccess* m_storedDB; |
77 | OContactAccess::List m_list; | 77 | OContactAccess::List m_list; |
78 | 78 | ||
79 | QWidgetStack* m_viewStack; | 79 | QWidgetStack* m_viewStack; |
80 | AbTable* m_abTable; | 80 | AbTable* m_abTable; |
81 | AbLabel* m_ablabel; | 81 | AbLabel* m_ablabel; |
82 | 82 | ||
83 | QValueList<int> m_orderedFields; | 83 | QValueList<int> m_orderedFields; |
84 | }; | 84 | }; |
85 | 85 | ||
86 | 86 | ||
87 | #endif | 87 | #endif |
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 5d588da..055124c 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp | |||
@@ -624,65 +624,65 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data) | |||
624 | for (QStringList::ConstIterator it = types.begin(); it!=types.end(); ++it) { | 624 | for (QStringList::ConstIterator it = types.begin(); it!=types.end(); ++it) { |
625 | QStringList sel; | 625 | QStringList sel; |
626 | stream >> sel; | 626 | stream >> sel; |
627 | picker.setSelection(i++,sel); | 627 | picker.setSelection(i++,sel); |
628 | } | 628 | } |
629 | picker.showMaximized(); | 629 | picker.showMaximized(); |
630 | picker.exec(); | 630 | picker.exec(); |
631 | 631 | ||
632 | // ###### note: contacts may have been added - save here! | 632 | // ###### note: contacts may have been added - save here! |
633 | 633 | ||
634 | setCentralWidget(abList); | 634 | setCentralWidget(abList); |
635 | QCopEnvelope e(ch,m); | 635 | QCopEnvelope e(ch,m); |
636 | i=0; | 636 | i=0; |
637 | for (QStringList::ConstIterator it = types.begin(); it!=types.end(); ++it) { | 637 | for (QStringList::ConstIterator it = types.begin(); it!=types.end(); ++it) { |
638 | QStringList sel = picker.selection(i++); | 638 | QStringList sel = picker.selection(i++); |
639 | e << sel; | 639 | e << sel; |
640 | } | 640 | } |
641 | } | 641 | } |
642 | #endif | 642 | #endif |
643 | 643 | ||
644 | } | 644 | } |
645 | 645 | ||
646 | void AddressbookWindow::editEntry( EntryMode entryMode ) | 646 | void AddressbookWindow::editEntry( EntryMode entryMode ) |
647 | { | 647 | { |
648 | OContact entry; | 648 | OContact entry; |
649 | if ( !abEditor ) { | 649 | if ( !abEditor ) { |
650 | abEditor = new ContactEditor( entry, this, "editor" ); | 650 | abEditor = new ContactEditor( entry, this, "editor" ); |
651 | } | 651 | } |
652 | if ( entryMode == EditEntry ) | 652 | if ( entryMode == EditEntry ) |
653 | abEditor->setEntry( m_abView -> currentEntry() ); | 653 | abEditor->setEntry( m_abView -> currentEntry() ); |
654 | else if ( entryMode == NewEntry ) | 654 | else if ( entryMode == NewEntry ) |
655 | abEditor->setEntry( entry ); | 655 | abEditor->setEntry( entry ); |
656 | // other things may chane the caption. | 656 | // other things may change the caption. |
657 | abEditor->setCaption( tr("Edit Address") ); | 657 | abEditor->setCaption( tr("Edit Address") ); |
658 | 658 | ||
659 | #if defined(Q_WS_QWS) || defined(_WS_QWS_) | 659 | #if defined(Q_WS_QWS) || defined(_WS_QWS_) |
660 | abEditor->showMaximized(); | 660 | abEditor->showMaximized(); |
661 | #endif | 661 | #endif |
662 | // fix the foxus... | 662 | // fix the foxus... |
663 | abEditor->setNameFocus(); | 663 | abEditor->setNameFocus(); |
664 | if ( abEditor->exec() ) { | 664 | if ( abEditor->exec() ) { |
665 | setFocus(); | 665 | setFocus(); |
666 | if ( entryMode == NewEntry ) { | 666 | if ( entryMode == NewEntry ) { |
667 | OContact insertEntry = abEditor->entry(); | 667 | OContact insertEntry = abEditor->entry(); |
668 | insertEntry.assignUid(); | 668 | insertEntry.assignUid(); |
669 | m_abView -> addEntry( insertEntry ); | 669 | m_abView -> addEntry( insertEntry ); |
670 | } else { | 670 | } else { |
671 | OContact replEntry = abEditor->entry(); | 671 | OContact replEntry = abEditor->entry(); |
672 | 672 | ||
673 | if ( !replEntry.isValidUid() ) | 673 | if ( !replEntry.isValidUid() ) |
674 | replEntry.assignUid(); | 674 | replEntry.assignUid(); |
675 | 675 | ||
676 | m_abView -> replaceEntry( replEntry ); | 676 | m_abView -> replaceEntry( replEntry ); |
677 | } | 677 | } |
678 | } | 678 | } |
679 | // populateCategories(); | 679 | // populateCategories(); |
680 | 680 | ||
681 | } | 681 | } |
682 | 682 | ||
683 | void AddressbookWindow::editPersonal() | 683 | void AddressbookWindow::editPersonal() |
684 | { | 684 | { |
685 | OContact entry; | 685 | OContact entry; |
686 | if ( !abEditor ) { | 686 | if ( !abEditor ) { |
687 | abEditor = new ContactEditor( entry, this, "editor" ); | 687 | abEditor = new ContactEditor( entry, this, "editor" ); |
688 | } | 688 | } |
diff --git a/core/pim/addressbook/configdlg_base.ui b/core/pim/addressbook/configdlg_base.ui index 408bfa6..8ae2578 100644 --- a/core/pim/addressbook/configdlg_base.ui +++ b/core/pim/addressbook/configdlg_base.ui | |||
@@ -1,58 +1,62 @@ | |||
1 | <!DOCTYPE UI><UI> | 1 | <!DOCTYPE UI><UI> |
2 | <class>ConfigDlg_Base</class> | 2 | <class>ConfigDlg_Base</class> |
3 | <author>Stefan Eilers</author> | 3 | <author>Stefan Eilers</author> |
4 | <widget> | 4 | <widget> |
5 | <class>QDialog</class> | 5 | <class>QDialog</class> |
6 | <property stdset="1"> | 6 | <property stdset="1"> |
7 | <name>name</name> | 7 | <name>name</name> |
8 | <cstring>Configuration</cstring> | 8 | <cstring>Configuration</cstring> |
9 | </property> | 9 | </property> |
10 | <property stdset="1"> | 10 | <property stdset="1"> |
11 | <name>geometry</name> | 11 | <name>geometry</name> |
12 | <rect> | 12 | <rect> |
13 | <x>0</x> | 13 | <x>0</x> |
14 | <y>0</y> | 14 | <y>0</y> |
15 | <width>276</width> | 15 | <width>282</width> |
16 | <height>327</height> | 16 | <height>327</height> |
17 | </rect> | 17 | </rect> |
18 | </property> | 18 | </property> |
19 | <property stdset="1"> | 19 | <property stdset="1"> |
20 | <name>sizePolicy</name> | 20 | <name>sizePolicy</name> |
21 | <sizepolicy> | 21 | <sizepolicy> |
22 | <hsizetype>5</hsizetype> | 22 | <hsizetype>5</hsizetype> |
23 | <vsizetype>5</vsizetype> | 23 | <vsizetype>5</vsizetype> |
24 | </sizepolicy> | 24 | </sizepolicy> |
25 | </property> | 25 | </property> |
26 | <property stdset="1"> | 26 | <property stdset="1"> |
27 | <name>caption</name> | ||
28 | <string>Configuration</string> | ||
29 | </property> | ||
30 | <property stdset="1"> | ||
27 | <name>sizeGripEnabled</name> | 31 | <name>sizeGripEnabled</name> |
28 | <bool>true</bool> | 32 | <bool>true</bool> |
29 | </property> | 33 | </property> |
30 | <property> | 34 | <property> |
31 | <name>layoutMargin</name> | 35 | <name>layoutMargin</name> |
32 | </property> | 36 | </property> |
33 | <vbox> | 37 | <vbox> |
34 | <property stdset="1"> | 38 | <property stdset="1"> |
35 | <name>margin</name> | 39 | <name>margin</name> |
36 | <number>1</number> | 40 | <number>1</number> |
37 | </property> | 41 | </property> |
38 | <property stdset="1"> | 42 | <property stdset="1"> |
39 | <name>spacing</name> | 43 | <name>spacing</name> |
40 | <number>6</number> | 44 | <number>6</number> |
41 | </property> | 45 | </property> |
42 | <widget> | 46 | <widget> |
43 | <class>QTabWidget</class> | 47 | <class>QTabWidget</class> |
44 | <property stdset="1"> | 48 | <property stdset="1"> |
45 | <name>name</name> | 49 | <name>name</name> |
46 | <cstring>configDlg_base</cstring> | 50 | <cstring>configDlg_base</cstring> |
47 | </property> | 51 | </property> |
48 | <property stdset="1"> | 52 | <property stdset="1"> |
49 | <name>sizePolicy</name> | 53 | <name>sizePolicy</name> |
50 | <sizepolicy> | 54 | <sizepolicy> |
51 | <hsizetype>7</hsizetype> | 55 | <hsizetype>7</hsizetype> |
52 | <vsizetype>7</vsizetype> | 56 | <vsizetype>7</vsizetype> |
53 | </sizepolicy> | 57 | </sizepolicy> |
54 | </property> | 58 | </property> |
55 | <property> | 59 | <property> |
56 | <name>layoutMargin</name> | 60 | <name>layoutMargin</name> |
57 | </property> | 61 | </property> |
58 | <property> | 62 | <property> |
@@ -324,69 +328,69 @@ is provided free !</string> | |||
324 | </property> | 328 | </property> |
325 | <property stdset="1"> | 329 | <property stdset="1"> |
326 | <name>orientation</name> | 330 | <name>orientation</name> |
327 | <enum>Vertical</enum> | 331 | <enum>Vertical</enum> |
328 | </property> | 332 | </property> |
329 | <property stdset="1"> | 333 | <property stdset="1"> |
330 | <name>sizeType</name> | 334 | <name>sizeType</name> |
331 | <enum>Expanding</enum> | 335 | <enum>Expanding</enum> |
332 | </property> | 336 | </property> |
333 | <property> | 337 | <property> |
334 | <name>sizeHint</name> | 338 | <name>sizeHint</name> |
335 | <size> | 339 | <size> |
336 | <width>20</width> | 340 | <width>20</width> |
337 | <height>20</height> | 341 | <height>20</height> |
338 | </size> | 342 | </size> |
339 | </property> | 343 | </property> |
340 | </spacer> | 344 | </spacer> |
341 | </vbox> | 345 | </vbox> |
342 | </widget> | 346 | </widget> |
343 | <widget> | 347 | <widget> |
344 | <class>QWidget</class> | 348 | <class>QWidget</class> |
345 | <property stdset="1"> | 349 | <property stdset="1"> |
346 | <name>name</name> | 350 | <name>name</name> |
347 | <cstring>tab</cstring> | 351 | <cstring>tab</cstring> |
348 | </property> | 352 | </property> |
349 | <attribute> | 353 | <attribute> |
350 | <name>title</name> | 354 | <name>title</name> |
351 | <string>Order</string> | 355 | <string>Order</string> |
352 | </attribute> | 356 | </attribute> |
353 | <vbox> | 357 | <vbox> |
354 | <property stdset="1"> | 358 | <property stdset="1"> |
355 | <name>margin</name> | 359 | <name>margin</name> |
356 | <number>-1</number> | 360 | <number>2</number> |
357 | </property> | 361 | </property> |
358 | <property stdset="1"> | 362 | <property stdset="1"> |
359 | <name>spacing</name> | 363 | <name>spacing</name> |
360 | <number>-1</number> | 364 | <number>2</number> |
361 | </property> | 365 | </property> |
362 | <widget> | 366 | <widget> |
363 | <class>QGroupBox</class> | 367 | <class>QGroupBox</class> |
364 | <property stdset="1"> | 368 | <property stdset="1"> |
365 | <name>name</name> | 369 | <name>name</name> |
366 | <cstring>GroupBox9</cstring> | 370 | <cstring>GroupBox9</cstring> |
367 | </property> | 371 | </property> |
368 | <property stdset="1"> | 372 | <property stdset="1"> |
369 | <name>title</name> | 373 | <name>title</name> |
370 | <string>Select Contact Order:</string> | 374 | <string>Select Contact Order:</string> |
371 | </property> | 375 | </property> |
372 | <grid> | 376 | <grid> |
373 | <property stdset="1"> | 377 | <property stdset="1"> |
374 | <name>margin</name> | 378 | <name>margin</name> |
375 | <number>11</number> | 379 | <number>11</number> |
376 | </property> | 380 | </property> |
377 | <property stdset="1"> | 381 | <property stdset="1"> |
378 | <name>spacing</name> | 382 | <name>spacing</name> |
379 | <number>6</number> | 383 | <number>6</number> |
380 | </property> | 384 | </property> |
381 | <widget row="0" column="2" > | 385 | <widget row="0" column="2" > |
382 | <class>QPushButton</class> | 386 | <class>QPushButton</class> |
383 | <property stdset="1"> | 387 | <property stdset="1"> |
384 | <name>name</name> | 388 | <name>name</name> |
385 | <cstring>m_upButton</cstring> | 389 | <cstring>m_upButton</cstring> |
386 | </property> | 390 | </property> |
387 | <property stdset="1"> | 391 | <property stdset="1"> |
388 | <name>sizePolicy</name> | 392 | <name>sizePolicy</name> |
389 | <sizepolicy> | 393 | <sizepolicy> |
390 | <hsizetype>1</hsizetype> | 394 | <hsizetype>1</hsizetype> |
391 | <vsizetype>0</vsizetype> | 395 | <vsizetype>0</vsizetype> |
392 | </sizepolicy> | 396 | </sizepolicy> |
diff --git a/core/pim/addressbook/ocontactfields.cpp b/core/pim/addressbook/ocontactfields.cpp index 7823a9c..df57efa 100644 --- a/core/pim/addressbook/ocontactfields.cpp +++ b/core/pim/addressbook/ocontactfields.cpp | |||
@@ -13,65 +13,65 @@ | |||
13 | */ | 13 | */ |
14 | QStringList OContactFields::untrdetailsfields( bool sorted ) | 14 | QStringList OContactFields::untrdetailsfields( bool sorted ) |
15 | { | 15 | { |
16 | QStringList list; | 16 | QStringList list; |
17 | 17 | ||
18 | list.append( "Office" ); | 18 | list.append( "Office" ); |
19 | list.append( "Profession" ); | 19 | list.append( "Profession" ); |
20 | list.append( "Assistant" ); | 20 | list.append( "Assistant" ); |
21 | list.append( "Manager" ); | 21 | list.append( "Manager" ); |
22 | list.append( "Spouse" ); | 22 | list.append( "Spouse" ); |
23 | list.append( "Gender" ); | 23 | list.append( "Gender" ); |
24 | list.append( "Birthday" ); | 24 | list.append( "Birthday" ); |
25 | list.append( "Anniversary" ); | 25 | list.append( "Anniversary" ); |
26 | list.append( "Nickname" ); | 26 | list.append( "Nickname" ); |
27 | list.append( "Children" ); | 27 | list.append( "Children" ); |
28 | 28 | ||
29 | if (sorted) list.sort(); | 29 | if (sorted) list.sort(); |
30 | 30 | ||
31 | return list; | 31 | return list; |
32 | } | 32 | } |
33 | 33 | ||
34 | /*! | 34 | /*! |
35 | \internal | 35 | \internal |
36 | Returns a translated list of phone field names for a contact. | 36 | Returns a translated list of phone field names for a contact. |
37 | */ | 37 | */ |
38 | QStringList OContactFields::trphonefields( bool sorted ) | 38 | QStringList OContactFields::trphonefields( bool sorted ) |
39 | { | 39 | { |
40 | QStringList list; | 40 | QStringList list; |
41 | list.append( QObject::tr( "Business Phone" ) ); | 41 | list.append( QObject::tr( "Business Phone" ) ); |
42 | list.append( QObject::tr( "Business Fax" ) ); | 42 | list.append( QObject::tr( "Business Fax" ) ); |
43 | list.append( QObject::tr( "Business Mobile" ) ); | 43 | list.append( QObject::tr( "Business Mobile" ) ); |
44 | 44 | ||
45 | list.append( QObject::tr( "Default Email" ) ); | 45 | // list.append( QObject::tr( "Default Email" ) ); |
46 | list.append( QObject::tr( "Emails" ) ); | 46 | list.append( QObject::tr( "Emails" ) ); |
47 | 47 | ||
48 | list.append( QObject::tr( "Home Phone" ) ); | 48 | list.append( QObject::tr( "Home Phone" ) ); |
49 | list.append( QObject::tr( "Home Fax" ) ); | 49 | list.append( QObject::tr( "Home Fax" ) ); |
50 | list.append( QObject::tr( "Home Mobile" ) ); | 50 | list.append( QObject::tr( "Home Mobile" ) ); |
51 | 51 | ||
52 | if (sorted) list.sort(); | 52 | if (sorted) list.sort(); |
53 | 53 | ||
54 | return list; | 54 | return list; |
55 | } | 55 | } |
56 | 56 | ||
57 | 57 | ||
58 | /*! | 58 | /*! |
59 | \internal | 59 | \internal |
60 | Returns a translated list of details field names for a contact. | 60 | Returns a translated list of details field names for a contact. |
61 | */ | 61 | */ |
62 | QStringList OContactFields::trdetailsfields( bool sorted ) | 62 | QStringList OContactFields::trdetailsfields( bool sorted ) |
63 | { | 63 | { |
64 | QStringList list; | 64 | QStringList list; |
65 | 65 | ||
66 | list.append( QObject::tr( "Office" ) ); | 66 | list.append( QObject::tr( "Office" ) ); |
67 | list.append( QObject::tr( "Profession" ) ); | 67 | list.append( QObject::tr( "Profession" ) ); |
68 | list.append( QObject::tr( "Assistant" ) ); | 68 | list.append( QObject::tr( "Assistant" ) ); |
69 | list.append( QObject::tr( "Manager" ) ); | 69 | list.append( QObject::tr( "Manager" ) ); |
70 | 70 | ||
71 | list.append( QObject::tr( "Spouse" ) ); | 71 | list.append( QObject::tr( "Spouse" ) ); |
72 | list.append( QObject::tr( "Gender" ) ); | 72 | list.append( QObject::tr( "Gender" ) ); |
73 | list.append( QObject::tr( "Birthday" ) ); | 73 | list.append( QObject::tr( "Birthday" ) ); |
74 | list.append( QObject::tr( "Anniversary" ) ); | 74 | list.append( QObject::tr( "Anniversary" ) ); |
75 | list.append( QObject::tr( "Nickname" ) ); | 75 | list.append( QObject::tr( "Nickname" ) ); |
76 | list.append( QObject::tr( "Children" ) ); | 76 | list.append( QObject::tr( "Children" ) ); |
77 | 77 | ||
@@ -109,65 +109,65 @@ QStringList OContactFields::trfields( bool sorted ) | |||
109 | list.append( QObject::tr( "Business Pager" ) ); | 109 | list.append( QObject::tr( "Business Pager" ) ); |
110 | list.append( QObject::tr( "Business WebPage" ) ); | 110 | list.append( QObject::tr( "Business WebPage" ) ); |
111 | 111 | ||
112 | list.append( QObject::tr( "Home Street" ) ); | 112 | list.append( QObject::tr( "Home Street" ) ); |
113 | list.append( QObject::tr( "Home City" ) ); | 113 | list.append( QObject::tr( "Home City" ) ); |
114 | list.append( QObject::tr( "Home State" ) ); | 114 | list.append( QObject::tr( "Home State" ) ); |
115 | list.append( QObject::tr( "Home Zip" ) ); | 115 | list.append( QObject::tr( "Home Zip" ) ); |
116 | list.append( QObject::tr( "Home Country" ) ); | 116 | list.append( QObject::tr( "Home Country" ) ); |
117 | list.append( QObject::tr( "Home Web Page" ) ); | 117 | list.append( QObject::tr( "Home Web Page" ) ); |
118 | 118 | ||
119 | list += trdetailsfields( sorted ); | 119 | list += trdetailsfields( sorted ); |
120 | 120 | ||
121 | list.append( QObject::tr( "Notes" ) ); | 121 | list.append( QObject::tr( "Notes" ) ); |
122 | list.append( QObject::tr( "Groups" ) ); | 122 | list.append( QObject::tr( "Groups" ) ); |
123 | 123 | ||
124 | if (sorted) list.sort(); | 124 | if (sorted) list.sort(); |
125 | 125 | ||
126 | return list; | 126 | return list; |
127 | } | 127 | } |
128 | 128 | ||
129 | /*! | 129 | /*! |
130 | \internal | 130 | \internal |
131 | Returns a list of phone field names for a contact. | 131 | Returns a list of phone field names for a contact. |
132 | */ | 132 | */ |
133 | QStringList OContactFields::untrphonefields( bool sorted ) | 133 | QStringList OContactFields::untrphonefields( bool sorted ) |
134 | { | 134 | { |
135 | QStringList list; | 135 | QStringList list; |
136 | 136 | ||
137 | list.append( "Business Phone" ); | 137 | list.append( "Business Phone" ); |
138 | list.append( "Business Fax" ); | 138 | list.append( "Business Fax" ); |
139 | list.append( "Business Mobile" ); | 139 | list.append( "Business Mobile" ); |
140 | 140 | ||
141 | list.append( "Default Email" ); | 141 | // list.append( "Default Email" ); |
142 | list.append( "Emails" ); | 142 | list.append( "Emails" ); |
143 | 143 | ||
144 | list.append( "Home Phone" ); | 144 | list.append( "Home Phone" ); |
145 | list.append( "Home Fax" ); | 145 | list.append( "Home Fax" ); |
146 | list.append( "Home Mobile" ); | 146 | list.append( "Home Mobile" ); |
147 | 147 | ||
148 | if (sorted) list.sort(); | 148 | if (sorted) list.sort(); |
149 | 149 | ||
150 | return list; | 150 | return list; |
151 | } | 151 | } |
152 | 152 | ||
153 | /*! | 153 | /*! |
154 | \internal | 154 | \internal |
155 | Returns an untranslated list of field names for a contact. | 155 | Returns an untranslated list of field names for a contact. |
156 | */ | 156 | */ |
157 | QStringList OContactFields::untrfields( bool sorted ) | 157 | QStringList OContactFields::untrfields( bool sorted ) |
158 | { | 158 | { |
159 | QStringList list; | 159 | QStringList list; |
160 | 160 | ||
161 | list.append( "Name Title" ); | 161 | list.append( "Name Title" ); |
162 | list.append( "First Name" ); | 162 | list.append( "First Name" ); |
163 | list.append( "Middle Name" ); | 163 | list.append( "Middle Name" ); |
164 | list.append( "Last Name" ); | 164 | list.append( "Last Name" ); |
165 | list.append( "Suffix" ); | 165 | list.append( "Suffix" ); |
166 | list.append( "File As" ); | 166 | list.append( "File As" ); |
167 | 167 | ||
168 | list.append( "Job Title" ); | 168 | list.append( "Job Title" ); |
169 | list.append( "Department" ); | 169 | list.append( "Department" ); |
170 | list.append( "Company" ); | 170 | list.append( "Company" ); |
171 | 171 | ||
172 | list += untrphonefields( sorted ); | 172 | list += untrphonefields( sorted ); |
173 | 173 | ||