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/pim | |
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 | |||
@@ -125,5 +125,6 @@ AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name | |||
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)) ); |
@@ -157,15 +158,8 @@ void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList ) | |||
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(); |
@@ -209,47 +203,14 @@ bool AbTable::selectContact( int UID ) | |||
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 | ||
@@ -257,15 +218,5 @@ 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 | ||
@@ -358,34 +309,4 @@ void AbTable::moveTo( char /*c*/ ) | |||
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 | ||
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 | |||
@@ -121,4 +121,5 @@ signals: | |||
121 | void signalKeyDown(); | 121 | void signalKeyDown(); |
122 | void signalKeyUp(); | 122 | void signalKeyUp(); |
123 | void signalSortOrderChanged( bool order ); | ||
123 | 124 | ||
124 | protected: | 125 | protected: |
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 | |||
@@ -43,4 +43,5 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ): | |||
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 ), |
@@ -81,4 +82,6 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ): | |||
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) ) ); |
@@ -162,13 +165,13 @@ void AbView::load() | |||
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 | } |
@@ -417,4 +420,9 @@ void AbView::slotSwitch(){ | |||
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 | ||
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 | |||
@@ -59,4 +59,5 @@ public slots: | |||
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: |
@@ -71,4 +72,5 @@ private: | |||
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; |
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 | |||
@@ -3,6 +3,6 @@ | |||
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" |