48 files changed, 678 insertions, 263 deletions
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 34bf7f1..6819085 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -1,23 +1,22 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2003 Stefan Eilers (eilers.stefan@epost.de)
 **
-** This file is part of Qt Palmtop Environment.
+** This file is part of the Open Palmtop Environment (see www.opie.info).
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
-** OContact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
 **
 **********************************************************************/
 #define QTOPIA_INTERNAL_FD
 #include "contacteditor.h"
@@ -110,18 +109,18 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
        listTools = new QPEToolBar( this, "list operations" );
        listTools->setHorizontalStretchable( true );
        addToolBar( listTools );
        moveToolBar( listTools, m_config.getToolBarPos() );
        // View Icons
-        m_tableViewButton  = new QAction( tr( "List" ), Resource::loadPixmap( "addressbook/weeklst" ),
+        m_tableViewButton  = new QAction( tr( "List" ), Resource::loadPixmap( "addressbook/listview" ),
                                          QString::null, 0, this, 0 );
        connect( m_tableViewButton, SIGNAL( activated() ), this, SLOT( slotListView() ) );
        m_tableViewButton->setToggleAction( true );
        m_tableViewButton->addTo( listTools );
-        m_cardViewButton = new QAction( tr( "Card" ), Resource::loadPixmap( "day" ),  QString::null, 0, this, 0 );
+        m_cardViewButton = new QAction( tr( "Card" ), Resource::loadPixmap( "addressbook/cardview" ),  QString::null, 0, this, 0 );
        connect( m_cardViewButton, SIGNAL( activated() ), this, SLOT( slotCardView() ) );
        m_cardViewButton->setToggleAction( true );
        m_cardViewButton->addTo( listTools );
        listTools->addSeparator();
@@ -649,13 +648,15 @@ static void parseName( const QString& name, QString *first, QString *middle,
 }
 void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 {
-        qWarning("Receiving QCop-Call with message %s", QString( msg ).latin1() );
+        bool needShow = FALSE;
+        qWarning("Receiving QCop-Call with message %s", QString( msg ).latin1() );
        if (msg == "editPersonal()") {
                editPersonal();
        } else if (msg == "editPersonalAndClose()") {
                editPersonal();
                close();
@@ -686,12 +687,13 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
                Ir *ir = new Ir( this );
                connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
                QString description = "mycard.vcf";
                ir->send( beamFilename, description, "text/x-vCard" );
        } else if ( msg == "show(int)" ) {
+                raise();
                QDataStream stream(data,IO_ReadOnly);
                int uid;
                stream >> uid;
                qWarning( "Showing uid: %d" , uid );
@@ -702,15 +704,15 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
                }
                // Reset category and show as card..
                m_abView -> setShowByCategory( QString::null );
                m_abView -> setCurrentUid( uid );
                slotViewSwitched ( AbView::CardView );
-                
-                showMaximized();
+                needShow = true;
-                qApp->exec();
        } else if ( msg == "edit(int)" ) {
                QDataStream stream(data,IO_ReadOnly);
                int uid;
                stream >> uid;
@@ -721,13 +723,16 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
                }
                // Reset category and edit..
                m_abView -> setShowByCategory( QString::null );
                m_abView -> setCurrentUid( uid );
                slotViewEdit();
-        } 
+        }
+        if (needShow)
+            QPEApplication::setKeepRunning();
 }
 void AddressbookWindow::editEntry( EntryMode entryMode )
 {
        OContact entry;
@@ -897,13 +902,13 @@ void AddressbookWindow::slotSave()
 void AddressbookWindow::slotNotFound()
 {
        qWarning("Got notfound signal!");
        QMessageBox::information( this, tr( "Not Found" ),
-                                  tr( "Unable to find a contact for this \n search pattern!" ) );
+                                 "<qt>" + tr( "Unable to find a contact for this search pattern!" ) + "</qt>" );
 }
 void AddressbookWindow::slotWrapAround()
 {
        qWarning("Got wrap signal!");
@@ -947,13 +952,13 @@ void AddressbookWindow::slotSetCategory( int c )
        //                      book = tr( "Personal" );
        //                      view = AbView:: PersonalView;
                        }else if ( i == 3 ){ // default All Categories
                                cat = QString::null;
                        }else if ( i == (unsigned int)catMenu->count() - 1 ){ // last menu option (seperator is counted, too) will be Unfiled
                                cat = "Unfiled";
-                                qWarning ("Unfiled selected!!!");
+                                qWarning ("Unfiled selected!");
                        }else{
                                cat = m_abView->categories()[i - 4];
                        }
                }
        }
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index ce14f98..9d1a1c7 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -594,13 +594,13 @@ void ContactEditor::init() {
        QMap<int, QString> mapIdToStr = OContactFields::idToTrFields();
        for (i = counter; it != slDynamicEntries.end(); i++, ++it ) {
          
          if (((*it) == "Anniversary") || 
              ((*it) == "Birthday")|| ((*it) == "Gender")) continue;
-          l = new QLabel( mapIdToStr[mapStrToID[*it]].utf8() , container );
+          l = new QLabel( mapIdToStr[mapStrToID[*it]], container );
                listName.append( l );
                gl->addWidget( l, i, 0 );
                QLineEdit *e = new QLineEdit( container );
                listValue.append( e );
                gl->addWidget( e, i, 1);
        }
diff --git a/core/pim/addressbook/opie-addressbook.control b/core/pim/addressbook/opie-addressbook.control
index f06fa91..d949bd4 100644
--- a/core/pim/addressbook/opie-addressbook.control
+++ b/core/pim/addressbook/opie-addressbook.control
@@ -1,11 +1,11 @@
 Package: opie-addressbook
-Files: bin/addressbook apps/1Pim/addressbook.desktop pics/addressbook/*.png
+Files: bin/addressbook apps/1Pim/addressbook.desktop
 Priority: optional
 Section: opie/applications
 Conflicts: qpe-tkcaddressbook
 Maintainer: Stefan Eilers <eilers.stefan@epost.de>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
+Depends: task-opie-minimal, libopie1, opie-pics
-Depends: task-opie-minimal, libopie1
 Description: Contacts
 A simple addressbook for the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/addressbook/version.h b/core/pim/addressbook/version.h
index 4c93584..9621826 100644
--- a/core/pim/addressbook/version.h
+++ b/core/pim/addressbook/version.h
@@ -1,10 +1,10 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
-#define MAINVERSION  "0"
+#define MAINVERSION  "1"
-#define SUBVERSION   "9"
+#define SUBVERSION   "0"
-#define PATCHVERSION "5"
+#define PATCHVERSION "0"
 #define APPNAME "OPIE_ADDRESSBOOK"
 #endif
diff --git a/libopie/pim/obackendfactory.h b/libopie/pim/obackendfactory.h
index ad6cf5a..f3c339d 100644
--- a/libopie/pim/obackendfactory.h
+++ b/libopie/pim/obackendfactory.h
@@ -13,12 +13,20 @@
 * ToDo: Use plugins
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.7  2003/08/01 12:30:16  eilers
+ * Merging changes from BRANCH_1_0 to HEAD
+ *
+ * Revision 1.6.4.1  2003/06/30 14:34:19  eilers
+ * Patches from Zecke:
+ * Fixing and cleaning up extraMap handling
+ * Adding d_ptr for binary compatibility in the future
+ *
 * Revision 1.6  2003/04/13 18:07:10  zecke
 * More API doc
 * QString -> const QString&
 * QString = 0l -> QString::null
 *
 * Revision 1.5  2003/02/21 23:31:52  zecke
@@ -65,12 +73,14 @@
 #include "odatebookaccessbackend_xml.h"
 #ifdef __USE_SQL
 #include "otodoaccesssql.h"
 #endif
+class OBackendPrivate;
 /**
 * This class is our factory. It will give us the default implementations
 * of at least Todolist, Contacts and Datebook. In the future this class will
 * allow users to switch the backend with ( XML->SQLite ) without the need
 * to recompile.#
 * This class as the whole PIM Api is making use of templates
@@ -145,10 +155,12 @@ class OBackendFactory
                default:
                        return NULL;
                }
        }
+    private:
+        OBackendPrivate* d;
 };
 #endif
diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp
index be4ce0a..3473baa 100644
--- a/libopie/pim/ocontact.cpp
+++ b/libopie/pim/ocontact.cpp
@@ -18,16 +18,17 @@
 **********************************************************************/
 #define QTOPIA_INTERNAL_CONTACT_MRE
 #include "ocontact.h"
 #include "opimresolver.h"
+#include "oconversion.h"
 #include <qpe/stringutil.h>
-#include "oconversion.h"
 #include <qpe/timestring.h>
+#include <qpe/config.h>
 #include <qobject.h>
 #include <qregexp.h>
 #include <qstylesheet.h>
 #include <qfileinfo.h>
 #include <qmap.h>
@@ -435,208 +436,280 @@ QString OContact::toRichText() const
 {
    QString text;
    QString value, comp, state;
    QString str;
    bool marker = false;
+    Config cfg("qpe");
+    cfg.setGroup("Appearance");
+    int addressformat = cfg.readNumEntry( "AddressFormat", Zip_City_State );
    // name, jobtitle and company
    if ( !(value = fullName()).isEmpty() )
-        text += "<b><h3><img src=\"addressbook/AddressBook\">" + Qtopia::escapeString(value) + "</h3></b>";
+        text += "<b><h3><img src=\"addressbook/AddressBook\"> " + Qtopia::escapeString(value) + "</h3></b>";
+    
    if ( !(value = jobTitle()).isEmpty() )
-        text += Qtopia::escapeString(value) + "<br>";
+        text += Qtopia::escapeString(value);
    comp = company();
    if ( !(value = department()).isEmpty() ) {
        text += Qtopia::escapeString(value);
        if ( comp )
            text += ", ";
        else
            text += "<br>";
    }
    if ( !comp.isEmpty() )
-        text += Qtopia::escapeString(comp) + "<br>";
+        text += Qtopia::escapeString(comp);
-    text += "<hr><br>";
+    text += "<br><hr>";
    // defailt email
    QString defEmail = defaultEmail();
-    if ( !defEmail.isEmpty() )
+    if ( !defEmail.isEmpty() ){
-        text += "<b><img src=\"addressbook/email\">" + QObject::tr("Default Email: ") + "</b>"
+        text += "<b><img src=\"addressbook/email\"> " + QObject::tr("Default Email: ") + "</b>"
-                + Qtopia::escapeString(defEmail) + "<br>";
+                + Qtopia::escapeString(defEmail);
+        marker = true;
-    text += "<br>";
+    }
    // business address
    if ( !businessStreet().isEmpty() || !businessCity().isEmpty() ||
         !businessZip().isEmpty() || !businessCountry().isEmpty() ) {
-        text += QObject::tr( "<b>Work Address:</b>" );
+        text += QObject::tr( "<br><br><b>Work Address:</b>" );
-        text +=  "<br>";
        marker = true;
    }
-    if ( !(value = businessStreet()).isEmpty() )
+    if ( !(value = businessStreet()).isEmpty() ){
-        text += Qtopia::escapeString(value) + "<br>";
+            text += "<br>" + Qtopia::escapeString(value);
-    state =  businessState();
+            marker = true;
-    if ( !(value = businessZip()).isEmpty() )
+    }
-        text += Qtopia::escapeString(value) + " ";
-    if ( !(value = businessCity()).isEmpty() ) {
+    switch( addressformat ){
-        text += Qtopia::escapeString(value);
+    case Zip_City_State:{ //  Zip_Code City, State
-        if ( state )
+            state =  businessState();
-            text += ", " + Qtopia::escapeString(state);
+            if ( !(value = businessZip()).isEmpty() ){
-        text += "<br>";
+                    text += "<br>" + Qtopia::escapeString(value) + " ";
-    } else if ( !state.isEmpty() )
+                    marker = true;
-        text += Qtopia::escapeString(state) + "<br>";
+                    
+            } else
+                    text += "<br>";
+            if ( !(value = businessCity()).isEmpty() ) {
+                    marker = true;
+                    text += Qtopia::escapeString(value);
+                    if ( state )
+                            text += ", " + Qtopia::escapeString(state);
+            } else if ( !state.isEmpty() ){
+                    text += "<br>" + Qtopia::escapeString(state);
+                    marker = true;
+            }
+            break;
+    }
+    case City_State_Zip:{ // City, State Zip_Code 
+            state =  businessState();
+            if ( !(value = businessCity()).isEmpty() ) {
+                    marker = true;
+                    text += "<br>" + Qtopia::escapeString(value);
+                    if ( state )
+                            text += ", " + Qtopia::escapeString(state);
+            } else if ( !state.isEmpty() ){
+                    text += "<br>" + Qtopia::escapeString(state);
+                    marker = true;
+            }
+            if ( !(value = businessZip()).isEmpty() ){
+                    text += " " + Qtopia::escapeString(value);
+                    marker = true;
+            }
+            break;
+    }
+    }
-    if ( !(value = businessCountry()).isEmpty() )
+    if ( !(value = businessCountry()).isEmpty() ){
-        text += Qtopia::escapeString(value) + "<br>";
+        text += "<br>" + Qtopia::escapeString(value);
+        marker = true;
+    }
    // rest of Business data
    str = office();
    if ( !str.isEmpty() ){
-        text += "<b>" + QObject::tr("Office: ") + "</b>"
+        text += "<br><b>" + QObject::tr("Office: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
        marker = true;
    }
    str = businessWebpage();
    if ( !str.isEmpty() ){
-        text += "<b><img src=\"addressbook/webpagework\">" + QObject::tr("Business Web Page: ") + "</b>"
+        text += "<br><b><img src=\"addressbook/webpagework\"> " + QObject::tr("Business Web Page: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
        marker = true;
    }
    str = businessPhone();
    if ( !str.isEmpty() ){
-        text += "<b><img src=\"addressbook/phonework\">" + QObject::tr("Business Phone: ") + "</b>"
+        text += "<br><b><img src=\"addressbook/phonework\"> " + QObject::tr("Business Phone: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
        marker = true;
    }
    str = businessFax();
    if ( !str.isEmpty() ){
-        text += "<b><img src=\"addressbook/faxwork\">" + QObject::tr("Business Fax: ") + "</b>"
+        text += "<br><b><img src=\"addressbook/faxwork\"> " + QObject::tr("Business Fax: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
        marker = true;
    }
    str = businessMobile();
    if ( !str.isEmpty() ){
-        text += "<b><img src=\"addressbook/mobilework\">" + QObject::tr("Business Mobile: ") + "</b>"
+        text += "<br><b><img src=\"addressbook/mobilework\"> " + QObject::tr("Business Mobile: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
        marker = true;
    }
    str = businessPager();
    if ( !str.isEmpty() ){
-        text += "<b>" + QObject::tr("Business Pager: ") + "</b>"
+        text += "<br><b>" + QObject::tr("Business Pager: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
        marker = true;
    }
    text += "<br>";
    // home address
    if ( !homeStreet().isEmpty() || !homeCity().isEmpty() ||
         !homeZip().isEmpty() || !homeCountry().isEmpty() ) {
-        text += QObject::tr( "<b>Home Address:</b>" );
+        text += QObject::tr( "<br><br><b>Home Address:</b>" );
-        text +=  "<br>";
+        marker = true;
    }
-    if ( !(value = homeStreet()).isEmpty() )
+    if ( !(value = homeStreet()).isEmpty() ){
-        text += Qtopia::escapeString(value) + "<br>";
+        text += "<br>" + Qtopia::escapeString(value);
-    state =  homeState();
+        marker = true;
-    if ( !(value = homeZip()).isEmpty() )
+    }
-        text += Qtopia::escapeString(value) + " ";
-    if ( !(value = homeCity()).isEmpty() ) {
+    switch( addressformat ){
-        text += Qtopia::escapeString(value);
+    case Zip_City_State:{ //  Zip_Code City, State
-        if ( !state.isEmpty() )
+            state =  homeState();
-            text += ", " + Qtopia::escapeString(state);
+            if ( !(value = homeZip()).isEmpty() ){
-        text += "<br>";
+                    text += "<br>" + Qtopia::escapeString(value) + " ";
-    } else if (!state.isEmpty())
+                    marker = true;
-        text += Qtopia::escapeString(state) + "<br>";
+            } else
-    if ( !(value = homeCountry()).isEmpty() )
+                    text += "<br>";
-        text += Qtopia::escapeString(value) + "<br>";
+            if ( !(value = homeCity()).isEmpty() ) {
+                    marker = true;
+                    text += Qtopia::escapeString(value);
+                    if ( !state.isEmpty() )
+                            text += ", " + Qtopia::escapeString(state);
+            } else if (!state.isEmpty()) {
+                    text += "<br>" + Qtopia::escapeString(state);
+                    marker = true;
+            }
+            break;
+    }
+    case City_State_Zip:{ // City, State Zip_Code 
+            state =  homeState();
+            if ( !(value = homeCity()).isEmpty() ) {
+                    marker = true;
+                    text += "<br>" + Qtopia::escapeString(value);
+                    if ( state )
+                            text += ", " + Qtopia::escapeString(state);
+            } else if ( !state.isEmpty() ){
+                    text += "<br>" + Qtopia::escapeString(state);
+                    marker = true;
+            }
+            if ( !(value = homeZip()).isEmpty() ){
+                    text += " " + Qtopia::escapeString(value);
+                    marker = true;
+            }
+            break;
+    }
+    }
+            
+    if ( !(value = homeCountry()).isEmpty() ){
+        text += "<br>" + Qtopia::escapeString(value);
+        marker = true;
+    }
    // rest of Home data
    str = homeWebpage();
    if ( !str.isEmpty() ){
-        text += "<b><img src=\"addressbook/webpagehome\">" + QObject::tr("Home Web Page: ") + "</b>"
+        text += "<br><b><img src=\"addressbook/webpagehome\"> " + QObject::tr("Home Web Page: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
        marker = true;
    }
    str = homePhone();
    if ( !str.isEmpty() ){
-        text += "<b><img src=\"addressbook/phonehome\">" + QObject::tr("Home Phone: ") + "</b>"
+        text += "<br><b><img src=\"addressbook/phonehome\"> " + QObject::tr("Home Phone: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
        marker = true;
    }
    str = homeFax();
    if ( !str.isEmpty() ){
-        text += "<b><img src=\"addressbook/faxhome\">" + QObject::tr("Home Fax: ") + "</b>"
+        text += "<br><b><img src=\"addressbook/faxhome\"> " + QObject::tr("Home Fax: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
        marker = true;
    }
    str = homeMobile();
    if ( !str.isEmpty() ){
-        text += "<b><img src=\"addressbook/mobilehome\">" + QObject::tr("Home Mobile: ") + "</b>"
+        text += "<br><b><img src=\"addressbook/mobilehome\"> " + QObject::tr("Home Mobile: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
        marker = true;
    }
    if ( marker )
-            text += "<br><hr><br>";
+            text += "<br><hr>";
-    // the others...
+    // the rest...
    str = emails();
    if ( !str.isEmpty() && ( str != defEmail ) )
-        text += "<b>" + QObject::tr("All Emails: ") + "</b>"
+        text += "<br><b>" + QObject::tr("All Emails: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
    str = profession();
    if ( !str.isEmpty() )
-        text += "<b>" + QObject::tr("Profession: ") + "</b>"
+        text += "<br><b>" + QObject::tr("Profession: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
    str = assistant();
    if ( !str.isEmpty() )
-        text += "<b>" + QObject::tr("Assistant: ") + "</b>"
+        text += "<br><b>" + QObject::tr("Assistant: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
    str = manager();
    if ( !str.isEmpty() )
-        text += "<b>" + QObject::tr("Manager: ") + "</b>"
+        text += "<br><b>" + QObject::tr("Manager: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
    str = gender();
    if ( !str.isEmpty() && str.toInt() != 0 ) {
-        if ( str.toInt() == 1 )
+            text += "<br>";
-            str = QObject::tr( "Male" );
+            if ( str.toInt() == 1 )
-        else if ( str.toInt() == 2 )
+                    str = QObject::tr( "Male" );
-            str = QObject::tr( "Female" );
+            else if ( str.toInt() == 2 )
-        text += "<b>" + QObject::tr("Gender: ") + "</b>" + str + "<br>";
+                    str = QObject::tr( "Female" );
+            text += "<b>" + QObject::tr("Gender: ") + "</b>" + str;
    }
    str = spouse();
    if ( !str.isEmpty() )
-        text += "<b>" + QObject::tr("Spouse: ") + "</b>"
+        text += "<br><b>" + QObject::tr("Spouse: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
    if ( birthday().isValid() ){
            str = TimeString::numberDateString( birthday() );
-            text += "<b>" + QObject::tr("Birthday: ") + "</b>"
+            text += "<br><b>" + QObject::tr("Birthday: ") + "</b>"
-                    + Qtopia::escapeString(str) + "<br>";
+                    + Qtopia::escapeString(str);
    }
    if ( anniversary().isValid() ){
            str = TimeString::numberDateString( anniversary() );
-            text += "<b>" + QObject::tr("Anniversary: ") + "</b>"
+            text += "<br><b>" + QObject::tr("Anniversary: ") + "</b>"
-                    + Qtopia::escapeString(str) + "<br>";
+                    + Qtopia::escapeString(str);
    }
    str = children();
    if ( !str.isEmpty() )
-        text += "<b>" + QObject::tr("Children: ") + "</b>"
+        text += "<br><b>" + QObject::tr("Children: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
    str = nickname();
    if ( !str.isEmpty() )
-        text += "<b>" + QObject::tr("Nickname: ") + "</b>"
+        text += "<br><b>" + QObject::tr("Nickname: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
    // categories
    if ( categoryNames("Contacts").count() ){
-            text += "<b>" + QObject::tr( "Category:") + "</b> ";
+            text += "<br><b>" + QObject::tr( "Category:") + "</b> ";
            text += categoryNames("Contacts").join(", ");
-            text += "<br>";
    }
    // notes last
    if ( !(value = notes()).isEmpty() ) {
            text += "<br><hr><b>" + QObject::tr( "Notes:") + "</b> ";
            QRegExp reg("\n");
diff --git a/libopie/pim/ocontact.h b/libopie/pim/ocontact.h
index dd2de17..9a1a8dc 100644
--- a/libopie/pim/ocontact.h
+++ b/libopie/pim/ocontact.h
@@ -29,13 +29,13 @@
 #if defined(QPC_TEMPLATEDLL)
 // MOC_SKIP_BEGIN
 QPC_TEMPLATEEXTERN template class QPC_EXPORT QMap<int, QString>;
 // MOC_SKIP_END
 #endif
-class ContactPrivate;
+class OContactPrivate;
 /**
 * OContact class represents a specialised PIM Record for contacts.
 * It does store all kind of persopn related information.
 *
 * @short Contact Container
@@ -46,12 +46,17 @@ class QPC_EXPORT OContact : public OPimRecord
    friend class DataSet;
 public:
    OContact();
    OContact( const QMap<int, QString> &fromMap );
    virtual ~OContact();
+    enum DateFormat{
+            Zip_City_State = 0,
+            City_State_Zip
+    };
    /*
     * do we need to inline them
     * if yes do we need to inline them this way?
     * -zecke
     */
    void setTitle( const QString &v ) { replace( Qtopia::Title, v ); }
@@ -230,11 +235,11 @@ private:
                            const QString &city,
                            const QString &state,
                            const QString &zip,
                            const QString &country ) const;
    QMap<int, QString> mMap;
-    ContactPrivate *d;
+    OContactPrivate *d;
 };
 #endif
diff --git a/libopie/pim/ocontactaccess.h b/libopie/pim/ocontactaccess.h
index e90db32..9b0a719 100644
--- a/libopie/pim/ocontactaccess.h
+++ b/libopie/pim/ocontactaccess.h
@@ -14,12 +14,20 @@
 * ToDo: Define enum for query settings
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.9  2003/08/01 12:30:16  eilers
+ * Merging changes from BRANCH_1_0 to HEAD
+ *
+ * Revision 1.8.2.1  2003/06/30 14:34:19  eilers
+ * Patches from Zecke:
+ * Fixing and cleaning up extraMap handling
+ * Adding d_ptr for binary compatibility in the future
+ *
 * Revision 1.8  2003/05/08 13:55:09  tille
 * search stuff
 * and match, toRichText & toShortText in oevent
 *
 * Revision 1.7  2003/04/13 18:07:10  zecke
 * More API doc
@@ -162,9 +170,12 @@ class OContactAccess: public QObject, public OPimAccessTemplate<OContact>
        OContactAccessBackend *m_backEnd;
        bool m_loading:1;
 private slots:
        void copMessage( const QCString &msg, const QByteArray &data );
+ private:
+        class Private;
+        Private *d;
 };
 #endif
diff --git a/libopie/pim/ocontactaccessbackend.h b/libopie/pim/ocontactaccessbackend.h
index ebeb42d..280e05c 100644
--- a/libopie/pim/ocontactaccessbackend.h
+++ b/libopie/pim/ocontactaccessbackend.h
@@ -16,12 +16,20 @@
 * ToDo: Define enum for query settings
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.6  2003/08/01 12:30:16  eilers
+ * Merging changes from BRANCH_1_0 to HEAD
+ *
+ * Revision 1.5.4.1  2003/06/30 14:34:19  eilers
+ * Patches from Zecke:
+ * Fixing and cleaning up extraMap handling
+ * Adding d_ptr for binary compatibility in the future
+ *
 * Revision 1.5  2003/04/13 18:07:10  zecke
 * More API doc
 * QString -> const QString&
 * QString = 0l -> QString::null
 *
 * Revision 1.4  2002/11/13 14:14:51  eilers
@@ -99,9 +107,13 @@ class OContactAccessBackend: public OPimAccessBackend<OContact> {
        /**
         * FIXME!!!
         * Returns a sorted list of records either ascendinf or descending for a giving criteria and category
         */
        virtual QArray<int> sorted( bool ascending, int sortOrder, int sortFilter, int cat ) = 0;
+        
+        
+private:
+        class Private;
+        Private *d;
 };
 #endif
diff --git a/libopie/pim/ocontactaccessbackend_vcard.cpp b/libopie/pim/ocontactaccessbackend_vcard.cpp
index 270bef3..b60c5be 100644
--- a/libopie/pim/ocontactaccessbackend_vcard.cpp
+++ b/libopie/pim/ocontactaccessbackend_vcard.cpp
@@ -14,12 +14,27 @@
 *
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.11  2003/08/01 12:30:16  eilers
+ * Merging changes from BRANCH_1_0 to HEAD
+ *
+ * Revision 1.10.4.3  2003/07/23 08:54:37  eilers
+ * Default email was added to the list of all emails, which already contains
+ * the default email..
+ * This closes bug #1045
+ *
+ * Revision 1.10.4.2  2003/07/23 08:44:45  eilers
+ * Importing of Notes in vcard files wasn't implemented.
+ * Closes bug #1044
+ *
+ * Revision 1.10.4.1  2003/06/02 13:37:49  eilers
+ * Fixing memory leak
+ *
 * Revision 1.10  2003/04/13 18:07:10  zecke
 * More API doc
 * QString -> const QString&
 * QString = 0l -> QString::null
 *
 * Revision 1.9  2003/03/21 10:33:09  eilers
@@ -148,12 +163,13 @@ bool OContactAccessBackend_VCard::save()
        for(QMap<int, OContact>::ConstIterator it=m_map.begin(); it !=m_map.end(); ++it ){
                vo = createVObject( *it );
                writeVObject( file.directHandle() , vo );
                cleanVObject( vo );
        }
        cleanStrTbl();
+        deleteVObject( obj );
        m_dirty = false;
        return true;
 }
@@ -443,13 +459,15 @@ OContact OContactAccessBackend_VCard::parseVObject( VObject *obj )
                }
                else if ( name == VCBirthDateProp ) {
                        // Reading Birthdate regarding RFC 2425 (5.8.4)
                        c.setBirthday( convVCardDateToDate( value ) );
                }
+                else if ( name == VCCommentProp ) {
+                        c.setNotes( value );
+                }
 #if 0
                else {
                        printf("Name: %s, value=%s\n", name.data(), vObjectStringZValue( o ) );
                        VObjectIterator nit;
                        initPropIterator( &nit, o );
                        while( moreIteration( &nit ) ) {
@@ -531,13 +549,13 @@ VObject* OContactAccessBackend_VCard::createVObject( const OContact &c )
        VObject *title = safeAddPropValue( vcard, VCTitleProp, c.jobTitle() );
        safeAddProp( title, VCWorkProp );
        QStringList emails = c.emailList();
-        emails.prepend( c.defaultEmail() );
+        // emails.prepend( c.defaultEmail() ); Fix for bugreport #1045
        for( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
                VObject *email = safeAddPropValue( vcard, VCEmailAddressProp, *it );
                safeAddProp( email, VCInternetProp );
        }
        safeAddPropValue( vcard, VCNoteProp, c.notes() );
diff --git a/libopie/pim/ocontactaccessbackend_xml.cpp b/libopie/pim/ocontactaccessbackend_xml.cpp
index 097142b..1c21619 100644
--- a/libopie/pim/ocontactaccessbackend_xml.cpp
+++ b/libopie/pim/ocontactaccessbackend_xml.cpp
@@ -14,12 +14,15 @@
 *
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.7  2003/08/01 12:30:16  eilers
+ * Merging changes from BRANCH_1_0 to HEAD
+ *
 * Revision 1.6  2003/07/07 16:19:47  eilers
 * Fixing serious bug in hasQuerySettings()
 *
 * Revision 1.5  2003/04/13 18:07:10  zecke
 * More API doc
 * QString -> const QString&
diff --git a/libopie/pim/oconversion.h b/libopie/pim/oconversion.h
index 13367e1..4c0a497 100644
--- a/libopie/pim/oconversion.h
+++ b/libopie/pim/oconversion.h
@@ -34,10 +34,15 @@ public:
     * simple function to store DateTime as string and read from string
     * no timezone changing is done
     * DDMMYYYYHHMMSS is the simple format
     */
    static QString dateTimeToString( const QDateTime& );
    static QDateTime dateTimeFromString( const QString& );
+    
+private:
+    class Private;
+    Private* d;    
+    
 };
 #endif // __oconversion_h__
diff --git a/libopie/pim/odatebookaccessbackend.h b/libopie/pim/odatebookaccessbackend.h
index 86ff298..3c02c42 100644
--- a/libopie/pim/odatebookaccessbackend.h
+++ b/libopie/pim/odatebookaccessbackend.h
@@ -65,9 +65,13 @@ public:
    /**
     * this is an overloaded member function
     * @see effecticeEvents
     */
    virtual OEffectiveEvent::ValueList effecticeEvents( const QDateTime& start );
+private:
+    class Private;
+    Private *d;
 };
 #endif
diff --git a/libopie/pim/odatebookaccessbackend_xml.cpp b/libopie/pim/odatebookaccessbackend_xml.cpp
index ab2eea4..5ea945c 100644
--- a/libopie/pim/odatebookaccessbackend_xml.cpp
+++ b/libopie/pim/odatebookaccessbackend_xml.cpp
@@ -427,15 +427,15 @@ bool ODateBookAccessBackend_XML::loadFile() {
            /*
             * add key + value
             */
            find = dict[attr.data()];
            if (!find)
-                ev.setCustomField( attr, value );
+                ev.setCustomField( attr, str );
            else {
-                setField( ev, *find, value );
+                setField( ev, *find, str );
            }
        }
        /* time to finalize */
        finalizeRecord( ev );
        delete rec;
    }
@@ -450,13 +450,13 @@ void ODateBookAccessBackend_XML::finalizeRecord( OEvent& ev ) {
        OTimeZone utc = OTimeZone::utc();
        ev.setStartDateTime( utc.fromUTCDateTime( start ) );
        ev.setEndDateTime  ( utc.fromUTCDateTime( end   ) );
        ev.setTimeZone( "UTC"); // make sure it is really utc
    }else {
        /* to current date time */
-        qWarning(" Start is %d", start );
+        // qWarning(" Start is %d", start );
        OTimeZone zone( ev.timeZone().isEmpty() ? OTimeZone::current() : ev.timeZone() );
        QDateTime date = zone.toDateTime( start );
        qWarning(" Start is %s", date.toString().latin1() );
        ev.setStartDateTime( zone.toDateTime( date, OTimeZone::current() ) );
        date = zone.toDateTime( end );
diff --git a/libopie/pim/opimaccessbackend.h b/libopie/pim/opimaccessbackend.h
index f4bbe35..c3d91f7 100644
--- a/libopie/pim/opimaccessbackend.h
+++ b/libopie/pim/opimaccessbackend.h
@@ -4,12 +4,13 @@
 #include <qarray.h>
 #include <opie/otemplatebase.h>
 #include <opie/opimrecord.h>
+class OPimAccessBackendPrivate;
 /**
 * OPimAccessBackend is the base class
 * for all private backends
 * it operates on OPimRecord as the base class
 * and it's responsible for fast manipulating
 * the resource the implementation takes care
@@ -104,14 +105,13 @@ protected:
     */
    void setSaneCacheSize( int );
    uint readAhead()const;
 private:
-    class Private;
+    OPimAccessBackendPrivate *d;
-    Private* d;
    Frontend* m_front;
    uint m_read;
    int m_acc;
 };
diff --git a/libopie/pim/opimaccesstemplate.h b/libopie/pim/opimaccesstemplate.h
index 8ff205c..ecbeb68 100644
--- a/libopie/pim/opimaccesstemplate.h
+++ b/libopie/pim/opimaccesstemplate.h
@@ -7,12 +7,13 @@
 #include <opie/opimaccessbackend.h>
 #include <opie/orecordlist.h>
 #include "opimcache.h"
 #include "otemplatebase.h"
+class OPimAccessTemplatePrivate;
 /**
 * Thats the frontend to our OPIE PIM
 * Library. Either you want to use it's
 * interface or you want to implement
 * your own Access lib
 * Just create a OPimRecord and inherit from
@@ -149,12 +150,15 @@ protected:
     * returns the backend
     */
    BackEnd* backEnd();
    BackEnd* m_backEnd;
    Cache m_cache;
+private:
+    OPimAccessTemplatePrivate *d;
 };
 template <class T>
 OPimAccessTemplate<T>::OPimAccessTemplate( BackEnd* end )
    : OTemplateBase<T>(), m_backEnd( end )
 {
diff --git a/libopie/pim/opimcache.h b/libopie/pim/opimcache.h
index 73414e5..7f7cff5 100644
--- a/libopie/pim/opimcache.h
+++ b/libopie/pim/opimcache.h
@@ -2,12 +2,14 @@
 #define OPIE_PIM_CACHE_H
 #include <qintcache.h>
 #include "opimrecord.h"
+class OPimCacheItemPrivate;
 template <class T = OPimRecord>
 class OPimCacheItem {
 public:
    OPimCacheItem( const T& t = T() );
    OPimCacheItem( const OPimCacheItem& );
    ~OPimCacheItem();
@@ -15,14 +17,17 @@ public:
    OPimCacheItem &operator=( const OPimCacheItem& );
    T record()const;
    void setRecord( const T& );
 private:
    T m_t;
+    OPimCacheItemPrivate *d;
 };
+class OPimCachePrivate;
 /**
 * OPimCache for caching the items
 * We support adding, removing
 * and finding
 */
 template <class T = OPimRecord>
@@ -43,12 +48,13 @@ public:
    void add( const T& );
    void remove( int uid );
    void replace( const T& );
 private:
    QIntCache<Item> m_cache;
+    OPimCachePrivate* d;
 };
 // Implementation
 template <class T>
 OPimCacheItem<T>::OPimCacheItem( const T& t )
    : m_t(t) {
diff --git a/libopie/pim/opimmainwindow.cpp b/libopie/pim/opimmainwindow.cpp
index 4044bc1..2739e26 100644
--- a/libopie/pim/opimmainwindow.cpp
+++ b/libopie/pim/opimmainwindow.cpp
@@ -1,12 +1,13 @@
 #include <qapplication.h>
 #include <qdatetime.h>
 #include <qcopchannel_qws.h>
 #include <qpe/sound.h>
 #include <qpe/qcopenvelope_qws.h>
+#include <qpe/qpeapplication.h>
 #include "opimresolver.h"
 #include "opimmainwindow.h"
 OPimMainWindow::OPimMainWindow( const QString& service, QWidget* parent,
                                const char* name, WFlags flag )
@@ -35,36 +36,43 @@ QCopChannel* OPimMainWindow::channel() {
    return m_channel;
 }
 void OPimMainWindow::doSetDocument( const QString&  ) {
 }
 void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array ) {
+    bool needShow = false;
    /*
     * create demands to create
     * a new record...
     */
    QDataStream stream(array, IO_ReadOnly);
    if ( cmd == "create()" ) {
+        raise();
        int uid = create();
        QCopEnvelope e(m_str, "created(int)" );
        e << uid;
+        needShow = true;
    }else if ( cmd == "remove(int)" ) {
        int uid;
        stream >> uid;
        bool rem = remove( uid );
        QCopEnvelope e(m_str, "removed(bool)" );
        e << rem;
+        needShow = true;
    }else if ( cmd == "beam(int)" ) {
        int uid;
        stream >> uid;
        beam( uid);
    }else if ( cmd == "show(int)" ) {
+        raise();
        int uid;
        stream >> uid;
        show( uid );
+        needShow = true;
    }else if ( cmd == "edit(int)" ) {
+        raise();
        int uid;
        stream >> uid;
        edit( uid );
    }else if ( cmd == "add(int,QByteArray)" ) {
        int rtti;
        QByteArray array;
@@ -72,22 +80,26 @@ void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array )
        stream >> array;
        m_fallBack = record(rtti, array );
        if (!m_fallBack) return;
        add( *m_fallBack );
        delete m_fallBack;
    }else if ( cmd == "alarm(QDateTime,int)" ) {
+        raise();
        QDateTime dt; int uid;
        stream >> dt;
        stream >> uid;
        qWarning(" Date: %s Uid: %d", dt.toString().latin1(), uid );
        QDateTime current = QDateTime::currentDateTime();
        if ( current.time().hour() != dt.time().hour() && current.time().minute() != dt.time().minute() )
            return;
        doAlarm( dt,  uid );
+        needShow = true;
    }
+    if (needShow )
+        QPEApplication::setKeepRunning();
 }
 /* implement the url scripting here */
 void OPimMainWindow::setDocument( const QString& str) {
    doSetDocument( str );
 }
 /*
diff --git a/libopie/pim/opimxrefmanager.h b/libopie/pim/opimxrefmanager.h
index 39e5eef..c485e98 100644
--- a/libopie/pim/opimxrefmanager.h
+++ b/libopie/pim/opimxrefmanager.h
@@ -33,9 +33,11 @@ public:
    OPimXRef::ValueList list()const;
    OPimXRef::ValueList list( const QString& service )const;
    OPimXRef::ValueList list( int uid )const;
 private:
    OPimXRef::ValueList m_list;
+    class Private;
+    Private *d;
 };
 #endif
diff --git a/libopie/pim/orecordlist.h b/libopie/pim/orecordlist.h
index edcd729..5211f57 100644
--- a/libopie/pim/orecordlist.h
+++ b/libopie/pim/orecordlist.h
@@ -4,12 +4,13 @@
 #include <qarray.h>
 #include "otemplatebase.h"
 #include "opimrecord.h"
+class ORecordListIteratorPrivate;
 /**
 * Our List Iterator
 * it behaves like STL or Qt
 *
 * for(it = list.begin(); it != list.end(); ++it )
 *   doSomeCoolStuff( (*it) );
@@ -68,15 +69,16 @@ private:
    const Base* m_temp;
    bool m_end : 1;
    T m_record;
    bool m_direction :1;
    /* d pointer for future versions */
-    class IteratorPrivate;
+    ORecordListIteratorPrivate *d;
-    IteratorPrivate *d;
 };
+class ORecordListPrivate;
 /**
 * The recordlist used as a return type
 * from OPimAccessTemplate
 */
 template <class T = OPimRecord >
 class ORecordList {
@@ -108,24 +110,25 @@ ORecordList( const QArray<int>& ids,
     */
     uint count()const;
    T operator[]( uint i );
    int uidAt(uint i );
-   /** 
+   /**
    * Remove the contact with given uid
    */
    bool remove( int uid );
    /*
      ConstIterator begin()const;
      ConstIterator end()const;
    */
 private:
    QArray<int> m_ids;
    const Base* m_acc;
+    ORecordListPrivate *d;
 };
 /* ok now implement it  */
 template <class T>
 ORecordListIterator<T>::ORecordListIterator() {
    m_current = 0;
@@ -217,12 +220,15 @@ bool ORecordListIterator<T>::operator!=( const ORecordListIterator<T>& it ) {
 template <class T>
 ORecordListIterator<T>::ORecordListIterator( const QArray<int> uids,
                                  const Base* t )
    : m_uids( uids ), m_current( 0 ),  m_temp( t ), m_end( false ),
      m_direction( false )
 {
+    /* if the list is empty we're already at the end of the list */
+    if (uids.count() == 0 )
+        m_end = true;
 }
 template <class T>
 uint ORecordListIterator<T>::current()const {
    return m_current;
 }
 template <class T>
diff --git a/libopie/pim/otemplatebase.h b/libopie/pim/otemplatebase.h
index 29fb6ec..cadac74 100644
--- a/libopie/pim/otemplatebase.h
+++ b/libopie/pim/otemplatebase.h
@@ -11,12 +11,13 @@
 * we've this class
 * this is here to give us the possibility
 * to have a common base class
 * You may not want to use that interface internaly
 * POOR mans interface
 */
+class OPimBasePrivate;
 struct OPimBase {
    /**
     * return the rtti
     */
    virtual int rtti()= 0;
    virtual OPimRecord* record()const = 0;
@@ -29,18 +30,21 @@ struct OPimBase {
    virtual bool save() = 0;
    virtual QArray<int> records()const = 0;
    /*
     * ADD editing here?
     * -zecke
     */
+private:
+    OPimBasePrivate* d;     
 };
 /**
 * internal template base
 * T needs to implement the copy c'tor!!!
 */
+class OTemplateBasePrivate;
 template <class T = OPimRecord>
 class OTemplateBase : public OPimBase {
 public:
    enum CacheDirection { Forward=0, Reverse };
    OTemplateBase() {
    };
@@ -58,12 +62,15 @@ public:
    /* reimplement of OPimBase */
    int rtti();
    OPimRecord* record()const;
    OPimRecord* record(int uid )const;
    static T* rec();
+    
+private:
+    OTemplateBasePrivate *d;    
 };
 /*
 * implementation
 */
 template <class T>
diff --git a/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp
index 38b93f7..5a18c37 100644
--- a/libopie/pim/otodo.cpp
+++ b/libopie/pim/otodo.cpp
@@ -25,12 +25,17 @@ struct OTodo::OTodoData : public QShared {
    OTodoData() : QShared() {
        recur = 0;
        state = 0;
        maintainer = 0;
        notifiers = 0;
    };
+    ~OTodoData() {
+        delete recur;
+        delete maintainer;
+        delete notifiers;
+    }
    QDate date;
    bool isCompleted:1;
    bool hasDate:1;
    int priority;
    QString desc;
@@ -271,30 +276,29 @@ QString OTodo::toShortText() const {
 QString OTodo::toRichText() const
 {
  QString text;
  QStringList catlist;
  // summary
-  text += "<b><h3><img src=\"todo/TodoList\">";
+  text += "<b><h3><img src=\"todo/TodoList\"> ";
  if ( !summary().isEmpty() ) {
      text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"),  "" );
  }
  text += "</h3></b><br><hr><br>";
  // description
  if( !description().isEmpty() ){
-    text += "<b>" + QObject::tr( "Description:" ) + "</b><br>";
+    text += "<b>" + QObject::tr( "Notes:" ) + "</b><br>";
-    text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) ;
+    text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) + "<br>";
  }
  // priority
  int priorityval = priority();
  text += "<b>" + QObject::tr( "Priority:") +" </b><img src=\"todo/priority" +
-          QString::number( priorityval ) + "\">";
+          QString::number( priorityval ) + "\"> ";
-//  text += "<b>" + QObject::tr( "Priority:") +"</b><img src=\"todo/priority" +
-//          QString::number( priority() ) + "\"><br>";
  switch ( priorityval )
  {
    case 1 : text += QObject::tr( "Very high" );
        break;
    case 2 : text += QObject::tr( "High" );
        break;
diff --git a/libopie/pim/otodo.h b/libopie/pim/otodo.h
index f9a345a..6df98b9 100644
--- a/libopie/pim/otodo.h
+++ b/libopie/pim/otodo.h
@@ -95,17 +95,12 @@ public:
     */
    bool hasDueDate() const;
    bool hasStartDate()const;
    bool hasCompletedDate()const;
    /**
-     * Does this Event has an alarm time ?
-     */
-    bool hasAlarmDateTime() const;
-    /**
     * What is the priority?
     */
    int priority()const ;
    /**
     * progress as ushort 0, 20, 40, 60, 80 or 100%
@@ -238,16 +233,12 @@ public:
    /**
     * set the completed date
     */
    void setCompletedDate( const QDate& date );
    void setRecurrence( const ORecur& );
-    /**
-     * set the alarm time
-     */
-    void setAlarmDateTime ( const QDateTime& alarm );
    void setDescription(const QString& );
    void setSummary(const QString& );
    /**
     * set the state of a Todo
diff --git a/libopie/pim/otodoaccessbackend.h b/libopie/pim/otodoaccessbackend.h
index 05e8ca9..6be95bc 100644
--- a/libopie/pim/otodoaccessbackend.h
+++ b/libopie/pim/otodoaccessbackend.h
@@ -15,10 +15,14 @@ public:
                                        bool includeNoDates ) = 0;
    virtual QArray<int> overDue() = 0;
    virtual QArray<int> sorted( bool asc, int sortOrder, int sortFilter,
                                int cat ) = 0;
    virtual void        removeAllCompleted() = 0;
    virtual QBitArray supports()const = 0;
+    
+private:
+    class Private;
+    Private *d;
 };
 #endif
diff --git a/libopie/pim/otodoaccessvcal.cpp b/libopie/pim/otodoaccessvcal.cpp
index 3577e14..6415952 100644
--- a/libopie/pim/otodoaccessvcal.cpp
+++ b/libopie/pim/otodoaccessvcal.cpp
@@ -12,18 +12,26 @@ namespace {
        VObject *ob;
        QCString name;
        // no uid, attendees, ... and no fun
        // description
        if( ( ob = isAPropertyOf( obj, VCDescriptionProp )) != 0 ){
            name = vObjectStringZValue( ob );
+#if 0
            event.setDescription( name );
+#else
+            event.setSummary( name );
+#endif
        }
        // summary
        if ( ( ob = isAPropertyOf( obj,  VCSummaryProp ) ) != 0 ) {
            name = vObjectStringZValue( ob );
+#if 0
            event.setSummary( name );
+#else
+            event.setDescription( name );
+#endif
        }
        // completed
        if( ( ob = isAPropertyOf( obj, VCStatusProp )) != 0 ){
            name = vObjectStringZValue( ob );
            if( name == "COMPLETED" ){
                event.setCompleted( true );
@@ -71,17 +79,33 @@ namespace {
        QString string = QString::number(event.priority() );
        addPropValue( task, VCPriorityProp, string.local8Bit() );
        addPropValue( task, VCCategoriesProp,
                      event.idsToString( event.categories() ).local8Bit() );
+#if 0
+        // There seems a misrepresentation between summary in otodoevent
+        // and summary in vcard. 
+        // The same with description..
+        // Description is summary and vice versa.. Argh.. (eilers)
        addPropValue( task, VCDescriptionProp,
                      event.description().local8Bit() );
        addPropValue( task, VCSummaryProp,
                      event.summary().local8Bit() );
+#else
+        addPropValue( task, VCDescriptionProp,
+                      event.summary().local8Bit() );
+        addPropValue( task, VCSummaryProp,
+                      event.description().local8Bit() );
+#endif 
  return task;
 };
 }
 OTodoAccessVCal::OTodoAccessVCal( const QString& path )
    : m_dirty(false), m_file( path )
@@ -182,13 +206,13 @@ QArray<int> OTodoAccessVCal::allRecords()const {
    for ( it = m_map.begin(); it != m_map.end(); ++it ) {
        ar[i] = it.key();
        i++;
    }
    return ar;
 }
-QArray<int> OTodoAccessVCal::matchRegexp(const QRegExp &r)const {
+QArray<int> OTodoAccessVCal::matchRegexp(const QRegExp& /* r */)const {
    QArray<int> ar(0);
    return ar;
 }
 QArray<int> OTodoAccessVCal::queryByExample( const OTodo&, int, const QDateTime& ) {
    QArray<int> ar(0);
    return ar;
diff --git a/libopie/pim/otodoaccessxml.cpp b/libopie/pim/otodoaccessxml.cpp
index 3d15354..f688735 100644
--- a/libopie/pim/otodoaccessxml.cpp
+++ b/libopie/pim/otodoaccessxml.cpp
@@ -84,13 +84,13 @@ bool OTodoAccessXML::load() {
    m_opened = true;
    m_changed = false;
    /* initialize dict */
    /*
     * UPDATE dict if you change anything!!!
     */
-    QAsciiDict<int> dict(21);
+    QAsciiDict<int> dict(26);
    dict.setAutoDelete( TRUE );
    dict.insert("Categories" ,     new int(OTodo::Category)         );
    dict.insert("Uid" ,            new int(OTodo::Uid)              );
    dict.insert("HasDate" ,        new int(OTodo::HasDate)          );
    dict.insert("Completed" ,      new int(OTodo::Completed)        );
    dict.insert("Description" ,    new int(OTodo::Description)      );
@@ -833,16 +833,18 @@ QArray<int> OTodoAccessXML::sorted( bool asc,  int sortOrder,
    for (uint i= 0; i < vector.count(); i++ ) {
        array[i] = ( vector.at(i) )->todo.uid();
    }
    return array;
 };
 void OTodoAccessXML::removeAllCompleted() {
+    QMap<int, OTodo> events = m_events;
    for ( QMap<int, OTodo>::Iterator it = m_events.begin(); it != m_events.end(); ++it ) {
        if ( (*it).isCompleted() )
-            m_events.remove( it );
+            events.remove( it.key() );
    }
+    m_events = events;
 }
 QBitArray OTodoAccessXML::supports()const {
    static QBitArray ar = sup();
    return ar;
 }
 QBitArray OTodoAccessXML::sup() {
diff --git a/libopie2/opiepim/backend/obackendfactory.h b/libopie2/opiepim/backend/obackendfactory.h
index ad6cf5a..f3c339d 100644
--- a/libopie2/opiepim/backend/obackendfactory.h
+++ b/libopie2/opiepim/backend/obackendfactory.h
@@ -13,12 +13,20 @@
 * ToDo: Use plugins
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.7  2003/08/01 12:30:16  eilers
+ * Merging changes from BRANCH_1_0 to HEAD
+ *
+ * Revision 1.6.4.1  2003/06/30 14:34:19  eilers
+ * Patches from Zecke:
+ * Fixing and cleaning up extraMap handling
+ * Adding d_ptr for binary compatibility in the future
+ *
 * Revision 1.6  2003/04/13 18:07:10  zecke
 * More API doc
 * QString -> const QString&
 * QString = 0l -> QString::null
 *
 * Revision 1.5  2003/02/21 23:31:52  zecke
@@ -65,12 +73,14 @@
 #include "odatebookaccessbackend_xml.h"
 #ifdef __USE_SQL
 #include "otodoaccesssql.h"
 #endif
+class OBackendPrivate;
 /**
 * This class is our factory. It will give us the default implementations
 * of at least Todolist, Contacts and Datebook. In the future this class will
 * allow users to switch the backend with ( XML->SQLite ) without the need
 * to recompile.#
 * This class as the whole PIM Api is making use of templates
@@ -145,10 +155,12 @@ class OBackendFactory
                default:
                        return NULL;
                }
        }
+    private:
+        OBackendPrivate* d;
 };
 #endif
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend.h b/libopie2/opiepim/backend/ocontactaccessbackend.h
index ebeb42d..280e05c 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend.h
+++ b/libopie2/opiepim/backend/ocontactaccessbackend.h
@@ -16,12 +16,20 @@
 * ToDo: Define enum for query settings
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.6  2003/08/01 12:30:16  eilers
+ * Merging changes from BRANCH_1_0 to HEAD
+ *
+ * Revision 1.5.4.1  2003/06/30 14:34:19  eilers
+ * Patches from Zecke:
+ * Fixing and cleaning up extraMap handling
+ * Adding d_ptr for binary compatibility in the future
+ *
 * Revision 1.5  2003/04/13 18:07:10  zecke
 * More API doc
 * QString -> const QString&
 * QString = 0l -> QString::null
 *
 * Revision 1.4  2002/11/13 14:14:51  eilers
@@ -99,9 +107,13 @@ class OContactAccessBackend: public OPimAccessBackend<OContact> {
        /**
         * FIXME!!!
         * Returns a sorted list of records either ascendinf or descending for a giving criteria and category
         */
        virtual QArray<int> sorted( bool ascending, int sortOrder, int sortFilter, int cat ) = 0;
+        
+        
+private:
+        class Private;
+        Private *d;
 };
 #endif
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
index 270bef3..b60c5be 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
@@ -14,12 +14,27 @@
 *
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.11  2003/08/01 12:30:16  eilers
+ * Merging changes from BRANCH_1_0 to HEAD
+ *
+ * Revision 1.10.4.3  2003/07/23 08:54:37  eilers
+ * Default email was added to the list of all emails, which already contains
+ * the default email..
+ * This closes bug #1045
+ *
+ * Revision 1.10.4.2  2003/07/23 08:44:45  eilers
+ * Importing of Notes in vcard files wasn't implemented.
+ * Closes bug #1044
+ *
+ * Revision 1.10.4.1  2003/06/02 13:37:49  eilers
+ * Fixing memory leak
+ *
 * Revision 1.10  2003/04/13 18:07:10  zecke
 * More API doc
 * QString -> const QString&
 * QString = 0l -> QString::null
 *
 * Revision 1.9  2003/03/21 10:33:09  eilers
@@ -148,12 +163,13 @@ bool OContactAccessBackend_VCard::save()
        for(QMap<int, OContact>::ConstIterator it=m_map.begin(); it !=m_map.end(); ++it ){
                vo = createVObject( *it );
                writeVObject( file.directHandle() , vo );
                cleanVObject( vo );
        }
        cleanStrTbl();
+        deleteVObject( obj );
        m_dirty = false;
        return true;
 }
@@ -443,13 +459,15 @@ OContact OContactAccessBackend_VCard::parseVObject( VObject *obj )
                }
                else if ( name == VCBirthDateProp ) {
                        // Reading Birthdate regarding RFC 2425 (5.8.4)
                        c.setBirthday( convVCardDateToDate( value ) );
                }
+                else if ( name == VCCommentProp ) {
+                        c.setNotes( value );
+                }
 #if 0
                else {
                        printf("Name: %s, value=%s\n", name.data(), vObjectStringZValue( o ) );
                        VObjectIterator nit;
                        initPropIterator( &nit, o );
                        while( moreIteration( &nit ) ) {
@@ -531,13 +549,13 @@ VObject* OContactAccessBackend_VCard::createVObject( const OContact &c )
        VObject *title = safeAddPropValue( vcard, VCTitleProp, c.jobTitle() );
        safeAddProp( title, VCWorkProp );
        QStringList emails = c.emailList();
-        emails.prepend( c.defaultEmail() );
+        // emails.prepend( c.defaultEmail() ); Fix for bugreport #1045
        for( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
                VObject *email = safeAddPropValue( vcard, VCEmailAddressProp, *it );
                safeAddProp( email, VCInternetProp );
        }
        safeAddPropValue( vcard, VCNoteProp, c.notes() );
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
index 097142b..1c21619 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
@@ -14,12 +14,15 @@
 *
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.7  2003/08/01 12:30:16  eilers
+ * Merging changes from BRANCH_1_0 to HEAD
+ *
 * Revision 1.6  2003/07/07 16:19:47  eilers
 * Fixing serious bug in hasQuerySettings()
 *
 * Revision 1.5  2003/04/13 18:07:10  zecke
 * More API doc
 * QString -> const QString&
diff --git a/libopie2/opiepim/backend/odatebookaccessbackend.h b/libopie2/opiepim/backend/odatebookaccessbackend.h
index 86ff298..3c02c42 100644
--- a/libopie2/opiepim/backend/odatebookaccessbackend.h
+++ b/libopie2/opiepim/backend/odatebookaccessbackend.h
@@ -65,9 +65,13 @@ public:
    /**
     * this is an overloaded member function
     * @see effecticeEvents
     */
    virtual OEffectiveEvent::ValueList effecticeEvents( const QDateTime& start );
+private:
+    class Private;
+    Private *d;
 };
 #endif
diff --git a/libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp b/libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp
index ab2eea4..5ea945c 100644
--- a/libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp
+++ b/libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp
@@ -427,15 +427,15 @@ bool ODateBookAccessBackend_XML::loadFile() {
            /*
             * add key + value
             */
            find = dict[attr.data()];
            if (!find)
-                ev.setCustomField( attr, value );
+                ev.setCustomField( attr, str );
            else {
-                setField( ev, *find, value );
+                setField( ev, *find, str );
            }
        }
        /* time to finalize */
        finalizeRecord( ev );
        delete rec;
    }
@@ -450,13 +450,13 @@ void ODateBookAccessBackend_XML::finalizeRecord( OEvent& ev ) {
        OTimeZone utc = OTimeZone::utc();
        ev.setStartDateTime( utc.fromUTCDateTime( start ) );
        ev.setEndDateTime  ( utc.fromUTCDateTime( end   ) );
        ev.setTimeZone( "UTC"); // make sure it is really utc
    }else {
        /* to current date time */
-        qWarning(" Start is %d", start );
+        // qWarning(" Start is %d", start );
        OTimeZone zone( ev.timeZone().isEmpty() ? OTimeZone::current() : ev.timeZone() );
        QDateTime date = zone.toDateTime( start );
        qWarning(" Start is %s", date.toString().latin1() );
        ev.setStartDateTime( zone.toDateTime( date, OTimeZone::current() ) );
        date = zone.toDateTime( end );
diff --git a/libopie2/opiepim/backend/opimaccessbackend.h b/libopie2/opiepim/backend/opimaccessbackend.h
index f4bbe35..c3d91f7 100644
--- a/libopie2/opiepim/backend/opimaccessbackend.h
+++ b/libopie2/opiepim/backend/opimaccessbackend.h
@@ -4,12 +4,13 @@
 #include <qarray.h>
 #include <opie/otemplatebase.h>
 #include <opie/opimrecord.h>
+class OPimAccessBackendPrivate;
 /**
 * OPimAccessBackend is the base class
 * for all private backends
 * it operates on OPimRecord as the base class
 * and it's responsible for fast manipulating
 * the resource the implementation takes care
@@ -104,14 +105,13 @@ protected:
     */
    void setSaneCacheSize( int );
    uint readAhead()const;
 private:
-    class Private;
+    OPimAccessBackendPrivate *d;
-    Private* d;
    Frontend* m_front;
    uint m_read;
    int m_acc;
 };
diff --git a/libopie2/opiepim/backend/otodoaccessbackend.h b/libopie2/opiepim/backend/otodoaccessbackend.h
index 05e8ca9..6be95bc 100644
--- a/libopie2/opiepim/backend/otodoaccessbackend.h
+++ b/libopie2/opiepim/backend/otodoaccessbackend.h
@@ -15,10 +15,14 @@ public:
                                        bool includeNoDates ) = 0;
    virtual QArray<int> overDue() = 0;
    virtual QArray<int> sorted( bool asc, int sortOrder, int sortFilter,
                                int cat ) = 0;
    virtual void        removeAllCompleted() = 0;
    virtual QBitArray supports()const = 0;
+    
+private:
+    class Private;
+    Private *d;
 };
 #endif
diff --git a/libopie2/opiepim/backend/otodoaccessvcal.cpp b/libopie2/opiepim/backend/otodoaccessvcal.cpp
index 3577e14..6415952 100644
--- a/libopie2/opiepim/backend/otodoaccessvcal.cpp
+++ b/libopie2/opiepim/backend/otodoaccessvcal.cpp
@@ -12,18 +12,26 @@ namespace {
        VObject *ob;
        QCString name;
        // no uid, attendees, ... and no fun
        // description
        if( ( ob = isAPropertyOf( obj, VCDescriptionProp )) != 0 ){
            name = vObjectStringZValue( ob );
+#if 0
            event.setDescription( name );
+#else
+            event.setSummary( name );
+#endif
        }
        // summary
        if ( ( ob = isAPropertyOf( obj,  VCSummaryProp ) ) != 0 ) {
            name = vObjectStringZValue( ob );
+#if 0
            event.setSummary( name );
+#else
+            event.setDescription( name );
+#endif
        }
        // completed
        if( ( ob = isAPropertyOf( obj, VCStatusProp )) != 0 ){
            name = vObjectStringZValue( ob );
            if( name == "COMPLETED" ){
                event.setCompleted( true );
@@ -71,17 +79,33 @@ namespace {
        QString string = QString::number(event.priority() );
        addPropValue( task, VCPriorityProp, string.local8Bit() );
        addPropValue( task, VCCategoriesProp,
                      event.idsToString( event.categories() ).local8Bit() );
+#if 0
+        // There seems a misrepresentation between summary in otodoevent
+        // and summary in vcard. 
+        // The same with description..
+        // Description is summary and vice versa.. Argh.. (eilers)
        addPropValue( task, VCDescriptionProp,
                      event.description().local8Bit() );
        addPropValue( task, VCSummaryProp,
                      event.summary().local8Bit() );
+#else
+        addPropValue( task, VCDescriptionProp,
+                      event.summary().local8Bit() );
+        addPropValue( task, VCSummaryProp,
+                      event.description().local8Bit() );
+#endif 
  return task;
 };
 }
 OTodoAccessVCal::OTodoAccessVCal( const QString& path )
    : m_dirty(false), m_file( path )
@@ -182,13 +206,13 @@ QArray<int> OTodoAccessVCal::allRecords()const {
    for ( it = m_map.begin(); it != m_map.end(); ++it ) {
        ar[i] = it.key();
        i++;
    }
    return ar;
 }
-QArray<int> OTodoAccessVCal::matchRegexp(const QRegExp &r)const {
+QArray<int> OTodoAccessVCal::matchRegexp(const QRegExp& /* r */)const {
    QArray<int> ar(0);
    return ar;
 }
 QArray<int> OTodoAccessVCal::queryByExample( const OTodo&, int, const QDateTime& ) {
    QArray<int> ar(0);
    return ar;
diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp
index 3d15354..f688735 100644
--- a/libopie2/opiepim/backend/otodoaccessxml.cpp
+++ b/libopie2/opiepim/backend/otodoaccessxml.cpp
@@ -84,13 +84,13 @@ bool OTodoAccessXML::load() {
    m_opened = true;
    m_changed = false;
    /* initialize dict */
    /*
     * UPDATE dict if you change anything!!!
     */
-    QAsciiDict<int> dict(21);
+    QAsciiDict<int> dict(26);
    dict.setAutoDelete( TRUE );
    dict.insert("Categories" ,     new int(OTodo::Category)         );
    dict.insert("Uid" ,            new int(OTodo::Uid)              );
    dict.insert("HasDate" ,        new int(OTodo::HasDate)          );
    dict.insert("Completed" ,      new int(OTodo::Completed)        );
    dict.insert("Description" ,    new int(OTodo::Description)      );
@@ -833,16 +833,18 @@ QArray<int> OTodoAccessXML::sorted( bool asc,  int sortOrder,
    for (uint i= 0; i < vector.count(); i++ ) {
        array[i] = ( vector.at(i) )->todo.uid();
    }
    return array;
 };
 void OTodoAccessXML::removeAllCompleted() {
+    QMap<int, OTodo> events = m_events;
    for ( QMap<int, OTodo>::Iterator it = m_events.begin(); it != m_events.end(); ++it ) {
        if ( (*it).isCompleted() )
-            m_events.remove( it );
+            events.remove( it.key() );
    }
+    m_events = events;
 }
 QBitArray OTodoAccessXML::supports()const {
    static QBitArray ar = sup();
    return ar;
 }
 QBitArray OTodoAccessXML::sup() {
diff --git a/libopie2/opiepim/core/ocontactaccess.h b/libopie2/opiepim/core/ocontactaccess.h
index e90db32..9b0a719 100644
--- a/libopie2/opiepim/core/ocontactaccess.h
+++ b/libopie2/opiepim/core/ocontactaccess.h
@@ -14,12 +14,20 @@
 * ToDo: Define enum for query settings
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.9  2003/08/01 12:30:16  eilers
+ * Merging changes from BRANCH_1_0 to HEAD
+ *
+ * Revision 1.8.2.1  2003/06/30 14:34:19  eilers
+ * Patches from Zecke:
+ * Fixing and cleaning up extraMap handling
+ * Adding d_ptr for binary compatibility in the future
+ *
 * Revision 1.8  2003/05/08 13:55:09  tille
 * search stuff
 * and match, toRichText & toShortText in oevent
 *
 * Revision 1.7  2003/04/13 18:07:10  zecke
 * More API doc
@@ -162,9 +170,12 @@ class OContactAccess: public QObject, public OPimAccessTemplate<OContact>
        OContactAccessBackend *m_backEnd;
        bool m_loading:1;
 private slots:
        void copMessage( const QCString &msg, const QByteArray &data );
+ private:
+        class Private;
+        Private *d;
 };
 #endif
diff --git a/libopie2/opiepim/core/oconversion.h b/libopie2/opiepim/core/oconversion.h
index 13367e1..4c0a497 100644
--- a/libopie2/opiepim/core/oconversion.h
+++ b/libopie2/opiepim/core/oconversion.h
@@ -34,10 +34,15 @@ public:
     * simple function to store DateTime as string and read from string
     * no timezone changing is done
     * DDMMYYYYHHMMSS is the simple format
     */
    static QString dateTimeToString( const QDateTime& );
    static QDateTime dateTimeFromString( const QString& );
+    
+private:
+    class Private;
+    Private* d;    
+    
 };
 #endif // __oconversion_h__
diff --git a/libopie2/opiepim/core/opimaccesstemplate.h b/libopie2/opiepim/core/opimaccesstemplate.h
index 8ff205c..ecbeb68 100644
--- a/libopie2/opiepim/core/opimaccesstemplate.h
+++ b/libopie2/opiepim/core/opimaccesstemplate.h
@@ -7,12 +7,13 @@
 #include <opie/opimaccessbackend.h>
 #include <opie/orecordlist.h>
 #include "opimcache.h"
 #include "otemplatebase.h"
+class OPimAccessTemplatePrivate;
 /**
 * Thats the frontend to our OPIE PIM
 * Library. Either you want to use it's
 * interface or you want to implement
 * your own Access lib
 * Just create a OPimRecord and inherit from
@@ -149,12 +150,15 @@ protected:
     * returns the backend
     */
    BackEnd* backEnd();
    BackEnd* m_backEnd;
    Cache m_cache;
+private:
+    OPimAccessTemplatePrivate *d;
 };
 template <class T>
 OPimAccessTemplate<T>::OPimAccessTemplate( BackEnd* end )
    : OTemplateBase<T>(), m_backEnd( end )
 {
diff --git a/libopie2/opiepim/core/opimcache.h b/libopie2/opiepim/core/opimcache.h
index 73414e5..7f7cff5 100644
--- a/libopie2/opiepim/core/opimcache.h
+++ b/libopie2/opiepim/core/opimcache.h
@@ -2,12 +2,14 @@
 #define OPIE_PIM_CACHE_H
 #include <qintcache.h>
 #include "opimrecord.h"
+class OPimCacheItemPrivate;
 template <class T = OPimRecord>
 class OPimCacheItem {
 public:
    OPimCacheItem( const T& t = T() );
    OPimCacheItem( const OPimCacheItem& );
    ~OPimCacheItem();
@@ -15,14 +17,17 @@ public:
    OPimCacheItem &operator=( const OPimCacheItem& );
    T record()const;
    void setRecord( const T& );
 private:
    T m_t;
+    OPimCacheItemPrivate *d;
 };
+class OPimCachePrivate;
 /**
 * OPimCache for caching the items
 * We support adding, removing
 * and finding
 */
 template <class T = OPimRecord>
@@ -43,12 +48,13 @@ public:
    void add( const T& );
    void remove( int uid );
    void replace( const T& );
 private:
    QIntCache<Item> m_cache;
+    OPimCachePrivate* d;
 };
 // Implementation
 template <class T>
 OPimCacheItem<T>::OPimCacheItem( const T& t )
    : m_t(t) {
diff --git a/libopie2/opiepim/core/opimxrefmanager.h b/libopie2/opiepim/core/opimxrefmanager.h
index 39e5eef..c485e98 100644
--- a/libopie2/opiepim/core/opimxrefmanager.h
+++ b/libopie2/opiepim/core/opimxrefmanager.h
@@ -33,9 +33,11 @@ public:
    OPimXRef::ValueList list()const;
    OPimXRef::ValueList list( const QString& service )const;
    OPimXRef::ValueList list( int uid )const;
 private:
    OPimXRef::ValueList m_list;
+    class Private;
+    Private *d;
 };
 #endif
diff --git a/libopie2/opiepim/core/otemplatebase.h b/libopie2/opiepim/core/otemplatebase.h
index 29fb6ec..cadac74 100644
--- a/libopie2/opiepim/core/otemplatebase.h
+++ b/libopie2/opiepim/core/otemplatebase.h
@@ -11,12 +11,13 @@
 * we've this class
 * this is here to give us the possibility
 * to have a common base class
 * You may not want to use that interface internaly
 * POOR mans interface
 */
+class OPimBasePrivate;
 struct OPimBase {
    /**
     * return the rtti
     */
    virtual int rtti()= 0;
    virtual OPimRecord* record()const = 0;
@@ -29,18 +30,21 @@ struct OPimBase {
    virtual bool save() = 0;
    virtual QArray<int> records()const = 0;
    /*
     * ADD editing here?
     * -zecke
     */
+private:
+    OPimBasePrivate* d;     
 };
 /**
 * internal template base
 * T needs to implement the copy c'tor!!!
 */
+class OTemplateBasePrivate;
 template <class T = OPimRecord>
 class OTemplateBase : public OPimBase {
 public:
    enum CacheDirection { Forward=0, Reverse };
    OTemplateBase() {
    };
@@ -58,12 +62,15 @@ public:
    /* reimplement of OPimBase */
    int rtti();
    OPimRecord* record()const;
    OPimRecord* record(int uid )const;
    static T* rec();
+    
+private:
+    OTemplateBasePrivate *d;    
 };
 /*
 * implementation
 */
 template <class T>
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index be4ce0a..3473baa 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -18,16 +18,17 @@
 **********************************************************************/
 #define QTOPIA_INTERNAL_CONTACT_MRE
 #include "ocontact.h"
 #include "opimresolver.h"
+#include "oconversion.h"
 #include <qpe/stringutil.h>
-#include "oconversion.h"
 #include <qpe/timestring.h>
+#include <qpe/config.h>
 #include <qobject.h>
 #include <qregexp.h>
 #include <qstylesheet.h>
 #include <qfileinfo.h>
 #include <qmap.h>
@@ -435,208 +436,280 @@ QString OContact::toRichText() const
 {
    QString text;
    QString value, comp, state;
    QString str;
    bool marker = false;
+    Config cfg("qpe");
+    cfg.setGroup("Appearance");
+    int addressformat = cfg.readNumEntry( "AddressFormat", Zip_City_State );
    // name, jobtitle and company
    if ( !(value = fullName()).isEmpty() )
-        text += "<b><h3><img src=\"addressbook/AddressBook\">" + Qtopia::escapeString(value) + "</h3></b>";
+        text += "<b><h3><img src=\"addressbook/AddressBook\"> " + Qtopia::escapeString(value) + "</h3></b>";
+    
    if ( !(value = jobTitle()).isEmpty() )
-        text += Qtopia::escapeString(value) + "<br>";
+        text += Qtopia::escapeString(value);
    comp = company();
    if ( !(value = department()).isEmpty() ) {
        text += Qtopia::escapeString(value);
        if ( comp )
            text += ", ";
        else
            text += "<br>";
    }
    if ( !comp.isEmpty() )
-        text += Qtopia::escapeString(comp) + "<br>";
+        text += Qtopia::escapeString(comp);
-    text += "<hr><br>";
+    text += "<br><hr>";
    // defailt email
    QString defEmail = defaultEmail();
-    if ( !defEmail.isEmpty() )
+    if ( !defEmail.isEmpty() ){
-        text += "<b><img src=\"addressbook/email\">" + QObject::tr("Default Email: ") + "</b>"
+        text += "<b><img src=\"addressbook/email\"> " + QObject::tr("Default Email: ") + "</b>"
-                + Qtopia::escapeString(defEmail) + "<br>";
+                + Qtopia::escapeString(defEmail);
+        marker = true;
-    text += "<br>";
+    }
    // business address
    if ( !businessStreet().isEmpty() || !businessCity().isEmpty() ||
         !businessZip().isEmpty() || !businessCountry().isEmpty() ) {
-        text += QObject::tr( "<b>Work Address:</b>" );
+        text += QObject::tr( "<br><br><b>Work Address:</b>" );
-        text +=  "<br>";
        marker = true;
    }
-    if ( !(value = businessStreet()).isEmpty() )
+    if ( !(value = businessStreet()).isEmpty() ){
-        text += Qtopia::escapeString(value) + "<br>";
+            text += "<br>" + Qtopia::escapeString(value);
-    state =  businessState();
+            marker = true;
-    if ( !(value = businessZip()).isEmpty() )
+    }
-        text += Qtopia::escapeString(value) + " ";
-    if ( !(value = businessCity()).isEmpty() ) {
+    switch( addressformat ){
-        text += Qtopia::escapeString(value);
+    case Zip_City_State:{ //  Zip_Code City, State
-        if ( state )
+            state =  businessState();
-            text += ", " + Qtopia::escapeString(state);
+            if ( !(value = businessZip()).isEmpty() ){
-        text += "<br>";
+                    text += "<br>" + Qtopia::escapeString(value) + " ";
-    } else if ( !state.isEmpty() )
+                    marker = true;
-        text += Qtopia::escapeString(state) + "<br>";
+                    
+            } else
+                    text += "<br>";
+            if ( !(value = businessCity()).isEmpty() ) {
+                    marker = true;
+                    text += Qtopia::escapeString(value);
+                    if ( state )
+                            text += ", " + Qtopia::escapeString(state);
+            } else if ( !state.isEmpty() ){
+                    text += "<br>" + Qtopia::escapeString(state);
+                    marker = true;
+            }
+            break;
+    }
+    case City_State_Zip:{ // City, State Zip_Code 
+            state =  businessState();
+            if ( !(value = businessCity()).isEmpty() ) {
+                    marker = true;
+                    text += "<br>" + Qtopia::escapeString(value);
+                    if ( state )
+                            text += ", " + Qtopia::escapeString(state);
+            } else if ( !state.isEmpty() ){
+                    text += "<br>" + Qtopia::escapeString(state);
+                    marker = true;
+            }
+            if ( !(value = businessZip()).isEmpty() ){
+                    text += " " + Qtopia::escapeString(value);
+                    marker = true;
+            }
+            break;
+    }
+    }
-    if ( !(value = businessCountry()).isEmpty() )
+    if ( !(value = businessCountry()).isEmpty() ){
-        text += Qtopia::escapeString(value) + "<br>";
+        text += "<br>" + Qtopia::escapeString(value);
+        marker = true;
+    }
    // rest of Business data
    str = office();
    if ( !str.isEmpty() ){
-        text += "<b>" + QObject::tr("Office: ") + "</b>"
+        text += "<br><b>" + QObject::tr("Office: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
        marker = true;
    }
    str = businessWebpage();
    if ( !str.isEmpty() ){
-        text += "<b><img src=\"addressbook/webpagework\">" + QObject::tr("Business Web Page: ") + "</b>"
+        text += "<br><b><img src=\"addressbook/webpagework\"> " + QObject::tr("Business Web Page: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
        marker = true;
    }
    str = businessPhone();
    if ( !str.isEmpty() ){
-        text += "<b><img src=\"addressbook/phonework\">" + QObject::tr("Business Phone: ") + "</b>"
+        text += "<br><b><img src=\"addressbook/phonework\"> " + QObject::tr("Business Phone: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
        marker = true;
    }
    str = businessFax();
    if ( !str.isEmpty() ){
-        text += "<b><img src=\"addressbook/faxwork\">" + QObject::tr("Business Fax: ") + "</b>"
+        text += "<br><b><img src=\"addressbook/faxwork\"> " + QObject::tr("Business Fax: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
        marker = true;
    }
    str = businessMobile();
    if ( !str.isEmpty() ){
-        text += "<b><img src=\"addressbook/mobilework\">" + QObject::tr("Business Mobile: ") + "</b>"
+        text += "<br><b><img src=\"addressbook/mobilework\"> " + QObject::tr("Business Mobile: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
        marker = true;
    }
    str = businessPager();
    if ( !str.isEmpty() ){
-        text += "<b>" + QObject::tr("Business Pager: ") + "</b>"
+        text += "<br><b>" + QObject::tr("Business Pager: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
        marker = true;
    }
    text += "<br>";
    // home address
    if ( !homeStreet().isEmpty() || !homeCity().isEmpty() ||
         !homeZip().isEmpty() || !homeCountry().isEmpty() ) {
-        text += QObject::tr( "<b>Home Address:</b>" );
+        text += QObject::tr( "<br><br><b>Home Address:</b>" );
-        text +=  "<br>";
+        marker = true;
    }
-    if ( !(value = homeStreet()).isEmpty() )
+    if ( !(value = homeStreet()).isEmpty() ){
-        text += Qtopia::escapeString(value) + "<br>";
+        text += "<br>" + Qtopia::escapeString(value);
-    state =  homeState();
+        marker = true;
-    if ( !(value = homeZip()).isEmpty() )
+    }
-        text += Qtopia::escapeString(value) + " ";
-    if ( !(value = homeCity()).isEmpty() ) {
+    switch( addressformat ){
-        text += Qtopia::escapeString(value);
+    case Zip_City_State:{ //  Zip_Code City, State
-        if ( !state.isEmpty() )
+            state =  homeState();
-            text += ", " + Qtopia::escapeString(state);
+            if ( !(value = homeZip()).isEmpty() ){
-        text += "<br>";
+                    text += "<br>" + Qtopia::escapeString(value) + " ";
-    } else if (!state.isEmpty())
+                    marker = true;
-        text += Qtopia::escapeString(state) + "<br>";
+            } else
-    if ( !(value = homeCountry()).isEmpty() )
+                    text += "<br>";
-        text += Qtopia::escapeString(value) + "<br>";
+            if ( !(value = homeCity()).isEmpty() ) {
+                    marker = true;
+                    text += Qtopia::escapeString(value);
+                    if ( !state.isEmpty() )
+                            text += ", " + Qtopia::escapeString(state);
+            } else if (!state.isEmpty()) {
+                    text += "<br>" + Qtopia::escapeString(state);
+                    marker = true;
+            }
+            break;
+    }
+    case City_State_Zip:{ // City, State Zip_Code 
+            state =  homeState();
+            if ( !(value = homeCity()).isEmpty() ) {
+                    marker = true;
+                    text += "<br>" + Qtopia::escapeString(value);
+                    if ( state )
+                            text += ", " + Qtopia::escapeString(state);
+            } else if ( !state.isEmpty() ){
+                    text += "<br>" + Qtopia::escapeString(state);
+                    marker = true;
+            }
+            if ( !(value = homeZip()).isEmpty() ){
+                    text += " " + Qtopia::escapeString(value);
+                    marker = true;
+            }
+            break;
+    }
+    }
+            
+    if ( !(value = homeCountry()).isEmpty() ){
+        text += "<br>" + Qtopia::escapeString(value);
+        marker = true;
+    }
    // rest of Home data
    str = homeWebpage();
    if ( !str.isEmpty() ){
-        text += "<b><img src=\"addressbook/webpagehome\">" + QObject::tr("Home Web Page: ") + "</b>"
+        text += "<br><b><img src=\"addressbook/webpagehome\"> " + QObject::tr("Home Web Page: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
        marker = true;
    }
    str = homePhone();
    if ( !str.isEmpty() ){
-        text += "<b><img src=\"addressbook/phonehome\">" + QObject::tr("Home Phone: ") + "</b>"
+        text += "<br><b><img src=\"addressbook/phonehome\"> " + QObject::tr("Home Phone: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
        marker = true;
    }
    str = homeFax();
    if ( !str.isEmpty() ){
-        text += "<b><img src=\"addressbook/faxhome\">" + QObject::tr("Home Fax: ") + "</b>"
+        text += "<br><b><img src=\"addressbook/faxhome\"> " + QObject::tr("Home Fax: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
        marker = true;
    }
    str = homeMobile();
    if ( !str.isEmpty() ){
-        text += "<b><img src=\"addressbook/mobilehome\">" + QObject::tr("Home Mobile: ") + "</b>"
+        text += "<br><b><img src=\"addressbook/mobilehome\"> " + QObject::tr("Home Mobile: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
        marker = true;
    }
    if ( marker )
-            text += "<br><hr><br>";
+            text += "<br><hr>";
-    // the others...
+    // the rest...
    str = emails();
    if ( !str.isEmpty() && ( str != defEmail ) )
-        text += "<b>" + QObject::tr("All Emails: ") + "</b>"
+        text += "<br><b>" + QObject::tr("All Emails: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
    str = profession();
    if ( !str.isEmpty() )
-        text += "<b>" + QObject::tr("Profession: ") + "</b>"
+        text += "<br><b>" + QObject::tr("Profession: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
    str = assistant();
    if ( !str.isEmpty() )
-        text += "<b>" + QObject::tr("Assistant: ") + "</b>"
+        text += "<br><b>" + QObject::tr("Assistant: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
    str = manager();
    if ( !str.isEmpty() )
-        text += "<b>" + QObject::tr("Manager: ") + "</b>"
+        text += "<br><b>" + QObject::tr("Manager: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
    str = gender();
    if ( !str.isEmpty() && str.toInt() != 0 ) {
-        if ( str.toInt() == 1 )
+            text += "<br>";
-            str = QObject::tr( "Male" );
+            if ( str.toInt() == 1 )
-        else if ( str.toInt() == 2 )
+                    str = QObject::tr( "Male" );
-            str = QObject::tr( "Female" );
+            else if ( str.toInt() == 2 )
-        text += "<b>" + QObject::tr("Gender: ") + "</b>" + str + "<br>";
+                    str = QObject::tr( "Female" );
+            text += "<b>" + QObject::tr("Gender: ") + "</b>" + str;
    }
    str = spouse();
    if ( !str.isEmpty() )
-        text += "<b>" + QObject::tr("Spouse: ") + "</b>"
+        text += "<br><b>" + QObject::tr("Spouse: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
    if ( birthday().isValid() ){
            str = TimeString::numberDateString( birthday() );
-            text += "<b>" + QObject::tr("Birthday: ") + "</b>"
+            text += "<br><b>" + QObject::tr("Birthday: ") + "</b>"
-                    + Qtopia::escapeString(str) + "<br>";
+                    + Qtopia::escapeString(str);
    }
    if ( anniversary().isValid() ){
            str = TimeString::numberDateString( anniversary() );
-            text += "<b>" + QObject::tr("Anniversary: ") + "</b>"
+            text += "<br><b>" + QObject::tr("Anniversary: ") + "</b>"
-                    + Qtopia::escapeString(str) + "<br>";
+                    + Qtopia::escapeString(str);
    }
    str = children();
    if ( !str.isEmpty() )
-        text += "<b>" + QObject::tr("Children: ") + "</b>"
+        text += "<br><b>" + QObject::tr("Children: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
    str = nickname();
    if ( !str.isEmpty() )
-        text += "<b>" + QObject::tr("Nickname: ") + "</b>"
+        text += "<br><b>" + QObject::tr("Nickname: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+                + Qtopia::escapeString(str);
    // categories
    if ( categoryNames("Contacts").count() ){
-            text += "<b>" + QObject::tr( "Category:") + "</b> ";
+            text += "<br><b>" + QObject::tr( "Category:") + "</b> ";
            text += categoryNames("Contacts").join(", ");
-            text += "<br>";
    }
    // notes last
    if ( !(value = notes()).isEmpty() ) {
            text += "<br><hr><b>" + QObject::tr( "Notes:") + "</b> ";
            QRegExp reg("\n");
diff --git a/libopie2/opiepim/ocontact.h b/libopie2/opiepim/ocontact.h
index dd2de17..9a1a8dc 100644
--- a/libopie2/opiepim/ocontact.h
+++ b/libopie2/opiepim/ocontact.h
@@ -29,13 +29,13 @@
 #if defined(QPC_TEMPLATEDLL)
 // MOC_SKIP_BEGIN
 QPC_TEMPLATEEXTERN template class QPC_EXPORT QMap<int, QString>;
 // MOC_SKIP_END
 #endif
-class ContactPrivate;
+class OContactPrivate;
 /**
 * OContact class represents a specialised PIM Record for contacts.
 * It does store all kind of persopn related information.
 *
 * @short Contact Container
@@ -46,12 +46,17 @@ class QPC_EXPORT OContact : public OPimRecord
    friend class DataSet;
 public:
    OContact();
    OContact( const QMap<int, QString> &fromMap );
    virtual ~OContact();
+    enum DateFormat{
+            Zip_City_State = 0,
+            City_State_Zip
+    };
    /*
     * do we need to inline them
     * if yes do we need to inline them this way?
     * -zecke
     */
    void setTitle( const QString &v ) { replace( Qtopia::Title, v ); }
@@ -230,11 +235,11 @@ private:
                            const QString &city,
                            const QString &state,
                            const QString &zip,
                            const QString &country ) const;
    QMap<int, QString> mMap;
-    ContactPrivate *d;
+    OContactPrivate *d;
 };
 #endif
diff --git a/libopie2/opiepim/orecordlist.h b/libopie2/opiepim/orecordlist.h
index edcd729..5211f57 100644
--- a/libopie2/opiepim/orecordlist.h
+++ b/libopie2/opiepim/orecordlist.h
@@ -4,12 +4,13 @@
 #include <qarray.h>
 #include "otemplatebase.h"
 #include "opimrecord.h"
+class ORecordListIteratorPrivate;
 /**
 * Our List Iterator
 * it behaves like STL or Qt
 *
 * for(it = list.begin(); it != list.end(); ++it )
 *   doSomeCoolStuff( (*it) );
@@ -68,15 +69,16 @@ private:
    const Base* m_temp;
    bool m_end : 1;
    T m_record;
    bool m_direction :1;
    /* d pointer for future versions */
-    class IteratorPrivate;
+    ORecordListIteratorPrivate *d;
-    IteratorPrivate *d;
 };
+class ORecordListPrivate;
 /**
 * The recordlist used as a return type
 * from OPimAccessTemplate
 */
 template <class T = OPimRecord >
 class ORecordList {
@@ -108,24 +110,25 @@ ORecordList( const QArray<int>& ids,
     */
     uint count()const;
    T operator[]( uint i );
    int uidAt(uint i );
-   /** 
+   /**
    * Remove the contact with given uid
    */
    bool remove( int uid );
    /*
      ConstIterator begin()const;
      ConstIterator end()const;
    */
 private:
    QArray<int> m_ids;
    const Base* m_acc;
+    ORecordListPrivate *d;
 };
 /* ok now implement it  */
 template <class T>
 ORecordListIterator<T>::ORecordListIterator() {
    m_current = 0;
@@ -217,12 +220,15 @@ bool ORecordListIterator<T>::operator!=( const ORecordListIterator<T>& it ) {
 template <class T>
 ORecordListIterator<T>::ORecordListIterator( const QArray<int> uids,
                                  const Base* t )
    : m_uids( uids ), m_current( 0 ),  m_temp( t ), m_end( false ),
      m_direction( false )
 {
+    /* if the list is empty we're already at the end of the list */
+    if (uids.count() == 0 )
+        m_end = true;
 }
 template <class T>
 uint ORecordListIterator<T>::current()const {
    return m_current;
 }
 template <class T>
diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp
index 38b93f7..5a18c37 100644
--- a/libopie2/opiepim/otodo.cpp
+++ b/libopie2/opiepim/otodo.cpp
@@ -25,12 +25,17 @@ struct OTodo::OTodoData : public QShared {
    OTodoData() : QShared() {
        recur = 0;
        state = 0;
        maintainer = 0;
        notifiers = 0;
    };
+    ~OTodoData() {
+        delete recur;
+        delete maintainer;
+        delete notifiers;
+    }
    QDate date;
    bool isCompleted:1;
    bool hasDate:1;
    int priority;
    QString desc;
@@ -271,30 +276,29 @@ QString OTodo::toShortText() const {
 QString OTodo::toRichText() const
 {
  QString text;
  QStringList catlist;
  // summary
-  text += "<b><h3><img src=\"todo/TodoList\">";
+  text += "<b><h3><img src=\"todo/TodoList\"> ";
  if ( !summary().isEmpty() ) {
      text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"),  "" );
  }
  text += "</h3></b><br><hr><br>";
  // description
  if( !description().isEmpty() ){
-    text += "<b>" + QObject::tr( "Description:" ) + "</b><br>";
+    text += "<b>" + QObject::tr( "Notes:" ) + "</b><br>";
-    text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) ;
+    text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) + "<br>";
  }
  // priority
  int priorityval = priority();
  text += "<b>" + QObject::tr( "Priority:") +" </b><img src=\"todo/priority" +
-          QString::number( priorityval ) + "\">";
+          QString::number( priorityval ) + "\"> ";
-//  text += "<b>" + QObject::tr( "Priority:") +"</b><img src=\"todo/priority" +
-//          QString::number( priority() ) + "\"><br>";
  switch ( priorityval )
  {
    case 1 : text += QObject::tr( "Very high" );
        break;
    case 2 : text += QObject::tr( "High" );
        break;
diff --git a/libopie2/opiepim/otodo.h b/libopie2/opiepim/otodo.h
index f9a345a..6df98b9 100644
--- a/libopie2/opiepim/otodo.h
+++ b/libopie2/opiepim/otodo.h
@@ -95,17 +95,12 @@ public:
     */
    bool hasDueDate() const;
    bool hasStartDate()const;
    bool hasCompletedDate()const;
    /**
-     * Does this Event has an alarm time ?
-     */
-    bool hasAlarmDateTime() const;
-    /**
     * What is the priority?
     */
    int priority()const ;
    /**
     * progress as ushort 0, 20, 40, 60, 80 or 100%
@@ -238,16 +233,12 @@ public:
    /**
     * set the completed date
     */
    void setCompletedDate( const QDate& date );
    void setRecurrence( const ORecur& );
-    /**
-     * set the alarm time
-     */
-    void setAlarmDateTime ( const QDateTime& alarm );
    void setDescription(const QString& );
    void setSummary(const QString& );
    /**
     * set the state of a Todo
diff --git a/libopie2/opiepim/ui/opimmainwindow.cpp b/libopie2/opiepim/ui/opimmainwindow.cpp
index 4044bc1..2739e26 100644
--- a/libopie2/opiepim/ui/opimmainwindow.cpp
+++ b/libopie2/opiepim/ui/opimmainwindow.cpp
@@ -1,12 +1,13 @@
 #include <qapplication.h>
 #include <qdatetime.h>
 #include <qcopchannel_qws.h>
 #include <qpe/sound.h>
 #include <qpe/qcopenvelope_qws.h>
+#include <qpe/qpeapplication.h>
 #include "opimresolver.h"
 #include "opimmainwindow.h"
 OPimMainWindow::OPimMainWindow( const QString& service, QWidget* parent,
                                const char* name, WFlags flag )
@@ -35,36 +36,43 @@ QCopChannel* OPimMainWindow::channel() {
    return m_channel;
 }
 void OPimMainWindow::doSetDocument( const QString&  ) {
 }
 void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array ) {
+    bool needShow = false;
    /*
     * create demands to create
     * a new record...
     */
    QDataStream stream(array, IO_ReadOnly);
    if ( cmd == "create()" ) {
+        raise();
        int uid = create();
        QCopEnvelope e(m_str, "created(int)" );
        e << uid;
+        needShow = true;
    }else if ( cmd == "remove(int)" ) {
        int uid;
        stream >> uid;
        bool rem = remove( uid );
        QCopEnvelope e(m_str, "removed(bool)" );
        e << rem;
+        needShow = true;
    }else if ( cmd == "beam(int)" ) {
        int uid;
        stream >> uid;
        beam( uid);
    }else if ( cmd == "show(int)" ) {
+        raise();
        int uid;
        stream >> uid;
        show( uid );
+        needShow = true;
    }else if ( cmd == "edit(int)" ) {
+        raise();
        int uid;
        stream >> uid;
        edit( uid );
    }else if ( cmd == "add(int,QByteArray)" ) {
        int rtti;
        QByteArray array;
@@ -72,22 +80,26 @@ void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array )
        stream >> array;
        m_fallBack = record(rtti, array );
        if (!m_fallBack) return;
        add( *m_fallBack );
        delete m_fallBack;
    }else if ( cmd == "alarm(QDateTime,int)" ) {
+        raise();
        QDateTime dt; int uid;
        stream >> dt;
        stream >> uid;
        qWarning(" Date: %s Uid: %d", dt.toString().latin1(), uid );
        QDateTime current = QDateTime::currentDateTime();
        if ( current.time().hour() != dt.time().hour() && current.time().minute() != dt.time().minute() )
            return;
        doAlarm( dt,  uid );
+        needShow = true;
    }
+    if (needShow )
+        QPEApplication::setKeepRunning();
 }
 /* implement the url scripting here */
 void OPimMainWindow::setDocument( const QString& str) {
    doSetDocument( str );
 }
 /*