summaryrefslogtreecommitdiff
authorzecke <zecke>2002-10-07 14:59:17 (UTC)
committer zecke <zecke>2002-10-07 14:59:17 (UTC)
commit645b377506fb32f4519e70d43c020084943debae (patch) (side-by-side diff)
tree95398d3a8aeb0342e08732c203eda5098beb92cb
parenta7b03f9c31f515747663f07b6665744369e57ba8 (diff)
downloadopie-645b377506fb32f4519e70d43c020084943debae.zip
opie-645b377506fb32f4519e70d43c020084943debae.tar.gz
opie-645b377506fb32f4519e70d43c020084943debae.tar.bz2
Switch to sorted stuff for TableView as default
Stefan it's safe
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/todo/tableview.cpp7
-rw-r--r--core/pim/todo/todoview.cpp1
2 files changed, 6 insertions, 2 deletions
diff --git a/core/pim/todo/tableview.cpp b/core/pim/todo/tableview.cpp
index 097af39..eaaf1bc 100644
--- a/core/pim/todo/tableview.cpp
+++ b/core/pim/todo/tableview.cpp
@@ -49,195 +49,198 @@ TableView::TableView( MainWindow* window, QWidget* wid )
setSelectionMode( NoSelection );
setColumnStretchable( 2, TRUE );
setColumnWidth(0, 20 );
setColumnWidth(1, 35 );
setLeftMargin( 0 );
verticalHeader()->hide();
horizontalHeader()->setLabel(0, tr("C.") );
horizontalHeader()->setLabel(1, tr("Prior.") );
horizontalHeader()->setLabel(2, tr("Description" ) );
setColumnStretchable(3, FALSE );
setColumnWidth(3, 20 );
horizontalHeader()->setLabel(3, tr("Deadline") );
if ( todoWindow()->showDeadline() )
showColumn( 3);
else
hideColumn(3 );
connect((QTable*)this, SIGNAL( clicked( int, int, int, const QPoint& ) ),
this, SLOT( slotClicked(int, int, int, const QPoint& ) ) );
connect((QTable*)this, SIGNAL( pressed( int, int, int, const QPoint& ) ),
this, SLOT( slotPressed(int, int, int, const QPoint& ) ) );
connect((QTable*)this, SIGNAL(valueChanged(int, int) ),
this, SLOT( slotValueChanged(int, int) ) );
connect((QTable*)this, SIGNAL(currentChanged(int, int) ),
this, SLOT( slotCurrentChanged(int, int) ) );
m_menuTimer = new QTimer( this );
connect( m_menuTimer, SIGNAL(timeout()),
this, SLOT(slotShowMenu()) );
m_enablePaint = true;
setUpdatesEnabled( true );
viewport()->setUpdatesEnabled( true );
viewport()->update();
}
/* a new day has started
* update the day
*/
void TableView::newDay() {
clear();
updateView();
}
TableView::~TableView() {
}
void TableView::slotShowMenu() {
QPopupMenu *menu = todoWindow()->contextMenu( current() );
menu->exec(QCursor::pos() );
delete menu;
}
OTodo TableView::find(int uid ) {
OTodo ev = TodoView::event( uid );
return ev;
}
void TableView::updateFromTable( const OTodo& ev, CheckItem* item ) {
TodoView::update( ev.uid(), ev );
/* update the other columns */
/* if completed or not we need to update
* the table
*
* We've two cases
* either item or !item
* this makes cases more easy
*/
if ( !item ) {
item = m_cache[ev.uid()];
}
DueTextItem *due = dueItem( item->row() );
due->setCompleted( ev.isCompleted() );
}
QString TableView::type() const {
return QString::fromLatin1( tr("Table View") );
}
int TableView::current() {
int cur = 0;
CheckItem* i = checkItem( currentRow() );
if (i )
cur = i->uid();
return cur;
}
QString TableView::currentRepresentation() {
return text( currentRow(), 2);
}
/* show overdue */
void TableView::showOverDue( bool ) {
clear();
updateView();
}
void TableView::updateView( ) {
+ setSortOrder( 0 );
+ setAscending( true );
+ sort();
OTodoAccess::List::Iterator it, end;
- it = list().begin();
- end = list().end();
+ it = sorted().begin();
+ end = sorted().end();
qWarning("setTodos");
QTime time;
time.start();
m_enablePaint = false;
setUpdatesEnabled( false );
viewport()->setUpdatesEnabled( false );
clear();
QString currentCat = todoWindow()->currentCategory();
bool showCompleted = todoWindow()->showCompleted();
bool showOverDue = todoWindow()->showOverDue();
qWarning( "Current Category:" + todoWindow()->currentCategory() );
int id = todoWindow()->currentCatId();
QTime t;
t.start();
setNumRows( it.count() );
uint i = 0;
for (; it != end; ++it ) {
OTodo todo = (*it);
/* test if the categories match */
if ( !currentCat.isEmpty() &&
!todo.categories().contains( id ) ) {
continue;
}
/* the item is completed but we shouldn't show it */
if ( !showCompleted && todo.isCompleted() ) {
qWarning("isCompleted ");
continue;
}
/* the item is not overdue but we should only show overdue */
if ( showOverDue && !todo.isOverdue() ) {
continue;
}
/* now it's fine to add it */
insertTodo( todo, i );
i++;
}
setNumRows( i );
int elc = time.elapsed();
qWarning("Adding took %d", elc/1000 );
setUpdatesEnabled( true );
viewport()->setUpdatesEnabled( true );
viewport()->update();
m_enablePaint = true;
int el = time.elapsed();
qWarning("adding took %d", el/1000 );
}
void TableView::setTodo( int uid, const OTodo& ev ) {
QMap<int, CheckItem*>::Iterator it = m_cache.find( uid );
if ( it != m_cache.end() ) {
int row = it.data()->row();
/* update checked */
CheckItem* check = checkItem(row );
if (check)
check->setChecked( ev.isCompleted() );
/* update the text */
QString sum = ev.summary();
setText(row, 2, sum.isEmpty() ?
ev.description().left(40).simplifyWhiteSpace() :
sum );
/* update priority */
setText(row, 1, QString::number( ev.priority() ) );
/* update DueDate */
DueTextItem *due = dueItem( row );
due->setToDoEvent( ev );
}
}
void TableView::addEvent( const OTodo& ev) {
int row= numRows();
setNumRows( row + 1 );
insertTodo( ev, row );
}
/*
* find the event
* and then replace the complete row
*/
void TableView::replaceEvent( const OTodo& ev) {
setTodo( ev.uid(), ev );
}
/*
* re aligning table can be slow too
* FIXME: look what performs better
* either this or the old align table
*/
void TableView::removeEvent( int ) {
clear();
updateView();
}
void TableView::setShowCompleted( bool b) {
qWarning("Show Completed %d" + b );
updateView();
}
diff --git a/core/pim/todo/todoview.cpp b/core/pim/todo/todoview.cpp
index b77baed..06eaaa9 100644
--- a/core/pim/todo/todoview.cpp
+++ b/core/pim/todo/todoview.cpp
@@ -1,77 +1,78 @@
#include "mainwindow.h"
#include "todoview.h"
using namespace Todo;
TodoView::TodoView( MainWindow* win )
: m_main( win )
{
hack = new InternQtHack;
m_asc = false;
m_sortOrder = -1;
}
TodoView::~TodoView() {
delete hack;
};
void TodoView::connectShow(QObject* obj,
const char* slot ) {
QObject::connect( hack, SIGNAL(showTodo(int) ),
obj, slot );
}
void TodoView::connectEdit( QObject* obj,
const char* slot ) {
QObject::connect( hack, SIGNAL(edit(int) ),
obj, slot );
}
void TodoView::connectUpdateSmall( QObject* obj,
const char* slot ) {
QObject::connect( hack, SIGNAL(update(int, const Todo::SmallTodo& ) ),
obj, slot );
}
void TodoView::connectUpdateBig( QObject* obj,
const char* slot ) {
QObject::connect( hack, SIGNAL(update(int, const OTodo& ) ),
obj, slot );
}
void TodoView::connectUpdateView( QObject* obj,
const char* slot ) {
QObject::connect( hack, SIGNAL(update(QWidget*) ),
obj, slot );
}
void TodoView::connectRemove( QObject* obj,
const char* slot ) {
QObject::connect( hack, SIGNAL(remove(int) ),
obj, slot );
}
MainWindow* TodoView::todoWindow() {
return m_main;
}
OTodo TodoView::event(int uid ) { return m_main->event( uid ); }
OTodoAccess::List TodoView::list(){
todoWindow()->updateList();
return todoWindow()->list();
}
OTodoAccess::List TodoView::sorted(){
return m_sort;
}
void TodoView::sort() {
m_sort = todoWindow()->sorted(m_asc,m_sortOrder );
+ qWarning("m_sort.count() = %d", m_sort.count() );
}
void TodoView::sort(int sort) {
m_sort = todoWindow()->sorted(m_asc, m_sortOrder, sort );
}
void TodoView::setSortOrder( int order ) {
m_sortOrder = order;
}
void TodoView::setAscending( bool b ) {
m_asc = b;
}
void TodoView::update(int uid, const SmallTodo& to ) {
//m_main->slotUpate1( uid, to );
}
void TodoView::update(int uid, const OTodo& ev ) {
m_main->updateTodo( ev );
}