summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie/TODO7
-rw-r--r--libopie/libopie.pro4
-rw-r--r--libopie/oconfig.cpp45
-rw-r--r--libopie/oconfig.h48
-rw-r--r--libopie/todoevent.cpp2
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
@@ -128,13 +128,13 @@ 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();