-rw-r--r-- | core/pim/todo/main.cpp | 2 | ||||
-rw-r--r-- | core/pim/todo/mainwindow.cpp | 5 | ||||
-rw-r--r-- | core/pim/todo/tableview.cpp | 83 | ||||
-rw-r--r-- | core/pim/todo/tableview.h | 7 | ||||
-rw-r--r-- | core/pim/todo/todomanager.cpp | 2 | ||||
-rw-r--r-- | core/pim/todo/todoview.cpp | 3 | ||||
-rw-r--r-- | core/pim/todo/todoview.h | 2 |
7 files changed, 78 insertions, 26 deletions
diff --git a/core/pim/todo/main.cpp b/core/pim/todo/main.cpp index 58ed45c..aeae794 100644 --- a/core/pim/todo/main.cpp +++ b/core/pim/todo/main.cpp @@ -32,5 +32,5 @@ void myMessages( QtMsgType, const char* ) { int main( int argc, char **argv ) { - qInstallMsgHandler( myMessages ); +// qInstallMsgHandler( myMessages ); QPEApplication a( argc, argv ); diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp index 48954ce..c9c43d4 100644 --- a/core/pim/todo/mainwindow.cpp +++ b/core/pim/todo/mainwindow.cpp @@ -421,5 +421,4 @@ void MainWindow::slotNew() { populateCategories(); } - raiseCurrentView( ); } @@ -498,4 +497,5 @@ void MainWindow::setCategory( int c) { if ( c <= 0 ) return; + qWarning("Iterating over cats %d", c ); for ( unsigned int i = 1; i < m_catMenu->count(); i++ ) @@ -514,4 +514,5 @@ void MainWindow::setCategory( int c) { } m_catMenu->setItemChecked( c, true ); + currentView()->setShowCategory( m_curCat ); raiseCurrentView(); @@ -550,5 +551,4 @@ void MainWindow::slotShowDetails() { */ void MainWindow::populateCategories() { - if (m_todoMgr.isLoaded() ) m_todoMgr.load(); @@ -615,4 +615,5 @@ void MainWindow::slotEdit( int uid ) { m_todoMgr.update( todo.uid(), todo ); currentView()->replaceEvent( todo ); + /* a Category might have changed */ populateCategories(); } diff --git a/core/pim/todo/tableview.cpp b/core/pim/todo/tableview.cpp index 5594b13..5d82eb2 100644 --- a/core/pim/todo/tableview.cpp +++ b/core/pim/todo/tableview.cpp @@ -90,4 +90,7 @@ TableView::TableView( MainWindow* window, QWidget* wid ) viewport()->setUpdatesEnabled( true ); viewport()->update(); + setSortOrder( 0 ); + setAscending( TRUE ); + m_first = true; } /* a new day has started @@ -110,7 +113,7 @@ QString TableView::type() const { } int TableView::current() { - int cur = 0; - // FIXME - return cur; + int uid = sorted().uidAt(currentRow() ); + qWarning("uid %d", uid ); + return uid; } QString TableView::currentRepresentation() { @@ -124,6 +127,4 @@ void TableView::showOverDue( bool ) { void TableView::updateView( ) { - setSortOrder( 0 ); - setAscending( true ); sort(); OTodoAccess::List::Iterator it, end; @@ -188,7 +189,12 @@ void TableView::setShowDeadline( bool b) { hideColumn(3 ); } -void TableView::setShowCategory( const QString& ) { +void TableView::setShowCategory( const QString& str) { qWarning("setShowCategory"); + if ( str != m_oleCat || m_first ) updateView(); + + m_oleCat = str; + m_first = false; + } void TableView::clear() { @@ -199,24 +205,22 @@ void TableView::slotClicked(int row, int col, int, if ( !cellGeometry(row, col ).contains(point ) ) return; - int ui=0; // FIXME = uid(row); + + int ui= sorted().uidAt( row ); switch( col ) { case 0: { - // FIXME - CheckItem* item = 0l; - /* - * let's see if we centered clicked - */ - if ( item ) { int x = point.x() -columnPos( col ); int y = point.y() -rowPos( row ); int w = columnWidth( col ); int h = rowHeight( row ); - if ( x >= ( w - OCheckItem::BoxSize ) / 2 && - x <= ( w - OCheckItem::BoxSize ) / 2 + OCheckItem::BoxSize && - y >= ( h - OCheckItem::BoxSize ) / 2 && - y <= ( h - OCheckItem::BoxSize ) / 2 + OCheckItem::BoxSize ) - item->toggle(); + if ( x >= ( w - BoxSize ) / 2 && + x <= ( w - BoxSize ) / 2 + BoxSize && + y >= ( h - BoxSize ) / 2 && + y <= ( h - BoxSize ) / 2 + BoxSize ) { + OTodo todo = sorted()[row]; + todo.setCompleted( !todo.isCompleted() ); + TodoView::update( todo.uid(), todo ); + updateView(); } } @@ -263,7 +267,9 @@ QWidget* TableView::widget() { * to a sort() and update() */ -void TableView::sortColumn( int row, bool asc, bool ) { - QTable::sortColumn( row, asc, TRUE ); - +void TableView::sortColumn( int col, bool asc, bool ) { + qWarning("bool %d", asc ); + setSortOrder( col ); + setAscending( asc ); + updateView(); } void TableView::viewportPaintEvent( QPaintEvent* e) { @@ -358,2 +364,37 @@ void TableView::paintCell(QPainter* p, int row, int col, const QRect& cr, bool p->restore(); } +QWidget* TableView::createEditor(int row, int col, bool )const { + switch( col ) { + case 1: { + /* the priority stuff */ + QComboBox* combo = new QComboBox( viewport() ); + combo->insertItem( "1" ); + combo->insertItem( "2" ); + combo->insertItem( "3" ); + combo->insertItem( "4" ); + combo->insertItem( "5" ); + combo->setCurrentItem( sorted()[row].priority()-1 ); + return combo; + } + case 0: + default: + return 0l; + } +} +void TableView::setCellContentFromEditor(int row, int col ) { + if ( col == 1 ) { + QWidget* wid = cellWidget(row, 1 ); + if ( wid->inherits("QComboBox") ) { + int pri = ((QComboBox*)wid)->currentItem() + 1; + OTodo todo = sorted()[row]; + if ( todo.priority() != pri ) { + todo.setPriority( pri ); + TodoView::update( todo.uid(), todo ); + updateView(); + } + } + } +} +void TableView::slotPriority() { + setCellContentFromEditor( currentRow(), currentColumn() ); +} diff --git a/core/pim/todo/tableview.h b/core/pim/todo/tableview.h index b608204..bf41aea 100644 --- a/core/pim/todo/tableview.h +++ b/core/pim/todo/tableview.h @@ -79,4 +79,10 @@ namespace Todo { QTimer *m_menuTimer; bool m_enablePaint:1; + QString m_oleCat; + bool m_first : 1; + + protected: + QWidget* createEditor(int row, int col, bool initFromCell )const; + void setCellContentFromEditor( int row, int col ); private slots: @@ -88,4 +94,5 @@ private slots: void slotValueChanged(int, int); void slotCurrentChanged(int, int ); + void slotPriority(); }; }; diff --git a/core/pim/todo/todomanager.cpp b/core/pim/todo/todomanager.cpp index ebf9e8a..1f81539 100644 --- a/core/pim/todo/todomanager.cpp +++ b/core/pim/todo/todomanager.cpp @@ -48,4 +48,5 @@ OTodo TodoManager::event(int uid ) { } void TodoManager::updateList() { + qWarning("update list"); m_list = m_db->allRecords(); } @@ -119,4 +120,5 @@ bool TodoManager::isLoaded()const { void TodoManager::load() { if (!m_db) { + qWarning("loading!"); m_db = new OTodoAccess(); m_db->load(); diff --git a/core/pim/todo/todoview.cpp b/core/pim/todo/todoview.cpp index 06eaaa9..639fa66 100644 --- a/core/pim/todo/todoview.cpp +++ b/core/pim/todo/todoview.cpp @@ -55,5 +55,5 @@ OTodoAccess::List TodoView::list(){ return todoWindow()->list(); } -OTodoAccess::List TodoView::sorted(){ +OTodoAccess::List TodoView::sorted()const{ return m_sort; } @@ -69,4 +69,5 @@ void TodoView::setSortOrder( int order ) { } void TodoView::setAscending( bool b ) { + qWarning("setAscending %d", b ); m_asc = b; } diff --git a/core/pim/todo/todoview.h b/core/pim/todo/todoview.h index 9408ef1..e5c77f9 100644 --- a/core/pim/todo/todoview.h +++ b/core/pim/todo/todoview.h @@ -158,5 +158,5 @@ namespace Todo { OTodo event(int uid ); OTodoAccess::List list(); - OTodoAccess::List sorted(); + OTodoAccess::List sorted()const; void sort(); void sort(int sort ); |