summaryrefslogtreecommitdiff
authoreilers <eilers>2005-03-18 16:06:14 (UTC)
committer eilers <eilers>2005-03-18 16:06:14 (UTC)
commite8df4b3938c8f97aa958708a56794797f16b24c7 (patch) (unidiff)
tree1e70153934960abc8e493a4da506021cf535e2d0
parentb37f4395889351829e295d6fd1b4535ad3a67728 (diff)
downloadopie-e8df4b3938c8f97aa958708a56794797f16b24c7.zip
opie-e8df4b3938c8f97aa958708a56794797f16b24c7.tar.gz
opie-e8df4b3938c8f97aa958708a56794797f16b24c7.tar.bz2
Fixing problem with categories: "unfiled" and "all" show the same list.
Previous patch removed correct use of the pim backend. Therefore I had reimplemented it.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/abview.cpp20
1 files changed, 15 insertions, 5 deletions
diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp
index 34035fd..8a2db96 100644
--- a/core/pim/addressbook/abview.cpp
+++ b/core/pim/addressbook/abview.cpp
@@ -144,37 +144,47 @@ Opie::OPimContact AbView::currentEntry()
144} 144}
145 145
146bool AbView::save() 146bool AbView::save()
147{ 147{
148 //odebug << "AbView::Save data" << oendl; 148 //odebug << "AbView::Save data" << oendl;
149 149
150 return m_contactdb->save(); 150 return m_contactdb->save();
151} 151}
152 152
153void AbView::load() 153void AbView::load()
154{ 154{
155 odebug << "AbView::Load data" << oendl; 155 odebug << "AbView::Load data" << oendl;
156 156
157 // Letter Search is stopped at this place 157 // Letter Search is stopped at this place
158 emit signalClearLetterPicker(); 158 emit signalClearLetterPicker();
159 159
160 m_list = m_contactdb->sorted( true, Opie::OPimContactAccess::SortFileAsName, 160 odebug << "selected Category: " << m_curr_category << oendl;
161 Opie::OPimContactAccess::FilterCategory, m_curr_category ); 161
162 162 if ( m_curr_category == -1 ) {
163 // if ( m_curr_category != -1 ) 163 // Show just unfiled contacts
164 // clearForCategory(); 164 m_list = m_contactdb->sorted( true, Opie::OPimContactAccess::SortFileAsName,
165 Opie::OPimContactAccess::DoNotShowWithCategory, 0 );
166 } elseif ( m_curr_category == 0 ){
167 // Just show all contacts
168 m_list = m_contactdb->sorted( true, Opie::OPimContactAccess::SortFileAsName,
169 Opie::OPimBase::FilterOff, 0 );
170 } else {
171 // Show contacts with given categories
172 m_list = m_contactdb->sorted( true, Opie::OPimContactAccess::SortFileAsName,
173 Opie::OPimBase::FilterCategory, m_curr_category );
174 }
165 175
166 odebug << "Number of contacts: " << m_list.count() << oendl; 176 odebug << "Number of contacts: " << m_list.count() << oendl;
167 177
168 updateView( true ); 178 updateView( true );
169 179
170} 180}
171 181
172void AbView::reload() 182void AbView::reload()
173{ 183{
174 odebug << "AbView::::reload()" << oendl; 184 odebug << "AbView::::reload()" << oendl;
175 185
176 m_contactdb->reload(); 186 m_contactdb->reload();
177 load(); 187 load();
178} 188}
179 189
180void AbView::clear() 190void AbView::clear()