summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/todo/mainwindow.cpp42
-rw-r--r--core/pim/todo/otaskeditor.cpp1
-rw-r--r--core/pim/todo/tableview.cpp20
-rw-r--r--core/pim/todo/templatedialog.cpp4
-rw-r--r--core/pim/todo/todoeditor.cpp2
-rw-r--r--core/pim/todo/todomanager.cpp4
-rw-r--r--core/pim/todo/todotemplatemanager.cpp3
-rw-r--r--core/pim/todo/todoview.cpp4
8 files changed, 36 insertions, 44 deletions
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index d552928..924fde1 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -59,10 +59,10 @@
59#include "todoeditor.h" 59#include "todoeditor.h"
60#include "mainwindow.h" 60#include "mainwindow.h"
61 61
62using namespace Opie::Core; 62using Opie::Core::OApplicationFactory;
63OPIE_EXPORT_APP( OApplicationFactory<Todo::MainWindow> ) 63OPIE_EXPORT_APP( OApplicationFactory<Todo::MainWindow> )
64 64
65 using namespace Opie; 65using namespace Opie;
66using namespace Todo; 66using namespace Todo;
67 67
68MainWindow::MainWindow( QWidget* parent, 68MainWindow::MainWindow( QWidget* parent,
@@ -296,7 +296,7 @@ QPopupMenu* MainWindow::contextMenu( int , bool recur ) {
296 return menu; 296 return menu;
297} 297}
298QPopupMenu* MainWindow::options() { 298QPopupMenu* MainWindow::options() {
299 Opie::Core::owarn << "Options" << oendl; 299 owarn << "Options" << oendl;
300 return m_options; 300 return m_options;
301} 301}
302QPopupMenu* MainWindow::edit() { 302QPopupMenu* MainWindow::edit() {
@@ -315,7 +315,7 @@ OPimTodoAccess::List MainWindow::sorted( bool asc, int sortOrder ) {
315 if ( m_curCat == QWidget::tr("Unfiled") ) 315 if ( m_curCat == QWidget::tr("Unfiled") )
316 cat = -1; 316 cat = -1;
317 317
318 Opie::Core::owarn << " Category " << cat << " " << m_curCat << oendl; 318 owarn << " Category " << cat << " " << m_curCat << oendl;
319 319
320 int filter = 1; 320 int filter = 1;
321 321
@@ -374,7 +374,7 @@ void MainWindow::closeEvent( QCloseEvent* e ) {
374 } 374 }
375 bool quit = false; 375 bool quit = false;
376 if ( m_todoMgr.saveAll() ){ 376 if ( m_todoMgr.saveAll() ){
377 Opie::Core::owarn << "saved" << oendl; 377 owarn << "saved" << oendl;
378 quit = true; 378 quit = true;
379 }else { 379 }else {
380 if ( QMessageBox::critical( this, QWidget::tr("Out of space"), 380 if ( QMessageBox::critical( this, QWidget::tr("Out of space"),
@@ -537,7 +537,7 @@ void MainWindow::setCategory( int c) {
537 if ( c <= 0 ) return; 537 if ( c <= 0 ) return;
538 538
539 539
540 Opie::Core::owarn << "Iterating over cats " << c << oendl; 540 owarn << "Iterating over cats " << c << oendl;
541 for ( unsigned int i = 1; i < m_catMenu->count(); i++ ) 541 for ( unsigned int i = 1; i < m_catMenu->count(); i++ )
542 m_catMenu->setItemChecked(i, c == (int)i ); 542 m_catMenu->setItemChecked(i, c == (int)i );
543 543
@@ -600,17 +600,17 @@ void MainWindow::receiveFile( const QString& filename ) {
600 600
601 if (list.count()){ 601 if (list.count()){
602 602
603 QString message = QWidget::tr("<P>%1 new tasks arrived.<p>Would you like to add them to your Todolist?").arg(list.count() ); 603 QString message = QWidget::tr("<P>%1 new tasks arrived.<p>Would you like to add them to your Todolist?").arg(list.count() );
604 604
605 if ( QMessageBox::information(this, QWidget::tr("New Tasks"), 605 if ( QMessageBox::information(this, QWidget::tr("New Tasks"),
606 message, QMessageBox::Ok, 606 message, QMessageBox::Ok,
607 QMessageBox::Cancel ) == QMessageBox::Ok ) { 607 QMessageBox::Cancel ) == QMessageBox::Ok ) {
608 OPimTodoAccess::List::Iterator it; 608 OPimTodoAccess::List::Iterator it;
609 for ( it = list.begin(); it != list.end(); ++it ) 609 for ( it = list.begin(); it != list.end(); ++it )
610 m_todoMgr.add( (*it) ); 610 m_todoMgr.add( (*it) );
611 611
612 currentView()->updateView(); 612 currentView()->updateView();
613 } 613 }
614 } 614 }
615} 615}
616 616
@@ -681,7 +681,9 @@ void MainWindow::slotShowDue(bool ov) {
681} 681}
682void MainWindow::slotShow( int uid ) { 682void MainWindow::slotShow( int uid ) {
683 if ( uid == 0 ) return; 683 if ( uid == 0 ) return;
684 Opie::Core::owarn << "slotShow" << oendl; 684
685
686 owarn << "slotShow" << oendl;
685 currentShow()->slotShow( event( uid ) ); 687 currentShow()->slotShow( event( uid ) );
686 m_stack->raiseWidget( currentShow()->widget() ); 688 m_stack->raiseWidget( currentShow()->widget() );
687} 689}
@@ -740,7 +742,7 @@ void MainWindow::setReadAhead( uint count ) {
740 m_todoMgr.todoDB()->setReadAhead( count ); 742 m_todoMgr.todoDB()->setReadAhead( count );
741} 743}
742void MainWindow::slotQuickEntered() { 744void MainWindow::slotQuickEntered() {
743 Opie::Core::owarn << "entered" << oendl; 745 owarn << "entered" << oendl;
744 OPimTodo todo = quickEditor()->todo(); 746 OPimTodo todo = quickEditor()->todo();
745 if (todo.isEmpty() ) 747 if (todo.isEmpty() )
746 return; 748 return;
@@ -787,7 +789,7 @@ void MainWindow::slotComplete( const OPimTodo& todo ) {
787 QDate date; 789 QDate date;
788 if ( to2.recurrence().nextOcurrence( to2.dueDate().addDays(1), date ) ) { 790 if ( to2.recurrence().nextOcurrence( to2.dueDate().addDays(1), date ) ) {
789 int dayDiff = to.dueDate().daysTo( date ); 791 int dayDiff = to.dueDate().daysTo( date );
790 Opie::Core::owarn << "day diff is " << dayDiff << oendl; 792 owarn << "day diff is " << dayDiff << oendl;
791 QDate inval; 793 QDate inval;
792 /* generate a new uid for the old record */ 794 /* generate a new uid for the old record */
793 to.setUid( 1 ); 795 to.setUid( 1 );
@@ -950,7 +952,7 @@ namespace {
950 void addAlarms( const OPimNotifyManager::Alarms& als, int uid ) { 952 void addAlarms( const OPimNotifyManager::Alarms& als, int uid ) {
951 OPimNotifyManager::Alarms::ConstIterator it; 953 OPimNotifyManager::Alarms::ConstIterator it;
952 for ( it = als.begin(); it != als.end(); ++it ) { 954 for ( it = als.begin(); it != als.end(); ++it ) {
953 Opie::Core::owarn << "Adding alarm for " << (*it).dateTime().toString() << oendl; 955 owarn << "Adding alarm for " << (*it).dateTime().toString() << oendl;
954 AlarmServer::addAlarm( (*it).dateTime(), "QPE/Application/todolist", "alarm(QDateTime,int)", uid ); 956 AlarmServer::addAlarm( (*it).dateTime(), "QPE/Application/todolist", "alarm(QDateTime,int)", uid );
955 } 957 }
956 958
@@ -958,7 +960,7 @@ namespace {
958 void removeAlarms( const OPimNotifyManager::Alarms& als, int uid ) { 960 void removeAlarms( const OPimNotifyManager::Alarms& als, int uid ) {
959 OPimNotifyManager::Alarms::ConstIterator it; 961 OPimNotifyManager::Alarms::ConstIterator it;
960 for ( it = als.begin(); it != als.end(); ++it ) { 962 for ( it = als.begin(); it != als.end(); ++it ) {
961 Opie::Core::owarn << "Removinf alarm for " << (*it).dateTime().toString() << oendl; 963 owarn << "Removinf alarm for " << (*it).dateTime().toString() << oendl;
962 AlarmServer::deleteAlarm( (*it).dateTime(), "QPE/Application/todolist", "alarm(QDateTime,int)", uid ); 964 AlarmServer::deleteAlarm( (*it).dateTime(), "QPE/Application/todolist", "alarm(QDateTime,int)", uid );
963 } 965 }
964 } 966 }
diff --git a/core/pim/todo/otaskeditor.cpp b/core/pim/todo/otaskeditor.cpp
index 55a3dd5..bbc177d 100644
--- a/core/pim/todo/otaskeditor.cpp
+++ b/core/pim/todo/otaskeditor.cpp
@@ -35,7 +35,6 @@ void OTaskEditor::init( const OPimTodo& to ) {
35 load( to ); 35 load( to );
36} 36}
37OPimTodo OTaskEditor::todo()const{ 37OPimTodo OTaskEditor::todo()const{
38 Opie::Core::owarn << "saving!" << oendl;
39 OPimTodo to ( m_todo ); 38 OPimTodo to ( m_todo );
40 m_overView->save( to ); 39 m_overView->save( to );
41 m_stat->save( to ); 40 m_stat->save( to );
diff --git a/core/pim/todo/tableview.cpp b/core/pim/todo/tableview.cpp
index 0b1c579..b7458d8 100644
--- a/core/pim/todo/tableview.cpp
+++ b/core/pim/todo/tableview.cpp
@@ -195,7 +195,7 @@ void TableView::showOverDue( bool ) {
195} 195}
196 196
197void TableView::updateView( ) { 197void TableView::updateView( ) {
198 Opie::Core::owarn << "update view" << oendl; 198 owarn << "update view" << oendl;
199 m_row = false; 199 m_row = false;
200 static int id; 200 static int id;
201 id = startTimer(4000 ); 201 id = startTimer(4000 );
@@ -209,7 +209,7 @@ void TableView::updateView( ) {
209 it = sorted().begin(); 209 it = sorted().begin();
210 end = sorted().end(); 210 end = sorted().end();
211 211
212 Opie::Core::owarn << "setTodos" << oendl; 212 owarn << "setTodos" << oendl;
213 QTime time; 213 QTime time;
214 time.start(); 214 time.start();
215 m_enablePaint = false; 215 m_enablePaint = false;
@@ -255,11 +255,11 @@ void TableView::removeEvent( int ) {
255 updateView(); 255 updateView();
256} 256}
257void TableView::setShowCompleted( bool b) { 257void TableView::setShowCompleted( bool b) {
258 Opie::Core::owarn << "Show Completed " << b << oendl; 258 owarn << "Show Completed " << b << oendl;
259 updateView(); 259 updateView();
260} 260}
261void TableView::setShowDeadline( bool b ) { 261void TableView::setShowDeadline( bool b ) {
262 Opie::Core::owarn << "Show Deadline " << b << oendl; 262 owarn << "Show Deadline " << b << oendl;
263 if ( b ) 263 if ( b )
264 showColumn( 3 ); 264 showColumn( 3 );
265 else 265 else
@@ -282,7 +282,7 @@ void TableView::setShowDeadline( bool b ) {
282 setColumnWidth( 2, col2width ); 282 setColumnWidth( 2, col2width );
283} 283}
284void TableView::setShowCategory( const QString& str) { 284void TableView::setShowCategory( const QString& str) {
285 Opie::Core::owarn << "setShowCategory" << oendl; 285 owarn << "setShowCategory" << oendl;
286 if ( str != m_oleCat || m_first ) 286 if ( str != m_oleCat || m_first )
287 updateView(); 287 updateView();
288 288
@@ -347,7 +347,7 @@ void TableView::slotClicked(int row, int col, int,
347void TableView::slotPressed(int row, int col, int, 347void TableView::slotPressed(int row, int col, int,
348 const QPoint& point) { 348 const QPoint& point) {
349 349
350 Opie::Core::owarn << "pressed row " << row << " col " << col << " x:" << point.x() 350 owarn << "pressed row " << row << " col " << col << " x:" << point.x()
351 << "+y:" << point.y() << oendl; 351 << "+y:" << point.y() << oendl;
352 m_prevP = point; 352 m_prevP = point;
353 /* TextColumn column */ 353 /* TextColumn column */
@@ -355,7 +355,7 @@ void TableView::slotPressed(int row, int col, int,
355 m_menuTimer->start( 750, TRUE ); 355 m_menuTimer->start( 750, TRUE );
356} 356}
357void TableView::slotValueChanged( int, int ) { 357void TableView::slotValueChanged( int, int ) {
358 Opie::Core::owarn << "Value Changed" << oendl; 358 owarn << "Value Changed" << oendl;
359} 359}
360void TableView::slotCurrentChanged(int, int ) { 360void TableView::slotCurrentChanged(int, int ) {
361 m_menuTimer->stop(); 361 m_menuTimer->stop();
@@ -371,7 +371,7 @@ QWidget* TableView::widget() {
371 * to a sort() and update() 371 * to a sort() and update()
372 */ 372 */
373void TableView::sortColumn( int col, bool asc, bool ) { 373void TableView::sortColumn( int col, bool asc, bool ) {
374 Opie::Core::owarn << "bool " << asc << oendl; 374 owarn << "bool " << asc << oendl;
375 setSortOrder( col ); 375 setSortOrder( col );
376 setAscending( asc ); 376 setAscending( asc );
377 updateView(); 377 updateView();
@@ -494,7 +494,7 @@ QWidget* TableView::createEditor(int row, int col, bool )const {
494 } 494 }
495} 495}
496void TableView::setCellContentFromEditor(int row, int col ) { 496void TableView::setCellContentFromEditor(int row, int col ) {
497 Opie::Core::owarn << "set cell content from editor" << oendl; 497 owarn << "set cell content from editor" << oendl;
498 if ( col == 1 ) { 498 if ( col == 1 ) {
499 QWidget* wid = cellWidget(row, 1 ); 499 QWidget* wid = cellWidget(row, 1 );
500 if ( wid->inherits("QComboBox") ) { 500 if ( wid->inherits("QComboBox") ) {
@@ -578,7 +578,7 @@ void TableView::contentsMouseReleaseEvent( QMouseEvent* e) {
578 int row = rowAt(m_prevP.y()); 578 int row = rowAt(m_prevP.y());
579 int colOld = columnAt(m_prevP.x() ); 579 int colOld = columnAt(m_prevP.x() );
580 int colNew = columnAt(e->x() ); 580 int colNew = columnAt(e->x() );
581 Opie::Core::owarn << "colNew: " << colNew << " colOld: " << colOld << oendl; 581 owarn << "colNew: " << colNew << " colOld: " << colOld << oendl;
582 if ( row == rowAt( e->y() ) && row != -1 && 582 if ( row == rowAt( e->y() ) && row != -1 &&
583 colOld != colNew ) { 583 colOld != colNew ) {
584 TodoView::complete( sorted()[row] ); 584 TodoView::complete( sorted()[row] );
diff --git a/core/pim/todo/templatedialog.cpp b/core/pim/todo/templatedialog.cpp
index 32327a6..8d72297 100644
--- a/core/pim/todo/templatedialog.cpp
+++ b/core/pim/todo/templatedialog.cpp
@@ -51,14 +51,10 @@ QLineEdit* TemplateDialog::edit() {
51 return m_lne; 51 return m_lne;
52} 52}
53void TemplateDialog::slotAdd() { 53void TemplateDialog::slotAdd() {
54 Opie::Core::owarn << "Not Implemented here" << oendl;
55} 54}
56void TemplateDialog::slotRemove() { 55void TemplateDialog::slotRemove() {
57 Opie::Core::owarn << "Not Implemented here" << oendl;
58} 56}
59void TemplateDialog::slotEdit() { 57void TemplateDialog::slotEdit() {
60 Opie::Core::owarn << "Not Implemented here" << oendl;
61} 58}
62void TemplateDialog::slotReturn() { 59void TemplateDialog::slotReturn() {
63 Opie::Core::owarn << "Not Implemented here" << oendl;
64} 60}
diff --git a/core/pim/todo/todoeditor.cpp b/core/pim/todo/todoeditor.cpp
index 7857d52..a1c559d 100644
--- a/core/pim/todo/todoeditor.cpp
+++ b/core/pim/todo/todoeditor.cpp
@@ -31,8 +31,6 @@ OPimTodo Editor::newTodo( int cur,
31 m_accepted = false; 31 m_accepted = false;
32 32
33 OPimTodo ev = e->todo(); 33 OPimTodo ev = e->todo();
34 Opie::Core::owarn << "Todo uid" << oendl;
35 Opie::Core::owarn << "Todo " << ev.summary() << " " << ev.progress() << " " << ev.isCompleted() << oendl;
36 ev.setUid(1); 34 ev.setUid(1);
37 35
38 return ev; 36 return ev;
diff --git a/core/pim/todo/todomanager.cpp b/core/pim/todo/todomanager.cpp
index 7826747..c4b8fbc 100644
--- a/core/pim/todo/todomanager.cpp
+++ b/core/pim/todo/todomanager.cpp
@@ -40,7 +40,7 @@ TodoManager::TodoManager( QObject *obj )
40 QTime time; 40 QTime time;
41 time.start(); 41 time.start();
42 int el = time.elapsed(); 42 int el = time.elapsed();
43 Opie::Core::owarn << "QTimer for loading " << el/1000 << oendl; 43 owarn << "QTimer for loading " << el/1000 << oendl;
44} 44}
45TodoManager::~TodoManager() { 45TodoManager::~TodoManager() {
46 delete m_db; 46 delete m_db;
@@ -49,7 +49,7 @@ OPimTodo TodoManager::event(int uid ) {
49 return m_db->find( uid ); 49 return m_db->find( uid );
50} 50}
51void TodoManager::updateList() { 51void TodoManager::updateList() {
52 Opie::Core::owarn << "update lists" << oendl; 52 owarn << "update lists" << oendl;
53 m_list = m_db->allRecords(); 53 m_list = m_db->allRecords();
54} 54}
55OPimTodoAccess::List TodoManager::list() const{ 55OPimTodoAccess::List TodoManager::list() const{
diff --git a/core/pim/todo/todotemplatemanager.cpp b/core/pim/todo/todotemplatemanager.cpp
index 0b20d5a..7690d37 100644
--- a/core/pim/todo/todotemplatemanager.cpp
+++ b/core/pim/todo/todotemplatemanager.cpp
@@ -36,7 +36,6 @@ void TemplateManager::load() {
36 } 36 }
37} 37}
38void TemplateManager::save() { 38void TemplateManager::save() {
39 Opie::Core::owarn << "Saving!!!!" << oendl;
40 Config conf("todolist_templates"); 39 Config conf("todolist_templates");
41 40
42 OPimTodoAccessXML *res = new OPimTodoAccessXML( "template", 41 OPimTodoAccessXML *res = new OPimTodoAccessXML( "template",
@@ -50,7 +49,6 @@ void TemplateManager::save() {
50 for ( it = m_templates.begin(); it != m_templates.end(); ++it ) { 49 for ( it = m_templates.begin(); it != m_templates.end(); ++it ) {
51 OPimTodo ev = it.data(); 50 OPimTodo ev = it.data();
52 conf.setGroup( QString::number( ev.uid() ) ); 51 conf.setGroup( QString::number( ev.uid() ) );
53 Opie::Core::owarn << "Name " << it.key() << oendl;
54 conf.writeEntry("Name", it.key() ); 52 conf.writeEntry("Name", it.key() );
55 db.add( ev ); 53 db.add( ev );
56 } 54 }
@@ -58,7 +56,6 @@ void TemplateManager::save() {
58} 56}
59void TemplateManager::addEvent( const QString& str, 57void TemplateManager::addEvent( const QString& str,
60 const OPimTodo& ev) { 58 const OPimTodo& ev) {
61 Opie::Core::owarn << "AddEvent " << str << oendl;
62 OPimTodo todo = ev; 59 OPimTodo todo = ev;
63 if( ev.uid() == 0 ) 60 if( ev.uid() == 0 )
64 todo.setUid(1); // generate a new uid 61 todo.setUid(1); // generate a new uid
diff --git a/core/pim/todo/todoview.cpp b/core/pim/todo/todoview.cpp
index 03e1060..3d2c982 100644
--- a/core/pim/todo/todoview.cpp
+++ b/core/pim/todo/todoview.cpp
@@ -33,7 +33,7 @@ OPimTodoAccess::List TodoView::sorted()const{
33} 33}
34void TodoView::sort() { 34void TodoView::sort() {
35 m_sort = todoWindow()->sorted(m_asc,m_sortOrder ); 35 m_sort = todoWindow()->sorted(m_asc,m_sortOrder );
36 Opie::Core::owarn << "m_sort.count() = " << m_sort.count() << oendl; 36 owarn << "m_sort.count() = " << m_sort.count() << oendl;
37} 37}
38void TodoView::sort(int sort) { 38void TodoView::sort(int sort) {
39 m_sort = todoWindow()->sorted(m_asc, m_sortOrder, sort ); 39 m_sort = todoWindow()->sorted(m_asc, m_sortOrder, sort );
@@ -42,7 +42,7 @@ void TodoView::setSortOrder( int order ) {
42 m_sortOrder = order; 42 m_sortOrder = order;
43} 43}
44void TodoView::setAscending( bool b ) { 44void TodoView::setAscending( bool b ) {
45 Opie::Core::owarn << "setAscending " << b << oendl; 45 owarn << "setAscending " << b << oendl;
46 m_asc = b; 46 m_asc = b;
47} 47}
48void TodoView::update(int, const SmallTodo& ) { 48void TodoView::update(int, const SmallTodo& ) {