author | eilers <eilers> | 2005-03-24 16:23:51 (UTC) |
---|---|---|
committer | eilers <eilers> | 2005-03-24 16:23:51 (UTC) |
commit | b390bcd32e188fc3c9fd7067bfc41b60b5e84ad4 (patch) (unidiff) | |
tree | 38bc784605eb06a6669e8708c86cc9cebaa32b2a /core | |
parent | 29da9a4477210843435cbea3ede0d520775fe1a5 (diff) | |
download | opie-b390bcd32e188fc3c9fd7067bfc41b60b5e84ad4.zip opie-b390bcd32e188fc3c9fd7067bfc41b60b5e84ad4.tar.gz opie-b390bcd32e188fc3c9fd7067bfc41b60b5e84ad4.tar.bz2 |
In table view: Clicking on column 0 changes the sortorder.
Version of ths app was changed to 1.2.0
Requested by #1591
-rw-r--r-- | core/pim/addressbook/abtable.cpp | 93 | ||||
-rw-r--r-- | core/pim/addressbook/abtable.h | 1 | ||||
-rw-r--r-- | core/pim/addressbook/abview.cpp | 14 | ||||
-rw-r--r-- | core/pim/addressbook/abview.h | 2 | ||||
-rw-r--r-- | core/pim/addressbook/version.h | 4 |
5 files changed, 23 insertions, 91 deletions
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp index 49e66ad..60f3177 100644 --- a/core/pim/addressbook/abtable.cpp +++ b/core/pim/addressbook/abtable.cpp | |||
@@ -115,25 +115,26 @@ void AbPickItem::setContentFromEditor( QWidget *w ) | |||
115 | AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name ) | 115 | AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name ) |
116 | : QTable( parent, name ), | 116 | : QTable( parent, name ), |
117 | lastSortCol( -1 ), | 117 | lastSortCol( -1 ), |
118 | asc( TRUE ), | 118 | asc( TRUE ), |
119 | intFields( order ), | 119 | intFields( order ), |
120 | enablePainting( true ), | 120 | enablePainting( true ), |
121 | columnVisible( true ), | 121 | columnVisible( true ), |
122 | countNested( 0 ) | 122 | countNested( 0 ) |
123 | { | 123 | { |
124 | //odebug << "C'tor start" << oendl; | 124 | //odebug << "C'tor start" << oendl; |
125 | setSelectionMode( NoSelection ); | 125 | setSelectionMode( NoSelection ); |
126 | init(); | 126 | init(); |
127 | setSorting( TRUE ); | 127 | setSorting( false ); // The table should not sort by itself! |
128 | |||
128 | connect( this, SIGNAL(clicked(int,int,int,const QPoint&)), | 129 | connect( this, SIGNAL(clicked(int,int,int,const QPoint&)), |
129 | this, SLOT(itemClicked(int,int)) ); | 130 | this, SLOT(itemClicked(int,int)) ); |
130 | 131 | ||
131 | // contactList.clear(); | 132 | // contactList.clear(); |
132 | //odebug << "C'tor end" << oendl; | 133 | //odebug << "C'tor end" << oendl; |
133 | } | 134 | } |
134 | 135 | ||
135 | AbTable::~AbTable() | 136 | AbTable::~AbTable() |
136 | { | 137 | { |
137 | } | 138 | } |
138 | 139 | ||
139 | void AbTable::init() | 140 | void AbTable::init() |
@@ -147,35 +148,28 @@ void AbTable::init() | |||
147 | setLeftMargin( 0 ); | 148 | setLeftMargin( 0 ); |
148 | verticalHeader()->hide(); | 149 | verticalHeader()->hide(); |
149 | columnVisible = true; | 150 | columnVisible = true; |
150 | } | 151 | } |
151 | 152 | ||
152 | void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList ) | 153 | void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList ) |
153 | { | 154 | { |
154 | odebug << "AbTable::setContacts()" << oendl; | 155 | odebug << "AbTable::setContacts()" << oendl; |
155 | 156 | ||
156 | clear(); | 157 | clear(); |
157 | m_viewList = viewList; | 158 | m_viewList = viewList; |
158 | 159 | ||
159 | setSorting( false ); | ||
160 | setPaintingEnabled( FALSE ); | 160 | setPaintingEnabled( FALSE ); |
161 | 161 | ||
162 | setNumRows( m_viewList.count() ); | 162 | setNumRows( m_viewList.count() ); |
163 | //int row = 0; | ||
164 | // for ( it = m_viewList.begin(); it != m_viewList.end(); ++it ) | ||
165 | // insertIntoTable( *it, row++ ); | ||
166 | |||
167 | // setSorting( true ); | ||
168 | 163 | ||
169 | // resort(); | ||
170 | 164 | ||
171 | updateVisible(); | 165 | updateVisible(); |
172 | 166 | ||
173 | setPaintingEnabled( TRUE ); | 167 | setPaintingEnabled( TRUE ); |
174 | 168 | ||
175 | } | 169 | } |
176 | 170 | ||
177 | void AbTable::setOrderedList( const QValueList<int> ordered ) | 171 | void AbTable::setOrderedList( const QValueList<int> ordered ) |
178 | { | 172 | { |
179 | intFields = ordered; | 173 | intFields = ordered; |
180 | } | 174 | } |
181 | 175 | ||
@@ -199,83 +193,40 @@ bool AbTable::selectContact( int UID ) | |||
199 | odebug << "Search end" << oendl; | 193 | odebug << "Search end" << oendl; |
200 | 194 | ||
201 | if ( !found ){ | 195 | if ( !found ){ |
202 | ensureCellVisible( 0,0 ); | 196 | ensureCellVisible( 0,0 ); |
203 | setCurrentCell( 0, 0 ); | 197 | setCurrentCell( 0, 0 ); |
204 | } | 198 | } |
205 | 199 | ||
206 | setPaintingEnabled( TRUE ); | 200 | setPaintingEnabled( TRUE ); |
207 | 201 | ||
208 | return true; | 202 | return true; |
209 | } | 203 | } |
210 | 204 | ||
211 | #if 0 | ||
212 | void AbTable::insertIntoTable( const Opie::OPimContact& cnt, int row ) | ||
213 | { | ||
214 | odebug << "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, " | ||
215 | << row << " )" << oendl; | ||
216 | QString strName; | ||
217 | ContactItem contactItem; | ||
218 | |||
219 | strName = findContactName( cnt ); | ||
220 | contactItem = findContactContact( cnt, row ); | ||
221 | |||
222 | AbTableItem *ati; | ||
223 | ati = new AbTableItem( this, QTableItem::Never, strName, contactItem.value ); | ||
224 | contactList.insert( ati, cnt ); | ||
225 | setItem( row, 0, ati ); | ||
226 | ati = new AbTableItem( this, QTableItem::Never, contactItem.value, strName); | ||
227 | if ( !contactItem.icon.isNull() ) | ||
228 | ati->setPixmap( contactItem.icon ); | ||
229 | setItem( row, 1, ati ); | ||
230 | |||
231 | //### cannot do this; table only has two columns at this point | ||
232 | // setItem( row, 2, new AbPickItem( this ) ); | ||
233 | |||
234 | } | ||
235 | #endif | ||
236 | |||
237 | 205 | ||
238 | void AbTable::columnClicked( int col ) | 206 | void AbTable::columnClicked( int col ) |
239 | { | 207 | { |
240 | if ( !sorting() ) | 208 | odebug << "columClicked(" << col << ")" << oendl; |
241 | return; | ||
242 | |||
243 | if ( lastSortCol == -1 ) | ||
244 | lastSortCol = col; | ||
245 | 209 | ||
246 | if ( col == lastSortCol ) { | 210 | if ( col == 0 ){ |
211 | odebug << "Change sort order: " << asc << oendl; | ||
247 | asc = !asc; | 212 | asc = !asc; |
248 | } else { | 213 | emit signalSortOrderChanged( asc ); |
249 | lastSortCol = col; | ||
250 | asc = TRUE; | ||
251 | } | 214 | } |
252 | //QMessageBox::information( this, "resort", "columnClicked" ); | ||
253 | resort(); | ||
254 | } | 215 | } |
255 | 216 | ||
256 | void AbTable::resort() | 217 | void AbTable::resort() |
257 | { | 218 | { |
258 | owarn << "void AbTable::resort() NOT POSSIBLE !!" << oendl; | 219 | owarn << "void AbTable::resort() NOT POSSIBLE !!" << oendl; |
259 | #if 0 | 220 | |
260 | setPaintingEnabled( FALSE ); | ||
261 | if ( sorting() ) { | ||
262 | if ( lastSortCol == -1 ) | ||
263 | lastSortCol = 0; | ||
264 | sortColumn( lastSortCol, asc, TRUE ); | ||
265 | //QMessageBox::information( this, "resort", "resort" ); | ||
266 | updateVisible(); | ||
267 | } | ||
268 | setPaintingEnabled( TRUE ); | ||
269 | #endif | ||
270 | } | 221 | } |
271 | 222 | ||
272 | Opie::OPimContact AbTable::currentEntry() | 223 | Opie::OPimContact AbTable::currentEntry() |
273 | { | 224 | { |
274 | return m_viewList[currentRow()]; | 225 | return m_viewList[currentRow()]; |
275 | } | 226 | } |
276 | 227 | ||
277 | int AbTable::currentEntry_UID() | 228 | int AbTable::currentEntry_UID() |
278 | { | 229 | { |
279 | return ( currentEntry().uid() ); | 230 | return ( currentEntry().uid() ); |
280 | } | 231 | } |
281 | 232 | ||
@@ -348,54 +299,24 @@ void AbTable::keyPressEvent( QKeyEvent *e ) | |||
348 | // emit signalKeyDown(); | 299 | // emit signalKeyDown(); |
349 | // break; | 300 | // break; |
350 | default: | 301 | default: |
351 | QTable::keyPressEvent( e ); | 302 | QTable::keyPressEvent( e ); |
352 | } | 303 | } |
353 | 304 | ||
354 | } | 305 | } |
355 | 306 | ||
356 | void AbTable::moveTo( char /*c*/ ) | 307 | void AbTable::moveTo( char /*c*/ ) |
357 | { | 308 | { |
358 | odebug << "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" << oendl; | 309 | odebug << "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" << oendl; |
359 | 310 | ||
360 | #if 0 | ||
361 | int rows = numRows(); | ||
362 | QString value; | ||
363 | AbTableItem *abi; | ||
364 | int r; | ||
365 | if ( asc ) { | ||
366 | r = 0; | ||
367 | while ( r < rows-1) { | ||
368 | abi = static_cast<AbTableItem*>( item(r, 0) ); | ||
369 | QChar first = abi->key()[0]; | ||
370 | //### is there a bug in QChar to char comparison??? | ||
371 | if ( first.row() || first.cell() >= c ) | ||
372 | break; | ||
373 | r++; | ||
374 | } | ||
375 | } else { | ||
376 | //### should probably disable reverse sorting instead | ||
377 | r = rows - 1; | ||
378 | while ( r > 0 ) { | ||
379 | abi = static_cast<AbTableItem*>( item(r, 0) ); | ||
380 | QChar first = abi->key()[0]; | ||
381 | //### is there a bug in QChar to char comparison??? | ||
382 | if ( first.row() || first.cell() >= c ) | ||
383 | break; | ||
384 | r--; | ||
385 | } | ||
386 | } | ||
387 | setCurrentCell( r, currentColumn() ); | ||
388 | |||
389 | #endif | ||
390 | } | 311 | } |
391 | 312 | ||
392 | #if 0 | 313 | #if 0 |
393 | // Useless.. Nobody uses it .. (se) | 314 | // Useless.. Nobody uses it .. (se) |
394 | QString AbTable::findContactName( const Opie::OPimContact &entry ) | 315 | QString AbTable::findContactName( const Opie::OPimContact &entry ) |
395 | { | 316 | { |
396 | // We use the fileAs, then company, defaultEmail | 317 | // We use the fileAs, then company, defaultEmail |
397 | QString str; | 318 | QString str; |
398 | str = entry.fileAs(); | 319 | str = entry.fileAs(); |
399 | if ( str.isEmpty() ) { | 320 | if ( str.isEmpty() ) { |
400 | str = entry.company(); | 321 | str = entry.company(); |
401 | if ( str.isEmpty() ) { | 322 | if ( str.isEmpty() ) { |
diff --git a/core/pim/addressbook/abtable.h b/core/pim/addressbook/abtable.h index 927a5a9..7d2818b 100644 --- a/core/pim/addressbook/abtable.h +++ b/core/pim/addressbook/abtable.h | |||
@@ -111,24 +111,25 @@ public: | |||
111 | 111 | ||
112 | // addresspicker mode (What's that ? se) | 112 | // addresspicker mode (What's that ? se) |
113 | // void setChoiceNames( const QStringList& list); | 113 | // void setChoiceNames( const QStringList& list); |
114 | // QStringList choiceNames() const; | 114 | // QStringList choiceNames() const; |
115 | void setChoiceSelection( const QValueList<int>& list ); | 115 | void setChoiceSelection( const QValueList<int>& list ); |
116 | QStringList choiceSelection(int index) const; | 116 | QStringList choiceSelection(int index) const; |
117 | 117 | ||
118 | signals: | 118 | signals: |
119 | void signalSwitch(); | 119 | void signalSwitch(); |
120 | void signalEditor(); | 120 | void signalEditor(); |
121 | void signalKeyDown(); | 121 | void signalKeyDown(); |
122 | void signalKeyUp(); | 122 | void signalKeyUp(); |
123 | void signalSortOrderChanged( bool order ); | ||
123 | 124 | ||
124 | protected: | 125 | protected: |
125 | virtual void keyPressEvent( QKeyEvent *e ); | 126 | virtual void keyPressEvent( QKeyEvent *e ); |
126 | 127 | ||
127 | // int rowHeight( int ) const; | 128 | // int rowHeight( int ) const; |
128 | // int rowPos( int row ) const; | 129 | // int rowPos( int row ) const; |
129 | // virtual int rowAt( int pos ) const; | 130 | // virtual int rowAt( int pos ) const; |
130 | 131 | ||
131 | 132 | ||
132 | protected slots: | 133 | protected slots: |
133 | void moveTo( char ); | 134 | void moveTo( char ); |
134 | virtual void columnClicked( int col ); | 135 | virtual void columnClicked( int col ); |
diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp index 8a2db96..9f7f71f 100644 --- a/core/pim/addressbook/abview.cpp +++ b/core/pim/addressbook/abview.cpp | |||
@@ -33,24 +33,25 @@ QString addressbookPersonalVCardName() | |||
33 | { | 33 | { |
34 | QString filename = Global::applicationFileName("addressbook", | 34 | QString filename = Global::applicationFileName("addressbook", |
35 | "businesscard.vcf"); | 35 | "businesscard.vcf"); |
36 | return filename; | 36 | return filename; |
37 | } | 37 | } |
38 | 38 | ||
39 | 39 | ||
40 | AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ): | 40 | AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ): |
41 | QWidget(parent), | 41 | QWidget(parent), |
42 | mCat(0), | 42 | mCat(0), |
43 | m_inSearch( false ), | 43 | m_inSearch( false ), |
44 | m_inPersonal( false ), | 44 | m_inPersonal( false ), |
45 | m_sortOrder( true ), | ||
45 | m_curr_category( 0 ), | 46 | m_curr_category( 0 ), |
46 | m_curr_View( TableView ), | 47 | m_curr_View( TableView ), |
47 | m_prev_View( TableView ), | 48 | m_prev_View( TableView ), |
48 | m_curr_Contact ( 0 ), | 49 | m_curr_Contact ( 0 ), |
49 | m_contactdb ( 0l ), | 50 | m_contactdb ( 0l ), |
50 | m_storedDB ( 0l ), | 51 | m_storedDB ( 0l ), |
51 | m_viewStack( 0l ), | 52 | m_viewStack( 0l ), |
52 | m_abTable( 0l ), | 53 | m_abTable( 0l ), |
53 | m_orderedFields( ordered ) | 54 | m_orderedFields( ordered ) |
54 | { | 55 | { |
55 | odebug << "AbView::c'tor" << oendl; | 56 | odebug << "AbView::c'tor" << oendl; |
56 | // Load default database and handle syncing myself.. ! | 57 | // Load default database and handle syncing myself.. ! |
@@ -71,24 +72,26 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ): | |||
71 | 72 | ||
72 | // Add TableView to WidgetStack and raise it | 73 | // Add TableView to WidgetStack and raise it |
73 | m_viewStack -> addWidget( tableBox , TableView ); | 74 | m_viewStack -> addWidget( tableBox , TableView ); |
74 | 75 | ||
75 | // Create CardView and add it to WidgetStack | 76 | // Create CardView and add it to WidgetStack |
76 | QVBox* cardBox = new QVBox( m_viewStack ); | 77 | QVBox* cardBox = new QVBox( m_viewStack ); |
77 | m_ablabel = new AbLabel( cardBox, "CardView"); | 78 | m_ablabel = new AbLabel( cardBox, "CardView"); |
78 | m_viewStack -> addWidget( cardBox , CardView ); | 79 | m_viewStack -> addWidget( cardBox , CardView ); |
79 | 80 | ||
80 | // Connect views to me | 81 | // Connect views to me |
81 | connect ( m_abTable, SIGNAL( signalSwitch(void) ), | 82 | connect ( m_abTable, SIGNAL( signalSwitch(void) ), |
82 | this, SLOT( slotSwitch(void) ) ); | 83 | this, SLOT( slotSwitch(void) ) ); |
84 | connect ( m_abTable, SIGNAL( signalSortOrderChanged( bool ) ), | ||
85 | this, SLOT( slotSetSortOrder( bool ) ) ); | ||
83 | connect ( m_ablabel, SIGNAL( signalOkPressed(void) ), | 86 | connect ( m_ablabel, SIGNAL( signalOkPressed(void) ), |
84 | this, SLOT( slotSwitch(void) ) ); | 87 | this, SLOT( slotSwitch(void) ) ); |
85 | 88 | ||
86 | load(); | 89 | load(); |
87 | } | 90 | } |
88 | 91 | ||
89 | AbView::~AbView() | 92 | AbView::~AbView() |
90 | { | 93 | { |
91 | m_contactdb -> save(); | 94 | m_contactdb -> save(); |
92 | delete m_contactdb; | 95 | delete m_contactdb; |
93 | 96 | ||
94 | if ( m_storedDB ){ | 97 | if ( m_storedDB ){ |
@@ -152,33 +155,33 @@ bool AbView::save() | |||
152 | 155 | ||
153 | void AbView::load() | 156 | void AbView::load() |
154 | { | 157 | { |
155 | odebug << "AbView::Load data" << oendl; | 158 | odebug << "AbView::Load data" << oendl; |
156 | 159 | ||
157 | // Letter Search is stopped at this place | 160 | // Letter Search is stopped at this place |
158 | emit signalClearLetterPicker(); | 161 | emit signalClearLetterPicker(); |
159 | 162 | ||
160 | odebug << "selected Category: " << m_curr_category << oendl; | 163 | odebug << "selected Category: " << m_curr_category << oendl; |
161 | 164 | ||
162 | if ( m_curr_category == -1 ) { | 165 | if ( m_curr_category == -1 ) { |
163 | // Show just unfiled contacts | 166 | // Show just unfiled contacts |
164 | m_list = m_contactdb->sorted( true, Opie::OPimContactAccess::SortFileAsName, | 167 | m_list = m_contactdb->sorted( m_sortOrder, Opie::OPimContactAccess::SortFileAsName, |
165 | Opie::OPimContactAccess::DoNotShowWithCategory, 0 ); | 168 | Opie::OPimContactAccess::DoNotShowWithCategory, 0 ); |
166 | } elseif ( m_curr_category == 0 ){ | 169 | } elseif ( m_curr_category == 0 ){ |
167 | // Just show all contacts | 170 | // Just show all contacts |
168 | m_list = m_contactdb->sorted( true, Opie::OPimContactAccess::SortFileAsName, | 171 | m_list = m_contactdb->sorted( m_sortOrder, Opie::OPimContactAccess::SortFileAsName, |
169 | Opie::OPimBase::FilterOff, 0 ); | 172 | Opie::OPimBase::FilterOff, 0 ); |
170 | } else { | 173 | } else { |
171 | // Show contacts with given categories | 174 | // Show contacts with given categories |
172 | m_list = m_contactdb->sorted( true, Opie::OPimContactAccess::SortFileAsName, | 175 | m_list = m_contactdb->sorted( m_sortOrder, Opie::OPimContactAccess::SortFileAsName, |
173 | Opie::OPimBase::FilterCategory, m_curr_category ); | 176 | Opie::OPimBase::FilterCategory, m_curr_category ); |
174 | } | 177 | } |
175 | 178 | ||
176 | odebug << "Number of contacts: " << m_list.count() << oendl; | 179 | odebug << "Number of contacts: " << m_list.count() << oendl; |
177 | 180 | ||
178 | updateView( true ); | 181 | updateView( true ); |
179 | 182 | ||
180 | } | 183 | } |
181 | 184 | ||
182 | void AbView::reload() | 185 | void AbView::reload() |
183 | { | 186 | { |
184 | odebug << "AbView::::reload()" << oendl; | 187 | odebug << "AbView::::reload()" << oendl; |
@@ -407,24 +410,29 @@ void AbView::slotSwitch(){ | |||
407 | odebug << "Switching to CardView" << oendl; | 410 | odebug << "Switching to CardView" << oendl; |
408 | m_curr_View = CardView; | 411 | m_curr_View = CardView; |
409 | break; | 412 | break; |
410 | case CardView: | 413 | case CardView: |
411 | odebug << "Switching to TableView" << oendl; | 414 | odebug << "Switching to TableView" << oendl; |
412 | m_curr_View = TableView; | 415 | m_curr_View = TableView; |
413 | break; | 416 | break; |
414 | } | 417 | } |
415 | updateView(); | 418 | updateView(); |
416 | 419 | ||
417 | } | 420 | } |
418 | 421 | ||
422 | void AbView::slotSetSortOrder( bool order ){ | ||
423 | m_sortOrder = order; | ||
424 | reload(); | ||
425 | } | ||
426 | |||
419 | // END: Slots | 427 | // END: Slots |
420 | 428 | ||
421 | void AbView::clearForCategory() | 429 | void AbView::clearForCategory() |
422 | { | 430 | { |
423 | Opie::OPimContactAccess::List::Iterator it; | 431 | Opie::OPimContactAccess::List::Iterator it; |
424 | // Now remove all contacts with wrong category if any category selected | 432 | // Now remove all contacts with wrong category if any category selected |
425 | 433 | ||
426 | Opie::OPimContactAccess::List allList = m_list; | 434 | Opie::OPimContactAccess::List allList = m_list; |
427 | if ( m_curr_category != 0 ){ | 435 | if ( m_curr_category != 0 ){ |
428 | for ( it = allList.begin(); it != allList.end(); ++it ){ | 436 | for ( it = allList.begin(); it != allList.end(); ++it ){ |
429 | if ( !contactCompare( *it, m_curr_category ) ){ | 437 | if ( !contactCompare( *it, m_curr_category ) ){ |
430 | //odebug << "Removing " << (*it).uid() << oendl; | 438 | //odebug << "Removing " << (*it).uid() << oendl; |
diff --git a/core/pim/addressbook/abview.h b/core/pim/addressbook/abview.h index b8c8a08..07b6b28 100644 --- a/core/pim/addressbook/abview.h +++ b/core/pim/addressbook/abview.h | |||
@@ -49,36 +49,38 @@ public: | |||
49 | QString showCategory() const; | 49 | QString showCategory() const; |
50 | QStringList categories(); | 50 | QStringList categories(); |
51 | 51 | ||
52 | signals: | 52 | signals: |
53 | void signalNotFound(); | 53 | void signalNotFound(); |
54 | void signalClearLetterPicker(); | 54 | void signalClearLetterPicker(); |
55 | void signalViewSwitched ( int ); | 55 | void signalViewSwitched ( int ); |
56 | 56 | ||
57 | public slots: | 57 | public slots: |
58 | void slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, | 58 | void slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, |
59 | bool backwards, QString category = QString::null ); | 59 | bool backwards, QString category = QString::null ); |
60 | void slotSwitch(); | 60 | void slotSwitch(); |
61 | void slotSetSortOrder( bool order ); | ||
61 | 62 | ||
62 | private: | 63 | private: |
63 | void updateListinViews(); | 64 | void updateListinViews(); |
64 | void updateView( bool newdata = false ); | 65 | void updateView( bool newdata = false ); |
65 | void clearForCategory(); | 66 | void clearForCategory(); |
66 | bool contactCompare( const Opie::OPimContact &cnt, int category ); | 67 | bool contactCompare( const Opie::OPimContact &cnt, int category ); |
67 | void parseName( const QString& name, QString *first, QString *middle, | 68 | void parseName( const QString& name, QString *first, QString *middle, |
68 | QString * last ); | 69 | QString * last ); |
69 | 70 | ||
70 | Categories mCat; | 71 | Categories mCat; |
71 | bool m_inSearch; | 72 | bool m_inSearch; |
72 | bool m_inPersonal; | 73 | bool m_inPersonal; |
74 | bool m_sortOrder; | ||
73 | int m_curr_category; | 75 | int m_curr_category; |
74 | Views m_curr_View; | 76 | Views m_curr_View; |
75 | Views m_prev_View; | 77 | Views m_prev_View; |
76 | int m_curr_Contact; | 78 | int m_curr_Contact; |
77 | 79 | ||
78 | Opie::OPimContactAccess* m_contactdb; | 80 | Opie::OPimContactAccess* m_contactdb; |
79 | Opie::OPimContactAccess* m_storedDB; | 81 | Opie::OPimContactAccess* m_storedDB; |
80 | Opie::OPimContactAccess::List m_list; | 82 | Opie::OPimContactAccess::List m_list; |
81 | 83 | ||
82 | QWidgetStack* m_viewStack; | 84 | QWidgetStack* m_viewStack; |
83 | AbTable* m_abTable; | 85 | AbTable* m_abTable; |
84 | AbLabel* m_ablabel; | 86 | AbLabel* m_ablabel; |
diff --git a/core/pim/addressbook/version.h b/core/pim/addressbook/version.h index 7ce9752..8aafc85 100644 --- a/core/pim/addressbook/version.h +++ b/core/pim/addressbook/version.h | |||
@@ -1,10 +1,10 @@ | |||
1 | #ifndef _VERSION_H_ | 1 | #ifndef _VERSION_H_ |
2 | #define _VERSION_H_ | 2 | #define _VERSION_H_ |
3 | 3 | ||
4 | #define MAINVERSION "1" | 4 | #define MAINVERSION "1" |
5 | #define SUBVERSION "1" | 5 | #define SUBVERSION "2" |
6 | #define PATCHVERSION "1" | 6 | #define PATCHVERSION "0" |
7 | 7 | ||
8 | #define APPNAME "OPIE_ADDRESSBOOK" | 8 | #define APPNAME "OPIE_ADDRESSBOOK" |
9 | 9 | ||
10 | #endif | 10 | #endif |