39 files changed, 1092 insertions, 441 deletions
diff --git a/core/pim/todo/main.cpp b/core/pim/todo/main.cpp
index a336ba3..e12326e 100644
--- a/core/pim/todo/main.cpp
+++ b/core/pim/todo/main.cpp
@@ -1,47 +1,57 @@
-/**********************************************************************
+/*
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+                             This file is part of the Opie Project
-**
-** This file is part of Qtopia Environment.
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
-**
+              =.
-** This file may be distributed and/or modified under the terms of the
+            .=l.
-** GNU General Public License version 2 as published by the Free Software
+           .>+-=
-** Foundation and appearing in the file LICENSE.GPL included in the
+ _;:,     .>    :=|.         This program is free software; you can
-** packaging of this file.
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-**
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+.="- .-=="i,     .._         License as published by the Free Software
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-**
+     ._= =}       :          or (at your option) any later version.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
+    .%`+i>       _;_.
-**
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-** Contact info@trolltech.com if any conditions of this licensing are
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-** not clear to you.
+    : ..    .:,     . . .    without even the implied warranty of
-**
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-**********************************************************************/
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
 #include "mainwindow.h"
 #include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
 void myMessages( QtMsgType, const char*  ) {
 }
 int main( int argc, char **argv )
 {
    qInstallMsgHandler( myMessages );
    QPEApplication a( argc, argv );
    QTime time;
    time.start();
    Todo::MainWindow mw;
    int t = time.elapsed();
    mw.setCaption( QObject::tr("Opie Todolist"));
    QObject::connect( &a, SIGNAL( flush() ), &mw, SLOT( slotFlush() ) );
    QObject::connect( &a, SIGNAL( reload() ), &mw, SLOT( slotReload() ) );
    a.showMainWidget(&mw);
    return a.exec();
 }
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index 9013522..b6ee16f 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -1,88 +1,89 @@
 /*
-       =.            This file is part of the OPIE Project
+                             This file is part of the Opie Project
-      .=l.            Copyright (c)  2002 <>
-     .>+-=
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
-_;:,   .>  :=|.         This program is free software; you can
+              =.
-.> <`_,  > .  <=          redistribute it and/or  modify it under
+            .=l.
-:`=1 )Y*s>-.--  :           the terms of the GNU General Public
+           .>+-=
-.="- .-=="i,   .._         License as published by the Free Software
+ _;:,     .>    :=|.         This program is free software; you can
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-  ._= =}    :          or (at your option) any later version.
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-  .%`+i>    _;_.
+.="- .-=="i,     .._         License as published by the Free Software
-  .i_,=:_.   -<s.       This program is distributed in the hope that
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  + . -:.    =       it will be useful,  but WITHOUT ANY WARRANTY;
+     ._= =}       :          or (at your option) any later version.
-  : ..  .:,   . . .    without even the implied warranty of
+    .%`+i>       _;_.
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    .i_,=:_.      -<s.       This program is distributed in the hope that
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-..}^=.=    =    ;      Library General Public License for more
+    : ..    .:,     . . .    without even the implied warranty of
-++=  -.   .`   .:       details.
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-:   = ...= . :.=-
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-.  .:....=;==+<;          You should have received a copy of the GNU
+..}^=.=       =       ;      Library General Public License for more
- -_. . .  )=. =           General Public License along with
++=   -.     .`     .:       details.
-  --    :-=`           this library; see the file COPYING.LIB.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include <unistd.h>
 #include <opie2/odebug.h>
 #include <opie2/opimrecurrence.h>
 #include <opie2/opimnotifymanager.h>
 #include <opie2/otodoaccessvcal.h>
 #include <opie2/oapplicationfactory.h>
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/ir.h>
-#include <qpe/resource.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/alarmserver.h>
 #include <qpe/qpeapplication.h>
 #include <qaction.h>
 #include <qlayout.h>
 #include <qmenubar.h>
 #include <qmessagebox.h>
 #include <qpushbutton.h>
 #include <qstringlist.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
 #include "quickeditimpl.h"
 #include "todotemplatemanager.h"
 #include "templatedialogimpl.h"
 #include "tableview.h"
 #include "textviewshow.h"
 #include "todoeditor.h"
 #include "newtaskdlg.h"
 #include "mainwindow.h"
 using Opie::Core::OApplicationFactory;
 OPIE_EXPORT_APP( OApplicationFactory<Todo::MainWindow> )
 using namespace Opie;
 using namespace Todo;
 MainWindow::MainWindow( QWidget* parent,
                        const char* name, WFlags )
    : Opie::OPimMainWindow( "Todolist", "Todo List", tr( "Task" ), "todo",
                            parent, name, WType_TopLevel | WStyle_ContextHelp )
 {
    setCaption( tr( "Todo List" ) );
    if (!name)
        setName("todo window");
    m_syncing = false;
    m_showing = false;
    m_counter = 0;
    m_tempManager = new TemplateManager();
    m_tempManager->load();
    initConfig();
    initUI();
    initViews();
    initActions();
diff --git a/core/pim/todo/mainwindow.h b/core/pim/todo/mainwindow.h
index c0fe805..b96795f 100644
--- a/core/pim/todo/mainwindow.h
+++ b/core/pim/todo/mainwindow.h
@@ -1,74 +1,76 @@
 /*
-       =.            This file is part of the OPIE Project
+                             This file is part of the Opie Project
-      .=l.            Copyright (c)  2002 Holger Freyther <zecke@handhelds.org>
-     .>+-=
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
-_;:,   .>  :=|.         This program is free software; you can
+              =.
-.> <`_,  > .  <=          redistribute it and/or  modify it under
+            .=l.
-:`=1 )Y*s>-.--  :           the terms of the GNU General Public
+           .>+-=
-.="- .-=="i,   .._         License as published by the Free Software
+ _;:,     .>    :=|.         This program is free software; you can
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-  ._= =}    :          or (at your option) any later version.
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-  .%`+i>    _;_.
+.="- .-=="i,     .._         License as published by the Free Software
-  .i_,=:_.   -<s.       This program is distributed in the hope that
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  + . -:.    =       it will be useful,  but WITHOUT ANY WARRANTY;
+     ._= =}       :          or (at your option) any later version.
-  : ..  .:,   . . .    without even the implied warranty of
+    .%`+i>       _;_.
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    .i_,=:_.      -<s.       This program is distributed in the hope that
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-..}^=.=    =    ;      Library General Public License for more
+    : ..    .:,     . . .    without even the implied warranty of
-++=  -.   .`   .:       details.
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-:   = ...= . :.=-
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-.  .:....=;==+<;          You should have received a copy of the GNU
+..}^=.=       =       ;      Library General Public License for more
- -_. . .  )=. =           Library General Public License along with
++=   -.     .`     .:       details.
-  --    :-=`           this library; see the file COPYING.LIB.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef TODO_MAIN_WINDOW_H
 #define TODO_MAIN_WINDOW_H
 #include <qlist.h>
 #include <opie2/otodoaccess.h>
 #include <opie2/opimtodo.h>
 #include <opie2/opimmainwindow.h>
 #include <opie2/owidgetstack.h>
 #include "smalltodo.h"
 #include "todoview.h"
 #include "quickedit.h"
 #include "todomanager.h"
 class QPopupMenu;
 class QMenuBar;
 class QToolBar;
 class QAction;
 class Ir;
 class QVBox;
 class QLineEdit;
 namespace Todo {
    typedef TodoView View;
    class TemplateManager;
    class Editor;
    class TodoShow;
    struct QuickEditBase;
    class MainWindow : public Opie::OPimMainWindow {
        Q_OBJECT
        friend class TodoView; // avoid QObject here....
        friend class TodoShow; // avoid QObject
    public:
        /* Opie::Core::OApplicationFactory application Name */
        static QString appName() { return QString::fromLatin1("todolist"); }
        MainWindow( QWidget *parent = 0,
                    const char* name = 0, WFlags fl = 0 );
        ~MainWindow();
        /** return a context menu for an OPimTodo */
        QPopupMenu* contextMenu(int uid, bool doesRecur = FALSE );
        void updateList();
@@ -109,90 +111,90 @@ private slots:
        void initConfig();
        void initViews();
        void initEditor();
        void initShow();
        void raiseCurrentView();
        ViewBase* currentView();
        ViewBase* m_curView;
        bool m_showing : 1; // used to see if we show a todo in the cases we shouldn't change the table
        QuickEditBase* m_curQuick;
        Editor* m_curEdit;
        TodoShow* currentShow();
        TodoShow* m_curShow;
        QAction* m_editAction,
            *m_deleteAction,
            *m_findAction,
            *m_completedAction,
            *m_showDeadLineAction,
            *m_deleteAllAction,
            *m_deleteCompleteAction,
            *m_duplicateAction,
            *m_showOverDueAction,
            *m_showQuickTaskAction,
            *m_effectiveAction;
        Opie::Ui::OWidgetStack *m_stack;
        bool m_syncing:1;
        bool m_deadline:1;
        bool m_completed:1;
        bool m_overdue:1;
        bool m_quicktask:1;
        TodoManager m_todoMgr;
        QString m_curCat;
        QList<ViewBase> m_views;
        uint m_counter;
        TemplateManager* m_tempManager;
     private slots:
        void initStuff();
        void slotItemNew();
        void slotItemEdit();
        void slotItemDuplicate();
        void slotItemDelete();
        void slotItemBeam();
        void slotItemFind();
        void slotConfigure();
-                
        void slotShow(int);
        void slotEdit(int);
        void slotUpdate3( QWidget* );
        void slotComplete( int uid );
        void slotComplete( const OPimTodo& ev );
        void slotDelete(int uid );
        void slotDeleteAll();
        void slotDeleteCompleted();
        void setCategory( const QString &category );
        void slotShowDeadLine( bool );
        void slotShowCompleted( bool );
        void slotShowQuickTask( bool );
        void setDocument( const QString& );
        void beamDone( Ir* );
        void slotShowDetails();
        void slotShowNext();
        void slotShowPrev();
        void slotShowDue( bool );
        void slotReturnFromView(); // for TodoShow...
        /* reimplementation from opimmainwindow */
    protected slots:
        void flush();
        void reload();
        int create();
        bool remove( int uid );
        void beam(int uid);
        void show( int uid );
        void edit( int uid );
        void add( const Opie::OPimRecord& );
        void doAlarm( const QDateTime& dt, int uid );
    };
 }
 #endif
diff --git a/core/pim/todo/newtaskdlg.cpp b/core/pim/todo/newtaskdlg.cpp
index 0b5a29d..68a0d24 100644
--- a/core/pim/todo/newtaskdlg.cpp
+++ b/core/pim/todo/newtaskdlg.cpp
@@ -1,78 +1,80 @@
 /*
-       =.            This file is part of the OPIE Project
+                             This file is part of the Opie Project
-      .=l.            Copyright (c)  2005 Dan Williams <drw@handhelds.org>
-     .>+-=
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
-_;:,   .>  :=|.         This program is free software; you can
+              =.
-.> <`_,  > .  <=          redistribute it and/or  modify it under
+            .=l.
-:`=1 )Y*s>-.--  :           the terms of the GNU General Public
+           .>+-=
-.="- .-=="i,   .._         License as published by the Free Software
+ _;:,     .>    :=|.         This program is free software; you can
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-  ._= =}    :          or (at your option) any later version.
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-  .%`+i>    _;_.
+.="- .-=="i,     .._         License as published by the Free Software
-  .i_,=:_.   -<s.       This program is distributed in the hope that
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  + . -:.    =       it will be useful,  but WITHOUT ANY WARRANTY;
+     ._= =}       :          or (at your option) any later version.
-  : ..  .:,   . . .    without even the implied warranty of
+    .%`+i>       _;_.
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    .i_,=:_.      -<s.       This program is distributed in the hope that
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-..}^=.=    =    ;      Library General Public License for more
+    : ..    .:,     . . .    without even the implied warranty of
-++=  -.   .`   .:       details.
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-:   = ...= . :.=-
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-.  .:....=;==+<;          You should have received a copy of the GNU
+..}^=.=       =       ;      Library General Public License for more
- -_. . .  )=. =           General Public License along with
++=   -.     .`     .:       details.
-  --    :-=`           this library; see the file COPYING.LIB.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include "newtaskdlg.h"
 #include <qbuttongroup.h>
 #include <qcombobox.h>
 #include <qlayout.h>
 #include <qradiobutton.h>
 NewTaskDlg::NewTaskDlg( const QStringList &templates, QWidget *parent )
    : QDialog( parent, QString::null, true, WStyle_ContextHelp )
 {
    setCaption( tr( "New Task" ) );
    QButtonGroup *bg = new QButtonGroup( this );
    bg->hide();
-    
    QVBoxLayout *layout = new QVBoxLayout( this, 10, 3 );
    QRadioButton *btn = new QRadioButton( tr( "Blank task" ), this );
    btn->setChecked( true );
    bg->insert( btn );
    layout->addWidget( btn );
-    
    layout->addStretch();
-    
    m_useTemplate = new QRadioButton( tr( "Using template:" ), this );
    connect( m_useTemplate, SIGNAL(toggled(bool)), this, SLOT(slotUseTemplate(bool)) );
    bg->insert( m_useTemplate );
    layout->addWidget( m_useTemplate );
    m_templateList = new QComboBox( this );
    m_templateList->insertStringList( templates );
    m_templateList->setEnabled( false );
    layout->addWidget( m_templateList );
-    
    layout->addStretch();
 }
 QString NewTaskDlg::tempSelected() {
-    QString tempStr;    
+    QString tempStr;
    if ( m_useTemplate->isChecked() )
        tempStr = m_templateList->currentText();
    return tempStr;
 }
 void NewTaskDlg::slotUseTemplate( bool on ) {
    m_templateList->setEnabled( on );
    if ( on )
        m_templateList->setFocus();
 }
diff --git a/core/pim/todo/newtaskdlg.h b/core/pim/todo/newtaskdlg.h
index 31398b3..235c7a0 100644
--- a/core/pim/todo/newtaskdlg.h
+++ b/core/pim/todo/newtaskdlg.h
@@ -1,56 +1,58 @@
 /*
-       =.            This file is part of the OPIE Project
+                             This file is part of the Opie Project
-      .=l.            Copyright (c)  2002 <>
-     .>+-=
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
-_;:,   .>  :=|.         This program is free software; you can
+              =.
-.> <`_,  > .  <=          redistribute it and/or  modify it under
+            .=l.
-:`=1 )Y*s>-.--  :           the terms of the GNU General Public
+           .>+-=
-.="- .-=="i,   .._         License as published by the Free Software
+ _;:,     .>    :=|.         This program is free software; you can
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-  ._= =}    :          or (at your option) any later version.
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-  .%`+i>    _;_.
+.="- .-=="i,     .._         License as published by the Free Software
-  .i_,=:_.   -<s.       This program is distributed in the hope that
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  + . -:.    =       it will be useful,  but WITHOUT ANY WARRANTY;
+     ._= =}       :          or (at your option) any later version.
-  : ..  .:,   . . .    without even the implied warranty of
+    .%`+i>       _;_.
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    .i_,=:_.      -<s.       This program is distributed in the hope that
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-..}^=.=    =    ;      Library General Public License for more
+    : ..    .:,     . . .    without even the implied warranty of
-++=  -.   .`   .:       details.
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-:   = ...= . :.=-
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-.  .:....=;==+<;          You should have received a copy of the GNU
+..}^=.=       =       ;      Library General Public License for more
- -_. . .  )=. =           General Public License along with
++=   -.     .`     .:       details.
-  --    :-=`           this library; see the file COPYING.LIB.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef NEWTASKDLG_H
 #define NEWTASKDLG_H
 #include <qdialog.h>
 #include <qstringlist.h>
 class QComboBox;
 class QRadioButton;
 class NewTaskDlg : public QDialog
 {
    Q_OBJECT
 public:
    NewTaskDlg( const QStringList &templates, QWidget *parent = 0l );
    QString tempSelected();
 private:
    QRadioButton *m_useTemplate;
    QComboBox    *m_templateList;
 private slots:
    void slotUseTemplate( bool on );
 };
 #endif
diff --git a/core/pim/todo/otaskeditor.cpp b/core/pim/todo/otaskeditor.cpp
index bbc177d..8cce9ed 100644
--- a/core/pim/todo/otaskeditor.cpp
+++ b/core/pim/todo/otaskeditor.cpp
@@ -1,48 +1,78 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
 #include <qlayout.h>
 #include <opie2/odebug.h>
 #include "taskeditoroverview.h"
 #include "taskeditorstatus.h"
 #include "taskeditoralarms.h"
 #include "otaskeditor.h"
 using namespace Opie::Ui;
 using namespace Opie;
 OTaskEditor::OTaskEditor(int cur)
    : QDialog( 0, 0, TRUE, WStyle_ContextHelp ) {
    init();
    init( cur );
 }
 OTaskEditor::OTaskEditor( const OPimTodo& to)
    : QDialog( 0, 0, TRUE, WStyle_ContextHelp ) {
    init();
    init( to );
 }
 OTaskEditor::~OTaskEditor() {
 }
 void OTaskEditor::init( int cur ) {
    OPimTodo to;
    to.setUid( 1 ); // generate a new uid
    if ( cur != 0 )
        to.setCategories( cur );
    load(to);
 }
 void OTaskEditor::init( const OPimTodo& to ) {
    load( to );
 }
 OPimTodo OTaskEditor::todo()const{
    OPimTodo to ( m_todo );
    m_overView->save( to );
    m_stat->save( to );
    to.setRecurrence( m_rec->recurrence() );
    m_alarm->save( to );
    return to;
 }
 void OTaskEditor::load(const OPimTodo& to) {
    m_overView->load( to );
    m_stat->load( to );
diff --git a/core/pim/todo/otaskeditor.h b/core/pim/todo/otaskeditor.h
index 65e7bda..1715d02 100644
--- a/core/pim/todo/otaskeditor.h
+++ b/core/pim/todo/otaskeditor.h
@@ -1,44 +1,74 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
 #ifndef OPIE_TASK_EDITOR_H
 #define OPIE_TASK_EDITOR_H
 #include <qdialog.h>
 #include <opie2/opimtodo.h>
 #include <opie2/otabwidget.h>
 #include <opie2/opimrecurrencewidget.h>
 #include <opie2/opimrecurrencewidget.h>
 class TaskEditorOverView;
 class TaskEditorStatus;
 class TaskEditorAlarms;
 class QMultiLineEdit;
 class OTaskEditor : public QDialog {
    Q_OBJECT
 public:
    OTaskEditor(int cur);
    OTaskEditor( const Opie::OPimTodo& todo );
    ~OTaskEditor();
    /*
     * same as the c'tor but this gives us the
     * power to 'preload' the dialog
     */
    void init( int cur );
    void init( const Opie::OPimTodo& todo );
    Opie::OPimTodo todo()const;
 private:
    void load( const Opie::OPimTodo& );
    void init();
    Opie::Ui::OTabWidget         *m_tab;
    TaskEditorOverView *m_overView;
    TaskEditorStatus   *m_stat;
    TaskEditorAlarms   *m_alarm;
    TaskEditorAlarms   *m_remind;
    OPimRecurrenceWidget  *m_rec;
            Opie::OPimTodo      m_todo;
 };
 #endif
diff --git a/core/pim/todo/quickedit.cpp b/core/pim/todo/quickedit.cpp
index 16fc53a..eb26c45 100644
--- a/core/pim/todo/quickedit.cpp
+++ b/core/pim/todo/quickedit.cpp
@@ -1,21 +1,51 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
 #include "quickedit.h"
 using namespace Todo;
 // not so interesting part base Implementation
 QuickEdit::QuickEdit(MainWindow* main )
    : m_main( main )  {
    m_sig = new QSignal();
 }
 QuickEdit::~QuickEdit() {
    delete m_sig;
 }
 QSignal* QuickEdit::signal() {
    return m_sig;
 }
 MainWindow* QuickEdit::mainWindow() {
    return m_main;
 }
 void QuickEdit::commit() {
    m_sig->activate();
 }
diff --git a/core/pim/todo/quickedit.h b/core/pim/todo/quickedit.h
index 0c0c204..a479d9e 100644
--- a/core/pim/todo/quickedit.h
+++ b/core/pim/todo/quickedit.h
@@ -1,47 +1,77 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
 #ifndef OPIE_QUICK_EDIT_H
 #define OPIE_QUICK_EDIT_H
 #include <qsignal.h>
 #include <qwidget.h>
 #include <opie2/opimtodo.h>
 using Opie::OPimTodo;
 namespace Todo{
    class MainWindow;
    struct QuickEditBase {
        virtual OPimTodo todo()const = 0l;
        virtual QSignal* signal() = 0l;
        virtual QWidget* widget() = 0l;
    };
    /*
     * this is my second try
     * of signal and slots with namespaces
     * and templates
     * I use a different approach now
     * I give a QSignal away
     * and have a protected method called emit
     */
    /**
     * Quick edit is meant to quickly enter
     * OPimTodos in a fast way
     */
    class QuickEdit : public QuickEditBase{
    public:
        QuickEdit(MainWindow* main );
        virtual ~QuickEdit();
        //OPimTodo todo()const;
        QSignal* signal();
        //QWidget* widget();
    protected:
        MainWindow* mainWindow();
        void commit();
    private:
        MainWindow* m_main;
        QSignal* m_sig;
    };
 };
 #endif
diff --git a/core/pim/todo/quickeditimpl.cpp b/core/pim/todo/quickeditimpl.cpp
index 90ad19e..f700716 100644
--- a/core/pim/todo/quickeditimpl.cpp
+++ b/core/pim/todo/quickeditimpl.cpp
@@ -1,98 +1,130 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
 #include <qaction.h>
 #include <qlineedit.h>
 #include <qwhatsthis.h>
-#include <qpe/resource.h>
 #include <opie2/oclickablelabel.h>
+#include <opie2/oresource.h>
 #include "mainwindow.h"
 #include "quickeditimpl.h"
 QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible )
    : QToolBar( (QMainWindow *)parent ), Todo::QuickEdit( (Todo::MainWindow *)parent ) {
    setHorizontalStretchable( TRUE );
    // Load priority icons
    // TODO - probably should be done globally somewhere else,
    //        see also tableview.cpp/h, taskeditoroverview.cpp/h
-    priority1 = Resource::loadPixmap( "todo/priority1" );
+    priority1 = Opie::Core::OResource::loadPixmap( "todo/priority1" );
-    priority3 = Resource::loadPixmap( "todo/priority3" );
+    priority3 = Opie::Core::OResource::loadPixmap( "todo/priority3" );
-    priority5 = Resource::loadPixmap( "todo/priority5" );
+    priority5 = Opie::Core::OResource::loadPixmap( "todo/priority5" );
    m_lbl = new Opie::Ui::OClickableLabel( this );
    m_lbl->setMinimumWidth( 15 );
    m_lbl->setPixmap( priority3 );
    connect(m_lbl, SIGNAL(clicked() ), this, SLOT(slotPrio()) );
    QWhatsThis::add( m_lbl, QWidget::tr( "Click here to set the priority of new task.\n\nThis area is called the quick task bar.\n\nIt allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options->'Show quick task bar' from the menu above." ) );
    m_edit = new QLineEdit( this );
    setStretchableWidget( m_edit );
    QWhatsThis::add( m_edit, QWidget::tr( "Enter description of new task here.\n\nThis area is called the quick task bar.\n\nIt allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options->'Show quick task bar' from the menu above." ) );
    /*
     * it's not implemented and won't be implemented for 1.0
     */
 #if 0
-    QAction *a = new QAction( QWidget::tr( "More" ), Resource::loadPixmap( "todo/more" ), QString::null, 0, this, 0 );
+    QAction *a = new QAction( QWidget::tr( "More" ), Opie::Core::OResource::loadPixmap( "todo/more", Opie::Core::OResource::SmallIcon ),
+                              QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), this, SLOT( slotMore() ) );
    a->addTo( this );
    a->setWhatsThis( QWidget::tr( "Click here to enter additional information for new task.\n\nThis area is called the quick task bar.\n\nIt allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options->'Show quick task bar' from the menu above." ) );
 #endif
-    QAction *a = new QAction( QWidget::tr( "Enter" ), Resource::loadPixmap( "enter" ), QString::null, 0, this, 0 );
+    QAction *a = new QAction( QWidget::tr( "Enter" ), Opie::Core::OResource::loadPixmap( "enter", Opie::Core::OResource::SmallIcon ),
+                              QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), this, SLOT( slotEnter() ) );
    a->addTo( this );
    a->setWhatsThis( QWidget::tr( "Click here to add new task.\n\nThis area is called the quick task bar.\n\nIt allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options->'Show quick task bar' from the menu above." ) );
-    a = new QAction( QWidget::tr( "Cancel" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
+    a = new QAction( QWidget::tr( "Cancel" ), Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ),
+                     QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), this, SLOT( slotCancel() ) );
    a->addTo( this );
    a->setWhatsThis( QWidget::tr( "Click here to reset new task information.\n\nThis area is called the quick task bar.\n\nIt allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options->'Show quick task bar' from the menu above." ) );
    m_visible = visible;
    if ( !m_visible ) {
        hide();
    }
    m_menu = 0l;
    reinit();
 }
 QuickEditImpl::~QuickEditImpl() {
 }
 OPimTodo QuickEditImpl::todo()const {
    return m_todo;
 }
 QWidget* QuickEditImpl::widget() {
    return this;
 }
 void QuickEditImpl::slotEnter() {
    OPimTodo todo;
    if (!m_edit->text().isEmpty() ) {
        todo.setUid(1 ); // new uid
        todo.setPriority( m_state );
        todo.setSummary( m_edit->text() );
        if ( ((Todo::MainWindow *)parent())->currentCatId() != 0 )
            todo.setCategories( ((Todo::MainWindow *)parent())->currentCatId() );
        m_todo = todo;
       commit();
    }
    m_todo = todo;
    reinit();
 }
 void QuickEditImpl::slotPrio() {
    m_state -= 2;
    if ( m_state < 1 )
        m_state = 5;
    switch( m_state ) {
    case 1:
        m_lbl->setPixmap( priority1 );
        break;
    case 5:
diff --git a/core/pim/todo/quickeditimpl.h b/core/pim/todo/quickeditimpl.h
index d465dba..cfb33a9 100644
--- a/core/pim/todo/quickeditimpl.h
+++ b/core/pim/todo/quickeditimpl.h
@@ -1,41 +1,71 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
 #ifndef OPIE_QUICK_EDIT_IMPL_H
 #define OPIE_QUICK_EDIT_IMPL_H
 #include <qpixmap.h>
 #include <qtoolbar.h>
 #include "quickedit.h"
 class QLineEdit;
 class QLabel;
 class QuickEditImpl : public QToolBar, public Todo::QuickEdit {
    Q_OBJECT
 public:
    QuickEditImpl( QWidget* parent,  bool visible);
    ~QuickEditImpl();
    OPimTodo todo()const;
    QWidget* widget();
 private slots:
    void slotEnter();
    void slotPrio();
    void slotMore();
    void slotCancel();
 private:
    void reinit();
    int m_state;
    QLabel* m_lbl;
    QLineEdit* m_edit;
    QLabel* m_enter;
    QLabel* m_more;
    QPopupMenu* m_menu;
    OPimTodo m_todo;
    bool m_visible;
    QPixmap priority1;
    QPixmap priority3;
    QPixmap priority5;
 };
 #endif
diff --git a/core/pim/todo/smalltodo.cpp b/core/pim/todo/smalltodo.cpp
index 504256d..c5e1201 100644
--- a/core/pim/todo/smalltodo.cpp
+++ b/core/pim/todo/smalltodo.cpp
@@ -1,74 +1,76 @@
 /*
-� � � � � � � �=.            This file is part of the OPIE Project
+                             This file is part of the Opie Project
-� � � � � � �.=l.            Copyright (c)  2002 <zecke@handhelds.org>
-� � � � � �.>+-=
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
-�_;:, � � .> � �:=|.         This program is free software; you can
+              =.
-.> <`_, � > �. � <=          redistribute it and/or  modify it under
+            .=l.
-:`=1 )Y*s>-.-- � :           the terms of the GNU General Public
+           .>+-=
-.="- .-=="i, � � .._         License as published by the Free Software
+ _;:,     .>    :=|.         This program is free software; you can
-�- . � .-<_> � � .<>         Foundation; either version 2 of the License,
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-� � �._= =} � � � :          or (at your option) any later version.
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-� � .%`+i> � � � _;_.
+.="- .-=="i,     .._         License as published by the Free Software
-� � .i_,=:_. � � �-<s.       This program is distributed in the hope that
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-� � �+ �. �-:. � � � =       it will be useful,  but WITHOUT ANY WARRANTY;
+     ._= =}       :          or (at your option) any later version.
-� � : .. � �.:, � � . . .    without even the implied warranty of
+    .%`+i>       _;_.
-� � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-� _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-..}^=.= � � � = � � � ;      Library General Public License for more
+    : ..    .:,     . . .    without even the implied warranty of
-++= � -. � � .` � � .:       details.
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-�: � � = �...= . :.=-
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-�-. � .:....=;==+<;          You should have received a copy of the GNU
+..}^=.=       =       ;      Library General Public License for more
-� -_. . . � )=. �=           Library General Public License along with
++=   -.     .`     .:       details.
-� � -- � � � �:-=`           this library; see the file COPYING.LIB.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include "smalltodo.h"
 using namespace Todo;
 struct SmallTodo::SmallTodoPrivate  : public QShared{
    SmallTodoPrivate() : QShared(), uid(-1) {};
    QString name;
    QStringList categories; // as real Names
    int uid;
    bool complete:1;
    QDate date;
    void deleteSelf() { delete this; };
 };
 SmallTodo::SmallTodo(int uid,
                     bool comp,
                     const QDate& date,
                     const QString& name,
                     const QStringList& cats) {
    d = new SmallTodoPrivate();
    d->name = name;
    d->uid = uid;
    d->categories = cats;
    d->complete = comp;
    d->date = date;
 }
 SmallTodo::SmallTodo( const SmallTodo& s ) : d(s.d) {
    d->ref();
 }
 SmallTodo::~SmallTodo() {
    /* deref and if last one delete */
    if ( d->deref() ) {
        d->deleteSelf();
    }
 }
 bool SmallTodo::operator==( const SmallTodo& todo ) {
    if ( d->complete != todo.d->complete ) return false;
    if ( d->name != todo.d->name ) return false;
    if ( d->uid != todo.d->uid ) return false;
    if ( d->categories != todo.d->categories ) return false;
    if ( d->date != todo.d->date ) return false;
    return true;
diff --git a/core/pim/todo/smalltodo.h b/core/pim/todo/smalltodo.h
index 963218e..d6db0e6 100644
--- a/core/pim/todo/smalltodo.h
+++ b/core/pim/todo/smalltodo.h
@@ -1,70 +1,72 @@
 /*
-� � � � � � � �=.            This file is part of the OPIE Project
+                             This file is part of the Opie Project
-� � � � � � �.=l.            Copyright (c)  2002 <zecke@handhelds.org>
-� � � � � �.>+-=
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
-�_;:, � � .> � �:=|.         This program is free software; you can
+              =.
-.> <`_, � > �. � <=          redistribute it and/or  modify it under
+            .=l.
-:`=1 )Y*s>-.-- � :           the terms of the GNU General Public
+           .>+-=
-.="- .-=="i, � � .._         License as published by the Free Software
+ _;:,     .>    :=|.         This program is free software; you can
-�- . � .-<_> � � .<>         Foundation; either version 2 of the License,
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-� � �._= =} � � � :          or (at your option) any later version.
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-� � .%`+i> � � � _;_.
+.="- .-=="i,     .._         License as published by the Free Software
-� � .i_,=:_. � � �-<s.       This program is distributed in the hope that
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-� � �+ �. �-:. � � � =       it will be useful,  but WITHOUT ANY WARRANTY;
+     ._= =}       :          or (at your option) any later version.
-� � : .. � �.:, � � . . .    without even the implied warranty of
+    .%`+i>       _;_.
-� � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-� _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-..}^=.= � � � = � � � ;      Library General Public License for more
+    : ..    .:,     . . .    without even the implied warranty of
-++= � -. � � .` � � .:       details.
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-�: � � = �...= . :.=-
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-�-. � .:....=;==+<;          You should have received a copy of the GNU
+..}^=.=       =       ;      Library General Public License for more
-� -_. . . � )=. �=           Library General Public License along with
++=   -.     .`     .:       details.
-� � -- � � � �:-=`           this library; see the file COPYING.LIB.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef TODO_SMALL_TODO_H
 #define TODO_SMALL_TODO_H
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qstringlist.h>
 namespace Todo {
    /**
     * SmallTodo holds everything necessary
     * to represent a OPimTodo without holding
     * everything from a OPimTodo
     */
    class SmallTodo {
    public:
        SmallTodo(int uid = 0,
                  bool comp = false,
                  const QDate& date = QDate::currentDate(),
                  const QString& = QString::null,
                  const QStringList& = QStringList() );
        SmallTodo( const SmallTodo& );
        ~SmallTodo();
        bool operator==( const SmallTodo& );
        bool operator==( const SmallTodo& ) const;
        SmallTodo &operator=( const SmallTodo& );
        QString name()const;
        QStringList categories()const;
        int uid()const;
        bool isCompleted()const;
        QDate date()const;
    private:
        struct SmallTodoPrivate;
        SmallTodoPrivate* d;
        void deref();
    };
 };
 #endif
diff --git a/core/pim/todo/tableview.cpp b/core/pim/todo/tableview.cpp
index c64ad46..3e88974 100644
--- a/core/pim/todo/tableview.cpp
+++ b/core/pim/todo/tableview.cpp
@@ -1,146 +1,149 @@
 /*
-       =.            This file is part of the OPIE Project
+                             This file is part of the Opie Project
-      .=l.            Copyright (c)  2002 <zecke>
-     .>+-=
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
-_;:,   .>  :=|.         This program is free software; you can
+              =.
-.> <`_,  > .  <=          redistribute it and/or  modify it under
+            .=l.
-:`=1 )Y*s>-.--  :           the terms of the GNU General Public
+           .>+-=
-.="- .-=="i,   .._         License as published by the Free Software
+ _;:,     .>    :=|.         This program is free software; you can
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-  ._= =}    :          or (at your option) any later version.
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-  .%`+i>    _;_.
+.="- .-=="i,     .._         License as published by the Free Software
-  .i_,=:_.   -<s.       This program is distributed in the hope that
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  + . -:.    =       it will be useful,  but WITHOUT ANY WARRANTY;
+     ._= =}       :          or (at your option) any later version.
-  : ..  .:,   . . .    without even the implied warranty of
+    .%`+i>       _;_.
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    .i_,=:_.      -<s.       This program is distributed in the hope that
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-..}^=.=    =    ;      Library General Public License for more
+    : ..    .:,     . . .    without even the implied warranty of
-++=  -.   .`   .:       details.
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-:   = ...= . :.=-
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-.  .:....=;==+<;          You should have received a copy of the GNU
+..}^=.=       =       ;      Library General Public License for more
- -_. . .  )=. =           Library General Public License along with
++=   -.     .`     .:       details.
-  --    :-=`           this library; see the file COPYING.LIB.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include <stdlib.h>
 #include <cmath>
 #include <cctype>
 #include <opie2/odebug.h>
 #include <opie2/opimrecurrence.h>
+#include <opie2/oresource.h>
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qpopupmenu.h>
 #include "mainwindow.h"
 //#include "tableitems.h"
 #include "tableview.h"
 using namespace Todo;
 namespace {
    static const int BoxSize = 14;
    static const int RowHeight = 20;
 }
 TableView::EditorWidget::EditorWidget() : m_wid(0l), m_row(-1), m_col(-1) {
 }
 void TableView::EditorWidget::setCellWidget(QWidget* wid, int row, int col ) {
    m_wid = wid;
    m_row = row;
    m_col = col;
 }
 void TableView::EditorWidget::releaseCellWidget() {
    m_wid = 0;
    m_row = m_col = -1;
 }
 QWidget* TableView::EditorWidget::cellWidget()const {
    return m_wid;
 }
 int TableView::EditorWidget::cellRow()const {
    return m_row;
 }
 int TableView::EditorWidget::cellCol()const {
    return m_col;
 }
 void TableView::initConfig() {
    Config config( "todo" );
    config.setGroup( "Options" );
    m_completeStrokeWidth = config.readNumEntry( "CompleteStrokeWidth", 8 );
    for (int i = 0; i < numCols(); i++ ) {
        int width = config.readNumEntry("Width"+QString::number(i), -1 );
        setColumnWidth(i, width == -1 ? columnWidth(i) : width );
    }
 }
 TableView::TableView( MainWindow* window, QWidget* wid )
    : QTable(  wid ), TodoView( window ) {
    setName("TableView");
    // Load icons
    // TODO - probably should be done globally somewhere else,
    //        see also quickeditimpl.cpp/h, taskeditoroverview.cpp/h
-    m_pic_completed = Resource::loadPixmap( "todo/completed" );
+    m_pic_completed = Opie::Core::OResource::loadPixmap( "todo/completed" );
    QString namestr;
    for ( unsigned int i = 1; i < 6; i++ ) {
        namestr = "todo/priority";
        namestr.append( QString::number( i ) );
-        m_pic_priority[ i - 1 ] = Resource::loadPixmap( namestr );
+        m_pic_priority[ i - 1 ] = Opie::Core::OResource::loadPixmap( namestr );
    }
    setUpdatesEnabled( false );
    viewport()->setUpdatesEnabled( false );
    m_enablePaint = false;
    setNumRows(0);
    setNumCols(4);
    horizontalHeader()->setLabel( 0, QWidget::tr("C.") );
    horizontalHeader()->setLabel( 1, QWidget::tr("Priority") );
    horizontalHeader()->setLabel( 2, QWidget::tr("Summary" ) );
    horizontalHeader()->setLabel( 3, QWidget::tr("Deadline") );
    setShowDeadline( todoWindow()->showDeadline() );
    setSorting( TRUE );
    setSelectionMode( NoSelection );
    setLeftMargin( 0 );
    verticalHeader()->hide();
    QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
    connect((QTable*)this, SIGNAL( clicked(int,int,int,const QPoint&) ),
            this, SLOT( slotClicked(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) ) );
    /* now let's init the config */
    initConfig();
    m_enablePaint = true;
    setUpdatesEnabled( true );
    viewport()->setUpdatesEnabled( true );
    viewport()->update();
    setSortOrder( Opie::OPimTodoAccess::Completed );
    setAscending( TRUE );
    m_first = true;
 }
 /* a new day has started
 * update the day
 */
 void TableView::newDay() {
    clear();
@@ -225,97 +228,97 @@ void TableView::setTodo( int, const OPimTodo&) {
 void TableView::addEvent( const OPimTodo&) {
    /* fix problems of not showing the 'Haken' */
    updateView();
 }
 /*
 * find the event
 * and then replace the complete row
 */
 void TableView::replaceEvent( const OPimTodo& ev) {
    addEvent( ev );
 }
 /*
 * re aligning table can be slow too
 * FIXME: look what performs better
 * either this or the old align table
 */
 void TableView::removeEvent( int ) {
    updateView();
 }
 void TableView::setShowCompleted( bool ) {
    updateView();
 }
 void TableView::setShowDeadline( bool b ) {
    if ( b )
        showColumn( 3 );
    else
        hideColumn( 3 );
    // Try to intelligently size columns
    // TODO - would use width() below, but doesn't have valid value at time of c'tor
    int col2width = 238;
    int width = m_pic_completed.width();
    setColumnWidth( 0, width );
    col2width -= width;
    width = fontMetrics().boundingRect( horizontalHeader()->label( 1 ) ).width() + 8;
    setColumnWidth( 1, width );
    col2width -= width;
    if ( b ) {
        width = fontMetrics().boundingRect( horizontalHeader()->label( 3 ) ).width() + 8;
        setColumnWidth( 3, width );
        col2width -= width;
    }
    setColumnWidth( 2, col2width );
 }
 void TableView::setShowCategory( const QString& str) {
    if ( str != m_oleCat || m_first )
        updateView();
-    
    m_oleCat = str;
    m_first = false;
 }
 void TableView::clear() {
    setNumRows(0);
 }
 void TableView::slotClicked(int row, int col, int,
                            const QPoint& point) {
    if ( m_editorWidget.cellWidget() ) {
        //setCellContentFromEditor(m_editorWidget.cellRow(), m_editorWidget.cellCol() );
        endEdit(m_editorWidget.cellRow(), m_editorWidget.cellCol(),
                true, true );
        m_editorWidget.releaseCellWidget();
    }
    if ( !cellGeometry(row, col ).contains(point ) )
        return;
    int ui= sorted().uidAt( row );
    switch( col ) {
    case 0:{
         int x = point.x() -columnPos( col );
         int y = point.y() -rowPos( row );
         int w = columnWidth( col );
         int h = rowHeight( row );
         if ( x >= ( w - BoxSize ) / 2 &&
              x <= ( w - BoxSize ) / 2 + BoxSize &&
              y >= ( h - BoxSize ) / 2 &&
              y <= ( h - BoxSize ) / 2 + BoxSize ) {
             TodoView::complete(sorted()[row] );
         }
    }
        break;
        // Priority emit a double click...
    case 1:{
        QWidget* wid = beginEdit( row, col, FALSE );
        m_editorWidget.setCellWidget( wid, row, col );
    }
        break;
    case 2: {
        showTodo( ui );
        break;
    }
    case 3: {
diff --git a/core/pim/todo/tableview.h b/core/pim/todo/tableview.h
index 46c16e1..6693d86 100644
--- a/core/pim/todo/tableview.h
+++ b/core/pim/todo/tableview.h
@@ -1,74 +1,76 @@
 /*
-       =.            This file is part of the OPIE Project
+                             This file is part of the Opie Project
-      .=l.            Copyright (c)  2002 <>
-     .>+-=
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
-_;:,   .>  :=|.         This program is free software; you can
+              =.
-.> <`_,  > .  <=          redistribute it and/or  modify it under
+            .=l.
-:`=1 )Y*s>-.--  :           the terms of the GNU General Public
+           .>+-=
-.="- .-=="i,   .._         License as published by the Free Software
+ _;:,     .>    :=|.         This program is free software; you can
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-  ._= =}    :          or (at your option) any later version.
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-  .%`+i>    _;_.
+.="- .-=="i,     .._         License as published by the Free Software
-  .i_,=:_.   -<s.       This program is distributed in the hope that
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  + . -:.    =       it will be useful,  but WITHOUT ANY WARRANTY;
+     ._= =}       :          or (at your option) any later version.
-  : ..  .:,   . . .    without even the implied warranty of
+    .%`+i>       _;_.
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    .i_,=:_.      -<s.       This program is distributed in the hope that
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-..}^=.=    =    ;      Library General Public License for more
+    : ..    .:,     . . .    without even the implied warranty of
-++=  -.   .`   .:       details.
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-:   = ...= . :.=-
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-.  .:....=;==+<;          You should have received a copy of the GNU
+..}^=.=       =       ;      Library General Public License for more
- -_. . .  )=. =           Library General Public License along with
++=   -.     .`     .:       details.
-  --    :-=`           this library; see the file COPYING.LIB.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef OPIE_TABLE_VIEW_H
 #define OPIE_TABLE_VIEW_H
 #include <qtable.h>
 #include <qmap.h>
 #include <qpixmap.h>
 #include "todoview.h"
 class QTimer;
 namespace Todo {
    class CheckItem;
    class DueTextItem;
    class TableView : public QTable, public TodoView {
        Q_OBJECT
    public:
        TableView( MainWindow*, QWidget* parent );
        ~TableView();
        QString type()const;
        int current();
        QString currentRepresentation();
        int next();
        int prev();
        void clear();
        void showOverDue( bool );
        void updateView();
        void setTodo( int uid, const OPimTodo& );
        void addEvent( const OPimTodo& event );
        void replaceEvent( const OPimTodo& );
        void removeEvent( int uid );
        void setShowCompleted( bool );
        void setShowDeadline( bool );
        void setShowCategory(const QString& =QString::null );
        void newDay();
        QWidget* widget();
        void sortColumn(int, bool, bool );
        /*
         * we do our drawing ourselves
         * because we don't want to have
         * 40.000 QTableItems for 10.000
diff --git a/core/pim/todo/taskeditoralarms.cpp b/core/pim/todo/taskeditoralarms.cpp
index 62fc600..054984d 100644
--- a/core/pim/todo/taskeditoralarms.cpp
+++ b/core/pim/todo/taskeditoralarms.cpp
@@ -1,148 +1,153 @@
 /*
-� � � � � � � �=.            This file is part of the OPIE Project
+                             This file is part of the Opie Project
-� � � � � � �.=l.            Copyright (c)  2002 <>
-� � � � � �.>+-=
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
-�_;:, � � .> � �:=|.         This program is free software; you can
+              =.
-.> <`_, � > �. � <=          redistribute it and/or  modify it under
+            .=l.
-:`=1 )Y*s>-.-- � :           the terms of the GNU General Public
+           .>+-=
-.="- .-=="i, � � .._         License as published by the Free Software
+ _;:,     .>    :=|.         This program is free software; you can
-�- . � .-<_> � � .<>         Foundation; either version 2 of the License,
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-� � �._= =} � � � :          or (at your option) any later version.
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-� � .%`+i> � � � _;_.
+.="- .-=="i,     .._         License as published by the Free Software
-� � .i_,=:_. � � �-<s.       This program is distributed in the hope that
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-� � �+ �. �-:. � � � =       it will be useful,  but WITHOUT ANY WARRANTY;
+     ._= =}       :          or (at your option) any later version.
-� � : .. � �.:, � � . . .    without even the implied warranty of
+    .%`+i>       _;_.
-� � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-� _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-..}^=.= � � � = � � � ;      Library General Public License for more
+    : ..    .:,     . . .    without even the implied warranty of
-++= � -. � � .` � � .:       details.
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-�: � � = �...= . :.=-
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-�-. � .:....=;==+<;          You should have received a copy of the GNU
+..}^=.=       =       ;      Library General Public License for more
-� -_. . . � )=. �=           General Public License along with
++=   -.     .`     .:       details.
-� � -- � � � �:-=`           this library; see the file COPYING.LIB.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include "taskeditoralarms.h"
 #include <opie2/opimnotifymanager.h>
+#include <opie2/oresource.h>
 #include <opie2/otimepicker.h>
 #include <qpe/datebookmonth.h>
-#include <qpe/resource.h>
 #include <qlistview.h>
 #include <qlayout.h>
 using namespace Opie::Ui;
 class AlarmItem : public QListViewItem {
 public:
    AlarmItem( QListView*, const OPimAlarm& );
    ~AlarmItem();
    OPimAlarm alarm()const;
    void setAlarm( const OPimAlarm& );
 private:
    QDateTime m_dt;
    int m_type;
 };
 AlarmItem::AlarmItem( QListView* view, const OPimAlarm& dt)
    : QListViewItem(view) {
    setAlarm( dt );
 }
 void AlarmItem::setAlarm( const OPimAlarm& dt ) {
    m_dt = dt.dateTime();
    m_type = dt.sound();
    setText( 0, TimeString::dateString( m_dt.date() ) );
    setText( 1, TimeString::timeString( m_dt.time() ) );
    setText( 2, m_type == 0 ? QObject::tr("silent") : QObject::tr("loud") );
 }
 AlarmItem::~AlarmItem() {
 }
 OPimAlarm AlarmItem::alarm()const{
    OPimAlarm al( m_type, m_dt );
    return al;
 }
 TaskEditorAlarms::TaskEditorAlarms( QWidget* parent,  int, const char* name, WFlags fl )
    : QWidget( parent, name, fl )
 {
    m_date = m_type = m_time = 0;
    QGridLayout *layout = new QGridLayout( this, 2, 2, 4, 4 );
    lstAlarms = new QListView( this );
    lstAlarms->addColumn( tr("Date") );
    lstAlarms->addColumn( tr("Time") );
    lstAlarms->addColumn( tr("Type") );
    connect( lstAlarms, SIGNAL(clicked(QListViewItem*,const QPoint&,int) ),
             this, SLOT(inlineEdit(QListViewItem*,const QPoint&,int) ) );
    layout->addMultiCellWidget( lstAlarms, 0, 0, 0, 2 );
-    QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), this );
+    QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ),
+                                        tr( "New" ), this );
    //QWhatsThis::add( btn, tr( "Click here to add a new transaction." ) );
    connect( btn, SIGNAL( clicked() ), this, SLOT( slotNew() ) );
    layout->addWidget( btn, 1, 0 );
 /* use when we've reminders too */
 #if 0
-    btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Edit" ), this );
+    btn = new QPushButton( Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ),
+                           tr( "Edit" ), this );
    //QWhatsThis::add( btn, tr( "Select a transaction and then click here to edit it." ) );
    connect( btn, SIGNAL( clicked() ), this, SLOT( slotEdit() ) );
    layout->addWidget( btn, 1, 1 );
 #endif
-    btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), this );
+    btn = new QPushButton( Opie::Core::OResource::loadPixmap( "trash", Opie::Core::OResource::SmallIcon ),
+                           tr( "Delete" ), this );
    //QWhatsThis::add( btn, tr( "Select a checkbook and then click here to delete it." ) );
    connect( btn, SIGNAL( clicked() ), this, SLOT( slotDelete() ) );
    layout->addWidget( btn, 1, 2 );
 }
 TaskEditorAlarms::~TaskEditorAlarms(){
 }
 void TaskEditorAlarms::slotNew(){
    (void)new AlarmItem(lstAlarms, OPimAlarm(0, QDateTime::currentDateTime() ) );
 }
 void TaskEditorAlarms::slotEdit(){
 }
 void TaskEditorAlarms::slotDelete(){
    QListViewItem* item = lstAlarms->currentItem();
    if (!item) return;
    lstAlarms->takeItem( item ); delete item;
 }
 void TaskEditorAlarms::load( const OPimTodo& todo) {
    lstAlarms->clear();
    if (!todo.hasNotifiers() ) return;
    OPimNotifyManager::Alarms als = todo.notifiers().alarms();
    if (als.isEmpty() ) return;
    OPimNotifyManager::Alarms::Iterator it = als.begin();
    for ( ; it != als.end(); ++it )
        (void)new AlarmItem( lstAlarms, (*it) );
 }
 void TaskEditorAlarms::save( OPimTodo& todo ) {
    if (lstAlarms->childCount() <= 0 ) return;
    OPimNotifyManager::Alarms alarms;
    for ( QListViewItem* item = lstAlarms->firstChild(); item; item = item->nextSibling() ) {
        AlarmItem *alItem = static_cast<AlarmItem*>(item);
        alarms.append( alItem->alarm() );
    }
diff --git a/core/pim/todo/taskeditoralarms.h b/core/pim/todo/taskeditoralarms.h
index 2379b0c..5cff352 100644
--- a/core/pim/todo/taskeditoralarms.h
+++ b/core/pim/todo/taskeditoralarms.h
@@ -1,74 +1,76 @@
 /*
-� � � � � � � �=.            This file is part of the OPIE Project
+                             This file is part of the Opie Project
-� � � � � � �.=l.            Copyright (c)  2002,2003 <>
-� � � � � �.>+-=
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
-�_;:, � � .> � �:=|.         This program is free software; you can
+              =.
-.> <`_, � > �. � <=          redistribute it and/or  modify it under
+            .=l.
-:`=1 )Y*s>-.-- � :           the terms of the GNU General Public
+           .>+-=
-.="- .-=="i, � � .._         License as published by the Free Software
+ _;:,     .>    :=|.         This program is free software; you can
-�- . � .-<_> � � .<>         Foundation; either version 2 of the License,
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-� � �._= =} � � � :          or (at your option) any later version.
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-� � .%`+i> � � � _;_.
+.="- .-=="i,     .._         License as published by the Free Software
-� � .i_,=:_. � � �-<s.       This program is distributed in the hope that
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-� � �+ �. �-:. � � � =       it will be useful,  but WITHOUT ANY WARRANTY;
+     ._= =}       :          or (at your option) any later version.
-� � : .. � �.:, � � . . .    without even the implied warranty of
+    .%`+i>       _;_.
-� � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-� _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-..}^=.= � � � = � � � ;      Library General Public License for more
+    : ..    .:,     . . .    without even the implied warranty of
-++= � -. � � .` � � .:       details.
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-�: � � = �...= . :.=-
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-�-. � .:....=;==+<;          You should have received a copy of the GNU
+..}^=.=       =       ;      Library General Public License for more
-� -_. . . � )=. �=           General Public License along with
++=   -.     .`     .:       details.
-� � -- � � � �:-=`           this library; see the file COPYING.LIB.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef TASKEDITORALARMS_H
 #define TASKEDITORALARMS_H
 #include <opie2/opimtodo.h>
 #include <qwidget.h>
 class QListView;
 class QListViewItem;
 using namespace Opie;
 class AlarmItem;
 class DateBookMonth;
 class TaskEditorAlarms : public QWidget
 {
    Q_OBJECT
 public:
    enum Type {
        Alarm = 0,
        Reminders
    };
    TaskEditorAlarms( QWidget* parent = 0, int type = Alarm,  const char* name = 0, WFlags fl = 0 );
    ~TaskEditorAlarms();
    void load( const OPimTodo& );
    void save( OPimTodo& );
 private:
    QPopupMenu* popup( int column );
    void inlineSetDate( AlarmItem*, const QPoint& p );
    void inlineSetTime( AlarmItem*);
    void inlineSetType( AlarmItem*, const QPoint& p );
    QListView* lstAlarms;
    QPopupMenu* m_date;
    QPopupMenu* m_time;
    QPopupMenu* m_type;
    DateBookMonth* m_dbMonth;
 protected slots:
    void slotNew();
    void slotEdit();
    void slotDelete();
    void inlineEdit( QListViewItem*, const QPoint& p, int );
 };
diff --git a/core/pim/todo/taskeditoroverview.cpp b/core/pim/todo/taskeditoroverview.cpp
index 294acb9..1e43883 100644
--- a/core/pim/todo/taskeditoroverview.cpp
+++ b/core/pim/todo/taskeditoroverview.cpp
@@ -1,101 +1,104 @@
 /*
-� � � � � � � �=.            This file is part of the OPIE Project
+                             This file is part of the Opie Project
-� � � � � � �.=l.            Copyright (c)  2002 <>
-� � � � � �.>+-=
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
-�_;:, � � .> � �:=|.         This program is free software; you can
+              =.
-.> <`_, � > �. � <=          redistribute it and/or  modify it under
+            .=l.
-:`=1 )Y*s>-.-- � :           the terms of the GNU General Public
+           .>+-=
-.="- .-=="i, � � .._         License as published by the Free Software
+ _;:,     .>    :=|.         This program is free software; you can
-�- . � .-<_> � � .<>         Foundation; either version 2 of the License,
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-� � �._= =} � � � :          or (at your option) any later version.
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-� � .%`+i> � � � _;_.
+.="- .-=="i,     .._         License as published by the Free Software
-� � .i_,=:_. � � �-<s.       This program is distributed in the hope that
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-� � �+ �. �-:. � � � =       it will be useful,  but WITHOUT ANY WARRANTY;
+     ._= =}       :          or (at your option) any later version.
-� � : .. � �.:, � � . . .    without even the implied warranty of
+    .%`+i>       _;_.
-� � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-� _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-..}^=.= � � � = � � � ;      Library General Public License for more
+    : ..    .:,     . . .    without even the implied warranty of
-++= � -. � � .` � � .:       details.
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-�: � � = �...= . :.=-
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-�-. � .:....=;==+<;          You should have received a copy of the GNU
+..}^=.=       =       ;      Library General Public License for more
-� -_. . . � )=. �=           General Public License along with
++=   -.     .`     .:       details.
-� � -- � � � �:-=`           this library; see the file COPYING.LIB.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include "taskeditoroverview.h"
 //#include <opie2/opimrecurrence.h>
+#include <opie2/oresource.h>
 #include <qpe/categoryselect.h>
 #include <qpe/datebookmonth.h>
-#include <qpe/resource.h>
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qmultilineedit.h>
 #include <qwhatsthis.h>
 TaskEditorOverView::TaskEditorOverView( QWidget* parent,  const char* name, WFlags fl )
    : QWidget( parent, name, fl )
 {
    // Load icons
    // TODO - probably should be done globally somewhere else,
    //        see also quickeditimpl.cpp/h, tableview.cpp/h
    QString namestr;
    for ( unsigned int i = 1; i < 6; i++ ) {
        namestr = "todo/priority";
        namestr.append( QString::number( i ) );
-        m_pic_priority[ i - 1 ] = Resource::loadPixmap( namestr );
+        m_pic_priority[ i - 1 ] = Opie::Core::OResource::loadPixmap( namestr );
    }
    QVBoxLayout *vb = new QVBoxLayout( this );
    QScrollView *sv = new QScrollView( this );
    vb->addWidget( sv );
    sv->setResizePolicy( QScrollView::AutoOneFit );
    sv->setFrameStyle( QFrame::NoFrame );
    QWidget *container = new QWidget( sv->viewport() );
    sv->addChild( container );
    QGridLayout *layout = new QGridLayout( container, 7, 2, 4, 4 );
    // Description
    QLabel *label = new QLabel( tr( "Summary:" ), container );
    layout->addWidget( label, 0, 0 );
    QWhatsThis::add( label, tr( "Enter brief description of the task here." ) );
    cmbDesc = new QComboBox( TRUE, container );
    cmbDesc->insertItem( tr( "Complete " ) );
    cmbDesc->insertItem( tr( "Work on " ) );
    cmbDesc->insertItem( tr( "Buy " ) );
    cmbDesc->insertItem( tr( "Organize " ) );
    cmbDesc->insertItem( tr( "Get " ) );
    cmbDesc->insertItem( tr( "Update " ) );
    cmbDesc->insertItem( tr( "Create " ) );
    cmbDesc->insertItem( tr( "Plan " ) );
    cmbDesc->insertItem( tr( "Call " ) );
    cmbDesc->insertItem( tr( "Mail " ) );
    cmbDesc->clearEdit();
    layout->addMultiCellWidget( cmbDesc, 1, 1, 0, 1 );
    QWhatsThis::add( cmbDesc, tr( "Enter brief description of the task here." ) );
    // Priority
    label = new QLabel( QWidget::tr( "Priority:" ), container );
    layout->addWidget( label, 2, 0 );
    QWhatsThis::add( label, tr( "Select priority of task here." ) );
    cmbPriority = new QComboBox( FALSE, container );
    cmbPriority->setMinimumHeight( 26 );
    cmbPriority->insertItem( m_pic_priority[ 0 ], tr( "Very High" ) );
    cmbPriority->insertItem( m_pic_priority[ 1 ], tr( "High" ) );
    cmbPriority->insertItem( m_pic_priority[ 2 ], tr( "Normal" ) );
    cmbPriority->insertItem( m_pic_priority[ 3 ], tr( "Low" ) );
    cmbPriority->insertItem( m_pic_priority[ 4 ], tr( "Very Low" ) );
    cmbPriority->setCurrentItem( 2 );
    layout->addWidget( cmbPriority, 2, 1 );
    QWhatsThis::add( cmbPriority, tr( "Select priority of task here." ) );
diff --git a/core/pim/todo/taskeditoroverview.h b/core/pim/todo/taskeditoroverview.h
index 89679f1..db85041 100644
--- a/core/pim/todo/taskeditoroverview.h
+++ b/core/pim/todo/taskeditoroverview.h
@@ -1,71 +1,73 @@
 /*
-� � � � � � � �=.            This file is part of the OPIE Project
+                             This file is part of the Opie Project
-� � � � � � �.=l.            Copyright (c)  2002 <>
-� � � � � �.>+-=
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
-�_;:, � � .> � �:=|.         This program is free software; you can
+              =.
-.> <`_, � > �. � <=          redistribute it and/or  modify it under
+            .=l.
-:`=1 )Y*s>-.-- � :           the terms of the GNU General Public
+           .>+-=
-.="- .-=="i, � � .._         License as published by the Free Software
+ _;:,     .>    :=|.         This program is free software; you can
-�- . � .-<_> � � .<>         Foundation; either version 2 of the License,
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-� � �._= =} � � � :          or (at your option) any later version.
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-� � .%`+i> � � � _;_.
+.="- .-=="i,     .._         License as published by the Free Software
-� � .i_,=:_. � � �-<s.       This program is distributed in the hope that
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-� � �+ �. �-:. � � � =       it will be useful,  but WITHOUT ANY WARRANTY;
+     ._= =}       :          or (at your option) any later version.
-� � : .. � �.:, � � . . .    without even the implied warranty of
+    .%`+i>       _;_.
-� � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-� _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-..}^=.= � � � = � � � ;      Library General Public License for more
+    : ..    .:,     . . .    without even the implied warranty of
-++= � -. � � .` � � .:       details.
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-�: � � = �...= . :.=-
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-�-. � .:....=;==+<;          You should have received a copy of the GNU
+..}^=.=       =       ;      Library General Public License for more
-� -_. . . � )=. �=           General Public License along with
++=   -.     .`     .:       details.
-� � -- � � � �:-=`           this library; see the file COPYING.LIB.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef TASKEDITOROVERVIEW_H
 #define TASKEDITOROVERVIEW_H
 #include <opie2/opimtodo.h>
 #include <qpixmap.h>
 #include <qwidget.h>
 class CategorySelect;
 class QCheckBox;
 class QComboBox;
 class QMultiLineEdit;
 using namespace Opie;
 class TaskEditorOverView : public QWidget
 {
    Q_OBJECT
 public:
    TaskEditorOverView( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
    ~TaskEditorOverView();
    QComboBox      *cmbDesc;
    QComboBox      *cmbPriority;
    CategorySelect *cmbCategory;
    QCheckBox      *ckbRecurrence;
    QMultiLineEdit *mleNotes;
    void load( const OPimTodo & );
    void save( OPimTodo & );
 signals:
    void recurranceEnabled( bool );
 protected:
    QPixmap m_pic_priority[ 5 ];
 protected slots:
    void slotRecClicked();
 };
 #endif // TASKEDITOROVERVIEW_H
diff --git a/core/pim/todo/taskeditorstatus.cpp b/core/pim/todo/taskeditorstatus.cpp
index 16351e0..17495a4 100644
--- a/core/pim/todo/taskeditorstatus.cpp
+++ b/core/pim/todo/taskeditorstatus.cpp
@@ -1,74 +1,76 @@
 /*
-� � � � � � � �=.            This file is part of the OPIE Project
+                             This file is part of the Opie Project
-� � � � � � �.=l.            Copyright (c)  2002 <>
-� � � � � �.>+-=
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
-�_;:, � � .> � �:=|.         This program is free software; you can
+              =.
-.> <`_, � > �. � <=          redistribute it and/or  modify it under
+            .=l.
-:`=1 )Y*s>-.-- � :           the terms of the GNU General Public
+           .>+-=
-.="- .-=="i, � � .._         License as published by the Free Software
+ _;:,     .>    :=|.         This program is free software; you can
-�- . � .-<_> � � .<>         Foundation; either version 2 of the License,
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-� � �._= =} � � � :          or (at your option) any later version.
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-� � .%`+i> � � � _;_.
+.="- .-=="i,     .._         License as published by the Free Software
-� � .i_,=:_. � � �-<s.       This program is distributed in the hope that
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-� � �+ �. �-:. � � � =       it will be useful,  but WITHOUT ANY WARRANTY;
+     ._= =}       :          or (at your option) any later version.
-� � : .. � �.:, � � . . .    without even the implied warranty of
+    .%`+i>       _;_.
-� � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-� _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-..}^=.= � � � = � � � ;      Library General Public License for more
+    : ..    .:,     . . .    without even the implied warranty of
-++= � -. � � .` � � .:       details.
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-�: � � = �...= . :.=-
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-�-. � .:....=;==+<;          You should have received a copy of the GNU
+..}^=.=       =       ;      Library General Public License for more
-� -_. . . � )=. �=           General Public License along with
++=   -.     .`     .:       details.
-� � -- � � � �:-=`           this library; see the file COPYING.LIB.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include "taskeditorstatus.h"
 #include <opie2/opimmaintainer.h>
 #include <opie2/opimstate.h>
 #include <qpe/datebookmonth.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qwhatsthis.h>
 // FIXME add the hack slots instead of setPopup!!!!
 // drw you shouldn't have removed them
 TaskEditorStatus::TaskEditorStatus( QWidget* parent,  const char* name, WFlags fl )
    : QWidget( parent, name, fl )
 {
    QDate curDate = QDate::currentDate();
    m_start = m_comp = m_due = curDate;
    QString curDateStr = TimeString::longDateString( curDate );
    QVBoxLayout *vb = new QVBoxLayout( this );
    QScrollView *sv = new QScrollView( this );
    vb->addWidget( sv );
    sv->setResizePolicy( QScrollView::AutoOneFit );
    sv->setFrameStyle( QFrame::NoFrame );
    QWidget *container = new QWidget( sv->viewport() );
    sv->addChild( container );
    QGridLayout *layout = new QGridLayout( container, 7, 3, 4, 4 );
    // Status
    QLabel *label = new QLabel( tr( "Status:" ), container );
    layout->addWidget( label, 0, 0 );
    QWhatsThis::add( label, tr( "Click here to set the current status of this task." ) );
    cmbStatus = new QComboBox( FALSE, container );
    cmbStatus->insertItem( tr( "Started" ) );
    cmbStatus->insertItem( tr( "Postponed" ) );
    cmbStatus->insertItem( tr( "Finished" ) );
    cmbStatus->insertItem( tr( "Not started" ) );
    layout->addMultiCellWidget( cmbStatus, 0, 0, 1, 2 );
    QWhatsThis::add( cmbStatus, tr( "Click here to set the current status of this task." ) );
diff --git a/core/pim/todo/taskeditorstatus.h b/core/pim/todo/taskeditorstatus.h
index 97129f0..427eaf4 100644
--- a/core/pim/todo/taskeditorstatus.h
+++ b/core/pim/todo/taskeditorstatus.h
@@ -1,74 +1,76 @@
 /*
-� � � � � � � �=.            This file is part of the OPIE Project
+                             This file is part of the Opie Project
-� � � � � � �.=l.            Copyright (c)  2002 <>
-� � � � � �.>+-=
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
-�_;:, � � .> � �:=|.         This program is free software; you can
+              =.
-.> <`_, � > �. � <=          redistribute it and/or  modify it under
+            .=l.
-:`=1 )Y*s>-.-- � :           the terms of the GNU General Public
+           .>+-=
-.="- .-=="i, � � .._         License as published by the Free Software
+ _;:,     .>    :=|.         This program is free software; you can
-�- . � .-<_> � � .<>         Foundation; either version 2 of the License,
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-� � �._= =} � � � :          or (at your option) any later version.
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-� � .%`+i> � � � _;_.
+.="- .-=="i,     .._         License as published by the Free Software
-� � .i_,=:_. � � �-<s.       This program is distributed in the hope that
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-� � �+ �. �-:. � � � =       it will be useful,  but WITHOUT ANY WARRANTY;
+     ._= =}       :          or (at your option) any later version.
-� � : .. � �.:, � � . . .    without even the implied warranty of
+    .%`+i>       _;_.
-� � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-� _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-..}^=.= � � � = � � � ;      Library General Public License for more
+    : ..    .:,     . . .    without even the implied warranty of
-++= � -. � � .` � � .:       details.
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-�: � � = �...= . :.=-
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-�-. � .:....=;==+<;          You should have received a copy of the GNU
+..}^=.=       =       ;      Library General Public License for more
-� -_. . . � )=. �=           General Public License along with
++=   -.     .`     .:       details.
-� � -- � � � �:-=`           this library; see the file COPYING.LIB.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef TASKEDITORSTATUS_H
 #define TASKEDITORSTATUS_H
 #include <opie2/opimtodo.h>
 #include <qdatetime.h>
 #include <qwidget.h>
 class DateBookMonth;
 class QCheckBox;
 class QComboBox;
 class QLabel;
 class QPushButton;
 class QToolButton;
 using namespace Opie;
 /**
 * This is the implementation of the Opie Task Editor Advanced tab
 * it features the State!
 *                 MaintainerMode
 *                 Description
 */
 class TaskEditorStatus : public QWidget
 {
    Q_OBJECT
 public:
    TaskEditorStatus( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
    ~TaskEditorStatus();
    QComboBox      *cmbStatus;
    QLabel         *txtMaintainer;
    QToolButton    *tbtMaintainer;
    QComboBox      *cmbMaintMode;
    QCheckBox      *ckbDue;
    QPushButton    *btnDue;
    QCheckBox      *ckbStart;
    QPushButton    *btnStart;
    QCheckBox      *ckbComp;
    QPushButton    *btnComp;
    QComboBox      *cmbProgress;
    /*
     * I could have a struct which returns a QWidget*
     * load and save to a OPimTodo
diff --git a/core/pim/todo/templatedialog.cpp b/core/pim/todo/templatedialog.cpp
index 8d72297..9821667 100644
--- a/core/pim/todo/templatedialog.cpp
+++ b/core/pim/todo/templatedialog.cpp
@@ -1,48 +1,78 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
 #include <opie2/odebug.h>
 #include <qpushbutton.h>
 #include <qhbox.h>
 #include <qlayout.h>
 #include <qlistview.h>
 #include <qlineedit.h>
 #include "templatedialog.h"
 using namespace Todo;
 /* TRANSLATOR Todo::TemplateDialog */
 TemplateDialog::TemplateDialog( QWidget* widget )
    : QDialog( widget, "TemplateDialog", TRUE )
 {
    setCaption( QWidget::tr("Template Editor") );
    m_main = new QVBoxLayout(this );
    m_list = new QListView( this );
    m_main->addWidget( m_list, 100 );
    m_lne = new QLineEdit( this );
    m_main->addWidget( m_lne );
    m_btnBar = new QHBox( this );
    m_add = new QPushButton( QWidget::tr("Add"), m_btnBar );
    m_edit = new QPushButton( QWidget::tr("Edit"), m_btnBar );
    m_rem = new QPushButton( QWidget::tr("Remove"), m_btnBar );
    m_main->addWidget( m_btnBar );
    connect(m_add,  SIGNAL(clicked() ),
            this,   SLOT(slotAdd() ) );
    connect(m_edit, SIGNAL(clicked() ),
            this,   SLOT(slotEdit() ) );
    connect(m_rem,  SIGNAL(clicked() ),
            this,   SLOT(slotRemove() ) );
    connect(m_lne, SIGNAL(returnPressed() ),
            this,   SLOT(slotReturn() ) );
 }
 TemplateDialog::~TemplateDialog() {
    // Qt does delete our widgets
 }
 QListView* TemplateDialog::listView() {
    return m_list;
diff --git a/core/pim/todo/templatedialog.h b/core/pim/todo/templatedialog.h
index 5886c34..8ed915b 100644
--- a/core/pim/todo/templatedialog.h
+++ b/core/pim/todo/templatedialog.h
@@ -1,44 +1,74 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
 #ifndef OPIE_TEMPLATE_DIALOG_H
 #define OPIE_TEMPLATE_DIALOG_H
 #include <qdialog.h>
 #include <qstring.h>
 class QListView;
 class QPushButton;
 class QLabel;
 class QHBox;
 class QVBoxLayout;
 class QLineEdit;
 namespace Todo {
    class TemplateDialog : public QDialog {
        Q_OBJECT
    public:
        /* it'll be modal */
        TemplateDialog( QWidget* parent );
        virtual ~TemplateDialog();
    protected:
        QListView* listView();
        QLineEdit* edit();
 private slots:
        virtual void slotAdd();
        virtual void slotRemove();
        virtual void slotEdit();
        virtual void slotReturn();
    private:
        QVBoxLayout* m_main;
        QHBox* m_btnBar;
        QListView* m_list;
        QLineEdit *m_lne;
        QPushButton* m_add;
        QPushButton* m_rem;
        QPushButton* m_edit;
    };
 }
 #endif
diff --git a/core/pim/todo/templatedialogimpl.cpp b/core/pim/todo/templatedialogimpl.cpp
index c9ad3d0..0d4090e 100644
--- a/core/pim/todo/templatedialogimpl.cpp
+++ b/core/pim/todo/templatedialogimpl.cpp
@@ -1,48 +1,78 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
 #include <qlineedit.h>
 #include "mainwindow.h"
 #include "todoeditor.h"
 #include "todotemplatemanager.h"
 #include "templatedialogimpl.h"
 using namespace Todo;
 /* TRANSLATOR Todo::TemplateDialogImpl */
 namespace {
    class TemplateListItem : public QListViewItem {
    public:
        TemplateListItem( QListView*,
                          const QString& name,
                          const OPimTodo& );
        ~TemplateListItem();
        OPimTodo event()const;
        QString text()const;
        void setText(const QString& str );
        void setEvent( const OPimTodo& );
    private:
        QString m_name;
        OPimTodo m_ev;
    };
    /* implementation */
    TemplateListItem::TemplateListItem( QListView* view,
                                        const QString& text,
                                        const OPimTodo& ev )
        : QListViewItem( view ), m_name( text ), m_ev( ev )
    {
        QListViewItem::setText(0, m_name );
    }
    TemplateListItem::~TemplateListItem() {}
    OPimTodo TemplateListItem::event() const {
        return m_ev;
    }
    QString TemplateListItem::text()const {
        return m_name;
    }
    void TemplateListItem::setText( const QString& str ) {
        QListViewItem::setText(0, str );
        m_name = str;
    }
diff --git a/core/pim/todo/templatedialogimpl.h b/core/pim/todo/templatedialogimpl.h
index cc78521..6affb7d 100644
--- a/core/pim/todo/templatedialogimpl.h
+++ b/core/pim/todo/templatedialogimpl.h
@@ -1,33 +1,63 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
 #ifndef OPIE_TEMPLATE_DIALOG_IMPL_H
 #define OPIE_TEMPLATE_DIALOG_IMPL_H
 #include <qlistview.h>
 #include <opie2/opimtodo.h>
 #include "templatedialog.h"
 namespace Todo {
    class MainWindow;
    class TemplateManager;
    class TemplateDialogImpl : public Todo::TemplateDialog {
        Q_OBJECT
    public:
        TemplateDialogImpl( MainWindow* win, TemplateManager* );
        ~TemplateDialogImpl();
    private:
        MainWindow* m_win;
        TemplateManager* m_man;
 private slots:
        void slotAdd();
        void slotRemove();
        void slotEdit();
        void slotReturn();
        void slotClicked(QListViewItem*);
    };
 };
 #endif
diff --git a/core/pim/todo/textviewshow.cpp b/core/pim/todo/textviewshow.cpp
index 01e5810..7d93efc 100644
--- a/core/pim/todo/textviewshow.cpp
+++ b/core/pim/todo/textviewshow.cpp
@@ -1,48 +1,78 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
 #include "textviewshow.h"
 using namespace Todo;
 TextViewShow::TextViewShow( QWidget* parent, MainWindow* win)
    : QTextView( parent ), TodoShow(win) {
 }
 TextViewShow::~TextViewShow() {
 }
 QString TextViewShow::type()const {
    return QString::fromLatin1("TextViewShow");
 }
 void TextViewShow::slotShow( const OPimTodo& ev ) {
    setText( ev.toRichText() );
 }
 QWidget* TextViewShow::widget() {
    return this;
 }
 void TextViewShow::keyPressEvent( QKeyEvent* event ) {
    switch( event->key() ) {
    case Qt::Key_Up:
        if ( ( visibleHeight() < contentsHeight() ) &&
             ( verticalScrollBar()->value() > verticalScrollBar()->minValue() ) )
            scrollBy( 0, -(visibleHeight()-20) );
        else
            showPrev();
        break;
    case Qt::Key_Down:
        if ( ( visibleHeight() < contentsHeight() ) &&
             ( verticalScrollBar()->value() < verticalScrollBar()->maxValue() ) )
            scrollBy( 0, visibleHeight()-20 );
        else
            showNext();
        break;
    case Qt::Key_Left:
    case Qt::Key_Right:
    case Qt::Key_F33:
    case Qt::Key_Enter:
    case Qt::Key_Return:
    case Qt::Key_Space:
        escapeView();
        break;
    default:
        QTextView::keyPressEvent( event );
        break;
    }
 }
diff --git a/core/pim/todo/textviewshow.h b/core/pim/todo/textviewshow.h
index cc31522..8278ef6 100644
--- a/core/pim/todo/textviewshow.h
+++ b/core/pim/todo/textviewshow.h
@@ -1,20 +1,50 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
 #include <qtextview.h>
 #include "todoshow.h"
 namespace Todo {
    class TextViewShow : public QTextView, public TodoShow {
    public:
        TextViewShow( QWidget* parent, MainWindow* );
        ~TextViewShow();
        QString type()const;
        void slotShow( const OPimTodo& ev );
        QWidget* widget();
    protected:
        void keyPressEvent( QKeyEvent* );
    };
 };
diff --git a/core/pim/todo/todoedit.h b/core/pim/todo/todoedit.h
index 4e89e93..a607eb2 100644
--- a/core/pim/todo/todoedit.h
+++ b/core/pim/todo/todoedit.h
@@ -1,17 +1,47 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
 #ifndef OPIE_TODO_EDIT_H
 #define OPIE_TODO_EDIT_H
 #include <opie2/opimtodo.h>
 namespace Todo {
    class Edit {
    public:
        Edit();
        virtual ~Edit();
        ToDoEvent newEvent( const OPimTodo& ) = 0;
        ToDoEvent editEvent( const OPimTodo& ) = 0;
    };
 };
 #endif
diff --git a/core/pim/todo/todoeditor.cpp b/core/pim/todo/todoeditor.cpp
index a1c559d..d4693a2 100644
--- a/core/pim/todo/todoeditor.cpp
+++ b/core/pim/todo/todoeditor.cpp
@@ -1,48 +1,78 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
 #include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
 #include "otaskeditor.h"
 #include "todoeditor.h"
 using namespace Opie;
 using namespace Todo;
 Editor::Editor() {
    m_accepted = false;
    m_self = 0l;
 }
 Editor::~Editor() {
    delete m_self;
    m_self = 0;
 }
 OPimTodo Editor::newTodo( int cur,
                           QWidget*) {
    OTaskEditor *e = self();
    e->setCaption( QObject::tr("Enter Task") );
    e->init( cur );
    int ret = QPEApplication::execDialog( e );
    if ( QDialog::Accepted == ret ) {
        m_accepted = true;
    }else
        m_accepted = false;
    OPimTodo ev = e->todo();
    ev.setUid(1);
    return ev;
 }
 OPimTodo Editor::edit( QWidget *,
                        const OPimTodo& todo ) {
    OTaskEditor *e = self();
    e->init( todo );
    e->setCaption( QObject::tr( "Edit Task" ) );
    int ret = QPEApplication::execDialog( e );
    OPimTodo ev = e->todo();
    if ( ret == QDialog::Accepted )
        m_accepted = true;
diff --git a/core/pim/todo/todoeditor.h b/core/pim/todo/todoeditor.h
index 1ac7f8a..c12824c 100644
--- a/core/pim/todo/todoeditor.h
+++ b/core/pim/todo/todoeditor.h
@@ -1,29 +1,59 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
 #ifndef OPIE_TODO_EDITOR_H
 #define OPIE_TODO_EDITOR_H
 #include <opie2/opimtodo.h>
 class OTaskEditor;
 namespace Todo {
    class Editor {
    public:
        Editor();
        ~Editor();
        Opie::OPimTodo newTodo( int currentCatId,
                           QWidget* par );
        Opie::OPimTodo edit( QWidget* par,
                             const Opie::OPimTodo& ev = Opie::OPimTodo() );
        bool accepted()const;
    protected:
        OTaskEditor* self();
    private:
        bool m_accepted: 1;
        OTaskEditor* m_self;
    };
 };
 #endif
diff --git a/core/pim/todo/todomanager.cpp b/core/pim/todo/todomanager.cpp
index fcd5f0e..2a9945d 100644
--- a/core/pim/todo/todomanager.cpp
+++ b/core/pim/todo/todomanager.cpp
@@ -1,74 +1,76 @@
 /*
-       =.            This file is part of the OPIE Project
+                             This file is part of the Opie Project
-      .=l.            Copyright (c)  2002 <>
-     .>+-=
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
-_;:,   .>  :=|.         This program is free software; you can
+              =.
-.> <`_,  > .  <=          redistribute it and/or  modify it under
+            .=l.
-:`=1 )Y*s>-.--  :           the terms of the GNU General Public
+           .>+-=
-.="- .-=="i,   .._         License as published by the Free Software
+ _;:,     .>    :=|.         This program is free software; you can
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-  ._= =}    :          or (at your option) any later version.
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-  .%`+i>    _;_.
+.="- .-=="i,     .._         License as published by the Free Software
-  .i_,=:_.   -<s.       This program is distributed in the hope that
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  + . -:.    =       it will be useful,  but WITHOUT ANY WARRANTY;
+     ._= =}       :          or (at your option) any later version.
-  : ..  .:,   . . .    without even the implied warranty of
+    .%`+i>       _;_.
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    .i_,=:_.      -<s.       This program is distributed in the hope that
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-..}^=.=    =    ;      Library General Public License for more
+    : ..    .:,     . . .    without even the implied warranty of
-++=  -.   .`   .:       details.
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-:   = ...= . :.=-
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-.  .:....=;==+<;          You should have received a copy of the GNU
+..}^=.=       =       ;      Library General Public License for more
- -_. . .  )=. =           Library General Public License along with
++=   -.     .`     .:       details.
-  --    :-=`           this library; see the file COPYING.LIB.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include <opie2/odebug.h>
 #include <qpe/categoryselect.h>
 #include "todomanager.h"
 using namespace Todo;
 TodoManager::TodoManager( QObject *obj )
    : QObject( obj ) {
    m_db = 0l;
    m_cat.load( categoryFileName() );
 }
 TodoManager::~TodoManager() {
    delete m_db;
 }
 OPimTodo TodoManager::event(int uid ) {
    return m_db->find( uid );
 }
 void TodoManager::updateList() {
    m_list = m_db->allRecords();
 }
 OPimTodoAccess::List TodoManager::list() const{
    return m_list;
 }
 OPimTodoAccess::List TodoManager::sorted( bool asc, int so, int f, int cat ) {
    return m_db->sorted( asc, so, f, cat );
 }
 OPimTodoAccess::List::Iterator TodoManager::overDue() {
    int filter = Opie::OPimTodoAccess::FilterCategory | Opie::OPimTodoAccess::OnlyOverDue;
    m_list = m_db->sorted(m_asc, m_sortOrder, filter,  m_ca );
    m_it = m_list.begin();
    return m_it;
 }
 OPimTodoAccess::List::Iterator TodoManager::fromTo( const QDate& start,
                                      const QDate& end ) {
    m_list = m_db->effectiveToDos( start, end );
    m_it = m_list.begin();
    return m_it;
 }
 OPimTodoAccess::List::Iterator TodoManager::query( const OPimTodo& ev, int query ) {
    m_list = m_db->queryByExample( ev, query );
    m_it = m_list.begin();
    return m_it;
 }
 OPimTodoAccess* TodoManager::todoDB() {
diff --git a/core/pim/todo/todomanager.h b/core/pim/todo/todomanager.h
index 865b47b..37c3a62 100644
--- a/core/pim/todo/todomanager.h
+++ b/core/pim/todo/todomanager.h
@@ -1,74 +1,76 @@
 /*
-� � � � � � � �=.            This file is part of the OPIE Project
+                             This file is part of the Opie Project
-� � � � � � �.=l.            Copyright (c)  2002 <>
-� � � � � �.>+-=
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
-�_;:, � � .> � �:=|.         This program is free software; you can
+              =.
-.> <`_, � > �. � <=          redistribute it and/or  modify it under
+            .=l.
-:`=1 )Y*s>-.-- � :           the terms of the GNU General Public
+           .>+-=
-.="- .-=="i, � � .._         License as published by the Free Software
+ _;:,     .>    :=|.         This program is free software; you can
-�- . � .-<_> � � .<>         Foundation; either version 2 of the License,
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-� � �._= =} � � � :          or (at your option) any later version.
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-� � .%`+i> � � � _;_.
+.="- .-=="i,     .._         License as published by the Free Software
-� � .i_,=:_. � � �-<s.       This program is distributed in the hope that
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-� � �+ �. �-:. � � � =       it will be useful,  but WITHOUT ANY WARRANTY;
+     ._= =}       :          or (at your option) any later version.
-� � : .. � �.:, � � . . .    without even the implied warranty of
+    .%`+i>       _;_.
-� � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-� _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-..}^=.= � � � = � � � ;      Library General Public License for more
+    : ..    .:,     . . .    without even the implied warranty of
-++= � -. � � .` � � .:       details.
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-�: � � = �...= . :.=-
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-�-. � .:....=;==+<;          You should have received a copy of the GNU
+..}^=.=       =       ;      Library General Public License for more
-� -_. . . � )=. �=           Library General Public License along with
++=   -.     .`     .:       details.
-� � -- � � � �:-=`           this library; see the file COPYING.LIB.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef OPIE_TODO_MANAGER_H
 #define OPIE_TODO_MANAGER_H
 #include <opie2/opimtodo.h>
 #include <opie2/otodoaccess.h>
 #include <qpe/categories.h>
 #include <qarray.h>
 #include <qobject.h>
 #include <qstring.h>
 #include "smalltodo.h"
 using Opie::OPimTodo;
 using Opie::OPimTodoAccess;
 namespace Todo {
    class TodoManager : public QObject{
        Q_OBJECT
    public:
        bool isLoaded()const;
        void load();
        TodoManager(QObject* obj = 0);
        ~TodoManager();
        QStringList categories()/*const*/;
        int catId(const QString&);
        OPimTodo event(int uid );
        void updateList();
        /** returns the iterator sorted if set sorted*/
        OPimTodoAccess::List list()const;
        OPimTodoAccess::List sorted( bool asc, int so, int f,  int cat );
        OPimTodoAccess::List::Iterator overDue();
        OPimTodoAccess::List::Iterator fromTo( const QDate& start,
                                 const QDate& end );
        OPimTodoAccess::List::Iterator query( const OPimTodo& ev, int query );
        void setCategory( bool sort, int category = -1);
        void setShowOverDue(  bool show );
        void setSortOrder( int sortOrder );
        void setSortASC( bool );
        void sort();
diff --git a/core/pim/todo/todoshow.cpp b/core/pim/todo/todoshow.cpp
index 5962028..268eb60 100644
--- a/core/pim/todo/todoshow.cpp
+++ b/core/pim/todo/todoshow.cpp
@@ -1,24 +1,53 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
 #include "mainwindow.h"
 #include "todoshow.h"
 using namespace Todo;
 TodoShow::TodoShow(MainWindow* win) {
    m_win = win;
 }
 TodoShow::~TodoShow() {
 }
 void TodoShow::escapeView() {
    if (m_win )
        m_win->slotReturnFromView();
 }
 void TodoShow::showNext() {
    if (m_win)
        m_win->slotShowNext();
 }
 void TodoShow::showPrev() {
    if (m_win)
        m_win->slotShowPrev();
 }
diff --git a/core/pim/todo/todoshow.h b/core/pim/todo/todoshow.h
index 1eeadf8..b3e0a1f 100644
--- a/core/pim/todo/todoshow.h
+++ b/core/pim/todo/todoshow.h
@@ -1,62 +1,65 @@
 /*
-� � � � � � � �=.            This file is part of the OPIE Project
+                             This file is part of the Opie Project
-� � � � � � �.=l.            Copyright (c)  2002 <>
-� � � � � �.>+-=
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
-�_;:, � � .> � �:=|.         This program is free software; you can
+              =.
-.> <`_, � > �. � <=          redistribute it and/or  modify it under
+            .=l.
-:`=1 )Y*s>-.-- � :           the terms of the GNU General Public
+           .>+-=
-.="- .-=="i, � � .._         License as published by the Free Software
+ _;:,     .>    :=|.         This program is free software; you can
-�- . � .-<_> � � .<>         Foundation; either version 2 of the License,
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-� � �._= =} � � � :          or (at your option) any later version.
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-� � .%`+i> � � � _;_.
+.="- .-=="i,     .._         License as published by the Free Software
-� � .i_,=:_. � � �-<s.       This program is distributed in the hope that
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-� � �+ �. �-:. � � � =       it will be useful,  but WITHOUT ANY WARRANTY;
+     ._= =}       :          or (at your option) any later version.
-� � : .. � �.:, � � . . .    without even the implied warranty of
+    .%`+i>       _;_.
-� � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-� _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-..}^=.= � � � = � � � ;      Library General Public License for more
+    : ..    .:,     . . .    without even the implied warranty of
-++= � -. � � .` � � .:       details.
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-�: � � = �...= . :.=-
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-�-. � .:....=;==+<;          You should have received a copy of the GNU
+..}^=.=       =       ;      Library General Public License for more
-� -_. . . � )=. �=           Library General Public License along with
++=   -.     .`     .:       details.
-� � -- � � � �:-=`           this library; see the file COPYING.LIB.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef TODO_TODO_SHOW_H
 #define TODO_TODO_SHOW_H
 #include <qstring.h>
 #include <qwidget.h>
 #include <opie2/opimtodo.h>
 using Opie::OPimTodo;
 namespace Todo {
    class MainWindow;
    /**
     * TodoShow is the baseclass of
     * of all TodoShows.
     * The first implementation is a QTextView
     * implementation showing the Todo as richtext
     */
    class TodoShow {
    public:
        TodoShow( MainWindow* win);
        virtual ~TodoShow();
        virtual QString type()const = 0;
        virtual void slotShow( const OPimTodo& ev ) = 0;
        virtual QWidget* widget() = 0;
    protected:
        void escapeView();
        void showNext();
        void showPrev();
    private:
        MainWindow *m_win;
    };
 };
 #endif
diff --git a/core/pim/todo/todotemplate.h b/core/pim/todo/todotemplate.h
index 9575737..69ec6dd 100644
--- a/core/pim/todo/todotemplate.h
+++ b/core/pim/todo/todotemplate.h
@@ -1,11 +1,40 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
 #ifndef OPIE_TODO_TEMPLATE_H
 #define OPIE_TODO_TEMPLATE_H
 namespace Todo {
 };
 #endif
diff --git a/core/pim/todo/todotemplatemanager.cpp b/core/pim/todo/todotemplatemanager.cpp
index 7690d37..892ad0d 100644
--- a/core/pim/todo/todotemplatemanager.cpp
+++ b/core/pim/todo/todotemplatemanager.cpp
@@ -1,48 +1,78 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
 #include <opie2/odebug.h>
 #include <opie2/otodoaccess.h>
 #include <opie2/otodoaccessxml.h>
 #include <qpe/config.h>
 #include <qpe/global.h>
 #include "todotemplatemanager.h"
 using namespace Todo;
 TemplateManager::TemplateManager() {
    m_path =  Global::applicationFileName("todolist", "templates.xml");
 }
 TemplateManager::~TemplateManager() {
    save();
 }
 void TemplateManager::load() {
    Config conf("todolist_templates");
    OPimTodoAccessXML *xml = new OPimTodoAccessXML( QString::fromLatin1("template"),
                                                m_path );
    OPimTodoAccess todoDB(xml );
    todoDB.load();
    OPimTodoAccess::List::Iterator it;
    OPimTodoAccess::List list = todoDB.allRecords();
    for ( it = list.begin(); it != list.end(); ++it ) {
        OPimTodo ev = (*it);
        conf.setGroup( QString::number( ev.uid() ) );
        QString str = conf.readEntry("Name", QString::null );
        if (str.isEmpty() )
            continue;
        m_templates.insert( str, ev );
    }
 }
 void TemplateManager::save() {
    Config conf("todolist_templates");
    OPimTodoAccessXML *res = new OPimTodoAccessXML( "template",
                                                m_path );
    OPimTodoAccess db(res);
    db.load();
    db.clear();
    QMap<QString, OPimTodo>::Iterator it;
diff --git a/core/pim/todo/todotemplatemanager.h b/core/pim/todo/todotemplatemanager.h
index ee8aaaf..8601ee8 100644
--- a/core/pim/todo/todotemplatemanager.h
+++ b/core/pim/todo/todotemplatemanager.h
@@ -1,33 +1,63 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
 #ifndef OPIE_TODO_TEMPLATE_H
 #define OPIE_TODO_TEMPLATE_H
 #include <opie2/opimtodo.h>
 #include <qstring.h>
 #include <qmap.h>
 using namespace Opie;
 namespace Todo {
    class TemplateManager {
    public:
        TemplateManager();
        ~TemplateManager();
        void load();
        void save();
        QStringList templates()const;
        OPimTodo templateEvent( const QString& templateName );
        /* also replaces one */
        void addEvent( const QString&, const OPimTodo& );
        void removeEvent( const QString& );
    private:
        QString m_path;
        QMap<QString, OPimTodo> m_templates;
    };
 };
 #endif
diff --git a/core/pim/todo/todoview.cpp b/core/pim/todo/todoview.cpp
index 3d2c982..937fbd1 100644
--- a/core/pim/todo/todoview.cpp
+++ b/core/pim/todo/todoview.cpp
@@ -1,48 +1,78 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
 #include "mainwindow.h"
 #include <opie2/odebug.h>
 #include "todoview.h"
 using namespace Todo;
 TodoView::TodoView( MainWindow* win )
    : m_main( win )
 {
    m_asc = false;
    m_sortOrder = -1;
 }
 TodoView::~TodoView() {
 };
 MainWindow* TodoView::todoWindow() {
    return m_main;
 }
 OPimTodo TodoView::event(int uid ) {
    return m_main->event( uid );
 }
 OPimTodoAccess::List TodoView::list(){
    todoWindow()->updateList();
    return todoWindow()->list();
 }
 OPimTodoAccess::List TodoView::sorted()const{
    return m_sort;
 }
 void TodoView::sort() {
    m_sort = todoWindow()->sorted(m_asc,m_sortOrder );
    owarn << "m_sort.count() = " << m_sort.count() << oendl;
 }
 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 ) {
    owarn << "setAscending " << b << oendl;
    m_asc = b;
 }
 void TodoView::update(int, const SmallTodo&  ) {
diff --git a/core/pim/todo/todoview.h b/core/pim/todo/todoview.h
index a5ea9f5..6e840e1 100644
--- a/core/pim/todo/todoview.h
+++ b/core/pim/todo/todoview.h
@@ -1,74 +1,76 @@
 /*
-� � � � � � � �=.            This file is part of the OPIE Project
+                             This file is part of the Opie Project
-� � � � � � �.=l.            Copyright (c)  2002 <>
-� � � � � �.>+-=
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
-�_;:, � � .> � �:=|.         This program is free software; you can
+              =.
-.> <`_, � > �. � <=          redistribute it and/or  modify it under
+            .=l.
-:`=1 )Y*s>-.-- � :           the terms of the GNU General Public
+           .>+-=
-.="- .-=="i, � � .._         License as published by the Free Software
+ _;:,     .>    :=|.         This program is free software; you can
-�- . � .-<_> � � .<>         Foundation; either version 2 of the License,
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-� � �._= =} � � � :          or (at your option) any later version.
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-� � .%`+i> � � � _;_.
+.="- .-=="i,     .._         License as published by the Free Software
-� � .i_,=:_. � � �-<s.       This program is distributed in the hope that
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-� � �+ �. �-:. � � � =       it will be useful,  but WITHOUT ANY WARRANTY;
+     ._= =}       :          or (at your option) any later version.
-� � : .. � �.:, � � . . .    without even the implied warranty of
+    .%`+i>       _;_.
-� � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-� _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-..}^=.= � � � = � � � ;      Library General Public License for more
+    : ..    .:,     . . .    without even the implied warranty of
-++= � -. � � .` � � .:       details.
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-�: � � = �...= . :.=-
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-�-. � .:....=;==+<;          You should have received a copy of the GNU
+..}^=.=       =       ;      Library General Public License for more
-� -_. . . � )=. �=           Library General Public License along with
++=   -.     .`     .:       details.
-� � -- � � � �:-=`           this library; see the file COPYING.LIB.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef TODO_VIEW_H
 #define TODO_VIEW_H
 #include <qarray.h>
 #include <qstring.h>
 #include <qvaluelist.h>
 #include <qwidget.h>
 #include <opie2/otodoaccess.h>
 #include "smalltodo.h"
 using Opie::OPimTodo;
 using Opie::OPimTodoAccess;
 namespace Todo {
    class MainWindow;
    /**
     * due to inheretince problems we need this base class
     */
    struct ViewBase {
    public:
        virtual QWidget* widget() = 0;
        virtual QString type()const = 0;
        virtual int current() = 0;
        virtual QString currentRepresentation() = 0;
        virtual void showOverDue( bool ) = 0;
        /**
         * the next record in the view or 0 if none is there
         */
        virtual int next()  = 0;
        /**
         * the previous record or 0 if none is there..
         */
        virtual int prev()  = 0;
        /*
         * update the view
         */
        virtual void updateView() = 0;
        virtual void addEvent( const OPimTodo& ) = 0;
        virtual void replaceEvent( const OPimTodo& ) = 0;