Update TODO

Update todoevent.cpp I almost forgot about this
\n -> <br> inside the RichText

remove oconfig cause it was bogus. We can achieve the same
with Config(path, Config::File );

5 files changed, 3 insertions, 103 deletions

diff --git a/libopie/TODO b/libopie/TODO
index d49910c..98baf72 100644
--- a/libopie/TODO
+++ b/libopie/TODO
@@ -1,20 +1,13 @@
 - xmltree done
 
 - tododb
    - set Alarms
-   - multiple categories
-   - Attendees
    
 - OFileSelector
-   - fix the weird view change bug delete m_pseudoLayout crash
    - DocLnk when not in Document Mode ( and vice versa )
    - MultipleDocuments
-   - TreeView have a own OFileSelectorItem for this
-   - IconView add a QIconView to the widgetstack
    - Move OFileSelectorItem to it's own files
-   - add functions to access the member variables
-   - debug
    - new Dirs created inside the listview
    
 - Clickable labels?
    Harlekin you wanted them in the libs?
\ No newline at end of file
diff --git a/libopie/libopie.pro b/libopie/libopie.pro
index b19426e..b2ecd07 100644
--- a/libopie/libopie.pro
+++ b/libopie/libopie.pro
@@ -1,8 +1,8 @@
 TEMPLATE        = lib
 CONFIG          += qte warn_on release
-        HEADERS = ofontmenu.h ofileselector.h ofiledialog.h tododb.h todoevent.h todoresource.h todovcalresource.h xmltree.h oconfig.h colordialog.h colorpopupmenu.h
-        SOURCES         = ofontmenu.cc ofileselector.cc ofiledialog.cc xmltree.cc tododb.cpp todoevent.cpp todovcalresource.cpp oconfig.cpp colordialog.cpp colorpopupmenu.cpp
+        HEADERS = ofontmenu.h ofileselector.h ofiledialog.h tododb.h todoevent.h todoresource.h todovcalresource.h xmltree.h  colordialog.h colorpopupmenu.h
+        SOURCES         = ofontmenu.cc ofileselector.cc ofiledialog.cc xmltree.cc tododb.cpp todoevent.cpp todovcalresource.cpp  colordialog.cpp colorpopupmenu.cpp
         TARGET  = opie
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR         = $(QTDIR)/lib$(PROJMAK)
 #VERSION = 1.0.0
diff --git a/libopie/oconfig.cpp b/libopie/oconfig.cpp
deleted file mode 100644
index d051d54..0000000
--- a/libopie/oconfig.cpp
+++ b/dev/null
@@ -1,45 +0,0 @@
-/*
-               =.            This file is part of the OPIE Project
-             .=l.            Copyright (c)  2002 Holger Freyther <freyther@kde.org>
-           .>+-=
- _;:,     .>    :=|.         This library 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 library 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 <opie/oconfig.h>
-
-OConfig::OConfig(const QString &file) 
-  : Config("tmpopie" )
-{
-  filename = file;
-  read();
-}
-OConfig::~OConfig()
-{
-  // Config will write the file for us
-}
-QString OConfig::fileName() const
-{
-  return filename;
-}
-
diff --git a/libopie/oconfig.h b/libopie/oconfig.h
deleted file mode 100644
index f6227d1..0000000
--- a/libopie/oconfig.h
+++ b/dev/null
@@ -1,48 +0,0 @@
-/*
-               =.            This file is part of the OPIE Project
-             .=l.            Copyright (c)  2002 Holger 'zecke' Freyther<freyther@kde.org>
-           .>+-=
- _;:,     .>    :=|.         This library 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 library 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 <qpe/config.h>
-
-#ifndef opieconfig_h
-#define opieconfig_h
-
-/** It supports all Config items + it lets you decide
- *  which file to use.
- */
-
-class OConfig : public Config {
- public:
-  OConfig( const QString &filename );
-  ~OConfig();
-  QString fileName() const;
-  void read( ) { Config::read(); };
-};
-
-#endif
-
diff --git a/libopie/todoevent.cpp b/libopie/todoevent.cpp
index 5537b77..b820150 100644
--- a/libopie/todoevent.cpp
+++ b/libopie/todoevent.cpp
@@ -1,235 +1,235 @@
 
 #include <opie/todoevent.h>
 
 
 #include <qpe/palmtopuidgen.h>
 #include <qpe/stringutil.h>
 #include <qpe/palmtoprecord.h>
 
 #include <qpe/stringutil.h>
 #include <qpe/categories.h>
 #include <qpe/categoryselect.h>
 
 #include <qobject.h>
 
 ToDoEvent::ToDoEvent(const ToDoEvent &event )
 {
   *this = event;
 }
 
 ToDoEvent::ToDoEvent(bool completed, int priority, const QStringList &category, 
                const QString &description, bool hasDate, QDate date, int uid )
 {
     m_date = date;
     m_isCompleted = completed;
     m_hasDate = hasDate;
     m_priority = priority;
     m_category = category;
     m_desc = Qtopia::simplifyMultiLineSpace(description );
     if (uid == -1 ) {
         Qtopia::UidGen *uidgen = new Qtopia::UidGen();
         uid = uidgen->generate();
         delete uidgen;
     }// generate the ids
     m_uid = uid; 
 }
 QArray<int> ToDoEvent::categories()const
 {
   QArray<int> array(m_category.count() ); // currently the datebook can be only in one category
     array = Qtopia::Record::idsFromString( m_category.join(";") );
   return array;
 }
 bool ToDoEvent::match( const QRegExp &regExp )const
 {
   if( QString::number( m_priority ).find( regExp ) != -1 ){
     return true;
   }else if( m_hasDate && m_date.toString().find( regExp) != -1 ){
     return true;
   }else if(m_desc.find( regExp ) != -1 ){
     return true;
   }
   return false;
 }
 bool ToDoEvent::isCompleted() const
 {
     return m_isCompleted;
 }
 bool ToDoEvent::hasDate() const
 {
     return m_hasDate;
 }
 int ToDoEvent::priority()const
 {
     return m_priority;
 }
 QStringList ToDoEvent::allCategories()const
 {
     return m_category;
 }
 void ToDoEvent::insertCategory(const QString &str )
 {
   m_category.append( str );
 }
 void ToDoEvent::clearCategories()
 {
   m_category.clear();
 }
 void ToDoEvent::setCategories(const QStringList &list )
 {
   m_category = list;
 }
 QDate ToDoEvent::date()const
 {
     return m_date;
 }
 
 QString ToDoEvent::description()const
 {
     return m_desc;
 }
 void ToDoEvent::setCompleted( bool completed )
 {
     m_isCompleted = completed;
 }
 void ToDoEvent::setHasDate( bool hasDate )
 {
     m_hasDate = hasDate;
 }
 void ToDoEvent::setDescription(const QString &desc )
 {
     m_desc = Qtopia::simplifyMultiLineSpace(desc );
 }
 void ToDoEvent::setCategory( const QString &cat )
 {
   qWarning("setCategory %s", cat.latin1() );
   m_category.clear();
   m_category << cat;
 }
 void ToDoEvent::setPriority(int prio )
 {
     m_priority = prio;
 }
 void ToDoEvent::setDate( QDate date )
 {
     m_date = date;
 }
 bool ToDoEvent::isOverdue( )
 {
     if( m_hasDate )
         return QDate::currentDate() > m_date;
     return false;
 }
 
 /*!
   Returns a richt text string
 */
 QString ToDoEvent::richText() const
 {
   QString text;
   QStringList catlist;
   
   // Description of the todo
   if ( !description().isEmpty() ){
     text += "<b>" + QObject::tr( "Description:" ) + "</b><br>";
-    text += Qtopia::escapeString(description() ) + "<br>";
+    text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) + "<br>";
   }
   text += "<b>" + QObject::tr( "Priority:") +" </b>"
     +  QString::number( priority() ) + "<br>";
   if (hasDate() ){
     text += "<b>" + QObject::tr( "Deadline:") + " </b>";
     text += date().toString();
     text += "<br>";
   }
   
   // Open database of all categories and get the list of
   // the categories this todoevent belongs to.
   // Then print them...
   // I am not sure whether there is no better way doing this !?
   Categories catdb;
   catdb.load( categoryFileName() );
   catlist = allCategories();
   
   text += "<b>" + QObject::tr( "Category:") + "</b> ";
   for ( QStringList::Iterator it = catlist.begin(); it != catlist.end(); ++it ) {
     text += catdb.label ("todo", (*it).toInt());
   }
   text += "<br>";
   return text;
 }
 
 bool ToDoEvent::operator<( const ToDoEvent &toDoEvent )const{
     if( !hasDate() && !toDoEvent.hasDate() ) return true;
     if( !hasDate() && toDoEvent.hasDate() ) return true;
     if( hasDate() && toDoEvent.hasDate() ){
         if( date() == toDoEvent.date() ){ // let's the priority decide
             return priority() < toDoEvent.priority();
         }else{
             return date() < toDoEvent.date();
         }
     }
     return false;
 }
 bool ToDoEvent::operator<=(const ToDoEvent &toDoEvent )const
 {
     if( !hasDate() && !toDoEvent.hasDate() ) return true;
     if( !hasDate() && toDoEvent.hasDate() ) return true;
     if( hasDate() && toDoEvent.hasDate() ){
         if( date() == toDoEvent.date() ){ // let's the priority decide
             return priority() <= toDoEvent.priority();
         }else{
             return date() <= toDoEvent.date();
         }
     }
     return true;
 }
 bool ToDoEvent::operator>(const ToDoEvent &toDoEvent )const
 {
     if( !hasDate() && !toDoEvent.hasDate() ) return false;
     if( !hasDate() && toDoEvent.hasDate() ) return false;
     if( hasDate() && toDoEvent.hasDate() ){
         if( date() == toDoEvent.date() ){ // let's the priority decide
             return priority() > toDoEvent.priority();
         }else{
             return date() > toDoEvent.date();
         }
     }
     return false;
 }
 bool ToDoEvent::operator>=(const ToDoEvent &toDoEvent )const
 {
     if( !hasDate() && !toDoEvent.hasDate() ) return true;
     if( !hasDate() && toDoEvent.hasDate() ) return false;
     if( hasDate() && toDoEvent.hasDate() ){
         if( date() == toDoEvent.date() ){ // let's the priority decide
             return priority() > toDoEvent.priority();
         }else{
             return date() > toDoEvent.date();
         }
     }
     return true;
 }
 bool ToDoEvent::operator==(const ToDoEvent &toDoEvent )const
 {
     if( m_date == toDoEvent.m_date && m_isCompleted == toDoEvent.m_isCompleted && m_hasDate == toDoEvent.m_hasDate && m_priority == toDoEvent.m_priority && m_category == toDoEvent.m_category && m_desc == toDoEvent.m_desc )
         return true;
     return false;
 }
 ToDoEvent &ToDoEvent::operator=(const ToDoEvent &item )
 {
     m_date = item.m_date;
     m_isCompleted = item.m_isCompleted;
     m_hasDate = item.m_hasDate;
     m_priority = item.m_priority;
     m_category = item.m_category;
     m_desc = item.m_desc;
     m_uid = item.m_uid;
     return *this;
 }