Backing out unintentional merge from TT branch.

26 files changed, 432 insertions, 491 deletions

diff --git a/library/alarmserver.h b/library/alarmserver.h
index 665c3ae..f12a63d 100644
--- a/library/alarmserver.h
+++ b/library/alarmserver.h
@@ -7,29 +7,32 @@
 ** 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.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef ALARM_SERVER_H
 #define ALARM_SERVER_H
 
 #include <qstring.h>
 #include <qdatetime.h>
 
 class AlarmServer
 {
 public:
     static void addAlarm ( QDateTime when, const QCString& channel, const QCString& msg, int data=0);
     static void deleteAlarm (QDateTime when, const QCString& channel, const QCString& msg, int data=0);
+
+private:
+    friend int initApplication(int, char **);
     static void initialize();
 };
 
 #endif
 
diff --git a/library/applnk.h b/library/applnk.h
index c6f92a3..18e20b6 100644
--- a/library/applnk.h
+++ b/library/applnk.h
@@ -37,86 +37,89 @@ public:
     AppLnk( const AppLnk &copy ); // copy constructor
     virtual ~AppLnk();
 
     bool isValid() const { return !mLinkFile.isNull(); }
 
     static void setSmallIconSize(int);
     static void setBigIconSize(int);
     static int smallIconSize();
     static int bigIconSize();
 
     QString name() const { return mName; }
     const QPixmap& pixmap() const;
     const QPixmap& bigPixmap() const;
     virtual QString exec() const { return mExec; }
     QString type() const;
     QString rotation() const { return mRotation; }
     QString comment() const { return mComment; }
     QString file() const;
     QString linkFile() const;
     QStringList mimeTypes() const { return mMimeTypes; }
     QStringList mimeTypeIcons() const { return mMimeTypeIcons; }
     const QArray<int> &categories() const;
     int id() const { return mId; }
 
+    bool linkFileKnown() const { return !mLinkFile.isNull(); }
+
     void execute() const;
     void execute(const QStringList& args) const;
     void removeFiles();
     void removeLinkFile();
 
     void setName( const QString& docname );
     void setExec( const QString& exec );
     void setFile( const QString& filename );
     void setLinkFile( const QString& filename );
     void setComment( const QString& comment );
     void setType( const QString& mimetype );
     void setIcon( const QString& iconname );
     void setCategories( const QArray<int> &v );
     bool writeLink() const;
 
     void setProperty(const QString& key, const QString& value);
     QString property(const QString& key) const;
 
 protected:
     QString mName;
     QPixmap mPixmap;
     QPixmap mBigPixmap;
     QString mExec;
     QString mType;
     QString mRotation;
     QString mComment;
     QString mFile;
     QString mLinkFile;
     QString mIconFile;
     QStringList mMimeTypes;
     QStringList mMimeTypeIcons;
     int mId;
     static int lastId;
     AppLnkPrivate *d;
     friend class AppLnkSet;
 
     virtual void invoke(const QStringList& args) const;
     bool ensureLinkExists() const;
+    void storeLink() const;
 };
 
 class DocLnk : public AppLnk
 {
 public:
     DocLnk();
     DocLnk( const DocLnk &o ) : AppLnk(o) { }
     DocLnk( const QString &file );
     DocLnk( const QString &file, bool may_be_desktopfile );
     virtual ~DocLnk();
 
     QString exec() const;
 
 protected:
     void invoke(const QStringList& args) const;
 
 private:
     void init(const QString &file);
 };
 
 class AppLnkSet
 {
 public:
     AppLnkSet();
diff --git a/library/backend/categories.cpp b/library/backend/categories.cpp
index 91331db..6e011c4 100644
--- a/library/backend/categories.cpp
+++ b/library/backend/categories.cpp
@@ -150,78 +150,48 @@ int CategoryGroup::id(const QString &label) const
 
 QStringList CategoryGroup::labels() const
 {
     QStringList labels;
     for ( QMap<int, QString>::ConstIterator it = mIdLabelMap.begin();
 	  it != mIdLabelMap.end(); ++it )
 	labels += *it;
     // ### I don't think this is the place for this...
 //    labels.sort();
     return labels;
 }
 
 QStringList CategoryGroup::labels(const QArray<int> &catids ) const
 {
     QStringList labels;
     if ( catids.count() == 0 )
 	return labels;
     for ( QMap<int, QString>::ConstIterator it = mIdLabelMap.begin();
 	  it != mIdLabelMap.end(); ++it )
 	if ( catids.find( it.key() ) != -1 )
 	    labels += *it;
     return labels;
 }
 
-QArray<int> CategoryGroup::ids( const QStringList &cats ) const
-{
-    QArray<int> results;
-
-    for ( QStringList::ConstIterator catIt = cats.begin();
-	  catIt != cats.end(); ++catIt ) {
-	if ( *catIt == QObject::tr("All") || *catIt == QObject::tr("Unfiled") )
-	    continue;
-	int value = id( *catIt );
-	if ( value != 0 ) {
-	    int tmp = results.size();
-	    results.resize( tmp + 1 );
-	    results[ tmp ] = value;
-	}
-    }
-
-    return results;
-}
-
-QArray<int> CategoryGroup::ids() const
-{
-    QArray<int> results( mIdLabelMap.count() );
-    int i = 0;
-    for ( QMap<int, QString>::ConstIterator it = mIdLabelMap.begin();
-	  it != mIdLabelMap.end(); ++it )
-	results[i++] = it.key();
-
-    return results;
-}
-
 /***********************************************************
  *
  * Categories
  *
  **********************************************************/
 
 /** Add the category name as long as it doesn't already exist locally
  *  or globally.  Return TRUE if added, FALSE if conflicts.
  */
 int Categories::addCategory( const QString &appname,
 			     const QString &catname,
 			     int uid )
 {
     if ( mGlobalCats.contains(catname) )
 	return 0;
 
     QMap< QString, CategoryGroup >::Iterator
 	appIt = mAppCats.find( appname );
 
     if ( appIt == mAppCats.end() ) {
 	CategoryGroup newgroup;
 	newgroup.add( uid, catname );
 	mAppCats.insert( appname, newgroup );
 	emit categoryAdded( *this, appname, uid );
@@ -322,149 +292,130 @@ bool Categories::removeGlobalCategory( const QString &catname )
     return FALSE;
 }
 
 
 bool Categories::removeGlobalCategory( int uid )
 {
      if ( mGlobalCats.remove( uid ) ) {
 	emit categoryRemoved( *this, QString::null, uid );
 	return TRUE;
     }
     return FALSE;
 }
 
 /** Returns the sorted list of all categories that are associated with
  *   the app.  If includeGlobal parameter is TRUE then the returned
  *   categories will include the global category items.
  */
 QStringList Categories::labels( const QString &app,
 				bool includeGlobal,
 				ExtraLabels extra ) const
 {
     QMap< QString, CategoryGroup >::ConstIterator
 	appIt = mAppCats.find( app );
     QStringList cats;
+
+    if ( appIt != mAppCats.end() )
+	cats += (*appIt).labels();
+    else qDebug("Categories::labels didn't find app %s", app.latin1() );
+    if ( includeGlobal )
+	cats += mGlobalCats.labels();
+
+    cats.sort();
     switch ( extra ) {
     case NoExtra: break;
     case AllUnfiled:
 	cats.append( tr("All") );
 	cats.append( tr("Unfiled") );
 	break;
     case AllLabel:
 	cats.append( tr("All") );
 	break;
     case UnfiledLabel:
 	cats.append( tr("Unfiled") );
 	break;
     }
-    if ( appIt != mAppCats.end() )
-	cats += (*appIt).labels();
-    else qDebug("Categories::labels didn't find app %s", app.latin1() );
-    if ( includeGlobal )
-	cats += mGlobalCats.labels();
-    // I don't think a sorted list is useful, the user might find prefer
-    // it in the original order.
-//     cats.sort();
+
     return cats;
 }
 
 QString Categories::label( const QString &app, int id ) const
 {
     if ( mGlobalCats.contains( id ) )
 	return mGlobalCats.label( id );
     QMap< QString, CategoryGroup >::ConstIterator
 	appIt = mAppCats.find( app );
     if ( appIt == mAppCats.end() )
 	return QString::null;
     return (*appIt).label( id );
 }
 
-QStringList Categories::labels( const QString & app,
-				const QArray<int> &catids ) const
-{
-    QStringList strs = mGlobalCats.labels( catids );
-    strs += mAppCats[app].labels( catids );
-    return strs;
-}
-
 /** Returns a single string associated with the cat ids for display in
     *   a combobox or any area that requires one string.  If catids are empty
     *   then "Unfiled" will be returned.  If multiple categories are assigned
     *   the first cat id is shown with " (multi)" appended to the string.
     */
 QString Categories::displaySingle( const QString &app,
 				   const QArray<int> &catids,
 				   DisplaySingle display ) const
 {
     QStringList strs = labels( app, catids );
     if ( !strs.count() )
 	return tr("Unfiled");
     strs.sort();
     QString r;
     if ( strs.count() > 1 ) {
 	switch ( display ) {
 	case ShowFirst:
 	    r = strs.first();
 	    break;
 	case ShowMulti:
 	    r = strs.first() + tr(" (multi.)");
 	    break;
 	case ShowAll:
 	    r = strs.join(" ");
 	    break;
 	}
     }
     else r = strs.first(); 	
     return r;
 }
 
-QArray<int> Categories::ids( const QString &app ) const
-{
-    QArray<int> allIds = mGlobalCats.ids();
-    QArray<int> appIds = mAppCats[app].ids();
-
-    // we should make the guarentee that the ids are in the
-    // same order as the labels, (i.e. app cats then global)
-    // otherwise there is no point in having these two separate functions.
-    uint appSize = appIds.size();
-    appIds.resize( appSize + allIds.size() );
-    for ( uint i = appSize; i < appIds.size(); ++i )
-	appIds[int(i)] = allIds[int(i - appSize)];
-
-    return appIds;
-}
-
-QArray<int> Categories::ids( const QString &app, const QStringList &cats ) const
+QArray<int> Categories::ids( const QString &app, const QStringList &labels) const
 {
-    QArray<int> allIds = mGlobalCats.ids( cats );
-    QArray<int> appIds = mAppCats[app].ids( cats );
-
-    uint appSize = appIds.size();
-    appIds.resize( appSize + allIds.size() );
-    for ( uint i = appSize; i < appIds.size(); ++i )
-	appIds[int(i)] = allIds[int(i - appSize)];
-
-    return appIds;
+  QArray<int> results;
+  QStringList::ConstIterator it;
+  int i;
+  
+  for ( i=0, it=labels.begin(); it!=labels.end(); i++, ++it ) {
+    int value = id( app, *it );
+    if ( value != 0 ) {
+      int tmp = results.size();
+      results.resize( tmp + 1 );
+      results[ tmp ] = value;
+    }
+  }
+  return results;
 }
 
 int Categories::id( const QString &app, const QString &cat ) const
 {
     if ( cat == tr("Unfiled") || cat.contains( tr(" (multi.)") ) )
 	return 0;
     int uid = mGlobalCats.id( cat );
     if ( uid != 0 )
 	return uid;
     return mAppCats[app].id( cat );
 }
 
 
 /** Return TRUE if renaming succeeded; FALSE if app name not found,
  *   or if there was a name conflict
  */
 bool Categories::renameCategory( const QString &appname,
 				 const QString &oldName,
 				 const QString &newName )
 {
     QMap< QString, CategoryGroup >::Iterator
 	appIt = mAppCats.find( appname );
 
     if ( appIt != mAppCats.end() ) {
@@ -518,87 +469,112 @@ bool Categories::isGlobal( const QString &catname ) const
 bool Categories::exists( const QString &catname ) const
 {
     if ( isGlobal(catname) )
 	return TRUE;
 
     for ( QMap<QString, CategoryGroup>::ConstIterator appsIt = mAppCats.begin(); appsIt != mAppCats.end(); ++appsIt )
 	if ( exists( appsIt.key(), catname ) )
 	    return TRUE;
 
     return FALSE;
 }
 
 bool Categories::exists( const QString &appname,
 			 const QString &catname) const
 {
     QMap< QString, CategoryGroup >::ConstIterator
 	appIt = mAppCats.find( appname );
 
     if ( appIt == mAppCats.end() )
 	return FALSE;
 
     return (*appIt).contains( catname );
 }
 
+
 bool Categories::save( const QString &fname ) const
 {
-    QFile file( fname );
-    if ( !file.open( IO_WriteOnly ) ) {
+    QString strNewFile = fname + ".new";
+    QFile f( strNewFile );
+    QString out;
+    int total_written;
+
+    if ( !f.open( IO_WriteOnly|IO_Raw ) ) {
 	qWarning("Unable to write to %s", fname.latin1());
 	return FALSE;
     }
 
-    QTextStream ts( &file );
-    ts << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-    ts << "<!DOCTYPE CategoryList>" << endl;
+    out = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+    out += "<!DOCTYPE CategoryList>\n";
+
+    out += "<Categories>\n";
 
-    ts << "<Categories>" << endl;
     for ( QMap<int, QString>::ConstIterator git = mGlobalCats.idMap().begin();
 	  git != mGlobalCats.idMap().end(); ++git )
-	ts << "<Category id=\"" << git.key() << "\""
-	   << " name=\"" << escapeString(*git) << "\" />" << endl;
+	out += "<Category id=\"" + QString::number(git.key()) + "\"" +
+	  " name=\"" + escapeString(*git) + "\" />\n";
 
     for ( QMap<QString, CategoryGroup>::ConstIterator appsIt=mAppCats.begin();
 	  appsIt != mAppCats.end(); ++appsIt ) {
 	const QString &app = appsIt.key();
 	const QMap<int, QString> &appcats = (*appsIt).idMap();
 	for ( QMap<int, QString>::ConstIterator appcatit = appcats.begin();
 	      appcatit != appcats.end(); ++appcatit )
-	    ts << "<Category id=\"" << appcatit.key() << "\""
-	       << " app=\"" << escapeString(app) << "\""
-	       << " name=\"" << escapeString(*appcatit) << "\" />" << endl;
+	    out += "<Category id=\"" + QString::number(appcatit.key()) + "\"" +
+	      " app=\"" + escapeString(app) + "\"" +
+	      " name=\"" + escapeString(*appcatit) + "\" />\n";
+    }
+    out += "</Categories>\n";
+
+    QCString cstr = out.utf8();
+    total_written = f.writeBlock( cstr.data(), cstr.length() );
+    if ( total_written != int(cstr.length()) ) {
+	f.close();
+ 	QFile::remove( strNewFile );
+ 	return FALSE;
+    }
+    f.close();
+
+    if ( ::rename( strNewFile.latin1(), fname.latin1() ) < 0 ) {
+	qWarning( "problem renaming file %s to %s",
+		  strNewFile.latin1(), fname.latin1());
+	// remove the tmp file...
+	QFile::remove( strNewFile );
     }
-    ts << "</Categories>" << endl;
 
-    file.close();
     return TRUE;
 }
 
 bool Categories::load( const QString &fname )
 {
     QFile file( fname );
     if ( !file.open( IO_ReadOnly ) ) {
 	qWarning("Unable to open %s", fname.latin1());
+
+	addGlobalCategory(tr("Business"));
+	addGlobalCategory(tr("Personal"));
+	save(fname);
+
 	return FALSE;
     }
 
     clear();
     QByteArray ba = file.readAll();
     QString data = QString::fromUtf8( ba.data(), ba.size() );
     QChar *uc = (QChar *)data.unicode();
     int len = data.length();
 
     //     QTime t;
     //     t.start();
     QString name;
     QString id;
     QString app;
     int i = 0;
     while ( (i = data.find( "<Category ",  i)) != -1 ) {
 
 	i += 10;
 	name = QString::null;
 	app = QString::null;
 	while ( 1 ) {
 	    // skip white space
 	    while ( i < len &&
 		    (uc[i] == ' ' || uc[i] == '\n' || uc[i] == '\r') )
diff --git a/library/backend/categories.h b/library/backend/categories.h
index 82d765b..ba65ee3 100644
--- a/library/backend/categories.h
+++ b/library/backend/categories.h
@@ -50,50 +50,49 @@ public:
 
     void clear() { mIdLabelMap.clear(); mLabelIdMap.clear(); }
 
     int add( const QString &label );
     bool add( int uid, const QString &label );
 
     bool remove( const QString &label );
     bool remove( int uid );
 
     bool rename( int uid, const QString &newLabel );
     bool rename( const QString &oldLabel, const QString &newLabel );
 
     bool contains(int id) const;
     bool contains(const QString &label) const;
 
     /** Returns label associated with the uid or QString::null if
     *   not found
     */
     const QString &label(int id) const;
     /** Returns the uid associated with label or 0 if not found */
     int id(const QString &label) const;
 
     /** Returns a sorted list of labels */
     QStringList labels() const;
-    QArray<int> ids( const QStringList &cats ) const;
-    QArray<int> ids() const;
+
     QStringList labels( const QArray<int> &catids ) const;
 
     const QMap<int, QString> &idMap() const { return mIdLabelMap; }
 
 private:
     void insert( int uid, const QString &label );
     QMap<int, QString> mIdLabelMap;
     QMap<QString, int> mLabelIdMap;
 
     static Qtopia::UidGen &uidGen() { return sUidGen; }
     static Qtopia::UidGen sUidGen;
 };
 
 /** Map from application name to categories */
 class QPC_EXPORT Categories : public QObject
 {
     Q_OBJECT
 public:
     Categories( QObject *parent=0, const char *name = 0 )
 	: QObject( parent, name ),  mGlobalCats(), mAppCats() { }
     Categories( const Categories &copyFrom ) : QObject( copyFrom.parent() ),
 	mGlobalCats( copyFrom.mGlobalCats ),
     mAppCats( copyFrom.mAppCats ) { }
     virtual ~Categories() { }
@@ -109,75 +108,70 @@ public:
     */
     int addCategory( const QString &appname, const QString &catname);
     /** Add the category name as long as it doesn't already exist
     *  locally or globally.  Return UID if added, 0 if conflicts
     *  (error).
     */
     int addCategory( const QString &appname, const QString &catname, int uid);
     /** Add the global category just checking that it doesn't
     *  already exist globally. Return UID if added, 0 if conflicts.
     */
     int addGlobalCategory( const QString &catname );
     /** Add the global category just checking that it doesn't
     *  already exist globally. Return UID if added, 0 if conflicts.
     */
     int addGlobalCategory( const QString &catname, int uid );
     /** Removes the category from the application; if it is not found
     *   in the application, then it removes it from the global list
     */
     bool removeCategory( const QString &appName, const QString &catName,
 			 bool checkGlobal = TRUE);
     bool removeCategory( const QString &appName, int uid );
     bool removeGlobalCategory( const QString &catName );
     bool removeGlobalCategory( int uid );
 
-    QArray<int> ids( const QString &app ) const;
-    QArray<int> ids( const QString &app,
-		     const QStringList &cats ) const;
+    QArray<int> ids( const QString &app, const QStringList &labels) const;
+
     /** Returns the id associated with the app */
     int id( const QString &app, const QString &cat ) const;
     /** Returns the label associated with the id */
     QString label( const QString &app, int id ) const;
 
     enum ExtraLabels { NoExtra, AllUnfiled, AllLabel, UnfiledLabel };
     /** Returns the sorted list of all categories that are
     *   associated with the app.
     *   If includeGlobal parameter is TRUE then the returned
     *   categories will include the global category items.
     *   If extra = NoExtra, then
     *   If extra = AllUnfiled, then All and Unfiled will be prepended to
     *   the list
     *   If extra = AllLabel, then All is prepended
     *   If extra = UnfiledLabel, then Unfiled is prepended
     */
     QStringList labels( const QString &app,
 			bool includeGlobal = TRUE,
 			ExtraLabels extra = NoExtra ) const;
 
-    /** Returns the labels of the categories associated with the uids */
-    QStringList labels( const QString & app,
-			const QArray<int> &catids ) const;
-
     enum DisplaySingle { ShowMulti, ShowAll, ShowFirst };
 
     /** Returns a single string associated with the cat ids for display in
     *   a combobox or any area that requires one string.  If catids are empty
     *   then "Unfiled" will be returned.  If multiple categories are assigned
     *   then the behavior depends on the DisplaySingle type.
     *   If /a display is set to ShowMulti then  " (multi)" appended to the
     *   first string. If /a display is set to ShowAll, then a space seperated
     *   string is returned with all categories.  If ShowFirst is returned,
     *   the just the first string is returned.
     */
     QString displaySingle( const QString &app,
 			   const QArray<int> &catids,
 			   DisplaySingle display ) const;
 
     QStringList globalCategories() const { return mGlobalCats.labels();}
 
     bool renameCategory( const QString &appname,
 			 const QString &oldName,
 			 const QString &newName );
     bool renameGlobalCategory( const QString &oldName,
 			       const QString &newName );
 
     void setGlobal( const QString &appname, const QString &catname,
diff --git a/library/backend/contact.cpp b/library/backend/contact.cpp
index a5f10ab..b10b19a 100644
--- a/library/backend/contact.cpp
+++ b/library/backend/contact.cpp
@@ -1,47 +1,49 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** 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.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
+#define QTOPIA_INTERNAL_CONTACT_MRE
+
 #include "contact.h"
-#include "vobject_p.h"

-#include "qfiledirect_p.h"

+#include "vobject_p.h"
+#include "qfiledirect_p.h"
 
 #include <qpe/stringutil.h>
 #include <qpe/timeconversion.h>
 
 #include <qobject.h>
 #include <qregexp.h>
 #include <qstylesheet.h>
 #include <qfileinfo.h>
 
 #include <stdio.h>
 
 Qtopia::UidGen Contact::sUidGen( Qtopia::UidGen::Qtopia );
 
 Contact::Contact()
     : Record(), mMap(), d( 0 )
 {
 }
 
 Contact::Contact( const QMap<int, QString> &fromMap ) :
     Record(), mMap( fromMap ), d( 0 )
 {
     QString cats = mMap[ Qtopia::AddressCategory ];
     if ( !cats.isEmpty() )
 	setCategories( idsFromString( cats ) );
@@ -365,141 +367,149 @@ void Contact::save( QString &buf ) const
 
 	    key -= Qtopia::AddressCategory+1;
 	    buf += SLFIELDS[key];
 	    buf += "=\"" + Qtopia::escapeString(value) + "\" ";
 	}
     }
     buf += customToXml();
     if ( categories().count() > 0 )
 	buf += "Categories=\"" + idsToString( categories() ) + "\" ";
     buf += "Uid=\"" + QString::number( uid() ) + "\" ";
     // You need to close this yourself
 }
 
 QStringList Contact::fields()
 {
     QStringList list;
 
     list.append( "Title" );  // Not Used!
     list.append( "FirstName" );
     list.append( "MiddleName" );
     list.append( "LastName" );
     list.append( "Suffix" );
     list.append( "FileAs" );
 
+    list.append( "JobTitle" );
+    list.append( "Department" );
+    list.append( "Company" );
+    list.append( "BusinessPhone" );
+    list.append( "BusinessFax" );
+    list.append( "BusinessMobile" );
+
     list.append( "DefaultEmail" );
     list.append( "Emails" );
 
-    list.append( "HomeStreet" );
-    list.append( "HomeCity" );
-    list.append( "HomeState" );
-    list.append( "HomeZip" );
-    list.append( "HomeCountry" );
     list.append( "HomePhone" );
     list.append( "HomeFax" );
     list.append( "HomeMobile" );
-    list.append( "HomeWebPage" );
 
-    list.append( "Company" );
     list.append( "BusinessStreet" );
     list.append( "BusinessCity" );
     list.append( "BusinessState" );
     list.append( "BusinessZip" );
     list.append( "BusinessCountry" );
+    list.append( "BusinessPager" );
     list.append( "BusinessWebPage" );
-    list.append( "JobTitle" );
-    list.append( "Department" );
+
     list.append( "Office" );
-    list.append( "BusinessPhone" );
-    list.append( "BusinessFax" );
-    list.append( "BusinessMobile" );
-    list.append( "BusinessPager" );
     list.append( "Profession" );
     list.append( "Assistant" );
     list.append( "Manager" );
 
+    list.append( "HomeStreet" );
+    list.append( "HomeCity" );
+    list.append( "HomeState" );
+    list.append( "HomeZip" );
+    list.append( "HomeCountry" );
+    list.append( "HomeWebPage" );
+
     list.append( "Spouse" );
     list.append( "Gender" );
     list.append( "Birthday" );
     list.append( "Anniversary" );
     list.append( "Nickname" );
-
     list.append( "Children" );
+
     list.append( "Notes" );
+    list.append( "Groups" );
 
     return list;
 }
 
 QStringList Contact::trfields()
 {
     QStringList list;
 
     list.append( QObject::tr( "Name Title") );
     list.append( QObject::tr( "First Name" ) );
     list.append( QObject::tr( "Middle Name" ) );
     list.append( QObject::tr( "Last Name" ) );
     list.append( QObject::tr( "Suffix" ) );
     list.append( QObject::tr( "File As" ) );
 
+    list.append( QObject::tr( "Job Title" ) );
+    list.append( QObject::tr( "Department" ) );
+    list.append( QObject::tr( "Company" ) );
+    list.append( QObject::tr( "Business Phone" ) );
+    list.append( QObject::tr( "Business Fax" ) );
+    list.append( QObject::tr( "Business Mobile" ) );
+
     list.append( QObject::tr( "Default Email" ) );
     list.append( QObject::tr( "Emails" ) );
 
-    list.append( QObject::tr( "Home Street" ) );
-    list.append( QObject::tr( "Home City" ) );
-    list.append( QObject::tr( "Home State" ) );
-    list.append( QObject::tr( "Home Zip" ) );
-    list.append( QObject::tr( "Home Country" ) );
     list.append( QObject::tr( "Home Phone" ) );
     list.append( QObject::tr( "Home Fax" ) );
     list.append( QObject::tr( "Home Mobile" ) );
-    list.append( QObject::tr( "Home Web Page" ) );
 
-    list.append( QObject::tr( "Company" ) );
     list.append( QObject::tr( "Business Street" ) );
     list.append( QObject::tr( "Business City" ) );
     list.append( QObject::tr( "Business State" ) );
     list.append( QObject::tr( "Business Zip" ) );
     list.append( QObject::tr( "Business Country" ) );
+    list.append( QObject::tr( "Business Pager" ) );
     list.append( QObject::tr( "Business WebPage" ) );
-    list.append( QObject::tr( "Job Title" ) );
-    list.append( QObject::tr( "Department" ) );
+
     list.append( QObject::tr( "Office" ) );
-    list.append( QObject::tr( "Business Phone" ) );
-    list.append( QObject::tr( "Business Fax" ) );
-    list.append( QObject::tr( "Business Mobile" ) );
-    list.append( QObject::tr( "Business Pager" ) );
     list.append( QObject::tr( "Profession" ) );
     list.append( QObject::tr( "Assistant" ) );
     list.append( QObject::tr( "Manager" ) );
 
+    list.append( QObject::tr( "Home Street" ) );
+    list.append( QObject::tr( "Home City" ) );
+    list.append( QObject::tr( "Home State" ) );
+    list.append( QObject::tr( "Home Zip" ) );
+    list.append( QObject::tr( "Home Country" ) );
+    list.append( QObject::tr( "Home Web Page" ) );
+
     list.append( QObject::tr( "Spouse" ) );
     list.append( QObject::tr( "Gender" ) );
     list.append( QObject::tr( "Birthday" ) );
     list.append( QObject::tr( "Anniversary" ) );
     list.append( QObject::tr( "Nickname" ) );
-
     list.append( QObject::tr( "Children" ) );
+
     list.append( QObject::tr( "Notes" ) );
+    list.append( QObject::tr( "Groups" ) );
 
     return list;
 }
 
 void Contact::setEmails( const QString &v )
 {
     replace( Qtopia::Emails, v );
     if ( v.isEmpty() )
         setDefaultEmail( QString::null );
 }
 
 void Contact::setChildren( const QString &v )
 {
     replace( Qtopia::Children, v );
 }
 
 // vcard conversion code
 static inline VObject *safeAddPropValue( VObject *o, const char *prop, const QString &value )
 {
     VObject *ret = 0;
     if ( o && !value.isEmpty() )
 	ret = addPropValue( o, prop, value.latin1() );
     return ret;
 }
@@ -608,49 +618,49 @@ static VObject *createVObject( const Contact &c )
     safeAddPropValue( vcard, "X-Qtopia-Nickname", c.nickname() );
     safeAddPropValue( vcard, "X-Qtopia-Children", c.children() );
 
     return vcard;
 }
 
 
 static Contact parseVObject( VObject *obj )
 {
     Contact c;
 
     bool haveDefaultEmail = FALSE;
 
     VObjectIterator it;
     initPropIterator( &it, obj );
     while( moreIteration( &it ) ) {
 	VObject *o = nextVObject( &it );
 	QCString name = vObjectName( o );
 	QCString value = vObjectStringZValue( o );
 	if ( name == VCNameProp ) {
 	    VObjectIterator nit;
 	    initPropIterator( &nit, o );
 	    while( moreIteration( &nit ) ) {
 		VObject *o = nextVObject( &nit );
-		QCString name = vObjectName( o );
+		QCString name = vObjectTypeInfo( o );
 		QString value = vObjectStringZValue( o );
 		if ( name == VCNamePrefixesProp )
 		    c.setTitle( value );
 		else if ( name == VCNameSuffixesProp )
 		    c.setSuffix( value );
 		else if ( name == VCFamilyNameProp )
 		    c.setLastName( value );
 		else if ( name == VCGivenNameProp )
 		    c.setFirstName( value );
 		else if ( name == VCAdditionalNamesProp )
 		    c.setMiddleName( value );
 	    }
 	}
 	else if ( name == VCAdrProp ) {
 	    bool work = TRUE; // default address is work address
 	    QString street;
 	    QString city;
 	    QString region;
 	    QString postal;
 	    QString country;
 
 	    VObjectIterator nit;
 	    initPropIterator( &nit, o );
 	    while( moreIteration( &nit ) ) {
@@ -681,119 +691,119 @@ static Contact parseVObject( VObject *obj )
 	    } else {
 		c.setHomeStreet( street );
 		c.setHomeCity( city );
 		c.setHomeCountry( country );
 		c.setHomeZip( postal );
 		c.setHomeState( region );
 	    }
 	}
 	else if ( name == VCTelephoneProp ) {
 	    enum {
 		HOME = 0x01,
 		WORK = 0x02,
 		VOICE = 0x04,
 		CELL = 0x08,
 		FAX = 0x10,
 		PAGER = 0x20,
 		UNKNOWN = 0x80
 	    };
 	    int type = 0;
 
 	    VObjectIterator nit;
 	    initPropIterator( &nit, o );
 	    while( moreIteration( &nit ) ) {
 		VObject *o = nextVObject( &nit );
-		QCString name = vObjectName( o );
+		QCString name = vObjectTypeInfo( o );
 		if ( name == VCHomeProp )
 		    type |= HOME;
 		else if ( name == VCWorkProp )
 		    type |= WORK;
 		else if ( name == VCVoiceProp )
 		    type |= VOICE;
 		else if ( name == VCCellularProp )
 		    type |= CELL;
 		else if ( name == VCFaxProp )
 		    type |= FAX;
 		else if ( name == VCPagerProp )
 		    type |= PAGER;
 		else  if ( name == VCPreferredProp )
 		    ;
 		else
 		    type |= UNKNOWN;
 	    }
 	    if ( (type & UNKNOWN) != UNKNOWN ) {
 		if ( ( type & (HOME|WORK) ) == 0 ) // default
 		    type |= HOME;
 		if ( ( type & (VOICE|CELL|FAX|PAGER) ) == 0 ) // default
 		    type |= VOICE;
 
 		if ( (type & (VOICE|HOME) ) == (VOICE|HOME) )
 		    c.setHomePhone( value );
 		if ( ( type & (FAX|HOME) ) == (FAX|HOME) )
 		    c.setHomeFax( value );
 		if ( ( type & (CELL|HOME) ) == (CELL|HOME) )
 		    c.setHomeMobile( value );
 		if ( ( type & (VOICE|WORK) ) == (VOICE|WORK) )
 		    c.setBusinessPhone( value );
 		if ( ( type & (FAX|WORK) ) == (FAX|WORK) )
 		    c.setBusinessFax( value );
 		if ( ( type & (CELL|WORK) ) == (CELL|WORK) )
 		    c.setBusinessMobile( value );
 		if ( ( type & (PAGER|WORK) ) == (PAGER|WORK) )
 		    c.setBusinessPager( value );
 	    }
 	}
 	else if ( name == VCEmailAddressProp ) {
 	    QString email = vObjectStringZValue( o );
 	    bool valid = TRUE;
 	    VObjectIterator nit;
 	    initPropIterator( &nit, o );
 	    while( moreIteration( &nit ) ) {
 		VObject *o = nextVObject( &nit );
-		QCString name = vObjectName( o );
+		QCString name = vObjectTypeInfo( o );
 		if ( name != VCInternetProp && name != VCHomeProp &&
 		     name != VCWorkProp &&
 		     name != VCPreferredProp )
 		    // ### preffered should map to default email
 		    valid = FALSE;
 	    }
 	    if ( valid ) {
 		if ( haveDefaultEmail ) {
 		    QString str = c.emails();
 		    if ( !str.isEmpty() )
 			str += ","+email;
 		    c.setEmails( str );
 		} else {
 		    c.setDefaultEmail( email );
 		}
 	    }
 	}
 	else if ( name == VCURLProp ) {
 	    VObjectIterator nit;
 	    initPropIterator( &nit, o );
 	    while( moreIteration( &nit ) ) {
 		VObject *o = nextVObject( &nit );
-		QCString name = vObjectName( o );
+		QCString name = vObjectTypeInfo( o );
 		if ( name == VCHomeProp )
 		    c.setHomeWebpage( value );
 		else if ( name == VCWorkProp )
 		    c.setBusinessWebpage( value );
 	    }
 	}
 	else if ( name == VCOrgProp ) {
 	    VObjectIterator nit;
 	    initPropIterator( &nit, o );
 	    while( moreIteration( &nit ) ) {
 		VObject *o = nextVObject( &nit );
 		QCString name = vObjectName( o );
 		QString value = vObjectStringZValue( o );
 		if ( name == VCOrgNameProp )
 		    c.setCompany( value );
 		else if ( name == VCOrgUnitProp )
 		    c.setDepartment( value );
 		else if ( name == VCOrgUnit2Prop )
 		    c.setOffice( value );
 	    }
 	}
 	else if ( name == VCTitleProp ) {
 	    c.setJobTitle( value );
 	}
@@ -821,89 +831,94 @@ static Contact parseVObject( VObject *obj )
 	else if ( name == "X-Qtopia-Children" ) {
 	    c.setChildren( value );
 	}
 
 
 #if 0
 	else {
 	    printf("Name: %s, value=%s\n", name.data(), vObjectStringZValue( o ) );
 	    VObjectIterator nit;
 	    initPropIterator( &nit, o );
 	    while( moreIteration( &nit ) ) {
 		VObject *o = nextVObject( &nit );
 		QCString name = vObjectName( o );
 		QString value = vObjectStringZValue( o );
 		printf(" subprop: %s = %s\n", name.data(), value.latin1() );
 	    }
 	}
 #endif
     }
     c.setFileAs();
     return c;
 }
 
 void Contact::writeVCard( const QString &filename, const QValueList<Contact> &contacts)
-{

-	QFileDirect f( filename.utf8().data() );

-	if ( !f.open( IO_WriteOnly ) ) {

-		qWarning("Unable to open vcard write");

-		return;

-	}

+{
+	QFileDirect f( filename.utf8().data() );
+	if ( !f.open( IO_WriteOnly ) ) {
+		qWarning("Unable to open vcard write");
+		return;
+	}
 
     QValueList<Contact>::ConstIterator it;
     for( it = contacts.begin(); it != contacts.end(); ++it ) {
 	VObject *obj = createVObject( *it );
 	writeVObject(f.directHandle() , obj );
 	cleanVObject( obj );
     }
     cleanStrTbl();
 }
 
 void Contact::writeVCard( const QString &filename, const Contact &contact)
-{

-	QFileDirect f( filename.utf8().data() );

-	if ( !f.open( IO_WriteOnly ) ) {

-		qWarning("Unable to open vcard write");

-		return;

-	}

+{
+	QFileDirect f( filename.utf8().data() );
+	if ( !f.open( IO_WriteOnly ) ) {
+		qWarning("Unable to open vcard write");
+		return;
+	}
 
     VObject *obj = createVObject( contact );
 	writeVObject( f.directHandle() , obj );
 	cleanVObject( obj );
 
 	cleanStrTbl();
 }
 
 
 QValueList<Contact> Contact::readVCard( const QString &filename )
 {
     qDebug("trying to open %s, exists=%d", filename.utf8().data(), QFileInfo( filename.utf8().data() ).size() );
     VObject *obj = Parse_MIME_FromFileName( (char *)filename.utf8().data() );
 
     qDebug("vobject = %p", obj );
 
     QValueList<Contact> contacts;
 
     while ( obj ) {
 	contacts.append( parseVObject( obj ) );
 
 	VObject *t = obj;
 	obj = nextVObjectInList(obj);
 	cleanVObject( t );
     }
 
     return contacts;
 }
 
+bool Contact::match( const QString &regexp ) const
+{
+    return match(QRegExp(regexp));
+}
+
 bool Contact::match( const QRegExp &r ) const
 {
     bool match;
     match = false;
     QMap<int, QString>::ConstIterator it;
     for ( it = mMap.begin(); it != mMap.end(); ++it ) {
 	if ( (*it).find( r ) > -1 ) {
 	    match = true;
 	    break;
 	}
     }
     return match;
 }
diff --git a/library/backend/contact.h b/library/backend/contact.h
index 6abdab6..a74cbbe 100644
--- a/library/backend/contact.h
+++ b/library/backend/contact.h
@@ -80,49 +80,54 @@ public:
     void setBusinessCountry( const QString &v ) { replace( Qtopia::BusinessCountry, v ); }
     void setBusinessWebpage( const QString &v ) { replace( Qtopia::BusinessWebPage, v ); }
     void setJobTitle( const QString &v ) { replace( Qtopia::JobTitle, v ); }
     void setDepartment( const QString &v ) { replace( Qtopia::Department, v ); }
     void setOffice( const QString &v ) { replace( Qtopia::Office, v ); }
     void setBusinessPhone( const QString &v ) { replace( Qtopia::BusinessPhone, v ); }
     void setBusinessFax( const QString &v ) { replace( Qtopia::BusinessFax, v ); }
     void setBusinessMobile( const QString &v ) { replace( Qtopia::BusinessMobile, v ); }
     void setBusinessPager( const QString &v ) { replace( Qtopia::BusinessPager, v ); }
     void setProfession( const QString &v ) { replace( Qtopia::Profession, v ); }
     void setAssistant( const QString &v ) { replace( Qtopia::Assistant, v ); }
     void setManager( const QString &v ) { replace( Qtopia::Manager, v ); }
 
     // personal
     void setSpouse( const QString &v ) { replace( Qtopia::Spouse, v ); }
     void setGender( const QString &v ) { replace( Qtopia::Gender, v ); }
     void setBirthday( const QString &v ) { replace( Qtopia::Birthday, v ); }
     void setAnniversary( const QString &v ) { replace( Qtopia::Anniversary, v ); }
     void setNickname( const QString &v ) { replace( Qtopia::Nickname, v ); }
     void setChildren( const QString &v );
 
     // other
     void setNotes( const QString &v ) { replace( Qtopia::Notes, v); }
 
-    bool match( const QRegExp &r ) const;
+    bool match( const QString &regexp ) const;
+
+// DON'T ATTEMPT TO USE THIS
+#ifdef QTOPIA_INTERNAL_CONTACT_MRE
+    bool match( const QRegExp &regexp ) const;
+#endif
 
 //     // custom
 //     void setCustomField( const QString &key, const QString &v )
 //         { replace(Custom- + key, v ); }
 
     // name
     QString fullName() const;
     QString title() const { return find( Qtopia::Title ); }
     QString firstName() const { return find( Qtopia::FirstName ); }
     QString middleName() const { return find( Qtopia::MiddleName ); }
     QString lastName() const { return find( Qtopia::LastName ); }
     QString suffix() const { return find( Qtopia::Suffix ); }
     QString fileAs() const { return find( Qtopia::FileAs ); }
 
     // email
     QString defaultEmail() const { return find( Qtopia::DefaultEmail ); }
     QString emails() const { return find( Qtopia::Emails ); }
     QStringList emailList() const;
 
     // home
     QString homeStreet() const { return find( Qtopia::HomeStreet ); }
     QString homeCity() const { return find( Qtopia::HomeCity ); }
     QString homeState() const { return find( Qtopia::HomeState ); }
     QString homeZip() const { return find( Qtopia::HomeZip ); }
diff --git a/library/backend/event.h b/library/backend/event.h
index 0ebe9ea..277aadd 100644
--- a/library/backend/event.h
+++ b/library/backend/event.h
@@ -119,49 +119,54 @@ public:
     // returns a proper days-char for a given dayOfWeek()
     static char day( int dayOfWeek ) { return 1 << ( dayOfWeek - 1 ); }
     // returns the dayOfWeek for the *first* day it finds (ignores
     // any further days!). Returns 1 (Monday) if there isn't any day found
     static int dayOfWeek( char day );
     // returns the difference of months from first to second.
     static int monthDiff( const QDate& first, const QDate& second );
     bool match( const QRegExp &r ) const;
 
 private:
     Qtopia::UidGen &uidGen() { return sUidGen; }
     static Qtopia::UidGen sUidGen;
 
     QString descript, locat, categ;
     Type typ : 4;
     bool startTimeDirty : 1;
     bool endTimeDirty : 1;
     time_t startUTC, endUTC;
     QString tz;
     bool hAlarm, hRepeat;
     int aMinutes;
     SoundTypeChoice aSound;
     RepeatPattern pattern;
     QString note;
+    // ADDITION
+    int mRid;	// Recode ID
+    int mRinfo;	// Recode Info
+    //
     EventPrivate *d;
+
 };
 
 // Since an event spans multiple day, it is better to have this
 // class to represent a day instead of creating many
 // dummy events...
 
 class EffectiveEventPrivate;
 class QPC_EXPORT EffectiveEvent
 {
 public:
     // If we calculate the effective event of a multi-day event
     // we have to figure out whether we are at the first day,
     // at the end, or anywhere else ("middle"). This is important
     // for the start/end times (00:00/23:59)
     // MidWay: 00:00 -> 23:59, as we are "in the middle" of a multi-
     //         day event
     // Start: start time -> 23:59
     // End: 00:00 -> end time
     // Start | End == StartEnd: for single-day events (default)
     //                          here we draw start time -> end time
     enum Position { MidWay = 0, Start = 1, End = 2, StartEnd = 3 };
 
     EffectiveEvent();
     EffectiveEvent( const Event &event, const QDate &startDate, Position pos = StartEnd );
diff --git a/library/backend/recordfields.h b/library/backend/recordfields.h
index 3cddde2..4196c8b 100644
--- a/library/backend/recordfields.h
+++ b/library/backend/recordfields.h
@@ -10,126 +10,140 @@
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING
 ** THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 ** PURPOSE.
 **
 ** email sales@trolltech.com for information about Qtopia License
 ** Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef QPC_RECORD_FIELDS_H
 #define QPC_RECORD_FIELDS_H
 #include "qpcglobal.h"
 
 // dataset = "addressbook"
 namespace Qtopia
 {
     static const int UID_ID = 0;
     static const int CATEGORY_ID = 1;
 
     enum AddressBookFields {
 	AddressUid = UID_ID,	
 	AddressCategory = CATEGORY_ID,
-	
+
+	// NOTE: Order of fields dependency in backend/contact.cpp
+
 	Title,
 	FirstName,
 	MiddleName,
 	LastName,
 	Suffix,
 	FileAs,
 
+	JobTitle,
+	Department,
+	Company,
+	BusinessPhone,
+	BusinessFax,
+	BusinessMobile,
+
 	// email
 	DefaultEmail,
 	Emails,
 
-	// home
-	HomeStreet,
-	HomeCity,
-	HomeState,
-	HomeZip,
-	HomeCountry,
 	HomePhone,
 	HomeFax,
 	HomeMobile,
-	HomeWebPage,
 
 	// business
-	Company,
 	BusinessStreet,
 	BusinessCity,
 	BusinessState,
 	BusinessZip,
 	BusinessCountry,
+	BusinessPager,
 	BusinessWebPage,
-	JobTitle,
-	Department,
+
 	Office,
-	BusinessPhone,
-	BusinessFax,
-	BusinessMobile,
-	BusinessPager,
 	Profession,
 	Assistant,
 	Manager,
 
+	// home
+	HomeStreet,
+	HomeCity,
+	HomeState,
+	HomeZip,
+	HomeCountry,
+	HomeWebPage,
+
 	//personal
 	Spouse,
 	Gender,
 	Birthday,
 	Anniversary,
 	Nickname,
 	Children,
 
 	// other
 	Notes,
 	Groups
+
+	,rid,
+	rinfo
     };
 
     // dataset = "todolist"
     enum TaskFields {
 	TaskUid = UID_ID,
 	TaskCategory = CATEGORY_ID,
 	
 	HasDate,
 	Completed,
 	TaskDescription,
 	Priority,
-	Date	
+	Date,
+
+	TaskRid,
+	TaskRinfo
     };
 
     // dataset = "categories" for todos
     enum CategoryFields {
 	CatUid = UID_ID,
 	CatName,
 	CatAppGroup
     };
 
 
 // dataset = "datebook"
     enum DatebookFields {
 	DatebookUid = UID_ID,
 	DatebookCategory = CATEGORY_ID,
 	
 	DatebookDescription,
 	Location,
 	TimeZone,
 	Note,
 	StartDateTime,
 	EndDateTime,
 	DatebookType,
 	HasAlarm,
 	SoundType,
 	AlarmTime,
 
 	RepeatPatternType,
 	RepeatPatternFrequency,
 	RepeatPatternPosition,
 	RepeatPatternDays,
 	RepeatPatternHasEndDate,
 	RepeatPatternEndDate,	
+
+	DateBookRid,
+	DateBookRinfo
     };
 };
 
 
 #endif
diff --git a/library/backend/task.h b/library/backend/task.h
index ffe26b0..6f383b8 100644
--- a/library/backend/task.h
+++ b/library/backend/task.h
@@ -51,27 +51,31 @@ public:
     { mDesc = Qtopia::simplifyMultiLineSpace(description); }
     const QString &description() const { return mDesc; }
 
     void setDueDate( const QDate& date, bool hasDue ) { mDueDate = date; mDue = hasDue; }
     const QDate &dueDate() const { return mDueDate; }
     bool hasDueDate() const { return mDue; }
     void setHasDueDate( bool b ) { mDue = b; }
     
     void setCompleted( bool b ) { mCompleted = b; }
     bool isCompleted() const { return mCompleted; }
 
     void save( QString& buf ) const;
     bool match( const QRegExp &r ) const;
 
 private:
     Qtopia::UidGen &uidGen() { return sUidGen; }
     static Qtopia::UidGen sUidGen;
 
     bool mDue;
     QDate mDueDate;
     bool mCompleted;
     int mPriority;
     QString mDesc;
     TaskPrivate *d;
+    // ADDITION
+    int recordId;
+    int recordInfo;
+    //
 };
 
 #endif
diff --git a/library/backend/vobject.cpp b/library/backend/vobject.cpp
index af112a7..9c2ba3b 100644
--- a/library/backend/vobject.cpp
+++ b/library/backend/vobject.cpp
@@ -1186,25 +1186,34 @@ DLLEXPORT(void) writeVObjectToFile(char *fname, VObject *o)
 {

 	QFileDirect f( fname);

 	if ( !f.open( IO_WriteOnly ) ) {

 		qWarning("Unable to open vobject write %s", fname);

 		return;

 	}

 

     writeVObject( f.directHandle(),o );

 }

 

 DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list)

 {

 	QFileDirect f( fname);

 	if ( !f.open( IO_WriteOnly ) ) {

 		qWarning("Unable to open vobject write %s", fname);

 		return;

 	}

 

 	while (list) {

 	    writeVObject(f.directHandle(),list);

 	    list = nextVObjectInList(list);

 	    }

 }

 

+DLLEXPORT(const char *) vObjectTypeInfo(VObject *o)

+{

+    const char *type = vObjectName( o );

+    if ( strcmp( type, "TYPE" ) == 0 )

+	type = vObjectStringZValue( o );

+    return type;

+}

+

+

 // end of source file vobject.c

diff --git a/library/backend/vobject_p.h b/library/backend/vobject_p.h
index b6a2c0a..a0d921e 100644
--- a/library/backend/vobject_p.h
+++ b/library/backend/vobject_p.h
@@ -375,27 +375,30 @@ typedef void (*MimeErrorHandler)(char *);
 extern DLLEXPORT(void) registerMimeErrorHandler(MimeErrorHandler);

 

 extern DLLEXPORT(VObject*) Parse_MIME(const char *input, unsigned long len);

 extern DLLEXPORT(VObject*) Parse_MIME_FromFileName(char* fname);

 

 

 /* NOTE regarding Parse_MIME_FromFile

 The function above, Parse_MIME_FromFile, comes in two flavors,

 neither of which is exported from the DLL. Each version takes

 a CFile or FILE* as a parameter, neither of which can be

 passed across a DLL interface (at least that is my experience).

 If you are linking this code into your build directly then

 you may find them a more convenient API that the other flavors

 that take a file name. If you use them with the DLL LIB you

 will get a link error.

 */

 

 

 #if INCLUDEMFC

 extern VObject* Parse_MIME_FromFile(CFile *file);

 #else

 extern VObject* Parse_MIME_FromFile(FILE *file);

 #endif

 

+extern DLLEXPORT(const char *) vObjectTypeInfo(VObject *o);

+

+

 #endif /* __VOBJECT_H__ */

 

 

diff --git a/library/categoryedit_p.cpp b/library/categoryedit_p.cpp
index 06e5fec..07e707e 100644
--- a/library/categoryedit_p.cpp
+++ b/library/categoryedit_p.cpp
@@ -54,51 +54,53 @@ public:
 };
 
 CategoryEdit::CategoryEdit( QWidget *parent, const char *name )
     : CategoryEditBase( parent, name )
 {
     d = 0;
 }
 
 CategoryEdit::CategoryEdit( const QArray<int> &recCats,
 			    const QString &appName, const QString &visibleName,
 			    QWidget *parent, const char *name )
     : CategoryEditBase( parent, name )
 {
     d = 0;
     setCategories( recCats, appName, visibleName );
 }
 
 void CategoryEdit::setCategories( const QArray<int> &recCats,
 				  const QString &appName, const QString &visibleName )
 {
     if ( !d )
 	d = new CategoryEditPrivate( (QWidget*)parent(), name()  );
     d->mStrApp = appName;
     d->mVisible = visibleName;
-    QArray<int> cats = d->mCategories.ids( d->mStrApp );
-    lvView->clear();
+
     QStringList appCats = d->mCategories.labels( d->mStrApp );
+    QArray<int> cats = d->mCategories.ids(d->mStrApp, appCats);
+    lvView->clear();
+
     QStringList::ConstIterator it;
     int i, j;
     for ( i = 0, it = appCats.begin(); it != appCats.end(); i++, ++it ) {
 	QCheckListItem *chk;
 	chk = new QCheckListItem( lvView, (*it), QCheckListItem::CheckBox );
 	if ( !d->mCategories.isGlobal((*it)) )
 	    chk->setText( 1, tr(d->mVisible) );
 	else
 	    chk->setText( 1, tr("All") );
 	// Is this record using this category, then we should check it
 	for ( j = 0; j < int(recCats.count()); j++ ) {
 	    if ( cats[i] == recCats[j] ) {
 		chk->setOn( true );
 		break;
 	    }
 	}
     }
     lvView->setSorting( 0, TRUE );
     lvView->sort();
     if ( lvView->childCount() < 1 )
 	txtCat->setEnabled( FALSE );
     else {
 	lvView->setSelected( lvView->firstChild(), true );
     }
diff --git a/library/categoryselect.cpp b/library/categoryselect.cpp
index dc5d1fa..21b3f91 100644
--- a/library/categoryselect.cpp
+++ b/library/categoryselect.cpp
@@ -1,315 +1,452 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** 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.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include <qpe/categories.h>
+#include <qpe/palmtoprecord.h>
 
-#include <qdialog.h>
+#include <qmessagebox.h>
 #include <qlayout.h>
 #include <qtoolbutton.h>
+#include <qfile.h>
 
 #include "categorywidget.h"
 #include "categoryselect.h"
 
+#include <stdlib.h>
+
+static QString categoryEdittingFileName()
+{
+    QString str = getenv("HOME");
+    str +="/.cateditting";
+    return str;
+}
 
 class CategoryComboPrivate
 {
 public:
     CategoryComboPrivate(QObject *o)
 	: mCat( o )
     {
     }
     QArray<int> mAppCats;
     QString mStrAppName;
     QString mStrVisibleName;
     Categories mCat;
 };
 
 class CategorySelectPrivate
 {
 public:
     CategorySelectPrivate( const QArray<int> &cats)
 	: mRec( cats ),
 	  usingAll( false )
     {
     }
     CategorySelectPrivate()
     {
     }
     QArray<int> mRec;
     bool usingAll;
     QString mVisibleName;
 };
 
-CategoryCombo::CategoryCombo( QWidget *parent, const char *name )
+CategoryCombo::CategoryCombo( QWidget *parent, const char *name , int width)
     : QComboBox( parent, name )
 {
     d = new CategoryComboPrivate(this);
+    if (width)
+      setFixedWidth(width);
 }
 
 void CategoryCombo::initCombo( const QArray<int> &recCats,
 			       const QString &appName )
 {
     initCombo( recCats, appName, appName );
 }
 
 void CategoryCombo::initCombo( const QArray<int> &recCats,
 			       const QString &appName,
 			       const QString &visibleName )
 {
     d->mStrAppName = appName;
     d->mStrVisibleName = visibleName;
     clear();
     QStringList slApp;
 
+    QObject::disconnect( this, SIGNAL(activated(int)),
+		      this, SLOT(slotValueChanged(int)) );
+
     QObject::connect( this, SIGNAL(activated(int)),
 		      this, SLOT(slotValueChanged(int)) );
     bool loadOk = d->mCat.load( categoryFileName() );
     slApp = d->mCat.labels( d->mStrAppName, TRUE, Categories::UnfiledLabel );
-    d->mAppCats = d->mCat.ids( d->mStrAppName );
+
+    d->mAppCats = d->mCat.ids( d->mStrAppName, slApp);
 
     int i,
 	j,
 	saveMe,
 	recCount;
     QStringList::Iterator it;
     // now add in all the items...
     recCount = recCats.count();
     saveMe = -1;
     if ( recCount > 1 && loadOk ) {
 	it = slApp.begin();
-	insertItem( *it );
-	++it;
-	for ( j = 0; it != slApp.end(); ++it, j++ ) {
+	for ( j = 0; j< (int)(slApp.count()-1); ++it, j++ ) {
 	    // grr... we have to go through and compare...
 	    if ( j < int(d->mAppCats.size()) ) {
 		for ( i = 0; i < recCount; i++ ) {
 		    if ( recCats[i] == d->mAppCats[j] ) {
 			(*it).append( tr(" (Multi.)") );
 			if ( saveMe < 0 )
 			    saveMe = j;
 			// no need to continue through the list.
 			break;
 		    }
 		}
 	    }
 	    insertItem( *it );
 	}
+	insertItem( *it );
     } else
 	insertStringList( slApp );
 
     if ( recCount > 0 && loadOk ) {
 	for ( i = 0; i < int(d->mAppCats.size()); i++ ) {
 	    if ( d->mAppCats[i] == recCats[0] ) {
-		setCurrentItem( i + 1 );
+		setCurrentItem( i );
+		break;
+	    }
+	}
+    } else
+    {
+	setCurrentItem( slApp.count()-1 );  // unfiled
+    }
+}
+
+// this is a new function by SHARP instead of initCombo()
+QArray<int> CategoryCombo::initComboWithRefind( const QArray<int> &recCats,
+			       const QString &appName)
+{
+    QString visibleName = appName;
+    d->mStrAppName = appName;
+    d->mStrVisibleName = visibleName;
+    clear();
+    QStringList slApp;
+    QArray<int> results;
+
+    QObject::disconnect( this, SIGNAL(activated(int)),
+		      this, SLOT(slotValueChanged(int)) );
+
+    QObject::connect( this, SIGNAL(activated(int)),
+		      this, SLOT(slotValueChanged(int)) );
+    bool loadOk = d->mCat.load( categoryFileName() );
+    slApp = d->mCat.labels( d->mStrAppName, TRUE, Categories::UnfiledLabel );
+
+    d->mAppCats = d->mCat.ids( d->mStrAppName, slApp);
+
+    // addition part
+    // make new recCats
+    if (loadOk){
+      int i,j;
+      int value;
+      int rCount = recCats.count();
+      int mCount = d->mAppCats.count();
+
+      for (i=0; i<rCount; i++){
+	value = 0;
+	for (j=0; j<mCount; j++){
+	  if (recCats[i] == d->mAppCats[j]){
+	    value = recCats[i];
+	    break;
+	  }
+	}
+	if (value != 0){
+	  int tmp = results.size();
+	  results.resize( tmp + 1 );
+	  results[ tmp ] = value;
+	}
+      }
+    }
+    else{
+      results = recCats;
+    }
+    // addition end
+
+    int i,
+	j,
+	saveMe,
+	recCount;
+    QStringList::Iterator it;
+    // now add in all the items...
+    recCount = results.count();
+    saveMe = -1;
+    if ( recCount > 1 && loadOk ) {
+	it = slApp.begin();
+	for ( j = 0; j< (int)(slApp.count()-1); ++it, j++ ) {
+
+	    // grr... we have to go through and compare...
+	    if ( j < int(d->mAppCats.size()) ) {
+		for ( i = 0; i < recCount; i++ ) {
+		    if ( results[i] == d->mAppCats[j] ) {
+			(*it).append( tr(" (Multi.)") );
+			if ( saveMe < 0 )
+			    saveMe = j;
+			// no need to continue through the list.
+			break;
+		    }
+		}
+	    }
+	    insertItem( *it );
+	}
+	insertItem( *it );
+    } else
+	insertStringList( slApp );
+
+    if ( recCount > 0 && loadOk ) {
+	for ( i = 0; i < int(d->mAppCats.size()); i++ ) {
+	    if ( d->mAppCats[i] == results[0] ) {
+		setCurrentItem( i );
 		break;
 	    }
 	}
     } else
-	setCurrentItem( 0 );  // unfiled
+    {
+	setCurrentItem( slApp.count()-1 );  // unfiled
+    }
+/*
     QObject::connect( this, SIGNAL(activated(int)),
 		      this, SLOT(slotValueChanged(int)) );
+*/
+    return results;
 }
 
+
 CategoryCombo::~CategoryCombo()
 {
     delete d;
 }
 
 int CategoryCombo::currentCategory() const
 {
     int returnMe;
     returnMe = currentItem();
-    // unfiled is now 0...
-    if ( returnMe == 0 )
+    
+    if ( returnMe == (int)d->mAppCats.count() )
 	returnMe = -1;
     else if ( returnMe > (int)d->mAppCats.count() )  // only happen on "All"
 	returnMe = -2;
     else
-	returnMe =  d->mAppCats[returnMe - 1];
+	returnMe =  d->mAppCats[returnMe];
     return returnMe;
 }
 
 void CategoryCombo::setCurrentCategory( int newCatUid )
 {
     int i;
     for ( i = 0; i < int(d->mAppCats.size()); i++ ) {
 	if ( d->mAppCats[i] == newCatUid )
 	    setCurrentItem( i );
     }
 }
 
 void CategoryCombo::setCurrentText( const QString &str )
 {
     int i;
     int stop;
     stop = count();
     for ( i = 0; i < stop; i++ ) {
 	if ( text( i ) == str ) {
 	    setCurrentItem( i );
 	    break;
 	}
     }
 }
 
 void CategoryCombo::slotValueChanged( int )
 {
     emit sigCatChanged( currentCategory() );
 }
 
-CategorySelect::CategorySelect( QWidget *parent, const char *name )
+CategorySelect::CategorySelect( QWidget *parent, const char *name,int width)
     : QHBox( parent, name ),
       cmbCat( 0 ),
       cmdCat( 0 ),
       d( 0 )
 {
     d = new CategorySelectPrivate();
-    init();
+    init(width);
 }
 
 CategorySelect::CategorySelect( const QArray<int> &vl,
 				const QString &appName, QWidget *parent,
-				const char *name )
+				const char *name ,int width)
     : QHBox( parent, name )
 {
     d = new CategorySelectPrivate( vl );
-    init();
+
+    init(width);
+
     setCategories( vl, appName, appName );
 }
 
 CategorySelect::CategorySelect( const QArray<int> &vl,
 				const QString &appName,
 				const QString &visibleName,
-				QWidget *parent, const char *name )
+				QWidget *parent, const char *name , int width)
     : QHBox( parent, name )
 {
     d = new CategorySelectPrivate( vl );
-    init();
+    init(width);
     setCategories( vl, appName, visibleName );
 }
 
 CategorySelect::~CategorySelect()
 {
     delete d;
 }
 
 void CategorySelect::slotDialog()
 {
+    if (QFile::exists( categoryEdittingFileName() )){
+        QMessageBox::warning(this,tr("Error"),
+	   tr("Sorry, another application is\nediting categories.") );
+        return;
+    }
+
+    QFile f( categoryEdittingFileName() );
+    if ( !f.open( IO_WriteOnly) ){
+        return;
+    }
+
     QDialog editDlg( this, 0, TRUE );
     editDlg.setCaption( tr("Edit Categories") );
     QVBoxLayout *vb = new QVBoxLayout( &editDlg );
     QScrollView *sv = new QScrollView( &editDlg );
     sv->setResizePolicy( QScrollView::AutoOneFit );
     sv->setHScrollBarMode( QScrollView::AlwaysOff );
     vb->addWidget( sv );
     CategoryWidget ce( d->mRec, mStrAppName, d->mVisibleName, &editDlg );
     sv->addChild( &ce );
     editDlg.showMaximized();
 
     if ( editDlg.exec() ) {
 	d->mRec = ce.newCategories();
 	cmbCat->initCombo( d->mRec, mStrAppName );
     }
+
+    f.close();
+    QFile::remove( categoryEdittingFileName() );
 }
 
 void CategorySelect::slotNewCat( int newUid )
 {
     if ( newUid != -1 ) {
 	bool alreadyIn = false;
 	for ( uint it = 0; it < d->mRec.count(); ++it ) {
 	    if ( d->mRec[it] == newUid ) {
 		alreadyIn = true;
 		break;
 	    }
 	}
 	if ( !alreadyIn ) {
 	    d->mRec.resize( 1 );
 	    d->mRec[ 0 ] = newUid;
 	}
     } else
     d->mRec.resize(0);  // now Unfiled.
     emit signalSelected( currentCategory() );
 }
 
-void CategorySelect::setCategories( const QArray<int> &rec,
+QString CategorySelect::setCategories( const QArray<int> &rec,
 				    const QString &appName )
 {
-    setCategories( rec, appName, appName );
+    return setCategories( rec, appName, appName );
 }
 
-void CategorySelect::setCategories( const QArray<int> &rec,
+QString CategorySelect::setCategories( const QArray<int> &rec,
 				    const QString &appName,
 				    const QString &visibleName )
 {
-    d->mRec = rec;
     d->mVisibleName = visibleName;
     mStrAppName = appName;
-    cmbCat->initCombo( rec, appName );
+    d->mRec = cmbCat->initComboWithRefind( rec, appName );
+    return Qtopia::Record::idsToString(d->mRec);
 }
 
-void CategorySelect::init()
+void CategorySelect::init(int width)
 {
-    cmbCat = new CategoryCombo( this );
+    cmbCat = new CategoryCombo( this, 0, width);
+
     QObject::connect( cmbCat, SIGNAL(sigCatChanged(int)),
 		      this, SLOT(slotNewCat(int)) );
     cmdCat = new QToolButton( this );
     QObject::connect( cmdCat, SIGNAL(clicked()), this, SLOT(slotDialog()) );
     cmdCat->setTextLabel( "...", FALSE );
     cmdCat->setUsesTextLabel( true );
     cmdCat->setMaximumSize( cmdCat->sizeHint() );
     cmdCat->setFocusPolicy( TabFocus );
 }
 
 
 int CategorySelect::currentCategory() const
 {
     return cmbCat->currentCategory();
 }
 
 void CategorySelect::setCurrentCategory( int newCatUid )
 {
     cmbCat->setCurrentCategory( newCatUid );
 }
 
 
 const QArray<int> &CategorySelect::currentCategories() const
 {
     return d->mRec;
 }
 
 void CategorySelect::setRemoveCategoryEdit( bool remove )
 {
     if ( remove ) {
 	cmdCat->setEnabled( FALSE );
 	cmdCat->hide();
     } else {
 	cmdCat->setEnabled( TRUE );
 	cmdCat->show();
     }
 }
 
 void CategorySelect::setAllCategories( bool add )
 {
     d->usingAll = add;
     if ( add ) {
 	cmbCat->insertItem( tr( "All" ), cmbCat->count() );
 	cmbCat->setCurrentItem( cmbCat->count() - 1 );
     } else
 	cmbCat->removeItem( cmbCat->count() - 1 );
 }
+
+// 01.12.21 added
+void CategorySelect::setFixedWidth(int width)
+{
+  width -= cmdCat->width();
+  cmbCat->setFixedWidth(width);
+}
diff --git a/library/categoryselect.h b/library/categoryselect.h
index 5c6b565..7a8e491 100644
--- a/library/categoryselect.h
+++ b/library/categoryselect.h
@@ -15,91 +15,99 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #ifndef __CATEGORYCOMBO_H__
 #define __CATEGORYCOMBO_H__
 
 #include <qcombobox.h>
 #include <qhbox.h>
 #include <qstring.h>
 #include <qarray.h>
 
 extern QString categoryFileName();
 
 class QToolButton;
 
 class CategoryComboPrivate;
 class CategoryCombo : public QComboBox
 {
     Q_OBJECT
 
 public:
-    CategoryCombo( QWidget *parent, const char* name = 0 );
+    CategoryCombo( QWidget *parent, const char* name = 0, int width=0);
+
     ~CategoryCombo();
 
     int currentCategory() const;
     void setCurrentCategory( int id );
     // depreciated.
     void initCombo( const QArray<int> &recCats, const QString &appName );
     void initCombo( const QArray<int> &recCats, const QString &appName,
 		    const QString &visibleName /* = appName */ );
 
+    QArray<int> initComboWithRefind( const QArray<int> &recCats, const QString &appName );
+
 signals:
     void sigCatChanged( int newUid );
 
 private slots:
     void slotValueChanged( int );
 
 private:
     void setCurrentText( const QString &str );
     CategoryComboPrivate *d;
 };
 
 #endif
 
 class CategorySelectPrivate;
 class CategorySelect : public QHBox
 {
     Q_OBJECT
 public:
     // we need two constructors, the first gets around designer limitations
-    CategorySelect( QWidget *parent = 0, const char *name = 0 );
+
+    CategorySelect( QWidget *parent = 0, const char *name = 0, int width = 0 );
 
     CategorySelect( const QArray<int> &vlCats, const QString &appName,
-		    QWidget *parent = 0, const char *name = 0 );
+		    QWidget *parent = 0, const char *name = 0, 
+		    int width = 0);
     CategorySelect( const QArray<int> &vlCats, const QString &appName,
 		    const QString &visibleName, QWidget *parent = 0,
-		    const char *name = 0 );
+		    const char *name = 0 , int width = 0);
+
     ~CategorySelect();
 
     const QArray<int> &currentCategories() const;
     int currentCategory() const;
     void setCurrentCategory( int newCatUid );
     // pretty much if you don't set it the constructor, you need to
     // call it here ASAP!
     // however this call is depreciated...
-    void setCategories( const QArray<int> &vlCats, const QString &appName );
-    // use this one instead (for translating )
-    void setCategories( const QArray<int> &vlCats, const QString &appName,
-			const QString &visibleName );
 
+    QString setCategories( const QArray<int> &vlCats, const QString &appName );
+    QString setCategories( const QArray<int> &vlCats, const QString &appName,
+			const QString &visibleName );
     // these were added for find dialog.
     void setRemoveCategoryEdit( bool remove );
     void setAllCategories( bool add );
 
+    void setFixedWidth(int width);
 signals:
     void signalSelected( int );
 
 private slots:
     void slotDialog();
+
+public slots:
     void slotNewCat( int id );
 
 private:
-    void init();
+    void init(int width=0);
     QString mStrAppName;
     CategoryCombo *cmbCat;
     QToolButton *cmdCat;
     CategorySelectPrivate *d;
 };
diff --git a/library/config.cpp b/library/config.cpp
index 9634571..e07eecb 100644
--- a/library/config.cpp
+++ b/library/config.cpp
@@ -12,49 +12,51 @@
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include <qdir.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qmessagebox.h>
 #if QT_VERSION <= 230 && defined(QT_NO_CODECS)
 #include <qtextcodec.h>
 #endif
 #include <qtextstream.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
 
+#define QTOPIA_INTERNAL_LANGLIST
 #include "config.h"
+#include "global.h"
 
 
 /*!
   \internal
 */
 QString Config::configFilename(const QString& name, Domain d)
 {
     switch (d) {
 	case File:
 	    return name;
 	case User: {
 	    QDir dir = (QString(getenv("HOME")) + "/Settings");
 	    if ( !dir.exists() )
 		mkdir(dir.path().local8Bit(),0700);
 	    return dir.path() + "/" + name + ".conf";
 	}
     }
     return name;
 }
 
 /*!
   \class Config config.h
   \brief The Config class provides for saving application cofniguration state.
 
@@ -74,56 +76,51 @@ QString Config::configFilename(const QString& name, Domain d)
   \value File
   \value User
 
   See Config for details.
 */
 
 /*!
   Constructs a config that will load or create a configuration with the
   given \a name in the given \a domain.
 
   You must call setGroup() before doing much else with the Config.
 
   In the default Domain, \e User,
   the configuration is user-specific. \a name should not contain "/" in
   this case, and in general should be the name of the C++ class that is
   primarily responsible for maintaining the configuration.
 
   In the File Domain, \a name is an absolute filename.
 */
 Config::Config( const QString &name, Domain domain )
     : filename( configFilename(name,domain) )
 {
     git = groups.end();
     read();
-
-    lang = getenv("LANG");
-    int i  = lang.find(".");
-    if ( i > 0 )
-	lang = lang.left( i );
-    i = lang.find( "_" );
-    if ( i > 0 )
-	glang = lang.left(i);
+    QStringList l = Global::languageList();
+    lang = l[0];
+    glang = l[1];
 }
 
 /*!
   Writes any changes to disk and destroys the in-memory object.
 */
 Config::~Config()
 {
     if ( changed )
 	write();
 }
 
 /*!
   Returns whether the current group has an entry called \a key.
 */
 bool Config::hasKey( const QString &key ) const
 {
     if ( groups.end() == git )
 	return FALSE;
     ConfigGroup::ConstIterator it = ( *git ).find( key );
     return it != ( *git ).end();
 }
 
 /*!
   Sets the current group for subsequent reading and writing of
diff --git a/library/custom-linux-sharp-g++.h b/library/custom-linux-sharp-g++.h
deleted file mode 100644
index f65d474..0000000
--- a/library/custom-linux-sharp-g++.h
+++ b/dev/null
@@ -1,147 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
-**
-** This file is part of the Qtopia Environment.
-**
-** 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.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-#define QPE_OWNAPM
-#define QPE_HAVE_TOGGLELIGHT
-#define QPE_NOCIBAUD
-#define QPE_STARTMENU
-#include <asm/sharp_apm.h>
-#ifndef APM_IOC_BATTERY_BACK_CHK
-#define APM_IOC_BATTERY_BACK_CHK       _IO(APM_IOC_MAGIC, 32)
-#endif
-#ifndef APM_IOC_BATTERY_MAIN_CHK
-#define APM_IOC_BATTERY_MAIN_CHK       _IO(APM_IOC_MAGIC, 33)
-#endif
-
-#include <unistd.h>
-#include <stdio.h>
-#include <signal.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-
-#define SHARP_DEV_IOCTL_COMMAND_START 0x5680
-
-/* --- for SHARP_BUZZER device --- */
-#define	SHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START)
-#define SHARP_BUZZER_MAKESOUND   (SHARP_BUZZER_IOCTL_START)
-#define SHARP_BUZZER_SETVOLUME   (SHARP_BUZZER_IOCTL_START+1)
-#define SHARP_BUZZER_GETVOLUME   (SHARP_BUZZER_IOCTL_START+2)
-#define SHARP_BUZZER_ISSUPPORTED (SHARP_BUZZER_IOCTL_START+3)
-#define SHARP_BUZZER_SETMUTE     (SHARP_BUZZER_IOCTL_START+4)
-#define SHARP_BUZZER_STOPSOUND   (SHARP_BUZZER_IOCTL_START+5)
-
-#define SHARP_BUZ_TOUCHSOUND       1  /* touch panel sound */
-#define SHARP_BUZ_KEYSOUND         2  /* key sound */
-#define SHARP_PDA_ILLCLICKSOUND    3  /* illegal click */
-#define SHARP_PDA_WARNSOUND        4  /* warning occurred */
-#define SHARP_PDA_ERRORSOUND       5  /* error occurred */
-#define SHARP_PDA_CRITICALSOUND    6  /* critical error occurred */
-#define SHARP_PDA_SYSSTARTSOUND    7  /* system start */
-#define SHARP_PDA_SYSTEMENDSOUND   8  /* system shutdown */
-#define SHARP_PDA_APPSTART         9  /* application start */
-#define SHARP_PDA_APPQUIT         10  /* application ends */
-#define SHARP_BUZ_SCHEDULE_ALARM  11  /* schedule alarm */
-#define SHARP_BUZ_DAILY_ALARM     12  /* daily alarm */
-#define SHARP_BUZ_GOT_PHONE_CALL  13  /* phone call sound */
-#define SHARP_BUZ_GOT_MAIL        14  /* mail sound */
-
-
-#define CUSTOM_BUZZER( sound ) \
-{ \
-  static int fd = open( "/dev/sharp_buz", O_RDWR|O_NONBLOCK ); \
-  ioctl( fd, SHARP_BUZZER_MAKESOUND, sound ); \
-}
-
-#define CUSTOM_SOUND_ALARM CUSTOM_BUZZER( SHARP_BUZ_SCHEDULE_ALARM )
-
-#include <sys/ioctl.h>
-#include <asm/sharp_char.h>
-
-// a bit awkward, as this value is defined in emailclient.cpp aswell...
-#define LED_MAIL 0
-#define SHARP_LED_MAIL 9
-
-#define CUSTOM_LEDS( led, status ) \
-{ \
-    if ( led == LED_MAIL ) \
-        led = SHARP_LED_MAIL; \
-    static int fd = open( "/dev/sharp_led", O_RDWR|O_NONBLOCK ); \
-    sharp_led_status leds; \
-    memset(&leds, 0, sizeof(leds)); \
-    leds.which = led; \
-    leds.status = status; \
-    ioctl( fd, SHARP_LED_SETSTATUS, (char*)&leds ); \
-}
-
-#define QPE_HAVE_MEMALERTER
-
-#define QPE_MEMALERTER_IMPL \
-static void sig_handler(int sig) \
-{ \
-    switch (sig) { \
-    case SIGHUP: \
-	memstate = VeryLow; \
-	break; \
-    case SIGUSR1: \
-	memstate = Normal; \
-	break; \
-    case SIGUSR2: \
-	memstate = Low; \
-	break; \
-    } \
-} \
-static void initMemalerter() \
-{ \
-    struct sigaction sa; \
-    memset(&sa, '\0', sizeof sa); \
-    sa.sa_handler = sig_handler; \
-    sa.sa_flags = SA_RESTART; \
-    if (sigaction(SIGHUP, &sa, NULL) < 0) { \
-	return; \
-    } \
-    if (sigaction(SIGUSR1, &sa, NULL) < 0) { \
-	return; \
-    } \
-    if (sigaction(SIGUSR2, &sa, NULL) < 0) { \
-	return; \
-    } \
-    FILE *fo = fopen("/proc/sys/vm/freepg_signal_proc", "w"); \
-     \
-    if (!fo) \
-        return; \
-    fprintf(fo, "qpe\n"); \
-    fclose(fo); \
-}
-
-#define QPE_INITIAL_NUMLOCK_STATE \
-{ \
-    bool numLock = FALSE; \
-    sharp_kbdctl_modifstat  st; \
-    int dev = ::open("/dev/sharp_kbdctl", O_RDWR); \
-    if( dev >= 0 ) { \
-	memset(&st, 0, sizeof(st)); \
-	st.which = 3; \
-                int ret = ioctl(dev, SHARP_KBDCTL_GETMODIFSTAT, (char*)&st); \
-	if( !ret ) \
-	    numLock = (bool)st.stat; \
-	::close(dev); \
-    } \
-    return numLock; \
-}
diff --git a/library/datebookmonth.h b/library/datebookmonth.h
index 6cd1ac5..a7647ae 100644
--- a/library/datebookmonth.h
+++ b/library/datebookmonth.h
@@ -47,48 +47,49 @@ public:
     DateBookMonthHeader( QWidget *parent = 0, const char *name = 0 );
     ~DateBookMonthHeader();
     void setDate( int year, int month );
 
 signals:
     void dateChanged( int year, int month );
 
 protected slots:
     void keyPressEvent(QKeyEvent *e ) {
 	e->ignore();
     }
 
 private slots:
     void updateDate();
     void firstMonth();
     void lastMonth();
     void monthBack();
     void monthForward();
 
 private:
     QToolButton *begin, *back, *next, *end;
     QComboBox *month;
     QSpinBox *year;
     DateBookMonthHeaderPrivate *d;
+    int focus;
 };
 
 class DayItemMonthPrivate;
 class DayItemMonth : public QTableItem
 {
 public:
     DayItemMonth( QTable *table, EditType et, const QString &t );
     ~DayItemMonth();
     void paint( QPainter *p, const QColorGroup &cg, const QRect &cr, bool selected );
     void setDay( int d ) { dy = d; }
     void setEvents( const QValueList<Event> &events ) { daysEvents = events; };
     void setEvents( const QValueList<EffectiveEvent> &effEvents );
     void clearEvents() { daysEvents.clear(); };
     void clearEffEvents();
     int day() const { return dy; }
     void setType( Calendar::Day::Type t );
     Calendar::Day::Type type() const { return typ; }
 
 private:
     QBrush back;
     QColor forg;
     int dy;
     Calendar::Day::Type typ;
     QValueList<Event> daysEvents; // not used anymore...
diff --git a/library/fileselector.h b/library/fileselector.h
index ef8efea..8cfdf13 100644
--- a/library/fileselector.h
+++ b/library/fileselector.h
@@ -1,108 +1,80 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** 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.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef FILESELECTOR_H
 #define FILESELECTOR_H
 
 #include <qhbox.h>
 #include <qvbox.h>
-#include <qlistview.h>
 #include <qtoolbutton.h>
+#include <qlistview.h>
 
 #include "filemanager.h"
 #include "applnk.h"
 
 class QPopupMenu;
 class QPushButton;
+class FileSelectorView;
 
 class FileSelectorItem : public QListViewItem
 {
 public:
     FileSelectorItem( QListView *parent, const DocLnk& f );
     ~FileSelectorItem();
 
     DocLnk file() const { return fl; }
 
 private:
     DocLnk fl;
 };
 
-class CategoryMenu;
-class FileSelectorViewPrivate;
-class FileSelectorView : public QListView
-{
-    Q_OBJECT
-
-public:
-    FileSelectorView( const QString &mimefilter, QWidget *parent, const char *name );
-    ~FileSelectorView();
-    void reread();
-    int fileCount() { return count; }
-
-    void setCategoryFilter(CategoryMenu *);
-protected:
-    void keyPressEvent( QKeyEvent *e );
-
-protected slots:
-    void cardMessage( const QCString &, const QByteArray &);
-
-    void categoryChanged();
-    
-private:
-    QString filter;
-    FileManager *fileManager;
-    int count;
-    FileSelectorViewPrivate *d;
-};
-
 class FileSelectorPrivate;
 class FileSelector : public QVBox
 {
     Q_OBJECT
 
 public:
     FileSelector( const QString &mimefilter, QWidget *parent, const char *name, bool newVisible = TRUE, bool closeVisible = TRUE );
     ~FileSelector();
     void setNewVisible( bool b );
     void setCloseVisible( bool b );
-    void setCategoriesVisible( bool b );
     void reread();
     int fileCount();
     const DocLnk *selected();
 
 signals:
     void fileSelected( const DocLnk & );
     void newSelected( const DocLnk & );
     void closeMe();
 
 private slots:
     void createNew();
     void fileClicked( int, QListViewItem *, const QPoint &, int );
     // pressed to get 'right down'
     void filePressed( int, QListViewItem *, const QPoint &, int );
     void fileClicked( QListViewItem *);
 
 private:
     FileSelectorView *view;
     QString filter;
     QToolButton *buttonNew, *buttonClose;
     FileSelectorPrivate *d;
 };
 
 #endif
diff --git a/library/finddialog.cpp b/library/finddialog.cpp
index 7a9367b..904e952 100644
--- a/library/finddialog.cpp
+++ b/library/finddialog.cpp
@@ -1,44 +1,48 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** 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.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
+// WARNING: Do *NOT* define this yourself. The SL5xxx from SHARP does NOT
+//      have this class.
+#define QTOPIA_INTERNAL_FD
+
 #include "finddialog.h"
 #include "findwidget_p.h"
 
 #include <qlayout.h>
 #include <qpushbutton.h>
 
 FindDialog::FindDialog( const QString &appName, QWidget *parent,
                         const char *name, bool modal )
     : QDialog( parent, name, modal )
 {
     QVBoxLayout *vb;
     vb = new QVBoxLayout( this );
     fw = new FindWidget( appName, this, "Find Widget" );
     vb->addWidget( fw );
     QObject::connect( fw, SIGNAL(signalFindClicked(const QString&,
 						   bool,bool,int)),
 		      this, SIGNAL(signalFindClicked(const QString&,
 						     bool,bool,int)) );
     QObject::connect( fw, SIGNAL(signalFindClicked(const QString&,const QDate&,
 						   bool,bool,int)),
 		      this, SIGNAL(signalFindClicked(const QString&,
 						     const QDate&,bool,bool,int)) );
     d = 0;
 }
diff --git a/library/finddialog.h b/library/finddialog.h
index 265b5ae..00c7b45 100644
--- a/library/finddialog.h
+++ b/library/finddialog.h
@@ -1,57 +1,68 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** 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.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
+
+//
+//   DO NOT ATTEMPT TO USE THIS CLASS
+//
+
 #ifndef __FINDDIALOG_H__
 #define __FINDDIALOG_H__
 
 #include <qdatetime.h>
 #include <qdialog.h>
 
 class FindWidget;
 
 class FindDialogPrivate;
 class FindDialog : public QDialog
 {
     Q_OBJECT
 public:
+
+// WARNING: Do *NOT* define this yourself. The SL5xxx from SHARP does NOT
+//      have this class.
+#ifdef QTOPIA_INTERNAL_FD
+
     FindDialog( const QString &appName,
                 QWidget *parent = 0, const char *name = 0, bool modal = TRUE );
     ~FindDialog();
+#endif
 
     QString findText() const;
     void setUseDate( bool show );
     void setDate( const QDate &dt );
 
 public slots:
     void slotNotFound();
     void slotWrapAround();
 
 signals:
     void signalFindClicked( const QString &txt, bool caseSensitive,
                             bool backwards, int category );
     void signalFindClicked( const QString &txt, const QDate &dt,
 			    bool caseSensitive, bool backwards, int category );
 
 private:
     FindWidget *fw;
     FindDialogPrivate *d;
 };
 
 #endif
diff --git a/library/mimetype.cpp b/library/mimetype.cpp
index c6a4453..9fab160 100644
--- a/library/mimetype.cpp
+++ b/library/mimetype.cpp
@@ -1,174 +1,187 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** 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.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
+#define QTOPIA_INTERNAL_MIMEEXT
 #include "mimetype.h"
 #include "applnk.h"
 #include "resource.h"
 #include "qpeapplication.h"
 #include <qfile.h>
 #include <qdict.h>
 #include <qregexp.h>
 #include <qstringlist.h>
 #include <qtextstream.h>
 #include <qmap.h>
  
 class MimeTypeData {
 public:
     MimeTypeData(const QString& i, const AppLnk& lnk, const QString& icon ) :
 	id(i),
 	desc(lnk.name()+" document"),
 	app(lnk)
     {
 	if ( icon.isEmpty() ) {
 	    regIcon = lnk.pixmap();
 	    bigIcon = lnk.bigPixmap();
 	} else {
 	    QImage unscaledIcon = Resource::loadImage( icon );
 	    regIcon.convertFromImage( unscaledIcon.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
 	    bigIcon.convertFromImage( unscaledIcon.smoothScale( AppLnk::bigIconSize(), AppLnk::bigIconSize() ) );
 	}
     }
     QString id;
+    QString extension;
     QString desc;
     QPixmap regIcon;
     QPixmap bigIcon;
     AppLnk app;
 };
 
 class MimeType::Dict : public QDict<MimeTypeData> {
 public:
     Dict() {}
 };
 
 MimeType::Dict* MimeType::d=0;
 static QMap<QString,QString> *typeFor = 0;
+static QMap<QString,QString> *extFor = 0;
 
 MimeType::Dict& MimeType::dict()
 {
     if ( !d ) {
 	d = new Dict;
 	d->setAutoDelete(TRUE);
     }
     return *d;
 }
 
 MimeType::MimeType( const QString& ext_or_id )
 {
     init(ext_or_id);
 }
 
 MimeType::MimeType( const DocLnk& lnk )
 {
     init(lnk.type());
 }
 
 QString MimeType::id() const
 {
     return i;
 }
 
 QString MimeType::description() const
 {
     MimeTypeData* d = data(i);
     return d ? d->desc : QString::null;
 }
 
 QPixmap MimeType::pixmap() const
 {
     MimeTypeData* d = data(i);
     return d ? d->regIcon : QPixmap();
 }
 
+QString MimeType::extension() const
+{
+    loadExtensions();
+    return *(*extFor).find(i);
+}
+
 QPixmap MimeType::bigPixmap() const
 {
     MimeTypeData* d = data(i);
     return d ? d->bigIcon : QPixmap();
 }
 
 const AppLnk* MimeType::application() const
 {
     MimeTypeData* d = data(i);
     return d ? &d->app : 0;
 }
 
 void MimeType::registerApp( const AppLnk& lnk )
 {
     QStringList list = lnk.mimeTypes();
     QStringList icons = lnk.mimeTypeIcons();
     QStringList::ConstIterator icon = icons.begin();
     for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it, ++icon) {
 	MimeTypeData *item = new MimeTypeData( *it, lnk, *icon );
         dict().replace( *it, item );
     }
 }
 
 void MimeType::clear()
 {
     delete d;
     d = 0;
 }
 
 void MimeType::loadExtensions()
 {
     if ( !typeFor ) {
+	extFor = new QMap<QString,QString>;
 	typeFor = new QMap<QString,QString>;
 	loadExtensions("/etc/mime.types");
 	loadExtensions(QPEApplication::qpeDir()+"etc/mime.types");
     }
 }
 
 void MimeType::loadExtensions(const QString& filename)
 {
     QFile file(filename);
     if ( file.open(IO_ReadOnly) ) {
 	QTextStream in(&file);
 	QRegExp space("[ \t]+");
 	while (!in.atEnd()) {
 	    QStringList tokens = QStringList::split(space, in.readLine());
 	    QStringList::ConstIterator it = tokens.begin();
 	    if ( it != tokens.end() ) {
 		QString id = *it; ++it;
-		while (it != tokens.end()) {
-		    (*typeFor)[*it] = id;
-		    ++it;
+		if ( it != tokens.end() ) {
+		    (*extFor)[id] = *it;
+		    while (it != tokens.end()) {
+			(*typeFor)[*it] = id;
+			++it;
+		    }
 		}
 	    }
 	}
     }
 }
 
 void MimeType::init( const QString& ext_or_id )
 {
     if ( ext_or_id[0] != '/' && ext_or_id.contains('/') ) {
 	i = ext_or_id.lower();
     } else {
 	loadExtensions();
 	int dot = ext_or_id.findRev('.');
 	QString ext = dot >= 0 ? ext_or_id.mid(dot+1) : ext_or_id;
 	i = (*typeFor)[ext.lower()];
 	if ( i.isNull() )
 	    i = "application/octet-stream";
     }
     static bool appsUpdated = FALSE;
     if ( !appsUpdated ) {
 	appsUpdated = TRUE;
 	updateApplications();
     }
 }
diff --git a/library/mimetype.h b/library/mimetype.h
index 58725d7..b6cca95 100644
--- a/library/mimetype.h
+++ b/library/mimetype.h
@@ -19,46 +19,51 @@
 **********************************************************************/
 #ifndef MIMETYPE_H
 #define MIMETYPE_H
 
 #include <qstring.h>
 #include <qpixmap.h>
 
 class AppLnk;
 class DocLnk;
 class QStringList;
 class MimeTypeData;
 class AppLnkSet;
 
 class MimeType
 {
 public:
     MimeType( const QString& ext_or_id );
     MimeType( const DocLnk& );
 
     QString id() const;
     QString description() const;
     QPixmap pixmap() const;
     QPixmap bigPixmap() const;
 
+// DON'T define this yourself!
+#ifdef QTOPIA_INTERNAL_MIMEEXT
+    QString extension() const;
+#endif
+
     const AppLnk* application() const;
 
     static QString appsFolderName();
     static void updateApplications();
 
     // These shouldn't be needed
     static void clear();
     static void registerApp( const AppLnk& );
 
 private:
     static void updateApplications(AppLnkSet* folder);
     static void loadExtensions();
     static void loadExtensions(const QString&);
     void init( const QString& ext_or_id );
     class Dict;
     static Dict* d;
     static Dict& dict();
     static MimeTypeData* data(const QString& id);
     QString i;
 };
 
 #endif
diff --git a/library/network.cpp b/library/network.cpp
index 7d51016..e6d2781 100644
--- a/library/network.cpp
+++ b/library/network.cpp
@@ -1,44 +1,45 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** 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.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
+#define QTOPIA_INTERNAL_LANGLIST
 #include "qpe/network.h"
 #include "qpe/networkinterface.h"
 #include "qpe/global.h"
 #include "qpe/config.h"
 #include "qpe/resource.h"
 #include "qpe/qpeapplication.h"
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qlibrary.h>
 
 #include <qlistbox.h>
 #include <qdir.h>
 #include <qlayout.h>
 #include <qdict.h>
 #include <qtranslator.h>
 
 #include <stdlib.h>
 
 class NetworkEmitter : public QCopChannel {
     Q_OBJECT
 public:
     NetworkEmitter() : QCopChannel("QPE/Network",qApp)
     {
     }
 
@@ -397,40 +398,42 @@ int Network::addStateWidgets(QWidget* parent)
 		n++;
 		vb->addWidget(w);
 	    }
 	}
     }
     return n;
 }
 
 static QDict<NetworkInterface> *ifaces;
 
 /*!
   \internal
 */
 NetworkInterface* Network::loadPlugin(const QString& type)
 {
 #ifndef QT_NO_COMPONENT
     if ( !ifaces ) ifaces = new QDict<NetworkInterface>;
     NetworkInterface *iface = ifaces->find(type);
     if ( !iface ) {
 	QString libfile = QPEApplication::qpeDir() + "/plugins/network/lib" + type + ".so";
 	QLibrary lib(libfile);
 	if ( !lib.queryInterface( IID_Network, (QUnknownInterface**)&iface ) == QS_OK )
 	    return 0;
 	ifaces->insert(type,iface);
-	QString lang = getenv( "LANG" );
-	QTranslator * trans = new QTranslator(qApp);
-	QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/lib"+type+".qm";
-	if ( trans->load( tfn ))
-	    qApp->installTranslator( trans );
-	else
-	    delete trans;
-
+	QStringList langs = Global::languageList();
+	for (QStringList::ConstIterator it = langs.begin(); it!=langs.end(); ++it) {
+	    QString lang = *it;
+	    QTranslator * trans = new QTranslator(qApp);
+	    QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/lib"+type+".qm";
+	    if ( trans->load( tfn ))
+		qApp->installTranslator( trans );
+	    else
+		delete trans;
+	}
     }
     return iface;
 #else
     return 0;
 #endif
 }
 
 #include "network.moc"
diff --git a/library/power.cpp b/library/power.cpp
index 990ff62..12b52ed 100644
--- a/library/power.cpp
+++ b/library/power.cpp
@@ -81,48 +81,50 @@ bool PowerStatusManager::getProcApmStatus( int &ac, int &bs, int &bf, int &pc, i
 	switch ( u ) {
 	    case 'm': sec *= 60;
 	    case 's': break; // ok
 	    default: sec = -1; // unknown
 	}
 
 	// extract data
 	switch ( bs ) {
 	    case 0x00:
 		ps->bs = PowerStatus::High;
 		break;
 	    case 0x01:
 		ps->bs = PowerStatus::Low;
 		break;
 	    case 0x7f:
 		ps->bs = PowerStatus::VeryLow;
 		break;
 	    case 0x02:
 		ps->bs = PowerStatus::Critical;
 		break;
 	    case 0x03:
 		ps->bs = PowerStatus::Charging;
 		break;
 	    case 0x04:
+	    case 0xff: // 0xff is Unknown but we map to NotPresent
+	    default:
 		ps->bs = PowerStatus::NotPresent;
 		break;
 	}
 
 	switch ( ac ) {
 	    case 0x00:
 		ps->ac = PowerStatus::Offline;
 		break;
 	    case 0x01:
 		ps->ac = PowerStatus::Online;
 		break;
 	    case 0x02:
 		ps->ac = PowerStatus::Backup;
 		break;
 	}
 
 	if ( pc > 100 )
 	    pc = -1;
 
 	ps->percentRemain = pc;
 	ps->secsRemain = sec;
 
 	ok = true;
     }
diff --git a/library/qcopmessage_qws.h b/library/qcopmessage_qws.h
deleted file mode 100644
index c19f57d..0000000
--- a/library/qcopmessage_qws.h
+++ b/dev/null
@@ -1,99 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
-**
-** This file is part of the Qtopia Environment.
-**
-** 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.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-#ifndef QCOP_MESSAGE_H
-#define QCOP_MESSAGE_H
-
-#include <qdatastream.h>
-#include <qbuffer.h>
-
-class QCopMessage : public QDataStream {
- public:
-  QCopMessage();
-  QCopMessage(const QCString& channel, const QCString& message);
-  QCopMessage(const QCopMessage& orig);
-  ~QCopMessage();
-
-  void setChannel(QCString& channel) { m_Channel = channel; }
-  QCString channel() const { return m_Channel; }
-  void setMessage(QCString& message) { m_Message = message; }
-  QCString message() const { return m_Message; }
-  const QByteArray data() const;
-
-  QCopMessage& operator=(const QCopMessage& orig);
-
- private:
-  QCString m_Channel;
-  QCString m_Message;
-};
-
-// ### No need to inline, just maintaining binary compatability
-inline QCopMessage::QCopMessage() : QDataStream(new QBuffer()) {
-    device()->open(IO_WriteOnly);
-}
-
-inline QCopMessage::QCopMessage(const QCString& channel, const QCString& message) 
-  : QDataStream(new QBuffer()), m_Channel(channel), m_Message(message) {
-  device()->open(IO_WriteOnly);
-}
-
-inline QCopMessage::QCopMessage(const QCopMessage& orig) : QDataStream() {
-  // The QBuffer is going to share the byte array, so it will keep the
-  // data pointer even when this one goes out of scope.
-  QByteArray array(((QBuffer*)orig.device())->buffer());
-  array.detach();
-  setDevice(new QBuffer(array));
-  device()->open(IO_Append);
-
-  m_Channel = orig.channel();
-  m_Message = orig.message();
-}
-
-inline QCopMessage& QCopMessage::operator=(const QCopMessage& orig) {
-  if (device()) {
-    delete device();
-    unsetDevice();
-  }
-
-  // The QBuffer is going to share the byte array, so it will keep the
-  // data pointer even when this one goes out of scope.
-  QByteArray array(((QBuffer*)orig.device())->buffer());
-  array.detach();
-  setDevice(new QBuffer(array));
-  device()->open(IO_Append);
-
-  m_Channel = orig.channel();
-  m_Message = orig.message();  
-
-  return *this;
-}
-
-inline const QByteArray QCopMessage::data() const {
-  return ((QBuffer*)device())->buffer();
-}
-
-inline QCopMessage::~QCopMessage() {
-  // If we still have our QBuffer, clean it up...
-  if (device())
-    delete device();
-  unsetDevice();
-}
-
-#endif
diff --git a/library/qpedecoration_qws.cpp b/library/qpedecoration_qws.cpp
index b6085ef..e041945 100644
--- a/library/qpedecoration_qws.cpp
+++ b/library/qpedecoration_qws.cpp
@@ -1,43 +1,44 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** 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.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
+#define QTOPIA_INTERNAL_LANGLIST
 #include <qapplication.h>
 #include <qstyle.h>
 #include <qwidget.h>
 #include <qpainter.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
 #include "qcopenvelope_qws.h"
 #include "qpedecoration_qws.h"
 #include <qdialog.h>
 #include <qdrawutil.h>
 #include <qgfx_qws.h>
 #include "qpeapplication.h"
 #include "resource.h"
 #include "global.h"
 #include <qfile.h>
 #include <qsignal.h>
 
 #include <stdlib.h>
 
 extern QRect qt_maxWindowRect; 
 
 //#define MINIMIZE_HELP_HACK  // use minimize button when not a dialog
 
 //#define WHATSTHIS_MODE
@@ -223,52 +224,52 @@ void QPEManager::whatsThisTimeout()
 	    state = QWSButton::Clicked|QWSButton::MouseOver;
 	else
 	    state = 0;
 	drawButton( active, QPEDecoration::Help, state );
     }
 }
 
 //=========
 
 class HackWidget : public QWidget
 {
 public:
     bool needsOk() { return (getWState() & WState_Reserved1 ); }
 };
 
 //===========================================================================
 
 QPEDecoration::QPEDecoration()
     : QWSDefaultDecoration()
 {
     imageOk = Resource::loadImage( "OKButton" );
     imageClose = Resource::loadImage( "CloseButton" );
     imageHelp = Resource::loadImage( "HelpButton" );
     helpFile = QString(qApp->argv()[0]) + ".html";
-    QString lang = getenv( "LANG" );
-    helpExists = QFile::exists( QPEApplication::qpeDir() + "/help/" + lang + "/html/" + helpFile );
-    if ( !helpExists )
-	helpExists = QFile::exists( QPEApplication::qpeDir() + "/help/en/html/" + helpFile );
+    QStringList path = Global::helpPath();
+    helpExists = FALSE;
+    for (QStringList::ConstIterator it=path.begin(); it!=path.end() && !helpExists; ++it)
+	helpExists = QFile::exists( *it + "/" + helpFile );
 #ifndef MINIMIZE_HELP_HACK
     qpeManager = new QPEManager( this );
 #else
     qpeManager = 0;
 #endif
 }
 
 QPEDecoration::~QPEDecoration()
 {
     delete qpeManager;
 }
 
 const char **QPEDecoration::menuPixmap()
 {
     return (const char **)0;
 }
 
 const char **QPEDecoration::closePixmap()
 {
     return (const char **)qpe_close_xpm;
 }
 
 const char **QPEDecoration::minimizePixmap()
 {