Qtopia1-6 merge

still to test
bic changes to be resolved
more changes to be made?

102 files changed, 10199 insertions, 7175 deletions

diff --git a/library/alarmserver.cpp b/library/alarmserver.cpp
index a1a7142..1ee05c6 100644
--- a/library/alarmserver.cpp
+++ b/library/alarmserver.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -196,2 +196,4 @@ void TimerReceiverObject::resetTimer()
     QDateTime now = QDateTime::currentDateTime();
+    if ( nearest < now )
+        nearest = now;
     int secs = TimeConversion::secsTo( now, nearest );
@@ -247,2 +249,3 @@ void TimerReceiverObject::timerEvent( QTimerEvent * )
              <= TimeConversion::toUTC(QDateTime::currentDateTime()) ) {
+#ifndef QT_NO_COP
             QCopEnvelope e( nearestTimerEvent->channel,
@@ -251,2 +254,3 @@ void TimerReceiverObject::timerEvent( QTimerEvent * )
               << nearestTimerEvent->data;
+#endif
             timerEventList.remove( nearestTimerEvent );
@@ -264,6 +268,17 @@ void TimerReceiverObject::timerEvent( QTimerEvent * )
   \class AlarmServer alarmserver.h
-  \brief The AlarmServer class provides alarms to be scheduled.
+  \brief The AlarmServer class allows alarms to be scheduled and unscheduled.
+
+    Applications can schedule alarms with addAlarm() and can
+    unschedule alarms with deleteAlarm(). When the time for an alarm
+    to go off is reached the specified \link qcop.html QCop\endlink
+    message is sent on the specified channel (optionally with
+    additional data).
+
+    Scheduling an alarm using this class is important (rather just using
+    a QTimer) since the machine may be asleep and needs to get woken up using
+    the Linux kernel which implements this at the kernel level to minimize
+    battery usage while asleep.
 
-  Applications which wish to be informed when a certain time instant
-  passes use the functions of AlarmServer to request so.
+    \ingroup qtopiaemb
+    \sa QCopEnvelope
 */
@@ -271,5 +286,9 @@ void TimerReceiverObject::timerEvent( QTimerEvent * )
 /*!
-  Schedules an alarm for \a when. Soon after this time,
-  \a message will be sent to \a channel, with \a data as
-  a parameter. \a message must be of the form "someMessage(int)".
+  Schedules an alarm to go off at (or soon after) time \a when. When
+  the alarm goes off, the \link qcop.html QCop\endlink \a message will
+  be sent to \a channel, with \a data as a parameter.
+
+  If this function is called with exactly the same data as a previous
+  call the subsequent call is ignored, so there is only ever one alarm
+  with a given set of parameters.
 
@@ -314,4 +333,6 @@ void AlarmServer::addAlarm ( QDateTime when, const QCString& channel,
     } else {
+#ifndef QT_NO_COP
         QCopEnvelope e( "QPE/System", "addAlarm(QDateTime,QCString,QCString,int)" );
         e << when << channel << message << data;
+#endif
     }
@@ -320,9 +341,13 @@ void AlarmServer::addAlarm ( QDateTime when, const QCString& channel,
 /*!
-  Deletes previously scheduled alarms which match \a when, \a channel, \a message,
-  and \a data.
+  Deletes previously scheduled alarms which match \a when, \a channel,
+  \a message, and \a data.
 
-  Passing null values for \a when, \a channel, or \a message indicates "any".
-  Passing -1 for \a data indicates "any".
+  Passing null values for \a when, \a channel, or for the \link
+  qcop.html QCop\endlink \a message, acts as a wildcard meaning "any".
+  Similarly, passing -1 for \a data indicates "any".
+
+  If there is no matching alarm, nothing happens.
+
+  \sa addAlarm()
 
-  \sa deleteAlarm()
 */
@@ -361,4 +386,6 @@ void AlarmServer::deleteAlarm (QDateTime when, const QCString& channel, const QC
     } else {
+#ifndef QT_NO_COP
         QCopEnvelope e( "QPE/System", "deleteAlarm(QDateTime,QCString,QCString,int)" );
         e << when << channel << message << data;
+#endif
     }
diff --git a/library/applnk.cpp b/library/applnk.cpp
index 9498f84..298581a 100644
--- a/library/applnk.cpp
+++ b/library/applnk.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -21,2 +21,4 @@
 #define QTOPIA_INTERNAL_MIMEEXT
+#define QTOPIA_INTERNAL_PRELOADACCESS
+#define QTOPIA_INTERNAL_APPLNKASSIGN
 
@@ -27,3 +29,5 @@
 #include <qpe/categoryselect.h>
+#ifdef QWS
 #include <qpe/qcopenvelope_qws.h>
+#endif
 #include <qpe/global.h>
@@ -52,3 +56,3 @@ static QString safeFileName(const QString& n)
     QString safename=n;
-    safename.replace(QRegExp("[^0-9A-Za-z.]"),"_"); // Njaard says this is broken
+    safename.replace(QRegExp("[^0-9A-Za-z.]"),"_");
     safename.replace(QRegExp("^[^A-Za-z]*"),"");
@@ -73,3 +77,48 @@ class AppLnkPrivate
 public:
-    QArray<int> mCat;
+    /* the size of the Pixmap */
+    enum Size {Normal = 0, Big };
+    AppLnkPrivate() {
+        /* we want one normal and one big item */
+        mPixmaps = QArray<QPixmap>(2);
+    }
+
+    QStringList mCatList; // always correct
+    QArray<int> mCat; // cached value; correct if not empty
+    QArray<QPixmap> mPixmaps;
+
+    void updateCatListFromArray()
+    {
+        Categories cat( 0 );
+        cat.load( categoryFileName() );
+        mCatList = cat.labels("Document View",mCat);
+    }
+
+    void setCatArrayDirty()
+    {
+        mCat.resize(0);
+    }
+
+    void ensureCatArray()
+    {
+        if ( mCat.count() > 0 || mCatList.count()==0 )
+            return;
+
+        Categories cat( 0 );
+        cat.load( categoryFileName() );
+        mCat.resize( mCatList.count() );
+        int i;
+        QStringList::ConstIterator it;
+        for ( i = 0, it = mCatList.begin(); it != mCatList.end();
+              ++it, i++ ) {
+
+            bool number;
+            int id = (*it).toInt( &number );
+            if ( !number ) {
+                id = cat.id( "Document View", *it );
+                if ( id == 0 )
+                    id = cat.addCategory( "Document View", *it );
+            }
+            mCat[i] = id;
+        }
+    }
 };
@@ -80,4 +129,90 @@ public:
 
-  Information about applications are stored in Qtopia as ".desktop" files.
-  When read, these files are stored as AppLnk objects.
+    Every Qtopia application \e app has a corresponding \e app.desktop
+    file. When one of these files is read its data is stored as an
+    AppLnk object.
+
+    The AppLnk class introduces some Qtopia-specific concepts, and
+    provides a variety of functions, as described in the following
+    sections.
+    \tableofcontents
+
+    \target Types
+    \section1 Types
+
+    Every AppLnk object has a \e type. For applications, games and
+    settings the type is \c Application; for documents the
+    type is the document's MIME type.
+
+    \target files-and-links
+    \section1 Files and Links
+
+    When you create an AppLnk (or more likely, a \link doclnk.html
+    DocLnk\endlink), you don't deal directly with filenames in the
+    filesystem. Instead you do this:
+    \code
+    DocLnk d;
+    d.setType("text/plain");
+    d.setName("My Nicely Named Document / Whatever"); // Yes, "/" is legal.
+    \endcode
+    At this point, the file() and linkFile() are unknown. Normally
+    this is uninteresting, and the names become automatically known,
+    and more importantly, becomes reserved, when you ask what they are:
+
+    \code
+    QString fn = d.file();
+    \endcode
+    This invents a filename, and creates the file on disk (an empty
+    reservation file) to prevent the name being used by another
+    application.
+
+    In some circumstances, you don't want to create the file if it
+    doesn't already exist (e.g. in the Document tab, some of the \link
+    doclnk.html DocLnk\endlink objects represented by icons are
+    DocLnk's created just for that view - they don't have
+    corresponding \c .desktop files. To avoid littering empty
+    reservation files around, we check in a few places to see whether
+    the file really needs to exist).
+
+    \section1 Functionality
+
+    AppLnk objects are created by calling the constructor with the
+    name of a \e .desktop file. The object can be checked for validity
+    using isValid().
+
+    The following functions are used to set or retrieve information
+    about the application:
+    \table
+    \header \i Get Function \i Set Function \i Short Description
+            \row \i \l name()    \i \l setName()    \i application's name
+            \row \i \l pixmap()     \i \e none    \i application's icon
+            \row \i \l bigPixmap()  \i \e none    \i application's large icon
+            \row \i \e none    \i setIcon()    \i sets the icon's filename
+            \row \i \l type()     \i \l setType()    \i see \link #Types Types\endlink above
+            \row \i \l rotation()   \i \e none    \i 0, 90, 180 or 270 degrees
+    \row \i \l comment()    \i \l setComment() \i text for the Details dialog
+            \row \i \l exec()    \i \l setExec()    \i executable's filename
+            \row \i \l file()       \i \e none    \i document's filename
+            \row \i \l linkFile()   \i \l setLinkFile()\i \e .desktop filename
+            \row \i \l mimeTypes()  \i \e none    \i the mime types the application can view or edit
+            \row \i \l categories() \i \l setCategories()\i \e{see the function descriptions}
+            \row \i \l fileKnown()  \i \e none    \i see \link
+#files-and-links Files and Links\endlink above
+            \row \i \l linkFileKnown() \i \e none    \i see \link
+#files-and-links Files and Links\endlink above
+            \row \i \l property()   \i \l setProperty()\i any AppLnk property
+    can be retrieved or set (if writeable) using these
+    \endtable
+
+    To save an AppLnk to disk use writeLink(). To execute the
+    application that the AppLnk object refers to, use execute().
+
+    AppLnk's can be deleted from disk using removeLinkFile(). To
+    remove both the link and the application's executable use
+    removeFiles().
+
+    Icon sizes can be globally changed (but only for AppLnk objects
+    created after the calls) with setSmallIconSize() and
+    setBigIconSize().
+
+    \ingroup qtopiaemb
 */
@@ -87,2 +222,4 @@ public:
   Only affects AppLnk objects created after the call.
+
+  \sa smallIconSize() setIcon()
 */
@@ -95,2 +232,4 @@ void AppLnk::setSmallIconSize(int small)
   Returns the size used for small icons.
+
+  \sa setSmallIconSize() setIcon()
 */
@@ -105,2 +244,4 @@ int AppLnk::smallIconSize()
   Only affects AppLnk objects created after the call.
+
+  \sa bigIconSize() setIcon()
 */
@@ -113,2 +254,4 @@ void AppLnk::setBigIconSize(int big)
   Returns the size used for large icons.
+
+  \sa setBigIconSize() setIcon()
 */
@@ -123,3 +266,8 @@ int AppLnk::bigIconSize()
 
-  Returns the Name property.
+  Returns the Name property. This is the user-visible name for the
+  document or application, not the filename.
+
+    See \link #files-and-links Files and Links\endlink.
+
+  \sa setName()
 */
@@ -128,4 +276,6 @@ int AppLnk::bigIconSize()
 
-  Returns the Exec property. This is the executable program associated
-  with the AppLnk.
+  Returns the Exec property. This is the name of the executable
+  program associated with the AppLnk.
+
+  \sa setExec()
 */
@@ -134,3 +284,4 @@ int AppLnk::bigIconSize()
 
-  Returns the Rotation property.
+  Returns the Rotation property. The value is 0, 90, 180 or 270
+  degrees.
 */
@@ -140,2 +291,4 @@ int AppLnk::bigIconSize()
   Returns the Comment property.
+
+  \sa setComment()
 */
@@ -151,2 +304,6 @@ int AppLnk::bigIconSize()
   Returns the Categories property.
+
+  See the CategoryWidget for more details.
+
+  \sa setCategories()
 */
@@ -155,2 +312,3 @@ const QArray<int>& AppLnk::categories() const
 {
+    d->ensureCatArray();
     return d->mCat;
@@ -164,2 +322,4 @@ const QArray<int>& AppLnk::categories() const
   duration of the current process.
+
+  \sa AppLnkSet::find()
 */
@@ -169,3 +329,3 @@ const QArray<int>& AppLnk::categories() const
 
-  Returns whether this AppLnk is valid.
+  Returns TRUE if this AppLnk is valid; otherwise returns FALSE.
 */
@@ -184,3 +344,5 @@ AppLnk::AppLnk()
 /*!
-  Loads \a file as an AppLnk.
+  Loads \a file (e.g. \e app.desktop) as an AppLnk.
+
+  \sa writeLink()
 */
@@ -202,3 +364,6 @@ AppLnk::AppLnk( const QString &file )
             mComment = config.readEntry( "Comment", QString::null );
+            // MIME types are case-insensitive.
             mMimeTypes = config.readListEntry( "MimeType", ';' );
+            for (QStringList::Iterator it=mMimeTypes.begin(); it!=mMimeTypes.end(); ++it)
+                *it = (*it).lower();
             mMimeTypeIcons = config.readListEntry( "MimeTypeIcons", ';' );
@@ -206,23 +371,31 @@ AppLnk::AppLnk( const QString &file )
             mFile = config.readEntry("File", QString::null);
-            sl = config.readListEntry("Categories", ';');
-        }
-    }
-    // let's try our darndest to create categories...
-    Categories cat( 0 );
-    cat.load( categoryFileName() );
-    d->mCat.resize( sl.count() );
-    int i;
-    QStringList::Iterator it;
-    for ( i = 0, it = sl.begin(); it != sl.end();
-          ++it, i++ ) {
-
-        bool number;
-        int id = (*it).toInt( &number );
-        if ( !number ) {
-            // convert from old school...
-            id = cat.id( "Document Viewer", *it );
-            if ( id == 0 )
-                id = cat.addCategory( "Document Viewer", *it );
+            if ( mFile[0] != '/' ) {
+                int slash = file.findRev('/');
+                if ( slash >= 0 ) {
+                    mFile = file.left(slash) + '/' + mFile;
+                }
+            }
+            d->mCatList = config.readListEntry("Categories", ';');
+            if ( d->mCatList[0].toInt() < -1 ) {
+                // numeric cats in file! convert to text
+                Categories cat( 0 );
+                cat.load( categoryFileName() );
+                d->mCat.resize( d->mCatList.count() );
+                int i;
+                QStringList::ConstIterator it;
+                for ( i = 0, it = d->mCatList.begin(); it != d->mCatList.end();
+                      ++it, i++ ) {
+                    bool number;
+                    int id = (*it).toInt( &number );
+                    if ( !number ) {
+                        // convert from text
+                        id = cat.id( "Document View", *it );
+                        if ( id == 0 )
+                            id = cat.addCategory( "Document View", *it );
+                    }
+                    d->mCat[i] = id;
+                }
+                d->updateCatListFromArray();
+            }
         }
-        d->mCat[i] = id;
     }
@@ -231,8 +404,40 @@ AppLnk::AppLnk( const QString &file )
 
+AppLnk& AppLnk::operator=(const AppLnk &copy)
+{
+    if ( mId )
+        qWarning("Deleting AppLnk that is in an AppLnkSet");
+    if ( d )
+        delete d;
+
+
+    mName = copy.mName;
+
+    /* remove for Qtopia 3.0 -zecke */
+    mPixmap = copy.mPixmap;
+    mBigPixmap = copy.mBigPixmap;
+
+    mExec = copy.mExec;
+    mType = copy.mType;
+    mRotation = copy.mRotation;
+    mComment = copy.mComment;
+    mFile = copy.mFile;
+    mLinkFile = copy.mLinkFile;
+    mIconFile = copy.mIconFile;
+    mMimeTypes = copy.mMimeTypes;
+    mMimeTypeIcons = copy.mMimeTypeIcons;
+    mId = 0;
+    d = new AppLnkPrivate();
+    d->mCat = copy.d->mCat;
+    d->mCatList = copy.d->mCatList;
+    d->mPixmaps = copy.d->mPixmaps;
+
+    return *this;
+}
 /*!
-  Returns a small pixmap associated with the application.
+  protected internally to share code
+  should I document that at all?
+  I don't know the TT style for that
 */
-const QPixmap& AppLnk::pixmap() const
-{
-    if ( mPixmap.isNull() ) {
+const QPixmap& AppLnk::pixmap( int pos, int size ) const {
+    if ( d->mPixmaps[pos].isNull() ) {
         AppLnk* that = (AppLnk*)this;
@@ -240,11 +445,20 @@ const QPixmap& AppLnk::pixmap() const
             MimeType mt(type());
-            that->mPixmap = mt.pixmap();
-            if ( that->mPixmap.isNull() )
-                that->mPixmap = Resource::loadPixmap("UnknownDocument-14");
-            return that->mPixmap;
+            that->d->mPixmaps[pos] = mt.pixmap();
+            if ( that->d->mPixmaps[pos].isNull() )
+                that->d->mPixmaps[pos].convertFromImage(
+                    Resource::loadImage("UnknownDocument")
+                        .smoothScale( size, size ) );
+            return that->d->mPixmaps[pos];
         }
         QImage unscaledIcon = Resource::loadImage( that->mIconFile );
-        that->mPixmap.convertFromImage( unscaledIcon.smoothScale( smallSize, smallSize ) );
-        that->mBigPixmap.convertFromImage( unscaledIcon.smoothScale( bigSize, bigSize ) );
-        return that->mPixmap;
+        if ( unscaledIcon.isNull() ) {
+            qDebug( "Cannot find icon: %s", that->mIconFile.latin1() );
+            that->d->mPixmaps[pos].convertFromImage(
+                    Resource::loadImage("UnknownDocument")
+                        .smoothScale( size, size ) );
+        } else {
+            that->d->mPixmaps[0].convertFromImage( unscaledIcon.smoothScale( smallSize, smallSize ) );
+            that->d->mPixmaps[1].convertFromImage( unscaledIcon.smoothScale( bigSize, bigSize ) );
+        }
+        return that->d->mPixmaps[0];
     }
@@ -254,3 +468,18 @@ const QPixmap& AppLnk::pixmap() const
 /*!
+  Returns a small pixmap associated with the application.
+
+  \sa bigPixmap() setIcon()
+*/
+const QPixmap& AppLnk::pixmap() const
+{
+    if ( d->mPixmaps[0].isNull() ) {
+        return pixmap(AppLnkPrivate::Normal, smallSize );
+    }
+    return d->mPixmaps[0];
+}
+
+/*!
   Returns a large pixmap associated with the application.
+
+  \sa pixmap() setIcon()
 */
@@ -258,15 +487,4 @@ const QPixmap& AppLnk::bigPixmap() const
 {
-    if ( mBigPixmap.isNull() ) {
-        AppLnk* that = (AppLnk*)this;
-        if ( mIconFile.isEmpty() ) {
-            MimeType mt(type());
-            that->mBigPixmap = mt.bigPixmap();
-            if ( that->mBigPixmap.isNull() )
-                that->mBigPixmap = Resource::loadPixmap("UnknownDocument");
-            return that->mBigPixmap;
-        }
-        QImage unscaledIcon = Resource::loadImage( that->mIconFile );
-        that->mPixmap.convertFromImage( unscaledIcon.smoothScale( smallSize, smallSize ) );
-        that->mBigPixmap.convertFromImage( unscaledIcon.smoothScale( bigSize, bigSize ) );
-        return that->mBigPixmap;
+    if ( d->mPixmaps[1].isNull() ) {
+        return pixmap( AppLnkPrivate::Big, bigSize );
     }
@@ -276,3 +494,5 @@ const QPixmap& AppLnk::bigPixmap() const
 /*!
-  Returns the type of the application.
+  Returns the type of the AppLnk. For applications, games and
+  settings the type is \c Application; for documents the type is the
+  document's MIME type.
 */
@@ -282,5 +502,8 @@ QString AppLnk::type() const
         AppLnk* that = (AppLnk*)this;
-        MimeType mt(file());
-        that->mType = mt.id();
-        return that->mType;
+        QString f = file();
+        if ( !f.isNull() ) {
+            MimeType mt(f);
+            that->mType = mt.id();
+            return that->mType;
+        }
     }
@@ -292,3 +515,3 @@ QString AppLnk::type() const
 
-  \sa exec()
+  \sa exec() name()
 */
@@ -297,3 +520,3 @@ QString AppLnk::file() const
     if ( mFile.isNull() ) {
-        AppLnk* that = (AppLnk*)this; // copy?
+        AppLnk* that = (AppLnk*)this;
         QString ext = MimeType(mType).extension();
@@ -308,5 +531,7 @@ QString AppLnk::file() const
                 QString(getenv("HOME"))+"/Documents/"+mType+"/"+safeFileName(that->mName);
-            if ( QFile::exists(that->mFile+ext) || QFile::exists(that->mFile+".desktop") ) { // a .desktop with the same name exists
+            /*
+             * A file with the same name or a .desktop file already exists
+             */
+            if ( QFile::exists(that->mFile+ext) || QFile::exists(that->mFile+".desktop") ) {
                 int n=1;
-                qWarning("AppLnk::file() n=1 %s", that->mFile.latin1() );
                 QString nn;
@@ -316,3 +541,2 @@ QString AppLnk::file() const
                 that->mFile = nn;
-                qWarning("AppLnl::file() now mFile is %s", that->mFile.latin1() );
             }
@@ -322,6 +546,8 @@ QString AppLnk::file() const
         prepareDirectories(that->mFile);
-        QFile f(that->mFile);
-        if ( !f.open(IO_WriteOnly) )
-            that->mFile = QString::null;
-        return that->mFile;
+        if ( !that->mFile.isEmpty() ) {
+            QFile f(that->mFile);
+            if ( !f.open(IO_WriteOnly) )
+                that->mFile = QString::null;
+            return that->mFile;
+        }
     }
@@ -331,5 +557,5 @@ QString AppLnk::file() const
 /*!
-  Returns the desktop file coresponding to this AppLnk.
+  Returns the desktop file corresponding to this AppLnk.
 
-  \sa file(), exec()
+  \sa file() exec() name()
 */
@@ -342,3 +568,6 @@ QString AppLnk::linkFile() const
             const FileSystem *fs = storage.fileSystemOf( that->mFile );
-            if ( fs && ( fs->isRemovable() || fs->disk() == "/dev/mtdblock6" || fs->disk() == "tmpfs" ) ) {
+            /* tmpfs + and ramfs are available too but not removable
+             * either we fix storage or add this
+             */
+            if ( fs && ( fs->isRemovable() || fs->disk() == "/dev/mtdblock6" || fs->disk() == "tmpfs") ) {
                 that->mLinkFile = fs->path();
@@ -347,20 +576,22 @@ QString AppLnk::linkFile() const
             that->mLinkFile += "/Documents/"+type()+"/"+safeFileName(that->mName);
-            if ( QFile::exists(that->mLinkFile+".desktop") ) { // ok the file exists lets check if we point to the same file
-                int n=1;
-                QString nn;
-                AppLnk lnk( that->mLinkFile+".desktop" );
-                if(that->file() != lnk.file() ){
-                  qWarning("AppLnk::linkFile exists %s", that->mLinkFile.latin1() );
-                  while (QFile::exists((nn=that->mLinkFile+"_"+QString::number(n))+".desktop")){
-                    n++;
-                    AppLnk lnk(nn ); // just to be sure
-                    if(lnk.file() ==that->file() ){
-                      break;
-                    }
-                  }
-                  that->mLinkFile = nn;
-                }
+
+            /* the desktop file exists make sure we don't point to the same file */
+            if ( QFile::exists(that->mLinkFile+".desktop") ) {
+                AppLnk lnk( that->mLinkFile + ".desktop" );
+
+                /* the linked is different */
+                if(that->file() != lnk.file() ) {
+                    int n = 1;
+                    QString nn;
+                    while (QFile::exists((nn=that->mLinkFile+"_"+QString::number(n))+".desktop")) {
+                        n++;
+                        /* just to be sure */
+                        AppLnk lnk(nn );
+                        if (lnk.file() == that->file() )
+                            break;
+                    }
+                    that->mLinkFile = nn;
+                }
             }
             that->mLinkFile += ".desktop";
-            qWarning("AppLnk::linkFile is %s", that->mLinkFile.latin1() );
             storeLink();
@@ -392,2 +623,4 @@ AppLnk::AppLnk( const AppLnk &copy )
     d->mCat = copy.d->mCat;
+    d->mCatList = copy.d->mCatList;
+    d->mPixmaps = copy.d->mPixmaps;
 }
@@ -395,6 +628,6 @@ AppLnk::AppLnk( const AppLnk &copy )
 /*!
-  Destroys the AppLnk. Note that if the AppLnk is current a member of
-  an AppLnkSet, this will produce a run-time warning.
+  Destroys the AppLnk. Note that if the AppLnk is currently a member
+  of an AppLnkSet, this will produce a run-time warning.
 
-  \sa AppLnkSet::add(), AppLnkSet::remove()
+  \sa AppLnkSet::add() AppLnkSet::remove()
 */
@@ -409,3 +642,6 @@ AppLnk::~AppLnk()
 /*!
+  \overload
   Executes the application associated with this AppLnk.
+
+  \sa exec()
 */
@@ -419,2 +655,4 @@ void AppLnk::execute() const
   \a args as arguments.
+
+  \sa exec()
 */
@@ -439,3 +677,3 @@ void AppLnk::execute(const QStringList& args) const
   \a args as arguments. Rotation is not taken into account by
-  this function, you should not call it directly.
+  this function, so you should not call it directly.
 
@@ -451,3 +689,3 @@ void AppLnk::invoke(const QStringList& args) const
 
-  \sa exec()
+  \sa exec() name()
 */
@@ -471,3 +709,3 @@ void AppLnk::setName( const QString& docname )
 
-  \sa file()
+  \sa file() name()
 */
@@ -491,2 +729,5 @@ void AppLnk::setLinkFile( const QString& filename )
 
+  This text is displayed in the 'Details Dialog', for example if the
+  user uses the 'press-and-hold' gesture.
+
   \sa comment()
@@ -501,2 +742,6 @@ void AppLnk::setComment( const QString& comment )
 
+  For applications, games and settings the type should be \c
+  Application; for documents the type should be the document's MIME
+  type.
+
   \sa type()
@@ -509,5 +754,14 @@ void AppLnk::setType( const QString& type )
 /*!
-  Sets the Icon property to \a iconname.
+  \fn QString AppLnk::icon() const
+
+  Returns the Icon property.
+
+  \sa setIcon()
+*/
+
+/*!
+  Sets the Icon property to \a iconname. This is the filename from
+  which the pixmap() and bigPixmap() are obtained.
 
-  \sa pixmap(), bigPixmap()
+  \sa icon() setSmallIconSize() setBigIconSize()
 */
@@ -517,4 +771,4 @@ void AppLnk::setIcon( const QString& iconname )
     QImage unscaledIcon = Resource::loadImage( mIconFile );
-    mPixmap.convertFromImage( unscaledIcon.smoothScale( smallSize, smallSize ) );
-    mBigPixmap.convertFromImage( unscaledIcon.smoothScale( bigSize, bigSize ) );
+    d->mPixmaps[0].convertFromImage( unscaledIcon.smoothScale( smallSize, smallSize ) );
+    d->mPixmaps[1].convertFromImage( unscaledIcon.smoothScale( bigSize, bigSize ) );
 }
@@ -524,2 +778,4 @@ void AppLnk::setIcon( const QString& iconname )
 
+  See the CategoryWidget for more details.
+
   \sa categories()
@@ -529,2 +785,3 @@ void AppLnk::setCategories( const QArray<int>& c )
     d->mCat = c;
+    d->updateCatListFromArray();
 }
@@ -538,4 +795,7 @@ void AppLnk::setCategories( const QArray<int>& c )
 /*!
-  Attempts to ensure that the link file for this AppLnk exists, including
-  creating any required directories. Returns TRUE if successful.
+  Attempts to ensure that the link file for this AppLnk exists,
+  including creating any required directories. Returns TRUE if
+  successful; otherwise returns FALSE.
+
+  You should not need to use this function.
 */
@@ -548,6 +808,7 @@ bool AppLnk::ensureLinkExists() const
 /*!
-  Commits the AppLnk to disk. Returns whether the operation succeeded.
+  Commits the AppLnk to disk. Returns TRUE if the operation succeeded;
+  otherwise returns FALSE.
 
-  The "linkChanged(QString)" message is sent to the
-  "QPE/System" QCop channel as a result.
+  In addition, the "linkChanged(QString)" message is sent to the
+  "QPE/System" \link qcop.html QCop\endlink channel.
 */
@@ -563,2 +824,5 @@ bool AppLnk::writeLink() const
 
+/*!
+  \internal
+*/
 void AppLnk::storeLink() const
@@ -571,13 +835,19 @@ void AppLnk::storeLink() const
     if ( !mComment.isNull() ) config.writeEntry("Comment",mComment);
-    config.writeEntry("File",file());
-    // write out the id...
-    int i;
-    QStringList sl;
-    for ( i = 0; i < int(d->mCat.count()); i++ ) {
-        sl.append( QString::number( d->mCat[i] ) );
-    }
-    config.writeEntry( "Categories", sl, ';' );
-
+    QString f = file();
+    int i = 0;
+    while ( i < (int)f.length() && i < (int)mLinkFile.length() && f[i] == mLinkFile[i] )
+        i++;
+    while ( i && f[i] != '/' )
+        i--;
+    // simple case where in the same directory
+    if ( mLinkFile.find( '/', i + 1 ) < 0 )
+        f = f.mid(i+1);
+    // ### could do relative ie ../../otherDocs/file.doc
+    config.writeEntry("File",f);
+    config.writeEntry( "Categories", d->mCatList, ';' );
+
+#ifndef QT_NO_COP
     QCopEnvelope e("QPE/System", "linkChanged(QString)");
     e << mLinkFile;
+#endif
 }
@@ -586,2 +856,4 @@ void AppLnk::storeLink() const
   Sets the property named \a key to \a value.
+
+  \sa property()
 */
@@ -597,2 +869,4 @@ void AppLnk::setProperty(const QString& key, const QString& value)
   Returns the property named \a key.
+
+  \sa setProperty()
 */
@@ -607,3 +881,2 @@ QString AppLnk::property(const QString& key) const
 
-
 bool AppLnk::isPreloaded() const {
@@ -632,3 +905,5 @@ void AppLnk::setPreloaded(bool yesNo) {
 /*!
-  Deletes both the linkFile() and file() associated with this AppLnk.
+  Deletes both the linkFile() and the file() associated with this AppLnk.
+
+  \sa removeLinkFile()
 */
@@ -639,2 +914,3 @@ void AppLnk::removeFiles()
         if ( QFile::remove(file()) ) {
+#ifndef QT_NO_COP
             QCopEnvelope e("QPE/System", "linkChanged(QString)");
@@ -644,2 +920,3 @@ void AppLnk::removeFiles()
                 e << file();
+#endif
         } else if ( valid ) {
@@ -652,3 +929,5 @@ void AppLnk::removeFiles()
 /*!
-  Delete the linkFile(), leaving any file() untouched.
+  Deletes the linkFile(), leaving any file() untouched.
+
+    \sa removeFiles()
 */
@@ -657,4 +936,6 @@ void AppLnk::removeLinkFile()
     if ( isValid() && linkFileKnown() && QFile::remove(linkFile()) ) {
+#ifndef QT_NO_COP
         QCopEnvelope e("QPE/System", "linkChanged(QString)");
         e << linkFile();
+#endif
     }
@@ -684,3 +965,6 @@ public:
 
-  Returns the list of types in the set.
+  Returns the list of \link applnk.html#Types types\endlink in the set.
+
+    For applications, games and settings the type is \c Application;
+    for documents the type is the document's MIME type.
 
@@ -705,7 +989,10 @@ AppLnkSet::AppLnkSet() :
   Constructs an AppLnkSet that contains AppLnk objects representing
-  all the files in a \a directory (recursively).
+  all the files in the given \a directory (and any subdirectories
+  recursively).
 
-  The directories may contain ".directory" files which overrides
-  any AppLnk::type() value of AppLnk objects found in the directory.
+  \omit
+  The directories may contain ".directory" files which override
+  any AppLnk::type() values for AppLnk objects found in the directory.
   This allows simple localization of application types.
+  \endomit
 */
@@ -720,4 +1007,4 @@ AppLnkSet::AppLnkSet( const QString &directory ) :
 /*!
-  Detaches all AppLnk objects from the set. The set become empty
-  and the call becomes responsible for deleting the AppLnk objects.
+  Detaches all AppLnk objects from the set. The set become empty and
+  the caller becomes responsible for deleting the AppLnk objects.
 */
@@ -735,3 +1022,3 @@ void AppLnkSet::detachChildren()
 /*!
-  Destroys the set, deleting all AppLnk objects it contains.
+  Destroys the set, deleting all the AppLnk objects it contains.
 
@@ -813,3 +1100,4 @@ void AppLnkSet::findChildren(const QString &dr, const QString& typ, const QStrin
 /*!
-  Adds \a f to the set. The set takes over responsibility for deleting \a f.
+  Adds AppLnk \a f to the set. The set takes responsibility for
+  deleting \a f.
 
@@ -829,4 +1117,5 @@ void AppLnkSet::add( AppLnk *f )
 /*!
-  Removes \a f to the set, returning whether \a f was in the set.
-  The caller becomes responsible for deleting \a f.
+  Removes AppLnk \a f to the set. The caller becomes responsible for
+  deleting \a f. Returns TRUE if \a f was in the set; otherwise
+  returns FALSE.
 
@@ -843,4 +1132,8 @@ bool AppLnkSet::remove( AppLnk *f )
 
+
 /*!
   Returns the localized name for type \a t.
+
+    For applications, games and settings the type is \c Application;
+    for documents the type is the document's MIME type.
 */
@@ -854,2 +1147,5 @@ QString AppLnkSet::typeName( const QString& t ) const
   Returns the small pixmap associated with type \a t.
+
+    For applications, games and settings the type is \c Application;
+    for documents the type is the document's MIME type.
 */
@@ -863,2 +1159,5 @@ QPixmap AppLnkSet::typePixmap( const QString& t ) const
   Returns the large pixmap associated with type \a t.
+
+    For applications, games and settings the type is \c Application;
+    for documents the type is the document's MIME type.
 */
@@ -923,4 +1222,4 @@ DocLnkSet::DocLnkSet()
 /*!
-  Constructs an DocLnkSet that contains DocLnk objects representing
-  all the files in a \a directory (recursively).
+  Constructs a DocLnkSet that contains DocLnk objects representing all
+  the files in the \a directory (and any subdirectories, recursively).
 
@@ -929,3 +1228,6 @@ DocLnkSet::DocLnkSet()
   The value may contain multiple wild-card patterns separated by ";",
-  such as "*o/mpeg;audio/x-wav".
+  such as \c{*o/mpeg;audio/x-wav}.
+
+  See also \link applnk.html#files-and-links Files and Links\endlink.
+
 */
@@ -998,2 +1300,9 @@ void DocLnkSet::findChildren(const QString &dr, const QValueList<QRegExp> &mimeF
 
+    /* Opie got a different approach
+     * I guess it's geek vs. consumer
+     * in this case to be discussed
+     */
+    if ( dir.exists( ".Qtopia-ignore" ) )
+        return;
+
     const QFileInfoList *list = dir.entryInfoList();
@@ -1003,5 +1312,6 @@ void DocLnkSet::findChildren(const QString &dr, const QValueList<QRegExp> &mimeF
             QString bn = fi->fileName();
-            if ( bn[0] != '.' && bn != "CVS" ) {
-                if ( fi->isDir() ) {
-                    findChildren(fi->filePath(), mimeFilters, reference, depth);
+            if ( bn[0] != '.' ) {
+                if ( fi->isDir()  ) {
+                    if ( bn != "CVS" && bn != "Qtopia" && bn != "QtPalmtop" )
+                        findChildren(fi->filePath(), mimeFilters, reference, depth);
                 } else {
@@ -1060,4 +1370,5 @@ DocLnk::DocLnk( const QString &file ) :
   Constructs a DocLnk from a valid .desktop \a file or a new .desktop
-  \a file for other files. If \a may_be_desktopfile is TRUE, then \a file
-  is first attempted to be read as a .desktop file.
+  \a file for other files. If \a may_be_desktopfile is TRUE, then an
+  attempt is made to read \a file as a .desktop file; if that fails it
+  is read as a normal file.
 */
@@ -1090,4 +1401,4 @@ void DocLnk::init(const QString &file)
         QString n = file;
-        n.replace(QRegExp("\\..*"),"");
         n.replace(QRegExp(".*/"),"");
+        n.replace(QRegExp("\\..*"),"");
         setName( n );
@@ -1108,3 +1419,3 @@ DocLnk::DocLnk()
 /*!
-  Destroys the DocLnk. As with AppLnk objects, a run-time error
+  Destroys the DocLnk. Just like AppLnk objects, a run-time error
   occurs if the DocLnk is a member of a DocLnkSet (or AppLnkSet).
@@ -1145 +1456,2 @@ void DocLnk::invoke(const QStringList& args) const
 
+
diff --git a/library/applnk.h b/library/applnk.h
index 9b5523e..71b62ef 100644
--- a/library/applnk.h
+++ b/library/applnk.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -49,2 +49,3 @@ public:
     const QPixmap& bigPixmap() const;
+    QString icon() const { return mIconFile; }
     virtual QString exec() const { return mExec; }
@@ -60,2 +61,3 @@ public:
 
+    bool fileKnown() const { return !mFile.isNull(); }
     bool linkFileKnown() const { return !mLinkFile.isNull(); }
@@ -80,6 +82,10 @@ public:
 
-//#ifdef QTOPIA_INTERNAL_PRELOADACCESS
+#ifdef QTOPIA_INTERNAL_PRELOADACCESS
     bool isPreloaded() const;
     void setPreloaded(bool yesNo);
-//#endif
+#endif
+
+#ifdef QTOPIA_INTERNAL_APPLNKASSIGN
+    AppLnk &operator=(const AppLnk &other);
+#endif
 
@@ -87,4 +93,9 @@ protected:
     QString mName;
+
+    /* remove for Qtopia 3.0 -zecke */
     QPixmap mPixmap;
+
+    /* remove for Qtopia 3.0 -zecke */
     QPixmap mBigPixmap;
+
     QString mExec;
@@ -106,2 +117,5 @@ protected:
     void storeLink() const;
+
+private:
+    const QPixmap& pixmap(int pos,  int size) const;
 };
@@ -117,2 +131,7 @@ public:
 
+
+#ifdef QTOPIA_INTERNAL_APPLNKASSIGN
+    DocLnk &operator=(const DocLnk &other) { AppLnk::operator=(other); return *this; }
+#endif
+
     QString exec() const;
@@ -143,2 +162,13 @@ public:
     bool remove(AppLnk*);
+    void clear() {
+        QListIterator<AppLnk> it( mApps );
+        for ( ; it.current(); ) {
+            AppLnk* a = *it;
+            ++it;
+            a->mId = 0;
+            delete a;
+        }
+        mApps.clear();
+        typs.clear();
+    }
 
diff --git a/library/backend/categories.cpp b/library/backend/categories.cpp
index 6e011c4..e37b3b9 100644
--- a/library/backend/categories.cpp
+++ b/library/backend/categories.cpp
@@ -1,14 +1,13 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** 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.
+** 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.
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
@@ -20,3 +19,4 @@
 **********************************************************************/
-#include "categories.h"
+#include <qtopia/categories.h>
+#include <qtopia/stringutil.h>
 #include <qfile.h>
@@ -24,3 +24,2 @@
 #include <qtextstream.h>
-#include "stringutil.h"
 
@@ -40,2 +39,20 @@ UidGen CategoryGroup::sUidGen( UidGen::Qtopia );
 
+/*! \class CategoryGroup categories.h
+  \brief Helper class that is used by Categories
+
+  CategoryGroup is a group of categories that is associated with an
+  application or global set. Mainly it defines a map of ids to
+  category labels and category labels to ids. Lookups can be done with
+  labels or unique idenifiers.
+
+  \ingroup qtopiaemb
+  \ingroup qtopiadesktop
+  \warning Categories API will likely change between Qtopia 1.5 and Qtopia 3
+  \sa Categories::appGroupMap(), Categories::globalGroup()
+ */
+
+/*! Add \a label and return the UID. If failure, then 0 is returned. Note
+  that All and Unfiled are reserved labels.
+  \internal
+*/
 int CategoryGroup::add( const QString &label )
@@ -60,2 +77,4 @@ void CategoryGroup::insert( int uid, const QString &label )
 
+/*! \internal
+ */
 bool CategoryGroup::add( int uid, const QString &label )
@@ -75,2 +94,5 @@ bool CategoryGroup::add( int uid, const QString &label )
 
+/*! Returns TRUE if \a label was removed from the group, FALSE if not.
+  \internal
+ */
 bool CategoryGroup::remove( const QString &label )
@@ -87,2 +109,5 @@ bool CategoryGroup::remove( const QString &label )
 
+/*! Returns TRUE if \a uid was removed from the group, FALSE if not.
+  \internal
+ */
 bool CategoryGroup::remove( int uid )
@@ -99,2 +124,4 @@ bool CategoryGroup::remove( int uid )
 
+/*! \internal
+ */
 bool CategoryGroup::rename( int uid, const QString &newLabel )
@@ -115,2 +142,4 @@ bool CategoryGroup::rename( int uid, const QString &newLabel )
 
+/*! \internal
+ */
 bool CategoryGroup::rename( const QString &oldLabel, const QString &newLabel )
@@ -120,2 +149,3 @@ bool CategoryGroup::rename( const QString &oldLabel, const QString &newLabel )
 
+/*! Returns TRUE if \a uid is stored in this group, FALSE if not. */
 bool CategoryGroup::contains(int uid) const
@@ -125,2 +155,3 @@ bool CategoryGroup::contains(int uid) const
 
+/*! Returns TRUE if \a label is stored in this group, FALSE if not. */
 bool CategoryGroup::contains(const QString &label) const
@@ -130,4 +161,4 @@ bool CategoryGroup::contains(const QString &label) const
 
-/** Returns label associated with the uid or QString::null if
- *   not found
+/*! Returns label associated with the \a uid or QString::null if
+  not found
  */
@@ -141,3 +172,3 @@ const QString &CategoryGroup::label(int uid) const
 
-/** Returns the uid associated with label or 0 if not found */
+/*! Returns the uid associated with \a label or 0 if not found */
 int CategoryGroup::id(const QString &label) const
@@ -150,2 +181,3 @@ int CategoryGroup::id(const QString &label) const
 
+/*! Returns a list of all labels stored in this group. */
 QStringList CategoryGroup::labels() const
@@ -161,2 +193,3 @@ QStringList CategoryGroup::labels() const
 
+/*! Returns a list of all labels associated with the \a catids */
 QStringList CategoryGroup::labels(const QArray<int> &catids ) const
@@ -179,5 +212,45 @@ QStringList CategoryGroup::labels(const QArray<int> &catids ) const
 
-/** Add the category name as long as it doesn't already exist locally
- *  or globally.  Return TRUE if added, FALSE if conflicts.
- */
+/*!
+  \class Categories categories.h
+  \brief The Categories class is a database that groups categories and maps ids to names.
+
+  The Categories class is the low level Categories accessor class. To
+  add a category menu and filter for your application, see CategoryMenu.
+
+  The Categories class allows the developer to add, remove, and rename
+  categories. Categories can be created for an individual application
+  such as Todo List or to be used for all applications. Categories
+  that can be used by all applications are called global
+  categories. Each PalmtopRecord subclass stores categories as an
+  QArray<int> using PalmtopRecord::setCategories() and
+  PalmtopRecord::categories(). This allows each record to be assigned
+  to multiple categories. This also allows the user to rename a
+  category and for it to update automatically in all records.
+
+  This class provides several methods to convert between a category id
+  and it's associated string such as id(), ids(), label() and labels(). A
+  helper class called CategoryGroup is used to access categories of a
+  single application group, such as Todo List. Global categories can
+  also be accessed via CategoryGroup objects.  See appGroupMap() and
+  globalGroup() for the appropriate accessor methods.
+
+  Categories are stored in an xml file in the Settings directory
+  (Categories.xml). A global function called categoryFileName() will
+  return to appropriate QString file location to be passed to load()
+  and save() for the master categories database.
+
+  \ingroup qtopiaemb
+  \ingroup qtopiadesktop
+  \warning Categories API will likely change between Qtopia 1.5 and Qtopia 3
+  \sa CategoryGroup, CategoryMenu
+*/
+
+
+/*!
+  Add the category name as long as it doesn't already exist locally or
+  globally.  The \a uid is assigned to the category if successfully
+  added. Return \a uid if added, 0 if conflicts (error).
+
+  \internal
+*/
 int Categories::addCategory( const QString &appname,
@@ -206,2 +279,7 @@ int Categories::addCategory( const QString &appname,
 
+/*!
+  Add the category name as long as it doesn't already exist locally or
+  globally.  Return UID if added, 0 if conflicts (error).
+*/
+
 int Categories::addCategory( const QString &appname,
@@ -231,2 +309,5 @@ int Categories::addCategory( const QString &appname,
 
+/*!
+  \internal
+*/
 int Categories::addGlobalCategory( const QString &catname, int uid )
@@ -238,2 +319,8 @@ int Categories::addGlobalCategory( const QString &catname, int uid )
 
+/*!
+  Add the global category \a catname while checking that it doesn't
+  already exist globally. Return UID if added, 0 if conflicts.
+
+  \sa addCategory()
+ */
 int Categories::addGlobalCategory( const QString &catname )
@@ -247,6 +334,8 @@ int Categories::addGlobalCategory( const QString &catname )
 
-/** Removes the category from the application; if it is not found
- *  in the application, then it attempts to remove it from
- *  the global list
- */
+/*!
+
+  Removes the \a catname from the application group. If it is not
+  found in the application group and \a checkGlobal is TRUE, then it
+  attempts to remove it from the global list
+*/
 bool Categories::removeCategory( const QString &appname,
@@ -270,2 +359,7 @@ bool Categories::removeCategory( const QString &appname,
 
+
+/*!
+  Removes the \a uid from the application group \a appname. Returns TRUE
+  if success, FALSE if not found.
+*/
 bool Categories::removeCategory( const QString &appname, int uid )
@@ -284,2 +378,6 @@ bool Categories::removeCategory( const QString &appname, int uid )
 
+/*!
+  Removes the global category \a catname. Returns TRUE
+  if success, FALSE if not found.
+*/
 bool Categories::removeGlobalCategory( const QString &catname )
@@ -294,3 +392,6 @@ bool Categories::removeGlobalCategory( const QString &catname )
 
-
+/*!
+  Removes the global category \a uid. Returns TRUE
+  if success, FALSE if not found.
+*/
 bool Categories::removeGlobalCategory( int uid )
@@ -304,5 +405,6 @@ bool Categories::removeGlobalCategory( int uid )
 
-/** 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.
+/*!
+  Returns the sorted list of all categories that are associated with
+  the \a app.  If \a includeGlobal is TRUE then the returned
+  categories will include the global category items.
  */
@@ -318,3 +420,3 @@ QStringList Categories::labels( const QString &app,
         cats += (*appIt).labels();
-    else qDebug("Categories::labels didn't find app %s", app.latin1() );
+    //else qDebug("Categories::labels didn't find app %s", app.latin1() );
     if ( includeGlobal )
@@ -340,2 +442,5 @@ QStringList Categories::labels( const QString &app,
 
+/*!
+  Returns the label associated with the id
+*/
 QString Categories::label( const QString &app, int id ) const
@@ -351,7 +456,13 @@ QString Categories::label( const QString &app, int id ) const
 
-/** 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.
-    */
+/*!
+  Returns a single string associated with \a catids for display in a
+  combobox or any area that requires one string.  If \a 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
+  set, the just the first string is returned.
+*/
 QString Categories::displaySingle( const QString &app,
@@ -382,2 +493,7 @@ QString Categories::displaySingle( const QString &app,
 
+/*!
+
+  Returns all ids associated with the application CategoryGroup \a app
+  and the passed in \a labels in that group.
+*/
 QArray<int> Categories::ids( const QString &app, const QStringList &labels) const
@@ -387,3 +503,3 @@ QArray<int> Categories::ids( const QString &app, const QStringList &labels) cons
   int i;
-  
+
   for ( i=0, it=labels.begin(); it!=labels.end(); i++, ++it ) {
@@ -399,2 +515,7 @@ QArray<int> Categories::ids( const QString &app, const QStringList &labels) cons
 
+/*!
+  Returns the id associated with the app. If the id is not found in the
+  application CategoryGroup, then it searches the global CategoryGroup.
+  If it is not found it either, 0 is returned.
+*/
 int Categories::id( const QString &app, const QString &cat ) const
@@ -410,4 +531,9 @@ int Categories::id( const QString &app, const QString &cat ) const
 
-/** Return TRUE if renaming succeeded; FALSE if app name not found,
- *   or if there was a name conflict
+/*!
+  Return TRUE if renaming succeeded; FALSE if \a appname or \a oldName
+  is not found, or if \a newName conflicts with an existing category
+  in the CategoryGroup.
+
+  It will first search the CategoryGroup associated with \a appname
+  and if not found it will try to replace in global CategoryGroup.
  */
@@ -431,2 +557,8 @@ bool Categories::renameCategory( const QString &appname,
 
+/*!
+  Return TRUE if renaming succeeded; FALSE if \a appname or \a oldName
+  is not found, or if \a newName conflicts with an existing category
+  in the CategoryGroup. This function will only rename categories found
+  in the global CategoryGroup.
+ */
 bool Categories::renameGlobalCategory( const QString &oldName,
@@ -442,2 +574,6 @@ bool Categories::renameGlobalCategory( const QString &oldName,
 
+/*!
+  Changes the grouping of a category. If a category was global and \a global
+  is set to TRUE, then the \a catname will be moved to the \a appname group.
+*/
 void Categories::setGlobal( const QString &appname,
@@ -460,2 +596,5 @@ void Categories::setGlobal( const QString &appname,
 
+/*!
+  Returns TRUE if the \a catname is in the global CategoryGroup, FALSE if not.
+*/
 bool Categories::isGlobal( const QString &catname ) const
@@ -466,3 +605,5 @@ bool Categories::isGlobal( const QString &catname ) const
 
-/** Returns true if the catname is associated with any application
+/*!
+  Returns true if the \a catname is associated with any CategoryGroup,
+  including global.
  */
@@ -480,2 +621,6 @@ bool Categories::exists( const QString &catname ) const
 
+/*!
+  Returns TRUE if the \a catname is associated with the \a appname
+  CategoryGroup, FALSE if not found.
+ */
 bool Categories::exists( const QString &appname,
@@ -492,3 +637,8 @@ bool Categories::exists( const QString &appname,
 
+/*!
+  Saves the Categories database to the \a fname. See categoryFileName()
+  for the default file name string used for the shared category database.
 
+  Returns FALSE if there is error writing the file or TRUE on success.
+ */
 bool Categories::save( const QString &fname ) const
@@ -536,2 +686,5 @@ bool Categories::save( const QString &fname ) const
 
+#ifdef Q_OS_WIN32
+    QFile::remove( fname );
+#endif
     if ( ::rename( strNewFile.latin1(), fname.latin1() ) < 0 ) {
@@ -546,2 +699,8 @@ bool Categories::save( const QString &fname ) const
 
+/*!
+  Loads the Categories database using \a fname. See categoryFileName()
+  for the default file name string used for the shared category database.
+
+  Returns FALSE if there is error reading the file or TRUE on success.
+ */
 bool Categories::load( const QString &fname )
@@ -621,2 +780,6 @@ bool Categories::load( const QString &fname )
 
+/*!
+  Clear the categories in memory. Equivelent to creating an empty Categories
+  object.
+*/
 void Categories::clear()
@@ -627,2 +790,5 @@ void Categories::clear()
 
+/*!
+  Dump the contents to standard out. Used for debugging only.
+*/
 void Categories::dump() const
@@ -677 +843,94 @@ void CheckedListView::setChecked( const QStringList &checked )
 }
+
+/*! \fn Categories &Categories::operator= ( const Categories &c )
+
+  Performs deep copy.
+ */
+
+
+/*! \fn  QStringList Categories::labels( const QString & app, const QArray<int> &catids ) const
+
+  Returns list of labels associated with the application and catids
+*/
+
+/*! \fn QStringList Categories::globalCategories() const
+
+  Returns list of all global category labels
+*/
+
+/*! \fn const QMap<QString, CategoryGroup> &Categories::appGroupMap() const
+
+  Returns a map of application names to CategoryGroup. The CategoryGroup
+  class defines a map of ids to category labels and category labels to ids.
+*/
+
+/*! \fn const CategoryGroup &Categories::globalGroup() const
+
+  Returns the global CategoryGroup. The CategoryGroup
+  class defines a map of ids to category labels and category labels to ids.
+*/
+
+/*! \fn void Categories::categoryAdded( const Categories &cats, const QString &appname, int uid)
+
+  Emitted if a category is added.
+
+  \a cats is a const reference to this object
+  \a appname is the CategoryGroup application name that the category was added to or QString::null if it was global
+  \a uid is the unique identifier associated with the added category
+        */
+
+/*! \fn void Categories::categoryRemoved( const Categories &cats, const QString &appname,
+  int uid)
+
+  Emitted if removed category is removed.
+
+  \a cats is a const reference to this object
+  \a appname is the CategoryGroup application name that the category was removed from or QString::null if it was the global CategoryGroup
+  \a uid is the unique identifier associated with the removed category
+*/
+
+
+/*! \fn void Categories::categoryRenamed( const Categories &cats, const QString &appname,
+  int uid)
+
+  Emitted if \a uid in the \a appname CategoryGroup is renamed in \a cats
+  object.
+
+  \a cats is a const reference to this object
+  \a appname is the CategoryGroup application name that the category was renamed in or QString::null if it was the global CategoryGroup
+  \a uid is the unique identifier associated with the renamed category
+*/
+
+/*! \fn Categories::Categories( QObject *parent=0, const char *name = 0 )
+
+  Constructor for an empty Categories object.
+*/
+
+/*! \fn Categories::Categories( const Categories &copyFrom )
+
+  Deep copy constructor
+*/
+
+/*! \fn Categories::~Categories()
+
+  Empty destructor. Call save() before destruction if there are changes
+  that need to be saved.
+*/
+
+/*! \fn CategoryGroup::clear()
+  \internal
+*/
+
+/*! \fn const QMap<int, QString> &CategoryGroup::idMap() const
+
+  Returns a const reference to the id to label QMap
+*/
+
+/*! \fn CategoryGroup::CategoryGroup()
+  \internal
+*/
+
+/*! \fn CategoryGroup::CategoryGroup(const CategoryGroup &c)
+  \internal
+*/
+
diff --git a/library/backend/contact.cpp b/library/backend/contact.cpp
index b10b19a..3f4934a 100644
--- a/library/backend/contact.cpp
+++ b/library/backend/contact.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -36,4 +36,18 @@
 
+/*!
+  \class Contact contact.h
+  \brief The Contact class holds the data of an address book entry.
+
+  This data includes information the name of the person, contact
+  information, and business information such as deparment and job title.
+
+  \ingroup qtopiaemb
+  \ingroup qtopiadesktop
+*/
+
 Qtopia::UidGen Contact::sUidGen( Qtopia::UidGen::Qtopia );
 
+/*!
+  Creates a new, empty contact.
+*/
 Contact::Contact()
@@ -43,2 +57,7 @@ Contact::Contact()
 
+/*!
+  \internal
+  Creates a new contact.  The properties of the contact are
+  set from \a fromMap.
+*/
 Contact::Contact( const QMap<int, QString> &fromMap ) :
@@ -50,2 +69,3 @@ Contact::Contact( const QMap<int, QString> &fromMap ) :
     QString uidStr = find( Qtopia::AddressUid );
+
     if ( uidStr.isEmpty() )
@@ -54,4 +74,10 @@ Contact::Contact( const QMap<int, QString> &fromMap ) :
         setUid( uidStr.toInt() );
+
+    if ( !uidStr.isEmpty() )
+        setUid( uidStr.toInt() );
 }
 
+/*!
+  Destroys a contact.
+*/
 Contact::~Contact()
@@ -60,2 +86,352 @@ Contact::~Contact()
 
+/*! \fn void Contact::setTitle( const QString &str )
+  Sets the title of the contact to \a str.
+*/
+
+/*! \fn void Contact::setFirstName( const QString &str )
+  Sets the first name of the contact to \a str.
+*/
+
+/*! \fn void Contact::setMiddleName( const QString &str )
+  Sets the middle name of the contact to \a str.
+*/
+
+/*! \fn void Contact::setLastName( const QString &str )
+  Sets the last name of the contact to \a str.
+*/
+
+/*! \fn void Contact::setSuffix( const QString &str )
+  Sets the suffix of the contact to \a str.
+*/
+
+/*! \fn void Contact::setFileAs( const QString &str )
+  Sets the contact to filed as \a str.
+*/
+
+/*! \fn void Contact::setDefaultEmail( const QString &str )
+  Sets the default email of the contact to \a str.
+*/
+
+/*! \fn void Contact::setHomeStreet( const QString &str )
+  Sets the home street address of the contact to \a str.
+*/
+
+/*! \fn void Contact::setHomeCity( const QString &str )
+  Sets the home city of the contact to \a str.
+*/
+
+/*! \fn void Contact::setHomeState( const QString &str )
+  Sets the home state of the contact to \a str.
+*/
+
+/*! \fn void Contact::setHomeZip( const QString &str )
+  Sets the home zip code of the contact to \a str.
+*/
+
+/*! \fn void Contact::setHomeCountry( const QString &str )
+  Sets the home country of the contact to \a str.
+*/
+
+/*! \fn void Contact::setHomePhone( const QString &str )
+  Sets the home phone number of the contact to \a str.
+*/
+
+/*! \fn void Contact::setHomeFax( const QString &str )
+  Sets the home fax number of the contact to \a str.
+*/
+
+/*! \fn void Contact::setHomeMobile( const QString &str )
+  Sets the home mobile phone number of the contact to \a str.
+*/
+
+/*! \fn void Contact::setHomeWebpage( const QString &str )
+  Sets the home webpage of the contact to \a str.
+*/
+
+/*! \fn void Contact::setCompany( const QString &str )
+  Sets the company for contact to \a str.
+*/
+
+/*! \fn void Contact::setJobTitle( const QString &str )
+  Sets the job title of the contact to \a str.
+*/
+
+/*! \fn void Contact::setDepartment( const QString &str )
+  Sets the department for contact to \a str.
+*/
+
+/*! \fn void Contact::setOffice( const QString &str )
+  Sets the office for contact to \a str.
+*/
+
+/*! \fn void Contact::setBusinessStreet( const QString &str )
+  Sets the business street address of the contact to \a str.
+*/
+
+/*! \fn void Contact::setBusinessCity( const QString &str )
+  Sets the business city of the contact to \a str.
+*/
+
+/*! \fn void Contact::setBusinessState( const QString &str )
+  Sets the business state of the contact to \a str.
+*/
+
+/*! \fn void Contact::setBusinessZip( const QString &str )
+  Sets the business zip code of the contact to \a str.
+*/
+
+/*! \fn void Contact::setBusinessCountry( const QString &str )
+  Sets the business country of the contact to \a str.
+*/
+
+/*! \fn void Contact::setBusinessPhone( const QString &str )
+  Sets the business phone number of the contact to \a str.
+*/
+
+/*! \fn void Contact::setBusinessFax( const QString &str )
+  Sets the business fax number of the contact to \a str.
+*/
+
+/*! \fn void Contact::setBusinessMobile( const QString &str )
+  Sets the business mobile phone number of the contact to \a str.
+*/
+
+/*! \fn void Contact::setBusinessPager( const QString &str )
+  Sets the business pager number of the contact to \a str.
+*/
+
+/*! \fn void Contact::setBusinessWebpage( const QString &str )
+  Sets the business webpage of the contact to \a str.
+*/
+
+/*! \fn void Contact::setProfession( const QString &str )
+  Sets the profession of the contact to \a str.
+*/
+
+/*! \fn void Contact::setAssistant( const QString &str )
+  Sets the assistant of the contact to \a str.
+*/
+
+/*! \fn void Contact::setManager( const QString &str )
+  Sets the manager of the contact to \a str.
+*/
+
+/*! \fn void Contact::setSpouse( const QString &str )
+  Sets the spouse of the contact to \a str.
+*/
+
+/*! \fn void Contact::setGender( const QString &str )
+  Sets the gender of the contact to \a str.
+*/
+
+/*! \fn void Contact::setBirthday( const QString &str )
+  Sets the birthday for the contact to \a str.
+*/
+
+/*! \fn void Contact::setAnniversary( const QString &str )
+  Sets the anniversary of the contact to \a str.
+*/
+
+/*! \fn void Contact::setNickname( const QString &str )
+  Sets the nickname of the contact to \a str.
+*/
+
+/*! \fn void Contact::setNotes( const QString &str )
+  Sets the notes about the contact to \a str.
+*/
+
+/*! \fn QString Contact::title() const
+  Returns the title of the contact.
+*/
+
+/*! \fn QString Contact::firstName() const
+  Returns the first name of the contact.
+*/
+
+/*! \fn QString Contact::middleName() const
+  Returns the middle name of the contact.
+*/
+
+/*! \fn QString Contact::lastName() const
+  Returns the last name of the contact.
+*/
+
+/*! \fn QString Contact::suffix() const
+  Returns the suffix of the contact.
+*/
+
+/*! \fn QString Contact::fileAs() const
+  Returns the string the contact is filed as.
+*/
+
+/*! \fn QString Contact::defaultEmail() const
+  Returns the default email address of the contact.
+*/
+
+/*! \fn QString Contact::emails() const
+  Returns the list of email address for a contact separated by ';'s in a single
+  string.
+*/
+
+/*! \fn QString Contact::homeStreet() const
+  Returns the home street address of the contact.
+*/
+
+/*! \fn QString Contact::homeCity() const
+  Returns the home city of the contact.
+*/
+
+/*! \fn QString Contact::homeState() const
+  Returns the home state of the contact.
+*/
+
+/*! \fn QString Contact::homeZip() const
+  Returns the home zip of the contact.
+*/
+
+/*! \fn QString Contact::homeCountry() const
+  Returns the home country of the contact.
+*/
+
+/*! \fn QString Contact::homePhone() const
+  Returns the home phone number of the contact.
+*/
+
+/*! \fn QString Contact::homeFax() const
+  Returns the home fax number of the contact.
+*/
+
+/*! \fn QString Contact::homeMobile() const
+  Returns the home mobile number of the contact.
+*/
+
+/*! \fn QString Contact::homeWebpage() const
+  Returns the home webpage of the contact.
+*/
+
+/*! \fn QString Contact::company() const
+  Returns the company for the contact.
+*/
+
+/*! \fn QString Contact::department() const
+  Returns the department for the contact.
+*/
+
+/*! \fn QString Contact::office() const
+  Returns the office for the contact.
+*/
+
+/*! \fn QString Contact::jobTitle() const
+  Returns the job title of the contact.
+*/
+
+/*! \fn QString Contact::profession() const
+  Returns the profession of the contact.
+*/
+
+/*! \fn QString Contact::assistant() const
+  Returns the assistant of the contact.
+*/
+
+/*! \fn QString Contact::manager() const
+  Returns the manager of the contact.
+*/
+
+/*! \fn QString Contact::businessStreet() const
+  Returns the business street address of the contact.
+*/
+
+/*! \fn QString Contact::businessCity() const
+  Returns the business city of the contact.
+*/
+
+/*! \fn QString Contact::businessState() const
+  Returns the business state of the contact.
+*/
+
+/*! \fn QString Contact::businessZip() const
+  Returns the business zip of the contact.
+*/
+
+/*! \fn QString Contact::businessCountry() const
+  Returns the business country of the contact.
+*/
+
+/*! \fn QString Contact::businessPhone() const
+  Returns the business phone number of the contact.
+*/
+
+/*! \fn QString Contact::businessFax() const
+  Returns the business fax number of the contact.
+*/
+
+/*! \fn QString Contact::businessMobile() const
+  Returns the business mobile number of the contact.
+*/
+
+/*! \fn QString Contact::businessPager() const
+  Returns the business pager number of the contact.
+*/
+
+/*! \fn QString Contact::businessWebpage() const
+  Returns the business webpage of the contact.
+*/
+
+/*! \fn QString Contact::spouse() const
+  Returns the spouse of the contact.
+*/
+
+/*! \fn QString Contact::gender() const
+  Returns the gender of the contact.
+*/
+
+/*! \fn QString Contact::birthday() const
+  Returns the birthday of the contact.
+*/
+
+/*! \fn QString Contact::anniversary() const
+  Returns the anniversary of the contact.
+*/
+
+/*! \fn QString Contact::nickname() const
+  Returns the nickname of the contact.
+*/
+
+/*! \fn QString Contact::children() const
+  Returns the children of the contact.
+*/
+
+/*! \fn QString Contact::notes() const
+  Returns the notes relating to the the contact.
+*/
+
+/*! \fn QString Contact::groups() const
+  \internal
+  Returns the groups for the contact.
+*/
+
+/*! \fn QStringList Contact::groupList() const
+  \internal
+*/
+
+/*! \fn QString Contact::field(int) const
+  \internal
+*/
+
+/*! \fn void Contact::saveJournal( journal_action, const QString & = QString::null )
+  \internal
+*/
+
+/*! \fn void Contact::setUid( int id )
+  \internal
+  Sets the uid for this record to \a id.
+*/
+
+/*! \enum Contact::journal_action
+  \internal
+*/
+
+/*!
+  \internal
+*/
 QMap<int, QString> Contact::toMap() const
@@ -63,3 +439,5 @@ QMap<int, QString> Contact::toMap() const
     QMap<int, QString> map = mMap;
-    map.insert( Qtopia::AddressCategory, idsToString( categories() ));
+    QString cats = idsToString( categories() );
+    if ( !cats.isEmpty() )
+        map.insert( Qtopia::AddressCategory, cats );
     return map;
@@ -68,3 +446,3 @@ QMap<int, QString> Contact::toMap() const
 /*!
-  Returns a rich text formatted QString of the Contact.
+  Returns a rich text formatted QString representing the contents the contact.
 */
@@ -233,2 +611,5 @@ QString Contact::toRichText() const
 
+/*!
+  \internal
+*/
 void Contact::insert( int key, const QString &v )
@@ -242,2 +623,5 @@ void Contact::insert( int key, const QString &v )
 
+/*!
+  \internal
+*/
 void Contact::replace( int key, const QString & v )
@@ -251,2 +635,5 @@ void Contact::replace( int key, const QString & v )
 
+/*!
+  \internal
+*/
 QString Contact::find( int key ) const
@@ -256,2 +643,5 @@ QString Contact::find( int key ) const
 
+/*!
+  \internal
+*/
 QString Contact::displayAddress( const QString &street,
@@ -278,2 +668,5 @@ QString Contact::displayAddress( const QString &street,
 
+/*!
+  \internal
+*/
 QString Contact::displayBusinessAddress() const
@@ -285,2 +678,5 @@ QString Contact::displayBusinessAddress() const
 
+/*!
+  \internal
+*/
 QString Contact::displayHomeAddress() const
@@ -292,2 +688,5 @@ QString Contact::displayHomeAddress() const
 
+/*!
+  Returns the full name of the contact
+*/
 QString Contact::fullName() const
@@ -324,2 +723,5 @@ QString Contact::fullName() const
 
+/*!
+  Returns a list of the names of the children of the contact.
+*/
 QStringList Contact::childrenList() const
@@ -329,7 +731,50 @@ QStringList Contact::childrenList() const
 
+/*! \fn void Contact::insertEmail( const QString &email )
+
+  Insert \a email into the email list. Ensures \a email can only be added
+  once. If there is no default email address set, it sets it to the \a email.
+*/
+
+/*! \fn void Contact::removeEmail( const QString &email )
+
+  Removes the \a email from the email list. If the default email was \a email,
+  then the default email address is assigned to the first email in the
+  email list
+*/
+
+/*! \fn void Contact::clearEmails()
+
+  Clears the email list.
+ */
+
+/*! \fn void Contact::insertEmails( const QStringList &emailList )
+
+  Appends the \a emailList to the exiting email list
+ */
+
+/*!
+  Returns a list of email addresses belonging to the contact, including
+  the default email address.
+*/
 QStringList Contact::emailList() const
 {
-    return QStringList::split( ";", find( Qtopia::Emails ) );
+    QString emailStr = emails();
+
+    QStringList r;
+    if ( !emailStr.isEmpty() ) {
+        qDebug(" emailstr ");
+        QStringList l = QStringList::split( emailSeparator(), emailStr );
+        for ( QStringList::ConstIterator it = l.begin();it != l.end();++it )
+            r += (*it).simplifyWhiteSpace();
+    }
+
+    return r;
 }
 
+/*!
+  \overload
+
+  Generates the string for the contact to be filed as from the first,
+  middle and last name of the contact.
+*/
 void Contact::setFileAs()
@@ -355,2 +800,6 @@ void Contact::setFileAs()
 
+/*!
+  \internal
+  Appends the contact information to \a buf.
+*/
 void Contact::save( QString &buf ) const
@@ -379,2 +828,6 @@ void Contact::save( QString &buf ) const
 
+/*!
+  \internal
+  Returns the list of fields belonging to a contact
+*/
 QStringList Contact::fields()
@@ -437,2 +890,6 @@ QStringList Contact::fields()
 
+/*!
+  \internal
+  Returns a translated list of field names for a contact.
+*/
 QStringList Contact::trfields()
@@ -495,6 +952,10 @@ QStringList Contact::trfields()
 
-void Contact::setEmails( const QString &v )
+/*!
+  Sets the list of email address for contact to those contained in \a str.
+  Email address should be separated by ';'s.
+*/
+void Contact::setEmails( const QString &str )
 {
-    replace( Qtopia::Emails, v );
-    if ( v.isEmpty() )
+    replace( Qtopia::Emails, str );
+    if ( str.isEmpty() )
         setDefaultEmail( QString::null );
@@ -502,5 +963,8 @@ void Contact::setEmails( const QString &v )
 
-void Contact::setChildren( const QString &v )
+/*!
+  Sets the list of children for the contact to those contained in \a str.
+*/
+void Contact::setChildren( const QString &str )
 {
-    replace( Qtopia::Children, v );
+    replace( Qtopia::Children, str );
 }
@@ -508,2 +972,5 @@ void Contact::setChildren( const QString &v )
 // vcard conversion code
+/*!
+  \internal
+*/
 static inline VObject *safeAddPropValue( VObject *o, const char *prop, const QString &value )
@@ -516,2 +983,5 @@ static inline VObject *safeAddPropValue( VObject *o, const char *prop, const QSt
 
+/*!
+  \internal
+*/
 static inline VObject *safeAddProp( VObject *o, const char *prop)
@@ -524,2 +994,5 @@ static inline VObject *safeAddProp( VObject *o, const char *prop)
 
+/*!
+  \internal
+*/
 static VObject *createVObject( const Contact &c )
@@ -624,2 +1097,5 @@ static VObject *createVObject( const Contact &c )
 
+/*!
+  \internal
+*/
 static Contact parseVObject( VObject *obj )
@@ -628,4 +1104,2 @@ static Contact parseVObject( VObject *obj )
 
-    bool haveDefaultEmail = FALSE;
-
     VObjectIterator it;
@@ -769,10 +1243,3 @@ static Contact parseVObject( VObject *obj )
             if ( valid ) {
-                if ( haveDefaultEmail ) {
-                    QString str = c.emails();
-                    if ( !str.isEmpty() )
-                        str += ","+email;
-                    c.setEmails( str );
-                } else {
-                    c.setDefaultEmail( email );
-                }
+                c.insertEmail( email );
             }
@@ -853,2 +1320,5 @@ static Contact parseVObject( VObject *obj )
 
+/*!
+  Writes the list of \a contacts as a set of VCards to the file \a filename.
+*/
 void Contact::writeVCard( const QString &filename, const QValueList<Contact> &contacts)
@@ -870,2 +1340,5 @@ void Contact::writeVCard( const QString &filename, const QValueList<Contact> &co
 
+/*!
+  writes \a contact as a VCard to the file \a filename.
+*/
 void Contact::writeVCard( const QString &filename, const Contact &contact)
@@ -885,3 +1358,5 @@ void Contact::writeVCard( const QString &filename, const Contact &contact)
 
-
+/*!
+  Returns the set of contacts read as VCards from the file \a filename.
+*/
 QValueList<Contact> Contact::readVCard( const QString &filename )
@@ -906,2 +1381,6 @@ QValueList<Contact> Contact::readVCard( const QString &filename )
 
+/*!
+  Returns TRUE if the contact matches the regular expression \a regexp.
+  Otherwise returns FALSE.
+*/
 bool Contact::match( const QString &regexp ) const
@@ -911,2 +1390,7 @@ bool Contact::match( const QString &regexp ) const
 
+/*!
+  \overload
+  Returns TRUE if the contact matches the regular expression \a regexp.
+  Otherwise returns FALSE.
+*/
 bool Contact::match( const QRegExp &r ) const
diff --git a/library/backend/contact.h b/library/backend/contact.h
index a74cbbe..4999430 100644
--- a/library/backend/contact.h
+++ b/library/backend/contact.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -23,4 +23,4 @@
 
-#include <qpe/palmtoprecord.h>
-#include <qpe/recordfields.h>
+#include <qtopia/private/palmtoprecord.h>
+#include <qtopia/private/recordfields.h>
 
@@ -30,3 +30,3 @@
 // MOC_SKIP_BEGIN
-template class QPC_EXPORT QMap<int, QString>;
+QPC_TEMPLATEEXTERN template class QPC_EXPORT QMap<int, QString>;
 // MOC_SKIP_END
@@ -58,5 +58,8 @@ public:
     // default email address
-    void setDefaultEmail( const QString &v ) { replace( Qtopia::DefaultEmail, v ); }
-    // the emails should be seperated by a semicolon
-    void setEmails( const QString &v );
+    void setDefaultEmail( const QString &v );
+    // inserts email to list and ensure's doesn't already exist
+    void insertEmail( const QString &v );
+    void removeEmail( const QString &v );
+    void clearEmails();
+    void insertEmails( const QStringList &v );
 
@@ -125,3 +128,2 @@ public:
     QString defaultEmail() const { return find( Qtopia::DefaultEmail ); }
-    QString emails() const { return find( Qtopia::Emails ); }
     QStringList emailList() const;
@@ -204,3 +206,12 @@ public:
 private:
+    friend class AbEditor;
     friend class AbTable;
+    friend class AddressBookAccessPrivate;
+    friend class XMLIO;
+
+    QString emailSeparator() const { return " "; }
+     // the emails should be seperated by a comma
+    void setEmails( const QString &v );
+    QString emails() const { return find( Qtopia::Emails ); }
+
     void insert( int key, const QString &value );
@@ -221,2 +232,75 @@ private:
 
+// these methods are inlined to keep binary compatability with Qtopia 1.5
+inline void Contact::insertEmail( const QString &v )
+{
+    //qDebug("insertEmail %s", v.latin1());
+    QString e = v.simplifyWhiteSpace();
+    QString def = defaultEmail();
+
+    // if no default, set it as the default email and don't insert
+    if ( def.isEmpty() ) {
+        setDefaultEmail( e ); // will insert into the list for us
+        return;
+    }
+
+    // otherwise, insert assuming doesn't already exist
+    QString emailsStr = find( Qtopia::Emails );
+    if ( emailsStr.contains( e ))
+        return;
+    if ( !emailsStr.isEmpty() )
+        emailsStr += emailSeparator();
+    emailsStr += e;
+    replace( Qtopia::Emails, emailsStr );
+}
+
+inline void Contact::removeEmail( const QString &v )
+{
+    QString e = v.simplifyWhiteSpace();
+    QString def = defaultEmail();
+    QString emailsStr = find( Qtopia::Emails );
+    QStringList emails = emailList();
+        
+    // otherwise, must first contain it
+    if ( !emailsStr.contains( e ) )
+        return;
+
+    // remove it
+    //qDebug(" removing email from list %s", e.latin1());
+    emails.remove( e );
+    // reset the string
+    emailsStr = emails.join(emailSeparator()); // Sharp's brain dead separator
+    replace( Qtopia::Emails, emailsStr );
+
+    // if default, then replace the default email with the first one
+    if ( def == e ) {
+        //qDebug("removeEmail is default; setting new default");
+        if ( !emails.count() )
+            clearEmails();
+        else // setDefaultEmail will remove e from the list
+            setDefaultEmail( emails.first() );
+    }
+}
+inline void Contact::clearEmails()
+{
+    mMap.remove( Qtopia::DefaultEmail );
+    mMap.remove( Qtopia::Emails );
+}
+inline void Contact::setDefaultEmail( const QString &v )
+{
+    QString e = v.simplifyWhiteSpace();
+
+    //qDebug("Contact::setDefaultEmail %s", e.latin1());
+    replace( Qtopia::DefaultEmail, e );
+
+            if ( !e.isEmpty() )
+        insertEmail( e );
+        
+}
+
+inline void Contact::insertEmails( const QStringList &v )
+{
+    for ( QStringList::ConstIterator it = v.begin(); it != v.end(); ++it )
+        insertEmail( *it );
+}
+
 #endif
diff --git a/library/backend/event.cpp b/library/backend/event.cpp
index 50a663d..7110717 100644
--- a/library/backend/event.cpp
+++ b/library/backend/event.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -20,7 +20,7 @@
 
-#include "event.h"

+#include "event.h"
 #include "qfiledirect_p.h"
-#include <qpe/timeconversion.h>
-#include <qpe/stringutil.h>
-#include <qpe/recordfields.h>
+#include <qtopia/timeconversion.h>
+#include <qtopia/stringutil.h>
+#include <qtopia/private/recordfields.h>
 #include <qbuffer.h>
@@ -73,2 +73,251 @@ Qtopia::UidGen Event::sUidGen( Qtopia::UidGen::Qtopia );
 
+/*!
+  \class Event event.h
+  \brief The Event class holds the data of a calendar event.
+
+  This data includes descriptive data of the event and schedualing information.
+
+  \ingroup qtopiaemb
+  \ingroup qtopiadesktop
+*/
+
+/*!
+  \class Event::RepeatPattern
+  \class The Event::RepeatPattern class is internal.
+  \internal
+*/
+
+/*!
+  \enum Event::Days
+  \internal
+*/
+
+/*!
+  \enum Event::Type
+  \internal
+*/
+
+/*!
+  \enum Event::SoundTypeChoice
+
+  This enum type defines what kind of sound is made when an alarm occurs
+  for an event.  The currently defined types are:
+
+  <ul>
+  <li>\c Silent - No sound is produced.
+  <li>\c Loud - A loud sound is produced.
+  </ul>
+*/
+
+/*!
+  \fn bool Event::operator<( const Event & ) const
+  \internal
+*/
+
+/*!
+  \fn bool Event::operator<=( const Event & ) const
+  \internal
+*/
+
+/*!
+  \fn bool Event::operator!=( const Event & ) const
+  \internal
+*/
+
+/*!
+  \fn bool Event::operator>( const Event & ) const
+  \internal
+*/
+
+/*!
+  \fn bool Event::operator>=( const Event & ) const
+  \internal
+*/
+
+/*!
+  \enum Event::RepeatType
+
+  This enum defines how a event will repeat, if at all.
+
+  <ul>
+  <li>\c NoRepeat - Event does not repeat.
+  <li>\c Daily - Event occurs every n days.
+  <li>\c Weekly - Event occurs every n weeks.
+  <li>\c MonthlyDay - Event occurs every n months.  Event will always occur in
+  the same week and same day of week as the first event.
+  <li>\c MonthlyDate - Event occurs every n months.  Event will always occur
+  on the same day of the month as the first event.
+  <li>\c Yearly - Event occurs every n years.
+  </ul>
+*/
+
+/*!
+  \fn bool Event::isAllDay() const
+
+  Returns TRUE if the event is an all day event.  Otherwise returns FALSE.
+*/
+
+/*!
+  \fn void Event::setAllDay(bool allday)
+
+  If \a allday is TRUE, will set the event to be an all day event.
+  Otherwise sets the event to not be an all day event.
+
+  \warning This function may affect the start and end times of the event.
+*/
+
+/*!
+  \fn QDateTime Event::start() const
+
+  Returns the start date and time of the first occurance of the event.
+*/
+
+/*!
+  \fn QDateTime Event::end() const
+
+  Returns the end date and time of the first occurance of the event.
+*/
+
+/*!
+  \fn time_t Event::startTime() const
+  \internal
+*/
+
+/*!
+  \fn time_t Event::endTime() const
+  \internal
+*/
+
+/*!
+  \fn void Event::setAlarm(int delay, SoundTypeChoice s)
+
+  Sets the alarm delay of the event to \a delay and the sound type of the
+  alarm to \a s.
+*/
+
+/*!
+  \fn void Event::clearAlarm()
+
+  Clears the alarm for the event.
+*/
+
+/*!
+  \fn int Event::alarmDelay() const
+
+  Returns the delay in minutes between the alarm for an event and the
+  start of the event.
+*/
+
+/*!
+  \fn Event::RepeatType Event::repeatType() const
+
+  Returns the repeat pattern type for the event.
+
+  \sa frequency()
+*/
+
+/*!
+  \fn int Event::weekOffset() const
+
+  Returns the number of weeks from the start of the month that this event
+  occurs.
+*/
+
+/*!
+  \fn QDate Event::repeatTill() const
+
+  Returns the date that the event will continue to repeat until.  If the event
+  repeats forever the value returned is undefined.
+
+  \sa repeatForever()
+*/
+
+/*!
+  \fn bool Event::repeatForever() const
+
+  Returns FALSE if there is a date set for the event to continue until.
+  Otherwise returns TRUE.
+*/
+
+/*!
+  \fn bool Event::doRepeat() const
+  \internal
+*/
+
+/*!
+  \fn bool Event::repeatOnWeekDay(int day) const
+
+  Returns TRUE if the event has a RepeatType of Weekly and is set to occur on
+  \a day each week.  Otherwise returns FALSE.
+
+  \sa QDate::dayName()
+*/
+
+/*!
+  \fn void Event::setRepeatOnWeekDay(int day, bool enable)
+
+  If \a enable is TRUE then sets the event to occur on \a day each week.
+  Otherwise sets the event not to occur on \a day.
+
+  \warning this function is only relavent for a event with RepeatType of
+  Weekly.
+
+  \sa QDate::dayName()
+*/
+
+/*!
+  \fn int Event::frequency() const
+
+  Returns how often the event repeats.
+
+  \sa repeatType()
+*/
+
+/*!
+  \fn void Event::setRepeatType(RepeatType t)
+
+  Sets the repeat pattern type of the event to \a t.
+
+  \sa setFrequency()
+*/
+
+/*!
+  \fn void Event::setFrequency(int n)
+
+  Sets how often the event occurs with in its repeat pattern.
+
+  \sa setRepeatType()
+*/
+
+/*!
+  \fn void Event::setRepeatTill(const QDate &d)
+
+  Sets the event to repeat until \a d.
+*/
+
+/*!
+  \fn void Event::setRepeatForever(bool enable)
+
+  If \a enable is TRUE, sets the event to repeat forever.  Otherwise
+  sets the event to stop repeating at some date.
+
+  \warning This function may affect the specific date the event will repeat
+  till.
+*/
+
+/*!
+  \fn bool Event::match(const QRegExp &r) const
+
+  Returns TRUE if the event matches the regular expression \a r.
+  Otherwise returns FALSE.
+*/
+
+/*!
+  \fn char Event::day(int)
+  \internal
+*/
+
+/*!
+  Creates a new, empty event.
+*/
 Event::Event() : Record()
@@ -85,2 +334,5 @@ Event::Event() : Record()
 
+/*!
+  \internal
+*/
 Event::Event( const QMap<int, QString> &map )
@@ -108,2 +360,5 @@ Event::Event( const QMap<int, QString> &map )
 
+/*!
+  Destroys an event.
+*/
 Event::~Event()
@@ -112,2 +367,5 @@ Event::~Event()
 
+/*!
+  \internal
+*/
 int Event::week( const QDate& date )
@@ -126,2 +384,5 @@ int Event::week( const QDate& date )
 
+/*!
+  \internal
+*/
 int Event::occurrence( const QDate& date )
@@ -133,2 +394,5 @@ int Event::occurrence( const QDate& date )
 
+/*!
+  \internal
+*/
 int Event::dayOfWeek( char day )
@@ -144,2 +408,5 @@ int Event::dayOfWeek( char day )
 
+/*!
+  \internal
+*/
 int Event::monthDiff( const QDate& first, const QDate& second )
@@ -150,2 +417,5 @@ int Event::monthDiff( const QDate& first, const QDate& second )
 
+/*!
+  \internal
+*/
 QMap<int, QString> Event::toMap() const
@@ -153,7 +423,14 @@ QMap<int, QString> Event::toMap() const
     QMap<int, QString> m;
-    m.insert( DatebookDescription, description() );
-    m.insert ( Location, location() );
-    m.insert ( DatebookCategory, idsToString( categories() ) );
-    m.insert ( TimeZone, timeZone() );
-    m.insert ( Note, notes() );
+
+    if ( !description().isEmpty() )
+        m.insert( DatebookDescription, description() );
+            if ( !location().isEmpty() )
+        m.insert ( Location, location() );
+    if ( categories().count() )
+        m.insert ( DatebookCategory, idsToString( categories() ) );
+    if ( !timeZone().isEmpty() )
+        m.insert ( TimeZone, timeZone() );
+    if ( !notes().isEmpty() )
+        m.insert ( Note, notes() );
+
     m.insert ( StartDateTime, QString::number( TimeConversion::toUTC( start() ) ) );
@@ -176,2 +453,5 @@ QMap<int, QString> Event::toMap() const
 
+/*!
+  \internal
+*/
 void Event::setRepeat( const RepeatPattern &p )
@@ -181,2 +461,5 @@ void Event::setRepeat( const RepeatPattern &p )
 
+/*!
+  Sets the description of the event to \a s.
+*/
 void Event::setDescription( const QString &s )
@@ -186,2 +469,5 @@ void Event::setDescription( const QString &s )
 
+/*!
+  Sets the location of the event to \a s.
+*/
 void Event::setLocation( const QString &s )
@@ -196,2 +482,5 @@ void Event::setLocation( const QString &s )
 
+/*!
+  \internal
+*/
 void Event::setType( Type t )
@@ -201,2 +490,6 @@ void Event::setType( Type t )
 
+/*!
+  Sets the start date and time of the first or only occurance of this event
+  to the date and time \a d. \a d should be in local time.
+*/
 void Event::setStart( const QDateTime &d )
@@ -206,2 +499,5 @@ void Event::setStart( const QDateTime &d )
 
+/*!
+  \internal
+*/
 void Event::setStart( time_t time )
@@ -211,2 +507,6 @@ void Event::setStart( time_t time )
 
+/*!
+  Sets the end date and time of the first or only occurance of this event
+  to the date and time \a d.  \a d should be in local time.
+*/
 void Event::setEnd( const QDateTime &d )
@@ -216,2 +516,5 @@ void Event::setEnd( const QDateTime &d )
 
+/*!
+  \internal
+*/
 void Event::setEnd( time_t time )
@@ -221,2 +524,5 @@ void Event::setEnd( time_t time )
 
+/*!
+  \internal
+*/
 void Event::setTimeZone( const QString &z )
@@ -226,2 +532,5 @@ void Event::setTimeZone( const QString &z )
 
+/*!
+  \internal
+*/
 void Event::setAlarm( bool b, int minutes, SoundTypeChoice s )
@@ -233,2 +542,5 @@ void Event::setAlarm( bool b, int minutes, SoundTypeChoice s )
 
+/*!
+  \internal
+*/
 void Event::setRepeat( bool b, const RepeatPattern &p )
@@ -239,2 +551,5 @@ void Event::setRepeat( bool b, const RepeatPattern &p )
 
+/*!
+  Sets the notes for the event to \a n.
+*/
 void Event::setNotes( const QString &n )
@@ -244,2 +559,5 @@ void Event::setNotes( const QString &n )
 
+/*!
+  Returns the description of the event.
+*/
 const QString &Event::description() const
@@ -249,2 +567,5 @@ const QString &Event::description() const
 
+/*!
+  Returns the location of the event.
+*/
 const QString &Event::location() const
@@ -259,2 +580,5 @@ const QString &Event::location() const
 
+/*!
+  \internal
+*/
 Event::Type Event::type() const
@@ -264,2 +588,5 @@ Event::Type Event::type() const
 
+/*!
+  \internal
+*/
 QDateTime Event::start( bool actual ) const
@@ -276,2 +603,5 @@ QDateTime Event::start( bool actual ) const
 
+/*!
+  \internal
+*/
 QDateTime Event::end( bool actual ) const
@@ -288,2 +618,5 @@ QDateTime Event::end( bool actual ) const
 
+/*!
+  \internal
+*/
 const QString &Event::timeZone() const
@@ -293,2 +626,5 @@ const QString &Event::timeZone() const
 
+/*!
+  \internal
+*/
 bool Event::hasAlarm() const
@@ -298,2 +634,5 @@ bool Event::hasAlarm() const
 
+/*!
+  \internal
+*/
 int Event::alarmTime() const
@@ -303,2 +642,5 @@ int Event::alarmTime() const
 
+/*!
+  Returns the sound type for the alarm of this event.
+*/
 Event::SoundTypeChoice Event::alarmSound() const
@@ -308,2 +650,5 @@ Event::SoundTypeChoice Event::alarmSound() const
 
+/*!
+  \internal
+*/
 bool Event::hasRepeat() const
@@ -313,2 +658,5 @@ bool Event::hasRepeat() const
 
+/*!
+  \internal
+*/
 const Event::RepeatPattern &Event::repeatPattern() const
@@ -318,2 +666,5 @@ const Event::RepeatPattern &Event::repeatPattern() const
 
+/*!
+  \internal
+*/
 Event::RepeatPattern &Event::repeatPattern()
@@ -323,2 +674,5 @@ Event::RepeatPattern &Event::repeatPattern()
 
+/*!
+  Returns the notes for the event.
+*/
 const QString &Event::notes() const
@@ -328,4 +682,9 @@ const QString &Event::notes() const
 
+/*!
+  \internal
+*/
 bool Event::operator==( const Event &e ) const
 {
+    if ( uid() && e.uid() == uid() )
+        return TRUE;
     return ( e.descript == descript &&
@@ -345,2 +704,6 @@ bool Event::operator==( const Event &e ) const
 
+/*!
+  \internal
+  Appends the contact information to \a buf.
+*/
 void Event::save( QString& buf )
@@ -380,2 +743,5 @@ void Event::save( QString& buf )
 
+/*!
+  \internal
+*/
 bool Event::RepeatPattern::operator==( const Event::RepeatPattern &right ) const
@@ -392,2 +758,24 @@ bool Event::RepeatPattern::operator==( const Event::RepeatPattern &right ) const
 
+/*!
+  \class EffectiveEvent
+  \brief The EffectiveEvent class the data for a single occurance of an event.
+
+  This class describes the event for a single occurance of it.  For example if
+  an Event occurs every week, the effective event might represent the third
+  occurance of this Event.
+
+  \ingroup qtopiaemb
+  \ingroup qtopiadesktop
+  \warning This class will be phased out in Qtopia 3.x
+*/
+
+/*!
+  \enum EffectiveEvent::Position
+  \internal
+*/
+
+/*!
+  \fn EffectiveEvent &EffectiveEvent::operator=(const EffectiveEvent &)
+  \internal
+*/
 
@@ -402,3 +790,5 @@ public:
 
-
+/*!
+  \internal
+*/
 EffectiveEvent::EffectiveEvent()
@@ -410,2 +800,5 @@ EffectiveEvent::EffectiveEvent()
 
+/*!
+  \internal
+*/
 EffectiveEvent::EffectiveEvent( const Event &e, const QDate &date, Position pos )
@@ -426,2 +819,5 @@ EffectiveEvent::EffectiveEvent( const Event &e, const QDate &date, Position pos
 
+/*!
+  \internal
+*/
 EffectiveEvent::~EffectiveEvent()
@@ -431,2 +827,5 @@ EffectiveEvent::~EffectiveEvent()
 
+/*!
+  \internal
+*/
 EffectiveEvent::EffectiveEvent( const EffectiveEvent &e )
@@ -463,2 +862,5 @@ EffectiveEvent& EffectiveEvent::operator=( const EffectiveEvent & e )
 
+/*!
+  Returns the description of the event for this effective event.
+*/
 const QString &EffectiveEvent::description( ) const
@@ -468,2 +870,5 @@ const QString &EffectiveEvent::description( ) const
 
+/*!
+\internal
+*/
 const QString &EffectiveEvent::location( ) const
@@ -473,2 +878,5 @@ const QString &EffectiveEvent::location( ) const
 
+/*!
+\internal
+*/
 const QString &EffectiveEvent::notes() const
@@ -478,2 +886,5 @@ const QString &EffectiveEvent::notes() const
 
+/*!
+  Returns the event associated with this effective event.
+*/
 const Event &EffectiveEvent::event() const
@@ -483,2 +894,5 @@ const Event &EffectiveEvent::event() const
 
+/*!
+  \internal
+*/
 const QTime &EffectiveEvent::end() const
@@ -488,2 +902,5 @@ const QTime &EffectiveEvent::end() const
 
+/*!
+  \internal
+*/
 const QTime &EffectiveEvent::start() const
@@ -493,2 +910,5 @@ const QTime &EffectiveEvent::start() const
 
+/*!
+  Returns the date the effective event occurs on.
+*/
 const QDate &EffectiveEvent::date() const
@@ -498,2 +918,5 @@ const QDate &EffectiveEvent::date() const
 
+/*!
+  \internal
+*/
 int EffectiveEvent::length() const
@@ -504,2 +927,5 @@ int EffectiveEvent::length() const
 
+/*!
+  \internal
+*/
 void EffectiveEvent::setDate( const QDate &dt )
@@ -509,2 +935,5 @@ void EffectiveEvent::setDate( const QDate &dt )
 
+/*!
+  \internal
+*/
 void EffectiveEvent::setStart( const QTime &start )
@@ -514,2 +943,5 @@ void EffectiveEvent::setStart( const QTime &start )
 
+/*!
+  \internal
+*/
 void EffectiveEvent::setEnd( const QTime &end )
@@ -519,2 +951,5 @@ void EffectiveEvent::setEnd( const QTime &end )
 
+/*!
+  \internal
+*/
 void EffectiveEvent::setEvent( Event e )
@@ -524,2 +959,5 @@ void EffectiveEvent::setEvent( Event e )
 
+/*!
+  \internal
+*/
 bool EffectiveEvent::operator<( const EffectiveEvent &e ) const
@@ -534,2 +972,5 @@ bool EffectiveEvent::operator<( const EffectiveEvent &e ) const
 
+/*!
+  \internal
+*/
 bool EffectiveEvent::operator<=( const EffectiveEvent &e ) const
@@ -539,2 +980,5 @@ bool EffectiveEvent::operator<=( const EffectiveEvent &e ) const
 
+/*!
+  \internal
+*/
 bool EffectiveEvent::operator==( const EffectiveEvent &e ) const
@@ -547,2 +991,5 @@ bool EffectiveEvent::operator==( const EffectiveEvent &e ) const
 
+/*!
+  \internal
+*/
 bool EffectiveEvent::operator!=( const EffectiveEvent &e ) const
@@ -552,2 +999,5 @@ bool EffectiveEvent::operator!=( const EffectiveEvent &e ) const
 
+/*!
+  \internal
+*/
 bool EffectiveEvent::operator>( const EffectiveEvent &e ) const
@@ -557,2 +1007,5 @@ bool EffectiveEvent::operator>( const EffectiveEvent &e ) const
 
+/*!
+  \internal
+*/
 bool EffectiveEvent::operator>=(const EffectiveEvent &e) const
@@ -562,2 +1015,5 @@ bool EffectiveEvent::operator>=(const EffectiveEvent &e) const
 
+/*!
+  \internal
+*/
 void EffectiveEvent::setEffectiveDates( const QDate &from, const QDate &to )
@@ -575,2 +1031,5 @@ void EffectiveEvent::setEffectiveDates( const QDate &from, const QDate &to )
 
+/*!
+  \internal
+*/
 QDate EffectiveEvent::startDate() const
@@ -585,2 +1044,5 @@ QDate EffectiveEvent::startDate() const
 
+/*!
+  \internal
+*/
 QDate EffectiveEvent::endDate() const
@@ -595,2 +1057,5 @@ QDate EffectiveEvent::endDate() const
 
+/*!
+  \internal
+*/
 int EffectiveEvent::size() const
@@ -742,10 +1207,18 @@ static Event parseVObject( VObject *obj )
 
-
+/*!
+    Writes the list of \a events as a set of VCards to the file \a filename.
+*/
 void Event::writeVCalendar( const QString &filename, const QValueList<Event> &events)
-{

-        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;
+
+        }
+
 
@@ -756,3 +1229,4 @@ void Event::writeVCalendar( const QString &filename, const QValueList<Event> &ev
         cleanVObject( obj );
-    }

+    }
+
 
@@ -761,9 +1235,18 @@ void Event::writeVCalendar( const QString &filename, const QValueList<Event> &ev
 
+/*!
+    Writes \a event as a VCard to the file \a filename.
+*/
 void Event::writeVCalendar( const QString &filename, const Event &event)
-{

-        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;
+
+        }
+
 
@@ -776,3 +1259,5 @@ void Event::writeVCalendar( const QString &filename, const Event &event)
 
-
+/*!
+    Returns the set of events read as VCards from the file \a filename.
+*/
 QValueList<Event> Event::readVCalendar( const QString &filename )
diff --git a/library/backend/event.h b/library/backend/event.h
index 277aadd..7fe41a5 100644
--- a/library/backend/event.h
+++ b/library/backend/event.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -25,2 +25,3 @@
 #include <qvaluelist.h>
+#include <qcolor.h>
 
@@ -29,3 +30,3 @@
 #endif
-#include <qpe/palmtoprecord.h>
+#include <qtopia/private/palmtoprecord.h>
 
@@ -33,2 +34,7 @@
 
+static const QColor colorNormal      = QColor(255, 0  , 0  );
+static const QColor colorRepeat      = QColor(0  , 0  , 255);
+static const QColor colorNormalLight = QColor(255, 220, 220);
+static const QColor colorRepeatLight = QColor(200, 200, 255);
+
 class EventPrivate;
@@ -39,4 +45,7 @@ public:
                       MonthlyDate, Yearly };
+
+    // Don't use this.
     enum Days { MON = 0x01, TUE = 0x02, WED = 0x04, THU = 0x08,
                 FRI = 0x10, SAT = 0x20, SUN = 0x40 };
+    // Don't use this.
     struct QPC_EXPORT RepeatPattern
@@ -72,2 +81,3 @@ public:
 
+    // Don't use these, there are essentially meaningless.
     bool operator<( const Event &e1) const { return start() < e1.start(); };
@@ -85,18 +95,45 @@ public:
 
-    void setType( Type t );
-    Type type() const;
+    void setNotes( const QString &n );
+    const QString &notes() const;
+
+    void setType( Type t ); // Don't use me.
+    Type type() const; // Don't use me.
+
+    void setAllDay(bool);
+    bool isAllDay() const;
+
     void setStart( const QDateTime &d );
-    void setStart( time_t time );
-    QDateTime start( bool actual = FALSE ) const;
-    time_t startTime() const { return startUTC; }
+    void setStart( time_t time ); // don't use me.
+    QDateTime start( ) const;
+    QDateTime start( bool actual ) const; // don't use me.
+    time_t startTime() const { return startUTC; } // don't use me.
     void setEnd( const QDateTime &e );
-    void setEnd( time_t time );
-    QDateTime end( bool actual = FALSE ) const;
-    time_t endTime() const { return endUTC; }
+    void setEnd( time_t time ); // don't use me
+    QDateTime end( ) const;
+    QDateTime end( bool actual ) const; // don't use me.
+    time_t endTime() const { return endUTC; } // don't use me.
     void setTimeZone( const QString & );
     const QString &timeZone() const;
-    void setAlarm( bool b, int minutes, SoundTypeChoice );
+    void setAlarm( int minutes, SoundTypeChoice );
+    void clearAlarm();
+    void setAlarm( bool b, int minutes, SoundTypeChoice ); // Don't use me.
     bool hasAlarm() const;
-    int alarmTime() const;
+    int alarmDelay() const;
+    int alarmTime() const; // Don't use me.
     SoundTypeChoice alarmSound() const;
+
+    RepeatType repeatType() const;
+    int frequency() const;
+    int weekOffset() const;
+    QDate repeatTill() const;
+    bool repeatForever() const;
+    bool repeatOnWeekDay(int day) const;
+
+    void setRepeatType(RepeatType);
+    void setFrequency(int);
+    void setRepeatTill(const QDate &);
+    void setRepeatForever(bool);
+    void setRepeatOnWeekDay(int day, bool enable);
+
+    // Don't use any of these.
     void setRepeat( bool b, const RepeatPattern &p );
@@ -106,4 +143,2 @@ public:
     RepeatPattern &repeatPattern();
-    void setNotes( const QString &n );
-    const QString &notes() const;
     bool doRepeat() const { return pattern.type != NoRepeat; }
@@ -113,2 +148,6 @@ public:
 
+    bool match( const QRegExp &r ) const;
+
+    // Don't use these either.  Functionality will be moved elsewhere.
+
     // helper function to calculate the week of the given date
@@ -125,3 +164,2 @@ public:
     static int monthDiff( const QDate& first, const QDate& second );
-    bool match( const QRegExp &r ) const;
 
@@ -213,2 +251,105 @@ private:
 
+inline void Event::setAlarm( int minutes, SoundTypeChoice s )
+{
+    setAlarm(TRUE, minutes, s);
+}
+
+inline void Event::clearAlarm()
+{
+    setAlarm(FALSE, 0, Silent);
+}
+
+inline int Event::alarmDelay() const
+{
+    return alarmTime();
+}
+
+inline void Event::setAllDay(bool enable)
+{
+    if (enable)
+        setType(AllDay);
+    else 
+        setType(Normal);
+}; 
+
+inline bool Event::isAllDay() const
+{
+    return type() == AllDay;
+}
+
+inline Event::RepeatType Event::repeatType() const
+{
+    return repeatPattern().type;
+}
+
+inline int Event::frequency() const
+{
+    return repeatPattern().frequency;
+}
+
+inline int Event::weekOffset() const
+{
+    if (start().date().day() == 1)
+        return 1;
+    return (start().date().day() - 1) / 7 + 1;
+}
+
+inline QDate Event::repeatTill() const
+{
+    return repeatPattern().endDate();
+}
+
+inline bool Event::repeatForever() const
+{
+    return !repeatPattern().hasEndDate;
+}
+
+inline void Event::setRepeatType(RepeatType t)
+{
+    pattern.type = t;
+}
+
+inline void Event::setFrequency(int f)
+{
+    pattern.frequency = f;
+}
+
+inline void Event::setRepeatTill(const QDate &d)
+{
+    pattern.setEndDate(d);
+    pattern.hasEndDate = TRUE;
+}
+
+inline void Event::setRepeatForever(bool b)
+{
+    if (!b == pattern.hasEndDate)
+        return;
+    if (!b && !pattern.hasEndDate)
+        pattern.setEndDate(end().date());
+    pattern.hasEndDate = !b;
+}
+
+inline bool Event::repeatOnWeekDay(int day) const
+{
+    if (pattern.type != Weekly)
+        return FALSE;
+    return ( (1 << (day - 1)) & pattern.days ) != 0;
+}
+
+inline void Event::setRepeatOnWeekDay(int day, bool enable)
+{
+    if ( repeatOnWeekDay( day ) != enable )
+        pattern.days ^= 1 << (day - 1);
+}
+
+inline QDateTime Event::start( ) const
+{
+    return start(FALSE);
+}
+
+inline QDateTime Event::end( ) const
+{
+    return end(FALSE);
+}
+
 #ifdef PALMTOPCENTER
diff --git a/library/backend/palmtoprecord.cpp b/library/backend/palmtoprecord.cpp
index 0d57699..3cfa874 100644
--- a/library/backend/palmtoprecord.cpp
+++ b/library/backend/palmtoprecord.cpp
@@ -1,14 +1,13 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** 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.
+** 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.
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
@@ -20,8 +19,20 @@
 **********************************************************************/
-#include "palmtoprecord.h"
-#include "stringutil.h"
+#include <qtopia/private/palmtoprecord.h>
+#include <qtopia/stringutil.h>
 #include <qstringlist.h>
 
+/*! \class Qtopia::PalmtopRecord palmtoprecord.h
+  \brief The Qtopia::PalmtopRecord class is the base class for all PIM records.
+
+  Provides unique id and category support for all PIM records.
+
+  \ingroup qtopiaemb
+  \ingroup qtopiadesktop
+*/
+
+
 namespace Qtopia {
 
+
+
 Record &Record::operator=( const Record &c )
@@ -43,4 +54,7 @@ void Record::setCategories( int single )
 // convenience methods provided for loading and saving to xml
-QString Record::idsToString( const QArray<int> &cats )
+QString Record::idsToString( const QArray<int> &catsUnsorted )
 {
+    QArray<int> cats = catsUnsorted;
+    cats.sort();
+
     QString str;
@@ -86,3 +100,3 @@ void Record::setCustomField( const QString &key, const QString &value)
 {
-    qWarning("setting custom " + key + " to " + value);
+//     qWarning("setting custom " + key + " to " + value);
     if (customMap.contains(key))
@@ -92,3 +106,3 @@ void Record::setCustomField( const QString &key, const QString &value)
 
-    qWarning(QString("custom size %1").arg(customMap.count()));
+//     qWarning(QString("custom size %1").arg(customMap.count()));
 }
@@ -109,3 +123,3 @@ QString Record::customToXml() const
             cit != customMap.end(); ++cit) {
-        qWarning(".ITEM.");
+        // qWarning(".ITEM.");
         buf += cit.key();
diff --git a/library/backend/palmtoprecord.h b/library/backend/palmtoprecord.h
index 0372011..72f7d1c 100644
--- a/library/backend/palmtoprecord.h
+++ b/library/backend/palmtoprecord.h
@@ -1,14 +1,13 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** 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.
+** 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.
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
@@ -20,6 +19,4 @@
 **********************************************************************/
-
 #ifndef QTPALMTOP_RECORD_H
 #define QTPALMTOP_RECORD_H
-
 #include <qglobal.h>
@@ -32,3 +29,3 @@
 // MOC_SKIP_BEGIN
-template class QPC_EXPORT QMap<QString, QString>;
+QPC_TEMPLATEEXTERN template class QPC_EXPORT QMap<QString, QString>;
 // MOC_SKIP_END
@@ -51,3 +48,3 @@ public:
 
-    void setCategories( const QArray<int> &v ) { mCats = v; }
+    void setCategories( const QArray<int> &v ) { mCats = v; mCats.sort(); }
     void setCategories( int single );
@@ -55,2 +52,9 @@ public:
 
+    void reassignCategoryId( int oldId, int newId )
+    {
+        int index = mCats.find( oldId );
+        if ( index >= 0 )
+            mCats[index] = newId;
+    }
+
     int uid() const { return mUid; };
@@ -79,5 +83,3 @@ protected:
     virtual UidGen &uidGen() = 0;
-
     virtual QString customToXml() const;
-
 private:
@@ -85,5 +87,3 @@ private:
     QArray<int> mCats;
-
     QMap<QString, QString> customMap;
-
     RecordPrivate *d;
@@ -94 +94,2 @@ private:
 #endif
+
diff --git a/library/backend/palmtopuidgen.h b/library/backend/palmtopuidgen.h
index 1a16681..c3fbcb9 100644
--- a/library/backend/palmtopuidgen.h
+++ b/library/backend/palmtopuidgen.h
@@ -1,18 +1,15 @@
-#ifndef QTPALMTOP_UIDGEN_H
-#define QTPALMTOP_UIDGEN_H
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
-** Licensees holding valid Qtopia Developer license may use this
-** file in accordance with the Qtopia Developer License Agreement
-** provided with the Software.
+** 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.
+** 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.
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
@@ -23,2 +20,5 @@
 
+#ifndef QTPALMTOP_UIDGEN_H
+#define QTPALMTOP_UIDGEN_H
+
 #include <time.h>
@@ -29,3 +29,3 @@
 // MOC_SKIP_BEGIN
-template class QPC_EXPORT QMap< int, bool >;
+QPC_TEMPLATEEXTERN template class QPC_EXPORT QMap< int, bool >;
 // MOC_SKIP_END
diff --git a/library/backend/qfiledirect_p.h b/library/backend/qfiledirect_p.h
index 3ade622..976c69f 100644
--- a/library/backend/qfiledirect_p.h
+++ b/library/backend/qfiledirect_p.h
@@ -1,37 +1,35 @@
-/**********************************************************************

-** Copyright (C) 2001 Trolltech AS.  All rights reserved.

-**

-** This file is part of the Qtopia Environment.

-**

-** Licensees holding valid Qtopia Developer license may use this

-** file in accordance with the Qtopia Developer License Agreement

-** provided with the Software.

-**

-** 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 QFILE_DIRECT_H

-#define QFILE_DIRECT_H

-#include <qfile.h>

-#include <qpe/qpcglobal.h>

-

-class QPC_EXPORT QFileDirect : public QFile

-{

-public:

-        QFileDirect() : QFile() { }

-    QFileDirect( const QString &name ) : QFile(name) { }

-

-        FILE *directHandle() { return fh; }

-};

-

-#endif

-

+/**********************************************************************
+** 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 QFILE_DIRECT_H
+#define QFILE_DIRECT_H
+#include <qfile.h>
+#include <qtopia/private/qpcglobal.h>
+
+class QPC_EXPORT QFileDirect : public QFile
+{
+public:
+        QFileDirect() : QFile() { }
+    QFileDirect( const QString &name ) : QFile(name) { }
+
+        FILE *directHandle() { return fh; }
+};
+
+#endif
diff --git a/library/backend/qpcglobal.h b/library/backend/qpcglobal.h
index 0d60272..7b71f06 100644
--- a/library/backend/qpcglobal.h
+++ b/library/backend/qpcglobal.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -24,4 +24,5 @@
 
-#if ( defined(Q_OS_WIN32) || defined(Q_OS_WIN64) ) && defined(PALMTOPCENTER)
 #include <qglobal.h>
+
+#if ( defined(Q_OS_WIN32) || defined(Q_OS_WIN64) ) && defined(PALMTOPCENTER)
 // #  if defined(QT_NODLL)
@@ -34,2 +35,3 @@
 #    define QPC_EXPORT  __declspec(dllexport)
+#    define QPC_TEMPLATEEXTERN
 #    define QPC_TEMPLATEDLL
@@ -38,2 +40,3 @@
 #    define QPC_EXPORT  __declspec(dllimport)
+#    define QPC_TEMPLATEEXTERN extern
 #    define QPC_TEMPLATEDLL
diff --git a/library/backend/recordfields.h b/library/backend/recordfields.h
index 4196c8b..1167ed3 100644
--- a/library/backend/recordfields.h
+++ b/library/backend/recordfields.h
@@ -1,16 +1,15 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
-** Licensees holding valid Qtopia Developer license may use this
-** file in accordance with the Qtopia Developer License Agreement
-** provided with the Software.
+** 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.
+** 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.
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
@@ -90,5 +89,6 @@ namespace Qtopia
         Notes,
-        Groups
 
-        ,rid,
+        // used for internal record keeping, not for end user.
+        Groups,
+        rid,
         rinfo
diff --git a/library/backend/stringutil.cpp b/library/backend/stringutil.cpp
deleted file mode 100644
index df58f54..0000000
--- a/library/backend/stringutil.cpp
+++ b/dev/null
@@ -1,415 +0,0 @@
-/**********************************************************************
-** 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.
-**
-**********************************************************************/
-
-#include "stringutil.h"
-#include <qregexp.h>
-#include <qstringlist.h>
-
-namespace Qtopia
-{
-
-
-
-/*
-  Very, very simple Latin-1 only collation guaranteed to displease anyone
-  who actually uses the non-ASCII characters.
- */
-
-static const char  collationHack[] = {
-0x00, //C-@
-0x01, //C-A
-0x02, //C-B
-0x03, //C-C
-0x04, //C-D
-0x05, //C-E
-0x06, //C-F
-0x07, //C-G
-0x08, //C-H
-0x09, //C-I
-0x0a, //C-J
-0x0b, //C-K
-0x0c, //C-L
-0x0d, //C-M
-0x0e, //C-N
-0x0f, //C-O
-0x10, //C-P
-0x11, //C-Q
-0x12, //C-R
-0x13, //C-S
-0x14, //C-T
-0x15, //C-U
-0x16, //C-V
-0x17, //C-W
-0x18, //C-X
-0x19, //C-Y
-0x1a, //C-Z
-0x1b, //C-[
-0x1c, //C-\ 
-0x1d, //C-]
-0x1e, //C-^
-0x1f, //C-_
-' ', // 
-'!', //!
-'"', //"
-'#', //#
-'$', //$
-'%', //%
-'&', //&
-'\'', //'
-'(', //(
-')', //)
-'*', //*
-'+', //+
-',', //,
-'-', //-
-'.', //.
-'/', ///
-0x80, //0
-0x81, //1
-0x82, //2
-0x83, //3
-0x84, //4
-0x85, //5
-0x86, //6
-0x87, //7
-0x88, //8
-0x89, //9
-':', //:
-';', //;
-'<', //<
-'=', //=
-'>', //>
-'?', //?
-'@', //@
-'A', //A
-'B', //B
-'C', //C
-'D', //D
-'E', //E
-'F', //F
-'G', //G
-'H', //H
-'I', //I
-'J', //J
-'K', //K
-'L', //L
-'M', //M
-'N', //N
-'O', //O
-'P', //P
-'Q', //Q
-'R', //R
-'S', //S
-'T', //T
-'U', //U
-'V', //V
-'W', //W
-'X', //X
-'Y', //Y
-'Z', //Z
-'[', //[
-'\\', //\ 
-']', //]
-'^', //^
-'_', //_
-'`', //`
-'A', //a
-'B', //b
-'C', //c
-'D', //d
-'E', //e
-'F', //f
-'G', //g
-'H', //h
-'I', //i
-'J', //j
-'K', //k
-'L', //l
-'M', //m
-'N', //n
-'O', //o
-'P', //p
-'Q', //q
-'R', //r
-'S', //s
-'T', //t
-'U', //u
-'V', //v
-'W', //w
-'X', //x
-'Y', //y
-'Z', //z
-'{', //{
-'|', //|
-'}', //}
-'~', //~
-'', //
-0x80, //C-M-@
-0x81, //C-M-A
-0x82, //C-M-B
-0x83, //C-M-C
-0x84, //C-M-D
-0x85, //C-M-E
-0x86, //C-M-F
-0x87, //C-M-G
-0x88, //C-M-H
-0x89, //C-M-I
-0x8a, //C-M-J
-0x8b, //C-M-K
-0x8c, //C-M-L
-0x8d, //C-M-M
-0x8e, //C-M-N
-0x8f, //C-M-O
-0x90, //C-M-P
-0x91, //C-M-Q
-0x92, //C-M-R
-0x93, //C-M-S
-0x94, //C-M-T
-0x95, //C-M-U
-0x96, //C-M-V
-0x97, //C-M-W
-0x98, //C-M-X
-0x99, //C-M-Y
-0x9a, //C-M-Z
-0x9b, //C-M-[
-0x9c, //C-M-\ 
-0x9d, //C-M-]
-0x9e, //C-M-^
-0x9f, //C-M-_
-' ', // 
-'¡', //¡
-'¢', //¢
-'£', //£
-'¤', //¤
-'¥', //¥
-'¦', //¦
-'§', //§
-'¨', //¨
-'©', //©
-'A', //ª
-'«', //«
-'¬', //¬
-'­', //­
-'®', //®
-'¯', //¯
-'O', //°
-'±', //±
-'²', //²
-'³', //³
-'´', //´
-'µ', //µ
-'P', //¶
-'·', //·
-'¸', //¸
-'¹', //¹
-'O', //º
-'»', //»
-'¼', //¼
-'½', //½
-'¾', //¾
-'¿', //¿
-'A', //À
-'A', //Á
-'A', //Â
-'A', //Ã
-'A', //Ä
-'A', //Å
-'A', //Æ
-'C', //Ç
-'E', //È
-'E', //É
-'E', //Ê
-'E', //Ë
-'I', //Ì
-'I', //Í
-'I', //Î
-'I', //Ï
-'D', //Ð
-'N', //Ñ
-'O', //Ò
-'O', //Ó
-'O', //Ô
-'O', //Õ
-'O', //Ö
-'×', //×
-'O', //Ø
-'U', //Ù
-'U', //Ú
-'U', //Û
-'U', //Ü
-'Y', //Ý
-'T', //Þ
-'S', //ß
-'A', //à
-'A', //á
-'A', //â
-'A', //ã
-'A', //ä
-'A', //å
-'A', //æ
-'C', //ç
-'E', //è
-'E', //é
-'E', //ê
-'E', //ë
-'I', //ì
-'I', //í
-'I', //î
-'I', //ï
-'D', //ð
-'N', //ñ
-'O', //ò
-'O', //ó
-'O', //ô
-'O', //õ
-'O', //ö
-'÷', //÷
-'O', //ø
-'U', //ù
-'U', //ú
-'U', //û
-'U', //ü
-'Y', //ý
-'T', //þ
-'Y', //ÿ
-};
-
-
-
-
-
-static void hackString ( QString &s )
-{
-    int len = s.length();
-    const QChar* uc = s.unicode();
-    for ( int i = 0; i < len; i++ ) {
-        if ( !uc++->row() )
-            s[i] = collationHack[s[i].cell()];
-    }
-}
-
-QString buildSortKey( const QString & s )
-{
-    QString res = s;
-    hackString( res );
-    return res;
-}
-
-QString buildSortKey( const QString & s1, const QString & s2 )
-{
-    QString res = s1 + QChar( '\0' ) + s2;
-    hackString( res );
-    return res;
-}
-
-QString buildSortKey( const QString & s1, const QString & s2, 
-                      const QString & s3 )
-{
-    QString res = s1 + QChar( '\0' ) +  s2 + QChar( '\0' ) + s3;
-    hackString( res );
-    return res;
-}
-
-static inline QChar coll( QChar u )
-{
-    return u.row() ? u : QChar(collationHack[ u.cell() ]);
-}
-
-
-int compare( const QString & s1, const QString & s2 )
-{
-    const QChar* u1 = s1.unicode();
-    const QChar* u2 = s2.unicode();
-    
-    if ( u1 == u2 )
-        return 0;
-    if ( u1 == 0 )
-        return 1;
-    if ( u2 == 0 )
-        return -1;
-    int l=QMIN(s1.length(),s2.length());
-    while ( l-- && coll(*u1) == coll(*u2) )
-        u1++,u2++;
-    if ( l==-1 )
-        return ( s1.length()-s2.length() );
-    return u1->unicode() - u2->unicode();
-}
-
-QString simplifyMultiLineSpace( const QString &multiLine )
-{
-    QString result;
-    QStringList lines =  QStringList::split("\n", multiLine);
-    for ( QStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) {
-        if ( it != lines.begin() )
-            result += "\n";
-        result += (*it).simplifyWhiteSpace();
-    }
-    return result;
-}
-
-QString escapeString( const QString& plain )
-{
-    QString tmp(plain);
-    int pos = tmp.length();
-    const QChar *uc = plain.unicode();
-    while ( pos-- ) {
-        unsigned char ch = uc[pos].latin1();
-        if ( ch == '&' )
-            tmp.replace( pos, 1, "&amp;" );
-        else if ( ch == '<' )
-            tmp.replace( pos, 1, "&lt;" );
-        else if ( ch == '>' )
-            tmp.replace( pos, 1, "&gt;" );
-        else if ( ch == '\"' )
-            tmp.replace( pos, 1, "&quot;" );
-    }
-    return tmp;
-}
-
-QString plainString( const char* escaped, unsigned int length )
-{
-    return plainString( QString::fromUtf8( escaped, length ) );
-}
-
-QString plainString( const QCString& string )
-{
-    // We first have to pass it through a ::fromUtf8()
-    return plainString( string.data(), string.length() );
-}
-
-QString plainString( const QString& string )
-{
-    QString tmp( string );
-    int pos = -1;
-    while ( (pos = tmp.find( "&", pos +1 ) ) != -1 ) {
-        if ( tmp.find( "&amp;", pos ) == pos )
-            tmp.replace( pos, 5, "&" );
-        else if ( tmp.find( "&lt;", pos ) == pos )
-            tmp.replace( pos, 4, "<" );
-        else if( tmp.find( "&gt;", pos ) == pos )
-            tmp.replace( pos, 4, ">" );
-        else if ( tmp.find( "&quot;", pos ) == pos )
-            tmp.replace( pos, 6, "\"" );
-    }
-    return tmp;
-}
-
-} // namespace QPC
diff --git a/library/backend/task.cpp b/library/backend/task.cpp
index f0a38f1..a00adb3 100644
--- a/library/backend/task.cpp
+++ b/library/backend/task.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -20,10 +20,12 @@
 
-#include <qpe/task.h>
-#include <qregexp.h>
-#include <qstring.h>
-#include <qpe/recordfields.h>
+#include "task.h"
+#include "recordfields.h"
 #include "vobject_p.h"
-#include "timeconversion.h"
 #include "qfiledirect_p.h"
 
+#include <qtopia/timeconversion.h>
+
+#include <qregexp.h>
+#include <qstring.h>
+
 #include <stdio.h>
@@ -33,2 +35,16 @@ UidGen Task::sUidGen( UidGen::Qtopia );
 
+/*!
+  \class Task
+  \brief The Task class holds the data of a todo entry.
+
+  This data includes the priority of the task, a description, an optional due
+  date, and whether the task is completed or not.
+
+  \ingroup qtopiaemb
+  \ingroup qtopiadesktop
+*/
+
+/*!
+  Creates a new, empty task.
+*/
 Task::Task() : Record(), mDue( FALSE ),
@@ -39,2 +55,85 @@ mCompleted( FALSE ), mPriority( 3 ), mDesc()
 
+/*!
+  \fn void Task::setPriority( int priority )
+
+  Sets the priority of the task to \a priority.
+*/
+
+/*!
+  \fn int Task::priority() const
+
+  Returns the priority of the task.
+*/
+
+/*!
+  \fn void Task::setDescription( const QString &description )
+
+  Sets the description of the task to \a description.
+ */
+
+/*!
+  \fn const QString &Task::description() const
+
+  Returns the description of the task.
+ */
+
+/*!
+  \fn void Task::setDueDate( const QDate &date, bool hasDue )
+
+  \internal
+  If \a hasDue is TRUE sets the due date of the task to \a date.
+  Otherwise clears the due date of the task.
+*/
+
+/*!
+  \fn void Task::setDueDate( const QDate &date )
+
+  Sets the due date of the task to \a date.
+*/
+
+/*!
+  \fn void Task::clearDueDate( )
+
+  Clears the due date of the task.
+*/
+
+/*!
+  \fn void Task::setCompleted( bool b )
+
+  If \a b is TRUE marks the task as completed.  Otherwise marks the task as
+  uncompleted.
+*/
+
+/*!
+  \fn bool Task::isCompleted() const
+
+  Returns TRUE if the task is completed.  Otherwise returns FALSE.
+*/
+
+/*!
+  \fn const QDate &Task::dueDate() const
+
+  Returns the due date of the task.
+ */
+
+/*!
+  \fn bool Task::hasDueDate() const
+
+  Returns TRUE if there is a due date set for the task.  Otherwise returns
+  FALSE.
+*/
+
+/*!
+  \fn void Task::setHasDueDate( bool b )
+
+  \internal
+  Just don't ask.  I really can't justify the function.
+*/
+
+
+/*!
+  \internal
+  Creates a new task.  The properties of the task are set from \a m.
+*/
+
 Task::Task( const QMap<int, QString> &m ) : Record(), mDue( FALSE ),
@@ -53,3 +152,5 @@ mDueDate( QDate::currentDate() ), mCompleted( FALSE ), mPriority( 3 ), mDesc()
         case TaskUid: setUid( (*it).toInt() ); break;
-        default: break;
+        case TaskRid:
+        case TaskRinfo:
+                        break;
         }
@@ -57,2 +158,5 @@ mDueDate( QDate::currentDate() ), mCompleted( FALSE ), mPriority( 3 ), mDesc()
 
+/*!
+  Destroys a task.
+*/
 Task::~Task()
@@ -61,2 +165,6 @@ Task::~Task()
 
+/*!
+  \internal
+  Returns the task as a map of field ids to property values.
+*/
 QMap<int, QString> Task::toMap() const
@@ -66,6 +174,9 @@ QMap<int, QString> Task::toMap() const
     m.insert( Completed, isCompleted() ? "1" : "0" );
-    m.insert( TaskCategory, idsToString( categories() ) );
-    m.insert( TaskDescription, description() );
+    if ( categories().count() )
+        m.insert( TaskCategory, idsToString( categories() ) );
+    if ( !description().isEmpty() )
+        m.insert( TaskDescription, description() );
     m.insert( Priority, QString::number( priority() ) );
-    m.insert( Date, TimeConversion::toString( dueDate() ) );
+    if ( hasDueDate() )
+        m.insert( Date, TimeConversion::toString( dueDate() ) );
     m.insert( TaskUid, QString::number(uid()) );
@@ -77,2 +188,6 @@ QMap<int, QString> Task::toMap() const
 
+/*!
+  \internal
+  Appends the task information to \a buf.
+*/
 void Task::save( QString& buf ) const
@@ -119,3 +234,7 @@ void Task::save( QString& buf ) const
 
-bool Task::match ( const QRegExp &r ) const
+/*!
+  Returns TRUE if the task matches the regular expressions \a regexp.
+  Otherwise returns FALSE.
+*/
+bool Task::match ( const QRegExp &regexp ) const
 {
@@ -124,7 +243,7 @@ bool Task::match ( const QRegExp &r ) const
     match = false;
-    if ( QString::number( mPriority ).find( r ) > -1 )
+    if ( QString::number( mPriority ).find( regexp ) > -1 )
         match = true;
-    else if ( mDue && mDueDate.toString().find( r ) > -1 )
+    else if ( mDue && mDueDate.toString().find( regexp ) > -1 )
         match = true;
-    else if ( mDesc.find( r ) > -1 )
+    else if ( mDesc.find( regexp ) > -1 )
         match = true;
@@ -133,2 +252,5 @@ bool Task::match ( const QRegExp &r ) const
 
+/*!
+  \internal
+*/
 static inline VObject *safeAddPropValue( VObject *o, const char *prop, const QString &value )
@@ -141,2 +263,5 @@ static inline VObject *safeAddPropValue( VObject *o, const char *prop, const QSt
 
+/*!
+  \internal
+*/
 static inline VObject *safeAddProp( VObject *o, const char *prop)
@@ -150,2 +275,5 @@ static inline VObject *safeAddProp( VObject *o, const char *prop)
 
+/*!
+  \internal
+*/
 static VObject *createVObject( const Task &t )
@@ -166,3 +294,5 @@ static VObject *createVObject( const Task &t )
 
-
+/*!
+  \internal
+*/
 static Task parseVObject( VObject *obj )
@@ -209,3 +339,5 @@ static Task parseVObject( VObject *obj )
 
-
+/*!
+  Writes the list of \a tasks as a set of VCards to the file \a filename.
+*/
 void Task::writeVCalendar( const QString &filename, const QValueList<Task> &tasks)
@@ -228,2 +360,5 @@ void Task::writeVCalendar( const QString &filename, const QValueList<Task> &task
 
+/*!
+  Writes \a task as a VCard to the file \a filename.
+*/
 void Task::writeVCalendar( const QString &filename, const Task &task)
@@ -243,3 +378,5 @@ void Task::writeVCalendar( const QString &filename, const Task &task)
 
-
+/*!
+  Returns the set of tasks read as VCards from the file \a filename.
+*/
 QValueList<Task> Task::readVCalendar( const QString &filename )
diff --git a/library/backend/task.h b/library/backend/task.h
index 6f383b8..091f2e9 100644
--- a/library/backend/task.h
+++ b/library/backend/task.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -22,4 +22,4 @@
 
-#include <qpe/palmtoprecord.h>
-#include <qpe/stringutil.h>
+#include <qtopia/private/palmtoprecord.h>
+#include <qtopia/stringutil.h>
 
@@ -42,2 +42,4 @@ public:
 
+    enum PriorityValue { VeryHigh=1, High, Normal, Low, VeryLow };
+
     void setPriority( int priority ) { mPriority = priority; }
@@ -53,6 +55,12 @@ public:
 
+    // Use THESE functions
+    void setDueDate( const QDate &date);
+    void clearDueDate();
+   
+    // Instead of these functions.
     void setDueDate( const QDate& date, bool hasDue ) { mDueDate = date; mDue = hasDue; }
+    void setHasDueDate( bool b ) { mDue = b; }
+
     const QDate &dueDate() const { return mDueDate; }
     bool hasDueDate() const { return mDue; }
-    void setHasDueDate( bool b ) { mDue = b; }
     
@@ -80,2 +88,5 @@ private:
 
+// MUST be inline.  (forwards compatability).
+inline void Task::setDueDate( const QDate &date) { setDueDate(date, date.isValid()); }
+inline void Task::clearDueDate() { setHasDueDate( FALSE ); }
 #endif
diff --git a/library/backend/timeconversion.cpp b/library/backend/timeconversion.cpp
deleted file mode 100644
index a4a2547..0000000
--- a/library/backend/timeconversion.cpp
+++ b/dev/null
@@ -1,237 +0,0 @@
-/**********************************************************************
-** 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.
-**
-**********************************************************************/
-
-#include <qglobal.h>
-#include "timeconversion.h"
-#include <qregexp.h>
-#include <stdlib.h>
-
-QString TimeConversion::toString( const QDate &d )
-{
-    QString r = QString::number( d.day() ) + "." +
-                QString::number( d.month() ) + "." +
-                QString::number( d.year() );
-    //qDebug("TimeConversion::toString %s", r.latin1());
-    return r;
-}
-
-QDate TimeConversion::fromString( const QString &datestr )
-{
-    int monthPos = datestr.find('.');
-    int yearPos = datestr.find('.', monthPos+1 );
-    if ( monthPos == -1 || yearPos == -1 ) {
-        qDebug("fromString didn't find . in str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, yearPos );
-        return QDate();
-    }
-    int d = datestr.left( monthPos ).toInt();
-    int m = datestr.mid( monthPos+1, yearPos - monthPos - 1 ).toInt();
-    int y = datestr.mid( yearPos+1 ).toInt();
-    QDate date ( y,m,d );
-    //qDebug("TimeConversion::fromString ymd = %s => %d %d %d; mpos = %d ypos = %d", datestr.latin1(), y, m, d, monthPos, yearPos);
-    return date;
-}
-
-time_t TimeConversion::toUTC( const QDateTime& dt )
-{
-    time_t tmp;
-    struct tm *lt;
-
-#if defined(_OS_WIN32) || defined (Q_OS_WIN32) || defined (Q_OS_WIN64)
-    _tzset();
-#else
-    tzset();
-#endif
-
-    // get a tm structure from the system to get the correct tz_name
-    tmp = time( 0 );
-    lt = localtime( &tmp );
-
-    lt->tm_sec = dt.time().second();
-    lt->tm_min = dt.time().minute();
-    lt->tm_hour = dt.time().hour();
-    lt->tm_mday = dt.date().day();
-    lt->tm_mon = dt.date().month() - 1; // 0-11 instead of 1-12
-    lt->tm_year = dt.date().year() - 1900; // year - 1900
-    //lt->tm_wday = dt.date().dayOfWeek(); ignored anyway
-    //lt->tm_yday = dt.date().dayOfYear(); ignored anyway
-    lt->tm_wday = -1;
-    lt->tm_yday = -1;
-    // tm_isdst negative -> mktime will find out about DST
-    lt->tm_isdst = -1;
-    // keep tm_zone and tm_gmtoff
-    tmp = mktime( lt );
-    return tmp;
-}
-
-QDateTime TimeConversion::fromUTC( time_t time )
-{
-    struct tm *lt;
-
-#if defined(_OS_WIN32) || defined (Q_OS_WIN32) || defined (Q_OS_WIN64)
-    _tzset();
-#else
-    tzset();
-#endif
-    lt = localtime( &time );
-    QDateTime dt;
-    dt.setDate( QDate( lt->tm_year + 1900, lt->tm_mon + 1, lt->tm_mday ) );
-    dt.setTime( QTime( lt->tm_hour, lt->tm_min, lt->tm_sec ) );
-    return dt;
-}
-
-
-int TimeConversion::secsTo( const QDateTime &from, const QDateTime &to )
-{
-    return toUTC( to ) - toUTC( from );
-}
-
-QCString TimeConversion::toISO8601( const QDate &d )
-{
-    time_t tmp = toUTC( d );
-    struct tm *utc = gmtime( &tmp );
-
-    QCString str;
-    str.sprintf("%04d%02d%02d", (utc->tm_year + 1900), utc->tm_mon+1, utc->tm_mday );
-    return str;
-}
-
-QCString TimeConversion::toISO8601( const QDateTime &dt )
-{
-    time_t tmp = toUTC( dt );
-    struct tm *utc = gmtime( &tmp );
-
-    QCString str;
-    str.sprintf("%04d%02d%02dT%02d%02d%02dZ",
-                (utc->tm_year + 1900), utc->tm_mon+1, utc->tm_mday,
-                utc->tm_hour, utc->tm_min, utc->tm_sec );
-    return str;
-}
-
-QDateTime TimeConversion::fromISO8601( const QCString &s )
-{
-
-#if defined(_OS_WIN32) || defined (Q_OS_WIN32) || defined (Q_OS_WIN64)
-    _tzset();
-#else
-    tzset();
-#endif
-
-    struct tm *thetime = new tm;
-
-    QCString str = s.copy();
-    str.replace(QRegExp("-"), "" );
-    str.replace(QRegExp(":"), "" );
-    str.stripWhiteSpace();
-    str = str.lower();
-
-    int i = str.find( "t" );
-    QCString date;
-    QCString timestr;
-    if ( i != -1 ) {
-        date = str.left( i );
-        timestr = str.mid( i+1 );
-    } else {
-        date = str;
-    }
-
-//     qDebug("--- parsing ISO time---");
-    thetime->tm_year = 100;
-    thetime->tm_mon = 0;
-    thetime->tm_mday = 0;
-    thetime->tm_hour = 0;
-    thetime->tm_min = 0;
-    thetime->tm_sec = 0;
-
-//     qDebug("date = %s", date.data() );
-
-    switch( date.length() ) {
-        case 8:
-            thetime->tm_mday = date.right( 2 ).toInt();
-        case 6:
-            thetime->tm_mon = date.mid( 4, 2 ).toInt() - 1;
-        case 4:
-            thetime->tm_year = date.left( 4 ).toInt();
-            thetime->tm_year -= 1900;
-            break;
-        default:
-            break;
-    }
-
-    int tzoff = 0;
-    bool inLocalTime = FALSE;
-    if ( timestr.find( 'z' ) == (int)timestr.length() - 1 )
-        // UTC
-        timestr = timestr.left( timestr.length() -1 );
-    else {
-        int plus = timestr.find( "+" );
-        int minus = timestr.find( "-" );
-        if ( plus != -1 || minus != -1 ) {
-            // have a timezone offset
-            plus = (plus != -1) ? plus : minus;
-            QCString off = timestr.mid( plus );
-            timestr = timestr.left( plus );
-
-            int tzoffhour = 0;
-            int tzoffmin = 0;
-            switch( off.length() ) {
-                case 5:
-                    tzoffmin = off.mid(3).toInt();
-                case 3:
-                    tzoffhour = off.left(3).toInt();
-                default:
-                    break;
-            }
-            tzoff = 60*tzoffhour + tzoffmin;
-        } else
-            inLocalTime = TRUE;
-    }
-
-    // get the time:
-    switch( timestr.length() ) {
-        case 6:
-            thetime->tm_sec = timestr.mid( 4 ).toInt();
-        case 4:
-            thetime->tm_min = timestr.mid( 2, 2 ).toInt();
-        case 2:
-            thetime->tm_hour = timestr.left( 2 ).toInt();
-        default:
-            break;
-    }
-
-    int tzloc = 0;
-    time_t tmp = time( 0 );
-    if ( !inLocalTime ) {
-        // have to get the offset between gmt and local time
-        struct tm *lt = localtime( &tmp );
-        tzloc = mktime( lt );
-        struct tm *ut = gmtime( &tmp );
-        tzloc -= mktime( ut );
-    }
-//     qDebug("time: %d %d %d, tzloc=%d, tzoff=%d", thetime->tm_hour, thetime->tm_min, thetime->tm_sec,
-        //     tzloc, tzoff );
-
-    tmp = mktime( thetime );
-    tmp += 60*(-tzloc + tzoff);
-
-    delete thetime;
-
-    return fromUTC( tmp );
-}
-
diff --git a/library/backend/timeconversion.h b/library/backend/timeconversion.h
deleted file mode 100644
index 1724812..0000000
--- a/library/backend/timeconversion.h
+++ b/dev/null
@@ -1,45 +0,0 @@
-/**********************************************************************
-** 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 __timeconversion_h__
-#define __timeconversion_h__
-
-#include <time.h>
-#include <sys/types.h>
-#include <qdatetime.h>
-
-#include <qpe/qpcglobal.h>
-
-class QPC_EXPORT TimeConversion
-{
-public:
-    static QString toString( const QDate &d );
-    static QDate fromString( const QString &datestr );
-
-    static time_t toUTC( const QDateTime& dt );
-    static QDateTime fromUTC( time_t time );
-    static int secsTo( const QDateTime &from, const QDateTime &to );
-
-    static QCString toISO8601( const QDate & );
-    static QCString toISO8601( const QDateTime & );
-    static QDateTime fromISO8601( const QCString & );
-};
-
-#endif // __timeconversion_h__
diff --git a/library/backend/vcc.y b/library/backend/vcc.y
index e326a64..5bcf0cb 100644
--- a/library/backend/vcc.y
+++ b/library/backend/vcc.y
@@ -1,1199 +1,1208 @@
-%{
-
-/***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International
-Business Machines Corporation and Siemens Rolm Communications Inc.
-
-For purposes of this license notice, the term Licensors shall mean,
-collectively, Apple Computer, Inc., AT&T Corp., International
-Business Machines Corporation and Siemens Rolm Communications Inc.
-The term Licensor shall mean any of the Licensors.
-
-Subject to acceptance of the following conditions, permission is hereby
-granted by Licensors without the need for written agreement and without
-license or royalty fees, to use, copy, modify and distribute this
-software for any purpose.
-
-The above copyright notice and the following four paragraphs must be
-reproduced in all copies of this software and any software including
-this software.
-
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR
-MODIFICATIONS.
-
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or
-disclosure by the government are subject to restrictions set forth in
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
-
-***************************************************************************/
-
-/*
- * src: vcc.c
- * doc: Parser for vCard and vCalendar. Note that this code is
- * generated by a yacc parser generator. Generally it should not
- * be edited by hand. The real source is vcc.y. The #line directives
- * can be commented out here to make it easier to trace through
- * in a debugger. However, if a bug is found it should
- * be fixed in vcc.y and this file regenerated.
- */
-
-
-/* debugging utilities */
-#if __DEBUG
-#define DBG_(x) printf x
-#else
-#define DBG_(x)
-#endif
-
-/****  External Functions  ****/
-
-/* assign local name to parser variables and functions so that
-   we can use more than one yacc based parser.
-*/
-
-#if 0
-#define yyparse mime_parse
-#define yylex mime_lex
-#define yyerror mime_error
-#define yychar mime_char
-/* #define p_yyval p_mime_val */
-#undef yyval
-#define yyval mime_yyval
-/* #define p_yylval p_mime_lval */
-#undef yylval
-#define yylval mime_yylval
-#define yydebug mime_debug
-#define yynerrs mime_nerrs
-#define yyerrflag mime_errflag
-#define yyss mime_ss
-#define yyssp mime_ssp
-#define yyvs mime_vs
-#define yyvsp mime_vsp
-#define yylhs mime_lhs
-#define yylen mime_len
-#define yydefred mime_defred
-#define yydgoto mime_dgoto
-#define yysindex mime_sindex
-#define yyrindex mime_rindex
-#define yygindex mime_gindex
-#define yytable mime_table
-#define yycheck mime_check
-#define yyname mime_name
-#define yyrule mime_rule
-#ifdef YYPREFIX
-#undef YYPREFIX
-#endif
-#define YYPREFIX "mime_"
-#endif
-
-
-#ifndef _NO_LINE_FOLDING
-#define _SUPPORT_LINE_FOLDING 1
-#endif
-
-/* undef below if compile with MFC */
-/* #define INCLUDEMFC 1 */
-
-#if defined(WIN32) || defined(_WIN32)
-#ifdef INCLUDEMFC
-#include <afx.h>
-#endif
-#endif
-
-#include <string.h>
-#ifndef __MWERKS__
-#include <stdlib.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-//#ifdef PALMTOPCENTER
-//#include <qpe/vobject_p.h>
-//#else
-#include "vobject_p.h"
-//#endif
-
-/****  Types, Constants  ****/
-
-        #define YYDEBUG                 0/* 1 to compile in some debugging code */
-        #define MAXTOKEN        256/* maximum token (line) length */
-        #define YYSTACKSIZE     100// ~unref ?
-        #define MAXLEVEL        10/* max # of nested objects parseable */
-                                /* (includes outermost) */
-
-
-/****  Global Variables  ****/
-int mime_lineNum, mime_numErrors; /* yyerror() can use these */
-static VObject* vObjList;
-static VObject *curProp;
-static VObject *curObj;
-static VObject* ObjStack[MAXLEVEL];
-static int ObjStackTop;
-
-
-/* A helpful utility for the rest of the app. */
-#if __CPLUSPLUS__
-extern "C" {
-#endif
-
-    extern void yyerror(char *s);
-
-#if __CPLUSPLUS__
-    };
-#endif
-
-int yyparse();
-
-enum LexMode {
-        L_NORMAL,
-        L_VCARD,
-        L_VCAL,
-        L_VEVENT,
-        L_VTODO,
-        L_VALUES,
-        L_BASE64,
-        L_QUOTED_PRINTABLE
-        };
-
-/****  Private Forward Declarations  ****/
-static int pushVObject(const char *prop);
-static VObject* popVObject();
-static void lexPopMode(int top);
-static int lexWithinMode(enum LexMode mode);
-static void lexPushMode(enum LexMode mode);
-static void enterProps(const char *s);
-static void enterAttr(const char *s1, const char *s2);
-static void enterValues(const char *value);
-#define mime_error yyerror
-void mime_error(char *s);
-void mime_error_(char *s);
-
-%}
-
-/***************************************************************************/
-/***                           The grammar                              ****/
-/***************************************************************************/
-
-%union {
-    char *str;
-    VObject *vobj;
-    }
-
-%token
-        EQ COLON DOT SEMICOLON SPACE HTAB LINESEP NEWLINE
-        BEGIN_VCARD END_VCARD BEGIN_VCAL END_VCAL
-        BEGIN_VEVENT END_VEVENT BEGIN_VTODO END_VTODO
-        ID
-
-/*
- * NEWLINE is the token that would occur outside a vCard,
- * while LINESEP is the token that would occur inside a vCard.
- */
-
-%token <str>
-        STRING ID
-
-%type <str> name value
-
-%type <vobj> vcard vcal vobject
-
-%start mime
-
-%%
-
-
-mime: vobjects
-        ;
-
-vobjects: vobjects vobject
-        { addList(&vObjList, $2); curObj = 0; }
-        | vobject
-                { addList(&vObjList, $1); curObj = 0; }
-        ;
-
-vobject: vcard
-        | vcal
-        ;
-
-vcard:
-        BEGIN_VCARD
-        {
-        lexPushMode(L_VCARD);
-        if (!pushVObject(VCCardProp)) YYERROR;
-        }
-        items END_VCARD
-        {
-        lexPopMode(0);
-        $$ = popVObject();
-        }
-        | BEGIN_VCARD
-        {
-        lexPushMode(L_VCARD);
-        if (!pushVObject(VCCardProp)) YYERROR;
-        }
-        END_VCARD
-        {
-        lexPopMode(0);
-        $$ = popVObject();
-        }
-        ;
-
-items: items item
-        | item
-        ;
-
-item: prop COLON
-        {
-        lexPushMode(L_VALUES);
-        }
-        values LINESEP
-        {
-        if (lexWithinMode(L_BASE64) || lexWithinMode(L_QUOTED_PRINTABLE))
-           lexPopMode(0);
-        lexPopMode(0);
-        }
-        | error
-        ;
-
-prop: name
-        {
-        enterProps($1);
-        }
-        attr_params
-        | name
-        {
-        enterProps($1);
-        }
-        ;
-
-attr_params: attr_params attr_param
-        | attr_param
-        ;
-
-attr_param: SEMICOLON attr
-        ;
-
-attr: name
-        {
-        enterAttr($1,0);
-        }
-        | name EQ name
-        {
-        enterAttr($1,$3);
-
-        }
-        ;
-        
-name: ID
-        ;
-
-values: value SEMICOLON { enterValues($1); } values
-        | value
-        { enterValues($1); }
-        ;
-
-value: STRING
-        |
-        { $$ = 0; }
-        ;
-
-vcal:
-        BEGIN_VCAL
-        { if (!pushVObject(VCCalProp)) YYERROR; }
-        calitems
-        END_VCAL
-        { $$ = popVObject(); }
-        | BEGIN_VCAL
-        { if (!pushVObject(VCCalProp)) YYERROR; }
-        END_VCAL
-        { $$ = popVObject(); }
-        ;
-
-calitems: calitems calitem
-        | calitem
-        ;
-
-calitem:
-        eventitem
-        | todoitem
-        | items
-        ;
-
-eventitem:
-        BEGIN_VEVENT
-        {
-        lexPushMode(L_VEVENT);
-        if (!pushVObject(VCEventProp)) YYERROR;
-        }
-        items
-        END_VEVENT
-        {
-        lexPopMode(0);
-        popVObject();
-        }
-        | BEGIN_VEVENT
-        {
-        lexPushMode(L_VEVENT);
-        if (!pushVObject(VCEventProp)) YYERROR;
-        }
-        END_VEVENT
-        {
-        lexPopMode(0);
-        popVObject();
-        }
-        ;
-
-todoitem:
-        BEGIN_VTODO
-        {
-        lexPushMode(L_VTODO);
-        if (!pushVObject(VCTodoProp)) YYERROR;
-        }
-        items
-        END_VTODO
-        {
-        lexPopMode(0);
-        popVObject();
-        }
-        | BEGIN_VTODO
-        {
-        lexPushMode(L_VTODO);
-        if (!pushVObject(VCTodoProp)) YYERROR;
-        }
-        END_VTODO
-        {
-        lexPopMode(0);
-        popVObject();
-        }
-        ;
-
-%%
-/*------------------------------------*/
-static int pushVObject(const char *prop)
-    {
-    VObject *newObj;
-    if (ObjStackTop == MAXLEVEL)
-        return FALSE;
-
-    ObjStack[++ObjStackTop] = curObj;
-
-    if (curObj) {
-        newObj = addProp(curObj,prop);
-        curObj = newObj;
-        }
-    else
-        curObj = newVObject(prop);
-
-    return TRUE;
-    }
-
-
-/*---------------------------------------*/
-/* This pops the recently built vCard off the stack and returns it. */
-static VObject* popVObject()
-    {
-    VObject *oldObj;
-    if (ObjStackTop < 0) {
-        yyerror("pop on empty Object Stack\n");
-        return 0;
-        }
-    oldObj = curObj;
-    curObj = ObjStack[ObjStackTop--];
-
-    return oldObj;
-    }
-
-
-static void enterValues(const char *value)
-    {
-    if (fieldedProp && *fieldedProp) {
-        if (value) {
-            addPropValue(curProp,*fieldedProp,value);
-            }
-        /* else this field is empty, advance to next field */
-        fieldedProp++;
-        }
-    else {
-        if (value) {
-            setVObjectStringZValue_(curProp,strdup( value ));
-            }
-        }
-    deleteStr(value);
-    }
-
-static void enterProps(const char *s)
-    {
-    curProp = addGroup(curObj,s);
-    deleteStr(s);
-    }
-
-static void enterAttr(const char *s1, const char *s2)
-    {
-    const char *p1, *p2;
-    p1 = lookupProp_(s1);
-    if (s2) {
-        VObject *a;
-        p2 = lookupProp_(s2);
-        a = addProp(curProp,p1);
-        setVObjectStringZValue(a,p2);
-        }
-    else
-        addProp(curProp,p1);
-    if (qstricmp(p1,VCBase64Prop) == 0 || (s2 && qstricmp(p2,VCBase64Prop)==0))
-        lexPushMode(L_BASE64);
-    else if (qstricmp(p1,VCQuotedPrintableProp) == 0
-            || (s2 && qstricmp(p2,VCQuotedPrintableProp)==0))
-        lexPushMode(L_QUOTED_PRINTABLE);
-    deleteStr(s1); deleteStr(s2);
-    }
-
-
-#define MAX_LEX_LOOKAHEAD_0 32
-#define MAX_LEX_LOOKAHEAD 64
-#define MAX_LEX_MODE_STACK_SIZE 10
-#define LEXMODE() (lexBuf.lexModeStack[lexBuf.lexModeStackTop])
-
-struct LexBuf {
-        /* input */
-#ifdef INCLUDEMFC
-    CFile *inputFile;
-#else
-    FILE *inputFile;
-#endif
-    char *inputString;
-    unsigned long curPos;
-    unsigned long inputLen;
-        /* lookahead buffer */
-        /*   -- lookahead buffer is short instead of char so that EOF
-         /      can be represented correctly.
-        */
-    unsigned long len;
-    short buf[MAX_LEX_LOOKAHEAD];
-    unsigned long getPtr;
-        /* context stack */
-    unsigned long lexModeStackTop;
-    enum LexMode lexModeStack[MAX_LEX_MODE_STACK_SIZE];
-        /* token buffer */
-    unsigned long maxToken;
-    char *strs;
-    unsigned long strsLen;
-    } lexBuf;
-
-static void lexPushMode(enum LexMode mode)
-    {
-    if (lexBuf.lexModeStackTop == (MAX_LEX_MODE_STACK_SIZE-1))
-        yyerror("lexical context stack overflow");
-    else {
-        lexBuf.lexModeStack[++lexBuf.lexModeStackTop] = mode;
-        }
-    }
-
-static void lexPopMode(int top)
-    {
-    /* special case of pop for ease of error recovery -- this
-        version will never underflow */
-    if (top)
-        lexBuf.lexModeStackTop = 0;
-    else
-        if (lexBuf.lexModeStackTop > 0) lexBuf.lexModeStackTop--;
-    }
-
-static int lexWithinMode(enum LexMode mode) {
-    unsigned long i;
-    for (i=0;i<lexBuf.lexModeStackTop;i++)
-        if (mode == lexBuf.lexModeStack[i]) return 1;
-    return 0;
-    }
-
-static char lexGetc_()
-    {
-    /* get next char from input, no buffering. */
-    if (lexBuf.curPos == lexBuf.inputLen)
-        return EOF;
-    else if (lexBuf.inputString)
-        return *(lexBuf.inputString + lexBuf.curPos++);
-    else {
-#ifdef INCLUDEMFC
-        char result;
-        return lexBuf.inputFile->Read(&result, 1) == 1 ? result : EOF;
-#else
-        return fgetc(lexBuf.inputFile);
-#endif
-        }
-    }
-
-static int lexGeta()
-    {
-    ++lexBuf.len;
-    return (lexBuf.buf[lexBuf.getPtr] = lexGetc_());
-    }
-
-static int lexGeta_(int i)
-    {
-    ++lexBuf.len;
-    return (lexBuf.buf[(lexBuf.getPtr+i)%MAX_LEX_LOOKAHEAD] = lexGetc_());
-    }
-
-static void lexSkipLookahead() {
-    if (lexBuf.len > 0 && lexBuf.buf[lexBuf.getPtr]!=EOF) {
-        /* don't skip EOF. */
-        lexBuf.getPtr = (lexBuf.getPtr + 1) % MAX_LEX_LOOKAHEAD;
-        lexBuf.len--;
-        }
-    }
-
-static int lexLookahead() {
-    int c = (lexBuf.len)?
-        lexBuf.buf[lexBuf.getPtr]:
-        lexGeta();
-    /* do the \r\n -> \n or \r -> \n translation here */
-    if (c == '\r') {
-        int a = (lexBuf.len>1)?
-            lexBuf.buf[(lexBuf.getPtr+1)%MAX_LEX_LOOKAHEAD]:
-            lexGeta_(1);
-        if (a == '\n') {
-            lexSkipLookahead();
-            }
-        lexBuf.buf[lexBuf.getPtr] = c = '\n';
-        }
-    else if (c == '\n') {
-        int a = (lexBuf.len>1)?
-            lexBuf.buf[lexBuf.getPtr+1]:
-            lexGeta_(1);
-        if (a == '\r') {
-            lexSkipLookahead();
-            }
-        lexBuf.buf[lexBuf.getPtr] = '\n';
-        }
-    return c;
-    }
-
-static int lexGetc() {
-    int c = lexLookahead();
-    if (lexBuf.len > 0 && lexBuf.buf[lexBuf.getPtr]!=EOF) {
-        /* EOF will remain in lookahead buffer */
-        lexBuf.getPtr = (lexBuf.getPtr + 1) % MAX_LEX_LOOKAHEAD;
-        lexBuf.len--;
-        }
-    return c;
-    }
-
-static void lexSkipLookaheadWord() {
-    if (lexBuf.strsLen <= lexBuf.len) {
-        lexBuf.len -= lexBuf.strsLen;
-        lexBuf.getPtr = (lexBuf.getPtr + lexBuf.strsLen) % MAX_LEX_LOOKAHEAD;
-        }
-    }
-
-static void lexClearToken()
-    {
-    lexBuf.strsLen = 0;
-    }
-
-static void lexAppendc(int c)
-    {
-    lexBuf.strs[lexBuf.strsLen] = c;
-    /* append up to zero termination */
-    if (c == 0) return;
-    lexBuf.strsLen++;
-    if (lexBuf.strsLen > lexBuf.maxToken) {
-        /* double the token string size */
-        lexBuf.maxToken <<= 1;
-        lexBuf.strs = (char*) realloc(lexBuf.strs,(size_t)lexBuf.maxToken);
-        }
-    }
-
-static char* lexStr() {
-    return dupStr(lexBuf.strs,(size_t)lexBuf.strsLen+1);
-    }
-
-static void lexSkipWhite() {
-    int c = lexLookahead();
-    while (c == ' ' || c == '\t') {
-        lexSkipLookahead();
-        c = lexLookahead();
-        }
-    }
-
-static char* lexGetWord() {
-    int c;
-    lexSkipWhite();
-    lexClearToken();
-    c = lexLookahead();
-    while (c != EOF && !strchr("\t\n ;:=",c)) {
-        lexAppendc(c);
-        lexSkipLookahead();
-        c = lexLookahead();
-        }
-    lexAppendc(0);
-    return lexStr();
-    }
-
-static void lexPushLookaheadc(int c) {
-    int putptr;
-    /* can't putback EOF, because it never leaves lookahead buffer */
-    if (c == EOF) return;
-    putptr = (int)lexBuf.getPtr - 1;
-    if (putptr < 0) putptr += MAX_LEX_LOOKAHEAD;
-    lexBuf.getPtr = putptr;
-    lexBuf.buf[putptr] = c;
-    lexBuf.len += 1;
-    }
-
-static char* lexLookaheadWord() {
-    /* this function can lookahead word with max size of MAX_LEX_LOOKAHEAD_0
-     /  and thing bigger than that will stop the lookahead and return 0;
-     / leading white spaces are not recoverable.
-     */
-    int c;
-    int len = 0;
-    int curgetptr = 0;
-    lexSkipWhite();
-    lexClearToken();
-            curgetptr = (int)lexBuf.getPtr;// remember!
-    while (len < (MAX_LEX_LOOKAHEAD_0)) {
-        c = lexGetc();
-        len++;
-        if (c == EOF || strchr("\t\n ;:=", c)) {
-            lexAppendc(0);
-            /* restore lookahead buf. */
-            lexBuf.len += len;
-            lexBuf.getPtr = curgetptr;
-            return lexStr();
-            }
-        else
-            lexAppendc(c);
-        }
-            lexBuf.len += len;/* char that has been moved to lookahead buffer */
-    lexBuf.getPtr = curgetptr;
-    return 0;
-    }
-
-#ifdef _SUPPORT_LINE_FOLDING
-static void handleMoreRFC822LineBreak(int c) {
-    /* suport RFC 822 line break in cases like
-             *ADR: foo;
-     *    morefoo;
-     *    more foo;
-     */
-    if (c == ';') {
-        int a;
-        lexSkipLookahead();
-        /* skip white spaces */
-        a = lexLookahead();
-        while (a == ' ' || a == '\t') {
-            lexSkipLookahead();
-            a = lexLookahead();
-            }
-        if (a == '\n') {
-            lexSkipLookahead();
-            a = lexLookahead();
-            if (a == ' ' || a == '\t') {
-                /* continuation, throw away all the \n and spaces read so
-                 * far
-                 */
-                lexSkipWhite();
-                lexPushLookaheadc(';');
-                }
-            else {
-                lexPushLookaheadc('\n');
-                lexPushLookaheadc(';');
-                }
-            }
-        else {
-            lexPushLookaheadc(';');
-            }
-        }
-    }
-
-static char* lexGet1Value() {
-    int c;
-    lexSkipWhite();
-    c = lexLookahead();
-    lexClearToken();
-    while (c != EOF && c != ';') {
-        if (c == '\\' ) {
-            int a;
-            lexSkipLookahead();
-            a = lexLookahead();
-            if ( a != ';' ) {
-                lexAppendc('\\');
-            } else {
-                lexAppendc( ';' );
-                lexSkipLookahead();
-            }
-        } else if (c == '\n') {
-            int a;
-            lexSkipLookahead();
-            a  = lexLookahead();
-            if (a == ' ' || a == '\t') {
-                lexAppendc(' ');
-                lexSkipLookahead();
-                }
-            else {
-                lexPushLookaheadc('\n');
-                break;
-                }
-            }
-        else {
-            lexAppendc(c);
-            lexSkipLookahead();
-            }
-        c = lexLookahead();
-        }
-    lexAppendc(0);
-    handleMoreRFC822LineBreak(c);
-    return c==EOF?0:lexStr();
-    }
-#endif
-
-static int match_begin_name(int end) {
-    char *n = lexLookaheadWord();
-    int token = ID;
-    if (n) {
-        if (!qstricmp(n,"vcard")) token = end?END_VCARD:BEGIN_VCARD;
-        else if (!qstricmp(n,"vcalendar")) token = end?END_VCAL:BEGIN_VCAL;
-        else if (!qstricmp(n,"vevent")) token = end?END_VEVENT:BEGIN_VEVENT;
-        else if (!qstricmp(n,"vtodo")) token = end?END_VTODO:BEGIN_VTODO;
-        deleteStr(n);
-        return token;
-        }
-    return 0;
-    }
-
-
-#ifdef INCLUDEMFC
-void initLex(const char *inputstring, unsigned long inputlen, CFile *inputfile)
-#else
-void initLex(const char *inputstring, unsigned long inputlen, FILE *inputfile)
-#endif
-    {
-    // initialize lex mode stack
-    lexBuf.lexModeStack[lexBuf.lexModeStackTop=0] = L_NORMAL;
-
-    // iniatialize lex buffer.
-    lexBuf.inputString = (char*) inputstring;
-    lexBuf.inputLen = inputlen;
-    lexBuf.curPos = 0;
-    lexBuf.inputFile = inputfile;
-
-    lexBuf.len = 0;
-    lexBuf.getPtr = 0;
-
-    lexBuf.maxToken = MAXTOKEN;
-    lexBuf.strs = (char*)malloc(MAXTOKEN);
-    lexBuf.strsLen = 0;
-
-    }
-
-static void finiLex() {
-    free(lexBuf.strs);
-    }
-
-
-/*-----------------------------------*/
-/* This parses and converts the base64 format for binary encoding into
- * a decoded buffer (allocated with new).  See RFC 1521.
- */
-static char * lexGetDataFromBase64()
-    {
-    unsigned long bytesLen = 0, bytesMax = 0;
-    int quadIx = 0, pad = 0;
-    unsigned long trip = 0;
-    unsigned char b;
-    int c;
-    unsigned char *bytes = NULL;
-    unsigned char *oldBytes = NULL;
-
-    DBG_(("db: lexGetDataFromBase64\n"));
-    while (1) {
-        c = lexGetc();
-        if (c == '\n') {
-            ++mime_lineNum;
-            if (lexLookahead() == '\n') {
-                /* a '\n' character by itself means end of data */
-                break;
-                }
-            else continue; /* ignore '\n' */
-            }
-        else {
-            if ((c >= 'A') && (c <= 'Z'))
-                b = (unsigned char)(c - 'A');
-            else if ((c >= 'a') && (c <= 'z'))
-                b = (unsigned char)(c - 'a') + 26;
-            else if ((c >= '0') && (c <= '9'))
-                b = (unsigned char)(c - '0') + 52;
-            else if (c == '+')
-                b = 62;
-            else if (c == '/')
-                b = 63;
-            else if (c == '=') {
-                b = 0;
-                pad++;
-            } else if ((c == ' ') || (c == '\t')) {
-                continue;
-            } else { /* error condition */
-                if (bytes) free(bytes);
-                else if (oldBytes) free(oldBytes);
-                // error recovery: skip until 2 adjacent newlines.
-                DBG_(("db: invalid character 0x%x '%c'\n", c,c));
-                if (c != EOF)  {
-                    c = lexGetc();
-                    while (c != EOF) {
-                        if (c == '\n' && lexLookahead() == '\n') {
-                            ++mime_lineNum;
-                            break;
-                            }
-                        c = lexGetc();
-                        }
-                    }
-                return NULL;
-                }
-            trip = (trip << 6) | b;
-            if (++quadIx == 4) {
-                unsigned char outBytes[3];
-                int numOut;
-                int i;
-                for (i = 0; i < 3; i++) {
-                    outBytes[2-i] = (unsigned char)(trip & 0xFF);
-                    trip >>= 8;
-                    }
-                numOut = 3 - pad;
-                if (bytesLen + numOut > bytesMax) {
-                    if (!bytes) {
-                        bytesMax = 1024;
-                        bytes = (unsigned char*)malloc((size_t)bytesMax);
-                        }
-                    else {
-                        bytesMax <<= 2;
-                        oldBytes = bytes;
-                        bytes = (unsigned char*)realloc(bytes,(size_t)bytesMax);
-                        }
-                    if (bytes == 0) {
-                        mime_error("out of memory while processing BASE64 data\n");
-                        }
-                    }
-                if (bytes) {
-                    memcpy(bytes + bytesLen, outBytes, numOut);
-                    bytesLen += numOut;
-                    }
-                trip = 0;
-                quadIx = 0;
-                }
-            }
-        } /* while */
-    DBG_(("db: bytesLen = %d\n",  bytesLen));
-    /* kludge: all this won't be necessary if we have tree form
-        representation */
-    if (bytes) {
-        setValueWithSize(curProp,bytes,(unsigned int)bytesLen);
-        free(bytes);
-        }
-    else if (oldBytes) {
-        setValueWithSize(curProp,oldBytes,(unsigned int)bytesLen);
-        free(oldBytes);
-        }
-    return 0;
-    }
-
-static int match_begin_end_name(int end) {
-    int token;
-    lexSkipWhite();
-    if (lexLookahead() != ':') return ID;
-    lexSkipLookahead();
-    lexSkipWhite();
-    token = match_begin_name(end);
-    if (token == ID) {
-        lexPushLookaheadc(':');
-        DBG_(("db: ID '%s'\n", yylval.str));
-        return ID;
-        }
-    else if (token != 0) {
-        lexSkipLookaheadWord();
-        deleteStr(yylval.str);
-        DBG_(("db: begin/end %d\n", token));
-        return token;
-        }
-    return 0;
-    }
-
-static char* lexGetQuotedPrintable()
-    {
-    char cur;
-
-    lexClearToken();
-    do {
-        cur = lexGetc();
-        switch (cur) {
-            case '=': {
-                int c = 0;
-                int next[2];
-                int i;
-                for (i = 0; i < 2; i++) {
-                    next[i] = lexGetc();
-                    if (next[i] >= '0' && next[i] <= '9')
-                        c = c * 16 + next[i] - '0';
-                    else if (next[i] >= 'A' && next[i] <= 'F')
-                        c = c * 16 + next[i] - 'A' + 10;
-                    else
-                        break;
-                    }
-                if (i == 0) {
-                    /* single '=' follow by LINESEP is continuation sign? */
-                    if (next[0] == '\n') {
-                        ++mime_lineNum;
-                        }
-                    else {
-                        lexPushLookaheadc('=');
-                        goto EndString;
-                        }
-                    }
-                else if (i == 1) {
-                    lexPushLookaheadc(next[1]);
-                    lexPushLookaheadc(next[0]);
-                    lexAppendc('=');
-                } else {
-                    lexAppendc(c);
-                    }
-                break;
-                } /* '=' */
-            case '\n': {
-                lexPushLookaheadc('\n');
-                goto EndString;
-                }
-            case (char)EOF:
-                break;
-            default:
-                lexAppendc(cur);
-                break;
-            } /* switch */
-        } while (cur != (char)EOF);
-
-EndString:
-    lexAppendc(0);
-    return lexStr();
-    } /* LexQuotedPrintable */
-
-static int yylex() {
-
-    int lexmode = LEXMODE();
-    if (lexmode == L_VALUES) {
-        int c = lexGetc();
-        if (c == ';') {
-            DBG_(("db: SEMICOLON\n"));
-            lexPushLookaheadc(c);
-            handleMoreRFC822LineBreak(c);
-            lexSkipLookahead();
-            return SEMICOLON;
-            }
-        else if (strchr("\n",c)) {
-            ++mime_lineNum;
-            /* consume all line separator(s) adjacent to each other */
-            c = lexLookahead();
-            while (strchr("\n",c)) {
-                lexSkipLookahead();
-                c = lexLookahead();
-                ++mime_lineNum;
-                }
-            DBG_(("db: LINESEP\n"));
-            return LINESEP;
-            }
-        else {
-            char *p = 0;
-            lexPushLookaheadc(c);
-            if (lexWithinMode(L_BASE64)) {
-                /* get each char and convert to bin on the fly... */
-                p = lexGetDataFromBase64();
-                yylval.str = p;
-                return STRING;
-                }
-            else if (lexWithinMode(L_QUOTED_PRINTABLE)) {
-                p = lexGetQuotedPrintable();
-                }
-            else {
-#ifdef _SUPPORT_LINE_FOLDING
-                p = lexGet1Value();
-#else
-                p = lexGetStrUntil(";\n");
-#endif
-                }
-            if (p) {
-                DBG_(("db: STRING: '%s'\n", p));
-                yylval.str = p;
-                return STRING;
-                }
-            else return 0;
-            }
-        }
-    else {
-        /* normal mode */
-        while (1) {
-            int c = lexGetc();
-            switch(c) {
-                case ':': {
-                    /* consume all line separator(s) adjacent to each other */
-                    /* ignoring linesep immediately after colon. */
-                    c = lexLookahead();
-                    while (strchr("\n",c)) {
-                        lexSkipLookahead();
-                        c = lexLookahead();
-                        ++mime_lineNum;
-                        }
-                    DBG_(("db: COLON\n"));
-                    return COLON;
-                    }
-                case ';':
-                    DBG_(("db: SEMICOLON\n"));
-                    return SEMICOLON;
-                case '=':
-                    DBG_(("db: EQ\n"));
-                    return EQ;
-                /* ignore whitespace in this mode */
-                case '\t':
-                case ' ': continue;
-                case '\n': {
-                    ++mime_lineNum;
-                    continue;
-                    }
-                case EOF: return 0;
-                    break;
-                default: {
-                    lexPushLookaheadc(c);
-                    if (isalnum(c)) {
-                        char *t = lexGetWord();
-                        yylval.str = t;
-                        if (!qstricmp(t, "begin")) {
-                            return match_begin_end_name(0);
-                            }
-                        else if (!qstricmp(t,"end")) {
-                            return match_begin_end_name(1);
-                            }
-                        else {
-                            DBG_(("db: ID '%s'\n", t));
-                            return ID;
-                            }
-                        }
-                    else {
-                        /* unknow token */
-                        return 0;
-                        }
-                    break;
-                    }
-                }
-            }
-        }
-    return 0;
-    }
-
-
-/***************************************************************************/
-        /***                                                    Public Functions                                        ****/
-/***************************************************************************/
-
-static VObject* Parse_MIMEHelper()
-    {
-    ObjStackTop = -1;
-    mime_numErrors = 0;
-    mime_lineNum = 1;
-    vObjList = 0;
-    curObj = 0;
-
-    if (yyparse() != 0)
-        return 0;
-
-    finiLex();
-    return vObjList;
-    }
-
-/*--------------------------------------------*/
-DLLEXPORT(VObject*) Parse_MIME(const char *input, unsigned long len)
-    {
-    initLex(input, len, 0);
-    return Parse_MIMEHelper();
-    }
-
-
-#if INCLUDEMFC
-
-DLLEXPORT(VObject*) Parse_MIME_FromFile(CFile *file)
-    {
-    unsigned long startPos;
-            VObject *result;
-
-    initLex(0,-1,file);
-    startPos = file->GetPosition();
-    if (!(result = Parse_MIMEHelper()))
-        file->Seek(startPos, CFile::begin);
-    return result;
-    }
-
-#else
-
-VObject* Parse_MIME_FromFile(FILE *file)
-    {
-            VObject *result;
-    long startPos;
-
-    initLex(0,(unsigned long)-1,file);
-    startPos = ftell(file);
-    if (!(result = Parse_MIMEHelper())) {
-        fseek(file,startPos,SEEK_SET);
-        }
-    return result;
-    }
-
-DLLEXPORT(VObject*) Parse_MIME_FromFileName(char *fname)
-    {
-    FILE *fp = fopen(fname,"r");
-    if (fp) {
-        VObject* o = Parse_MIME_FromFile(fp);
-        fclose(fp);
-        return o;
-        }
-    else {
-        char msg[80];
-        sprintf(msg, "can't open file '%s' for reading\n", fname);
-        mime_error_(msg);
-        return 0;
-        }
-    }
-
-#endif
-
-/*-------------------------------------*/
-
-static MimeErrorHandler mimeErrorHandler;
-
-DLLEXPORT(void) registerMimeErrorHandler(MimeErrorHandler me)
-    {
-    mimeErrorHandler = me;
-    }
-
-void mime_error(char *s)
-    {
-    char msg[256];
-    if (mimeErrorHandler) {
-        sprintf(msg,"%s at line %d", s, mime_lineNum);
-        mimeErrorHandler(msg);
-        }
-    }
-
-void mime_error_(char *s)
-    {
-    if (mimeErrorHandler) {
-        mimeErrorHandler(s);
-        }
-    }
-
+%{

+

+/***************************************************************************

+(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International

+Business Machines Corporation and Siemens Rolm Communications Inc.

+

+For purposes of this license notice, the term Licensors shall mean,

+collectively, Apple Computer, Inc., AT&T Corp., International

+Business Machines Corporation and Siemens Rolm Communications Inc.

+The term Licensor shall mean any of the Licensors.

+

+Subject to acceptance of the following conditions, permission is hereby

+granted by Licensors without the need for written agreement and without

+license or royalty fees, to use, copy, modify and distribute this

+software for any purpose.

+

+The above copyright notice and the following four paragraphs must be

+reproduced in all copies of this software and any software including

+this software.

+

+THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE

+ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR

+MODIFICATIONS.

+

+IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,

+INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT

+OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH

+DAMAGE.

+

+EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,

+INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE

+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+PURPOSE.

+

+The software is provided with RESTRICTED RIGHTS.  Use, duplication, or

+disclosure by the government are subject to restrictions set forth in

+DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.

+

+***************************************************************************/

+

+/*

+ * src: vcc.c

+ * doc: Parser for vCard and vCalendar. Note that this code is

+ * generated by a yacc parser generator. Generally it should not

+ * be edited by hand. The real source is vcc.y. The #line directives

+ * can be commented out here to make it easier to trace through

+ * in a debugger. However, if a bug is found it should

+ * be fixed in vcc.y and this file regenerated.

+ */

+

+

+/* debugging utilities */

+#if __DEBUG

+#define DBG_(x) printf x

+#else

+#define DBG_(x)

+#endif

+

+/****  External Functions  ****/

+

+/* assign local name to parser variables and functions so that

+   we can use more than one yacc based parser.

+*/

+

+#if 0

+#define yyparse mime_parse

+#define yylex mime_lex

+#define yyerror mime_error

+#define yychar mime_char

+/* #define p_yyval p_mime_val */

+#undef yyval

+#define yyval mime_yyval

+/* #define p_yylval p_mime_lval */

+#undef yylval

+#define yylval mime_yylval

+#define yydebug mime_debug

+#define yynerrs mime_nerrs

+#define yyerrflag mime_errflag

+#define yyss mime_ss

+#define yyssp mime_ssp

+#define yyvs mime_vs

+#define yyvsp mime_vsp

+#define yylhs mime_lhs

+#define yylen mime_len

+#define yydefred mime_defred

+#define yydgoto mime_dgoto

+#define yysindex mime_sindex

+#define yyrindex mime_rindex

+#define yygindex mime_gindex

+#define yytable mime_table

+#define yycheck mime_check

+#define yyname mime_name

+#define yyrule mime_rule

+#ifdef YYPREFIX

+#undef YYPREFIX

+#endif

+#define YYPREFIX "mime_"

+#endif

+

+

+#ifndef _NO_LINE_FOLDING

+#define _SUPPORT_LINE_FOLDING 1

+#endif

+

+/* undef below if compile with MFC */

+/* #define INCLUDEMFC 1 */

+

+#if defined(WIN32) || defined(_WIN32)

+#ifdef INCLUDEMFC

+#include <afx.h>

+#endif

+#endif

+

+#include <string.h>

+#ifndef __MWERKS__

+#include <stdlib.h>

+#endif

+#include <stdio.h>

+#include <stdlib.h>

+#include <ctype.h>

+

+//#ifdef PALMTOPCENTER

+//#include <qpe/vobject_p.h>

+//#else

+#include "vobject_p.h"

+//#endif

+

+/****  Types, Constants  ****/

+

+        #define YYDEBUG                 0/* 1 to compile in some debugging code */

+        #define MAXTOKEN        256/* maximum token (line) length */

+        #define YYSTACKSIZE     100// ~unref ?

+        #define MAXLEVEL        10/* max # of nested objects parseable */

+                                /* (includes outermost) */

+

+

+/****  Global Variables  ****/

+int mime_lineNum, mime_numErrors; /* yyerror() can use these */

+static VObject* vObjList;

+static VObject *curProp;

+static VObject *curObj;

+static VObject* ObjStack[MAXLEVEL];

+static int ObjStackTop;

+

+

+/* A helpful utility for the rest of the app. */

+#if __CPLUSPLUS__

+extern "C" {

+#endif

+

+    extern void yyerror(char *s);

+

+#if __CPLUSPLUS__

+    };

+#endif

+

+int yyparse();

+

+enum LexMode {

+        L_NORMAL,

+        L_VCARD,

+        L_VCAL,

+        L_VEVENT,

+        L_VTODO,

+        L_VALUES,

+        L_BASE64,

+        L_QUOTED_PRINTABLE

+        };

+

+/****  Private Forward Declarations  ****/

+static int pushVObject(const char *prop);

+static VObject* popVObject();

+static void lexPopMode(int top);

+static int lexWithinMode(enum LexMode mode);

+static void lexPushMode(enum LexMode mode);

+static void enterProps(const char *s);

+static void enterAttr(const char *s1, const char *s2);

+static void enterValues(const char *value);

+#define mime_error yyerror

+void mime_error(char *s);

+void mime_error_(char *s);

+

+%}

+

+/***************************************************************************/

+/***                           The grammar                              ****/

+/***************************************************************************/

+

+%union {

+    char *str;

+    VObject *vobj;

+    }

+

+%token

+        EQ COLON DOT SEMICOLON SPACE HTAB LINESEP NEWLINE

+        BEGIN_VCARD END_VCARD BEGIN_VCAL END_VCAL

+        BEGIN_VEVENT END_VEVENT BEGIN_VTODO END_VTODO

+        ID

+

+/*

+ * NEWLINE is the token that would occur outside a vCard,

+ * while LINESEP is the token that would occur inside a vCard.

+ */

+

+%token <str>

+        STRING ID

+

+%type <str> name value

+

+%type <vobj> vcard vcal vobject

+

+%start mime

+

+%%

+

+

+mime: vobjects

+        ;

+

+vobjects: vobjects vobject

+        { addList(&vObjList, $2); curObj = 0; }

+        | vobject

+                { addList(&vObjList, $1); curObj = 0; }

+        ;

+

+vobject: vcard

+        | vcal

+        ;

+

+vcard:

+        BEGIN_VCARD

+        {

+        lexPushMode(L_VCARD);

+        if (!pushVObject(VCCardProp)) YYERROR;

+        }

+        items END_VCARD

+        {

+        lexPopMode(0);

+        $$ = popVObject();

+        }

+        | BEGIN_VCARD

+        {

+        lexPushMode(L_VCARD);

+        if (!pushVObject(VCCardProp)) YYERROR;

+        }

+        END_VCARD

+        {

+        lexPopMode(0);

+        $$ = popVObject();

+        }

+        ;

+

+items: items item

+        | item

+        ;

+

+item: prop COLON

+        {

+        lexPushMode(L_VALUES);

+        }

+        values LINESEP

+        {

+        if (lexWithinMode(L_BASE64) || lexWithinMode(L_QUOTED_PRINTABLE))

+           lexPopMode(0);

+        lexPopMode(0);

+        }

+        | error

+        ;

+

+prop: name

+        {

+        enterProps($1);

+        }

+        attr_params

+        | name

+        {

+        enterProps($1);

+        }

+        ;

+

+attr_params: attr_params attr_param

+        | attr_param

+        ;

+

+attr_param: SEMICOLON attr

+        ;

+

+attr: name

+        {

+        enterAttr($1,0);

+        }

+        | name EQ name

+        {

+        enterAttr($1,$3);

+

+        }

+        ;

+        

+name: ID

+        ;

+

+values: value SEMICOLON { enterValues($1); } values

+        | value

+        { enterValues($1); }

+        ;

+

+value: STRING

+        |

+        { $$ = 0; }

+        ;

+

+vcal:

+        BEGIN_VCAL

+        { if (!pushVObject(VCCalProp)) YYERROR; }

+        calitems

+        END_VCAL

+        { $$ = popVObject(); }

+        | BEGIN_VCAL

+        { if (!pushVObject(VCCalProp)) YYERROR; }

+        END_VCAL

+        { $$ = popVObject(); }

+        ;

+

+calitems: calitems calitem

+        | calitem

+        ;

+

+calitem:

+        eventitem

+        | todoitem

+        | items

+        ;

+

+eventitem:

+        BEGIN_VEVENT

+        {

+        lexPushMode(L_VEVENT);

+        if (!pushVObject(VCEventProp)) YYERROR;

+        }

+        items

+        END_VEVENT

+        {

+        lexPopMode(0);

+        popVObject();

+        }

+        | BEGIN_VEVENT

+        {

+        lexPushMode(L_VEVENT);

+        if (!pushVObject(VCEventProp)) YYERROR;

+        }

+        END_VEVENT

+        {

+        lexPopMode(0);

+        popVObject();

+        }

+        ;

+

+todoitem:

+        BEGIN_VTODO

+        {

+        lexPushMode(L_VTODO);

+        if (!pushVObject(VCTodoProp)) YYERROR;

+        }

+        items

+        END_VTODO

+        {

+        lexPopMode(0);

+        popVObject();

+        }

+        | BEGIN_VTODO

+        {

+        lexPushMode(L_VTODO);

+        if (!pushVObject(VCTodoProp)) YYERROR;

+        }

+        END_VTODO

+        {

+        lexPopMode(0);

+        popVObject();

+        }

+        ;

+

+%%

+/*------------------------------------*/

+static int pushVObject(const char *prop)

+    {

+    VObject *newObj;

+    if (ObjStackTop == MAXLEVEL)

+        return FALSE;

+

+    ObjStack[++ObjStackTop] = curObj;

+

+    if (curObj) {

+        newObj = addProp(curObj,prop);

+        curObj = newObj;

+        }

+    else

+        curObj = newVObject(prop);

+

+    return TRUE;

+    }

+

+

+/*---------------------------------------*/

+/* This pops the recently built vCard off the stack and returns it. */

+static VObject* popVObject()

+    {

+    VObject *oldObj;

+    if (ObjStackTop < 0) {

+        yyerror("pop on empty Object Stack\n");

+        return 0;

+        }

+    oldObj = curObj;

+    curObj = ObjStack[ObjStackTop--];

+

+    return oldObj;

+    }

+

+

+static void enterValues(const char *value)

+    {

+    if (fieldedProp && *fieldedProp) {

+        if (value) {

+            addPropValue(curProp,*fieldedProp,value);

+            }

+        /* else this field is empty, advance to next field */

+        fieldedProp++;

+        }

+    else {

+        if (value) {

+            setVObjectStringZValue_(curProp,strdup( value ));

+            }

+        }

+    deleteStr(value);

+    }

+

+static void enterProps(const char *s)

+    {

+    curProp = addGroup(curObj,s);

+    deleteStr(s);

+    }

+

+static void enterAttr(const char *s1, const char *s2)

+    {

+    const char *p1, *p2;

+    p1 = lookupProp_(s1);

+    if (s2) {

+        VObject *a;

+        p2 = lookupProp_(s2);

+        a = addProp(curProp,p1);

+        setVObjectStringZValue(a,p2);

+        }

+    else

+        addProp(curProp,p1);

+    if (qstricmp(p1,VCBase64Prop) == 0 || (s2 && qstricmp(p2,VCBase64Prop)==0))

+        lexPushMode(L_BASE64);

+    else if (qstricmp(p1,VCQuotedPrintableProp) == 0

+            || (s2 && qstricmp(p2,VCQuotedPrintableProp)==0))

+        lexPushMode(L_QUOTED_PRINTABLE);

+    deleteStr(s1); deleteStr(s2);

+    }

+

+

+#define MAX_LEX_LOOKAHEAD_0 32

+#define MAX_LEX_LOOKAHEAD 64

+#define MAX_LEX_MODE_STACK_SIZE 10

+#define LEXMODE() (lexBuf.lexModeStack[lexBuf.lexModeStackTop])

+

+struct LexBuf {

+        /* input */

+#ifdef INCLUDEMFC

+    CFile *inputFile;

+#else

+    FILE *inputFile;

+#endif

+    char *inputString;

+    unsigned long curPos;

+    unsigned long inputLen;

+        /* lookahead buffer */

+        /*   -- lookahead buffer is short instead of char so that EOF

+         /      can be represented correctly.

+        */

+    unsigned long len;

+    short buf[MAX_LEX_LOOKAHEAD];

+    unsigned long getPtr;

+        /* context stack */

+    unsigned long lexModeStackTop;

+    enum LexMode lexModeStack[MAX_LEX_MODE_STACK_SIZE];

+        /* token buffer */

+    unsigned long maxToken;

+    char *strs;

+    unsigned long strsLen;

+    } lexBuf;

+

+static void lexPushMode(enum LexMode mode)

+    {

+    if (lexBuf.lexModeStackTop == (MAX_LEX_MODE_STACK_SIZE-1))

+        yyerror("lexical context stack overflow");

+    else {

+        lexBuf.lexModeStack[++lexBuf.lexModeStackTop] = mode;

+        }

+    }

+

+static void lexPopMode(int top)

+    {

+    /* special case of pop for ease of error recovery -- this

+        version will never underflow */

+    if (top)

+        lexBuf.lexModeStackTop = 0;

+    else

+        if (lexBuf.lexModeStackTop > 0) lexBuf.lexModeStackTop--;

+    }

+

+static int lexWithinMode(enum LexMode mode) {

+    unsigned long i;

+    for (i=0;i<lexBuf.lexModeStackTop;i++)

+        if (mode == lexBuf.lexModeStack[i]) return 1;

+    return 0;

+    }

+

+static int lexGetc_()

+    {

+    /* get next char from input, no buffering. */

+    if (lexBuf.curPos == lexBuf.inputLen)

+        return EOF;

+    else if (lexBuf.inputString)

+        return *(lexBuf.inputString + lexBuf.curPos++);

+    else {

+#ifdef INCLUDEMFC

+        char result;

+        return lexBuf.inputFile->Read(&result, 1) == 1 ? result : EOF;

+#else

+        return fgetc(lexBuf.inputFile);

+#endif

+        }

+    }

+

+static int lexGeta()

+    {

+    ++lexBuf.len;

+    return (lexBuf.buf[lexBuf.getPtr] = lexGetc_());

+    }

+

+static int lexGeta_(int i)

+    {

+    ++lexBuf.len;

+    return (lexBuf.buf[(lexBuf.getPtr+i)%MAX_LEX_LOOKAHEAD] = lexGetc_());

+    }

+

+static void lexSkipLookahead() {

+    if (lexBuf.len > 0 && lexBuf.buf[lexBuf.getPtr]!=EOF) {

+        /* don't skip EOF. */

+        lexBuf.getPtr = (lexBuf.getPtr + 1) % MAX_LEX_LOOKAHEAD;

+        lexBuf.len--;

+        }

+    }

+

+static int lexLookahead() {

+    int c = (lexBuf.len)?

+        lexBuf.buf[lexBuf.getPtr]:

+        lexGeta();

+    /* do the \r\n -> \n or \r -> \n translation here */

+    if (c == '\r') {

+        int a = (lexBuf.len>1)?

+            lexBuf.buf[(lexBuf.getPtr+1)%MAX_LEX_LOOKAHEAD]:

+            lexGeta_(1);

+        if (a == '\n') {

+            lexSkipLookahead();

+            }

+        lexBuf.buf[lexBuf.getPtr] = c = '\n';

+        }

+    else if (c == '\n') {

+        int a = (lexBuf.len>1)?

+            lexBuf.buf[lexBuf.getPtr+1]:

+            lexGeta_(1);

+        if (a == '\r') {

+            lexSkipLookahead();

+            }

+        lexBuf.buf[lexBuf.getPtr] = '\n';

+        }

+    return c;

+    }

+

+static int lexGetc() {

+    int c = lexLookahead();

+    if (lexBuf.len > 0 && lexBuf.buf[lexBuf.getPtr]!=EOF) {

+        /* EOF will remain in lookahead buffer */

+        lexBuf.getPtr = (lexBuf.getPtr + 1) % MAX_LEX_LOOKAHEAD;

+        lexBuf.len--;

+        }

+    return c;

+    }

+

+static void lexSkipLookaheadWord() {

+    if (lexBuf.strsLen <= lexBuf.len) {

+        lexBuf.len -= lexBuf.strsLen;

+        lexBuf.getPtr = (lexBuf.getPtr + lexBuf.strsLen) % MAX_LEX_LOOKAHEAD;

+        }

+    }

+

+static void lexClearToken()

+    {

+    lexBuf.strsLen = 0;

+    }

+

+static void lexAppendc(int c)

+    {

+    lexBuf.strs[lexBuf.strsLen] = c;

+    /* append up to zero termination */

+    if (c == 0) return;

+    lexBuf.strsLen++;

+    if (lexBuf.strsLen > lexBuf.maxToken) {

+        /* double the token string size */

+        lexBuf.maxToken <<= 1;

+        lexBuf.strs = (char*) realloc(lexBuf.strs,(size_t)lexBuf.maxToken);

+        }

+    }

+

+static char* lexStr() {

+    return dupStr(lexBuf.strs,(size_t)lexBuf.strsLen+1);

+    }

+

+static void lexSkipWhite() {

+    int c = lexLookahead();

+    while (c == ' ' || c == '\t') {

+        lexSkipLookahead();

+        c = lexLookahead();

+        }

+    }

+

+static char* lexGetWord() {

+    int c;

+    lexSkipWhite();

+    lexClearToken();

+    c = lexLookahead();

+    while (c != EOF && !strchr("\t\n ;:=",c)) {

+        lexAppendc(c);

+        lexSkipLookahead();

+        c = lexLookahead();

+        }

+    lexAppendc(0);

+    return lexStr();

+    }

+

+static void lexPushLookaheadc(int c) {

+    int putptr;

+    /* can't putback EOF, because it never leaves lookahead buffer */

+    if (c == EOF) return;

+    putptr = (int)lexBuf.getPtr - 1;

+    if (putptr < 0) putptr += MAX_LEX_LOOKAHEAD;

+    lexBuf.getPtr = putptr;

+    lexBuf.buf[putptr] = c;

+    lexBuf.len += 1;

+    }

+

+static char* lexLookaheadWord() {

+    /* this function can lookahead word with max size of MAX_LEX_LOOKAHEAD_0

+     /  and thing bigger than that will stop the lookahead and return 0;

+     / leading white spaces are not recoverable.

+     */

+    int c;

+    int len = 0;

+    int curgetptr = 0;

+    lexSkipWhite();

+    lexClearToken();

+            curgetptr = (int)lexBuf.getPtr;// remember!

+    while (len < (MAX_LEX_LOOKAHEAD_0)) {

+        c = lexGetc();

+        len++;

+        if (c == EOF || strchr("\t\n ;:=", c)) {

+            lexAppendc(0);

+            /* restore lookahead buf. */

+            lexBuf.len += len;

+            lexBuf.getPtr = curgetptr;

+            return lexStr();

+            }

+        else

+            lexAppendc(c);

+        }

+            lexBuf.len += len;/* char that has been moved to lookahead buffer */

+    lexBuf.getPtr = curgetptr;

+    return 0;

+    }

+

+#ifdef _SUPPORT_LINE_FOLDING

+static void handleMoreRFC822LineBreak(int c) {

+    /* suport RFC 822 line break in cases like

+             *ADR: foo;

+     *    morefoo;

+     *    more foo;

+     */

+    if (c == ';') {

+        int a;

+        lexSkipLookahead();

+        /* skip white spaces */

+        a = lexLookahead();

+        while (a == ' ' || a == '\t') {

+            lexSkipLookahead();

+            a = lexLookahead();

+            }

+        if (a == '\n') {

+            lexSkipLookahead();

+            a = lexLookahead();

+            if (a == ' ' || a == '\t') {

+                /* continuation, throw away all the \n and spaces read so

+                 * far

+                 */

+                lexSkipWhite();

+                lexPushLookaheadc(';');

+                }

+            else {

+                lexPushLookaheadc('\n');

+                lexPushLookaheadc(';');

+                }

+            }

+        else {

+            lexPushLookaheadc(';');

+            }

+        }

+    }

+

+static char* lexGet1Value() {

+    int c;

+    lexSkipWhite();

+    c = lexLookahead();

+    lexClearToken();

+    while (c != EOF && c != ';') {

+        if (c == '\\' ) {

+            int a;

+            lexSkipLookahead();

+            a = lexLookahead();

+            if ( a != ';' ) {

+                lexAppendc('\\');

+            } else {

+                lexAppendc( ';' );

+                lexSkipLookahead();

+            }

+        } else if (c == '\n') {

+            int a;

+            lexSkipLookahead();

+            a  = lexLookahead();

+            if (a == ' ' || a == '\t') {

+                lexAppendc(' ');

+                lexSkipLookahead();

+                }

+            else {

+                lexPushLookaheadc('\n');

+                break;

+                }

+            }

+        else {

+            lexAppendc(c);

+            lexSkipLookahead();

+            }

+        c = lexLookahead();

+        }

+    lexAppendc(0);

+    handleMoreRFC822LineBreak(c);

+    return c==EOF?0:lexStr();

+    }

+#endif

+

+static int match_begin_name(int end) {

+    char *n = lexLookaheadWord();

+    int token = ID;

+    if (n) {

+        if (!qstricmp(n,"vcard")) token = end?END_VCARD:BEGIN_VCARD;

+        else if (!qstricmp(n,"vcalendar")) token = end?END_VCAL:BEGIN_VCAL;

+        else if (!qstricmp(n,"vevent")) token = end?END_VEVENT:BEGIN_VEVENT;

+        else if (!qstricmp(n,"vtodo")) token = end?END_VTODO:BEGIN_VTODO;

+        deleteStr(n);

+        return token;

+        }

+    return 0;

+    }

+

+

+#ifdef INCLUDEMFC

+void initLex(const char *inputstring, unsigned long inputlen, CFile *inputfile)

+#else

+void initLex(const char *inputstring, unsigned long inputlen, FILE *inputfile)

+#endif

+    {

+    // initialize lex mode stack

+    lexBuf.lexModeStack[lexBuf.lexModeStackTop=0] = L_NORMAL;

+

+    // iniatialize lex buffer.

+    lexBuf.inputString = (char*) inputstring;

+    lexBuf.inputLen = inputlen;

+    lexBuf.curPos = 0;

+    lexBuf.inputFile = inputfile;

+

+    lexBuf.len = 0;

+    lexBuf.getPtr = 0;

+

+    lexBuf.maxToken = MAXTOKEN;

+    lexBuf.strs = (char*)malloc(MAXTOKEN);

+    lexBuf.strsLen = 0;

+

+    }

+

+static void finiLex() {

+    free(lexBuf.strs);

+    }

+

+

+/*-----------------------------------*/

+/* This parses and converts the base64 format for binary encoding into

+ * a decoded buffer (allocated with new).  See RFC 1521.

+ */

+static char * lexGetDataFromBase64()

+    {

+    unsigned long bytesLen = 0, bytesMax = 0;

+    int quadIx = 0, pad = 0;

+    unsigned long trip = 0;

+    unsigned char b;

+    int c;

+    unsigned char *bytes = NULL;

+    unsigned char *oldBytes = NULL;

+

+    DBG_(("db: lexGetDataFromBase64\n"));

+    while (1) {

+        c = lexGetc();

+        if (c == '\n') {

+            ++mime_lineNum;

+            if (lexLookahead() == '\n') {

+                /* a '\n' character by itself means end of data */

+                break;

+                }

+            else continue; /* ignore '\n' */

+            }

+        else {

+            if ((c >= 'A') && (c <= 'Z'))

+                b = (unsigned char)(c - 'A');

+            else if ((c >= 'a') && (c <= 'z'))

+                b = (unsigned char)(c - 'a') + 26;

+            else if ((c >= '0') && (c <= '9'))

+                b = (unsigned char)(c - '0') + 52;

+            else if (c == '+')

+                b = 62;

+            else if (c == '/')

+                b = 63;

+            else if (c == '=') {

+                b = 0;

+                pad++;

+            } else if ((c == ' ') || (c == '\t')) {

+                continue;

+            } else { /* error condition */

+                if (bytes) free(bytes);

+                else if (oldBytes) free(oldBytes);

+                // error recovery: skip until 2 adjacent newlines.

+                DBG_(("db: invalid character 0x%x '%c'\n", c,c));

+                if (c != EOF)  {

+                    c = lexGetc();

+                    while (c != EOF) {

+                        if (c == '\n' && lexLookahead() == '\n') {

+                            ++mime_lineNum;

+                            break;

+                            }

+                        c = lexGetc();

+                        }

+                    }

+                return NULL;

+                }

+            trip = (trip << 6) | b;

+            if (++quadIx == 4) {

+                unsigned char outBytes[3];

+                int numOut;

+                int i;

+                for (i = 0; i < 3; i++) {

+                    outBytes[2-i] = (unsigned char)(trip & 0xFF);

+                    trip >>= 8;

+                    }

+                numOut = 3 - pad;

+                if (bytesLen + numOut > bytesMax) {

+                    if (!bytes) {

+                        bytesMax = 1024;

+                        bytes = (unsigned char*)malloc((size_t)bytesMax);

+                        }

+                    else {

+                        bytesMax <<= 2;

+                        oldBytes = bytes;

+                        bytes = (unsigned char*)realloc(bytes,(size_t)bytesMax);

+                        }

+                    if (bytes == 0) {

+                        mime_error("out of memory while processing BASE64 data\n");

+                        }

+                    }

+                if (bytes) {

+                    memcpy(bytes + bytesLen, outBytes, numOut);

+                    bytesLen += numOut;

+                    }

+                trip = 0;

+                quadIx = 0;

+                }

+            }

+        } /* while */

+    DBG_(("db: bytesLen = %d\n",  bytesLen));

+    /* kludge: all this won't be necessary if we have tree form

+        representation */

+    if (bytes) {

+        setValueWithSize(curProp,bytes,(unsigned int)bytesLen);

+        free(bytes);

+        }

+    else if (oldBytes) {

+        setValueWithSize(curProp,oldBytes,(unsigned int)bytesLen);

+        free(oldBytes);

+        }

+    return 0;

+    }

+

+static int match_begin_end_name(int end) {

+    int token;

+    lexSkipWhite();

+    if (lexLookahead() != ':') return ID;

+    lexSkipLookahead();

+    lexSkipWhite();

+    token = match_begin_name(end);

+    if (token == ID) {

+        lexPushLookaheadc(':');

+        DBG_(("db: ID '%s'\n", yylval.str));

+        return ID;

+        }

+    else if (token != 0) {

+        lexSkipLookaheadWord();

+        deleteStr(yylval.str);

+        DBG_(("db: begin/end %d\n", token));

+        return token;

+        }

+    return 0;

+    }

+

+static char* lexGetQuotedPrintable()

+{

+    int c;

+    lexSkipWhite();

+    c = lexLookahead();

+    lexClearToken();

+

+    while (c != EOF && c != ';') {

+        if (c == '\n') {

+            // break, leave '\n' on remaining chars.

+            break;

+        } else if (c == '=') {

+            int cur = 0;

+            int next;

+

+            lexSkipLookahead(); // skip '='

+            next = lexLookahead();

+

+            if (next == '\n') {

+                // skip and only skip the \n

+                lexSkipLookahead(); 

+                c = lexLookahead();

+                ++mime_lineNum; // aid in error reporting

+                continue;

+            } else if (next >= '0' && next <= '9') {

+                cur = next - '0';

+            } else if (next >= 'A' && next <= 'F') {

+                cur = next - 'A' + 10;

+            } else {

+                // we have been sent buggy stuff. doesn't matter

+                // what we do so long as we keep going.

+                // should probably spit an error here

+                c = lexLookahead();

+                continue;

+            }

+

+            lexSkipLookahead(); // skip A-Z0-9

+            next = lexLookahead();

+

+            cur = cur * 16;

+            // this time really just expecting 0-9A-F

+            if (next >= '0' && next <= '9') {

+                cur += next - '0';

+            } else if (next >= 'A' && next <= 'F') {

+                cur += next - 'A' + 10;

+            } else {

+                // we have been sent buggy stuff. doesn't matter

+                // what we do so long as we keep going.

+                // should probably spit an error here

+                c = lexLookahead();

+                continue;

+            }

+

+            // got a valid escaped =.  append it.

+            lexSkipLookahead(); // skip second 0-9A-F

+            lexAppendc(cur);

+        } else {

+            lexSkipLookahead(); // skip whatever we just read.

+            lexAppendc(c); // and append it.

+        }

+        c = lexLookahead();

+    }

+    lexAppendc(0);

+    return c==EOF?0:lexStr();

+}

+

+static int yylex() {

+

+    int lexmode = LEXMODE();

+    if (lexmode == L_VALUES) {

+        int c = lexGetc();

+        if (c == ';') {

+            DBG_(("db: SEMICOLON\n"));

+            lexPushLookaheadc(c);

+            handleMoreRFC822LineBreak(c);

+            lexSkipLookahead();

+            return SEMICOLON;

+            }

+        else if (strchr("\n",c)) {

+            ++mime_lineNum;

+            /* consume all line separator(s) adjacent to each other */

+            c = lexLookahead();

+            while (strchr("\n",c)) {

+                lexSkipLookahead();

+                c = lexLookahead();

+                ++mime_lineNum;

+                }

+            DBG_(("db: LINESEP\n"));

+            return LINESEP;

+            }

+        else {

+            char *p = 0;

+            lexPushLookaheadc(c);

+            if (lexWithinMode(L_BASE64)) {

+                /* get each char and convert to bin on the fly... */

+                p = lexGetDataFromBase64();

+                yylval.str = p;

+                return STRING;

+                }

+            else if (lexWithinMode(L_QUOTED_PRINTABLE)) {

+                p = lexGetQuotedPrintable();

+                }

+            else {

+#ifdef _SUPPORT_LINE_FOLDING

+                p = lexGet1Value();

+#else

+                p = lexGetStrUntil(";\n");

+#endif

+                }

+            if (p) {

+                DBG_(("db: STRING: '%s'\n", p));

+                yylval.str = p;

+                return STRING;

+                }

+            else return 0;

+            }

+        }

+    else {

+        /* normal mode */

+        while (1) {

+            int c = lexGetc();

+            switch(c) {

+                case ':': {

+                    /* consume all line separator(s) adjacent to each other */

+                    /* ignoring linesep immediately after colon. */

+                    c = lexLookahead();

+                    while (strchr("\n",c)) {

+                        lexSkipLookahead();

+                        c = lexLookahead();

+                        ++mime_lineNum;

+                        }

+                    DBG_(("db: COLON\n"));

+                    return COLON;

+                    }

+                case ';':

+                    DBG_(("db: SEMICOLON\n"));

+                    return SEMICOLON;

+                case '=':

+                    DBG_(("db: EQ\n"));

+                    return EQ;

+                /* ignore whitespace in this mode */

+                case '\t':

+                case ' ': continue;

+                case '\n': {

+                    ++mime_lineNum;

+                    continue;

+                    }

+                case EOF: return 0;

+                    break;

+                default: {

+                    lexPushLookaheadc(c);

+                    if (isalnum(c)) {

+                        char *t = lexGetWord();

+                        yylval.str = t;

+                        if (!qstricmp(t, "begin")) {

+                            return match_begin_end_name(0);

+                            }

+                        else if (!qstricmp(t,"end")) {

+                            return match_begin_end_name(1);

+                            }

+                        else {

+                            DBG_(("db: ID '%s'\n", t));

+                            return ID;

+                            }

+                        }

+                    else {

+                        /* unknow token */

+                        return 0;

+                        }

+                    break;

+                    }

+                }

+            }

+        }

+    return 0;

+    }

+

+

+/***************************************************************************/

+        /***                                                    Public Functions                                        ****/

+/***************************************************************************/

+

+static VObject* Parse_MIMEHelper()

+    {

+    ObjStackTop = -1;

+    mime_numErrors = 0;

+    mime_lineNum = 1;

+    vObjList = 0;

+    curObj = 0;

+

+    if (yyparse() != 0)

+        return 0;

+

+    finiLex();

+    return vObjList;

+    }

+

+/*--------------------------------------------*/

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

+    {

+    initLex(input, len, 0);

+    return Parse_MIMEHelper();

+    }

+

+

+#if INCLUDEMFC

+

+DLLEXPORT(VObject*) Parse_MIME_FromFile(CFile *file)

+    {

+    unsigned long startPos;

+            VObject *result;

+

+    initLex(0,-1,file);

+    startPos = file->GetPosition();

+    if (!(result = Parse_MIMEHelper()))

+        file->Seek(startPos, CFile::begin);

+    return result;

+    }

+

+#else

+

+VObject* Parse_MIME_FromFile(FILE *file)

+    {

+            VObject *result;

+    long startPos;

+

+    initLex(0,(unsigned long)-1,file);

+    startPos = ftell(file);

+    if (!(result = Parse_MIMEHelper())) {

+        fseek(file,startPos,SEEK_SET);

+        }

+    return result;

+    }

+

+DLLEXPORT(VObject*) Parse_MIME_FromFileName(char *fname)

+    {

+    FILE *fp = fopen(fname,"r");

+    if (fp) {

+        VObject* o = Parse_MIME_FromFile(fp);

+        fclose(fp);

+        return o;

+        }

+    else {

+        char msg[80];

+        sprintf(msg, "can't open file '%s' for reading\n", fname);

+        mime_error_(msg);

+        return 0;

+        }

+    }

+

+#endif

+

+/*-------------------------------------*/

+

+static MimeErrorHandler mimeErrorHandler;

+

+DLLEXPORT(void) registerMimeErrorHandler(MimeErrorHandler me)

+    {

+    mimeErrorHandler = me;

+    }

+

+void mime_error(char *s)

+    {

+    char msg[256];

+    if (mimeErrorHandler) {

+        sprintf(msg,"%s at line %d", s, mime_lineNum);

+        mimeErrorHandler(msg);

+        }

+    }

+

+void mime_error_(char *s)

+    {

+    if (mimeErrorHandler) {

+        mimeErrorHandler(s);

+        }

+    }

+

diff --git a/library/backend/vcc_yacc.cpp b/library/backend/vcc_yacc.cpp
index cb24631..19a108f 100644
--- a/library/backend/vcc_yacc.cpp
+++ b/library/backend/vcc_yacc.cpp
@@ -1,3 +1,4 @@
 #ifndef lint
-        static char yysccsid[] = "@(#)yaccpar1.9 (Berkeley) 02/21/93";
+        /*static char yysccsid[] = "from: @(#)yaccpar1.9 (Berkeley) 02/21/93";*/
+static char yyrcsid[] = "$Id$";
 #endif
@@ -9,4 +10,28 @@ static char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
 #define YYRECOVERING (yyerrflag!=0)
-#define YYPREFIX "yy"
-#line 1 "vcc.y"
+#define yyparse vccparse
+#define yylex vcclex
+#define yyerror vccerror
+#define yychar vccchar
+#define yyval vccval
+#define yylval vcclval
+#define yydebug vccdebug
+#define yynerrs vccnerrs
+#define yyerrflag vccerrflag
+#define yyss vccss
+#define yyssp vccssp
+#define yyvs vccvs
+#define yyvsp vccvsp
+#define yylhs vcclhs
+#define yylen vcclen
+#define yydefred vccdefred
+#define yydgoto vccdgoto
+#define yysindex vccsindex
+#define yyrindex vccrindex
+#define yygindex vccgindex
+#define yytable vcctable
+#define yycheck vcccheck
+#define yyname vccname
+#define yyrule vccrule
+#define YYPREFIX "vcc"
+#line 1 "backend/vcc.y"
 

@@ -75,2 +100,3 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
 

+#if 0

 #define yyparse mime_parse

@@ -107,2 +133,3 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
 #define YYPREFIX "mime_"

+#endif

 

@@ -130,9 +157,7 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
 

-#ifdef PALMTOPCENTER
-#include <qpe/vobject_p.h>

-#include <qpe/qfiledirect_p.h>
-#else
+/*#ifdef PALMTOPCENTER
*/
+/*#include <qpe/vobject_p.h>
*/
+/*#else
*/
 #include "vobject_p.h"

-#include "qfiledirect_p.h"
-#endif
+/*#endif
*/
 

@@ -142,4 +167,3 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
         #define MAXTOKEN        256/* maximum token (line) length */

-        #define YYSTACKSIZE     100/* ~unref ?
-*/
+        #define YYSTACKSIZE     100/* ~unref ?
*/
         #define MAXLEVEL        10/* max # of nested objects parseable */

@@ -190,5 +214,7 @@ static void enterAttr(const char *s1, const char *s2);
 static void enterValues(const char *value);

+#define mime_error yyerror

+void mime_error(char *s);

 void mime_error_(char *s);

 

-#line 185 "vcc.y"
+#line 189 "backend/vcc.y"
 typedef union {

@@ -197,3 +223,3 @@ typedef union {
     } YYSTYPE;
-#line 196 "y.tab.c"
+#line 225 "y.tab.c"
 #define EQ 257
@@ -217,3 +243,3 @@ typedef union {
 #define YYERRCODE 256
-short yylhs[] = {                                        -1,
+short vcclhs[] = {                                        -1,
     0,    6,    6,    5,    5,    8,    3,    9,    3,    7,
@@ -224,3 +250,3 @@ short yylhs[] = {                                        -1,
 };
-short yylen[] = {                                         2,
+short vcclen[] = {                                         2,
     1,    2,    1,    1,    1,    0,    4,    0,    3,    2,
@@ -231,3 +257,3 @@ short yylen[] = {                                         2,
 };
-short yydefred[] = {                                      0,
+short vccdefred[] = {                                      0,
     0,    0,    0,    4,    5,    3,    0,    0,    0,    0,
@@ -239,3 +265,3 @@ short yydefred[] = {                                      0,
 };
-short yydgoto[] = {                                       3,
+short vccdgoto[] = {                                       3,
    15,   50,    4,    5,    6,    7,   22,    8,    9,   17,
@@ -244,3 +270,3 @@ short yydgoto[] = {                                       3,
 };
-short yysindex[] = {                                   -262,
+short vccsindex[] = {                                   -262,
     0,    0,    0,    0,    0,    0, -262, -252, -219, -249,
@@ -252,3 +278,3 @@ short yysindex[] = {                                   -262,
 };
-short yyrindex[] = {                                      0,
+short vccrindex[] = {                                      0,
  -222, -238,    0,    0,    0,    0,   65,    0,    0,    0,
@@ -260,3 +286,3 @@ short yyrindex[] = {                                      0,
 };
-short yygindex[] = {                                      0,
+short vccgindex[] = {                                      0,
     3,    0,    0,    0,   61,    0,   -7,    0,    0,  -16,
@@ -266,3 +292,3 @@ short yygindex[] = {                                      0,
 #define YYTABLESIZE 71
-short yytable[] = {                                      30,
+short vcctable[] = {                                      30,
    16,   13,    1,   13,    2,   30,   13,   37,   37,   28,
@@ -276,3 +302,3 @@ short yytable[] = {                                      30,
 };
-short yycheck[] = {                                      16,
+short vcccheck[] = {                                      16,
     8,  256,  265,  256,  267,   22,  256,  268,  269,  260,
@@ -292,3 +318,3 @@ short yycheck[] = {                                      16,
 #if YYDEBUG
-char *yyname[] = {
+char *vccname[] = {
 "end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -303,3 +329,3 @@ char *yyname[] = {
 };
-char *yyrule[] = {
+char *vccrule[] = {
 "$accept : mime",
@@ -374,3 +400,3 @@ YYSTYPE yyvs[YYSTACKSIZE];
 #define yystacksize YYSTACKSIZE
-#line 378 "vcc.y"
+#line 382 "backend/vcc.y"
 

@@ -513,3 +539,3 @@ static int lexWithinMode(enum LexMode mode) {
 

-static char lexGetc_()

+static int lexGetc_()

     {

@@ -927,3 +953,3 @@ static char* lexGetQuotedPrintable()
     {

-    char cur;

+    int cur;

 

@@ -969,3 +995,3 @@ static char* lexGetQuotedPrintable()
                 }

-            case (char)EOF:

+            case (int)EOF:

                 break;

@@ -975,3 +1001,3 @@ static char* lexGetQuotedPrintable()
             } /* switch */

-        } while (cur != (char)EOF);

+        } while (cur != (int)EOF);

 

@@ -1152,9 +1178,14 @@ DLLEXPORT(VObject*) Parse_MIME_FromFileName(char *fname)
     {

-        QFileDirect f( fname );

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

-                qWarning("Unable to open mime for reading %s", fname);

-                return 0;

+    FILE *fp = fopen(fname,"r");

+    if (fp) {

+        VObject* o = Parse_MIME_FromFile(fp);

+        fclose(fp);

+        return o;

+        }

+    else {

+        char msg[80];

+        sprintf(msg, "can't open file '%s' for reading\n", fname);

+        mime_error_(msg);

+        return 0;

         }

-

-    return Parse_MIME_FromFile( f.directHandle() );

     }

@@ -1188,3 +1219,3 @@ void mime_error_(char *s)
 

-#line 1192 "y.tab.c"
+#line 1221 "y.tab.c"
 #define YYABORT goto yyabort
@@ -1194,3 +1225,7 @@ void mime_error_(char *s)
 int
+#if defined(__STDC__)
+yyparse(void)
+#else
 yyparse()
+#endif
 {
@@ -1218,3 +1253,3 @@ yyparse()
 yyloop:
-    if (yyn = yydefred[yystate]) goto yyreduce;
+    if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
     if (yychar < 0)
@@ -1258,6 +1293,2 @@ yyloop:
     if (yyerrflag) goto yyinrecovery;
-#ifdef lint
-    goto yynewerror;
-#endif
-yynewerror:
     yyerror("syntax error");
@@ -1330,3 +1361,3 @@ yyreduce:
 case 2:
-#line 217 "vcc.y"
+#line 221 "backend/vcc.y"
 { addList(&vObjList, yyvsp[0].vobj); curObj = 0; }
@@ -1334,3 +1365,3 @@ break;
 case 3:
-#line 219 "vcc.y"
+#line 223 "backend/vcc.y"
 { addList(&vObjList, yyvsp[0].vobj); curObj = 0; }
@@ -1338,3 +1369,3 @@ break;
 case 6:
-#line 228 "vcc.y"
+#line 232 "backend/vcc.y"
 {

@@ -1345,3 +1376,3 @@ break;
 case 7:
-#line 233 "vcc.y"
+#line 237 "backend/vcc.y"
 {

@@ -1352,3 +1383,3 @@ break;
 case 8:
-#line 238 "vcc.y"
+#line 242 "backend/vcc.y"
 {

@@ -1359,3 +1390,3 @@ break;
 case 9:
-#line 243 "vcc.y"
+#line 247 "backend/vcc.y"
 {

@@ -1366,3 +1397,3 @@ break;
 case 12:
-#line 254 "vcc.y"
+#line 258 "backend/vcc.y"
 {

@@ -1372,3 +1403,3 @@ break;
 case 13:
-#line 258 "vcc.y"
+#line 262 "backend/vcc.y"
 {

@@ -1380,3 +1411,3 @@ break;
 case 15:
-#line 267 "vcc.y"
+#line 271 "backend/vcc.y"
 {

@@ -1386,3 +1417,3 @@ break;
 case 17:
-#line 272 "vcc.y"
+#line 276 "backend/vcc.y"
 {

@@ -1392,3 +1423,3 @@ break;
 case 21:
-#line 285 "vcc.y"
+#line 289 "backend/vcc.y"
 {

@@ -1398,3 +1429,3 @@ break;
 case 22:
-#line 289 "vcc.y"
+#line 293 "backend/vcc.y"
 {

@@ -1405,3 +1436,3 @@ break;
 case 24:
-#line 298 "vcc.y"
+#line 302 "backend/vcc.y"
 { enterValues(yyvsp[-1].str); }
@@ -1409,3 +1440,3 @@ break;
 case 26:
-#line 300 "vcc.y"
+#line 304 "backend/vcc.y"
 { enterValues(yyvsp[0].str); }
@@ -1413,3 +1444,3 @@ break;
 case 28:
-#line 305 "vcc.y"
+#line 309 "backend/vcc.y"
 { yyval.str = 0; }
@@ -1417,3 +1448,3 @@ break;
 case 29:
-#line 310 "vcc.y"
+#line 314 "backend/vcc.y"
 { if (!pushVObject(VCCalProp)) YYERROR; }
@@ -1421,3 +1452,3 @@ break;
 case 30:
-#line 313 "vcc.y"
+#line 317 "backend/vcc.y"
 { yyval.vobj = popVObject(); }
@@ -1425,3 +1456,3 @@ break;
 case 31:
-#line 315 "vcc.y"
+#line 319 "backend/vcc.y"
 { if (!pushVObject(VCCalProp)) YYERROR; }
@@ -1429,3 +1460,3 @@ break;
 case 32:
-#line 317 "vcc.y"
+#line 321 "backend/vcc.y"
 { yyval.vobj = popVObject(); }
@@ -1433,3 +1464,3 @@ break;
 case 38:
-#line 332 "vcc.y"
+#line 336 "backend/vcc.y"
 {

@@ -1440,3 +1471,3 @@ break;
 case 39:
-#line 338 "vcc.y"
+#line 342 "backend/vcc.y"
 {

@@ -1447,3 +1478,3 @@ break;
 case 40:
-#line 343 "vcc.y"
+#line 347 "backend/vcc.y"
 {

@@ -1454,3 +1485,3 @@ break;
 case 41:
-#line 348 "vcc.y"
+#line 352 "backend/vcc.y"
 {

@@ -1461,3 +1492,3 @@ break;
 case 42:
-#line 356 "vcc.y"
+#line 360 "backend/vcc.y"
 {

@@ -1468,3 +1499,3 @@ break;
 case 43:
-#line 362 "vcc.y"
+#line 366 "backend/vcc.y"
 {

@@ -1475,3 +1506,3 @@ break;
 case 44:
-#line 367 "vcc.y"
+#line 371 "backend/vcc.y"
 {

@@ -1482,3 +1513,3 @@ break;
 case 45:
-#line 372 "vcc.y"
+#line 376 "backend/vcc.y"
 {

@@ -1488,3 +1519,3 @@ case 45:
 break;
-#line 1492 "y.tab.c"
+#line 1521 "y.tab.c"
     }
diff --git a/library/backend/vobject.cpp b/library/backend/vobject.cpp
index 9c2ba3b..e6f6b78 100644
--- a/library/backend/vobject.cpp
+++ b/library/backend/vobject.cpp
@@ -1,1219 +1,1315 @@
-/***************************************************************************

-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             

-Business Machines Corporation and Siemens Rolm Communications Inc.             

-                                                                               

-For purposes of this license notice, the term Licensors shall mean,            

-collectively, Apple Computer, Inc., AT&T Corp., International                  

-Business Machines Corporation and Siemens Rolm Communications Inc.             

-The term Licensor shall mean any of the Licensors.                             

-                                                                               

-Subject to acceptance of the following conditions, permission is hereby        

-granted by Licensors without the need for written agreement and without        

-license or royalty fees, to use, copy, modify and distribute this              

-software for any purpose.                                                      

-                                                                               

-The above copyright notice and the following four paragraphs must be           

-reproduced in all copies of this software and any software including           

-this software.                                                                 

-                                                                               

-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       

-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       

-MODIFICATIONS.                                                                 

-                                                                               

-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              

-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         

-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         

-DAMAGE.                                                                        

-                                                                               

-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       

-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            

-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             

-PURPOSE.                                                                       

-

-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         

-disclosure by the government are subject to restrictions set forth in          

-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         

-

-***************************************************************************/

-

-/*

- * src: vobject.c

- * doc: vobject and APIs to construct vobject, APIs pretty print 

- * vobject, and convert a vobject into its textual representation.

- */

-

-        #ifndef MWERKS

-#include <malloc.h>

-#endif

-

-#include "vobject_p.h"

-#include "qfiledirect_p.h"

-#include <string.h>

-#include <stdio.h>

-#include <fcntl.h>

-//#include <io.h>

-

-

-        #define NAME_OF(o)                      o->id

-        #define VALUE_TYPE(o)           o->valType

-        #define STRINGZ_VALUE_OF(o)     o->val.strs

-        #define INTEGER_VALUE_OF(o)     o->val.i

-        #define LONG_VALUE_OF(o)        o->val.l

-        #define ANY_VALUE_OF(o)                 o->val.any

-        #define VOBJECT_VALUE_OF(o)     o->val.vobj

-

-typedef union ValueItem {

-    const char *strs;

-    unsigned int i;

-    unsigned long l;

-    void *any;

-    VObject *vobj;

-    } ValueItem;

-

-struct VObject {

-    VObject *next;

-    const char *id;

-    VObject *prop;

-    unsigned short valType;

-    ValueItem val;

-    };

-

-typedef struct StrItem StrItem;

-

-struct StrItem {

-    StrItem *next;

-    const char *s;

-    unsigned int refCnt;

-    };

-

-const char** fieldedProp;

-

-

-

-/*----------------------------------------------------------------------

-   The following functions involve with memory allocation:

-        newVObject

-        deleteVObject

-        dupStr

-        deleteStr

-        newStrItem

-        deleteStrItem

-   ----------------------------------------------------------------------*/

-

-DLLEXPORT(VObject*) newVObject_(const char *id)

-{

-    VObject *p = (VObject*)malloc(sizeof(VObject));

-    p->next = 0;

-    p->id = id;

-    p->prop = 0;

-    VALUE_TYPE(p) = 0;

-    ANY_VALUE_OF(p) = 0;

-    return p;

-}

-

-DLLEXPORT(VObject*) newVObject(const char *id)

-{

-    return newVObject_(lookupStr(id));

-}

-

-DLLEXPORT(void) deleteVObject(VObject *p)

-{

-    unUseStr(p->id);

-    free(p);

-}

-

-DLLEXPORT(char*) dupStr(const char *s, unsigned int size)

-{

-    char *t;

-    if  (size == 0) {

-        size = strlen(s);

-        }

-    t = (char*)malloc(size+1);

-    if (t) {

-        memcpy(t,s,size);

-        t[size] = 0;

-        return t;

-        }

-    else {

-        return (char*)0;

-        }

-}

-

-DLLEXPORT(void) deleteStr(const char *p)

-{

-    if (p) free((void*)p);

-}

-

-

-static StrItem* newStrItem(const char *s, StrItem *next)

-{

-    StrItem *p = (StrItem*)malloc(sizeof(StrItem));

-    p->next = next;

-    p->s = s;

-    p->refCnt = 1;

-    return p;

-}

-

-static void deleteStrItem(StrItem *p)

-{

-    free((void*)p);

-}

-

-

-/*----------------------------------------------------------------------

-  The following function provide accesses to VObject's value.

-  ----------------------------------------------------------------------*/

-

-DLLEXPORT(const char*) vObjectName(VObject *o)

-{

-    return NAME_OF(o);

-}

-

-DLLEXPORT(void) setVObjectName(VObject *o, const char* id)

-{

-    NAME_OF(o) = id;

-}

-

-DLLEXPORT(const char*) vObjectStringZValue(VObject *o)

-{

-    return STRINGZ_VALUE_OF(o);

-}

-

-DLLEXPORT(void) setVObjectStringZValue(VObject *o, const char *s)

-{

-    STRINGZ_VALUE_OF(o) = dupStr(s,0);

-    VALUE_TYPE(o) = VCVT_STRINGZ;

-}

-

-DLLEXPORT(void) setVObjectStringZValue_(VObject *o, const char *s)

-{

-    STRINGZ_VALUE_OF(o) = s;

-    VALUE_TYPE(o) = VCVT_STRINGZ;

-}

-

-DLLEXPORT(unsigned int) vObjectIntegerValue(VObject *o)

-{

-    return INTEGER_VALUE_OF(o);

-}

-

-DLLEXPORT(void) setVObjectIntegerValue(VObject *o, unsigned int i)

-{

-    INTEGER_VALUE_OF(o) = i;

-    VALUE_TYPE(o) = VCVT_UINT;

-}

-

-DLLEXPORT(unsigned long) vObjectLongValue(VObject *o)

-{

-    return LONG_VALUE_OF(o);

-}

-

-DLLEXPORT(void) setVObjectLongValue(VObject *o, unsigned long l)

-{

-    LONG_VALUE_OF(o) = l;

-    VALUE_TYPE(o) = VCVT_ULONG;

-}

-

-DLLEXPORT(void*) vObjectAnyValue(VObject *o)

-{

-    return ANY_VALUE_OF(o);

-}

-

-DLLEXPORT(void) setVObjectAnyValue(VObject *o, void *t)

-{

-    ANY_VALUE_OF(o) = t;

-    VALUE_TYPE(o) = VCVT_RAW;

-}

-

-DLLEXPORT(VObject*) vObjectVObjectValue(VObject *o)

-{

-    return VOBJECT_VALUE_OF(o);

-}

-

-DLLEXPORT(void) setVObjectVObjectValue(VObject *o, VObject *p)

-{

-    VOBJECT_VALUE_OF(o) = p;

-    VALUE_TYPE(o) = VCVT_VOBJECT;

-}

-

-DLLEXPORT(int) vObjectValueType(VObject *o)

-{

-    return VALUE_TYPE(o);

-}

-

-

-/*----------------------------------------------------------------------

-  The following functions can be used to build VObject.

-  ----------------------------------------------------------------------*/

-

-DLLEXPORT(VObject*) addVObjectProp(VObject *o, VObject *p)

-{

-    /* circular link list pointed to tail */

-    /*

-    o {next,id,prop,val}

-                V

-        pn {next,id,prop,val}

-             V

-            ...

-        p1 {next,id,prop,val}

-             V

-             pn

-    -->

-    o {next,id,prop,val}

-                V

-        pn {next,id,prop,val}

-             V

-        p {next,id,prop,val}

-            ...

-        p1 {next,id,prop,val}

-             V

-             pn

-    */

-

-    VObject *tail = o->prop;

-    if (tail) {

-        p->next = tail->next;

-        o->prop = tail->next = p;

-        }

-    else {

-        o->prop = p->next = p;

-        }

-    return p;

-}

-

-DLLEXPORT(VObject*) addProp(VObject *o, const char *id)

-{

-    return addVObjectProp(o,newVObject(id));

-}

-

-DLLEXPORT(VObject*) addProp_(VObject *o, const char *id)

-{

-    return addVObjectProp(o,newVObject_(id));

-}

-

-DLLEXPORT(void) addList(VObject **o, VObject *p)

-{

-    p->next = 0;

-    if (*o == 0) {

-        *o = p;

-        }

-    else {

-        VObject *t = *o;

-        while (t->next) {

-           t = t->next;

-           }

-        t->next = p;

-        }

-}

-

-DLLEXPORT(VObject*) nextVObjectInList(VObject *o)

-{

-    return o->next;

-}

-

-DLLEXPORT(VObject*) setValueWithSize_(VObject *prop, void *val, unsigned int size)

-{

-    VObject *sizeProp;

-    setVObjectAnyValue(prop, val);

-    sizeProp = addProp(prop,VCDataSizeProp);

-    setVObjectLongValue(sizeProp, size);

-    return prop;

-}

-

-DLLEXPORT(VObject*) setValueWithSize(VObject *prop, void *val, unsigned int size)

-{

-    void *p = dupStr((const char *)val,size);

-    return setValueWithSize_(prop,p,p?size:0);

-}

-

-DLLEXPORT(void) initPropIterator(VObjectIterator *i, VObject *o)

-{

-    i->start = o->prop; 

-    i->next = 0;

-}

-

-DLLEXPORT(void) initVObjectIterator(VObjectIterator *i, VObject *o)

-{

-    i->start = o->next; 

-    i->next = 0;

-}

-

-DLLEXPORT(int) moreIteration(VObjectIterator *i)

-{ 

-    return (i->start && (i->next==0 || i->next!=i->start));

-}

-

-DLLEXPORT(VObject*) nextVObject(VObjectIterator *i)

-{

-    if (i->start && i->next != i->start) {

-        if (i->next == 0) {

-            i->next = i->start->next;

-            return i->next;

-            }

-        else {

-            i->next = i->next->next;

-            return i->next;

-            }

-        }

-    else return (VObject*)0;

-}

-

-DLLEXPORT(VObject*) isAPropertyOf(VObject *o, const char *id)

-{

-    VObjectIterator i;

-    initPropIterator(&i,o);

-    while (moreIteration(&i)) {

-        VObject *each = nextVObject(&i);

-        if (!qstricmp(id,each->id))

-            return each;

-        }

-    return (VObject*)0;

-}

-

-DLLEXPORT(VObject*) addGroup(VObject *o, const char *g)

-{

-    /*

-        a.b.c

-        -->

-        prop(c)

-            prop(VCGrouping=b)

-                prop(VCGrouping=a)

-     */

-    char *dot = strrchr(g,'.');

-    if (dot) {

-        VObject *p, *t;

-        char *gs, *n = dot+1;

-                gs = dupStr(g,0);/* so we can write to it. */

-        /* used to be

-        * t = p = addProp_(o,lookupProp_(n));

-        */

-        t = p = addProp_(o,lookupProp(n));

-        dot = strrchr(gs,'.');

-        *dot = 0;

-        do {

-            dot = strrchr(gs,'.');

-            if (dot) {

-                n = dot+1;

-                *dot=0;

-                }

-            else

-                n = gs;

-            /* property(VCGroupingProp=n);

-                     *and the value may have VCGrouping property

-             */

-            t = addProp(t,VCGroupingProp);

-            setVObjectStringZValue(t,lookupProp_(n));

-            } while (n != gs);

-                deleteStr(gs);

-        return p;

-        }

-    else

-        return addProp_(o,lookupProp(g));

-}

-

-DLLEXPORT(VObject*) addPropValue(VObject *o, const char *p, const char *v)

-{

-    VObject *prop;

-    prop = addProp(o,p);

-    setVObjectStringZValue_(prop, strdup( v ) );

-    return prop;

-}

-

-DLLEXPORT(VObject*) addPropSizedValue_(VObject *o, const char *p, const char *v,

-        unsigned int size)

-{

-    VObject *prop;

-    prop = addProp(o,p);

-    setValueWithSize_(prop, (void*)v, size);

-    return prop;

-}

-

-DLLEXPORT(VObject*) addPropSizedValue(VObject *o, const char *p, const char *v,

-        unsigned int size)

-{

-    return addPropSizedValue_(o,p,dupStr(v,size),size);

-}

-

-

-DLLEXPORT(void) cleanVObject(VObject *o)

-{

-    if (o == 0) return;

-    if (o->prop) {

-        /* destroy time: cannot use the iterator here.

-           Have to break the cycle in the circular link

-           list and turns it into regular NULL-terminated

-           list -- since at some point of destruction,

-           the reference entry for the iterator to work

-           will not longer be valid.

-           */

-        VObject *p;

-        p = o->prop->next;

-        o->prop->next = 0;

-        do {

-           VObject *t = p->next;

-           cleanVObject(p);

-           p = t;

-           } while (p);

-        }

-    switch (VALUE_TYPE(o)) {

-        case VCVT_STRINGZ:

-        case VCVT_RAW:

-            // assume they are all allocated by malloc.

-            free((char*)STRINGZ_VALUE_OF(o));

-            break;

-        case VCVT_VOBJECT:

-            cleanVObject(VOBJECT_VALUE_OF(o));

-            break;

-        }

-    deleteVObject(o);

-}

-

-DLLEXPORT(void) cleanVObjects(VObject *list)

-{

-    while (list) {

-        VObject *t = list;

-        list = nextVObjectInList(list);

-        cleanVObject(t);

-        }

-}

-

-/*----------------------------------------------------------------------

-  The following is a String Table Facilities.

-  ----------------------------------------------------------------------*/

-

-#define STRTBLSIZE 255

-

-static StrItem *strTbl[STRTBLSIZE];

-

-static unsigned int hashStr(const char *s)

-{

-    unsigned int h = 0;

-    int i;

-    for (i=0;s[i];i++) {

-        h += s[i]*i;

-        }

-    return h % STRTBLSIZE;

-}

-

-DLLEXPORT(const char*) lookupStr(const char *s)

-{

-    StrItem *t;

-    unsigned int h = hashStr(s);

-    if ((t = strTbl[h]) != 0) {

-        do {

-            if (qstricmp(t->s,s) == 0) {

-                t->refCnt++;

-                return t->s;

-                }

-            t = t->next;

-            } while (t);

-        }

-    s = dupStr(s,0);

-    strTbl[h] = newStrItem(s,strTbl[h]);

-    return s;

-}

-

-DLLEXPORT(void) unUseStr(const char *s)

-{

-    StrItem *t, *p;

-    unsigned int h = hashStr(s);

-    if ((t = strTbl[h]) != 0) {

-        p = t;

-        do {

-            if (qstricmp(t->s,s) == 0) {

-                t->refCnt--;

-                if (t->refCnt == 0) {

-                    if (p == strTbl[h]) {

-                        strTbl[h] = t->next;

-                        }

-                    else {

-                        p->next = t->next;

-                        }

-                    deleteStr(t->s);

-                    deleteStrItem(t);

-                    return;

-                    }

-                }

-            p = t;

-            t = t->next;

-            } while (t);

-        }

-}

-

-DLLEXPORT(void) cleanStrTbl()

-{

-    int i;

-    for (i=0; i<STRTBLSIZE;i++) {

-        StrItem *t = strTbl[i];

-        while (t) {

-            StrItem *p;

-            deleteStr(t->s);

-            p = t;

-            t = t->next;

-            deleteStrItem(p);

-            } while (t);

-        strTbl[i] = 0;

-        }

-}

-

-

-struct PreDefProp {

-    const char *name;

-    const char *alias;

-    const char** fields;

-    unsigned int flags;

-    };

-

-/* flags in PreDefProp */

-        #define PD_BEGIN0x1

-        #define PD_INTERNAL0x2

-

-static const char *adrFields[] = {

-    VCPostalBoxProp,

-    VCExtAddressProp,

-    VCStreetAddressProp,

-    VCCityProp,

-    VCRegionProp,

-    VCPostalCodeProp,

-    VCCountryNameProp,

-    0

-};

-

-static const char *nameFields[] = {

-    VCFamilyNameProp,

-    VCGivenNameProp,

-    VCAdditionalNamesProp,

-    VCNamePrefixesProp,

-    VCNameSuffixesProp,

-    NULL

-    };

-

-static const char *orgFields[] = {

-    VCOrgNameProp,

-    VCOrgUnitProp,

-    VCOrgUnit2Prop,

-    VCOrgUnit3Prop,

-    VCOrgUnit4Prop,

-    NULL

-    };

-

-static const char *AAlarmFields[] = {

-    VCRunTimeProp,

-    VCSnoozeTimeProp,

-    VCRepeatCountProp,

-    VCAudioContentProp,

-    0

-    };

-

-/* ExDate -- has unamed fields */

-/* RDate -- has unamed fields */

-

-static const char *DAlarmFields[] = {

-    VCRunTimeProp,

-    VCSnoozeTimeProp,

-    VCRepeatCountProp,

-    VCDisplayStringProp,

-    0

-    };

-

-static const char *MAlarmFields[] = {

-    VCRunTimeProp,

-    VCSnoozeTimeProp,

-    VCRepeatCountProp,

-    VCEmailAddressProp,

-    VCNoteProp,

-    0

-    };

-

-static const char *PAlarmFields[] = {

-    VCRunTimeProp,

-    VCSnoozeTimeProp,

-    VCRepeatCountProp,

-    VCProcedureNameProp,

-    0

-    };

-

-static struct PreDefProp propNames[] = {

-    { VC7bitProp, 0, 0, 0 },

-    { VC8bitProp, 0, 0, 0 },

-    { VCAAlarmProp, 0, AAlarmFields, 0 },

-    { VCAdditionalNamesProp, 0, 0, 0 },

-    { VCAdrProp, 0, adrFields, 0 },

-    { VCAgentProp, 0, 0, 0 },

-    { VCAIFFProp, 0, 0, 0 },

-    { VCAOLProp, 0, 0, 0 },

-    { VCAppleLinkProp, 0, 0, 0 },

-    { VCAttachProp, 0, 0, 0 },

-    { VCAttendeeProp, 0, 0, 0 },

-    { VCATTMailProp, 0, 0, 0 },

-    { VCAudioContentProp, 0, 0, 0 },

-    { VCAVIProp, 0, 0, 0 },

-    { VCBase64Prop, 0, 0, 0 },

-    { VCBBSProp, 0, 0, 0 },

-    { VCBirthDateProp, 0, 0, 0 },

-    { VCBMPProp, 0, 0, 0 },

-    { VCBodyProp, 0, 0, 0 },

-    { VCBusinessRoleProp, 0, 0, 0 },

-    { VCCalProp, 0, 0, PD_BEGIN },

-    { VCCaptionProp, 0, 0, 0 },

-    { VCCardProp, 0, 0, PD_BEGIN },

-    { VCCarProp, 0, 0, 0 },

-    { VCCategoriesProp, 0, 0, 0 },

-    { VCCellularProp, 0, 0, 0 },

-    { VCCGMProp, 0, 0, 0 },

-    { VCCharSetProp, 0, 0, 0 },

-    { VCCIDProp, VCContentIDProp, 0, 0 },

-    { VCCISProp, 0, 0, 0 },

-    { VCCityProp, 0, 0, 0 },

-    { VCClassProp, 0, 0, 0 },

-    { VCCommentProp, 0, 0, 0 },

-    { VCCompletedProp, 0, 0, 0 },

-    { VCContentIDProp, 0, 0, 0 },

-    { VCCountryNameProp, 0, 0, 0 },

-    { VCDAlarmProp, 0, DAlarmFields, 0 },

-    { VCDataSizeProp, 0, 0, PD_INTERNAL },

-    { VCDayLightProp, 0, 0, 0 },

-    { VCDCreatedProp, 0, 0, 0 },

-    { VCDeliveryLabelProp, 0, 0, 0 },

-    { VCDescriptionProp, 0, 0, 0 },

-    { VCDIBProp, 0, 0, 0 },

-    { VCDisplayStringProp, 0, 0, 0 },

-    { VCDomesticProp, 0, 0, 0 },

-    { VCDTendProp, 0, 0, 0 },

-    { VCDTstartProp, 0, 0, 0 },

-    { VCDueProp, 0, 0, 0 },

-    { VCEmailAddressProp, 0, 0, 0 },

-    { VCEncodingProp, 0, 0, 0 },

-    { VCEndProp, 0, 0, 0 },

-    { VCEventProp, 0, 0, PD_BEGIN },

-    { VCEWorldProp, 0, 0, 0 },

-    { VCExNumProp, 0, 0, 0 },

-    { VCExpDateProp, 0, 0, 0 },

-    { VCExpectProp, 0, 0, 0 },

-    { VCExtAddressProp, 0, 0, 0 },

-    { VCFamilyNameProp, 0, 0, 0 },

-    { VCFaxProp, 0, 0, 0 },

-    { VCFullNameProp, 0, 0, 0 },

-    { VCGeoLocationProp, 0, 0, 0 },

-    { VCGeoProp, 0, 0, 0 },

-    { VCGIFProp, 0, 0, 0 },

-    { VCGivenNameProp, 0, 0, 0 },

-    { VCGroupingProp, 0, 0, 0 },

-    { VCHomeProp, 0, 0, 0 },

-    { VCIBMMailProp, 0, 0, 0 },

-    { VCInlineProp, 0, 0, 0 },

-    { VCInternationalProp, 0, 0, 0 },

-    { VCInternetProp, 0, 0, 0 },

-    { VCISDNProp, 0, 0, 0 },

-    { VCJPEGProp, 0, 0, 0 },

-    { VCLanguageProp, 0, 0, 0 },

-    { VCLastModifiedProp, 0, 0, 0 },

-    { VCLastRevisedProp, 0, 0, 0 },

-    { VCLocationProp, 0, 0, 0 },

-    { VCLogoProp, 0, 0, 0 },

-    { VCMailerProp, 0, 0, 0 },

-    { VCMAlarmProp, 0, MAlarmFields, 0 },

-    { VCMCIMailProp, 0, 0, 0 },

-    { VCMessageProp, 0, 0, 0 },

-    { VCMETProp, 0, 0, 0 },

-    { VCModemProp, 0, 0, 0 },

-    { VCMPEG2Prop, 0, 0, 0 },

-    { VCMPEGProp, 0, 0, 0 },

-    { VCMSNProp, 0, 0, 0 },

-    { VCNamePrefixesProp, 0, 0, 0 },

-    { VCNameProp, 0, nameFields, 0 },

-    { VCNameSuffixesProp, 0, 0, 0 },

-    { VCNoteProp, 0, 0, 0 },

-    { VCOrgNameProp, 0, 0, 0 },

-    { VCOrgProp, 0, orgFields, 0 },

-    { VCOrgUnit2Prop, 0, 0, 0 },

-    { VCOrgUnit3Prop, 0, 0, 0 },

-    { VCOrgUnit4Prop, 0, 0, 0 },

-    { VCOrgUnitProp, 0, 0, 0 },

-    { VCPagerProp, 0, 0, 0 },

-    { VCPAlarmProp, 0, PAlarmFields, 0 },

-    { VCParcelProp, 0, 0, 0 },

-    { VCPartProp, 0, 0, 0 },

-    { VCPCMProp, 0, 0, 0 },

-    { VCPDFProp, 0, 0, 0 },

-    { VCPGPProp, 0, 0, 0 },

-    { VCPhotoProp, 0, 0, 0 },

-    { VCPICTProp, 0, 0, 0 },

-    { VCPMBProp, 0, 0, 0 },

-    { VCPostalBoxProp, 0, 0, 0 },

-    { VCPostalCodeProp, 0, 0, 0 },

-    { VCPostalProp, 0, 0, 0 },

-    { VCPowerShareProp, 0, 0, 0 },

-    { VCPreferredProp, 0, 0, 0 },

-    { VCPriorityProp, 0, 0, 0 },

-    { VCProcedureNameProp, 0, 0, 0 },

-    { VCProdIdProp, 0, 0, 0 },

-    { VCProdigyProp, 0, 0, 0 },

-    { VCPronunciationProp, 0, 0, 0 },

-    { VCPSProp, 0, 0, 0 },

-    { VCPublicKeyProp, 0, 0, 0 },

-    { VCQPProp, VCQuotedPrintableProp, 0, 0 },

-    { VCQuickTimeProp, 0, 0, 0 },

-    { VCQuotedPrintableProp, 0, 0, 0 },

-    { VCRDateProp, 0, 0, 0 },

-    { VCRegionProp, 0, 0, 0 },

-    { VCRelatedToProp, 0, 0, 0 },

-    { VCRepeatCountProp, 0, 0, 0 },

-    { VCResourcesProp, 0, 0, 0 },

-    { VCRNumProp, 0, 0, 0 },

-    { VCRoleProp, 0, 0, 0 },

-    { VCRRuleProp, 0, 0, 0 },

-    { VCRSVPProp, 0, 0, 0 },

-    { VCRunTimeProp, 0, 0, 0 },

-    { VCSequenceProp, 0, 0, 0 },

-    { VCSnoozeTimeProp, 0, 0, 0 },

-    { VCStartProp, 0, 0, 0 },

-    { VCStatusProp, 0, 0, 0 },

-    { VCStreetAddressProp, 0, 0, 0 },

-    { VCSubTypeProp, 0, 0, 0 },

-    { VCSummaryProp, 0, 0, 0 },

-    { VCTelephoneProp, 0, 0, 0 },

-    { VCTIFFProp, 0, 0, 0 },

-    { VCTimeZoneProp, 0, 0, 0 },

-    { VCTitleProp, 0, 0, 0 },

-    { VCTLXProp, 0, 0, 0 },

-    { VCTodoProp, 0, 0, PD_BEGIN },

-    { VCTranspProp, 0, 0, 0 },

-    { VCUniqueStringProp, 0, 0, 0 },

-    { VCURLProp, 0, 0, 0 },

-    { VCURLValueProp, 0, 0, 0 },

-    { VCValueProp, 0, 0, 0 },

-    { VCVersionProp, 0, 0, 0 },

-    { VCVideoProp, 0, 0, 0 },

-    { VCVoiceProp, 0, 0, 0 },

-    { VCWAVEProp, 0, 0, 0 },

-    { VCWMFProp, 0, 0, 0 },

-    { VCWorkProp, 0, 0, 0 },

-    { VCX400Prop, 0, 0, 0 },

-    { VCX509Prop, 0, 0, 0 },

-    { VCXRuleProp, 0, 0, 0 },

-    { 0,0,0,0 }

-    };

-

-

-static struct PreDefProp* lookupPropInfo(const char* str)

-{

-    /* brute force for now, could use a hash table here. */

-    int i;

-        

-    for (i = 0; propNames[i].name; i++)

-        if (qstricmp(str, propNames[i].name) == 0) {

-            return &propNames[i];

-            }

-    

-    return 0;

-}

-

-

-DLLEXPORT(const char*) lookupProp_(const char* str)

-{

-    int i;

-        

-    for (i = 0; propNames[i].name; i++)

-        if (qstricmp(str, propNames[i].name) == 0) {

-            const char* s;

-            s = propNames[i].alias?propNames[i].alias:propNames[i].name;

-            return lookupStr(s);

-            }

-    return lookupStr(str);

-}

-

-

-DLLEXPORT(const char*) lookupProp(const char* str)

-{

-    int i;

-        

-    for (i = 0; propNames[i].name; i++)

-        if (qstricmp(str, propNames[i].name) == 0) {

-            const char *s;

-            fieldedProp = propNames[i].fields;

-            s = propNames[i].alias?propNames[i].alias:propNames[i].name;

-            return lookupStr(s);

-            }

-    fieldedProp = 0;

-    return lookupStr(str);

-}

-

-

-/*----------------------------------------------------------------------

-  APIs to Output text form.

-  ----------------------------------------------------------------------*/

-#define OFILE_REALLOC_SIZE 256

-typedef struct OFile {

-    FILE *fp;

-    char *s;

-    int len;

-    int limit;

-    int alloc:1;

-    int fail:1;

-    } OFile;

-

-#if 0

-static void appendsOFile(OFile *fp, const char *s)

-{

-    int slen;

-    if (fp->fail) return;

-    slen  = strlen(s);

-    if (fp->fp) {

-        fwrite(s,1,slen,fp->fp);

-        }

-    else {

-stuff:

-        if (fp->len + slen < fp->limit) {

-            memcpy(fp->s+fp->len,s,slen);

-            fp->len += slen;

-            return;

-            }

-        else if (fp->alloc) {

-            fp->limit = fp->limit + OFILE_REALLOC_SIZE;

-            if (OFILE_REALLOC_SIZE <= slen) fp->limit += slen;

-            fp->s = (char *) realloc(fp->s,fp->limit);

-            if (fp->s) goto stuff;

-            }

-        if (fp->alloc)

-            free(fp->s);

-        fp->s = 0;

-        fp->fail = 1;

-        }

-}

-

-static void appendcOFile(OFile *fp, char c)

-{

-    if (fp->fail) return;

-    if (fp->fp) {

-        fputc(c,fp->fp);

-        }

-    else {

-stuff:

-        if (fp->len+1 < fp->limit) {

-            fp->s[fp->len] = c;

-            fp->len++;

-            return;

-            }

-        else if (fp->alloc) {

-            fp->limit = fp->limit + OFILE_REALLOC_SIZE;

-            fp->s = (char *) realloc(fp->s,fp->limit);

-            if (fp->s) goto stuff;

-            }

-        if (fp->alloc)

-            free(fp->s);

-        fp->s = 0;

-        fp->fail = 1;

-        }

-}

-#else

-static void appendcOFile_(OFile *fp, char c)

-{

-    if (fp->fail) return;

-    if (fp->fp) {

-        fputc(c,fp->fp);

-        }

-    else {

-stuff:

-        if (fp->len+1 < fp->limit) {

-            fp->s[fp->len] = c;

-            fp->len++;

-            return;

-            }

-        else if (fp->alloc) {

-            fp->limit = fp->limit + OFILE_REALLOC_SIZE;

-            fp->s = (char *)realloc(fp->s,fp->limit);

-            if (fp->s) goto stuff;

-            }

-        if (fp->alloc)

-            free(fp->s);

-        fp->s = 0;

-        fp->fail = 1;

-        }

-}

-

-static void appendcOFile(OFile *fp, char c)

-{

-    if (c == '\n') {

-        /* write out as <CR><LF> */

-        appendcOFile_(fp,0xd);

-        appendcOFile_(fp,0xa);

-        }

-    else

-        appendcOFile_(fp,c);

-}

-

-static void appendsOFile(OFile *fp, const char *s)

-{

-    int i, slen;

-    slen  = strlen(s);

-    for (i=0; i<slen; i++) {

-        appendcOFile(fp,s[i]);

-        }

-}

-

-#endif

-

-static void initOFile(OFile *fp, FILE *ofp)

-{

-    fp->fp = ofp;

-    fp->s = 0;

-    fp->len = 0;

-    fp->limit = 0;

-    fp->alloc = 0;

-    fp->fail = 0;

-}

-

-static int writeBase64(OFile *fp, unsigned char *s, long len)

-{

-    long cur = 0;

-    int i, numQuads = 0;

-    unsigned long trip;

-    unsigned char b;

-    char quad[5];

-#define MAXQUADS 16

-

-    quad[4] = 0;

-

-    while (cur < len) {

-        // collect the triplet of bytes into 'trip'

-        trip = 0;

-        for (i = 0; i < 3; i++) {

-            b = (cur < len) ? *(s + cur) : 0;

-            cur++;

-            trip = trip << 8 | b;

-            }

-        // fill in 'quad' with the appropriate four characters

-        for (i = 3; i >= 0; i--) {

-            b = (unsigned char)(trip & 0x3F);

-            trip = trip >> 6;

-            if ((3 - i) < (cur - len))

-                quad[i] = '='; // pad char

-            else if (b < 26) quad[i] = (char)b + 'A';

-            else if (b < 52) quad[i] = (char)(b - 26) + 'a';

-            else if (b < 62) quad[i] = (char)(b - 52) + '0';

-            else if (b == 62) quad[i] = '+';

-            else quad[i] = '/';

-            }

-        // now output 'quad' with appropriate whitespace and line ending

-        appendsOFile(fp, (numQuads == 0 ? "    " : ""));

-        appendsOFile(fp, quad);

-        appendsOFile(fp, ((cur >= len)?"\n" :(numQuads==MAXQUADS-1?"\n" : "")));

-        numQuads = (numQuads + 1) % MAXQUADS;

-        }

-    appendcOFile(fp,'\n');

-

-    return 1;

-}

-

-static void writeQPString(OFile *fp, const char *s)

-{

-    const char *p = s;

-    while (*p) {

-        if (*p == '\n') {

-            if (p[1]) appendsOFile(fp,"=0A=");

-            }

-        appendcOFile(fp,*p);

-        p++;

-        }

-}

-

-

-

-static void writeVObject_(OFile *fp, VObject *o);

-

-static void writeValue(OFile *fp, VObject *o, unsigned long size)

-{

-    if (o == 0) return;

-    switch (VALUE_TYPE(o)) {

-        case VCVT_STRINGZ: {

-            writeQPString(fp, STRINGZ_VALUE_OF(o));

-            break;

-            }

-        case VCVT_UINT: {

-            char buf[16];

-            sprintf(buf,"%u", INTEGER_VALUE_OF(o));

-            appendsOFile(fp,buf);

-            break;

-            }

-        case VCVT_ULONG: {

-            char buf[16];

-            sprintf(buf,"%lu", LONG_VALUE_OF(o));

-            appendsOFile(fp,buf);

-            break;

-            }

-        case VCVT_RAW: {

-            appendcOFile(fp,'\n');

-            writeBase64(fp,(unsigned char*)(ANY_VALUE_OF(o)),size);

-            break;

-            }

-        case VCVT_VOBJECT:

-            appendcOFile(fp,'\n');

-            writeVObject_(fp,VOBJECT_VALUE_OF(o));

-            break;

-        }

-}

-

-static void writeAttrValue(OFile *fp, VObject *o)

-{

-    if (NAME_OF(o)) {

-        struct PreDefProp *pi;

-        pi = lookupPropInfo(NAME_OF(o));

-        if (pi && ((pi->flags & PD_INTERNAL) != 0)) return;

-        appendcOFile(fp,';');

-        appendsOFile(fp,NAME_OF(o));

-        }

-    else

-        appendcOFile(fp,';');

-    if (VALUE_TYPE(o)) {

-        appendcOFile(fp,'=');

-        writeValue(fp,o,0);

-        }

-}

-

-static void writeGroup(OFile *fp, VObject *o)

-{

-    char buf1[256];

-    char buf2[256];

-    strcpy(buf1,NAME_OF(o));

-    while ((o=isAPropertyOf(o,VCGroupingProp)) != 0) {

-        strcpy(buf2,STRINGZ_VALUE_OF(o));

-        strcat(buf2,".");

-        strcat(buf2,buf1);

-        strcpy(buf1,buf2);

-        }

-    appendsOFile(fp,buf1);

-}

-

-static int inList(const char **list, const char *s)

-{

-    if (list == 0) return 0;

-    while (*list) {

-        if (qstricmp(*list,s) == 0) return 1;

-        list++;

-        }

-    return 0;

-}

-

-static void writeProp(OFile *fp, VObject *o)

-{

-    if (NAME_OF(o)) {

-        struct PreDefProp *pi;

-        VObjectIterator t;

-        const char **fields_ = 0;

-        pi = lookupPropInfo(NAME_OF(o));

-        if (pi && ((pi->flags & PD_BEGIN) != 0)) {

-            writeVObject_(fp,o);

-            return;

-            }

-        if (isAPropertyOf(o,VCGroupingProp))

-            writeGroup(fp,o);

-        else

-            appendsOFile(fp,NAME_OF(o));

-        if (pi) fields_ = pi->fields;

-        initPropIterator(&t,o);

-        while (moreIteration(&t)) {

-            const char *s;

-            VObject *eachProp = nextVObject(&t);

-            s = NAME_OF(eachProp);

-            if (qstricmp(VCGroupingProp,s) && !inList(fields_,s))

-                writeAttrValue(fp,eachProp);

-            }

-        if (fields_) {

-            int i = 0, n = 0;

-            const char** fields = fields_;

-            /* output prop as fields */

-            appendcOFile(fp,':');

-            while (*fields) {

-                VObject *t = isAPropertyOf(o,*fields);

-                i++;

-                if (t) n = i;

-                fields++;

-                }

-            fields = fields_;

-            for (i=0;i<n;i++) {

-                writeValue(fp,isAPropertyOf(o,*fields),0);

-                fields++;

-                if (i<(n-1)) appendcOFile(fp,';');

-                }

-            }

-        }

-        

-    if (VALUE_TYPE(o)) {

-        unsigned long size = 0;

-        VObject *p = isAPropertyOf(o,VCDataSizeProp);

-        if (p) size = LONG_VALUE_OF(p);

-        appendcOFile(fp,':');

-        writeValue(fp,o,size);

-        }

-

-    appendcOFile(fp,'\n');

-}

-

-static void writeVObject_(OFile *fp, VObject *o)

-{

-    if (NAME_OF(o)) {

-        struct PreDefProp *pi;

-        pi = lookupPropInfo(NAME_OF(o));

-

-        if (pi && ((pi->flags & PD_BEGIN) != 0)) {

-            VObjectIterator t;

-            const char *begin = NAME_OF(o);

-            appendsOFile(fp,"BEGIN:");

-            appendsOFile(fp,begin);

-            appendcOFile(fp,'\n');

-            initPropIterator(&t,o);

-            while (moreIteration(&t)) {

-                VObject *eachProp = nextVObject(&t);

-                writeProp(fp, eachProp);

-                }

-            appendsOFile(fp,"END:");

-            appendsOFile(fp,begin);

-            appendsOFile(fp,"\n\n");

-            }

-        }

-}

-

-void writeVObject(FILE *fp, VObject *o)

-{

-    OFile ofp;

-    // #####

-    //_setmode(_fileno(fp), _O_BINARY);

-    initOFile(&ofp,fp);

-    writeVObject_(&ofp,o);

-}

-

-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

+/***************************************************************************
+(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
+Business Machines Corporation and Siemens Rolm Communications Inc.             
+                                                                               
+For purposes of this license notice, the term Licensors shall mean,            
+collectively, Apple Computer, Inc., AT&T Corp., International                  
+Business Machines Corporation and Siemens Rolm Communications Inc.             
+The term Licensor shall mean any of the Licensors.                             
+                                                                               
+Subject to acceptance of the following conditions, permission is hereby        
+granted by Licensors without the need for written agreement and without        
+license or royalty fees, to use, copy, modify and distribute this              
+software for any purpose.                                                      
+                                                                               
+The above copyright notice and the following four paragraphs must be           
+reproduced in all copies of this software and any software including           
+this software.                                                                 
+                                                                               
+THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
+ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
+MODIFICATIONS.                                                                 
+                                                                               
+IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
+INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
+OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
+DAMAGE.                                                                        
+                                                                               
+EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
+INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
+PURPOSE.                                                                       
+
+The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
+disclosure by the government are subject to restrictions set forth in          
+DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
+
+***************************************************************************/
+
+/*
+ * src: vobject.c
+ * doc: vobject and APIs to construct vobject, APIs pretty print 
+ * vobject, and convert a vobject into its textual representation.
+ */
+
+        #ifndef MWERKS
+#include <malloc.h>
+#endif
+
+#include "vobject_p.h"
+#include "qfiledirect_p.h"
+#include <string.h>
+#include <stdio.h>
+#include <fcntl.h>
+//#include <io.h>
+
+
+        #define NAME_OF(o)                      o->id
+        #define VALUE_TYPE(o)           o->valType
+        #define STRINGZ_VALUE_OF(o)     o->val.strs
+        #define INTEGER_VALUE_OF(o)     o->val.i
+        #define LONG_VALUE_OF(o)        o->val.l
+        #define ANY_VALUE_OF(o)                 o->val.any
+        #define VOBJECT_VALUE_OF(o)     o->val.vobj
+
+typedef union ValueItem {
+    const char *strs;
+    unsigned int i;
+    unsigned long l;
+    void *any;
+    VObject *vobj;
+    } ValueItem;
+
+struct VObject {
+    VObject *next;
+    const char *id;
+    VObject *prop;
+    unsigned short valType;
+    ValueItem val;
+    };
+
+typedef struct StrItem StrItem;
+
+struct StrItem {
+    StrItem *next;
+    const char *s;
+    unsigned int refCnt;
+    };
+
+const char** fieldedProp;
+
+
+
+/*----------------------------------------------------------------------
+   The following functions involve with memory allocation:
+        newVObject
+        deleteVObject
+        dupStr
+        deleteStr
+        newStrItem
+        deleteStrItem
+   ----------------------------------------------------------------------*/
+
+DLLEXPORT(VObject*) newVObject_(const char *id)
+{
+    VObject *p = (VObject*)malloc(sizeof(VObject));
+    p->next = 0;
+    p->id = id;
+    p->prop = 0;
+    VALUE_TYPE(p) = 0;
+    ANY_VALUE_OF(p) = 0;
+    return p;
+}
+
+DLLEXPORT(VObject*) newVObject(const char *id)
+{
+    return newVObject_(lookupStr(id));
+}
+
+DLLEXPORT(void) deleteVObject(VObject *p)
+{
+    unUseStr(p->id);
+    free(p);
+}
+
+DLLEXPORT(char*) dupStr(const char *s, unsigned int size)
+{
+    char *t;
+    if  (size == 0) {
+        size = strlen(s);
+        }
+    t = (char*)malloc(size+1);
+    if (t) {
+        memcpy(t,s,size);
+        t[size] = 0;
+        return t;
+        }
+    else {
+        return (char*)0;
+        }
+}
+
+DLLEXPORT(void) deleteStr(const char *p)
+{
+    if (p) free((void*)p);
+}
+
+
+static StrItem* newStrItem(const char *s, StrItem *next)
+{
+    StrItem *p = (StrItem*)malloc(sizeof(StrItem));
+    p->next = next;
+    p->s = s;
+    p->refCnt = 1;
+    return p;
+}
+
+static void deleteStrItem(StrItem *p)
+{
+    free((void*)p);
+}
+
+
+/*----------------------------------------------------------------------
+  The following function provide accesses to VObject's value.
+  ----------------------------------------------------------------------*/
+
+DLLEXPORT(const char*) vObjectName(VObject *o)
+{
+    return NAME_OF(o);
+}
+
+DLLEXPORT(void) setVObjectName(VObject *o, const char* id)
+{
+    NAME_OF(o) = id;
+}
+
+DLLEXPORT(const char*) vObjectStringZValue(VObject *o)
+{
+    return STRINGZ_VALUE_OF(o);
+}
+
+DLLEXPORT(void) setVObjectStringZValue(VObject *o, const char *s)
+{
+    STRINGZ_VALUE_OF(o) = dupStr(s,0);
+    VALUE_TYPE(o) = VCVT_STRINGZ;
+}
+
+DLLEXPORT(void) setVObjectStringZValue_(VObject *o, const char *s)
+{
+    STRINGZ_VALUE_OF(o) = s;
+    VALUE_TYPE(o) = VCVT_STRINGZ;
+}
+
+DLLEXPORT(unsigned int) vObjectIntegerValue(VObject *o)
+{
+    return INTEGER_VALUE_OF(o);
+}
+
+DLLEXPORT(void) setVObjectIntegerValue(VObject *o, unsigned int i)
+{
+    INTEGER_VALUE_OF(o) = i;
+    VALUE_TYPE(o) = VCVT_UINT;
+}
+
+DLLEXPORT(unsigned long) vObjectLongValue(VObject *o)
+{
+    return LONG_VALUE_OF(o);
+}
+
+DLLEXPORT(void) setVObjectLongValue(VObject *o, unsigned long l)
+{
+    LONG_VALUE_OF(o) = l;
+    VALUE_TYPE(o) = VCVT_ULONG;
+}
+
+DLLEXPORT(void*) vObjectAnyValue(VObject *o)
+{
+    return ANY_VALUE_OF(o);
+}
+
+DLLEXPORT(void) setVObjectAnyValue(VObject *o, void *t)
+{
+    ANY_VALUE_OF(o) = t;
+    VALUE_TYPE(o) = VCVT_RAW;
+}
+
+DLLEXPORT(VObject*) vObjectVObjectValue(VObject *o)
+{
+    return VOBJECT_VALUE_OF(o);
+}
+
+DLLEXPORT(void) setVObjectVObjectValue(VObject *o, VObject *p)
+{
+    VOBJECT_VALUE_OF(o) = p;
+    VALUE_TYPE(o) = VCVT_VOBJECT;
+}
+
+DLLEXPORT(int) vObjectValueType(VObject *o)
+{
+    return VALUE_TYPE(o);
+}
+
+
+/*----------------------------------------------------------------------
+  The following functions can be used to build VObject.
+  ----------------------------------------------------------------------*/
+
+DLLEXPORT(VObject*) addVObjectProp(VObject *o, VObject *p)
+{
+    /* circular link list pointed to tail */
+    /*
+    o {next,id,prop,val}
+                V
+        pn {next,id,prop,val}
+             V
+            ...
+        p1 {next,id,prop,val}
+             V
+             pn
+    -->
+    o {next,id,prop,val}
+                V
+        pn {next,id,prop,val}
+             V
+        p {next,id,prop,val}
+            ...
+        p1 {next,id,prop,val}
+             V
+             pn
+    */
+
+    VObject *tail = o->prop;
+    if (tail) {
+        p->next = tail->next;
+        o->prop = tail->next = p;
+        }
+    else {
+        o->prop = p->next = p;
+        }
+    return p;
+}
+
+DLLEXPORT(VObject*) addProp(VObject *o, const char *id)
+{
+    return addVObjectProp(o,newVObject(id));
+}
+
+DLLEXPORT(VObject*) addProp_(VObject *o, const char *id)
+{
+    return addVObjectProp(o,newVObject_(id));
+}
+
+DLLEXPORT(void) addList(VObject **o, VObject *p)
+{
+    p->next = 0;
+    if (*o == 0) {
+        *o = p;
+        }
+    else {
+        VObject *t = *o;
+        while (t->next) {
+           t = t->next;
+           }
+        t->next = p;
+        }
+}
+
+DLLEXPORT(VObject*) nextVObjectInList(VObject *o)
+{
+    return o->next;
+}
+
+DLLEXPORT(VObject*) setValueWithSize_(VObject *prop, void *val, unsigned int size)
+{
+    VObject *sizeProp;
+    setVObjectAnyValue(prop, val);
+    sizeProp = addProp(prop,VCDataSizeProp);
+    setVObjectLongValue(sizeProp, size);
+    return prop;
+}
+
+DLLEXPORT(VObject*) setValueWithSize(VObject *prop, void *val, unsigned int size)
+{
+    void *p = dupStr((const char *)val,size);
+    return setValueWithSize_(prop,p,p?size:0);
+}
+
+DLLEXPORT(void) initPropIterator(VObjectIterator *i, VObject *o)
+{
+    i->start = o->prop; 
+    i->next = 0;
+}
+
+DLLEXPORT(void) initVObjectIterator(VObjectIterator *i, VObject *o)
+{
+    i->start = o->next; 
+    i->next = 0;
+}
+
+DLLEXPORT(int) moreIteration(VObjectIterator *i)
+{ 
+    return (i->start && (i->next==0 || i->next!=i->start));
+}
+
+DLLEXPORT(VObject*) nextVObject(VObjectIterator *i)
+{
+    if (i->start && i->next != i->start) {
+        if (i->next == 0) {
+            i->next = i->start->next;
+            return i->next;
+            }
+        else {
+            i->next = i->next->next;
+            return i->next;
+            }
+        }
+    else return (VObject*)0;
+}
+
+DLLEXPORT(VObject*) isAPropertyOf(VObject *o, const char *id)
+{
+    VObjectIterator i;
+    initPropIterator(&i,o);
+    while (moreIteration(&i)) {
+        VObject *each = nextVObject(&i);
+        if (!qstricmp(id,each->id))
+            return each;
+        }
+    return (VObject*)0;
+}
+
+DLLEXPORT(VObject*) addGroup(VObject *o, const char *g)
+{
+    /*
+        a.b.c
+        -->
+        prop(c)
+            prop(VCGrouping=b)
+                prop(VCGrouping=a)
+     */
+    char *dot = strrchr(g,'.');
+    if (dot) {
+        VObject *p, *t;
+        char *gs, *n = dot+1;
+                gs = dupStr(g,0);/* so we can write to it. */
+        /* used to be
+        * t = p = addProp_(o,lookupProp_(n));
+        */
+        t = p = addProp_(o,lookupProp(n));
+        dot = strrchr(gs,'.');
+        *dot = 0;
+        do {
+            dot = strrchr(gs,'.');
+            if (dot) {
+                n = dot+1;
+                *dot=0;
+                }
+            else
+                n = gs;
+            /* property(VCGroupingProp=n);
+                     *and the value may have VCGrouping property
+             */
+            t = addProp(t,VCGroupingProp);
+            setVObjectStringZValue(t,lookupProp_(n));
+            } while (n != gs);
+                deleteStr(gs);
+        return p;
+        }
+    else
+        return addProp_(o,lookupProp(g));
+}
+
+DLLEXPORT(VObject*) addPropValue(VObject *o, const char *p, const char *v)
+{
+    VObject *prop;
+    prop = addProp(o,p);
+    setVObjectStringZValue_(prop, strdup( v ) );
+    return prop;
+}
+
+DLLEXPORT(VObject*) addPropSizedValue_(VObject *o, const char *p, const char *v,
+        unsigned int size)
+{
+    VObject *prop;
+    prop = addProp(o,p);
+    setValueWithSize_(prop, (void*)v, size);
+    return prop;
+}
+
+DLLEXPORT(VObject*) addPropSizedValue(VObject *o, const char *p, const char *v,
+        unsigned int size)
+{
+    return addPropSizedValue_(o,p,dupStr(v,size),size);
+}
+
+
+DLLEXPORT(void) cleanVObject(VObject *o)
+{
+    if (o == 0) return;
+    if (o->prop) {
+        /* destroy time: cannot use the iterator here.
+           Have to break the cycle in the circular link
+           list and turns it into regular NULL-terminated
+           list -- since at some point of destruction,
+           the reference entry for the iterator to work
+           will not longer be valid.
+           */
+        VObject *p;
+        p = o->prop->next;
+        o->prop->next = 0;
+        do {
+           VObject *t = p->next;
+           cleanVObject(p);
+           p = t;
+           } while (p);
+        }
+    switch (VALUE_TYPE(o)) {
+        case VCVT_STRINGZ:
+        case VCVT_RAW:
+            // assume they are all allocated by malloc.
+            free((char*)STRINGZ_VALUE_OF(o));
+            break;
+        case VCVT_VOBJECT:
+            cleanVObject(VOBJECT_VALUE_OF(o));
+            break;
+        }
+    deleteVObject(o);
+}
+
+DLLEXPORT(void) cleanVObjects(VObject *list)
+{
+    while (list) {
+        VObject *t = list;
+        list = nextVObjectInList(list);
+        cleanVObject(t);
+        }
+}
+
+/*----------------------------------------------------------------------
+  The following is a String Table Facilities.
+  ----------------------------------------------------------------------*/
+
+#define STRTBLSIZE 255
+
+static StrItem *strTbl[STRTBLSIZE];
+
+static unsigned int hashStr(const char *s)
+{
+    unsigned int h = 0;
+    int i;
+    for (i=0;s[i];i++) {
+        h += s[i]*i;
+        }
+    return h % STRTBLSIZE;
+}
+
+DLLEXPORT(const char*) lookupStr(const char *s)
+{
+    StrItem *t;
+    unsigned int h = hashStr(s);
+    if ((t = strTbl[h]) != 0) {
+        do {
+            if (qstricmp(t->s,s) == 0) {
+                t->refCnt++;
+                return t->s;
+                }
+            t = t->next;
+            } while (t);
+        }
+    s = dupStr(s,0);
+    strTbl[h] = newStrItem(s,strTbl[h]);
+    return s;
+}
+
+DLLEXPORT(void) unUseStr(const char *s)
+{
+    StrItem *t, *p;
+    unsigned int h = hashStr(s);
+    if ((t = strTbl[h]) != 0) {
+        p = t;
+        do {
+            if (qstricmp(t->s,s) == 0) {
+                t->refCnt--;
+                if (t->refCnt == 0) {
+                    if (p == strTbl[h]) {
+                        strTbl[h] = t->next;
+                        }
+                    else {
+                        p->next = t->next;
+                        }
+                    deleteStr(t->s);
+                    deleteStrItem(t);
+                    return;
+                    }
+                }
+            p = t;
+            t = t->next;
+            } while (t);
+        }
+}
+
+DLLEXPORT(void) cleanStrTbl()
+{
+    int i;
+    for (i=0; i<STRTBLSIZE;i++) {
+        StrItem *t = strTbl[i];
+        while (t) {
+            StrItem *p;
+            deleteStr(t->s);
+            p = t;
+            t = t->next;
+            deleteStrItem(p);
+            } while (t);
+        strTbl[i] = 0;
+        }
+}
+
+
+struct PreDefProp {
+    const char *name;
+    const char *alias;
+    const char** fields;
+    unsigned int flags;
+    };
+
+/* flags in PreDefProp */
+        #define PD_BEGIN0x1
+        #define PD_INTERNAL0x2
+
+static const char *adrFields[] = {
+    VCPostalBoxProp,
+    VCExtAddressProp,
+    VCStreetAddressProp,
+    VCCityProp,
+    VCRegionProp,
+    VCPostalCodeProp,
+    VCCountryNameProp,
+    0
+};
+
+static const char *nameFields[] = {
+    VCFamilyNameProp,
+    VCGivenNameProp,
+    VCAdditionalNamesProp,
+    VCNamePrefixesProp,
+    VCNameSuffixesProp,
+    NULL
+    };
+
+static const char *orgFields[] = {
+    VCOrgNameProp,
+    VCOrgUnitProp,
+    VCOrgUnit2Prop,
+    VCOrgUnit3Prop,
+    VCOrgUnit4Prop,
+    NULL
+    };
+
+static const char *AAlarmFields[] = {
+    VCRunTimeProp,
+    VCSnoozeTimeProp,
+    VCRepeatCountProp,
+    VCAudioContentProp,
+    0
+    };
+
+/* ExDate -- has unamed fields */
+/* RDate -- has unamed fields */
+
+static const char *DAlarmFields[] = {
+    VCRunTimeProp,
+    VCSnoozeTimeProp,
+    VCRepeatCountProp,
+    VCDisplayStringProp,
+    0
+    };
+
+static const char *MAlarmFields[] = {
+    VCRunTimeProp,
+    VCSnoozeTimeProp,
+    VCRepeatCountProp,
+    VCEmailAddressProp,
+    VCNoteProp,
+    0
+    };
+
+static const char *PAlarmFields[] = {
+    VCRunTimeProp,
+    VCSnoozeTimeProp,
+    VCRepeatCountProp,
+    VCProcedureNameProp,
+    0
+    };
+
+static struct PreDefProp propNames[] = {
+    { VC7bitProp, 0, 0, 0 },
+    { VC8bitProp, 0, 0, 0 },
+    { VCAAlarmProp, 0, AAlarmFields, 0 },
+    { VCAdditionalNamesProp, 0, 0, 0 },
+    { VCAdrProp, 0, adrFields, 0 },
+    { VCAgentProp, 0, 0, 0 },
+    { VCAIFFProp, 0, 0, 0 },
+    { VCAOLProp, 0, 0, 0 },
+    { VCAppleLinkProp, 0, 0, 0 },
+    { VCAttachProp, 0, 0, 0 },
+    { VCAttendeeProp, 0, 0, 0 },
+    { VCATTMailProp, 0, 0, 0 },
+    { VCAudioContentProp, 0, 0, 0 },
+    { VCAVIProp, 0, 0, 0 },
+    { VCBase64Prop, 0, 0, 0 },
+    { VCBBSProp, 0, 0, 0 },
+    { VCBirthDateProp, 0, 0, 0 },
+    { VCBMPProp, 0, 0, 0 },
+    { VCBodyProp, 0, 0, 0 },
+    { VCBusinessRoleProp, 0, 0, 0 },
+    { VCCalProp, 0, 0, PD_BEGIN },
+    { VCCaptionProp, 0, 0, 0 },
+    { VCCardProp, 0, 0, PD_BEGIN },
+    { VCCarProp, 0, 0, 0 },
+    { VCCategoriesProp, 0, 0, 0 },
+    { VCCellularProp, 0, 0, 0 },
+    { VCCGMProp, 0, 0, 0 },
+    { VCCharSetProp, 0, 0, 0 },
+    { VCCIDProp, VCContentIDProp, 0, 0 },
+    { VCCISProp, 0, 0, 0 },
+    { VCCityProp, 0, 0, 0 },
+    { VCClassProp, 0, 0, 0 },
+    { VCCommentProp, 0, 0, 0 },
+    { VCCompletedProp, 0, 0, 0 },
+    { VCContentIDProp, 0, 0, 0 },
+    { VCCountryNameProp, 0, 0, 0 },
+    { VCDAlarmProp, 0, DAlarmFields, 0 },
+    { VCDataSizeProp, 0, 0, PD_INTERNAL },
+    { VCDayLightProp, 0, 0, 0 },
+    { VCDCreatedProp, 0, 0, 0 },
+    { VCDeliveryLabelProp, 0, 0, 0 },
+    { VCDescriptionProp, 0, 0, 0 },
+    { VCDIBProp, 0, 0, 0 },
+    { VCDisplayStringProp, 0, 0, 0 },
+    { VCDomesticProp, 0, 0, 0 },
+    { VCDTendProp, 0, 0, 0 },
+    { VCDTstartProp, 0, 0, 0 },
+    { VCDueProp, 0, 0, 0 },
+    { VCEmailAddressProp, 0, 0, 0 },
+    { VCEncodingProp, 0, 0, 0 },
+    { VCEndProp, 0, 0, 0 },
+    { VCEventProp, 0, 0, PD_BEGIN },
+    { VCEWorldProp, 0, 0, 0 },
+    { VCExNumProp, 0, 0, 0 },
+    { VCExpDateProp, 0, 0, 0 },
+    { VCExpectProp, 0, 0, 0 },
+    { VCExtAddressProp, 0, 0, 0 },
+    { VCFamilyNameProp, 0, 0, 0 },
+    { VCFaxProp, 0, 0, 0 },
+    { VCFullNameProp, 0, 0, 0 },
+    { VCGeoLocationProp, 0, 0, 0 },
+    { VCGeoProp, 0, 0, 0 },
+    { VCGIFProp, 0, 0, 0 },
+    { VCGivenNameProp, 0, 0, 0 },
+    { VCGroupingProp, 0, 0, 0 },
+    { VCHomeProp, 0, 0, 0 },
+    { VCIBMMailProp, 0, 0, 0 },
+    { VCInlineProp, 0, 0, 0 },
+    { VCInternationalProp, 0, 0, 0 },
+    { VCInternetProp, 0, 0, 0 },
+    { VCISDNProp, 0, 0, 0 },
+    { VCJPEGProp, 0, 0, 0 },
+    { VCLanguageProp, 0, 0, 0 },
+    { VCLastModifiedProp, 0, 0, 0 },
+    { VCLastRevisedProp, 0, 0, 0 },
+    { VCLocationProp, 0, 0, 0 },
+    { VCLogoProp, 0, 0, 0 },
+    { VCMailerProp, 0, 0, 0 },
+    { VCMAlarmProp, 0, MAlarmFields, 0 },
+    { VCMCIMailProp, 0, 0, 0 },
+    { VCMessageProp, 0, 0, 0 },
+    { VCMETProp, 0, 0, 0 },
+    { VCModemProp, 0, 0, 0 },
+    { VCMPEG2Prop, 0, 0, 0 },
+    { VCMPEGProp, 0, 0, 0 },
+    { VCMSNProp, 0, 0, 0 },
+    { VCNamePrefixesProp, 0, 0, 0 },
+    { VCNameProp, 0, nameFields, 0 },
+    { VCNameSuffixesProp, 0, 0, 0 },
+    { VCNoteProp, 0, 0, 0 },
+    { VCOrgNameProp, 0, 0, 0 },
+    { VCOrgProp, 0, orgFields, 0 },
+    { VCOrgUnit2Prop, 0, 0, 0 },
+    { VCOrgUnit3Prop, 0, 0, 0 },
+    { VCOrgUnit4Prop, 0, 0, 0 },
+    { VCOrgUnitProp, 0, 0, 0 },
+    { VCPagerProp, 0, 0, 0 },
+    { VCPAlarmProp, 0, PAlarmFields, 0 },
+    { VCParcelProp, 0, 0, 0 },
+    { VCPartProp, 0, 0, 0 },
+    { VCPCMProp, 0, 0, 0 },
+    { VCPDFProp, 0, 0, 0 },
+    { VCPGPProp, 0, 0, 0 },
+    { VCPhotoProp, 0, 0, 0 },
+    { VCPICTProp, 0, 0, 0 },
+    { VCPMBProp, 0, 0, 0 },
+    { VCPostalBoxProp, 0, 0, 0 },
+    { VCPostalCodeProp, 0, 0, 0 },
+    { VCPostalProp, 0, 0, 0 },
+    { VCPowerShareProp, 0, 0, 0 },
+    { VCPreferredProp, 0, 0, 0 },
+    { VCPriorityProp, 0, 0, 0 },
+    { VCProcedureNameProp, 0, 0, 0 },
+    { VCProdIdProp, 0, 0, 0 },
+    { VCProdigyProp, 0, 0, 0 },
+    { VCPronunciationProp, 0, 0, 0 },
+    { VCPSProp, 0, 0, 0 },
+    { VCPublicKeyProp, 0, 0, 0 },
+    { VCQPProp, VCQuotedPrintableProp, 0, 0 },
+    { VCQuickTimeProp, 0, 0, 0 },
+    { VCQuotedPrintableProp, 0, 0, 0 },
+    { VCRDateProp, 0, 0, 0 },
+    { VCRegionProp, 0, 0, 0 },
+    { VCRelatedToProp, 0, 0, 0 },
+    { VCRepeatCountProp, 0, 0, 0 },
+    { VCResourcesProp, 0, 0, 0 },
+    { VCRNumProp, 0, 0, 0 },
+    { VCRoleProp, 0, 0, 0 },
+    { VCRRuleProp, 0, 0, 0 },
+    { VCRSVPProp, 0, 0, 0 },
+    { VCRunTimeProp, 0, 0, 0 },
+    { VCSequenceProp, 0, 0, 0 },
+    { VCSnoozeTimeProp, 0, 0, 0 },
+    { VCStartProp, 0, 0, 0 },
+    { VCStatusProp, 0, 0, 0 },
+    { VCStreetAddressProp, 0, 0, 0 },
+    { VCSubTypeProp, 0, 0, 0 },
+    { VCSummaryProp, 0, 0, 0 },
+    { VCTelephoneProp, 0, 0, 0 },
+    { VCTIFFProp, 0, 0, 0 },
+    { VCTimeZoneProp, 0, 0, 0 },
+    { VCTitleProp, 0, 0, 0 },
+    { VCTLXProp, 0, 0, 0 },
+    { VCTodoProp, 0, 0, PD_BEGIN },
+    { VCTranspProp, 0, 0, 0 },
+    { VCUniqueStringProp, 0, 0, 0 },
+    { VCURLProp, 0, 0, 0 },
+    { VCURLValueProp, 0, 0, 0 },
+    { VCValueProp, 0, 0, 0 },
+    { VCVersionProp, 0, 0, 0 },
+    { VCVideoProp, 0, 0, 0 },
+    { VCVoiceProp, 0, 0, 0 },
+    { VCWAVEProp, 0, 0, 0 },
+    { VCWMFProp, 0, 0, 0 },
+    { VCWorkProp, 0, 0, 0 },
+    { VCX400Prop, 0, 0, 0 },
+    { VCX509Prop, 0, 0, 0 },
+    { VCXRuleProp, 0, 0, 0 },
+    { 0,0,0,0 }
+    };
+
+
+static struct PreDefProp* lookupPropInfo(const char* str)
+{
+    /* brute force for now, could use a hash table here. */
+    int i;
+        
+    for (i = 0; propNames[i].name; i++)
+        if (qstricmp(str, propNames[i].name) == 0) {
+            return &propNames[i];
+            }
+    
+    return 0;
+}
+
+
+DLLEXPORT(const char*) lookupProp_(const char* str)
+{
+    int i;
+        
+    for (i = 0; propNames[i].name; i++)
+        if (qstricmp(str, propNames[i].name) == 0) {
+            const char* s;
+            s = propNames[i].alias?propNames[i].alias:propNames[i].name;
+            return lookupStr(s);
+            }
+    return lookupStr(str);
+}
+
+
+DLLEXPORT(const char*) lookupProp(const char* str)
+{
+    int i;
+        
+    for (i = 0; propNames[i].name; i++)
+        if (qstricmp(str, propNames[i].name) == 0) {
+            const char *s;
+            fieldedProp = propNames[i].fields;
+            s = propNames[i].alias?propNames[i].alias:propNames[i].name;
+            return lookupStr(s);
+            }
+    fieldedProp = 0;
+    return lookupStr(str);
+}
+
+
+/*----------------------------------------------------------------------
+  APIs to Output text form.
+  ----------------------------------------------------------------------*/
+#define OFILE_REALLOC_SIZE 256
+typedef struct OFile {
+    FILE *fp;
+    char *s;
+    int len;
+    int limit;
+    int alloc:1;
+    int fail:1;
+    } OFile;
+
+#if 0
+static void appendsOFile(OFile *fp, const char *s)
+{
+    int slen;
+    if (fp->fail) return;
+    slen  = strlen(s);
+    if (fp->fp) {
+        fwrite(s,1,slen,fp->fp);
+        }
+    else {
+stuff:
+        if (fp->len + slen < fp->limit) {
+            memcpy(fp->s+fp->len,s,slen);
+            fp->len += slen;
+            return;
+            }
+        else if (fp->alloc) {
+            fp->limit = fp->limit + OFILE_REALLOC_SIZE;
+            if (OFILE_REALLOC_SIZE <= slen) fp->limit += slen;
+            fp->s = (char *) realloc(fp->s,fp->limit);
+            if (fp->s) goto stuff;
+            }
+        if (fp->alloc)
+            free(fp->s);
+        fp->s = 0;
+        fp->fail = 1;
+        }
+}
+
+static void appendcOFile(OFile *fp, char c)
+{
+    if (fp->fail) return;
+    if (fp->fp) {
+        fputc(c,fp->fp);
+        }
+    else {
+stuff:
+        if (fp->len+1 < fp->limit) {
+            fp->s[fp->len] = c;
+            fp->len++;
+            return;
+            }
+        else if (fp->alloc) {
+            fp->limit = fp->limit + OFILE_REALLOC_SIZE;
+            fp->s = (char *) realloc(fp->s,fp->limit);
+            if (fp->s) goto stuff;
+            }
+        if (fp->alloc)
+            free(fp->s);
+        fp->s = 0;
+        fp->fail = 1;
+        }
+}
+#else
+static void appendcOFile_(OFile *fp, char c)
+{
+    if (fp->fail) return;
+    if (fp->fp) {
+        fputc(c,fp->fp);
+        }
+    else {
+stuff:
+        if (fp->len+1 < fp->limit) {
+            fp->s[fp->len] = c;
+            fp->len++;
+            return;
+            }
+        else if (fp->alloc) {
+            fp->limit = fp->limit + OFILE_REALLOC_SIZE;
+            fp->s = (char *)realloc(fp->s,fp->limit);
+            if (fp->s) goto stuff;
+            }
+        if (fp->alloc)
+            free(fp->s);
+        fp->s = 0;
+        fp->fail = 1;
+        }
+}
+
+static void appendcOFile(OFile *fp, char c)
+{
+    if (c == '\n') {
+        /* write out as <CR><LF> */
+        appendcOFile_(fp,0xd);
+        appendcOFile_(fp,0xa);
+        }
+    else
+        appendcOFile_(fp,c);
+}
+
+static void appendsOFile(OFile *fp, const char *s)
+{
+    int i, slen;
+    slen  = strlen(s);
+    for (i=0; i<slen; i++) {
+        appendcOFile(fp,s[i]);
+        }
+}
+
+#endif
+
+static void initOFile(OFile *fp, FILE *ofp)
+{
+    fp->fp = ofp;
+    fp->s = 0;
+    fp->len = 0;
+    fp->limit = 0;
+    fp->alloc = 0;
+    fp->fail = 0;
+}
+
+static int writeBase64(OFile *fp, unsigned char *s, long len)
+{
+    long cur = 0;
+    int i, numQuads = 0;
+    unsigned long trip;
+    unsigned char b;
+    char quad[5];
+#define MAXQUADS 16
+
+    quad[4] = 0;
+
+    while (cur < len) {
+        // collect the triplet of bytes into 'trip'
+        trip = 0;
+        for (i = 0; i < 3; i++) {
+            b = (cur < len) ? *(s + cur) : 0;
+            cur++;
+            trip = trip << 8 | b;
+            }
+        // fill in 'quad' with the appropriate four characters
+        for (i = 3; i >= 0; i--) {
+            b = (unsigned char)(trip & 0x3F);
+            trip = trip >> 6;
+            if ((3 - i) < (cur - len))
+                quad[i] = '='; // pad char
+            else if (b < 26) quad[i] = (char)b + 'A';
+            else if (b < 52) quad[i] = (char)(b - 26) + 'a';
+            else if (b < 62) quad[i] = (char)(b - 52) + '0';
+            else if (b == 62) quad[i] = '+';
+            else quad[i] = '/';
+            }
+        // now output 'quad' with appropriate whitespace and line ending
+        appendsOFile(fp, (numQuads == 0 ? "    " : ""));
+        appendsOFile(fp, quad);
+        appendsOFile(fp, ((cur >= len)?"\n" :(numQuads==MAXQUADS-1?"\n" : "")));
+        numQuads = (numQuads + 1) % MAXQUADS;
+        }
+    appendcOFile(fp,'\n');
+
+    return 1;
+}
+
+static const char *replaceChar(unsigned char c) 
+{
+    if (c == '\n') {
+        return "=0A=\n";
+    } else if (
+            (c >= 'A' && c <= 'Z') 
+            ||
+            (c >= 'a' && c <= 'z') 
+            ||
+            (c >= '0' && c <= '9') 
+            ||
+            (c >= '\'' && c <= ')') 
+            ||
+            (c >= '+' && c <= '-') 
+            ||
+            (c == '/')
+            ||
+            (c == '?') 
+            ||
+            (c == ' ')) 
+    { 
+        return 0;
+    }
+
+    static char trans[4];
+    trans[0] = '=';
+    trans[3] = '\0';
+    int rem = c % 16;
+    int div = c / 16;
+
+    if (div < 10)
+        trans[1] = '0' + div;
+    else
+        trans[1] = 'A' + (div - 10);
+
+    if (rem < 10)
+        trans[2] = '0' + rem;
+    else
+        trans[2] = 'A' + (rem - 10);
+
+    return trans;
+}
+
+static void writeQPString(OFile *fp, const char *s)
+{
+    /*
+        only A-Z, 0-9 and 
+       "'"  (ASCII code 39)
+       "("  (ASCII code 40)
+       ")"  (ASCII code 41)
+       "+"  (ASCII code 43)
+       ","  (ASCII code 44)
+       "-"  (ASCII code 45)
+       "/"  (ASCII code 47)
+       "?"  (ASCII code 63)
+       
+       should remain un-encoded.
+       '=' needs to be encoded as it is the escape character.
+       ';' needs to be as it is a field separator.
+
+     */
+    const char *p = s;
+    while (*p) {
+        const char *rep = replaceChar(*p);
+        if (rep)
+            appendsOFile(fp, rep);
+        else
+            appendcOFile(fp, *p);
+        p++;
+    }
+}
+
+static bool includesUnprintable(VObject *o)
+{
+    if (o) {
+        if (VALUE_TYPE(o) == VCVT_STRINGZ) {
+            const char *p = STRINGZ_VALUE_OF(o);
+            if (p) {
+                while (*p) {
+                    if (replaceChar(*p))
+                        return TRUE;
+                    p++;
+                }
+            }
+        }
+    }
+    return FALSE;
+}
+            
+static void writeVObject_(OFile *fp, VObject *o);
+
+static void writeValue(OFile *fp, VObject *o, unsigned long size)
+{
+    if (o == 0) return;
+    switch (VALUE_TYPE(o)) {
+        case VCVT_STRINGZ: {
+            writeQPString(fp, STRINGZ_VALUE_OF(o));
+            break;
+            }
+        case VCVT_UINT: {
+            char buf[16];
+            sprintf(buf,"%u", INTEGER_VALUE_OF(o));
+            appendsOFile(fp,buf);
+            break;
+            }
+        case VCVT_ULONG: {
+            char buf[16];
+            sprintf(buf,"%lu", LONG_VALUE_OF(o));
+            appendsOFile(fp,buf);
+            break;
+            }
+        case VCVT_RAW: {
+            appendcOFile(fp,'\n');
+            writeBase64(fp,(unsigned char*)(ANY_VALUE_OF(o)),size);
+            break;
+            }
+        case VCVT_VOBJECT:
+            appendcOFile(fp,'\n');
+            writeVObject_(fp,VOBJECT_VALUE_OF(o));
+            break;
+        }
+}
+
+static void writeAttrValue(OFile *fp, VObject *o)
+{
+    if (NAME_OF(o)) {
+        struct PreDefProp *pi;
+        pi = lookupPropInfo(NAME_OF(o));
+        if (pi && ((pi->flags & PD_INTERNAL) != 0)) return;
+        if ( includesUnprintable(o) ) {
+            appendsOFile(fp, ";" VCEncodingProp "=" VCQuotedPrintableProp);
+            appendsOFile(fp, ";" VCCharSetProp "=" "UTF-8");
+        }
+        appendcOFile(fp,';');
+        appendsOFile(fp,NAME_OF(o));
+        }
+    else
+        appendcOFile(fp,';');
+    if (VALUE_TYPE(o)) {
+        appendcOFile(fp,'=');
+        writeValue(fp,o,0);
+        }
+}
+
+static void writeGroup(OFile *fp, VObject *o)
+{
+    char buf1[256];
+    char buf2[256];
+    strcpy(buf1,NAME_OF(o));
+    while ((o=isAPropertyOf(o,VCGroupingProp)) != 0) {
+        strcpy(buf2,STRINGZ_VALUE_OF(o));
+        strcat(buf2,".");
+        strcat(buf2,buf1);
+        strcpy(buf1,buf2);
+        }
+    appendsOFile(fp,buf1);
+}
+
+static int inList(const char **list, const char *s)
+{
+    if (list == 0) return 0;
+    while (*list) {
+        if (qstricmp(*list,s) == 0) return 1;
+        list++;
+        }
+    return 0;
+}
+
+static void writeProp(OFile *fp, VObject *o)
+{
+    if (NAME_OF(o)) {
+        struct PreDefProp *pi;
+        VObjectIterator t;
+        const char **fields_ = 0;
+        pi = lookupPropInfo(NAME_OF(o));
+        if (pi && ((pi->flags & PD_BEGIN) != 0)) {
+            writeVObject_(fp,o);
+            return;
+            }
+        if (isAPropertyOf(o,VCGroupingProp))
+            writeGroup(fp,o);
+        else
+            appendsOFile(fp,NAME_OF(o));
+        if (pi) fields_ = pi->fields;
+        initPropIterator(&t,o);
+        while (moreIteration(&t)) {
+            const char *s;
+            VObject *eachProp = nextVObject(&t);
+            s = NAME_OF(eachProp);
+            if (qstricmp(VCGroupingProp,s) && !inList(fields_,s))
+                writeAttrValue(fp,eachProp);
+            }
+        if (fields_) {
+            int i = 0, n = 0;
+            const char** fields = fields_;
+            /* output prop as fields */
+            bool printable = TRUE;
+            while (*fields && printable) {
+                VObject *t = isAPropertyOf(o,*fields);
+                if (includesUnprintable(t))
+                    printable = FALSE;
+                fields++;
+            }
+            fields = fields_;
+            if (!printable) {
+                appendsOFile(fp, ";" VCEncodingProp "=" VCQuotedPrintableProp);
+                appendsOFile(fp, ";" VCCharSetProp "=" "UTF-8");
+            }
+            appendcOFile(fp,':');
+            while (*fields) {
+                VObject *t = isAPropertyOf(o,*fields);
+                i++;
+                if (t) n = i;
+                fields++;
+            }
+            fields = fields_;
+            for (i=0;i<n;i++) {
+                writeValue(fp,isAPropertyOf(o,*fields),0);
+                fields++;
+                if (i<(n-1)) appendcOFile(fp,';');
+            }
+            }
+        }
+
+        
+    if (VALUE_TYPE(o)) {
+            if ( includesUnprintable(o) ) {
+            appendsOFile(fp, ";" VCEncodingProp "=" VCQuotedPrintableProp);
+            appendsOFile(fp, ";" VCCharSetProp "=" "UTF-8");
+        }
+        unsigned long size = 0;
+        VObject *p = isAPropertyOf(o,VCDataSizeProp);
+        if (p) size = LONG_VALUE_OF(p);
+        appendcOFile(fp,':');
+        writeValue(fp,o,size);
+        }
+
+    appendcOFile(fp,'\n');
+}
+
+static void writeVObject_(OFile *fp, VObject *o)
+{
+    if (NAME_OF(o)) {
+        struct PreDefProp *pi;
+        pi = lookupPropInfo(NAME_OF(o));
+
+        if (pi && ((pi->flags & PD_BEGIN) != 0)) {
+            VObjectIterator t;
+            const char *begin = NAME_OF(o);
+            appendsOFile(fp,"BEGIN:");
+            appendsOFile(fp,begin);
+            appendcOFile(fp,'\n');
+            initPropIterator(&t,o);
+            while (moreIteration(&t)) {
+                VObject *eachProp = nextVObject(&t);
+                writeProp(fp, eachProp);
+                }
+            appendsOFile(fp,"END:");
+            appendsOFile(fp,begin);
+            appendsOFile(fp,"\n\n");
+            }
+        }
+}
+
+void writeVObject(FILE *fp, VObject *o)
+{
+    OFile ofp;
+    // #####
+    //_setmode(_fileno(fp), _O_BINARY);
+    initOFile(&ofp,fp);
+    writeVObject_(&ofp,o);
+}
+
+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 a0d921e..0d0a2a8 100644
--- a/library/backend/vobject_p.h
+++ b/library/backend/vobject_p.h
@@ -1,404 +1,406 @@
-/***************************************************************************

-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International

-Business Machines Corporation and Siemens Rolm Communications Inc.

-

-For purposes of this license notice, the term Licensors shall mean,

-collectively, Apple Computer, Inc., AT&T Corp., International

-Business Machines Corporation and Siemens Rolm Communications Inc.

-The term Licensor shall mean any of the Licensors.

-

-Subject to acceptance of the following conditions, permission is hereby

-granted by Licensors without the need for written agreement and without

-license or royalty fees, to use, copy, modify and distribute this

-software for any purpose.

-

-The above copyright notice and the following four paragraphs must be

-reproduced in all copies of this software and any software including

-this software.

-

-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE

-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR

-MODIFICATIONS.

-

-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,

-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT

-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH

-DAMAGE.

-

-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,

-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE

-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

-PURPOSE.

-

-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or

-disclosure by the government are subject to restrictions set forth in

-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.

-

-***************************************************************************/

-

-/*

-

-The vCard/vCalendar C interface is implemented in the set

-of files as follows:

-

-vcc.y, yacc source, and vcc.c, the yacc output you will use

-implements the core parser

-

-vobject.c implements an API that insulates the caller from

-the parser and changes in the vCard/vCalendar BNF

-

-port.h defines compilation environment dependent stuff

-

-vcc.h and vobject.h are header files for their .c counterparts

-

-vcaltmp.h and vcaltmp.c implement vCalendar "macro" functions

-which you may find useful.

-

-test.c is a standalone test driver that exercises some of

-the features of the APIs provided. Invoke test.exe on a

-VCARD/VCALENDAR input text file and you will see the pretty

-print output of the internal representation (this pretty print

-output should give you a good idea of how the internal

-representation looks like -- there is one such output in the

-following too). Also, a file with the .out suffix is generated

-to show that the internal representation can be written back

-in the original text format.

-

-For more information on this API see the readme.txt file

-which accompanied this distribution.

-

-  Also visit:

-

-                http://www.versit.com

-                http://www.ralden.com

-

-*/

-

-

-#ifndef __VOBJECT_H__

-#define __VOBJECT_H__ 1

-

-#include <qstring.h>

-

-        #define         vCardClipboardFormat    "+//ISBN 1-887687-00-9::versit::PDI//vCard"

-        #define         vCalendarClipboardFormat"+//ISBN 1-887687-00-9::versit::PDI//vCalendar"

-

-/* The above strings vCardClipboardFormat and vCalendarClipboardFormat

-are globally unique IDs which can be used to generate clipboard format

-ID's as per the requirements of a specific platform. For example, in

-Windows they are used as the parameter in a call to RegisterClipboardFormat.

-For example:

-

-  CLIPFORMAT foo = RegisterClipboardFormat(vCardClipboardFormat);

-

-*/

-

-        #define vCardMimeType   "text/x-vCard"

-        #define vCalendarMimeType"text/x-vCalendar"

-

-#undef DLLEXPORT

-#include <qglobal.h>

-#if defined(Q_WS_WIN)

-#define DLLEXPORT(t)   __declspec(dllexport) t

-#else

-#define DLLEXPORT(t)   t

-#endif

-

-#ifndef FALSE

-        #define FALSE0

-#endif

-#ifndef TRUE

-        #define TRUE1

-#endif

-

-#include <stdlib.h>

-#include <stdio.h>

-

-

-        #define VC7bitProp                      "7BIT"

-        #define VC8bitProp                      "8BIT"

-        #define VCAAlarmProp            "AALARM"

-        #define VCAdditionalNamesProp"ADDN"

-        #define VCAdrProp                       "ADR"

-        #define VCAgentProp                     "AGENT"

-        #define VCAIFFProp                      "AIFF"

-        #define VCAOLProp                       "AOL"

-        #define VCAppleLinkProp                 "APPLELINK"

-        #define VCAttachProp            "ATTACH"

-        #define VCAttendeeProp          "ATTENDEE"

-        #define VCATTMailProp           "ATTMAIL"

-        #define VCAudioContentProp      "AUDIOCONTENT"

-        #define VCAVIProp                       "AVI"

-        #define VCBase64Prop            "BASE64"

-        #define VCBBSProp                       "BBS"

-        #define VCBirthDateProp                 "BDAY"

-        #define VCBMPProp                       "BMP"

-        #define VCBodyProp                      "BODY"

-        #define VCBusinessRoleProp      "ROLE"

-        #define VCCalProp                       "VCALENDAR"

-        #define VCCaptionProp           "CAP"

-        #define VCCardProp                      "VCARD"

-        #define VCCarProp                       "CAR"

-        #define VCCategoriesProp        "CATEGORIES"

-        #define VCCellularProp          "CELL"

-        #define VCCGMProp                       "CGM"

-        #define VCCharSetProp           "CS"

-        #define VCCIDProp                       "CID"

-        #define VCCISProp                       "CIS"

-        #define VCCityProp                      "L"

-        #define VCClassProp                     "CLASS"

-        #define VCCommentProp           "NOTE"

-        #define VCCompletedProp                 "COMPLETED"

-        #define VCContentIDProp                 "CONTENT-ID"

-        #define VCCountryNameProp       "C"

-        #define VCDAlarmProp            "DALARM"

-        #define VCDataSizeProp          "DATASIZE"

-        #define VCDayLightProp          "DAYLIGHT"

-        #define VCDCreatedProp          "DCREATED"

-#define VCDeliveryLabelProp     "LABEL"

-        #define VCDescriptionProp       "DESCRIPTION"

-        #define VCDIBProp                       "DIB"

-        #define VCDisplayStringProp     "DISPLAYSTRING"

-        #define VCDomesticProp          "DOM"

-        #define VCDTendProp                     "DTEND"

-        #define VCDTstartProp           "DTSTART"

-        #define VCDueProp                       "DUE"

-        #define VCEmailAddressProp      "EMAIL"

-        #define VCEncodingProp          "ENCODING"

-        #define VCEndProp                       "END"

-        #define VCEventProp                     "VEVENT"

-        #define VCEWorldProp            "EWORLD"

-        #define VCExNumProp                     "EXNUM"

-        #define VCExpDateProp           "EXDATE"

-        #define VCExpectProp            "EXPECT"

-        #define VCExtAddressProp        "EXT ADD"

-        #define VCFamilyNameProp        "F"

-        #define VCFaxProp                       "FAX"

-        #define VCFullNameProp          "FN"

-        #define VCGeoProp                       "GEO"

-        #define VCGeoLocationProp       "GEO"

-        #define VCGIFProp                       "GIF"

-        #define VCGivenNameProp                 "G"

-        #define VCGroupingProp          "Grouping"

-        #define VCHomeProp                      "HOME"

-        #define VCIBMMailProp           "IBMMail"

-        #define VCInlineProp            "INLINE"

-        #define VCInternationalProp     "INTL"

-        #define VCInternetProp          "INTERNET"

-        #define VCISDNProp                      "ISDN"

-        #define VCJPEGProp                      "JPEG"

-        #define VCLanguageProp          "LANG"

-        #define VCLastModifiedProp      "LAST-MODIFIED"

-        #define VCLastRevisedProp       "REV"

-        #define VCLocationProp          "LOCATION"

-        #define VCLogoProp                      "LOGO"

-        #define VCMailerProp            "MAILER"

-        #define VCMAlarmProp            "MALARM"

-        #define VCMCIMailProp           "MCIMAIL"

-        #define VCMessageProp           "MSG"

-        #define VCMETProp                       "MET"

-        #define VCModemProp                     "MODEM"

-        #define VCMPEG2Prop                     "MPEG2"

-        #define VCMPEGProp                      "MPEG"

-        #define VCMSNProp                       "MSN"

-        #define VCNamePrefixesProp      "NPRE"

-        #define VCNameProp                      "N"

-        #define VCNameSuffixesProp      "NSUF"

-        #define VCNoteProp                      "NOTE"

-        #define VCOrgNameProp           "ORGNAME"

-        #define VCOrgProp                       "ORG"

-        #define VCOrgUnit2Prop          "OUN2"

-        #define VCOrgUnit3Prop          "OUN3"

-        #define VCOrgUnit4Prop          "OUN4"

-        #define VCOrgUnitProp           "OUN"

-        #define VCPagerProp                     "PAGER"

-        #define VCPAlarmProp            "PALARM"

-        #define VCParcelProp            "PARCEL"

-        #define VCPartProp                      "PART"

-        #define VCPCMProp                       "PCM"

-        #define VCPDFProp                       "PDF"

-        #define VCPGPProp                       "PGP"

-        #define VCPhotoProp                     "PHOTO"

-        #define VCPICTProp                      "PICT"

-        #define VCPMBProp                       "PMB"

-        #define VCPostalBoxProp                 "BOX"

-        #define VCPostalCodeProp        "PC"

-        #define VCPostalProp            "POSTAL"

-        #define VCPowerShareProp        "POWERSHARE"

-        #define VCPreferredProp                 "PREF"

-        #define VCPriorityProp          "PRIORITY"

-        #define VCProcedureNameProp     "PROCEDURENAME"

-        #define VCProdIdProp            "PRODID"

-        #define VCProdigyProp           "PRODIGY"

-        #define VCPronunciationProp     "SOUND"

-        #define VCPSProp                        "PS"

-        #define VCPublicKeyProp                 "KEY"

-        #define VCQPProp                        "QP"

-        #define VCQuickTimeProp                 "QTIME"

-        #define VCQuotedPrintableProp"QUOTED-PRINTABLE"

-        #define VCRDateProp                     "RDATE"

-        #define VCRegionProp            "R"

-        #define VCRelatedToProp                 "RELATED-TO"

-        #define VCRepeatCountProp       "REPEATCOUNT"

-        #define VCResourcesProp                 "RESOURCES"

-        #define VCRNumProp                      "RNUM"

-        #define VCRoleProp                      "ROLE"

-        #define VCRRuleProp                     "RRULE"

-        #define VCRSVPProp                      "RSVP"

-        #define VCRunTimeProp           "RUNTIME"

-        #define VCSequenceProp          "SEQUENCE"

-        #define VCSnoozeTimeProp        "SNOOZETIME"

-        #define VCStartProp                     "START"

-        #define VCStatusProp            "STATUS"

-        #define VCStreetAddressProp     "STREET"

-        #define VCSubTypeProp           "SUBTYPE"

-        #define VCSummaryProp           "SUMMARY"

-        #define VCTelephoneProp                 "TEL"

-        #define VCTIFFProp                      "TIFF"

-        #define VCTimeZoneProp          "TZ"

-        #define VCTitleProp                     "TITLE"

-        #define VCTLXProp                       "TLX"

-        #define VCTodoProp                      "VTODO"

-        #define VCTranspProp            "TRANSP"

-        #define VCUniqueStringProp      "UID"

-        #define VCURLProp                       "URL"

-        #define VCURLValueProp          "URLVAL"

-        #define VCValueProp                     "VALUE"

-        #define VCVersionProp           "VERSION"

-        #define VCVideoProp                     "VIDEO"

-        #define VCVoiceProp                     "VOICE"

-        #define VCWAVEProp                      "WAVE"

-        #define VCWMFProp                       "WMF"

-        #define VCWorkProp                      "WORK"

-        #define VCX400Prop                      "X400"

-        #define VCX509Prop                      "X509"

-        #define VCXRuleProp                     "XRULE"

-

-

-typedef struct VObject VObject;

-

-typedef struct VObjectIterator {

-    VObject* start;

-    VObject* next;

-    } VObjectIterator;

-

-extern DLLEXPORT(VObject*) newVObject(const char *id);

-extern DLLEXPORT(void) deleteVObject(VObject *p);

-extern DLLEXPORT(char*) dupStr(const char *s, unsigned int size);

-extern DLLEXPORT(void) deleteStr(const char *p);

-extern DLLEXPORT(void) unUseStr(const char *s);

-

-extern DLLEXPORT(void) setVObjectName(VObject *o, const char* id);

-extern DLLEXPORT(void) setVObjectStringZValue(VObject *o, const char *s);

-extern DLLEXPORT(void) setVObjectStringZValue_(VObject *o, const char *s);

-extern DLLEXPORT(void) setVObjectIntegerValue(VObject *o, unsigned int i);

-extern DLLEXPORT(void) setVObjectLongValue(VObject *o, unsigned long l);

-extern DLLEXPORT(void) setVObjectAnyValue(VObject *o, void *t);

-extern DLLEXPORT(VObject*) setValueWithSize(VObject *prop, void *val, unsigned int size);

-extern DLLEXPORT(VObject*) setValueWithSize_(VObject *prop, void *val, unsigned int size);

-

-extern DLLEXPORT(const char*) vObjectName(VObject *o);

-extern DLLEXPORT(const char*) vObjectStringZValue(VObject *o);

-extern DLLEXPORT(unsigned int) vObjectIntegerValue(VObject *o);

-extern DLLEXPORT(unsigned long) vObjectLongValue(VObject *o);

-extern DLLEXPORT(void*) vObjectAnyValue(VObject *o);

-extern DLLEXPORT(VObject*) vObjectVObjectValue(VObject *o);

-extern DLLEXPORT(void) setVObjectVObjectValue(VObject *o, VObject *p);

-

-extern DLLEXPORT(VObject*) addVObjectProp(VObject *o, VObject *p);

-extern DLLEXPORT(VObject*) addProp(VObject *o, const char *id);

-extern DLLEXPORT(VObject*) addProp_(VObject *o, const char *id);

-extern DLLEXPORT(VObject*) addPropValue(VObject *o, const char *p, const char *v);

-extern DLLEXPORT(VObject*) addPropSizedValue_(VObject *o, const char *p, const char *v, unsigned int size);

-extern DLLEXPORT(VObject*) addPropSizedValue(VObject *o, const char *p, const char *v, unsigned int size);

-extern DLLEXPORT(VObject*) addGroup(VObject *o, const char *g);

-extern DLLEXPORT(void) addList(VObject **o, VObject *p);

-

-extern DLLEXPORT(VObject*) isAPropertyOf(VObject *o, const char *id);

-

-extern DLLEXPORT(VObject*) nextVObjectInList(VObject *o);

-extern DLLEXPORT(void) initPropIterator(VObjectIterator *i, VObject *o);

-extern DLLEXPORT(int) moreIteration(VObjectIterator *i);

-extern DLLEXPORT(VObject*) nextVObject(VObjectIterator *i);

-

-extern DLLEXPORT(const char*) lookupStr(const char *s);

-extern DLLEXPORT(void) cleanStrTbl();

-

-extern DLLEXPORT(void) cleanVObject(VObject *o);

-extern DLLEXPORT(void) cleanVObjects(VObject *list);

-

-extern DLLEXPORT(const char*) lookupProp(const char* str);

-extern DLLEXPORT(const char*) lookupProp_(const char* str);

-

-extern DLLEXPORT(void) writeVObjectToFile(char *fname, VObject *o);

-extern DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list);

-

-extern DLLEXPORT(int) vObjectValueType(VObject *o);

-

-/* return type of vObjectValueType: */

-        #define VCVT_NOVALUE0

-        /* if the VObject has no value associated with it. */

-        #define VCVT_STRINGZ1

-        /* if the VObject has value set by setVObjectStringZValue. */

-        #define VCVT_UINT       2

-        /* if the VObject has value set by setVObjectIntegerValue. */

-        #define VCVT_ULONG             3

-        /* if the VObject has value set by setVObjectLongValue. */

-        #define VCVT_RAW        4

-        /* if the VObject has value set by setVObjectAnyValue. */

-        #define VCVT_VOBJECT5

-        /* if the VObject has value set by setVObjectVObjectValue. */

-

-extern const char** fieldedProp;

-

-/***************************************************

- * The methods below are implemented in vcc.c (generated from vcc.y )

- ***************************************************/

-

-/* NOTE regarding printVObject and writeVObject

-

-The functions below are not exported from the DLL because they

-take a FILE* as a parameter, which cannot be passed across a DLL

-interface (at least that is my experience). Instead you can use

-their companion functions which take file names or pointers

-to memory. However, if you are linking this code into

-your build directly then you may find them a more convenient API

-and you can go ahead and use them. If you try to use them with

-the DLL LIB you will get a link error.

-*/

-extern void writeVObject(FILE *fp, VObject *o);

-

-

-

-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__ */

-

-

+/***************************************************************************
+(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International
+Business Machines Corporation and Siemens Rolm Communications Inc.
+
+For purposes of this license notice, the term Licensors shall mean,
+collectively, Apple Computer, Inc., AT&T Corp., International
+Business Machines Corporation and Siemens Rolm Communications Inc.
+The term Licensor shall mean any of the Licensors.
+
+Subject to acceptance of the following conditions, permission is hereby
+granted by Licensors without the need for written agreement and without
+license or royalty fees, to use, copy, modify and distribute this
+software for any purpose.
+
+The above copyright notice and the following four paragraphs must be
+reproduced in all copies of this software and any software including
+this software.
+
+THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE
+ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR
+MODIFICATIONS.
+
+IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,
+INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT
+OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.
+
+The software is provided with RESTRICTED RIGHTS.  Use, duplication, or
+disclosure by the government are subject to restrictions set forth in
+DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
+
+***************************************************************************/
+
+/*
+
+The vCard/vCalendar C interface is implemented in the set
+of files as follows:
+
+vcc.y, yacc source, and vcc.c, the yacc output you will use
+implements the core parser
+
+vobject.c implements an API that insulates the caller from
+the parser and changes in the vCard/vCalendar BNF
+
+port.h defines compilation environment dependent stuff
+
+vcc.h and vobject.h are header files for their .c counterparts
+
+vcaltmp.h and vcaltmp.c implement vCalendar "macro" functions
+which you may find useful.
+
+test.c is a standalone test driver that exercises some of
+the features of the APIs provided. Invoke test.exe on a
+VCARD/VCALENDAR input text file and you will see the pretty
+print output of the internal representation (this pretty print
+output should give you a good idea of how the internal
+representation looks like -- there is one such output in the
+following too). Also, a file with the .out suffix is generated
+to show that the internal representation can be written back
+in the original text format.
+
+For more information on this API see the readme.txt file
+which accompanied this distribution.
+
+  Also visit:
+
+                http://www.versit.com
+                http://www.ralden.com
+
+*/
+
+// No tr() anywhere in this file
+
+
+#ifndef __VOBJECT_H__
+#define __VOBJECT_H__ 1
+
+#include <qstring.h>
+
+        #define         vCardClipboardFormat    "+//ISBN 1-887687-00-9::versit::PDI//vCard"
+        #define         vCalendarClipboardFormat"+//ISBN 1-887687-00-9::versit::PDI//vCalendar"
+
+/* The above strings vCardClipboardFormat and vCalendarClipboardFormat
+are globally unique IDs which can be used to generate clipboard format
+ID's as per the requirements of a specific platform. For example, in
+Windows they are used as the parameter in a call to RegisterClipboardFormat.
+For example:
+
+  CLIPFORMAT foo = RegisterClipboardFormat(vCardClipboardFormat);
+
+*/
+
+        #define vCardMimeType   "text/x-vCard"
+        #define vCalendarMimeType"text/x-vCalendar"
+
+#undef DLLEXPORT
+#include <qglobal.h>
+#if defined(Q_WS_WIN)
+#define DLLEXPORT(t)   __declspec(dllexport) t
+#else
+#define DLLEXPORT(t)   t
+#endif
+
+#ifndef FALSE
+        #define FALSE0
+#endif
+#ifndef TRUE
+        #define TRUE1
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+
+
+        #define VC7bitProp                      "7BIT"
+        #define VC8bitProp                      "8BIT"
+        #define VCAAlarmProp            "AALARM"
+        #define VCAdditionalNamesProp"ADDN"
+        #define VCAdrProp                       "ADR"
+        #define VCAgentProp                     "AGENT"
+        #define VCAIFFProp                      "AIFF"
+        #define VCAOLProp                       "AOL"
+        #define VCAppleLinkProp                 "APPLELINK"
+        #define VCAttachProp            "ATTACH"
+        #define VCAttendeeProp          "ATTENDEE"
+        #define VCATTMailProp           "ATTMAIL"
+        #define VCAudioContentProp      "AUDIOCONTENT"
+        #define VCAVIProp                       "AVI"
+        #define VCBase64Prop            "BASE64"
+        #define VCBBSProp                       "BBS"
+        #define VCBirthDateProp                 "BDAY"
+        #define VCBMPProp                       "BMP"
+        #define VCBodyProp                      "BODY"
+        #define VCBusinessRoleProp      "ROLE"
+        #define VCCalProp                       "VCALENDAR"
+        #define VCCaptionProp           "CAP"
+        #define VCCardProp                      "VCARD"
+        #define VCCarProp                       "CAR"
+        #define VCCategoriesProp        "CATEGORIES"
+        #define VCCellularProp          "CELL"
+        #define VCCGMProp                       "CGM"
+        #define VCCharSetProp           "CHARSET"
+        #define VCCIDProp                       "CID"
+        #define VCCISProp                       "CIS"
+        #define VCCityProp                      "L"
+        #define VCClassProp                     "CLASS"
+        #define VCCommentProp           "NOTE"
+        #define VCCompletedProp                 "COMPLETED"
+        #define VCContentIDProp                 "CONTENT-ID"
+        #define VCCountryNameProp       "C"
+        #define VCDAlarmProp            "DALARM"
+        #define VCDataSizeProp          "DATASIZE"
+        #define VCDayLightProp          "DAYLIGHT"
+        #define VCDCreatedProp          "DCREATED"
+#define VCDeliveryLabelProp     "LABEL"
+        #define VCDescriptionProp       "DESCRIPTION"
+        #define VCDIBProp                       "DIB"
+        #define VCDisplayStringProp     "DISPLAYSTRING"
+        #define VCDomesticProp          "DOM"
+        #define VCDTendProp                     "DTEND"
+        #define VCDTstartProp           "DTSTART"
+        #define VCDueProp                       "DUE"
+        #define VCEmailAddressProp      "EMAIL"
+        #define VCEncodingProp          "ENCODING"
+        #define VCEndProp                       "END"
+        #define VCEventProp                     "VEVENT"
+        #define VCEWorldProp            "EWORLD"
+        #define VCExNumProp                     "EXNUM"
+        #define VCExpDateProp           "EXDATE"
+        #define VCExpectProp            "EXPECT"
+        #define VCExtAddressProp        "EXT ADD"
+        #define VCFamilyNameProp        "F"
+        #define VCFaxProp                       "FAX"
+        #define VCFullNameProp          "FN"
+        #define VCGeoProp                       "GEO"
+        #define VCGeoLocationProp       "GEO"
+        #define VCGIFProp                       "GIF"
+        #define VCGivenNameProp                 "G"
+        #define VCGroupingProp          "Grouping"
+        #define VCHomeProp                      "HOME"
+        #define VCIBMMailProp           "IBMMail"
+        #define VCInlineProp            "INLINE"
+        #define VCInternationalProp     "INTL"
+        #define VCInternetProp          "INTERNET"
+        #define VCISDNProp                      "ISDN"
+        #define VCJPEGProp                      "JPEG"
+        #define VCLanguageProp          "LANG"
+        #define VCLastModifiedProp      "LAST-MODIFIED"
+        #define VCLastRevisedProp       "REV"
+        #define VCLocationProp          "LOCATION"
+        #define VCLogoProp                      "LOGO"
+        #define VCMailerProp            "MAILER"
+        #define VCMAlarmProp            "MALARM"
+        #define VCMCIMailProp           "MCIMAIL"
+        #define VCMessageProp           "MSG"
+        #define VCMETProp                       "MET"
+        #define VCModemProp                     "MODEM"
+        #define VCMPEG2Prop                     "MPEG2"
+        #define VCMPEGProp                      "MPEG"
+        #define VCMSNProp                       "MSN"
+        #define VCNamePrefixesProp      "NPRE"
+        #define VCNameProp                      "N"
+        #define VCNameSuffixesProp      "NSUF"
+        #define VCNoteProp                      "NOTE"
+        #define VCOrgNameProp           "ORGNAME"
+        #define VCOrgProp                       "ORG"
+        #define VCOrgUnit2Prop          "OUN2"
+        #define VCOrgUnit3Prop          "OUN3"
+        #define VCOrgUnit4Prop          "OUN4"
+        #define VCOrgUnitProp           "OUN"
+        #define VCPagerProp                     "PAGER"
+        #define VCPAlarmProp            "PALARM"
+        #define VCParcelProp            "PARCEL"
+        #define VCPartProp                      "PART"
+        #define VCPCMProp                       "PCM"
+        #define VCPDFProp                       "PDF"
+        #define VCPGPProp                       "PGP"
+        #define VCPhotoProp                     "PHOTO"
+        #define VCPICTProp                      "PICT"
+        #define VCPMBProp                       "PMB"
+        #define VCPostalBoxProp                 "BOX"
+        #define VCPostalCodeProp        "PC"
+        #define VCPostalProp            "POSTAL"
+        #define VCPowerShareProp        "POWERSHARE"
+        #define VCPreferredProp                 "PREF"
+        #define VCPriorityProp          "PRIORITY"
+        #define VCProcedureNameProp     "PROCEDURENAME"
+        #define VCProdIdProp            "PRODID"
+        #define VCProdigyProp           "PRODIGY"
+        #define VCPronunciationProp     "SOUND"
+        #define VCPSProp                        "PS"
+        #define VCPublicKeyProp                 "KEY"
+        #define VCQPProp                        "QP"
+        #define VCQuickTimeProp                 "QTIME"
+        #define VCQuotedPrintableProp"QUOTED-PRINTABLE"
+        #define VCRDateProp                     "RDATE"
+        #define VCRegionProp            "R"
+        #define VCRelatedToProp                 "RELATED-TO"
+        #define VCRepeatCountProp       "REPEATCOUNT"
+        #define VCResourcesProp                 "RESOURCES"
+        #define VCRNumProp                      "RNUM"
+        #define VCRoleProp                      "ROLE"
+        #define VCRRuleProp                     "RRULE"
+        #define VCRSVPProp                      "RSVP"
+        #define VCRunTimeProp           "RUNTIME"
+        #define VCSequenceProp          "SEQUENCE"
+        #define VCSnoozeTimeProp        "SNOOZETIME"
+        #define VCStartProp                     "START"
+        #define VCStatusProp            "STATUS"
+        #define VCStreetAddressProp     "STREET"
+        #define VCSubTypeProp           "SUBTYPE"
+        #define VCSummaryProp           "SUMMARY"
+        #define VCTelephoneProp                 "TEL"
+        #define VCTIFFProp                      "TIFF"
+        #define VCTimeZoneProp          "TZ"
+        #define VCTitleProp                     "TITLE"
+        #define VCTLXProp                       "TLX"
+        #define VCTodoProp                      "VTODO"
+        #define VCTranspProp            "TRANSP"
+        #define VCUniqueStringProp      "UID"
+        #define VCURLProp                       "URL"
+        #define VCURLValueProp          "URLVAL"
+        #define VCValueProp                     "VALUE"
+        #define VCVersionProp           "VERSION"
+        #define VCVideoProp                     "VIDEO"
+        #define VCVoiceProp                     "VOICE"
+        #define VCWAVEProp                      "WAVE"
+        #define VCWMFProp                       "WMF"
+        #define VCWorkProp                      "WORK"
+        #define VCX400Prop                      "X400"
+        #define VCX509Prop                      "X509"
+        #define VCXRuleProp                     "XRULE"
+
+
+typedef struct VObject VObject;
+
+typedef struct VObjectIterator {
+    VObject* start;
+    VObject* next;
+    } VObjectIterator;
+
+extern DLLEXPORT(VObject*) newVObject(const char *id);
+extern DLLEXPORT(void) deleteVObject(VObject *p);
+extern DLLEXPORT(char*) dupStr(const char *s, unsigned int size);
+extern DLLEXPORT(void) deleteStr(const char *p);
+extern DLLEXPORT(void) unUseStr(const char *s);
+
+extern DLLEXPORT(void) setVObjectName(VObject *o, const char* id);
+extern DLLEXPORT(void) setVObjectStringZValue(VObject *o, const char *s);
+extern DLLEXPORT(void) setVObjectStringZValue_(VObject *o, const char *s);
+extern DLLEXPORT(void) setVObjectIntegerValue(VObject *o, unsigned int i);
+extern DLLEXPORT(void) setVObjectLongValue(VObject *o, unsigned long l);
+extern DLLEXPORT(void) setVObjectAnyValue(VObject *o, void *t);
+extern DLLEXPORT(VObject*) setValueWithSize(VObject *prop, void *val, unsigned int size);
+extern DLLEXPORT(VObject*) setValueWithSize_(VObject *prop, void *val, unsigned int size);
+
+extern DLLEXPORT(const char*) vObjectName(VObject *o);
+extern DLLEXPORT(const char*) vObjectStringZValue(VObject *o);
+extern DLLEXPORT(unsigned int) vObjectIntegerValue(VObject *o);
+extern DLLEXPORT(unsigned long) vObjectLongValue(VObject *o);
+extern DLLEXPORT(void*) vObjectAnyValue(VObject *o);
+extern DLLEXPORT(VObject*) vObjectVObjectValue(VObject *o);
+extern DLLEXPORT(void) setVObjectVObjectValue(VObject *o, VObject *p);
+
+extern DLLEXPORT(VObject*) addVObjectProp(VObject *o, VObject *p);
+extern DLLEXPORT(VObject*) addProp(VObject *o, const char *id);
+extern DLLEXPORT(VObject*) addProp_(VObject *o, const char *id);
+extern DLLEXPORT(VObject*) addPropValue(VObject *o, const char *p, const char *v);
+extern DLLEXPORT(VObject*) addPropSizedValue_(VObject *o, const char *p, const char *v, unsigned int size);
+extern DLLEXPORT(VObject*) addPropSizedValue(VObject *o, const char *p, const char *v, unsigned int size);
+extern DLLEXPORT(VObject*) addGroup(VObject *o, const char *g);
+extern DLLEXPORT(void) addList(VObject **o, VObject *p);
+
+extern DLLEXPORT(VObject*) isAPropertyOf(VObject *o, const char *id);
+
+extern DLLEXPORT(VObject*) nextVObjectInList(VObject *o);
+extern DLLEXPORT(void) initPropIterator(VObjectIterator *i, VObject *o);
+extern DLLEXPORT(int) moreIteration(VObjectIterator *i);
+extern DLLEXPORT(VObject*) nextVObject(VObjectIterator *i);
+
+extern DLLEXPORT(const char*) lookupStr(const char *s);
+extern DLLEXPORT(void) cleanStrTbl();
+
+extern DLLEXPORT(void) cleanVObject(VObject *o);
+extern DLLEXPORT(void) cleanVObjects(VObject *list);
+
+extern DLLEXPORT(const char*) lookupProp(const char* str);
+extern DLLEXPORT(const char*) lookupProp_(const char* str);
+
+extern DLLEXPORT(void) writeVObjectToFile(char *fname, VObject *o);
+extern DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list);
+
+extern DLLEXPORT(int) vObjectValueType(VObject *o);
+
+/* return type of vObjectValueType: */
+        #define VCVT_NOVALUE0
+        /* if the VObject has no value associated with it. */
+        #define VCVT_STRINGZ1
+        /* if the VObject has value set by setVObjectStringZValue. */
+        #define VCVT_UINT       2
+        /* if the VObject has value set by setVObjectIntegerValue. */
+        #define VCVT_ULONG             3
+        /* if the VObject has value set by setVObjectLongValue. */
+        #define VCVT_RAW        4
+        /* if the VObject has value set by setVObjectAnyValue. */
+        #define VCVT_VOBJECT5
+        /* if the VObject has value set by setVObjectVObjectValue. */
+
+extern const char** fieldedProp;
+
+/***************************************************
+ * The methods below are implemented in vcc.c (generated from vcc.y )
+ ***************************************************/
+
+/* NOTE regarding printVObject and writeVObject
+
+The functions below are not exported from the DLL because they
+take a FILE* as a parameter, which cannot be passed across a DLL
+interface (at least that is my experience). Instead you can use
+their companion functions which take file names or pointers
+to memory. However, if you are linking this code into
+your build directly then you may find them a more convenient API
+and you can go ahead and use them. If you try to use them with
+the DLL LIB you will get a link error.
+*/
+extern void writeVObject(FILE *fp, VObject *o);
+
+
+
+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/categoryeditbase_p.ui b/library/categoryeditbase_p.ui
index a76e433..e192ae1 100644
--- a/library/categoryeditbase_p.ui
+++ b/library/categoryeditbase_p.ui
@@ -32,3 +32,3 @@
             <y>0</y>
-            <width>201</width>
+            <width>197</width>
             <height>287</height>
@@ -107,2 +107,6 @@
             </property>
+            <property>
+                <name>whatsThis</name>
+                <string>Check the categories this document belongs to.</string>
+            </property>
         </widget>
@@ -129,2 +133,6 @@
                     </property>
+                    <property>
+                        <name>whatsThis</name>
+                        <string>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</string>
+                    </property>
                 </widget>
@@ -144,2 +152,6 @@
                     </property>
+                    <property>
+                        <name>whatsThis</name>
+                        <string>Enter a new category to the left and press to add it to the list.</string>
+                    </property>
                 </widget>
@@ -163,2 +175,6 @@
                     </property>
+                    <property>
+                        <name>whatsThis</name>
+                        <string>Press to delete the highlighted category.</string>
+                    </property>
                 </widget>
@@ -174,2 +190,6 @@
                     </property>
+                    <property>
+                        <name>whatsThis</name>
+                        <string>Check to make this property available to all applications.</string>
+                    </property>
                 </widget>
diff --git a/library/datebookmonth.cpp b/library/datebookmonth.cpp
index f4b3e6b..272c223 100644
--- a/library/datebookmonth.cpp
+++ b/library/datebookmonth.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -22,3 +22,3 @@
 #include "datebookdb.h"
-#include <qpe/event.h>
+#include <qtopia/private/event.h>
 #include "resource.h"
@@ -33,2 +33,4 @@
 #include <qpopupmenu.h>
+#include <qvaluestack.h>
+#include <qwhatsthis.h>
 
@@ -45,2 +47,3 @@ DateBookMonthHeader::DateBookMonthHeader( QWidget *parent, const char *name )
     begin->setFixedSize( begin->sizeHint() );
+    QWhatsThis::add( begin, tr("Show January in the selected year") );
 
@@ -51,2 +54,3 @@ DateBookMonthHeader::DateBookMonthHeader( QWidget *parent, const char *name )
     back->setFixedSize( back->sizeHint() );
+    QWhatsThis::add( back, tr("Show the previous month") );
 
@@ -63,2 +67,3 @@ DateBookMonthHeader::DateBookMonthHeader( QWidget *parent, const char *name )
     next->setFixedSize( next->sizeHint() );
+    QWhatsThis::add( next, tr("Show the next month") );
 
@@ -69,2 +74,3 @@ DateBookMonthHeader::DateBookMonthHeader( QWidget *parent, const char *name )
     end->setFixedSize( end->sizeHint() );
+    QWhatsThis::add( end, tr("Show December in the selected year") );
 
@@ -456,3 +462,2 @@ QDate  DateBookMonth::selectedDate() const
     table->getDate( y, m, d );
-    qDebug( "got %d %d %d", y, m, d );
     return QDate( y, m, d );
@@ -527,2 +532,4 @@ void DayItemMonth::paint( QPainter *p, const QColorGroup &cg,
 {
+    p->save();
+
     QColorGroup g( cg );
@@ -530,4 +537,2 @@ void DayItemMonth::paint( QPainter *p, const QColorGroup &cg,
     g.setColor( QColorGroup::Text, forg );
-    p->fillRect( 0, 0, cr.width(), cr.height(), selected ? g.brush( QColorGroup::Highlight ) : g.brush( QColorGroup::Base ) );
-
     if ( selected )
@@ -537,89 +542,115 @@ void DayItemMonth::paint( QPainter *p, const QColorGroup &cg,
 
-    p->save();
-    QFont f = p->font();
-    f.setPointSize( ( f.pointSize() / 3 ) * 2 );
-    p->setFont( f );
-    QFontMetrics fm( f );
-    p->drawText( 1, 1 + fm.ascent(), QString::number( day() ) );
-    p->restore();
-    // Put indicators for something like this, (similar to PalmOS)
-    // Before noon: item at top of the day
-    // At noon: put a small item at the middle
-    // After noon: put an indicator at the bottom of the day
-    // an all day event: mark with a circle in the middle (a la DateBook+)
-    bool beforeNoon = false;
-    bool atNoon = false;
-    bool afterNoon = false;
-    bool bAllDay = false;
-    bool bRepeatAfter = false;
-    bool bRepeatBefore = false;
-    bool bRepeatNoon = false;
-    bool straddleAfter = false;
-    bool straddleBefore = false;
+    QValueStack<int> normalLine;
+    QValueStack<int> repeatLine;
+    QValueStack<int> travelLine;
+
+    bool normalAllDay = FALSE;
+    bool repeatAllDay = FALSE;
+    bool travelAllDay = FALSE;
+
     QValueListIterator<EffectiveEvent> itDays = d->mDayEvents.begin();
+
     for ( ; itDays != d->mDayEvents.end(); ++itDays ) {
-        if ( (*itDays).event().type() == Event::AllDay )
-            bAllDay = TRUE;
-        else if ( (*itDays).start().hour() < 12 ) {
-            beforeNoon = TRUE;
-            if ( (*itDays).end().hour() > 12 ) {
-                atNoon = TRUE;
-                straddleBefore = TRUE;
+        int w = cr.width();
+        Event ev = (*itDays).event();
+
+        int f = (*itDays).start().hour(); // assume Effective event 
+                int t = (*itDays).end().hour();  // is truncated.
+
+        if (ev.isAllDay()) { 
+            if (!ev.hasRepeat())
+                normalAllDay = TRUE;
+            else
+                repeatAllDay = TRUE;
+        } else {
+            int sLine, eLine;
+            if (f == 0)
+                sLine = 0;
+            else if (f < 8 )
+                sLine = 1;
+            else if (f >= 17)
+                sLine = w - 4;
+            else {
+                sLine = (f - 8) * (w - 8);
+                if (sLine)
+                    sLine /= 8;
+                sLine += 4;
             }
-            if ( (*itDays).end().hour() > 14 ||
-                 (*itDays).end().hour() == 14 && (*itDays).end().minute() > 0 ) {
-                afterNoon = TRUE;
-                straddleAfter = TRUE;
+            if (t == 23)
+                eLine = w;
+            else if (t < 8)
+                eLine = 4;
+            else if (t >= 17)
+                eLine = w - 1;
+            else {
+                eLine = (t - 8) * (w - 8);
+                if (eLine)
+                    eLine /= 8;
+                eLine += 4;
             }
-            if ( (*itDays).event().hasRepeat() )
-                bRepeatBefore = TRUE;
-        } else if ( (*itDays).start().hour() == 12 ) {
-            if ( !atNoon )
-                atNoon = TRUE;
-            if ( (*itDays).event().hasRepeat() )
-                bRepeatNoon = TRUE;
-            if ( (*itDays).end().hour() > 14 ||
-                 (*itDays).end().hour() == 14 && (*itDays).end().minute() > 0 ) {
-                afterNoon = TRUE;
-                straddleAfter = TRUE;
+            if (!ev.hasRepeat()) {
+                normalLine.push(sLine);
+                normalLine.push(eLine);
+            } else {
+                repeatLine.push(sLine);
+                repeatLine.push(eLine);
             }
-        } else if ( (*itDays).start().hour() > 12 ) {
-            afterNoon = TRUE;
-            if ( (*itDays).event().hasRepeat() )
-                bRepeatAfter = TRUE;
         }
     }
-    int x = cr.width() - 13;
-    if ( beforeNoon ) {
-        p->setBrush( blue );
-        p->drawRect( x, 2,  10, 10 );
-        if ( bRepeatBefore )
-            p->fillRect( x + 5, 4,  3, 3, white );
-    }
-    if ( atNoon ) {
-        p->setBrush( blue );
-        p->drawRect( x, 14, 10, 5 );
-        if ( bRepeatNoon )
-            p->fillRect( x + 5, 16,  3, 2, white );
-    }
-    if ( straddleBefore ) {
-        p->drawLine( x, 11, x, 14 );
-        p->fillRect( x + 1, 11, 8, 4, blue );
-        p->drawLine( x + 9, 11, x + 9, 14 );
-    }
-    if ( afterNoon ) {
-        p->setBrush( blue );
-        p->drawRect( x, 21, 10, 10 );
-        if ( bRepeatAfter )
-            p->fillRect( x + 5, 23,  3, 3, white );
+
+    // draw the background
+    if (normalAllDay || repeatAllDay || travelAllDay) {
+        p->save();
+
+        if (normalAllDay)
+            if (repeatAllDay) {
+                p->fillRect( 0, 0, cr.width(), cr.height() / 2,
+                        colorNormalLight );
+                p->fillRect( 0, cr.height() / 2, cr.width(), cr.height() / 2,
+                        colorRepeatLight );
+            } else
+                p->fillRect( 0, 0, cr.width(), cr.height(),
+                        colorNormalLight );
+            else if (repeatAllDay)
+                p->fillRect( 0, 0, cr.width(), cr.height(),
+                        colorRepeatLight );
+    } else {
+        p->fillRect( 0, 0, cr.width(), 
+                cr.height(), selected 
+                ?  g.brush( QColorGroup::Highlight ) 
+                : g.brush( QColorGroup::Base ) );
     }
-    if ( straddleAfter ) {
-        p->drawLine( x, 18, x, 21 );
-        p->fillRect( x + 1, 18, 8, 4, blue );
-        p->drawLine( x + 9, 18, x + 9, 21 );
+
+    // The lines
+    // now for the lines.
+    int h = 5;
+    int y = cr.height() / 2 - h;
+
+    while(normalLine.count() >= 2) {
+        int x2 = normalLine.pop();
+        int x1 = normalLine.pop();
+        if (x2 < x1 + 2)
+            x2 = x1 + 2;
+        p->fillRect(x1, y, x2 - x1, h, colorNormal);
     }
-    if ( bAllDay ) {
-        p->setBrush( green );
-        p->drawEllipse( cr.width() / 2 - 7, cr.height() / 2 - 5, 10, 10 );
+
+    y += h;
+
+    while(repeatLine.count() >= 2) {
+        int x2 = repeatLine.pop();
+        int x1 = repeatLine.pop();
+        if (x2 < x1 + 2)
+            x2 = x1 + 2;
+        p->fillRect(x1, y, x2 - x1, h, colorRepeat);
     }
+
+
+    // Finally, draw the number.
+    QFont f = p->font();
+    f.setPointSize( ( f.pointSize() / 3 ) * 2 );
+    p->setFont( f );
+    QFontMetrics fm( f );
+    p->drawText( 1, 1 + fm.ascent(), QString::number( day() ) );
+
+    p->restore();
 }
@@ -713 +744,7 @@ void DateButton::setDateFormat( DateFormat f )
 }
+
+bool DateButton::customWhatsThis() const
+{
+    return TRUE;
+}
+
diff --git a/library/datebookmonth.h b/library/datebookmonth.h
index a7647ae..3c57c19 100644
--- a/library/datebookmonth.h
+++ b/library/datebookmonth.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -22,3 +22,3 @@
 
-#include <qpe/event.h>
+#include <qtopia/private/event.h>
 
@@ -189,2 +189,4 @@ public:
 
+    bool customWhatsThis() const;
+
 signals:
diff --git a/library/fileselector.cpp b/library/fileselector.cpp
index 013f43a..382012f 100644
--- a/library/fileselector.cpp
+++ b/library/fileselector.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -32,3 +32,5 @@
 #include "qpemenubar.h"
+#ifdef QWS
 #include "qcopchannel_qws.h"
+#endif
 #include "lnkproperties.h"
@@ -37,2 +39,5 @@
 #include "categorymenu.h"
+#include "categoryselect.h"
+#include "mimetype.h"
+#include "categories.h"
 
@@ -47,3 +52,110 @@
 #include <qtooltip.h>
+#include <qwhatsthis.h>
 
+class TypeCombo : public QComboBox
+{
+    Q_OBJECT
+public:
+    TypeCombo( QWidget *parent, const char *name=0 )
+        : QComboBox( parent, name )
+    {
+        connect( this, SIGNAL(activated(int)), this, SLOT(selectType(int)) );
+    }
+
+    void reread( DocLnkSet &files, const QString &filter );
+
+signals:
+    void selected( const QString & );
+
+protected slots:
+    void selectType( int idx ) {
+        emit selected( typelist[idx] );
+    }
+
+protected:
+    QStringList typelist;
+    QString prev;
+};
+
+void TypeCombo::reread( DocLnkSet &files, const QString &filter )
+{
+    typelist.clear();
+    QStringList filters = QStringList::split( ';', filter );
+    int pos = filter.find( '/' );
+    //### do for each filter
+    if ( filters.count() == 1 && pos >= 0 && filter[pos+1] != '*' ) {
+        typelist.append( filter );
+        clear();
+        QString minor = filter.mid( pos+1 );
+        minor[0] = minor[0].upper();
+        insertItem( tr("%1 files").arg(minor) );
+        setCurrentItem(0);
+        setEnabled( FALSE );
+        return;
+    }
+
+    QListIterator<DocLnk> dit( files.children() );
+    for ( ; dit.current(); ++dit ) {
+        if ( !typelist.contains( (*dit)->type() ) )
+            typelist.append(  (*dit)->type() );
+    }
+
+    QStringList types;
+    QStringList::ConstIterator it;
+    for (it = typelist.begin(); it!=typelist.end(); ++it) {
+        QString t = *it;
+        if ( t.left(12) == "application/" ) {
+            MimeType mt(t);
+            const AppLnk* app = mt.application();
+            if ( app )
+                t = app->name();
+            else
+                t = t.mid(12);
+        } else {
+            QString major, minor;
+            int pos = t.find( '/' );
+            if ( pos >= 0 ) {
+                major = t.left( pos );
+                minor = t.mid( pos+1 );
+            }
+            if ( minor.find( "x-" ) == 0 )
+                minor = minor.mid( 2 );
+            minor[0] = minor[0].upper();
+            major[0] = major[0].upper();
+            if ( filters.count() > 1 )
+                t = tr("%1 %2", "minor mimetype / major mimetype").arg(minor).arg(major);
+            else
+                t = minor;
+        }
+        types += tr("%1 files").arg(t);
+    }
+    for (it = filters.begin(); it!=filters.end(); ++it) {
+        typelist.append( *it );
+        int pos = (*it).find( '/' );
+        if ( pos >= 0 ) {
+            QString maj = (*it).left( pos );
+            maj[0] = maj[0].upper();
+            types << tr("All %1 files").arg(maj);
+        }
+    }
+    if ( filters.count() > 1 ) {
+        typelist.append( filter );
+        types << tr("All files");
+    }
+    prev = currentText();
+    clear();
+    insertStringList(types);
+    for (int i=0; i<count(); i++) {
+        if ( text(i) == prev ) {
+            setCurrentItem(i);
+            break;
+        }
+    }
+    if ( prev.isNull() )
+        setCurrentItem(count()-1);
+    setEnabled( TRUE );
+}
+
+
+//===========================================================================
 
@@ -60,15 +172,5 @@ FileSelectorItem::~FileSelectorItem()
 
-class FileSelectorViewPrivate
-{
-public:
-    CategoryMenu *cm;
-    bool m_noItems:1;
-};
-
-FileSelectorView::FileSelectorView( const QString &f, QWidget *parent, const char *name )
-    : QListView( parent, name ), filter( f ), count( 0 )
+FileSelectorView::FileSelectorView( QWidget *parent, const char *name )
+    : QListView( parent, name )
 {
-    d = new FileSelectorViewPrivate();
-    d->cm = 0;
-    d->m_noItems = false;
     setAllColumnsShowFocus( TRUE );
@@ -76,8 +178,2 @@ FileSelectorView::FileSelectorView( const QString &f, QWidget *parent, const cha
     header()->hide();
-
-    fileManager = new FileManager;
-    reread();
-    QCopChannel *channel = new QCopChannel( "QPE/Card", this );
-    connect( channel, SIGNAL(received(const QCString &, const QByteArray &)),
-             this, SLOT(cardMessage( const QCString &, const QByteArray &)) );
 }
@@ -88,48 +184,2 @@ FileSelectorView::~FileSelectorView()
 
-void FileSelectorView::reread()
-{
-    QString oldFile;
-    FileSelectorItem *item;
-    if( !d->m_noItems ) { // there are items
-      item = (FileSelectorItem *)selectedItem();
-      if ( item )
-          oldFile = item->file().file();
-    }
-    clear();
-    DocLnkSet files;
-    Global::findDocuments(&files, filter);
-    count = files.children().count();
-    if(count == 0 ){ // No Documents
-      d->m_noItems = true;
-      QListViewItem *it = new QListViewItem(this, tr("There are no files in this directory." ), "empty" );
-      it->setSelectable(FALSE );
-      return;
-    }
-    QListIterator<DocLnk> dit( files.children() );
-    for ( ; dit.current(); ++dit ) {
-        if (d->cm)
-            if (!d->cm->isSelected((**dit).categories()))
-                continue;
-        item = new FileSelectorItem( this, **dit );
-        if ( item->file().file() == oldFile )
-            setCurrentItem( item );
-    }
-    if ( !selectedItem() )
-        setCurrentItem( firstChild() );
-}
-
-void FileSelectorView::setCategoryFilter(CategoryMenu *cm)
-{
-    d->cm = cm;
-    connect(cm, SIGNAL(categoryChange()), this, SLOT(categoryChanged()) );
-}
-
-void FileSelectorView::categoryChanged() { reread(); }
-
-void FileSelectorView::cardMessage( const QCString &msg, const QByteArray &)
-{
-    if ( msg == "mtabChanged()" )
-        reread();
-}
-
 void FileSelectorView::keyPressEvent( QKeyEvent *e )
@@ -145,2 +195,33 @@ void FileSelectorView::keyPressEvent( QKeyEvent *e )
 
+class NewDocItem : public FileSelectorItem
+{
+public:
+    NewDocItem( QListView *parent, const DocLnk &f )
+        : FileSelectorItem( parent, f ) {
+        setText( 0, QObject::tr("New Document") );
+        QImage img( Resource::loadImage( "new" ) );
+        QPixmap pm;
+        pm = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
+        setPixmap( 0, pm );
+    }
+    QString key ( int, bool ) const {
+        return QString("\n");
+    }
+
+    void paintCell( QPainter *p, const QColorGroup &cg, int column, int width, int alignment ) {
+        QFont oldFont = p->font();
+        QFont newFont = p->font();
+        newFont.setWeight( QFont::Bold );
+        p->setFont( newFont );
+        FileSelectorItem::paintCell( p, cg, column, width, alignment );
+        p->setFont( oldFont );
+    }
+
+    int width( const QFontMetrics &fm, const QListView *v, int c ) const {
+        return FileSelectorItem::width( fm, v, c )*4/3; // allow for bold font
+    }
+};
+
+//===========================================================================
+
 class FileSelectorPrivate
@@ -148,4 +229,10 @@ class FileSelectorPrivate
 public:
-    CategoryMenu *cm;
-    QMenuBar *mb;
+    TypeCombo *typeCombo;
+    CategorySelect *catSelect;
+    QValueList<QRegExp> mimeFilters;
+    int catId;
+    bool showNew;
+    NewDocItem *newDocItem;
+    DocLnkSet files;
+    QHBox *toolbar;
 };
@@ -155,2 +242,28 @@ public:
   \brief The FileSelector widget allows the user to select DocLnk objects.
+
+  This class presents a file selection dialog to the user. This widget
+  is usually the first widget seen in a \link docwidget.html
+  document-oriented application\endlink. The developer will most often
+  create this widget in combination with a <a
+  href="../qt/qwidgetstack.html"> QWidgetStack</a> and the appropriate
+  editor and/or viewer widget for their application. This widget
+  should be shown first and the user can the select which document
+  they wish to operate on. Please refer to the implementation of
+  texteditor for an example of how to tie these classes together.
+
+  Use setNewVisible() depending on whether the application can be used
+  to create new files or not. Use setCloseVisible() depending on
+  whether the user may leave the dialog without creating or selecting
+  a document or not. The number of files in the view is available from
+  fileCount(). To force the view to be updated call reread().
+
+  If the user presses the 'New Document' button the newSelected()
+  signal is emitted. If the user selects an existing file the
+  fileSelected() signal is emitted. The selected file's \link
+  doclnk.html DocLnk\endlink is available from the selected()
+  function. If the file selector is no longer necessary the closeMe()
+  signal is emitted.
+
+  \ingroup qtopiaemb
+  \sa FileManager
 */
@@ -160,10 +273,10 @@ public:
   The standard Qt \a parent and \a name parameters are passed to the
-  parent.
+  parent widget.
 
-  If \a newVisible is TRUE, the widget has an button allowing the user
-  the create "new" documents - editor applications will have this while
-  viewer applications will not.
+  If \a newVisible is TRUE, the widget has a button to allow the user
+  the create "new" documents; this is useful for applications that can
+  create and edit documents but not suitable for applications that
+  only provide viewing.
 
-  If \a closeVisible is TRUE, the widget has an button allowinf the user
-  to select "no document".
+  \a closeVisible is deprecated
 
@@ -176,26 +289,17 @@ FileSelector::FileSelector( const QString &f, QWidget *parent, const char *name,
     setSpacing( 0 );
-    QHBox *top = new QHBox( this );
-            top->setBackgroundMode( PaletteButton );// same colour as toolbars
-    top->setSpacing( 0 );
-
-    QWidget *spacer = new QWidget( top );
-    spacer->setBackgroundMode( PaletteButton );
 
     d = new FileSelectorPrivate();
-    d->mb = new QMenuBar(spacer);
-    d->cm = new CategoryMenu("Document View", this);
-    QPEMenuToolFocusManager::manager()->addWidget( d->mb );
-    d->mb->insertItem(tr("View"), d->cm);
+    d->newDocItem = 0;
+    d->showNew = newVisible;
+    d->catId = -2; // All files
 
+    d->toolbar = new QHBox( this );
+    d->toolbar->setBackgroundMode( PaletteButton );   // same colour as toolbars
+    d->toolbar->setSpacing( 0 );
+    d->toolbar->hide();
 
-    QToolButton *tb = new QToolButton( top );
-    tb->setPixmap( Resource::loadPixmap( "new" ) );
-    connect( tb, SIGNAL( clicked() ), this, SLOT( createNew() ) );
-    buttonNew = tb;
-    tb->setFixedSize( 18, 20 ); // tb->sizeHint() );
-    tb->setAutoRaise( TRUE );
-    QToolTip::add( tb, tr( "Create a new Document" ) );
-    QPEMenuToolFocusManager::manager()->addWidget( tb );
+    QWidget *spacer = new QWidget( d->toolbar );
+    spacer->setBackgroundMode( PaletteButton );
 
-    tb = new QToolButton( top );
+    QToolButton *tb = new QToolButton( d->toolbar );
     tb->setPixmap( Resource::loadPixmap( "close" ) );
@@ -208,4 +312,3 @@ FileSelector::FileSelector( const QString &f, QWidget *parent, const char *name,
 
-    view = new FileSelectorView( filter, this, "fileview" );
-    view->setCategoryFilter(d->cm);
+    view = new FileSelectorView( this, "fileview" );
     QPEApplication::setStylusOperation( view->viewport(), QPEApplication::RightOnHold );
@@ -218,4 +321,26 @@ FileSelector::FileSelector( const QString &f, QWidget *parent, const char *name,
 
-    setNewVisible( newVisible );
+    QHBox *hb = new QHBox( this );
+    d->typeCombo = new TypeCombo( hb );
+    connect( d->typeCombo, SIGNAL(selected(const QString&)),
+            this, SLOT(typeSelected(const QString&)) );
+    QWhatsThis::add( d->typeCombo, tr("Show documents of this type") );
+
+    Categories c;
+    c.load(categoryFileName());
+    QArray<int> vl( 0 );
+    d->catSelect = new CategorySelect( hb );
+    d->catSelect->setRemoveCategoryEdit( TRUE );
+    d->catSelect->setCategories( vl, "Document View", tr("Document View") );
+    d->catSelect->setAllCategories( TRUE );
+    connect( d->catSelect, SIGNAL(signalSelected(int)), this, SLOT(catSelected(int)) );
+    QWhatsThis::add( d->catSelect, tr("Show documents in this category") );
+
     setCloseVisible( closeVisible );
+
+    QCopChannel *channel = new QCopChannel( "QPE/Card", this );
+    connect( channel, SIGNAL(received(const QCString &, const QByteArray &)),
+            this, SLOT(cardMessage( const QCString &, const QByteArray &)) );
+
+    reread();
+    updateWhatsThis();
 }
@@ -227,3 +352,3 @@ FileSelector::~FileSelector()
 {
-
+    delete d;
 }
@@ -231,4 +356,4 @@ FileSelector::~FileSelector()
 /*!
-  Returns the number of files in the view. If this is zero, and editor
-  application might avoid using the selector and immediately start with
+  Returns the number of files in the view. If this is zero, an editor
+  application might bypass the selector and immediately start with
   a "new" document.
@@ -237,3 +362,3 @@ int FileSelector::fileCount()
 {
-    return view->fileCount();
+    return d->files.children().count();;
 }
@@ -241,3 +366,4 @@ int FileSelector::fileCount()
 /*!
-  Causes the file selector to act as if the "new" button was chosen.
+  Calling this function is the programmatic equivalent of the user
+  pressing the "new" button.
 
@@ -256,5 +382,2 @@ void FileSelector::fileClicked( int button, QListViewItem *i, const QPoint &, in
         return;
-    if(i->text(1) == QString::fromLatin1("empty" ) )
-      return; 
-
     if ( button == Qt::LeftButton ) {
@@ -266,7 +389,4 @@ void FileSelector::filePressed( int button, QListViewItem *i, const QPoint &, in
 {
-    if ( !i )
+    if ( !i || i == d->newDocItem )
         return;
-    if(i->text(1) == QString::fromLatin1("empty" ) )
-      return; 
-
     if ( button == Qt::RightButton ) {
@@ -276,3 +396,2 @@ void FileSelector::filePressed( int button, QListViewItem *i, const QPoint &, in
         prop.exec();
-        d->cm->reload();
         reread();
@@ -285,9 +404,35 @@ void FileSelector::fileClicked( QListViewItem *i )
         return;
-    emit fileSelected( ( (FileSelectorItem*)i )->file() );
-    emit closeMe();
+    if ( i == d->newDocItem ) {
+        createNew();
+    } else {
+        emit fileSelected( ( (FileSelectorItem*)i )->file() );
+        emit closeMe();
+    }
+}
+
+void FileSelector::typeSelected( const QString &type )
+{
+    d->mimeFilters.clear();
+    QStringList subFilter = QStringList::split(";", type);
+    for( QStringList::Iterator it = subFilter.begin(); it != subFilter.end(); ++it )
+        d->mimeFilters.append( QRegExp(*it, FALSE, TRUE) );
+    updateView();
 }
 
+void FileSelector::catSelected( int c )
+{
+    d->catId = c;
+    updateView();
+}
+
+void FileSelector::cardMessage( const QCString &msg, const QByteArray &)
+{
+    if ( msg == "mtabChanged()" )
+        reread();
+}
+
+
 /*!
-  Returns the selected DocLnk. The caller is responsible for deleting
-  the returned value.
+  Returns the selected \link doclnk.html DocLnk\endlink. The caller is
+  responsible for deleting the returned value.
 */
@@ -296,3 +441,3 @@ const DocLnk *FileSelector::selected()
     FileSelectorItem *item = (FileSelectorItem *)view->selectedItem();
-    if ( item )
+    if ( item && item != d->newDocItem )
         return new DocLnk( item->file() );
@@ -304,4 +449,4 @@ const DocLnk *FileSelector::selected()
 
-  This signal is emitted when the user selects a file.
-  \a f is the file.
+  This signal is emitted when the user selects a document.
+  \a f is the document.
 */
@@ -311,5 +456,5 @@ const DocLnk *FileSelector::selected()
 
-  This signal is emitted when the user selects "new" file.
-  \a f is a DocLnk for the file. You will need to set the type
-  of the value after copying it.
+  This signal is emitted when the user selects a "new" document.
+  \a f is a DocLnk for the document. You will need to set the type
+  of the document after copying it.
 */
@@ -324,3 +469,5 @@ const DocLnk *FileSelector::selected()
 /*!
-  Sets whether a "new document" button is visible, according to \a b.
+  If \a b is TRUE a "new document" entry is visible; if \a b is FALSE
+  this entry is not visible and the user is unable to create new
+  documents from the dialog.
 */
@@ -328,6 +475,7 @@ void FileSelector::setNewVisible( bool b )
 {
-    if ( b )
-        buttonNew->show();
-    else
-        buttonNew->hide();
+    if ( d->showNew != b ) {
+        d->showNew = b;
+        updateView();
+        updateWhatsThis();
+    }
 }
@@ -335,3 +483,7 @@ void FileSelector::setNewVisible( bool b )
 /*!
-  Sets whether a "no document" button is visible, according to \a b.
+  If \a b is TRUE a "close" or "no document" button is visible; if \a
+  b is FALSE this button is not visible and the user is unable to
+  leave the dialog without creating or selecting a document.
+
+  This function is deprecated.
 */
@@ -339,6 +491,6 @@ void FileSelector::setCloseVisible( bool b )
 {
-    if ( b )
-        buttonClose->show();
+    if (  b )
+        d->toolbar->show();
     else
-        buttonClose->hide();
+        d->toolbar->hide();
 }
@@ -346,3 +498,3 @@ void FileSelector::setCloseVisible( bool b )
 /*!
-  Rereads the list of files.
+  Rereads the list of documents.
 */
@@ -350,4 +502,62 @@ void FileSelector::reread()
 {
-    view->reread();
+    d->files.clear();
+    Global::findDocuments(&d->files, filter);
+    d->typeCombo->reread( d->files, filter );
+    updateView();
 }
 
+void FileSelector::updateView()
+{
+    FileSelectorItem *item = (FileSelectorItem *)view->selectedItem();
+    if ( item == d->newDocItem )
+        item = 0;
+    QString oldFile;
+    if ( item )
+        oldFile = item->file().file();
+    view->clear();
+    QListIterator<DocLnk> dit( d->files.children() );
+    for ( ; dit.current(); ++dit ) {
+        bool mimeMatch = FALSE;
+        if ( d->mimeFilters.count() ) {
+            QValueList<QRegExp>::Iterator it;
+            for ( it = d->mimeFilters.begin(); it != d->mimeFilters.end(); ++it ) {
+                if ( (*it).match((*dit)->type()) >= 0 ) {
+                    mimeMatch = TRUE;
+                    break;
+                }
+            }
+        } else {
+            mimeMatch = TRUE;
+        }
+        if ( mimeMatch &&
+                (d->catId == -2 || (*dit)->categories().contains(d->catId) ||
+                 (d->catId == -1 && (*dit)->categories().isEmpty())) ) {
+            item = new FileSelectorItem( view, **dit );
+            if ( item->file().file() == oldFile )
+                view->setCurrentItem( item );
+        }
+    }
+
+    if ( d->showNew )
+        d->newDocItem = new NewDocItem( view, DocLnk() );
+    else
+        d->newDocItem = 0;
+
+    if ( !view->selectedItem() || view->childCount() == 1 ) {
+        view->setCurrentItem( view->firstChild() );
+        view->setSelected( view->firstChild(), TRUE );
+    }
+}
+
+void FileSelector::updateWhatsThis()
+{
+    QWhatsThis::remove( this );
+    QString text = tr("Click to select a document from the list");
+    if ( d->showNew )
+        text += tr(", or select <b>New Document</b> to create a new document.");
+    text += tr("<br><br>Click and hold for document properties.");
+    QWhatsThis::add( this, text );
+}
+
+#include "fileselector.moc"
+
diff --git a/library/fileselector.h b/library/fileselector.h
index 8cfdf13..1a6ace2 100644
--- a/library/fileselector.h
+++ b/library/fileselector.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -52,3 +52,3 @@ class FileSelector : public QVBox
 public:
-    FileSelector( const QString &mimefilter, QWidget *parent, const char *name, bool newVisible = TRUE, bool closeVisible = TRUE );
+    FileSelector( const QString &mimefilter, QWidget *parent, const char *name=0, bool newVisible = TRUE, bool closeVisible = TRUE );
     ~FileSelector();
@@ -58,3 +58,27 @@ public:
     int fileCount();
-    const DocLnk *selected();
+    DocLnk selectedDocument() const
+    {
+        const DocLnk* rp = ((FileSelector*)this)->selected();
+        if (!rp) {
+            DocLnk r;
+            return r;
+        }
+        DocLnk r(*rp);
+        delete rp;
+        return r;
+    }
+
+    QValueList<DocLnk> fileList() const
+    {
+        ((FileSelector*)this)->fileCount(); // ensure all loaded when this is extended
+
+        QValueList<DocLnk> list;
+        FileSelectorItem *item = (FileSelectorItem *)((QListView*)view)->firstChild();
+        while (item) {
+            list.append(item->file());
+            item = (FileSelectorItem *)item->nextSibling();
+        }
+
+        return list;
+    }
 
@@ -71,4 +95,12 @@ private slots:
     void fileClicked( QListViewItem *);
+    void typeSelected( const QString &type );
+    void catSelected( int );
+    void cardMessage( const QCString &, const QByteArray &);
+
+private:
+    void updateView();
+    void updateWhatsThis();
 
 private:
+    const DocLnk *selected(); // use selectedDocument()
     FileSelectorView *view;
diff --git a/library/fileselector_p.h b/library/fileselector_p.h
index 6bab485..13933ba 100644
--- a/library/fileselector_p.h
+++ b/library/fileselector_p.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -24,6 +24,2 @@
 
-class FileManager;
-class CategoryMenu;
-class FileSelectorViewPrivate;
-
 class FileSelectorView : public QListView
@@ -33,21 +29,7 @@ class FileSelectorView : public QListView
 public:
-    FileSelectorView( const QString &mimefilter, QWidget *parent, const char *name );
+    FileSelectorView( 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;
 };
diff --git a/library/finddialog.cpp b/library/finddialog.cpp
index 904e952..d9f430a 100644
--- a/library/finddialog.cpp
+++ b/library/finddialog.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -34,2 +34,3 @@ FindDialog::FindDialog( const QString &appName, QWidget *parent,
 {
+    setCaption( tr("Find") );
     QVBoxLayout *vb;
diff --git a/library/finddialog.h b/library/finddialog.h
index 00c7b45..2512533 100644
--- a/library/finddialog.h
+++ b/library/finddialog.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/findwidget_p.cpp b/library/findwidget_p.cpp
index 7ed8bca..9ecaa40 100644
--- a/library/findwidget_p.cpp
+++ b/library/findwidget_p.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/findwidget_p.h b/library/findwidget_p.h
index 418242c..e1329da 100644
--- a/library/findwidget_p.h
+++ b/library/findwidget_p.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/findwidgetbase_p.ui b/library/findwidgetbase_p.ui
index 5eceaad..393365e 100644
--- a/library/findwidgetbase_p.ui
+++ b/library/findwidgetbase_p.ui
@@ -13,4 +13,4 @@
             <y>0</y>
-            <width>245</width>
-            <height>183</height>
+            <width>246</width>
+            <height>203</height>
         </rect>
@@ -37,3 +37,3 @@
             <name>margin</name>
-            <number>0</number>
+            <number>6</number>
         </property>
@@ -41,3 +41,3 @@
             <name>spacing</name>
-            <number>0</number>
+            <number>4</number>
         </property>
@@ -92,3 +92,3 @@
                         <name>text</name>
-                        <string>&amp;Find</string>
+                        <string>Find</string>
                     </property>
@@ -232,2 +232,10 @@
             <property stdset="1">
+                <name>frameShape</name>
+                <enum>Panel</enum>
+            </property>
+            <property stdset="1">
+                <name>frameShadow</name>
+                <enum>Sunken</enum>
+            </property>
+            <property stdset="1">
                 <name>text</name>
diff --git a/library/fontdatabase.cpp b/library/fontdatabase.cpp
index 50dcf3d..c64e645 100644
--- a/library/fontdatabase.cpp
+++ b/library/fontdatabase.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -26,3 +26,5 @@
 
+#ifdef QWS
 #include <qfontmanager_qws.h>
+#endif
 #include <qdir.h>
@@ -60,16 +62,14 @@ QValueList<FontFactory> *FontDatabase::factoryList = 0;
 
-  Provides information about available fonts. 
-
-  FontDatabase provides information about the available fonts of the
-  underlying window system. 
+  Most often you will simply want to query the database for the
+  available font families().
 
-  Most often you will simply want to query the database for all font
-  families(), and their respective pointSizes(), styles() and charSets().
+  Use FontDatabase rather than QFontDatabase when you may need access
+  to fonts that are not normally available. For example, if the
+  freetype library and the Qtopia freetype plugin are installed,
+  TrueType fonts will be available to your application. Font renderer
+  plugins have greater resource requirements than system fonts so they
+  should be used only when necessary. You can force the loading of
+  font renderer plugins with loadRenderers().
 
-  Use FontDatabase rather than QFontDatabase when you may need access to
-  fonts not normally available.  For example, if the freetype library and
-  Qtopia freetype plugin are installed TrueType fonts will be available
-  to your application.  Font renderer plugins have greater resource
-  requirements than the system fonts so they should be used only when
-  necessary.
+  \ingroup qtopiaemb
 */
@@ -77,3 +77,3 @@ QValueList<FontFactory> *FontDatabase::factoryList = 0;
 /*!
-  Constructs the FontDatabase class.
+  Constructs a FontDatabase object.
 */
@@ -89,3 +89,3 @@ FontDatabase::FontDatabase()
 /*!
-  Returns a list of names of all available font families.
+  Returns a list of names of all the available font families.
 */
@@ -143,4 +143,4 @@ QValueList<int> FontDatabase::standardSizes()
 /*!
-  Load any font renderer plugins that are available and make fonts that
-  the plugins can read available.
+  Load any font renderer plugins that are available and make the fonts
+  that the plugins can read available.
 */
@@ -190,3 +190,2 @@ void FontDatabase::readFonts( QFontFactory *factory )
 {
-
     // Load in font definition file
@@ -222,3 +221,2 @@ void FontDatabase::readFonts( QFontFactory *factory )
                     qt_fontmanager->diskfonts.append(qdf);
-#ifndef QT_NO_FONTDATABASE
 #if QT_VERSION >= 232
@@ -226,3 +224,2 @@ void FontDatabase::readFonts( QFontFactory *factory )
 #endif
-#endif
                 }
diff --git a/library/fontdatabase.h b/library/fontdatabase.h
index 9160ab0..10aec91 100644
--- a/library/fontdatabase.h
+++ b/library/fontdatabase.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/fontmanager.cpp b/library/fontmanager.cpp
index adbe57b..28a5212 100644
--- a/library/fontmanager.cpp
+++ b/library/fontmanager.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -20,2 +20,3 @@
 
+#ifdef QWS
 #include "fontmanager.h"
@@ -101 +102,2 @@ QFont FontManager::unicodeFont( Spacing sp )
 }
+#endif
diff --git a/library/fontmanager.h b/library/fontmanager.h
index 7498df8..c4d2c78 100644
--- a/library/fontmanager.h
+++ b/library/fontmanager.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/global.cpp b/library/global.cpp
index ab27b3f..7438891 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -47,3 +47,5 @@
 
+#ifdef QWS
 #include <qwindowsystem_qws.h> // for qwsServer
+#endif
 #include <qdatetime.h>
@@ -58,3 +60,3 @@ namespace {
        return true;
-    
+
     QByteArray array = file.readAll();
@@ -110,2 +112,3 @@ StartingAppList::StartingAppList( QObject *parent, const char* name )
 {
+#ifdef QWS
 #if QT_VERSION >= 232 && !defined(QT_NO_COP)
@@ -115,2 +118,3 @@ StartingAppList::StartingAppList( QObject *parent, const char* name )
 #endif
+#endif
 }
@@ -171,3 +175,51 @@ static QString dictDir()
   \class Global global.h
-  \brief The Global class collects application-wide global functions.
+  \brief The Global class provides application-wide global functions.
+
+  The Global functions are grouped as follows:
+  \tableofcontents
+
+  \section1 User Interface
+
+  The statusMessage() function provides short-duration messages to the
+  user. The showInputMethod() function shows the current input method,
+  and hideInputMethod() hides the input method.
+
+  \section1 Document related
+
+  The findDocuments() function creates a set of \link doclnk.html
+  DocLnk\endlink objects in a particular folder.
+
+  \section1 Filesystem related
+
+  Global provides an applicationFileName() function that returns the
+  full path of an application-specific file.
+
+  The execute() function runs an application.
+
+  \section1 Word list related
+
+  A list of words relevant to the current locale is maintained by the
+  system. The list is held in a \link qdawg.html DAWG\endlink
+  (implemented by the QDawg class). This list is used, for example, by
+  the pickboard input method.
+
+  The global QDawg is returned by fixedDawg(); this cannot be updated.
+  An updatable copy of the global QDawg is returned by addedDawg().
+  Applications may have their own word lists stored in \l{QDawg}s
+  which are returned by dawg(). Use addWords() to add words to the
+  updateable copy of the global QDawg or to named application
+  \l{QDawg}s.
+
+  \section1 Quoting
+
+  The shellQuote() function quotes a string suitable for passing to a
+  shell. The stringQuote() function backslash escapes '\' and '"'
+  characters.
+
+  \section1 Hardware
+
+  The writeHWClock() function sets the hardware clock to the system
+  clock's date and time.
+
+  \ingroup qtopiaemb
 */
@@ -254,3 +306,3 @@ const QDawg& Global::dawg(const QString& name)
         named_dawg->insert(name,r);
-        QString dawgfilename = dictDir() + "/" + name + ".dawg";
+        QString dawgfilename = applicationFileName("Dictionary", name ) + ".dawg";
         QFile dawgfile(dawgfilename);
@@ -263,3 +315,8 @@ const QDawg& Global::dawg(const QString& name)
 /*!
+  \overload
   Adds \a wordlist to the addedDawg().
+
+  Note that the addition of words persists between program executions
+  (they are saved in the dictionary files), so you should confirm the
+  words with the user before adding them.
 */
@@ -271,3 +328,8 @@ void Global::addWords(const QStringList& wordlist)
 /*!
-  Adds \a wordlist to the dawg() named \a dictname.
+  \overload
+  Adds \a wordlist to the addedDawg().
+
+  Note that the addition of words persists between program executions
+  (they are saved in the dictionary files), so you should confirm the
+  words with the user before adding them.
 */
@@ -279,3 +341,3 @@ void Global::addWords(const QString& dictname, const QStringList& wordlist)
 
-    QString dawgfilename = dictDir() + "/" + dictname + ".dawg";
+    QString dawgfilename = applicationFileName("Dictionary", dictname) + ".dawg";
     QFile dawgfile(dawgfilename);
@@ -293,7 +355,7 @@ void Global::addWords(const QString& dictname, const QStringList& wordlist)
 /*!
-  Returns a full path for the application named \a appname, with the
-  given \a filename or QString::null if there was a problem creating
-  the directory tree for \a appname.  
-  If \a filename contains "/", it is the caller's responsibility to 
-  ensure those directories exist.
+  Returns the full path for the application called \a appname, with the
+  given \a filename. Returns QString::null if there was a problem creating
+  the directory tree for \a appname.
+  If \a filename contains "/", it is the caller's responsibility to
+  ensure that those directories exist.
 */
@@ -328,4 +390,4 @@ void Global::createDocDir()
 /*!
-  Displays a status \a message to the user. This generally appears
-  in the taskbar for some amount of time, then disappears.
+  Displays a status \a message to the user. This usually appears
+  in the taskbar for a short amount of time, then disappears.
 */
@@ -375,2 +437,9 @@ QWidget *Global::restart( bool )
   Explicitly show the current input method.
+
+  Input methods are indicated in the taskbar by a small icon. If the
+  input method is activated (shown) then it takes up some proportion
+  of the bottom of the screen, to allow the user to interact (input
+  characters) with it.
+
+  \sa hideInputMethod()
 */
@@ -385,2 +454,7 @@ void Global::showInputMethod()
   Explicitly hide the current input method.
+
+  The current input method is still indicated in the taskbar, but no
+  longer takes up screen space, and can no longer be interacted with.
+
+  \sa showInputMethod()
 */
@@ -467,2 +541,3 @@ void Global::terminate( const AppLnk* app )
 
+#ifndef QT_NO_COP
     QCString channel = "QPE/Application/" + app->exec().utf8();
@@ -471,2 +546,3 @@ void Global::terminate( const AppLnk* app )
     }
+#endif
 }
@@ -474,5 +550,9 @@ void Global::terminate( const AppLnk* app )
 /*!
-  Low-level function to run command \a c. Not recommended.
+  Low-level function to run command \a c.
+
+  \warning Do not use this function. Use execute instead.
+
+  \sa execute()
 */
-void Global::invoke(const QString &c) 
+void Global::invoke(const QString &c)
 {
@@ -484,3 +564,3 @@ void Global::invoke(const QString &c)
     // see if the application is already running
-    // XXX should lock file /tmp/qcop-msg-ap 
+    // XXX should lock file /tmp/qcop-msg-ap
     if ( QCopChannel::isRegistered( ("QPE/Application/" + ap).latin1() ) ) {
@@ -490,3 +570,3 @@ void Global::invoke(const QString &c)
     }
-    // XXX should unlock file /tmp/qcop-msg-ap 
+    // XXX should unlock file /tmp/qcop-msg-ap
     //see if it is being started
@@ -526,3 +606,3 @@ void Global::invoke(const QString &c)
         quickexecv( libexe.utf8().data(), (const char **)args );
-    } else 
+    } else
 #endif
@@ -543,7 +623,9 @@ void Global::invoke(const QString &c)
 
+
 /*!
-  Executes application identfied by \a c, passing \a document.
+  Executes the application identfied by \a c, passing \a
+  document if it isn't null.
 
-  Note that you might be better off sending a QCop message to
-  the application's QPE/Application/<i>appname</i> channel.
+  Note that a better approach might be to send a QCop message to the
+  application's QPE/Application/\e{appname} channel.
 */
@@ -579,4 +661,6 @@ void Global::execute( const QString &c, const QString& document )
                 }
+#ifndef QT_NO_COP
                 QCopEnvelope e("QPE/System", "notBusy(QString)" );
                 e << c; // that was quick ;-)
+#endif
                 return;
@@ -596,3 +680,3 @@ void Global::execute( const QString &c, const QString& document )
     if ( ap == "suspend" ) {
-                QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE );
+        QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE );
         return;
@@ -600,5 +684,6 @@ void Global::execute( const QString &c, const QString& document )
 
-    /* if need be, sending a qcop message will result in an invoke, see 
+    /* if need be, sending a qcop message will result in an invoke, see
        preceeding function */
-    { QCopEnvelope env( ("QPE/Application/" + ap).latin1(), "raise()" ); }
+    invoke( ap );
+    //{ QCopEnvelope env( ("QPE/Application/" + ap).latin1(), "raise()" ); }
     if ( !document.isEmpty() ) {
@@ -611,4 +696,6 @@ void Global::execute( const QString &c, const QString& document )
 /*!
-  Returns the string \a s with the characters backslash, ", and $
-  quoted by a preceeding backslash.
+  Returns the string \a s with the characters '\', '"', and '$' quoted
+  by a preceeding '\'.
+
+  \sa stringQuote()
 */
@@ -630,4 +717,6 @@ QString Global::shellQuote(const QString& s)
 /*!
-  Returns the string \a s with the characters backslash and "
-  quoted by a preceeding backslash.
+  Returns the string \a s with the characters '\' and '"' quoted by a
+  preceeding '\'.
+
+  \sa shellQuote()
 */
@@ -663,4 +752,4 @@ void Global::findDocuments(DocLnkSet* folder, const QString &mimefilter)
      *  d) the user wants to check and this medium as well
-     * 
-     *  In all cases we need to apply a different mimefilter to 
+     *
+     *  In all cases we need to apply a different mimefilter to
      *  the medium.
@@ -677,3 +766,3 @@ void Global::findDocuments(DocLnkSet* folder, const QString &mimefilter)
       if ( (*it)->isRemovable() ) { // let's find out  if we should search on it
-        // this is a candidate look at the cf and see if we should search on it 
+        // this is a candidate look at the cf and see if we should search on it
         QString path = (*it)->path();
@@ -715,12 +804,6 @@ QStringList Global::helpPath()
     path += QPEApplication::qpeDir() + "/pics";
-    path += QPEApplication::qpeDir() + "/help/en/html";
+    path += QPEApplication::qpeDir() + "/help/html";
     path += QPEApplication::qpeDir() + "/docs";
-    QString dir = QDir::current().canonicalPath();
-    if ( dir == "/" )
-        dir += "/docs";
-    else {
-        path += dir + "/../pics";
-        dir += "/../docs";
-        path += dir;
-    }
+
+
     return path;
diff --git a/library/global.h b/library/global.h
index fdf8754..1136b12 100644
--- a/library/global.h
+++ b/library/global.h
@@ -1,6 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2002 Holger 'zecke' Freyther <freyther@kde.org>
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -48,4 +47,2 @@ public:
     static void findDocuments(DocLnkSet* folder, const QString &mimefilter=QString::null);
-    // we don't need a mimefilter. Same as above but this is fast as light speed or not ;)
-    //static void findNewDocuments( DocLnkSet* folder ); 
 
@@ -61,3 +58,2 @@ public:
 
-    static void invoke( const QString &exec);
     static void execute( const QString &exec, const QString &document=QString::null );
@@ -88,2 +84,3 @@ public:
 private:
+    static void invoke( const QString &exec);
     static Command* builtin;
diff --git a/library/imagecodecinterface.h b/library/imagecodecinterface.h
new file mode 100644
index 0000000..8306b68
--- a/dev/null
+++ b/library/imagecodecinterface.h
@@ -0,0 +1,39 @@
+/**********************************************************************
+** 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 IMAGECODECINTERFACE_H
+#define IMAGECODECINTERFACE_H
+
+#include <qstringlist.h>
+#include <qpe/qcom.h>
+
+#ifndef QT_NO_COMPONENT
+#ifndef IID_QtopiaImageCodec
+#define IID_QtopiaImageCodec QUuid(0x09bf6906, 0x1549, 0xbb4a, 0x18, 0xba, 0xb9, 0xe7, 0x0a, 0x6e, 0x4d, 0x1e)
+#endif
+#endif
+
+struct ImageCodecInterface : public QUnknownInterface
+{
+public:
+    virtual QStringList keys() const = 0;
+    virtual bool installIOHandler( const QString &format ) = 0;
+};
+
+#endif
diff --git a/library/imageedit.cpp b/library/imageedit.cpp
index 0c22448..caa538a 100644
--- a/library/imageedit.cpp
+++ b/library/imageedit.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -22,3 +22,3 @@
 
-ImageEdit::ImageEdit( QWidget *parent, const char *name )
+ImageEdit::ImageEdit( QWidget *parent, const char *name)
     : QScrollView( parent, name, WNorthWestGravity | WResizeNoErase ), buffer()
diff --git a/library/imageedit.h b/library/imageedit.h
index ccedbcd..780aac9 100644
--- a/library/imageedit.h
+++ b/library/imageedit.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/inlinepics_p.h b/library/inlinepics_p.h
index c3b5ad1..52d184b 100644
--- a/library/inlinepics_p.h
+++ b/library/inlinepics_p.h
@@ -1,5 +1,6 @@
-#ifndef _1804289383
-#define _1804289383
+/* Generated by qembed */
+#ifndef _1733461185
+#define _1733461185
 #include <qimage.h>
-#include <qdict.h>
+#include <stdlib.h>
 static const QRgb _to1_data[] = {
@@ -7,11 +8,11 @@ static const QRgb _to1_data[] = {
     0x6000000,0xf000000,0x1d000000,0x3a000000,0x4c000000,0x39000000,0x21000000,0x1c000000,0x1c000000,0x22000000,0x3a000000,0x4c000000,0x39000000,0x1f000000,
-    0x10000000,0x25000000,0x51000000,0xb4595959,0xffffffff,0x76000000,0x42000000,0x3b000000,0x3e000000,0x5b000000,0xb4595959,0xffffffff,0x72000000,0x38000000,
-    0x1e000000,0x54000000,0xbc555555,0xffffffff,0xffffffff,0xa6000000,0x6d000000,0x65000000,0x7a000000,0xc4525252,0xffffffff,0xffffffff,0x9d000000,0x57000000,
-    0x45000000,0xb5595959,0xffffffff,0xffffffff,0xffffffff,0xcf000000,0xaa000000,0xa3000000,0xce4e4e4e,0xffffffff,0xffffffff,0xffffffff,0xb8000000,0x74000000,
-    0x88767676,0xffffffff,0xf4999999,0xffffffff,0xffffffff,0xf2424242,0xffffffff,0xdc494949,0xffffffff,0xf7979797,0xffffffff,0xffffffff,0xcd000000,0x8a000000,
-    0x48000000,0x84000000,0xc6000000,0xffffffff,0xffffffff,0xfa404040,0xf9c6c6c6,0xd5000000,0xcd000000,0xdd000000,0xffffffff,0xffffffff,0xd9000000,0x97000000,
+    0x10000000,0x25000000,0x51000000,0xb46b6b6b,0xffffffff,0x76000000,0x42000000,0x3b000000,0x3e000000,0x5b000000,0xb46b6b6b,0xffffffff,0x72000000,0x38000000,
+    0x1e000000,0x54000000,0xbc676767,0xffffffff,0xffffffff,0xa6000000,0x6d000000,0x65000000,0x7a000000,0xc4646464,0xffffffff,0xffffffff,0x9d000000,0x57000000,
+    0x45000000,0xb56b6b6b,0xffffffff,0xffffffff,0xffffffff,0xcf000000,0xaa000000,0xa3000000,0xce606060,0xffffffff,0xffffffff,0xffffffff,0xb8000000,0x74000000,
+    0x88878787,0xffffffff,0xf4a7a7a7,0xffffffff,0xffffffff,0xf2535353,0xffffffff,0xdc5b5b5b,0xffffffff,0xf7a5a5a5,0xffffffff,0xffffffff,0xcd000000,0x8a000000,
+    0x48000000,0x84000000,0xc6000000,0xffffffff,0xffffffff,0xfa515151,0xf9cfcfcf,0xd5000000,0xcd000000,0xdd000000,0xffffffff,0xffffffff,0xd9000000,0x97000000,
     0x2c000000,0x5e000000,0xb1000000,0xffffffff,0xffffffff,0xf8000000,0xdc000000,0xcc000000,0xc3000000,0xd3000000,0xffffffff,0xffffffff,0xdb000000,0x9a000000,
     0x25000000,0x53000000,0xa7000000,0xffffffff,0xffffffff,0xf0000000,0xd2000000,0xc2000000,0xb6000000,0xc8000000,0xffffffff,0xffffffff,0xd3000000,0x92000000,
-    0x1d000000,0x44000000,0x99000000,0xffffffff,0xffffffff,0xf1434343,0xf5c9c9c9,0xbc000000,0xa3000000,0xba000000,0xffffffff,0xffffffff,0xc4000000,0x83000000,
-    0x14000000,0x34000000,0x7d000000,0xffffffff,0xffffffff,0xe5464646,0xffffffff,0xab000000,0x8c000000,0x9e000000,0xffffffff,0xffffffff,0xa8000000,0x6e000000,
+    0x1d000000,0x44000000,0x99000000,0xffffffff,0xffffffff,0xf1545454,0xf5d1d1d1,0xbc000000,0xa3000000,0xba000000,0xffffffff,0xffffffff,0xc4000000,0x83000000,
+    0x14000000,0x34000000,0x7d000000,0xffffffff,0xffffffff,0xe5585858,0xffffffff,0xab000000,0x8c000000,0x9e000000,0xffffffff,0xffffffff,0xa8000000,0x6e000000,
     0xc000000,0x25000000,0x4d000000,0x84000000,0xa0000000,0xa2000000,0x92000000,0x7f000000,0x6c000000,0x6f000000,0x88000000,0x94000000,0x79000000,0x56000000,
@@ -21,3 +22,2 @@ static const QRgb _to1_data[] = {
 
-/* Generated by qembed */
 static const QRgb AddressBook_data[] = {
@@ -180,10 +180,10 @@ static const QRgb AppsIcon_data[] = {
     0xffffff,0xffffff,0xff000000,0xff000000,0xff000000,0xff000000,0x6c000000,0x5c000000,0xff000000,0xff000000,0xff000000,0xff000000,0x24000000,0xc000000,
-    0xffffff,0xffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0x9c000000,0x6c000000,0xff99cc00,0xff99cc00,0xff99cc00,0xff000000,0x6b000000,0x24000000,
-    0xffffff,0xffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xb4000000,0x74000000,0xff99cc00,0xff99cc00,0xff99cc00,0xff000000,0x8f000000,0x30000000,
-    0xffffff,0xffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xb4000000,0x74000000,0xff99cc00,0xff99cc00,0xff99cc00,0xff000000,0x8f000000,0x30000000,
+    0xffffff,0xffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0x9c000000,0x6c000000,0xffa7d400,0xffa7d400,0xffa7d400,0xff000000,0x6b000000,0x24000000,
+    0xffffff,0xffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xb4000000,0x74000000,0xffa7d400,0xffa7d400,0xffa7d400,0xff000000,0x8f000000,0x30000000,
+    0xffffff,0xffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xb4000000,0x74000000,0xffa7d400,0xffa7d400,0xffa7d400,0xff000000,0x8f000000,0x30000000,
     0xffffff,0xffffff,0x6c000000,0x9c000000,0xb4000000,0xb4000000,0x9c000000,0x6c000000,0x6c000000,0x9c000000,0xb4000000,0xb4000000,0x6b000000,0x24000000,
     0xffffff,0xffffff,0x5c000000,0x6c000000,0x74000000,0x74000000,0x6c000000,0x5c000000,0x5c000000,0x6c000000,0x74000000,0x74000000,0x24000000,0xc000000,
-    0xffffff,0xffffff,0xff000000,0xff99cc00,0xff99cc00,0xff99cc00,0x6c000000,0x5c000000,0xff99cc00,0xff99cc00,0xff99cc00,0xff000000,0x24000000,0xc000000,
-    0xffffff,0xffffff,0xff000000,0xff99cc00,0xff99cc00,0xff99cc00,0x9c000000,0x6c000000,0xff99cc00,0xff99cc00,0xff99cc00,0xff000000,0x6b000000,0x24000000,
-    0xffffff,0xffffff,0xff000000,0xff99cc00,0xff99cc00,0xff99cc00,0xb4000000,0x74000000,0xff99cc00,0xff99cc00,0xff99cc00,0xff000000,0x8f000000,0x30000000,
+    0xffffff,0xffffff,0xff000000,0xffa7d400,0xffa7d400,0xffa7d400,0x6c000000,0x5c000000,0xffa7d400,0xffa7d400,0xffa7d400,0xff000000,0x24000000,0xc000000,
+    0xffffff,0xffffff,0xff000000,0xffa7d400,0xffa7d400,0xffa7d400,0x9c000000,0x6c000000,0xffa7d400,0xffa7d400,0xffa7d400,0xff000000,0x6b000000,0x24000000,
+    0xffffff,0xffffff,0xff000000,0xffa7d400,0xffa7d400,0xffa7d400,0xb4000000,0x74000000,0xffa7d400,0xffa7d400,0xffa7d400,0xff000000,0x8f000000,0x30000000,
     0xffffff,0xffffff,0xff000000,0xff000000,0xff000000,0xff000000,0xb4000000,0x74000000,0xff000000,0xff000000,0xff000000,0xff000000,0x8f000000,0x30000000,
@@ -503,13 +503,13 @@ static const QRgb CloseButton_data[] = {
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0x3ed5d5d5,0x93d4d4d4,0xd5d8d8d8,0xfad5d5d5,0xd8c8c8c8,0x9ebebebe,0x508e8e8e,0xc000000,0x3000000,0xffffff,0xffffff,
-    0xffffff,0xffffff,0x60d5d5d5,0xdbdddddd,0xffdcdcdc,0xffcbcbcb,0xffc5c5c5,0xffc4c4c4,0xffd0d0d0,0xe6bbbbbb,0x837d7d7d,0x18000000,0x4000000,0xffffff,
-    0xffffff,0x3ed6d5d5,0xdbd3d3d3,0xffc1c1c1,0xff262626,0xff777777,0xffb7b6b7,0xff767576,0xff252525,0xffa4a5a4,0xec8f8e8f,0x75474747,0x18000000,0x3000000,
-    0xffffff,0x94cdcecd,0xffc8c7c7,0xff7b7b7b,0xff000000,0xff000000,0xff484848,0xff000000,0xff000000,0xff757675,0xff9d9c9c,0xc84f4f4f,0x3d000000,0xc000000,
-    0xffffff,0xd5c2c2c2,0xffafafaf,0xffa0a0a0,0xff686868,0xff000000,0xff000000,0xff000000,0xff656565,0xffa4a4a4,0xffa4a4a4,0xef4f4f4f,0x61000000,0x1a000000,
-    0xffffff,0xfab4b4b4,0xff9d9d9d,0xff959595,0xff696969,0xff000000,0xff000000,0xff000000,0xff626262,0xffa1a1a1,0xff939393,0xfd4b4b4b,0x7c000000,0x25000000,
-    0xffffff,0xd9a3a3a3,0xff919191,0xff6c6c6c,0xff000000,0xff000000,0xff393939,0xff000000,0xff000000,0xff696969,0xff7b7b7b,0xf2373737,0x85000000,0x2b000000,
-    0xffffff,0xa0848484,0xff8c8c8b,0xff858686,0xff292929,0xff585858,0xff929291,0xff5c5c5c,0xff262626,0xff868786,0xff585758,0xdf272727,0x7c000000,0x25000000,
-    0xffffff,0x515d5d5d,0xe7707070,0xff7c7c7c,0xff848484,0xff898a8a,0xff8c8c8c,0xff8f8f8f,0xff7f7f7f,0xff616061,0xf5313131,0xbb101010,0x61000000,0x1a000000,
-    0xffffff,0xc000000,0x843f3f3f,0xed505050,0xff5d5c5c,0xff6a6a69,0xff6c6c6c,0xff646364,0xff515051,0xf5313130,0xcd141414,0x83000000,0x3d000000,0xc000000,
-    0xffffff,0x3000000,0x18000000,0x76212121,0xc92b2b2b,0xf0303030,0xfd353535,0xf32a2a2a,0xdf1d1d1d,0xbb0d0d0d,0x83000000,0x4b000000,0x18000000,0x3000000,
+    0xffffff,0xffffff,0xffffff,0x3edcdcdc,0x93dbdbdb,0xd5dedede,0xfadcdcdc,0xd8d1d1d1,0x9ec8c8c8,0x509d9d9d,0xc000000,0x3000000,0xffffff,0xffffff,
+    0xffffff,0xffffff,0x60dcdcdc,0xdbe3e3e3,0xffe2e2e2,0xffd3d3d3,0xffcecece,0xffcdcdcd,0xffd7d7d7,0xe6c5c5c5,0x838d8d8d,0x18000000,0x4000000,0xffffff,
+    0xffffff,0x3edddcdc,0xdbdadada,0xffcbcbcb,0xff353535,0xff888888,0xffc2c1c2,0xff878687,0xff343434,0xffb1b2b1,0xec9e9d9e,0x75595959,0x18000000,0x3000000,
+    0xffffff,0x94d5d6d5,0xffd1d0d0,0xff8c8c8c,0xff000000,0xff000000,0xff5a5a5a,0xff000000,0xff000000,0xff868786,0xffabaaaa,0xc8616161,0x3d000000,0xc000000,
+    0xffffff,0xd5cbcbcb,0xffbbbbbb,0xffadadad,0xff7a7a7a,0xff000000,0xff000000,0xff000000,0xff777777,0xffb1b1b1,0xffb1b1b1,0xef616161,0x61000000,0x1a000000,
+    0xffffff,0xfabfbfbf,0xffababab,0xffa4a4a4,0xff7a7a7a,0xff000000,0xff000000,0xff000000,0xff747474,0xffaeaeae,0xffa2a2a2,0xfd5d5d5d,0x7c000000,0x25000000,
+    0xffffff,0xd9b0b0b0,0xffa0a0a0,0xff7d7d7d,0xff000000,0xff000000,0xff4a4a4a,0xff000000,0xff000000,0xff7a7a7a,0xff8c8c8c,0xf2484848,0x85000000,0x2b000000,
+    0xffffff,0xa0949494,0xff9b9b9a,0xff959696,0xff383838,0xff6a6a6a,0xffa1a1a0,0xff6e6e6e,0xff353535,0xff969796,0xff6a696a,0xdf363636,0x7c000000,0x25000000,
+    0xffffff,0x516f6f6f,0xe7818181,0xff8d8d8d,0xff949494,0xff999a9a,0xff9b9b9b,0xff9e9e9e,0xff8f8f8f,0xff737273,0xf5414141,0xbb1a1a1a,0x61000000,0x1a000000,
+    0xffffff,0xc000000,0x84505050,0xed626262,0xff6f6e6e,0xff7b7b7a,0xff7d7d7d,0xff767576,0xff636263,0xf5414140,0xcd1f1f1f,0x83000000,0x3d000000,0xc000000,
+    0xffffff,0x3000000,0x18000000,0x762f2f2f,0xc93b3b3b,0xf0404040,0xfd464646,0xf3393939,0xdf2a2a2a,0xbb161616,0x83000000,0x4b000000,0x18000000,0x3000000,
     0xffffff,0xffffff,0x4000000,0x18000000,0x3d000000,0x61000000,0x7c000000,0x85000000,0x7c000000,0x61000000,0x3d000000,0x18000000,0x4000000,0xffffff,
@@ -673,14 +673,14 @@ static const QRgb DateTime_data[] = {
 static const QRgb DocsIcon_data[] = {
-    0xffffff,0xffffff,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff555555,0x24000000,0xc000000,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xff000000,0xffffffff,0xffffffff,0xffdfdfdf,0xffb3b3b3,0xffffffff,0xff555555,0x3c000000,0xc000000,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xff000000,0xffffffff,0xffffffff,0xffd4d4d4,0xff898989,0xffffffff,0xffffffff,0xff555555,0x3c000000,0xc000000,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xff000000,0xfffdfdfd,0xfffdfdfd,0xffd2d2d2,0xff7d7d7d,0xffffffff,0xffffffff,0xffffffff,0xff555555,0x3c000000,0xc000000,0xffffff,
-    0xffffff,0xffffff,0xff000000,0xfffbfbfb,0xfffbfbfb,0xffd0d0d0,0xff7b7b7b,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff555555,0x3c000000,0xc000000,
-    0xffffff,0xffffff,0xff000000,0xfff8f8f8,0xfff6f6f6,0xffd6d6d6,0xff999999,0xff797979,0xff797979,0xff848484,0xffaeaeae,0xff000000,0x77000000,0x24000000,
-    0xffffff,0xffffff,0xff000000,0xfff3f3f3,0xfff1f1f1,0xffe5e5e5,0xffd0d0d0,0xffc6c6c6,0xffc7c7c7,0xffc8c8c8,0xffd5d5d5,0xff000000,0x8f000000,0x30000000,
-    0xffffff,0xffffff,0xff000000,0xffededed,0xffe9e9e9,0xffe7e7e7,0xffe5e5e5,0xffe5e5e5,0xffe7e7e7,0xffe9e9e9,0xffededed,0xff000000,0x8f000000,0x30000000,
-    0xffffff,0xffffff,0xff000000,0xffe7e7e7,0xffe2e2e2,0xffdedede,0xffdcdcdc,0xffdcdcdc,0xffdedede,0xffe2e2e2,0xffe7e7e7,0xff000000,0x8f000000,0x30000000,
-    0xffffff,0xffffff,0xff000000,0xffe0e0e0,0xffdadada,0xffd5d5d5,0xffd3d3d3,0xffd3d3d3,0xffd5d5d5,0xffdadada,0xffe0e0e0,0xff000000,0x8f000000,0x30000000,
-    0xffffff,0xffffff,0xff000000,0xffd9d9d9,0xffd1d1d1,0xffcbcbcb,0xffc8c8c8,0xffc8c8c8,0xffcbcbcb,0xffd1d1d1,0xffd9d9d9,0xff000000,0x8f000000,0x30000000,
-    0xffffff,0xffffff,0xff000000,0xffd9d9d9,0xffd1d1d1,0xffcbcbcb,0xffc8c8c8,0xffc8c8c8,0xffcbcbcb,0xffd1d1d1,0xffd9d9d9,0xff000000,0x8f000000,0x30000000,
+    0xffffff,0xffffff,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff676767,0x24000000,0xc000000,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xff000000,0xffffffff,0xffffffff,0xffe4e4e4,0xffbebebe,0xffffffff,0xff676767,0x3c000000,0xc000000,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xff000000,0xffffffff,0xffffffff,0xffdbdbdb,0xff999999,0xffffffff,0xffffffff,0xff676767,0x3c000000,0xc000000,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xff000000,0xfffdfdfd,0xfffdfdfd,0xffd9d9d9,0xff8d8d8d,0xffffffff,0xffffffff,0xffffffff,0xff676767,0x3c000000,0xc000000,0xffffff,
+    0xffffff,0xffffff,0xff000000,0xfffcfcfc,0xfffcfcfc,0xffd7d7d7,0xff8c8c8c,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff676767,0x3c000000,0xc000000,
+    0xffffff,0xffffff,0xff000000,0xfff9f9f9,0xfff8f8f8,0xffdddddd,0xffa7a7a7,0xff8a8a8a,0xff8a8a8a,0xff949494,0xffbababa,0xff000000,0x77000000,0x24000000,
+    0xffffff,0xffffff,0xff000000,0xfff5f5f5,0xfff3f3f3,0xffe9e9e9,0xffd7d7d7,0xffcfcfcf,0xffd0d0d0,0xffd1d1d1,0xffdcdcdc,0xff000000,0x8f000000,0x30000000,
+    0xffffff,0xffffff,0xff000000,0xfff0f0f0,0xffededed,0xffebebeb,0xffe9e9e9,0xffe9e9e9,0xffebebeb,0xffededed,0xfff0f0f0,0xff000000,0x8f000000,0x30000000,
+    0xffffff,0xffffff,0xff000000,0xffebebeb,0xffe7e7e7,0xffe3e3e3,0xffe2e2e2,0xffe2e2e2,0xffe3e3e3,0xffe7e7e7,0xffebebeb,0xff000000,0x8f000000,0x30000000,
+    0xffffff,0xffffff,0xff000000,0xffe5e5e5,0xffe0e0e0,0xffdcdcdc,0xffdadada,0xffdadada,0xffdcdcdc,0xffe0e0e0,0xffe5e5e5,0xff000000,0x8f000000,0x30000000,
+    0xffffff,0xffffff,0xff000000,0xffdfdfdf,0xffd8d8d8,0xffd3d3d3,0xffd1d1d1,0xffd1d1d1,0xffd3d3d3,0xffd8d8d8,0xffdfdfdf,0xff000000,0x8f000000,0x30000000,
+    0xffffff,0xffffff,0xff000000,0xffdfdfdf,0xffd8d8d8,0xffd3d3d3,0xffd1d1d1,0xffd1d1d1,0xffd3d3d3,0xffd8d8d8,0xffdfdfdf,0xff000000,0x8f000000,0x30000000,
     0xffffff,0xffffff,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0x8f000000,0x30000000,
@@ -692,74 +692,74 @@ static const QRgb DocumentTypeExcel_data[] = {
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x1000200,0x2000200,0x5000200,0x9000200,0x10000200,0x18000200,0x22000200,
-    0x2c000200,0x36000200,0x3f000200,0x45000200,0x4a000200,0x4d000200,0x4e000200,0x4e000200,0x4e000200,0x4c000200,0x49000200,0x45000200,0x3f000200,0x37000200,
-    0x2e000200,0x25000200,0x1c000200,0x13000200,0xd000200,0x8000200,0x4000200,0x2000200,0xffffff,0xffffff,0xffffff,0x1000200,0x3000200,0x7000200,
-    0xd000200,0x16000200,0x22000200,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,
-    0xff000000,0xff000000,0xfd282828,0x72434543,0x44000200,0x37000200,0x2b000200,0x1f000200,0x15000200,0xd000200,0x8000200,0x4000200,0xffffff,0xffffff,
-    0xffffff,0x1000200,0x4000200,0x9000200,0x11000200,0x1d000200,0x2c000200,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,
-    0xfffefefe,0xfffcfcfc,0xfff9f9f9,0xfff3f3f3,0xffe9e9e9,0xffdedede,0xffc8c8c8,0xfd272727,0x76303230,0x4e000200,0x3d000200,0x2e000200,0x21000200,0x16000200,
-    0xe000200,0x8000200,0xffffff,0xffffff,0xffffff,0x2000200,0x5000200,0xb000200,0x15000200,0x24000200,0x36000200,0xff000000,0xffffffff,0xffffffff,
-    0xffffffff,0xffffffff,0xfffefefe,0xfffefefe,0xfffdfdfd,0xfffcfcfc,0xfff6f6f6,0xffededed,0xffdedede,0xffcccccc,0xfffefefe,0xffb3b3b3,0xfd292929,0x802e302e,
-    0x53000200,0x40000200,0x2f000200,0x21000200,0x16000200,0xd000200,0xffffff,0xffffff,0xffffff,0x2000200,0x6000200,0xd000200,0x18000200,0x29000200,
-    0x3f000200,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,0xfffdfdfd,0xfffcfcfc,0xfffafafa,0xfff4f4f4,0xffe9e9e9,0xffd4d4d4,0xffbcbcbc,
-    0xffffffff,0xfffcfcfc,0xffa1a1a1,0xfd2b2b2b,0x7e262826,0x55000200,0x41000200,0x2f000200,0x20000200,0x15000200,0xffffff,0xffffff,0x1000200,0x2000200,
-    0x6000200,0xe000200,0x1b000200,0x2d000200,0x45000200,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffdfdfd,0xfffdfdfd,0xfffbfbfb,0xfff9f9f9,
-    0xfff2f2f2,0xffe4e4e4,0xffcdcdcd,0xffaeaeae,0xffffffff,0xffffffff,0xfffcfcfc,0xff949494,0xfd2e2e2e,0x7a1d1f1d,0x55000200,0x40000200,0x2d000200,0x1e000200,
-    0xffffff,0xffffff,0x1000200,0x2000200,0x7000200,0xf000200,0x1d000200,0x30000200,0x4a000200,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,
-    0xfffdfdfd,0xfffcfcfc,0xfffbfbfb,0xfff7f7f7,0xfff0f0f0,0xffe2e2e2,0xffc8c8c8,0xffa7a7a7,0xffffffff,0xffffffff,0xffffffff,0xfff9f9f9,0xff8e8e8e,0xfd343434,
-    0x781e1e1e,0x52000200,0x3c000200,0x29000200,0xffffff,0xffffff,0x1000200,0x3000200,0x7000200,0x10000200,0x1e000200,0x32000200,0x4d000200,0xff000000,
-    0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffcfcfc,0xfffbfbfb,0xfffafafa,0xfff7f7f7,0xfff0f0f0,0xffe1e1e1,0xffc8c8c8,0xffa6a6a6,0xffffffff,0xffffffff,
-    0xffffffff,0xffffffff,0xfff8f8f8,0xff8f8f8f,0xfc3b3b3b,0x70141714,0x4c000200,0x36000200,0x1000000,0x2000000,0x5000000,0x9000000,0xf000000,0x18000000,
-    0x27000000,0x3b000000,0x55000300,0xff000000,0xfff5f5f5,0xfff5f5f5,0xfff5f5f5,0xfff6f6f6,0xfff4f4f4,0xfff5f5f5,0xfff5f5f5,0xfff4f4f4,0xffefefef,0xffe4e4e4,
-    0xffcccccc,0xffadadad,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffafafa,0xff929292,0xfb434343,0x5c000200,0x42000200,0x4000000,0x7000000,
-    0xd000000,0x16000000,0x1e000000,0x2a000000,0x39000000,0x4d000000,0x65000000,0xff000000,0xffdedede,0xffdedede,0xffe0e0e0,0xffe3e3e3,0xffe3e3e3,0xffe7e7e7,
-    0xffececec,0xfff0f0f0,0xffededed,0xffe6e6e6,0xffd7d7d7,0xffbfbfbf,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffafafa,0xff2e2e2e,
-    0x6a000200,0x4e000200,0x7000000,0xf000000,0x1b000000,0x2b000000,0x39000000,0x49000000,0x58000000,0x69000000,0x7e000200,0xff000000,0xffb9b9b9,0xffb9b9b9,
-    0xffbcbcbc,0xffc3c3c3,0xffcbcbcb,0xffd4d4d4,0xffe1e1e1,0xffe8e8e8,0xffececec,0xffececec,0xffe2e2e2,0xffbbbbbb,0xff909090,0xff6e6e6e,0xff5d5d5d,0xff595959,
-    0xff5f5f5f,0xff7b7b7b,0xffa8a8a8,0xff000000,0x76000200,0x58000200,0xc000000,0x19000000,0xffee5358,0xffe84f53,0xffec8689,0xffe05a5e,0xffd84045,0xffdc5257,
-    0xffe47a7d,0xffd43337,0xffde5b60,0xffe16e72,0xffdb3a3f,0xffdc1c21,0xffdd191f,0xffbababa,0xffd0d0d0,0xffe0e0e0,0xffebebeb,0xffefefef,0xffc6c6c6,0xff919191,
-    0xff7c7c7c,0xff717171,0xff717171,0xff6c6c6c,0xff5f5f5f,0xff5e5e5e,0xff626262,0xff000000,0x80000200,0x60000200,0x12000000,0x26000000,0xffea5054,0xffee9a9c,
-    0xffffffff,0xffe9b1b3,0xffc2363a,0xffe6aeaf,0xffffffff,0xffd98689,0xffe9b6b7,0xffffffff,0xffd66669,0xffca171c,0xffce171d,0xff999999,0xffbcbcbc,0xffd5d5d5,
-    0xffe8e8e8,0xffd2d2d2,0xff9d9d9d,0xff8b8b8b,0xff959595,0xffb5b5b5,0xffc5c5c5,0xffc6c6c6,0xffbababa,0xff818181,0xff5c5c5c,0xff000000,0x87000200,0x66000200,
-    0x17000000,0x2f000000,0xffe84c50,0xffde5b5f,0xfffefafa,0xfffefbfb,0xffbe6366,0xfffdfbfb,0xfffdfafa,0xffad3a3e,0xffe1b3b4,0xffffffff,0xffc66265,0xffb71519,
-    0xffbf161a,0xff818181,0xffaaaaaa,0xffcecece,0xffd8d8d8,0xffb1b1b1,0xff9a9a9a,0xffa8a8a8,0xffe1e1e1,0xfff1f1f1,0xfff5f5f5,0xfff0f0f0,0xffc9c9c9,0xffe2e2e2,
-    0xff909090,0xff000000,0x8b000200,0x6a000200,0x1b000000,0x37000000,0xffe8484d,0xffd63f44,0xffe8b3b4,0xffffffff,0xfff1e2e3,0xffffffff,0xffd3a9aa,0xff8f171a,
-    0xffdcb1b2,0xffffffff,0xffbb6163,0xffa71317,0xffb31519,0xff6d6d6d,0xff9e9e9e,0xffc5c5c5,0xffc1c1c1,0xffa6a6a6,0xffa4a4a4,0xffdedede,0xfff9f9f9,0xfff6f6f6,
-    0xfff5f5f5,0xffa2a2a2,0xff686868,0xffa9a9a9,0xffdbdbdb,0xff000000,0x8e000200,0x6d000200,0x1d000000,0x3c000000,0xffe84449,0xffd83b3f,0xffca5053,0xfffefcfc,
-    0xffffffff,0xfffdfcfc,0xff91383a,0xff851114,0xffd9afb0,0xffffffff,0xffb46062,0xff9c1215,0xffaa1317,0xff616161,0xff979797,0xffbebebe,0xffb5b5b5,0xffa5a5a5,
-    0xffbbbbbb,0xfff3f3f3,0xfffafafa,0xfff9f9f9,0xffaaaaaa,0xff6b6b6b,0xff656565,0xff8c8c8c,0xffececec,0xff000000,0x8f000200,0x6e000200,0x1f000000,0x3e000000,
-    0xffea3f44,0xffdb373b,0xffc12c30,0xfff4e7e7,0xffffffff,0xfff0e5e5,0xff781012,0xff810f12,0xffd7afb0,0xffffffff,0xffb16062,0xff961115,0xffa41216,0xff5c5c5c,
-    0xff939393,0xffbbbbbb,0xffaeaeae,0xffa5a5a5,0xffc5c5c5,0xfffcfcfc,0xfffbfbfb,0xffaeaeae,0xff717171,0xff696969,0xff6f6f6f,0xffdfdfdf,0xffffffff,0xff000000,
-    0x90000200,0x6e000200,0x1f000000,0x3d000000,0xffec3b40,0xffdb3236,0xffcf5256,0xfffffefe,0xffffffff,0xfffefefe,0xff913e40,0xff7e0e11,0xffd6afb0,0xffffffff,
-    0xffad5f62,0xff901114,0xff9d1216,0xff5b5b5b,0xff929292,0xffbbbbbb,0xffb1b1b1,0xffa1a1a1,0xffbcbcbc,0xfff8f8f8,0xffb0b0b0,0xff757575,0xff6d6d6d,0xff656565,
-    0xff626262,0xff959595,0xfff2f2f2,0xff000000,0x90000200,0x6f000200,0x1f000000,0x3e000000,0xffe9353a,0xffd92c31,0xffecbfc1,0xffffffff,0xfff3e9e9,0xffffffff,
-    0xffd6baba,0xff770e11,0xffd4afb0,0xffffffff,0xffa85e60,0xff850f13,0xff931114,0xff595959,0xff909090,0xffbdbdbd,0xffbcbcbc,0xff9a9a9a,0xff9f9f9f,0xffe6e6e6,
-    0xffadadad,0xff6d6d6d,0xff8c8c8c,0xff8b8b8b,0xff575757,0xff555555,0xff838383,0xff000000,0x90000200,0x6f000200,0x1f000000,0x3e000000,0xffe82e32,0xffdf575b,
-    0xffffffff,0xffffffff,0xffaf6a6c,0xffffffff,0xffffffff,0xff954548,0xffd3afb0,0xffffffff,0xffe0c9ca,0xffd4afb0,0xff8b1013,0xff585858,0xff8e8e8e,0xffbdbdbd,
-    0xffcccccc,0xff9a9a9a,0xff848484,0xffa8a8a8,0xffededed,0xffbbbbbb,0xffe7e7e7,0xfffbfbfb,0xff8f8f8f,0xff565656,0xff565656,0xff000000,0x90000200,0x6f000200,
-    0x1d000000,0x3c000000,0xffe5262c,0xffe2696d,0xfffcf6f6,0xffe5bfc0,0xff850f12,0xffdcbebf,0xfffaf6f6,0xffa75f61,0xffd3afb0,0xffffffff,0xffffffff,0xffffffff,
-    0xff860f12,0xff5b5b5b,0xff919191,0xffbcbcbc,0xffdedede,0xffbbbbbb,0xff7c7c7c,0xff707070,0xff979797,0xffd6d6d6,0xffe3e3e3,0xffe6e6e6,0xffc2c2c2,0xff5e5e5e,
-    0xff575757,0xff000000,0x90000200,0x6f000200,0x1b000000,0x37000000,0xffe42025,0xffd5181e,0xffc3262b,0xffb13033,0xff941115,0xff9c2d31,0xff8f2024,0xff860f12,
-    0xff850f13,0xff7e0e12,0xff7d0e11,0xff820f12,0xff881013,0xff686868,0xff979797,0xffbfbfbf,0xffdfdfdf,0xffebebeb,0xffababab,0xff6c6c6c,0xff646464,0xff676767,
-    0xff757575,0xff757575,0xff6b6b6b,0xff5b5b5b,0xff5b5b5b,0xff000000,0x90000200,0x6f000200,0x17000000,0x2f000000,0xffe41a20,0xffd4181d,0xffc4161c,0xffb41419,
-    0xffa61317,0xffa21217,0xff9b1215,0xff981215,0xff951115,0xff8f1114,0xff8d1013,0xff8e1014,0xff911015,0xff7c7c7c,0xffa5a5a5,0xffc8c8c8,0xffdedede,0xfff0f0f0,
-    0xfff3f3f3,0xffbdbdbd,0xff868686,0xff606060,0xff606060,0xff606060,0xff606060,0xff838383,0xffb3b3b3,0xff000000,0x90000200,0x6e000200,0x12000000,0x26000000,
-    0x41000000,0x64000000,0x7f000000,0x98000000,0xa9000000,0xb5000000,0xbf000000,0xff000000,0xff5c5c5c,0xff5b5b5b,0xff616161,0xff6c6c6c,0xff7d7d7d,0xff989898,
-    0xffb8b8b8,0xffd0d0d0,0xffe4e4e4,0xffececec,0xfff5f5f5,0xfff8f8f8,0xffe7e7e7,0xffcfcfcf,0xffbfbfbf,0xffbfbfbf,0xffcecece,0xffe6e6e6,0xfff9f9f9,0xff000000,
-    0x8e000200,0x6d000200,0xc000000,0x18000000,0x2b000000,0x41000000,0x55000000,0x68000000,0x78000000,0x88000000,0x98000000,0xff000000,0xff949494,0xff939393,
-    0xff979797,0xff9f9f9f,0xffaaaaaa,0xffbababa,0xffcecece,0xffdedede,0xffe9e9e9,0xffefefef,0xfff2f2f2,0xfff3f3f3,0xfff6f6f6,0xfff7f7f7,0xfff7f7f7,0xfff7f7f7,
-    0xfff7f7f7,0xfff5f5f5,0xfff2f2f2,0xff000000,0x8c000200,0x6b000200,0x7000000,0xf000000,0x19000000,0x27000000,0x34000000,0x43000000,0x52000000,0x63000000,
-    0x76000000,0xff000000,0xffc2c2c2,0xffc2c2c2,0xffc4c4c4,0xffc9c9c9,0xffcecece,0xffd5d5d5,0xffe1e1e1,0xffe8e8e8,0xffefefef,0xfff3f3f3,0xfff4f4f4,0xfff4f4f4,
-    0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xff000000,0x87000200,0x68000200,0x4000000,0x7000000,0xd000000,0x14000000,
-    0x1c000000,0x28000000,0x35000000,0x47000000,0x5c000300,0xff000000,0xffe0e0e0,0xffe0e0e0,0xffe2e2e2,0xffe4e4e4,0xffe4e4e4,0xffe8e8e8,0xffeeeeee,0xfff1f1f1,
-    0xfff3f3f3,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xff000000,0x7f000200,0x61000200,
-    0x1000000,0x2000000,0x4000000,0x8000000,0xe000000,0x16000000,0x21000000,0x31000000,0x47000000,0xff000000,0xfff5f5f5,0xfff5f5f5,0xfff5f5f5,0xfff6f6f6,
-    0xfff7f7f7,0xfff9f9f9,0xfffbfbfb,0xfffdfdfd,0xfffefefe,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,
-    0xffffffff,0xff000000,0x73000200,0x58000200,0xffffff,0xffffff,0xffffff,0x2000200,0x5000200,0xb000200,0x15000200,0x24000200,0x36000200,0xff000000,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x1000500,0x2000500,0x5000500,0x9000500,0x10000500,0x18000500,0x22000500,
+    0x2c000500,0x36000500,0x3f000500,0x45000500,0x4a000500,0x4d000500,0x4e000500,0x4e000500,0x4e000500,0x4c000500,0x49000500,0x45000500,0x3f000500,0x37000500,
+    0x2e000500,0x25000500,0x1c000500,0x13000500,0xd000500,0x8000500,0x4000500,0x2000500,0xffffff,0xffffff,0xffffff,0x1000500,0x3000500,0x7000500,
+    0xd000500,0x16000500,0x22000500,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,
+    0xff000000,0xff000000,0xfd373737,0x72545754,0x44000500,0x37000500,0x2b000500,0x1f000500,0x15000500,0xd000500,0x8000500,0x4000500,0xffffff,0xffffff,
+    0xffffff,0x1000500,0x4000500,0x9000500,0x11000500,0x1d000500,0x2c000500,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,
+    0xfffefefe,0xfffdfdfd,0xfffafafa,0xfff5f5f5,0xffededed,0xffe3e3e3,0xffd1d1d1,0xfd363636,0x76404240,0x4e000500,0x3d000500,0x2e000500,0x21000500,0x16000500,
+    0xe000500,0x8000500,0xffffff,0xffffff,0xffffff,0x2000500,0x5000500,0xb000500,0x15000500,0x24000500,0x36000500,0xff000000,0xffffffff,0xffffffff,
+    0xffffffff,0xffffffff,0xfffefefe,0xfffefefe,0xfffdfdfd,0xfffdfdfd,0xfff8f8f8,0xfff0f0f0,0xffe3e3e3,0xffd4d4d4,0xfffefefe,0xffbebebe,0xfd383838,0x803e403e,
+    0x53000500,0x40000500,0x2f000500,0x21000500,0x16000500,0xd000500,0xffffff,0xffffff,0xffffff,0x2000500,0x6000500,0xd000500,0x18000500,0x29000500,
+    0x3f000500,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,0xfffdfdfd,0xfffdfdfd,0xfffbfbfb,0xfff6f6f6,0xffededed,0xffdbdbdb,0xffc6c6c6,
+    0xffffffff,0xfffdfdfd,0xffaeaeae,0xfd3b3b3b,0x7e353735,0x55000500,0x41000500,0x2f000500,0x20000500,0x15000500,0xffffff,0xffffff,0x1000500,0x2000500,
+    0x6000500,0xe000500,0x1b000500,0x2d000500,0x45000500,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffdfdfd,0xfffdfdfd,0xfffcfcfc,0xfffafafa,
+    0xfff4f4f4,0xffe8e8e8,0xffd5d5d5,0xffbababa,0xffffffff,0xffffffff,0xfffdfdfd,0xffa3a3a3,0xfd3e3e3e,0x7a2a2d2a,0x55000500,0x40000500,0x2d000500,0x1e000500,
+    0xffffff,0xffffff,0x1000500,0x2000500,0x7000500,0xf000500,0x1d000500,0x30000500,0x4a000500,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,
+    0xfffdfdfd,0xfffdfdfd,0xfffcfcfc,0xfff8f8f8,0xfff3f3f3,0xffe7e7e7,0xffd1d1d1,0xffb4b4b4,0xffffffff,0xffffffff,0xffffffff,0xfffafafa,0xff9d9d9d,0xfd454545,
+    0x782b2b2b,0x52000500,0x3c000500,0x29000500,0xffffff,0xffffff,0x1000500,0x3000500,0x7000500,0x10000500,0x1e000500,0x32000500,0x4d000500,0xff000000,
+    0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffdfdfd,0xfffcfcfc,0xfffbfbfb,0xfff8f8f8,0xfff3f3f3,0xffe6e6e6,0xffd1d1d1,0xffb3b3b3,0xffffffff,0xffffffff,
+    0xffffffff,0xffffffff,0xfff9f9f9,0xff9e9e9e,0xfc4c4c4c,0x701f231f,0x4c000500,0x36000500,0x1000000,0x2000000,0x5000000,0x9000000,0xf000000,0x18000000,
+    0x27000000,0x3b000000,0x55000600,0xff000000,0xfff7f7f7,0xfff7f7f7,0xfff7f7f7,0xfff8f8f8,0xfff6f6f6,0xfff7f7f7,0xfff7f7f7,0xfff6f6f6,0xfff2f2f2,0xffe8e8e8,
+    0xffd4d4d4,0xffb9b9b9,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffbfbfb,0xffa1a1a1,0xfb545454,0x5c000500,0x42000500,0x4000000,0x7000000,
+    0xd000000,0x16000000,0x1e000000,0x2a000000,0x39000000,0x4d000000,0x65000000,0xff000000,0xffe3e3e3,0xffe3e3e3,0xffe5e5e5,0xffe8e8e8,0xffe8e8e8,0xffebebeb,
+    0xffefefef,0xfff3f3f3,0xfff0f0f0,0xffeaeaea,0xffdddddd,0xffc9c9c9,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffbfbfb,0xff3e3e3e,
+    0x6a000500,0x4e000500,0x7000000,0xf000000,0x1b000000,0x2b000000,0x39000000,0x49000000,0x58000000,0x69000000,0x7e000500,0xff000000,0xffc4c4c4,0xffc4c4c4,
+    0xffc6c6c6,0xffcccccc,0xffd3d3d3,0xffdbdbdb,0xffe6e6e6,0xffececec,0xffefefef,0xffefefef,0xffe7e7e7,0xffc5c5c5,0xff9f9f9f,0xff7f7f7f,0xff6f6f6f,0xff6b6b6b,
+    0xff717171,0xff8c8c8c,0xffb5b5b5,0xff000000,0x76000500,0x58000500,0xc000000,0x19000000,0xfff1656a,0xffec6165,0xffef9699,0xffe56c70,0xffde5157,0xffe26469,
+    0xffe88b8d,0xffdb4348,0xffe36d72,0xffe67f83,0xffe14b50,0xffe2292f,0xffe3252d,0xffc4c4c4,0xffd7d7d7,0xffe5e5e5,0xffeeeeee,0xfff2f2f2,0xffcfcfcf,0xffa0a0a0,
+    0xff8d8d8d,0xff828282,0xff828282,0xff7d7d7d,0xff717171,0xff707070,0xff747474,0xff000000,0x80000500,0x60000500,0x12000000,0x26000000,0xffee6266,0xfff1a8aa,
+    0xffffffff,0xffedbdbe,0xffcb474b,0xffeababb,0xffffffff,0xffdf9699,0xffedc1c2,0xffffffff,0xffdd787a,0xffd22329,0xffd6232a,0xffa7a7a7,0xffc6c6c6,0xffdcdcdc,
+    0xffececec,0xffd9d9d9,0xffababab,0xff9a9a9a,0xffa4a4a4,0xffc0c0c0,0xffcecece,0xffcfcfcf,0xffc4c4c4,0xff919191,0xff6e6e6e,0xff000000,0x87000500,0x66000500,
+    0x17000000,0x2f000000,0xffec5e62,0xffe36d71,0xfffefbfb,0xfffefcfc,0xffc87578,0xfffdfcfc,0xfffdfbfb,0xffb94b4f,0xffe6bebf,0xffffffff,0xffcf7477,0xffc22025,
+    0xffc92227,0xff919191,0xffb6b6b6,0xffd6d6d6,0xffdedede,0xffbdbdbd,0xffa8a8a8,0xffb5b5b5,0xffe6e6e6,0xfff3f3f3,0xfff7f7f7,0xfff3f3f3,0xffd1d1d1,0xffe7e7e7,
+    0xff9f9f9f,0xff000000,0x8b000500,0x6a000500,0x1b000000,0x37000000,0xffec5a5f,0xffdd5056,0xffecbebf,0xffffffff,0xfff3e7e8,0xffffffff,0xffdab6b6,0xff9e2327,
+    0xffe2bdbd,0xffffffff,0xffc57375,0xffb41e23,0xffbe2025,0xff7e7e7e,0xffacacac,0xffcecece,0xffcbcbcb,0xffb3b3b3,0xffb1b1b1,0xffe3e3e3,0xfffafafa,0xfff8f8f8,
+    0xfff7f7f7,0xffafafaf,0xff7a7a7a,0xffb6b6b6,0xffe1e1e1,0xff000000,0x8e000500,0x6d000500,0x1d000000,0x3c000000,0xffec565b,0xffde4c50,0xffd26265,0xfffefdfd,
+    0xffffffff,0xfffdfdfd,0xffa0494b,0xff951b1f,0xffdfbbbc,0xffffffff,0xffbf7274,0xffaa1d20,0xffb61e23,0xff737373,0xffa5a5a5,0xffc8c8c8,0xffc0c0c0,0xffb2b2b2,
+    0xffc5c5c5,0xfff5f5f5,0xfffbfbfb,0xfffafafa,0xffb6b6b6,0xff7c7c7c,0xff777777,0xff9b9b9b,0xffefefef,0xff000000,0x8f000500,0x6e000500,0x1f000000,0x3e000000,
+    0xffee5056,0xffe1484c,0xffcb3c40,0xfff6ebeb,0xffffffff,0xfff3e9e9,0xff891a1d,0xff91191d,0xffddbbbc,0xffffffff,0xffbd7274,0xffa41b20,0xffb11d22,0xff6e6e6e,
+    0xffa2a2a2,0xffc5c5c5,0xffbababa,0xffb2b2b2,0xffcecece,0xfffdfdfd,0xfffcfcfc,0xffbababa,0xff828282,0xff7a7a7a,0xff808080,0xffe4e4e4,0xffffffff,0xff000000,
+    0x90000500,0x6e000500,0x1f000000,0x3d000000,0xffef4c51,0xffe14247,0xffd76468,0xfffffefe,0xffffffff,0xfffefefe,0xffa04f51,0xff8e171b,0xffddbbbc,0xffffffff,
+    0xffb97174,0xff9f1b1f,0xffab1d22,0xff6d6d6d,0xffa1a1a1,0xffc5c5c5,0xffbdbdbd,0xffaeaeae,0xffc6c6c6,0xfff9f9f9,0xffbcbcbc,0xff868686,0xff7e7e7e,0xff777777,
+    0xff747474,0xffa4a4a4,0xfff4f4f4,0xff000000,0x90000500,0x6f000500,0x1f000000,0x3e000000,0xffed464b,0xffdf3c41,0xffefc9cb,0xffffffff,0xfff5eded,0xffffffff,
+    0xffddc4c4,0xff88171b,0xffdbbbbc,0xffffffff,0xffb57072,0xff95191e,0xffa21b1f,0xff6b6b6b,0xff9f9f9f,0xffc7c7c7,0xffc6c6c6,0xffa8a8a8,0xffadadad,0xffeaeaea,
+    0xffb9b9b9,0xff7e7e7e,0xff9b9b9b,0xff9a9a9a,0xff696969,0xff676767,0xff939393,0xff000000,0x90000500,0x6f000500,0x1f000000,0x3e000000,0xffec3e42,0xffe4696d,
+    0xffffffff,0xffffffff,0xffbb7b7d,0xffffffff,0xffffffff,0xffa4575a,0xffdabbbc,0xffffffff,0xffe5d1d2,0xffdbbbbc,0xff9a1a1e,0xff6a6a6a,0xff9d9d9d,0xffc7c7c7,
+    0xffd4d4d4,0xffa8a8a8,0xff949494,0xffb5b5b5,0xfff0f0f0,0xffc5c5c5,0xffebebeb,0xfffcfcfc,0xff9e9e9e,0xff686868,0xff686868,0xff000000,0x90000500,0x6f000500,
+    0x1d000000,0x3c000000,0xffe9353c,0xffe77a7e,0xfffdf8f8,0xffe9c9ca,0xff95191d,0xffe2c8c9,0xfffbf8f8,0xffb47173,0xffdabbbc,0xffffffff,0xffffffff,0xffffffff,
+    0xff96191d,0xff6d6d6d,0xffa0a0a0,0xffc6c6c6,0xffe3e3e3,0xffc5c5c5,0xff8d8d8d,0xff818181,0xffa5a5a5,0xffdddddd,0xffe8e8e8,0xffeaeaea,0xffcbcbcb,0xff707070,
+    0xff696969,0xff000000,0x90000500,0x6f000500,0x1b000000,0x37000000,0xffe82e34,0xffdc242b,0xffcc353b,0xffbd4043,0xffa31b20,0xffaa3d41,0xff9e2e33,0xff96191d,
+    0xff95191e,0xff8e171d,0xff8d171b,0xff92191d,0xff981a1e,0xff7a7a7a,0xffa5a5a5,0xffc9c9c9,0xffe4e4e4,0xffeeeeee,0xffb7b7b7,0xff7d7d7d,0xff767676,0xff797979,
+    0xff868686,0xff868686,0xff7c7c7c,0xff6d6d6d,0xff6d6d6d,0xff000000,0x90000500,0x6f000500,0x17000000,0x2f000000,0xffe8272e,0xffdb242a,0xffcd2229,0xffbf1f25,
+    0xffb31e23,0xffaf1d23,0xffa91d20,0xffa61d20,0xffa41b20,0xff9e1b1f,0xff9c1a1e,0xff9d1a1f,0xffa01a20,0xff8d8d8d,0xffb2b2b2,0xffd1d1d1,0xffe3e3e3,0xfff3f3f3,
+    0xfff5f5f5,0xffc7c7c7,0xff969696,0xff727272,0xff727272,0xff727272,0xff727272,0xff939393,0xffbebebe,0xff000000,0x90000500,0x6e000500,0x12000000,0x26000000,
+    0x41000000,0x64000000,0x7f000000,0x98000000,0xa9000000,0xb5000000,0xbf000000,0xff000000,0xff6e6e6e,0xff6d6d6d,0xff737373,0xff7d7d7d,0xff8d8d8d,0xffa6a6a6,
+    0xffc3c3c3,0xffd7d7d7,0xffe8e8e8,0xffefefef,0xfff7f7f7,0xfff9f9f9,0xffebebeb,0xffd7d7d7,0xffc9c9c9,0xffc9c9c9,0xffd6d6d6,0xffeaeaea,0xfffafafa,0xff000000,
+    0x8e000500,0x6d000500,0xc000000,0x18000000,0x2b000000,0x41000000,0x55000000,0x68000000,0x78000000,0x88000000,0x98000000,0xff000000,0xffa3a3a3,0xffa2a2a2,
+    0xffa5a5a5,0xffadadad,0xffb6b6b6,0xffc4c4c4,0xffd6d6d6,0xffe3e3e3,0xffededed,0xfff2f2f2,0xfff4f4f4,0xfff5f5f5,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,
+    0xfff8f8f8,0xfff7f7f7,0xfff4f4f4,0xff000000,0x8c000500,0x6b000500,0x7000000,0xf000000,0x19000000,0x27000000,0x34000000,0x43000000,0x52000000,0x63000000,
+    0x76000000,0xff000000,0xffcbcbcb,0xffcbcbcb,0xffcdcdcd,0xffd1d1d1,0xffd6d6d6,0xffdcdcdc,0xffe6e6e6,0xffececec,0xfff2f2f2,0xfff5f5f5,0xfff6f6f6,0xfff6f6f6,
+    0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xff000000,0x87000500,0x68000500,0x4000000,0x7000000,0xd000000,0x14000000,
+    0x1c000000,0x28000000,0x35000000,0x47000000,0x5c000600,0xff000000,0xffe5e5e5,0xffe5e5e5,0xffe7e7e7,0xffe8e8e8,0xffe8e8e8,0xffececec,0xfff1f1f1,0xfff3f3f3,
+    0xfff5f5f5,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xff000000,0x7f000500,0x61000500,
+    0x1000000,0x2000000,0x4000000,0x8000000,0xe000000,0x16000000,0x21000000,0x31000000,0x47000000,0xff000000,0xfff7f7f7,0xfff7f7f7,0xfff7f7f7,0xfff8f8f8,
+    0xfff8f8f8,0xfffafafa,0xfffcfcfc,0xfffdfdfd,0xfffefefe,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,
+    0xffffffff,0xff000000,0x73000500,0x58000500,0xffffff,0xffffff,0xffffff,0x2000500,0x5000500,0xb000500,0x15000500,0x24000500,0x36000500,0xff000000,
     0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,
-    0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0x63000200,0x4c000200,0xffffff,0xffffff,0xffffff,0x1000200,0x4000200,0x9000200,
-    0x11000200,0x1d000200,0x2c000200,0x3e000200,0x51000200,0x63000200,0x73000200,0x7f000200,0x87000200,0x8c000200,0x8e000200,0x90000200,0x90000200,0x90000200,
-    0x90000200,0x90000200,0x90000200,0x90000200,0x8e000200,0x8c000200,0x87000200,0x7f000200,0x73000200,0x63000200,0x51000200,0x3e000200,0xffffff,0xffffff,
-    0xffffff,0x1000200,0x3000200,0x7000200,0xd000200,0x16000200,0x22000200,0x30000200,0x3e000200,0x4c000200,0x58000200,0x61000200,0x68000200,0x6b000200,
-    0x6d000200,0x6e000200,0x6f000200,0x6f000200,0x6f000200,0x6f000200,0x6f000200,0x6e000200,0x6d000200,0x6b000200,0x68000200,0x61000200,0x58000200,0x4c000200,
-    0x3e000200,0x30000200
+    0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0x63000500,0x4c000500,0xffffff,0xffffff,0xffffff,0x1000500,0x4000500,0x9000500,
+    0x11000500,0x1d000500,0x2c000500,0x3e000500,0x51000500,0x63000500,0x73000500,0x7f000500,0x87000500,0x8c000500,0x8e000500,0x90000500,0x90000500,0x90000500,
+    0x90000500,0x90000500,0x90000500,0x90000500,0x8e000500,0x8c000500,0x87000500,0x7f000500,0x73000500,0x63000500,0x51000500,0x3e000500,0xffffff,0xffffff,
+    0xffffff,0x1000500,0x3000500,0x7000500,0xd000500,0x16000500,0x22000500,0x30000500,0x3e000500,0x4c000500,0x58000500,0x61000500,0x68000500,0x6b000500,
+    0x6d000500,0x6e000500,0x6f000500,0x6f000500,0x6f000500,0x6f000500,0x6f000500,0x6e000500,0x6d000500,0x6b000500,0x68000500,0x61000500,0x58000500,0x4c000500,
+    0x3e000500,0x30000500
 };
@@ -769,74 +769,74 @@ static const QRgb DocumentTypeNone_data[] = {
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x1000200,0x2000200,0x5000200,0x9000200,0x10000200,0x18000200,0x22000200,
-    0x2c000200,0x36000200,0x3f000200,0x45000200,0x4a000200,0x4d000200,0x4e000200,0x4e000200,0x4e000200,0x4c000200,0x49000200,0x45000200,0x3f000200,0x37000200,
-    0x2e000200,0x25000200,0x1c000200,0x13000200,0xd000200,0x8000200,0x4000200,0x2000200,0xffffff,0xffffff,0xffffff,0x1000200,0x3000200,0x7000200,
-    0xd000200,0x16000200,0x22000200,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,
-    0xff000000,0xff000000,0xfd282828,0x72434543,0x44000200,0x37000200,0x2b000200,0x1f000200,0x15000200,0xd000200,0x8000200,0x4000200,0xffffff,0xffffff,
-    0xffffff,0x1000200,0x4000200,0x9000200,0x11000200,0x1d000200,0x2c000200,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,
-    0xfffefefe,0xfffcfcfc,0xfff9f9f9,0xfff3f3f3,0xffe9e9e9,0xffdedede,0xffc8c8c8,0xfd272727,0x76303230,0x4e000200,0x3d000200,0x2e000200,0x21000200,0x16000200,
-    0xe000200,0x8000200,0xffffff,0xffffff,0xffffff,0x2000200,0x5000200,0xb000200,0x15000200,0x24000200,0x36000200,0xff000000,0xfffefefe,0xfffefefe,
-    0xffffffff,0xffffffff,0xfffefefe,0xfffefefe,0xfffdfdfd,0xfffcfcfc,0xfff6f6f6,0xffededed,0xffdedede,0xffcccccc,0xfffefefe,0xffb3b3b3,0xfd292929,0x802e302e,
-    0x53000200,0x40000200,0x2f000200,0x21000200,0x16000200,0xd000200,0xffffff,0xffffff,0xffffff,0x3000200,0x7000200,0xe000200,0x19000200,0x2a000200,
-    0x40000200,0xff000000,0xfffdfdfd,0xfffdfdfd,0xfffdfdfd,0xfffdfdfd,0xfffdfdfd,0xfffcfcfc,0xfffbfbfb,0xfffafafa,0xfff4f4f4,0xffe9e9e9,0xffd4d4d4,0xffbcbcbc,
-    0xffffffff,0xfffcfcfc,0xffa1a1a1,0xfd2b2b2b,0x7e262826,0x55000200,0x41000200,0x2f000200,0x20000200,0x15000200,0x1000200,0x1000200,0x3000200,0x4000200,
-    0x9000200,0x11000200,0x1e000200,0x2f000200,0x47000200,0xff000000,0xfff8f8f8,0xfff9f9f9,0xfff9f9f9,0xfffafafa,0xfff9f9f9,0xfffafafa,0xfff9f9f9,0xfff8f8f8,
-    0xfff1f1f1,0xffe4e4e4,0xffcdcdcd,0xffaeaeae,0xffffffff,0xffffffff,0xfffcfcfc,0xff949494,0xfd2e2e2e,0x7a1d1f1d,0x55000200,0x40000200,0x2d000200,0x1e000200,
-    0x2000200,0x3000200,0x5000200,0x7000200,0xd000200,0x16000200,0x23000200,0x36000200,0x50000200,0xff000000,0xfff0f0f0,0xfff1f1f1,0xfff2f2f2,0xfff4f4f4,
-    0xfff4f4f4,0xfff5f5f5,0xfff6f6f6,0xfff4f4f4,0xffeeeeee,0xffe1e1e1,0xffc8c8c8,0xffa7a7a7,0xffffffff,0xffffffff,0xffffffff,0xfff9f9f9,0xff8e8e8e,0xfd343434,
-    0x781e1e1e,0x52000200,0x3c000200,0x29000200,0x4000200,0x6000200,0x9000200,0xd000200,0x13000200,0x1c000200,0x2a000200,0x3e000200,0x57000200,0xff000000,
-    0xffe2e2e2,0xffe4e4e4,0xffe7e7e7,0xffeaeaea,0xffebebeb,0xffeeeeee,0xfff1f1f1,0xfff1f1f1,0xffededed,0xffdfdfdf,0xffc7c7c7,0xffa6a6a6,0xffffffff,0xffffffff,
-    0xffffffff,0xffffffff,0xfff8f8f8,0xff8f8f8f,0xfc3b3b3b,0x70141714,0x4c000200,0x36000200,0x8000200,0xb000200,0xf000200,0x15000200,0x1a000200,0x25000200,
-    0x33000200,0x47000200,0x5f000200,0xff000000,0xffcfcfcf,0xffd2d2d2,0xffd6d6d6,0xffdbdbdb,0xffdfe0df,0xffe5e6e5,0xffe9eae9,0xffececec,0xffeaeaea,0xffe1e1e1,
-    0xffcbcbcb,0xffadadad,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffafafa,0xff929292,0xfb434343,0x5c000200,0x42000200,0xc000200,0x11000200,
-    0x17000200,0x1e000200,0x25000200,0x30000200,0x3f000200,0x51000200,0x69000200,0xff000100,0xffb5b6b5,0xffbabbba,0xffc0c0c0,0xffc9c9c9,0xffd0d0d0,0xffd9d9d9,
-    0xffe1e1e1,0xffe8e8e8,0xffe8e9e8,0xffe2e3e2,0xffd5d5d5,0xffbebebe,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffafafa,0xff2e2e2e,
-    0x6a000200,0x4e000200,0x11000200,0x18000200,0x20000200,0x29000200,0x32000200,0x3d000200,0x4c000200,0x5d000200,0x74000200,0xff000100,0xff979897,0xff9e9f9e,
-    0xffa7a8a7,0xffb3b4b3,0xffbebebe,0xffcbcbcb,0xffd8d8d8,0xffe1e1e1,0xffe7e7e7,0xffe7e8e7,0xffdfdfdf,0xffbababa,0xff909090,0xff6e6e6e,0xff5d5d5d,0xff595959,
-    0xff5f5f5f,0xff7b7b7b,0xffa8a8a8,0xff000000,0x76000200,0x58000200,0x16000200,0x1f000200,0xf8fefefe,0xf0fbfbfb,0xecf9f9f9,0xecf6f6f6,0xedf5f5f5,0xeff3f3f3,
-    0xf1f1f1f1,0xffe4e4e4,0xfff1f1f1,0xfff2f2f2,0xfff4f4f4,0xfff8f8f8,0xfffcfcfc,0xffbdbebd,0xffcecece,0xffdbdbdb,0xffe7e7e7,0xffeaeaea,0xffc3c3c3,0xff909090,
-    0xff7c7c7c,0xff717171,0xff717171,0xff6c6c6c,0xff5f5f5f,0xff5e5e5e,0xff626262,0xff000000,0x80000200,0x60000200,0x1b000200,0x26000200,0xf0fbfbfb,0xe0f4f4f4,
-    0xd8ececec,0xd8e7e7e7,0xdbe3e3e3,0xdfdedede,0xe3dadbda,0xffc2c3c2,0xffd8d8d8,0xffdbdbdb,0xffe1e1e1,0xffececec,0xfff8f8f8,0xffafafaf,0xffc4c5c4,0xffd6d6d6,
-    0xffe5e6e5,0xffcecece,0xff9a9a9a,0xff8a8a8a,0xff959595,0xffb5b5b5,0xffc5c5c5,0xffc6c6c6,0xffbababa,0xff818181,0xff5c5c5c,0xff000000,0x87000200,0x66000200,
-    0x1f000200,0x2c000200,0xecf9f9f9,0xd8ededed,0xcee0e0e0,0xced9d9d9,0xd3d3d3d3,0xd7cfcfcf,0xddc9cac9,0xffaeafae,0xffc3c3c3,0xffc8c8c8,0xffd0d0d0,0xffe1e1e1,
-    0xfff3f4f3,0xffa3a4a3,0xffbbbbbb,0xffd3d3d3,0xffd7d7d7,0xffaeaeae,0xff969696,0xffa7a7a7,0xffe1e1e1,0xfff1f1f1,0xfff5f5f5,0xfff0f0f0,0xffc9c9c9,0xffe2e2e2,
-    0xff909090,0xff000000,0x8b000200,0x6a000200,0x22000200,0x30000200,0xebf8f8f8,0xd6e9e9e9,0xcddadada,0xced3d3d3,0xd3cdcdcd,0xd8c9c9c9,0xddc4c4c4,0xffaaabaa,
-    0xffb9bab9,0xffbebfbe,0xffc8c8c8,0xffdbdbdb,0xfff2f2f2,0xff9a9b9a,0xffb6b6b6,0xffcecece,0xffc1c1c1,0xffa3a3a3,0xffa0a0a0,0xffdcdcdc,0xfff8f8f8,0xfff6f6f6,
-    0xfff5f5f5,0xffa2a2a2,0xff686868,0xffa9a9a9,0xffdbdbdb,0xff000000,0x8e000200,0x6d000200,0x25000200,0x33000200,0xebf7f7f7,0xd7e7e8e7,0xced8d8d8,0xd0d0d0d0,
-    0xd5cccccc,0xdac7c7c7,0xdfc2c2c2,0xffaaabaa,0xffb5b6b5,0xffb9bab9,0xffc3c4c3,0xffd8d8d8,0xfff0f1f0,0xff949594,0xffb1b1b1,0xffc9c9c9,0xffb5b5b5,0xffa2a2a2,
-    0xffb6b6b6,0xfff1f1f1,0xfff9f9f9,0xfff9f9f9,0xffaaaaaa,0xff6b6b6b,0xff656565,0xff8c8c8c,0xffececec,0xff000000,0x8f000200,0x6e000200,0x26000200,0x35000200,
-    0xebf7f7f7,0xd7e7e7e7,0xced7d8d7,0xd1cfcfcf,0xd6cbcbcb,0xdbc6c6c6,0xe0c2c2c2,0xffaaabaa,0xffb3b3b3,0xffb7b8b7,0xffc1c2c1,0xffd7d7d7,0xfff0f0f0,0xff919291,
-    0xffafafaf,0xffc6c6c6,0xffafafaf,0xffa1a1a1,0xffc0c0c0,0xfff9f9f9,0xfffafafa,0xffaeaeae,0xff717171,0xff696969,0xff6f6f6f,0xffdfdfdf,0xffffffff,0xff000000,
-    0x90000200,0x6e000200,0x26000200,0x35000200,0xebf7f7f7,0xd7e7e7e7,0xced7d8d7,0xd1cfcfcf,0xd6cbcbcb,0xdbc6c6c6,0xe0c2c2c2,0xffaaabaa,0xffb3b3b3,0xffb7b8b7,
-    0xffc1c2c1,0xffd7d7d7,0xfff0f0f0,0xff919291,0xffafafaf,0xffc7c7c7,0xffb2b2b2,0xff9d9e9d,0xffb7b7b7,0xfff5f5f5,0xffafafaf,0xff757575,0xff6d6d6d,0xff656565,
-    0xff626262,0xff959595,0xfff2f2f2,0xff000000,0x90000200,0x6f000200,0x25000200,0x33000200,0xebf7f7f7,0xd7e7e8e7,0xced8d8d8,0xd0d0d0d0,0xd5cccccc,0xdac7c7c7,
-    0xdfc2c2c2,0xffaaabaa,0xffb5b6b5,0xffb9bab9,0xffc3c4c3,0xffd8d8d8,0xfff0f1f0,0xff949594,0xffb1b1b1,0xffcbcbcb,0xffbebebe,0xff979797,0xff9b9b9b,0xffe4e4e4,
-    0xffacacac,0xff6d6d6d,0xff8c8c8c,0xff8b8b8b,0xff575757,0xff555555,0xff838383,0xff000000,0x90000200,0x6f000200,0x22000200,0x30000200,0xebf8f8f8,0xd6e9e9e9,
-    0xcddadada,0xced3d3d3,0xd3cdcdcd,0xd8c9c9c9,0xddc4c4c4,0xffaaabaa,0xffb9bab9,0xffbebfbe,0xffc8c8c8,0xffdbdbdb,0xfff2f2f2,0xff9a9b9a,0xffb5b5b5,0xffcfcfcf,
-    0xffcfd0cf,0xff979797,0xff818181,0xffa7a7a7,0xffececec,0xffbbbbbb,0xffe7e7e7,0xfffbfbfb,0xff8f8f8f,0xff565656,0xff565656,0xff000000,0x90000200,0x6f000200,
-    0x1f000200,0x2c000200,0xecf9f9f9,0xd8ededed,0xcee0e0e0,0xced9d9d9,0xd3d3d3d3,0xd7cfcfcf,0xddc9cac9,0xffaeafae,0xffc3c3c3,0xffc8c8c8,0xffd0d0d0,0xffe1e1e1,
-    0xfff3f4f3,0xffa3a4a3,0xffbbbcbb,0xffd0d0d0,0xffe2e3e2,0xffb9b9b9,0xff797979,0xff6f6f6f,0xff979797,0xffd6d6d6,0xffe3e3e3,0xffe6e6e6,0xffc2c2c2,0xff5e5e5e,
-    0xff575757,0xff000000,0x90000200,0x6f000200,0x1b000200,0x26000200,0xf0fbfbfb,0xe0f4f4f4,0xd8ececec,0xd8e7e7e7,0xdbe3e3e3,0xdfdedede,0xe3dadbda,0xffc2c3c2,
-    0xffd8d8d8,0xffdbdbdb,0xffe1e1e1,0xffececec,0xfff8f8f8,0xffafb0af,0xffc3c4c3,0xffd3d4d3,0xffe4e5e4,0xffe9eae9,0xffa8a8a8,0xff6b6b6b,0xff646464,0xff676767,
-    0xff757575,0xff757575,0xff6b6b6b,0xff5b5b5b,0xff5b5b5b,0xff000000,0x90000200,0x6f000200,0x16000200,0x1f000200,0xf8fefefe,0xf0fbfbfb,0xecf9f9f9,0xecf6f6f6,
-    0xedf5f5f5,0xeff3f3f3,0xf1f1f1f1,0xffe4e4e4,0xfff1f1f1,0xfff2f2f2,0xfff4f4f4,0xfff8f8f8,0xfffcfcfc,0xffbcbdbc,0xffcdcecd,0xffdadada,0xffe4e4e4,0xffefefef,
-    0xffefefef,0xffbcbcbc,0xff868686,0xff606060,0xff606060,0xff606060,0xff606060,0xff838383,0xffb3b3b3,0xff000000,0x90000200,0x6e000200,0x11000200,0x18000200,
-    0x20000200,0x29000200,0x32000200,0x3d000200,0x4c000200,0x5d000200,0x73000200,0xff000100,0xff979897,0xff9e9f9e,0xffa7a8a7,0xffb3b4b3,0xffbdbebd,0xffcacbca,
-    0xffd6d6d6,0xffe1e1e1,0xffe9e9e9,0xffebebeb,0xfff2f2f2,0xfff7f7f7,0xffe7e7e7,0xffcfcfcf,0xffbfbfbf,0xffbfbfbf,0xffcecece,0xffe6e6e6,0xfff9f9f9,0xff000000,
-    0x8e000200,0x6d000200,0xc000200,0x11000200,0x17000200,0x1e000200,0x25000200,0x30000200,0x3f000200,0x51000200,0x68000200,0xff000100,0xffb5b6b5,0xffbabbba,
-    0xffc0c0c0,0xffc9c9c9,0xffd0d0d0,0xffd8d8d8,0xffe1e1e1,0xffe7e7e7,0xffececec,0xffeeeeee,0xfff0f0f0,0xfff2f2f2,0xfff6f6f6,0xfff7f7f7,0xfff7f7f7,0xfff7f7f7,
-    0xfff7f7f7,0xfff5f5f5,0xfff2f2f2,0xff000000,0x8c000200,0x6b000200,0x8000200,0xb000200,0xf000200,0x14000200,0x1a000200,0x24000200,0x32000200,0x44000200,
-    0x5c000200,0xff000000,0xffcfcfcf,0xffd2d2d2,0xffd6d6d6,0xffdbdbdb,0xffdedfde,0xffe4e4e4,0xffe8e9e8,0xffededed,0xfff0f0f0,0xfff2f2f2,0xfff3f3f3,0xfff4f4f4,
-    0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xff000000,0x87000200,0x68000200,0x4000200,0x6000200,0x9000200,0xc000200,
-    0x12000200,0x1a000200,0x28000200,0x39000200,0x50000200,0xff000000,0xffe2e2e2,0xffe4e4e4,0xffe7e7e7,0xffeaeaea,0xffeaeaea,0xffededed,0xfff1f1f1,0xfff2f2f2,
-    0xfff4f4f4,0xfff5f5f5,0xfff5f5f5,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xff000000,0x7f000200,0x61000200,
-    0x2000200,0x3000200,0x4000200,0x7000200,0xc000200,0x14000200,0x1e000200,0x30000200,0x45000200,0xff000000,0xfff0f0f0,0xfff1f1f1,0xfff2f2f2,0xfff4f4f4,
-    0xfff6f6f6,0xfff8f8f8,0xfffafafa,0xfffcfcfc,0xfffdfdfd,0xfffefefe,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,
-    0xffffffff,0xff000000,0x73000200,0x58000200,0x1000200,0x1000200,0x2000200,0x4000200,0x8000200,0xe000200,0x18000200,0x27000200,0x38000200,0xff000000,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x1000500,0x2000500,0x5000500,0x9000500,0x10000500,0x18000500,0x22000500,
+    0x2c000500,0x36000500,0x3f000500,0x45000500,0x4a000500,0x4d000500,0x4e000500,0x4e000500,0x4e000500,0x4c000500,0x49000500,0x45000500,0x3f000500,0x37000500,
+    0x2e000500,0x25000500,0x1c000500,0x13000500,0xd000500,0x8000500,0x4000500,0x2000500,0xffffff,0xffffff,0xffffff,0x1000500,0x3000500,0x7000500,
+    0xd000500,0x16000500,0x22000500,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,
+    0xff000000,0xff000000,0xfd373737,0x72545754,0x44000500,0x37000500,0x2b000500,0x1f000500,0x15000500,0xd000500,0x8000500,0x4000500,0xffffff,0xffffff,
+    0xffffff,0x1000500,0x4000500,0x9000500,0x11000500,0x1d000500,0x2c000500,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,
+    0xfffefefe,0xfffdfdfd,0xfffafafa,0xfff5f5f5,0xffededed,0xffe3e3e3,0xffd1d1d1,0xfd363636,0x76404240,0x4e000500,0x3d000500,0x2e000500,0x21000500,0x16000500,
+    0xe000500,0x8000500,0xffffff,0xffffff,0xffffff,0x2000500,0x5000500,0xb000500,0x15000500,0x24000500,0x36000500,0xff000000,0xfffefefe,0xfffefefe,
+    0xffffffff,0xffffffff,0xfffefefe,0xfffefefe,0xfffdfdfd,0xfffdfdfd,0xfff8f8f8,0xfff0f0f0,0xffe3e3e3,0xffd4d4d4,0xfffefefe,0xffbebebe,0xfd383838,0x803e403e,
+    0x53000500,0x40000500,0x2f000500,0x21000500,0x16000500,0xd000500,0xffffff,0xffffff,0xffffff,0x3000500,0x7000500,0xe000500,0x19000500,0x2a000500,
+    0x40000500,0xff000000,0xfffdfdfd,0xfffdfdfd,0xfffdfdfd,0xfffdfdfd,0xfffdfdfd,0xfffdfdfd,0xfffcfcfc,0xfffbfbfb,0xfff6f6f6,0xffededed,0xffdbdbdb,0xffc6c6c6,
+    0xffffffff,0xfffdfdfd,0xffaeaeae,0xfd3b3b3b,0x7e353735,0x55000500,0x41000500,0x2f000500,0x20000500,0x15000500,0x1000500,0x1000500,0x3000500,0x4000500,
+    0x9000500,0x11000500,0x1e000500,0x2f000500,0x47000500,0xff000000,0xfff9f9f9,0xfffafafa,0xfffafafa,0xfffbfbfb,0xfffafafa,0xfffbfbfb,0xfffafafa,0xfff9f9f9,
+    0xfff3f3f3,0xffe8e8e8,0xffd5d5d5,0xffbababa,0xffffffff,0xffffffff,0xfffdfdfd,0xffa3a3a3,0xfd3e3e3e,0x7a2a2d2a,0x55000500,0x40000500,0x2d000500,0x1e000500,
+    0x2000500,0x3000500,0x5000500,0x7000500,0xd000500,0x16000500,0x23000500,0x36000500,0x50000500,0xff000000,0xfff3f3f3,0xfff3f3f3,0xfff4f4f4,0xfff6f6f6,
+    0xfff6f6f6,0xfff7f7f7,0xfff8f8f8,0xfff6f6f6,0xfff1f1f1,0xffe6e6e6,0xffd1d1d1,0xffb4b4b4,0xffffffff,0xffffffff,0xffffffff,0xfffafafa,0xff9d9d9d,0xfd454545,
+    0x782b2b2b,0x52000500,0x3c000500,0x29000500,0x4000500,0x6000500,0x9000500,0xd000500,0x13000500,0x1c000500,0x2a000500,0x3e000500,0x57000500,0xff000000,
+    0xffe7e7e7,0xffe8e8e8,0xffebebeb,0xffeeeeee,0xffeeeeee,0xfff1f1f1,0xfff3f3f3,0xfff3f3f3,0xfff0f0f0,0xffe4e4e4,0xffd0d0d0,0xffb3b3b3,0xffffffff,0xffffffff,
+    0xffffffff,0xffffffff,0xfff9f9f9,0xff9e9e9e,0xfc4c4c4c,0x701f231f,0x4c000500,0x36000500,0x8000500,0xb000500,0xf000500,0x15000500,0x1a000500,0x25000500,
+    0x33000500,0x47000500,0x5f000500,0xff000000,0xffd7d7d7,0xffd9d9d9,0xffdddddd,0xffe1e1e1,0xffe4e5e4,0xffe9eae9,0xffedeeed,0xffefefef,0xffeeeeee,0xffe6e6e6,
+    0xffd3d3d3,0xffb9b9b9,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffbfbfb,0xffa1a1a1,0xfb545454,0x5c000500,0x42000500,0xc000500,0x11000500,
+    0x17000500,0x1e000500,0x25000500,0x30000500,0x3f000500,0x51000500,0x69000500,0xff000300,0xffc0c1c0,0xffc4c5c4,0xffcacaca,0xffd1d1d1,0xffd7d7d7,0xffdfdfdf,
+    0xffe6e6e6,0xffececec,0xffecedec,0xffe7e8e7,0xffdcdcdc,0xffc8c8c8,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffbfbfb,0xff3e3e3e,
+    0x6a000500,0x4e000500,0x11000500,0x18000500,0x20000500,0x29000500,0x32000500,0x3d000500,0x4c000500,0x5d000500,0x74000500,0xff000300,0xffa5a6a5,0xffacadac,
+    0xffb4b5b4,0xffbebfbe,0xffc8c8c8,0xffd3d3d3,0xffdedede,0xffe6e6e6,0xffebebeb,0xffebeceb,0xffe4e4e4,0xffc4c4c4,0xff9f9f9f,0xff7f7f7f,0xff6f6f6f,0xff6b6b6b,
+    0xff717171,0xff8c8c8c,0xffb5b5b5,0xff000000,0x76000500,0x58000500,0x16000500,0x1f000500,0xf8fefefe,0xf0fcfcfc,0xecfafafa,0xecf8f8f8,0xedf7f7f7,0xeff5f5f5,
+    0xf1f3f3f3,0xffe8e8e8,0xfff3f3f3,0xfff4f4f4,0xfff6f6f6,0xfff9f9f9,0xfffdfdfd,0xffc7c8c7,0xffd6d6d6,0xffe1e1e1,0xffebebeb,0xffeeeeee,0xffcccccc,0xff9f9f9f,
+    0xff8d8d8d,0xff828282,0xff828282,0xff7d7d7d,0xff717171,0xff707070,0xff747474,0xff000000,0x80000500,0x60000500,0x1b000500,0x26000500,0xf0fcfcfc,0xe0f6f6f6,
+    0xd8efefef,0xd8ebebeb,0xdbe8e8e8,0xdfe3e3e3,0xe3e0e1e0,0xffcbcccb,0xffdedede,0xffe1e1e1,0xffe6e6e6,0xffefefef,0xfff9f9f9,0xffbbbbbb,0xffcdcecd,0xffdddddd,
+    0xffe9eae9,0xffd6d6d6,0xffa8a8a8,0xff9a9a9a,0xffa4a4a4,0xffc0c0c0,0xffcecece,0xffcfcfcf,0xffc4c4c4,0xff919191,0xff6e6e6e,0xff000000,0x87000500,0x66000500,
+    0x1f000500,0x2c000500,0xecfafafa,0xd8f0f0f0,0xcee5e5e5,0xcedfdfdf,0xd3dadada,0xd7d7d7d7,0xddd1d2d1,0xffbabbba,0xffcccccc,0xffd1d1d1,0xffd7d7d7,0xffe6e6e6,
+    0xfff5f6f5,0xffb0b1b0,0xffc5c5c5,0xffdadada,0xffdddddd,0xffbababa,0xffa4a4a4,0xffb4b4b4,0xffe6e6e6,0xfff3f3f3,0xfff7f7f7,0xfff3f3f3,0xffd1d1d1,0xffe7e7e7,
+    0xff9f9f9f,0xff000000,0x8b000500,0x6a000500,0x22000500,0x30000500,0xebf9f9f9,0xd6ededed,0xcde0e0e0,0xcedadada,0xd3d5d5d5,0xd8d1d1d1,0xddcdcdcd,0xffb6b7b6,
+    0xffc4c4c4,0xffc8c9c8,0xffd1d1d1,0xffe1e1e1,0xfff4f4f4,0xffa8a9a8,0xffc1c1c1,0xffd6d6d6,0xffcbcbcb,0xffb0b0b0,0xffadadad,0xffe2e2e2,0xfff9f9f9,0xfff8f8f8,
+    0xfff7f7f7,0xffafafaf,0xff7a7a7a,0xffb6b6b6,0xffe1e1e1,0xff000000,0x8e000500,0x6d000500,0x25000500,0x33000500,0xebf8f8f8,0xd7ebeceb,0xcededede,0xd0d7d7d7,
+    0xd5d4d4d4,0xdad0d0d0,0xdfcbcbcb,0xffb6b7b6,0xffc0c1c0,0xffc4c4c4,0xffcccdcc,0xffdedede,0xfff3f3f3,0xffa3a4a3,0xffbdbdbd,0xffd1d1d1,0xffc0c0c0,0xffafafaf,
+    0xffc1c1c1,0xfff3f3f3,0xfffafafa,0xfffafafa,0xffb6b6b6,0xff7c7c7c,0xff777777,0xff9b9b9b,0xffefefef,0xff000000,0x8f000500,0x6e000500,0x26000500,0x35000500,
+    0xebf8f8f8,0xd7ebebeb,0xcedddedd,0xd1d7d7d7,0xd6d3d3d3,0xdbcfcfcf,0xe0cbcbcb,0xffb6b7b6,0xffbebebe,0xffc2c3c2,0xffcbcbcb,0xffdddddd,0xfff3f3f3,0xffa0a1a0,
+    0xffbbbbbb,0xffcfcfcf,0xffbbbbbb,0xffaeaeae,0xffcacaca,0xfffafafa,0xfffbfbfb,0xffbababa,0xff828282,0xff7a7a7a,0xff808080,0xffe4e4e4,0xffffffff,0xff000000,
+    0x90000500,0x6e000500,0x26000500,0x35000500,0xebf8f8f8,0xd7ebebeb,0xcedddedd,0xd1d7d7d7,0xd6d3d3d3,0xdbcfcfcf,0xe0cbcbcb,0xffb6b7b6,0xffbebebe,0xffc2c3c2,
+    0xffcbcbcb,0xffdddddd,0xfff3f3f3,0xffa0a1a0,0xffbbbbbb,0xffd0d0d0,0xffbdbdbd,0xffabacab,0xffc2c2c2,0xfff7f7f7,0xffbbbbbb,0xff868686,0xff7e7e7e,0xff777777,
+    0xff747474,0xffa4a4a4,0xfff4f4f4,0xff000000,0x90000500,0x6f000500,0x25000500,0x33000500,0xebf8f8f8,0xd7ebeceb,0xcededede,0xd0d7d7d7,0xd5d4d4d4,0xdad0d0d0,
+    0xdfcbcbcb,0xffb6b7b6,0xffc0c1c0,0xffc4c4c4,0xffcccdcc,0xffdedede,0xfff3f3f3,0xffa3a4a3,0xffbdbdbd,0xffd3d3d3,0xffc8c8c8,0xffa5a5a5,0xffa9a9a9,0xffe8e8e8,
+    0xffb8b8b8,0xff7e7e7e,0xff9b9b9b,0xff9a9a9a,0xff696969,0xff676767,0xff939393,0xff000000,0x90000500,0x6f000500,0x22000500,0x30000500,0xebf9f9f9,0xd6ededed,
+    0xcde0e0e0,0xcedadada,0xd3d5d5d5,0xd8d1d1d1,0xddcdcdcd,0xffb6b7b6,0xffc4c4c4,0xffc8c9c8,0xffd1d1d1,0xffe1e1e1,0xfff4f4f4,0xffa8a9a8,0xffc0c0c0,0xffd7d7d7,
+    0xffd7d7d7,0xffa5a5a5,0xff919191,0xffb4b4b4,0xffefefef,0xffc5c5c5,0xffebebeb,0xfffcfcfc,0xff9e9e9e,0xff686868,0xff686868,0xff000000,0x90000500,0x6f000500,
+    0x1f000500,0x2c000500,0xecfafafa,0xd8f0f0f0,0xcee5e5e5,0xcedfdfdf,0xd3dadada,0xd7d7d7d7,0xddd1d2d1,0xffbabbba,0xffcccccc,0xffd1d1d1,0xffd7d7d7,0xffe6e6e6,
+    0xfff5f6f5,0xffb0b1b0,0xffc5c6c5,0xffd7d7d7,0xffe7e8e7,0xffc4c4c4,0xff8a8a8a,0xff808080,0xffa5a5a5,0xffdddddd,0xffe8e8e8,0xffeaeaea,0xffcbcbcb,0xff707070,
+    0xff696969,0xff000000,0x90000500,0x6f000500,0x1b000500,0x26000500,0xf0fcfcfc,0xe0f6f6f6,0xd8efefef,0xd8ebebeb,0xdbe8e8e8,0xdfe3e3e3,0xe3e0e1e0,0xffcbcccb,
+    0xffdedede,0xffe1e1e1,0xffe6e6e6,0xffefefef,0xfff9f9f9,0xffbbbcbb,0xffcccdcc,0xffdadbda,0xffe8e9e8,0xffedeeed,0xffb5b5b5,0xff7c7c7c,0xff767676,0xff797979,
+    0xff868686,0xff868686,0xff7c7c7c,0xff6d6d6d,0xff6d6d6d,0xff000000,0x90000500,0x6f000500,0x16000500,0x1f000500,0xf8fefefe,0xf0fcfcfc,0xecfafafa,0xecf8f8f8,
+    0xedf7f7f7,0xeff5f5f5,0xf1f3f3f3,0xffe8e8e8,0xfff3f3f3,0xfff4f4f4,0xfff6f6f6,0xfff9f9f9,0xfffdfdfd,0xffc6c7c6,0xffd5d6d5,0xffe0e0e0,0xffe8e8e8,0xfff2f2f2,
+    0xfff2f2f2,0xffc6c6c6,0xff969696,0xff727272,0xff727272,0xff727272,0xff727272,0xff939393,0xffbebebe,0xff000000,0x90000500,0x6e000500,0x11000500,0x18000500,
+    0x20000500,0x29000500,0x32000500,0x3d000500,0x4c000500,0x5d000500,0x73000500,0xff000300,0xffa5a6a5,0xffacadac,0xffb4b5b4,0xffbebfbe,0xffc7c8c7,0xffd2d3d2,
+    0xffdddddd,0xffe6e6e6,0xffededed,0xffeeeeee,0xfff4f4f4,0xfff8f8f8,0xffebebeb,0xffd7d7d7,0xffc9c9c9,0xffc9c9c9,0xffd6d6d6,0xffeaeaea,0xfffafafa,0xff000000,
+    0x8e000500,0x6d000500,0xc000500,0x11000500,0x17000500,0x1e000500,0x25000500,0x30000500,0x3f000500,0x51000500,0x68000500,0xff000300,0xffc0c1c0,0xffc4c5c4,
+    0xffcacaca,0xffd1d1d1,0xffd7d7d7,0xffdedede,0xffe6e6e6,0xffebebeb,0xffefefef,0xfff1f1f1,0xfff3f3f3,0xfff4f4f4,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,
+    0xfff8f8f8,0xfff7f7f7,0xfff4f4f4,0xff000000,0x8c000500,0x6b000500,0x8000500,0xb000500,0xf000500,0x14000500,0x1a000500,0x24000500,0x32000500,0x44000500,
+    0x5c000500,0xff000000,0xffd7d7d7,0xffd9d9d9,0xffdddddd,0xffe1e1e1,0xffe3e4e3,0xffe8e8e8,0xffecedec,0xfff0f0f0,0xfff3f3f3,0xfff4f4f4,0xfff5f5f5,0xfff6f6f6,
+    0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xff000000,0x87000500,0x68000500,0x4000500,0x6000500,0x9000500,0xc000500,
+    0x12000500,0x1a000500,0x28000500,0x39000500,0x50000500,0xff000000,0xffe7e7e7,0xffe8e8e8,0xffebebeb,0xffeeeeee,0xffeeeeee,0xfff0f0f0,0xfff3f3f3,0xfff4f4f4,
+    0xfff6f6f6,0xfff7f7f7,0xfff7f7f7,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xff000000,0x7f000500,0x61000500,
+    0x2000500,0x3000500,0x4000500,0x7000500,0xc000500,0x14000500,0x1e000500,0x30000500,0x45000500,0xff000000,0xfff3f3f3,0xfff3f3f3,0xfff4f4f4,0xfff6f6f6,
+    0xfff8f8f8,0xfff9f9f9,0xfffbfbfb,0xfffdfdfd,0xfffdfdfd,0xfffefefe,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,
+    0xffffffff,0xff000000,0x73000500,0x58000500,0x1000500,0x1000500,0x2000500,0x4000500,0x8000500,0xe000500,0x18000500,0x27000500,0x38000500,0xff000000,
     0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,
-    0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0x63000200,0x4c000200,0xffffff,0xffffff,0xffffff,0x2000200,0x5000200,0xa000200,
-    0x12000200,0x1e000200,0x2d000200,0x3f000200,0x52000200,0x64000200,0x74000200,0x80000200,0x87000200,0x8c000200,0x8e000200,0x90000200,0x90000200,0x90000200,
-    0x90000200,0x90000200,0x90000200,0x90000200,0x8e000200,0x8c000200,0x87000200,0x7f000200,0x73000200,0x63000200,0x51000200,0x3e000200,0xffffff,0xffffff,
-    0xffffff,0x1000200,0x3000200,0x7000200,0xd000200,0x16000200,0x22000200,0x30000200,0x3e000200,0x4c000200,0x58000200,0x61000200,0x68000200,0x6b000200,
-    0x6d000200,0x6e000200,0x6f000200,0x6f000200,0x6f000200,0x6f000200,0x6f000200,0x6e000200,0x6d000200,0x6b000200,0x68000200,0x61000200,0x58000200,0x4c000200,
-    0x3e000200,0x30000200
+    0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0x63000500,0x4c000500,0xffffff,0xffffff,0xffffff,0x2000500,0x5000500,0xa000500,
+    0x12000500,0x1e000500,0x2d000500,0x3f000500,0x52000500,0x64000500,0x74000500,0x80000500,0x87000500,0x8c000500,0x8e000500,0x90000500,0x90000500,0x90000500,
+    0x90000500,0x90000500,0x90000500,0x90000500,0x8e000500,0x8c000500,0x87000500,0x7f000500,0x73000500,0x63000500,0x51000500,0x3e000500,0xffffff,0xffffff,
+    0xffffff,0x1000500,0x3000500,0x7000500,0xd000500,0x16000500,0x22000500,0x30000500,0x3e000500,0x4c000500,0x58000500,0x61000500,0x68000500,0x6b000500,
+    0x6d000500,0x6e000500,0x6f000500,0x6f000500,0x6f000500,0x6f000500,0x6f000500,0x6e000500,0x6d000500,0x6b000500,0x68000500,0x61000500,0x58000500,0x4c000500,
+    0x3e000500,0x30000500
 };
@@ -846,74 +846,74 @@ static const QRgb DocumentTypePowerPoint_data[] = {
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x1000200,0x2000200,0x5000200,0x9000200,0x10000200,0x18000200,0x22000200,
-    0x2c000200,0x36000200,0x3f000200,0x45000200,0x4a000200,0x4d000200,0x4e000200,0x4e000200,0x4e000200,0x4c000200,0x49000200,0x45000200,0x3f000200,0x37000200,
-    0x2e000200,0x25000200,0x1c000200,0x13000200,0xd000200,0x8000200,0x4000200,0x2000200,0xffffff,0xffffff,0xffffff,0x1000200,0x3000200,0x7000200,
-    0xd000200,0x16000200,0x22000200,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,
-    0xff000000,0xff000000,0xfd282828,0x72434543,0x44000200,0x37000200,0x2b000200,0x1f000200,0x15000200,0xd000200,0x8000200,0x4000200,0xffffff,0xffffff,
-    0xffffff,0x1000200,0x4000200,0x9000200,0x11000200,0x1d000200,0x2c000200,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,
-    0xfffefefe,0xfffcfcfc,0xfff9f9f9,0xfff3f3f3,0xffe9e9e9,0xffdedede,0xffc8c8c8,0xfd272727,0x76303230,0x4e000200,0x3d000200,0x2e000200,0x21000200,0x16000200,
-    0xe000200,0x8000200,0xffffff,0xffffff,0xffffff,0x2000200,0x5000200,0xb000200,0x15000200,0x24000200,0x36000200,0xff000000,0xffffffff,0xffffffff,
-    0xffffffff,0xffffffff,0xfffefefe,0xfffefefe,0xfffdfdfd,0xfffcfcfc,0xfff6f6f6,0xffededed,0xffdedede,0xffcccccc,0xfffefefe,0xffb3b3b3,0xfd292929,0x802e302e,
-    0x53000200,0x40000200,0x2f000200,0x21000200,0x16000200,0xd000200,0xffffff,0xffffff,0xffffff,0x2000200,0x6000200,0xd000200,0x18000200,0x29000200,
-    0x3f000200,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,0xfffdfdfd,0xfffcfcfc,0xfffafafa,0xfff4f4f4,0xffe9e9e9,0xffd4d4d4,0xffbcbcbc,
-    0xffffffff,0xfffcfcfc,0xffa1a1a1,0xfd2b2b2b,0x7e262826,0x55000200,0x41000200,0x2f000200,0x20000200,0x15000200,0xffffff,0xffffff,0x1000200,0x2000200,
-    0x6000200,0xe000200,0x1b000200,0x2d000200,0x45000200,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffdfdfd,0xfffdfdfd,0xfffbfbfb,0xfff9f9f9,
-    0xfff2f2f2,0xffe4e4e4,0xffcdcdcd,0xffaeaeae,0xffffffff,0xffffffff,0xfffcfcfc,0xff949494,0xfd2e2e2e,0x7a1d1f1d,0x55000200,0x40000200,0x2d000200,0x1e000200,
-    0xffffff,0xffffff,0x1000200,0x2000200,0x7000200,0xf000200,0x1d000200,0x30000200,0x4a000200,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,
-    0xfffdfdfd,0xfffcfcfc,0xfffbfbfb,0xfff7f7f7,0xfff0f0f0,0xffe2e2e2,0xffc8c8c8,0xffa7a7a7,0xffffffff,0xffffffff,0xffffffff,0xfff9f9f9,0xff8e8e8e,0xfd343434,
-    0x781e1e1e,0x52000200,0x3c000200,0x29000200,0xffffff,0xffffff,0x1000200,0x3000200,0x7000200,0x10000200,0x1e000200,0x32000200,0x4d000200,0xff000000,
-    0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffcfcfc,0xfffbfbfb,0xfffafafa,0xfff7f7f7,0xfff0f0f0,0xffe1e1e1,0xffc8c8c8,0xffa6a6a6,0xffffffff,0xffffffff,
-    0xffffffff,0xffffffff,0xfff8f8f8,0xff8f8f8f,0xfc3b3b3b,0x70141714,0x4c000200,0x36000200,0x1000000,0x2000000,0x5000000,0x9000000,0xf000000,0x18000000,
-    0x27000000,0x3b000000,0x55000300,0xff000000,0xfff5f5f5,0xfff5f5f5,0xfff5f5f5,0xfff6f6f6,0xfff4f4f4,0xfff5f5f5,0xfff5f5f5,0xfff4f4f4,0xffefefef,0xffe4e4e4,
-    0xffcccccc,0xffadadad,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffafafa,0xff929292,0xfb434343,0x5c000200,0x42000200,0x4000000,0x7000000,
-    0xd000000,0x15000000,0x1d000000,0x29000000,0x38000000,0x4c000000,0x64000000,0xff000000,0xffe0e0e0,0xffe0e0e0,0xffe2e2e2,0xffe4e4e4,0xffe4e4e4,0xffe8e8e8,
-    0xffececec,0xfff0f0f0,0xffededed,0xffe6e6e6,0xffd7d7d7,0xffbfbfbf,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffafafa,0xff2e2e2e,
-    0x6a000200,0x4e000200,0x7000000,0xf000000,0x19000000,0x28000000,0x34000000,0x43000000,0x52000000,0x64000000,0x79000200,0xff000000,0xffc2c2c2,0xffc2c2c2,
-    0xffc4c4c4,0xffc9c9c9,0xffcecece,0xffd6d6d6,0xffe2e2e2,0xffe8e8e8,0xffececec,0xffececec,0xffe2e2e2,0xffbbbbbb,0xff909090,0xff6e6e6e,0xff5d5d5d,0xff595959,
-    0xff5f5f5f,0xff7b7b7b,0xffa8a8a8,0xff000000,0x76000200,0x58000200,0xc000000,0x19000000,0xff66c66a,0xff63c466,0xff5fc163,0xff5cbe60,0xff57bb5b,0xff55bb59,
-    0xff50ba54,0xff4cba51,0xff46b64b,0xff40b445,0xff3cb13f,0xff34b039,0xff32ad37,0xffbcbcbc,0xffd0d0d0,0xffe0e0e0,0xffebebeb,0xffefefef,0xffc6c6c6,0xff919191,
-    0xff7c7c7c,0xff717171,0xff717171,0xff6c6c6c,0xff5f5f5f,0xff5e5e5e,0xff626262,0xff000000,0x80000200,0x60000200,0x12000000,0x27000000,0xff62c265,0xff5dbc61,
-    0xff58b65b,0xff52b056,0xff4fae53,0xff4bac4e,0xff47ad4b,0xff42ab45,0xff3ca841,0xff37a53b,0xff31a336,0xff2ea033,0xff2e9f32,0xff999999,0xffb9b9b9,0xffd4d4d4,
-    0xffe8e8e8,0xffd2d2d2,0xff9d9d9d,0xff8b8b8b,0xff959595,0xffb5b5b5,0xffc5c5c5,0xffc6c6c6,0xffbababa,0xff818181,0xff5c5c5c,0xff000000,0x87000200,0x66000200,
-    0x17000000,0x31000000,0xff5dbc61,0xffffffff,0xffffffff,0xffffffff,0xfff2f8f3,0xff97c899,0xff3b993e,0xffffffff,0xffffffff,0xffffffff,0xfff1f8f1,0xff8bc28d,
-    0xff2a8f2d,0xff7c7c7c,0xffa4a4a4,0xffcbcbcb,0xffd7d7d7,0xffb1b1b1,0xff9a9a9a,0xffa8a8a8,0xffe1e1e1,0xfff1f1f1,0xfff5f5f5,0xfff0f0f0,0xffc9c9c9,0xffe2e2e2,
-    0xff909090,0xff000000,0x8b000200,0x6a000200,0x1b000000,0x3c000000,0xff57b45a,0xffffffff,0xffdaeadb,0xff6ea871,0xffbcd6bd,0xffffffff,0xff66a369,0xffffffff,
-    0xffd5e6d6,0xff5d9b60,0xffb5d2b6,0xffffffff,0xff5e9f61,0xff646464,0xff939393,0xffbebebe,0xffc0c0c0,0xffa6a6a6,0xffa4a4a4,0xffdedede,0xfff9f9f9,0xfff6f6f6,
-    0xfff5f5f5,0xffa2a2a2,0xff686868,0xffa9a9a9,0xffdbdbdb,0xff000000,0x8e000200,0x6d000200,0x1d000000,0x43000000,0xff50ae54,0xffffffff,0xffc9deca,0xff317833,
-    0xff659966,0xffffffff,0xff89b18a,0xffffffff,0xffc2d6c3,0xff1d6520,0xff59905b,0xffffffff,0xff86b088,0xff545454,0xff878787,0xffb4b4b4,0xffb4b4b4,0xffa5a5a5,
-    0xffbbbbbb,0xfff3f3f3,0xfffafafa,0xfff9f9f9,0xffaaaaaa,0xff6b6b6b,0xff656565,0xff8c8c8c,0xffececec,0xff000000,0x8f000200,0x6e000200,0x1f000000,0x45000000,
-    0xff4caa4f,0xffffffff,0xffc8dcc9,0xff2b6f2d,0xff8ab08b,0xffffffff,0xff77a279,0xffffffff,0xffc1d3c2,0xff1a5a1c,0xff83a785,0xffffffff,0xff77a378,0xff4e4e4e,
-    0xff818181,0xffb0b0b0,0xffacacac,0xffa5a5a5,0xffc5c5c5,0xfffcfcfc,0xfffbfbfb,0xffaeaeae,0xff717171,0xff696969,0xff6f6f6f,0xffdfdfdf,0xffffffff,0xff000000,
-    0x90000200,0x6e000200,0x1f000000,0x46000000,0xff46a64b,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffd4e2d5,0xff2a6d2d,0xffffffff,0xffffffff,0xffffffff,
-    0xffffffff,0xffd3e0d4,0xff2b6f2e,0xff4f4f4f,0xff828282,0xffb2b2b2,0xffafafaf,0xffa1a1a1,0xffbcbcbc,0xfff8f8f8,0xffb0b0b0,0xff757575,0xff6d6d6d,0xff656565,
-    0xff626262,0xff959595,0xfff2f2f2,0xff000000,0x90000200,0x6f000200,0x1f000000,0x46000000,0xff42a545,0xffffffff,0xffd6e5d7,0xff5e9561,0xff4b8a4d,0xff1f6c22,
-    0xff1e6921,0xffffffff,0xffd3dfd3,0xff568358,0xff457b48,0xff1c601e,0xff1e6921,0xff535353,0xff868686,0xffb7b7b7,0xffbbbbbb,0xff9a9a9a,0xff9f9f9f,0xffe6e6e6,
-    0xffadadad,0xff6d6d6d,0xff8c8c8c,0xff8b8b8b,0xff575757,0xff555555,0xff838383,0xff000000,0x90000200,0x6f000200,0x1f000000,0x46000000,0xff3da240,0xffffffff,
-    0xffc5dbc5,0xff217225,0xff227625,0xff217525,0xff217324,0xffffffff,0xffc1d4c2,0xff1b5d1d,0xff1c611e,0xff1e6821,0xff217124,0xff595959,0xff8c8c8c,0xffbbbbbb,
-    0xffcbcbcb,0xff9a9a9a,0xff848484,0xffa8a8a8,0xffededed,0xffbbbbbb,0xffe7e7e7,0xfffbfbfb,0xff8f8f8f,0xff565656,0xff565656,0xff000000,0x90000200,0x6f000200,
-    0x1d000000,0x43000000,0xff38a33d,0xffffffff,0xffc4dcc5,0xff237725,0xff247d28,0xff257e28,0xff237b27,0xffffffff,0xffc2d5c3,0xff1c631f,0xff1e6921,0xff206e23,
-    0xff237725,0xff636363,0xff959595,0xffbdbdbd,0xffdddddd,0xffbbbbbb,0xff7c7c7c,0xff707070,0xff979797,0xffd6d6d6,0xffe3e3e3,0xffe6e6e6,0xffc2c2c2,0xff5e5e5e,
-    0xff575757,0xff000000,0x90000200,0x6f000200,0x1b000000,0x3e000000,0xff34a437,0xffffffff,0xffc4ddc5,0xff257f28,0xff26842a,0xff26852a,0xff258129,0xffffffff,
-    0xffc2d7c3,0xff1f6a22,0xff206f23,0xff227625,0xff247c28,0xff747474,0xff9f9f9f,0xffc1c1c1,0xffdfdfdf,0xffebebeb,0xffababab,0xff6c6c6c,0xff646464,0xff676767,
-    0xff757575,0xff757575,0xff6b6b6b,0xff5b5b5b,0xff5b5b5b,0xff000000,0x90000200,0x6f000200,0x17000000,0x34000000,0xff2fa534,0xff2b952f,0xff27892b,0xff27862a,
-    0xff278a2c,0xff27892b,0xff26852a,0xff247e28,0xff217324,0xff217223,0xff227525,0xff237926,0xff247e28,0xff878787,0xffacacac,0xffcacaca,0xffdedede,0xfff0f0f0,
-    0xfff3f3f3,0xffbdbdbd,0xff868686,0xff606060,0xff606060,0xff606060,0xff606060,0xff838383,0xffb3b3b3,0xff000000,0x90000200,0x6e000200,0x12000000,0x28000000,
-    0x47000000,0x6b000000,0x87000000,0x9a000000,0xa7000000,0xb2000000,0xbc000000,0xff000000,0xff5b5b5b,0xff5c5c5c,0xff646464,0xff737373,0xff868686,0xff9f9f9f,
-    0xffbcbcbc,0xffd2d2d2,0xffe4e4e4,0xffececec,0xfff5f5f5,0xfff8f8f8,0xffe7e7e7,0xffcfcfcf,0xffbfbfbf,0xffbfbfbf,0xffcecece,0xffe6e6e6,0xfff9f9f9,0xff000000,
-    0x8e000200,0x6d000200,0xc000000,0x1a000000,0x2f000000,0x47000000,0x5b000000,0x6c000000,0x79000000,0x87000000,0x97000000,0xff000000,0xff919191,0xff919191,
-    0xff979797,0xffa2a2a2,0xffaeaeae,0xffbdbdbd,0xffd0d0d0,0xffdfdfdf,0xffe9e9e9,0xffefefef,0xfff2f2f2,0xfff3f3f3,0xfff6f6f6,0xfff7f7f7,0xfff7f7f7,0xfff7f7f7,
-    0xfff7f7f7,0xfff5f5f5,0xfff2f2f2,0xff000000,0x8c000200,0x6b000200,0x7000000,0x10000000,0x1b000000,0x2a000000,0x37000000,0x45000000,0x53000000,0x63000000,
-    0x76000000,0xff000000,0xffbfbfbf,0xffbfbfbf,0xffc2c2c2,0xffc8c8c8,0xffcdcdcd,0xffd5d5d5,0xffe1e1e1,0xffe8e8e8,0xffefefef,0xfff3f3f3,0xfff4f4f4,0xfff4f4f4,
-    0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xff000000,0x87000200,0x68000200,0x4000000,0x7000000,0xd000000,0x14000000,
-    0x1c000000,0x28000000,0x35000000,0x47000000,0x5c000300,0xff000000,0xffe0e0e0,0xffe0e0e0,0xffe2e2e2,0xffe4e4e4,0xffe4e4e4,0xffe8e8e8,0xffeeeeee,0xfff1f1f1,
-    0xfff3f3f3,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xff000000,0x7f000200,0x61000200,
-    0x1000000,0x2000000,0x4000000,0x8000000,0xe000000,0x16000000,0x21000000,0x31000000,0x47000000,0xff000000,0xfff5f5f5,0xfff5f5f5,0xfff5f5f5,0xfff6f6f6,
-    0xfff7f7f7,0xfff9f9f9,0xfffbfbfb,0xfffdfdfd,0xfffefefe,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,
-    0xffffffff,0xff000000,0x73000200,0x58000200,0xffffff,0xffffff,0xffffff,0x2000200,0x5000200,0xb000200,0x15000200,0x24000200,0x36000200,0xff000000,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x1000500,0x2000500,0x5000500,0x9000500,0x10000500,0x18000500,0x22000500,
+    0x2c000500,0x36000500,0x3f000500,0x45000500,0x4a000500,0x4d000500,0x4e000500,0x4e000500,0x4e000500,0x4c000500,0x49000500,0x45000500,0x3f000500,0x37000500,
+    0x2e000500,0x25000500,0x1c000500,0x13000500,0xd000500,0x8000500,0x4000500,0x2000500,0xffffff,0xffffff,0xffffff,0x1000500,0x3000500,0x7000500,
+    0xd000500,0x16000500,0x22000500,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,
+    0xff000000,0xff000000,0xfd373737,0x72545754,0x44000500,0x37000500,0x2b000500,0x1f000500,0x15000500,0xd000500,0x8000500,0x4000500,0xffffff,0xffffff,
+    0xffffff,0x1000500,0x4000500,0x9000500,0x11000500,0x1d000500,0x2c000500,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,
+    0xfffefefe,0xfffdfdfd,0xfffafafa,0xfff5f5f5,0xffededed,0xffe3e3e3,0xffd1d1d1,0xfd363636,0x76404240,0x4e000500,0x3d000500,0x2e000500,0x21000500,0x16000500,
+    0xe000500,0x8000500,0xffffff,0xffffff,0xffffff,0x2000500,0x5000500,0xb000500,0x15000500,0x24000500,0x36000500,0xff000000,0xffffffff,0xffffffff,
+    0xffffffff,0xffffffff,0xfffefefe,0xfffefefe,0xfffdfdfd,0xfffdfdfd,0xfff8f8f8,0xfff0f0f0,0xffe3e3e3,0xffd4d4d4,0xfffefefe,0xffbebebe,0xfd383838,0x803e403e,
+    0x53000500,0x40000500,0x2f000500,0x21000500,0x16000500,0xd000500,0xffffff,0xffffff,0xffffff,0x2000500,0x6000500,0xd000500,0x18000500,0x29000500,
+    0x3f000500,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,0xfffdfdfd,0xfffdfdfd,0xfffbfbfb,0xfff6f6f6,0xffededed,0xffdbdbdb,0xffc6c6c6,
+    0xffffffff,0xfffdfdfd,0xffaeaeae,0xfd3b3b3b,0x7e353735,0x55000500,0x41000500,0x2f000500,0x20000500,0x15000500,0xffffff,0xffffff,0x1000500,0x2000500,
+    0x6000500,0xe000500,0x1b000500,0x2d000500,0x45000500,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffdfdfd,0xfffdfdfd,0xfffcfcfc,0xfffafafa,
+    0xfff4f4f4,0xffe8e8e8,0xffd5d5d5,0xffbababa,0xffffffff,0xffffffff,0xfffdfdfd,0xffa3a3a3,0xfd3e3e3e,0x7a2a2d2a,0x55000500,0x40000500,0x2d000500,0x1e000500,
+    0xffffff,0xffffff,0x1000500,0x2000500,0x7000500,0xf000500,0x1d000500,0x30000500,0x4a000500,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,
+    0xfffdfdfd,0xfffdfdfd,0xfffcfcfc,0xfff8f8f8,0xfff3f3f3,0xffe7e7e7,0xffd1d1d1,0xffb4b4b4,0xffffffff,0xffffffff,0xffffffff,0xfffafafa,0xff9d9d9d,0xfd454545,
+    0x782b2b2b,0x52000500,0x3c000500,0x29000500,0xffffff,0xffffff,0x1000500,0x3000500,0x7000500,0x10000500,0x1e000500,0x32000500,0x4d000500,0xff000000,
+    0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffdfdfd,0xfffcfcfc,0xfffbfbfb,0xfff8f8f8,0xfff3f3f3,0xffe6e6e6,0xffd1d1d1,0xffb3b3b3,0xffffffff,0xffffffff,
+    0xffffffff,0xffffffff,0xfff9f9f9,0xff9e9e9e,0xfc4c4c4c,0x701f231f,0x4c000500,0x36000500,0x1000000,0x2000000,0x5000000,0x9000000,0xf000000,0x18000000,
+    0x27000000,0x3b000000,0x55000600,0xff000000,0xfff7f7f7,0xfff7f7f7,0xfff7f7f7,0xfff8f8f8,0xfff6f6f6,0xfff7f7f7,0xfff7f7f7,0xfff6f6f6,0xfff2f2f2,0xffe8e8e8,
+    0xffd4d4d4,0xffb9b9b9,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffbfbfb,0xffa1a1a1,0xfb545454,0x5c000500,0x42000500,0x4000000,0x7000000,
+    0xd000000,0x15000000,0x1d000000,0x29000000,0x38000000,0x4c000000,0x64000000,0xff000000,0xffe5e5e5,0xffe5e5e5,0xffe7e7e7,0xffe8e8e8,0xffe8e8e8,0xffececec,
+    0xffefefef,0xfff3f3f3,0xfff0f0f0,0xffeaeaea,0xffdddddd,0xffc9c9c9,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffbfbfb,0xff3e3e3e,
+    0x6a000500,0x4e000500,0x7000000,0xf000000,0x19000000,0x28000000,0x34000000,0x43000000,0x52000000,0x64000000,0x79000500,0xff000000,0xffcbcbcb,0xffcbcbcb,
+    0xffcdcdcd,0xffd1d1d1,0xffd6d6d6,0xffdddddd,0xffe7e7e7,0xffececec,0xffefefef,0xffefefef,0xffe7e7e7,0xffc5c5c5,0xff9f9f9f,0xff7f7f7f,0xff6f6f6f,0xff6b6b6b,
+    0xff717171,0xff8c8c8c,0xffb5b5b5,0xff000000,0x76000500,0x58000500,0xc000000,0x19000000,0xff78cf7b,0xff75cd78,0xff71cb75,0xff6ec872,0xff69c56d,0xff67c56b,
+    0xff62c466,0xff5ec463,0xff58c15d,0xff51bf57,0xff4dbd50,0xff45bc4a,0xff42b948,0xffc6c6c6,0xffd7d7d7,0xffe5e5e5,0xffeeeeee,0xfff2f2f2,0xffcfcfcf,0xffa0a0a0,
+    0xff8d8d8d,0xff828282,0xff828282,0xff7d7d7d,0xff717171,0xff707070,0xff747474,0xff000000,0x80000500,0x60000500,0x12000000,0x27000000,0xff74cb77,0xff6fc673,
+    0xff6ac16d,0xff64bc68,0xff61ba65,0xff5db860,0xff59b95d,0xff53b757,0xff4db552,0xff48b24c,0xff41b047,0xff3ead43,0xff3ead42,0xffa7a7a7,0xffc4c4c4,0xffdbdbdb,
+    0xffececec,0xffd9d9d9,0xffababab,0xff9a9a9a,0xffa4a4a4,0xffc0c0c0,0xffcecece,0xffcfcfcf,0xffc4c4c4,0xff919191,0xff6e6e6e,0xff000000,0x87000500,0x66000500,
+    0x17000000,0x31000000,0xff6fc673,0xffffffff,0xffffffff,0xffffffff,0xfff4f9f5,0xffa5d1a7,0xff4ca74f,0xffffffff,0xffffffff,0xffffffff,0xfff3f9f3,0xff9acb9c,
+    0xff399e3d,0xff8d8d8d,0xffb1b1b1,0xffd3d3d3,0xffdddddd,0xffbdbdbd,0xffa8a8a8,0xffb5b5b5,0xffe6e6e6,0xfff3f3f3,0xfff7f7f7,0xfff3f3f3,0xffd1d1d1,0xffe7e7e7,
+    0xff9f9f9f,0xff000000,0x8b000500,0x6a000500,0x1b000000,0x3c000000,0xff69bf6c,0xffffffff,0xffe0eee1,0xff7fb582,0xffc6ddc7,0xffffffff,0xff78b07a,0xffffffff,
+    0xffdceadd,0xff6fa972,0xffc0d9c1,0xffffffff,0xff70ad73,0xff767676,0xffa2a2a2,0xffc8c8c8,0xffcacaca,0xffb3b3b3,0xffb1b1b1,0xffe3e3e3,0xfffafafa,0xfff8f8f8,
+    0xfff7f7f7,0xffafafaf,0xff7a7a7a,0xffb6b6b6,0xffe1e1e1,0xff000000,0x8e000500,0x6d000500,0x1d000000,0x43000000,0xff62ba66,0xffffffff,0xffd1e3d2,0xff418943,
+    0xff77a778,0xffffffff,0xff99bd9a,0xffffffff,0xffcbddcc,0xff2a772e,0xff6b9f6d,0xffffffff,0xff96bc98,0xff666666,0xff979797,0xffbfbfbf,0xffbfbfbf,0xffb2b2b2,
+    0xffc5c5c5,0xfff5f5f5,0xfffbfbfb,0xfffafafa,0xffb6b6b6,0xff7c7c7c,0xff777777,0xff9b9b9b,0xffefefef,0xff000000,0x8f000500,0x6e000500,0x1f000000,0x45000000,
+    0xff5eb661,0xffffffff,0xffd1e2d1,0xff3b803d,0xff9abc9a,0xffffffff,0xff88af8a,0xffffffff,0xffcbdacb,0xff276c29,0xff93b495,0xffffffff,0xff88b089,0xff606060,
+    0xff919191,0xffbcbcbc,0xffb8b8b8,0xffb2b2b2,0xffcecece,0xfffdfdfd,0xfffcfcfc,0xffbababa,0xff828282,0xff7a7a7a,0xff808080,0xffe4e4e4,0xffffffff,0xff000000,
+    0x90000500,0x6e000500,0x1f000000,0x46000000,0xff58b35d,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffdbe7dc,0xff397e3d,0xffffffff,0xffffffff,0xffffffff,
+    0xffffffff,0xffdae5db,0xff3b803e,0xff616161,0xff929292,0xffbdbdbd,0xffbbbbbb,0xffaeaeae,0xffc6c6c6,0xfff9f9f9,0xffbcbcbc,0xff868686,0xff7e7e7e,0xff777777,
+    0xff747474,0xffa4a4a4,0xfff4f4f4,0xff000000,0x90000500,0x6f000500,0x1f000000,0x46000000,0xff53b257,0xffffffff,0xffdde9dd,0xff70a473,0xff5d9a5f,0xff2d7d30,
+    0xff2b7a2f,0xffffffff,0xffdae4da,0xff68936a,0xff578c5a,0xff29722b,0xff2b7a2f,0xff656565,0xff969696,0xffc2c2c2,0xffc5c5c5,0xffa8a8a8,0xffadadad,0xffeaeaea,
+    0xffb9b9b9,0xff7e7e7e,0xff9b9b9b,0xff9a9a9a,0xff696969,0xff676767,0xff939393,0xff000000,0x90000500,0x6f000500,0x1f000000,0x46000000,0xff4eaf51,0xffffffff,
+    0xffcee1ce,0xff2f8334,0xff308734,0xff2f8634,0xff2f8433,0xffffffff,0xffcbdbcb,0xff286f2a,0xff29732b,0xff2b7a2f,0xff2f8233,0xff6b6b6b,0xff9b9b9b,0xffc5c5c5,
+    0xffd3d3d3,0xffa8a8a8,0xff949494,0xffb5b5b5,0xfff0f0f0,0xffc5c5c5,0xffebebeb,0xfffcfcfc,0xff9e9e9e,0xff686868,0xff686868,0xff000000,0x90000500,0x6f000500,
+    0x1d000000,0x43000000,0xff49b04e,0xffffffff,0xffcde2ce,0xff318834,0xff338d37,0xff348e37,0xff318c36,0xffffffff,0xffcbdccc,0xff29752d,0xff2b7a2f,0xff2e7f31,
+    0xff318834,0xff757575,0xffa4a4a4,0xffc7c7c7,0xffe3e3e3,0xffc5c5c5,0xff8d8d8d,0xff818181,0xffa5a5a5,0xffdddddd,0xffe8e8e8,0xffeaeaea,0xffcbcbcb,0xff707070,
+    0xff696969,0xff000000,0x90000500,0x6f000500,0x1b000000,0x3e000000,0xff45b148,0xffffffff,0xffcde3ce,0xff348f37,0xff359439,0xff359539,0xff349138,0xffffffff,
+    0xffcbddcc,0xff2d7b30,0xff2e8031,0xff308734,0xff338d37,0xff858585,0xffadadad,0xffcbcbcb,0xffe4e4e4,0xffeeeeee,0xffb7b7b7,0xff7d7d7d,0xff767676,0xff797979,
+    0xff868686,0xff868686,0xff7c7c7c,0xff6d6d6d,0xff6d6d6d,0xff000000,0x90000500,0x6f000500,0x17000000,0x34000000,0xff3fb245,0xff3ba43f,0xff36993b,0xff369639,
+    0xff369a3c,0xff36993b,0xff359539,0xff338e37,0xff2f8433,0xff2f8331,0xff308634,0xff318a35,0xff338e37,0xff979797,0xffb8b8b8,0xffd2d2d2,0xffe3e3e3,0xfff3f3f3,
+    0xfff5f5f5,0xffc7c7c7,0xff969696,0xff727272,0xff727272,0xff727272,0xff727272,0xff939393,0xffbebebe,0xff000000,0x90000500,0x6e000500,0x12000000,0x28000000,
+    0x47000000,0x6b000000,0x87000000,0x9a000000,0xa7000000,0xb2000000,0xbc000000,0xff000000,0xff6d6d6d,0xff6e6e6e,0xff767676,0xff848484,0xff969696,0xffadadad,
+    0xffc6c6c6,0xffd9d9d9,0xffe8e8e8,0xffefefef,0xfff7f7f7,0xfff9f9f9,0xffebebeb,0xffd7d7d7,0xffc9c9c9,0xffc9c9c9,0xffd6d6d6,0xffeaeaea,0xfffafafa,0xff000000,
+    0x8e000500,0x6d000500,0xc000000,0x1a000000,0x2f000000,0x47000000,0x5b000000,0x6c000000,0x79000000,0x87000000,0x97000000,0xff000000,0xffa0a0a0,0xffa0a0a0,
+    0xffa5a5a5,0xffafafaf,0xffbababa,0xffc7c7c7,0xffd7d7d7,0xffe4e4e4,0xffededed,0xfff2f2f2,0xfff4f4f4,0xfff5f5f5,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,
+    0xfff8f8f8,0xfff7f7f7,0xfff4f4f4,0xff000000,0x8c000500,0x6b000500,0x7000000,0x10000000,0x1b000000,0x2a000000,0x37000000,0x45000000,0x53000000,0x63000000,
+    0x76000000,0xff000000,0xffc9c9c9,0xffc9c9c9,0xffcbcbcb,0xffd1d1d1,0xffd5d5d5,0xffdcdcdc,0xffe6e6e6,0xffececec,0xfff2f2f2,0xfff5f5f5,0xfff6f6f6,0xfff6f6f6,
+    0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xff000000,0x87000500,0x68000500,0x4000000,0x7000000,0xd000000,0x14000000,
+    0x1c000000,0x28000000,0x35000000,0x47000000,0x5c000600,0xff000000,0xffe5e5e5,0xffe5e5e5,0xffe7e7e7,0xffe8e8e8,0xffe8e8e8,0xffececec,0xfff1f1f1,0xfff3f3f3,
+    0xfff5f5f5,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xff000000,0x7f000500,0x61000500,
+    0x1000000,0x2000000,0x4000000,0x8000000,0xe000000,0x16000000,0x21000000,0x31000000,0x47000000,0xff000000,0xfff7f7f7,0xfff7f7f7,0xfff7f7f7,0xfff8f8f8,
+    0xfff8f8f8,0xfffafafa,0xfffcfcfc,0xfffdfdfd,0xfffefefe,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,
+    0xffffffff,0xff000000,0x73000500,0x58000500,0xffffff,0xffffff,0xffffff,0x2000500,0x5000500,0xb000500,0x15000500,0x24000500,0x36000500,0xff000000,
     0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,
-    0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0x63000200,0x4c000200,0xffffff,0xffffff,0xffffff,0x1000200,0x4000200,0x9000200,
-    0x11000200,0x1d000200,0x2c000200,0x3e000200,0x51000200,0x63000200,0x73000200,0x7f000200,0x87000200,0x8c000200,0x8e000200,0x90000200,0x90000200,0x90000200,
-    0x90000200,0x90000200,0x90000200,0x90000200,0x8e000200,0x8c000200,0x87000200,0x7f000200,0x73000200,0x63000200,0x51000200,0x3e000200,0xffffff,0xffffff,
-    0xffffff,0x1000200,0x3000200,0x7000200,0xd000200,0x16000200,0x22000200,0x30000200,0x3e000200,0x4c000200,0x58000200,0x61000200,0x68000200,0x6b000200,
-    0x6d000200,0x6e000200,0x6f000200,0x6f000200,0x6f000200,0x6f000200,0x6f000200,0x6e000200,0x6d000200,0x6b000200,0x68000200,0x61000200,0x58000200,0x4c000200,
-    0x3e000200,0x30000200
+    0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0x63000500,0x4c000500,0xffffff,0xffffff,0xffffff,0x1000500,0x4000500,0x9000500,
+    0x11000500,0x1d000500,0x2c000500,0x3e000500,0x51000500,0x63000500,0x73000500,0x7f000500,0x87000500,0x8c000500,0x8e000500,0x90000500,0x90000500,0x90000500,
+    0x90000500,0x90000500,0x90000500,0x90000500,0x8e000500,0x8c000500,0x87000500,0x7f000500,0x73000500,0x63000500,0x51000500,0x3e000500,0xffffff,0xffffff,
+    0xffffff,0x1000500,0x3000500,0x7000500,0xd000500,0x16000500,0x22000500,0x30000500,0x3e000500,0x4c000500,0x58000500,0x61000500,0x68000500,0x6b000500,
+    0x6d000500,0x6e000500,0x6f000500,0x6f000500,0x6f000500,0x6f000500,0x6f000500,0x6e000500,0x6d000500,0x6b000500,0x68000500,0x61000500,0x58000500,0x4c000500,
+    0x3e000500,0x30000500
 };
@@ -923,74 +923,74 @@ static const QRgb DocumentTypeWord_data[] = {
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x1000200,0x2000200,0x5000200,0x9000200,0x10000200,0x18000200,0x22000200,
-    0x2c000200,0x36000200,0x3f000200,0x45000200,0x4a000200,0x4d000200,0x4e000200,0x4e000200,0x4e000200,0x4c000200,0x49000200,0x45000200,0x3f000200,0x37000200,
-    0x2e000200,0x25000200,0x1c000200,0x13000200,0xd000200,0x8000200,0x4000200,0x2000200,0xffffff,0xffffff,0xffffff,0x1000200,0x3000200,0x7000200,
-    0xd000200,0x16000200,0x22000200,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,
-    0xff000000,0xff000000,0xfd282828,0x72434543,0x44000200,0x37000200,0x2b000200,0x1f000200,0x15000200,0xd000200,0x8000200,0x4000200,0xffffff,0xffffff,
-    0xffffff,0x1000200,0x4000200,0x9000200,0x11000200,0x1d000200,0x2c000200,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,
-    0xfffefefe,0xfffcfcfc,0xfff9f9f9,0xfff3f3f3,0xffe9e9e9,0xffdedede,0xffc8c8c8,0xfd272727,0x76303230,0x4e000200,0x3d000200,0x2e000200,0x21000200,0x16000200,
-    0xe000200,0x8000200,0xffffff,0xffffff,0xffffff,0x2000200,0x5000200,0xb000200,0x15000200,0x24000200,0x36000200,0xff000000,0xffffffff,0xffffffff,
-    0xffffffff,0xffffffff,0xfffefefe,0xfffefefe,0xfffdfdfd,0xfffcfcfc,0xfff6f6f6,0xffededed,0xffdedede,0xffcccccc,0xfffefefe,0xffb3b3b3,0xfd292929,0x802e302e,
-    0x53000200,0x40000200,0x2f000200,0x21000200,0x16000200,0xd000200,0xffffff,0xffffff,0xffffff,0x2000200,0x6000200,0xd000200,0x18000200,0x29000200,
-    0x3f000200,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,0xfffdfdfd,0xfffcfcfc,0xfffafafa,0xfff4f4f4,0xffe9e9e9,0xffd4d4d4,0xffbcbcbc,
-    0xffffffff,0xfffcfcfc,0xffa1a1a1,0xfd2b2b2b,0x7e262826,0x55000200,0x41000200,0x2f000200,0x20000200,0x15000200,0xffffff,0xffffff,0x1000200,0x2000200,
-    0x6000200,0xe000200,0x1b000200,0x2d000200,0x45000200,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffdfdfd,0xfffdfdfd,0xfffbfbfb,0xfff9f9f9,
-    0xfff2f2f2,0xffe4e4e4,0xffcdcdcd,0xffaeaeae,0xffffffff,0xffffffff,0xfffcfcfc,0xff949494,0xfd2e2e2e,0x7a1d1f1d,0x55000200,0x40000200,0x2d000200,0x1e000200,
-    0xffffff,0xffffff,0x1000200,0x2000200,0x7000200,0xf000200,0x1d000200,0x30000200,0x4a000200,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,
-    0xfffdfdfd,0xfffcfcfc,0xfffbfbfb,0xfff7f7f7,0xfff0f0f0,0xffe2e2e2,0xffc8c8c8,0xffa7a7a7,0xffffffff,0xffffffff,0xffffffff,0xfff9f9f9,0xff8e8e8e,0xfd343434,
-    0x781e1e1e,0x52000200,0x3c000200,0x29000200,0xffffff,0xffffff,0x1000200,0x3000200,0x7000200,0x10000200,0x1e000200,0x32000200,0x4d000200,0xff000000,
-    0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffcfcfc,0xfffbfbfb,0xfffafafa,0xfff7f7f7,0xfff0f0f0,0xffe1e1e1,0xffc8c8c8,0xffa6a6a6,0xffffffff,0xffffffff,
-    0xffffffff,0xffffffff,0xfff8f8f8,0xff8f8f8f,0xfc3b3b3b,0x70141714,0x4c000200,0x36000200,0x1000000,0x2000000,0x5000000,0x9000000,0xf000000,0x18000000,
-    0x27000000,0x3b000000,0x55000300,0xff000000,0xfff5f5f5,0xfff5f5f5,0xfff5f5f5,0xfff6f6f6,0xfff4f4f4,0xfff5f5f5,0xfff5f5f5,0xfff4f4f4,0xffefefef,0xffe4e4e4,
-    0xffcccccc,0xffadadad,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffafafa,0xff929292,0xfb434343,0x5c000200,0x42000200,0x4000000,0x7000000,
-    0xd000000,0x15000000,0x1d000000,0x29000000,0x38000000,0x4c000000,0x64000000,0xff000000,0xffe0e0e0,0xffe0e0e0,0xffe2e2e2,0xffe4e4e4,0xffe4e4e4,0xffe8e8e8,
-    0xffececec,0xfff0f0f0,0xffededed,0xffe6e6e6,0xffd7d7d7,0xffbfbfbf,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffafafa,0xff2e2e2e,
-    0x6a000200,0x4e000200,0x7000000,0xf000000,0x19000000,0x28000000,0x34000000,0x43000000,0x52000000,0x64000000,0x79000200,0xff000000,0xffc2c2c2,0xffc2c2c2,
-    0xffc4c4c4,0xffc9c9c9,0xffcecece,0xffd6d6d6,0xffe2e2e2,0xffe8e8e8,0xffececec,0xffececec,0xffe2e2e2,0xffbbbbbb,0xff909090,0xff6e6e6e,0xff5d5d5d,0xff595959,
-    0xff5f5f5f,0xff7b7b7b,0xffa8a8a8,0xff000000,0x76000200,0x58000200,0xc000000,0x18000000,0xff5356f1,0xff5153f1,0xff4d4ff0,0xff494cef,0xff4547ef,0xff4144ef,
-    0xff3d3fef,0xff383aee,0xff3235ee,0xff2b2eed,0xff2528ed,0xff1d20eb,0xff191ce6,0xffbdbdbd,0xffd0d0d0,0xffe0e0e0,0xffebebeb,0xffefefef,0xffc6c6c6,0xff919191,
-    0xff7c7c7c,0xff717171,0xff717171,0xff6c6c6c,0xff5f5f5f,0xff5e5e5e,0xff626262,0xff000000,0x80000200,0x60000200,0x12000000,0x26000000,0xff5052ee,0xff4c4eeb,
-    0xff474ae9,0xff4345e7,0xff3f42e7,0xff3b3de8,0xff3638e7,0xff2e31e7,0xff292ce6,0xff2426e6,0xff1d20e4,0xff181bde,0xff171ad7,0xff9b9b9b,0xffbababa,0xffd4d4d4,
-    0xffe8e8e8,0xffd2d2d2,0xff9d9d9d,0xff8b8b8b,0xff959595,0xffb5b5b5,0xffc5c5c5,0xffc6c6c6,0xffbababa,0xff818181,0xff5c5c5c,0xff000000,0x87000200,0x66000200,
-    0x17000000,0x30000000,0xff4c4eeb,0xff9b9df1,0xff9899ed,0xff5454de,0xff3739d7,0xff4c4ddd,0xff8c8eea,0xff4244dc,0xff2124d7,0xff383adb,0xff8183e5,0xff8183e3,
-    0xff1618c7,0xff818181,0xffa7a7a7,0xffcccccc,0xffd8d8d8,0xffb1b1b1,0xff9a9a9a,0xffa8a8a8,0xffe1e1e1,0xfff1f1f1,0xfff5f5f5,0xfff0f0f0,0xffc9c9c9,0xffe2e2e2,
-    0xff909090,0xff000000,0x8b000200,0x6a000200,0x1b000000,0x38000000,0xff474ae8,0xffa7a8ee,0xffffffff,0xff9091e0,0xff2b2dc1,0xff8a8bdd,0xffffffff,0xff8586dc,
-    0xff181abd,0xff8081da,0xffffffff,0xff9293dc,0xff1416b5,0xff6a6a6a,0xff9a9a9a,0xffc3c3c3,0xffc1c1c1,0xffa6a6a6,0xffa4a4a4,0xffdedede,0xfff9f9f9,0xfff6f6f6,
-    0xfff5f5f5,0xffa2a2a2,0xff686868,0xffa9a9a9,0xffdbdbdb,0xff000000,0x8e000200,0x6d000200,0x1d000000,0x3d000000,0xff4144e5,0xff5354db,0xffffffff,0xffe3e3f5,
-    0xff2224a8,0xffe2e2f3,0xffffffff,0xffe1e1f3,0xff11139d,0xffe0e0f2,0xffffffff,0xff2f31ab,0xff1214a6,0xff5d5d5d,0xff919191,0xffbcbcbc,0xffb5b5b5,0xffa5a5a5,
-    0xffbbbbbb,0xfff3f3f3,0xfffafafa,0xfff9f9f9,0xffaaaaaa,0xff6b6b6b,0xff656565,0xff8c8c8c,0xffececec,0xff000000,0x8f000200,0x6e000200,0x1f000000,0x3f000000,
-    0xff3e40e6,0xff3436d3,0xffb8b9ea,0xffffffff,0xff8384c6,0xffffffff,0xffffffff,0xffffffff,0xff7d7eba,0xffffffff,0xffafafd7,0xff0f118e,0xff12139e,0xff585858,
-    0xff8e8e8e,0xffbababa,0xffaeaeae,0xffa5a5a5,0xffc5c5c5,0xfffcfcfc,0xfffbfbfb,0xffaeaeae,0xff717171,0xff696969,0xff6f6f6f,0xffdfdfdf,0xffffffff,0xff000000,
-    0x90000200,0x6e000200,0x1f000000,0x3e000000,0xff393ce7,0xff2f32d7,0xff6161d2,0xffffffff,0xffffffff,0xffffffff,0xff4e4f9b,0xffffffff,0xffffffff,0xffffffff,
-    0xff4e4f9d,0xff0f1089,0xff11129a,0xff595959,0xff8f8f8f,0xffbbbbbb,0xffb1b1b1,0xffa1a1a1,0xffbcbcbc,0xfff8f8f8,0xffb0b0b0,0xff757575,0xff6d6d6d,0xff656565,
-    0xff626262,0xff959595,0xfff2f2f2,0xff000000,0x90000200,0x6f000200,0x1f000000,0x3e000000,0xff3437ea,0xff2c2edd,0xff2124c7,0xffd3d3ef,0xffffffff,0xff9f9fcc,
-    0xff0d0f76,0xff9e9fc7,0xffffffff,0xffe0e0ed,0xff0d0f7b,0xff0f118a,0xff11139b,0xff5c5c5c,0xff919191,0xffbdbdbd,0xffbcbcbc,0xff9a9a9a,0xff9f9f9f,0xffe6e6e6,
-    0xffadadad,0xff6d6d6d,0xff8c8c8c,0xff8b8b8b,0xff575757,0xff555555,0xff838383,0xff000000,0x90000200,0x6f000200,0x1f000000,0x3d000000,0xff2e30ed,0xff2629e3,
-    0xff1e21d2,0xff7273d5,0xffffffff,0xff5051ad,0xff0e1084,0xff4e50a2,0xffffffff,0xff6d6eb0,0xff0e1084,0xff0f1291,0xff11139f,0xff5f5f5f,0xff949494,0xffbfbfbf,
-    0xffcccccc,0xff9a9a9a,0xff848484,0xffa8a8a8,0xffededed,0xffbbbbbb,0xffe7e7e7,0xfffbfbfb,0xff8f8f8f,0xff565656,0xff565656,0xff000000,0x90000200,0x6f000200,
-    0x1d000000,0x3b000000,0xff272aee,0xff1f22e7,0xff181bd9,0xff1518c4,0xff5253c4,0xff12139f,0xff111398,0xff101292,0xff5050ad,0xff1e2194,0xff0f1291,0xff111399,
-    0xff1113a1,0xff666666,0xff989898,0xffbfbfbf,0xffdedede,0xffbbbbbb,0xff7c7c7c,0xff707070,0xff979797,0xffd6d6d6,0xffe3e3e3,0xffe6e6e6,0xffc2c2c2,0xff5e5e5e,
-    0xff575757,0xff000000,0x90000200,0x6f000200,0x1b000000,0x36000000,0xff2023ee,0xff1a1dea,0xff181bdc,0xff1619cc,0xff1517bd,0xff1316b1,0xff1215aa,0xff1214a6,
-    0xff1213a1,0xff11139e,0xff11139e,0xff1114a2,0xff1214a6,0xff747474,0xffa0a0a0,0xffc2c2c2,0xffdfdfdf,0xffebebeb,0xffababab,0xff6c6c6c,0xff646464,0xff676767,
-    0xff757575,0xff757575,0xff6b6b6b,0xff5b5b5b,0xff5b5b5b,0xff000000,0x90000200,0x6f000200,0x17000000,0x2e000000,0xff1a1deb,0xff191ce2,0xff181ad8,0xff1619cf,
-    0xff1618c3,0xff1417bc,0xff1316b5,0xff1315b0,0xff1315ab,0xff1314a8,0xff1214a5,0xff1214a6,0xff1315a7,0xff878787,0xffacacac,0xffcacaca,0xffdedede,0xfff0f0f0,
-    0xfff3f3f3,0xffbdbdbd,0xff868686,0xff606060,0xff606060,0xff606060,0xff606060,0xff838383,0xffb3b3b3,0xff000000,0x90000200,0x6e000200,0x12000000,0x25000000,
-    0x3e000000,0x5e000000,0x79000000,0x91000000,0xa2000000,0xaf000000,0xba000000,0xff000000,0xff636363,0xff636363,0xff6a6a6a,0xff767676,0xff878787,0xff9e9e9e,
-    0xffbcbcbc,0xffd2d2d2,0xffe4e4e4,0xffececec,0xfff5f5f5,0xfff8f8f8,0xffe7e7e7,0xffcfcfcf,0xffbfbfbf,0xffbfbfbf,0xffcecece,0xffe6e6e6,0xfff9f9f9,0xff000000,
-    0x8e000200,0x6d000200,0xc000000,0x18000000,0x2a000000,0x3f000000,0x52000000,0x65000000,0x75000000,0x84000000,0x94000000,0xff000000,0xff989898,0xff989898,
-    0xff9c9c9c,0xffa4a4a4,0xffafafaf,0xffbdbdbd,0xffd0d0d0,0xffdfdfdf,0xffe9e9e9,0xffefefef,0xfff2f2f2,0xfff3f3f3,0xfff6f6f6,0xfff7f7f7,0xfff7f7f7,0xfff7f7f7,
-    0xfff7f7f7,0xfff5f5f5,0xfff2f2f2,0xff000000,0x8c000200,0x6b000200,0x7000000,0xf000000,0x19000000,0x27000000,0x34000000,0x42000000,0x51000000,0x62000000,
-    0x75000000,0xff000000,0xffc2c2c2,0xffc2c2c2,0xffc4c4c4,0xffc9c9c9,0xffcecece,0xffd5d5d5,0xffe1e1e1,0xffe8e8e8,0xffefefef,0xfff3f3f3,0xfff4f4f4,0xfff4f4f4,
-    0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xff000000,0x87000200,0x68000200,0x4000000,0x7000000,0xd000000,0x14000000,
-    0x1c000000,0x28000000,0x35000000,0x47000000,0x5c000300,0xff000000,0xffe0e0e0,0xffe0e0e0,0xffe2e2e2,0xffe4e4e4,0xffe4e4e4,0xffe8e8e8,0xffeeeeee,0xfff1f1f1,
-    0xfff3f3f3,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xff000000,0x7f000200,0x61000200,
-    0x1000000,0x2000000,0x4000000,0x8000000,0xe000000,0x16000000,0x21000000,0x31000000,0x47000000,0xff000000,0xfff5f5f5,0xfff5f5f5,0xfff5f5f5,0xfff6f6f6,
-    0xfff7f7f7,0xfff9f9f9,0xfffbfbfb,0xfffdfdfd,0xfffefefe,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,
-    0xffffffff,0xff000000,0x73000200,0x58000200,0xffffff,0xffffff,0xffffff,0x2000200,0x5000200,0xb000200,0x15000200,0x24000200,0x36000200,0xff000000,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x1000500,0x2000500,0x5000500,0x9000500,0x10000500,0x18000500,0x22000500,
+    0x2c000500,0x36000500,0x3f000500,0x45000500,0x4a000500,0x4d000500,0x4e000500,0x4e000500,0x4e000500,0x4c000500,0x49000500,0x45000500,0x3f000500,0x37000500,
+    0x2e000500,0x25000500,0x1c000500,0x13000500,0xd000500,0x8000500,0x4000500,0x2000500,0xffffff,0xffffff,0xffffff,0x1000500,0x3000500,0x7000500,
+    0xd000500,0x16000500,0x22000500,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,
+    0xff000000,0xff000000,0xfd373737,0x72545754,0x44000500,0x37000500,0x2b000500,0x1f000500,0x15000500,0xd000500,0x8000500,0x4000500,0xffffff,0xffffff,
+    0xffffff,0x1000500,0x4000500,0x9000500,0x11000500,0x1d000500,0x2c000500,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,
+    0xfffefefe,0xfffdfdfd,0xfffafafa,0xfff5f5f5,0xffededed,0xffe3e3e3,0xffd1d1d1,0xfd363636,0x76404240,0x4e000500,0x3d000500,0x2e000500,0x21000500,0x16000500,
+    0xe000500,0x8000500,0xffffff,0xffffff,0xffffff,0x2000500,0x5000500,0xb000500,0x15000500,0x24000500,0x36000500,0xff000000,0xffffffff,0xffffffff,
+    0xffffffff,0xffffffff,0xfffefefe,0xfffefefe,0xfffdfdfd,0xfffdfdfd,0xfff8f8f8,0xfff0f0f0,0xffe3e3e3,0xffd4d4d4,0xfffefefe,0xffbebebe,0xfd383838,0x803e403e,
+    0x53000500,0x40000500,0x2f000500,0x21000500,0x16000500,0xd000500,0xffffff,0xffffff,0xffffff,0x2000500,0x6000500,0xd000500,0x18000500,0x29000500,
+    0x3f000500,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,0xfffdfdfd,0xfffdfdfd,0xfffbfbfb,0xfff6f6f6,0xffededed,0xffdbdbdb,0xffc6c6c6,
+    0xffffffff,0xfffdfdfd,0xffaeaeae,0xfd3b3b3b,0x7e353735,0x55000500,0x41000500,0x2f000500,0x20000500,0x15000500,0xffffff,0xffffff,0x1000500,0x2000500,
+    0x6000500,0xe000500,0x1b000500,0x2d000500,0x45000500,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffdfdfd,0xfffdfdfd,0xfffcfcfc,0xfffafafa,
+    0xfff4f4f4,0xffe8e8e8,0xffd5d5d5,0xffbababa,0xffffffff,0xffffffff,0xfffdfdfd,0xffa3a3a3,0xfd3e3e3e,0x7a2a2d2a,0x55000500,0x40000500,0x2d000500,0x1e000500,
+    0xffffff,0xffffff,0x1000500,0x2000500,0x7000500,0xf000500,0x1d000500,0x30000500,0x4a000500,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,
+    0xfffdfdfd,0xfffdfdfd,0xfffcfcfc,0xfff8f8f8,0xfff3f3f3,0xffe7e7e7,0xffd1d1d1,0xffb4b4b4,0xffffffff,0xffffffff,0xffffffff,0xfffafafa,0xff9d9d9d,0xfd454545,
+    0x782b2b2b,0x52000500,0x3c000500,0x29000500,0xffffff,0xffffff,0x1000500,0x3000500,0x7000500,0x10000500,0x1e000500,0x32000500,0x4d000500,0xff000000,
+    0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffdfdfd,0xfffcfcfc,0xfffbfbfb,0xfff8f8f8,0xfff3f3f3,0xffe6e6e6,0xffd1d1d1,0xffb3b3b3,0xffffffff,0xffffffff,
+    0xffffffff,0xffffffff,0xfff9f9f9,0xff9e9e9e,0xfc4c4c4c,0x701f231f,0x4c000500,0x36000500,0x1000000,0x2000000,0x5000000,0x9000000,0xf000000,0x18000000,
+    0x27000000,0x3b000000,0x55000600,0xff000000,0xfff7f7f7,0xfff7f7f7,0xfff7f7f7,0xfff8f8f8,0xfff6f6f6,0xfff7f7f7,0xfff7f7f7,0xfff6f6f6,0xfff2f2f2,0xffe8e8e8,
+    0xffd4d4d4,0xffb9b9b9,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffbfbfb,0xffa1a1a1,0xfb545454,0x5c000500,0x42000500,0x4000000,0x7000000,
+    0xd000000,0x15000000,0x1d000000,0x29000000,0x38000000,0x4c000000,0x64000000,0xff000000,0xffe5e5e5,0xffe5e5e5,0xffe7e7e7,0xffe8e8e8,0xffe8e8e8,0xffececec,
+    0xffefefef,0xfff3f3f3,0xfff0f0f0,0xffeaeaea,0xffdddddd,0xffc9c9c9,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffbfbfb,0xff3e3e3e,
+    0x6a000500,0x4e000500,0x7000000,0xf000000,0x19000000,0x28000000,0x34000000,0x43000000,0x52000000,0x64000000,0x79000500,0xff000000,0xffcbcbcb,0xffcbcbcb,
+    0xffcdcdcd,0xffd1d1d1,0xffd6d6d6,0xffdddddd,0xffe7e7e7,0xffececec,0xffefefef,0xffefefef,0xffe7e7e7,0xffc5c5c5,0xff9f9f9f,0xff7f7f7f,0xff6f6f6f,0xff6b6b6b,
+    0xff717171,0xff8c8c8c,0xffb5b5b5,0xff000000,0x76000500,0x58000500,0xc000000,0x18000000,0xff6568f3,0xff6365f3,0xff5f61f3,0xff5b5ef2,0xff5759f2,0xff5256f2,
+    0xff4e50f2,0xff494bf1,0xff4246f1,0xff3b3ef0,0xff3437f0,0xff2a2eee,0xff2529ea,0xffc7c7c7,0xffd7d7d7,0xffe5e5e5,0xffeeeeee,0xfff2f2f2,0xffcfcfcf,0xffa0a0a0,
+    0xff8d8d8d,0xff828282,0xff828282,0xff7d7d7d,0xff717171,0xff707070,0xff747474,0xff000000,0x80000500,0x60000500,0x12000000,0x26000000,0xff6264f1,0xff5e60ee,
+    0xff595ced,0xff5457eb,0xff5053eb,0xff4c4eec,0xff4749eb,0xff3e41eb,0xff383cea,0xff3335ea,0xff2a2ee8,0xff2428e3,0xff2327dd,0xffa9a9a9,0xffc4c4c4,0xffdbdbdb,
+    0xffececec,0xffd9d9d9,0xffababab,0xff9a9a9a,0xffa4a4a4,0xffc0c0c0,0xffcecece,0xffcfcfcf,0xffc4c4c4,0xff919191,0xff6e6e6e,0xff000000,0x87000500,0x66000500,
+    0x17000000,0x30000000,0xff5e60ee,0xffa9abf3,0xffa6a7f0,0xff6666e3,0xff484add,0xff5e5fe3,0xff9b9dee,0xff5356e2,0xff2f33dd,0xff494be1,0xff9193e9,0xff9193e8,
+    0xff2224d0,0xff919191,0xffb4b4b4,0xffd4d4d4,0xffdedede,0xffbdbdbd,0xffa8a8a8,0xffb5b5b5,0xffe6e6e6,0xfff3f3f3,0xfff7f7f7,0xfff3f3f3,0xffd1d1d1,0xffe7e7e7,
+    0xff9f9f9f,0xff000000,0x8b000500,0x6a000500,0x1b000000,0x38000000,0xff595cec,0xffb4b5f1,0xffffffff,0xff9fa0e5,0xff3b3dcb,0xff9a9ae3,0xffffffff,0xff9596e2,
+    0xff2427c7,0xff9091e0,0xffffffff,0xffa1a2e2,0xff1f22c0,0xff7b7b7b,0xffa8a8a8,0xffcccccc,0xffcbcbcb,0xffb3b3b3,0xffb1b1b1,0xffe3e3e3,0xfffafafa,0xfff8f8f8,
+    0xfff7f7f7,0xffafafaf,0xff7a7a7a,0xffb6b6b6,0xffe1e1e1,0xff000000,0x8e000500,0x6d000500,0x1d000000,0x3d000000,0xff5256e9,0xff6566e1,0xffffffff,0xffe8e8f7,
+    0xff3033b5,0xffe7e7f5,0xffffffff,0xffe6e6f5,0xff1b1eab,0xffe5e5f4,0xffffffff,0xff3f41b7,0xff1d1fb3,0xff6f6f6f,0xffa0a0a0,0xffc6c6c6,0xffc0c0c0,0xffb2b2b2,
+    0xffc5c5c5,0xfff5f5f5,0xfffbfbfb,0xfffafafa,0xffb6b6b6,0xff7c7c7c,0xff777777,0xff9b9b9b,0xffefefef,0xff000000,0x8f000500,0x6e000500,0x1f000000,0x3f000000,
+    0xff4f51ea,0xff4547da,0xffc3c4ee,0xffffffff,0xff9394cf,0xffffffff,0xffffffff,0xffffffff,0xff8d8ec4,0xffffffff,0xffbbbbdd,0xff191b9d,0xff1d1eac,0xff6a6a6a,
+    0xff9d9d9d,0xffc4c4c4,0xffbababa,0xffb2b2b2,0xffcecece,0xfffdfdfd,0xfffcfcfc,0xffbababa,0xff828282,0xff7a7a7a,0xff808080,0xffe4e4e4,0xffffffff,0xff000000,
+    0x90000500,0x6e000500,0x1f000000,0x3e000000,0xff4a4deb,0xff3f42dd,0xff7373d9,0xffffffff,0xffffffff,0xffffffff,0xff6061a9,0xffffffff,0xffffffff,0xffffffff,
+    0xff6061ab,0xff191a99,0xff1b1da8,0xff6b6b6b,0xff9e9e9e,0xffc5c5c5,0xffbdbdbd,0xffaeaeae,0xffc6c6c6,0xfff9f9f9,0xffbcbcbc,0xff868686,0xff7e7e7e,0xff777777,
+    0xff747474,0xffa4a4a4,0xfff4f4f4,0xff000000,0x90000500,0x6f000500,0x1f000000,0x3e000000,0xff4548ee,0xff3c3ee3,0xff2f33d0,0xffdadaf2,0xffffffff,0xffadadd4,
+    0xff161987,0xffacadd0,0xffffffff,0xffe5e5f0,0xff16198c,0xff191b9a,0xff1b1ea9,0xff6e6e6e,0xffa0a0a0,0xffc7c7c7,0xffc6c6c6,0xffa8a8a8,0xffadadad,0xffeaeaea,
+    0xffb9b9b9,0xff7e7e7e,0xff9b9b9b,0xff9a9a9a,0xff696969,0xff676767,0xff939393,0xff000000,0x90000500,0x6f000500,0x1f000000,0x3d000000,0xff3e40f0,0xff3538e8,
+    0xff2b2fd9,0xff8384dc,0xffffffff,0xff6263b9,0xff171a94,0xff6062af,0xffffffff,0xff7e7fbc,0xff171a94,0xff191da0,0xff1b1ead,0xff717171,0xffa3a3a3,0xffc9c9c9,
+    0xffd4d4d4,0xffa8a8a8,0xff949494,0xffb5b5b5,0xfff0f0f0,0xffc5c5c5,0xffebebeb,0xfffcfcfc,0xff9e9e9e,0xff686868,0xff686868,0xff000000,0x90000500,0x6f000500,
+    0x1d000000,0x3b000000,0xff3639f1,0xff2d30eb,0xff2428df,0xff2024cd,0xff6465cd,0xff1d1ead,0xff1b1ea6,0xff1a1da1,0xff6262b9,0xff2b2fa3,0xff191da0,0xff1b1ea7,
+    0xff1b1eae,0xff787878,0xffa6a6a6,0xffc9c9c9,0xffe3e3e3,0xffc5c5c5,0xff8d8d8d,0xff818181,0xffa5a5a5,0xffdddddd,0xffe8e8e8,0xffeaeaea,0xffcbcbcb,0xff707070,
+    0xff696969,0xff000000,0x90000500,0x6f000500,0x1b000000,0x36000000,0xff2e31f1,0xff272aee,0xff2428e2,0xff2225d4,0xff2023c7,0xff1e22bd,0xff1d20b6,0xff1d1fb3,
+    0xff1d1eae,0xff1b1eac,0xff1b1eac,0xff1b1faf,0xff1d1fb3,0xff858585,0xffadadad,0xffcbcbcb,0xffe4e4e4,0xffeeeeee,0xffb7b7b7,0xff7d7d7d,0xff767676,0xff797979,
+    0xff868686,0xff868686,0xff7c7c7c,0xff6d6d6d,0xff6d6d6d,0xff000000,0x90000500,0x6f000500,0x17000000,0x2e000000,0xff272aee,0xff2529e7,0xff2427de,0xff2225d7,
+    0xff2224cc,0xff1f23c6,0xff1e22c0,0xff1e20bc,0xff1e20b7,0xff1e1fb5,0xff1d1fb2,0xff1d1fb3,0xff1e20b4,0xff979797,0xffb8b8b8,0xffd2d2d2,0xffe3e3e3,0xfff3f3f3,
+    0xfff5f5f5,0xffc7c7c7,0xff969696,0xff727272,0xff727272,0xff727272,0xff727272,0xff939393,0xffbebebe,0xff000000,0x90000500,0x6e000500,0x12000000,0x25000000,
+    0x3e000000,0x5e000000,0x79000000,0x91000000,0xa2000000,0xaf000000,0xba000000,0xff000000,0xff757575,0xff757575,0xff7b7b7b,0xff878787,0xff979797,0xffacacac,
+    0xffc6c6c6,0xffd9d9d9,0xffe8e8e8,0xffefefef,0xfff7f7f7,0xfff9f9f9,0xffebebeb,0xffd7d7d7,0xffc9c9c9,0xffc9c9c9,0xffd6d6d6,0xffeaeaea,0xfffafafa,0xff000000,
+    0x8e000500,0x6d000500,0xc000000,0x18000000,0x2a000000,0x3f000000,0x52000000,0x65000000,0x75000000,0x84000000,0x94000000,0xff000000,0xffa6a6a6,0xffa6a6a6,
+    0xffaaaaaa,0xffb1b1b1,0xffbbbbbb,0xffc7c7c7,0xffd7d7d7,0xffe4e4e4,0xffededed,0xfff2f2f2,0xfff4f4f4,0xfff5f5f5,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,
+    0xfff8f8f8,0xfff7f7f7,0xfff4f4f4,0xff000000,0x8c000500,0x6b000500,0x7000000,0xf000000,0x19000000,0x27000000,0x34000000,0x42000000,0x51000000,0x62000000,
+    0x75000000,0xff000000,0xffcbcbcb,0xffcbcbcb,0xffcdcdcd,0xffd1d1d1,0xffd6d6d6,0xffdcdcdc,0xffe6e6e6,0xffececec,0xfff2f2f2,0xfff5f5f5,0xfff6f6f6,0xfff6f6f6,
+    0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xff000000,0x87000500,0x68000500,0x4000000,0x7000000,0xd000000,0x14000000,
+    0x1c000000,0x28000000,0x35000000,0x47000000,0x5c000600,0xff000000,0xffe5e5e5,0xffe5e5e5,0xffe7e7e7,0xffe8e8e8,0xffe8e8e8,0xffececec,0xfff1f1f1,0xfff3f3f3,
+    0xfff5f5f5,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xff000000,0x7f000500,0x61000500,
+    0x1000000,0x2000000,0x4000000,0x8000000,0xe000000,0x16000000,0x21000000,0x31000000,0x47000000,0xff000000,0xfff7f7f7,0xfff7f7f7,0xfff7f7f7,0xfff8f8f8,
+    0xfff8f8f8,0xfffafafa,0xfffcfcfc,0xfffdfdfd,0xfffefefe,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,
+    0xffffffff,0xff000000,0x73000500,0x58000500,0xffffff,0xffffff,0xffffff,0x2000500,0x5000500,0xb000500,0x15000500,0x24000500,0x36000500,0xff000000,
     0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,
-    0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0x63000200,0x4c000200,0xffffff,0xffffff,0xffffff,0x1000200,0x4000200,0x9000200,
-    0x11000200,0x1d000200,0x2c000200,0x3e000200,0x51000200,0x63000200,0x73000200,0x7f000200,0x87000200,0x8c000200,0x8e000200,0x90000200,0x90000200,0x90000200,
-    0x90000200,0x90000200,0x90000200,0x90000200,0x8e000200,0x8c000200,0x87000200,0x7f000200,0x73000200,0x63000200,0x51000200,0x3e000200,0xffffff,0xffffff,
-    0xffffff,0x1000200,0x3000200,0x7000200,0xd000200,0x16000200,0x22000200,0x30000200,0x3e000200,0x4c000200,0x58000200,0x61000200,0x68000200,0x6b000200,
-    0x6d000200,0x6e000200,0x6f000200,0x6f000200,0x6f000200,0x6f000200,0x6f000200,0x6e000200,0x6d000200,0x6b000200,0x68000200,0x61000200,0x58000200,0x4c000200,
-    0x3e000200,0x30000200
+    0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0x63000500,0x4c000500,0xffffff,0xffffff,0xffffff,0x1000500,0x4000500,0x9000500,
+    0x11000500,0x1d000500,0x2c000500,0x3e000500,0x51000500,0x63000500,0x73000500,0x7f000500,0x87000500,0x8c000500,0x8e000500,0x90000500,0x90000500,0x90000500,
+    0x90000500,0x90000500,0x90000500,0x90000500,0x8e000500,0x8c000500,0x87000500,0x7f000500,0x73000500,0x63000500,0x51000500,0x3e000500,0xffffff,0xffffff,
+    0xffffff,0x1000500,0x3000500,0x7000500,0xd000500,0x16000500,0x22000500,0x30000500,0x3e000500,0x4c000500,0x58000500,0x61000500,0x68000500,0x6b000500,
+    0x6d000500,0x6e000500,0x6f000500,0x6f000500,0x6f000500,0x6f000500,0x6f000500,0x6e000500,0x6d000500,0x6b000500,0x68000500,0x61000500,0x58000500,0x4c000500,
+    0x3e000500,0x30000500
 };
@@ -1002,68 +1002,68 @@ static const QRgb FileBrowser_data[] = {
     0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,
-    0x3d000000,0x3d000000,0x3b000000,0x36000000,0x2e000000,0x25000000,0x18000000,0xf000000,0xc000000,0x18000000,0xff083115,0xff06230f,0xff06230f,0xff06290f,
-    0xff06270f,0xff06240f,0xff06230f,0xff06230f,0xff0b471e,0xff0b471e,0xff0b471e,0xff0b461e,0xff0b461e,0xff0b451d,0xff0b451d,0xff0b441d,0xff0b441d,0xff0b431c,
-    0xff0a421c,0xff0a421c,0xff0a421c,0xff0a411b,0xff0a411b,0xff0a401b,0xff0a3f1b,0xff0a3e1a,0xff093c19,0x3d000000,0x29000000,0x18000000,0x12000000,0x25000000,
-    0xff0b431c,0xffc7c7c7,0xff999999,0xff6d6d6d,0xff6d6d6d,0xff778775,0xff768275,0xff727771,0xff6d6d6d,0xff6d6d6d,0xffd9d9d9,0xffd8d8d8,0xffd6d6d6,0xffd5d5d5,
-    0xffd3d3d3,0xffd1d1d1,0xffcfcfcf,0xffcdcdcd,0xffcbcbcb,0xffc9c9c9,0xffc8c8c8,0xffc6c6c6,0xffc5c5c5,0xffc3c3c3,0xffbfbfbf,0xffb8b8b8,0xff093a18,0x5c000000,
-    0x3d000000,0x25000000,0x17000000,0x2e000000,0xff0a421c,0xffcdcdcd,0xffcecece,0xffc9c9c9,0xff9f9f9f,0xff6d6d6d,0xff6d6d6d,0xff829480,0xff839481,0xff7a8479,
-    0xff6c6c6c,0xff6b6b6b,0xffd5d5d5,0xffd3d3d3,0xff696969,0xff686868,0xff666666,0xffcbcbcb,0xffc9c9c9,0xffc8c8c8,0xffc6c6c6,0xffc4c4c4,0xffc3c3c3,0xffbdbdbd,
-    0xffb8b8b8,0xffb1b1b1,0xff093817,0x74000000,0x4e000000,0x2e000000,0x1b000000,0x36000000,0xff0a3e1a,0xffc8c7c7,0xffcccbcb,0xffcdcdcd,0xffcecece,0xffc9c9c9,
-    0xffa2a2a2,0xff6d6d6d,0xff6d6d6d,0xff8da28b,0xff90a48e,0xff859384,0xff6a6a6a,0xff696969,0xff818f80,0xff808e7f,0xff6d706c,0xff656565,0xff646464,0xffc6c6c6,
-    0xffc4c4c4,0xffc3c3c3,0xffbdbdbd,0xffb8b8b8,0xffb1b1b1,0xffababab,0xff083517,0x87000000,0x5a000000,0x36000000,0x1d000000,0x3b000000,0xff093617,0xffb8b4b4,
-    0xffc2c0c0,0xffc8c7c7,0xffcccbcb,0xffcdcdcd,0xffcecece,0xffcacaca,0xffa5a5a5,0xff6c6c6c,0xff6c6c6c,0xff97ad95,0xff98ae96,0xff96ab94,0xff98af96,0xff96ad94,
-    0xff94aa92,0xff829181,0xff6b6e6a,0xff626262,0xff616161,0xffbdbdbd,0xffb8b8b8,0xffb2b2b2,0xffababab,0xffa4a4a4,0xff083316,0x93000000,0x62000000,0x3b000000,
-    0x1f000000,0x3d000000,0xff072c13,0xff9d9595,0xffaca6a6,0xffb8b4b4,0xffc2c0c0,0xffc8c7c7,0xffcccbcb,0xffcdcdcd,0xffcdcdcd,0xffcbcbcb,0xffa5a5a5,0xff6a6a6a,
-    0xff696969,0xff9eb59c,0xff9fb69d,0xff9eb59d,0xff9db49b,0xff9ab298,0xff97ae95,0xff839282,0xff686c67,0xff5c5c5c,0xffb2b2b2,0xffadadad,0xffa6a6a6,0xff9f9f9f,
-    0xff083115,0x99000000,0x66000000,0x3d000000,0x1f000000,0x3d000000,0xff062510,0xff877c7c,0xff918787,0xff9d9595,0xffaca6a6,0xffb8b4b4,0xffc1bfbf,0xffc8c7c7,
-    0xffcbcaca,0xffcccccc,0xffcbcbcb,0xffcbcbcb,0xffa7a7a7,0xff686868,0xff676767,0xffa5bda3,0xffa5bda3,0xffa3bba1,0xffa0b89e,0xff9cb39a,0xff95ac93,0xffbcdabb,
-    0xff565656,0xffa7a7a7,0xffa0a0a0,0xff999999,0xff073014,0x99000000,0x66000000,0x3d000000,0x1f000000,0x3d000000,0xff06230f,0xff6d6d6d,0xff7b7272,0xff877c7c,
-    0xff918787,0xff9d9595,0xffaba6a6,0xffb7b3b3,0xffc0bebe,0xffc7c6c6,0xffc9c9c9,0xffcacaca,0xffc9c9c9,0xffc8c8c8,0xffa6a6a6,0xff656565,0xff636363,0xffa9c3a8,
-    0xffa8c1a6,0xffa3bca1,0xff9cb59b,0xffb9d6b7,0xff535353,0xffa1a1a1,0xff9a9a9a,0xff949494,0xff072e13,0x99000000,0x66000000,0x3d000000,0x1f000000,0x3e000000,
-    0xff094319,0xff8d988c,0xff6b6b6b,0xff6b6b6b,0xff766e6e,0xff847979,0xff8e8484,0xff9a9292,0xffa9a4a4,0xffb5b1b1,0xffbfbdbd,0xffc4c3c3,0xffc7c6c6,0xffc7c7c7,
-    0xffc6c6c6,0xffc5c5c5,0xffa8a8a8,0xff616161,0xff5d5d5d,0xffa7c1a6,0xffa3bda1,0xffb3cfb1,0xff515151,0xff9b9b9b,0xff969696,0xff8f8f8f,0xff072c13,0x99000000,
-    0x66000000,0x3d000000,0x21000000,0x42000000,0xff0a4519,0xffb1cbb0,0xffa3baa2,0xff808a7f,0xff5f5f5f,0xff606060,0xff6b6565,0xff7b7171,0xff887f7f,0xff979090,
-    0xffa7a2a2,0xffb3afaf,0xffbcbaba,0xffc1c0c0,0xffc3c3c3,0xffc3c3c3,0xffc2c2c2,0xffc0c0c0,0xffa2a2a2,0xff565656,0xffa1bba0,0xffacc7aa,0xff4d4d4d,0xff969696,
-    0xff8f8f8f,0xff888888,0xff072a12,0x99000000,0x66000000,0x3d000000,0x2a000000,0x4f000000,0xff083c16,0xff8ea28d,0xff7f907d,0xff748573,0xff6e7d6d,0xff5c655c,
-    0xff494949,0xff515151,0xff625c5c,0xff776d6d,0xff887e7e,0xff968e8e,0xffa59f9f,0xffafacac,0xffb8b6b6,0xffbdbcbc,0xffbebebe,0xffbbbaba,0xffb7b7b7,0xff535353,
-    0xff99b298,0xffa3bca1,0xff4a4a4a,0xff8e8e8e,0xff888888,0xff818181,0xff062811,0x99000000,0x66000000,0x3d000000,0x40000000,0x6a000000,0xff072c10,0xff5c6a5b,
-    0xff495348,0xff3e463d,0xff394139,0xff3b443a,0xff434c42,0xff474e47,0xff424242,0xff515151,0xff656060,0xff7a7070,0xff887e7e,0xff948c8c,0xffa19c9c,0xffaca9a9,
-    0xffb3b2b2,0xffb4b4b4,0xffb3b3b3,0xff4e4e4e,0xff8ca38b,0xff99b198,0xff464646,0xff878787,0xff818181,0xff7b7b7b,0xff062610,0x99000000,0x66000000,0x3d000000,
-    0x64000000,0x91000000,0xff041b0a,0xff646963,0xffa1a3a0,0xffd7d8d7,0xfffafafa,0xffd7d8d7,0xff9fa29f,0xff5f655f,0xff414b41,0xff525b51,0xff4f4f4f,0xff5c5c5c,
-    0xff696565,0xff7a6f6f,0xff867c7c,0xff928b8b,0xffa39f9f,0xffadacac,0xffaeaeae,0xff4b4b4b,0xff7f947e,0xff8fa58d,0xff434343,0xff808080,0xff7a7a7a,0xff747474,
-    0xff06240f,0x99000000,0x66000000,0x3d000000,0x92000000,0xb8000000,0xff5d6760,0xffc7c9c7,0xffa6a8a6,0xff8d928d,0xff858b84,0xff8c908c,0xffa4a8a4,0xffc6c7c6,
-    0xff767a76,0xff3f483e,0xff606e5f,0xff717d6f,0xff5d5d5d,0xff606060,0xff656060,0xff787070,0xff918b8b,0xffa2a0a0,0xffa8a7a7,0xff474747,0xff728671,0xff869a85,
-    0xff3f3f3f,0xff797979,0xff747474,0xff707070,0xff05230f,0x99000000,0x66000000,0x3d000000,0xbd000000,0xdd454545,0xffbdc0bd,0xff969a96,0xff919890,0xff9ea79d,
-    0xffa1aaa1,0xff9ca49b,0xff8d948d,0xff939893,0xffc6c7c5,0xff5d615d,0xff495549,0xff6d7e6b,0xff829681,0xff7a8a79,0xff575757,0xff535353,0xff797272,0xff938f8f,
-    0xffa09f9f,0xff434343,0xff677965,0xff7b8e7a,0xff3c3c3c,0xff747474,0xff6f6f6f,0xff6b6b6b,0xff05210e,0x99000000,0x66000000,0x3d000000,0xd9000000,0xf0979797,
-    0xff949a95,0xff919890,0xffa8b1a7,0xffb0bcaf,0xffb0bcb0,0xffadb8ac,0xffa2aca1,0xff8c928b,0xffa3a6a3,0xff9d9f9d,0xff394239,0xff606f5f,0xff788c77,0xff7d927b,
-    0xff788d76,0xff70846e,0xff494949,0xff837d7d,0xff969494,0xff3f3f3f,0xff5c6e5b,0xff728270,0xff383838,0xff6e6e6e,0xff696969,0xff666666,0xff05200d,0x99000000,
-    0x66000000,0x3d000000,0xe7000000,0xf9d5d5d5,0xff6f7a72,0xff9da79d,0xffb0bcaf,0xffb3bfb2,0xffb2beb1,0xffb0bcaf,0xffaab5a9,0xff979f97,0xff888d88,0xffd6d7d6,
-    0xff303830,0xff546254,0xff70836e,0xff758973,0xff70856e,0xff697d67,0xff444444,0xff696262,0xff888484,0xff3b3b3b,0xff526351,0xff687768,0xff353535,0xff686868,
-    0xff646464,0xff626262,0xff051f0d,0x99000000,0x66000000,0x3d000000,0xec000000,0xfefafafa,0xff636965,0xff989e98,0xffb0bcb0,0xffb2beb1,0xffb0bcaf,0xffaebaad,
-    0xffabb5aa,0xff99a399,0xff80847f,0xfffafafa,0xff2a302a,0xff4d5a4c,0xff697b67,0xff6d826b,0xff697d67,0xff627660,0xff5c6f5a,0xff3c3c3c,0xff787272,0xff383838,
-    0xff495947,0xff5f6d5f,0xff333333,0xff646464,0xff616161,0xff5e5e5e,0xff051e0c,0x99000000,0x66000000,0x3d000000,0xe7000000,0xf9d5d5d5,0xff707a74,0xff858585,
-    0xff909090,0xffa5ada4,0xffaebaad,0xffacb8ab,0xffa6b1a6,0xff949c93,0xff868a85,0xffd2d3d2,0xff252c25,0xff455144,0xff5f715d,0xff657863,0xff637762,0xff5d705b,
-    0xff566a54,0xff393939,0xff5b5555,0xff353535,0xff40503e,0xff586357,0xff323232,0xff606060,0xff5f5f5f,0xff5d5d5d,0xff051e0c,0x99000000,0x66000000,0x3d000000,
-    0xd9000000,0xf0979797,0xff949a96,0xff989898,0xffb3b3b3,0xff909090,0xff909090,0xff9ea59d,0xff9ba59b,0xff868c86,0xff9d9f9c,0xff919391,0xff20261f,0xff394338,
-    0xff4f5f4e,0xff5a6c58,0xff5b6e59,0xff576b56,0xff526550,0xff4d5f4a,0xff353535,0xff343434,0xff3b4b39,0xff515a50,0xff303030,0xff606060,0xff5e5e5e,0xff5d5d5d,
-    0xff051e0c,0x99000000,0x66000000,0x3d000000,0xbd000000,0xdd454545,0xffbdc0be,0xff9a9a9a,0xff989898,0xffa7a7a7,0xffacacac,0xff838383,0xff7a7a7a,0xff898b89,
-    0xffb6b7b6,0xff585958,0xff1f231e,0xff283027,0xff3b4539,0xff475646,0xff4f604d,0xff51644e,0xff4e614c,0xff495b47,0xff343434,0xff333333,0xff364634,0xff495149,
-    0xff303030,0xff5f5f5f,0xff5e5e5e,0xff5d5d5d,0xff051e0c,0x99000000,0x66000000,0x3d000000,0x92000000,0xb8000000,0xff5d6760,0xffc8c8c8,0xffa8a8a8,0xff919191,
-    0xff898989,0xff8e8e8e,0xffa2a2a2,0xffb5b5b5,0xff6b6b6b,0xffe4e4e4,0xffcacbca,0xff1e231e,0xff232b23,0xff323d31,0xff3f4c3e,0xff455644,0xff475946,0xff445642,
-    0xff41533f,0xff323232,0xff334331,0xff424842,0xff2f2f2f,0xff5e5e5e,0xff5d5d5d,0xff5d5d5d,0xff051e0c,0x99000000,0x66000000,0x3d000000,0x64000000,0x91000000,
-    0xff04190a,0xff676767,0xffa2a2a2,0xffd8d8d8,0xfffafafa,0xffd5d5d5,0xff979797,0xff4e4e4e,0xffe1e1e1,0xffffffff,0xffffffff,0xffc9c9c9,0xff1a1d19,0xff1e241d,
-    0xff2b352a,0xff374436,0xff3e4d3c,0xff3f503d,0xff3e4e3c,0xff303030,0xff324230,0xff3c403c,0xff2f2f2f,0xff5e5e5e,0xff5e5e5e,0xff5d5d5d,0xff051e0d,0x99000000,
-    0x66000000,0x3d000000,0x40000000,0x6a000000,0xff072911,0xff606060,0xff4b4b4b,0xff3f3f3f,0xff393939,0xff363636,0xff313131,0xff272727,0xff646464,0xfffafafa,
-    0xffffffff,0xffffffff,0xffc8c8c8,0xff161716,0xff191f19,0xff273126,0xff323f31,0xff384735,0xff384a37,0xff394936,0xff2f2f2f,0xff363836,0xff2f2f2f,0xff5e5e5e,
-    0xff5e5e5e,0xff5e5e5e,0xff051f0d,0x99000000,0x66000000,0x3d000000,0x28000000,0x4e000000,0xff083517,0xff919191,0xff7d7d7d,0xff707070,0xff696969,0xff636363,
-    0xff575757,0xff424242,0xff2b2b2b,0xff626262,0xfffafafa,0xffffffff,0xffffffff,0xffc8c8c8,0xff131313,0xff171b17,0xff263024,0xff303e2e,0xff344432,0xff354633,
-    0xff2f2f2f,0xff313231,0xff2f2f2f,0xff5e5e5e,0xff5e5e5e,0xff5f5f5f,0xff051f0d,0x93000000,0x62000000,0x3b000000,0x1d000000,0x3b000000,0xff0a3b19,0xffaaaaaa,
-    0xffa0a0a0,0xff989898,0xff909090,0xff888888,0xff797979,0xff606060,0xff424242,0xff252525,0xff5e5e5e,0xfffafafa,0xffffffff,0xffffffff,0xffcacaca,0xff161616,
-    0xff181818,0xff262e25,0xff303f2f,0xff334331,0xff334330,0xff2e2e2e,0xff2e2e2e,0xff5e5e5e,0xff5f5f5f,0xff606060,0xff05200d,0x87000000,0x5a000000,0x36000000,
-    0x17000000,0x2f000000,0xff093c19,0xff093918,0xff093717,0xff083417,0xff083215,0xff083014,0xff072c13,0xff06260f,0xff041c0c,0xff031208,0xff010a04,0xff545654,
-    0xfffafafa,0xffffffff,0xffffffff,0xff676a68,0xff020e06,0xff020a04,0xff020d06,0xff020f06,0xff020f06,0xff020f06,0xff051e0d,0xff051f0d,0xff051f0d,0xff05200d,
-    0xff05210e,0x74000000,0x4e000000,0x2e000000,0x12000000,0x25000000,0x3d000000,0x5c000000,0x74000000,0x87000000,0x93000000,0x99000000,0x9b000000,0xa1000000,
-    0xad000000,0xc0000000,0xd5000000,0xe9000000,0xf8555555,0xfffafafa,0xfa858585,0xe6000000,0xcf000000,0xb7000000,0xa4000000,0x9c000000,0x99000000,0x99000000,
+    0x3d000000,0x3d000000,0x3b000000,0x36000000,0x2e000000,0x25000000,0x18000000,0xf000000,0xc000000,0x18000000,0xff0f4120,0xff0c3119,0xff0c3119,0xff0c3819,
+    0xff0c3619,0xff0c3319,0xff0c3119,0xff0c3119,0xff13592b,0xff13592b,0xff13592b,0xff13582b,0xff13582b,0xff13572a,0xff13572a,0xff13562a,0xff13562a,0xff135429,
+    0xff125329,0xff125329,0xff125329,0xff125228,0xff125228,0xff125128,0xff125028,0xff124f27,0xff104d25,0x3d000000,0x29000000,0x18000000,0x12000000,0x25000000,
+    0xff135429,0xffd0d0d0,0xffa7a7a7,0xff7e7e7e,0xff7e7e7e,0xff889786,0xff879286,0xff838882,0xff7e7e7e,0xff7e7e7e,0xffdfdfdf,0xffdedede,0xffdddddd,0xffdcdcdc,
+    0xffdadada,0xffd8d8d8,0xffd7d7d7,0xffd5d5d5,0xffd3d3d3,0xffd1d1d1,0xffd1d1d1,0xffcfcfcf,0xffcecece,0xffcccccc,0xffc9c9c9,0xffc3c3c3,0xff104b24,0x5c000000,
+    0x3d000000,0x25000000,0x17000000,0x2e000000,0xff125329,0xffd5d5d5,0xffd6d6d6,0xffd1d1d1,0xffadadad,0xff7e7e7e,0xff7e7e7e,0xff92a390,0xff93a391,0xff8b948a,
+    0xff7d7d7d,0xff7c7c7c,0xffdcdcdc,0xffdadada,0xff7a7a7a,0xff7a7a7a,0xff787878,0xffd3d3d3,0xffd1d1d1,0xffd1d1d1,0xffcfcfcf,0xffcdcdcd,0xffcccccc,0xffc7c7c7,
+    0xffc3c3c3,0xffbdbdbd,0xff104923,0x74000000,0x4e000000,0x2e000000,0x1b000000,0x36000000,0xff124f27,0xffd1d0d0,0xffd4d3d3,0xffd5d5d5,0xffd6d6d6,0xffd1d1d1,
+    0xffafafaf,0xff7e7e7e,0xff7e7e7e,0xff9caf9a,0xff9fb19d,0xff95a294,0xff7b7b7b,0xff7a7a7a,0xff919e90,0xff909d8f,0xff7e817d,0xff777777,0xff767676,0xffcfcfcf,
+    0xffcdcdcd,0xffcccccc,0xffc7c7c7,0xffc3c3c3,0xffbdbdbd,0xffb7b7b7,0xff0f4623,0x87000000,0x5a000000,0x36000000,0x1d000000,0x3b000000,0xff104723,0xffc3bfbf,
+    0xffcbcaca,0xffd1d0d0,0xffd4d3d3,0xffd5d5d5,0xffd6d6d6,0xffd2d2d2,0xffb2b2b2,0xff7d7d7d,0xff7d7d7d,0xffa5b9a4,0xffa6baa4,0xffa4b7a3,0xffa6bba4,0xffa4b9a3,
+    0xffa3b6a1,0xff92a091,0xff7c7f7b,0xff747474,0xff737373,0xffc7c7c7,0xffc3c3c3,0xffbdbdbd,0xffb7b7b7,0xffb1b1b1,0xff0f4322,0x93000000,0x62000000,0x3b000000,
+    0x1f000000,0x3d000000,0xff0d3c1e,0xffaba4a4,0xffb8b3b3,0xffc3bfbf,0xffcbcaca,0xffd1d0d0,0xffd4d3d3,0xffd5d5d5,0xffd5d5d5,0xffd3d3d3,0xffb2b2b2,0xff7b7b7b,
+    0xff7a7a7a,0xffacc0aa,0xffadc1ab,0xffacc0ab,0xffabbfa9,0xffa8bda6,0xffa5baa4,0xff93a192,0xff7a7d79,0xff6e6e6e,0xffbdbdbd,0xffb9b9b9,0xffb3b3b3,0xffadadad,
+    0xff0f4120,0x99000000,0x66000000,0x3d000000,0x1f000000,0x3d000000,0xff0c341a,0xff978d8d,0xffa09797,0xffaba4a4,0xffb8b3b3,0xffc3bfbf,0xffcbc9c9,0xffd1d0d0,
+    0xffd3d2d2,0xffd4d4d4,0xffd3d3d3,0xffd3d3d3,0xffb4b4b4,0xff7a7a7a,0xff797979,0xffb2c7b0,0xffb2c7b0,0xffb0c5ae,0xffadc3ac,0xffaabea8,0xffa4b8a2,0xffc6e0c5,
+    0xff686868,0xffb4b4b4,0xffadadad,0xffa7a7a7,0xff0d401f,0x99000000,0x66000000,0x3d000000,0x1f000000,0x3d000000,0xff0c3119,0xff7e7e7e,0xff8c8383,0xff978d8d,
+    0xffa09797,0xffaba4a4,0xffb7b3b3,0xffc2bebe,0xffcac8c8,0xffd0cfcf,0xffd1d1d1,0xffd2d2d2,0xffd1d1d1,0xffd1d1d1,0xffb3b3b3,0xff777777,0xff757575,0xffb6ccb5,
+    0xffb5cbb3,0xffb0c6ae,0xffaac0a9,0xffc4ddc2,0xff656565,0xffaeaeae,0xffa8a8a8,0xffa3a3a3,0xff0d3e1e,0x99000000,0x66000000,0x3d000000,0x1f000000,0x3e000000,
+    0xff105425,0xff9ca69b,0xff7c7c7c,0xff7c7c7c,0xff877f7f,0xff948a8a,0xff9d9494,0xffa8a1a1,0xffb6b1b1,0xffc0bdbd,0xffc9c7c7,0xffcdcccc,0xffd0cfcf,0xffd0d0d0,
+    0xffcfcfcf,0xffcecece,0xffb5b5b5,0xff737373,0xff6f6f6f,0xffb4cbb3,0xffb0c7ae,0xffbed7bd,0xff636363,0xffa9a9a9,0xffa4a4a4,0xff9e9e9e,0xff0d3c1e,0x99000000,
+    0x66000000,0x3d000000,0x21000000,0x42000000,0xff125725,0xffbdd3bc,0xffb0c4af,0xff909a8f,0xff717171,0xff727272,0xff7c7777,0xff8c8282,0xff988f8f,0xffa59f9f,
+    0xffb4afaf,0xffbebbbb,0xffc6c4c4,0xffcbcaca,0xffcccccc,0xffcccccc,0xffcbcbcb,0xffcacaca,0xffafafaf,0xff686868,0xffaec5ad,0xffb8d0b6,0xff5f5f5f,0xffa4a4a4,
+    0xff9e9e9e,0xff989898,0xff0d391d,0x99000000,0x66000000,0x3d000000,0x2a000000,0x4f000000,0xff0f4d22,0xff9daf9c,0xff8f9f8d,0xff859584,0xff7f8d7e,0xff6e776e,
+    0xff5b5b5b,0xff636363,0xff746e6e,0xff887e7e,0xff988e8e,0xffa49d9d,0xffb2adad,0xffbbb8b8,0xffc3c1c1,0xffc7c6c6,0xffc8c8c8,0xffc5c4c4,0xffc2c2c2,0xff656565,
+    0xffa7bda6,0xffb0c6ae,0xff5c5c5c,0xff9d9d9d,0xff989898,0xff919191,0xff0c371b,0x99000000,0x66000000,0x3d000000,0x40000000,0x6a000000,0xff0d3c1a,0xff6e7b6d,
+    0xff5b655a,0xff4f584e,0xff4a524a,0xff4c564b,0xff545e53,0xff596059,0xff535353,0xff636363,0xff777272,0xff8b8181,0xff988e8e,0xffa39b9b,0xffaeaaaa,0xffb8b6b6,
+    0xffbebdbd,0xffbfbfbf,0xffbebebe,0xff606060,0xff9bb09a,0xffa7bda6,0xff585858,0xff979797,0xff919191,0xff8c8c8c,0xff0c351a,0x99000000,0x66000000,0x3d000000,
+    0x64000000,0x91000000,0xff082812,0xff767a75,0xffaeb0ad,0xffdddedd,0xfffbfbfb,0xffdddedd,0xffadafad,0xff717771,0xff525d52,0xff646d63,0xff616161,0xff6e6e6e,
+    0xff7a7777,0xff8b8080,0xff968d8d,0xffa19a9a,0xffb0adad,0xffb9b8b8,0xffbababa,0xff5d5d5d,0xff8fa38e,0xff9eb29c,0xff545454,0xff909090,0xff8b8b8b,0xff858585,
+    0xff0c3319,0x99000000,0x66000000,0x3d000000,0x92000000,0xb8000000,0xff6f7972,0xffd0d1d0,0xffb3b5b3,0xff9ca19c,0xff959a94,0xff9b9f9b,0xffb1b5b1,0xffcfd0cf,
+    0xff878b87,0xff505a4f,0xff727f71,0xff828d80,0xff6f6f6f,0xff727272,0xff777272,0xff898181,0xffa09a9a,0xffafadad,0xffb5b4b4,0xff595959,0xff839682,0xff96a895,
+    0xff505050,0xff8a8a8a,0xff858585,0xff818181,0xff0a3119,0x99000000,0x66000000,0x3d000000,0xbd000000,0xdd575757,0xffc7cac7,0xffa4a8a4,0xffa0a69f,0xffacb4ab,
+    0xffaeb6ae,0xffaab1a9,0xff9ca39c,0xffa2a6a2,0xffcfd0ce,0xff6f736f,0xff5b675b,0xff7e8e7c,0xff92a491,0xff8b9a8a,0xff696969,0xff656565,0xff8a8383,0xffa29e9e,
+    0xffadadad,0xff545454,0xff798a77,0xff8c9d8b,0xff4d4d4d,0xff858585,0xff808080,0xff7c7c7c,0xff0a2f17,0x99000000,0x66000000,0x3d000000,0xd9000000,0xf0a5a5a5,
+    0xffa3a8a4,0xffa0a69f,0xffb5bdb4,0xffbcc6bb,0xffbcc6bc,0xffb9c3b8,0xffafb8ae,0xff9ba19a,0xffb0b3b0,0xffabadab,0xff4a534a,0xff728071,0xff899b88,0xff8da18c,
+    0xff899c87,0xff81947f,0xff5b5b5b,0xff938d8d,0xffa4a3a3,0xff505050,0xff6e7f6d,0xff839281,0xff494949,0xff7f7f7f,0xff7a7a7a,0xff787878,0xff0a2e16,0x99000000,
+    0x66000000,0x3d000000,0xe7000000,0xf9dcdcdc,0xff808b83,0xffabb4ab,0xffbcc6bb,0xffbec9bd,0xffbdc8bd,0xffbcc6bb,0xffb6c0b6,0xffa5ada5,0xff989c98,0xffdddddd,
+    0xff404940,0xff667466,0xff81937f,0xff869984,0xff81957f,0xff7a8d79,0xff565656,0xff7a7474,0xff989494,0xff4c4c4c,0xff647563,0xff7a887a,0xff464646,0xff7a7a7a,
+    0xff767676,0xff747474,0xff0a2d16,0x99000000,0x66000000,0x3d000000,0xec000000,0xfefbfbfb,0xff757a77,0xffa6aca6,0xffbcc6bc,0xffbdc8bd,0xffbcc6bb,0xffbac4b9,
+    0xffb7c0b6,0xffa7b0a7,0xff90948f,0xfffbfbfb,0xff394039,0xff5f6c5e,0xff7a8c79,0xff7e927c,0xff7a8d79,0xff748772,0xff6e806c,0xff4d4d4d,0xff898383,0xff494949,
+    0xff5b6b59,0xff717e71,0xff434343,0xff767676,0xff737373,0xff707070,0xff0a2b14,0x99000000,0x66000000,0x3d000000,0xe7000000,0xf9dcdcdc,0xff818b85,0xff959595,
+    0xff9f9f9f,0xffb2b9b1,0xffbac4b9,0xffb8c3b7,0xffb3bdb3,0xffa3aaa2,0xff969a95,0xffd9dad9,0xff343c34,0xff576356,0xff71826f,0xff778975,0xff758874,0xff6f816d,
+    0xff687b66,0xff4a4a4a,0xff6d6767,0xff464646,0xff51624f,0xff6a7569,0xff424242,0xff727272,0xff717171,0xff6f6f6f,0xff0a2b14,0x99000000,0x66000000,0x3d000000,
+    0xd9000000,0xf0a5a5a5,0xffa3a8a4,0xffa6a6a6,0xffbebebe,0xff9f9f9f,0xff9f9f9f,0xffacb2ab,0xffa9b2a9,0xff969b96,0xffabadaa,0xffa0a2a0,0xff2e352d,0xff4a5449,
+    0xff617160,0xff6c7d6a,0xff6d7f6b,0xff697c68,0xff647762,0xff5f715c,0xff464646,0xff454545,0xff4c5d4a,0xff636c62,0xff404040,0xff727272,0xff707070,0xff6f6f6f,
+    0xff0a2b14,0x99000000,0x66000000,0x3d000000,0xbd000000,0xdd575757,0xffc7cac8,0xffa8a8a8,0xffa6a6a6,0xffb4b4b4,0xffb8b8b8,0xff939393,0xff8b8b8b,0xff999a99,
+    0xffc1c2c1,0xff6a6b6a,0xff2d312b,0xff374036,0xff4c574a,0xff596858,0xff61725f,0xff637660,0xff60735e,0xff5b6d59,0xff454545,0xff434343,0xff475845,0xff5b635b,
+    0xff404040,0xff717171,0xff707070,0xff6f6f6f,0xff0a2b14,0x99000000,0x66000000,0x3d000000,0x92000000,0xb8000000,0xff6f7972,0xffd1d1d1,0xffb5b5b5,0xffa0a0a0,
+    0xff999999,0xff9d9d9d,0xffafafaf,0xffc0c0c0,0xff7c7c7c,0xffe8e8e8,0xffd2d3d2,0xff2b312b,0xff313b31,0xff424e41,0xff505e4f,0xff576856,0xff596b58,0xff566853,
+    0xff526550,0xff424242,0xff435441,0xff535a53,0xff3f3f3f,0xff707070,0xff6f6f6f,0xff6f6f6f,0xff0a2b14,0x99000000,0x66000000,0x3d000000,0x64000000,0x91000000,
+    0xff082512,0xff797979,0xffafafaf,0xffdedede,0xfffbfbfb,0xffdcdcdc,0xffa5a5a5,0xff606060,0xffe6e6e6,0xffffffff,0xffffffff,0xffd1d1d1,0xff272a25,0xff2b332a,
+    0xff3b4639,0xff485647,0xff4f5f4d,0xff50624e,0xff4f604d,0xff404040,0xff425340,0xff4d514d,0xff3f3f3f,0xff707070,0xff707070,0xff6f6f6f,0xff0a2b16,0x99000000,
+    0x66000000,0x3d000000,0x40000000,0x6a000000,0xff0d381b,0xff727272,0xff5d5d5d,0xff505050,0xff4a4a4a,0xff474747,0xff414141,0xff363636,0xff767676,0xfffbfbfb,
+    0xffffffff,0xffffffff,0xffd1d1d1,0xff222322,0xff252d25,0xff364135,0xff425041,0xff495946,0xff495c48,0xff4a5b47,0xff3f3f3f,0xff474947,0xff3f3f3f,0xff707070,
+    0xff707070,0xff707070,0xff0a2d16,0x99000000,0x66000000,0x3d000000,0x28000000,0x4e000000,0xff0f4623,0xffa0a0a0,0xff8d8d8d,0xff818181,0xff7a7a7a,0xff757575,
+    0xff696969,0xff535353,0xff3b3b3b,0xff747474,0xfffbfbfb,0xffffffff,0xffffffff,0xffd1d1d1,0xff1e1e1e,0xff232823,0xff354033,0xff404f3e,0xff455642,0xff465843,
+    0xff3f3f3f,0xff414241,0xff3f3f3f,0xff707070,0xff707070,0xff717171,0xff0a2d16,0x93000000,0x62000000,0x3b000000,0x1d000000,0x3b000000,0xff124c25,0xffb6b6b6,
+    0xffadadad,0xffa6a6a6,0xff9f9f9f,0xff989898,0xff8a8a8a,0xff727272,0xff535353,0xff343434,0xff707070,0xfffbfbfb,0xffffffff,0xffffffff,0xffd2d2d2,0xff222222,
+    0xff242424,0xff353e34,0xff40503f,0xff435441,0xff435440,0xff3e3e3e,0xff3e3e3e,0xff707070,0xff717171,0xff727272,0xff0a2e16,0x87000000,0x5a000000,0x36000000,
+    0x17000000,0x2f000000,0xff104d25,0xff104a24,0xff104823,0xff0f4523,0xff0f4220,0xff0f401f,0xff0d3c1e,0xff0c3519,0xff082914,0xff061d0f,0xff031208,0xff666866,
+    0xfffbfbfb,0xffffffff,0xffffffff,0xff797b7a,0xff05170c,0xff051208,0xff05160c,0xff05190c,0xff05190c,0xff05190c,0xff0a2b16,0xff0a2d16,0xff0a2d16,0xff0a2e16,
+    0xff0a2f17,0x74000000,0x4e000000,0x2e000000,0x12000000,0x25000000,0x3d000000,0x5c000000,0x74000000,0x87000000,0x93000000,0x99000000,0x9b000000,0xa1000000,
+    0xad000000,0xc0000000,0xd5000000,0xe9000000,0xf8676767,0xfffbfbfb,0xfa959595,0xe6000000,0xcf000000,0xb7000000,0xa4000000,0x9c000000,0x99000000,0x99000000,
     0x99000000,0x99000000,0x93000000,0x87000000,0x74000000,0x5c000000,0x3d000000,0x25000000,0xc000000,0x18000000,0x29000000,0x3d000000,0x4d000000,0x5a000000,
-    0x62000000,0x66000000,0x67000000,0x6a000000,0x74000000,0x89000000,0xab000000,0xce000000,0xe8000000,0xf4303030,0xeb000000,0xd3000000,0xaf000000,0x8c000000,
+    0x62000000,0x66000000,0x67000000,0x6a000000,0x74000000,0x89000000,0xab000000,0xce000000,0xe8000000,0xf4404040,0xeb000000,0xd3000000,0xaf000000,0x8c000000,
     0x75000000,0x6a000000,0x67000000,0x66000000,0x66000000,0x66000000,0x62000000,0x5a000000,0x4d000000,0x3d000000,0x29000000,0x18000000,0x7000000,0xf000000,
@@ -1289,13 +1289,13 @@ static const QRgb HelpButton_data[] = {
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0x3ed5d5d5,0x93d4d4d4,0xd5d8d8d8,0xfad5d5d5,0xd8c8c8c8,0x9ebebebe,0x508e8e8e,0xc000000,0x3000000,0xffffff,0xffffff,
-    0xffffff,0xffffff,0x60d5d5d5,0xdbdddddd,0xffdcdcdc,0xffcbcbcb,0xffc5c5c5,0xffc4c4c4,0xffd0d0d0,0xe6bbbbbb,0x837d7d7d,0x18000000,0x4000000,0xffffff,
-    0xffffff,0x3ed6d5d5,0xdbd3d3d3,0xffd1d1d1,0xff9c9b9b,0xff333333,0xff323132,0xff565556,0xffbababa,0xffb1b2b1,0xec8f8e8f,0x75474747,0x18000000,0x3000000,
-    0xffffff,0x94cdcecd,0xffc8c7c7,0xffb2b2b2,0xff000000,0xff616161,0xffb2b2b2,0xff000000,0xff5f5f5f,0xffaaabaa,0xff9d9c9c,0xc84f4f4f,0x3d000000,0xc000000,
-    0xffffff,0xd5c2c2c2,0xffafafaf,0xffa0a0a0,0xff5b5b5b,0xff757575,0xffa8a8a8,0xff000000,0xff585858,0xffa4a4a4,0xffa4a4a4,0xef4f4f4f,0x61000000,0x1a000000,
-    0xffffff,0xfab4b4b4,0xff9d9d9d,0xff959595,0xffa5a5a5,0xff989898,0xff434343,0xff1d1d1d,0xff878787,0xffa1a1a1,0xff939393,0xfd4b4b4b,0x7c000000,0x25000000,
-    0xffffff,0xd9a3a3a3,0xff919191,0xff989898,0xff909090,0xff4e4e4e,0xff000000,0xff919191,0xff989898,0xff949494,0xff7b7b7b,0xf2373737,0x85000000,0x2b000000,
-    0xffffff,0xa0848484,0xff8c8c8b,0xff8a8b8b,0xff979797,0xff8e8e8e,0xff929291,0xff959595,0xff8c8c8c,0xff8b8c8b,0xff585758,0xdf272727,0x7c000000,0x25000000,
-    0xffffff,0x515d5d5d,0xe7707070,0xff7c7c7c,0xff848484,0xff434343,0xff262626,0xff8f8f8f,0xff7f7f7f,0xff616061,0xf5313131,0xbb101010,0x61000000,0x1a000000,
-    0xffffff,0xc000000,0x843f3f3f,0xed505050,0xff5d5c5c,0xff535353,0xff262626,0xff646364,0xff515051,0xf5313130,0xcd141414,0x83000000,0x3d000000,0xc000000,
-    0xffffff,0x3000000,0x18000000,0x76212121,0xc92b2b2b,0xf0303030,0xfd353535,0xf32a2a2a,0xdf1d1d1d,0xbb0d0d0d,0x83000000,0x4b000000,0x18000000,0x3000000,
+    0xffffff,0xffffff,0xffffff,0x3edcdcdc,0x93dbdbdb,0xd5dedede,0xfadcdcdc,0xd8d1d1d1,0x9ec8c8c8,0x509d9d9d,0xc000000,0x3000000,0xffffff,0xffffff,
+    0xffffff,0xffffff,0x60dcdcdc,0xdbe3e3e3,0xffe2e2e2,0xffd3d3d3,0xffcecece,0xffcdcdcd,0xffd7d7d7,0xe6c5c5c5,0x838d8d8d,0x18000000,0x4000000,0xffffff,
+    0xffffff,0x3edddcdc,0xdbdadada,0xffd8d8d8,0xffaaa9a9,0xff434343,0xff424142,0xff686768,0xffc4c4c4,0xffbdbdbd,0xec9e9d9e,0x75595959,0x18000000,0x3000000,
+    0xffffff,0x94d5d6d5,0xffd1d0d0,0xffbdbdbd,0xff000000,0xff737373,0xffbdbdbd,0xff000000,0xff717171,0xffb6b7b6,0xffabaaaa,0xc8616161,0x3d000000,0xc000000,
+    0xffffff,0xd5cbcbcb,0xffbbbbbb,0xffadadad,0xff6d6d6d,0xff868686,0xffb5b5b5,0xff000000,0xff6a6a6a,0xffb1b1b1,0xffb1b1b1,0xef616161,0x61000000,0x1a000000,
+    0xffffff,0xfabfbfbf,0xffababab,0xffa4a4a4,0xffb2b2b2,0xffa6a6a6,0xff545454,0xff2a2a2a,0xff979797,0xffaeaeae,0xffa2a2a2,0xfd5d5d5d,0x7c000000,0x25000000,
+    0xffffff,0xd9b0b0b0,0xffa0a0a0,0xffa6a6a6,0xff9f9f9f,0xff606060,0xff000000,0xffa0a0a0,0xffa6a6a6,0xffa3a3a3,0xff8c8c8c,0xf2484848,0x85000000,0x2b000000,
+    0xffffff,0xa0949494,0xff9b9b9a,0xff9a9a9a,0xffa5a5a5,0xff9d9d9d,0xffa1a1a0,0xffa4a4a4,0xff9b9b9b,0xff9a9b9a,0xff6a696a,0xdf363636,0x7c000000,0x25000000,
+    0xffffff,0x516f6f6f,0xe7818181,0xff8d8d8d,0xff949494,0xff545454,0xff353535,0xff9e9e9e,0xff8f8f8f,0xff737273,0xf5414141,0xbb1a1a1a,0x61000000,0x1a000000,
+    0xffffff,0xc000000,0x84505050,0xed626262,0xff6f6e6e,0xff656565,0xff353535,0xff767576,0xff636263,0xf5414140,0xcd1f1f1f,0x83000000,0x3d000000,0xc000000,
+    0xffffff,0x3000000,0x18000000,0x762f2f2f,0xc93b3b3b,0xf0404040,0xfd464646,0xf3393939,0xdf2a2a2a,0xbb161616,0x83000000,0x4b000000,0x18000000,0x3000000,
     0xffffff,0xffffff,0x4000000,0x18000000,0x3d000000,0x61000000,0x7c000000,0x85000000,0x7c000000,0x61000000,0x3d000000,0x18000000,0x4000000,0xffffff,
@@ -1382,75 +1382,75 @@ static const QRgb ImageViewer_data[] = {
 static const QRgb Ipkg_data[] = {
-    0xffffff,0xffffff,0xffffff,0x1181818,0x1181818,0x2181818,0x3181818,0x4000000,0x7242424,0xf111111,0x1e111111,0x30151515,0x44161616,0x51161616,
-    0x59141414,0x5b161616,0x5a141414,0x54121212,0x4a151515,0x3e151515,0x2f161616,0x22161616,0x1a141414,0x120e0e0e,0xb171717,0x8202020,0x4181818,0x3181818,
-    0x2181818,0x1181818,0x1181818,0xffffff,0xffffff,0x1181818,0x2181818,0x3181818,0x5181818,0x7181818,0xb171717,0x10101010,0x1a141414,0x2f161616,
-    0x50161616,0x75141414,0x94151515,0xa8151515,0xb2141414,0xb3141414,0xaf141414,0xaa151515,0x9d151515,0x8a141414,0x74161616,0x5d161616,0x48121212,0x36181818,
-    0x27141414,0x1b131313,0x131b1b1b,0xc181818,0x7181818,0x5181818,0x2181818,0x1181818,0x1181818,0x3181818,0x6181818,0xc181818,0x13181818,0x1b131313,
-    0x24151515,0x30151515,0x47161616,0x6d171717,0x9a161616,0xc0151515,0xe4495e64,0xf36f97a2,0xfb89c0d0,0xfe92d6ec,0xf977bacf,0xf1538d9e,0xe6325560,0xd2131313,
-    0xc4151515,0xaf161616,0x96141414,0x7d161616,0x64141414,0x4e171717,0x39161616,0x28191919,0x1a181818,0x10181818,0x8181818,0x3181818,0x3181818,0x7181818,
-    0x15181818,0x27181818,0x3c181818,0x4f171717,0x61181818,0x75181818,0x90151515,0xb4151515,0xd9242b2d,0xf4658792,0xffa3deee,0xffa4dff1,0xff9dddf0,0xff91d9ee,
-    0xff82d3ec,0xff6ecce9,0xff5cc4e4,0xff3c7586,0xfc413229,0xf23d2417,0xda1d1916,0xc7161616,0xb1161616,0x9b171717,0x81181818,0x66191919,0x4c181818,0x32181818,
-    0x18181818,0x9181818,0x6181818,0x14181818,0x33181818,0x5f181818,0x83151515,0x9c191919,0xaf171717,0xc1181818,0xd4171717,0xe71e1414,0xf86a828d,0xffa0def0,
-    0xffa2def1,0xffa0def0,0xff99dbef,0xff8bd7ed,0xff78d0ea,0xff62c8e7,0xff4ec1e4,0xff3dbbe1,0xff4c7a83,0xff462617,0xff201915,0xfc3f2518,0xf24c2a19,0xdc342218,
-    0xc3161616,0xb2181818,0x96181818,0x6d181818,0x3a181818,0x16181818,0xe181818,0x25181818,0x59181818,0x9c1b1717,0xcb2e1313,0xdf3f0d0d,0xec500a0a,0xf65d0505,
-    0xfd680202,0xff75454c,0xff93d6ec,0xff99dbef,0xff9adcf0,0xff99dbef,0xff90d8ee,0xff82d3ec,0xff6acbe8,0xff53c3e5,0xff3dbbe1,0xff2db2da,0xff2ba2c5,0xff89674f,
-    0xffc3531f,0xff9f481d,0xff6d361b,0xff342119,0xfe322119,0xf6512d1c,0xe34e2c1b,0xa8221c19,0x5e181818,0x24181818,0x21181818,0x3d181818,0x77181818,0xc52d1313,
-    0xfd770101,0xff780000,0xff750000,0xff710000,0xff6c0000,0xff778190,0xff87d5ed,0xff8bd7ed,0xff8cd7ed,0xff8bd7ed,0xff82d3ec,0xff70cde9,0xff58c5e5,0xff3ebbe1,
-    0xff2cafd6,0xff289ec2,0xff2591b2,0xff586f6f,0xffc0521e,0xffd15920,0xffe16123,0xffed6625,0xffd55f25,0xff9a4921,0xff482a1c,0xd246291c,0x71181818,0x2f181818,
-    0x53181818,0x6c181818,0x99181818,0xcc181818,0xed3f0e0e,0xff780000,0xff740000,0xff6f0000,0xff690000,0xff6eadc4,0xff75cfea,0xff76cfea,0xff76cfea,0xff74ceea,
-    0xff69cbe8,0xff55c4e5,0xff3abae1,0xff2ba9cf,0xff2696b8,0xff2287a5,0xff1f7b97,0xff326d7c,0xffb64f1e,0xffcb5821,0xffdb5f24,0xffe96628,0xfff36c2b,0xffa04c25,
-    0xf9512e1e,0xc1181818,0x7b181818,0x3a181818,0x9a181818,0xab181818,0xc3181818,0xdd181818,0xea181818,0xf6540808,0xff730000,0xff6e0000,0xff670000,0xff5ec3e1,
-    0xff5ec7e6,0xff5bc6e6,0xff58c5e5,0xff51c2e4,0xff44bee2,0xff2eb6df,0xff289ec2,0xff2389a8,0xff1f7995,0xff1c6d86,0xff19657b,0xff1a6176,0xff8e401c,0xffc45723,
-    0xffd76028,0xffe6682a,0xffe0672c,0xff36241a,0xe7291f1a,0xcc181818,0x92181818,0x5e181818,0xd9593d1f,0xf48a5824,0xf1714a21,0xf0593d1f,0xf13e2e1c,0xf5542e1b,
-    0xfd5d0f07,0xfe54160a,0xff461c0c,0xff47a6c1,0xff44bee2,0xff3dbbe1,0xff34b8e0,0xff2db1d9,0xff29a3c7,0xff248fb0,0xff1f7a96,0xff1b6981,0xff175c71,0xff155568,
-    0xff144f61,0xff154756,0xff221712,0xff231913,0xff60321c,0xffa54e25,0xff6c3921,0xf64f2e1e,0xed181818,0xe1181818,0xbd181818,0x93181818,0xbd181818,0xe5553a1e,
-    0xffa86927,0xffaa6a27,0xffaa6a27,0xffaa6a27,0xffab6124,0xff5c3714,0xff462c10,0xff38808e,0xff2db2da,0xff2ba8ce,0xff289ec1,0xff2591b2,0xff20809d,0xff1c6d86,
-    0xff175b70,0xff134d5e,0xff114554,0xff10404f,0xff10404e,0xff0f2f38,0xff101010,0xff131312,0xff271b16,0xfe5e2f19,0xff9a5521,0xffc2812e,0xffd09936,0xfeca9435,
-    0xed926d2c,0xbc4b3c20,0x93181818,0xbc181818,0xe24a341d,0xfea66827,0xffaa6a27,0xffaa6a27,0xffaa6a27,0xffae6927,0xff8f4f1d,0xff39524d,0xff289dc0,0xff2593b4,
-    0xff2286a4,0xff1e7893,0xff1a677e,0xff165669,0xff124656,0xff0f3a47,0xff0d3541,0xff0d333e,0xff0d3540,0xff151a1e,0xff4d2211,0xff91501e,0xffc1802d,0xffd09936,
-    0xffd09936,0xffc5822e,0xf26d5426,0xd926221a,0xb5181818,0x91181818,0x57181818,0x8a181818,0xbc181818,0xde402f1c,0xfda36626,0xffaa6a27,0xffaa6a27,0xffaa6a27,
-    0xffaa6a27,0xffaf6425,0xff536157,0xff21829f,0xff1d748e,0xff19647a,0xff155466,0xff114453,0xff0e3743,0xff0c2e39,0xff1b2730,0xff502f23,0xff8f5120,0xffbe802e,
-    0xffd09936,0xffd09936,0xffce9635,0xffb06825,0xff75290f,0xff3c0101,0xc9181818,0xa3181818,0x76181818,0x53181818,0x28181818,0x52181818,0x8c181818,0xbe181818,
-    0xdf37291b,0xffa26525,0xffaa6a27,0xffaa6a27,0xffaa6a27,0xffaa6a27,0xffad6a27,0xff976134,0xff1e6478,0xff155568,0xff144555,0xff272a33,0xff5a2b1e,0xff965020,
-    0xffbf802d,0xffd09936,0xffd09936,0xffd09936,0xffc38930,0xff8a4c1b,0xff3f1006,0xff310000,0xff390101,0xff400202,0x9b191919,0x6a181818,0x40181818,0x25181818,
-    0x10181818,0x29181818,0x56181818,0x93181818,0xc5191919,0xff6c4019,0xff82511e,0xff88551f,0xff905a21,0xffa26327,0xffb66e2e,0xffb26b29,0xffb36727,0xff6a2b1b,
-    0xff9c4f1e,0xffc0802d,0xffd09936,0xffd09936,0xffd09936,0xffd09936,0xffa4732a,0xff593515,0xff2a0403,0xff320000,0xff3d0000,0xff490000,0xff510101,0xff550707,
-    0x7b171717,0x4a181818,0x26181818,0x12181818,0x8181818,0x15181818,0x33181818,0x65181818,0x9d181818,0xffc86637,0xff9e562b,0xff98552b,0xff894f28,0xff7f4b25,
-    0xff7c4a24,0xffb9693d,0xfff77f4a,0xffa04e1d,0xffd09936,0xffd09936,0xffd09936,0xffc48e32,0xff81561f,0xff3a1b0d,0xff230909,0xff2d0606,0xff3c0202,0xff4a0000,
-    0xff580000,0xff660101,0xff6a0707,0xff680f0f,0x6d171717,0x3f181818,0x1f181818,0xd181818,0x5181818,0xf181818,0x23181818,0x49181818,0x7d181818,0xffd66d3e,
-    0xffef7c49,0xfffc8853,0xffff8e5c,0xfffe9261,0xfffd9262,0xfffb9061,0xfff88c5b,0xff460202,0xff7f4d1c,0xffac792b,0xff653a15,0xff2e0502,0xff2c0202,0xff300606,
-    0xff320909,0xff400606,0xff550202,0xff670000,0xff770101,0xff7f0808,0xff7f1010,0xff761616,0x6a181818,0x3d181818,0x1e181818,0xd181818,0x4181818,0xd181818,
-    0x1e181818,0x3f181818,0x6c181818,0xffd16c3f,0xffed7d4b,0xfffb8956,0xffff915f,0xffff9666,0xfffe9769,0xfffb9567,0xfff88f61,0xff3a0202,0xff360101,0xff350000,
-    0xff370000,0xff3c0000,0xff420202,0xff440606,0xff420909,0xff560606,0xff710202,0xff840303,0xff8f0b0b,0xff951212,0xff8d1818,0xff7d1d1d,0x68181818,0x3c181818,
-    0x1d181818,0xc181818,0x4181818,0xc181818,0x1d181818,0x3b181818,0x66181818,0xffcb6b3f,0xffeb7d4b,0xfffb8b59,0xffff9362,0xffff9869,0xfffd996c,0xfffa976c,
-    0xfff79366,0xff470303,0xff480101,0xff4c0101,0xff500000,0xff570000,0xff5c0202,0xff5a0606,0xff550909,0xff6c0606,0xff890606,0xff990d0d,0xffa11414,0xffa31c1c,
-    0xff942121,0xff7c2121,0x68181818,0x3c181818,0x1d181818,0xc181818,0x4181818,0xb181818,0x1b181818,0x39181818,0x63181818,0xffc7693f,0xffe97c4c,0xfffb8b59,
-    0xffff9464,0xffff996b,0xfffd9b6e,0xfffa996e,0xfff69469,0xff530505,0xff5b0202,0xff630101,0xff6b0000,0xff720000,0xff760202,0xff6e0606,0xff650a0a,0xff7b0a0a,
-    0xff981010,0xffa81818,0xffae2020,0xffab2323,0xff982626,0xff792525,0x67181818,0x3b181818,0x1d181818,0xc181818,0x3181818,0xa181818,0x19181818,0x35181818,
-    0x5d181818,0xffc0673e,0xffe57b4b,0xfffa8a59,0xfffe9363,0xffff996b,0xfffd9b6f,0xfff99a6f,0xfff5966a,0xff5d0606,0xff6b0303,0xff780101,0xff800000,0xff890000,
-    0xff8a0202,0xff7d0909,0xff6f1010,0xff861313,0xffa21b1b,0xffb12323,0xffb42929,0xffb02d2d,0xff972c2c,0xff752727,0x65181818,0x3a181818,0x1c181818,0xc181818,
-    0x3181818,0x9181818,0x16181818,0x2e181818,0x52181818,0xffb8623c,0xffdc7749,0xfff58756,0xfffd9161,0xfffe996a,0xfffc9b6e,0xfff8996f,0xfff4956b,0xff610808,
-    0xff750404,0xff880101,0xff920000,0xff9a0000,0xff980505,0xff871111,0xff761717,0xff8d1c1c,0xffaa2626,0xffb62e2e,0xffb83333,0xffb03434,0xff953030,0xff6e2828,
-    0x60181818,0x37181818,0x1b181818,0xb181818,0x2181818,0x7181818,0x11181818,0x25181818,0x43181818,0xc69e5d40,0xffcb6f46,0xffe98153,0xfff88d5e,0xfffd9667,
-    0xfffb986c,0xfff7986d,0xfff39469,0xff610909,0xff7b0404,0xff920101,0xff9f0000,0xffa60404,0xffa21111,0xff8c1b1b,0xff791f1f,0xff912727,0xffad3131,0xffb73636,
-    0xffb53a3a,0xffa93838,0xff8a3131,0xff652929,0x57181818,0x31181818,0x18181818,0xa181818,0x1181818,0x5181818,0xc181818,0x1a181818,0x32181818,0x5a363636,
-    0xc59b6247,0xfed4774e,0xffec8759,0xfff99162,0xfffb9669,0xfff59569,0xfff09267,0xff600a0a,0xff800505,0xff9b0101,0xffa90404,0xffad1010,0xffa71e1e,0xff902424,
-    0xff7b2828,0xff912f2f,0xffa73838,0xffab3d3d,0xffa03b3b,0xff8d3737,0xff712e2e,0xff582727,0x48181818,0x29181818,0x13181818,0x8181818,0x1181818,0x3181818,
-    0x7181818,0x11181818,0x21181818,0x39181818,0x61373737,0xc19c6851,0xfdd97c54,0xffed895c,0xfff69063,0xfff39165,0xffee8e63,0xff600b0b,0xff830505,0xffa10404,
-    0xffad1010,0xffb11e1e,0xffa92929,0xff8f2d2d,0xff762d2d,0xff853333,0xff903939,0xff883838,0xff773333,0xfb682f2f,0xd8632c2c,0x834d2424,0x36181818,0x1e181818,
-    0xe181818,0x6181818,0xffffff,0x1181818,0x4181818,0xa181818,0x14181818,0x24181818,0x3b181818,0x62373737,0xb9966a55,0xfed97d54,0xffeb885c,0xffed8b5f,
-    0xffe9895e,0xff5e0b0b,0xff850707,0xffa31010,0xffad1e1e,0xffaa2929,0xff9c3030,0xff7e3030,0xff622c2c,0xff673030,0xfe683030,0xee673131,0xba592b2b,0x6a241c1c,
-    0x4d181818,0x37181818,0x23181818,0x13181818,0x9181818,0x4181818,0xffffff,0x1181818,0x2181818,0x5181818,0xa181818,0x15181818,0x24181818,0x3a181818,
-    0x5f333333,0xb3946957,0xfcd87c53,0xffe18256,0xffe18256,0xff5b0d0d,0xff801010,0xff981b1b,0xff9b2727,0xff902e2e,0xff7b3030,0xff5e2c2c,0xfb4d2929,0xd9582c2c,
-    0x8d3d2323,0x5e181818,0x4d181818,0x3d181818,0x2d181818,0x1f181818,0x14181818,0xa181818,0x5181818,0x2181818,0xffffff,0xffffff,0x1181818,0x2181818,
-    0x5181818,0xb181818,0x14181818,0x23181818,0x38181818,0x5a303030,0xa9896554,0xfacf754f,0xffd7794f,0xff511212,0xff6b1818,0xff792121,0xff732727,0xfe652a2a,
-    0xe8602b2b,0xb44d2828,0x691d1919,0x55181818,0x46181818,0x38181818,0x2b181818,0x21181818,0x17181818,0xf181818,0x9181818,0x5181818,0x2181818,0x1181818,
-    0xffffff,0xffffff,0xffffff,0x1181818,0x2181818,0x5181818,0xa181818,0x14181818,0x22181818,0x36181818,0x552a2a2a,0x9a836251,0xf7ca7147,0xff441616,
-    0xff4e1b1b,0xf65c2121,0xca5b2525,0x7e321e1e,0x5b181818,0x4c181818,0x3d181818,0x31181818,0x26181818,0x1d181818,0x15181818,0xf181818,0xa181818,0x6181818,
-    0x4181818,0x2181818,0x1181818,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x1181818,0x2181818,0x4181818,0xa181818,0x12181818,0x20181818,
-    0x31181818,0x48272727,0xa782493f,0xdb571818,0x974b1c1c,0x5a181818,0x4f181818,0x42181818,0x35181818,0x2a181818,0x20181818,0x18181818,0x12181818,0xd181818,
-    0x9181818,0x6181818,0x4181818,0x2181818,0x1181818,0x1181818,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x1181818,
-    0x2181818,0x4181818,0x9181818,0x10181818,0x1b181818,0x27181818,0x34272727,0x38181818,0x39181818,0x34181818,0x2c181818,0x23181818,0x1b181818,0x14181818,
-    0xe181818,0xa181818,0x7181818,0x5181818,0x3181818,0x2181818,0x1181818,0x1181818,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0x1181818,0x2181818,0x4181818,0x7181818,0xd181818,0x14181818,0x19181818,0x1d181818,0x1d181818,0x1a181818,
-    0x15181818,0x10181818,0xc181818,0x8181818,0x5181818,0x4181818,0x2181818,0x1181818,0x1181818,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0x1242424,0x1242424,0x2242424,0x3242424,0x4000000,0x7333333,0xf1b1b1b,0x1e1b1b1b,0x30202020,0x44222222,0x51222222,
+    0x591f1f1f,0x5b222222,0x5a1f1f1f,0x541d1d1d,0x4a202020,0x3e202020,0x2f222222,0x22222222,0x1a1f1f1f,0x12171717,0xb232323,0x82e2e2e,0x4242424,0x3242424,
+    0x2242424,0x1242424,0x1242424,0xffffff,0xffffff,0x1242424,0x2242424,0x3242424,0x5242424,0x7242424,0xb232323,0x101a1a1a,0x1a1f1f1f,0x2f222222,
+    0x50222222,0x751f1f1f,0x94202020,0xa8202020,0xb21f1f1f,0xb31f1f1f,0xaf1f1f1f,0xaa202020,0x9d202020,0x8a1f1f1f,0x74222222,0x5d222222,0x481d1d1d,0x36242424,
+    0x271f1f1f,0x1b1e1e1e,0x13282828,0xc242424,0x7242424,0x5242424,0x2242424,0x1242424,0x1242424,0x3242424,0x6242424,0xc242424,0x13242424,0x1b1e1e1e,
+    0x24202020,0x30202020,0x47222222,0x6d232323,0x9a222222,0xc0202020,0xe45b7076,0xf380a5af,0xfb99cad7,0xfea1ddef,0xf988c4d7,0xf1659cac,0xe6426772,0xd21e1e1e,
+    0xc4202020,0xaf222222,0x961f1f1f,0x7d222222,0x641f1f1f,0x4e232323,0x39222222,0x28252525,0x1a242424,0x10242424,0x8242424,0x3242424,0x3242424,0x7242424,
+    0x15242424,0x27242424,0x3c242424,0x4f232323,0x61242424,0x75242424,0x90202020,0xb4202020,0xd9333b3d,0xf47797a1,0xffb0e3f1,0xffb1e4f3,0xffabe3f3,0xffa0dff1,
+    0xff92daef,0xff7fd4ed,0xff6ecde8,0xff4d8696,0xfc524238,0xf24e3323,0xda2a2522,0xc7222222,0xb1222222,0x9b232323,0x81242424,0x66252525,0x4c242424,0x32242424,
+    0x18242424,0x9242424,0x6242424,0x14242424,0x33242424,0x5f242424,0x83202020,0x9c252525,0xaf232323,0xc1242424,0xd4232323,0xe72b1f1f,0xf87b929c,0xffade3f3,
+    0xffafe3f3,0xffade3f3,0xffa7e1f2,0xff9addf0,0xff89d7ee,0xff74d1eb,0xff60cbe8,0xff4ec5e6,0xff5e8b93,0xff583523,0xff2e2520,0xfc503424,0xf25e3925,0xdc453024,
+    0xc3222222,0xb2242424,0x96242424,0x6d242424,0x3a242424,0x16242424,0xe242424,0x25242424,0x59242424,0x9c282323,0xcb3e1e1e,0xdf501616,0xec621212,0xf66f0a0a,
+    0xfd7a0505,0xff86575e,0xffa2ddef,0xffa7e1f2,0xffa8e2f3,0xffa7e1f2,0xff9fdef1,0xff92daef,0xff7bd3ec,0xff65cce9,0xff4ec5e6,0xff3dbde0,0xff3bafce,0xff997961,
+    0xffcc652d,0xffad5a2a,0xff7e4728,0xff452f25,0xfe422f25,0xf6633d29,0xe3603c28,0xa8302925,0x5e242424,0x24242424,0x21242424,0x3d242424,0x77242424,0xc53d1e1e,
+    0xfd880303,0xff890000,0xff860000,0xff820000,0xff7d0000,0xff88919f,0xff97dcf0,0xff9addf0,0xff9bddf0,0xff9addf0,0xff92daef,0xff81d5ed,0xff6acee9,0xff4fc5e6,
+    0xff3cbbdd,0xff37accb,0xff34a0bd,0xff6a8080,0xffca642b,0xffd86b2e,0xffe67331,0xfff07834,0xffdc7134,0xffa85b2f,0xff5a3929,0xd2583829,0x71242424,0x2f242424,
+    0x53242424,0x6c242424,0x99242424,0xcc242424,0xed501717,0xff890000,0xff850000,0xff800000,0xff7a0000,0xff7fb9cd,0xff86d7ee,0xff87d7ee,0xff87d7ee,0xff85d6ee,
+    0xff7ad3ec,0xff67cde9,0xff4bc4e6,0xff3bb6d7,0xff35a4c3,0xff3097b2,0xff2d8ca5,0xff427e8d,0xffc1612b,0xffd36a2f,0xffe17133,0xffed7837,0xfff57d3b,0xffad5e34,
+    0xf9633e2b,0xc1242424,0x7b242424,0x3a242424,0x9a242424,0xab242424,0xc3242424,0xdd242424,0xea242424,0xf6660f0f,0xff840000,0xff7f0000,0xff790000,0xff70cce6,
+    0xff70d0ea,0xff6dcfea,0xff6acee9,0xff63cbe8,0xff56c8e7,0xff3ec1e4,0xff37accb,0xff3199b5,0xff2d8aa4,0xff297e96,0xff25778c,0xff277387,0xff9d5129,0xffcd6931,
+    0xffdd7237,0xffea7a39,0xffe5793c,0xff473327,0xe7382d27,0xcc242424,0x92242424,0x5e242424,0xd96b4e2d,0xf49a6a33,0xf1825c2f,0xf06b4e2d,0xf14f3e29,0xf5663e28,
+    0xfd6f190d,0xfe662212,0xff582914,0xff59b3cb,0xff56c8e7,0xff4ec5e6,0xff45c3e5,0xff3dbddf,0xff38b0d0,0xff339ebc,0xff2d8ba4,0xff287a91,0xff236e82,0xff20677a,
+    0xff1f6173,0xff205968,0xff30231d,0xff31251e,0xff724229,0xffb26034,0xff7d4a2f,0xf6613e2b,0xed242424,0xe1242424,0xbd242424,0x93242424,0xbd242424,0xe5674b2b,
+    0xffb57a36,0xffb67b36,0xffb67b36,0xffb67b36,0xffb77333,0xff6e481f,0xff583c1a,0xff49909d,0xff3dbde0,0xff3bb5d6,0xff37accb,0xff34a0bd,0xff2e90ab,0xff297e96,
+    0xff236d81,0xff1e5f70,0xff1b5766,0xff1a5161,0xff1a5160,0xff193f49,0xff1a1a1a,0xff1e1e1d,0xff362822,0xfe703f25,0xffa8672f,0xffcb913e,0xffd7a747,0xfed2a346,
+    0xeda17e3c,0xbc5d4d2e,0x93242424,0xbc242424,0xe25c452a,0xfeb37a36,0xffb67b36,0xffb67b36,0xffb67b36,0xffba7a36,0xff9e612a,0xff4a645f,0xff37abca,0xff34a2bf,
+    0xff3096b1,0xff2b89a2,0xff27798e,0xff22687a,0xff1d5868,0xff194b59,0xff164652,0xff16434f,0xff164651,0xff20272b,0xff5f301b,0xffa0622b,0xffcb903d,0xffd7a747,
+    0xffd7a747,0xffce923e,0xf27e6635,0xd9353027,0xb5242424,0x91242424,0x57242424,0x8a242424,0xbc242424,0xde513f29,0xfdb07835,0xffb67b36,0xffb67b36,0xffb67b36,
+    0xffb67b36,0xffbb7634,0xff657369,0xff2f92ad,0xff2a859d,0xff25768b,0xff206678,0xff1b5665,0xff174854,0xff143e4a,0xff283640,0xff623f31,0xff9e632e,0xffc8903e,
+    0xffd7a747,0xffd7a747,0xffd6a446,0xffbc7a34,0xff863819,0xff4d0303,0xc9242424,0xa3242424,0x76242424,0x53242424,0x28242424,0x52242424,0x8c242424,0xbe242424,
+    0xdf483828,0xffaf7734,0xffb67b36,0xffb67b36,0xffb67b36,0xffb67b36,0xffb97b36,0xffa57345,0xff2b7689,0xff20677a,0xff1f5767,0xff363943,0xff6c3b2b,0xffa4622e,
+    0xffc9903d,0xffd7a747,0xffd7a747,0xffd7a747,0xffcc9940,0xff9a5e28,0xff501a0c,0xff410000,0xff4a0303,0xff510505,0x9b252525,0x6a242424,0x40242424,0x25242424,
+    0x10242424,0x29242424,0x56242424,0x93242424,0xc5252525,0xff7d5125,0xff92632b,0xff98672d,0xff9f6c2f,0xffaf7536,0xffc17f3e,0xffbd7c38,0xffbe7936,0xff7b3b28,
+    0xffaa612b,0xffca903d,0xffd7a747,0xffd7a747,0xffd7a747,0xffd7a747,0xffb18439,0xff6b4620,0xff390806,0xff420000,0xff4e0000,0xff5b0000,0xff630303,0xff670d0d,
+    0x7b232323,0x4a242424,0x26242424,0x12242424,0x8242424,0x15242424,0x33242424,0x65242424,0x9d242424,0xffd17848,0xffac683b,0xffa6673b,0xff996137,0xff8f5d34,
+    0xff8d5c33,0xffc47a4e,0xfff88f5c,0xffad602a,0xffd7a747,0xffd7a747,0xffd7a747,0xffcd9d42,0xff91682d,0xff4b2816,0xff311010,0xff3d0c0c,0xff4d0505,0xff5c0000,
+    0xff6a0000,0xff780303,0xff7b0d0d,0xff7a1919,0x6d232323,0x3f242424,0x1f242424,0xd242424,0x5242424,0xf242424,0x23242424,0x49242424,0x7d242424,0xffdd7e4f,
+    0xfff28d5b,0xfffd9865,0xffff9d6e,0xfffea173,0xfffda174,0xfffc9f73,0xfff99b6d,0xff580505,0xff8f5f29,0xffb88a3b,0xff774b20,0xff3e0a05,0xff3c0505,0xff400c0c,
+    0xff421010,0xff510c0c,0xff670505,0xff790000,0xff880303,0xff8f0f0f,0xff8f1a1a,0xff872222,0x6a242424,0x3d242424,0x1e242424,0xd242424,0x4242424,0xd242424,
+    0x1e242424,0x3f242424,0x6c242424,0xffd87d50,0xfff08d5d,0xfffc9968,0xffffa071,0xffffa478,0xfffea57a,0xfffca479,0xfff99e73,0xff4b0505,0xff470303,0xff460000,
+    0xff480000,0xff4d0000,0xff530505,0xff560c0c,0xff531010,0xff680c0c,0xff820505,0xff940606,0xff9e1313,0xffa41d1d,0xff9c2424,0xff8d2a2a,0x68242424,0x3c242424,
+    0x1d242424,0xc242424,0x4242424,0xc242424,0x1d242424,0x3b242424,0x66242424,0xffd37c50,0xffee8d5d,0xfffc9a6b,0xffffa274,0xffffa67a,0xfffda77d,0xfffba57d,
+    0xfff8a278,0xff590606,0xff5a0303,0xff5e0303,0xff620000,0xff690000,0xff6e0505,0xff6c0c0c,0xff671010,0xff7d0c0c,0xff990c0c,0xffa71616,0xffae1f1f,0xffb02929,
+    0xffa32f2f,0xff8d2f2f,0x68242424,0x3c242424,0x1d242424,0xc242424,0x4242424,0xb242424,0x1b242424,0x39242424,0x63242424,0xffd07a50,0xffed8d5e,0xfffc9a6b,
+    0xffffa376,0xffffa77c,0xfffda97f,0xfffba77f,0xfff8a37a,0xff650a0a,0xff6d0505,0xff750303,0xff7c0000,0xff830000,0xff870505,0xff7f0c0c,0xff771212,0xff8c1212,
+    0xffa61a1a,0xffb52424,0xffba2e2e,0xffb73131,0xffa63535,0xff8a3434,0x67242424,0x3b242424,0x1d242424,0xc242424,0x3242424,0xa242424,0x19242424,0x35242424,
+    0x5d242424,0xffca794f,0xffe98c5d,0xfffb9a6b,0xfffea275,0xffffa77c,0xfffda980,0xfffaa880,0xfff7a47b,0xff6f0c0c,0xff7c0606,0xff890303,0xff900000,0xff990000,
+    0xff9a0505,0xff8d1010,0xff801a1a,0xff961e1e,0xffaf2828,0xffbd3131,0xffbf3838,0xffbc3d3d,0xffa53c3c,0xff863636,0x65242424,0x3a242424,0x1c242424,0xc242424,
+    0x3242424,0x9242424,0x16242424,0x2e242424,0x52242424,0xffc3744d,0xffe2885b,0xfff79768,0xfffda073,0xfffea77b,0xfffda97f,0xfff9a780,0xfff6a47c,0xff730f0f,
+    0xff860808,0xff980303,0xffa10000,0xffa80000,0xffa60a0a,0xff971b1b,0xff872323,0xff9c2929,0xffb63535,0xffc13e3e,0xffc34343,0xffbc4545,0xffa44040,0xff7f3737,
+    0x60242424,0x37242424,0x1b242424,0xb242424,0x2242424,0x7242424,0x11242424,0x25242424,0x43242424,0xc6ac6f51,0xffd38058,0xffed9165,0xfff99c70,0xfffda479,
+    0xfffca67d,0xfff8a67e,0xfff5a37a,0xff731010,0xff8c0808,0xffa10303,0xffad0000,0xffb30808,0xffaf1b1b,0xff9b2828,0xff8a2d2d,0xffa03636,0xffb94141,0xffc24747,
+    0xffc04b4b,0xffb64949,0xff9a4141,0xff773838,0x57242424,0x31242424,0x18242424,0xa242424,0x1242424,0x5242424,0xc242424,0x1a242424,0x32242424,0x5a474747,
+    0xc5a97459,0xfedb8860,0xffef976b,0xfffaa074,0xfffca47a,0xfff7a47a,0xfff3a179,0xff721212,0xff900a0a,0xffa90303,0xffb60808,0xffb91a1a,0xffb42b2b,0xff9f3333,
+    0xff8c3737,0xffa03f3f,0xffb44949,0xffb74e4e,0xffad4c4c,0xff9c4848,0xff823e3e,0xff6a3636,0x48242424,0x29242424,0x13242424,0x8242424,0x1242424,0x3242424,
+    0x7242424,0x11242424,0x21242424,0x39242424,0x61484848,0xc1aa7a63,0xfddf8d66,0xfff0996e,0xfff89f75,0xfff5a077,0xfff19d75,0xff721313,0xff930a0a,0xffae0808,
+    0xffb91a1a,0xffbd2b2b,0xffb63838,0xff9e3d3d,0xff873d3d,0xff954343,0xff9f4a4a,0xff984949,0xff884343,0xfb7a3f3f,0xd8753c3c,0x835f3333,0x36242424,0x1e242424,
+    0xe242424,0x6242424,0xffffff,0x1242424,0x4242424,0xa242424,0x14242424,0x24242424,0x3b242424,0x62484848,0xb9a47b67,0xfedf8d66,0xffee986e,0xfff09a71,
+    0xffed9970,0xff701313,0xff950d0d,0xffb01a1a,0xffb92b2b,0xffb63838,0xffaa4040,0xff8e4040,0xff743c3c,0xff794040,0xfe7a4040,0xee794141,0xba6b3b3b,0x6a332929,
+    0x4d242424,0x37242424,0x23242424,0x13242424,0x9242424,0x4242424,0xffffff,0x1242424,0x2242424,0x5242424,0xa242424,0x15242424,0x24242424,0x3a242424,
+    0x5f434343,0xb3a37a69,0xfcde8d65,0xffe69268,0xffe69268,0xff6d1616,0xff901a1a,0xffa62828,0xffa93636,0xff9f3e3e,0xff8c4040,0xff703c3c,0xfb5f3838,0xd96a3c3c,
+    0x8d4e3131,0x5e242424,0x4d242424,0x3d242424,0x2d242424,0x1f242424,0x14242424,0xa242424,0x5242424,0x2242424,0xffffff,0xffffff,0x1242424,0x2242424,
+    0x5242424,0xb242424,0x14242424,0x23242424,0x38242424,0x5a404040,0xa9997766,0xfad78661,0xffdd8a61,0xff631d1d,0xff7c2424,0xff8a2f2f,0xff843636,0xfe773939,
+    0xe8723b3b,0xb45f3737,0x692a2525,0x55242424,0x46242424,0x38242424,0x2b242424,0x21242424,0x17242424,0xf242424,0x9242424,0x5242424,0x2242424,0x1242424,
+    0xffffff,0xffffff,0xffffff,0x1242424,0x2242424,0x5242424,0xa242424,0x14242424,0x22242424,0x36242424,0x55393939,0x9a937463,0xf7d28259,0xff562222,
+    0xff602828,0xf66e2f2f,0xca6d3434,0x7e422b2b,0x5b242424,0x4c242424,0x3d242424,0x31242424,0x26242424,0x1d242424,0x15242424,0xf242424,0xa242424,0x6242424,
+    0x4242424,0x2242424,0x1242424,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x1242424,0x2242424,0x4242424,0xa242424,0x12242424,0x20242424,
+    0x31242424,0x48363636,0xa7925b50,0xdb692424,0x975d2929,0x5a242424,0x4f242424,0x42242424,0x35242424,0x2a242424,0x20242424,0x18242424,0x12242424,0xd242424,
+    0x9242424,0x6242424,0x4242424,0x2242424,0x1242424,0x1242424,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x1242424,
+    0x2242424,0x4242424,0x9242424,0x10242424,0x1b242424,0x27242424,0x34363636,0x38242424,0x39242424,0x34242424,0x2c242424,0x23242424,0x1b242424,0x14242424,
+    0xe242424,0xa242424,0x7242424,0x5242424,0x3242424,0x2242424,0x1242424,0x1242424,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0x1242424,0x2242424,0x4242424,0x7242424,0xd242424,0x14242424,0x19242424,0x1d242424,0x1d242424,0x1a242424,
+    0x15242424,0x10242424,0xc242424,0x8242424,0x5242424,0x4242424,0x2242424,0x1242424,0x1242424,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
     0xffffff,0xffffff
@@ -1923,24 +1923,24 @@ static const QRgb OKButton_data[] = {
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0x3ed5d5d5,0x93d4d4d4,0xd5d9d9d9,0xfed8d8d8,0xf8d2d2d2,0xeed5d5d5,0xe1d1d1d1,0xdcd3d3d3,0xe1d3d3d3,0xe6d4d4d4,
-    0xecd6d6d6,0xf1d5d5d5,0xf6d5d5d5,0xfbd6d6d6,0xfed7d7d7,0xffd8d8d8,0xffd6d6d6,0xd9cacaca,0xa1bebebe,0x518f8f8f,0xc000000,0x3000000,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0x5fd5d5d5,0xdbdddddd,0xffdcdcdc,0xffcbcbcb,0xffc5c5c5,0xffc3c3c3,0xffcdcdcd,0xffc7c7c7,0xffc4c4c4,0xffc5c5c5,0xffc5c5c5,
-    0xffc4c4c4,0xffc3c3c3,0xffc4c4c4,0xffc5c5c5,0xffc8c8c8,0xffcacaca,0xffcbcbcb,0xffcccccc,0xffd5d5d5,0xe7bdbdbd,0x847e7e7e,0x18000000,0x4000000,0xffffff,
-    0xffffff,0xffffff,0x3ed6d5d5,0xdbd3d3d3,0xffd1d1d1,0xffc0bfbf,0xffbcbcbc,0xffb7b6b7,0xffb9b8b9,0xff989898,0xff313131,0xff323232,0xff555555,0xffbababa,
-    0xff969696,0xff323232,0xff989798,0xffc1c0c1,0xff797879,0xffa6a5a6,0xffcecdce,0xffcecdce,0xffcbcbcb,0xffbbbcbb,0xed939293,0x76484848,0x18000000,0x3000000,
-    0xffffff,0xffffff,0x93cccdcc,0xffc8c7c7,0xffb0b0b0,0xffaeadad,0xffb2b2b2,0xffb0b0b0,0xffafaeae,0xff000000,0xff5b5c5b,0xffb2b1b1,0xff000000,0xff606060,
-    0xff828282,0xff000000,0xff878787,0xff6a6a6a,0xff1a1a1a,0xffa4a4a4,0xffc8c8c8,0xffc9c8c8,0xffc7c7c7,0xffbdbebd,0xffa6a5a5,0xc9505050,0x3d000000,0xc000000,
-    0xffffff,0xffffff,0xd5c1c1c1,0xffacacac,0xff999999,0xffa1a1a1,0xff9b9a9a,0xffa4a4a4,0xff989898,0xff000000,0xff565656,0xffa9a9a9,0xff000000,0xff565656,
-    0xff757575,0xff000000,0xff474747,0xff191919,0xff8e8e8e,0xffbababa,0xffb5b5b5,0xffb0b0b0,0xffbcbcbc,0xffbbbbbb,0xffafafaf,0xf0545454,0x61000000,0x1a000000,
-    0xffffff,0xffffff,0xfab3b3b3,0xff969696,0xff878787,0xff9a9a9a,0xff919191,0xff8c8c8c,0xff929292,0xff000000,0xff515151,0xff959595,0xff000000,0xff4d4d4d,
-    0xff686868,0xff000000,0xff000000,0xff909090,0xffafafaf,0xff9f9f9f,0xff999999,0xffa5a5a5,0xffb0b0b0,0xffb7b7b7,0xff9f9f9f,0xfd505050,0x7c000000,0x25000000,
-    0xffffff,0xffffff,0xd8a0a0a0,0xff888888,0xff858585,0xff7a7a7a,0xff838383,0xff8a8a8a,0xff838383,0xff000000,0xff464646,0xff878787,0xff000000,0xff494949,
-    0xff636363,0xff000000,0xff1e1e1e,0xff212121,0xff9b9b9b,0xffa6a6a6,0xff9f9f9f,0xffa0a0a0,0xffacacac,0xffa7a7a7,0xff858585,0xf2393939,0x85000000,0x2b000000,
-    0xffffff,0xffffff,0x9e818181,0xff848483,0xff757676,0xff7b7b7b,0xff707070,0xff777776,0xff797979,0xff000000,0xff434443,0xff737273,0xff000000,0xff3e3e3e,
-    0xff555554,0xff000000,0xff616160,0xff3d3d3c,0xff2c2c2c,0xff8f8f8f,0xffa1a1a1,0xffa5a5a5,0xff9e9e9e,0xff979897,0xff5e5d5e,0xdf282828,0x7c000000,0x25000000,
-    0xffffff,0xffffff,0x505b5b5b,0xe66a6a6a,0xff6c6c6c,0xff686868,0xff656666,0xff656565,0xff6c6d6c,0xff373737,0xff0d0d0d,0xff1c1c1c,0xff131414,0xff585959,
-    0xff4a4a4a,0xff000000,0xff4f4f4f,0xff727272,0xff373737,0xff6d6d6d,0xff979797,0xff989998,0xff878787,0xff666566,0xf5333333,0xbb101010,0x61000000,0x1a000000,
-    0xffffff,0xffffff,0xc000000,0x833c3c3c,0xec474747,0xff4c4b4b,0xff535352,0xff575757,0xff575657,0xff595859,0xff585857,0xff545453,0xff525251,0xff535352,
-    0xff545454,0xff565656,0xff5a5a5a,0xff606060,0xff696969,0xff717171,0xff707070,0xff666566,0xff535253,0xf5323231,0xce161616,0x83000000,0x3d000000,0xc000000,
-    0xffffff,0xffffff,0x3000000,0x18000000,0x751f1f1f,0xc8262626,0xef272727,0xff2e2e2e,0xfd282828,0xfa262626,0xf5242424,0xf3232323,0xf5262626,0xf7262626,
-    0xf9282828,0xfa292929,0xfc2c2c2c,0xfe2d2d2d,0xff323232,0xff343434,0xff343434,0xf3292929,0xdf1d1d1d,0xbb0d0d0d,0x83000000,0x4b000000,0x18000000,0x3000000,
+    0xffffff,0xffffff,0xffffff,0xffffff,0x3edcdcdc,0x93dbdbdb,0xd5dfdfdf,0xfededede,0xf8d9d9d9,0xeedcdcdc,0xe1d8d8d8,0xdcdadada,0xe1dadada,0xe6dbdbdb,
+    0xecdddddd,0xf1dcdcdc,0xf6dcdcdc,0xfbdddddd,0xfedddddd,0xffdedede,0xffdddddd,0xd9d2d2d2,0xa1c8c8c8,0x519e9e9e,0xc000000,0x3000000,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0x5fdcdcdc,0xdbe3e3e3,0xffe2e2e2,0xffd3d3d3,0xffcecece,0xffcccccc,0xffd5d5d5,0xffd0d0d0,0xffcdcdcd,0xffcecece,0xffcecece,
+    0xffcdcdcd,0xffcccccc,0xffcdcdcd,0xffcecece,0xffd1d1d1,0xffd2d2d2,0xffd3d3d3,0xffd4d4d4,0xffdcdcdc,0xe7c7c7c7,0x848e8e8e,0x18000000,0x4000000,0xffffff,
+    0xffffff,0xffffff,0x3edddcdc,0xdbdadada,0xffd8d8d8,0xffcac9c9,0xffc6c6c6,0xffc2c1c2,0xffc4c3c4,0xffa6a6a6,0xff414141,0xff424242,0xff676767,0xffc4c4c4,
+    0xffa4a4a4,0xff424242,0xffa6a5a6,0xffcbcacb,0xff8a898a,0xffb3b2b3,0xffd6d5d6,0xffd6d5d6,0xffd3d3d3,0xffc5c6c5,0xeda2a1a2,0x765a5a5a,0x18000000,0x3000000,
+    0xffffff,0xffffff,0x93d4d5d4,0xffd1d0d0,0xffbcbcbc,0xffbab9b9,0xffbdbdbd,0xffbcbcbc,0xffbbbaba,0xff000000,0xff6d6e6d,0xffbdbdbd,0xff000000,0xff727272,
+    0xff929292,0xff000000,0xff979797,0xff7b7b7b,0xff272727,0xffb1b1b1,0xffd1d1d1,0xffd1d1d1,0xffd0d0d0,0xffc7c8c7,0xffb3b2b2,0xc9626262,0x3d000000,0xc000000,
+    0xffffff,0xffffff,0xd5cbcbcb,0xffb8b8b8,0xffa7a7a7,0xffaeaeae,0xffa9a8a8,0xffb1b1b1,0xffa6a6a6,0xff000000,0xff686868,0xffb6b6b6,0xff000000,0xff686868,
+    0xff868686,0xff000000,0xff595959,0xff252525,0xff9d9d9d,0xffc4c4c4,0xffc0c0c0,0xffbcbcbc,0xffc6c6c6,0xffc5c5c5,0xffbbbbbb,0xf0666666,0x61000000,0x1a000000,
+    0xffffff,0xffffff,0xfabebebe,0xffa4a4a4,0xff979797,0xffa8a8a8,0xffa0a0a0,0xff9b9b9b,0xffa1a1a1,0xff000000,0xff636363,0xffa4a4a4,0xff000000,0xff5f5f5f,
+    0xff7a7a7a,0xff000000,0xff000000,0xff9f9f9f,0xffbbbbbb,0xffadadad,0xffa7a7a7,0xffb2b2b2,0xffbcbcbc,0xffc2c2c2,0xffadadad,0xfd626262,0x7c000000,0x25000000,
+    0xffffff,0xffffff,0xd8adadad,0xff989898,0xff959595,0xff8b8b8b,0xff939393,0xff9a9a9a,0xff939393,0xff000000,0xff585858,0xff979797,0xff000000,0xff5b5b5b,
+    0xff757575,0xff000000,0xff2b2b2b,0xff2f2f2f,0xffa9a9a9,0xffb3b3b3,0xffadadad,0xffadadad,0xffb8b8b8,0xffb4b4b4,0xff959595,0xf24a4a4a,0x85000000,0x2b000000,
+    0xffffff,0xffffff,0x9e919191,0xff949493,0xff868787,0xff8c8c8c,0xff818181,0xff888887,0xff8a8a8a,0xff000000,0xff545654,0xff848384,0xff000000,0xff4f4f4f,
+    0xff676766,0xff000000,0xff737372,0xff4e4e4d,0xff3c3c3c,0xff9e9e9e,0xffaeaeae,0xffb2b2b2,0xffacacac,0xffa5a6a5,0xff706f70,0xdf373737,0x7c000000,0x25000000,
+    0xffffff,0xffffff,0x506d6d6d,0xe67b7b7b,0xff7d7d7d,0xff7a7a7a,0xff777878,0xff777777,0xff7d7e7d,0xff484848,0xff161616,0xff292929,0xff1e1f1f,0xff6a6b6b,
+    0xff5c5c5c,0xff000000,0xff616161,0xff838383,0xff484848,0xff7e7e7e,0xffa5a5a5,0xffa6a7a6,0xff979797,0xff787778,0xf5434343,0xbb1a1a1a,0x61000000,0x1a000000,
+    0xffffff,0xffffff,0xc000000,0x834d4d4d,0xec595959,0xff5e5d5d,0xff656564,0xff696969,0xff696869,0xff6b6a6b,0xff6a6a69,0xff666665,0xff646463,0xff656564,
+    0xff666666,0xff686868,0xff6c6c6c,0xff727272,0xff7a7a7a,0xff828282,0xff818181,0xff787778,0xff656465,0xf5424241,0xce222222,0x83000000,0x3d000000,0xc000000,
+    0xffffff,0xffffff,0x3000000,0x18000000,0x752d2d2d,0xc8353535,0xef363636,0xff3e3e3e,0xfd373737,0xfa353535,0xf5333333,0xf3313131,0xf5353535,0xf7353535,
+    0xf9373737,0xfa383838,0xfc3c3c3c,0xfe3d3d3d,0xff424242,0xff454545,0xff454545,0xf3383838,0xdf2a2a2a,0xbb161616,0x83000000,0x4b000000,0x18000000,0x3000000,
     0xffffff,0xffffff,0xffffff,0x4000000,0x18000000,0x3d000000,0x61000000,0x7c000000,0x8a000000,0x8b000000,0x87000000,0x82000000,0x81000000,0x82000000,
@@ -2029,75 +2029,75 @@ static const QRgb Opera_data[] = {
 static const QRgb PPPConnect_data[] = {
-    0xffffff,0xffffff,0x1000000,0x4000000,0x7000000,0xc232615,0xd000000,0xd000000,0xb262a17,0x5000000,0x2000000,0x2000000,0x3000000,0x5000000,
-    0x9000000,0xc000000,0xd000000,0xd000000,0xb000000,0x8000000,0x6000000,0x4000000,0x6000000,0xa111500,0xd000000,0xd000000,0xb0f1200,0x7000000,
-    0x4000000,0x1000000,0xffffff,0xffffff,0x1000000,0x6000000,0x13000000,0x34394119,0x76899742,0x5e626d2e,0x989cab4c,0x8a94a347,0x6984923e,0x48717d34,
-    0x26515928,0x12000000,0x12000000,0x1a000000,0x23000000,0x2b000000,0x2f000000,0x2e000000,0x29000000,0x21000000,0x1e000000,0x2a2a3106,0x3e4c5904,0x57647509,
-    0x7373870b,0x7f7a900a,0x51445006,0x62667808,0x30282f05,0x13000000,0x6000000,0x1000000,0x7000000,0x324c5423,0xa99cab4e,0xe3b7c766,0xf2c1d170,0xf5c3d373,
-    0xd8b2c25f,0xd7b3c360,0xd1b6c36d,0xc7b4c16b,0xa9abb960,0x5c757f48,0x3c11151e,0x622f4656,0x99446b82,0xc4517994,0xd8547e99,0xd3517c98,0xb949748f,0x873b5d75,
-    0x6f415730,0x967b9112,0xab8aa112,0xb68fa712,0xc293ad0e,0xc293ac0e,0xeda7c311,0xe7a2be11,0xd396af10,0x937a8e0c,0x2c343d06,0x7000000,0x2440481c,0xb5a1b050,
-    0xfac8d877,0xffcddc7c,0xd6acbc5a,0x716f7b33,0x6f849141,0x647d8841,0x6d7c8842,0x85909965,0x93959c8f,0xb896a7aa,0xe38ba6b4,0xff759eb1,0xff6498b0,0xff4b8aaa,
-    0xff30769b,0xff5e98b4,0xff639ab1,0xff5a90ab,0xf94d81a0,0xc9476e7f,0x924f663d,0x75495919,0x604b580b,0x635e6d0d,0x664f5c08,0xc48ca310,0xffb1ce15,0xf7aac714,
-    0xa07f950e,0x22303708,0x657a8737,0xefbece68,0xffcddd79,0xe2b0c05c,0x31000000,0x101a1c10,0xe000000,0x19000000,0x350f141e,0x7d264c66,0xe039758b,0xff7ea8b1,
-    0xffb0cccc,0xffa2c7ca,0xff8ec3cd,0xff6dbacf,0xff3f99b1,0xff82c5d9,0xff82c3d3,0xff83bfce,0xff71acbf,0xff4889a3,0xff2b6e91,0xbc356686,0x60284255,0x2a000000,
-    0x1c060700,0x34000000,0xd592aa13,0xffb2cf18,0xe5a0b915,0x585e6d0c,0x9591a042,0xf8c5d56c,0xffcbdc74,0xb796a546,0x18000000,0x6000000,0x14000000,0x32191f24,
-    0x9437647e,0xf90d5a73,0xff317c82,0xff91c1bd,0xff76a49d,0xff558374,0xffa0c6bf,0xffd1f3ef,0xffcbf4f9,0xffbbecf5,0xffb1e8f2,0xffa2dfec,0xff9cd8e7,0xff83c7d6,
-    0xff24748a,0xff004e79,0xe235759d,0x733c5b71,0x27070d0d,0x25000000,0xa7798c11,0xffb3d01b,0xf3a8c319,0x85758811,0xa293a243,0xfcc7d86c,0xffcadb70,0xaf93a242,
-    0x1f262a10,0x12000000,0x2f10161b,0x9d517a8d,0xff176676,0xff015052,0xff2f766b,0xff286a4f,0xff165029,0xff4f845d,0xffbae6dd,0xffbbe9de,0xffd6f5f5,0xffc8f2f7,
-    0xffb1edf7,0xffabe9f7,0xffa7e8f7,0xffa1e5f5,0xff58a5b7,0xff1a6c8b,0xff2c87ac,0xf35292af,0x723c5c70,0x38121405,0xa3778a14,0xffb5d120,0xfab0cb1f,0x93798c13,
-    0x968c9c3d,0xfec8da6a,0xfec6d868,0xc09bab45,0x25000000,0x25000000,0x8558737f,0xff3d838b,0xff065a4a,0xff155a40,0xff07491e,0xff12531b,0xff99c5ad,0xffeaffff,
-    0xffe2ffff,0xffc0eeea,0xffd0f4f5,0xffd9f6f8,0xffcbf3f7,0xffb6edf6,0xffabeaf8,0xffa2e6fb,0xff87daf8,0xff6ac3e4,0xff348fb4,0xff257ea9,0xe04985a4,0x631f2e39,
-    0xb9809417,0xfeb5d023,0xfeb5d124,0x88758815,0x71798631,0xf4bdcf5b,0xffc5d764,0xdda9ba4c,0x3d0e0f08,0x593c484d,0xea759a9f,0xff207365,0xff085529,0xff0b4f0e,
-    0xff0f5f12,0xff88c19c,0xffefffff,0xffe9fdff,0xffd8f7fa,0xffd8f9fe,0xffcbf6f8,0xffcbf4f8,0xffd3f5f7,0xffcbf2f7,0xffb5ebf8,0xffa7e7f9,0xff98e8fe,0xff6bc6e0,
-    0xff136785,0xff005998,0xff156da2,0xca40677e,0xda93a920,0xffb7d229,0xf1aac325,0x69677716,0x363d4318,0xe2adc04c,0xffc4d75f,0xf4b6c853,0x81545d21,0xb86c8289,
-    0xff6d9896,0xff09613c,0xff287243,0xff60a882,0xff87c7a5,0xffdffbf6,0xffedfeff,0xffdff9fa,0xffdaf8fa,0xffd5f6f8,0xffcff6f8,0xffc8f5f7,0xffc8f2f7,0xffcef3f7,
-    0xffc7eff6,0xffb0e9f7,0xffacf1ff,0xff85d1db,0xff20676f,0xff005b97,0xff0060a3,0xff396f6d,0xf6a7c02b,0xffbad42f,0xdb9eb526,0x3431380a,0x1a1e220a,0xb092a33a,
-    0xfec0d457,0xffc1d558,0xc5829236,0xf77d9397,0xff6b9e90,0xff18743f,0xff97ccb6,0xffe8fefd,0xffebffff,0xfff1ffff,0xffedfeff,0xffe3fafd,0xffddf9fa,0xffd9f7f9,
-    0xffd3f6f8,0xffccf5f8,0xffc5f3f8,0xffc2eff6,0xffc9f1f6,0xffc3eef6,0xffb5effe,0xff9de1ec,0xff2d726f,0xff005b85,0xff0065a4,0xff57864c,0xffbbd534,0xfeb9d333,
-    0xab849721,0x1b1b1f09,0x9000000,0x5e667223,0xefb0c448,0xffbed352,0xf3a5b845,0xff809280,0xff96b7ad,0xff6ab98e,0xfff1fdfd,0xfffdffff,0xffd9f3ed,0xffbdeadc,
-    0xffa7decd,0xffd5f5f2,0xffe2fafc,0xffdcf8f9,0xffd9f7f8,0xffcef5f7,0xffc8f3f6,0xffc0f1f6,0xffb8eff5,0xffc2eef7,0xffc2edf9,0xffb2f1fc,0xff438378,0xff00474d,
-    0xff146683,0xff94b33d,0xffbdd639,0xefa9bf31,0x63566217,0xb000000,0x2000000,0x1d1a1d09,0xad88992f,0xfdb9cf4b,0xfeb9ce4a,0xff93a556,0xffa5b8af,0xff5caf7f,
-    0xff84c8a0,0xffdbf2e8,0xffebfbf8,0xffd2f5ec,0xffcbf1ea,0xffdff8f7,0xffe3fafb,0xffdaf7fb,0xffcef5f8,0xffcff5f7,0xffc8f4f7,0xffc1f1f6,0xffb8eef5,0xffb4eaf6,
-    0xffbfecf7,0xffc1f2fb,0xff8bcad2,0xff1b5043,0xff608341,0xffbcd43f,0xffb9d13f,0xb8788823,0x2b121406,0x4000000,0xffffff,0x9000000,0x50454e17,0xe8a3b73a,
-    0xffb9cf45,0xffadc343,0xffa3b183,0xffa2cfbb,0xff8fcfac,0xffacddc8,0xffecfbfa,0xfff6ffff,0xfff1ffff,0xfff3ffff,0xfff6ffff,0xffddfbfc,0xffc1f3f9,0xffc9f4f6,
-    0xffc9f4f6,0xffc1f1f6,0xffb9eef5,0xffb1eaf6,0xffb0e8f6,0xffbaeaf5,0xffb1e2ec,0xff7aa57c,0xffb1ca45,0xffc1d845,0xfe97b341,0x6f2f350e,0x18000000,0x2000000,
-    0xffffff,0x3000000,0x20000000,0x9c616e1d,0xfeabc13e,0xffb5cc42,0xffb8c96a,0xffced7c5,0xffe7f1f0,0xffc4efe5,0xff97d5c0,0xff457955,0xff377847,0xff3d8a53,
-    0xff71b192,0xffdcfbfa,0xffe2ffff,0xffd1f9fb,0xffc9f4f7,0xffc3f1f6,0xffb9eef5,0xffb1eaf6,0xffa7e6f5,0xffa7deec,0xffa4cac0,0xffb8ce71,0xffc4da50,0xffb4cc4b,
-    0xfb446e50,0x47000000,0x12000000,0x2000000,0xffffff,0x2000000,0x14000000,0x57151806,0xfc8ba244,0xffbfd35d,0xffc9d979,0xffb6c578,0xffbeccbb,0xffeef4f4,
-    0xffcfe3dd,0xff3e784a,0xff176b22,0xff1d6f1d,0xff115a10,0xff307445,0xff4e876e,0xffbfeff0,0xffddfffe,0xffc6f7fd,0xffbceff7,0xffafe9f3,0xffa0dceb,0xff8ebfb9,
-    0xffaec67b,0xffd0e07b,0xffcadc68,0xff92b05a,0xf91d5569,0x3d000000,0x11000000,0x2000000,0xffffff,0x2000000,0xf000000,0x3c000000,0xf2718d7a,0xffbdcd7c,
-    0xffc7d870,0xffafc440,0xffa0b453,0xffc3cfb9,0xffcce6e0,0xff4fa26e,0xff22832f,0xff287925,0xff266a22,0xff185613,0xff073404,0xff377053,0xff94cdc8,0xff9ad5d3,
-    0xffb0e9ef,0xffaae4ee,0xff90c0b8,0xff9fbc66,0xffc4d95e,0xffd0e177,0xffbacc7a,0xff769f8e,0xf82a657a,0x3a000000,0x11000000,0x2000000,0xffffff,0x1000000,
-    0xf000000,0x403f4330,0xdc88a1ad,0xffa9bc9c,0xffb5c759,0xffabc32c,0xffa7be2c,0xffa1b34f,0xffa7c4a9,0xff3e875e,0xff1b6f28,0xff277529,0xff216322,0xff1e571e,
-    0xff21561d,0xff0e3e0c,0xff023106,0xff063711,0xff377065,0xff94c7c0,0xffa5c06a,0xffc5da5d,0xffc9de5e,0xffbdd16b,0xff98b794,0xff79a5ab,0xf8346d7b,0x3c000000,
-    0x11000000,0x2000000,0xffffff,0x3000000,0x1a16190a,0x7d9aa468,0xc4a6b3ba,0xffa6bab5,0xff99ad63,0xffa3bb2d,0xffa7c027,0xffa1b92a,0xff9cb057,0xff618d6b,
-    0xff185d2a,0xff277c3d,0xff246a2f,0xff1e521d,0xff1e4f1b,0xff1f501e,0xff184418,0xff0f3310,0xff517a64,0xffa2bf74,0xffc4d862,0xffccdf65,0xffc0d561,0xff95b87c,
-    0xff86b8bd,0xff78a3a3,0xfb4a7a63,0x460a0b04,0x12000000,0x2000000,0xffffff,0xa000000,0x5f7c893b,0xc9becb7a,0xabadb4b5,0xff99b0b4,0xff98aea3,0xff98ad62,
-    0xff9fb72b,0xffa3bc22,0xff9db426,0xff8fa342,0xff395c33,0xff196530,0xff216336,0xff1d5321,0xff1c4a1a,0xff1c4a1c,0xff154115,0xff304f24,0xff9fba66,0xffc4d867,
-    0xffcee06b,0xffbfd365,0xff95b87c,0xff7fbcc6,0xff7fbaca,0xff68918d,0xfa708e3c,0x7f4e5912,0x17000000,0x2000000,0x3000000,0x26333914,0xbaa8b756,0xefcad979,
-    0x9faaada4,0xe47a98a2,0xff98b3b4,0xffa6bfb8,0xff98af66,0xff9bb326,0xff9fb71d,0xff9cb31d,0xff8aa12f,0xff486735,0xff1d592c,0xff1b5728,0xff1d4e1c,0xff1d471a,
-    0xff3d5e21,0xff9fb555,0xffcee070,0xffd0e171,0xffc0d46a,0xff96b880,0xff84c0cd,0xff7fc5e2,0xff71afc6,0xff587f72,0xf8849a1e,0xc9718315,0x2f252b06,0x4000000,
-    0xa000000,0x6e7a8735,0xf1c4d568,0xefc8d77e,0xa8a7af7a,0x8e526b77,0xff85a8ad,0xffa5c3c5,0xffa6c5be,0xff97af58,0xff98b020,0xff9ab319,0xff98b019,0xff8da527,
-    0xff567421,0xff23501a,0xff274f1c,0xff668133,0xffb2c661,0xffd1e376,0xffd1e376,0xffc5d86f,0xff9fbe7b,0xff84c1ca,0xff7ac6e5,0xff6ab5d8,0xff5b99b3,0xfa5d7e52,
-    0xf47b8e16,0xf47e9311,0x795a690c,0xa000000,0x160c0c0c,0xb5a0b04d,0xfed1e279,0xf3cad781,0xb0a0ad5b,0x48192027,0xc5658c9d,0xff8db2b6,0xffa4c9cc,0xff9ec2ac,
-    0xff90ac55,0xff93ab20,0xff96b016,0xff93ac15,0xff8aa316,0xff778c27,0xff889947,0xffbdcd6e,0xffd1e17b,0xffd2e37b,0xffc2d571,0xff9fbd7c,0xff8bc0ba,0xff82cbe5,
-    0xff5eb2d8,0xff54a1c5,0xff4986a5,0xd8627b28,0xf6758811,0xfe778c0e,0xc16d7f0c,0x16020200,0x22262626,0xdcb7c861,0xffd5e581,0xfcd1e17c,0xb5a2af5d,0x31050505,
-    0x582e4651,0xdc6792a2,0xff8db5ba,0xff8bbdc9,0xff7cb5b3,0xff86a75e,0xff8ea71f,0xff97ae1d,0xffa2b73b,0xffb5c466,0xffc1cc86,0xffc2ce85,0xffc7d481,0xffbcce74,
-    0xff96b681,0xff85bdbf,0xff86cbe0,0xff7bc3de,0xff5fa6c8,0xff4f90b5,0xb72e6383,0xc564750e,0xfd778d0c,0xff70840c,0xe66e820a,0x27101206,0x2d4a4a4a,0xeac2d26e,
-    0xffd6e585,0xffd6e585,0xd7b3c267,0x4e545c2b,0x2f0f100b,0x6c344c5c,0xdf618c9e,0xff709eac,0xff679ea6,0xff7aa08b,0xff8ca25a,0xffaaba5c,0xffc1ce7d,0xffc7d38d,
-    0xffc7d28d,0xffc0cc84,0xffabb968,0xff869e5a,0xff749e84,0xff75aeb2,0xff74b2c8,0xff6aa7be,0xff548fad,0xbf346b8d,0x79314120,0xdf6d810c,0xff70850a,0xff6a7e0a,
-    0xf26b7f09,0x371a1d08,0x2f575757,0xe7c0d06e,0xffd7e689,0xffd8e78a,0xf8ccdb7b,0xb49daa59,0x75747f36,0x74646e30,0x9b607143,0xe26d8868,0xff99af6e,0xffabbf6f,
-    0xffbccb78,0xffc8d48b,0xffc6d18e,0xffc7d28f,0xffbeca7b,0xffa9ba57,0xff90a52a,0xff7d9619,0xff769125,0xff708e37,0xff5e8360,0xff537e6a,0xc646674b,0x94465913,
-    0xc0607109,0xfa70850a,0xff6a7d09,0xff657808,0xf0697d07,0x391b1f08,0x24555555,0xd0b4c463,0xffd9e78d,0xffdae88f,0xffdae88f,0xf8ccdc7e,0xebc0cf70,0xe9bfce70,
-    0xe8bac96b,0xf6c7d67a,0xffd6e48a,0xffd9e78f,0xffd8e68f,0xffd4e18d,0xffbecb7f,0xffabb96b,0xff99ab49,0xff879d1f,0xff7f970b,0xff7d940b,0xff7b910b,0xff798f0c,
-    0xfc758c0f,0xf170860d,0xef718609,0xef718509,0xfa6f8309,0xff697d08,0xff657908,0xff627507,0xdd687c06,0x2c191d05,0x113c3c3c,0x8895a34b,0xefc7d679,0xffdbe892,
-    0xffdbe892,0xffdbe892,0xffdae790,0xffdbe892,0xffdbe892,0xffdbe892,0xffdae891,0xffdae790,0xfccedc84,0xf7b3c470,0xf48ba266,0xf76d8964,0xfb5b7b4e,0xfc5e7d2d,
-    0xfc6f8916,0xfe79900d,0xff798f0a,0xff768c0a,0xff74890a,0xff72870a,0xff6f8308,0xff6d8008,0xff697c08,0xff657907,0xff627507,0xf5677b07,0x95617306,0x130e1100,
-    0x4000000,0x1f353919,0x8b93a04b,0xe2becd70,0xf9d0df86,0xfed9e691,0xffdce995,0xfedae793,0xfed8e590,0xfbd3e089,0xf6cfdd84,0xe1b9c76c,0xb597a450,0x8874803a,
-    0x5d3e431e,0x43000000,0x45000000,0x63283004,0x8d4c5905,0xba607206,0xe4718508,0xf8758a09,0xfb728809,0xfe6f8409,0xfe6c8008,0xff697c08,0xfe677a08,0xfb677a07,
-    0xea697c06,0x97607106,0x20252b01,0x4000000,0xffffff,0x4000000,0x13000000,0x6c889544,0xb8a9b85d,0xdabac86d,0xe2bdcc71,0xe6c2d176,0xd1b3c166,0xc1acbb5f,
-    0x999ba952,0x50697333,0x25313615,0x1d31361a,0x12000000,0x11000000,0x12000000,0x14000000,0x201b1f01,0x2b1d2301,0x54455204,0x9d647607,0xc56b7f07,0xd66c8007,
-    0xeb6e8207,0xe86c8007,0xe16b7e07,0xc2677a05,0x755a6b04,0x13000000,0x4000000,0xffffff,0xffffff,0xffffff,0x3000000,0x1250582b,0x27515927,0x557f8b3f,
-    0x6a8a9746,0x61849142,0x3c60692f,0x346e7936,0x1941471f,0x7000000,0x3000000,0x2000000,0x1000000,0x2000000,0x2000000,0x2000000,0x3000000,0x3000000,
-    0x8000000,0x192c3401,0x364d5b07,0x3e445006,0x66586804,0x705b6c04,0x5b566505,0x29384201,0x12333d01,0x3000000,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0x1000000,0x3000000,0x6000000,0x8000000,0x92f321c,0x4000000,0x3000000,0x1000000,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x1000000,0x3000000,0x4000000,0x9181d00,0x8000000,0x6000000,0x3000000,0x1000000,0xffffff,
+    0xffffff,0xffffff,0x1000000,0x4000000,0x7000000,0xc313520,0xd000000,0xd000000,0xb353923,0x5000000,0x2000000,0x2000000,0x3000000,0x5000000,
+    0x9000000,0xc000000,0xd000000,0xd000000,0xb000000,0x8000000,0x6000000,0x4000000,0x6000000,0xa1b2000,0xd000000,0xd000000,0xb191d00,0x7000000,
+    0x4000000,0x1000000,0xffffff,0xffffff,0x1000000,0x6000000,0x13000000,0x344a5225,0x7699a553,0x5e747e3e,0x98aab75e,0x8aa3b059,0x6994a14f,0x48828d45,
+    0x26636b37,0x12000000,0x12000000,0x1a000000,0x23000000,0x2b000000,0x2f000000,0x2e000000,0x29000000,0x21000000,0x1e000000,0x2a39410c,0x3e5e6b08,0x57768610,
+    0x73849713,0x7f8b9f12,0x5156620c,0x6278890f,0x30373f0a,0x13000000,0x6000000,0x1000000,0x7000000,0x325e6631,0xa9aab760,0xe3c2d078,0xf2cbd881,0xf5ccda84,
+    0xd8bdcb71,0xd7becc72,0xd1c1cc7e,0xc7bfcb7c,0xa9b7c472,0x5c868f5a,0x3c1b202b,0x623f5868,0x99567c92,0xc4638aa3,0xd8668ea7,0xd3638da6,0xb95b859e,0x874c6f86,
+    0x6f526940,0x968ca01d,0xab9aae1d,0xb69eb41d,0xc2a2b917,0xc2a2b817,0xedb4cc1b,0xe7afc81b,0xd3a4bb1a,0x938b9d14,0x2c454e0c,0x7000000,0x24515a29,0xb5aebc62,
+    0xfad1de88,0xffd5e28d,0xd6b8c66c,0x71808c43,0x6f94a052,0x648d9852,0x6d8d9853,0x859fa777,0x93a4aa9e,0xb8a4b4b6,0xe39ab3bf,0xff86acbd,0xff76a6bc,0xff5d9ab6,
+    0xff4087a9,0xff70a6bf,0xff75a8bd,0xff6c9fb7,0xf95f91ad,0xc9597f8f,0x9261784e,0x755b6b25,0x605d6a13,0x63707e16,0x66616e0f,0xc49bb01a,0xffbdd620,0xf7b6d01f,
+    0xa08fa417,0x2240480f,0x658b9748,0xefc8d67a,0xffd5e38a,0xe2bcca6e,0x31000000,0x1027291a,0xe000000,0x19000000,0x35191f2b,0x7d355e78,0xe04a869a,0xff8eb5bd,
+    0xffbcd4d4,0xffafd0d2,0xff9dccd5,0xff7ec4d7,0xff50a7bd,0xff92cedf,0xff92ccda,0xff93c9d6,0xff82b8c9,0xff5a99b0,0xff3b7fa0,0xbc467896,0x60375367,0x2a000000,
+    0x1c0c0d00,0x34000000,0xd5a1b61e,0xffbdd724,0xe5adc420,0x58707e14,0x95a0ad53,0xf8cedc7d,0xffd3e285,0xb7a4b258,0x18000000,0x6000000,0x14000000,0x32252d33,
+    0x9448768e,0xf9166c84,0xff418d92,0xffa0cbc7,0xff87b1ab,0xff679385,0xffadcfc9,0xffd8f5f2,0xffd3f6fa,0xffc5eff7,0xffbdecf4,0xffafe4ef,0xffaadeeb,0xff93d0dd,
+    0xff33859a,0xff00608a,0xe24686ab,0x734d6d82,0x270d1616,0x25000000,0xa78a9b1b,0xffbed728,0xf3b5cc25,0x8586981b,0xa2a2af54,0xfcd0de7d,0xffd2e181,0xafa2af53,
+    0x1f35391a,0x12000000,0x2f1a2228,0x9d638b9c,0xff237887,0xff036264,0xff3f877c,0xff377b61,0xff226238,0xff61946f,0xffc4eae3,0xffc5ede3,0xffddf7f7,0xffd1f4f8,
+    0xffbdf0f8,0xffb7edf8,0xffb4ecf8,0xffaee9f7,0xff6ab2c2,0xff277d9a,0xff3c97b8,0xf364a1bb,0x724d6e81,0x381d1f0a,0xa3889a1f,0xffc0d82e,0xfabcd32d,0x938a9b1e,
+    0x969baa4e,0xfed1e07b,0xfecfde7a,0xc0a9b757,0x25000000,0x25000000,0x856a848f,0xff4e939a,0xff0c6c5c,0xff206c51,0xff0d5b2b,0xff1d6528,0xffa7ceb9,0xffeeffff,
+    0xffe7ffff,0xffcaf1ee,0xffd7f6f7,0xffdff8f9,0xffd3f5f8,0xffc1f0f8,0xffb7eef9,0xffafeafc,0xff97e0f9,0xff7bcce8,0xff459ebf,0xff348eb6,0xe05b95b1,0x632d3e4a,
+    0xb990a323,0xfec0d731,0xfec0d833,0x88869820,0x718a9641,0xf4c7d76d,0xffcedd76,0xddb6c45e,0x3d17190f,0x594d5a5f,0xea86a8ad,0xff2e8477,0xff0f6738,0xff136117,
+    0xff19711d,0xff98cbaa,0xfff2ffff,0xffedfdff,0xffdef8fb,0xffdefafe,0xffd3f8f9,0xffd3f6f9,0xffdaf7f8,0xffd3f4f8,0xffc0eef9,0xffb4ebfa,0xffa6ecfe,0xff7ccfe5,
+    0xff1e7995,0xff006ba6,0xff207eaf,0xca51798e,0xdaa2b62e,0xffc2d938,0xf1b6cc34,0x69798822,0x364e5424,0xe2b9ca5e,0xffcddd71,0xf4c1d165,0x81666f2f,0xb87d9299,
+    0xff7ea6a4,0xff10734d,0xff378354,0xff72b592,0xff97d0b2,0xffe4fcf8,0xfff0feff,0xffe4fafb,0xffe0f9fb,0xffdcf8f9,0xffd7f8f9,0xffd1f7f8,0xffd1f4f8,0xffd6f5f8,
+    0xffd0f2f8,0xffbcedf8,0xffb8f3ff,0xff95d8e1,0xff2e7980,0xff006da5,0xff0072b0,0xff4a807e,0xf6b4ca3b,0xffc4db3f,0xdbacc035,0x34414912,0x1a2b3012,0xb0a1b04b,
+    0xfecadb69,0xffcbdc6a,0xc592a147,0xf78da2a5,0xff7cac9f,0xff248550,0xffa5d4c1,0xffecfefd,0xffeeffff,0xfff3ffff,0xfff0feff,0xffe8fbfd,0xffe3fafb,0xffdff8fa,
+    0xffdaf8f9,0xffd4f7f9,0xffcef5f9,0xffcbf2f8,0xffd1f3f8,0xffccf1f8,0xffc0f2fe,0xffabe6ef,0xff3d8380,0xff006d95,0xff0077b1,0xff69965e,0xffc5dc45,0xfec4da43,
+    0xab94a52f,0x1b282d10,0x9000000,0x5e788331,0xefbccd5a,0xffc8da64,0xf3b2c357,0xff90a190,0xffa4c2b9,0xff7bc49d,0xfff3fdfd,0xfffdffff,0xffdff5f0,0xffc7eee2,
+    0xffb4e3d5,0xffdcf7f4,0xffe7fbfd,0xffe2f9fa,0xffdff8f9,0xffd6f7f8,0xffd1f5f8,0xffcaf3f8,0xffc3f2f7,0xffcbf1f8,0xffcbf0fa,0xffbdf3fd,0xff549389,0xff00595f,
+    0xff1f7893,0xffa3be4e,0xffc7dd4a,0xefb6c941,0x63687423,0xb000000,0x2000000,0x1d272a10,0xad98a73f,0xfdc4d75d,0xfec4d65c,0xffa2b268,0xffb2c3bb,0xff6ebb8f,
+    0xff94d1ad,0xffe1f4ec,0xffeefcf9,0xffd9f7ef,0xffd3f3ee,0xffe4f9f8,0xffe8fbfc,0xffe0f8fc,0xffd6f7f9,0xffd7f7f8,0xffd1f6f8,0xffcbf3f8,0xffc3f1f7,0xffbfeef8,
+    0xffc9eff8,0xffcbf4fc,0xff9ad2d9,0xff286254,0xff729352,0xffc6db50,0xffc4d850,0xb8899831,0x2b1d1f0c,0x4000000,0xffffff,0x9000000,0x50576023,0xe8b0c24b,
+    0xffc4d757,0xffb9cc54,0xffb0bd93,0xffafd7c5,0xff9ed7b8,0xffb8e3d1,0xffeffcfb,0xfff8ffff,0xfff3ffff,0xfff5ffff,0xfff8ffff,0xffe3fcfd,0xffcbf5fa,0xffd1f6f8,
+    0xffd1f6f8,0xffcbf3f8,0xffc4f1f7,0xffbdeef8,0xffbcecf8,0xffc4eef7,0xffbde7ef,0xff8bb28d,0xffbdd257,0xffcbde57,0xfea5be52,0x6f3f4617,0x18000000,0x2000000,
+    0xffffff,0x3000000,0x20000000,0x9c737f2a,0xfeb7cb4f,0xffc0d453,0xffc3d17b,0xffd6ddce,0xffebf3f3,0xffcdf2e9,0xffa5dcca,0xff578a67,0xff488959,0xff4e9a65,
+    0xff82bda1,0xffe2fcfb,0xffe7ffff,0xffd8fafc,0xffd1f6f8,0xffccf3f8,0xffc4f1f7,0xffbdeef8,0xffb4eaf7,0xffb4e3ef,0xffb1d2ca,0xffc3d682,0xffcde062,0xffbfd45d,
+    0xfb567f62,0x47000000,0x12000000,0x2000000,0xffffff,0x2000000,0x14000000,0x5720240c,0xfc9aaf56,0xffc9da6f,0xffd1df8a,0xffc1ce89,0xffc8d4c5,0xfff1f6f6,
+    0xffd7e8e3,0xff4f895c,0xff237c30,0xff2a802a,0xff1b6c1a,0xff408557,0xff60977f,0xffc9f2f3,0xffe3fffe,0xffcff8fd,0xffc6f2f8,0xffbbedf5,0xffade2ee,0xff9dc9c4,
+    0xffbacf8c,0xffd7e58c,0xffd2e27a,0xffa1bc6c,0xf92a677a,0x3d000000,0x11000000,0x2000000,0xffffff,0x2000000,0xf000000,0x3c000000,0xf2829c8b,0xffc7d58d,
+    0xffd0de81,0xffbbcd51,0xffadbf65,0xffccd7c4,0xffd4eae5,0xff61af7f,0xff30933f,0xff378a34,0xff357b30,0xff24681e,0xff0d4508,0xff488165,0xffa3d5d1,0xffa8dcda,
+    0xffbcedf2,0xffb6e8f1,0xff9fcac3,0xffadc678,0xffcddf70,0xffd7e688,0xffc4d48b,0xff87ad9d,0xf839778b,0x3a000000,0x11000000,0x2000000,0xffffff,0x1000000,
+    0xf000000,0x40505440,0xdc98aeb9,0xffb6c6aa,0xffc0d06b,0xffb7cc3c,0xffb4c83c,0xffaebe61,0xffb4cdb6,0xff4f9770,0xff288037,0xff368638,0xff2f7530,0xff2b692b,
+    0xff2f682a,0xff174f14,0xff05410c,0xff0c481b,0xff488177,0xffa3d0ca,0xffb2ca7b,0xffcee06f,0xffd1e370,0xffc7d87c,0xffa6c2a3,0xff8ab2b7,0xf8457e8c,0x3c000000,
+    0x11000000,0x2000000,0xffffff,0x3000000,0x1a222512,0x7da8b17a,0xc4b3bec4,0xffb3c4c0,0xffa7b975,0xffb0c53d,0xffb4ca36,0xffaec439,0xffaabc69,0xff739c7c,
+    0xff246f39,0xff368d4e,0xff337b3f,0xff2b642a,0xff2b6128,0xff2d622b,0xff245624,0xff19431a,0xff638b76,0xffafc985,0xffcdde74,0xffd4e477,0xffcadc73,0xffa4c38d,
+    0xff96c3c7,0xff89b0b0,0xfb5c8b75,0x46121308,0x12000000,0x2000000,0xffffff,0xa000000,0x5f8d994c,0xc9c8d38b,0xabb9bfc0,0xffa7bcbf,0xffa6bab0,0xffa6b974,
+    0xffadc23b,0xffb0c630,0xffabbf35,0xff9eb053,0xff4a6e43,0xff257740,0xff2f7547,0xff2a652f,0xff295c27,0xff295c29,0xff205220,0xff406133,0xffadc478,0xffcdde79,
+    0xffd6e57c,0xffc9da77,0xffa4c38d,0xff8fc6cf,0xff8fc4d2,0xff7aa09c,0xfa819d4d,0x7f606b1d,0x17000000,0x2000000,0x3000000,0x26434a1f,0xbab5c268,0xefd2df8a,
+    0x9fb6b9b1,0xe48ba6af,0xffa6bebf,0xffb3c9c3,0xffa6bb78,0xffa9be35,0xffadc22a,0xffaabe2a,0xff9aae3f,0xff5a7946,0xff2a6b3c,0xff286937,0xff2a6029,0xff2a5927,
+    0xff4e702f,0xffadc067,0xffd6e581,0xffd7e682,0xffcadb7b,0xffa4c390,0xff94cad5,0xff8fcee7,0xff82bbcf,0xff6a8f83,0xf894a82b,0xc9829320,0x2f343b0c,0x4000000,
+    0xa000000,0x6e8b9746,0xf1cddc7a,0xefd1dd8e,0xa8b4bb8b,0x8e647c88,0xff95b5b9,0xffb2ccce,0xffb3cec8,0xffa5bb6a,0xffa6bc2e,0xffa8be25,0xffa6bc25,0xff9cb236,
+    0xff68852f,0xff316227,0xff366129,0xff789143,0xffbdcf73,0xffd8e887,0xffd8e887,0xffcede80,0xffadc88c,0xff94cbd2,0xff8bcfe9,0xff7bc0de,0xff6da7be,0xfa6f8e64,
+    0xf48c9d22,0xf48ea21b,0x796c7a14,0xa000000,0x16141414,0xb5adbc5f,0xfed8e78a,0xf3d2dd91,0xb0adb96d,0x48252e36,0xc5779bab,0xff9cbdc1,0xffb1d1d4,0xffaccbb8,
+    0xff9fb867,0xffa2b72e,0xffa4bc22,0xffa2b820,0xff9ab022,0xff889b36,0xff98a759,0xffc7d57f,0xffd8e68c,0xffd9e88c,0xffcbdc82,0xffadc78d,0xff9acac4,0xff92d3e9,
+    0xff70bdde,0xff66aece,0xff5b96b2,0xd8748c37,0xf686981b,0xfe889b17,0xc17e8f14,0x16050500,0x22353535,0xdcc2d173,0xffdce991,0xfcd8e68d,0xb5afbb6f,0x310a0a0a,
+    0x583e5863,0xdc79a1af,0xff9cc0c4,0xff9ac7d1,0xff8dc0be,0xff96b470,0xff9db42d,0xffa5ba2a,0xffafc24c,0xffc0cd78,0xffcbd496,0xffcbd695,0xffd0db91,0xffc6d685,
+    0xffa4c191,0xff95c7c9,0xff96d3e5,0xff8ccce3,0xff71b3d1,0xff619fc0,0xb73e7593,0xc5768617,0xfd889c14,0xff819414,0xe67f9212,0x271a1d0c,0x2d5c5c5c,0xeacbd97f,
+    0xffdde995,0xffdde995,0xd7becb79,0x4e666e3b,0x2f191a13,0x6c455e6e,0xdf739bac,0xff81acb8,0xff79acb3,0xff8bad9a,0xff9baf6c,0xffb6c46e,0xffcbd68d,0xffd0da9c,
+    0xffd0d99c,0xffcad494,0xffb7c47a,0xff96ac6c,0xff85ac94,0xff86babd,0xff85bdd1,0xff7bb4c8,0xff669eb9,0xbf457c9c,0x7941522e,0xdf7e9114,0xff819512,0xff7b8e12,
+    0xf27c8f10,0x37272a0f,0x2f696969,0xe7cad77f,0xffddea99,0xffdeeb9a,0xf8d4e18c,0xb4abb66b,0x75858f47,0x74767f40,0x9b728254,0xe27e987a,0xffa7bb7f,0xffb7c980,
+    0xffc6d389,0xffd1db9a,0xffcfd89d,0xffd0d99e,0xffc8d28c,0xffb6c469,0xff9fb239,0xff8da425,0xff87a034,0xff819d48,0xff709372,0xff658e7b,0xc658795d,0x94586b1e,
+    0xc0728210,0xfa819512,0xff7b8d10,0xff77890f,0xf07a8d0d,0x39282d0f,0x24676767,0xd0bfcd75,0xffdfeb9c,0xffe0ec9e,0xffe0ec9e,0xf8d4e28e,0xebcad781,0xe9c9d681,
+    0xe8c4d17c,0xf6d0dd8b,0xffdde89a,0xffdfeb9e,0xffdeea9e,0xffdbe69c,0xffc8d38f,0xffb7c47c,0xffa7b75b,0xff97ab2d,0xff8fa513,0xff8da313,0xff8ca013,0xff8a9e14,
+    0xfc869b19,0xf1819616,0xef829610,0xef829510,0xfa809310,0xff7a8d0f,0xff778a0f,0xff74860d,0xdd7a8d0c,0x2c252a0a,0x114d4d4d,0x88a4b05d,0xefd0dd8a,0xffe1eca1,
+    0xffe1eca1,0xffe1eca1,0xffe0eb9f,0xffe1eca1,0xffe1eca1,0xffe1eca1,0xffe0eca0,0xffe0eb9f,0xfcd6e294,0xf7becd81,0xf49aaf78,0xf77e9976,0xfb6d8c60,0xfc708d3d,
+    0xfc809922,0xfe8a9f16,0xff8a9e12,0xff879b12,0xff859912,0xff839712,0xff80930f,0xff7e900f,0xff7a8d0f,0xff778a0d,0xff74860d,0xf5798c0d,0x9573840c,0x13171b00,
+    0x4000000,0x1f464a25,0x8ba2ad5d,0xe2c8d581,0xf9d7e496,0xfedfeaa0,0xffe2eda4,0xfee0eba2,0xfedee99f,0xfbdae599,0xf6d7e394,0xe1c4d07d,0xb5a5b162,0x8885904b,
+    0x5d4f542b,0x43000000,0x45000000,0x63374008,0x8d5e6b0a,0xba72830c,0xe482950f,0xf8869a10,0xfb839810,0xfe809410,0xfe7d900f,0xff7a8d0f,0xfe798b0f,0xfb798b0d,
+    0xea7a8d0c,0x9772820c,0x20343b03,0x4000000,0xffffff,0x4000000,0x13000000,0x6c98a456,0xb8b6c36f,0xdac4d17e,0xe2c7d482,0xe6cbd887,0xd1becb78,0xc1b8c571,
+    0x99a9b664,0x507a8443,0x25414720,0x1d414727,0x12000000,0x11000000,0x12000000,0x14000000,0x20282d03,0x2b2a3103,0x54576408,0x9d76870d,0xc57c8f0d,0xd67d900d,
+    0xeb7f920d,0xe87d900d,0xe17c8e0d,0xc2798b0a,0x756c7c08,0x13000000,0x4000000,0xffffff,0xffffff,0xffffff,0x3000000,0x12626a3b,0x27636b36,0x558f9a50,
+    0x6a9aa558,0x6194a053,0x3c727a3f,0x347f8a47,0x1952592d,0x7000000,0x3000000,0x2000000,0x1000000,0x2000000,0x2000000,0x2000000,0x3000000,0x3000000,
+    0x8000000,0x193c4503,0x365f6d0d,0x3e56620c,0x666a7a08,0x706d7d08,0x5b68770a,0x29495303,0x12434e03,0x3000000,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0x1000000,0x3000000,0x6000000,0x8000000,0x93f4229,0x4000000,0x3000000,0x1000000,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x1000000,0x3000000,0x4000000,0x9242a00,0x8000000,0x6000000,0x3000000,0x1000000,0xffffff,
     0xffffff,0xffffff
@@ -2105,2 +2105,79 @@ static const QRgb PPPConnect_data[] = {
 
+static const QRgb ParaShoot_data[] = {
+    0x4000000,0x7000000,0xc000000,0x12000000,0x17000000,0x1b000000,0x1d000000,0x1f000000,0x1f000000,0x1f000000,0x1f000000,0x1f000000,0x1f000000,0x1f000000,
+    0x1f000000,0x1f000000,0x1f000000,0x1f000000,0x1f000000,0x1f000000,0x1f000000,0x1f000000,0x1f000000,0x1f000000,0x1f000000,0x1f000000,0x1d000000,0x1b000000,
+    0x17000000,0x12000000,0xc000000,0x7000000,0x7000000,0xf000000,0x18000000,0x25000000,0x2e000000,0x36000000,0x3b000000,0x3d000000,0x3d000000,0x3d000000,
+    0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,
+    0x3d000000,0x3d000000,0x3b000000,0x36000000,0x2e000000,0x25000000,0x18000000,0xf000000,0xc000000,0x18000000,0xff03035a,0xff03035e,0xff03035f,0xff03035e,
+    0xff03035e,0xff03035e,0xff03035e,0xff03035e,0xff03035e,0xff03035e,0xff03035e,0xff03035e,0xff03035e,0xff03035e,0xff03035e,0xff03035e,0xff03035e,0xff03035e,
+    0xff03035e,0xff03035e,0xff03035e,0xff03035e,0xff03035e,0xff03035b,0xff030354,0xff030249,0xff02023c,0x3d000000,0x29000000,0x18000000,0x12000000,0x25000000,
+    0xff03035e,0xff688eb6,0xff6187b3,0xff5981af,0xff567fae,0xff567fae,0xff567fae,0xff567fae,0xff567fae,0xff809fc2,0xff95aecc,0xffaabed6,0xffaabed5,0xffa9bed5,
+    0xff8aa5c5,0xff7f9cbf,0xff567dab,0xff567dab,0xff567dab,0xff567dac,0xff567eac,0xff567ead,0xff567eac,0xff557ba8,0xff537096,0xff4b5b78,0xff020126,0x5c000000,
+    0x3d000000,0x25000000,0x17000000,0x2e000000,0xff03035f,0xff6087b3,0xff4971a8,0xff35629f,0xff305e9c,0xff2f5d9c,0xff7090bb,0xffbecce0,0xfffefefe,0xfffefefe,
+    0xfffdfdfd,0xfffcfcfc,0xfffafafa,0xfff8f8f8,0xfff6f6f6,0xfff2f2f2,0xffefefef,0xffb1bfd0,0xff7690b4,0xff3a6299,0xff2e5a94,0xff2f5b98,0xff2f5c99,0xff2e5993,
+    0xff2c4d7d,0xff26334b,0xff010111,0x74000000,0x4e000000,0x2e000000,0x1b000000,0x36000000,0xff04035f,0xff5b83b1,0xff3966a2,0xff1f5295,0xff5278ae,0xffd3ddea,
+    0xfffefefe,0xffe7e7e7,0xffdedede,0xffdedede,0xfff4f4f4,0xfff3f3f3,0xffdcdcdc,0xffdadada,0xffbbbbbb,0xffb8b8b8,0xffcacaca,0xffcbcbcb,0xffdadada,0xffcfd2d6,
+    0xff7990ae,0xff224e89,0xff164788,0xff164686,0xff13376d,0xff0c1a34,0xff000006,0x87000000,0x5a000000,0x36000000,0x1d000000,0x3b000000,0xff040361,0xff5c83b2,
+    0xff3565a2,0xff8da7ca,0xfff6f6f6,0xffaeaeae,0xff868686,0xff8e8e8e,0xff9e9e9e,0xff969696,0xff7f7f7f,0xff7f7f7f,0xff8e8e8e,0xff9d9d9d,0xffacacac,0xffb3b3b3,
+    0xff999999,0xff8f8f8f,0xff757575,0xff848484,0xffadadad,0xffadb6c1,0xff1c4782,0xff103f7e,0xff0d326a,0xff051430,0xff000003,0x93000000,0x62000000,0x3b000000,
+    0x1f000000,0x3d000000,0xff040362,0xff6188b5,0xffb4c5dc,0xffd8d8d8,0xff868686,0xffaeaeae,0xffeeeeee,0xfffefefe,0xfffefefe,0xff979797,0xffa7a7a7,0xffbfbfbf,
+    0xff7f7f7f,0xffcfcfcf,0xffffffff,0xfffefefe,0xfffdfdfd,0xfffbfbfb,0xffefefef,0xffc2c2c2,0xff7e7e7e,0xff747474,0xff949ba5,0xff123b76,0xff0e3167,0xff05142f,
+    0xff000002,0x99000000,0x66000000,0x3d000000,0x1f000000,0x3d000000,0xff040364,0xff9fb6d3,0xffd5d5d5,0xff8b8b8b,0xffd5d5d5,0xfffefefe,0xffffffff,0xffffffff,
+    0xffb7b7b7,0xff979797,0xffffffff,0xffffffff,0xffe7e7e7,0xff878787,0xffcfcfcf,0xffffffff,0xffffffff,0xfffefefe,0xfffcfcfc,0xfff7f7f7,0xffe9e9e9,0xffa2a2a2,
+    0xff616161,0xff425772,0xff113264,0xff071530,0xff000002,0x99000000,0x66000000,0x3d000000,0x1f000000,0x3d000000,0xff05046b,0xffe5e6e9,0xff989898,0xffdddddd,
+    0xfffefefe,0xffffffff,0xffffffff,0xffefefef,0xff7f7f7f,0xffefefef,0xffffffff,0xffffffff,0xffffffff,0xffe7e7e7,0xff7f7f7f,0xffe7e7e7,0xffffffff,0xfffefefe,
+    0xfff8f8f8,0xffededed,0xffdbdbdb,0xffc2c2c2,0xff878787,0xff494c4f,0xff112f59,0xff081630,0xff000002,0x99000000,0x66000000,0x3d000000,0x1f000000,0x3d000000,
+    0xff08057c,0xffb4b4b4,0xffc5c5c5,0xfffdfdfd,0xffffffff,0xffffffff,0xffffffff,0xffafafaf,0xffbfbfbf,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,
+    0xffbfbfbf,0xff979797,0xfffefefe,0xfff9f9f9,0xffe9e9e9,0xffd3d3d3,0xffbbbbbb,0xffa9a9a9,0xff9a9a9a,0xff88888a,0xff2c456b,0xff0a1732,0xff000003,0x99000000,
+    0x66000000,0x3d000000,0x1f000000,0x3d000000,0xff080574,0xffadadad,0xfffbfbfb,0xfffefefe,0xffffffff,0xffffffff,0xffefefef,0xff7f7f7f,0xffefefef,0xffffffff,
+    0xfffefefe,0xfffefefe,0xfffefefe,0xfffefefe,0xffffffff,0xff8e8e8e,0xffcccccc,0xffececec,0xffd2d2d2,0xffb3b6b9,0xff4f6a8c,0xff47658b,0xff3d4d63,0xff3c4d66,
+    0xff2b4874,0xff0c1a35,0xff000003,0x99000000,0x66000000,0x3d000000,0x1f000000,0x3d000000,0xff07045c,0xffdcdcdc,0xfffcfcfc,0xfffefefe,0xffffffff,0xffffffff,
+    0xffc7c7c7,0xffa7a7a7,0xfffefefe,0xfffdfdfd,0xfffafafa,0xfff9f9f9,0xfff8f8f8,0xfff9f9f9,0xfffbfbfb,0xffcccccc,0xff888888,0xffd9d9d9,0xffbbbbbb,0xff687f9b,
+    0xff183d71,0xff2c5a96,0xff13273f,0xff234777,0xff23477b,0xff0d1c38,0xff000003,0x99000000,0x66000000,0x3d000000,0x1f000000,0x3d000000,0xff07045b,0xfff5f5f5,
+    0xfff9f9f9,0xfffcfcfc,0xfffefefe,0xfffefefe,0xffa6a6a6,0xffcecece,0xfffafafa,0xfff2f2f2,0xffe9e9e9,0xffe2e2e2,0xffe0e0e0,0xffe2e2e2,0xffe8e8e8,0xffeaeaea,
+    0xff7c7c7c,0xffa3a3a3,0xff9ea3a9,0xff2a5489,0xff204a85,0xff386dad,0xff0e1b2b,0xff3465a3,0xff284e86,0xff101f3a,0xff000003,0x99000000,0x66000000,0x3d000000,
+    0x1f000000,0x3d000000,0xff08056b,0xffededed,0xffeeeeee,0xfff1f1f1,0xfff6f6f6,0xfffbfbfb,0xff858585,0xffe8e8e8,0xffebebeb,0xffd9d9d9,0xffc8c8c8,0xffbdbdbd,
+    0xffbababa,0xffbbbbbb,0xffc0c0c0,0xffc3c3c3,0xff909090,0xff747474,0xff70839b,0xff2d5990,0xff2d5c9b,0xff37659d,0xff172c43,0xff3d70af,0xff2d548b,0xff11203c,
+    0xff000003,0x99000000,0x66000000,0x3d000000,0x1f000000,0x3d000000,0xff080572,0xffdfdfdf,0xffdbdbdb,0xffdadada,0xffe3e3e3,0xffdfdfdf,0xff7f7f7f,0xffe4e4e4,
+    0xffcfcfcf,0xffbebebe,0xff8695a7,0xff5d7491,0xff6f8199,0xff78889c,0xff9299a2,0xffa4a4a4,0xff929292,0xff818181,0xff466994,0xff2e5b96,0xff3b6eaf,0xff2e537e,
+    0xff28456a,0xff4275b5,0xff32578f,0xff13223e,0xff000003,0x99000000,0x66000000,0x3d000000,0x1f000000,0x3d000000,0xff080571,0xffaebccb,0xff889fbc,0xffa0acbd,
+    0xffcccccc,0xffb9b9b9,0xff858585,0xffc8c8c8,0xffacb0b6,0xff5d7da2,0xff3f6ba1,0xff376399,0xff2f5992,0xff406ea5,0xff3e699e,0xff426998,0xff667f9d,0xff6f747a,
+    0xff406ca4,0xff2b5796,0xff497fc0,0xff253f5e,0xff395f8f,0xff477aba,0xff355c93,0xff142440,0xff000003,0x99000000,0x66000000,0x3d000000,0x1f000000,0x3d000000,
+    0xff040349,0xff8ca9c9,0xff658ebf,0xff4d79af,0xff7590af,0xffadadad,0xff8b8b8b,0xffa2a9b2,0xff325788,0xff4776b0,0xff4d81bd,0xff497bba,0xff3463a2,0xff5084c3,
+    0xff4e81bf,0xff4c7eba,0xff4979b4,0xff121e2c,0xff4a7dbb,0xff305ea0,0xff5389cc,0xff18283b,0xff4b7eba,0xff4c7fbf,0xff3a6097,0xff162541,0xff000003,0x99000000,
+    0x66000000,0x3d000000,0x1f000000,0x3d000000,0xff05034c,0xff6f7e8f,0xff6f9bcf,0xff5b8cc5,0xff4e7eb4,0xff7690b0,0xffa2a8ae,0xff4e76a5,0xff37639e,0xff4778b7,
+    0xff598fcf,0xff588ecf,0xff3364a5,0xff5a90d2,0xff5990d0,0xff598fd0,0xff5487c3,0xff19293a,0xff4b7ebf,0xff3f72b3,0xff5284c0,0xff1b2c3f,0xff5990d1,0xff5386c5,
+    0xff3e659b,0xff182743,0xff000003,0x99000000,0x66000000,0x3d000000,0x1f000000,0x3d000000,0xff07057a,0xff738293,0xff4d617a,0xff6396d3,0xff5d8fcc,0xff5787c1,
+    0xff304b6b,0xff2a425d,0xff578bca,0xff386aab,0xff5f95d5,0xff6198d8,0xff3a6cae,0xff5d92d4,0xff6197d8,0xff6198d9,0xff5787c1,0xff21344b,0xff477abc,0xff5084c5,
+    0xff466e9d,0xff314d6e,0xff6096d6,0xff598bca,0xff436a9f,0xff1a2945,0xff000003,0x99000000,0x66000000,0x3d000000,0x1f000000,0x3d000000,0xff07057e,0xffa5c3e6,
+    0xff4f647d,0xff384f6c,0xff659ad8,0xff649ad9,0xff6297d4,0xff293f58,0xff436892,0xff4d80c1,0xff4f83c4,0xff679ede,0xff4679bb,0xff5a8fd0,0xff689ede,0xff679ede,
+    0xff5987be,0xff2a405a,0xff3f72b3,0xff5f95d6,0xff39577a,0xff476e9a,0xff669ddc,0xff5f92cf,0xff476ea4,0xff1c2a47,0xff000003,0x99000000,0x66000000,0x3d000000,
+    0x1f000000,0x3d000000,0xff070580,0xffabcaec,0xff82b0e4,0xff3a526f,0xff334c6a,0xff6ca1df,0xff6ea3e3,0xff6699d4,0xff213245,0xff5885b9,0xff4073b5,0xff689fde,
+    0xff5388c8,0xff578ccd,0xff6ea5e4,0xff6ea5e4,0xff5581b2,0xff314a67,0xff3e71b3,0xff6ea5e4,0xff273b52,0xff5f8fc6,0xff6da3e2,0xff6598d5,0xff4c73a8,0xff1e2c49,
+    0xff000003,0x99000000,0x66000000,0x3d000000,0x1f000000,0x3d000000,0xff080582,0xffb1cef0,0xff89b8ec,0xff78abe7,0xff364f6c,0xff354e6b,0xff72a8e6,0xff74abe9,
+    0xff5e8bbd,0xff233446,0xff5789c7,0xff5387c9,0xff6096d6,0xff5388c9,0xff74abe9,0xff74abea,0xff547caa,0xff345072,0xff4f83c5,0xff71a6e3,0xff1f2e3f,0xff74abea,
+    0xff73aae8,0xff6b9eda,0xff5177ad,0xff1f2e4b,0xff000004,0x99000000,0x66000000,0x3d000000,0x1f000000,0x3d000000,0xff080584,0xffb5d3f4,0xff8ebdf1,0xff7fb4f0,
+    0xff79aeeb,0xff38516e,0xff38516e,0xff78aeeb,0xff7ab1ef,0xff4f739c,0xff334a64,0xff497dbe,0xff679ddd,0xff4e83c5,0xff7ab1ef,0xff7ab1ef,0xff51759e,0xff345277,
+    0xff6197d7,0xff618dbe,0xff354c67,0xff7ab1ef,0xff79b0ed,0xff70a3df,0xff557bb0,0xff212f4d,0xff000004,0x99000000,0x66000000,0x3d000000,0x1f000000,0x3d000000,
+    0xff080585,0xffbad6f6,0xff93c1f4,0xff83b9f2,0xff7fb6f2,0xff7cb3ee,0xff3b536f,0xff3b536f,0xff7cb3ee,0xff7eb6f2,0xff3b536e,0xff3f6085,0xff5288c7,0xff487dbe,
+    0xff7fb6f2,0xff7fb6f2,0xff4e7096,0xff33557f,0xff72a9e7,0xff4e7096,0xff4e7096,0xff7eb5f2,0xff7eb4f0,0xff75a7e2,0xff587eb3,0xff22304e,0xff000004,0x99000000,
+    0x66000000,0x3d000000,0x1f000000,0x3d000000,0xff080584,0xffb7d1f0,0xff8eb9eb,0xff80b0e9,0xff7bace7,0xff7bade7,0xff78aae4,0xff384f6a,0xff384f6a,0xff79aae4,
+    0xff74a5dd,0xff293a4d,0xff3b6190,0xff4779b8,0xff74a6e2,0xff7aace8,0xff446082,0xff2f527e,0xff7aace7,0xff354b64,0xff628ab8,0xff7aade8,0xff79ace6,0xff709fd9,
+    0xff5578ac,0xff212f4d,0xff000004,0x99000000,0x66000000,0x3d000000,0x1d000000,0x3b000000,0xff070578,0xffa1b5d2,0xff7898c5,0xff658abd,0xff6085ba,0xff5f85ba,
+    0xff5f85ba,0xff5e82b7,0xff2c3d55,0xff2c3d55,0xff5e83b7,0xff5373a1,0xff43618a,0xff355b91,0xff5277ad,0xff5f85ba,0xff4c6fa0,0xff3a5e91,0xff5e85ba,0xff5779a9,
+    0xff5e82b7,0xff5f85ba,0xff5f84b9,0xff577baf,0xff435d8e,0xff1c2844,0xff000004,0x93000000,0x62000000,0x3b000000,0x1b000000,0x36000000,0xff060466,0xff7282a2,
+    0xff45516a,0xff2d3b58,0xff263553,0xff253452,0xff253452,0xff253452,0xff253350,0xff172033,0xff24324f,0xff253452,0xff253452,0xff162543,0xff1a2845,0xff253452,
+    0xff1d2c48,0xff1d2b48,0xff253452,0xff253452,0xff253452,0xff253452,0xff253351,0xff23304e,0xff1c2844,0xff0e1425,0xff000000,0x87000000,0x5a000000,0x36000000,
+    0x17000000,0x2e000000,0xff040356,0xff03022e,0xff010112,0xff000008,0xff000004,0xff000004,0xff000004,0xff000004,0xff000004,0xff000004,0xff000004,0xff000004,
+    0xff000004,0xff000004,0xff000004,0xff000004,0xff000004,0xff000004,0xff000004,0xff000004,0xff000004,0xff000004,0xff000004,0xff000004,0xff000004,0xff000000,
+    0xff000000,0x74000000,0x4e000000,0x2e000000,0x12000000,0x25000000,0x3d000000,0x5c000000,0x74000000,0x87000000,0x93000000,0x99000000,0x99000000,0x99000000,
+    0x99000000,0x99000000,0x99000000,0x99000000,0x99000000,0x99000000,0x99000000,0x99000000,0x99000000,0x99000000,0x99000000,0x99000000,0x99000000,0x99000000,
+    0x99000000,0x99000000,0x93000000,0x87000000,0x74000000,0x5c000000,0x3d000000,0x25000000,0xc000000,0x18000000,0x29000000,0x3d000000,0x4d000000,0x5a000000,
+    0x62000000,0x66000000,0x66000000,0x66000000,0x66000000,0x66000000,0x66000000,0x66000000,0x66000000,0x66000000,0x66000000,0x66000000,0x66000000,0x66000000,
+    0x66000000,0x66000000,0x66000000,0x66000000,0x66000000,0x66000000,0x62000000,0x5a000000,0x4d000000,0x3d000000,0x29000000,0x18000000,0x7000000,0xf000000,
+    0x18000000,0x25000000,0x2e000000,0x36000000,0x3b000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,
+    0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3d000000,0x3b000000,0x36000000,0x2e000000,0x25000000,
+    0x18000000,0xf000000
+};
+
 static const QRgb Rotation_data[] = {
@@ -2183,15 +2260,15 @@ static const QRgb Rotation_data[] = {
 static const QRgb SettingsIcon_data[] = {
-    0xff778145,0xff788246,0xff788246,0xff778144,0xff768141,0xff75803d,0xff737f37,0xff717d31,0xff6e7c29,0xff6b7a20,0xff697819,0xff677712,0xff627211,0x24000000,
-    0xff788246,0xffcde06a,0xffcde06a,0xffccdf66,0xffc9de5e,0xffb7cc4f,0xff5c662c,0xff7d7f79,0xff838483,0xff454c23,0xff839a0d,0xff99b604,0xff5d6c11,0x6b000000,
-    0xff788246,0xffcde06a,0xffcde069,0xffcbdf64,0xffc8dd5b,0xffbdd24d,0xff687330,0xff87888c,0xffdddde9,0xff9f9fa6,0xff2c3118,0xff768a10,0xff586611,0x8f000000,
-    0xff778144,0xffccdf66,0xffcbdf64,0xffc9de5e,0xffc6db54,0xffc1d946,0xffb3ca36,0xff57621e,0xff7b7c7e,0xffcfcfdc,0xff5b5b61,0xff3c4513,0xff525f11,0x8f000000,
-    0xff768141,0xffc9de5e,0xffc8dd5b,0xff97a746,0xffa1b341,0xffbcd537,0xffb1cb26,0xff9ab317,0xff3b4312,0xffb2b2bb,0xff909097,0xff202313,0xff4d5911,0x8f000000,
-    0xff75803d,0xffc5db52,0xffb6ca4a,0xff4e513d,0xff585e40,0xff92a726,0xffadc917,0xffa6c601,0xff404b07,0xffb8b8be,0xff8d8d95,0xff10120a,0xff475211,0x8f000000,
-    0xff737f37,0xffc1d946,0xff809032,0xff97979b,0xffb8b8c1,0xff494f2f,0xff798f07,0xff647606,0xff707361,0xffd2d2da,0xffa4a4ad,0xff222322,0xff434d11,0x8f000000,
-    0xff717d31,0xffbcd537,0xff94a92c,0xff60615c,0xffdadae6,0xffacacb5,0xff55584a,0xff7b7d73,0xffcdcdd4,0xffa9a9b2,0xff9e9ea7,0xff86868d,0xff404911,0x8f000000,
-    0xff6e7c29,0xffb5d125,0xffafcb1c,0xff546115,0xff5f5f63,0xffb8b8c2,0xffd1d1db,0xffd9d9e3,0xffb5b5c0,0xff8e8e96,0xffbbbbc2,0xffbfbfca,0xff3d4611,0x8f000000,
-    0xff6b7a20,0xffb0ce13,0xffa9c707,0xff91ab09,0xff414b10,0xff2b2c27,0xff414144,0xff4e4e53,0xff8f8f98,0xffb1b1bb,0xffe2e2e8,0xffe8e8ee,0xff3b4311,0x8f000000,
-    0xff697819,0xffaaca01,0xffa0bf00,0xff91ac03,0xff7b900b,0xff586516,0xff3d441a,0xff20240e,0xff2f302f,0xff97979f,0xffcdcdd5,0xfff0f0f4,0xff3a4211,0x8f000000,
-    0xff677712,0xffa1c000,0xff97b400,0xff8ba501,0xff7c9303,0xff6c7f08,0xff5e6e10,0xff546016,0xff353d11,0xff333430,0xffa4a4ad,0xffd3d3dd,0xff3b4311,0x8f000000,
-    0xff627211,0xff5d6c11,0xff586611,0xff525f11,0xff4d5911,0xff475211,0xff434d11,0xff404911,0xff3d4611,0xff3b4311,0xff3a4211,0xff3b4311,0xff3c4511,0x8f000000,
+    0xff889157,0xff899258,0xff899258,0xff889156,0xff879152,0xff86904e,0xff848f48,0xff828d41,0xff7f8d38,0xff7c8b2e,0xff7a8925,0xff79881d,0xff74831b,0x24000000,
+    0xff899258,0xffd5e57b,0xffd5e57b,0xffd4e478,0xffd1e370,0xffc2d461,0xff6e783c,0xff8d8f8a,0xff939493,0xff575e31,0xff93a816,0xffa7c108,0xff6f7d1b,0x6b000000,
+    0xff899258,0xffd5e57b,0xffd5e57a,0xffd3e476,0xffd1e36d,0xffc7d95f,0xff7a8440,0xff97989b,0xffe3e3ed,0xffadadb3,0xff3c4124,0xff879a1a,0xff6a781b,0x8f000000,
+    0xff889156,0xffd4e478,0xffd3e476,0xffd1e370,0xffcfe166,0xffcbdf58,0xffbed247,0xff69742b,0xff8c8d8e,0xffd7d7e2,0xff6d6d73,0xff4d571e,0xff64711b,0x8f000000,
+    0xff879152,0xffd1e370,0xffd1e36d,0xffa5b458,0xffaebe52,0xffc6dc48,0xffbdd335,0xffa8be23,0xff4c541d,0xffbdbdc5,0xff9f9fa5,0xff2e311e,0xff5f6b1b,0x8f000000,
+    0xff86904e,0xffcee164,0xffc1d25c,0xff60634e,0xff6a7051,0xffa1b435,0xffb9d123,0xffb3cf03,0xff515d0d,0xffc3c3c8,0xff9c9ca4,0xff1a1d12,0xff59641b,0x8f000000,
+    0xff848f48,0xffcbdf58,0xff909f42,0xffa5a5a9,0xffc3c3cb,0xff5b613f,0xff8a9e0d,0xff76870c,0xff818473,0xffd9d9e0,0xffb1b1b9,0xff303130,0xff545f1b,0x8f000000,
+    0xff828d41,0xffc6dc48,0xffa3b63c,0xff72736e,0xffe0e0ea,0xffb8b8c0,0xff676a5c,0xff8c8d84,0xffd5d5db,0xffb6b6bd,0xffacacb4,0xff96969c,0xff515b1b,0x8f000000,
+    0xff7f8d38,0xffc0d834,0xffbbd329,0xff667320,0xff717175,0xffc3c3cb,0xffd8d8e1,0xffdfdfe8,0xffc0c0ca,0xff9d9da4,0xffc5c5cb,0xffc9c9d2,0xff4e581b,0x8f000000,
+    0xff7c8b2e,0xffbcd61e,0xffb6d00d,0xffa0b710,0xff525d1a,0xff3b3c36,0xff525256,0xff606065,0xff9e9ea6,0xffbdbdc5,0xffe7e7ec,0xffececf1,0xff4c541b,0x8f000000,
+    0xff7a8925,0xffb6d203,0xffadc900,0xffa0b806,0xff8c9f13,0xff6a7722,0xff4e5627,0xff2e3317,0xff3f403f,0xffa5a5ad,0xffd5d5dc,0xfff3f3f6,0xff4b531b,0x8f000000,
+    0xff79881d,0xffaeca00,0xffa5bf00,0xff9ab203,0xff8da206,0xff7d8f0f,0xff707f1a,0xff667222,0xff464e1b,0xff434540,0xffb1b1b9,0xffdadae3,0xff4c541b,0x8f000000,
+    0xff74831b,0xff6f7d1b,0xff6a781b,0xff64711b,0xff5f6b1b,0xff59641b,0xff545f1b,0xff515b1b,0xff4e581b,0xff4c541b,0xff4b531b,0xff4c541b,0xff4d571b,0x8f000000,
     0x24000000,0x6b000000,0x8f000000,0x8f000000,0x8f000000,0x8f000000,0x8f000000,0x8f000000,0x8f000000,0x8f000000,0x8f000000,0x8f000000,0x8f000000,0x6b000000
@@ -2203,67 +2280,67 @@ static const QRgb Shutdown_data[] = {
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x1000000,0x2000000,0x5000000,0xa000000,0x11000000,0x1b000000,0x26000000,
-    0x5d8b4143,0x93b85357,0xbed15b5f,0xdedf5f63,0xf3e85e63,0xfeee5d61,0xf3e75457,0xe0dc4b4d,0xc4c73e42,0x9fa73032,0x70721d20,0x3f000000,0x33000000,0x26000000,
+    0x5d9a5254,0x93c36569,0xbed86d71,0xdee47175,0xf3ec7075,0xfef16f73,0xf3eb6669,0xe0e25d5f,0xc4d04f53,0x9fb44042,0x70832a2e,0x3f000000,0x33000000,0x26000000,
     0x1b000000,0x11000000,0xa000000,0x5000000,0x2000000,0x1000000,0xffffff,0xffffff,0xffffff,0xffffff,0x1000000,0x2000000,0x6000000,0xd000000,
-    0x16000000,0x23000000,0x6fa55154,0xbad2666a,0xf5ee7277,0xfff17275,0xffef6d71,0xffeb676a,0xffe96064,0xffe85b5e,0xffe85358,0xffe94e53,0xffec484c,0xffed4146,
-    0xf7e8393e,0xc6c12a2e,0x8884191c,0x45000000,0x33000000,0x23000000,0x16000000,0xd000000,0x6000000,0x2000000,0x1000000,0xffffff,0xffffff,0x1000000,
-    0x2000000,0x7000000,0xe000000,0x1a000000,0x47793d3e,0xa7cc6669,0xf5f0797c,0xfff4787c,0xfff3777b,0xffef7174,0xffe96a6e,0xffe46366,0xffde5b5f,0xffdb5458,
-    0xffdd4f53,0xffe2494e,0xffe74348,0xffeb3d42,0xffee373c,0xffef3036,0xf8e7282e,0xbcb01a1e,0x6c4d090b,0x3e000000,0x2a000000,0x1a000000,0xe000000,0x7000000,
-    0x2000000,0x1000000,0xffffff,0x2000000,0x6000000,0xe000000,0x1b000000,0x5f9b4f51,0xc6db7072,0xfff57d80,0xfff57b7e,0xfff47a7d,0xfff07579,0xffea6e71,
-    0xffe2676a,0xffd85e61,0xffd05457,0xffcc4e51,0xffcf484b,0xffd74447,0xffde3e43,0xffe7393d,0xffeb3237,0xffed2b31,0xffee2429,0xffed1d23,0xd7c11419,0x85670a0d,
-    0x46000000,0x2e000000,0x1b000000,0xe000000,0x6000000,0x2000000,0x1000000,0x5000000,0xd000000,0x1a000000,0x5f9b4f51,0xd0e07276,0xfff57d81,0xfff47d7f,
-    0xfff47b7e,0xfff2797c,0xffec7377,0xffe36b6e,0xffd55f63,0xffc85659,0xffffffff,0xffffffff,0xffffffff,0xffc63c40,0xffd2373b,0xffde3237,0xffe82d31,0xffeb262a,
-    0xffec1e24,0xffeb181e,0xffe5171d,0xe0bd1318,0x8a5e0a0c,0x48000000,0x2e000000,0x1a000000,0xd000000,0x5000000,0x3000000,0xa000000,0x16000000,0x47793d3e,
-    0xc6db7072,0xfff57d81,0xfff47d80,0xfff37c7f,0xfff0797c,0xffed7679,0xffe46d71,0xffd76567,0xffc7585b,0xffb94e51,0xffffffff,0xffffffff,0xffffffff,0xffb73438,
-    0xffc43034,0xffd32b31,0xffde252b,0xffe71f25,0xffe8191e,0xffe4171d,0xffde171c,0xffd9161b,0xdbaa1116,0x7b3b0607,0x46000000,0x2a000000,0x16000000,0xa000000,
-    0x6000000,0x11000000,0x23000000,0xa7cc6669,0xfff57d80,0xfff47d7f,0xfff27c7e,0xffee7a7c,0xffe97477,0xffe26f73,0xffd7666a,0xffc85c5f,0xffb64f52,0xffa84548,
-    0xffffffff,0xffffffff,0xffffffff,0xffa62d30,0xffb3282c,0xffc42428,0xffd21f24,0xffdb191f,0xffda161c,0xffd9161b,0xffd6161b,0xffd2151b,0xffcd151a,0xc88b0e11,
-    0x60000000,0x3e000000,0x23000000,0x11000000,0xb000000,0x1b000000,0x6fa55154,0xf5f0797c,0xfff47b7e,0xfff37a7d,0xffee787b,0xffe87376,0xffdc6c70,0xffd36569,
-    0xffc65d60,0xffc26e71,0xffcd999a,0xff993d40,0xffffffff,0xffffffff,0xffffffff,0xff982528,0xffcb8486,0xffbe4044,0xffc0181c,0xffca151a,0xffcb1519,0xffcd151a,
-    0xffcb1419,0xffca151a,0xffc41419,0xf9b91217,0xa257090b,0x55000000,0x33000000,0x1b000000,0x12000000,0x26000000,0xbad2666a,0xfff4787c,0xfff47a7d,0xfff0787b,
-    0xffe97477,0xffdc6c70,0xffce6366,0xffc25c5e,0xffd2999a,0xffeddcdc,0xffffffff,0xff8c3638,0xffffffff,0xffffffff,0xffffffff,0xff8b2023,0xffffffff,0xffedd2d3,
-    0xffce7375,0xffb41217,0xffb71318,0xffbe1318,0xffc11419,0xffc11419,0xffbd1318,0xffb81317,0xd7860d11,0x6c000000,0x45000000,0x26000000,0x19000000,0x5d8b4143,
-    0xf5ef7377,0xfff3777b,0xfff07579,0xffea7276,0xffdf6b6f,0xffd16367,0xffbe5a5c,0xffd7a6a8,0xfffefefe,0xffffffff,0xffffffff,0xff873234,0xffffffff,0xffffffff,
-    0xffffffff,0xff851b1e,0xffffffff,0xffffffff,0xfffefdfd,0xffce8587,0xffa51015,0xffae1216,0xffb21217,0xffb61217,0xffb41317,0xffb11216,0xfaa61115,0x9b3b0608,
-    0x56000000,0x33000000,0x21000000,0x93ba5558,0xfff47376,0xfff37376,0xffee7073,0xffe56c6f,0xffd66467,0xffc35a5d,0xffcf9799,0xfffefefe,0xffffffff,0xffffffff,
-    0xffecdfdf,0xff862e31,0xffffffff,0xffffffff,0xffffffff,0xff84171a,0xffecdada,0xffffffff,0xffffffff,0xfffefdfd,0xffbe7173,0xff9b1014,0xffa41115,0xffa91116,
-    0xffab1215,0xffa81115,0xffa51115,0xc25f0a0c,0x67000000,0x3f000000,0x29000000,0xbed35d61,0xfff46f73,0xfff26e72,0xffeb6b6f,0xffdf6467,0xffcd5b5e,0xffc16b6d,
-    0xffeddbdc,0xffffffff,0xffffffff,0xffd1adae,0xffa1595a,0xff8c2c2e,0xffffffff,0xffffffff,0xffffffff,0xff8a1317,0xff9c3c3f,0xffcc9c9e,0xffffffff,0xffffffff,
-    0xffe7d0d1,0xff9d3437,0xff950f13,0xff9d1014,0xffa01014,0xffa01014,0xff9e1014,0xde730c0f,0x75000000,0x4a000000,0x2f000000,0xdee26164,0xfff36a6d,0xffef686b,
-    0xffe76567,0xffd75c60,0xffc25256,0xffd1999a,0xffffffff,0xffffffff,0xffeedfe0,0xffa85a5c,0xff952f32,0xff982a2d,0xffffffff,0xffffffff,0xffffffff,0xff940f13,
-    0xff8a0e11,0xff983c3e,0xffead9d9,0xffffffff,0xffffffff,0xffb7797b,0xff870e11,0xff910f13,0xff960f13,0xff960f13,0xff960f13,0xef810d10,0x81000000,0x53000000,
-    0x34000000,0xf3ec6165,0xfff36468,0xffef6266,0xffe45c60,0xffd35458,0xffbc494c,0xffe2c3c4,0xffffffff,0xffffffff,0xffd0a3a4,0xff9e3034,0xffa32d30,0xffa7282b,
-    0xffffffff,0xffffffff,0xffffffff,0xff9b1013,0xff8f0e12,0xff830d10,0xffc29294,0xffffffff,0xffffffff,0xffd3b3b4,0xff7b0c0f,0xff850e10,0xff8d0e12,0xff8f0f12,
-    0xff8e0e12,0xf9870d11,0x89000000,0x59000000,0x37000000,0xfef25f63,0xfff35f63,0xffed5b5f,0xffe15659,0xffce4c50,0xffb74245,0xfff3e7e7,0xffffffff,0xffffffff,
-    0xffba6e70,0xffa72c2f,0xffb0292c,0xffb62327,0xffffffff,0xffffffff,0xffffffff,0xffa11015,0xff930f12,0xff830d11,0xff9e5759,0xffffffff,0xffffffff,0xffede1e2,
-    0xff720b0e,0xff7b0d0f,0xff830d11,0xff870e12,0xff880e11,0xfe870e11,0x8e000000,0x5e000000,0x38000000,0xf3eb5559,0xfff2575c,0xffed5559,0xffe04e51,0xffcb4449,
-    0xffb53a3e,0xfffefdfd,0xffffffff,0xffffffff,0xffa94144,0xffad2629,0xffbb2326,0xffc41d22,0xffc51419,0xffbd1317,0xffb31217,0xffa61015,0xff940f13,0xff810d10,
-    0xff81292b,0xffffffff,0xffffffff,0xfffdfcfc,0xff6a0a0d,0xff740c0f,0xff7c0d10,0xff800d11,0xff820d10,0xfa7b0c0f,0x90000000,0x5f000000,0x37000000,0xe0df4c4f,
-    0xfff15156,0xffec4c51,0xffe0474a,0xffcd3e42,0xffb63337,0xfff3e5e6,0xffffffff,0xffffffff,0xffbb6467,0xffad1e22,0xffbd1a1f,0xffc8151a,0xffc41419,0xffbc1318,
-    0xffb11216,0xffa21015,0xff8e0e12,0xff790c0f,0xff975658,0xffffffff,0xffffffff,0xffebe1e1,0xff650b0d,0xff6f0b0e,0xff760c0f,0xff7b0d10,0xff7d0d10,0xf26a0b0e,
-    0x8e000000,0x5e000000,0x34000000,0xc4c93f43,0xfff1494e,0xffed454a,0xffe13f43,0xffd0373b,0xffb92e31,0xffe2bbbc,0xffffffff,0xffffffff,0xffd09899,0xffa51418,
-    0xffb21216,0xffb91217,0xffb91218,0xffb11216,0xffa51115,0xff950f12,0xff800d10,0xff6d0b0e,0xffb79192,0xffffffff,0xffffffff,0xffcbb3b3,0xff620a0c,0xff6c0b0e,
-    0xff720b0e,0xff760c0f,0xff770c0f,0xe558090b,0x89000000,0x59000000,0x2f000000,0x9fa93034,0xfff04247,0xffec3d42,0xffe4383d,0xffd43034,0xffbf272c,0xffcf8385,
-    0xffffffff,0xffffffff,0xffeed9da,0xffab3d40,0xff9f1014,0xffa41014,0xffa51115,0xff9f1014,0xff930f12,0xff830d10,0xff710c0e,0xff7f393b,0xffe4d8d9,0xffffffff,
-    0xffffffff,0xffa37778,0xff600a0c,0xff680b0d,0xff6e0b0e,0xff700c0e,0xff740c0f,0xd1400608,0x81000000,0x53000000,0x29000000,0x70721d20,0xf7e9393e,0xffed373c,
-    0xffe73136,0xffda2a2f,0xffc82227,0xffbe3e42,0xffecd2d2,0xffffffff,0xffffffff,0xffce9d9e,0xffa13c40,0xff8e0e12,0xff8e0e12,0xff870e11,0xff7e0d10,0xff710b0e,
-    0xff80393c,0xffba9b9b,0xffffffff,0xffffffff,0xffded0d0,0xff733031,0xff610a0d,0xff670a0d,0xff6c0b0e,0xff6f0b0e,0xfc6c0a0d,0xb5220404,0x75000000,0x4a000000,
-    0x21000000,0x3f000000,0xc6c12a2e,0xffee3036,0xffe82a30,0xffdf2428,0xffd11c21,0xffbe161a,0xffca7274,0xfffefdfd,0xffffffff,0xffffffff,0xffead9d9,0xffc39294,
-    0xffa15759,0xff82292c,0xff975658,0xffb79192,0xffe4d8d9,0xffffffff,0xffffffff,0xfffefdfd,0xff9a6d6f,0xff5b0a0b,0xff620a0c,0xff680a0d,0xff6a0b0e,0xff6d0b0e,
-    0xe64e080a,0x93000000,0x67000000,0x3f000000,0x19000000,0x33000000,0x8884191c,0xf8e6282e,0xffea2328,0xffe41d23,0xffd9171c,0xffc51419,0xffb01216,0xffcb8587,
-    0xfffefdfd,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffefdfd,0xffa78183,0xff59090b,0xff60090c,
-    0xff640a0d,0xff680b0d,0xff6a0b0e,0xfc680a0d,0xc32b0405,0x81000000,0x56000000,0x33000000,0x12000000,0x26000000,0x45000000,0xbcb01a1e,0xffec1d23,0xffe7181d,
-    0xffda161c,0xffc91519,0xffb71318,0xffa51015,0xffbe7173,0xffe7d0d1,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffded0d0,
-    0xff9a6d6f,0xff59090b,0xff5e090c,0xff620a0d,0xff660a0d,0xff680b0d,0xff6a0b0d,0xdf430709,0x94000000,0x6c000000,0x45000000,0x26000000,0xb000000,0x1b000000,
-    0x33000000,0x6c4d090b,0xd7c01419,0xffe3171d,0xffd9161b,0xffcd151a,0xffbd1317,0xffae1216,0xff9c1014,0xff9e3437,0xffb8797b,0xffd3b3b4,0xffede1e2,0xfffdfcfc,
-    0xffebe1e1,0xffccb3b3,0xffa47778,0xff743031,0xff5d0a0c,0xff60090c,0xff620a0d,0xff660a0d,0xff670b0d,0xff690b0d,0xed50080a,0xae160203,0x7b000000,0x55000000,
-    0x33000000,0x1b000000,0x6000000,0x11000000,0x23000000,0x3e000000,0x85670a0d,0xe0bc1318,0xffd6161b,0xffcd141a,0xffc21419,0xffb41217,0xffa61115,0xff970f13,
-    0xff8a0e12,0xff7f0d10,0xff740c0e,0xff6d0b0d,0xff680b0e,0xff650a0d,0xff640a0d,0xff620a0d,0xff630a0c,0xff650a0d,0xff660a0d,0xff670b0d,0xff690b0d,0xf054080a,
-    0xbc220304,0x85000000,0x60000000,0x3e000000,0x23000000,0x11000000,0x3000000,0xa000000,0x16000000,0x2a000000,0x46000000,0x8a5e0a0c,0xdba91116,0xffca151a,
-    0xffc11419,0xffb71217,0xffac1216,0xffa01014,0xff930f13,0xff890e11,0xff800d10,0xff770c0f,0xff720c0e,0xff6e0b0e,0xff6c0b0d,0xff6a0b0e,0xff690a0d,0xff690b0d,
-    0xff6a0b0e,0xff690b0d,0xed50080a,0xbc220304,0x88000000,0x66000000,0x46000000,0x2a000000,0x16000000,0xa000000,0x1000000,0x5000000,0xd000000,0x1a000000,
-    0x2e000000,0x48000000,0x7b3b0607,0xc88a0e11,0xf9b81217,0xffb51317,0xffae1215,0xffa31014,0xff990f13,0xff8e0e12,0xff870e11,0xff800d11,0xff7a0c10,0xff750c0f,
-    0xff720b0e,0xff6e0c0e,0xff6d0b0e,0xff6b0b0e,0xfc680a0d,0xdf430709,0xae160203,0x85000000,0x66000000,0x48000000,0x2e000000,0x1a000000,0xd000000,0x5000000,
-    0xffffff,0x2000000,0x6000000,0xe000000,0x1b000000,0x2e000000,0x46000000,0x60000000,0xa257090b,0xd7850d11,0xfaa51115,0xffa41115,0xff9c1014,0xff940f13,
-    0xff8b0e12,0xff850e11,0xff7f0d10,0xff7b0d10,0xff750c0f,0xff730c0f,0xfc6c0a0d,0xe64e080a,0xc32b0405,0x94000000,0x7b000000,0x60000000,0x46000000,0x2e000000,
+    0x16000000,0x23000000,0x6fb26366,0xbad9787b,0xf5f18388,0xfff38386,0xfff27e82,0xffee797b,0xffed7276,0xffec6d70,0xffec656a,0xffed6065,0xffef5a5e,0xfff05258,
+    0xf7ec4a4f,0xc6cb393e,0x88942529,0x45000000,0x33000000,0x23000000,0x16000000,0xd000000,0x6000000,0x2000000,0x1000000,0xffffff,0xffffff,0x1000000,
+    0x2000000,0x7000000,0xe000000,0x1a000000,0x478a4e4f,0xa7d4787a,0xf5f38a8d,0xfff6898d,0xfff5888c,0xfff28285,0xffed7b7f,0xffe87578,0xffe36d71,0xffe1666a,
+    0xffe36165,0xffe75b60,0xffeb545a,0xffee4e53,0xfff1484d,0xfff24047,0xf8eb373e,0xbcbc272b,0x6c5f1013,0x3e000000,0x2a000000,0x1a000000,0xe000000,0x7000000,
+    0x2000000,0x1000000,0xffffff,0x2000000,0x6000000,0xe000000,0x1b000000,0x5fa96163,0xc6e18183,0xfff78d90,0xfff78c8e,0xfff68b8d,0xfff3868a,0xffee7f82,
+    0xffe7797b,0xffde7073,0xffd76669,0xffd46063,0xffd75a5d,0xffdd5659,0xffe34f54,0xffeb4a4e,0xffee4248,0xfff03b41,0xfff13338,0xfff02a31,0xd7cb1f25,0x85791216,
+    0x46000000,0x2e000000,0x1b000000,0xe000000,0x6000000,0x2000000,0x1000000,0x5000000,0xd000000,0x1a000000,0x5fa96163,0xd0e58387,0xfff78d91,0xfff68d8f,
+    0xfff68c8e,0xfff48a8d,0xffef8488,0xffe87c7f,0xffdc7175,0xffd1686b,0xffffffff,0xffffffff,0xffffffff,0xffcf4d51,0xffd9484c,0xffe34248,0xffec3d41,0xffee3539,
+    0xffef2b33,0xffee242b,0xffe9232a,0xe0c71e24,0x8a701214,0x48000000,0x2e000000,0x1a000000,0xd000000,0x5000000,0x3000000,0xa000000,0x16000000,0x478a4e4f,
+    0xc6e18183,0xfff78d91,0xfff68d90,0xfff58d8f,0xfff38a8d,0xfff0878a,0xffe87e82,0xffdd7779,0xffd06a6d,0xffc46063,0xffffffff,0xffffffff,0xffffffff,0xffc24549,
+    0xffcd4045,0xffda3b41,0xffe3343b,0xffeb2d34,0xffec252b,0xffe8232a,0xffe32329,0xffdf2228,0xdbb61b22,0x7b4c0c0d,0x46000000,0x2a000000,0x16000000,0xa000000,
+    0x6000000,0x11000000,0x23000000,0xa7d4787a,0xfff78d90,0xfff68d8f,0xfff48d8e,0xfff18b8d,0xffed8588,0xffe78084,0xffdd787b,0xffd16e71,0xffc16164,0xffb5575a,
+    0xffffffff,0xffffffff,0xffffffff,0xffb33d40,0xffbe373c,0xffcd3337,0xffd92d33,0xffe1252d,0xffe02229,0xffdf2228,0xffdd2228,0xffd92028,0xffd52027,0xc89a171b,
+    0x60000000,0x3e000000,0x23000000,0x11000000,0xb000000,0x1b000000,0x6fb26366,0xf5f38a8d,0xfff68c8e,0xfff58b8d,0xfff1898c,0xffec8487,0xffe27d81,0xffda777a,
+    0xffcf6f72,0xffcb7f82,0xffd5a7a8,0xffa74e51,0xffffffff,0xffffffff,0xffffffff,0xffa63437,0xffd39496,0xffc85156,0xffca2429,0xffd22027,0xffd32025,0xffd52027,
+    0xffd31f25,0xffd22027,0xffcd1f25,0xf9c41d23,0xa2691013,0x55000000,0x33000000,0x1b000000,0x12000000,0x26000000,0xbad9787b,0xfff6898d,0xfff68b8d,0xfff3898c,
+    0xffed8588,0xffe27d81,0xffd67578,0xffcb6e70,0xffd9a7a8,0xfff0e2e2,0xffffffff,0xff9b4749,0xffffffff,0xffffffff,0xffffffff,0xff9a2e31,0xffffffff,0xfff0d9da,
+    0xffd68486,0xffbf1d23,0xffc21e24,0xffc81e24,0xffcb1f25,0xffcb1f25,0xffc71e24,0xffc31e23,0xd796161b,0x6c000000,0x45000000,0x26000000,0x19000000,0x5d9a5254,
+    0xf5f28488,0xfff5888c,0xfff3868a,0xffee8387,0xffe47c80,0xffd87579,0xffc86c6e,0xffddb3b5,0xfffefefe,0xffffffff,0xffffffff,0xff974245,0xffffffff,0xffffffff,
+    0xffffffff,0xff95282b,0xffffffff,0xffffffff,0xfffefdfd,0xffd69597,0xffb21a20,0xffba1d22,0xffbd1d23,0xffc11d23,0xffbf1e23,0xffbd1d22,0xfab31b20,0x9b4c0c0f,
+    0x56000000,0x33000000,0x21000000,0x93c4676a,0xfff68487,0xfff58487,0xfff18184,0xffe97d80,0xffdd7679,0xffcc6c6f,0xffd7a5a7,0xfffefefe,0xffffffff,0xffffffff,
+    0xffefe4e4,0xff963e41,0xffffffff,0xffffffff,0xffffffff,0xff942327,0xffefe0e0,0xffffffff,0xffffffff,0xfffefdfd,0xffc88284,0xffa91a1f,0xffb11b20,0xffb61b22,
+    0xffb71d20,0xffb51b20,0xffb21b20,0xc2711214,0x67000000,0x3f000000,0x29000000,0xbeda6f73,0xfff68084,0xfff47f83,0xffee7c80,0xffe47679,0xffd56d70,0xffcb7c7e,
+    0xfff0e1e2,0xffffffff,0xffffffff,0xffd8b9ba,0xffae6b6c,0xff9b3c3e,0xffffffff,0xffffffff,0xffffffff,0xff9a1e23,0xffaa4d50,0xffd4aaac,0xffffffff,0xffffffff,
+    0xffebd7d8,0xffab4548,0xffa4191e,0xffab1a1f,0xffad1a1f,0xffad1a1f,0xffac1a1f,0xde841419,0x75000000,0x4a000000,0x2f000000,0xdee77376,0xfff57b7e,0xfff27a7c,
+    0xffeb7779,0xffdd6e72,0xffcb6468,0xffd8a7a8,0xffffffff,0xffffffff,0xfff1e4e5,0xffb56c6e,0xffa43f42,0xffa6393d,0xffffffff,0xffffffff,0xffffffff,0xffa3191e,
+    0xff9a171b,0xffa64d4f,0xffeedfdf,0xffffffff,0xffffffff,0xffc28a8c,0xff97171b,0xffa0191e,0xffa4191e,0xffa4191e,0xffa4191e,0xef91161a,0x81000000,0x53000000,
+    0x34000000,0xf3ef7377,0xfff5767a,0xfff27478,0xffe86e72,0xffda666a,0xffc65b5e,0xffe7cccd,0xffffffff,0xffffffff,0xffd7b0b1,0xffac4045,0xffb03d40,0xffb4373b,
+    0xffffffff,0xffffffff,0xffffffff,0xffa91a1e,0xff9e171d,0xff93161a,0xffcba1a3,0xffffffff,0xffffffff,0xffdabebf,0xff8c1419,0xff95171a,0xff9c171d,0xff9e191d,
+    0xff9d171d,0xf997161b,0x89000000,0x59000000,0x37000000,0xfef47175,0xfff57175,0xfff06d71,0xffe6686b,0xffd65e62,0xffc25357,0xfff5ebeb,0xffffffff,0xffffffff,
+    0xffc47f81,0xffb43c3f,0xffbc383c,0xffc13136,0xffffffff,0xffffffff,0xffffffff,0xffae1a20,0xffa2191d,0xff93161b,0xffac696b,0xffffffff,0xffffffff,0xfff0e6e7,
+    0xff831317,0xff8c1619,0xff93161b,0xff97171d,0xff98171b,0xfe97171b,0x8e000000,0x5e000000,0x38000000,0xf3ee676b,0xfff4696e,0xfff0676b,0xffe56063,0xffd3565b,
+    0xffc04b4f,0xfffefdfd,0xffffffff,0xffffffff,0xffb65256,0xffb93538,0xffc53135,0xffcd2a30,0xffce1f25,0xffc71e23,0xffbe1d23,0xffb31a20,0xffa3191e,0xff91161a,
+    0xff91383b,0xffffffff,0xffffffff,0xfffdfdfd,0xff7b1216,0xff851419,0xff8d161a,0xff90161b,0xff92161a,0xfa8c1419,0x90000000,0x5f000000,0x37000000,0xe0e45e61,
+    0xfff36368,0xffef5e63,0xffe5595c,0xffd54f53,0xffc14348,0xfff5e9ea,0xffffffff,0xffffffff,0xffc57679,0xffb92b30,0xffc7272d,0xffd12027,0xffcd1f25,0xffc61e24,
+    0xffbd1d22,0xffaf1a20,0xff9d171d,0xff8a1419,0xffa5686a,0xffffffff,0xffffffff,0xffeee6e6,0xff771316,0xff801317,0xff871419,0xff8c161a,0xff8d161a,0xf27b1317,
+    0x8e000000,0x5e000000,0x34000000,0xc4d15054,0xfff35b60,0xfff0575c,0xffe65054,0xffd7484c,0xffc43e41,0xffe7c5c6,0xffffffff,0xffffffff,0xffd7a6a7,0xffb21f24,
+    0xffbd1d22,0xffc41d23,0xffc41d24,0xffbd1d22,0xffb21b20,0xffa4191d,0xff90161a,0xff7e1317,0xffc2a0a1,0xffffffff,0xffffffff,0xffd3bebe,0xff741214,0xff7d1317,
+    0xff831317,0xff871419,0xff881419,0xe56a1013,0x89000000,0x59000000,0x2f000000,0x9fb64045,0xfff35359,0xffef4e53,0xffe8494e,0xffdb4045,0xffc9363c,0xffd79395,
+    0xffffffff,0xffffffff,0xfff1dfe0,0xffb74e51,0xffad1a1f,0xffb11a1f,0xffb21b20,0xffad1a1f,0xffa2191d,0xff93161a,0xff821417,0xff8f4a4c,0xffe8dedf,0xffffffff,
+    0xffffffff,0xffb08889,0xff721214,0xff7a1316,0xff7f1317,0xff811417,0xff851419,0xd1510c0f,0x81000000,0x53000000,0x29000000,0x70832a2e,0xf7ed4a4f,0xfff0484d,
+    0xffeb4147,0xffe0393f,0xffd13036,0xffc84f53,0xffefd9d9,0xffffffff,0xffffffff,0xffd6abac,0xffae4d51,0xff9d171d,0xff9d171d,0xff97171b,0xff8e161a,0xff821317,
+    0xff904a4d,0xffc4a9a9,0xffffffff,0xffffffff,0xffe3d7d7,0xff844041,0xff731216,0xff791216,0xff7d1317,0xff801317,0xfc7d1216,0xb5300808,0x75000000,0x4a000000,
+    0x21000000,0x3f000000,0xc6cb393e,0xfff14047,0xffec3940,0xffe43337,0xffd8292f,0xffc82227,0xffd28385,0xfffefdfd,0xffffffff,0xffffffff,0xffeedfdf,0xffcca1a3,
+    0xffae696b,0xff92383c,0xffa5686a,0xffc2a0a1,0xffe8dedf,0xffffffff,0xffffffff,0xfffefdfd,0xffa87e80,0xff6d1213,0xff741214,0xff7a1216,0xff7b1317,0xff7e1317,
+    0xe6600f12,0x93000000,0x67000000,0x3f000000,0x19000000,0x33000000,0x88942529,0xf8ea373e,0xffee3137,0xffe82a31,0xffdf2329,0xffce1f25,0xffbc1d22,0xffd39597,
+    0xfffefdfd,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffefdfd,0xffb49193,0xff6b1013,0xff721014,
+    0xff761216,0xff7a1316,0xff7b1317,0xfc7a1216,0xc33b080a,0x81000000,0x56000000,0x33000000,0x12000000,0x26000000,0x45000000,0xbcbc272b,0xffef2a31,0xffeb242a,
+    0xffe02229,0xffd12025,0xffc21e24,0xffb21a20,0xffc88284,0xffebd7d8,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffe3d7d7,
+    0xffa87e80,0xff6b1013,0xff701014,0xff741216,0xff781216,0xff7a1316,0xff7b1316,0xdf540d10,0x94000000,0x6c000000,0x45000000,0x26000000,0xb000000,0x1b000000,
+    0x33000000,0x6c5f1013,0xd7ca1f25,0xffe8232a,0xffdf2228,0xffd52027,0xffc71e23,0xffba1d22,0xffaa1a1f,0xffac4548,0xffc38a8c,0xffdabebf,0xfff0e6e7,0xfffdfdfd,
+    0xffeee6e6,0xffd4bebe,0xffb18889,0xff854041,0xff6f1214,0xff721014,0xff741216,0xff781216,0xff791316,0xff7a1316,0xed620f12,0xae220506,0x7b000000,0x55000000,
+    0x33000000,0x1b000000,0x6000000,0x11000000,0x23000000,0x3e000000,0x85791216,0xe0c61e24,0xffdd2228,0xffd51f27,0xffcb1f25,0xffbf1d23,0xffb31b20,0xffa5191e,
+    0xff9a171d,0xff8f161a,0xff851417,0xff7e1316,0xff7a1317,0xff771216,0xff761216,0xff741216,0xff751214,0xff771216,0xff781216,0xff791316,0xff7a1316,0xf0660f12,
+    0xbc300608,0x85000000,0x60000000,0x3e000000,0x23000000,0x11000000,0x3000000,0xa000000,0x16000000,0x2a000000,0x46000000,0x8a701214,0xdbb61b22,0xffd22027,
+    0xffcb1f25,0xffc21d23,0xffb81d22,0xffad1a1f,0xffa2191e,0xff99171b,0xff90161a,0xff881419,0xff831417,0xff7f1317,0xff7d1316,0xff7b1317,0xff7a1216,0xff7a1316,
+    0xff7b1317,0xff7a1316,0xed620f12,0xbc300608,0x88000000,0x66000000,0x46000000,0x2a000000,0x16000000,0xa000000,0x1000000,0x5000000,0xd000000,0x1a000000,
+    0x2e000000,0x48000000,0x7b4c0c0d,0xc89a171b,0xf9c31d23,0xffc01e23,0xffba1d20,0xffb01a1f,0xffa7191e,0xff9d171d,0xff97171b,0xff90161b,0xff8b141a,0xff861419,
+    0xff831317,0xff7f1417,0xff7e1317,0xff7c1317,0xfc7a1216,0xdf540d10,0xae220506,0x85000000,0x66000000,0x48000000,0x2e000000,0x1a000000,0xd000000,0x5000000,
+    0xffffff,0x2000000,0x6000000,0xe000000,0x1b000000,0x2e000000,0x46000000,0x60000000,0xa2691013,0xd795161b,0xfab21b20,0xffb11b20,0xffaa1a1f,0xffa3191e,
+    0xff9a171d,0xff95171b,0xff8f161a,0xff8c161a,0xff861419,0xff841419,0xfc7d1216,0xe6600f12,0xc33b080a,0x94000000,0x7b000000,0x60000000,0x46000000,0x2e000000,
     0x1b000000,0xe000000,0x6000000,0x2000000,0xffffff,0x1000000,0x2000000,0x7000000,0xe000000,0x1a000000,0x2a000000,0x3e000000,0x55000000,0x6c000000,
-    0x9b3b0608,0xc25f0a0c,0xde730c0f,0xef810d10,0xf9870d11,0xfe870e11,0xfa7b0c0f,0xf26a0b0e,0xe558090b,0xd1400608,0xb5220404,0x93000000,0x81000000,0x6c000000,
+    0x9b4c0c0f,0xc2711214,0xde841419,0xef91161a,0xf997161b,0xfe97171b,0xfa8c1419,0xf27b1317,0xe56a1013,0xd1510c0f,0xb5300808,0x93000000,0x81000000,0x6c000000,
     0x55000000,0x3e000000,0x2a000000,0x1a000000,0xe000000,0x7000000,0x2000000,0x1000000,0xffffff,0xffffff,0x1000000,0x2000000,0x6000000,0xd000000,
@@ -3258,13 +3335,13 @@ static const QRgb back_data[] = {
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x7a5a6163,0xff000000,0xff000000,0x24000000,0xc000000,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0x7a5a6163,0xfc151717,0xffffffff,0xff000000,0x6b000000,0x24000000,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0x7a5a6163,0xfc151717,0xffffffff,0xfffbfbfb,0xff000000,0x8f000000,0x30000000,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0x7a5a6163,0xfc151717,0xffffffff,0xffffffff,0xfff7f7f7,0xff000000,0xff000000,0xff000000,0xff000000,0x24000000,0xc000000,0xffffff,
-    0xffffff,0x7a5a6163,0xfc151717,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,0xffffffff,0xffffffff,0xfff3f3f3,0xff000000,0x6b000000,0x24000000,0xffffff,
-    0xffffff,0xe0383d3e,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfff4f4f4,0xfff4f4f4,0xffeaeaea,0xffcbcbcb,0xff000000,0x8f000000,0x30000000,0xffffff,
-    0xffffff,0x69545a5b,0xfd151717,0xfffbfbfb,0xfffbfbfb,0xfff2f2f2,0xffd6d6d6,0xffc3c3c3,0xffbfbfbf,0xffbfbfbf,0xff000000,0x8f000000,0x30000000,0xffffff,
-    0xffffff,0xd000000,0x8344494a,0xfd151617,0xfff2f2f2,0xffe9e9e9,0xffc3c3c3,0xff000000,0xff000000,0xff000000,0xff000000,0x8f000000,0x30000000,0xffffff,
-    0xffffff,0x2000000,0x14000000,0x88414648,0xfe151718,0xffe4e4e4,0xffc2c2c2,0xff000000,0xb3000000,0x9b000000,0x8f000000,0x6b000000,0x24000000,0xffffff,
-    0xffffff,0xffffff,0x2000000,0x14000000,0x88414648,0xfe151718,0xffcbcbcb,0xff000000,0x9b000000,0x54000000,0x30000000,0x24000000,0xc000000,0xffffff,
-    0xffffff,0xffffff,0xffffff,0x2000000,0x14000000,0x88414648,0xff000000,0xff000000,0x8f000000,0x30000000,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x7a6c7375,0xff000000,0xff000000,0x24000000,0xc000000,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0x7a6c7375,0xfc202323,0xffffffff,0xff000000,0x6b000000,0x24000000,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0x7a6c7375,0xfc202323,0xffffffff,0xfffcfcfc,0xff000000,0x8f000000,0x30000000,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0x7a6c7375,0xfc202323,0xffffffff,0xffffffff,0xfff8f8f8,0xff000000,0xff000000,0xff000000,0xff000000,0x24000000,0xc000000,0xffffff,
+    0xffffff,0x7a6c7375,0xfc202323,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,0xffffffff,0xffffffff,0xfff5f5f5,0xff000000,0x6b000000,0x24000000,0xffffff,
+    0xffffff,0xe0494e4f,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfff6f6f6,0xfff6f6f6,0xffeeeeee,0xffd3d3d3,0xff000000,0x8f000000,0x30000000,0xffffff,
+    0xffffff,0x69666c6d,0xfd202323,0xfffcfcfc,0xfffcfcfc,0xfff4f4f4,0xffdddddd,0xffcccccc,0xffc9c9c9,0xffc9c9c9,0xff000000,0x8f000000,0x30000000,0xffffff,
+    0xffffff,0xd000000,0x83565b5c,0xfd202223,0xfff4f4f4,0xffededed,0xffcccccc,0xff000000,0xff000000,0xff000000,0xff000000,0x8f000000,0x30000000,0xffffff,
+    0xffffff,0x2000000,0x14000000,0x8852585a,0xfe202324,0xffe8e8e8,0xffcbcbcb,0xff000000,0xb3000000,0x9b000000,0x8f000000,0x6b000000,0x24000000,0xffffff,
+    0xffffff,0xffffff,0x2000000,0x14000000,0x8852585a,0xfe202324,0xffd3d3d3,0xff000000,0x9b000000,0x54000000,0x30000000,0x24000000,0xc000000,0xffffff,
+    0xffffff,0xffffff,0xffffff,0x2000000,0x14000000,0x8852585a,0xff000000,0xff000000,0x8f000000,0x30000000,0xffffff,0xffffff,0xffffff,0xffffff,
     0xffffff,0xffffff,0xffffff,0xffffff,0x2000000,0x14000000,0x45000000,0x7b000000,0x6b000000,0x24000000,0xffffff,0xffffff,0xffffff,0xffffff,
@@ -3275,13 +3352,13 @@ static const QRgb back_inactive_data[] = {
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x3d5e5e5e,0x7f000000,0x7f000000,0x12000000,0x6000000,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0x3d5e5e5e,0x7e161616,0x7fffffff,0x7f000000,0x35000000,0x12000000,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0x3d5e5e5e,0x7e161616,0x7fffffff,0x7ffbfbfb,0x7f000000,0x47000000,0x18000000,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0x3d5e5e5e,0x7e161616,0x7fffffff,0x7fffffff,0x7ff7f7f7,0x7f000000,0x7f000000,0x7f000000,0x7f000000,0x12000000,0x6000000,0xffffff,
-    0xffffff,0x3d5e5e5e,0x7e161616,0x7fffffff,0x7fffffff,0x7fffffff,0x7ffefefe,0x7fffffff,0x7fffffff,0x7ff3f3f3,0x7f000000,0x35000000,0x12000000,0xffffff,
-    0xffffff,0x703b3b3b,0x7fffffff,0x7fffffff,0x7fffffff,0x7fffffff,0x7ff4f4f4,0x7ff4f4f4,0x7feaeaea,0x7fcbcbcb,0x7f000000,0x47000000,0x18000000,0xffffff,
-    0xffffff,0x34575757,0x7e161616,0x7ffbfbfb,0x7ffbfbfb,0x7ff2f2f2,0x7fd6d6d6,0x7fc3c3c3,0x7fbfbfbf,0x7fbfbfbf,0x7f000000,0x47000000,0x18000000,0xffffff,
-    0xffffff,0x6000000,0x41474747,0x7e161616,0x7ff2f2f2,0x7fe9e9e9,0x7fc3c3c3,0x7f000000,0x7f000000,0x7f000000,0x7f000000,0x47000000,0x18000000,0xffffff,
-    0xffffff,0x1000000,0xa000000,0x44444444,0x7f161616,0x7fe4e4e4,0x7fc2c2c2,0x7f000000,0x59000000,0x4d000000,0x47000000,0x35000000,0x12000000,0xffffff,
-    0xffffff,0xffffff,0x1000000,0xa000000,0x44444444,0x7f161616,0x7fcbcbcb,0x7f000000,0x4d000000,0x2a000000,0x18000000,0x12000000,0x6000000,0xffffff,
-    0xffffff,0xffffff,0xffffff,0x1000000,0xa000000,0x44444444,0x7f000000,0x7f000000,0x47000000,0x18000000,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x3d707070,0x7f000000,0x7f000000,0x12000000,0x6000000,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0x3d707070,0x7e222222,0x7fffffff,0x7f000000,0x35000000,0x12000000,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0x3d707070,0x7e222222,0x7fffffff,0x7ffcfcfc,0x7f000000,0x47000000,0x18000000,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0x3d707070,0x7e222222,0x7fffffff,0x7fffffff,0x7ff8f8f8,0x7f000000,0x7f000000,0x7f000000,0x7f000000,0x12000000,0x6000000,0xffffff,
+    0xffffff,0x3d707070,0x7e222222,0x7fffffff,0x7fffffff,0x7fffffff,0x7ffefefe,0x7fffffff,0x7fffffff,0x7ff5f5f5,0x7f000000,0x35000000,0x12000000,0xffffff,
+    0xffffff,0x704c4c4c,0x7fffffff,0x7fffffff,0x7fffffff,0x7fffffff,0x7ff6f6f6,0x7ff6f6f6,0x7feeeeee,0x7fd3d3d3,0x7f000000,0x47000000,0x18000000,0xffffff,
+    0xffffff,0x34696969,0x7e222222,0x7ffcfcfc,0x7ffcfcfc,0x7ff4f4f4,0x7fdddddd,0x7fcccccc,0x7fc9c9c9,0x7fc9c9c9,0x7f000000,0x47000000,0x18000000,0xffffff,
+    0xffffff,0x6000000,0x41595959,0x7e222222,0x7ff4f4f4,0x7fededed,0x7fcccccc,0x7f000000,0x7f000000,0x7f000000,0x7f000000,0x47000000,0x18000000,0xffffff,
+    0xffffff,0x1000000,0xa000000,0x44565656,0x7f222222,0x7fe8e8e8,0x7fcbcbcb,0x7f000000,0x59000000,0x4d000000,0x47000000,0x35000000,0x12000000,0xffffff,
+    0xffffff,0xffffff,0x1000000,0xa000000,0x44565656,0x7f222222,0x7fd3d3d3,0x7f000000,0x4d000000,0x2a000000,0x18000000,0x12000000,0x6000000,0xffffff,
+    0xffffff,0xffffff,0xffffff,0x1000000,0xa000000,0x44565656,0x7f000000,0x7f000000,0x47000000,0x18000000,0xffffff,0xffffff,0xffffff,0xffffff,
     0xffffff,0xffffff,0xffffff,0xffffff,0x1000000,0xa000000,0x22000000,0x3d000000,0x35000000,0x12000000,0xffffff,0xffffff,0xffffff,0xffffff,
@@ -3385,15 +3462,15 @@ static const QRgb beam_data[] = {
 static const QRgb bell_data[] = {
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x95020202,0x1c000000,0x32000000,0x2d000000,0x10000000,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xff000000,0x56000000,0xb6858585,0xc57b7b7b,0x62000000,0x14000000,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xffc0c0c0,0xff000000,0x8e000000,0x93000000,0xffdcdcdc,0xe68c8c8c,0x69000000,0x14000000,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xffc0c0c0,0xffffffff,0xff000000,0xc6464646,0xba4a4a4a,0xb7000000,0xffdcdcdc,0xe38d8d8d,0x47000000,
-    0xff000000,0xff000000,0xff000000,0xff000000,0xffc0c0c0,0xffffffff,0xffffffff,0xff000000,0xb6000000,0xffdcdcdc,0xc4474747,0xc1000000,0xffdcdcdc,0x71000000,
-    0xff000000,0xffaeaeae,0xffaeaeae,0xffaeaeae,0xffe6e6e6,0xffe6e6e6,0xffe6e6e6,0xff000000,0x9e000000,0xae000000,0xffdcdcdc,0xc4000000,0xffdcdcdc,0x7d000000,
-    0xff000000,0xffc6c6c6,0xffc6c6c6,0xffc6c6c6,0xffc6c6c6,0xffc6c6c6,0xffc6c6c6,0xff000000,0x8f000000,0x95000000,0xffdcdcdc,0xd1000000,0xffdcdcdc,0x7d000000,
-    0xff000000,0xff7d7d7d,0xff7d7d7d,0xff7d7d7d,0xffa7a7a7,0xffa6a6a6,0xffa6a6a6,0xff000000,0x9e000000,0xae000000,0xffdcdcdc,0xc4000000,0xffdcdcdc,0x7d000000,
-    0xff000000,0xff000000,0xff000000,0xff000000,0xff6b6b6b,0xff8e8e8e,0xff8e8e8e,0xff000000,0xb6000000,0xffdcdcdc,0xc4474747,0xc1000000,0xffdcdcdc,0x71000000,
-    0x24000000,0x6b000000,0x8f000000,0x8f000000,0xff000000,0xff6b6b6b,0xff8e8e8e,0xff000000,0xc6464646,0xba4a4a4a,0xb7000000,0xffdcdcdc,0xe38d8d8d,0x47000000,
-    0xc000000,0x24000000,0x30000000,0x30000000,0x48000000,0xff000000,0xff6b6b6b,0xff000000,0xa1000000,0x96000000,0xffdcdcdc,0xe68c8c8c,0x69000000,0x14000000,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xc000000,0x3c000000,0xff000000,0xff000000,0x9c000000,0xbd808080,0xc57b7b7b,0x62000000,0x14000000,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xc000000,0x3c000000,0xc8010101,0x82000000,0x51000000,0x2d000000,0x10000000,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x95050505,0x1c000000,0x32000000,0x2d000000,0x10000000,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xff000000,0x56000000,0xb6959595,0xc58c8c8c,0x62000000,0x14000000,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xffcacaca,0xff000000,0x8e000000,0x93000000,0xffe2e2e2,0xe69b9b9b,0x69000000,0x14000000,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xffcacaca,0xffffffff,0xff000000,0xc6585858,0xba5c5c5c,0xb7000000,0xffe2e2e2,0xe39c9c9c,0x47000000,
+    0xff000000,0xff000000,0xff000000,0xff000000,0xffcacaca,0xffffffff,0xffffffff,0xff000000,0xb6000000,0xffe2e2e2,0xc4595959,0xc1000000,0xffe2e2e2,0x71000000,
+    0xff000000,0xffbababa,0xffbababa,0xffbababa,0xffeaeaea,0xffeaeaea,0xffeaeaea,0xff000000,0x9e000000,0xae000000,0xffe2e2e2,0xc4000000,0xffe2e2e2,0x7d000000,
+    0xff000000,0xffcfcfcf,0xffcfcfcf,0xffcfcfcf,0xffcfcfcf,0xffcfcfcf,0xffcfcfcf,0xff000000,0x8f000000,0x95000000,0xffe2e2e2,0xd1000000,0xffe2e2e2,0x7d000000,
+    0xff000000,0xff8d8d8d,0xff8d8d8d,0xff8d8d8d,0xffb4b4b4,0xffb3b3b3,0xffb3b3b3,0xff000000,0x9e000000,0xae000000,0xffe2e2e2,0xc4000000,0xffe2e2e2,0x7d000000,
+    0xff000000,0xff000000,0xff000000,0xff000000,0xff7c7c7c,0xff9d9d9d,0xff9d9d9d,0xff000000,0xb6000000,0xffe2e2e2,0xc4595959,0xc1000000,0xffe2e2e2,0x71000000,
+    0x24000000,0x6b000000,0x8f000000,0x8f000000,0xff000000,0xff7c7c7c,0xff9d9d9d,0xff000000,0xc6585858,0xba5c5c5c,0xb7000000,0xffe2e2e2,0xe39c9c9c,0x47000000,
+    0xc000000,0x24000000,0x30000000,0x30000000,0x48000000,0xff000000,0xff7c7c7c,0xff000000,0xa1000000,0x96000000,0xffe2e2e2,0xe69b9b9b,0x69000000,0x14000000,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xc000000,0x3c000000,0xff000000,0xff000000,0x9c000000,0xbd909090,0xc58c8c8c,0x62000000,0x14000000,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xc000000,0x3c000000,0xc8030303,0x82000000,0x51000000,0x2d000000,0x10000000,0xffffff,0xffffff,
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xc000000,0x31000000,0x3f000000,0x19000000,0xffffff,0xffffff,0xffffff,0xffffff
@@ -3490,9 +3567,9 @@ static const QRgb binary_data[] = {
     0x7000000,0xe000000,0x23000000,0x42000000,0x55000000,0x5b000000,0x5d000000,0x5a000000,0x49000000,0x34000000,0x24000000,0x1a000000,0x11000000,0xffffff,
-    0xc000000,0x18000000,0x48000000,0xffffffff,0xfffdfdfd,0xffe6e6e6,0xffa3a3a3,0xffffffff,0xf3bebebe,0x6b000000,0x44000000,0x2d000000,0x1d000000,0xc000000,
-    0x11000000,0x24000000,0x62000000,0xffffffff,0xfffbfbfb,0xffdcdcdc,0xff868686,0xffffffff,0xffffffff,0xf7b6b6b6,0x75000000,0x46000000,0x2a000000,0x11000000,
-    0x16000000,0x2e000000,0x71000000,0xffffffff,0xfffbfbfb,0xffdcdcdc,0xff838383,0xffffffff,0xffffffff,0xffffffff,0xf5bcbcbc,0x65000000,0x36000000,0x16000000,
-    0x1a000000,0x35000000,0x7b000000,0xffffffff,0xfffdfdfd,0xffe4e4e4,0xff9d9d9d,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0x7c000000,0x3e000000,0x1a000000,
-    0x1c000000,0x39000000,0x80000000,0xffffffff,0xfffdfdfd,0xfff3f3f3,0xffcfcfcf,0xff9d9d9d,0xff838383,0xff868686,0xffa3a3a3,0x85000000,0x43000000,0x1c000000,
-    0x1d000000,0x3b000000,0x83000000,0xffffffff,0xffffffff,0xfffbfbfb,0xfff3f3f3,0xffe4e4e4,0xffdcdcdc,0xffdcdcdc,0xffe6e6e6,0x88000000,0x46000000,0x1d000000,
-    0x1d000000,0x3c000000,0x84000000,0xffffffff,0xffffffff,0xffffffff,0xfffdfdfd,0xfffdfdfd,0xfffbfbfb,0xfffbfbfb,0xfffdfdfd,0x88000000,0x47000000,0x1d000000,
+    0xc000000,0x18000000,0x48000000,0xffffffff,0xfffdfdfd,0xffeaeaea,0xffb0b0b0,0xffffffff,0xf3c8c8c8,0x6b000000,0x44000000,0x2d000000,0x1d000000,0xc000000,
+    0x11000000,0x24000000,0x62000000,0xffffffff,0xfffcfcfc,0xffe2e2e2,0xff969696,0xffffffff,0xffffffff,0xf7c1c1c1,0x75000000,0x46000000,0x2a000000,0x11000000,
+    0x16000000,0x2e000000,0x71000000,0xffffffff,0xfffcfcfc,0xffe2e2e2,0xff939393,0xffffffff,0xffffffff,0xffffffff,0xf5c6c6c6,0x65000000,0x36000000,0x16000000,
+    0x1a000000,0x35000000,0x7b000000,0xffffffff,0xfffdfdfd,0xffe8e8e8,0xffababab,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0x7c000000,0x3e000000,0x1a000000,
+    0x1c000000,0x39000000,0x80000000,0xffffffff,0xfffdfdfd,0xfff5f5f5,0xffd7d7d7,0xffababab,0xff939393,0xff969696,0xffb0b0b0,0x85000000,0x43000000,0x1c000000,
+    0x1d000000,0x3b000000,0x83000000,0xffffffff,0xffffffff,0xfffcfcfc,0xfff5f5f5,0xffe8e8e8,0xffe2e2e2,0xffe2e2e2,0xffeaeaea,0x88000000,0x46000000,0x1d000000,
+    0x1d000000,0x3c000000,0x84000000,0xffffffff,0xffffffff,0xffffffff,0xfffdfdfd,0xfffdfdfd,0xfffcfcfc,0xfffcfcfc,0xfffdfdfd,0x88000000,0x47000000,0x1d000000,
     0x1d000000,0x3b000000,0x83000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0x88000000,0x46000000,0x1d000000,
@@ -3556,15 +3633,15 @@ static const QRgb c_src_ctable[] = {
 static const QRgb calculator_data[] = {
-    0x2000000,0xfff8f8f8,0xfff1f1f1,0xffe1e1e1,0xffd4d4d4,0xffdfdfdf,0xffeaeaea,0xffeaeaea,0xffeaeaea,0xffeaeaea,0xffeaeaea,0xffeaeaea,0x13000000,0xe000000,
-    0x7000000,0xff649c64,0xff549254,0xff3c763c,0xffffffff,0xff3c763c,0xff468946,0xff468946,0xff468946,0xff468946,0xff468946,0xff2e792e,0xff005800,0x2b000000,
-    0xe000000,0xff508b50,0xff2c6b2c,0xff134a13,0xffffffff,0xff134a13,0xff185e18,0xff1b691b,0xff1c6e1c,0xff1c6e1c,0xff1c6e1c,0xff005b00,0xff004300,0x55000000,
-    0x13000000,0xff3f7c3f,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff005300,0xff005c00,0xff005c00,0xff005c00,0xff005100,0xff003a00,0x71000000,
-    0x15000000,0xff438343,0xff185e18,0xff003e00,0xffffffff,0xff003900,0xff004200,0xff004600,0xff004b00,0xff004b00,0xff004f00,0xff004d00,0xff003a00,0x7f000000,
-    0x15000000,0xff468946,0xff1c6e1c,0xff004f00,0xffffffff,0xff004600,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff004900,0xff003a00,0x7f000000,
-    0x15000000,0xff438343,0xff196419,0xff005300,0xff005300,0xff004f00,0xff004600,0xff004600,0xff004600,0xff004200,0xff004b00,0xff004d00,0xff003a00,0x7f000000,
-    0x15000000,0xff3f7c3f,0xffffffff,0xff7fa57f,0xff005300,0xff7fa57f,0xffffffff,0xff005300,0xff7fa97f,0xffffffff,0xff7fa97f,0xff005100,0xff003a00,0x7f000000,
-    0x15000000,0xff438343,0xff8bac8b,0xffffffff,0xff7fa07f,0xffffffff,0xff7fa27f,0xff004b00,0xff004600,0xff004200,0xff004600,0xff004600,0xff003700,0x7f000000,
-    0x15000000,0xff468946,0xff196419,0xff7fa07f,0xffffffff,0xff7fa07f,0xff004b00,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff003500,0x7f000000,
-    0x15000000,0xff438343,0xff8bac8b,0xffffffff,0xff7fa07f,0xffffffff,0xff7fa27f,0xff004b00,0xff004600,0xff004200,0xff004600,0xff004600,0xff003700,0x7f000000,
-    0x15000000,0xff2a6e2a,0xffffffff,0xff7fa07f,0xff004900,0xff7fa07f,0xffffffff,0xff004900,0xff7fa47f,0xffffffff,0xff7fa47f,0xff004800,0xff003600,0x7f000000,
-    0x13000000,0xff005400,0xff003d00,0xff003700,0xff003a00,0xff003700,0xff003500,0xff003700,0xff003700,0xff003500,0xff003700,0xff003600,0xff003000,0x71000000,
+    0x2000000,0xfff9f9f9,0xfff3f3f3,0xffe6e6e6,0xffdbdbdb,0xffe4e4e4,0xffeeeeee,0xffeeeeee,0xffeeeeee,0xffeeeeee,0xffeeeeee,0xffeeeeee,0x13000000,0xe000000,
+    0x7000000,0xff76aa76,0xff66a166,0xff4d874d,0xffffffff,0xff4d874d,0xff589958,0xff589958,0xff589958,0xff589958,0xff589958,0xff3e8a3e,0xff006a00,0x2b000000,
+    0xe000000,0xff629a62,0xff3c7c3c,0xff1e5c1e,0xffffffff,0xff1e5c1e,0xff247024,0xff287a28,0xff297f29,0xff297f29,0xff297f29,0xff006d00,0xff005400,0x55000000,
+    0x13000000,0xff508d50,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff006500,0xff006e00,0xff006e00,0xff006e00,0xff006300,0xff004b00,0x71000000,
+    0x15000000,0xff549354,0xff247024,0xff004f00,0xffffffff,0xff004a00,0xff005300,0xff005800,0xff005d00,0xff005d00,0xff006100,0xff005f00,0xff004b00,0x7f000000,
+    0x15000000,0xff589958,0xff297f29,0xff006100,0xffffffff,0xff005800,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff005b00,0xff004b00,0x7f000000,
+    0x15000000,0xff549354,0xff257625,0xff006500,0xff006500,0xff006100,0xff005800,0xff005800,0xff005800,0xff005300,0xff005d00,0xff005f00,0xff004b00,0x7f000000,
+    0x15000000,0xff508d50,0xffffffff,0xff8fb28f,0xff006500,0xff8fb28f,0xffffffff,0xff006500,0xff8fb68f,0xffffffff,0xff8fb68f,0xff006300,0xff004b00,0x7f000000,
+    0x15000000,0xff549354,0xff9ab89a,0xffffffff,0xff8fad8f,0xffffffff,0xff8faf8f,0xff005d00,0xff005800,0xff005300,0xff005800,0xff005800,0xff004800,0x7f000000,
+    0x15000000,0xff589958,0xff257625,0xff8fad8f,0xffffffff,0xff8fad8f,0xff005d00,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff004600,0x7f000000,
+    0x15000000,0xff549354,0xff9ab89a,0xffffffff,0xff8fad8f,0xffffffff,0xff8faf8f,0xff005d00,0xff005800,0xff005300,0xff005800,0xff005800,0xff004800,0x7f000000,
+    0x15000000,0xff397f39,0xffffffff,0xff8fad8f,0xff005b00,0xff8fad8f,0xffffffff,0xff005b00,0xff8fb18f,0xffffffff,0xff8fb18f,0xff005a00,0xff004700,0x7f000000,
+    0x13000000,0xff006600,0xff004e00,0xff004800,0xff004b00,0xff004800,0xff004600,0xff004800,0xff004800,0xff004600,0xff004800,0xff004700,0xff004000,0x71000000,
     0xe000000,0x2b000000,0x55000000,0x71000000,0x7f000000,0x7f000000,0x7f000000,0x7f000000,0x7f000000,0x7f000000,0x7f000000,0x7f000000,0x71000000,0x55000000
@@ -3621,15 +3698,15 @@ static const QRgb citytime_icon_ctable[] = {
 static const QRgb close_data[] = {
-    0xffffff,0xffffff,0xffffff,0x66a45b5b,0xba884d4d,0xeb6a3939,0xfd572c2c,0xeb682e2e,0xba833232,0x669b2f2f,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0x1bc26464,0x9dad6060,0xfd9b5858,0xff995353,0xff994d4d,0xff984545,0xff963b3b,0xff913030,0xfd912626,0x9da01d1d,0x1bb21414,0xffffff,0xffffff,
-    0xffffff,0x9dac5a5a,0xffa65a5a,0xffbc8888,0xffc06161,0xffc65353,0xffc64a4a,0xffc13e3e,0xffb83838,0xffb56262,0xff981111,0x9c9c0606,0xffffff,0xffffff,
-    0x66a14a4a,0xfd984c4c,0xffbb8484,0xffe5e5e5,0xffeccfcf,0xffd74c4c,0xffd43737,0xffd33a3a,0xffeac4c4,0xffe5e5e5,0xffb25252,0xfd8a0000,0x60940000,0xffffff,
-    0xba843939,0xff954040,0xffbf5353,0xffeccdcd,0xfffdfdfd,0xfff4cdcd,0xffd63232,0xfff4c9c9,0xfffdfdfd,0xffe9bdbd,0xffa80b0b,0xff830000,0xaf810000,0xffffff,
-    0xeb662525,0xff943333,0xffc03a3a,0xffd43b3b,0xfff5cdcd,0xffffffff,0xfffdf2f2,0xffffffff,0xfff3c6c6,0xffbe0d0d,0xffa30000,0xff7e0000,0xe36e0000,0xffffff,
-    0xfd541717,0xff922525,0xffbf2828,0xffcf1f1f,0xffd42828,0xfffcf2f2,0xffffffff,0xfffcf2f2,0xffc81a1a,0xffb30000,0xff9a0000,0xff760000,0xfc620000,0xffffff,
-    0xeb621212,0xff8e1414,0xffb81313,0xffcd1919,0xfff4c6c6,0xffffffff,0xfffcf2f2,0xffffffff,0xffefc5c5,0xffab0d0d,0xff8b0000,0xff6a0000,0xe35d0000,0xffffff,
-    0xba7b0909,0xff890404,0xffae0b0b,0xffe8bdbd,0xfffdfdfd,0xffefc5c5,0xffc11b1b,0xffedc5c5,0xfffdfdfd,0xffdebdbd,0xff7c0b0b,0xff5d0000,0xaf5e0000,0xffffff,
-    0x668f0000,0xfd830000,0xffa84e4e,0xffe5e5e5,0xffe4bdbd,0xffad0e0e,0xffa40000,0xff9f0e0e,0xffddbdbd,0xffe5e5e5,0xff8b4e4e,0xfd540000,0x60620000,0xffffff,
-    0xffffff,0x9d890000,0xff7e0000,0xff9f4f4f,0xff8c0c0c,0xff8a0000,0xff860000,0xff7b0000,0xff740c0c,0xff884f4f,0xff530000,0x9c590000,0xffffff,0xffffff,
-    0xffffff,0x1b950000,0x9c7d0000,0xfd6b0000,0xff680000,0xff640000,0xff610000,0xff590000,0xff510000,0xfd4d0000,0x9c560000,0x1b660000,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0x60740000,0xaf630000,0xe2550000,0xfc4d0000,0xe24c0000,0xaf500000,0x60570000,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0x66b16d6d,0xba985f5f,0xeb7b4a4a,0xfd693c3c,0xeb7a3e3e,0xba934242,0x66a93f3f,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0x1bcb7676,0x9db97272,0xfda96a6a,0xffa76565,0xffa75f5f,0xffa65757,0xffa44c4c,0xffa04040,0xfda03535,0x9dad2a2a,0x1bbd1f1f,0xffffff,0xffffff,
+    0xffffff,0x9db86c6c,0xffb36c6c,0xffc69898,0xffca7373,0xffcf6565,0xffcf5c5c,0xffcb4f4f,0xffc34949,0xffc07474,0xffa61b1b,0x9caa0c0c,0xffffff,0xffffff,
+    0x66ae5c5c,0xfda65e5e,0xffc59494,0xffe9e9e9,0xffefd7d7,0xffdd5e5e,0xffdb4848,0xffda4b4b,0xffeecdcd,0xffe9e9e9,0xffbd6464,0xfd9a0000,0x60a30000,0xffffff,
+    0xba944a4a,0xffa45151,0xffc96565,0xffefd5d5,0xfffdfdfd,0xfff6d5d5,0xffdd4242,0xfff6d1d1,0xfffdfdfd,0xffedc7c7,0xffb51313,0xff930000,0xaf910000,0xffffff,
+    0xeb783434,0xffa34343,0xffca4b4b,0xffdb4c4c,0xfff7d5d5,0xffffffff,0xfffdf4f4,0xffffffff,0xfff5cfcf,0xffc81616,0xffb00000,0xff8e0000,0xe37f0000,0xffffff,
+    0xfd662323,0xffa13434,0xffc93737,0xffd72d2d,0xffdb3737,0xfffdf4f4,0xffffffff,0xfffdf4f4,0xffd12727,0xffbe0000,0xffa80000,0xff870000,0xfc740000,0xffffff,
+    0xeb741d1d,0xff9d1f1f,0xffc31e1e,0xffd52525,0xfff6cfcf,0xffffffff,0xfffdf4f4,0xffffffff,0xfff2cece,0xffb71616,0xff9a0000,0xff7b0000,0xe36f0000,0xffffff,
+    0xba8c1010,0xff990808,0xffba1313,0xffecc7c7,0xfffdfdfd,0xfff2cece,0xffcb2828,0xfff0cece,0xfffdfdfd,0xffe3c7c7,0xff8d1313,0xff6f0000,0xaf700000,0xffffff,
+    0x669e0000,0xfd930000,0xffb56060,0xffe9e9e9,0xffe8c7c7,0xffb91717,0xffb10000,0xffad1717,0xffe3c7c7,0xffe9e9e9,0xff9a6060,0xfd660000,0x60740000,0xffffff,
+    0xffffff,0x9d990000,0xff8e0000,0xffad6161,0xff9b1414,0xff9a0000,0xff960000,0xff8c0000,0xff851414,0xff986161,0xff650000,0x9c6b0000,0xffffff,0xffffff,
+    0xffffff,0x1ba40000,0x9c8d0000,0xfd7c0000,0xff7a0000,0xff760000,0xff730000,0xff6b0000,0xff630000,0xfd5f0000,0x9c680000,0x1b780000,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0x60850000,0xaf750000,0xe2670000,0xfc5f0000,0xe25e0000,0xaf620000,0x60690000,0xffffff,0xffffff,0xffffff,0xffffff,
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff
@@ -3638,16 +3715,16 @@ static const QRgb close_data[] = {
 static const QRgb copy_data[] = {
-    0xffffff,0x3200,0xa00,0x400,0x28000000,0xa6000000,0x9b000000,0xa6000000,0xb71e1e1e,0x6545454,0x10101,0x0,0x0,0x0,
-    0xffffff,0x3200,0xa00,0x400,0x28000000,0xa6363636,0x9ba7a7a7,0xa6828282,0xaeb2b2b2,0x7b656565,0xe000000,0x2000000,0x0,0x0,
-    0xffffff,0x3200,0xa00,0x200,0x26000000,0xa5565556,0x9affffff,0xa6b6b6b6,0xa9e6e6e6,0xb3eaeaea,0x8e4a4a4a,0x1c000000,0x2000000,0x0,
-    0xffffff,0x5003200,0xc2000a00,0xe2101410,0xe90f100f,0xf9192619,0xd59aaf9a,0xa0a3a2a3,0xa9d5d4d5,0xaaffffff,0xb1f1f1f1,0x914e4e4e,0x1e050505,0x2000000,
-    0xffffff,0x5003100,0xd2020f02,0xf5ebefeb,0xf9cfe6cf,0xffbcddbc,0xffbecabe,0xde3e583e,0xb0a9aea9,0xa9e9e8e9,0xaaececec,0xb3d8d8d8,0x86272727,0x5000000,
-    0xffffff,0x5003100,0xd0020f02,0xf3e9eee9,0xf7b9d8b9,0xff8ab78a,0xffffffff,0xffb6c6b6,0xe3385438,0xb26a746a,0xa8a0a0a0,0xaf9a9a9a,0x8a000000,0x10000000,
-    0xffffff,0x5003100,0xd0020f02,0xf3e7ece7,0xf7b5d4b5,0xff8ab18a,0xffffffff,0xffffffff,0xffbfcabf,0xe3688668,0xafbac3ba,0xa8bebebe,0x89000000,0x15000000,
-    0xffffff,0x4003200,0xd0021002,0xf3e2eae2,0xf7c1ddc1,0xfe78ac78,0xff9dbe9d,0xff9dc39d,0xffcce9cc,0xff364636,0xbb879987,0xa0bfbfbf,0x81000000,0x13000000,
-    0xffffff,0x4003300,0xd0020f02,0xf1d7e4d7,0xf4d6ead6,0xfea5cba5,0xfd91bc91,0xfd94c094,0xfdb9dfb9,0xfe1c201c,0xc1687b68,0x9db8b8b8,0x7e000000,0x10000000,
-    0xffffff,0x4003500,0xcf020f02,0xefcbdccb,0xefd2e8d2,0xfcc7e0c7,0xfbd2e7d2,0xfbd4e8d4,0xfbe9f9e9,0xfc2a2f2a,0xc56b7e6b,0xa5b7b7b7,0x80000000,0xc000000,
-    0xffffff,0x3003700,0xce021002,0xeec0d5c0,0xecc0dec0,0xf7b1d2b1,0xf7b4d5b4,0xf7b9d8b9,0xf7cceacc,0xf8222822,0xc2090c09,0xa4141414,0x7a000000,0x4000000,
-    0xffffff,0x3003600,0xce031003,0xeec2dcc2,0xe9c4e7c4,0xefbde1bd,0xf0bee1be,0xf0c3e4c3,0xefdefcde,0xf1252c25,0x740e240e,0x27313131,0x1c000000,0x2000000,
-    0xffffff,0xa003000,0xdb000800,0xfa7b8b7b,0xf97f947f,0xff7a907a,0xff7b907b,0xff809380,0xff91a291,0xff181a18,0x51001c00,0x1000000,0x2000000,0x0,
-    0xffffff,0xd002a00,0x82133013,0xaa1c361c,0xb80e220e,0xae0b200b,0xab0b200b,0xab0b200b,0xab0c210c,0xa7021602,0x2a002b00,0x0,0x0,0x0
+    0xffffff,0x4200,0x1200,0x800,0x28000000,0xa6000000,0x9b000000,0xa6000000,0xb72b2b2b,0x6666666,0x30303,0x0,0x0,0x0,
+    0xffffff,0x4200,0x1200,0x800,0x28000000,0xa6474747,0x9bb4b4b4,0xa6929292,0xaebdbdbd,0x7b777777,0xe000000,0x2000000,0x0,0x0,
+    0xffffff,0x4200,0x1200,0x500,0x26000000,0xa5686768,0x9affffff,0xa6c1c1c1,0xa9eaeaea,0xb3eeeeee,0x8e5c5c5c,0x1c000000,0x2000000,0x0,
+    0xffffff,0x5004200,0xc2001200,0xe21a1f1a,0xe9191a19,0xf9253525,0xd5a8bba8,0xa0b0afb0,0xa9dcdbdc,0xaaffffff,0xb1f3f3f3,0x91606060,0x1e0a0a0a,0x2000000,
+    0xffffff,0x5004100,0xd2051905,0xf5eef2ee,0xf9d7ead7,0xffc6e3c6,0xffc8d2c8,0xde4f6a4f,0xb0b6bab6,0xa9edeced,0xaaefefef,0xb3dedede,0x86363636,0x5000000,
+    0xffffff,0x5004100,0xd0051905,0xf3edf1ed,0xf7c4dec4,0xff9ac29a,0xffffffff,0xffc1cfc1,0xe3496649,0xb27b857b,0xa8adadad,0xafa8a8a8,0x8a000000,0x10000000,
+    0xffffff,0x5004100,0xd0051905,0xf3ebefeb,0xf7c0dbc0,0xff9abd9a,0xffffffff,0xffffffff,0xffc9d2c9,0xe37a967a,0xafc4ccc4,0xa8c8c8c8,0x89000000,0x15000000,
+    0xffffff,0x4004200,0xd0051a05,0xf3e7eee7,0xf7cbe3cb,0xfe89b889,0xffabc8ab,0xffabccab,0xffd4edd4,0xff475847,0xbb97a797,0xa0c9c9c9,0x81000000,0x13000000,
+    0xffffff,0x4004300,0xd0051905,0xf1dde8dd,0xf4ddeedd,0xfeb2d3b2,0xfda0c6a0,0xfda3caa3,0xfdc4e4c4,0xfe292e29,0xc17a8c7a,0x9dc3c3c3,0x7e000000,0x10000000,
+    0xffffff,0x4004600,0xcf051905,0xefd3e2d3,0xefd9ecd9,0xfcd0e5d0,0xfbd9ebd9,0xfbdbecdb,0xfbedfaed,0xfc393f39,0xc57c8e7c,0xa5c2c2c2,0x80000000,0xc000000,
+    0xffffff,0x3004800,0xce051a05,0xeecadcca,0xeccae3ca,0xf7bdd9bd,0xf7bfdcbf,0xf7c4dec4,0xf7d4eed4,0xf8303730,0xc2101410,0xa41f1f1f,0x7a000000,0x4000000,
+    0xffffff,0x3004700,0xce061a06,0xeecbe2cb,0xe9cdebcd,0xefc7e6c7,0xf0c8e6c8,0xf0cce8cc,0xefe3fde3,0xf1343c34,0x74173317,0x27414141,0x1c000000,0x2000000,
+    0xffffff,0xa004000,0xdb000f00,0xfa8c9a8c,0xf98fa38f,0xff8b9f8b,0xff8c9f8c,0xff90a290,0xffa0afa0,0xff242724,0x51002900,0x1000000,0x2000000,0x0,
+    0xffffff,0xd003900,0x821e401e,0xaa294729,0xb8173017,0xae132e13,0xab132e13,0xab132e13,0xab142f14,0xa7052205,0x2a003b00,0x0,0x0,0x0
 };
@@ -3655,16 +3732,16 @@ static const QRgb copy_data[] = {
 static const QRgb copy_inactive_data[] = {
-    0xffffff,0x3200,0xa00,0x400,0x14000000,0x53000000,0x4d000000,0x53000000,0x5b1e1e1e,0x3545454,0x10101,0x0,0x0,0x0,
-    0xffffff,0x3200,0xa00,0x400,0x14000000,0x53363636,0x4da7a7a7,0x53828282,0x57b2b2b2,0x3d656565,0x7000000,0x1000000,0x0,0x0,
-    0xffffff,0x3200,0xa00,0x200,0x13000000,0x52555555,0x4dffffff,0x53b6b6b6,0x54e6e6e6,0x59eaeaea,0x474a4a4a,0xe000000,0x1000000,0x0,
-    0xffffff,0x2191919,0x61050505,0x71121212,0x740f0f0f,0x7c1f1f1f,0x6aa4a4a4,0x50a2a2a2,0x54d4d4d4,0x55ffffff,0x58f1f1f1,0x484e4e4e,0xf050505,0x1000000,
-    0xffffff,0x2181818,0x69080808,0x7aededed,0x7cdadada,0x7fcccccc,0x7fc4c4c4,0x6f4b4b4b,0x58ababab,0x54e8e8e8,0x55ececec,0x59d8d8d8,0x43272727,0x2000000,
-    0xffffff,0x2181818,0x68080808,0x79ebebeb,0x7bc8c8c8,0x7fa0a0a0,0x7fffffff,0x7fbebebe,0x71464646,0x596f6f6f,0x54a0a0a0,0x579a9a9a,0x45000000,0x8000000,
-    0xffffff,0x2181818,0x68080808,0x79e9e9e9,0x7bc4c4c4,0x7f9d9d9d,0x7fffffff,0x7fffffff,0x7fc4c4c4,0x71777777,0x57bebebe,0x54bebebe,0x44000000,0xa000000,
-    0xffffff,0x2191919,0x68090909,0x79e6e6e6,0x7bcfcfcf,0x7f929292,0x7fadadad,0x7fb0b0b0,0x7fdadada,0x7f3e3e3e,0x5d909090,0x50bfbfbf,0x40000000,0x9000000,
-    0xffffff,0x2191919,0x68080808,0x78dddddd,0x7ae0e0e0,0x7fb8b8b8,0x7ea6a6a6,0x7eaaaaaa,0x7ecccccc,0x7f1e1e1e,0x60717171,0x4eb8b8b8,0x3f000000,0x8000000,
-    0xffffff,0x21a1a1a,0x67080808,0x77d3d3d3,0x77dddddd,0x7ed3d3d3,0x7ddcdcdc,0x7ddedede,0x7df1f1f1,0x7e2c2c2c,0x62747474,0x52b7b7b7,0x40000000,0x6000000,
-    0xffffff,0x11b1b1b,0x67090909,0x77cacaca,0x76cfcfcf,0x7bc1c1c1,0x7bc4c4c4,0x7bc8c8c8,0x7bdbdbdb,0x7c252525,0x610a0a0a,0x52141414,0x3d000000,0x2000000,
-    0xffffff,0x11b1b1b,0x67090909,0x77cfcfcf,0x74d5d5d5,0x77cfcfcf,0x78cfcfcf,0x78d3d3d3,0x77ededed,0x78282828,0x3a191919,0x13313131,0xe000000,0x1000000,
-    0xffffff,0x5181818,0x6d040404,0x7d838383,0x7c898989,0x7f858585,0x7f858585,0x7f898989,0x7f999999,0x7f191919,0x280e0e0e,0x0,0x1000000,0x0,
-    0xffffff,0x6151515,0x41212121,0x55292929,0x5c181818,0x57151515,0x55151515,0x55151515,0x55161616,0x530c0c0c,0x15151515,0x0,0x0,0x0
+    0xffffff,0x4200,0x1200,0x800,0x14000000,0x53000000,0x4d000000,0x53000000,0x5b2b2b2b,0x3666666,0x30303,0x0,0x0,0x0,
+    0xffffff,0x4200,0x1200,0x800,0x14000000,0x53474747,0x4db4b4b4,0x53929292,0x57bdbdbd,0x3d777777,0x7000000,0x1000000,0x0,0x0,
+    0xffffff,0x4200,0x1200,0x500,0x13000000,0x52676767,0x4dffffff,0x53c1c1c1,0x54eaeaea,0x59eeeeee,0x475c5c5c,0xe000000,0x1000000,0x0,
+    0xffffff,0x2252525,0x610a0a0a,0x711d1d1d,0x74191919,0x7c2d2d2d,0x6ab1b1b1,0x50afafaf,0x54dbdbdb,0x55ffffff,0x58f3f3f3,0x48606060,0xf0a0a0a,0x1000000,
+    0xffffff,0x2242424,0x690f0f0f,0x7af0f0f0,0x7ce0e0e0,0x7fd4d4d4,0x7fcdcdcd,0x6f5d5d5d,0x58b7b7b7,0x54ececec,0x55efefef,0x59dedede,0x43363636,0x2000000,
+    0xffffff,0x2242424,0x680f0f0f,0x79eeeeee,0x7bd1d1d1,0x7fadadad,0x7fffffff,0x7fc8c8c8,0x71585858,0x59808080,0x54adadad,0x57a8a8a8,0x45000000,0x8000000,
+    0xffffff,0x2242424,0x680f0f0f,0x79ededed,0x7bcdcdcd,0x7fababab,0x7fffffff,0x7fffffff,0x7fcdcdcd,0x71888888,0x57c8c8c8,0x54c8c8c8,0x44000000,0xa000000,
+    0xffffff,0x2252525,0x68101010,0x79eaeaea,0x7bd7d7d7,0x7fa1a1a1,0x7fb9b9b9,0x7fbcbcbc,0x7fe0e0e0,0x7f4f4f4f,0x5d9f9f9f,0x50c9c9c9,0x40000000,0x9000000,
+    0xffffff,0x2252525,0x680f0f0f,0x78e3e3e3,0x7ae5e5e5,0x7fc3c3c3,0x7eb3b3b3,0x7eb6b6b6,0x7ed4d4d4,0x7f2b2b2b,0x60828282,0x4ec3c3c3,0x3f000000,0x8000000,
+    0xffffff,0x2272727,0x670f0f0f,0x77dadada,0x77e3e3e3,0x7edadada,0x7de2e2e2,0x7de3e3e3,0x7df3f3f3,0x7e3c3c3c,0x62858585,0x52c2c2c2,0x40000000,0x6000000,
+    0xffffff,0x1282828,0x67101010,0x77d2d2d2,0x76d7d7d7,0x7bcbcbcb,0x7bcdcdcd,0x7bd1d1d1,0x7be1e1e1,0x7c343434,0x61121212,0x521f1f1f,0x3d000000,0x2000000,
+    0xffffff,0x1282828,0x67101010,0x77d7d7d7,0x74dcdcdc,0x77d7d7d7,0x78d7d7d7,0x78dadada,0x77f0f0f0,0x78373737,0x3a252525,0x13414141,0xe000000,0x1000000,
+    0xffffff,0x5242424,0x6d080808,0x7d939393,0x7c999999,0x7f959595,0x7f959595,0x7f999999,0x7fa7a7a7,0x7f252525,0x28171717,0x0,0x1000000,0x0,
+    0xffffff,0x6202020,0x412f2f2f,0x55383838,0x5c242424,0x57202020,0x55202020,0x55202020,0x55222222,0x53141414,0x15202020,0x0,0x0,0x0
 };
@@ -3672,16 +3749,16 @@ static const QRgb copy_inactive_data[] = {
 static const QRgb cut_data[] = {
-    0xc000000,0x9000000,0xa7494949,0xe7434343,0x5d262626,0x4000000,0x12000000,0xb000000,0xb000000,0xd000000,0x3f424242,0x9e666666,0x422f2f2f,0xe000000,
-    0x7000000,0x82101010,0xe5232323,0xfb171717,0xd0191919,0x88101010,0xd000000,0x14000000,0x16000000,0x53383838,0xbb555555,0xe22a2a2a,0xb3363636,0x38202020,
-    0x13000000,0xc3050505,0xff141414,0xcc393939,0xf94b4b4b,0xff181818,0x91111111,0x1e000000,0x6e3a3a3a,0xe0585858,0xff202020,0xff1b1b1b,0xff282828,0x971a1a1a,
-    0x11000000,0x9d3b3b3b,0xfd393939,0xf21e1e1e,0x981f1f1f,0xe55b5b5b,0xfe191919,0xba3b3b3b,0xda3b3b3b,0xfe252525,0x8d0c0c0c,0x6b0a0a0a,0xc52a2a2a,0xb40f0f0f,
-    0x12000000,0x27000000,0x9b4d4d4d,0xf83a3a3a,0xf8212121,0xe2333333,0xff303030,0xff1e1e1e,0xff0d0d0d,0xe41e1e1e,0xa6171717,0xaf242424,0xfd3e3e3e,0xaa1a1a1a,
-    0xc000000,0x15000000,0x2e000000,0x8f4e4e4e,0xd41b1b1b,0xed212121,0xff373737,0xff5b5b5b,0xff252525,0xff111111,0xf7565656,0xf5626262,0xea5e5e5e,0x7b2e2e2e,
-    0x7000000,0xd000000,0x1a000000,0x2b000000,0x5c010101,0xda121212,0xff5e5e5e,0xfff5f5f5,0xff999999,0xff1a1a1a,0xa7535353,0x96626262,0x734b4b4b,0x37040404,
-    0x4000000,0x8000000,0x14000000,0x32000000,0xca141414,0xff636363,0xff484848,0xfe818181,0xfeefefef,0xffa1a1a1,0xc5000000,0x52000000,0x3e000000,0x2a000000,
-    0x5000000,0xe000000,0x25000000,0xc6151515,0xff9a9a9a,0xfec8c8c8,0xff5f5f5f,0xff151515,0xfda2a2a2,0xfdf8f8f8,0xffa4a4a4,0xbe080808,0x3d000000,0x2b000000,
-    0xe000000,0x1e000000,0xc5151515,0xff9a9a9a,0xffededed,0xffa1a1a1,0xd6111111,0x7d000000,0xdd1e1e1e,0xffababab,0xfff4f4f4,0xffa1a1a1,0xb7090909,0x2d000000,
-    0x3000000,0xab0e0e0e,0xff8b8b8b,0xffe3e3e3,0xffadadad,0xf41e1e1e,0xb30e0e0e,0x43000000,0x4f000000,0xda1f1f1f,0xffaeaeae,0xfef5f5f5,0xff9c9c9c,0x98020202,
-    0x6000000,0xb70d0d0d,0xffa9a9a9,0xffb0b0b0,0xd1151515,0x53000000,0x44000000,0x38000000,0x31000000,0x3a000000,0xd7202020,0xffb9b9b9,0xffb6b6b6,0xa7010101,
-    0x0,0xc0121212,0xff787878,0xcc1f1f1f,0x4a010101,0x3a000000,0x2f000000,0x22000000,0x1c000000,0x1f000000,0x30000000,0xd32b2b2b,0xff7c7c7c,0xae0b0b0b,
-    0x5000000,0x650c0c0c,0x97090909,0x38090909,0x2a000000,0x24000000,0x1a000000,0xf000000,0xb000000,0xe000000,0x13000000,0x2d000000,0x990a0a0a,0x650a0a0a
+    0xc000000,0x9000000,0xa75b5b5b,0xe7545454,0x5d353535,0x4000000,0x12000000,0xb000000,0xb000000,0xd000000,0x3f535353,0x9e787878,0x423f3f3f,0xe000000,
+    0x7000000,0x821a1a1a,0xe5313131,0xfb232323,0xd0252525,0x881a1a1a,0xd000000,0x14000000,0x16000000,0x53494949,0xbb676767,0xe2393939,0xb3474747,0x382e2e2e,
+    0x13000000,0xc30a0a0a,0xff1f1f1f,0xcc4a4a4a,0xf95d5d5d,0xff242424,0x911b1b1b,0x1e000000,0x6e4b4b4b,0xe06a6a6a,0xff2e2e2e,0xff282828,0xff373737,0x97272727,
+    0x11000000,0x9d4c4c4c,0xfd4a4a4a,0xf22b2b2b,0x982d2d2d,0xe56d6d6d,0xfe252525,0xba4c4c4c,0xda4c4c4c,0xfe343434,0x8d141414,0x6b121212,0xc5393939,0xb4191919,
+    0x12000000,0x27000000,0x9b5f5f5f,0xf84b4b4b,0xf82f2f2f,0xe2434343,0xff404040,0xff2b2b2b,0xff161616,0xe42b2b2b,0xa6232323,0xaf333333,0xfd4f4f4f,0xaa272727,
+    0xc000000,0x15000000,0x2e000000,0x8f606060,0xd4282828,0xed2f2f2f,0xff484848,0xff6d6d6d,0xff343434,0xff1b1b1b,0xf7686868,0xf5747474,0xea707070,0x7b3e3e3e,
+    0x7000000,0xd000000,0x1a000000,0x2b000000,0x5c030303,0xda1d1d1d,0xff707070,0xfff7f7f7,0xffa7a7a7,0xff272727,0xa7656565,0x96747474,0x735d5d5d,0x37080808,
+    0x4000000,0x8000000,0x14000000,0x32000000,0xca1f1f1f,0xff757575,0xff5a5a5a,0xfe919191,0xfef2f2f2,0xffaeaeae,0xc5000000,0x52000000,0x3e000000,0x2a000000,
+    0x5000000,0xe000000,0x25000000,0xc6202020,0xffa8a8a8,0xfed1d1d1,0xff717171,0xff202020,0xfdafafaf,0xfdf9f9f9,0xffb1b1b1,0xbe0f0f0f,0x3d000000,0x2b000000,
+    0xe000000,0x1e000000,0xc5202020,0xffa8a8a8,0xfff0f0f0,0xffaeaeae,0xd61b1b1b,0x7d000000,0xdd2b2b2b,0xffb7b7b7,0xfff6f6f6,0xffaeaeae,0xb7101010,0x2d000000,
+    0x3000000,0xab171717,0xff9a9a9a,0xffe8e8e8,0xffb9b9b9,0xf42b2b2b,0xb3171717,0x43000000,0x4f000000,0xda2d2d2d,0xffbababa,0xfef7f7f7,0xffaaaaaa,0x98050505,
+    0x6000000,0xb7161616,0xffb6b6b6,0xffbcbcbc,0xd1202020,0x53000000,0x44000000,0x38000000,0x31000000,0x3a000000,0xd72e2e2e,0xffc4c4c4,0xffc1c1c1,0xa7030303,
+    0x0,0xc01d1d1d,0xff898989,0xcc2d2d2d,0x4a030303,0x3a000000,0x2f000000,0x22000000,0x1c000000,0x1f000000,0x30000000,0xd33b3b3b,0xff8d8d8d,0xae131313,
+    0x5000000,0x65141414,0x97101010,0x38101010,0x2a000000,0x24000000,0x1a000000,0xf000000,0xb000000,0xe000000,0x13000000,0x2d000000,0x99121212,0x65121212
 };
@@ -3689,16 +3766,16 @@ static const QRgb cut_data[] = {
 static const QRgb cut_inactive_data[] = {
-    0x6000000,0x4000000,0x53494949,0x73434343,0x2e262626,0x2000000,0x9000000,0x5000000,0x5000000,0x6000000,0x1f424242,0x4f666666,0x212f2f2f,0x7000000,
-    0x3000000,0x41101010,0x72232323,0x7d171717,0x68191919,0x44101010,0x6000000,0xa000000,0xb000000,0x29383838,0x5d555555,0x712a2a2a,0x59363636,0x1c202020,
-    0x9000000,0x61050505,0x7f141414,0x66393939,0x7c4b4b4b,0x7f181818,0x48111111,0xf000000,0x373a3a3a,0x70585858,0x7f202020,0x7f1b1b1b,0x7f282828,0x4b1a1a1a,
-    0x8000000,0x4e3b3b3b,0x7e393939,0x791e1e1e,0x4c1f1f1f,0x725b5b5b,0x7f191919,0x5d3b3b3b,0x6d3b3b3b,0x7f252525,0x460c0c0c,0x350a0a0a,0x622a2a2a,0x5a0f0f0f,
-    0x9000000,0x13000000,0x4d4d4d4d,0x7c3a3a3a,0x7c212121,0x71333333,0x7f303030,0x7f1e1e1e,0x7f0d0d0d,0x721e1e1e,0x53171717,0x57242424,0x7e3e3e3e,0x551a1a1a,
-    0x6000000,0xa000000,0x17000000,0x474e4e4e,0x6a1b1b1b,0x76212121,0x7f373737,0x7f5b5b5b,0x7f252525,0x7f111111,0x7b565656,0x7a626262,0x755e5e5e,0x3d2e2e2e,
-    0x3000000,0x6000000,0xd000000,0x15000000,0x2e010101,0x6d121212,0x7f5e5e5e,0x7ff5f5f5,0x7f999999,0x7f1a1a1a,0x53535353,0x4b626262,0x394b4b4b,0x1b040404,
-    0x2000000,0x4000000,0xa000000,0x19000000,0x65141414,0x7f636363,0x7f484848,0x7f818181,0x7fefefef,0x7fa1a1a1,0x62000000,0x29000000,0x1f000000,0x15000000,
-    0x2000000,0x7000000,0x12000000,0x63151515,0x7f9a9a9a,0x7fc8c8c8,0x7f5f5f5f,0x7f151515,0x7ea2a2a2,0x7ef8f8f8,0x7fa4a4a4,0x5f080808,0x1e000000,0x15000000,
-    0x7000000,0xf000000,0x62151515,0x7f9a9a9a,0x7fededed,0x7fa1a1a1,0x6b111111,0x3e000000,0x6e1e1e1e,0x7fababab,0x7ff4f4f4,0x7fa1a1a1,0x5b090909,0x16000000,
-    0x1000000,0x550e0e0e,0x7f8b8b8b,0x7fe3e3e3,0x7fadadad,0x7a1e1e1e,0x590e0e0e,0x21000000,0x27000000,0x6d1f1f1f,0x7faeaeae,0x7ff5f5f5,0x7f9c9c9c,0x4c020202,
-    0x3000000,0x5b0d0d0d,0x7fa9a9a9,0x7fb0b0b0,0x68151515,0x29000000,0x22000000,0x1c000000,0x18000000,0x1d000000,0x6b202020,0x7fb9b9b9,0x7fb6b6b6,0x53010101,
-    0x0,0x60121212,0x7f787878,0x661f1f1f,0x25010101,0x1d000000,0x17000000,0x11000000,0xe000000,0xf000000,0x18000000,0x692b2b2b,0x7f7c7c7c,0x570b0b0b,
-    0x2000000,0x320c0c0c,0x4b090909,0x1c090909,0x15000000,0x12000000,0xd000000,0x7000000,0x5000000,0x7000000,0x9000000,0x16000000,0x4c0a0a0a,0x320a0a0a
+    0x6000000,0x4000000,0x535b5b5b,0x73545454,0x2e353535,0x2000000,0x9000000,0x5000000,0x5000000,0x6000000,0x1f535353,0x4f787878,0x213f3f3f,0x7000000,
+    0x3000000,0x411a1a1a,0x72313131,0x7d232323,0x68252525,0x441a1a1a,0x6000000,0xa000000,0xb000000,0x29494949,0x5d676767,0x71393939,0x59474747,0x1c2e2e2e,
+    0x9000000,0x610a0a0a,0x7f1f1f1f,0x664a4a4a,0x7c5d5d5d,0x7f242424,0x481b1b1b,0xf000000,0x374b4b4b,0x706a6a6a,0x7f2e2e2e,0x7f282828,0x7f373737,0x4b272727,
+    0x8000000,0x4e4c4c4c,0x7e4a4a4a,0x792b2b2b,0x4c2d2d2d,0x726d6d6d,0x7f252525,0x5d4c4c4c,0x6d4c4c4c,0x7f343434,0x46141414,0x35121212,0x62393939,0x5a191919,
+    0x9000000,0x13000000,0x4d5f5f5f,0x7c4b4b4b,0x7c2f2f2f,0x71434343,0x7f404040,0x7f2b2b2b,0x7f161616,0x722b2b2b,0x53232323,0x57333333,0x7e4f4f4f,0x55272727,
+    0x6000000,0xa000000,0x17000000,0x47606060,0x6a282828,0x762f2f2f,0x7f484848,0x7f6d6d6d,0x7f343434,0x7f1b1b1b,0x7b686868,0x7a747474,0x75707070,0x3d3e3e3e,
+    0x3000000,0x6000000,0xd000000,0x15000000,0x2e030303,0x6d1d1d1d,0x7f707070,0x7ff7f7f7,0x7fa7a7a7,0x7f272727,0x53656565,0x4b747474,0x395d5d5d,0x1b080808,
+    0x2000000,0x4000000,0xa000000,0x19000000,0x651f1f1f,0x7f757575,0x7f5a5a5a,0x7f919191,0x7ff2f2f2,0x7faeaeae,0x62000000,0x29000000,0x1f000000,0x15000000,
+    0x2000000,0x7000000,0x12000000,0x63202020,0x7fa8a8a8,0x7fd1d1d1,0x7f717171,0x7f202020,0x7eafafaf,0x7ef9f9f9,0x7fb1b1b1,0x5f0f0f0f,0x1e000000,0x15000000,
+    0x7000000,0xf000000,0x62202020,0x7fa8a8a8,0x7ff0f0f0,0x7faeaeae,0x6b1b1b1b,0x3e000000,0x6e2b2b2b,0x7fb7b7b7,0x7ff6f6f6,0x7faeaeae,0x5b101010,0x16000000,
+    0x1000000,0x55171717,0x7f9a9a9a,0x7fe8e8e8,0x7fb9b9b9,0x7a2b2b2b,0x59171717,0x21000000,0x27000000,0x6d2d2d2d,0x7fbababa,0x7ff7f7f7,0x7faaaaaa,0x4c050505,
+    0x3000000,0x5b161616,0x7fb6b6b6,0x7fbcbcbc,0x68202020,0x29000000,0x22000000,0x1c000000,0x18000000,0x1d000000,0x6b2e2e2e,0x7fc4c4c4,0x7fc1c1c1,0x53030303,
+    0x0,0x601d1d1d,0x7f898989,0x662d2d2d,0x25030303,0x1d000000,0x17000000,0x11000000,0xe000000,0xf000000,0x18000000,0x693b3b3b,0x7f8d8d8d,0x57131313,
+    0x2000000,0x32141414,0x4b101010,0x1c101010,0x15000000,0x12000000,0xd000000,0x7000000,0x5000000,0x7000000,0x9000000,0x16000000,0x4c121212,0x32121212
 };
@@ -3724,13 +3801,13 @@ static const QRgb day_data[] = {
     0xe000000,0x18000000,0x23000000,0x2e000000,0x35000000,0x39000000,0x3b000000,0x3b000000,0x3b000000,0x39000000,0x35000000,0x2e000000,0x23000000,0x18000000,
-    0x18000000,0xff686eaf,0xff595fa6,0xff4b529f,0xff4b529f,0xff4b529f,0xff4b529f,0xff4b529f,0xff4b529f,0xff4b529f,0xff343b93,0xff070f75,0x3d000000,0x2a000000,
-    0x24000000,0xff595fa6,0xff394095,0xff222a89,0xff222a89,0xff222a89,0xff222a89,0xff222a89,0xff222a89,0xff222a89,0xff07107a,0xff050c5a,0x5a000000,0x3e000000,
-    0x2e000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffe0e0e0,0xffa1a1a1,0x74000000,0x50000000,
-    0x35000000,0xffffffff,0xffffffff,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xffe0e0e0,0xffa1a1a1,0x86000000,0x5c000000,
-    0x39000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff000000,0xffe0e0e0,0xffa1a1a1,0x90000000,0x63000000,
-    0x3b000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff000000,0xffe0e0e0,0xffa1a1a1,0x95000000,0x66000000,
-    0x3c000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff000000,0xffe0e0e0,0xffa1a1a1,0x96000000,0x67000000,
-    0x3b000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff000000,0xffe0e0e0,0xffa1a1a1,0x95000000,0x66000000,
-    0x39000000,0xffffffff,0xffffffff,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xffe0e0e0,0xffa1a1a1,0x90000000,0x63000000,
-    0x35000000,0xffffffff,0xfffcfcfc,0xffe0e0e0,0xffe0e0e0,0xffe0e0e0,0xffe0e0e0,0xffe0e0e0,0xffe0e0e0,0xffe0e0e0,0xffc8c8c8,0xff959595,0x86000000,0x5c000000,
-    0x2e000000,0xfff3f3f3,0xffbababa,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xff959595,0xff868686,0x74000000,0x50000000,
+    0x18000000,0xff7a7fbb,0xff6b71b3,0xff5d64ad,0xff5d64ad,0xff5d64ad,0xff5d64ad,0xff5d64ad,0xff5d64ad,0xff5d64ad,0xff454ca2,0xff0d1986,0x3d000000,0x2a000000,
+    0x24000000,0xff6b71b3,0xff4a51a4,0xff303999,0xff303999,0xff303999,0xff303999,0xff303999,0xff303999,0xff303999,0xff0d1a8b,0xff0a146c,0x5a000000,0x3e000000,
+    0x2e000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffe5e5e5,0xffaeaeae,0x74000000,0x50000000,
+    0x35000000,0xffffffff,0xffffffff,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xffe5e5e5,0xffaeaeae,0x86000000,0x5c000000,
+    0x39000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff000000,0xffe5e5e5,0xffaeaeae,0x90000000,0x63000000,
+    0x3b000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff000000,0xffe5e5e5,0xffaeaeae,0x95000000,0x66000000,
+    0x3c000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff000000,0xffe5e5e5,0xffaeaeae,0x96000000,0x67000000,
+    0x3b000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff000000,0xffe5e5e5,0xffaeaeae,0x95000000,0x66000000,
+    0x39000000,0xffffffff,0xffffffff,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xffe5e5e5,0xffaeaeae,0x90000000,0x63000000,
+    0x35000000,0xffffffff,0xfffdfdfd,0xffe5e5e5,0xffe5e5e5,0xffe5e5e5,0xffe5e5e5,0xffe5e5e5,0xffe5e5e5,0xffe5e5e5,0xffd1d1d1,0xffa4a4a4,0x86000000,0x5c000000,
+    0x2e000000,0xfff5f5f5,0xffc4c4c4,0xffaeaeae,0xffaeaeae,0xffaeaeae,0xffaeaeae,0xffaeaeae,0xffaeaeae,0xffaeaeae,0xffa4a4a4,0xff969696,0x74000000,0x50000000,
     0x24000000,0x3e000000,0x5a000000,0x74000000,0x86000000,0x90000000,0x95000000,0x96000000,0x95000000,0x90000000,0x86000000,0x74000000,0x5a000000,0x3e000000,
@@ -3740,15 +3817,15 @@ static const QRgb day_data[] = {
 static const QRgb done_data[] = {
-    0xffffff,0xffffff,0xffffff,0x665b925b,0xba4d794d,0xeb395e39,0xfd2c4c2c,0xeb2e592e,0xba326f32,0x662f802f,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0x1b64aa64,0x9d609a60,0xfd588a58,0xff538753,0xff4d864d,0xff458445,0xff3b7f3b,0xff307930,0xfd267626,0xa1278227,0x2b6aac6a,0xffffff,0xffffff,
-    0xffffff,0x9d5a975a,0xff5a935a,0xff5f9e5f,0xff5ba65b,0xff53a953,0xff4aa74a,0xff3ea03e,0xff2f942f,0xff2d892d,0xff889888,0xd27da47d,0xffffff,0xffffff,
-    0x664a8b4a,0xfd4c864c,0xff579b57,0xff5aad5a,0xff50b350,0xff42b042,0xff37ac37,0xff2fa82f,0xff37a637,0xffacbeac,0xffaeaeae,0xff989a98,0x9471a171,0xffffff,
-    0xba397139,0xff407f40,0xff51a251,0xff50b150,0xff38ae38,0xff26a726,0xff1ca41c,0xff31a931,0xffc0d2c0,0xffd3d3d3,0xffbcbcbc,0xff9c9c9c,0xc7468146,0xffffff,
-    0xeb255625,0xff337b33,0xff90b690,0xffb2cdb2,0xff2aa92a,0xff109f10,0xff28a628,0xffc4d5c4,0xffdcdcdc,0xffd8d8d8,0xffc5c5c5,0xff518051,0xe3005200,0xffffff,
-    0xfd1a451a,0xff6b8a6b,0xffc6c6c6,0xffd9d9d9,0xffaeceae,0xff34a934,0xffc7d6c7,0xffdcdcdc,0xffdcdcdc,0xffd9d9d9,0xff649e64,0xff005800,0xfc004a00,0xffffff,
-    0xec165016,0xff778c77,0xffc3c3c3,0xffd8d8d8,0xffdcdcdc,0xffd8dbd8,0xffdcdcdc,0xffdcdcdc,0xffdcdcdc,0xff6cab6c,0xff006800,0xff004f00,0xe3004600,0xffffff,
-    0xba095e09,0xff0b690b,0xff91ae91,0xffd3d3d3,0xffdadada,0xffdbdbdb,0xffdcdcdc,0xffdbdbdb,0xff6dac6d,0xff006e00,0xff005900,0xff004600,0xaf004600,0xffffff,
-    0x66006c00,0xfd006200,0xff097209,0xff99b599,0xffd3d3d3,0xffd7d7d7,0xffd9d9d9,0xff6ba66b,0xff006900,0xff005a00,0xff004a00,0xfd003f00,0x60004900,0xffffff,
-    0xffffff,0x9d006700,0xff005e00,0xff096609,0xff89a489,0xff88a788,0xff649664,0xff005d00,0xff005300,0xff004700,0xff003f00,0x9c004300,0xffffff,0xffffff,
-    0xffffff,0x1b006f00,0x9c005e00,0xfd005000,0xff004d00,0xff004c00,0xff004800,0xff004300,0xff003d00,0xfd003900,0x9c004000,0x1b004d00,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0x60005700,0xaf004b00,0xe2004000,0xfc003900,0xe2003900,0xaf003b00,0x60004200,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0x666da16d,0xba5f8a5f,0xeb4a704a,0xfd3c5e3c,0xeb3e6b3e,0xba428042,0x663f903f,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0x1b76b676,0x9d72a872,0xfd6a9a6a,0xff659765,0xff5f965f,0xff579457,0xff4c8f4c,0xff408a40,0xfd358735,0xa1369236,0x2b7bb87b,0xffffff,0xffffff,
+    0xffffff,0x9d6ca56c,0xff6ca26c,0xff71ac71,0xff6db36d,0xff65b665,0xff5cb45c,0xff4fad4f,0xff3fa33f,0xff3d993d,0xff98a698,0xd28db18d,0xffffff,0xffffff,
+    0x665c9a5c,0xfd5e965e,0xff69a969,0xff6cb96c,0xff62be62,0xff53bc53,0xff48b848,0xff3fb53f,0xff48b348,0xffb8c8b8,0xffbababa,0xffa6a8a6,0x9482ae82,0xffffff,
+    0xba4a824a,0xff518f51,0xff63af63,0xff62bd62,0xff49ba49,0xff35b435,0xff29b129,0xff41b641,0xffcad9ca,0xffdadada,0xffc6c6c6,0xffaaaaaa,0xc7589158,0xffffff,
+    0xeb346834,0xff438c43,0xff9fc19f,0xffbdd5bd,0xff39b639,0xff1aad1a,0xff37b337,0xffcddccd,0xffe2e2e2,0xffdedede,0xffcecece,0xff639063,0xe3006400,0xffffff,
+    0xfd275727,0xff7c9a7c,0xffcfcfcf,0xffdfdfdf,0xffbad6ba,0xff45b645,0xffd0ddd0,0xffe2e2e2,0xffe2e2e2,0xffdfdfdf,0xff76ac76,0xff006a00,0xfc005c00,0xffffff,
+    0xec226222,0xff889b88,0xffcccccc,0xffdedede,0xffe2e2e2,0xffdee1de,0xffe2e2e2,0xffe2e2e2,0xffe2e2e2,0xff7db77d,0xff007a00,0xff006100,0xe3005800,0xffffff,
+    0xba107010,0xff137a13,0xffa0baa0,0xffdadada,0xffe0e0e0,0xffe1e1e1,0xffe2e2e2,0xffe1e1e1,0xff7eb87e,0xff007f00,0xff006b00,0xff005800,0xaf005800,0xffffff,
+    0x66007d00,0xfd007400,0xff108310,0xffa7c0a7,0xffdadada,0xffdddddd,0xffdfdfdf,0xff7cb37c,0xff007a00,0xff006c00,0xff005c00,0xfd005000,0x60005b00,0xffffff,
+    0xffffff,0x9d007900,0xff007000,0xff107810,0xff99b199,0xff98b498,0xff76a476,0xff006f00,0xff006500,0xff005900,0xff005000,0x9c005400,0xffffff,0xffffff,
+    0xffffff,0x1b008000,0x9c007000,0xfd006200,0xff005f00,0xff005e00,0xff005a00,0xff005400,0xff004e00,0xfd004a00,0x9c005100,0x1b005f00,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0x60006900,0xaf005d00,0xe2005100,0xfc004a00,0xe2004a00,0xaf004c00,0x60005300,0xffffff,0xffffff,0xffffff,0xffffff,
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff
@@ -3756,29 +3833,12 @@ static const QRgb done_data[] = {
 
-static const QRgb down_data[] = {
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x1000000,0x1000000,0x1000000,0x1000000,0x1000000,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x1000000,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0x24000000,0xc000000,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xffffffff,0xffffffff,0xfff3f3f3,0xff000000,0x6b000000,0x24000000,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xffffffff,0xffffffff,0xffdbdbdb,0xff000000,0x8f000000,0x30000000,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xff000000,0xff000000,0xff000000,0xff000000,0xffffffff,0xffffffff,0xffe5e5e5,0xff000000,0xff000000,0xff000000,0xff000000,0x24000000,0xc000000,
-    0xffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfff8f8f8,0xfff7f7f7,0xfff2f2f2,0xffe5e5e5,0xff000000,0x6b000000,0x24000000,
-    0xffffff,0x8d4e5455,0xfd151617,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffececec,0xffd1d1d1,0xffbfbfbf,0xfe151717,0xce2b2e2f,0x7b000000,0x26000000,
-    0xffffff,0x13000000,0x9f454b4c,0xfe151718,0xfff2f2f2,0xfff5f5f5,0xffeaeaea,0xffc9c9c9,0xffbfbfbf,0xfe151717,0xcd2c2f2f,0x86000000,0x45000000,0x10000000,
-    0xffffff,0x3000000,0x18000000,0xa0454a4b,0xfe151718,0xffe9e9e9,0xffcecece,0xffbfbfbf,0xfe151717,0xcd2c2f2f,0x85000000,0x45000000,0x14000000,0x2000000,
-    0xffffff,0xffffff,0x3000000,0x18000000,0xa0454a4b,0xfe151718,0xffc8c8c8,0xfe151717,0xcd2c2f2f,0x85000000,0x45000000,0x14000000,0x2000000,0xffffff,
-    0xffffff,0xffffff,0xffffff,0x3000000,0x18000000,0xa0454a4b,0xef35393a,0xc12e3132,0x82000000,0x45000000,0x14000000,0x2000000,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0x3000000,0x18000000,0x41000000,0x57000000,0x3d000000,0x14000000,0x2000000,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x3000000,0xe000000,0x15000000,0xd000000,0x2000000,0xffffff,0xffffff,0xffffff,0xffffff
-};
-
 static const QRgb edit_data[] = {
     0xffffff,0xffffff,0xffffff,0xffffff,0x1000000,0x3000000,0x36000000,0xff000000,0xff000000,0xff000000,0x2c000000,0x18000000,0x8000000,0x1000000,
-    0xffffff,0xffffff,0xffffff,0xffffff,0x1000000,0x3f000000,0xff000000,0xff772121,0xffef3434,0xffff0606,0xff000000,0x40000000,0x19000000,0x5000000,
-    0xffffff,0xffffff,0xffffff,0x1000000,0x5000000,0x8f000000,0xff000000,0xff000000,0xff1f0000,0xff610000,0xff000000,0x68000000,0x2c000000,0xa000000,
-    0xffffff,0xffffff,0xffffff,0x1000000,0x14000000,0xff000000,0xfff8f898,0xffffff83,0xff000000,0xff000000,0xff000000,0x79000000,0x36000000,0xd000000,
-    0xffffff,0xffffff,0xffffff,0x4000000,0x78000000,0xff000000,0xffffff95,0xffffff71,0xffd1d154,0xff000000,0xbe000000,0x71000000,0x31000000,0xb000000,
-    0xffffff,0xffffff,0x1000000,0xd000000,0xff000000,0xffdddd84,0xffffff81,0xffd4d455,0xff888837,0xff000000,0x92000000,0x58000000,0x21000000,0x7000000,
-    0xffffff,0xffffff,0x4000000,0x62000000,0xff000000,0xffffff90,0xffffff66,0xffa7a743,0xff000000,0xc4000000,0x79000000,0x3c000000,0x12000000,0x3000000,
-    0xffffff,0x1000000,0x7000000,0xff000000,0xffb5b560,0xffffff6e,0xffbaba4a,0xff70702d,0xff000000,0x95000000,0x5b000000,0x24000000,0x8000000,0x1000000,
-    0xffffff,0x1000000,0x35000000,0xff000000,0xffe2e25b,0xffaaaa44,0xff818134,0xff000000,0xc9000000,0x7b000000,0x3d000000,0x13000000,0x4000000,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0x1000000,0x3f000000,0xff000000,0xff882f2f,0xfff24545,0xffff0c0c,0xff000000,0x40000000,0x19000000,0x5000000,
+    0xffffff,0xffffff,0xffffff,0x1000000,0x5000000,0x8f000000,0xff000000,0xff000000,0xff2d0000,0xff730000,0xff000000,0x68000000,0x2c000000,0xa000000,
+    0xffffff,0xffffff,0xffffff,0x1000000,0x14000000,0xff000000,0xfff9f9a6,0xffffff93,0xff000000,0xff000000,0xff000000,0x79000000,0x36000000,0xd000000,
+    0xffffff,0xffffff,0xffffff,0x4000000,0x78000000,0xff000000,0xffffffa4,0xffffff82,0xffd8d866,0xff000000,0xbe000000,0x71000000,0x31000000,0xb000000,
+    0xffffff,0xffffff,0x1000000,0xd000000,0xff000000,0xffe3e394,0xffffff91,0xffdbdb67,0xff989848,0xff000000,0x92000000,0x58000000,0x21000000,0x7000000,
+    0xffffff,0xffffff,0x4000000,0x62000000,0xff000000,0xffffff9f,0xffffff78,0xffb4b454,0xff000000,0xc4000000,0x79000000,0x3c000000,0x12000000,0x3000000,
+    0xffffff,0x1000000,0x7000000,0xff000000,0xffc0c072,0xffffff7f,0xffc4c45c,0xff81813d,0xff000000,0x95000000,0x5b000000,0x24000000,0x8000000,0x1000000,
+    0xffffff,0x1000000,0x35000000,0xff000000,0xffe7e76d,0xffb6b656,0xff919145,0xff000000,0xc9000000,0x7b000000,0x3d000000,0x13000000,0x4000000,0xffffff,
     0xffffff,0x2000000,0x11000000,0xff000000,0xff000000,0xff000000,0xff000000,0xfe000000,0xa0000000,0x5c000000,0x26000000,0xa000000,0x1000000,0xffffff,
@@ -3791,15 +3851,15 @@ static const QRgb edit_data[] = {
 static const QRgb editdelete_data[] = {
-    0x0,0x261818,0x8d5858,0xdd000000,0x0,0x5000000,0x0,0x0,0x0,0x0,0xde000000,0x663a3a,0x5000000,0x1000000,
-    0x0,0x261818,0x8e201313,0xdf764747,0x90000000,0x0,0x4000000,0x0,0x0,0x8b000000,0xdf795353,0x93150d0d,0x4000000,0xa000000,
-    0x0,0x8f261818,0xff8b5f5f,0xf7e08383,0xf37e3f3f,0xa2000000,0x1000000,0x0,0x98000000,0xec946c6c,0xf6e79696,0xff824141,0xaa000000,0x18100808,
-    0xdc000000,0xdf764848,0xf6e08383,0xffd37171,0xf7cf6767,0xf8783c3c,0x8b020101,0x8a040303,0xed946c6c,0xf4e89b9b,0xffca6969,0xfa944a4a,0xfc412121,0x88020101,
-    0x1000000,0x90000000,0xf37f3f3f,0xf8cf6868,0xffcd6666,0xf6d46c6c,0xf1683838,0xea795757,0xf1e99a9a,0xffca6969,0xfb8a4444,0xfb3d1e1e,0xbe000000,0x2e000000,
-    0x3000000,0x0,0xa2000000,0xf9763b3b,0xf6d46d6d,0xffcd6969,0xfdd77878,0xfedb8383,0xffc76868,0xf98f4646,0xfb3b1d1d,0xc5000000,0x48000000,0x22000000,
-    0x0,0x4000000,0x1000000,0x8a000000,0xf2683737,0xfcd77777,0xffd06c6c,0xffce6666,0xfdab5555,0xf6361b1b,0xb8000000,0x4e000000,0x29000000,0xb000000,
-    0x0,0x0,0x0,0x88000000,0xea785858,0xfcdb8282,0xffce6767,0xffc86363,0xfdb95c5c,0xf5572c2c,0xb6000000,0x27000000,0x11000000,0x1000000,
-    0x0,0x0,0x95000000,0xed926b6b,0xf2ea9b9b,0xffc86868,0xfeab5454,0xfeb95c5c,0xffc86464,0xf8c66363,0xf5723939,0xa8000000,0x2000000,0x4000000,
-    0x0,0x8e000000,0xec956c6c,0xf4e89b9b,0xffca6969,0xf98f4646,0xf6361b1b,0xf6572c2c,0xf9c76363,0xffd06868,0xf9ca6565,0xf6713939,0xa2000000,0x2000000,
-    0xdc000000,0xd7785050,0xf3e79595,0xffca6969,0xfa8a4444,0xfa3c1e1e,0xb8000000,0xb6020101,0xf6743a3a,0xf9ca6565,0xffbd5e5e,0xf8a15151,0xf64e2727,0x81000000,
-    0x0,0x8d000000,0xff884444,0xfa964a4a,0xfa3d1f1f,0xc5000000,0x4e000000,0x28000000,0xa8000000,0xf6713838,0xf9a25050,0xff542929,0xbc000000,0x29000000,
-    0x2000000,0x0,0xa5000000,0xf6412121,0xbc000000,0x46000000,0x29000000,0x10000000,0x2000000,0xa3000000,0xf74b2525,0xbc000000,0x4c000000,0x2a000000,
+    0x0,0x352424,0x9c6a6a,0xdd000000,0x0,0x5000000,0x0,0x0,0x0,0x0,0xde000000,0x784b4b,0x5000000,0x1000000,
+    0x0,0x352424,0x8e2e1e1e,0xdf875959,0x90000000,0x0,0x4000000,0x0,0x0,0x8b000000,0xdf8a6565,0x93201616,0x4000000,0xa000000,
+    0x0,0x8f352424,0xff9a7171,0xf7e59393,0xf38e5050,0xa2000000,0x1000000,0x0,0x98000000,0xeca37d7d,0xf6eba4a4,0xff925252,0xaa000000,0x181a0f0f,
+    0xdc000000,0xdf875a5a,0xf6e59393,0xffda8282,0xf7d77979,0xf8894d4d,0x8b050303,0x8a080606,0xeda37d7d,0xf4eca9a9,0xffd27a7a,0xfaa35c5c,0xfc522f2f,0x88050303,
+    0x1000000,0x90000000,0xf38f5050,0xf8d77a7a,0xffd57878,0xf6db7d7d,0xf17a4949,0xea8a6969,0xf1eda8a8,0xffd27a7a,0xfb9a5656,0xfb4e2b2b,0xbe000000,0x2e000000,
+    0x3000000,0x0,0xa2000000,0xf9874c4c,0xf6db7e7e,0xffd57a7a,0xfddd8989,0xfee19393,0xffd07a7a,0xf99e5858,0xfb4c2a2a,0xc5000000,0x48000000,0x22000000,
+    0x0,0x4000000,0x1000000,0x8a000000,0xf27a4848,0xfcdd8888,0xffd77d7d,0xffd67878,0xfdb76767,0xf6472828,0xb8000000,0x4e000000,0x29000000,0xb000000,
+    0x0,0x0,0x0,0x88000000,0xea896a6a,0xfce19292,0xffd67979,0xffd17575,0xfdc46e6e,0xf5693c3c,0xb6000000,0x27000000,0x11000000,0x1000000,
+    0x0,0x0,0x95000000,0xeda17c7c,0xf2eea9a9,0xffd17a7a,0xfeb76666,0xfec46e6e,0xffd17676,0xf8cf7575,0xf5834a4a,0xa8000000,0x2000000,0x4000000,
+    0x0,0x8e000000,0xeca47d7d,0xf4eca9a9,0xffd27a7a,0xf99e5858,0xf6472828,0xf6693c3c,0xf9d07575,0xffd77a7a,0xf9d27777,0xf6824a4a,0xa2000000,0x2000000,
+    0xdc000000,0xd7896262,0xf3eba4a4,0xffd27a7a,0xfa9a5656,0xfa4d2b2b,0xb8000000,0xb6050303,0xf6854b4b,0xf9d27777,0xffc77070,0xf8ae6363,0xf6603636,0x81000000,
+    0x0,0x8d000000,0xff985656,0xfaa45c5c,0xfa4e2d2d,0xc5000000,0x4e000000,0x28000000,0xa8000000,0xf6824949,0xf9af6262,0xff663838,0xbc000000,0x29000000,
+    0x2000000,0x0,0xa5000000,0xf6522f2f,0xbc000000,0x46000000,0x29000000,0x10000000,0x2000000,0xa3000000,0xf75d3434,0xbc000000,0x4c000000,0x2a000000,
     0x1000000,0x7000000,0xb000000,0x84000000,0x28000000,0x21000000,0xb000000,0x0,0x3000000,0x3000000,0x81000000,0x29000000,0x29000000,0x11000000
@@ -3808,15 +3868,15 @@ static const QRgb editdelete_data[] = {
 static const QRgb enter_data[] = {
-    0xffffff,0xffffff,0xffffff,0x665b925b,0xba4d794d,0xeb395e39,0xfd2c4c2c,0xeb2e592e,0xba326f32,0x662f802f,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0x1b64aa64,0x9d609a60,0xfd588a58,0xff538753,0xff4d864d,0xff458445,0xff3b7f3b,0xff307930,0xfd267626,0xa1278227,0x2b6aac6a,0xffffff,0xffffff,
-    0xffffff,0x9d5a975a,0xff5a935a,0xff5f9e5f,0xff5ba65b,0xff53a953,0xff4aa74a,0xff3ea03e,0xff2f942f,0xff2d892d,0xff889888,0xd27da47d,0xffffff,0xffffff,
-    0x664a8b4a,0xfd4c864c,0xff579b57,0xff5aad5a,0xff50b350,0xff42b042,0xff37ac37,0xff2fa82f,0xff37a637,0xffacbeac,0xffaeaeae,0xff989a98,0x9471a171,0xffffff,
-    0xba397139,0xff407f40,0xff51a251,0xff50b150,0xff38ae38,0xff26a726,0xff1ca41c,0xff31a931,0xffc0d2c0,0xffd3d3d3,0xffbcbcbc,0xff9c9c9c,0xc7468146,0xffffff,
-    0xeb255625,0xff337b33,0xff90b690,0xffb2cdb2,0xff2aa92a,0xff109f10,0xff28a628,0xffc4d5c4,0xffdcdcdc,0xffd8d8d8,0xffc5c5c5,0xff518051,0xe3005200,0xffffff,
-    0xfd1a451a,0xff6b8a6b,0xffc6c6c6,0xffd9d9d9,0xffaeceae,0xff34a934,0xffc7d6c7,0xffdcdcdc,0xffdcdcdc,0xffd9d9d9,0xff649e64,0xff005800,0xfc004a00,0xffffff,
-    0xec165016,0xff778c77,0xffc3c3c3,0xffd8d8d8,0xffdcdcdc,0xffd8dbd8,0xffdcdcdc,0xffdcdcdc,0xffdcdcdc,0xff6cab6c,0xff006800,0xff004f00,0xe3004600,0xffffff,
-    0xba095e09,0xff0b690b,0xff91ae91,0xffd3d3d3,0xffdadada,0xffdbdbdb,0xffdcdcdc,0xffdbdbdb,0xff6dac6d,0xff006e00,0xff005900,0xff004600,0xaf004600,0xffffff,
-    0x66006c00,0xfd006200,0xff097209,0xff99b599,0xffd3d3d3,0xffd7d7d7,0xffd9d9d9,0xff6ba66b,0xff006900,0xff005a00,0xff004a00,0xfd003f00,0x60004900,0xffffff,
-    0xffffff,0x9d006700,0xff005e00,0xff096609,0xff89a489,0xff88a788,0xff649664,0xff005d00,0xff005300,0xff004700,0xff003f00,0x9c004300,0xffffff,0xffffff,
-    0xffffff,0x1b006f00,0x9c005e00,0xfd005000,0xff004d00,0xff004c00,0xff004800,0xff004300,0xff003d00,0xfd003900,0x9c004000,0x1b004d00,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0x60005700,0xaf004b00,0xe2004000,0xfc003900,0xe2003900,0xaf003b00,0x60004200,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0x666da16d,0xba5f8a5f,0xeb4a704a,0xfd3c5e3c,0xeb3e6b3e,0xba428042,0x663f903f,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0x1b76b676,0x9d72a872,0xfd6a9a6a,0xff659765,0xff5f965f,0xff579457,0xff4c8f4c,0xff408a40,0xfd358735,0xa1369236,0x2b7bb87b,0xffffff,0xffffff,
+    0xffffff,0x9d6ca56c,0xff6ca26c,0xff71ac71,0xff6db36d,0xff65b665,0xff5cb45c,0xff4fad4f,0xff3fa33f,0xff3d993d,0xff98a698,0xd28db18d,0xffffff,0xffffff,
+    0x665c9a5c,0xfd5e965e,0xff69a969,0xff6cb96c,0xff62be62,0xff53bc53,0xff48b848,0xff3fb53f,0xff48b348,0xffb8c8b8,0xffbababa,0xffa6a8a6,0x9482ae82,0xffffff,
+    0xba4a824a,0xff518f51,0xff63af63,0xff62bd62,0xff49ba49,0xff35b435,0xff29b129,0xff41b641,0xffcad9ca,0xffdadada,0xffc6c6c6,0xffaaaaaa,0xc7589158,0xffffff,
+    0xeb346834,0xff438c43,0xff9fc19f,0xffbdd5bd,0xff39b639,0xff1aad1a,0xff37b337,0xffcddccd,0xffe2e2e2,0xffdedede,0xffcecece,0xff639063,0xe3006400,0xffffff,
+    0xfd275727,0xff7c9a7c,0xffcfcfcf,0xffdfdfdf,0xffbad6ba,0xff45b645,0xffd0ddd0,0xffe2e2e2,0xffe2e2e2,0xffdfdfdf,0xff76ac76,0xff006a00,0xfc005c00,0xffffff,
+    0xec226222,0xff889b88,0xffcccccc,0xffdedede,0xffe2e2e2,0xffdee1de,0xffe2e2e2,0xffe2e2e2,0xffe2e2e2,0xff7db77d,0xff007a00,0xff006100,0xe3005800,0xffffff,
+    0xba107010,0xff137a13,0xffa0baa0,0xffdadada,0xffe0e0e0,0xffe1e1e1,0xffe2e2e2,0xffe1e1e1,0xff7eb87e,0xff007f00,0xff006b00,0xff005800,0xaf005800,0xffffff,
+    0x66007d00,0xfd007400,0xff108310,0xffa7c0a7,0xffdadada,0xffdddddd,0xffdfdfdf,0xff7cb37c,0xff007a00,0xff006c00,0xff005c00,0xfd005000,0x60005b00,0xffffff,
+    0xffffff,0x9d007900,0xff007000,0xff107810,0xff99b199,0xff98b498,0xff76a476,0xff006f00,0xff006500,0xff005900,0xff005000,0x9c005400,0xffffff,0xffffff,
+    0xffffff,0x1b008000,0x9c007000,0xfd006200,0xff005f00,0xff005e00,0xff005a00,0xff005400,0xff004e00,0xfd004a00,0x9c005100,0x1b005f00,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0x60006900,0xaf005d00,0xe2005100,0xfc004a00,0xe2004a00,0xaf004c00,0x60005300,0xffffff,0xffffff,0xffffff,0xffffff,
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff
@@ -3935,13 +3995,13 @@ static const QRgb fastback_data[] = {
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xff000000,0xffffff,0xffffff,0xffffff,0xffffff,0x7a5a6163,0xff000000,0xff000000,0x24000000,0xc000000,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xff000000,0xffffff,0xffffff,0xffffff,0x7a5a6163,0xfc151717,0xffffffff,0xff000000,0x6b000000,0x24000000,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xff000000,0xffffff,0xffffff,0x7a5a6163,0xfc151717,0xffffffff,0xfffbfbfb,0xff000000,0x8f000000,0x30000000,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xff000000,0xffffff,0x7a5a6163,0xfc151717,0xffffffff,0xffffffff,0xfff7f7f7,0xff000000,0xff000000,0xff000000,0xff000000,0x24000000,0xc000000,
-    0xffffff,0xff000000,0x7a5a6163,0xfc151717,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,0xffffffff,0xffffffff,0xfff3f3f3,0xff000000,0x6b000000,0x24000000,
-    0xffffff,0xff000000,0xe0383d3e,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfff4f4f4,0xfff4f4f4,0xffeaeaea,0xffcbcbcb,0xff000000,0x8f000000,0x30000000,
-    0xffffff,0xff000000,0x69545a5b,0xfd151717,0xfffbfbfb,0xfffbfbfb,0xfff2f2f2,0xffd6d6d6,0xffc3c3c3,0xffbfbfbf,0xffbfbfbf,0xff000000,0x8f000000,0x30000000,
-    0xffffff,0xff000000,0xd000000,0x8344494a,0xfd151617,0xfff2f2f2,0xffe9e9e9,0xffc3c3c3,0xff000000,0xff000000,0xff000000,0xff000000,0x8f000000,0x30000000,
-    0xffffff,0xff000000,0x2000000,0x14000000,0x88414648,0xfe151718,0xffe4e4e4,0xffc2c2c2,0xff000000,0xb3000000,0x9b000000,0x8f000000,0x6b000000,0x24000000,
-    0xffffff,0xff000000,0xffffff,0x2000000,0x14000000,0x88414648,0xfe151718,0xffcbcbcb,0xff000000,0x9b000000,0x54000000,0x30000000,0x24000000,0xc000000,
-    0xffffff,0xff000000,0xffffff,0xffffff,0x2000000,0x14000000,0x88414648,0xff000000,0xff000000,0x8f000000,0x30000000,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xff000000,0xffffff,0xffffff,0xffffff,0xffffff,0x7a6c7375,0xff000000,0xff000000,0x24000000,0xc000000,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xff000000,0xffffff,0xffffff,0xffffff,0x7a6c7375,0xfc202323,0xffffffff,0xff000000,0x6b000000,0x24000000,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xff000000,0xffffff,0xffffff,0x7a6c7375,0xfc202323,0xffffffff,0xfffcfcfc,0xff000000,0x8f000000,0x30000000,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xff000000,0xffffff,0x7a6c7375,0xfc202323,0xffffffff,0xffffffff,0xfff8f8f8,0xff000000,0xff000000,0xff000000,0xff000000,0x24000000,0xc000000,
+    0xffffff,0xff000000,0x7a6c7375,0xfc202323,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,0xffffffff,0xffffffff,0xfff5f5f5,0xff000000,0x6b000000,0x24000000,
+    0xffffff,0xff000000,0xe0494e4f,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfff6f6f6,0xfff6f6f6,0xffeeeeee,0xffd3d3d3,0xff000000,0x8f000000,0x30000000,
+    0xffffff,0xff000000,0x69666c6d,0xfd202323,0xfffcfcfc,0xfffcfcfc,0xfff4f4f4,0xffdddddd,0xffcccccc,0xffc9c9c9,0xffc9c9c9,0xff000000,0x8f000000,0x30000000,
+    0xffffff,0xff000000,0xd000000,0x83565b5c,0xfd202223,0xfff4f4f4,0xffededed,0xffcccccc,0xff000000,0xff000000,0xff000000,0xff000000,0x8f000000,0x30000000,
+    0xffffff,0xff000000,0x2000000,0x14000000,0x8852585a,0xfe202324,0xffe8e8e8,0xffcbcbcb,0xff000000,0xb3000000,0x9b000000,0x8f000000,0x6b000000,0x24000000,
+    0xffffff,0xff000000,0xffffff,0x2000000,0x14000000,0x8852585a,0xfe202324,0xffd3d3d3,0xff000000,0x9b000000,0x54000000,0x30000000,0x24000000,0xc000000,
+    0xffffff,0xff000000,0xffffff,0xffffff,0x2000000,0x14000000,0x8852585a,0xff000000,0xff000000,0x8f000000,0x30000000,0xffffff,0xffffff,0xffffff,
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x2000000,0x14000000,0x45000000,0x7b000000,0x6b000000,0x24000000,0xffffff,0xffffff,0xffffff,
@@ -3952,13 +4012,13 @@ static const QRgb fastforward_data[] = {
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xff000000,0x8d4e5455,0x13000000,0x3000000,0xffffff,0xffffff,0xff000000,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xffffffff,0xfd151617,0x9f454b4c,0x18000000,0x3000000,0xffffff,0xff000000,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xffffffff,0xffffffff,0xfe151718,0xa0454a4b,0x18000000,0x3000000,0xff000000,0xffffff,0xffffff,
-    0xffffff,0xff000000,0xff000000,0xff000000,0xff000000,0xffffffff,0xffffffff,0xfff2f2f2,0xfe151718,0xa0454a4b,0x18000000,0xff000000,0xffffff,0xffffff,
-    0xffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfff5f5f5,0xffe9e9e9,0xfe151718,0xa0454a4b,0xff000000,0x3000000,0xffffff,
-    0xffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffeaeaea,0xffcecece,0xffc8c8c8,0xef35393a,0xff000000,0xe000000,0xffffff,
-    0xffffff,0xff000000,0xfff3f3f3,0xffdbdbdb,0xffe5e5e5,0xfff8f8f8,0xffececec,0xffc9c9c9,0xffbfbfbf,0xfe151717,0xc12e3132,0xff000000,0x15000000,0xffffff,
-    0x1000000,0xff000000,0xff000000,0xff000000,0xff000000,0xfff7f7f7,0xffd1d1d1,0xffbfbfbf,0xfe151717,0xcd2c2f2f,0x82000000,0xff000000,0xd000000,0xffffff,
-    0xffffff,0x24000000,0x6b000000,0x8f000000,0xff000000,0xfff2f2f2,0xffbfbfbf,0xfe151717,0xcd2c2f2f,0x85000000,0x45000000,0xff000000,0x2000000,0xffffff,
-    0xffffff,0xc000000,0x24000000,0x30000000,0xff000000,0xffe5e5e5,0xfe151717,0xcd2c2f2f,0x85000000,0x45000000,0x14000000,0xff000000,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xff000000,0xce2b2e2f,0x86000000,0x45000000,0x14000000,0x2000000,0xff000000,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xff000000,0x8d606667,0x13000000,0x3000000,0xffffff,0xffffff,0xff000000,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xffffffff,0xfd202223,0x9f575d5e,0x18000000,0x3000000,0xffffff,0xff000000,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xffffffff,0xffffffff,0xfe202324,0xa0575c5d,0x18000000,0x3000000,0xff000000,0xffffff,0xffffff,
+    0xffffff,0xff000000,0xff000000,0xff000000,0xff000000,0xffffffff,0xffffffff,0xfff4f4f4,0xfe202324,0xa0575c5d,0x18000000,0xff000000,0xffffff,0xffffff,
+    0xffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfff7f7f7,0xffededed,0xfe202324,0xa0575c5d,0xff000000,0x3000000,0xffffff,
+    0xffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffeeeeee,0xffd6d6d6,0xffd1d1d1,0xef464a4b,0xff000000,0xe000000,0xffffff,
+    0xffffff,0xff000000,0xfff5f5f5,0xffe1e1e1,0xffe9e9e9,0xfff9f9f9,0xffefefef,0xffd1d1d1,0xffc9c9c9,0xfe202323,0xc13e4142,0xff000000,0x15000000,0xffffff,
+    0x1000000,0xff000000,0xff000000,0xff000000,0xff000000,0xfff8f8f8,0xffd8d8d8,0xffc9c9c9,0xfe202323,0xcd3c3f3f,0x82000000,0xff000000,0xd000000,0xffffff,
+    0xffffff,0x24000000,0x6b000000,0x8f000000,0xff000000,0xfff4f4f4,0xffc9c9c9,0xfe202323,0xcd3c3f3f,0x85000000,0x45000000,0xff000000,0x2000000,0xffffff,
+    0xffffff,0xc000000,0x24000000,0x30000000,0xff000000,0xffe9e9e9,0xfe202323,0xcd3c3f3f,0x85000000,0x45000000,0x14000000,0xff000000,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xff000000,0xce3b3e3f,0x86000000,0x45000000,0x14000000,0x2000000,0xff000000,0xffffff,0xffffff,
     0xffffff,0xffffff,0xffffff,0xffffff,0x24000000,0x6b000000,0x7b000000,0x45000000,0x14000000,0x2000000,0xffffff,0xffffff,0xffffff,0xffffff,
@@ -3971,10 +4031,10 @@ static const QRgb fileopen_data[] = {
     0x20000000,0x43000000,0x72000000,0x87000000,0x89000000,0x79000000,0x53000000,0x36000000,0x2b000000,0x23000000,0x1b000000,0x17000000,0x11000000,0xa000000,
-    0x39000000,0x84000000,0xffaaaaaa,0xffa9a9a9,0xffa7a7a7,0xffa3a3a3,0xab000000,0x7b000000,0x67000000,0x5a000000,0x4d000000,0x3e000000,0x2e000000,0x1b000000,
-    0x5b000000,0xc9353535,0xffaaaaaa,0xffa9a9a9,0xffa3a3a3,0xff9b9b9b,0xfa555555,0xd8000000,0xca000000,0xc1000000,0xad000000,0x89000000,0x5f000000,0x39000000,
-    0x74000000,0xdc313131,0xffa9a9a9,0xffa6a6a6,0xff9d9d9d,0xff8e8e8e,0xff767676,0xff575757,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0x56000000,
-    0x85000000,0xe82e2e2e,0xffa7a7a7,0xff9f9f9f,0xff8f8f8f,0xff777777,0xff535353,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xb4000000,0x6e000000,
-    0x91000000,0xef2b2b2b,0xff9f9f9f,0xff929292,0xff7b7b7b,0xff585858,0xff2c2c2c,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xc0000000,0x77000000,
-    0x92000000,0xf02a2a2a,0xff999999,0xff858585,0xff656565,0xff3b3b3b,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xf8000000,0xc0000000,0x77000000,
-    0x89000000,0xe92d2d2d,0xff8c8c8c,0xff747474,0xff7a7a7a,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xf1000000,0xb2000000,0x6b000000,
-    0x78000000,0xd82c2c2c,0xfea6a6a6,0xffa9a9a9,0xffb0b0b0,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfd000000,0xdd000000,0x9b000000,0x59000000,
+    0x39000000,0x84000000,0xffb6b6b6,0xffb6b6b6,0xffb4b4b4,0xffb0b0b0,0xab000000,0x7b000000,0x67000000,0x5a000000,0x4d000000,0x3e000000,0x2e000000,0x1b000000,
+    0x5b000000,0xc9464646,0xffb6b6b6,0xffb6b6b6,0xffb0b0b0,0xffa9a9a9,0xfa676767,0xd8000000,0xca000000,0xc1000000,0xad000000,0x89000000,0x5f000000,0x39000000,
+    0x74000000,0xdc414141,0xffb6b6b6,0xffb3b3b3,0xffababab,0xff9d9d9d,0xff878787,0xff696969,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0x56000000,
+    0x85000000,0xe83e3e3e,0xffb4b4b4,0xffadadad,0xff9e9e9e,0xff888888,0xff656565,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xb4000000,0x6e000000,
+    0x91000000,0xef3b3b3b,0xffadadad,0xffa1a1a1,0xff8c8c8c,0xff6a6a6a,0xff3c3c3c,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xc0000000,0x77000000,
+    0x92000000,0xf0393939,0xffa7a7a7,0xff959595,0xff777777,0xff4c4c4c,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xf8000000,0xc0000000,0x77000000,
+    0x89000000,0xe93d3d3d,0xff9b9b9b,0xff858585,0xff8b8b8b,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xf1000000,0xb2000000,0x6b000000,
+    0x78000000,0xd83c3c3c,0xfeb3b3b3,0xffb6b6b6,0xffbcbcbc,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfd000000,0xdd000000,0x9b000000,0x59000000,
     0x5d000000,0x9d000000,0xd7000000,0xf7000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xfa000000,0xe4000000,0xaf000000,0x73000000,0x3c000000,
@@ -3985,15 +4045,15 @@ static const QRgb fileopen_data[] = {
 static const QRgb find_data[] = {
-    0x1ffffff,0x420c0c0c,0x9c0b0b0b,0xe10e0e0e,0xe2101010,0xe2101010,0xe10e0e0e,0x9c0b0b0b,0x420c0c0c,0x1ffffff,0xffffff,0xffffff,0xffffff,0xffffff,
-    0x420c0c0c,0xcf101010,0xff545655,0xffa5a9a7,0xffdde2e0,0xffdae1de,0xffa0a7a4,0xff505453,0xd0101010,0x440b0b0b,0x1000000,0x1000000,0xffffff,0xffffff,
-    0x9c0b0b0b,0xff535555,0xf6d9dedc,0xfff6fbf9,0xfff5faf8,0xfff1f9f6,0xffeef7f4,0xf6ced9d4,0xff4e5150,0xa00b0b0b,0x8202020,0x4000000,0x1000000,0x1000000,
-    0xe10e0e0e,0xffa3a8a5,0xfff4f9f8,0xfff4faf9,0xfff1f9f6,0xffeff8f5,0xffedf7f4,0xffe1ece8,0xff8d9693,0xe40d0d0d,0x110f0f0f,0x9000000,0x4000000,0x1000000,
-    0xe2101010,0xffd7e0dc,0xfff0f8f5,0xffeff8f5,0xffeaf6f1,0xffe7f5f0,0xffe2eee9,0xffd5dfdb,0xffaeb8b4,0xe6101010,0x1e090909,0x11000000,0x9000000,0x4000000,
-    0xe3101010,0xffd2ddd9,0xffecf6f2,0xffebf7f2,0xffe4f2ed,0xffdfece7,0xffd7e1dd,0xffc7d0cd,0xffa1aaa7,0xe90f0f0f,0x30060606,0x1c000000,0xf000000,0x7000000,
-    0xe20e0e0e,0xff98a09e,0xffe0ebe7,0xffdfe9e6,0xffd8e2df,0xffd1dbd8,0xffc9d1cf,0xffbbc3c0,0xff767d7a,0xec0d0d0d,0x41040404,0x28000000,0x16000000,0xa000000,
-    0xa10b0b0b,0xff4a4f4d,0xf8b5bebb,0xffc9d3d0,0xffc3ccc9,0xffbcc4c1,0xffbbc3c0,0xfb9da5a2,0xff3f4240,0xdc050505,0x76020202,0x33000000,0x1c000000,0xd000000,
-    0x4c0a0a0a,0xd4101010,0xff454847,0xff7b827f,0xff9ba4a1,0xff9ba4a1,0xff767d7a,0xff3f4240,0xed231c17,0xdb836b59,0xf3000000,0x64000000,0x20000000,0xe000000,
-    0xf111111,0x5a090909,0xb10a0a0a,0xec0d0d0d,0xef0f0f0f,0xf20f0f0f,0xf40d0d0d,0xe5050505,0xe4513826,0xffb68059,0xe0bea595,0xf0000000,0x51000000,0xe000000,
-    0xd000000,0x1c000000,0x34050505,0x50030303,0x6d020202,0x82020202,0x8f020202,0xc0010101,0xec050302,0xf2453020,0xffb9845f,0xc9b6a08f,0xee000000,0x42000000,
-    0xa000000,0x16000000,0x28000000,0x40000000,0x58000000,0x6c000000,0x77000000,0x77000000,0xac000000,0xe3000000,0xe6412d1e,0xffb7815b,0xc1b79a85,0xed000000,
-    0x7000000,0xf000000,0x1c000000,0x2e000000,0x40000000,0x4f000000,0x58000000,0x58000000,0x4f000000,0x93000000,0xdd000000,0xde4f3625,0xdca26f4c,0xa0000000,
+    0x1ffffff,0x42141414,0x9c131313,0xe1171717,0xe21a1a1a,0xe21a1a1a,0xe1171717,0x9c131313,0x42141414,0x1ffffff,0xffffff,0xffffff,0xffffff,0xffffff,
+    0x42141414,0xcf1a1a1a,0xff666867,0xffb2b6b4,0xffe3e7e5,0xffe0e6e3,0xffadb4b1,0xff626665,0xd01a1a1a,0x44131313,0x1000000,0x1000000,0xffffff,0xffffff,
+    0x9c131313,0xff656767,0xf6dfe3e2,0xfff8fcfa,0xfff7fbf9,0xfff3faf8,0xfff1f8f6,0xf6d6dfdb,0xff606362,0xa0131313,0x82e2e2e,0x4000000,0x1000000,0x1000000,
+    0xe1171717,0xffb0b5b2,0xfff6faf9,0xfff6fbfa,0xfff3faf8,0xfff2f9f7,0xfff0f8f6,0xffe6efec,0xff9ca4a2,0xe4161616,0x11191919,0x9000000,0x4000000,0x1000000,
+    0xe21a1a1a,0xffdde5e2,0xfff3f9f7,0xfff2f9f7,0xffeef8f3,0xffebf7f3,0xffe7f1ed,0xffdce4e1,0xffbac3bf,0xe61a1a1a,0x1e101010,0x11000000,0x9000000,0x4000000,
+    0xe31a1a1a,0xffd9e3df,0xffeff8f4,0xffeef8f4,0xffe8f4f0,0xffe4efeb,0xffdde6e3,0xffd0d7d5,0xffaeb6b4,0xe9191919,0x300c0c0c,0x1c000000,0xf000000,0x7000000,
+    0xe2171717,0xffa6adac,0xffe5eeeb,0xffe4edea,0xffdee7e4,0xffd8e1de,0xffd1d8d7,0xffc5ccca,0xff878d8b,0xec161616,0x41080808,0x28000000,0x16000000,0xa000000,
+    0xa1131313,0xff5c615f,0xf8c0c8c5,0xffd1dad7,0xffccd4d1,0xffc6cdcb,0xffc5ccca,0xfbabb2af,0xff505351,0xdc0a0a0a,0x76050505,0x33000000,0x1c000000,0xd000000,
+    0x4c121212,0xd41a1a1a,0xff575a59,0xff8c928f,0xffa9b1ae,0xffa9b1ae,0xff878d8b,0xff505351,0xed312923,0xdb937c6b,0xf3000000,0x64000000,0x20000000,0xe000000,
+    0xf1b1b1b,0x5a101010,0xb1121212,0xec161616,0xef191919,0xf2191919,0xf4161616,0xe50a0a0a,0xe4634935,0xffc1906b,0xe0c8b2a4,0xf0000000,0x51000000,0xe000000,
+    0xd000000,0x1c000000,0x340a0a0a,0x50060606,0x6d050505,0x82050505,0x8f050505,0xc0030303,0xec0a0605,0xf257402e,0xffc49471,0xc9c1ad9e,0xee000000,0x42000000,
+    0xa000000,0x16000000,0x28000000,0x40000000,0x58000000,0x6c000000,0x77000000,0x77000000,0xac000000,0xe3000000,0xe6523d2b,0xffc2916d,0xc1c2a895,0xed000000,
+    0x7000000,0xf000000,0x1c000000,0x2e000000,0x40000000,0x4f000000,0x58000000,0x58000000,0x4f000000,0x93000000,0xdd000000,0xde614734,0xdcaf805e,0xa0000000,
     0x4000000,0x9000000,0x11000000,0x1c000000,0x28000000,0x33000000,0x38000000,0x38000000,0x33000000,0x28000000,0x7f000000,0xd8000000,0xb4000000,0x71000000
@@ -4003,13 +4063,13 @@ static const QRgb finish_data[] = {
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xff000000,0x8d4e5455,0x13000000,0x3000000,0xffffff,0xffffff,0xff000000,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xffffffff,0xfd151617,0x9f454b4c,0x18000000,0x3000000,0xffffff,0xff000000,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xffffffff,0xffffffff,0xfe151718,0xa0454a4b,0x18000000,0x3000000,0xff000000,0xffffff,0xffffff,
-    0xffffff,0xff000000,0xff000000,0xff000000,0xff000000,0xffffffff,0xffffffff,0xfff2f2f2,0xfe151718,0xa0454a4b,0x18000000,0xff000000,0xffffff,0xffffff,
-    0xffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfff5f5f5,0xffe9e9e9,0xfe151718,0xa0454a4b,0xff000000,0x3000000,0xffffff,
-    0xffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffeaeaea,0xffcecece,0xffc8c8c8,0xef35393a,0xff000000,0xe000000,0xffffff,
-    0xffffff,0xff000000,0xfff3f3f3,0xffdbdbdb,0xffe5e5e5,0xfff8f8f8,0xffececec,0xffc9c9c9,0xffbfbfbf,0xfe151717,0xc12e3132,0xff000000,0x15000000,0xffffff,
-    0x1000000,0xff000000,0xff000000,0xff000000,0xff000000,0xfff7f7f7,0xffd1d1d1,0xffbfbfbf,0xfe151717,0xcd2c2f2f,0x82000000,0xff000000,0xd000000,0xffffff,
-    0xffffff,0x24000000,0x6b000000,0x8f000000,0xff000000,0xfff2f2f2,0xffbfbfbf,0xfe151717,0xcd2c2f2f,0x85000000,0x45000000,0xff000000,0x2000000,0xffffff,
-    0xffffff,0xc000000,0x24000000,0x30000000,0xff000000,0xffe5e5e5,0xfe151717,0xcd2c2f2f,0x85000000,0x45000000,0x14000000,0xff000000,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xff000000,0xce2b2e2f,0x86000000,0x45000000,0x14000000,0x2000000,0xff000000,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xff000000,0x8d606667,0x13000000,0x3000000,0xffffff,0xffffff,0xff000000,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xffffffff,0xfd202223,0x9f575d5e,0x18000000,0x3000000,0xffffff,0xff000000,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xffffffff,0xffffffff,0xfe202324,0xa0575c5d,0x18000000,0x3000000,0xff000000,0xffffff,0xffffff,
+    0xffffff,0xff000000,0xff000000,0xff000000,0xff000000,0xffffffff,0xffffffff,0xfff4f4f4,0xfe202324,0xa0575c5d,0x18000000,0xff000000,0xffffff,0xffffff,
+    0xffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfff7f7f7,0xffededed,0xfe202324,0xa0575c5d,0xff000000,0x3000000,0xffffff,
+    0xffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffeeeeee,0xffd6d6d6,0xffd1d1d1,0xef464a4b,0xff000000,0xe000000,0xffffff,
+    0xffffff,0xff000000,0xfff5f5f5,0xffe1e1e1,0xffe9e9e9,0xfff9f9f9,0xffefefef,0xffd1d1d1,0xffc9c9c9,0xfe202323,0xc13e4142,0xff000000,0x15000000,0xffffff,
+    0x1000000,0xff000000,0xff000000,0xff000000,0xff000000,0xfff8f8f8,0xffd8d8d8,0xffc9c9c9,0xfe202323,0xcd3c3f3f,0x82000000,0xff000000,0xd000000,0xffffff,
+    0xffffff,0x24000000,0x6b000000,0x8f000000,0xff000000,0xfff4f4f4,0xffc9c9c9,0xfe202323,0xcd3c3f3f,0x85000000,0x45000000,0xff000000,0x2000000,0xffffff,
+    0xffffff,0xc000000,0x24000000,0x30000000,0xff000000,0xffe9e9e9,0xfe202323,0xcd3c3f3f,0x85000000,0x45000000,0x14000000,0xff000000,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xff000000,0xce3b3e3f,0x86000000,0x45000000,0x14000000,0x2000000,0xff000000,0xffffff,0xffffff,
     0xffffff,0xffffff,0xffffff,0xffffff,0x24000000,0x6b000000,0x7b000000,0x45000000,0x14000000,0x2000000,0xffffff,0xffffff,0xffffff,0xffffff,
@@ -4020,15 +4080,15 @@ static const QRgb folder_data[] = {
     0x1000000,0x4000000,0x7000000,0x19000000,0x11000000,0x2c000000,0x19000000,0x19000000,0x16000000,0x13000000,0xe000000,0xa000000,0x7000000,0x4000000,
-    0x5000000,0xa000000,0x5d1f1f1f,0xca3e3e3e,0xf53d463c,0xfe6f7b6e,0xb01d231d,0x40000000,0x2c000000,0x26000000,0x1f000000,0x19000000,0x13000000,0xd000000,
-    0xc000000,0x15000000,0x9c212020,0xffb8b7b7,0xff939493,0xff757575,0xff838582,0xfa747f72,0xbb1c221c,0xc4282e26,0xe21d221d,0x7b000000,0x82000000,0x1a000000,
-    0xc03d483d,0xc63b463a,0xcd111010,0xff746969,0xffaaa6a6,0xffc0bfbf,0xff9a9a9a,0xff757675,0xff777f77,0xffa5b0a4,0xffb8bfb7,0xfc818f80,0xc43a4338,0x63000000,
-    0xff798e77,0xffcbe7c9,0xfa91a98f,0xfa474a43,0xff473b3b,0xff5d5454,0xffaaa6a6,0xffc1c0c0,0xff959795,0xff6a716a,0xff7c8c7b,0xffaabba8,0xfe829981,0x9f101510,
-    0xc3131613,0xffb7d4b6,0xffc8e5c6,0xffbfdbbd,0xff90a88f,0xff81877b,0xff483c3c,0xff5d5454,0xffaaa6a6,0xffbfbebe,0xff8f948f,0xff4b564b,0xff769474,0xaf111611,
-    0x41000000,0xf4627561,0xffc4e1c3,0xffbfdabd,0xffb9d3b7,0xffaec8ac,0xff80977f,0xff7c8176,0xff4b4140,0xff5d5555,0xffb2afaf,0xff767d76,0xff4b5d4a,0xb40e120e,
-    0x25000000,0xae0e100d,0xffb0caaf,0xffbad5b8,0xffb4cdb2,0xffaec7ac,0xffa8c0a6,0xff9cb49b,0xff738671,0xff797f74,0xff4c4746,0xff787a78,0xff4e5a4c,0xba0b0e0b,
-    0x1f000000,0x49000000,0xf4586857,0xffb0caaf,0xffafc8ad,0xffa9c1a7,0xffa3bba2,0xff9eb49c,0xff98ae97,0xff8da28c,0xff3f453c,0xff757473,0xff4f5a4e,0xbc090b09,
-    0x17000000,0x29000000,0x64000000,0xdb272f26,0xfd70856f,0xff9eb59c,0xff9fb69d,0xff9ab098,0xff94a992,0xff8da18b,0xff6d806b,0xff50514f,0xff535b53,0xbd060806,
-    0xe000000,0x1b000000,0x2c000000,0x41000000,0x83000000,0xdd222922,0xfd637662,0xff8fa48d,0xff8fa38d,0xff899c87,0xff839581,0xff3f4a3e,0xff575f56,0xba040504,
-    0x7000000,0x10000000,0x1b000000,0x2b000000,0x3b000000,0x4d000000,0x84000000,0xdc191f19,0xfd566554,0xff7f927d,0xff7e907c,0xff637461,0xff313931,0x99030403,
-    0x4000000,0x7000000,0xf000000,0x18000000,0x24000000,0x31000000,0x40000000,0x4f000000,0x84000000,0xda171c17,0xfc384336,0xff687966,0xfd1d231b,0x88000000,
-    0x1000000,0x3000000,0x7000000,0xb000000,0x13000000,0x1c000000,0x26000000,0x32000000,0x40000000,0x4c000000,0x6d000000,0xa9020302,0x83080a07,0x42000000
+    0x5000000,0xa000000,0x5d2d2d2d,0xca4f4f4f,0xf54e584d,0xfe808c7f,0xb02a312a,0x40000000,0x2c000000,0x26000000,0x1f000000,0x19000000,0x13000000,0xd000000,
+    0xc000000,0x15000000,0x9c2f2e2e,0xffc3c2c2,0xffa2a3a2,0xff868686,0xff939592,0xfa858f83,0xbb293029,0xc4373e35,0xe22a302a,0x7b000000,0x82000000,0x1a000000,
+    0xc04e5a4e,0xc64c584b,0xcd1b1a1a,0xff857a7a,0xffb6b3b3,0xffcac9c9,0xffa8a8a8,0xff868786,0xff888f88,0xffb2bcb1,0xffc3c9c2,0xfc919e90,0xc44b5449,0x63000000,
+    0xff8a9d88,0xffd3ebd1,0xfaa0b69e,0xfa595c54,0xff594c4c,0xff6f6666,0xffb6b3b3,0xffcbcaca,0xffa4a5a4,0xff7b827b,0xff8d9b8c,0xffb6c5b5,0xfe92a791,0x9f1a201a,
+    0xc31e221e,0xffc2dbc1,0xffd1e9cf,0xffc9e1c7,0xff9fb59e,0xff91978c,0xff5a4d4d,0xff6f6666,0xffb6b3b3,0xffc9c8c8,0xff9ea39e,0xff5d685d,0xff87a385,0xaf1b221b,
+    0x41000000,0xf4748673,0xffcde6cc,0xffc9e0c7,0xffc4dac2,0xffbad1b8,0xff90a58f,0xff8d9187,0xff5d5251,0xff6f6767,0xffbdbbbb,0xff878d87,0xff5d6f5c,0xb4171d17,
+    0x25000000,0xae171a16,0xffbcd2bb,0xffc4dcc3,0xffbfd5bd,0xffbad0b8,0xffb5cab3,0xffaabfa9,0xff849682,0xff8a8f85,0xff5e5958,0xff898b89,0xff606c5e,0xba131713,
+    0x1f000000,0x49000000,0xf46a7a69,0xffbcd2bb,0xffbbd1b9,0xffb6cbb4,0xffb0c5af,0xffacbfaa,0xffa6baa5,0xff9caf9b,0xff50574d,0xff868584,0xff616c60,0xbc101310,
+    0x17000000,0x29000000,0x64000000,0xdb363f35,0xfd819580,0xffacc0aa,0xffadc1ab,0xffa8bca6,0xffa3b6a1,0xff9cae9a,0xff7e907c,0xff626361,0xff656d65,0xbd0c0f0c,
+    0xe000000,0x1b000000,0x2c000000,0x41000000,0x83000000,0xdd303830,0xfd758774,0xff9eb19c,0xff9eb09c,0xff99aa97,0xff93a491,0xff505c4f,0xff697168,0xba080a08,
+    0x7000000,0x10000000,0x1b000000,0x2b000000,0x3b000000,0x4d000000,0x84000000,0xdc252d25,0xfd687766,0xff8fa18d,0xff8e9f8d,0xff758573,0xff414a41,0x99060806,
+    0x4000000,0x7000000,0xf000000,0x18000000,0x24000000,0x31000000,0x40000000,0x4f000000,0x84000000,0xda232923,0xfc495447,0xff7a8a78,0xfd2a3128,0x88000000,
+    0x1000000,0x3000000,0x7000000,0xb000000,0x13000000,0x1c000000,0x26000000,0x32000000,0x40000000,0x4c000000,0x6d000000,0xa9050605,0x830f120d,0x42000000
 };
@@ -4063,13 +4123,13 @@ static const QRgb forward_data[] = {
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xff000000,0x8d4e5455,0x13000000,0x3000000,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xffffffff,0xfd151617,0x9f454b4c,0x18000000,0x3000000,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xffffffff,0xffffffff,0xfe151718,0xa0454a4b,0x18000000,0x3000000,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xff000000,0xff000000,0xff000000,0xff000000,0xffffffff,0xffffffff,0xfff2f2f2,0xfe151718,0xa0454a4b,0x18000000,0x3000000,0xffffff,
-    0xffffff,0xffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfff5f5f5,0xffe9e9e9,0xfe151718,0xa0454a4b,0x18000000,0x3000000,
-    0x1000000,0xffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffeaeaea,0xffcecece,0xffc8c8c8,0xef35393a,0x41000000,0xe000000,
-    0x1000000,0xffffff,0xff000000,0xfff3f3f3,0xffdbdbdb,0xffe5e5e5,0xfff8f8f8,0xffececec,0xffc9c9c9,0xffbfbfbf,0xfe151717,0xc12e3132,0x57000000,0x15000000,
-    0x1000000,0x1000000,0xff000000,0xff000000,0xff000000,0xff000000,0xfff7f7f7,0xffd1d1d1,0xffbfbfbf,0xfe151717,0xcd2c2f2f,0x82000000,0x3d000000,0xd000000,
-    0x1000000,0xffffff,0x24000000,0x6b000000,0x8f000000,0xff000000,0xfff2f2f2,0xffbfbfbf,0xfe151717,0xcd2c2f2f,0x85000000,0x45000000,0x14000000,0x2000000,
-    0x1000000,0xffffff,0xc000000,0x24000000,0x30000000,0xff000000,0xffe5e5e5,0xfe151717,0xcd2c2f2f,0x85000000,0x45000000,0x14000000,0x2000000,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xff000000,0xce2b2e2f,0x86000000,0x45000000,0x14000000,0x2000000,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xff000000,0x8d606667,0x13000000,0x3000000,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xffffffff,0xfd202223,0x9f575d5e,0x18000000,0x3000000,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xffffffff,0xffffffff,0xfe202324,0xa0575c5d,0x18000000,0x3000000,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xff000000,0xff000000,0xff000000,0xff000000,0xffffffff,0xffffffff,0xfff4f4f4,0xfe202324,0xa0575c5d,0x18000000,0x3000000,0xffffff,
+    0xffffff,0xffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfff7f7f7,0xffededed,0xfe202324,0xa0575c5d,0x18000000,0x3000000,
+    0x1000000,0xffffff,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffeeeeee,0xffd6d6d6,0xffd1d1d1,0xef464a4b,0x41000000,0xe000000,
+    0x1000000,0xffffff,0xff000000,0xfff5f5f5,0xffe1e1e1,0xffe9e9e9,0xfff9f9f9,0xffefefef,0xffd1d1d1,0xffc9c9c9,0xfe202323,0xc13e4142,0x57000000,0x15000000,
+    0x1000000,0x1000000,0xff000000,0xff000000,0xff000000,0xff000000,0xfff8f8f8,0xffd8d8d8,0xffc9c9c9,0xfe202323,0xcd3c3f3f,0x82000000,0x3d000000,0xd000000,
+    0x1000000,0xffffff,0x24000000,0x6b000000,0x8f000000,0xff000000,0xfff4f4f4,0xffc9c9c9,0xfe202323,0xcd3c3f3f,0x85000000,0x45000000,0x14000000,0x2000000,
+    0x1000000,0xffffff,0xc000000,0x24000000,0x30000000,0xff000000,0xffe9e9e9,0xfe202323,0xcd3c3f3f,0x85000000,0x45000000,0x14000000,0x2000000,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xff000000,0xce3b3e3f,0x86000000,0x45000000,0x14000000,0x2000000,0xffffff,0xffffff,
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x24000000,0x6b000000,0x7b000000,0x45000000,0x14000000,0x2000000,0xffffff,0xffffff,0xffffff,
@@ -4080,13 +4140,13 @@ static const QRgb forward_inactive_data[] = {
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x7f000000,0x7f000000,0x46515151,0x9000000,0x1000000,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x7f000000,0x7fffffff,0x7e161616,0x4f484848,0xc000000,0x1000000,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x7f000000,0x7fffffff,0x7fffffff,0x7f161616,0x50484848,0xc000000,0x1000000,0xffffff,0xffffff,
-    0xffffff,0xffffff,0x7f000000,0x7f000000,0x7f000000,0x7f000000,0x7fffffff,0x7fffffff,0x7ff2f2f2,0x7f161616,0x50484848,0xc000000,0x1000000,0xffffff,
-    0xffffff,0xffffff,0x7f000000,0x7fffffff,0x7fffffff,0x7fffffff,0x7fffffff,0x7fffffff,0x7ff5f5f5,0x7fe9e9e9,0x7f161616,0x50484848,0xc000000,0x1000000,
-    0xffffff,0xffffff,0x7f000000,0x7fffffff,0x7fffffff,0x7fffffff,0x7fffffff,0x7fffffff,0x7feaeaea,0x7fcecece,0x7fc8c8c8,0x77373737,0x20000000,0x7000000,
-    0xffffff,0xffffff,0x7f000000,0x7ff3f3f3,0x7fdbdbdb,0x7fe5e5e5,0x7ff8f8f8,0x7fececec,0x7fc9c9c9,0x7fbfbfbf,0x7f161616,0x60303030,0x2b000000,0xa000000,
-    0xffffff,0xffffff,0x7f000000,0x7f000000,0x7f000000,0x7f000000,0x7ff7f7f7,0x7fd1d1d1,0x7fbfbfbf,0x7f161616,0x662d2d2d,0x41000000,0x1e000000,0x6000000,
-    0xffffff,0xffffff,0x12000000,0x35000000,0x47000000,0x7f000000,0x7ff2f2f2,0x7fbfbfbf,0x7f161616,0x662d2d2d,0x42000000,0x22000000,0xa000000,0x1000000,
-    0xffffff,0xffffff,0x6000000,0x12000000,0x18000000,0x7f000000,0x7fe5e5e5,0x7f161616,0x662d2d2d,0x42000000,0x22000000,0xa000000,0x1000000,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x7f000000,0x7f000000,0x672d2d2d,0x43000000,0x22000000,0xa000000,0x1000000,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x7f000000,0x7f000000,0x46636363,0x9000000,0x1000000,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x7f000000,0x7fffffff,0x7e222222,0x4f5a5a5a,0xc000000,0x1000000,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x7f000000,0x7fffffff,0x7fffffff,0x7f222222,0x505a5a5a,0xc000000,0x1000000,0xffffff,0xffffff,
+    0xffffff,0xffffff,0x7f000000,0x7f000000,0x7f000000,0x7f000000,0x7fffffff,0x7fffffff,0x7ff4f4f4,0x7f222222,0x505a5a5a,0xc000000,0x1000000,0xffffff,
+    0xffffff,0xffffff,0x7f000000,0x7fffffff,0x7fffffff,0x7fffffff,0x7fffffff,0x7fffffff,0x7ff7f7f7,0x7fededed,0x7f222222,0x505a5a5a,0xc000000,0x1000000,
+    0xffffff,0xffffff,0x7f000000,0x7fffffff,0x7fffffff,0x7fffffff,0x7fffffff,0x7fffffff,0x7feeeeee,0x7fd6d6d6,0x7fd1d1d1,0x77484848,0x20000000,0x7000000,
+    0xffffff,0xffffff,0x7f000000,0x7ff5f5f5,0x7fe1e1e1,0x7fe9e9e9,0x7ff9f9f9,0x7fefefef,0x7fd1d1d1,0x7fc9c9c9,0x7f222222,0x60404040,0x2b000000,0xa000000,
+    0xffffff,0xffffff,0x7f000000,0x7f000000,0x7f000000,0x7f000000,0x7ff8f8f8,0x7fd8d8d8,0x7fc9c9c9,0x7f222222,0x663d3d3d,0x41000000,0x1e000000,0x6000000,
+    0xffffff,0xffffff,0x12000000,0x35000000,0x47000000,0x7f000000,0x7ff4f4f4,0x7fc9c9c9,0x7f222222,0x663d3d3d,0x42000000,0x22000000,0xa000000,0x1000000,
+    0xffffff,0xffffff,0x6000000,0x12000000,0x18000000,0x7f000000,0x7fe9e9e9,0x7f222222,0x663d3d3d,0x42000000,0x22000000,0xa000000,0x1000000,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x7f000000,0x7f000000,0x673d3d3d,0x43000000,0x22000000,0xa000000,0x1000000,0xffffff,0xffffff,
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x12000000,0x35000000,0x3d000000,0x22000000,0xa000000,0x1000000,0xffffff,0xffffff,0xffffff,
@@ -4098,12 +4158,12 @@ static const QRgb fullscreen_data[] = {
     0x5f000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0x86000000,0x7a000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0x93000000,
-    0x7e000000,0xffffffff,0xffffffff,0xffffffff,0xfeeaeaea,0xd8111111,0xa9000000,0x95000000,0xcc353535,0xfff9f9f9,0xffffffff,0xffffffff,0xffffffff,0xc1000000,
-    0x86000000,0xffffffff,0xffffffff,0xffffffff,0xfda7a7a7,0xe0000000,0xb9000000,0xa0000000,0xbe000000,0xfaacacac,0xffffffff,0xffffffff,0xffffffff,0xd3000000,
-    0x88000000,0xffffffff,0xfff9f9f9,0xfdaaaaaa,0xfee3e3e3,0xf6a1a1a1,0xbf000000,0xa7000000,0xeba8a8a8,0xfde4e4e4,0xfca8a8a8,0xffe9e9e9,0xffffffff,0xd6000000,
-    0x77000000,0xffffffff,0xe0303030,0xe3000000,0xf6a2a2a2,0xee888888,0xb9000000,0xa1000000,0xdf919191,0xefa6a6a6,0xda000000,0xe70f0f0f,0xffffffff,0xc8000000,
+    0x7e000000,0xffffffff,0xffffffff,0xffffffff,0xfeeeeeee,0xd81b1b1b,0xa9000000,0x95000000,0xcc464646,0xfffafafa,0xffffffff,0xffffffff,0xffffffff,0xc1000000,
+    0x86000000,0xffffffff,0xffffffff,0xffffffff,0xfdb4b4b4,0xe0000000,0xb9000000,0xa0000000,0xbe000000,0xfab8b8b8,0xffffffff,0xffffffff,0xffffffff,0xd3000000,
+    0x88000000,0xffffffff,0xfffafafa,0xfdb6b6b6,0xfee8e8e8,0xf6aeaeae,0xbf000000,0xa7000000,0xebb5b5b5,0xfde8e8e8,0xfcb5b5b5,0xffededed,0xffffffff,0xd6000000,
+    0x77000000,0xffffffff,0xe0404040,0xe3000000,0xf6afafaf,0xee989898,0xb9000000,0xa1000000,0xdfa0a0a0,0xefb3b3b3,0xda000000,0xe7191919,0xffffffff,0xc8000000,
     0x55000000,0x89000000,0xac000000,0xba000000,0xc0000000,0xb9000000,0x9f000000,0x88000000,0x93000000,0xa9000000,0xb3000000,0xbc000000,0xc0000000,0xa8000000,
     0x4b000000,0x79000000,0x95000000,0x9f000000,0xa7000000,0xa1000000,0x88000000,0x74000000,0x81000000,0x94000000,0x9a000000,0xa4000000,0xaa000000,0x93000000,
-    0x68000000,0xffffffff,0xc0131313,0xbc000000,0xeba8a8a8,0xdf919191,0x93000000,0x81000000,0xd4999999,0xe6acacac,0xba000000,0xd3333333,0xffffffff,0xa5000000,
-    0x7d000000,0xffffffff,0xfeeaeaea,0xf9aaaaaa,0xfde4e4e4,0xefa6a6a6,0xa9000000,0x94000000,0xe7acacac,0xfce5e5e5,0xfaacacac,0xfff9f9f9,0xffffffff,0xbe000000,
-    0x83000000,0xffffffff,0xffffffff,0xffffffff,0xfcacacac,0xdb000000,0xb4000000,0x99000000,0xb8000000,0xf9aaaaaa,0xffffffff,0xffffffff,0xffffffff,0xcf000000,
-    0x87000000,0xffffffff,0xffffffff,0xffffffff,0xfff9f9f9,0xec2d2d2d,0xbe000000,0xa2000000,0xc8121212,0xfeeaeaea,0xffffffff,0xffffffff,0xffffffff,0xd7000000,
+    0x68000000,0xffffffff,0xc01e1e1e,0xbc000000,0xebb5b5b5,0xdfa0a0a0,0x93000000,0x81000000,0xd4a7a7a7,0xe6b8b8b8,0xba000000,0xd3434343,0xffffffff,0xa5000000,
+    0x7d000000,0xffffffff,0xfeeeeeee,0xf9b6b6b6,0xfde8e8e8,0xefb3b3b3,0xa9000000,0x94000000,0xe7b8b8b8,0xfce9e9e9,0xfab8b8b8,0xfffafafa,0xffffffff,0xbe000000,
+    0x83000000,0xffffffff,0xffffffff,0xffffffff,0xfcb8b8b8,0xdb000000,0xb4000000,0x99000000,0xb8000000,0xf9b6b6b6,0xffffffff,0xffffffff,0xffffffff,0xcf000000,
+    0x87000000,0xffffffff,0xffffffff,0xffffffff,0xfffafafa,0xec3d3d3d,0xbe000000,0xa2000000,0xc81d1d1d,0xfeeeeeee,0xffffffff,0xffffffff,0xffffffff,0xd7000000,
     0x79000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xc3000000,0xa9000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xd0000000,
@@ -4123,14 +4183,14 @@ static const QRgb go_data[] = {
     0xff747474,0xffffffff,0xffffffff,0xfff2f4ee,0xff101606,0xff4b6a10,0xff293909,0xffb9da77,0xffa1ce4a,0xff33480b,0xff000000,0xff0c1103,0xff6d9a17,0xff8ac21d,
-    0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff2c3c0d,0xff55584e,0xff4c4c4c,0xff52544d,0xff6a7752,0xff2f3a19,0xff4b6a10,0xff293909,0xffb9da77,0xffa1ce4a,
-    0xff161e05,0xff000000,0xff283808,0xff84b91c,0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff39510c,0xff222f07,0xff000000,0xff020300,0xff32470a,
-    0xff3f580d,0xff4b6a10,0xff293909,0xffb9da77,0xffa1ce4a,0xff080b02,0xff000000,0xff374d0b,0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff8ac21d,
+    0xff8ac21d,0xff5f8514,0xff0c1103,0xff49660f,0xff2c3c0d,0xff55584e,0xff4c4c4c,0xff52544d,0xff6a7752,0xff2f3a19,0xff4b6a10,0xff293909,0xffb9da77,0xffa1ce4a,
+    0xff161e05,0xff000000,0xff283808,0xff84b91c,0xff8ac21d,0xff628a15,0xff0b1002,0xff000000,0xff121a04,0xff39510c,0xff222f07,0xff000000,0xff020300,0xff32470a,
+    0xff3f580d,0xff4b6a10,0xff293909,0xffb9da77,0xffa1ce4a,0xff080b02,0xff000000,0xff374d0b,0xff8ac21d,0xff5f8514,0xff0a0e02,0xff000000,0xff000000,0xff2f420a,
     0xff8ac21d,0xff5d8314,0xff000000,0xff000000,0xff6a9516,0xff8ac21d,0xff689216,0xff293909,0xffb9da77,0xffa1ce4a,0xff172105,0xff000000,0xff283808,0xff80b41b,
-    0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff46630f,0xff000000,0xff050701,0xff709d18,0xff8ac21d,0xff689216,0xff293909,0xffb9da77,
-    0xffa1ce4a,0xff354b0b,0xff000000,0xff0c1103,0xff6c9717,0xff719e18,0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff77a719,0xff0e1403,0xff000000,0xff1b2506,
+    0xff1c2706,0xff000000,0xff000000,0xff000000,0xff050801,0xff445f0e,0xff46630f,0xff000000,0xff050701,0xff709d18,0xff8ac21d,0xff689216,0xff293909,0xffb9da77,
+    0xffa1ce4a,0xff354b0b,0xff000000,0xff0c1103,0xff6c9717,0xff719e18,0xff1e2b06,0xff537411,0xff273708,0xff000000,0xff020200,0xff0e1403,0xff000000,0xff1b2506,
     0xff7cae1a,0xff8ac21d,0xff689216,0xff293909,0xffb9da77,0xffa1ce4a,0xff608714,0xff030401,0xff000000,0xff293909,0xff73a118,0xff83b81c,0xff8ac21d,0xff77a719,
-    0xff77a719,0xff000000,0xff000000,0xff000000,0xff435e0e,0xff8ac21d,0xff8ac21d,0xff689216,0xff293909,0xffb9da77,0xffa1ce4a,0xff88bf1d,0xff3b530c,0xff000000,
-    0xff000000,0xff101703,0xff32460a,0xff47640f,0xff3d560d,0xff182105,0xff000000,0xff000000,0xff000000,0xff77a719,0xff8ac21d,0xff8ac21d,0xff689216,0xff293909,
-    0xffb9da77,0xffa1ce4a,0xff8ac21d,0xff7fb31b,0xff3c540d,0xff020300,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff080b02,0xff77a719,
-    0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff689216,0xff293909,0xffb9da77,0xffa1ce4a,0xff8ac21d,0xff8ac21d,0xff85ba1c,0xff587c13,0xff2c3e09,0xff0f1503,0xff000000,
-    0xff080b02,0xff243308,0xff4d6c10,0xff6a9416,0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff689216,0xff293909,0xffb9da77,0xffa1ce4a,0xff8ac21d,0xff8ac21d,
+    0xff182105,0xff000000,0xff000000,0xff000000,0xff435e0e,0xff8ac21d,0xff8ac21d,0xff689216,0xff293909,0xffb9da77,0xffa1ce4a,0xff88bf1d,0xff3b530c,0xff000000,
+    0xff000000,0xff101703,0xff32460a,0xff47640f,0xff3d560d,0xff182105,0xff000000,0xff000000,0xff000000,0xff3f590d,0xff82b71b,0xff8ac21d,0xff689216,0xff293909,
+    0xffb9da77,0xffa1ce4a,0xff8ac21d,0xff7fb31b,0xff3c540d,0xff020300,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff080b02,0xff000000,
+    0xff030401,0xff709d18,0xff8ac21d,0xff689216,0xff293909,0xffb9da77,0xffa1ce4a,0xff8ac21d,0xff8ac21d,0xff85ba1c,0xff587c13,0xff2c3e09,0xff0f1503,0xff000000,
+    0xff080b02,0xff243308,0xff4d6c10,0xff6a9416,0xff233107,0xff435e0e,0xff84ba1c,0xff8ac21d,0xff689216,0xff293909,0xffb9da77,0xffa1ce4a,0xff8ac21d,0xff8ac21d,
     0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff8ac21d,0xff689216,
@@ -4172,12 +4232,12 @@ static const QRgb help_icon_data[] = {
     0x2000000,0x7000000,0x10000000,0x1b000000,0x2f000000,0x47000000,0x58000000,0x59000000,0x4b000000,0x33000000,0x1e000000,0x12000000,0x9000000,0x3000000,
-    0x5000000,0xe000000,0x1d000000,0x3b000000,0x72000000,0xbf5b5b5b,0xdf868686,0xe0858585,0xca6b6b6b,0x81000000,0x48000000,0x24000000,0x13000000,0x7000000,
-    0x7000000,0x16000000,0x30000000,0x71000000,0xeaa7a7a7,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xf9d3d3d3,0x931c1c1c,0x42000000,0x1e000000,0xb000000,
-    0xa000000,0x1c000000,0x45000000,0xb65f5f5f,0xffffffff,0xffffffff,0xfdababab,0xfd8a8a8a,0xffffffff,0xffffffff,0xdf868686,0x63000000,0x2a000000,0x10000000,
-    0xb000000,0x20000000,0x4c000000,0xb1626262,0xe9808080,0xfbbdbdbd,0xf9101010,0xfe303030,0xffffffff,0xffffffff,0xe2848484,0x6d000000,0x31000000,0x13000000,
-    0xa000000,0x1e000000,0x40000000,0x72000000,0xad000000,0xe0000000,0xfc666666,0xffeeeeee,0xffffffff,0xfbbdbdbd,0xb0000000,0x62000000,0x31000000,0x13000000,
-    0x8000000,0x17000000,0x33000000,0x5d000000,0x99000000,0xe3363636,0xffffffff,0xffffffff,0xfd9a9a9a,0xd3000000,0x8e000000,0x53000000,0x2a000000,0xf000000,
-    0x5000000,0x12000000,0x2c000000,0x55000000,0x92000000,0xe76f6f6f,0xfdbbbbbb,0xfdbbbbbb,0xe0000000,0xaa000000,0x72000000,0x41000000,0x1f000000,0xb000000,
-    0x3000000,0xc000000,0x23000000,0x48000000,0x83000000,0xd7515151,0xf6797979,0xf47a7a7a,0xbc000000,0x83000000,0x56000000,0x2e000000,0x13000000,0x6000000,
-    0x1000000,0x7000000,0x1b000000,0x3d000000,0x77000000,0xe2848484,0xffffffff,0xffffffff,0xaa000000,0x66000000,0x3f000000,0x1d000000,0x9000000,0x3000000,
-    0xffffff,0x5000000,0x18000000,0x37000000,0x6a000000,0xd9898989,0xffffffff,0xffffffff,0x93000000,0x50000000,0x2e000000,0x12000000,0x3000000,0x1000000,
+    0x5000000,0xe000000,0x1d000000,0x3b000000,0x72000000,0xbf6d6d6d,0xdf969696,0xe0959595,0xca7c7c7c,0x81000000,0x48000000,0x24000000,0x13000000,0x7000000,
+    0x7000000,0x16000000,0x30000000,0x71000000,0xeab4b4b4,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xf9dadada,0x93292929,0x42000000,0x1e000000,0xb000000,
+    0xa000000,0x1c000000,0x45000000,0xb6717171,0xffffffff,0xffffffff,0xfdb7b7b7,0xfd9a9a9a,0xffffffff,0xffffffff,0xdf969696,0x63000000,0x2a000000,0x10000000,
+    0xb000000,0x20000000,0x4c000000,0xb1747474,0xe9909090,0xfbc7c7c7,0xf91a1a1a,0xfe404040,0xffffffff,0xffffffff,0xe2949494,0x6d000000,0x31000000,0x13000000,
+    0xa000000,0x1e000000,0x40000000,0x72000000,0xad000000,0xe0000000,0xfc787878,0xfff1f1f1,0xffffffff,0xfbc7c7c7,0xb0000000,0x62000000,0x31000000,0x13000000,
+    0x8000000,0x17000000,0x33000000,0x5d000000,0x99000000,0xe3474747,0xffffffff,0xffffffff,0xfda8a8a8,0xd3000000,0x8e000000,0x53000000,0x2a000000,0xf000000,
+    0x5000000,0x12000000,0x2c000000,0x55000000,0x92000000,0xe7808080,0xfdc5c5c5,0xfdc5c5c5,0xe0000000,0xaa000000,0x72000000,0x41000000,0x1f000000,0xb000000,
+    0x3000000,0xc000000,0x23000000,0x48000000,0x83000000,0xd7636363,0xf68a8a8a,0xf48b8b8b,0xbc000000,0x83000000,0x56000000,0x2e000000,0x13000000,0x6000000,
+    0x1000000,0x7000000,0x1b000000,0x3d000000,0x77000000,0xe2949494,0xffffffff,0xffffffff,0xaa000000,0x66000000,0x3f000000,0x1d000000,0x9000000,0x3000000,
+    0xffffff,0x5000000,0x18000000,0x37000000,0x6a000000,0xd9999999,0xffffffff,0xffffffff,0x93000000,0x50000000,0x2e000000,0x12000000,0x3000000,0x1000000,
     0xffffff,0x5000000,0x14000000,0x2e000000,0x4e000000,0x7b000000,0x9a000000,0x92000000,0x62000000,0x3b000000,0x21000000,0xb000000,0xffffff,0xffffff,
@@ -4189,12 +4249,12 @@ static const QRgb home_data[] = {
     0x1000000,0x2000000,0x8000000,0x12000000,0x21000000,0x31000000,0x43000000,0x4e000000,0x51000000,0x4a000000,0x40000000,0x2e000000,0x1f000000,0x11000000,
-    0x2000000,0x8000000,0x14000000,0x27000000,0x42000000,0x5e000000,0xa36a6a6a,0xaf5f5f5f,0x8e0b0b0b,0xab585858,0x93505050,0x57000000,0x3b000000,0x22000000,
-    0x7000000,0x13000000,0x28000000,0x4c000000,0x71000000,0xb7585858,0xfff1f1f1,0xffefefef,0xdd535353,0xffa4a4a4,0xf9a6a6a6,0x88000000,0x5f000000,0x39000000,
-    0xf000000,0x23000000,0x47000000,0x75000000,0xbf525252,0xffebebeb,0xffffffff,0xffffffff,0xffe3e3e3,0xff838383,0xfc7e7e7e,0xb3000000,0x86000000,0x56000000,
-    0x1a000000,0x38000000,0x66000000,0xbd5d5d5d,0xffebebeb,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffdddddd,0xfe747474,0xd0000000,0xa4000000,0x6f000000,
-    0x21000000,0x4d000000,0xa1525252,0xffe7e7e7,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffc2c2c2,0xe8252525,0xb9000000,0x82000000,
-    0x2a000000,0x80626262,0xfccdcdcd,0xffeeeeee,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffc6c6c6,0xfe8d8d8d,0xd22f2f2f,0x8d000000,
-    0x2d000000,0x73353535,0xb74a4a4a,0xfdd8d8d8,0xffffffff,0xfff7f7f7,0xffeeeeee,0xffededed,0xfff6f6f6,0xffffffff,0xffacacac,0xee222222,0xcc181818,0x90000000,
-    0x2b000000,0x5d000000,0x94000000,0xfad6d6d6,0xffffffff,0xffa5a5a5,0xff444444,0xff3b3b3b,0xff959595,0xffffffff,0xfda1a1a1,0xdf000000,0xb9000000,0x83000000,
-    0x23000000,0x51000000,0x85000000,0xfbe0e0e0,0xffffffff,0xffb3b3b3,0xff5a5a5a,0xff525252,0xffa7a7a7,0xffffffff,0xfbb0b0b0,0xcd000000,0xa4000000,0x73000000,
-    0x1d000000,0x40000000,0x6c000000,0xddaaaaaa,0xfccecece,0xfda3a3a3,0xfa6b6b6b,0xfb676767,0xfe989898,0xfdc3c3c3,0xe87a7a7a,0xaf000000,0x87000000,0x5b000000,
+    0x2000000,0x8000000,0x14000000,0x27000000,0x42000000,0x5e000000,0xa37b7b7b,0xaf717171,0x8e131313,0xab6a6a6a,0x93626262,0x57000000,0x3b000000,0x22000000,
+    0x7000000,0x13000000,0x28000000,0x4c000000,0x71000000,0xb76a6a6a,0xfff3f3f3,0xfff2f2f2,0xdd656565,0xffb1b1b1,0xf9b3b3b3,0x88000000,0x5f000000,0x39000000,
+    0xf000000,0x23000000,0x47000000,0x75000000,0xbf646464,0xffeeeeee,0xffffffff,0xffffffff,0xffe8e8e8,0xff939393,0xfc8e8e8e,0xb3000000,0x86000000,0x56000000,
+    0x1a000000,0x38000000,0x66000000,0xbd6f6f6f,0xffeeeeee,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffe3e3e3,0xfe858585,0xd0000000,0xa4000000,0x6f000000,
+    0x21000000,0x4d000000,0xa1646464,0xffebebeb,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffcbcbcb,0xe8343434,0xb9000000,0x82000000,
+    0x2a000000,0x80747474,0xfcd5d5d5,0xfff1f1f1,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffcfcfcf,0xfe9c9c9c,0xd23f3f3f,0x8d000000,
+    0x2d000000,0x73464646,0xb75c5c5c,0xfddedede,0xffffffff,0xfff8f8f8,0xfff1f1f1,0xfff0f0f0,0xfff8f8f8,0xffffffff,0xffb8b8b8,0xee303030,0xcc242424,0x90000000,
+    0x2b000000,0x5d000000,0x94000000,0xfadddddd,0xffffffff,0xffb2b2b2,0xff565656,0xff4c4c4c,0xffa4a4a4,0xffffffff,0xfdaeaeae,0xdf000000,0xb9000000,0x83000000,
+    0x23000000,0x51000000,0x85000000,0xfbe5e5e5,0xffffffff,0xffbebebe,0xff6c6c6c,0xff646464,0xffb4b4b4,0xffffffff,0xfbbcbcbc,0xcd000000,0xa4000000,0x73000000,
+    0x1d000000,0x40000000,0x6c000000,0xddb6b6b6,0xfcd6d6d6,0xfdb0b0b0,0xfa7c7c7c,0xfb797979,0xfea6a6a6,0xfdcccccc,0xe88b8b8b,0xaf000000,0x87000000,0x5b000000,
     0x12000000,0x2c000000,0x4d000000,0x71000000,0x94000000,0xab000000,0xb8000000,0xbf000000,0xbd000000,0xb3000000,0xa2000000,0x85000000,0x61000000,0x3e000000,
@@ -4414,5 +4474,5 @@ static const QRgb library_data[] = {
     0x6000000,0x10000000,0x26000000,0x3c000000,0x3b000000,0x28000000,0x19000000,0x18000000,0x26000000,0x3a000000,0x3e000000,0x2e000000,0x1b000000,0xf000000,
-    0xa000000,0x27000000,0xb3b6b6b6,0xffffffff,0xffffffff,0x817d7d7d,0x31000000,0x30000000,0x7f7e7e7e,0xffffffff,0xffffffff,0xb8b1b1b1,0x3a000000,0x1a000000,
-    0xe000000,0x40000000,0xffffffff,0xffffffff,0xffffffff,0xa2636363,0x55000000,0x55000000,0xa0646464,0xffffffff,0xffffffff,0xffffffff,0x5a000000,0x28000000,
-    0x13000000,0x4c000000,0xffffffff,0xffffffff,0xffffffff,0xe4bebebe,0xae5c5c5c,0xae5c5c5c,0xe4bebebe,0xffffffff,0xffffffff,0xffffffff,0x6e000000,0x35000000,
+    0xa000000,0x27000000,0xb3c1c1c1,0xffffffff,0xffffffff,0x818d8d8d,0x31000000,0x30000000,0x7f8e8e8e,0xffffffff,0xffffffff,0xb8bdbdbd,0x3a000000,0x1a000000,
+    0xe000000,0x40000000,0xffffffff,0xffffffff,0xffffffff,0xa2757575,0x55000000,0x55000000,0xa0767676,0xffffffff,0xffffffff,0xffffffff,0x5a000000,0x28000000,
+    0x13000000,0x4c000000,0xffffffff,0xffffffff,0xffffffff,0xe4c8c8c8,0xae6e6e6e,0xae6e6e6e,0xe4c8c8c8,0xffffffff,0xffffffff,0xffffffff,0x6e000000,0x35000000,
     0x17000000,0x50000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0x7a000000,0x3f000000,
@@ -4422,6 +4482,6 @@ static const QRgb library_data[] = {
     0x17000000,0x4b000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0x7e000000,0x42000000,
-    0x14000000,0x37000000,0xbdadadad,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xd19c9c9c,0x68000000,0x39000000,
-    0x10000000,0x20000000,0x42000000,0x67000000,0x91000000,0xf0cccccc,0xffffffff,0xffffffff,0xf3c9c9c9,0xaf000000,0x90000000,0x71000000,0x4c000000,0x2d000000,
-    0xb000000,0x12000000,0x20000000,0x35000000,0x62000000,0xe8d3d3d3,0xffffffff,0xffffffff,0xeccfcfcf,0x84000000,0x61000000,0x4b000000,0x34000000,0x1f000000,
-    0x8000000,0xe000000,0x19000000,0x2b000000,0x4b000000,0xa8818181,0xe9d2d2d2,0xead1d1d1,0xb5787878,0x6b000000,0x4e000000,0x3a000000,0x27000000,0x15000000,
+    0x14000000,0x37000000,0xbdb9b9b9,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xd1aaaaaa,0x68000000,0x39000000,
+    0x10000000,0x20000000,0x42000000,0x67000000,0x91000000,0xf0d4d4d4,0xffffffff,0xffffffff,0xf3d1d1d1,0xaf000000,0x90000000,0x71000000,0x4c000000,0x2d000000,
+    0xb000000,0x12000000,0x20000000,0x35000000,0x62000000,0xe8dadada,0xffffffff,0xffffffff,0xecd7d7d7,0x84000000,0x61000000,0x4b000000,0x34000000,0x1f000000,
+    0x8000000,0xe000000,0x19000000,0x2b000000,0x4b000000,0xa8919191,0xe9d9d9d9,0xead8d8d8,0xb5898989,0x6b000000,0x4e000000,0x3a000000,0x27000000,0x15000000,
     0xe000000,0x19000000,0x2c000000,0x41000000,0x5b000000,0x75000000,0x89000000,0x8e000000,0x83000000,0x70000000,0x58000000,0x41000000,0x28000000,0x16000000
@@ -4494,13 +4554,13 @@ static const QRgb month_data[] = {
     0xe000000,0x18000000,0x23000000,0x2e000000,0x35000000,0x39000000,0x3b000000,0x3b000000,0x3b000000,0x39000000,0x35000000,0x2e000000,0x23000000,0x18000000,
-    0x18000000,0xff686eaf,0xff595fa6,0xff4b529f,0xff4b529f,0xff4b529f,0xff4b529f,0xff4b529f,0xff4b529f,0xff4b529f,0xff343b93,0xff070f75,0x3d000000,0x2a000000,
-    0x24000000,0xff595fa6,0xff394095,0xff222a89,0xff222a89,0xff222a89,0xff222a89,0xff222a89,0xff222a89,0xff222a89,0xff07107a,0xff050c5a,0x5a000000,0x3e000000,
-    0x2e000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffe0e0e0,0xffa1a1a1,0x74000000,0x50000000,
-    0x35000000,0xffffffff,0xff000000,0xff000000,0xffffffff,0xff000000,0xff000000,0xffffffff,0xff000000,0xff000000,0xffe0e0e0,0xffa1a1a1,0x86000000,0x5c000000,
-    0x39000000,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffe0e0e0,0xffa1a1a1,0x90000000,0x63000000,
-    0x3b000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffe0e0e0,0xffa1a1a1,0x95000000,0x66000000,
-    0x3c000000,0xffffffff,0xff000000,0xff000000,0xffffffff,0xff000000,0xff000000,0xffffffff,0xff000000,0xff000000,0xffe0e0e0,0xffa1a1a1,0x96000000,0x67000000,
-    0x3b000000,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffe0e0e0,0xffa1a1a1,0x95000000,0x66000000,
-    0x39000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffe0e0e0,0xffa1a1a1,0x90000000,0x63000000,
-    0x35000000,0xffffffff,0xfffcfcfc,0xffe0e0e0,0xffe0e0e0,0xffe0e0e0,0xffe0e0e0,0xffe0e0e0,0xffe0e0e0,0xffe0e0e0,0xffc8c8c8,0xff959595,0x86000000,0x5c000000,
-    0x2e000000,0xfff3f3f3,0xffbababa,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xff959595,0xff868686,0x74000000,0x50000000,
+    0x18000000,0xff7a7fbb,0xff6b71b3,0xff5d64ad,0xff5d64ad,0xff5d64ad,0xff5d64ad,0xff5d64ad,0xff5d64ad,0xff5d64ad,0xff454ca2,0xff0d1986,0x3d000000,0x2a000000,
+    0x24000000,0xff6b71b3,0xff4a51a4,0xff303999,0xff303999,0xff303999,0xff303999,0xff303999,0xff303999,0xff303999,0xff0d1a8b,0xff0a146c,0x5a000000,0x3e000000,
+    0x2e000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffe5e5e5,0xffaeaeae,0x74000000,0x50000000,
+    0x35000000,0xffffffff,0xff000000,0xff000000,0xffffffff,0xff000000,0xff000000,0xffffffff,0xff000000,0xff000000,0xffe5e5e5,0xffaeaeae,0x86000000,0x5c000000,
+    0x39000000,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffe5e5e5,0xffaeaeae,0x90000000,0x63000000,
+    0x3b000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffe5e5e5,0xffaeaeae,0x95000000,0x66000000,
+    0x3c000000,0xffffffff,0xff000000,0xff000000,0xffffffff,0xff000000,0xff000000,0xffffffff,0xff000000,0xff000000,0xffe5e5e5,0xffaeaeae,0x96000000,0x67000000,
+    0x3b000000,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffe5e5e5,0xffaeaeae,0x95000000,0x66000000,
+    0x39000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffe5e5e5,0xffaeaeae,0x90000000,0x63000000,
+    0x35000000,0xffffffff,0xfffdfdfd,0xffe5e5e5,0xffe5e5e5,0xffe5e5e5,0xffe5e5e5,0xffe5e5e5,0xffe5e5e5,0xffe5e5e5,0xffd1d1d1,0xffa4a4a4,0x86000000,0x5c000000,
+    0x2e000000,0xfff5f5f5,0xffc4c4c4,0xffaeaeae,0xffaeaeae,0xffaeaeae,0xffaeaeae,0xffaeaeae,0xffaeaeae,0xffaeaeae,0xffa4a4a4,0xff969696,0x74000000,0x50000000,
     0x24000000,0x3e000000,0x5a000000,0x74000000,0x86000000,0x90000000,0x95000000,0x96000000,0x95000000,0x90000000,0x86000000,0x74000000,0x5a000000,0x3e000000,
@@ -4510,15 +4570,15 @@ static const QRgb month_data[] = {
 static const QRgb mute_data[] = {
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x95020202,0xd000000,0x7000000,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x95050505,0xd000000,0x7000000,0xffffff,0xffffff,0xffffff,0xffffff,
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xff000000,0x3f000000,0x19000000,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xffc0c0c0,0xff000000,0x79000000,0x2b000000,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xffc0c0c0,0xffffffff,0xff010101,0xe3020202,0xcb020202,0x2f020202,0xbf020202,0xbf020202,0xbf020202,
-    0xff000000,0xff000000,0xff000000,0xff000000,0xffc0c0c0,0xffffffff,0xffffffff,0xff010101,0xffffffff,0xbb575757,0xbf020202,0xab5f5f5f,0xffffffff,0xbf020202,
-    0xff000000,0xffaeaeae,0xffaeaeae,0xffaeaeae,0xffe6e6e6,0xffe6e6e6,0xffe6e6e6,0xff010101,0xda4b4b4b,0xffffffff,0xab5f5f5f,0xffffffff,0xab5f5f5f,0xbf020202,
-    0xff000000,0xffc6c6c6,0xffc6c6c6,0xffc6c6c6,0xffc6c6c6,0xffc6c6c6,0xffc6c6c6,0xff000000,0xe3020202,0xbb575757,0xffffffff,0xab5f5f5f,0xbf020202,0x2f020202,
-    0xff000000,0xff7d7d7d,0xff7d7d7d,0xff7d7d7d,0xffa7a7a7,0xffa6a6a6,0xffa6a6a6,0xff010101,0xda4b4b4b,0xffffffff,0xab5f5f5f,0xffffffff,0xab5f5f5f,0xbf020202,
-    0xff000000,0xff000000,0xff000000,0xff000000,0xff6b6b6b,0xff8e8e8e,0xff8e8e8e,0xff010101,0xffffffff,0xbb575757,0xbf020202,0xab5f5f5f,0xffffffff,0xbf020202,
-    0x24000000,0x6b000000,0x8f000000,0x8f000000,0xff000000,0xff6b6b6b,0xff8e8e8e,0xff010101,0xe3020202,0xcb020202,0x2f020202,0xbf020202,0xbf020202,0xbf020202,
-    0xc000000,0x24000000,0x30000000,0x30000000,0x48000000,0xff000000,0xff6b6b6b,0xff000000,0x8f000000,0x30000000,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xffcacaca,0xff000000,0x79000000,0x2b000000,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xffcacaca,0xffffffff,0xff030303,0xe3050505,0xcb050505,0x2f050505,0xbf050505,0xbf050505,0xbf050505,
+    0xff000000,0xff000000,0xff000000,0xff000000,0xffcacaca,0xffffffff,0xffffffff,0xff030303,0xffffffff,0xbb696969,0xbf050505,0xab717171,0xffffffff,0xbf050505,
+    0xff000000,0xffbababa,0xffbababa,0xffbababa,0xffeaeaea,0xffeaeaea,0xffeaeaea,0xff030303,0xda5d5d5d,0xffffffff,0xab717171,0xffffffff,0xab717171,0xbf050505,
+    0xff000000,0xffcfcfcf,0xffcfcfcf,0xffcfcfcf,0xffcfcfcf,0xffcfcfcf,0xffcfcfcf,0xff000000,0xe3050505,0xbb696969,0xffffffff,0xab717171,0xbf050505,0x2f050505,
+    0xff000000,0xff8d8d8d,0xff8d8d8d,0xff8d8d8d,0xffb4b4b4,0xffb3b3b3,0xffb3b3b3,0xff030303,0xda5d5d5d,0xffffffff,0xab717171,0xffffffff,0xab717171,0xbf050505,
+    0xff000000,0xff000000,0xff000000,0xff000000,0xff7c7c7c,0xff9d9d9d,0xff9d9d9d,0xff030303,0xffffffff,0xbb696969,0xbf050505,0xab717171,0xffffffff,0xbf050505,
+    0x24000000,0x6b000000,0x8f000000,0x8f000000,0xff000000,0xff7c7c7c,0xff9d9d9d,0xff030303,0xe3050505,0xcb050505,0x2f050505,0xbf050505,0xbf050505,0xbf050505,
+    0xc000000,0x24000000,0x30000000,0x30000000,0x48000000,0xff000000,0xff7c7c7c,0xff000000,0x8f000000,0x30000000,0xffffff,0xffffff,0xffffff,0xffffff,
     0xffffff,0xffffff,0xffffff,0xffffff,0xc000000,0x3c000000,0xff000000,0xff000000,0x8f000000,0x30000000,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xc000000,0x3c000000,0xc8010101,0x79000000,0x2b000000,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xc000000,0x3c000000,0xc8030303,0x79000000,0x2b000000,0xffffff,0xffffff,0xffffff,0xffffff,
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xc000000,0x31000000,0x3f000000,0x19000000,0xffffff,0xffffff,0xffffff,0xffffff
@@ -4528,9 +4588,9 @@ static const QRgb new_data[] = {
     0x16000000,0x4f000000,0x9c000000,0xbb000000,0xbe000000,0xbe000000,0xc1000000,0xc4000000,0xbf000000,0xa2000000,0x6d000000,0x3e000000,0x21000000,0x12000000,
-    0x18000000,0x4b000000,0x86000000,0xffffffff,0xfffdfdfd,0xffe6e6e6,0xffa3a3a3,0xffffffff,0xf5bcbcbc,0xae000000,0x99000000,0x6e000000,0x3f000000,0x21000000,
-    0x19000000,0x4b000000,0x7c000000,0xffffffff,0xfffbfbfb,0xffdcdcdc,0xff868686,0xffffffff,0xffffffff,0xf8b6b6b6,0xb5000000,0x99000000,0x61000000,0x33000000,
-    0x1a000000,0x4d000000,0x7e000000,0xffffffff,0xfffbfbfb,0xffdcdcdc,0xff838383,0xffffffff,0xffffffff,0xffffffff,0xf8bababa,0xb0000000,0x7b000000,0x43000000,
-    0x1c000000,0x50000000,0x81000000,0xffffffff,0xfffdfdfd,0xffe4e4e4,0xff9d9d9d,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xb9000000,0x87000000,0x4c000000,
-    0x1c000000,0x51000000,0x84000000,0xffffffff,0xfffdfdfd,0xfff3f3f3,0xffcfcfcf,0xff9d9d9d,0xff838383,0xff868686,0xffa3a3a3,0xbd000000,0x8d000000,0x50000000,
-    0x1d000000,0x52000000,0x85000000,0xffffffff,0xffffffff,0xfffbfbfb,0xfff3f3f3,0xffe4e4e4,0xffdcdcdc,0xffdcdcdc,0xffe6e6e6,0xbf000000,0x8f000000,0x53000000,
-    0x1d000000,0x52000000,0x85000000,0xffffffff,0xffffffff,0xffffffff,0xfffdfdfd,0xfffdfdfd,0xfffbfbfb,0xfffbfbfb,0xfffdfdfd,0xc0000000,0x8f000000,0x54000000,
+    0x18000000,0x4b000000,0x86000000,0xffffffff,0xfffdfdfd,0xffeaeaea,0xffb0b0b0,0xffffffff,0xf5c6c6c6,0xae000000,0x99000000,0x6e000000,0x3f000000,0x21000000,
+    0x19000000,0x4b000000,0x7c000000,0xffffffff,0xfffcfcfc,0xffe2e2e2,0xff969696,0xffffffff,0xffffffff,0xf8c1c1c1,0xb5000000,0x99000000,0x61000000,0x33000000,
+    0x1a000000,0x4d000000,0x7e000000,0xffffffff,0xfffcfcfc,0xffe2e2e2,0xff939393,0xffffffff,0xffffffff,0xffffffff,0xf8c4c4c4,0xb0000000,0x7b000000,0x43000000,
+    0x1c000000,0x50000000,0x81000000,0xffffffff,0xfffdfdfd,0xffe8e8e8,0xffababab,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xb9000000,0x87000000,0x4c000000,
+    0x1c000000,0x51000000,0x84000000,0xffffffff,0xfffdfdfd,0xfff5f5f5,0xffd7d7d7,0xffababab,0xff939393,0xff969696,0xffb0b0b0,0xbd000000,0x8d000000,0x50000000,
+    0x1d000000,0x52000000,0x85000000,0xffffffff,0xffffffff,0xfffcfcfc,0xfff5f5f5,0xffe8e8e8,0xffe2e2e2,0xffe2e2e2,0xffeaeaea,0xbf000000,0x8f000000,0x53000000,
+    0x1d000000,0x52000000,0x85000000,0xffffffff,0xffffffff,0xffffffff,0xfffdfdfd,0xfffdfdfd,0xfffcfcfc,0xfffcfcfc,0xfffdfdfd,0xc0000000,0x8f000000,0x54000000,
     0x1d000000,0x52000000,0x85000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xbf000000,0x8f000000,0x53000000,
@@ -4547,12 +4607,12 @@ static const QRgb newfolder_data[] = {
     0xffffff,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xff000000,0xffe5cca8,0xffffffcc,0xffffffcc,0xffffffcc,0xffffffcc,0xffcc9952,0xff000000,0xff000000,0xff000000,0xff000000,0xffffff,0xffffff,0xffffff,
-    0xff000000,0xffe5cca8,0xffcc9952,0xffcc9952,0xffcc9952,0xffcc9952,0xffcc9952,0xffcb9852,0xffcb9852,0xffcb9852,0xffcb9852,0xff000000,0xffba8b5d,0xffffff,
-    0xff000000,0xffe5cca8,0xffcc9952,0xffcc9952,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,
-    0xff000000,0xffe5cca8,0xffcc9952,0xff000000,0xffffffff,0xfffefefe,0xfff5f5f5,0xffd3d3d3,0xffa7a7a7,0xffa2a2a2,0xffc8c8c8,0xffe9e9e9,0xfff5f5f5,0xff000000,
-    0xff000000,0xffe5cca8,0xffa35c21,0xff3f3f32,0xfffcfcc9,0xfff5f5c4,0xffdbdbaf,0xff929275,0xff66ff66,0xff66ff66,0xff838368,0xffc3c39c,0xff37372c,0x87717159,
-    0xff000000,0xffe5cca8,0xff000000,0xfffefefe,0xfff6f6c5,0xffd3d3a9,0xff929275,0xff48483a,0xff66ff66,0xff66ff66,0xff39392e,0xff73735c,0xff000000,0x6b000000,
-    0xff000000,0xffa35c21,0xff3f3f32,0xfffefecb,0xffeeeebe,0xffa6a684,0xff66ff66,0xff66ff66,0xff66ff66,0xff66ff66,0xff66ff66,0xff66ff66,0xe423231c,0x67000000,
-    0xff000000,0xffcc9952,0xffffffff,0xfffefecb,0xffececbd,0xffa1a181,0xff66ff66,0xff66ff66,0xff66ff66,0xff66ff66,0xff66ff66,0xff66ff66,0xc6000000,0x4d000000,
-    0xff000000,0xffffffff,0xffffffcc,0xfffefecb,0xfff2f2c2,0xffc8c8a0,0xff838368,0xff39392e,0xff66ff66,0xff66ff66,0xff080807,0xee151511,0x99000000,0x37000000,
-    0xffffff,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff66ff66,0xff66ff66,0xff000000,0xb0000000,0x5f000000,0x28000000,
+    0xff000000,0xffe9d4b5,0xffffffd4,0xffffffd4,0xffffffd4,0xffffffd4,0xffd4a764,0xff000000,0xff000000,0xff000000,0xff000000,0xffffff,0xffffff,0xffffff,
+    0xff000000,0xffe9d4b5,0xffd4a764,0xffd4a764,0xffd4a764,0xffd4a764,0xffd4a764,0xffd3a664,0xffd3a664,0xffd3a664,0xffd3a664,0xff000000,0xffc49a6f,0xffffff,
+    0xff000000,0xffe9d4b5,0xffd4a764,0xffd4a764,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,
+    0xff000000,0xffe9d4b5,0xffd4a764,0xff000000,0xffffffff,0xfffefefe,0xfff7f7f7,0xffdadada,0xffb4b4b4,0xffafafaf,0xffd1d1d1,0xffededed,0xfff7f7f7,0xff000000,
+    0xff000000,0xffe9d4b5,0xffb06e2f,0xff505042,0xfffdfdd1,0xfff7f7cd,0xffe1e1bb,0xffa1a186,0xff78ff78,0xff78ff78,0xff93937a,0xffccccaa,0xff48483c,0x8782826b,
+    0xff000000,0xffe9d4b5,0xff000000,0xfffefefe,0xfff8f8ce,0xffdadab6,0xffa1a186,0xff5a5a4b,0xff78ff78,0xff78ff78,0xff4a4a3e,0xff84846e,0xff000000,0x6b000000,
+    0xff000000,0xffb06e2f,0xff505042,0xfffefed3,0xfff1f1c8,0xffb3b394,0xff78ff78,0xff78ff78,0xff78ff78,0xff78ff78,0xff78ff78,0xff78ff78,0xe4313129,0x67000000,
+    0xff000000,0xffd4a764,0xffffffff,0xfffefed3,0xffefefc7,0xffaeae91,0xff78ff78,0xff78ff78,0xff78ff78,0xff78ff78,0xff78ff78,0xff78ff78,0xc6000000,0x4d000000,
+    0xff000000,0xffffffff,0xffffffd4,0xfffefed3,0xfff4f4cb,0xffd1d1ad,0xff93937a,0xff4a4a3e,0xff78ff78,0xff78ff78,0xff0f0f0d,0xee20201b,0x99000000,0x37000000,
+    0xffffff,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff78ff78,0xff78ff78,0xff000000,0xb0000000,0x5f000000,0x28000000,
     0xffffff,0x17000000,0x43000000,0x57000000,0x59000000,0x5e000000,0x6c000000,0x8c000000,0xac000000,0xb5000000,0x99000000,0x5f000000,0x34000000,0x19000000
@@ -4562,12 +4622,12 @@ static const QRgb next_data[] = {
     0x1000000,0x3000000,0x8000000,0xf000000,0x16000000,0x1b000000,0x1d000000,0x1c000000,0x19000000,0x16000000,0x12000000,0xf000000,0xb000000,0x8000000,
-    0x3000000,0xa000000,0x15000000,0x30000000,0x5c0e0e0e,0x6c0c0c0c,0x59000000,0x48000000,0x41000000,0x45000000,0x44000000,0x30000000,0x1b000000,0x12000000,
-    0x8000000,0x15000000,0x36000000,0x7d0a0a0a,0xebb8b8b8,0xffffffff,0xc9474747,0x95000000,0x8d000000,0xb13d3d3d,0xd7ababab,0x68000000,0x34000000,0x22000000,
-    0xe000000,0x2e000000,0x7c0a0a0a,0xefb2b2b2,0xffffffff,0xffffffff,0xffffffff,0xf03c3c3c,0xea2e2e2e,0xffffffff,0xffffffff,0x9f000000,0x55000000,0x37000000,
-    0x14000000,0x55000000,0xeab6b6b6,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffcfcfc,0xffffffff,0xffffffff,0xffffffff,0xca000000,0x79000000,0x4d000000,
-    0x19000000,0x65000000,0xffffffff,0xffffffff,0xffececec,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xec000000,0x9a000000,0x5f000000,
-    0x1b000000,0x55000000,0xc0383838,0xfee4e4e4,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff000000,0xb2000000,0x6d000000,
-    0x1a000000,0x44000000,0x8f000000,0xec2d2d2d,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff000000,0xc2000000,0x76000000,
-    0x17000000,0x3e000000,0x86000000,0xe62f2f2f,0xffffffff,0xffffffff,0xffffffff,0xfff8f8f8,0xffffffff,0xffffffff,0xffffffff,0xff000000,0xc2000000,0x75000000,
-    0x14000000,0x41000000,0xab3f3f3f,0xfde1e1e1,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff000000,0xb3000000,0x6c000000,
-    0x11000000,0x3e000000,0xc99a9a9a,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xed000000,0x9b000000,0x5d000000,
+    0x3000000,0xa000000,0x15000000,0x30000000,0x5c171717,0x6c141414,0x59000000,0x48000000,0x41000000,0x45000000,0x44000000,0x30000000,0x1b000000,0x12000000,
+    0x8000000,0x15000000,0x36000000,0x7d121212,0xebc3c3c3,0xffffffff,0xc9595959,0x95000000,0x8d000000,0xb14e4e4e,0xd7b7b7b7,0x68000000,0x34000000,0x22000000,
+    0xe000000,0x2e000000,0x7c121212,0xefbdbdbd,0xffffffff,0xffffffff,0xffffffff,0xf04d4d4d,0xea3e3e3e,0xffffffff,0xffffffff,0x9f000000,0x55000000,0x37000000,
+    0x14000000,0x55000000,0xeac1c1c1,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffdfdfd,0xffffffff,0xffffffff,0xffffffff,0xca000000,0x79000000,0x4d000000,
+    0x19000000,0x65000000,0xffffffff,0xffffffff,0xffefefef,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xec000000,0x9a000000,0x5f000000,
+    0x1b000000,0x55000000,0xc0494949,0xfee8e8e8,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff000000,0xb2000000,0x6d000000,
+    0x1a000000,0x44000000,0x8f000000,0xec3d3d3d,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff000000,0xc2000000,0x76000000,
+    0x17000000,0x3e000000,0x86000000,0xe63f3f3f,0xffffffff,0xffffffff,0xffffffff,0xfff9f9f9,0xffffffff,0xffffffff,0xffffffff,0xff000000,0xc2000000,0x75000000,
+    0x14000000,0x41000000,0xab505050,0xfde6e6e6,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff000000,0xb3000000,0x6c000000,
+    0x11000000,0x3e000000,0xc9a8a8a8,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xed000000,0x9b000000,0x5d000000,
     0xe000000,0x2d000000,0x63000000,0x9b000000,0xc6000000,0xea000000,0xff000000,0xff000000,0xff000000,0xff000000,0xed000000,0xbc000000,0x7a000000,0x49000000,
@@ -4621,16 +4681,16 @@ static const QRgb pass_ctable[] = {
 static const QRgb paste_data[] = {
-    0xffffff,0x0,0x0,0x0,0x38000000,0xff000000,0xff000000,0xff000000,0x57000000,0x0,0x0,0x0,0x0,0x8e8e8e,
-    0xffffff,0x0,0x8b000000,0xaa000000,0xc4141414,0xff979797,0xffadadad,0xffa1a1a1,0xcd232323,0xa9000000,0x9e000000,0x0,0x0,0x272829,
-    0xffffff,0x8e000000,0xe3292929,0xff656565,0xff1b1b1b,0xffbbbbbb,0xffbababa,0xffc2c2c2,0xff2b2b2b,0xff4e4e4e,0xe2202020,0xb0000000,0x221808,0x241907,
-    0xffffff,0xac000000,0xfc838383,0xfe7f7f7f,0xff535353,0xff565656,0xff4c4c4c,0xff4a4a4a,0xff464747,0xff5d5d5b,0xfb383839,0xda000000,0x2a1e0a,0x362812,
-    0xffffff,0xa7000000,0xff808080,0xff6e6e6e,0xff6a6a6a,0xff403f3d,0xff111010,0xff32312f,0xff24211d,0xff6b6354,0xff35332d,0xd4000000,0x291d0a,0x342711,
-    0xffffff,0xa7000000,0xff7f7f7f,0xff6e6e6e,0xff696968,0xff32322f,0xff716f6b,0xffffffff,0xffcebea4,0xfffcfaf4,0xff928b7e,0xd8110c02,0x271b08,0x352812,
-    0xffffff,0xa7000000,0xff7f7f7f,0xff6e6e6e,0xff696968,0xff333330,0xff6a6965,0xfffffff4,0xffa3947a,0xffe8e5df,0xffffffff,0xf0989080,0x71281a06,0x32c200c,
-    0xffffff,0xa7000000,0xff7f7f7f,0xff6e6e6e,0xff696968,0xff343331,0xff6a6863,0xfffffef1,0xff9e8e74,0xffeeebe7,0xffffffff,0xffffffff,0xfaa0998e,0x6a322612,
-    0xffffff,0xa7000000,0xff7f7f7f,0xff6e6e6e,0xff696968,0xff343331,0xff686560,0xfffffbee,0xffb7a890,0xffaa9d89,0xffaea290,0xffc4b8a4,0xffa8a194,0xb2130e07,
-    0xffffff,0xa7000000,0xff7f7f7f,0xff6f6f6f,0xff686767,0xff31302e,0xff64615b,0xfffcf3e6,0xffdcd1bc,0xffc7b79d,0xffc4b39a,0xfed7c7ad,0xff978f83,0xb6000000,
-    0xffffff,0xa7000000,0xff818181,0xff707071,0xff6a6968,0xff343331,0xff625c53,0xffeee2ce,0xffd9cdb9,0xffdacdb8,0xffd7cab3,0xfce6d8c3,0xf2a8a299,0xbf000000,
-    0xffffff,0xb1000000,0xf9686868,0xfe686868,0xff626262,0xff31302f,0xff665f53,0xfff3e3ca,0xffd8cab2,0xffd6c7af,0xffd3c5ac,0xfce6d7bf,0xf1aca497,0xb3000000,
-    0xffffff,0x79000000,0xe60d0d0d,0xff262626,0xff222222,0xff070809,0xff3a3630,0xff9a907f,0xff8b8171,0xff8a8070,0xff8d8373,0xff9a907f,0xff6a665f,0xb1050402,
-    0xffffff,0x0,0x6e000000,0x85000000,0x85000000,0x9018130a,0xa9342e24,0xbd2a251c,0xb81d1911,0xae1e1a11,0xae1f1b12,0xac211c14,0xae1a150d,0x68201709
+    0xffffff,0x0,0x0,0x0,0x38000000,0xff000000,0xff000000,0xff000000,0x57000000,0x0,0x0,0x0,0x0,0x9d9d9d,
+    0xffffff,0x0,0x8b000000,0xaa000000,0xc41f1f1f,0xffa5a5a5,0xffb9b9b9,0xffaeaeae,0xcd313131,0xa9000000,0x9e000000,0x0,0x0,0x363738,
+    0xffffff,0x8e000000,0xe3383838,0xff777777,0xff282828,0xffc5c5c5,0xffc4c4c4,0xffcbcbcb,0xff3b3b3b,0xff606060,0xe22e2e2e,0xb0000000,0x30240f,0x33250d,
+    0xffffff,0xac000000,0xfc939393,0xfe8f8f8f,0xff656565,0xff686868,0xff5e5e5e,0xff5c5c5c,0xff585959,0xff6f6f6d,0xfb49494a,0xda000000,0x392b12,0x47371d,
+    0xffffff,0xa7000000,0xff909090,0xff7f7f7f,0xff7b7b7b,0xff51504e,0xff1b1a1a,0xff42413f,0xff332f2a,0xff7c7566,0xff46433d,0xd4000000,0x382a12,0x45361b,
+    0xffffff,0xa7000000,0xff8f8f8f,0xff7f7f7f,0xff7a7a7a,0xff42423f,0xff82807c,0xffffffff,0xffd6c8b1,0xfffdfbf6,0xffa19a8e,0xd81b1405,0x36280f,0x46371d,
+    0xffffff,0xa7000000,0xff8f8f8f,0xff7f7f7f,0xff7a7a7a,0xff434340,0xff7b7a77,0xfffffff6,0xffb0a38b,0xffece9e4,0xffffffff,0xf0a69f90,0x7137270c,0x33c2e14,
+    0xffffff,0xa7000000,0xff8f8f8f,0xff7f7f7f,0xff7a7a7a,0xff454341,0xff7b7a75,0xfffffef3,0xffac9d85,0xfff1eeeb,0xffffffff,0xffffffff,0xfaada79d,0x6a42351d,
+    0xffffff,0xa7000000,0xff8f8f8f,0xff7f7f7f,0xff7a7a7a,0xff454341,0xff7a7772,0xfffffcf1,0xffc2b59f,0xffb6ab99,0xffbaaf9f,0xffcdc3b1,0xffb5aea3,0xb21e170d,
+    0xffffff,0xa7000000,0xff8f8f8f,0xff808080,0xff7a7979,0xff41403e,0xff76736d,0xfffdf5ea,0xffe2d8c6,0xffd0c2ab,0xffcdbea8,0xfeddd0b9,0xffa59e93,0xb6000000,
+    0xffffff,0xa7000000,0xff919191,0xff818182,0xff7b7a7a,0xff454341,0xff746e65,0xfff1e7d6,0xffdfd5c4,0xffe0d5c3,0xffddd2be,0xfceadecc,0xf2b5afa7,0xbf000000,
+    0xffffff,0xb1000000,0xf97a7a7a,0xfe7a7a7a,0xff747474,0xff41403f,0xff787165,0xfff5e8d2,0xffded2bd,0xffddd0bb,0xffdaceb8,0xfceaddc9,0xf1b8b1a5,0xb3000000,
+    0xffffff,0x79000000,0xe6161616,0xff353535,0xff303030,0xff0d0f10,0xff4b4740,0xffa89f8f,0xff9a9182,0xff9a9081,0xff9c9384,0xffa89f8f,0xff7b7871,0xb10a0805,
+    0xffffff,0x0,0x6e000000,0x85000000,0x85000000,0x90241e12,0xa9453e33,0xbd393429,0xb82a251b,0xae2b271b,0xae2d281d,0xac2f291f,0xae272016,0x682e2310
 };
@@ -4638,16 +4698,16 @@ static const QRgb paste_data[] = {
 static const QRgb paste_inactive_data[] = {
-    0xffffff,0x0,0x0,0x0,0x1c000000,0x7f000000,0x7f000000,0x7f000000,0x2b000000,0x0,0x0,0x0,0x0,0x8e8e8e,
-    0xffffff,0x0,0x45000000,0x55000000,0x62141414,0x7f979797,0x7fadadad,0x7fa1a1a1,0x66232323,0x54000000,0x4f000000,0x0,0x0,0x272829,
-    0xffffff,0x47000000,0x71292929,0x7f656565,0x7f1b1b1b,0x7fbbbbbb,0x7fbababa,0x7fc2c2c2,0x7f2b2b2b,0x7f4e4e4e,0x71202020,0x58000000,0x221808,0x241907,
-    0xffffff,0x56000000,0x7e838383,0x7f7f7f7f,0x7f535353,0x7f565656,0x7f4c4c4c,0x7f4a4a4a,0x7f464646,0x7f5c5c5c,0x7d383838,0x6d000000,0x2a1e0a,0x362812,
-    0xffffff,0x53000000,0x7f808080,0x7f6e6e6e,0x7f6a6a6a,0x7f3e3e3e,0x7f101010,0x7f303030,0x7f202020,0x7f5f5f5f,0x7f313131,0x6a000000,0x291d0a,0x342711,
-    0xffffff,0x53000000,0x7f7f7f7f,0x7f6e6e6e,0x7f686868,0x7f303030,0x7f6e6e6e,0x7fffffff,0x7fb9b9b9,0x7ff8f8f8,0x7f888888,0x6c090909,0x271b08,0x352812,
-    0xffffff,0x53000000,0x7f7f7f7f,0x7f6e6e6e,0x7f686868,0x7f313131,0x7f676767,0x7ff9f9f9,0x7f8e8e8e,0x7fe3e3e3,0x7fffffff,0x788c8c8c,0x38171717,0x11c1c1c,
-    0xffffff,0x53000000,0x7f7f7f7f,0x7f6e6e6e,0x7f686868,0x7f323232,0x7f666666,0x7ff8f8f8,0x7f898989,0x7feaeaea,0x7fffffff,0x7fffffff,0x7d979797,0x35222222,
-    0xffffff,0x53000000,0x7f7f7f7f,0x7f6e6e6e,0x7f686868,0x7f323232,0x7f646464,0x7ff6f6f6,0x7fa3a3a3,0x7f999999,0x7f9f9f9f,0x7fb4b4b4,0x7f9e9e9e,0x590d0d0d,
-    0xffffff,0x53000000,0x7f7f7f7f,0x7f6f6f6f,0x7f676767,0x7f2f2f2f,0x7f5f5f5f,0x7ff1f1f1,0x7fcccccc,0x7fb2b2b2,0x7fafafaf,0x7fc2c2c2,0x7f8d8d8d,0x5b000000,
-    0xffffff,0x53000000,0x7f818181,0x7f707070,0x7f696969,0x7f323232,0x7f5a5a5a,0x7fdedede,0x7fc9c9c9,0x7fc9c9c9,0x7fc5c5c5,0x7ed4d4d4,0x79a0a0a0,0x5f000000,
-    0xffffff,0x58000000,0x7c686868,0x7f686868,0x7f626262,0x7f303030,0x7f5c5c5c,0x7fdedede,0x7fc5c5c5,0x7fc2c2c2,0x7fbfbfbf,0x7ed2d2d2,0x78a1a1a1,0x59000000,
-    0xffffff,0x3c000000,0x730d0d0d,0x7f262626,0x7f222222,0x7f080808,0x7f353535,0x7f8c8c8c,0x7f7e7e7e,0x7f7d7d7d,0x7f808080,0x7f8c8c8c,0x7f646464,0x58030303,
-    0xffffff,0x0,0x37000000,0x42000000,0x42000000,0x48111111,0x542c2c2c,0x5e232323,0x5c171717,0x57171717,0x57181818,0x561a1a1a,0x57131313,0x34141414
+    0xffffff,0x0,0x0,0x0,0x1c000000,0x7f000000,0x7f000000,0x7f000000,0x2b000000,0x0,0x0,0x0,0x0,0x9d9d9d,
+    0xffffff,0x0,0x45000000,0x55000000,0x621f1f1f,0x7fa5a5a5,0x7fb9b9b9,0x7faeaeae,0x66313131,0x54000000,0x4f000000,0x0,0x0,0x363738,
+    0xffffff,0x47000000,0x71383838,0x7f777777,0x7f282828,0x7fc5c5c5,0x7fc4c4c4,0x7fcbcbcb,0x7f3b3b3b,0x7f606060,0x712e2e2e,0x58000000,0x30240f,0x33250d,
+    0xffffff,0x56000000,0x7e939393,0x7f8f8f8f,0x7f656565,0x7f686868,0x7f5e5e5e,0x7f5c5c5c,0x7f585858,0x7f6e6e6e,0x7d494949,0x6d000000,0x392b12,0x47371d,
+    0xffffff,0x53000000,0x7f909090,0x7f7f7f7f,0x7f7b7b7b,0x7f4f4f4f,0x7f1a1a1a,0x7f404040,0x7f2e2e2e,0x7f717171,0x7f414141,0x6a000000,0x382a12,0x45361b,
+    0xffffff,0x53000000,0x7f8f8f8f,0x7f7f7f7f,0x7f7a7a7a,0x7f404040,0x7f7f7f7f,0x7fffffff,0x7fc4c4c4,0x7ff9f9f9,0x7f989898,0x6c101010,0x36280f,0x46371d,
+    0xffffff,0x53000000,0x7f8f8f8f,0x7f7f7f7f,0x7f7a7a7a,0x7f414141,0x7f797979,0x7ffafafa,0x7f9d9d9d,0x7fe8e8e8,0x7fffffff,0x789b9b9b,0x38232323,0x1292929,
+    0xffffff,0x53000000,0x7f8f8f8f,0x7f7f7f7f,0x7f7a7a7a,0x7f424242,0x7f787878,0x7ff9f9f9,0x7f999999,0x7feeeeee,0x7fffffff,0x7fffffff,0x7da5a5a5,0x35303030,
+    0xffffff,0x53000000,0x7f8f8f8f,0x7f7f7f7f,0x7f7a7a7a,0x7f424242,0x7f767676,0x7ff8f8f8,0x7fb0b0b0,0x7fa7a7a7,0x7fadadad,0x7fbfbfbf,0x7facacac,0x59161616,
+    0xffffff,0x53000000,0x7f8f8f8f,0x7f808080,0x7f797979,0x7f3f3f3f,0x7f717171,0x7ff3f3f3,0x7fd4d4d4,0x7fbdbdbd,0x7fbbbbbb,0x7fcbcbcb,0x7f9c9c9c,0x5b000000,
+    0xffffff,0x53000000,0x7f919191,0x7f818181,0x7f7a7a7a,0x7f424242,0x7f6c6c6c,0x7fe3e3e3,0x7fd1d1d1,0x7fd1d1d1,0x7fcecece,0x7edbdbdb,0x79adadad,0x5f000000,
+    0xffffff,0x58000000,0x7c7a7a7a,0x7f7a7a7a,0x7f747474,0x7f404040,0x7f6e6e6e,0x7fe3e3e3,0x7fcecece,0x7fcbcbcb,0x7fc9c9c9,0x7ed9d9d9,0x78aeaeae,0x59000000,
+    0xffffff,0x3c000000,0x73161616,0x7f353535,0x7f303030,0x7f0f0f0f,0x7f464646,0x7f9b9b9b,0x7f8e8e8e,0x7f8d8d8d,0x7f909090,0x7f9b9b9b,0x7f767676,0x58060606,
+    0xffffff,0x0,0x37000000,0x42000000,0x42000000,0x481b1b1b,0x543c3c3c,0x5e313131,0x5c232323,0x57232323,0x57242424,0x56272727,0x571e1e1e,0x341f1f1f
 };
@@ -4683,14 +4743,14 @@ static const QRgb play_data[] = {
     0xc6000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xc6000000,
-    0xff000000,0xffd6d6d6,0xffe1e1e1,0xffdcdcdc,0xffcfcfcf,0xffcccccc,0xffcbcbcb,0xffcbcbcb,0xffc3c3c3,0xffaeaeae,0xff939393,0xff707070,0xff414141,0xff000000,
-    0xff000000,0xffc8c8c8,0xffd6d6d6,0xffc0c0c0,0xff999999,0xffa2a2a2,0xffb8b8b8,0xffbebebe,0xffb1b1b1,0xff959595,0xff707070,0xff414141,0xff2c2c2c,0xff000000,
-    0xff000000,0xffb3b3b3,0xffc1c1c1,0xff9c9c9c,0xff565656,0xffacacac,0xff878787,0xffa1a1a1,0xff989898,0xff717171,0xff464646,0xff2d2d2d,0xff232323,0xff000000,
-    0xff000000,0xff9b9b9b,0xffa6a6a6,0xff808080,0xff2f2f2f,0xffffffff,0xffa0a0a0,0xff6a6a6a,0xff6d6d6d,0xff484848,0xff2e2e2e,0xff252525,0xff1c1c1c,0xff000000,
-    0xff000000,0xff818181,0xff868686,0xff626262,0xff1e1e1e,0xffffffff,0xffffffff,0xff949494,0xff323232,0xff2c2c2c,0xff252525,0xff1d1d1d,0xff161616,0xff000000,
-    0xff000000,0xff757575,0xff737373,0xff525252,0xff181818,0xffffffff,0xffffffff,0xffffffff,0xff8f8f8f,0xff252525,0xff202020,0xff191919,0xff131313,0xff000000,
-    0xff000000,0xff757575,0xff737373,0xff525252,0xff181818,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff939393,0xff202020,0xff191919,0xff131313,0xff000000,
-    0xff000000,0xff686868,0xff606060,0xff404040,0xff121212,0xffffffff,0xffffffff,0xffffffff,0xff949494,0xff232323,0xff1c1c1c,0xff161616,0xff111111,0xff000000,
-    0xff000000,0xff494949,0xff363636,0xff252525,0xff121212,0xffffffff,0xffffffff,0xff8f8f8f,0xff1e1e1e,0xff181818,0xff141414,0xff101010,0xff0d0d0d,0xff000000,
-    0xff000000,0xff313131,0xff2b2b2b,0xff1f1f1f,0xff161616,0xffffffff,0xff898989,0xff151515,0xff131313,0xff0f0f0f,0xff0d0d0d,0xff0d0d0d,0xff0d0d0d,0xff000000,
-    0xff000000,0xff292929,0xff212121,0xff191919,0xff121212,0xff868686,0xff0d0d0d,0xff0d0d0d,0xff0d0d0d,0xff0d0d0d,0xff0d0d0d,0xff0d0d0d,0xff0d0d0d,0xff000000,
-    0xff000000,0xff212121,0xff171717,0xff0f0f0f,0xff0d0d0d,0xff0d0d0d,0xff0d0d0d,0xff0d0d0d,0xff0d0d0d,0xff0d0d0d,0xff0d0d0d,0xff0d0d0d,0xff0d0d0d,0xff000000,
+    0xff000000,0xffdddddd,0xffe6e6e6,0xffe2e2e2,0xffd7d7d7,0xffd4d4d4,0xffd3d3d3,0xffd3d3d3,0xffcccccc,0xffbababa,0xffa2a2a2,0xff818181,0xff525252,0xff000000,
+    0xff000000,0xffd1d1d1,0xffdddddd,0xffcacaca,0xffa7a7a7,0xffafafaf,0xffc3c3c3,0xffc8c8c8,0xffbdbdbd,0xffa4a4a4,0xff818181,0xff525252,0xff3c3c3c,0xff000000,
+    0xff000000,0xffbebebe,0xffcbcbcb,0xffaaaaaa,0xff686868,0xffb8b8b8,0xff979797,0xffaeaeae,0xffa6a6a6,0xff828282,0xff585858,0xff3d3d3d,0xff313131,0xff000000,
+    0xff000000,0xffa9a9a9,0xffb3b3b3,0xff909090,0xff3f3f3f,0xffffffff,0xffadadad,0xff7b7b7b,0xff7e7e7e,0xff5a5a5a,0xff3e3e3e,0xff343434,0xff292929,0xff000000,
+    0xff000000,0xff919191,0xff969696,0xff747474,0xff2b2b2b,0xffffffff,0xffffffff,0xffa3a3a3,0xff424242,0xff3c3c3c,0xff343434,0xff2a2a2a,0xff222222,0xff000000,
+    0xff000000,0xff868686,0xff848484,0xff646464,0xff242424,0xffffffff,0xffffffff,0xffffffff,0xff9e9e9e,0xff343434,0xff2e2e2e,0xff252525,0xff1e1e1e,0xff000000,
+    0xff000000,0xff868686,0xff848484,0xff646464,0xff242424,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffa2a2a2,0xff2e2e2e,0xff252525,0xff1e1e1e,0xff000000,
+    0xff000000,0xff7a7a7a,0xff727272,0xff515151,0xff1d1d1d,0xffffffff,0xffffffff,0xffffffff,0xffa3a3a3,0xff313131,0xff292929,0xff222222,0xff1b1b1b,0xff000000,
+    0xff000000,0xff5b5b5b,0xff474747,0xff343434,0xff1d1d1d,0xffffffff,0xffffffff,0xff9e9e9e,0xff2b2b2b,0xff242424,0xff1f1f1f,0xff1a1a1a,0xff161616,0xff000000,
+    0xff000000,0xff414141,0xff3b3b3b,0xff2d2d2d,0xff222222,0xffffffff,0xff999999,0xff202020,0xff1e1e1e,0xff191919,0xff161616,0xff161616,0xff161616,0xff000000,
+    0xff000000,0xff383838,0xff2f2f2f,0xff252525,0xff1d1d1d,0xff969696,0xff161616,0xff161616,0xff161616,0xff161616,0xff161616,0xff161616,0xff161616,0xff000000,
+    0xff000000,0xff2f2f2f,0xff232323,0xff191919,0xff161616,0xff161616,0xff161616,0xff161616,0xff161616,0xff161616,0xff161616,0xff161616,0xff161616,0xff000000,
     0xc6000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xc6000000
@@ -4700,13 +4760,13 @@ static const QRgb play2_data[] = {
     0xffffff,0x3000000,0x8000000,0x11000000,0x1a000000,0x1b000000,0x16000000,0x12000000,0xd000000,0x8000000,0x2000000,0xffffff,0xffffff,0xffffff,
-    0xffffff,0x6000000,0xf000000,0x33000000,0x86787878,0x57000000,0x38000000,0x2a000000,0x1f000000,0x14000000,0x8000000,0x2000000,0xffffff,0xffffff,
-    0xffffff,0x9000000,0x19000000,0x5f000000,0xffffffff,0xdc939393,0x7f000000,0x56000000,0x3e000000,0x2a000000,0x14000000,0x8000000,0x2000000,0xffffff,
-    0xffffff,0xd000000,0x24000000,0x7a000000,0xffffffff,0xffffffff,0xe98b8b8b,0xa0000000,0x72000000,0x4d000000,0x2b000000,0x14000000,0x8000000,0x2000000,
-    0xffffff,0x10000000,0x2e000000,0x88000000,0xffffffff,0xffffffff,0xffffffff,0xf2868686,0xb8000000,0x7d000000,0x47000000,0x24000000,0xf000000,0x5000000,
-    0xffffff,0x12000000,0x35000000,0x94000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xf7838383,0xb7000000,0x69000000,0x35000000,0x17000000,0x7000000,
-    0xffffff,0x14000000,0x3a000000,0x9b000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xec898989,0x84000000,0x43000000,0x1e000000,0xa000000,
-    0xffffff,0x14000000,0x3c000000,0x9e000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff7f7f7f,0xdb000000,0x88000000,0x49000000,0x22000000,0xb000000,
-    0xffffff,0x14000000,0x3a000000,0x9b000000,0xffffffff,0xffffffff,0xffffffff,0xff7f7f7f,0xfd000000,0xc4000000,0x7a000000,0x43000000,0x1e000000,0xa000000,
-    0xffffff,0x12000000,0x35000000,0x94000000,0xffffffff,0xffffffff,0xfe808080,0xf9000000,0xd7000000,0xa2000000,0x63000000,0x35000000,0x17000000,0x7000000,
-    0xffffff,0x10000000,0x2e000000,0x7f000000,0xffffffff,0xf0878787,0xd5000000,0xc2000000,0xa3000000,0x78000000,0x47000000,0x24000000,0xf000000,0x5000000,
-    0xffffff,0xd000000,0x24000000,0x57000000,0xa8606060,0x9c000000,0x94000000,0x85000000,0x6d000000,0x4d000000,0x2b000000,0x14000000,0x8000000,0x2000000,
+    0xffffff,0x6000000,0xf000000,0x33000000,0x86898989,0x57000000,0x38000000,0x2a000000,0x1f000000,0x14000000,0x8000000,0x2000000,0xffffff,0xffffff,
+    0xffffff,0x9000000,0x19000000,0x5f000000,0xffffffff,0xdca2a2a2,0x7f000000,0x56000000,0x3e000000,0x2a000000,0x14000000,0x8000000,0x2000000,0xffffff,
+    0xffffff,0xd000000,0x24000000,0x7a000000,0xffffffff,0xffffffff,0xe99a9a9a,0xa0000000,0x72000000,0x4d000000,0x2b000000,0x14000000,0x8000000,0x2000000,
+    0xffffff,0x10000000,0x2e000000,0x88000000,0xffffffff,0xffffffff,0xffffffff,0xf2969696,0xb8000000,0x7d000000,0x47000000,0x24000000,0xf000000,0x5000000,
+    0xffffff,0x12000000,0x35000000,0x94000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xf7939393,0xb7000000,0x69000000,0x35000000,0x17000000,0x7000000,
+    0xffffff,0x14000000,0x3a000000,0x9b000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xec999999,0x84000000,0x43000000,0x1e000000,0xa000000,
+    0xffffff,0x14000000,0x3c000000,0x9e000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xff8f8f8f,0xdb000000,0x88000000,0x49000000,0x22000000,0xb000000,
+    0xffffff,0x14000000,0x3a000000,0x9b000000,0xffffffff,0xffffffff,0xffffffff,0xff8f8f8f,0xfd000000,0xc4000000,0x7a000000,0x43000000,0x1e000000,0xa000000,
+    0xffffff,0x12000000,0x35000000,0x94000000,0xffffffff,0xffffffff,0xfe909090,0xf9000000,0xd7000000,0xa2000000,0x63000000,0x35000000,0x17000000,0x7000000,
+    0xffffff,0x10000000,0x2e000000,0x7f000000,0xffffffff,0xf0979797,0xd5000000,0xc2000000,0xa3000000,0x78000000,0x47000000,0x24000000,0xf000000,0x5000000,
+    0xffffff,0xd000000,0x24000000,0x57000000,0xa8727272,0x9c000000,0x94000000,0x85000000,0x6d000000,0x4d000000,0x2b000000,0x14000000,0x8000000,0x2000000,
     0xffffff,0x9000000,0x19000000,0x2f000000,0x48000000,0x5a000000,0x5a000000,0x50000000,0x3e000000,0x2a000000,0x14000000,0x8000000,0x2000000,0xffffff,
@@ -4733,15 +4793,15 @@ static const QRgb programs_data[] = {
 static const QRgb quit_icon_data[] = {
-    0xffffff,0xffffff,0xffffff,0x55e39797,0xa2e28f8f,0xdbe17f7f,0xfbe16c6c,0xded54d4d,0xabc42f2f,0x65aa1313,0xf000000,0x4000000,0xffffff,0xffffff,
-    0xffffff,0x18e39e9e,0x8fe7a3a3,0xfceea7a7,0xffeb9c9c,0xffe68282,0xffe16767,0xffda4848,0xffd63232,0xfdce1010,0xac960000,0x36490000,0x9000000,0x1000000,
-    0xffffff,0x8fe7a3a3,0xffeea8a8,0xfff8dcdc,0xfffae6e6,0xffe57f7f,0xffdf5d5d,0xffda4747,0xfff5cbcb,0xffe89f9f,0xffa70000,0xb8700000,0x2a000000,0x9000000,
-    0x55e39797,0xfceea7a7,0xfff8dcdc,0xffffffff,0xffffffff,0xfff8dcdc,0xffde5a5a,0xfff5cfcf,0xffffffff,0xffffffff,0xffd79e9e,0xfe830b0b,0x943e0000,0x22000000,
-    0xa2e28f8f,0xffeb9c9c,0xfffae6e6,0xffffffff,0xffffffff,0xffffffff,0xfffdf4f4,0xffffffff,0xffffffff,0xffffffff,0xffe3c5c5,0xff6f0d0d,0xd5410000,0x48000000,
-    0xdbe17f7f,0xffe68282,0xffe57f7f,0xfff8dcdc,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffe6c5c5,0xff750d0d,0xff510000,0xf2390000,0x69000000,
-    0xfbe16c6c,0xffe16767,0xffdf5d5d,0xffde5a5a,0xfffdf4f4,0xffffffff,0xffffffff,0xffffffff,0xfffbf2f2,0xff8a1919,0xff580000,0xff3a0000,0xfe320000,0x7e000000,
-    0xded54d4d,0xffda4848,0xffda4747,0xfff5cfcf,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffdcc5c5,0xff480d0d,0xff330000,0xf42d0000,0x87000000,
-    0xabc42f2f,0xffd42727,0xfff3c2c2,0xffffffff,0xffffffff,0xffffffff,0xfffbf2f2,0xffffffff,0xffffffff,0xffffffff,0xffc9bbbb,0xff330000,0xe3230000,0x7e000000,
-    0x65aa1313,0xfdcc0606,0xffd95f5f,0xffffffff,0xffffffff,0xffe6c6c6,0xff8b1b1b,0xffddc6c6,0xffffffff,0xffffffff,0xff7f5f5f,0xfe330000,0xc7150000,0x69000000,
-    0xf000000,0xac960000,0xffa70000,0xffbd6060,0xffdebbbb,0xff760e0e,0xff580000,0xff490e0e,0xffc9bbbb,0xff806060,0xff330000,0xdf200000,0x93000000,0x48000000,
-    0x4000000,0x36490000,0xb8700000,0xfe7d0000,0xff670000,0xff510000,0xff3a0000,0xff330000,0xff330000,0xfe330000,0xdf200000,0xa7070000,0x62000000,0x22000000,
-    0xffffff,0x9000000,0x2a000000,0x943e0000,0xd5410000,0xf2390000,0xfe320000,0xf42d0000,0xe3230000,0xc7150000,0x93000000,0x62000000,0x2a000000,0x9000000,
+    0xffffff,0xffffff,0xffffff,0x55e8a5a5,0xa2e79e9e,0xdbe68f8f,0xfbe67d7d,0xdedc5f5f,0xabcd3f3f,0x65b61e1e,0xf000000,0x4000000,0xffffff,0xffffff,
+    0xffffff,0x18e8acac,0x8febb0b0,0xfcf1b4b4,0xffeeaaaa,0xffea9292,0xffe67979,0xffe05a5a,0xffdd4242,0xfdd61a1a,0xaca40000,0x365b0000,0x9000000,0x1000000,
+    0xffffff,0x8febb0b0,0xfff1b5b5,0xfff9e2e2,0xfffbeaea,0xffe98f8f,0xffe46f6f,0xffe05959,0xfff7d3d3,0xffecadad,0xffb40000,0xb8810000,0x2a000000,0x9000000,
+    0x55e8a5a5,0xfcf1b4b4,0xfff9e2e2,0xffffffff,0xffffffff,0xfff9e2e2,0xffe36c6c,0xfff7d7d7,0xffffffff,0xffffffff,0xffddacac,0xfe931313,0x944f0000,0x22000000,
+    0xa2e79e9e,0xffeeaaaa,0xfffbeaea,0xffffffff,0xffffffff,0xffffffff,0xfffdf6f6,0xffffffff,0xffffffff,0xffffffff,0xffe8cece,0xff801616,0xd5520000,0x48000000,
+    0xdbe68f8f,0xffea9292,0xffe98f8f,0xfff9e2e2,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffeacece,0xff861616,0xff630000,0xf24a0000,0x69000000,
+    0xfbe67d7d,0xffe67979,0xffe46f6f,0xffe36c6c,0xfffdf6f6,0xffffffff,0xffffffff,0xffffffff,0xfffcf4f4,0xff9a2525,0xff6a0000,0xff4b0000,0xfe420000,0x7e000000,
+    0xdedc5f5f,0xffe05a5a,0xffe05959,0xfff7d7d7,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffe2cece,0xff5a1616,0xff430000,0xf43d0000,0x87000000,
+    0xabcd3f3f,0xffdb3636,0xfff5cbcb,0xffffffff,0xffffffff,0xffffffff,0xfffcf4f4,0xffffffff,0xffffffff,0xffffffff,0xffd1c5c5,0xff430000,0xe3310000,0x7e000000,
+    0x65b61e1e,0xfdd40c0c,0xffdf7171,0xffffffff,0xffffffff,0xffeacfcf,0xff9a2828,0xffe3cfcf,0xffffffff,0xffffffff,0xff8f7171,0xfe430000,0xc7200000,0x69000000,
+    0xf000000,0xaca40000,0xffb40000,0xffc77272,0xffe3c5c5,0xff871717,0xff6a0000,0xff5b1717,0xffd1c5c5,0xff907272,0xff430000,0xdf2e0000,0x93000000,0x48000000,
+    0x4000000,0x365b0000,0xb8810000,0xfe8d0000,0xff790000,0xff630000,0xff4b0000,0xff430000,0xff430000,0xfe430000,0xdf2e0000,0xa70d0000,0x62000000,0x22000000,
+    0xffffff,0x9000000,0x2a000000,0x944f0000,0xd5520000,0xf24a0000,0xfe420000,0xf43d0000,0xe3310000,0xc7200000,0x93000000,0x62000000,0x2a000000,0x9000000,
     0xffffff,0x1000000,0x9000000,0x22000000,0x48000000,0x69000000,0x7e000000,0x87000000,0x7e000000,0x69000000,0x48000000,0x22000000,0x9000000,0x1000000
@@ -4816,14 +4876,14 @@ static const QRgb rotate_data[] = {
     0xb000000,0x16000000,0x26000000,0x3f000000,0x5d000000,0x75000000,0x84000000,0x84000000,0x75000000,0x5d000000,0x3f000000,0x26000000,0x16000000,0xb000000,
-    0x18000000,0x2e000000,0x55000000,0x98313131,0xd9848484,0xf5bebebe,0xfdececec,0xfdececec,0xf5bebebe,0xda838383,0x99303030,0x56000000,0x2e000000,0x18000000,
-    0x2d000000,0x5b000000,0xb5505050,0xf4b8b8b8,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xf4b8b8b8,0xb6505050,0x5c000000,0x2e000000,
-    0x4c000000,0xa12e2e2e,0xf5b7b7b7,0xffffffff,0xfee3e3e3,0xf8939393,0xf24c4c4c,0xf34c4c4c,0xfa929292,0xffe2e2e2,0xffffffff,0xf6b6b6b6,0xa52d2d2d,0x50000000,
-    0x70000000,0xe0808080,0xffffffff,0xfee3e3e3,0xf0545454,0xdc000000,0xd9000000,0xde000000,0xeb000000,0xfca9a9a9,0xffe2e2e2,0xffffffff,0xe37e7e7e,0x77000000,
-    0x8e000000,0xf7bdbdbd,0xffffffff,0xf8939393,0xd5000000,0xc1000000,0xb9000000,0xc2000000,0xdc000000,0xf4000000,0xffc7c7c7,0xffffffff,0xf9bbbbbb,0x9e000000,
-    0xa1000000,0xfeebebeb,0xffffffff,0xee4d4d4d,0xc1000000,0xa4000000,0x97000000,0xa5000000,0xe68d8d8d,0xfbc2c2c2,0xffefefef,0xffdfdfdf,0xfde1e1e1,0xd7979797,
-    0xa8000000,0xfeebebeb,0xffffffff,0xec4e4e4e,0xb5000000,0x8e000000,0x7a000000,0x84000000,0xb1000000,0xf0878787,0xfdc1c1c1,0xfee0e0e0,0xee888888,0x9c000000,
-    0xa2000000,0xfabbbbbb,0xffffffff,0xf7949494,0xbd000000,0x8e000000,0x74000000,0x74000000,0x90000000,0xbd000000,0xed898989,0xec898989,0xb2000000,0x76000000,
-    0x90000000,0xeb7a7a7a,0xffffffff,0xfee3e3e3,0xe8575757,0xb3000000,0x95000000,0x8a000000,0x94000000,0xac000000,0xbe000000,0xb2000000,0x89000000,0x5a000000,
-    0x77000000,0xc5262626,0xfab4b4b4,0xffffffff,0xfee3e3e3,0xf4959595,0xdf525252,0xd5565656,0xc2000000,0xe58d8d8d,0xe38f8f8f,0xd3999999,0x70000000,0x43000000,
-    0x5c000000,0x94000000,0xd8434343,0xfab4b4b4,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xf0bbbbbb,0xaf535353,0x5a000000,0x32000000,
-    0x42000000,0x6b000000,0x9c000000,0xce242424,0xef777777,0xfbbababa,0xfeebebeb,0xfeebebeb,0xf8bcbcbc,0xe47d7d7d,0xac2b2b2b,0x6b000000,0x3d000000,0x22000000,
+    0x18000000,0x2e000000,0x55000000,0x98414141,0xd9949494,0xf5c8c8c8,0xfdefefef,0xfdefefef,0xf5c8c8c8,0xda939393,0x99404040,0x56000000,0x2e000000,0x18000000,
+    0x2d000000,0x5b000000,0xb5626262,0xf4c3c3c3,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xf4c3c3c3,0xb6626262,0x5c000000,0x2e000000,
+    0x4c000000,0xa13e3e3e,0xf5c2c2c2,0xffffffff,0xfee8e8e8,0xf8a2a2a2,0xf25e5e5e,0xf35e5e5e,0xfaa1a1a1,0xffe7e7e7,0xffffffff,0xf6c1c1c1,0xa53d3d3d,0x50000000,
+    0x70000000,0xe0909090,0xffffffff,0xfee8e8e8,0xf0666666,0xdc000000,0xd9000000,0xde000000,0xeb000000,0xfcb6b6b6,0xffe7e7e7,0xffffffff,0xe38e8e8e,0x77000000,
+    0x8e000000,0xf7c7c7c7,0xffffffff,0xf8a2a2a2,0xd5000000,0xc1000000,0xb9000000,0xc2000000,0xdc000000,0xf4000000,0xffd0d0d0,0xffffffff,0xf9c5c5c5,0x9e000000,
+    0xa1000000,0xfeeeeeee,0xffffffff,0xee5f5f5f,0xc1000000,0xa4000000,0x97000000,0xa5000000,0xe69c9c9c,0xfbcbcbcb,0xfff2f2f2,0xffe4e4e4,0xfde6e6e6,0xd7a5a5a5,
+    0xa8000000,0xfeeeeeee,0xffffffff,0xec606060,0xb5000000,0x8e000000,0x7a000000,0x84000000,0xb1000000,0xf0979797,0xfdcbcbcb,0xfee5e5e5,0xee989898,0x9c000000,
+    0xa2000000,0xfac5c5c5,0xffffffff,0xf7a3a3a3,0xbd000000,0x8e000000,0x74000000,0x74000000,0x90000000,0xbd000000,0xed999999,0xec999999,0xb2000000,0x76000000,
+    0x90000000,0xeb8b8b8b,0xffffffff,0xfee8e8e8,0xe8696969,0xb3000000,0x95000000,0x8a000000,0x94000000,0xac000000,0xbe000000,0xb2000000,0x89000000,0x5a000000,
+    0x77000000,0xc5353535,0xfabfbfbf,0xffffffff,0xfee8e8e8,0xf4a4a4a4,0xdf646464,0xd5686868,0xc2000000,0xe59c9c9c,0xe39e9e9e,0xd3a7a7a7,0x70000000,0x43000000,
+    0x5c000000,0x94000000,0xd8545454,0xfabfbfbf,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xf0c5c5c5,0xaf656565,0x5a000000,0x32000000,
+    0x42000000,0x6b000000,0x9c000000,0xce333333,0xef888888,0xfbc4c4c4,0xfeeeeeee,0xfeeeeeee,0xf8c6c6c6,0xe48d8d8d,0xac3b3b3b,0x6b000000,0x3d000000,0x22000000,
     0x2b000000,0x48000000,0x6a000000,0x8e000000,0xac000000,0xbf000000,0xc5000000,0xbf000000,0xac000000,0x90000000,0x6a000000,0x45000000,0x29000000,0x16000000
@@ -4833,13 +4893,13 @@ static const QRgb start_data[] = {
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xff000000,0xffffff,0xffffff,0xffffff,0xffffff,0x7a5a6163,0xff000000,0xff000000,0x24000000,0xc000000,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xff000000,0xffffff,0xffffff,0xffffff,0x7a5a6163,0xfc151717,0xffffffff,0xff000000,0x6b000000,0x24000000,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xff000000,0xffffff,0xffffff,0x7a5a6163,0xfc151717,0xffffffff,0xfffbfbfb,0xff000000,0x8f000000,0x30000000,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xff000000,0xffffff,0x7a5a6163,0xfc151717,0xffffffff,0xffffffff,0xfff7f7f7,0xff000000,0xff000000,0xff000000,0xff000000,0x24000000,0xc000000,
-    0xffffff,0xff000000,0x7a5a6163,0xfc151717,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,0xffffffff,0xffffffff,0xfff3f3f3,0xff000000,0x6b000000,0x24000000,
-    0xffffff,0xff000000,0xe0383d3e,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfff4f4f4,0xfff4f4f4,0xffeaeaea,0xffcbcbcb,0xff000000,0x8f000000,0x30000000,
-    0xffffff,0xff000000,0x69545a5b,0xfd151717,0xfffbfbfb,0xfffbfbfb,0xfff2f2f2,0xffd6d6d6,0xffc3c3c3,0xffbfbfbf,0xffbfbfbf,0xff000000,0x8f000000,0x30000000,
-    0xffffff,0xff000000,0xd000000,0x8344494a,0xfd151617,0xfff2f2f2,0xffe9e9e9,0xffc3c3c3,0xff000000,0xff000000,0xff000000,0xff000000,0x8f000000,0x30000000,
-    0xffffff,0xff000000,0x2000000,0x14000000,0x88414648,0xfe151718,0xffe4e4e4,0xffc2c2c2,0xff000000,0xb3000000,0x9b000000,0x8f000000,0x6b000000,0x24000000,
-    0xffffff,0xff000000,0xffffff,0x2000000,0x14000000,0x88414648,0xfe151718,0xffcbcbcb,0xff000000,0x9b000000,0x54000000,0x30000000,0x24000000,0xc000000,
-    0xffffff,0xff000000,0xffffff,0xffffff,0x2000000,0x14000000,0x88414648,0xff000000,0xff000000,0x8f000000,0x30000000,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xff000000,0xffffff,0xffffff,0xffffff,0xffffff,0x7a6c7375,0xff000000,0xff000000,0x24000000,0xc000000,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xff000000,0xffffff,0xffffff,0xffffff,0x7a6c7375,0xfc202323,0xffffffff,0xff000000,0x6b000000,0x24000000,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xff000000,0xffffff,0xffffff,0x7a6c7375,0xfc202323,0xffffffff,0xfffcfcfc,0xff000000,0x8f000000,0x30000000,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xff000000,0xffffff,0x7a6c7375,0xfc202323,0xffffffff,0xffffffff,0xfff8f8f8,0xff000000,0xff000000,0xff000000,0xff000000,0x24000000,0xc000000,
+    0xffffff,0xff000000,0x7a6c7375,0xfc202323,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,0xffffffff,0xffffffff,0xfff5f5f5,0xff000000,0x6b000000,0x24000000,
+    0xffffff,0xff000000,0xe0494e4f,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfff6f6f6,0xfff6f6f6,0xffeeeeee,0xffd3d3d3,0xff000000,0x8f000000,0x30000000,
+    0xffffff,0xff000000,0x69666c6d,0xfd202323,0xfffcfcfc,0xfffcfcfc,0xfff4f4f4,0xffdddddd,0xffcccccc,0xffc9c9c9,0xffc9c9c9,0xff000000,0x8f000000,0x30000000,
+    0xffffff,0xff000000,0xd000000,0x83565b5c,0xfd202223,0xfff4f4f4,0xffededed,0xffcccccc,0xff000000,0xff000000,0xff000000,0xff000000,0x8f000000,0x30000000,
+    0xffffff,0xff000000,0x2000000,0x14000000,0x8852585a,0xfe202324,0xffe8e8e8,0xffcbcbcb,0xff000000,0xb3000000,0x9b000000,0x8f000000,0x6b000000,0x24000000,
+    0xffffff,0xff000000,0xffffff,0x2000000,0x14000000,0x8852585a,0xfe202324,0xffd3d3d3,0xff000000,0x9b000000,0x54000000,0x30000000,0x24000000,0xc000000,
+    0xffffff,0xff000000,0xffffff,0xffffff,0x2000000,0x14000000,0x8852585a,0xff000000,0xff000000,0x8f000000,0x30000000,0xffffff,0xffffff,0xffffff,
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x2000000,0x14000000,0x45000000,0x7b000000,0x6b000000,0x24000000,0xffffff,0xffffff,0xffffff,
@@ -4935,15 +4995,15 @@ static const QRgb tgz_ctable[] = {
 
-static const QRgb to_day_data[] = {
+static const QRgb today_data[] = {
     0xe000000,0x18000000,0x23000000,0x2e000000,0x35000000,0x39000000,0x3b000000,0x3b000000,0x3b000000,0x39000000,0x35000000,0x2e000000,0x23000000,0x18000000,
-    0x18000000,0xff686eaf,0xff595fa6,0xff4b529f,0xff4b529f,0xff4b529f,0xff4b529f,0xff4b529f,0xff4b529f,0xff4b529f,0xff343b93,0xff070f75,0x3d000000,0x2a000000,
-    0x24000000,0xff595fa6,0xff394095,0xff222a89,0xff222a89,0xff222a89,0xff222a89,0xff222a89,0xff222a89,0xff222a89,0xff07107a,0xff050c5a,0x5a000000,0x3e000000,
-    0x2e000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffe0e0e0,0xffa1a1a1,0x74000000,0x50000000,
-    0x35000000,0xffffffff,0xffff5555,0xffff0000,0xffff0000,0xffff0000,0xffff0000,0xffff0000,0xffff0000,0xffffaaaa,0xffe0e0e0,0xffa1a1a1,0x86000000,0x5c000000,
-    0x39000000,0xffffffff,0xffff8e8e,0xffff5555,0xffff3939,0xffff0000,0xffff0000,0xffff5555,0xffff5555,0xffffc7c7,0xffe0e0e0,0xffa1a1a1,0x90000000,0x63000000,
-    0x3b000000,0xffffffff,0xffffffff,0xffffffff,0xffffaaaa,0xffff0000,0xffff0000,0xffffffff,0xffffffff,0xffffffff,0xffe0e0e0,0xffa1a1a1,0x95000000,0x66000000,
-    0x3c000000,0xffffffff,0xffffffff,0xffffffff,0xffffaaaa,0xffff0000,0xffff0000,0xffffffff,0xffffffff,0xffffffff,0xffe0e0e0,0xffa1a1a1,0x96000000,0x67000000,
-    0x3b000000,0xffffffff,0xffffffff,0xffffffff,0xffffaaaa,0xffff0000,0xffff0000,0xffffffff,0xffffffff,0xffffffff,0xffe0e0e0,0xffa1a1a1,0x95000000,0x66000000,
-    0x39000000,0xffffffff,0xffffffff,0xffffffff,0xffffaaaa,0xffff0000,0xffff0000,0xffffffff,0xffffffff,0xffffffff,0xffe0e0e0,0xffa1a1a1,0x90000000,0x63000000,
-    0x35000000,0xffffffff,0xfffcfcfc,0xffe0e0e0,0xffea9595,0xffff0000,0xffff0000,0xffe0e0e0,0xffe0e0e0,0xffe0e0e0,0xffc8c8c8,0xff959595,0x86000000,0x5c000000,
-    0x2e000000,0xfff3f3f3,0xffbababa,0xffa1a1a1,0xffc06b6b,0xffff0000,0xffff0000,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xff959595,0xff868686,0x74000000,0x50000000,
+    0x18000000,0xff686eaf,0xff595fa6,0xff4b529f,0xff4b529f,0xff4b529f,0xffea0404,0xffea0404,0xff4b529f,0xff4b529f,0xff343b93,0xff070f75,0x3d000000,0x2a000000,
+    0x24000000,0xff595fa6,0xffdd6c6c,0xffea0404,0xffea0404,0xff222a89,0xff222a89,0xffdd6c6c,0xffea0404,0xffdd6c6c,0xff07107a,0xff050c5a,0x5a000000,0x3e000000,
+    0x2e000000,0xffffffff,0xffea0404,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffea0404,0xffdd6c6c,0xffa1a1a1,0x74000000,0x50000000,
+    0x35000000,0xffea0404,0xffdd6c6c,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xffffffff,0xffea0404,0xffa1a1a1,0x86000000,0x5c000000,
+    0x39000000,0xffea0404,0xffffffff,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xffffffff,0xffea0404,0xffa1a1a1,0x90000000,0x63000000,
+    0x3b000000,0xffea0404,0xffffffff,0xffffffff,0xffffffff,0xff000000,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffea0404,0xffa1a1a1,0x95000000,0x66000000,
+    0x3c000000,0xffea0404,0xffffffff,0xffffffff,0xffffffff,0xff000000,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffea0404,0xffa1a1a1,0x96000000,0x67000000,
+    0x3b000000,0xffdd6c6c,0xffea0404,0xffffffff,0xffffffff,0xff000000,0xff000000,0xffffffff,0xffffffff,0xffdd6c6c,0xffea0404,0xffa1a1a1,0x95000000,0x66000000,
+    0x39000000,0xffffffff,0xffea0404,0xffdd6c6c,0xffffffff,0xff000000,0xff000000,0xffffffff,0xffdd6c6c,0xffea0404,0xffe0e0e0,0xffa1a1a1,0x90000000,0x63000000,
+    0x35000000,0xffffffff,0xfffcfcfc,0xffea0404,0xffea0404,0xffea0404,0xffea0404,0xffea0404,0xffea0404,0xffe0e0e0,0xffc8c8c8,0xff959595,0x86000000,0x5c000000,
+    0x2e000000,0xfff3f3f3,0xffbababa,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xff959595,0xff868686,0x74000000,0x50000000,
     0x24000000,0x3e000000,0x5a000000,0x74000000,0x86000000,0x90000000,0x95000000,0x96000000,0x95000000,0x90000000,0x86000000,0x74000000,0x5a000000,0x3e000000,
@@ -5087,11 +5147,11 @@ static const QRgb up_data[] = {
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x5d5e6567,0xe0383d3e,0x84545b5c,0xe000000,0x3000000,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0x5d5e6567,0xfc151717,0xffffffff,0xfd151717,0x9b474d4f,0x18000000,0x3000000,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0x5d5e6567,0xfc151717,0xffffffff,0xffffffff,0xfffbfbfb,0xfe151718,0xa0454a4b,0x18000000,0x3000000,0xffffff,0xffffff,
-    0xffffff,0xffffff,0x5d5e6567,0xfc151717,0xffffffff,0xffffffff,0xffffffff,0xfffbfbfb,0xfff2f2f2,0xfe151718,0xa0454a4b,0x18000000,0x3000000,0xffffff,
-    0xffffff,0x5d5e6567,0xfc151717,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfff2f2f2,0xffe9e9e9,0xffe4e4e4,0xfe151718,0xa0454a4b,0x18000000,0x3000000,
-    0xffffff,0xff000000,0xffffffff,0xfffbfbfb,0xfff7f7f7,0xfffefefe,0xfff4f4f4,0xffd6d6d6,0xffc3c3c3,0xffc2c2c2,0xffcbcbcb,0xff000000,0x49000000,0x13000000,
-    0xffffff,0xff000000,0xff000000,0xff000000,0xff000000,0xffffffff,0xfff4f4f4,0xffc3c3c3,0xff000000,0xff000000,0xff000000,0xff000000,0x7c000000,0x27000000,
-    0xffffff,0x24000000,0x6b000000,0x8f000000,0xff000000,0xffffffff,0xffeaeaea,0xffbfbfbf,0xff000000,0xb3000000,0x9b000000,0x8f000000,0x6b000000,0x24000000,
-    0xffffff,0xc000000,0x24000000,0x30000000,0xff000000,0xfff3f3f3,0xffcbcbcb,0xffbfbfbf,0xff000000,0x9b000000,0x54000000,0x30000000,0x24000000,0xc000000,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x5d707779,0xe0494e4f,0x84666d6e,0xe000000,0x3000000,0xffffff,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0xffffff,0x5d707779,0xfc202323,0xffffffff,0xfd202323,0x9b595f61,0x18000000,0x3000000,0xffffff,0xffffff,0xffffff,
+    0xffffff,0xffffff,0xffffff,0x5d707779,0xfc202323,0xffffffff,0xffffffff,0xfffcfcfc,0xfe202324,0xa0575c5d,0x18000000,0x3000000,0xffffff,0xffffff,
+    0xffffff,0xffffff,0x5d707779,0xfc202323,0xffffffff,0xffffffff,0xffffffff,0xfffcfcfc,0xfff4f4f4,0xfe202324,0xa0575c5d,0x18000000,0x3000000,0xffffff,
+    0xffffff,0x5d707779,0xfc202323,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfff4f4f4,0xffededed,0xffe8e8e8,0xfe202324,0xa0575c5d,0x18000000,0x3000000,
+    0xffffff,0xff000000,0xffffffff,0xfffcfcfc,0xfff8f8f8,0xfffefefe,0xfff6f6f6,0xffdddddd,0xffcccccc,0xffcbcbcb,0xffd3d3d3,0xff000000,0x49000000,0x13000000,
+    0xffffff,0xff000000,0xff000000,0xff000000,0xff000000,0xffffffff,0xfff6f6f6,0xffcccccc,0xff000000,0xff000000,0xff000000,0xff000000,0x7c000000,0x27000000,
+    0xffffff,0x24000000,0x6b000000,0x8f000000,0xff000000,0xffffffff,0xffeeeeee,0xffc9c9c9,0xff000000,0xb3000000,0x9b000000,0x8f000000,0x6b000000,0x24000000,
+    0xffffff,0xc000000,0x24000000,0x30000000,0xff000000,0xfff5f5f5,0xffd3d3d3,0xffc9c9c9,0xff000000,0x9b000000,0x54000000,0x30000000,0x24000000,0xc000000,
     0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0x8f000000,0x30000000,0xffffff,0xffffff,0xffffff,
@@ -5108,8 +5168,8 @@ static const QRgb volume_data[] = {
     0xff000000,0xff000000,0xff000000,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xff000000,0x8f000000,0xff000000,0x24000000,0x3c000000,0xff000000,0x30000000,
-    0xff000000,0xffcde6ff,0xffcee6ff,0xffcee6ff,0xffcde5ff,0xffcee5ff,0xffcee5ff,0xff000000,0x8f000000,0x48000000,0xff000000,0x3c000000,0xff000000,0x54000000,
-    0xff000000,0xff8ec5ff,0xff8ec5ff,0xff8ec5ff,0xff8ec5ff,0xff8ec4ff,0xff8ec4ff,0xff000000,0x8f000000,0x3c000000,0xff000000,0x54000000,0xff000000,0x60000000,
-    0xff000000,0xff4ea3ff,0xff4ea4ff,0xff4ea3ff,0xff4fa4ff,0xff4ea4ff,0xff4ea4ff,0xff000000,0x8f000000,0x30000000,0xff000000,0x60000000,0xff000000,0x60000000,
-    0xff000000,0xff000000,0xff000000,0xff000000,0xff1d8aff,0xff1d8aff,0xff1d8aff,0xff000000,0x8f000000,0xff000000,0x3c000000,0x54000000,0xff000000,0x60000000,
-    0x24000000,0x6b000000,0x8f000000,0x8f000000,0xff000000,0xff1d8aff,0xff1d8aff,0xff000000,0x8f000000,0x48000000,0x3c000000,0xff000000,0x48000000,0x54000000,
-    0xc000000,0x24000000,0x30000000,0x30000000,0x48000000,0xff000000,0xff1d8aff,0xff000000,0x8f000000,0x3c000000,0xff000000,0x3c000000,0x48000000,0x30000000,
+    0xff000000,0xffd5eaff,0xffd6eaff,0xffd6eaff,0xffd5e9ff,0xffd6e9ff,0xffd6e9ff,0xff000000,0x8f000000,0x48000000,0xff000000,0x3c000000,0xff000000,0x54000000,
+    0xff000000,0xff9dceff,0xff9dceff,0xff9dceff,0xff9dceff,0xff9dcdff,0xff9dcdff,0xff000000,0x8f000000,0x3c000000,0xff000000,0x54000000,0xff000000,0x60000000,
+    0xff000000,0xff60b0ff,0xff60b1ff,0xff60b0ff,0xff61b1ff,0xff60b1ff,0xff60b1ff,0xff000000,0x8f000000,0x30000000,0xff000000,0x60000000,0xff000000,0x60000000,
+    0xff000000,0xff000000,0xff000000,0xff000000,0xff2a9aff,0xff2a9aff,0xff2a9aff,0xff000000,0x8f000000,0xff000000,0x3c000000,0x54000000,0xff000000,0x60000000,
+    0x24000000,0x6b000000,0x8f000000,0x8f000000,0xff000000,0xff2a9aff,0xff2a9aff,0xff000000,0x8f000000,0x48000000,0x3c000000,0xff000000,0x48000000,0x54000000,
+    0xc000000,0x24000000,0x30000000,0x30000000,0x48000000,0xff000000,0xff2a9aff,0xff000000,0x8f000000,0x3c000000,0xff000000,0x3c000000,0x48000000,0x30000000,
     0xffffff,0xffffff,0xffffff,0xffffff,0xc000000,0x3c000000,0xff000000,0xff000000,0x8f000000,0x30000000,0x18000000,0x3c000000,0x30000000,0xc000000,
@@ -5120,16 +5180,16 @@ static const QRgb volume_data[] = {
 static const QRgb wait_data[] = {
-    0x1000000,0x1d000000,0xff996633,0xff996633,0xff996633,0xff996633,0xff996633,0xff996633,0xff996633,0xff996633,0xff996633,0x28000000,0xb000000,0x5000000,
-    0x3000000,0x15000000,0x33000000,0xff777777,0xff7e7e7e,0xff848484,0xff8c8c8c,0xff929292,0xff989898,0xff9d9d9d,0x4b000000,0x29000000,0x12000000,0x9000000,
-    0x4000000,0xc000000,0x19000000,0xff8a8a8a,0xff929292,0xff989898,0xff9f9f9f,0xffa6a6a6,0xffababab,0xffafafaf,0x41000000,0x2b000000,0x19000000,0xc000000,
-    0x4000000,0xe000000,0x1d000000,0xff777777,0xff7a7a7a,0xff7e7e7e,0xff818181,0xff828282,0xff848484,0xff828282,0x4d000000,0x32000000,0x1d000000,0xe000000,
-    0x4000000,0xe000000,0x1e000000,0xcc404040,0xff696969,0xff6a6a6a,0xff6b6b6b,0xff6b6b6b,0xff6a6a6a,0xda3c3c3c,0x51000000,0x34000000,0x1e000000,0xe000000,
-    0x4000000,0xc000000,0x1b000000,0x31000000,0xd23d3d3d,0xff686868,0xff686868,0xff686868,0xde3a3a3a,0x6a000000,0x4f000000,0x31000000,0x1b000000,0xc000000,
-    0x2000000,0xa000000,0x17000000,0x2c000000,0x48000000,0xd73e3e3e,0xff727272,0xde3d3d3d,0x78000000,0x63000000,0x48000000,0x2c000000,0x17000000,0xa000000,
-    0x2000000,0x7000000,0x13000000,0x28000000,0x41000000,0xd5474747,0xff929292,0xdc494949,0x70000000,0x5b000000,0x41000000,0x28000000,0x13000000,0x7000000,
-    0x2000000,0x7000000,0x13000000,0x28000000,0xce515151,0xffa0a0a0,0xffa9a9a9,0xffb1b1b1,0xdb5d5d5d,0x5b000000,0x41000000,0x28000000,0x13000000,0x7000000,
-    0x2000000,0xa000000,0x17000000,0xca525252,0xff9d9d9d,0xffa1a1a1,0xffa0a0a0,0xffb7b7b7,0xffbdbdbd,0xd86a6a6a,0x48000000,0x2c000000,0x17000000,0xa000000,
-    0x4000000,0xc000000,0x1b000000,0xff949494,0xff9d9d9d,0xff969696,0xff808080,0xffb7b7b7,0xffbebebe,0xffc5c5c5,0x4f000000,0x31000000,0x1b000000,0xc000000,
-    0x4000000,0xe000000,0x1e000000,0xff919191,0xff898989,0xff737373,0xff6a6a6a,0xff777777,0xff7e7e7e,0xff7c7c7c,0x51000000,0x34000000,0x1e000000,0xe000000,
-    0x4000000,0x19000000,0x3d000000,0xff5e5e5e,0xff575757,0xff535353,0xff535353,0xff535353,0xff535353,0xff535353,0x66000000,0x3c000000,0x1d000000,0xe000000,
-    0x4000000,0x23000000,0xff996633,0xff996633,0xff996633,0xff996633,0xff996633,0xff996633,0xff996633,0xff996633,0xff996633,0x3f000000,0x19000000,0xc000000
+    0x1000000,0x1d000000,0xffa77843,0xffa77843,0xffa77843,0xffa77843,0xffa77843,0xffa77843,0xffa77843,0xffa77843,0xffa77843,0x28000000,0xb000000,0x5000000,
+    0x3000000,0x15000000,0x33000000,0xff888888,0xff8e8e8e,0xff949494,0xff9b9b9b,0xffa1a1a1,0xffa6a6a6,0xffababab,0x4b000000,0x29000000,0x12000000,0x9000000,
+    0x4000000,0xc000000,0x19000000,0xff9a9a9a,0xffa1a1a1,0xffa6a6a6,0xffadadad,0xffb3b3b3,0xffb7b7b7,0xffbbbbbb,0x41000000,0x2b000000,0x19000000,0xc000000,
+    0x4000000,0xe000000,0x1d000000,0xff888888,0xff8b8b8b,0xff8e8e8e,0xff919191,0xff929292,0xff949494,0xff929292,0x4d000000,0x32000000,0x1d000000,0xe000000,
+    0x4000000,0xe000000,0x1e000000,0xcc515151,0xff7a7a7a,0xff7b7b7b,0xff7c7c7c,0xff7c7c7c,0xff7b7b7b,0xda4d4d4d,0x51000000,0x34000000,0x1e000000,0xe000000,
+    0x4000000,0xc000000,0x1b000000,0x31000000,0xd24e4e4e,0xff7a7a7a,0xff7a7a7a,0xff7a7a7a,0xde4b4b4b,0x6a000000,0x4f000000,0x31000000,0x1b000000,0xc000000,
+    0x2000000,0xa000000,0x17000000,0x2c000000,0x48000000,0xd74f4f4f,0xff838383,0xde4e4e4e,0x78000000,0x63000000,0x48000000,0x2c000000,0x17000000,0xa000000,
+    0x2000000,0x7000000,0x13000000,0x28000000,0x41000000,0xd5595959,0xffa1a1a1,0xdc5b5b5b,0x70000000,0x5b000000,0x41000000,0x28000000,0x13000000,0x7000000,
+    0x2000000,0x7000000,0x13000000,0x28000000,0xce636363,0xffadadad,0xffb6b6b6,0xffbdbdbd,0xdb6f6f6f,0x5b000000,0x41000000,0x28000000,0x13000000,0x7000000,
+    0x2000000,0xa000000,0x17000000,0xca646464,0xffababab,0xffaeaeae,0xffadadad,0xffc2c2c2,0xffc7c7c7,0xd87b7b7b,0x48000000,0x2c000000,0x17000000,0xa000000,
+    0x4000000,0xc000000,0x1b000000,0xffa3a3a3,0xffababab,0xffa4a4a4,0xff909090,0xffc2c2c2,0xffc8c8c8,0xffcecece,0x4f000000,0x31000000,0x1b000000,0xc000000,
+    0x4000000,0xe000000,0x1e000000,0xffa0a0a0,0xff999999,0xff848484,0xff7b7b7b,0xff888888,0xff8e8e8e,0xff8d8d8d,0x51000000,0x34000000,0x1e000000,0xe000000,
+    0x4000000,0x19000000,0x3d000000,0xff707070,0xff696969,0xff656565,0xff656565,0xff656565,0xff656565,0xff656565,0x66000000,0x3c000000,0x1d000000,0xe000000,
+    0x4000000,0x23000000,0xffa77843,0xffa77843,0xffa77843,0xffa77843,0xffa77843,0xffa77843,0xffa77843,0xffa77843,0xffa77843,0x3f000000,0x19000000,0xc000000
 };
@@ -5138,30 +5198,13 @@ static const QRgb week_data[] = {
     0xe000000,0x18000000,0x23000000,0x2e000000,0x35000000,0x39000000,0x3b000000,0x3b000000,0x3b000000,0x39000000,0x35000000,0x2e000000,0x23000000,0x18000000,
-    0x18000000,0xff686eaf,0xff595fa6,0xff4b529f,0xff4b529f,0xff4b529f,0xff4b529f,0xff4b529f,0xff4b529f,0xff4b529f,0xff343b93,0xff070f75,0x3d000000,0x2a000000,
-    0x24000000,0xff595fa6,0xff394095,0xff222a89,0xff222a89,0xff222a89,0xff222a89,0xff222a89,0xff222a89,0xff222a89,0xff07107a,0xff050c5a,0x5a000000,0x3e000000,
-    0x2e000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffe0e0e0,0xffa1a1a1,0x74000000,0x50000000,
-    0x35000000,0xffffffff,0xff000000,0xff000000,0xffffffff,0xff000000,0xff000000,0xffffffff,0xff000000,0xff000000,0xffe0e0e0,0xffa1a1a1,0x86000000,0x5c000000,
-    0x39000000,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffe0e0e0,0xffa1a1a1,0x90000000,0x63000000,
-    0x3b000000,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffe0e0e0,0xffa1a1a1,0x95000000,0x66000000,
-    0x3c000000,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffe0e0e0,0xffa1a1a1,0x96000000,0x67000000,
-    0x3b000000,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffe0e0e0,0xffa1a1a1,0x95000000,0x66000000,
-    0x39000000,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffe0e0e0,0xffa1a1a1,0x90000000,0x63000000,
-    0x35000000,0xffffffff,0xfffcfcfc,0xffe0e0e0,0xffe0e0e0,0xffe0e0e0,0xffe0e0e0,0xffe0e0e0,0xffe0e0e0,0xffe0e0e0,0xffc8c8c8,0xff959595,0x86000000,0x5c000000,
-    0x2e000000,0xfff3f3f3,0xffbababa,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xff959595,0xff868686,0x74000000,0x50000000,
-    0x24000000,0x3e000000,0x5a000000,0x74000000,0x86000000,0x90000000,0x95000000,0x96000000,0x95000000,0x90000000,0x86000000,0x74000000,0x5a000000,0x3e000000,
-    0x18000000,0x2a000000,0x3d000000,0x4f000000,0x5c000000,0x63000000,0x66000000,0x67000000,0x66000000,0x63000000,0x5c000000,0x4f000000,0x3d000000,0x2a000000
-};
-
-static const QRgb weeklst_data[] = {
-    0xe000000,0x18000000,0x23000000,0x2e000000,0x35000000,0x39000000,0x3b000000,0x3b000000,0x3b000000,0x39000000,0x35000000,0x2e000000,0x23000000,0x18000000,
-    0x18000000,0xff686eaf,0xff595fa6,0xff4b529f,0xff4b529f,0xff4b529f,0xff4b529f,0xff4b529f,0xff4b529f,0xff4b529f,0xff343b93,0xff070f75,0x3d000000,0x2a000000,
-    0x24000000,0xff595fa6,0xff394095,0xff222a89,0xff222a89,0xff222a89,0xff222a89,0xff222a89,0xff222a89,0xff222a89,0xff07107a,0xff050c5a,0x5a000000,0x3e000000,
-    0x2e000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffe0e0e0,0xffa1a1a1,0x74000000,0x50000000,
-    0x35000000,0xffffffff,0xff000000,0xff000000,0xff000000,0xffffffff,0xff000000,0xff000000,0xff000000,0xffffffff,0xffe0e0e0,0xffa1a1a1,0x86000000,0x5c000000,
-    0x39000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffe0e0e0,0xffa1a1a1,0x90000000,0x63000000,
-    0x3b000000,0xffffffff,0xff000000,0xff000000,0xff000000,0xffffffff,0xff000000,0xff000000,0xff000000,0xffffffff,0xffe0e0e0,0xffa1a1a1,0x95000000,0x66000000,
-    0x3c000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffe0e0e0,0xffa1a1a1,0x96000000,0x67000000,
-    0x3b000000,0xffffffff,0xff000000,0xff000000,0xff000000,0xffffffff,0xff000000,0xff000000,0xff000000,0xffffffff,0xffe0e0e0,0xffa1a1a1,0x95000000,0x66000000,
-    0x39000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffe0e0e0,0xffa1a1a1,0x90000000,0x63000000,
-    0x35000000,0xffffffff,0xfffcfcfc,0xffe0e0e0,0xffe0e0e0,0xffe0e0e0,0xffe0e0e0,0xffe0e0e0,0xffe0e0e0,0xffe0e0e0,0xffc8c8c8,0xff959595,0x86000000,0x5c000000,
-    0x2e000000,0xfff3f3f3,0xffbababa,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xffa1a1a1,0xff959595,0xff868686,0x74000000,0x50000000,
+    0x18000000,0xff7a7fbb,0xff6b71b3,0xff5d64ad,0xff5d64ad,0xff5d64ad,0xff5d64ad,0xff5d64ad,0xff5d64ad,0xff5d64ad,0xff454ca2,0xff0d1986,0x3d000000,0x2a000000,
+    0x24000000,0xff6b71b3,0xff4a51a4,0xff303999,0xff303999,0xff303999,0xff303999,0xff303999,0xff303999,0xff303999,0xff0d1a8b,0xff0a146c,0x5a000000,0x3e000000,
+    0x2e000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffe5e5e5,0xffaeaeae,0x74000000,0x50000000,
+    0x35000000,0xffffffff,0xff000000,0xff000000,0xffffffff,0xff000000,0xff000000,0xffffffff,0xff000000,0xff000000,0xffe5e5e5,0xffaeaeae,0x86000000,0x5c000000,
+    0x39000000,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffe5e5e5,0xffaeaeae,0x90000000,0x63000000,
+    0x3b000000,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffe5e5e5,0xffaeaeae,0x95000000,0x66000000,
+    0x3c000000,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffe5e5e5,0xffaeaeae,0x96000000,0x67000000,
+    0x3b000000,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffe5e5e5,0xffaeaeae,0x95000000,0x66000000,
+    0x39000000,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xffe5e5e5,0xffaeaeae,0x90000000,0x63000000,
+    0x35000000,0xffffffff,0xfffdfdfd,0xffe5e5e5,0xffe5e5e5,0xffe5e5e5,0xffe5e5e5,0xffe5e5e5,0xffe5e5e5,0xffe5e5e5,0xffd1d1d1,0xffa4a4a4,0x86000000,0x5c000000,
+    0x2e000000,0xfff5f5f5,0xffc4c4c4,0xffaeaeae,0xffaeaeae,0xffaeaeae,0xffaeaeae,0xffaeaeae,0xffaeaeae,0xffaeaeae,0xffa4a4a4,0xff969696,0x74000000,0x50000000,
     0x24000000,0x3e000000,0x5a000000,0x74000000,0x86000000,0x90000000,0x95000000,0x96000000,0x95000000,0x90000000,0x86000000,0x74000000,0x5a000000,0x3e000000,
@@ -5374,2 +5417,4 @@ static const QRgb zoom_ctable[] = {
 
+// No tr() anywhere in this file
+
 static struct EmbedImage {
@@ -5400,6 +5445,6 @@ static struct EmbedImage {
     { 14, 14, 32, (const unsigned char*)Games_data, 0, 0, TRUE, "Games" },
-    { 12, 12, 32, (const unsigned char*)Go_black_highlight_data, 0, 0, TRUE, "Go-black-highlight" },
+    { 32, 32, 32, (const unsigned char*)Go_data, 0, 0, TRUE, "Go" },
     { 12, 12, 32, (const unsigned char*)Go_black_data, 0, 0, TRUE, "Go-black" },
+    { 12, 12, 32, (const unsigned char*)Go_black_highlight_data, 0, 0, TRUE, "Go-black-highlight" },
     { 12, 12, 32, (const unsigned char*)Go_white_data, 0, 0, TRUE, "Go-white" },
-    { 32, 32, 32, (const unsigned char*)Go_data, 0, 0, TRUE, "Go" },
     { 32, 32, 32, (const unsigned char*)HelpBrowser_data, 0, 0, TRUE, "HelpBrowser" },
@@ -5417,2 +5462,3 @@ static struct EmbedImage {
     { 32, 32, 32, (const unsigned char*)PPPConnect_data, 0, 0, TRUE, "PPPConnect" },
+    { 32, 32, 32, (const unsigned char*)ParaShoot_data, 0, 0, TRUE, "ParaShoot" },
     { 32, 32, 32, (const unsigned char*)Rotation_data, 0, 0, TRUE, "Rotation" },
@@ -5455,3 +5501,2 @@ static struct EmbedImage {
     { 14, 14, 32, (const unsigned char*)done_data, 0, 0, TRUE, "done" },
-    { 14, 14, 32, (const unsigned char*)down_data, 0, 0, TRUE, "down" },
     { 14, 14, 32, (const unsigned char*)edit_data, 0, 0, TRUE, "edit" },
@@ -5509,3 +5554,3 @@ static struct EmbedImage {
     { 16, 16, 8, (const unsigned char*)tgz_data, 7, tgz_ctable, TRUE, "tgz" },
-    { 14, 14, 32, (const unsigned char*)to_day_data, 0, 0, TRUE, "to_day" },
+    { 14, 14, 32, (const unsigned char*)today_data, 0, 0, TRUE, "today" },
     { 14, 14, 32, (const unsigned char*)toys_data, 0, 0, TRUE, "toys" },
@@ -5520,3 +5565,2 @@ static struct EmbedImage {
     { 14, 14, 32, (const unsigned char*)week_data, 0, 0, TRUE, "week" },
-    { 14, 14, 32, (const unsigned char*)weeklst_data, 0, 0, TRUE, "weeklst" },
     { 14, 14, 32, (const unsigned char*)wordgame_data, 0, 0, TRUE, "wordgame" },
@@ -5526,29 +5570,33 @@ static struct EmbedImage {
     { 20, 20, 8, (const unsigned char*)zoom_data, 7, zoom_ctable, TRUE, "zoom" },
-    { 0, 0, 0, 0, 0, 0, 0, 0 }
 };
 
-static const QImage& qembed_findImage( const QString& name )
+static int cmpEmbedImage(const void *a, const void *b)
+{
+    const EmbedImage* ea = (const EmbedImage*)a;
+    const EmbedImage* eb = (const EmbedImage*)b;
+    return strcmp(ea->name,eb->name);
+}
+inline const QImage& qembed_findImage(const char* name)
 {
-    static QDict<QImage> dict;
-    QImage* img = dict.find(name);
-    if ( !img ) {
-        for (int i=0; embed_image_vec[i].data; i++) {
-        if ( 0==strcmp(embed_image_vec[i].name, name) ) {
-            img = new QImage((uchar*)embed_image_vec[i].data,
-                        embed_image_vec[i].width,
-                        embed_image_vec[i].height,
-                        embed_image_vec[i].depth,
-                        (QRgb*)embed_image_vec[i].colorTable,
-                        embed_image_vec[i].numColors,
-                        QImage::BigEndian
-                );
-            if ( embed_image_vec[i].alpha )
-                img->setAlphaBuffer(TRUE);
-            break;
-        }
-        }
-        if ( !img ) {
-            static QImage dummy;
-            return dummy;
-        }
+    EmbedImage key; key.name = name;
+    EmbedImage* r = (EmbedImage*)bsearch( &key, embed_image_vec,
+        sizeof(embed_image_vec)/sizeof(EmbedImage), sizeof(EmbedImage), cmpEmbedImage );
+    QImage* img;
+    if ( r ) {
+        img = new QImage((uchar*)r->data,
+                            r->width,
+                            r->height,
+                            r->depth,
+#ifdef _WS_QWS_
+                            (r->width*r->depth+31)/32*4,
+#endif
+                            (QRgb*)r->colorTable,
+                            r->numColors,
+                            QImage::BigEndian
+                    );
+        if ( r->alpha )
+            img->setAlphaBuffer(TRUE);
+    } else {
+        static QImage dummy;
+        img = &dummy;
     }
diff --git a/library/inputmethodinterface.h b/library/inputmethodinterface.h
index ae14218..88a121d 100644
--- a/library/inputmethodinterface.h
+++ b/library/inputmethodinterface.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -38,2 +38,3 @@ class QPixmap;
 class QObject;
+class QWSInputMethod;
 
@@ -48,2 +49,16 @@ struct InputMethodInterface : public QUnknownInterface
 
+// {70F0991C-8282-4625-A279-BD9D7D959FF6} 
+#ifndef IID_ExtInputMethod
+#define IID_ExtInputMethod QUuid( 0x70f0991c, 0x8282, 0x4625, 0xa2, 0x79, 0xbd, 0x9d, 0x7d, 0x95, 0x9f, 0xf6)
+#endif
+
+struct ExtInputMethodInterface : public QUnknownInterface
+{
+    virtual QWSInputMethod *inputMethod() = 0;
+    virtual QPixmap *icon() = 0;
+    virtual QString name() = 0;
+    virtual QWidget *widget( QWidget *parent, Qt::WFlags f )= 0;
+};
+
+
 #endif
diff --git a/library/ir.cpp b/library/ir.cpp
index 68345d1..a7cf7b1 100644
--- a/library/ir.cpp
+++ b/library/ir.cpp
@@ -1 +1,21 @@
+/**********************************************************************
+** 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.
+**
+**********************************************************************/
+
 #include "ir.h"
@@ -3,7 +23,9 @@
 #include <qstring.h>
+#ifdef QWS
 #include "qcopenvelope_qws.h"
 #include <qcopchannel_qws.h>
+#endif
 #include "applnk.h"
 
-/*! 
+/*!
   \class Ir ir.h
@@ -11,4 +33,12 @@
   infrared communication link.
-  
-  The Ir class is a small helper class to enable sending of objects over an infrared communication link.
+
+  Both \link doclnk.html DocLnk\endlink objects and files can be
+  sent to another device via the infrared link using the send()
+  function. When the send has completed the done() signal is
+  emitted.
+
+  The supported() function returns whether the device supports
+  infrared communication or not.
+
+  \ingroup qtopiaemb
 */
@@ -22,2 +52,3 @@ Ir::Ir( QObject *parent, const char *name )
 {
+#ifndef QT_NO_COP
     ch = new QCopChannel( "QPE/Obex" );
@@ -25,6 +56,8 @@ Ir::Ir( QObject *parent, const char *name )
              this, SLOT(obexMessage( const QCString &, const QByteArray &)) );
+#endif
 }
 
-/*! 
-  Returns TRUE if the system supports infrared communication.
+/*!
+  Returns TRUE if the system supports infrared communication;
+  otherwise returns FALSE.
 */
@@ -32,3 +65,5 @@ bool Ir::supported()
 {
+#ifndef QT_NO_COP
     return QCopChannel::isRegistered( "QPE/Obex" );
+#endif
 }
@@ -36,7 +71,9 @@ bool Ir::supported()
 /*!
-  Send the object in the file \a fn over the infrared link.
-  The \a description will be shown to the user while
-  sending is in progress.
-  The optional \a mimetype parameter specifies the mimetype of the object. If this parameter is not
-  set, it will be determined by the extension of the filename.
+  Sends the object in file \a fn over the infrared link. The \a
+  description is used in the text shown to the user while sending
+  is in progress. The optional \a mimetype parameter specifies the
+  mimetype of the object. If this parameter is not set, it is
+  determined by the the filename's suffix.
+
+  \sa done()
 */
@@ -46,4 +83,6 @@ void Ir::send( const QString &fn, const QString &description, const QString &mim
     filename = fn;
+#ifndef QT_NO_COP
     QCopEnvelope e("QPE/Obex", "send(QString,QString,QString)");
     e << description << filename << mimetype;
+#endif
 }
@@ -54,2 +93,4 @@ void Ir::send( const QString &fn, const QString &description, const QString &mim
   Uses the DocLnk::file() and DocLnk::type() of \a doc.
+
+  \sa done()
 */
@@ -60,5 +101,5 @@ void Ir::send( const DocLnk &doc, const QString &description )
 
-/*! 
+/*!
   \fn Ir::done( Ir *ir );
-  
+
   This signal is emitted by \a ir, when the send comand has been processed.
@@ -78,2 +119,2 @@ void Ir::obexMessage( const QCString &msg, const QByteArray &data)
 }
-    
+
diff --git a/library/ir.h b/library/ir.h
index 33eedfe..a62f91d 100644
--- a/library/ir.h
+++ b/library/ir.h
@@ -1 +1,21 @@
+/**********************************************************************
+** 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 IR_H
diff --git a/library/library.pro b/library/library.pro
index 1837b4f..af505dd 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -38,3 +38,3 @@ HEADERS	=   calendar.h \
             qpemessagebox.h \
-        backend/timeconversion.h \
+            timeconversion.h \
             qpedebug.h \
@@ -43,3 +43,3 @@ HEADERS	=   calendar.h \
             backend/categories.h \
-            backend/stringutil.h \
+            stringutil.h \
             backend/palmtoprecord.h \
@@ -56,3 +56,6 @@ HEADERS	=   calendar.h \
         finddialog.h \
-        lnkproperties.h
+        lnkproperties.h \
+        windowdecorationinterface.h \
+        textcodecinterface.h \
+        imagecodecinterface.h
         SOURCES=   calendar.cpp \
diff --git a/library/lnkproperties.cpp b/library/lnkproperties.cpp
index c020328..983c677 100644
--- a/library/lnkproperties.cpp
+++ b/library/lnkproperties.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -31,3 +31,5 @@
 #include <qpe/categorywidget.h>
+#ifdef QWS
 #include <qpe/qcopenvelope_qws.h>
+#endif
 #include <qpe/filemanager.h>
@@ -56,2 +58,4 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent )
 {
+    setCaption( tr("Properties") );
+
     QVBoxLayout *vbox = new QVBoxLayout( this );
@@ -63,6 +67,6 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent )
     if ( l->type().isEmpty() ) {
-  d->type->hide();
-  d->typeLabel->hide();
+        d->type->hide();
+        d->typeLabel->hide();
     } else {
-  d->type->setText( l->type() );
+        d->type->setText( l->type() );
     }
@@ -70,6 +74,6 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent )
     if ( l->comment().isEmpty() ) {
-  d->comment->hide();
-  d->commentLabel->hide();
+        d->comment->hide();
+        d->commentLabel->hide();
     } else {
-  d->comment->setText( l->comment() );
+        d->comment->setText( l->comment() );
     }
@@ -78,44 +82,42 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent )
     if ( lnk->type().contains('/') ) { // A document? (#### better predicate needed)
-  connect(d->unlink,SIGNAL(clicked()),this,SLOT(unlinkLnk()));
-  connect(d->duplicate,SIGNAL(clicked()),this,SLOT(duplicateLnk()));
-  connect(d->delicon,SIGNAL(clicked()),this,SLOT(unlinkIcon()));
-  
-  d->docname->setReadOnly( FALSE );
-  d->preload->hide();
-  d->spacer->hide();
-
-  // ### THIS MUST GO, FIX WIERD BUG in QLAYOUT
-  d->categoryEdit->kludge();
-
-  d->categoryEdit->setCategories( lnk->categories(),
-          "Document View",
-          tr("Document View") );
-  setupLocations();
+        connect(d->unlink,SIGNAL(clicked()),this,SLOT(unlinkLnk()));
+        connect(d->duplicate,SIGNAL(clicked()),this,SLOT(duplicateLnk()));
+
+        d->docname->setReadOnly( FALSE );
+        d->preload->hide();
+        d->spacer->hide();
+
+        // ### THIS MUST GO, FIX WIERD BUG in QLAYOUT
+        d->categoryEdit->kludge();
+
+        d->categoryEdit->setCategories( lnk->categories(),
+                                        "Document View",
+                                        tr("Document View") );
+        setupLocations();
     } else {
-  d->unlink->hide();
-  d->duplicate->hide();
-  d->beam->hide();
-  d->hline->hide();
-  d->locationLabel->hide();
-  d->locationCombo->hide();
-
-  // Can't edit categories, since the app .desktop files are global,
-  // possibly read-only.
-  d->categoryEdit->hide();
-
-  d->docname->setReadOnly( TRUE );
-
-  if ( l->property("CanFastload") == "0" )
-      d->preload->hide();
-
-  Config cfg("Launcher");
-  cfg.setGroup("Preload");
-  QStringList apps = cfg.readListEntry("Apps",',');
-  d->preload->setChecked( apps.contains(l->exec()) );
-  if ( Global::isBuiltinCommand(lnk->exec()) )
-      d->preload->hide(); // builtins are always fast
-
-  currentLocation = 0; // apps not movable (yet)
+        d->unlink->hide();
+        d->duplicate->hide();
+        d->beam->hide();
+        d->hline->hide();
+         d->locationLabel->hide();
+        d->locationCombo->hide();
+
+        // Can't edit categories, since the app .desktop files are global,
+        // possibly read-only.
+         d->categoryEdit->hide();
+
+        d->docname->setReadOnly( TRUE );
+
+        if ( l->property("CanFastload") == "0" )
+            d->preload->hide();
+
+        Config cfg("Launcher");
+        cfg.setGroup("Preload");
+        QStringList apps = cfg.readListEntry("Apps",',');
+        d->preload->setChecked( apps.contains(l->exec()) );
+        if ( Global::isBuiltinCommand(lnk->exec()) )
+            d->preload->hide(); // builtins are always fast
+
+        currentLocation = 0; // apps not movable (yet)
     }
-    setCaption( l->file());
 }
@@ -129,27 +131,8 @@ void LnkProperties::unlinkLnk()
     if ( QPEMessageBox::confirmDelete( this, tr("Delete"), lnk->name() ) ) {
-        if ( QFile::exists(lnk->file()) )
-            lnk->removeFiles();
-        else
-            QMessageBox::warning( this, tr("Delete"), tr("File does not exist.") );
-        if ( QFile::exists(lnk->file()) ) {
-            QMessageBox::warning( this, tr("Delete"), tr("File deletion failed.") );
-        } else {
-            reject();
-        }
-    }
-}
-
-
-/*
- * remove only the link from documents, not also the file
- */
-void LnkProperties::unlinkIcon() 
-{
-    if ( QPEMessageBox::confirmDelete( this, tr("Delete Icon and leave file"), lnk->name() ) ) {
-  lnk->removeLinkFile();
-        if ( QFile::exists(lnk->linkFile()) ) {
-      QMessageBox::warning( this, tr("Delete"), tr("Icon deletion failed.") );
-  } else {
-      reject();
-  }
+        lnk->removeFiles();
+        if ( QFile::exists(lnk->file()) ) {
+            QMessageBox::warning( this, tr("Delete"), tr("File deletion failed.") );
+        } else {
+            reject();
+        }
     }
@@ -171,30 +154,35 @@ void LnkProperties::setupLocations()
     for ( ; it.current(); ++it ) {
-  // we add 10k to the file size so we are sure we can also save the desktop file
-  if ( (*it)->availBlocks() * (*it)->blockSize() > fileSize + 10000 ) {
-      if ( (*it)->isRemovable() ||
-     (*it)->disk() == "/dev/mtdblock1" ||
-     (*it)->disk() == "/dev/mtdblock/1" || (*it)->disk().left(13) == "/dev/mtdblock" ||
-     (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs" ) {
-    d->locationCombo->insertItem( (*it)->name(), index );
-    locations.append( ((*it)->isRemovable() || (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs" ? (*it)->path() : homeDir) );
-    if ( lnk->file().contains( (*it)->path() ) ) {
-         d->locationCombo->setCurrentItem( index );
-         currentLocation = index;
-    }
-    index++;
-      } else if ( (*it)->name().contains( tr("Hard Disk") ) &&
-      homeDir.contains( (*it)->path() ) &&
-      (*it)->path().length() > hardDiskHome.length() ) {
-    hardDiskHome = (*it)->name();
-    hardDiskPath = (*it)->path();
-      }
-  }
+        // we add 10k to the file size so we are sure we can also save the desktop file
+        if ( (ulong)(*it)->availBlocks() * (ulong)(*it)->blockSize() > (ulong)fileSize + 10000 ) {
+            if ( (*it)->isRemovable() ||
+                 (*it)->disk() == "/dev/mtdblock1" ||
+                 (*it)->disk() == "/dev/mtdblock/1" ||
+                 (*it)->disk().left(13) == "/dev/mtdblock" ||
+                 (*it)->disk() == "/dev/mtdblock6" || 
+                 (*it)->disk() == "tmpfs" ) {
+                d->locationCombo->insertItem( (*it)->name(), index );
+                locations.append( ( ((*it)->isRemovable() || 
+                                    (*it)->disk() == "/dev/mtdblock6" ||
+                                    (*it)->disk() == "tmpfs" )
+                                    ? (*it)->path() : homeDir) );
+                if ( lnk->file().contains( (*it)->path() ) ) {
+                     d->locationCombo->setCurrentItem( index );
+                     currentLocation = index;
+                }
+                index++;
+            } else if ( (*it)->name().contains( tr("Hard Disk") ) &&
+                        homeDir.contains( (*it)->path() ) &&
+                        (*it)->path().length() > hardDiskHome.length() ) {
+                hardDiskHome = (*it)->name();
+                hardDiskPath = (*it)->path();
+            }
+        }
     }
     if ( !hardDiskHome.isEmpty() ) {
-  d->locationCombo->insertItem( hardDiskHome );
-  locations.append( hardDiskPath );
-  if ( currentLocation == -1 ) { // assume it's the hard disk
-      d->locationCombo->setCurrentItem( index );
-      currentLocation = index;
-  }
+        d->locationCombo->insertItem( hardDiskHome );
+        locations.append( hardDiskPath );
+        if ( currentLocation == -1 ) { // assume it's the hard disk
+            d->locationCombo->setCurrentItem( index );
+            currentLocation = index;
+        }
     }
@@ -207,9 +195,9 @@ void LnkProperties::duplicateLnk()
     if ( d->docname->text() == lnk->name() )
-  newdoc.setName(tr("Copy of ")+d->docname->text());
+        newdoc.setName(tr("Copy of ")+d->docname->text());
     else
-  newdoc.setName(d->docname->text());
+        newdoc.setName(d->docname->text());
 
     if ( !copyFile( newdoc ) ) {
-  QMessageBox::warning( this, tr("Duplicate"), tr("File copy failed.") );
-  return;
+        QMessageBox::warning( this, tr("Duplicate"), tr("File copy failed.") );
+        return;
     }
@@ -224,4 +212,4 @@ bool LnkProperties::moveLnk()
     if ( !copyFile( newdoc ) ) {
-  QMessageBox::warning( this, tr("Details"), tr("Moving Document failed.") );
-  return FALSE;
+        QMessageBox::warning( this, tr("Details"), tr("Moving Document failed.") );
+        return FALSE;
     }
@@ -237,2 +225,4 @@ void LnkProperties::beamLnk()
     DocLnk doc( *((DocLnk *)lnk) );
+    doc.setName(d->docname->text());
+    reject();
     ir.send( doc, doc.comment() );
@@ -246,3 +236,3 @@ bool LnkProperties::copyFile( DocLnk &newdoc )
     if ( extnPos > 0 )
-  fileExtn = lnk->file().mid( extnPos );
+        fileExtn = lnk->file().mid( extnPos );
 
@@ -252,11 +242,11 @@ bool LnkProperties::copyFile( DocLnk &newdoc )
      QString fn = locations[ d->locationCombo->currentItem() ]
-      + "/Documents/" + newdoc.type() + "/" + safename;
+                  + "/Documents/" + newdoc.type() + "/" + safename;
     if ( QFile::exists(fn + fileExtn) || QFile::exists(fn + linkExtn) ) {
-  int n=1;
-  QString nn = fn + "_" + QString::number(n);
-  while ( QFile::exists(nn+fileExtn) || QFile::exists(nn+linkExtn) ) {
-      n++;
-      nn = fn + "_" + QString::number(n);
-  }
-  fn = nn;
+        int n=1;
+        QString nn = fn + "_" + QString::number(n);
+        while ( QFile::exists(nn+fileExtn) || QFile::exists(nn+linkExtn) ) {
+            n++;
+            nn = fn + "_" + QString::number(n);
+        }
+        fn = nn;
     }
@@ -268,3 +258,3 @@ bool LnkProperties::copyFile( DocLnk &newdoc )
     if ( !fm.copyFile( *lnk, newdoc ) )
-  return FALSE;
+        return FALSE;
     return TRUE;
@@ -275,38 +265,42 @@ void LnkProperties::done(int ok)
     if ( ok ) {
-  bool changed=FALSE;
-  if ( lnk->name() != d->docname->text() ) {
-      lnk->setName(d->docname->text());
-      changed=TRUE;
-  }
-  if ( d->categoryEdit->isVisible() ) {
-      QArray<int> tmp = d->categoryEdit->newCategories();
-      if ( lnk->categories() != tmp ) {
-    lnk->setCategories( tmp );
-    changed = TRUE;
-      }
-  }
-  if ( d->preload->isHidden() && d->locationCombo->currentItem() != currentLocation ) {
-      moveLnk();
-  } else if ( changed ) {
-      lnk->writeLink();
-  }
-
-  if ( !d->preload->isHidden() ) {
-      Config cfg("Launcher");
-      cfg.setGroup("Preload");
-      QStringList apps = cfg.readListEntry("Apps",',');
-      QString exe = lnk->exec();
-      if ( apps.contains(exe) != d->preload->isChecked() ) {
-    if ( d->preload->isChecked() ) {
-        apps.append(exe);
-        QCopEnvelope e("QPE/Application/"+exe.local8Bit(),
-           "enablePreload()");
-    } else {
-        apps.remove(exe);
-        QCopEnvelope e("QPE/Application/"+exe.local8Bit(),
-           "quitIfInvisible()");
-    }
-    cfg.writeEntry("Apps",apps,',');
-      }
-  }
+        bool changed=FALSE;
+        if ( lnk->name() != d->docname->text() ) {
+            lnk->setName(d->docname->text());
+            changed=TRUE;
+        }
+        if ( d->categoryEdit->isVisible() ) {
+            QArray<int> tmp = d->categoryEdit->newCategories();
+            if ( lnk->categories() != tmp ) {
+                lnk->setCategories( tmp );
+                changed = TRUE;
+            }
+        }
+        if ( d->preload->isHidden() && d->locationCombo->currentItem() != currentLocation ) {
+            moveLnk();
+        } else if ( changed ) {
+            lnk->writeLink();
+        }
+
+        if ( !d->preload->isHidden() ) {
+            Config cfg("Launcher");
+            cfg.setGroup("Preload");
+            QStringList apps = cfg.readListEntry("Apps",',');
+            QString exe = lnk->exec();
+            if ( apps.contains(exe) != d->preload->isChecked() ) {
+                if ( d->preload->isChecked() ) {
+                    apps.append(exe);
+#ifndef QT_NO_COP
+                    QCopEnvelope e("QPE/Application/"+exe.local8Bit(),
+                                   "enablePreload()");
+#endif
+                } else {
+                    apps.remove(exe);
+#ifndef QT_NO_COP
+                    QCopEnvelope e("QPE/Application/"+exe.local8Bit(),
+                                   "quitIfInvisible()");
+#endif
+                }
+                cfg.writeEntry("Apps",apps,',');
+            }
+        }
     }
diff --git a/library/lnkproperties.h b/library/lnkproperties.h
index 38da5b2..a88fc10 100644
--- a/library/lnkproperties.h
+++ b/library/lnkproperties.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -54,3 +54,2 @@ private slots:
     void unlinkLnk();
-    void unlinkIcon();
     void duplicateLnk();
diff --git a/library/lnkpropertiesbase_p.ui b/library/lnkpropertiesbase_p.ui
index 3d35bca..e7139e7 100644
--- a/library/lnkpropertiesbase_p.ui
+++ b/library/lnkpropertiesbase_p.ui
@@ -13,3 +13,3 @@
             <y>0</y>
-            <width>297</width>
+            <width>289</width>
             <height>449</height>
@@ -158,2 +158,6 @@
                     </property>
+                    <property>
+                        <name>whatsThis</name>
+                        <string>The media the document resides on.</string>
+                    </property>
                 </widget>
@@ -176,2 +180,6 @@
                     </property>
+                    <property>
+                        <name>whatsThis</name>
+                        <string>The name of this document.</string>
+                    </property>
                 </widget>
@@ -258,2 +266,6 @@
                     </property>
+                    <property>
+                        <name>whatsThis</name>
+                        <string>Preload this application so that it is available instantly.</string>
+                    </property>
                 </widget>
@@ -329,20 +341,7 @@
                     </property>
-                </widget>
-        
-                <widget>
-                    <class>QPushButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>delicon</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Del Icon</string>
-                    </property>
-                    <property stdset="1">
-                        <name>autoDefault</name>
-                        <bool>false</bool>
+                    <property>
+                        <name>whatsThis</name>
+                        <string>Delete this document.</string>
                     </property>
-                        </widget>
-
+                </widget>
                 <widget>
@@ -361,2 +360,6 @@
                     </property>
+                    <property>
+                        <name>whatsThis</name>
+                        <string>Make a copy of this document.</string>
+                    </property>
                 </widget>
@@ -380,2 +383,6 @@
                     </property>
+                    <property>
+                        <name>whatsThis</name>
+                        <string>Beam this document to another device.</string>
+                    </property>
                 </widget>
diff --git a/library/menubutton.cpp b/library/menubutton.cpp
index 6b1fa2b..f5c832c 100644
--- a/library/menubutton.cpp
+++ b/library/menubutton.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -27,3 +27,20 @@
 
-  Similar in function to a QComboBox.
+  When the user presses the menubutton's pushbutton, the menu pops up.
+  A menu is composed of menu items each of which has a string label,
+  and optionally an icon.
+
+  The index of the item that the user's input device (e.g. stylus) is
+  pointing at is the currentItem(), whose text is available using
+  currentText().
+
+  Menu items are inserted with the \link MenuButton::MenuButton()
+  constructor\endlink, insertItem() or insertItems(). Separators are
+  inserted with insertSeparator(). All the items in the menu can be
+  removed by calling clear().
+
+  Items can be selected programmatically using select(). When a menu
+  item is selected (programmatically or by the user), the selected()
+  signal is emitted.
+
+  \ingroup qtopiaemb
 */
@@ -31,5 +48,5 @@
 /*!
-  \fn void MenuButton::selected(int index)
+  \overload void MenuButton::selected(int index)
 
-  This signal is emitted when the item at \a index is selected.
+  This signal is emitted when the item at position \a index is selected.
 */
@@ -39,3 +56,3 @@
 
-  This signal is emitted when the item with the given \a text is selected.
+  This signal is emitted when the item with the label \a text is selected.
 */
@@ -44,4 +61,6 @@
 /*!
-  Constructs a MenuButton with the given \a items added (see insertItems()).
-  The standard \a parent an \a name arguments are passed to the base class.
+  Constructs a MenuButton. A menu item is created (see insertItem()
+  and insertItems()) for each string in the \a items string list. The
+  standard \a parent an \a name arguments are passed to the base
+  class.
 */
@@ -58,3 +77,3 @@ MenuButton::MenuButton( const QStringList& items, QWidget* parent, const char* n
 
-  \sa insertItems()
+  \sa insertItem() insertItems()
 */
@@ -77,3 +96,3 @@ void MenuButton::init()
 /*!
-  Removes all items from the button and menu.
+  Removes all the menu items from the button and menu.
 */
@@ -86,4 +105,5 @@ void MenuButton::clear()
 /*!
-  Inserts string \a items into the menu. The string "--" represents
-  a separator.
+  A menu item is created (see insertItem()) for each string in the \a
+  items string list. If any string is "--" a separator (see
+  insertSeparator()) is inserted in its place.
 */
@@ -101,5 +121,8 @@ void MenuButton::insertItems( const QStringList& items )
 /*!
-  Inserts an \a icon and \a text into the menu.
+  Inserts a menu item with the icon \a icon and label \a text into
+  the menu.
+
+  \sa insertItems()
 */
-void MenuButton::insertItem( const QIconSet& icon, const QString& text )
+void MenuButton::insertItem( const QIconSet& icon, const QString& text=QString::null )
 {
@@ -110,3 +133,6 @@ void MenuButton::insertItem( const QIconSet& icon, const QString& text )
 /*!
-  Inserts \a text into the menu.
+  \overload
+  Inserts a menu item with the label \a text into the menu.
+
+  \sa insertItems()
 */
@@ -119,3 +145,5 @@ void MenuButton::insertItem( const QString& text )
 /*!
-  Inserts a visual separator into the menu.
+  Inserts a separator into the menu.
+
+  \sa insertItems()
 */
@@ -127,3 +155,3 @@ void MenuButton::insertSeparator()
 /*!
-  Selects the items with text \a s.
+  Selects the items with label text \a s.
 */
@@ -140,3 +168,4 @@ void MenuButton::select(const QString& s)
 /*!
-  Selects the item at index \a s.
+  \overload
+  Selects the item at index position \a s.
 */
@@ -153,3 +182,3 @@ void MenuButton::select(int s)
 /*!
-  Returns the index of the current item.
+  Returns the index position of the current item.
 */
@@ -161,3 +190,3 @@ int MenuButton::currentItem() const
 /*!
-  Returns the text of the current item.
+  Returns the label text of the current item.
 */
@@ -169,3 +198,3 @@ QString MenuButton::currentText() const
 /*!
-  Sets the label. If \a label is empty, the
+  Sets the menubutton's label. If \a label is empty, the
   current item text is displayed, otherwise \a label should contain
diff --git a/library/menubutton.h b/library/menubutton.h
index e9c91b7..6582b1e 100644
--- a/library/menubutton.h
+++ b/library/menubutton.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/mimetype.cpp b/library/mimetype.cpp
index 9fab160..e2e0dab 100644
--- a/library/mimetype.cpp
+++ b/library/mimetype.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -25,2 +25,4 @@
 #include "qpeapplication.h"
+#include "config.h"
+
 #include <qfile.h>
@@ -31,18 +33,15 @@
 #include <qmap.h>
- 
+
+
+static void cleanupMime()
+{
+    MimeType::clear();
+}
+
 class MimeTypeData {
 public:
-    MimeTypeData(const QString& i, const AppLnk& lnk, const QString& icon ) :
-        id(i),
-        desc(lnk.name()+" document"),
-        app(lnk)
+    MimeTypeData(const QString& i) :
+        id(i)
     {
-        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() ) );
-        }
+        apps.setAutoDelete(TRUE);
     }
@@ -50,22 +49,81 @@ public:
     QString extension;
+    QList<AppLnk> apps;
+
+    QString description()
+    {
+        if ( desc.isEmpty() )
+            desc = QPEApplication::tr("%1 document").arg(apps.first()->name());
+        return desc;
+    }
+
+    QPixmap regIcon()
+    {
+        if ( regicon.isNull() )
+            loadPixmaps();
+        return regicon;
+    }
+
+    QPixmap bigIcon()
+    {
+        if ( bigicon.isNull() )
+            loadPixmaps();
+        return bigicon;
+    }
+
+private:
+    void loadPixmaps()
+    {
+        if ( apps.count() ) {
+            QString icon;
+            for (AppLnk* lnk = apps.first(); icon.isNull() && lnk; lnk=apps.next()) {
+                QStringList icons = lnk->mimeTypeIcons();
+                if ( icons.count() ) {
+                    QStringList types = lnk->mimeTypes();
+                    for (QStringList::ConstIterator t=types.begin(),i=icons.begin(); t!=types.end() && i!=icons.end(); ++i,++t) {
+                        if ( *t == id ) {
+                            icon = *i;
+                            break;
+                        }
+                    }
+                }
+            }
+            if ( icon.isNull() ) {
+                AppLnk* lnk = apps.first();
+                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() ) );
+            }
+        }
+    }
+
+    QPixmap regicon;
+    QPixmap bigicon;
     QString desc;
-    QPixmap regIcon;
-    QPixmap bigIcon;
-    AppLnk app;
 };
 
-class MimeType::Dict : public QDict<MimeTypeData> {
+class MimeType::Private : public QDict<MimeTypeData> {
 public:
-    Dict() {}
+    Private() {}
+    ~Private() {}
+
+    // ...
 };
 
-MimeType::Dict* MimeType::d=0;
+MimeType::Private* MimeType::d=0;
 static QMap<QString,QString> *typeFor = 0;
-static QMap<QString,QString> *extFor = 0;
+static QMap<QString,QStringList> *extFor = 0;
 
-MimeType::Dict& MimeType::dict()
+MimeType::Private& MimeType::data()
 {
     if ( !d ) {
-        d = new Dict;
+        d = new Private;
         d->setAutoDelete(TRUE);
+        static bool setCleanup = FALSE;
+        if ( !setCleanup ) {
+            qAddPostRoutine( cleanupMime );
+            setCleanup = TRUE;
+        }
     }
@@ -92,3 +150,3 @@ QString MimeType::description() const
     MimeTypeData* d = data(i);
-    return d ? d->desc : QString::null;
+    return d ? d->description() : QString::null;
 }
@@ -98,3 +156,3 @@ QPixmap MimeType::pixmap() const
     MimeTypeData* d = data(i);
-    return d ? d->regIcon : QPixmap();
+    return d ? d->regIcon() : QPixmap();
 }
@@ -103,2 +161,7 @@ QString MimeType::extension() const
 {
+    return extensions().first();
+}
+
+QStringList MimeType::extensions() const
+{
     loadExtensions();
@@ -110,3 +173,3 @@ QPixmap MimeType::bigPixmap() const
     MimeTypeData* d = data(i);
-    return d ? d->bigIcon : QPixmap();
+    return d ? d->bigIcon() : QPixmap();
 }
@@ -116,3 +179,12 @@ const AppLnk* MimeType::application() const
     MimeTypeData* d = data(i);
-    return d ? &d->app : 0;
+    return d ? d->apps.first() : 0;
+}
+
+static QString serviceBinding(const QString& service)
+{
+    // Copied from qtopiaservices
+    QString svrc = service;
+    for (int i=0; i<(int)svrc.length(); i++)
+        if ( svrc[i]=='/' ) svrc[i] = '-';
+    return "Service-"+svrc;
 }
@@ -122,7 +194,20 @@ 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 );
+    for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) {
+        MimeTypeData* cur = data()[*it];
+        AppLnk* l = new AppLnk(lnk);
+        if ( !cur ) {
+            cur = new MimeTypeData( *it );
+            data().insert( *it, cur );
+            cur->apps.append(l);
+        } else if ( cur->apps.count() ) {
+            Config binding(serviceBinding("Open/"+*it));
+            binding.setGroup("Service");
+            QString def = binding.readEntry("default");
+            if ( l->exec() == def )
+                cur->apps.prepend(l);
+            else
+                cur->apps.append(l);
+        } else {
+            cur->apps.append(l);
+        }
     }
@@ -139,3 +224,3 @@ void MimeType::loadExtensions()
     if ( !typeFor ) {
-        extFor = new QMap<QString,QString>;
+        extFor = new QMap<QString,QStringList>;
         typeFor = new QMap<QString,QString>;
@@ -157,4 +242,9 @@ void MimeType::loadExtensions(const QString& filename)
                 QString id = *it; ++it;
+                // new override old (though left overrides right)
+                QStringList exts = (*extFor)[id];
+                QStringList newexts;
                 if ( it != tokens.end() ) {
-                    (*extFor)[id] = *it;
+                    exts.remove(*it);
+                    if ( !newexts.contains(*it) )
+                        newexts.append(*it);
                     while (it != tokens.end()) {
@@ -164,2 +254,3 @@ void MimeType::loadExtensions(const QString& filename)
                 }
+                (*extFor)[id] = newexts + exts;
             }
@@ -190,3 +281,3 @@ MimeTypeData* MimeType::data(const QString& id)
 {
-    MimeTypeData* d = dict()[id];
+    MimeTypeData* d = data()[id];
     if ( !d ) {
@@ -194,3 +285,3 @@ MimeTypeData* MimeType::data(const QString& id)
         QString idw = id.left(s)+"/*";
-        d = dict()[idw];
+        d = data()[idw];
     }
diff --git a/library/mimetype.h b/library/mimetype.h
index b6cca95..94bfe4e 100644
--- a/library/mimetype.h
+++ b/library/mimetype.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -22,4 +22,5 @@
 
-#include <qstring.h>
+#include <qstringlist.h>
 #include <qpixmap.h>
+#include <qlist.h>
 
@@ -45,2 +46,4 @@ public:
     QString extension() const;
+    QStringList extensions() const;
+    QList<AppLnk> applications() const;
 #endif
@@ -61,5 +64,5 @@ private:
     void init( const QString& ext_or_id );
-    class Dict;
-    static Dict* d;
-    static Dict& dict();
+    class Private;
+    static Private* d;
+    static Private& data();
     static MimeTypeData* data(const QString& id);
diff --git a/library/network.cpp b/library/network.cpp
index e6d2781..185b147 100644
--- a/library/network.cpp
+++ b/library/network.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -27,3 +27,5 @@
 #include "qpe/qpeapplication.h"
+#ifdef QWS
 #include <qpe/qcopenvelope_qws.h>
+#endif
 #include <qpe/qlibrary.h>
@@ -38,2 +40,3 @@
 
+#ifndef QT_NO_COP
 class NetworkEmitter : public QCopChannel {
@@ -70,2 +73,3 @@ void Network::start(const QString& choice, const QString& password)
   \brief The Network class provides network access functionality.
+  \internal
 */
@@ -115,2 +119,3 @@ void Network::connectChoiceChange(QObject* receiver, const char* slot)
 
+        #endif// QT_NO_COP
 /*!
@@ -123,2 +128,3 @@ QString Network::settingsDir()
 
+#ifndef QT_NO_COP
 /*!
@@ -136,3 +142,3 @@ QStringList Network::choices(QListBox* lb, const QString& dir)
     settingsdir.mkdir(adir);
-    
+
     QStringList files = settingsdir.entryList("*.conf");
@@ -154,3 +160,3 @@ class NetworkServer : public QCopChannel {
 public:
-    NetworkServer(QObject* parent) : QCopChannel("QPE/Network",parent)
+    NetworkServer(QObject* parent) : QCopChannel("QPE/Network",parent), wait(0)
     {
@@ -439 +445,2 @@ NetworkInterface* Network::loadPlugin(const QString& type)
 #include "network.moc"
+        #endif// QT_NO_COP
diff --git a/library/network.h b/library/network.h
index cee67af..33699a2 100644
--- a/library/network.h
+++ b/library/network.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/networkinterface.cpp b/library/networkinterface.cpp
index 56a0e5b..2b5c77e 100644
--- a/library/networkinterface.cpp
+++ b/library/networkinterface.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -47,3 +47,5 @@ bool NetworkInterface::isActive( Config& cfg ) const
                     fclose(f);
+#ifdef QWS
                     Network::writeProxySettings( cfg );
+#endif
                     return TRUE;
diff --git a/library/networkinterface.h b/library/networkinterface.h
index d2ca5ab..bda2119 100644
--- a/library/networkinterface.h
+++ b/library/networkinterface.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/password.cpp b/library/password.cpp
index 3be6efe..41b3358 100644
--- a/library/password.cpp
+++ b/library/password.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -29,3 +29,5 @@
 #include <qfile.h>
+#ifdef QWS
 #include <qwindowsystem_qws.h>
+#endif
 
@@ -74,2 +76,12 @@ PasswordDialog::PasswordDialog( QWidget* parent,  const char* name, WFlags fl )
 {
+    QRect desk = qApp->desktop()->geometry();
+
+    if ( desk.width() < 220 ) {
+        QFont f( font() );
+        f.setPointSize( 18 );
+        setFont( f );
+        f.setPointSize( 12 );
+        prompt->setFont( f );
+    }
+    
     button_0->installEventFilter( this );
diff --git a/library/password.h b/library/password.h
index 30a5377..a3a3e45 100644
--- a/library/password.h
+++ b/library/password.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/passwordbase_p.ui b/library/passwordbase_p.ui
index e79777b..a5eed87 100644
--- a/library/passwordbase_p.ui
+++ b/library/passwordbase_p.ui
@@ -13,4 +13,4 @@
             <y>0</y>
-            <width>251</width>
-            <height>443</height>
+            <width>243</width>
+            <height>293</height>
         </rect>
@@ -43,2 +43,9 @@
             <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>5</hsizetype>
+                    <vsizetype>5</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
                 <name>frameShape</name>
@@ -69,2 +76,9 @@
             <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>5</hsizetype>
+                    <vsizetype>5</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
                 <name>frameShape</name>
@@ -95,2 +109,9 @@
             <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>5</hsizetype>
+                    <vsizetype>5</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
                 <name>frameShape</name>
@@ -121,2 +142,9 @@
             <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>5</hsizetype>
+                    <vsizetype>5</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
                 <name>frameShape</name>
@@ -147,2 +175,9 @@
             <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>5</hsizetype>
+                    <vsizetype>5</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
                 <name>frameShape</name>
@@ -173,2 +208,9 @@
             <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>5</hsizetype>
+                    <vsizetype>5</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
                 <name>frameShape</name>
@@ -199,2 +241,9 @@
             <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>5</hsizetype>
+                    <vsizetype>5</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
                 <name>frameShape</name>
@@ -225,2 +274,9 @@
             <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>5</hsizetype>
+                    <vsizetype>5</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
                 <name>frameShape</name>
@@ -251,2 +307,9 @@
             <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>5</hsizetype>
+                    <vsizetype>5</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
                 <name>frameShape</name>
@@ -283,2 +346,9 @@
             <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>5</hsizetype>
+                    <vsizetype>5</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
                 <name>frameShape</name>
@@ -315,2 +385,9 @@
             <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>5</hsizetype>
+                    <vsizetype>5</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
                 <name>frameShape</name>
diff --git a/library/power.cpp b/library/power.cpp
index d10a865..d53ecfe 100644
--- a/library/power.cpp
+++ b/library/power.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -22,3 +22,3 @@
 
-#if defined( QT_QWS_CUSTOM ) || defined( QT_QWS_IPAQ )
+#ifdef QT_QWS_CUSTOM
 #include "custom.h"
diff --git a/library/power.h b/library/power.h
index 99d3595..04499a8 100644
--- a/library/power.h
+++ b/library/power.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/process.cpp b/library/process.cpp
index 2e25dd5..103dcae 100644
--- a/library/process.cpp
+++ b/library/process.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/process.h b/library/process.h
index def68d7..e4f613d 100644
--- a/library/process.h
+++ b/library/process.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/process_unix.cpp b/library/process_unix.cpp
index b599edb..e0fbf8c 100644
--- a/library/process_unix.cpp
+++ b/library/process_unix.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/qcom.h b/library/qcom.h
index 229be2b..8c0fa60 100644
--- a/library/qcom.h
+++ b/library/qcom.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/qcopenvelope_qws.cpp b/library/qcopenvelope_qws.cpp
index 10d1567..81bb0f5 100644
--- a/library/qcopenvelope_qws.cpp
+++ b/library/qcopenvelope_qws.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -20,3 +20,5 @@
 
+#ifndef QT_NO_COP
 #include "qcopenvelope_qws.h"
+#endif
 #include "global.h"
@@ -36,6 +38,7 @@
   \class QCopEnvelope qcopenvelope_qws.h
-  \brief The QCopEnvelope class encapsulates QCop message sending.
+  \brief The QCopEnvelope class encapsulates and sends QCop messages
+  over QCopChannels.
 
   QCop messages allow applications to communicate with each other.
-  These messages are send using QCopEnvelope, and received by connecting
+  These messages are sent using QCopEnvelope, and received by connecting
   to a QCopChannel.
@@ -49,19 +52,19 @@
 
-  For messages without parameters, you can simply use:
+  For messages without parameters, simply use:
 
   \code
-     QCopEnvelope (channelname, messagename);
+     QCopEnvelope e(channelname, messagename);
   \endcode
 
-  Do not try to simplify further as some compilers may not do
-  as you expect.
+  (Do not try to simplify this further as it may confuse some
+  compilers.)
 
-  The <tt>channelname</tt> of channels within Qtopia all start with "QPE/".
-  The <tt>messagename</tt> is a function identifier followed by a list of types
-  in parentheses. There are no spaces in the message name.
+  The \c{channelname} of channels within Qtopia all start with "QPE/".
+  The \c{messagename} is a function identifier followed by a list of types
+  in parentheses. There is no whitespace in the message name.
 
-  To receive a message, you will generally just use your applications
-  predefined QPE/Application/<i>appname</i> channel
+  To receive a message, you will generally just use your application's
+  predefined QPE/Application/\e{appname} channel
   (see QPEApplication::appMessage()), but you can make another channel
-  and connect it to a slot with:
+  and connect it to a slot like this:
 
@@ -78,4 +81,4 @@
   Constructs a QCopEnvelope that will write \a message to \a channel.
-  If \a message has parameters, you must then user operator<<() to
-  write the parameters.
+  If \a message has parameters, you must then use operator<<() to
+  add these parameters to the envelope.
 */
@@ -89,3 +92,3 @@ QCopEnvelope::QCopEnvelope( const QCString& channel, const QCString& message ) :
 /*!
-  Writes the completed message and destroys the QCopEnvelope.
+  Writes the message and then destroys the QCopEnvelope.
 */
@@ -113,3 +116,3 @@ QCopEnvelope::~QCopEnvelope()
                 // success on fstat, lets compare times
-                if (buf.st_mtime + 60 < t) {
+                if (buf.st_ctime + 60 < t) {
                     qWarning("stale file " + qcopfn + " found.  Truncating");
@@ -131,4 +134,3 @@ QCopEnvelope::~QCopEnvelope()
                     QString cmd = ch.mid(pref);
-                    cmd += " -qcop " + qcopfn;
-                    Global::invoke(cmd);
+                    Global::execute(cmd);
                 }
@@ -156,2 +158,11 @@ QCopEnvelope::~QCopEnvelope()
     }
+    else if (qstrncmp(ch.data(), "QPE/SOAP/", 9) == 0) {
+      // If this is a message that should go along the SOAP channel, we move the
+      // endpoint URL to the data section.
+      QString endpoint = ch.mid(9);
+      
+      ch = "QPE/SOAP";
+      // Since byte arrays are explicitly shared, this is appended to the data variable..
+      *this << endpoint;
+    }
     QCopChannel::send(ch,msg,data);
diff --git a/library/qcopenvelope_qws.h b/library/qcopenvelope_qws.h
index f2a94d3..67aa843 100644
--- a/library/qcopenvelope_qws.h
+++ b/library/qcopenvelope_qws.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -22,6 +22,4 @@
 
-#ifndef QT_H
 #include <qcopchannel_qws.h>
 #include <qdatastream.h>
-#endif // QT_H
 
diff --git a/library/qdawg.cpp b/library/qdawg.cpp
index 3615693..af5dc82 100644
--- a/library/qdawg.cpp
+++ b/library/qdawg.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -198,3 +198,3 @@ bool TrieList::equal(TrieList& l)
         return FALSE;
-    sort(); l.sort(); 
+    sort(); l.sort();
     ConstIterator it2 = begin();
@@ -402,3 +402,44 @@ private:
 
+/*!
+  \class QDawg qdawg.h
+  \brief The QDawg class provides an implementation of a Directed Acyclic Word Graph.
 
+  A DAWG provides very fast look-up of words in a word list.
+
+  The word list is created using readFile(), read() or
+  createFromWords(). A list of all the DAWG's words is returned by
+  allWords(), and the total number of words is returned by
+  countWords(). Use contains() to see if a particular word is in the
+  DAWG. The root \link qdawg-node.html node\endlink is returned by root().
+
+  A global DAWG is maintained for the current locale. See the
+  \l Global class for details.
+
+  The structure of a DAWG is a graph of \link qdawg-node.html
+  Nodes\endlink. There are no cycles in the graph (since there are no
+  inifinitely repeating words). Each \link qdawg-node.html
+  Node\endlink is a member of a list of \link qdawg-node.html
+  Nodes\endlink called a child list. Each \link qdawg-node.html
+  Node\endlink in the child list has a \e letter, an \e isWord flag,
+  at most one \e jump arc, and at most one arc to the next child in
+  the list.
+
+  If you traverse the \link qdawg-node.html Nodes\endlink in a DAWG,
+  starting from the root(), and you concatenate all the letters from
+  the single child in each child list that you visit, at every \link
+  qdawg-node.html Node\endlink which has the isWord flag set your
+  concatenation will be a word in the list represented by the DAWG.
+
+  For example, the DAWG below represents the word list:
+  ban, band, can, cane, cans, pan, pane, pans.
+
+  This structuring not only provides O(1) lookup of words in the word list,
+  but also produces a smaller storage file than a plain text file word list.
+
+  \img qdawg.png
+*/
+
+/*!
+    Constructs a new empty DAWG.
+*/
 QDawg::QDawg()
@@ -408,2 +449,5 @@ QDawg::QDawg()
 
+/*!
+    Deletes the DAWG.
+*/
 QDawg::~QDawg()
@@ -413,2 +457,6 @@ QDawg::~QDawg()
 
+/*!
+  \overload
+  Replaces all the DAWG's words with words read from \a dev.
+*/
 bool QDawg::createFromWords(QIODevice* dev)
@@ -431,2 +479,5 @@ bool QDawg::createFromWords(QIODevice* dev)
 
+/*!
+  Replaces all the DAWG's words with the words in the \a list.
+*/
 void QDawg::createFromWords(const QStringList& list)
@@ -446,2 +497,5 @@ void QDawg::createFromWords(const QStringList& list)
 
+/*!
+  Returns a list of all the words in the DAWG.
+*/
 QStringList QDawg::allWords() const
@@ -454,2 +508,8 @@ QStringList QDawg::allWords() const
 
+/*!
+  Replaces the DAWG with the DAWG in \a filename.
+  The file is memory-mapped.
+
+  \sa write()
+*/
 bool QDawg::readFile(const QString& filename)
@@ -474,2 +534,8 @@ bool QDawg::readFile(const QString& filename)
 
+/*!
+  Replaces the DAWG with the DAWG in \a dev.
+  The file is memory-mapped.
+
+  \sa write()
+*/
 bool QDawg::read(QIODevice* dev)
@@ -485,2 +551,5 @@ bool QDawg::read(QIODevice* dev)
 
+/*!
+  Writes the DAWG to \a dev, in a custom QDAWG format.
+*/
 bool QDawg::write(QIODevice* dev) const
@@ -490,2 +559,5 @@ bool QDawg::write(QIODevice* dev) const
 
+/*!
+  Returns the number of words in the DAWG.
+*/
 int QDawg::countWords() const
@@ -495,2 +567,5 @@ int QDawg::countWords() const
 
+/*!
+  Returns the root \link qdawg-node.html Node\endlink of the DAWG.
+*/
 const QDawg::Node* QDawg::root() const
@@ -500,2 +575,6 @@ const QDawg::Node* QDawg::root() const
 
+/*!
+  Returns TRUE if the DAWG contains the word \a s; otherwise returns
+  FALSE.
+*/
 bool QDawg::contains(const QString& s) const
@@ -505,2 +584,7 @@ bool QDawg::contains(const QString& s) const
 
+/*!
+  \internal
+
+  For debugging: prints out the DAWG contents.
+*/
 void QDawg::dump() const
@@ -510 +594,34 @@ void QDawg::dump() const
 
+/*!
+  \class QDawg::Node qdawg.h
+  \brief The QDawg::Node class represents one node of a QDawg.
+*/
+
+/*!
+  \fn QChar QDawg::Node::letter() const
+
+  Returns this Node's letter.
+*/
+/*!
+  \fn bool QDawg::Node::isWord() const
+
+  Returns TRUE if this Node is the end of a word; otherwise returns
+  FALSE.
+*/
+/*!
+  \fn bool QDawg::Node::isLast() const
+
+  Returns TRUE if this Node is the last in the child list; otherwise
+  returns FALSE.
+*/
+/*!
+  \fn const Node* QDawg::Node::next() const
+
+  Returns the next child Node in the child list or 0 if the current
+  Node isLast().
+*/
+/*!
+  \fn const Node* QDawg::Node::jump() const
+
+  Returns the node connected to this Node.
+*/
diff --git a/library/qdawg.h b/library/qdawg.h
index ea182f3..e3b1628 100644
--- a/library/qdawg.h
+++ b/library/qdawg.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/qlibrary.cpp b/library/qlibrary.cpp
index 4aabbc5..cbf49a3 100644
--- a/library/qlibrary.cpp
+++ b/library/qlibrary.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/qlibrary.h b/library/qlibrary.h
index d33173b..67ed3bf 100644
--- a/library/qlibrary.h
+++ b/library/qlibrary.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/qlibrary_p.h b/library/qlibrary_p.h
index 4734228..33cab6f 100644
--- a/library/qlibrary_p.h
+++ b/library/qlibrary_p.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/qlibrary_unix.cpp b/library/qlibrary_unix.cpp
index 50a5478..7740321 100644
--- a/library/qlibrary_unix.cpp
+++ b/library/qlibrary_unix.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/qmath.h b/library/qmath.h
index 629fe99..fc18fdb 100644
--- a/library/qmath.h
+++ b/library/qmath.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 8aae786..3ca6d73 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -47,2 +47,3 @@
 #include <qdragobject.h>
+#include <qtextcodec.h>
 #include <qevent.h>
@@ -66,5 +67,10 @@
 #include "resource.h"
+#if QT_VERSION <= 230 && defined(QT_NO_CODECS)
+#include "qutfcodec.h"
+#endif
 #include "config.h"
+#include "network.h"
+#ifdef QWS
 #include "fontmanager.h"
-#include "fontdatabase.h"
+#endif
 
@@ -73,2 +79,4 @@
 #include "qpemenubar.h"
+#include "textcodecinterface.h"
+#include "imagecodecinterface.h"
 
@@ -80,4 +88,3 @@
 
-class QPEApplicationData
-{
+class QPEApplicationData {
 public:
@@ -94,13 +101,11 @@ public:
         QPoint presspos;
-        bool rightpressed;
+        bool rightpressed : 1; // AEH why not use uint foobar :1; if it's tt style -zecke
         int kbgrabber;
-        bool kbregrab;
-        bool notbusysent;
+        bool kbregrab : 1;
+        bool notbusysent : 1;
         QString appName;
-        struct QCopRec
-        {
-                QCopRec( const QCString &ch, const QCString &msg,
-                         const QByteArray &d ) :
-                                channel( ch ), message( msg ), data( d )
-                { }
+        struct QCopRec {
+            QCopRec( const QCString &ch, const QCString &msg,
+                     const QByteArray &d ) :
+                channel( ch ), message( msg ), data( d ) { }
 
@@ -110,7 +115,7 @@ public:
         };
-        bool preloaded;
-        bool forceshow;
-        bool nomaximize;
+        bool preloaded : 1;
+        bool forceshow : 1;
+        bool nomaximize : 1;
         QWidget* qpe_main_widget;
-        bool keep_running;
+        bool keep_running : 1;
         QList<QCopRec> qcopq;
@@ -122,13 +127,110 @@ public:
         }
-        void sendQCopQ()
-        {
-                QCopRec * r;
+        void sendQCopQ() {
+            QCopRec * r;
+#ifndef QT_NO_COP
                 for ( QListIterator<QCopRec> it( qcopq ); ( r = it.current() ); ++it )
                         QCopChannel::sendLocally( r->channel, r->message, r->data );
+#endif
                 qcopq.clear();
         }
+    static void show_mx(QWidget* mw, bool nomaximize) {
+        if ( mw->layout() && mw->inherits("QDialog") ) {
+            QPEApplication::showDialog((QDialog*)mw,nomaximize);
+        } else {
+#ifdef Q_WS_QWS
+            if ( !nomaximize )
+                mw->showMaximized();
+            else
+#endif
+            mw->show();
+        }
+    }
+    static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ )
+    {
+    /*
+        // This works but disable it for now until it is safe to apply
+        // What is does is scan the .desktop files of all the apps for
+        // the applnk that has the corresponding argv[0] as this program
+        // then it uses the name stored in the .desktop file as the caption
+        // for the main widget. This saves duplicating translations for
+        // the app name in the program and in the .desktop files.
+
+        AppLnkSet apps( appsPath );
+
+        QList<AppLnk> appsList = apps.children();
+        for ( QListIterator<AppLnk> it(appsList); it.current(); ++it ) {
+            if ( (*it)->exec() == appName ) {
+                mw->setCaption( (*it)->name() );
+                return TRUE;
+            }
+        }
+    */
+        return FALSE;
+    }
+
+
+    void show(QWidget* mw, bool nomax)
+    {
+        setWidgetCaptionFromAppName( mw, appName, QPEApplication::qpeDir() + "apps" );
+        nomaximize = nomax;
+        qpe_main_widget = mw;
+#ifndef QT_NO_COP
+        sendQCopQ();
+#endif
+        if ( preloaded ) {
+            if(forceshow)
+                show_mx(mw,nomax);
+        } else if ( keep_running ) {
+            show_mx(mw,nomax);
+        }
+    }
+
+    void loadTextCodecs()
+    {
+        QString path = QPEApplication::qpeDir() + "/plugins/textcodecs";
+        QDir dir( path, "lib*.so" );
+        QStringList list = dir.entryList();
+        QStringList::Iterator it;
+        for ( it = list.begin(); it != list.end(); ++it ) {
+            TextCodecInterface *iface = 0;
+            QLibrary *lib = new QLibrary( path + "/" + *it );
+            if ( lib->queryInterface( IID_QtopiaTextCodec, (QUnknownInterface**)&iface ) == QS_OK && iface ) {
+                QValueList<int> mibs = iface->mibEnums();
+                for (QValueList<int>::ConstIterator i=mibs.begin(); i!=mibs.end(); ++i) {
+                    (void)iface->createForMib(*i);
+                    // ### it exists now; need to remember if we can delete it
+                }
+            } else {
+                lib->unload();
+                delete lib;
+            }
+        }
+    }
+
+    void loadImageCodecs()
+    {
+        QString path = QPEApplication::qpeDir() + "/plugins/imagecodecs";
+        QDir dir( path, "lib*.so" );
+        QStringList list = dir.entryList();
+        QStringList::Iterator it;
+        for ( it = list.begin(); it != list.end(); ++it ) {
+            ImageCodecInterface *iface = 0;
+            QLibrary *lib = new QLibrary( path + "/" + *it );
+            if ( lib->queryInterface( IID_QtopiaImageCodec, (QUnknownInterface**)&iface ) == QS_OK && iface ) {
+                QStringList formats = iface->keys();
+                for (QStringList::ConstIterator i=formats.begin(); i!=formats.end(); ++i) {
+                    (void)iface->installIOHandler(*i);
+                    // ### it exists now; need to remember if we can delete it
+                }
+            } else {
+                lib->unload();
+                delete lib;
+            }
+        }
+    }
+    QString styleName;
+    QString decorationName;
 };
 
-class ResourceMimeFactory : public QMimeSourceFactory
-{
+class ResourceMimeFactory : public QMimeSourceFactory {
 public:
@@ -166,19 +268,19 @@ static void setVolume( int t = 0, int percent = -1 )
 {
-        switch ( t ) {
-                case 0: {
-                                Config cfg( "qpe" );
-                                cfg.setGroup( "Volume" );
-                                if ( percent < 0 )
-                                        percent = cfg.readNumEntry( "VolumePercent", 50 );
-                                int fd = 0;
-                                if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
-                                        int vol = muted ? 0 : percent;
-                                        // set both channels to same volume
-                                        vol |= vol << 8;
-                                        ioctl( fd, MIXER_WRITE( 0 ), &vol );
-                                        ::close( fd );
-                                }
-                        }
-                        break;
-        }
+    switch ( t ) {
+    case 0: {
+        Config cfg( "qpe" );
+        cfg.setGroup( "Volume" );
+        if ( percent < 0 )
+            percent = cfg.readNumEntry( "VolumePercent", 50 );
+        int fd = 0;
+        if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
+            int vol = muted ? 0 : percent;
+            // set both channels to same volume
+            vol |= vol << 8;
+            ioctl( fd, MIXER_WRITE( 0 ), &vol );
+            ::close( fd );
+        }
+    }
+        break;
+    }
 }
@@ -187,18 +289,18 @@ static void setMic( int t = 0, int percent = -1 )
 {
-        switch ( t ) {
-                case 0: {
-                                Config cfg( "qpe" );
-                                cfg.setGroup( "Volume" );
-                                if ( percent < 0 )
-                                        percent = cfg.readNumEntry( "Mic", 50 );
-
-                                int fd = 0;
-                                int mic = micMuted ? 0 : percent;
-                                if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
-                                        ioctl( fd, MIXER_WRITE( SOUND_MIXER_MIC ), &mic );
-                                        ::close( fd );
-                                }
-                        }
-                        break;
-        }
+    switch ( t ) {
+    case 0: {
+        Config cfg( "qpe" );
+        cfg.setGroup( "Volume" );
+        if ( percent < 0 )
+            percent = cfg.readNumEntry( "Mic", 50 );
+
+        int fd = 0;
+        int mic = micMuted ? 0 : percent;
+        if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
+            ioctl( fd, MIXER_WRITE( SOUND_MIXER_MIC ), &mic );
+            ::close( fd );
+        }
+    }
+        break;
+    }
 }
@@ -211,3 +313,3 @@ static void setMic( int t = 0, int percent = -1 )
 
-  Simply by using QPEApplication instead of QApplication, a plain Qt
+  Simply by using QPEApplication instead of QApplication, a standard Qt
   application becomes a Qtopia application. It automatically follows
@@ -215,3 +317,32 @@ static void setMic( int t = 0, int percent = -1 )
   case of \link docwidget.html document-oriented\endlink applications,
-  changes the current displayed document in response to the environment.
+  changes the currently displayed document in response to the environment.
+
+  To create a \link docwidget.html document-oriented\endlink
+  application use showMainDocumentWidget(); to create a
+  non-document-oriented application use showMainWidget(). The
+  keepRunning() function indicates whether the application will
+  continue running after it's processed the last \link qcop.html
+  QCop\endlink message. This can be changed using setKeepRunning().
+
+  A variety of signals are emitted when certain events occur, for
+  example, timeChanged(), clockChanged(), weekChanged(),
+  dateFormatChanged() and volumeChanged(). If the application receives
+  a \link qcop.html QCop\endlink message on the application's
+  QPE/Application/\e{appname} channel, the appMessage() signal is
+  emitted. There are also flush() and reload() signals, which
+  are emitted when synching begins and ends respectively - upon these
+  signals, the application should save and reload any data
+  files that are involved in synching. Most of these signals will initially
+  be received and unfiltered through the appMessage() signal.
+
+  This class also provides a set of useful static functions. The
+  qpeDir() and documentDir() functions return the respective paths.
+  The grabKeyboard() and ungrabKeyboard() functions are used to
+  control whether the application takes control of the device's
+  physical buttons (e.g. application launch keys). The stylus' mode of
+  operation is set with setStylusOperation() and retrieved with
+  stylusOperation(). There are also setInputMethodHint() and
+  inputMethodHint() functions.
+
+  \ingroup qtopiaemb
 */
@@ -226,5 +357,4 @@ static void setMic( int t = 0, int percent = -1 )
   \fn void QPEApplication::timeChanged();
-
-  This signal is emitted when the time jumps forward or backwards
-  by more than the normal passage of time.
+  This signal is emitted when the time changes outside the normal
+  passage of time, i.e. if the time is set backwards or forwards.
 */
@@ -234,5 +364,38 @@ static void setMic( int t = 0, int percent = -1 )
 
-  This signal is emitted when the user changes the style
-  of clock. If \a ampm is TRUE, the user wants a 12-hour
-  AM/PM close, otherwise, they want a 24-hour clock.
+  This signal is emitted when the user changes the clock's style. If
+  \a ampm is TRUE, the user wants a 12-hour AM/PM clock, otherwise,
+  they want a 24-hour clock.
+*/
+
+/*!
+    \fn void QPEApplication::volumeChanged( bool muted )
+
+    This signal is emitted whenever the mute state is changed. If \a
+    muted is TRUE, then sound output has been muted.
+*/
+
+/*!
+    \fn void QPEApplication::weekChanged( bool startOnMonday )
+
+    This signal is emitted if the week start day is changed. If \a
+    startOnMonday is TRUE then the first day of the week is Monday; if
+    \a startOnMonday is FALSE then the first day of the week is
+    Sunday.
+*/
+
+/*!
+    \fn void QPEApplication::dateFormatChanged()
+
+    This signal is emitted whenever the date format is changed.
+*/
+
+/*!
+    \fn void QPEApplication::flush()
+
+    ###
+*/
+
+/*!
+  \fn void QPEApplication::reload()
+
 */
@@ -242,4 +405,5 @@ static void setMic( int t = 0, int percent = -1 )
 
-  This signal is emitted when a message is received on the
-  QPE/Application/<i>appname</i> QCop channel for this application.
+  This signal is emitted when a message is received on this
+  application's QPE/Application/<i>appname</i> \link qcop.html
+  QCop\endlink channel.
 
@@ -249,12 +413,12 @@ static void setMic( int t = 0, int percent = -1 )
 \code
-    void MyWidget::receive( const QCString& msg, const QByteArray& data )
-    {
-  QDataStream stream( data, IO_ReadOnly );
-  if ( msg == "someMessage(int,int,int)" ) {
-      int a,b,c;
-      stream >> a >> b >> c;
-      ...
-  } else if ( msg == "otherMessage(QString)" ) {
-      ...
-  }
+     void MyWidget::receive( const QCString& msg, const QByteArray& data )
+     {
+       QDataStream stream( data, IO_ReadOnly );
+       if ( msg == "someMessage(int,int,int)" ) {
+            int a,b,c;
+            stream >> a >> b >> c;
+            ...
+       } else if ( msg == "otherMessage(QString)" ) {
+           ...
+       }
     }
@@ -263,2 +427,4 @@ static void setMic( int t = 0, int percent = -1 )
   \sa qcop.html
+  Note that messages received here may be processed by qpe application
+  and emitted as signals, such as flush() and reload().
 */
@@ -268,72 +434,86 @@ static void setMic( int t = 0, int percent = -1 )
   a QApplication, passing \a argc, \a argv, and \a t.
+
+  For applications, \a t should be the default, GuiClient. Only
+  the Qtopia server passes GuiServer.
 */
 QPEApplication::QPEApplication( int & argc, char **argv, Type t )
-                : QApplication( argc, argv, t )
+    : QApplication( argc, argv, t )
 {
-        int dw = desktop() ->width();
-        if ( dw < 200 ) {
-                //  setFont( QFont( "helvetica", 8 ) );
-                AppLnk::setSmallIconSize( 10 );
-                AppLnk::setBigIconSize( 28 );
-        }
+    d = new QPEApplicationData;
+    d->loadTextCodecs();
+    d->loadImageCodecs();
+    int dw = desktop() ->width();
+    if ( dw < 200 ) {
+        setFont( QFont( "helvetica", 8 ) );
+        AppLnk::setSmallIconSize( 10 );
+        AppLnk::setBigIconSize( 28 );
+    }else if ( dw > 600 ) {
+        setFont( QFont( "helvetica", 12 ) );
+        AppLnk::setSmallIconSize( 24 );
+        AppLnk::setBigIconSize( 48 );
+    }else if ( dw > 400 ) {
+        setFont( QFont( "helvetica", 12 ) );
+        AppLnk::setSmallIconSize( 16 );
+        AppLnk::setBigIconSize( 32 );
+    }
 
-        d = new QPEApplicationData;
-        QMimeSourceFactory::setDefaultFactory( new ResourceMimeFactory );
 
-        connect( this, SIGNAL( lastWindowClosed() ), this, SLOT( hideOrQuit() ) );
-#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
+    QMimeSourceFactory::setDefaultFactory( new ResourceMimeFactory );
 
-        QString qcopfn( "/tmp/qcop-msg-" );
-        qcopfn += QString( argv[ 0 ] ); // append command name
+    connect( this, SIGNAL( lastWindowClosed() ), this, SLOT( hideOrQuit() ) );
+#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
 
-        QFile f( qcopfn );
-        if ( f.open( IO_ReadOnly ) ) {
-                flock( f.handle(), LOCK_EX );
-        }
+    QString qcopfn( "/tmp/qcop-msg-" );
+    qcopfn += QString( argv[ 0 ] ); // append command name
 
-        sysChannel = new QCopChannel( "QPE/System", this );
-        connect( sysChannel, SIGNAL( received( const QCString &, const QByteArray & ) ),
-                 this, SLOT( systemMessage( const QCString &, const QByteArray & ) ) );
-
-        QCString channel = QCString( argv[ 0 ] );
-        channel.replace( QRegExp( ".*/" ), "" );
-        d->appName = channel;
-        channel = "QPE/Application/" + channel;
-        pidChannel = new QCopChannel( channel, this );
-        connect( pidChannel, SIGNAL( received( const QCString &, const QByteArray & ) ),
-                 this, SLOT( pidMessage( const QCString &, const QByteArray & ) ) );
-
-        if ( f.isOpen() ) {
-                d->keep_running = FALSE;
-                QDataStream ds( &f );
-                QCString channel, message;
-                QByteArray data;
-                while ( !ds.atEnd() ) {
-                        ds >> channel >> message >> data;
-                        d->enqueueQCop( channel, message, data );
-                }
+    QFile f( qcopfn );
+    if ( f.open( IO_ReadOnly ) ) {
+        flock( f.handle(), LOCK_EX );
+    }
 
-                flock( f.handle(), LOCK_UN );
-                f.close();
-                f.remove();
-        }
+    sysChannel = new QCopChannel( "QPE/System", this );
+    connect( sysChannel, SIGNAL( received( const QCString &, const QByteArray & ) ),
+             this, SLOT( systemMessage( const QCString &, const QByteArray & ) ) );
+
+    QCString channel = QCString( argv[ 0 ] );
+    channel.replace( QRegExp( ".*/" ), "" );
+    d->appName = channel;
+    channel = "QPE/Application/" + channel;
+    pidChannel = new QCopChannel( channel, this );
+    connect( pidChannel, SIGNAL( received( const QCString &, const QByteArray & ) ),
+             this, SLOT( pidMessage( const QCString &, const QByteArray & ) ) );
+
+    if ( f.isOpen() ) {
+        d->keep_running = FALSE;
+        QDataStream ds( &f );
+        QCString channel, message;
+        QByteArray data;
+        while ( !ds.atEnd() ) {
+            ds >> channel >> message >> data;
+            d->enqueueQCop( channel, message, data );
+        }
+
+        flock( f.handle(), LOCK_UN );
+        f.close();
+        f.remove();
+    }
 
-        for ( int a = 0; a < argc; a++ ) {
-                if ( qstrcmp( argv[ a ], "-preload" ) == 0 ) {
-                        argv[ a ] = argv[ a + 1 ];
-                        a++;
-                        d->preloaded = TRUE;
-                        argc -= 1;
-                }
-                else if ( qstrcmp( argv[ a ], "-preload-show" ) == 0 ) {
-                        argv[ a ] = argv[ a + 1 ];
-                        a++;
-                        d->preloaded = TRUE;
-                        d->forceshow = TRUE;
-                        argc -= 1;
-                }
-        }
+    for ( int a = 0; a < argc; a++ ) {
+        if ( qstrcmp( argv[ a ], "-preload" ) == 0 ) {
+            argv[ a ] = argv[ a + 1 ];
+            a++;
+            d->preloaded = TRUE;
+            argc -= 1;
+        }
+        else if ( qstrcmp( argv[ a ], "-preload-show" ) == 0 ) {
+            argv[ a ] = argv[ a + 1 ];
+            a++;
+            d->preloaded = TRUE;
+            d->forceshow = TRUE;
+            argc -= 1;
+        }
+    }
 
-        /* overide stored arguments */
-        setArgs( argc, argv );
+    /* overide stored arguments */
+    setArgs( argc, argv );
 
@@ -341,3 +521,3 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t )
 
-        qwsSetDecoration( new QPEDecoration() );
+        //qwsSetDecoration( new QPEDecoration() );
 
@@ -345,64 +525,46 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t )
 
-        QStringList langs = Global::languageList();
-        for ( QStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it ) {
-                QString lang = *it;
-
-                QTranslator * trans;
-                QString tfn;
-
-                trans = new QTranslator( this );
-                tfn = qpeDir() + "/i18n/" + lang + "/libqpe.qm";
-                if ( trans->load( tfn ) )
-                        installTranslator( trans );
-                else
-                        delete trans;
-
-                trans = new QTranslator( this );
-                tfn = qpeDir() + "/i18n/" + lang + "/" + d->appName + ".qm";
-                if ( trans->load( tfn ) )
-                        installTranslator( trans );
-                else
-                        delete trans;
-
-                /*
-                 * not required. if using one of these languages, you might as well install
-                 * a custom font.
-
-                 //###language/font hack; should look it up somewhere
-                 if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) {
-                 QFont fn = FontManager::unicodeFont( FontManager::Proportional );
-                 setFont( fn );
-                 }
-
-                 else {
-                */
-                    Config config( "qpe" );
-                        config.setGroup( "Appearance" );
-                        QString familyStr = config.readEntry( "FontFamily", "helvetica" );
-                        QString styleStr = config.readEntry( "FontStyle", "Regular" );
-                        QString sizeStr = config.readEntry( "FontSize", "10" );
-                        QString charSetStr = config.readEntry( "FontCharSet", QString::null );
-                        bool ok;
-                        int i_size = sizeStr.toInt( &ok, 10 );
-                        FontDatabase fdb;
-                        QFont selectedFont = fdb.font( familyStr, styleStr, i_size, charSetStr );
-                        setFont( selectedFont );
-                        //}
-        }
-
+    QStringList langs = Global::languageList();
+    for ( QStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it ) {
+        QString lang = *it;
+
+        QTranslator * trans;
+        QString tfn;
+
+        trans = new QTranslator( this );
+        tfn = qpeDir() + "/i18n/" + lang + "/libqpe.qm";
+        if ( trans->load( tfn ) )
+            installTranslator( trans );
+        else
+            delete trans;
+
+        trans = new QTranslator( this );
+        tfn = qpeDir() + "/i18n/" + lang + "/" + d->appName + ".qm";
+        if ( trans->load( tfn ) )
+            installTranslator( trans );
+        else
+            delete trans;
+
+               //###language/font hack; should look it up somewhere
+#ifdef QWS
+        if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) {
+            QFont fn = FontManager::unicodeFont( FontManager::Proportional );
+            setFont( fn );
+         }
+#endif
+    }
 #endif
 
-        applyStyle();
+    applyStyle();
 
-        if ( type() == GuiServer ) {
-                setVolume();
-        }
+    if ( type() == GuiServer ) {
+        setVolume();
+    }
 
-        installEventFilter( this );
+    installEventFilter( this );
 
-        QPEMenuToolFocusManager::initialize();
+    QPEMenuToolFocusManager::initialize();
 
 #ifdef QT_NO_QWS_CURSOR
-        // if we have no cursor, probably don't want tooltips
-        QToolTip::setEnabled( FALSE );
+    // if we have no cursor, probably don't want tooltips
+    QToolTip::setEnabled( FALSE );
 #endif
@@ -413,4 +575,4 @@ static void createInputMethodDict()
 {
-        if ( !inputMethodDict )
-                inputMethodDict = new QPtrDict<void>;
+    if ( !inputMethodDict )
+        inputMethodDict = new QPtrDict<void>;
 }
@@ -419,5 +581,6 @@ static void createInputMethodDict()
   Returns the currently set hint to the system as to whether
-  \a w has any use for text input methods.
+  widget \a w has any use for text input methods.
 
-  \sa setInputMethodHint()
+
+  \sa setInputMethodHint() InputMethodHint
 */
@@ -425,5 +588,5 @@ QPEApplication::InputMethodHint QPEApplication::inputMethodHint( QWidget * w )
 {
-        if ( inputMethodDict && w )
-                return ( InputMethodHint ) ( int ) inputMethodDict->find( w );
-        return Normal;
+    if ( inputMethodDict && w )
+        return ( InputMethodHint ) ( int ) inputMethodDict->find( w );
+    return Normal;
 }
@@ -431,7 +594,7 @@ QPEApplication::InputMethodHint QPEApplication::inputMethodHint( QWidget * w )
 /*!
-    \enum QPEApplication::InputMethodHint
+  \enum QPEApplication::InputMethodHint
 
-    \value Normal the application sometimes needs text input (the default).
-    \value AlwaysOff the application never needs text input.
-    \value AlwaysOn the application always needs text input.
+  \value Normal the application sometimes needs text input (the default).
+  \value AlwaysOff the application never needs text input.
+  \value AlwaysOn the application always needs text input.
 */
@@ -439,6 +602,6 @@ QPEApplication::InputMethodHint QPEApplication::inputMethodHint( QWidget * w )
 /*!
-  Hints to the system that \a w has use for text input methods
+  Hints to the system that widget \a w has use for text input methods
   as specified by \a mode.
 
-  \sa inputMethodHint()
+  \sa inputMethodHint() InputMethodHint
 */
@@ -446,10 +609,10 @@ void QPEApplication::setInputMethodHint( QWidget * w, InputMethodHint mode )
 {
-        createInputMethodDict();
-        if ( mode == Normal ) {
-                inputMethodDict->remove
-                ( w );
-        }
-        else {
-                inputMethodDict->insert( w, ( void* ) mode );
-        }
+    createInputMethodDict();
+    if ( mode == Normal ) {
+        inputMethodDict->remove
+            ( w );
+    }
+    else {
+        inputMethodDict->insert( w, ( void* ) mode );
+    }
 }
@@ -459,10 +622,4 @@ class HackDialog : public QDialog
 public:
-        void acceptIt()
-        {
-                accept();
-        }
-        void rejectIt()
-        {
-                reject();
-        }
+    void acceptIt() { accept(); }
+    void rejectIt() { reject(); }
 };
@@ -472,13 +629,15 @@ void QPEApplication::mapToDefaultAction( QWSKeyEvent * ke, int key )
 {
-        // specialised actions for certain widgets. May want to
-        // add more stuff here.
-        if ( activePopupWidget() && activePopupWidget() ->inherits( "QListBox" )
-                && activePopupWidget() ->parentWidget()
-                && activePopupWidget() ->parentWidget() ->inherits( "QComboBox" ) )
-                key = Qt::Key_Return;
-
-        if ( activePopupWidget() && activePopupWidget() ->inherits( "QPopupMenu" ) )
-                key = Qt::Key_Return;
-
-        ke->simpleData.keycode = key;
+    // specialised actions for certain widgets. May want to
+    // add more stuff here.
+    if ( activePopupWidget() && activePopupWidget() ->inherits( "QListBox" )
+         && activePopupWidget() ->parentWidget()
+         && activePopupWidget() ->parentWidget() ->inherits( "QComboBox" ) )
+        key = Qt::Key_Return;
+
+    if ( activePopupWidget() && activePopupWidget() ->inherits( "QPopupMenu" ) )
+        key = Qt::Key_Return;
+
+#ifdef QWS
+    ke->simpleData.keycode = key;
+#endif
 }
@@ -488,6 +647,4 @@ class HackWidget : public QWidget
 public:
-        bool needsOk()
-        {
-                return ( getWState() & WState_Reserved1 );
-        }
+    bool needsOk()
+    { return ( getWState() & WState_Reserved1 ); }
 };
@@ -497,117 +654,122 @@ public:
 */
+
+#ifdef QWS
 bool QPEApplication::qwsEventFilter( QWSEvent * e )
 {
-        if ( !d->notbusysent && e->type == QWSEvent::Focus ) {
-                if ( qApp->type() != QApplication::GuiServer ) {
-                        QCopEnvelope e( "QPE/System", "notBusy(QString)" );
-                        e << d->appName;
-                }
-                d->notbusysent = TRUE;
-        }
-        if ( type() == GuiServer ) {
-                switch ( e->type ) {
-                        case QWSEvent::Mouse:
-                                if ( e->asMouse() ->simpleData.state && !QWidget::find( e->window() ) )
-                                        emit clientMoused();
-                }
-        }
-        if ( e->type == QWSEvent::Key ) {
-                if ( d->kbgrabber == 1 )
-                        return TRUE;
-                QWSKeyEvent *ke = ( QWSKeyEvent * ) e;
-                if ( ke->simpleData.keycode == Qt::Key_F33 ) {
-                        // Use special "OK" key to press "OK" on top level widgets
-                        QWidget * active = activeWindow();
-                        QWidget *popup = 0;
-                        if ( active && active->isPopup() ) {
-                                popup = active;
-                                active = active->parentWidget();
-                        }
-                        if ( active && ( int ) active->winId() == ke->simpleData.window &&
-                                !active->testWFlags( WStyle_Customize | WType_Popup | WType_Desktop ) ) {
-                                if ( ke->simpleData.is_press ) {
-                                        if ( popup )
-                                                popup->close();
-                                        if ( active->inherits( "QDialog" ) ) {
-                                                HackDialog * d = ( HackDialog * ) active;
-                                                d->acceptIt();
-                                                return TRUE;
-                                        }
-                                        else if ( ( ( HackWidget * ) active ) ->needsOk() ) {
-                                                QSignal s;
-                                                s.connect( active, SLOT( accept() ) );
-                                                s.activate();
-                                        }
-                                        else {
-                                                // do the same as with the select key: Map to the default action of the widget:
-                                                mapToDefaultAction( ke, Qt::Key_Return );
-                                        }
-                                }
-                        }
-                }
-                else if ( ke->simpleData.keycode == Qt::Key_F30 ) {
-                        // Use special "select" key to do whatever default action a widget has
-                        mapToDefaultAction( ke, Qt::Key_Space );
-                }
-                else if ( ke->simpleData.keycode == Qt::Key_Escape &&
-                          ke->simpleData.is_press ) {
-                        // Escape key closes app if focus on toplevel
-                        QWidget * active = activeWindow();
-                        if ( active && active->testWFlags( WType_TopLevel ) &&
-                                ( int ) active->winId() == ke->simpleData.window &&
-                                !active->testWFlags( WStyle_Dialog | WStyle_Customize | WType_Popup | WType_Desktop ) ) {
-                                if ( active->inherits( "QDialog" ) ) {
-                                        HackDialog * d = ( HackDialog * ) active;
-                                        d->rejectIt();
-                                        return TRUE;
-                                }
-                                else if ( strcmp( argv() [ 0 ], "embeddedkonsole" ) != 0 ) {
-                                        active->close();
-                                }
-                        }
-                }
+    if ( !d->notbusysent && e->type == QWSEvent::Focus ) {
+        if ( qApp->type() != QApplication::GuiServer ) {
+            QCopEnvelope e( "QPE/System", "notBusy(QString)" );
+            e << d->appName;
+        }
+        d->notbusysent = TRUE;
+    }
+    if ( type() == GuiServer ) {
+        switch ( e->type ) {
+        case QWSEvent::Mouse:
+            if ( e->asMouse() ->simpleData.state && !QWidget::find( e->window() ) )
+                emit clientMoused();
+            break;
+        default:
+            break;
+        }
+    }
+    if ( e->type == QWSEvent::Key ) {
+        if ( d->kbgrabber == 1 )
+            return TRUE;
+        QWSKeyEvent *ke = ( QWSKeyEvent * ) e;
+        if ( ke->simpleData.keycode == Qt::Key_F33 ) {
+            // Use special "OK" key to press "OK" on top level widgets
+            QWidget * active = activeWindow();
+            QWidget *popup = 0;
+            if ( active && active->isPopup() ) {
+                popup = active;
+                active = active->parentWidget();
+            }
+            if ( active && ( int ) active->winId() == ke->simpleData.window &&
+                 !active->testWFlags( WStyle_Customize | WType_Popup | WType_Desktop ) ) {
+                if ( ke->simpleData.is_press ) {
+                    if ( popup )
+                        popup->close();
+                    if ( active->inherits( "QDialog" ) ) {
+                        HackDialog * d = ( HackDialog * ) active;
+                        d->acceptIt();
+                        return TRUE;
+                    }
+                    else if ( ( ( HackWidget * ) active ) ->needsOk() ) {
+                        QSignal s;
+                        s.connect( active, SLOT( accept() ) );
+                        s.activate();
+                    }
+                    else {
+                        // do the same as with the select key: Map to the default action of the widget:
+                        mapToDefaultAction( ke, Qt::Key_Return );
+                    }
+                }
+            }
+        } else if ( ke->simpleData.keycode == Qt::Key_F30 ) {
+            // Use special "select" key to do whatever default action a widget has
+            mapToDefaultAction( ke, Qt::Key_Space );
+        }
+        else if ( ke->simpleData.keycode == Qt::Key_Escape &&
+                  ke->simpleData.is_press ) {
+            // Escape key closes app if focus on toplevel
+            QWidget * active = activeWindow();
+            if ( active && active->testWFlags( WType_TopLevel ) &&
+                 ( int ) active->winId() == ke->simpleData.window &&
+                 !active->testWFlags( WStyle_Dialog | WStyle_Customize | WType_Popup | WType_Desktop ) ) {
+                if ( active->inherits( "QDialog" ) ) {
+                    HackDialog * d = ( HackDialog * ) active;
+                    d->rejectIt();
+                    return TRUE;
+                }
+                else if ( strcmp( argv() [ 0 ], "embeddedkonsole" ) != 0 ) {
+                    active->close();
+                }
+            }
+        }
 
 #if QT_VERSION < 231
-                // Filter out the F4/Launcher key from apps
-                // ### The launcher key may not always be F4 on all devices
-                if ( ( ( QWSKeyEvent * ) e ) ->simpleData.keycode == Qt::Key_F4 )
-                        return TRUE;
+        // Filter out the F4/Launcher key from apps
+        // ### The launcher key may not always be F4 on all devices
+        if ( ( ( QWSKeyEvent * ) e ) ->simpleData.keycode == Qt::Key_F4 )
+            return TRUE;
 #endif
 
-        }
-        if ( e->type == QWSEvent::Focus ) {
-                QWSFocusEvent * fe = ( QWSFocusEvent* ) e;
-                QWidget* nfw = QWidget::find( e->window() );
-                if ( !fe->simpleData.get_focus ) {
-                        QWidget * active = activeWindow();
-                        while ( active && active->isPopup() ) {
-                                active->close();
-                                active = activeWindow();
-                        }
-                        if ( !nfw && d->kbgrabber == 2 ) {
-                                ungrabKeyboard();
-                                d->kbregrab = TRUE; // want kb back when we're active
-                        }
-                }
-                else {
-                        // make sure our modal widget is ALWAYS on top
-                        QWidget *topm = activeModalWidget();
-                        if ( topm ) {
-                                topm->raise();
-                        }
-                        if ( d->kbregrab ) {
-                                grabKeyboard();
-                                d->kbregrab = FALSE;
-                        }
-                }
-                if ( fe->simpleData.get_focus && inputMethodDict ) {
-                        InputMethodHint m = inputMethodHint( QWidget::find( e->window() ) );
-                        if ( m == AlwaysOff )
-                                Global::hideInputMethod();
-                        if ( m == AlwaysOn )
-                                Global::showInputMethod();
-                }
-        }
-        return QApplication::qwsEventFilter( e );
+    }
+    if ( e->type == QWSEvent::Focus ) {
+        QWSFocusEvent * fe = ( QWSFocusEvent* ) e;
+        QWidget* nfw = QWidget::find( e->window() );
+        if ( !fe->simpleData.get_focus ) {
+            QWidget * active = activeWindow();
+            while ( active && active->isPopup() ) {
+                active->close();
+                active = activeWindow();
+            }
+            if ( !nfw && d->kbgrabber == 2 ) {
+                ungrabKeyboard();
+                d->kbregrab = TRUE; // want kb back when we're active
+            }
+        }
+        else {
+            // make sure our modal widget is ALWAYS on top
+            QWidget *topm = activeModalWidget();
+            if ( topm ) {
+                topm->raise();
+            }
+            if ( d->kbregrab ) {
+                grabKeyboard();
+                d->kbregrab = FALSE;
+            }
+        }
+        if ( fe->simpleData.get_focus && inputMethodDict ) {
+            InputMethodHint m = inputMethodHint( QWidget::find( e->window() ) );
+            if ( m == AlwaysOff )
+                Global::hideInputMethod();
+            if ( m == AlwaysOn )
+                Global::showInputMethod();
+        }
+    }
+    return QApplication::qwsEventFilter( e );
 }
+#endif
 
@@ -618,11 +780,11 @@ QPEApplication::~QPEApplication()
 {
-        ungrabKeyboard();
+    ungrabKeyboard();
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
-        // Need to delete QCopChannels early, since the display will
-        // be gone by the time we get to ~QObject().
-        delete sysChannel;
-        delete pidChannel;
+    // Need to delete QCopChannels early, since the display will
+    // be gone by the time we get to ~QObject().
+    delete sysChannel;
+    delete pidChannel;
 #endif
 
-        delete d;
+    delete d;
 }
@@ -634,7 +796,7 @@ QString QPEApplication::qpeDir()
 {
-        const char * base = getenv( "OPIEDIR" );
-        if ( base )
-                return QString( base ) + "/";
+    const char * base = getenv( "OPIEDIR" );
+    if ( base )
+        return QString( base ) + "/";
 
-        return QString( "../" );
+    return QString( "../" );
 }
@@ -646,7 +808,3 @@ QString QPEApplication::documentDir()
 {
-        const char * base = getenv( "HOME" );
-        if ( base )
-                return QString( base ) + "/Documents/";
-
-        return QString( "../Documents/" );
+    return QString( qpeDir() + "Documents");
 }
@@ -660,18 +818,18 @@ int QPEApplication::defaultRotation()
 {
-        if ( deforient < 0 ) {
-                QString d = getenv( "QWS_DISPLAY" );
-                if ( d.contains( "Rot90" ) ) {
-                        deforient = 90;
-                }
-                else if ( d.contains( "Rot180" ) ) {
-                        deforient = 180;
-                }
-                else if ( d.contains( "Rot270" ) ) {
-                        deforient = 270;
-                }
-                else {
-                        deforient = 0;
-                }
-        }
-        return deforient;
+    if ( deforient < 0 ) {
+        QString d = getenv( "QWS_DISPLAY" );
+        if ( d.contains( "Rot90" ) ) {
+            deforient = 90;
+        }
+        else if ( d.contains( "Rot180" ) ) {
+            deforient = 180;
+        }
+        else if ( d.contains( "Rot270" ) ) {
+            deforient = 270;
+        }
+        else {
+            deforient = 0;
+        }
+    }
+    return deforient;
 }
@@ -683,9 +841,13 @@ void QPEApplication::setDefaultRotation( int r )
 {
-        if ( qApp->type() == GuiServer ) {
-                deforient = r;
-                setenv( "QWS_DISPLAY", QString( "Transformed:Rot%1:0" ).arg( r ).latin1(), 1 );
-        }
-        else {
-                QCopEnvelope( "QPE/System", "setDefaultRotation(int)" ) << r;
-        }
+    if ( qApp->type() == GuiServer ) {
+        deforient = r;
+        setenv( "QWS_DISPLAY", QString( "Transformed:Rot%1:0" ).arg( r ).latin1(), 1 );
+        Config config("qpe");
+        config.setGroup( "Rotation" );
+        config.writeEntry( "Screen",  getenv("QWS_DISPLAY") );
+    }  else {
+#ifndef QT_NO_COP
+        { QCopEnvelope e( "QPE/System", "setDefaultRotation(int)" ); e << r; }
+#endif
+    }
 }
@@ -724,139 +886,130 @@ void QPEApplication::applyStyle()
         setPalette( pal, TRUE );
+
+        // Window Decoration
+        QString dec = config.readEntry( "Decoration", "Qtopia" );
+        if ( dec != d->decorationName ) {
+            qwsSetDecoration( new QPEDecoration( dec ) );
+            d->decorationName = dec;
+        }
+
+        // Font
+        QString ff = config.readEntry( "FontFamily", font().family() );
+        int fs = config.readNumEntry( "FontSize", font().pointSize() );
+        setFont( QFont(ff,fs) );
 }
 
-void QPEApplication::systemMessage( const QCString & msg, const QByteArray & data )
+void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data )
 {
 #ifdef Q_WS_QWS
-        QDataStream stream( data, IO_ReadOnly );
-        if ( msg == "applyStyle()" ) {
-                applyStyle();
-        }
-        else if ( msg == "setDefaultRotation(int)" ) {
-                if ( type() == GuiServer ) {
-                        int r;
-                        stream >> r;
-                        setDefaultRotation( r );
-                }
-        }
-        else if ( msg == "shutdown()" ) {
-                if ( type() == GuiServer )
-                        shutdown();
-        }
-        else if ( msg == "quit()" ) {
-                if ( type() != GuiServer )
-                        tryQuit();
-        }
-        else if ( msg == "forceQuit()" ) {
-                if ( type() != GuiServer )
-                        quit();
-        }
-        else if ( msg == "restart()" ) {
-                if ( type() == GuiServer )
-                        restart();
-        }
-        else if ( msg == "grabKeyboard(QString)" ) {
-                QString who;
-                stream >> who;
-                if ( who.isEmpty() )
-                        d->kbgrabber = 0;
-                else if ( who != d->appName )
-                        d->kbgrabber = 1;
-                else
-                        d->kbgrabber = 2;
-                        
-                printf( "'%s' received grabKeyboard ( '%s' ) -> kbgrabber = %d\n", d-> appName.latin1(), who.latin1(), d-> kbgrabber );
-        }
-        else if ( msg == "language(QString)" ) {
-                if ( type() == GuiServer ) {
-                        QString l;
-                        stream >> l;
-                        QString cl = getenv( "LANG" );
-                        if ( cl != l ) {
-                                if ( l.isNull() )
-                                        unsetenv( "LANG" );
-                                else
-                                        setenv( "LANG", l.latin1(), 1 );
-                                restart();
-                        }
-                }
-        }
-        else if ( msg == "timeChange(QString)" ) {
-                QString t;
-                stream >> t;
-                if ( t.isNull() )
-                        unsetenv( "TZ" );
-                else
-                        setenv( "TZ", t.latin1(), 1 );
-                // emit the signal so everyone else knows...
-                emit timeChanged();
-        }
-        else if ( msg == "execute(QString)" ) {
-                if ( type() == GuiServer ) {
-                        QString t;
-                        stream >> t;
-                        Global::execute( t );
-                }
-        }
-        else if ( msg == "execute(QString,QString)" ) {
-                if ( type() == GuiServer ) {
-                        QString t, d;
-                        stream >> t >> d;
-                        Global::execute( t, d );
-                }
-        }
-        else if ( msg == "addAlarm(QDateTime,QCString,QCString,int)" ) {
-                if ( type() == GuiServer ) {
-                        QDateTime when;
-                        QCString channel, message;
-                        int data;
-                        stream >> when >> channel >> message >> data;
-                        AlarmServer::addAlarm( when, channel, message, data );
-                }
-        }
-        else if ( msg == "deleteAlarm(QDateTime,QCString,QCString,int)" ) {
-                if ( type() == GuiServer ) {
-                        QDateTime when;
-                        QCString channel, message;
-                        int data;
-                        stream >> when >> channel >> message >> data;
-                        AlarmServer::deleteAlarm( when, channel, message, data );
-                }
-        }
-        else if ( msg == "clockChange(bool)" ) {
-                int tmp;
-                stream >> tmp;
-                emit clockChanged( tmp );
-        }
-        else if ( msg == "weekChange(bool)" ) {
-                int tmp;
-                stream >> tmp;
-                emit weekChanged( tmp );
-        }
-        else if ( msg == "setDateFormat(DateFormat)" ) {
-                DateFormat tmp;
-                stream >> tmp;
-                emit dateFormatChanged( tmp );
-        }
-        else if ( msg == "setVolume(int,int)" ) {
-                int t, v;
-                stream >> t >> v;
-                setVolume( t, v );
-                emit volumeChanged( muted );
-        }
-        else if ( msg == "volumeChange(bool)" ) {
-                stream >> muted;
-                setVolume();
-                emit volumeChanged( muted );
-        }
-        else if ( msg == "setMic(int,int)" ) { // Added: 2002-02-08 by Jeremy Cowgar <jc@cowgar.com>
-                int t, v;
-                stream >> t >> v;
-                setMic( t, v );
-                emit micChanged( micMuted );
-        }
-        else if ( msg == "micChange(bool)" ) { // Added: 2002-02-08 by Jeremy Cowgar <jc@cowgar.com>
-                stream >> micMuted;
-                setMic();
-                emit micChanged( micMuted );
-        }
+    QDataStream stream( data, IO_ReadOnly );
+    if ( msg == "applyStyle()" ) {
+        applyStyle();
+    } else if ( msg == "setDefaultRotation(int)" ) {
+        if ( type() == GuiServer ) {
+            int r;
+            stream >> r;
+            setDefaultRotation( r );
+        }
+    } else if ( msg == "shutdown()" ) {
+        if ( type() == GuiServer )
+            shutdown();
+    } else if ( msg == "quit()" ) {
+        if ( type() != GuiServer )
+            tryQuit();
+    } else if ( msg == "forceQuit()" ) {
+        if ( type() != GuiServer )
+            quit();
+    } else if ( msg == "restart()" ) {
+        if ( type() == GuiServer )
+            restart();
+    } else if ( msg == "grabKeyboard(QString)" ) {
+        QString who;
+        stream >> who;
+        if ( who.isEmpty() )
+            d->kbgrabber = 0;
+        else if ( who != d->appName )
+            d->kbgrabber = 1;
+        else
+            d->kbgrabber = 2;
+    } else if ( msg == "language(QString)" ) {
+        if ( type() == GuiServer ) {
+            QString l;
+            stream >> l;
+            QString cl = getenv( "LANG" );
+            if ( cl != l ) {
+                if ( l.isNull() )
+                    unsetenv( "LANG" );
+                else
+                    setenv( "LANG", l.latin1(), 1 );
+                restart();
+            }
+        }
+    } else if ( msg == "timeChange(QString)" ) {
+        QString t;
+        stream >> t;
+        if ( t.isNull() )
+            unsetenv( "TZ" );
+        else
+            setenv( "TZ", t.latin1(), 1 );
+        // emit the signal so everyone else knows...
+        emit timeChanged();
+    } else if ( msg == "execute(QString)" ) {
+        if ( type() == GuiServer ) {
+            QString t;
+            stream >> t;
+            Global::execute( t );
+        }
+    } else if ( msg == "execute(QString,QString)" ) {
+        if ( type() == GuiServer ) {
+            QString t, d;
+            stream >> t >> d;
+            Global::execute( t, d );
+        }
+    } else if ( msg == "addAlarm(QDateTime,QCString,QCString,int)" ) {
+        if ( type() == GuiServer ) {
+            QDateTime when;
+            QCString channel, message;
+            int data;
+            stream >> when >> channel >> message >> data;
+            AlarmServer::addAlarm( when, channel, message, data );
+        }
+    } else if ( msg == "deleteAlarm(QDateTime,QCString,QCString,int)" ) {
+        if ( type() == GuiServer ) {
+            QDateTime when;
+            QCString channel, message;
+            int data;
+            stream >> when >> channel >> message >> data;
+            AlarmServer::deleteAlarm( when, channel, message, data );
+        }
+    } else if ( msg == "clockChange(bool)" ) {
+        int tmp;
+        stream >> tmp;
+        emit clockChanged( tmp );
+    } else if ( msg == "weekChange(bool)" ) {
+        int tmp;
+        stream >> tmp;
+        emit weekChanged( tmp );
+    } else if ( msg == "setDateFormat(DateFormat)" ) {
+        DateFormat tmp;
+        stream >> tmp;
+        emit dateFormatChanged( tmp );
+    } else if ( msg == "setVolume(int,int)" ) {
+        int t, v;
+        stream >> t >> v;
+        setVolume( t, v );
+        emit volumeChanged( muted );
+    } else if ( msg == "volumeChange(bool)" ) {
+        stream >> muted;
+        setVolume();
+        emit volumeChanged( muted );
+    } else if ( msg == "setMic(int,int)" ) { // Added: 2002-02-08 by Jeremy Cowgar <jc@cowgar.com>
+        int t, v;
+        stream >> t >> v;
+        setMic( t, v );
+        emit micChanged( micMuted );
+    } else if ( msg == "micChange(bool)" ) { // Added: 2002-02-08 by Jeremy Cowgar <jc@cowgar.com>
+        stream >> micMuted;
+        setMic();
+        emit micChanged( micMuted );
+    }
 #endif
@@ -869,33 +1022,36 @@ bool QPEApplication::raiseAppropriateWindow()
 {
-        bool r = FALSE;
-        // ########## raise()ing main window should raise and set active
-        // ########## it and then all childen. This belongs in Qt/Embedded
-        QWidget *top = d->qpe_main_widget;
-        if ( !top )
-                top = mainWidget();
-        if ( top && d->keep_running ) {
-                if ( top->isVisible() )
-                        r = TRUE;
-#ifdef Q_WS_QWS
-
-                if ( !d->nomaximize )
-                        top->showMaximized();
-                else
-#endif
-
-                        top->show();
-                top->raise();
-                top->setActiveWindow();
-        }
-        QWidget *topm = activeModalWidget();
-        if ( topm && topm != top ) {
-                topm->show();
-                topm->raise();
-                topm->setActiveWindow();
-                r = FALSE;
-        }
-        return r;
+    bool r=FALSE;
+    // ########## raise()ing main window should raise and set active
+    // ########## it and then all childen. This belongs in Qt/Embedded
+    QWidget *top = d->qpe_main_widget;
+    if ( !top ) top =mainWidget();
+    if ( top && d->keep_running ) {
+        if ( top->isVisible() )
+            r = TRUE;
+        else if (d->preloaded) {
+          // We are preloaded and not visible.. pretend we just started..
+           QCopEnvelope e("QPE/System", "fastAppShowing(QString)");
+           e << d->appName;
+        }
+
+        d->show_mx(top,d->nomaximize);
+        top->raise();
+        top->setActiveWindow();
+    }
+    QWidget *topm = activeModalWidget();
+    if ( topm && topm != top ) {
+        topm->show();
+        topm->raise();
+        topm->setActiveWindow();
+        // If we haven't already handled the fastAppShowing message
+        if (!top && d->preloaded) {
+           QCopEnvelope e("QPE/System", "fastAppShowing(QString)");
+           e << d->appName;
+        }
+        r = FALSE;
+    }
+    return r;
 }
 
-void QPEApplication::pidMessage( const QCString &msg, const QByteArray & data )
+void QPEApplication::pidMessage( const QCString& msg, const QByteArray& data)
 {
@@ -903,79 +1059,53 @@ void QPEApplication::pidMessage( const QCString &msg, const QByteArray & data )
 
-        if ( msg == "quit()" ) {
-                tryQuit();
-        }
-        else if ( msg == "quitIfInvisible()" ) {
-                if ( d->qpe_main_widget && !d->qpe_main_widget->isVisible() )
-                        quit();
-        }
-        else if ( msg == "close()" ) {
-                hideOrQuit();
-        }
-        else if ( msg == "disablePreload()" ) {
-                d->preloaded = FALSE;
-                d->keep_running = TRUE;
-                /* so that quit will quit */
-        }
-        else if ( msg == "enablePreload()" ) {
-                d->preloaded = TRUE;
-                d->keep_running = TRUE;
-                /* so next quit won't quit */
-        }
-        else if ( msg == "raise()" ) {
-                d->keep_running = TRUE;
-                d->notbusysent = FALSE;
-                raiseAppropriateWindow();
-        }
-        else if ( msg == "flush()" ) {
-                emit flush();
-                // we need to tell the desktop
-                QCopEnvelope e( "QPE/Desktop", "flushDone(QString)" );
-                e << d->appName;
-        }
-        else if ( msg == "reload()" ) {
-                emit reload();
-        }
-        else if ( msg == "setDocument(QString)" ) {
-                d->keep_running = TRUE;
-                QDataStream stream( data, IO_ReadOnly );
-                QString doc;
-                stream >> doc;
-                QWidget *mw = mainWidget();
-                if ( !mw )
-                        mw = d->qpe_main_widget;
-                if ( mw )
-                        Global::setDocument( mw, doc );
-        }
-        else if ( msg == "nextView()" ) {
-                if ( raiseAppropriateWindow() )
-                        emit appMessage( msg, data );
-        }
-        else {
-                emit appMessage( msg, data );
-        }
-#endif
-}
-
+    if ( msg == "quit()" ) {
+        tryQuit();
+    } else if ( msg == "quitIfInvisible()" ) {
+        if ( d->qpe_main_widget && !d->qpe_main_widget->isVisible() )
+            quit();
+    } else if ( msg == "close()" ) {
+        hideOrQuit();
+    } else if ( msg == "disablePreload()" ) {
+        d->preloaded = FALSE;
+        d->keep_running = TRUE;
+        /* so that quit will quit */
+    } else if ( msg == "enablePreload()" ) {
+      if (d->qpe_main_widget)
+        d->preloaded = TRUE;
+        d->keep_running = TRUE;
+        /* so next quit won't quit */
+    } else if ( msg == "raise()" ) {
+        d->keep_running = TRUE;
+        d->notbusysent = FALSE;
+        raiseAppropriateWindow();
+        // Tell the system we're still chugging along...
+        QCopEnvelope e("QPE/System", "appRaised(QString)");
+        e << d->appName;
+    } else if ( msg == "flush()" ) {
+        emit flush();
+        // we need to tell the desktop
+        QCopEnvelope e( "QPE/Desktop", "flushDone(QString)" );
+        e << d->appName;
+    } else if ( msg == "reload()" ) {
+        emit reload();
+    } else if ( msg == "setDocument(QString)" ) {
+        d->keep_running = TRUE;
+        QDataStream stream( data, IO_ReadOnly );
+        QString doc;
+        stream >> doc;
+        QWidget *mw = mainWidget();
+        if ( !mw )
+            mw = d->qpe_main_widget;
+        if ( mw )
+            Global::setDocument( mw, doc );
+    } else if ( msg == "nextView()" ) {
+        qDebug("got nextView()");
+/*
+        if ( raiseAppropriateWindow() )
+*/
+        emit appMessage( msg, data);
+    } else {
+        emit appMessage( msg, data);
+    }
 
-static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ )
-{
-        /*
-            // This works but disable it for now until it is safe to apply
-            // What is does is scan the .desktop files of all the apps for
-            // the applnk that has the corresponding argv[0] as this program
-            // then it uses the name stored in the .desktop file as the caption
-            // for the main widget. This saves duplicating translations for
-            // the app name in the program and in the .desktop files.
-
-            AppLnkSet apps( appsPath );
-
-            QList<AppLnk> appsList = apps.children();
-            for ( QListIterator<AppLnk> it(appsList); it.current(); ++it ) {
-          if ( (*it)->exec() == appName ) {
-              mw->setCaption( (*it)->name() );
-              return TRUE;
-          }
-            }
-        */
-        return FALSE;
+#endif
 }
@@ -984,3 +1114,3 @@ static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appNa
 /*!
-  Sets \a mw as the mainWidget() and shows it. For small windows,
+  Sets widget \a mw as the mainWidget() and shows it. For small windows,
   consider passing TRUE for \a nomaximize rather than the default FALSE.
@@ -991,27 +1121,3 @@ void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize )
 {
-        setWidgetCaptionFromAppName( mw, d->appName, qpeDir() + "apps" );
-
-        d->nomaximize = nomaximize;
-        d->qpe_main_widget = mw;
-        d->sendQCopQ();
-        if ( d->preloaded ) {
-                if ( d->forceshow ) {
-#ifdef Q_WS_QWS
-                        if ( !nomaximize )
-                                mw->showMaximized();
-                        else
-#endif
-
-                                mw->show();
-                }
-        }
-        else if ( d->keep_running ) {
-#ifdef Q_WS_QWS
-                if ( !nomaximize )
-                        mw->showMaximized();
-                else
-#endif
-
-                        mw->show();
-        }
+    d->show(mw,nomaximize );
 }
@@ -1019,3 +1125,3 @@ void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize )
 /*!
-  Sets \a mw as the mainWidget() and shows it. For small windows,
+  Sets widget \a mw as the mainWidget() and shows it. For small windows,
   consider passing TRUE for \a nomaximize rather than the default FALSE.
@@ -1025,3 +1131,3 @@ void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize )
 
-  The \a mw widget must have a slot: setDocument(const QString&).
+  The \a mw widget \e must have this slot: setDocument(const QString&).
 
@@ -1031,29 +1137,6 @@ void QPEApplication::showMainDocumentWidget( QWidget* mw, bool nomaximize )
 {
-        setWidgetCaptionFromAppName( mw, d->appName, qpeDir() + "apps" );
-
-        if ( mw && argc() == 2 )
-                Global::setDocument( mw, QString::fromUtf8( argv() [ 1 ] ) );
-        d->nomaximize = nomaximize;
-        d->qpe_main_widget = mw;
-        d->sendQCopQ();
-        if ( d->preloaded ) {
-                if ( d->forceshow ) {
-#ifdef Q_WS_QWS
-                        if ( !nomaximize )
-                                mw->showMaximized();
-                        else
-#endif
+    if ( mw && argc() == 2 )
+        Global::setDocument( mw, QString::fromUtf8(argv()[1]) );
 
-                                mw->show();
-                }
-        }
-        else if ( d->keep_running ) {
-#ifdef Q_WS_QWS
-                if ( !nomaximize )
-                        mw->showMaximized();
-                else
-#endif
-
-                        mw->show();
-        }
+    d->show(mw, nomaximize );
 }
@@ -1062,7 +1145,8 @@ void QPEApplication::showMainDocumentWidget( QWidget* mw, bool nomaximize )
 /*!
-  Sets that the application should continue running after processing
-  qcop messages.  Normally if an application is started via a qcop message,
-  the application will process the qcop message and then quit.  If while
-  processing the qcop message it calls this function, then the application
-  will show and start proper once it has finished processing qcop messages.
+  If an application is started via a \link qcop.html QCop\endlink
+  message, the application will process the \link qcop.html
+  QCop\endlink message and then quit. If the application calls this
+  function while processing a \link qcop.html QCop\endlink message,
+  after processing its outstanding \link qcop.html QCop\endlink
+  messages the application will start 'properly' and show itself.
 
@@ -1072,6 +1156,6 @@ void QPEApplication::setKeepRunning()
 {
-        if ( qApp && qApp->inherits( "QPEApplication" ) ) {
-                QPEApplication * qpeApp = ( QPEApplication* ) qApp;
-                qpeApp->d->keep_running = TRUE;
-        }
+    if ( qApp && qApp->inherits( "QPEApplication" ) ) {
+        QPEApplication * qpeApp = ( QPEApplication* ) qApp;
+        qpeApp->d->keep_running = TRUE;
+    }
 }
@@ -1079,4 +1163,4 @@ void QPEApplication::setKeepRunning()
 /*!
-  Returns whether the application will quit after processing the current
-  list of qcop messages.
+  Returns TRUE if the application will quit after processing the
+  current list of qcop messages; otherwise returns FALSE.
 
@@ -1095,70 +1179,70 @@ void QPEApplication::internalSetStyle( const QString &style )
 #if QT_VERSION >= 300
-        if ( style == "QPE" ) {
-                setStyle( new QPEStyle );
-        }
-        else {
-                QStyle *s = QStyleFactory::create( style );
-                if ( s )
-                        setStyle( s );
-        }
+    if ( style == "QPE" ) {
+        setStyle( new QPEStyle );
+    }
+    else {
+        QStyle *s = QStyleFactory::create( style );
+        if ( s )
+            setStyle( s );
+    }
 #else
-        if ( style == "Windows" ) {
-                setStyle( new QWindowsStyle );
-        }
-        else if ( style == "QPE" ) {
-                setStyle( new QPEStyle );
-        }
-        else if ( style == "Light" ) {
-                setStyle( new LightStyle );
-        }
+    if ( style == "Windows" ) {
+        setStyle( new QWindowsStyle );
+    }
+    else if ( style == "QPE" ) {
+        setStyle( new QPEStyle );
+    }
+    else if ( style == "Light" ) {
+        setStyle( new LightStyle );
+    }
 #ifndef QT_NO_STYLE_PLATINUM
-        else if ( style == "Platinum" ) {
-                setStyle( new QPlatinumStyle );
-        }
+    else if ( style == "Platinum" ) {
+        setStyle( new QPlatinumStyle );
+    }
 #endif
 #ifndef QT_NO_STYLE_MOTIF
-        else if ( style == "Motif" ) {
-                setStyle( new QMotifStyle );
-        }
+    else if ( style == "Motif" ) {
+        setStyle( new QMotifStyle );
+    }
 #endif
 #ifndef QT_NO_STYLE_MOTIFPLUS
-        else if ( style == "MotifPlus" ) {
-                setStyle( new QMotifPlusStyle );
-        }
+    else if ( style == "MotifPlus" ) {
+        setStyle( new QMotifPlusStyle );
+    }
 #endif
 
-        else {
-                QStyle *sty = 0;
-                QString path = QPEApplication::qpeDir ( ) + "/plugins/styles/lib" + style. lower ( ) + ".so";
+    else {
+        QStyle *sty = 0;
+        QString path = QPEApplication::qpeDir ( ) + "/plugins/styles/lib" + style. lower ( ) + ".so";
 
-                static QLibrary *lastlib = 0;
-                static StyleInterface *lastiface = 0;
+        static QLibrary *lastlib = 0;
+        static StyleInterface *lastiface = 0;
 
-                QLibrary *lib = new QLibrary ( path );
-                StyleInterface *iface = 0;
+        QLibrary *lib = new QLibrary ( path );
+        StyleInterface *iface = 0;
 
-                if ( lib-> queryInterface ( IID_Style, ( QUnknownInterface ** ) &iface ) == QS_OK )
-                        sty = iface-> create ( );
+        if ( lib-> queryInterface ( IID_Style, ( QUnknownInterface ** ) &iface ) == QS_OK )
+            sty = iface-> create ( );
 
-                if ( sty ) {
-                        setStyle ( sty );
+        if ( sty ) {
+            setStyle ( sty );
 
-                        if ( lastiface )
-                                lastiface-> release ( );
-                        lastiface = iface;
+            if ( lastiface )
+                lastiface-> release ( );
+            lastiface = iface;
 
-                        if ( lastlib ) {
-                                lastlib-> unload ( );
-                                delete lastlib;
-                        }
-                        lastlib = lib;
-                }
-                else {
-                        if ( iface )
-                                iface-> release ( );
-                        delete lib;
+            if ( lastlib ) {
+                lastlib-> unload ( );
+                delete lastlib;
+            }
+            lastlib = lib;
+        }
+        else {
+            if ( iface )
+                iface-> release ( );
+            delete lib;
 
-                        setStyle ( new QPEStyle ( ));
-                }
-        }
+            setStyle ( new QPEStyle ( ));
+        }
+    }
 #endif
@@ -1171,20 +1255,20 @@ void QPEApplication::prepareForTermination( bool willrestart )
 {
-        if ( willrestart ) {
-                // Draw a big wait icon, the image can be altered in later revisions
-                //  QWidget *d = QApplication::desktop();
-                QImage img = Resource::loadImage( "launcher/new_wait" );
-                QPixmap pix;
-                pix.convertFromImage( img.smoothScale( 1 * img.width(), 1 * img.height() ) );
-                QLabel *lblWait = new QLabel( 0, "wait hack!", QWidget::WStyle_Customize |
-                                              QWidget::WStyle_NoBorder | QWidget::WStyle_Tool );
-                lblWait->setPixmap( pix );
-                lblWait->setAlignment( QWidget::AlignCenter );
-                lblWait->show();
-                lblWait->showMaximized();
-        }
+    if ( willrestart ) {
+        // Draw a big wait icon, the image can be altered in later revisions
+        //  QWidget *d = QApplication::desktop();
+        QImage img = Resource::loadImage( "launcher/new_wait" );
+        QPixmap pix;
+        pix.convertFromImage( img.smoothScale( 1 * img.width(), 1 * img.height() ) );
+        QLabel *lblWait = new QLabel( 0, "wait hack!", QWidget::WStyle_Customize |
+                                      QWidget::WStyle_NoBorder | QWidget::WStyle_Tool );
+        lblWait->setPixmap( pix );
+        lblWait->setAlignment( QWidget::AlignCenter );
+        lblWait->show();
+        lblWait->showMaximized();
+    }
 #ifndef SINGLE_APP
-        { QCopEnvelope envelope( "QPE/System", "forceQuit()" );
-        }
-        processEvents(); // ensure the message goes out.
-        sleep( 1 ); // You have 1 second to comply.
+    { QCopEnvelope envelope( "QPE/System", "forceQuit()" );
+    }
+    processEvents(); // ensure the message goes out.
+    sleep( 1 ); // You have 1 second to comply.
 #endif
@@ -1197,3 +1281,3 @@ void QPEApplication::shutdown()
 {
-        // Implement in server's QPEApplication subclass
+    // Implement in server's QPEApplication subclass
 }
@@ -1205,3 +1289,3 @@ void QPEApplication::restart()
 {
-        // Implement in server's QPEApplication subclass
+    // Implement in server's QPEApplication subclass
 }
@@ -1211,4 +1295,4 @@ static void createDict()
 {
-        if ( !stylusDict )
-                stylusDict = new QPtrDict<void>;
+    if ( !stylusDict )
+        stylusDict = new QPtrDict<void>;
 }
@@ -1216,11 +1300,11 @@ static void createDict()
 /*!
-  Returns the current StylusMode for \a w.
+  Returns the current StylusMode for widget \a w.
 
-  \sa setStylusOperation()
+  \sa setStylusOperation() StylusMode
 */
-QPEApplication::StylusMode QPEApplication::stylusOperation( QWidget * w )
+QPEApplication::StylusMode QPEApplication::stylusOperation( QWidget* w )
 {
-        if ( stylusDict )
-                return ( StylusMode ) ( int ) stylusDict->find( w );
-        return LeftOnly;
+    if ( stylusDict )
+        return ( StylusMode ) ( int ) stylusDict->find( w );
+    return LeftOnly;
 }
@@ -1231,7 +1315,7 @@ QPEApplication::StylusMode QPEApplication::stylusOperation( QWidget * w )
     \value LeftOnly the stylus only generates LeftButton
-      events (the default).
+                       events (the default).
     \value RightOnHold the stylus generates RightButton events
-      if the user uses the press-and-hold gesture.
+                       if the user uses the press-and-hold gesture.
 
-    See setStylusOperation().
+    \sa setStylusOperation() stylusOperation()
 */
@@ -1239,5 +1323,6 @@ QPEApplication::StylusMode QPEApplication::stylusOperation( QWidget * w )
 /*!
-  Causes \a w to receive mouse events according to \a mode.
+  Causes widget \a w to receive mouse events according to the stylus
+  \a mode.
 
-  \sa stylusOperation()
+  \sa stylusOperation() StylusMode
 */
@@ -1245,13 +1330,13 @@ void QPEApplication::setStylusOperation( QWidget * w, StylusMode mode )
 {
-        createDict();
-        if ( mode == LeftOnly ) {
-                stylusDict->remove
-                ( w );
-                w->removeEventFilter( qApp );
-        }
-        else {
-                stylusDict->insert( w, ( void* ) mode );
-                connect( w, SIGNAL( destroyed() ), qApp, SLOT( removeSenderFromStylusDict() ) );
-                w->installEventFilter( qApp );
-        }
+    createDict();
+    if ( mode == LeftOnly ) {
+        stylusDict->remove
+            ( w );
+        w->removeEventFilter( qApp );
+    }
+    else {
+        stylusDict->insert( w, ( void* ) mode );
+        connect( w, SIGNAL( destroyed() ), qApp, SLOT( removeSenderFromStylusDict() ) );
+        w->installEventFilter( qApp );
+    }
 }
@@ -1264,57 +1349,63 @@ bool QPEApplication::eventFilter( QObject *o, QEvent *e )
 {
-        if ( stylusDict && e->type() >= QEvent::MouseButtonPress && e->type() <= QEvent::MouseMove ) {
-                QMouseEvent * me = ( QMouseEvent* ) e;
+    if ( stylusDict && e->type() >= QEvent::MouseButtonPress && e->type() <= QEvent::MouseMove ) {
+        QMouseEvent * me = ( QMouseEvent* ) e;
+        StylusMode mode = (StylusMode)(int)stylusDict->find(o);
+        switch (mode) {
+        case RightOnHold:
+            switch ( me->type() ) {
+            case QEvent::MouseButtonPress:
                 if ( me->button() == LeftButton ) {
-                        StylusMode mode = ( StylusMode ) ( int ) stylusDict->find( o );
-                        switch ( mode ) {
-                                case RightOnHold:
-                                        switch ( me->type() ) {
-                                                case QEvent::MouseButtonPress:
-                                                        d->presstimer = startTimer( 500 ); // #### pref.
-                                                        d->presswidget = ( QWidget* ) o;
-                                                        d->presspos = me->pos();
-                                                        d->rightpressed = FALSE;
-                                                        break;
-                                                case QEvent::MouseButtonRelease:
-                                                        if ( d->presstimer ) {
-                                                                killTimer( d->presstimer );
-                                                                d->presstimer = 0;
-                                                        }
-                                                        if ( d->rightpressed && d->presswidget ) {
-                                                                // Right released
-                                                                postEvent( d->presswidget,
-                                                                           new QMouseEvent( QEvent::MouseButtonRelease, me->pos(),
-                                                                                            RightButton, LeftButton + RightButton ) );
-                                                                // Left released, off-widget
-                                                                postEvent( d->presswidget,
-                                                                           new QMouseEvent( QEvent::MouseMove, QPoint( -1, -1 ),
-                                                                                            LeftButton, LeftButton ) );
-                                                                postEvent( d->presswidget,
-                                                                           new QMouseEvent( QEvent::MouseButtonRelease, QPoint( -1, -1 ),
-                                                                                            LeftButton, LeftButton ) );
-                                                                d->rightpressed = FALSE;
-                                                                return TRUE; // don't send the real Left release
-                                                        }
-                                                        break;
-                                                default:
-                                                        break;
-                                        }
-                                        break;
-                                default:
-                                        ;
-                        }
+                    d->presstimer = startTimer(500); // #### pref.
+                    d->presswidget = (QWidget*)o;
+                    d->presspos = me->pos();
+                    d->rightpressed = FALSE;
                 }
-        }
-        else if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) {
-                QKeyEvent * ke = ( QKeyEvent * ) e;
-                if ( ke->key() == Key_Enter ) {
-                        if ( o->isA( "QRadioButton" ) || o->isA( "QCheckBox" ) ) {
-                                postEvent( o, new QKeyEvent( e->type(), Key_Space, ' ',
-                                                             ke->state(), " ", ke->isAutoRepeat(), ke->count() ) );
-                                return TRUE;
-                        }
+                break;
+            case QEvent::MouseMove:
+                if (d->presstimer && (me->pos()-d->presspos).manhattanLength() > 8) {
+                    killTimer(d->presstimer);
+                    d->presstimer = 0;
+                }
+                break;
+              case QEvent::MouseButtonRelease:
+                if ( me->button() == LeftButton ) {
+                    if ( d->presstimer ) {
+                        killTimer(d->presstimer);
+                        d->presstimer = 0;
+                    }
+                    if ( d->rightpressed && d->presswidget ) {
+                        // Right released
+                        postEvent( d->presswidget,
+                            new QMouseEvent( QEvent::MouseButtonRelease, me->pos(),
+                                    RightButton, LeftButton+RightButton ) );
+                        // Left released, off-widget
+                        postEvent( d->presswidget,
+                            new QMouseEvent( QEvent::MouseMove, QPoint(-1,-1),
+                                    LeftButton, LeftButton ) );
+                        postEvent( d->presswidget,
+                            new QMouseEvent( QEvent::MouseButtonRelease, QPoint(-1,-1),
+                                    LeftButton, LeftButton ) );
+                        d->rightpressed = FALSE;
+                return TRUE; // don't send the real Left release
+                    }
+                }
+                break;
+              default:
+                break;
+            }
+            break;
+          default:
+            ;
+        }
+    }else if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) {
+        QKeyEvent *ke = (QKeyEvent *)e;
+        if ( ke->key() == Key_Enter ) {
+            if ( o->isA( "QRadioButton" ) || o->isA( "QCheckBox" ) ) {
+                postEvent( o, new QKeyEvent( e->type(), Key_Space, ' ',
+                    ke->state(), " ", ke->isAutoRepeat(), ke->count() ) );
+                return TRUE;
                 }
         }
-
-        return FALSE;
+    }
+    return FALSE;
 }
@@ -1326,11 +1417,11 @@ void QPEApplication::timerEvent( QTimerEvent *e )
 {
-        if ( e->timerId() == d->presstimer && d->presswidget ) {
-                // Right pressed
-                postEvent( d->presswidget,
-                           new QMouseEvent( QEvent::MouseButtonPress, d->presspos,
-                                            RightButton, LeftButton ) );
-                killTimer( d->presstimer );
-                d->presstimer = 0;
-                d->rightpressed = TRUE;
-        }
+    if ( e->timerId() == d->presstimer && d->presswidget ) {
+        // Right pressed
+        postEvent( d->presswidget,
+                   new QMouseEvent( QEvent::MouseButtonPress, d->presspos,
+                                    RightButton, LeftButton ) );
+        killTimer( d->presstimer );
+        d->presstimer = 0;
+        d->rightpressed = TRUE;
+    }
 }
@@ -1339,6 +1430,6 @@ void QPEApplication::removeSenderFromStylusDict()
 {
-        stylusDict->remove
+    stylusDict->remove
         ( ( void* ) sender() );
-        if ( d->presswidget == sender() )
-                d->presswidget = 0;
+    if ( d->presswidget == sender() )
+        d->presswidget = 0;
 }
@@ -1350,3 +1441,3 @@ bool QPEApplication::keyboardGrabbed() const
 {
-        return d->kbgrabber;
+    return d->kbgrabber;
 }
@@ -1360,9 +1451,11 @@ void QPEApplication::ungrabKeyboard()
 {
-        QPEApplicationData * d = ( ( QPEApplication* ) qApp ) ->d;
-        if ( d->kbgrabber == 2 ) {
-                QCopEnvelope e( "QPE/System", "grabKeyboard(QString)" );
-                e << QString::null;
-                d->kbregrab = FALSE;
-                d->kbgrabber = 0;
-        }
+    QPEApplicationData * d = ( ( QPEApplication* ) qApp ) ->d;
+    if ( d->kbgrabber == 2 ) {
+#ifndef QT_NO_COP
+        QCopEnvelope e( "QPE/System", "grabKeyboard(QString)" );
+        e << QString::null;
+#endif
+        d->kbregrab = FALSE;
+        d->kbgrabber = 0;
+    }
 }
@@ -1370,5 +1463,7 @@ void QPEApplication::ungrabKeyboard()
 /*!
-  Grabs the keyboard such that the system's application launching
-  keys no longer work, and instead they are receivable by this
-  application.
+  Grabs the physical keyboard keys, e.g. the application's launching
+  keys. Instead of launching applications when these keys are pressed
+  the signals emitted are sent to this application instead. Some games
+  programs take over the launch keys in this way to make interaction
+  easier.
 
@@ -1378,10 +1473,12 @@ void QPEApplication::grabKeyboard()
 {
-        QPEApplicationData * d = ( ( QPEApplication* ) qApp ) ->d;
-        if ( qApp->type() == QApplication::GuiServer )
-                d->kbgrabber = 0;
-        else {
-                QCopEnvelope e( "QPE/System", "grabKeyboard(QString)" );
-                e << d->appName;
-                d->kbgrabber = 2; // me
-        }
+    QPEApplicationData * d = ( ( QPEApplication* ) qApp ) ->d;
+    if ( qApp->type() == QApplication::GuiServer )
+        d->kbgrabber = 0;
+    else {
+#ifndef QT_NO_COP
+        QCopEnvelope e( "QPE/System", "grabKeyboard(QString)" );
+        e << d->appName;
+#endif
+        d->kbgrabber = 2; // me
+    }
 }
@@ -1393,13 +1490,17 @@ int QPEApplication::exec()
 {
-        d->sendQCopQ();
-        if ( d->keep_running )
-                //|| d->qpe_main_widget && d->qpe_main_widget->isVisible() )
-                return QApplication::exec();
+#ifndef QT_NO_COP
+    d->sendQCopQ();
+#endif
+    if ( d->keep_running )
+        //|| d->qpe_main_widget && d->qpe_main_widget->isVisible() )
+        return QApplication::exec();
 
-        {
-                QCopEnvelope e( "QPE/System", "closing(QString)" );
-                e << d->appName;
-        }
-        processEvents();
-        return 0;
+#ifndef QT_NO_COP
+    {
+        QCopEnvelope e( "QPE/System", "closing(QString)" );
+        e << d->appName;
+    }
+#endif
+    processEvents();
+    return 0;
 }
@@ -1413,11 +1514,13 @@ void QPEApplication::tryQuit()
 {
-        if ( activeModalWidget() || strcmp( argv() [ 0 ], "embeddedkonsole" ) == 0 )
-                return ; // Inside modal loop or konsole. Too hard to save state.
-        {
-                QCopEnvelope e( "QPE/System", "closing(QString)" );
-                e << d->appName;
-        }
-        processEvents();
+    if ( activeModalWidget() || strcmp( argv() [ 0 ], "embeddedkonsole" ) == 0 )
+        return ; // Inside modal loop or konsole. Too hard to save state.
+#ifndef QT_NO_COP
+    {
+        QCopEnvelope e( "QPE/System", "closing(QString)" );
+        e << d->appName;
+    }
+#endif
+    processEvents();
 
-        quit();
+    quit();
 }
@@ -1432,12 +1535,16 @@ void QPEApplication::hideOrQuit()
 {
-        // notify of our demise :)
-        {
-                QCopEnvelope e( "QPE/System", "closing(QString)" );
-                e << d->appName;
-        }
-        processEvents();
-        if ( d->preloaded && d->qpe_main_widget )
-                d->qpe_main_widget->hide();
-        else
-                quit();
+    processEvents();
+
+    // If we are a preloaded application we don't actually quit, so emit
+    // a System message indicating we're quasi-closing.
+    if ( d->preloaded && d->qpe_main_widget )
+#ifndef QT_NO_COP
+      {
+        QCopEnvelope e("QPE/System", "fastAppHiding(QString)" );
+        e << d->appName;
+        d->qpe_main_widget->hide();
+      }
+#endif
+    else
+        quit();
 }
@@ -1451,5 +1558,5 @@ void QPEApplication::hideOrQuit()
 
-void* operator new[] ( size_t size )
+void* operator new[]( size_t size )
 {
-        return malloc( size );
+    return malloc( size );
 }
@@ -1458,13 +1565,13 @@ void* operator new( size_t size )
 {
-        return malloc( size );
+    return malloc( size );
 }
 
-void operator delete[] ( void* p )
+void operator delete[]( void* p )
 {
-        free( p );
+    free( p );
 }
 
-void operator delete[] ( void* p, size_t /*size*/ )
+void operator delete[]( void* p, size_t /*size*/ )
 {
-        free( p );
+    free( p );
 }
@@ -1473,3 +1580,3 @@ void operator delete( void* p )
 {
-        free( p );
+    free( p );
 }
@@ -1478,3 +1585,3 @@ void operator delete( void* p, size_t /*size*/ )
 {
-        free( p );
+    free( p );
 }
@@ -1485,21 +1592,23 @@ void operator delete( void* p, size_t /*size*/ )
 #include <qwidgetlist.h>
+#ifdef QWS
 #include <qgfx_qws.h>
 extern QRect qt_maxWindowRect;
-void qt_setMaxWindowRect( const QRect & r )
+void qt_setMaxWindowRect(const QRect& r )
 {
-        qt_maxWindowRect = qt_screen->mapFromDevice( r,
-                           qt_screen->mapToDevice( QSize( qt_screen->width(), qt_screen->height() ) ) );
-        // Re-resize any maximized windows
-        QWidgetList* l = QApplication::topLevelWidgets();
-        if ( l ) {
-                QWidget * w = l->first();
-                while ( w ) {
-                        if ( w->isVisible() && w->isMaximized() ) {
-                                w->showMaximized();
-                        }
-                        w = l->next();
-                }
-                delete l;
-        }
+    qt_maxWindowRect = qt_screen->mapFromDevice( r,
+                                                 qt_screen->mapToDevice( QSize( qt_screen->width(), qt_screen->height() ) ) );
+    // Re-resize any maximized windows
+    QWidgetList* l = QApplication::topLevelWidgets();
+    if ( l ) {
+        QWidget * w = l->first();
+        while ( w ) {
+            if ( w->isVisible() && w->isMaximized() ) {
+                w->showMaximized();
+            }
+            w = l->next();
+        }
+        delete l;
+    }
 }
 #endif
+#endif
diff --git a/library/qpeapplication.h b/library/qpeapplication.h
index 23606db..2515f1b 100644
--- a/library/qpeapplication.h
+++ b/library/qpeapplication.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -24,2 +24,3 @@
 #include <qapplication.h>
+#include <qdialog.h>
 #if defined(_WS_QWS_) && !defined(Q_WS_QWS)
@@ -63,3 +64,3 @@ public:
     };
-    
+
     enum screenSaverHint {
@@ -70,3 +71,3 @@ public:
     };
-    
+
     static void setInputMethodHint( QWidget *, InputMethodHint );
@@ -76,2 +77,4 @@ public:
     void showMainDocumentWidget( QWidget*, bool nomax=FALSE );
+    static void showDialog( QDialog*, bool nomax=FALSE );
+    static int execDialog( QDialog*, bool nomax=FALSE );
 
@@ -80,2 +83,4 @@ public:
 
+    bool keyboardGrabbed() const;
+
     int exec();
@@ -86,4 +91,4 @@ signals:
     void clockChanged( bool pm );
+    void micChanged( bool muted );
     void volumeChanged( bool muted );
-        void micChanged( bool muted );
     void appMessage( const QCString& msg, const QByteArray& data);
@@ -93,3 +98,3 @@ signals:
     void reload();
-    
+
 private slots:
@@ -108,3 +113,2 @@ protected:
     void timerEvent( QTimerEvent * );
-    bool keyboardGrabbed() const;
     bool raiseAppropriateWindow();
@@ -127,2 +131,24 @@ private:
 
+inline void QPEApplication::showDialog( QDialog* d, bool nomax )
+{
+    QSize sh = d->sizeHint();
+    int w = QMAX(sh.width(),d->width());
+    int h = QMAX(sh.height(),d->height());
+    if ( !nomax
+        && ( w > qApp->desktop()->width()*3/4
+            || h > qApp->desktop()->height()*3/4 ) )
+    {
+        d->showMaximized();
+    } else {
+        d->resize(w,h);
+        d->show();
+    }
+}
+
+inline int QPEApplication::execDialog( QDialog* d, bool nomax )
+{
+    showDialog(d,nomax);
+    return d->exec();
+}
+
 
diff --git a/library/qpedebug.cpp b/library/qpedebug.cpp
index 29bcbb6..b7cbc7b 100644
--- a/library/qpedebug.cpp
+++ b/library/qpedebug.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/qpedebug.h b/library/qpedebug.h
index 434ddec..6bf2e8b 100644
--- a/library/qpedebug.h
+++ b/library/qpedebug.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/qpedecoration_qws.cpp b/library/qpedecoration_qws.cpp
index e041945..222d906 100644
--- a/library/qpedecoration_qws.cpp
+++ b/library/qpedecoration_qws.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -19,2 +19,3 @@
 **********************************************************************/
+#ifdef QWS
 #define QTOPIA_INTERNAL_LANGLIST
@@ -34,2 +35,4 @@
 #include "global.h"
+#include "qlibrary.h"
+#include "windowdecorationinterface.h"
 #include <qfile.h>
@@ -41,5 +44,3 @@ extern QRect qt_maxWindowRect;
 
-//#define MINIMIZE_HELP_HACK  // use minimize button when not a dialog
-
-//#define WHATSTHIS_MODE
+#define WHATSTHIS_MODE
 
@@ -97,2 +98,20 @@ static const char * const qpe_accept_xpm[] = {
 
+class HackWidget : public QWidget
+{
+public:
+    bool needsOk() {
+        return (getWState() & WState_Reserved1 ) ||
+                 (inherits( "QDialog" ) && !inherits( "QMessageBox" ) );
+    }
+};
+
+static QImage scaleButton( const QImage &img, int height )
+{
+    if ( img.height() != height ) {
+        return img.smoothScale( img.width()*height/img.height(), height );
+    } else {
+        return img;
+    }
+}
+
 class TLWidget : public QWidget
@@ -109,6 +128,10 @@ public:
     }
+
+    void setWState( uint s ) { QWidget::setWState( s ); }
+    void clearWState( uint s ) { QWidget::clearWState( s ); }
 };
 
+
 QPEManager::QPEManager( QPEDecoration *d, QObject *parent )
-    : QObject( parent ), decoration( d ), helpState(0)
+    : QObject( parent ), decoration( d ), helpState(0), inWhatsThis(FALSE)
 {
@@ -122,6 +145,6 @@ void QPEManager::updateActive()
     QWidget *newActive = qApp->activeWindow();
-    if ( (QWidget*)active == newActive )
+    if ( newActive && (QWidget*)active == newActive )
         return;
 
-    if ( active ) {
+    if ( active && (!newActive || ((TLWidget *)newActive)->manager()) ) {
         ((TLWidget *)(QWidget*)active)->manager()->removeEventFilter( this );
@@ -132,3 +155,3 @@ void QPEManager::updateActive()
         ((TLWidget *)(QWidget*)active)->manager()->installEventFilter( this );
-    } else {
+    } else if ( !newActive ) {
         active = 0;
@@ -139,5 +162,11 @@ int QPEManager::pointInQpeRegion( QWidget *w, const QPoint &p )
 {
-    if ( decoration->region( w, w->geometry(),
-            (QWSDecoration::Region)QPEDecoration::Help ).contains(p) ) {
+    QRect rect(w->geometry());
+
+    if ( decoration->region( w, rect,
+                (QWSDecoration::Region)QPEDecoration::Help ).contains(p) )
         return QPEDecoration::Help;
+
+    for (int i = QWSDecoration::LastRegion; i >= QWSDecoration::Title; i--) {
+        if (decoration->region(w, rect, (QWSDecoration::Region)i).contains(p))
+            return (QWSDecoration::Region)i;
     }
@@ -154,9 +183,37 @@ bool QPEManager::eventFilter( QObject *o, QEvent *e )
             {
-                if ( QWhatsThis::inWhatsThisMode() ) {
-                    QWhatsThis::leaveWhatsThisMode();
-                    return true;
-                }
                 pressTime = QTime::currentTime();
                 QPoint p = ((QMouseEvent*)e)->globalPos();
-                if ( pointInQpeRegion( w, p ) == QPEDecoration::Help ) {
+                int inRegion = pointInQpeRegion( w, p );
+#ifdef WHATSTHIS_MODE
+                if ( !w->geometry().contains(p) && QWhatsThis::inWhatsThisMode() ) {
+                    QString text;
+                    switch ( inRegion ) {
+                        case QWSDecoration::Close:
+                            if ( ((HackWidget*)w)->needsOk() )
+                                text = tr("Click to close this window, discarding changes.");
+                            else
+                                text = tr("Click to close this window.");
+                            break;
+                        case QWSDecoration::Minimize:
+                            text = tr("Click to close this window and apply changes.");
+                            break;
+                        case QWSDecoration::Maximize:
+                            if ( w->isMaximized() )
+                                text = tr("Click to make this window moveable.");
+                            else
+                                text = tr("Click to make this window use all available screen area.");
+                            break;
+                        default:
+                            break;
+                    }
+                    QWhatsThis::leaveWhatsThisMode( text );
+                    whatsThisTimeout();
+                    helpState = 0;
+                    return true;
+                }
+#endif
+                if ( inRegion == QPEDecoration::Help ) {
+#ifdef WHATSTHIS_MODE
+                    wtTimer->start( 400, TRUE );
+#endif
                     helpState = QWSButton::Clicked|QWSButton::MouseOver;
@@ -169,2 +226,3 @@ bool QPEManager::eventFilter( QObject *o, QEvent *e )
             if ( helpState & QWSButton::Clicked ) {
+                wtTimer->stop();
                 helpState = 0;
@@ -173,12 +231,3 @@ bool QPEManager::eventFilter( QObject *o, QEvent *e )
                 if ( pointInQpeRegion( w, p ) == QPEDecoration::Help ) {
-#ifdef WHATSTHIS_MODE
-                    if ( pressTime.msecsTo( QTime::currentTime() ) > 250 ) {
-                        decoration->help( w );
-                    } else {
-                        QWhatsThis::enterWhatsThisMode();
-                        wtTimer->start( 200 );
-                    }
-#else
                     decoration->help( w );
-#endif
                 }
@@ -191,6 +240,7 @@ bool QPEManager::eventFilter( QObject *o, QEvent *e )
                 QPoint p = ((QMouseEvent*)e)->globalPos();
-                if ( pointInQpeRegion( w, p ) == QPEDecoration::Help )
+                if ( pointInQpeRegion( w, p ) == QPEDecoration::Help ) {
                     helpState = QWSButton::Clicked|QWSButton::MouseOver;
-                else
+                } else {
                     helpState = 0;
+                }
                 if ( helpState != oldState )
@@ -214,2 +264,15 @@ void QPEManager::drawButton( QWidget *w, QPEDecoration::QPERegion r, int state )
 
+void QPEManager::drawTitle( QWidget *w )
+{
+    QPainter painter(w);
+    QRegion rgn = ((TLWidget *)w)->topExtra()->decor_allocated_region;
+    painter.internalGfx()->setWidgetDeviceRegion( rgn );
+    painter.setClipRegion(decoration->region(w, w->rect(),QWSDecoration::All));
+    decoration->paint( &painter, w );
+    decoration->paintButton(&painter, w, QWSDecoration::Menu, 0);
+    decoration->paintButton(&painter, w, QWSDecoration::Close, 0);
+    decoration->paintButton(&painter, w, QWSDecoration::Minimize, 0);
+    decoration->paintButton(&painter, w, QWSDecoration::Maximize, 0);
+}
+
 void QPEManager::whatsThisTimeout()
@@ -217,12 +280,162 @@ void QPEManager::whatsThisTimeout()
     if ( !QWhatsThis::inWhatsThisMode() ) {
-        wtTimer->stop();
-        if ( active )
-            drawButton( active, QPEDecoration::Help, 0 );
-    } else if ( active ) {
-        static int state = 0;
-        if ( !state )
-            state = QWSButton::Clicked|QWSButton::MouseOver;
+        if ( inWhatsThis ) {
+            if ( whatsThis ) {
+                QWidget *w = whatsThis;
+                whatsThis = 0;
+                drawTitle( w );
+            }
+            wtTimer->stop();
+        } else {
+            QWhatsThis::enterWhatsThisMode();
+            helpState = 0;
+            updateActive();
+            if ( active ) {
+                whatsThis = active;
+                drawTitle( active );
+                // check periodically to see if we've left whats this mode
+                wtTimer->start( 250 );
+            }
+        }
+        inWhatsThis = !inWhatsThis;
+    }
+}
+
+//===========================================================================
+
+static QImage *okImage( int th )
+{
+    static QImage *i = 0;
+    if ( !i || i->height() != th ) {
+        delete i;
+        i = new QImage(scaleButton(Resource::loadImage("OKButton"),th));
+    }
+    return i;
+}
+
+static QImage *closeImage( int th )
+{
+    static QImage *i = 0;
+    if ( !i || i->height() != th ) {
+        delete i;
+        i = new QImage(scaleButton(Resource::loadImage("CloseButton"),th));
+    }
+    return i;
+}
+
+static QImage *helpImage( int th )
+{
+    static QImage *i = 0;
+    if ( !i || i->height() != th ) {
+        delete i;
+        i = new QImage(scaleButton(Resource::loadImage("HelpButton"),th));
+    }
+    return i;
+}
+
+static QImage *maximizeImage( int th )
+{
+    static QImage *i = 0;
+    if ( !i || i->height() != th ) {
+        delete i;
+        i = new QImage(scaleButton(Resource::loadImage("MaximizeButton"),th));
+    }
+    return i;
+}
+
+int WindowDecorationInterface::metric( Metric m, const WindowData *wd ) const
+{
+    switch ( m ) {
+        case TitleHeight:
+            if ( QApplication::desktop()->height() > 320 )
+                return 19;
+            else
+                return 15;
+        case LeftBorder:
+        case RightBorder:
+        case TopBorder:
+        case BottomBorder:
+            return 4;
+        case OKWidth:
+            return okImage(metric(TitleHeight,wd))->width();
+        case CloseWidth:
+            return closeImage(metric(TitleHeight,wd))->width();
+        case HelpWidth:
+            return helpImage(metric(TitleHeight,wd))->width();
+        case MaximizeWidth:
+            return maximizeImage(metric(TitleHeight,wd))->width();
+        case CornerGrabSize:
+            return 16;
+    }
+
+    return 0;
+}
+
+void WindowDecorationInterface::drawArea( Area a, QPainter *p, const WindowData *wd ) const
+{
+    int th = metric( TitleHeight, wd );
+    QRect r = wd->rect;
+
+    switch ( a ) {
+        case Border:
+            {
+                const QColorGroup &cg = wd->palette.active();
+                qDrawWinPanel(p, r.x()-metric(LeftBorder,wd),
+                        r.y()-th-metric(TopBorder,wd),
+                        r.width()+metric(LeftBorder,wd)+metric(RightBorder,wd),
+                        r.height()+th+metric(TopBorder,wd)+metric(BottomBorder,wd),
+                        cg, FALSE, &cg.brush(QColorGroup::Background));
+            }
+            break;
+        case Title:
+            {
+                const QColorGroup &cg = wd->palette.active();
+                QBrush titleBrush;
+                QPen   titleLines;
+
+                if ( wd->flags & WindowData::Active ) {
+                    titleBrush = cg.brush(QColorGroup::Highlight);
+                    titleLines = titleBrush.color().dark();
+                } else {
+                    titleBrush = cg.brush(QColorGroup::Background);
+                    titleLines = titleBrush.color();
+                }
+
+                p->fillRect( r.x(), r.y()-th, r.width(), th, titleBrush);
+
+                p->setPen( titleLines );
+                for ( int i = r.y()-th; i < r.y(); i += 2 )
+                    p->drawLine( r.left(), i, r.right(), i );
+            }
+            break;
+        case TitleText:
+            p->drawText( r.x()+3+metric(HelpWidth,wd), r.top()-th,
+                r.width()-metric(OKWidth,wd)-metric(CloseWidth,wd),
+                th, QPainter::AlignVCenter, wd->caption);
+            break;
+    }
+}
+
+void WindowDecorationInterface::drawButton( Button b, QPainter *p, const WindowData *wd, int x, int y, int, int, QWSButton::State state ) const
+{
+    QImage *img = 0;
+    switch ( b ) {
+        case OK:
+            img = okImage(metric(TitleHeight,wd));
+            break;
+        case Close:
+            img = closeImage(metric(TitleHeight,wd));
+            break;
+        case Help:
+            img = helpImage(metric(TitleHeight,wd));
+            break;
+        case Maximize:
+            img = maximizeImage(metric(TitleHeight,wd));
+            break;
+    }
+
+    if ( img ) {
+        if ((state & QWSButton::MouseOver) && (state & QWSButton::Clicked))
+            p->drawImage(x+2, y+2, *img);
         else
-            state = 0;
-        drawButton( active, QPEDecoration::Help, state );
+            p->drawImage(x+1, y+1, *img);
     }
@@ -230,10 +443,43 @@ void QPEManager::whatsThisTimeout()
 
-//=========
+QRegion WindowDecorationInterface::mask( const WindowData *wd ) const
+{
+    int th = metric(TitleHeight,wd);
+    QRect rect( wd->rect );
+    QRect r(rect.left() - metric(LeftBorder,wd),
+            rect.top() - th - metric(TopBorder,wd),
+            rect.width() + metric(LeftBorder,wd) + metric(RightBorder,wd),
+            rect.height() + th + metric(TopBorder,wd) + metric(BottomBorder,wd));
+    return QRegion(r) - rect;
+}
 
-class HackWidget : public QWidget
+class DefaultWindowDecoration : public WindowDecorationInterface
 {
 public:
-    bool needsOk() { return (getWState() & WState_Reserved1 ); }
+    DefaultWindowDecoration() : ref(0) {}
+    QString name() const {
+        return "Default";
+    }
+    QPixmap icon() const {
+        return QPixmap();
+    }
+    QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface ) {
+        *iface = 0;
+        if ( uuid == IID_QUnknown )
+            *iface = this;
+        else if ( uuid == IID_WindowDecoration )
+            *iface = this;
+
+        if ( *iface )
+            (*iface)->addRef();
+        return QS_OK;
+    }
+    Q_REFCOUNT
+
+private:
+    ulong ref;
 };
 
+static WindowDecorationInterface *wdiface = 0;
+static QLibrary *wdlib = 0;
+
 //===========================================================================
@@ -243,15 +489,48 @@ QPEDecoration::QPEDecoration()
 {
-    imageOk = Resource::loadImage( "OKButton" );
-    imageClose = Resource::loadImage( "CloseButton" );
-    imageHelp = Resource::loadImage( "HelpButton" );
+    if ( wdlib ) {
+        wdiface->release();
+        wdlib->unload();
+        delete wdlib;
+        wdlib = 0;
+    } else {
+        delete wdiface;
+    }
+    wdiface = new DefaultWindowDecoration;
+
     helpFile = QString(qApp->argv()[0]) + ".html";
-    QStringList path = Global::helpPath();
+    QStringList helpPath = Global::helpPath();
     helpExists = FALSE;
-    for (QStringList::ConstIterator it=path.begin(); it!=path.end() && !helpExists; ++it)
+    for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it)
+        helpExists = QFile::exists( *it + "/" + helpFile );
+    qpeManager = new QPEManager( this );
+}
+
+QPEDecoration::QPEDecoration( const QString &plugin )
+    : QWSDefaultDecoration()
+{
+    if ( wdlib ) {
+        wdiface->release();
+        wdlib->unload();
+        delete wdlib;
+        wdlib = 0;
+    } else {
+        delete wdiface;
+    }
+    WindowDecorationInterface *iface = 0;
+    QString path = QPEApplication::qpeDir() + "/plugins/decorations";
+    QLibrary *lib = new QLibrary( path + "/" + plugin );
+    if ( lib->queryInterface( IID_WindowDecoration, (QUnknownInterface**)&iface ) == QS_OK && iface ) {
+        wdiface = iface;
+        wdlib = lib;
+    } else {
+        delete lib;
+        wdiface = new DefaultWindowDecoration;
+    }
+
+    helpFile = QString(qApp->argv()[0]) + ".html";
+    QStringList helpPath = Global::helpPath();
+    helpExists = FALSE;
+    for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it)
         helpExists = QFile::exists( *it + "/" + helpFile );
-#ifndef MINIMIZE_HELP_HACK
     qpeManager = new QPEManager( this );
-#else
-    qpeManager = 0;
-#endif
 }
@@ -288,5 +567,7 @@ const char **QPEDecoration::normalizePixmap()
 
-int QPEDecoration::getTitleHeight(const QWidget *)
+int QPEDecoration::getTitleHeight( const QWidget *w )
 {
-    return 15;
+    WindowDecorationInterface::WindowData wd;
+    windowData( w, wd );
+    return wdiface->metric(WindowDecorationInterface::TitleHeight,&wd);
 }
@@ -298,10 +579,15 @@ QRegion QPEDecoration::region(const QWidget *widget, const QRect &rect, QWSDecor
 {
-    int titleHeight = getTitleHeight(widget);
-//    int titleWidth = getTitleWidth(widget);
-//    int bw = rect.isEmpty() ? 0 : BORDER_WIDTH;
-    QRegion region;
-
-#ifndef MINIMIZE_HELP_HACK
     qpeManager->updateActive();
-#endif
+
+    WindowDecorationInterface::WindowData wd;
+    windowData( widget, wd );
+    wd.rect = rect;
+
+    int titleHeight = wdiface->metric(WindowDecorationInterface::TitleHeight,&wd);
+    int okWidth = wdiface->metric(WindowDecorationInterface::OKWidth,&wd);
+    int closeWidth = wdiface->metric(WindowDecorationInterface::CloseWidth,&wd);
+    int helpWidth = wdiface->metric(WindowDecorationInterface::HelpWidth,&wd);
+    int grab = wdiface->metric(WindowDecorationInterface::CornerGrabSize,&wd);
+
+    QRegion region;
 
@@ -309,19 +595,17 @@ QRegion QPEDecoration::region(const QWidget *widget, const QRect &rect, QWSDecor
         case Menu:
-        case Maximize:
             break;
-        case Minimize: {
-            if ( ((HackWidget *)widget)->needsOk() || 
-                 (widget->inherits( "QDialog" ) && !widget->inherits( "QMessageBox" ) ) ) {
-                QRect r(rect.right() - imageOk.width(),
-                    rect.top() - titleHeight - 2,
-                    imageOk.width(), titleHeight);
-                if (r.left() > rect.left() + titleHeight)
-                    region = r;
+        case Maximize:
+            if ( !widget->inherits( "QDialog" ) && qApp->desktop()->width() > 350 ) {
+                int maximizeWidth = wdiface->metric(WindowDecorationInterface::MaximizeWidth,&wd);
+                int left = rect.right() - maximizeWidth - closeWidth;
+                if ( ((HackWidget *)widget)->needsOk() )
+                    left -= okWidth;
+                QRect r(left, rect.top() - titleHeight, closeWidth, titleHeight);
+                region = r;
             }
-#ifdef MINIMIZE_HELP_HACK
-            else if ( helpExists ) {
-                QRect r;
-                r = QRect(rect.right() - imageClose.width() - imageHelp.width(),
-                          rect.top() - titleHeight - 2,
-                          imageHelp.width(), titleHeight);
+            break;
+        case Minimize:
+            if ( ((HackWidget *)widget)->needsOk() ) {
+                QRect r(rect.right() - okWidth,
+                    rect.top() - titleHeight, okWidth, titleHeight);
                 if (r.left() > rect.left() + titleHeight)
@@ -329,33 +613,19 @@ QRegion QPEDecoration::region(const QWidget *widget, const QRect &rect, QWSDecor
             }
-#endif
-        }
-        break;
-        case Close: {
-            if ( ((HackWidget *)widget)->needsOk() || 
-                 (widget->inherits( "QDialog" ) && !widget->inherits( "QMessageBox" ) ) ) {
-                QRect r;
-                r = QRect(rect.right() - imageOk.width() - imageClose.width(),
-                    rect.top() - titleHeight - 2,
-                    imageClose.width(), titleHeight);
-                if (r.left() > rect.left() + titleHeight)
-                    region = r;
-            } else {
-                QRect r(rect.right() - imageClose.width(),
-                    rect.top() - titleHeight - 2,
-                    imageClose.width(), titleHeight);
-                if (r.left() > rect.left() + titleHeight)
-                    region = r;
+            break;
+        case Close:
+            {
+                int left = rect.right() - closeWidth;
+                if ( ((HackWidget *)widget)->needsOk() )
+                    left -= okWidth;
+                QRect r(left, rect.top() - titleHeight, closeWidth, titleHeight);
+                region = r;
             }
             break;
-        }
-            case Title: {
-            if ( widget->isMaximized() ) {
-                region = QRegion();
-            } else {
-                int btnWidth = imageClose.width();
-                if ( ((HackWidget *)widget)->needsOk() || 
-                     (widget->inherits( "QDialog" ) && !widget->inherits( "QMessageBox" ) ) )
-                    btnWidth += imageOk.width();
-                QRect r(rect.left() + 1, rect.top() - titleHeight,
-                        rect.width() - btnWidth - 2, titleHeight);
+            case Title:
+            if ( !widget->isMaximized() ) {
+                int width = rect.width() - helpWidth - closeWidth;
+                if ( ((HackWidget *)widget)->needsOk() )
+                    width -= okWidth;
+                QRect r(rect.left()+helpWidth, rect.top() - titleHeight,
+                        width, titleHeight);
                 if (r.width() > 0)
@@ -364,31 +634,87 @@ QRegion QPEDecoration::region(const QWidget *widget, const QRect &rect, QWSDecor
             break;
-        }
-        case Help: {
-            if ( helpExists ) {
-                QRect r;
-                int l = rect.right() - imageClose.width() - imageHelp.width();
-                if ( ((HackWidget *)widget)->needsOk() || 
-                     (widget->inherits( "QDialog" ) && !widget->inherits( "QMessageBox" ) ) )
-                    l -= imageOk.width();
-                r = QRect(l, rect.top() - titleHeight - 2,
-                          imageHelp.width(), titleHeight);
-                if (r.left() > rect.left() + titleHeight)
-                    region = r;
+        case Help:
+            if ( helpExists || widget->testWFlags(Qt::WStyle_ContextHelp) ) {
+                QRect r(rect.left(), rect.top() - titleHeight,
+                          helpWidth, titleHeight);
+                region = r;
             }
             break;
-        }
         case Top:
+            if ( !widget->isMaximized() ) {
+                QRegion m = wdiface->mask(&wd);
+                QRect br = m.boundingRect();
+                int b = wdiface->metric(WindowDecorationInterface::TopBorder,&wd);
+                region = m & QRect( br.left()+grab, br.top(),
+                                    br.width()-2*grab, b );
+            }
+            break; 
         case Left:
+            if ( !widget->isMaximized() ) {
+                QRegion m = wdiface->mask(&wd);
+                QRect br = m.boundingRect();
+                int b = wdiface->metric(WindowDecorationInterface::LeftBorder,&wd);
+                region = m & QRect( br.left(), br.top()+grab,
+                                    b, br.height()-2*grab );
+            }
+            break; 
         case Right:
+            if ( !widget->isMaximized() ) {
+                QRegion m = wdiface->mask(&wd);
+                QRect br = m.boundingRect();
+                int b = wdiface->metric(WindowDecorationInterface::RightBorder,&wd);
+                region = m & QRect( rect.right(), br.top()+grab,
+                                    b, br.height()-2*grab );
+            }
+            break; 
         case Bottom:
+            if ( !widget->isMaximized() ) {
+                QRegion m = wdiface->mask(&wd);
+                QRect br = m.boundingRect();
+                int b = wdiface->metric(WindowDecorationInterface::BottomBorder,&wd);
+                region = m & QRect( br.left()+grab, rect.bottom(),
+                                    br.width()-2*grab, b );
+            }
+            break;
         case TopLeft:
+            if ( !widget->isMaximized() ) {
+                QRegion m = wdiface->mask(&wd);
+                QRect br = m.boundingRect();
+                int tb = wdiface->metric(WindowDecorationInterface::TopBorder,&wd);
+                int lb = wdiface->metric(WindowDecorationInterface::LeftBorder,&wd);
+                QRegion crgn( br.left(), br.top(), grab, tb );
+                crgn |= QRect( br.left(), br.top(), lb, grab );
+                region = m & crgn;
+            }
+            break; 
         case TopRight:
+            if ( !widget->isMaximized() ) {
+                QRegion m = wdiface->mask(&wd);
+                QRect br = m.boundingRect();
+                int tb = wdiface->metric(WindowDecorationInterface::TopBorder,&wd);
+                int rb = wdiface->metric(WindowDecorationInterface::RightBorder,&wd);
+                QRegion crgn( br.right()-grab, br.top(), grab, tb );
+                crgn |= QRect( br.right()-rb, br.top(), rb, grab );
+                region = m & crgn;
+            }
+            break;
         case BottomLeft:
+            if ( !widget->isMaximized() ) {
+                QRegion m = wdiface->mask(&wd);
+                QRect br = m.boundingRect();
+                region = m & QRect( br.left(), br.bottom()-grab, grab, grab );
+            }
+            break; 
         case BottomRight:
-            if ( widget->isMaximized() ) {
-                region = QRegion();
-                break;
+            if ( !widget->isMaximized() ) {
+                QRegion m = wdiface->mask(&wd);
+                QRect br = m.boundingRect();
+                region = m & QRect( br.right()-grab, br.bottom()-grab, grab, grab );
             }
-            //else fallthrough!!!
+            break;
         case All:
+            if ( widget->isMaximized() )
+                region = QWSDefaultDecoration::region(widget, rect, type);
+            else
+                region = wdiface->mask(&wd) - rect;
+            break;
         default:
@@ -403,8 +729,7 @@ void QPEDecoration::paint(QPainter *painter, const QWidget *widget)
 {
-#ifndef QT_NO_STYLE
-//    QStyle &style = QApplication::style();
-#endif
+    WindowDecorationInterface::WindowData wd;
+    windowData( widget, wd );
 
     int titleWidth = getTitleWidth(widget);
-    int titleHeight = getTitleHeight(widget);
+    int titleHeight = wdiface->metric(WindowDecorationInterface::TitleHeight,&wd);
 
@@ -412,24 +737,9 @@ void QPEDecoration::paint(QPainter *painter, const QWidget *widget)
 
-    // Border rect
-    QRect br( rect.left() - BORDER_WIDTH,
-                rect.top() - BORDER_WIDTH - titleHeight,
-                rect.width() + 2 * BORDER_WIDTH,
-                rect.height() + BORDER_WIDTH + BOTTOM_BORDER_WIDTH + titleHeight );
-
     // title bar rect
-    QRect tr;
-
-    tr = QRect( rect.left(), rect.top() - titleHeight, rect.width(), titleHeight );
+    QRect tr( rect.left(), rect.top() - titleHeight, rect.width(), titleHeight );
 
+#ifndef QT_NO_PALETTE
     QRegion oldClip = painter->clipRegion();
             painter->setClipRegion( oldClip - QRegion( tr ) );// reduce flicker
-
-#ifndef QT_NO_PALETTE
-    // const QColorGroup &cg = QApplication::palette().active();
-    const QColorGroup &cg = widget->palette().active();
-
-    qDrawWinPanel(painter, br.x(), br.y(), br.width(),
-                  br.height() - 4, cg, FALSE,
-                  &cg.brush(QColorGroup::Background));
-
+    wdiface->drawArea( WindowDecorationInterface::Border, painter, &wd );
     painter->setClipRegion( oldClip );
@@ -437,8 +747,7 @@ void QPEDecoration::paint(QPainter *painter, const QWidget *widget)
     if (titleWidth > 0) {
+        const QColorGroup &cg = widget->palette().active();
         QBrush titleBrush;
         QPen   titlePen;
-        QPen   titleLines;
-        int    titleLeft = titleHeight + 4;
 
-        if (widget == qApp->activeWindow()) {
+        if ( wd.flags & WindowDecorationInterface::WindowData::Active ) {
             titleBrush = cg.brush(QColorGroup::Highlight);
@@ -450,25 +759,5 @@ void QPEDecoration::paint(QPainter *painter, const QWidget *widget)
 
-        titleLines = titleBrush.color().dark(150);
-
-        #define CLAMP(x, y)    ( ((x) > (y)) ? (y) : (x) )
+        wdiface->drawArea( WindowDecorationInterface::Title, painter, &wd );
 
-            titleLeft = rect.left() + 5;
-            painter->setPen( cg.midlight() );
-            painter->drawLine( rect.left() - BORDER_WIDTH + 2,
-                                rect.bottom() + 1, rect.right() + BORDER_WIDTH - 2,
-                                rect.bottom() + 1 );
-
-            fillTitle( painter, widget, rect.left() - 2,
-                        rect.top() - titleHeight - 2,
-                        rect.width() + 3, titleHeight + 2 );
-/*
-            painter->fillRect(rect.left() - 2,
-                            rect.top() - titleHeight - 2,
-                            rect.width() + 3, titleHeight + 2,
-                            titleBrush);
-
-            painter->setPen( titleLines );
-            for ( int i = rect.top() - titleHeight - 2; i < rect.top(); i += 2 )
-                painter->drawLine( rect.left() - 2, i, rect.left() + rect.width() + 2, i );
-*/
+        // Draw caption
         painter->setPen(titlePen);
@@ -477,12 +766,7 @@ void QPEDecoration::paint(QPainter *painter, const QWidget *widget)
         painter->setFont(f);
-        painter->drawText( titleLeft, -titleHeight,
-                        rect.width() - titleHeight - 10, titleHeight-1,
-                        QPainter::AlignVCenter, widget->caption());
+        wdiface->drawArea( WindowDecorationInterface::TitleText, painter, &wd );
     }
-
 #endif //QT_NO_PALETTE
 
-#ifndef MINIMIZE_HELP_HACK
     paintButton( painter, widget, (QWSDecoration::Region)Help, 0 );
-#endif
 }
@@ -492,81 +776,44 @@ void QPEDecoration::paintButton(QPainter *painter, const QWidget *w,
 {
-#ifndef QT_NO_PALETTE
-#ifndef QT_NO_STYLE
-//    QStyle &style = QApplication::style();
-#endif
-    const QColorGroup &cg = w->palette().active();
-
-    QRect brect(region(w, w->rect(), type).boundingRect());
-
-//    int xoff=2;
-//    int yoff=2;
-
-//    const QPixmap *pm=pixmapFor(w,type,state & QWSButton::On, xoff, yoff);
-
-    const QImage *img = 0;
-
-        switch ((int)type) {
-            case Close:
-                img = &imageClose;
-                break;
-            case Minimize:
-                if ( ((HackWidget *)w)->needsOk() || 
-                     (w->inherits( "QDialog" ) && !w->inherits( "QMessageBox" ) ) )
-                    img = &imageOk;
-                else if ( helpExists )
-                    img = &imageHelp;
-                break;
-            case Help:
-                img = &imageHelp;
-                break;
-            default:
+    WindowDecorationInterface::Button b;
+    switch ((int)type) {
+        case Close:
+            b = WindowDecorationInterface::Close;
+            break;
+        case Minimize:
+            if ( ((HackWidget *)w)->needsOk() )
+                b = WindowDecorationInterface::OK;
+            else if ( helpExists )
+                b = WindowDecorationInterface::Help;
+            else
                 return;
-        }
-
-        QBrush titleBrush;
-
-        if (w == qApp->activeWindow()) {
-            titleBrush = cg.brush(QColorGroup::Highlight);
-        } else {
-            titleBrush = cg.brush(QColorGroup::Background);
-        }
-
-        fillTitle( painter, w, brect.x(), brect.y(), brect.width()+1,
-                    brect.height()+1 );
-        if ((state & QWSButton::MouseOver) && (state & QWSButton::Clicked)) {
-            if (img) painter->drawImage(brect.x()+1, brect.y()+3, *img);
-        } else {
-            if (img) painter->drawImage(brect.x(), brect.y()+2, *img);
-        }
-
-#endif
-
-}
-
-void QPEDecoration::fillTitle( QPainter *p, const QWidget *widget,
-                                int x, int y, int w, int h )
-{
-    QBrush titleBrush;
-    QPen   topLine;
-    QPen   titleLines;
+            break;
+        case Help:
+            b = WindowDecorationInterface::Help;
+            break;
+        case Maximize:
+            b = WindowDecorationInterface::Maximize;
+            break;
+        default:
+            return;
+    }
 
-    const QColorGroup &cg = widget->palette().active();
+    WindowDecorationInterface::WindowData wd;
+    windowData( w, wd );
 
-    if (widget == qApp->activeWindow()) {
-        titleBrush = cg.brush(QColorGroup::Highlight);
-        titleLines = titleBrush.color().dark();
-        topLine = titleBrush.color().light();
-    } else {
-        titleBrush = cg.brush(QColorGroup::Background);
-        titleLines = titleBrush.color();
-        topLine = titleBrush.color();
-    }
+    int titleHeight = wdiface->metric(WindowDecorationInterface::TitleHeight,&wd);
+    QRect rect(w->rect());
+    QRect tr( rect.left(), rect.top() - titleHeight, rect.width(), titleHeight );
+    QRect brect(region(w, w->rect(), type).boundingRect());
 
-    p->fillRect( x, y, w, h, titleBrush);
+    const QColorGroup &cg = w->palette().active();
+    if ( wd.flags & WindowDecorationInterface::WindowData::Active )
+        painter->setPen( cg.color(QColorGroup::HighlightedText) );
+    else
+        painter->setPen( cg.color(QColorGroup::Text) );
 
-    p->setPen( topLine );
-    p->drawLine( x, y+1, x+w-1, y+1 );
-    p->setPen( titleLines );
-    for ( int i = y; i < y+h; i += 2 )
-        p->drawLine( x, i, x+w-1, i );
+    QRegion oldClip = painter->clipRegion();
+    painter->setClipRegion( QRect(brect.x(), tr.y(), brect.width(), tr.height()) ); // reduce flicker
+    wdiface->drawArea( WindowDecorationInterface::Title, painter, &wd );
+    wdiface->drawButton( b, painter, &wd, brect.x(), brect.y(), brect.width(), brect.height(), (QWSButton::State)state );
+    painter->setClipRegion( oldClip );
 }
@@ -619,3 +866,3 @@ void QPEDecoration::minimize( QWidget *widget )
 
-void QPEDecoration::help( QWidget * )
+void QPEDecoration::help( QWidget *w )
 {
@@ -623,2 +870,10 @@ void QPEDecoration::help( QWidget * )
         Global::execute( "helpbrowser", helpFile );
+    } else if ( w && w->testWFlags(Qt::WStyle_ContextHelp) ) {
+        QWhatsThis::enterWhatsThisMode();
+        QWhatsThis::leaveWhatsThisMode( qApp->tr(
+            "<Qt>Comprehensive help is not available for this application, "
+            "however there is context-sensitive help.<p>To use context-sensitive help:<p>"
+            "<ol><li>click and hold the help button."
+            "<li>when the title bar shows <b>What's this...</b>, "
+            "click on any control.</ol></Qt>" ) );
     }
@@ -626,2 +881,17 @@ void QPEDecoration::help( QWidget * )
 
+void QPEDecoration::windowData( const QWidget *w, WindowDecorationInterface::WindowData &wd ) const
+{
+    wd.rect = w->rect();
+    if ( qpeManager->whatsThisWidget() == w )
+        wd.caption = qApp->tr("What's this..." );
+    else
+        wd.caption = w->caption();
+    wd.palette = qApp->palette();
+    wd.flags = 0;
+    wd.flags |= w->isMaximized() ? WindowDecorationInterface::WindowData::Maximized : 0;
+    wd.flags |= w->testWFlags(Qt::WStyle_Dialog) ? WindowDecorationInterface::WindowData::Dialog : 0;
+    const QWidget *active = qpeManager->activeWidget();
+    wd.flags |= w == active ? WindowDecorationInterface::WindowData::Active : 0;
+    wd.reserved = 1;
+}
 
@@ -640 +910,2 @@ QPopupMenu *QPEDecoration::menu(QWSManager*, const QWidget*, const QPoint&)
 #endif // QT_NO_QWS_QPE_WM_STYLE
+#endif
diff --git a/library/qpedecoration_qws.h b/library/qpedecoration_qws.h
index b8afd05..691c6f6 100644
--- a/library/qpedecoration_qws.h
+++ b/library/qpedecoration_qws.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -23,2 +23,3 @@
 
+#ifdef QWS
 #include <qwsdefaultdecoration_qws.h>
@@ -27,2 +28,3 @@
 #include <qguardedptr.h>
+#include "windowdecorationinterface.h"
 
@@ -38,2 +40,3 @@ public:
     QPEDecoration();
+    QPEDecoration( const QString &plugin );
     virtual ~QPEDecoration();
@@ -52,4 +55,2 @@ public:
 protected:
-    void fillTitle( QPainter *p, const QWidget *w, int x, int y, int w, int h );
-//    virtual int getTitleWidth(const QWidget *);
     virtual int getTitleHeight(const QWidget *);
@@ -61,2 +62,5 @@ protected:
 
+private:
+    void windowData( const QWidget *w, WindowDecorationInterface::WindowData &wd ) const;
+
 protected:
@@ -79,2 +83,4 @@ public:
     void updateActive();
+    const QWidget *activeWidget() const { return (const QWidget *)active; }
+    const QWidget *whatsThisWidget() const { return (const QWidget *)whatsThis; }
 
@@ -84,2 +90,3 @@ protected:
     void drawButton( QWidget *w, QPEDecoration::QPERegion r, int state );
+    void drawTitle( QWidget *w );
 
@@ -94,2 +101,4 @@ protected:
     QTimer *wtTimer;
+    bool inWhatsThis;
+    QGuardedPtr<QWidget> whatsThis;
 };
@@ -101 +110,2 @@ protected:
 #endif // QPE_DECORATION_QWS_H__
+#endif // QWS
diff --git a/library/qpedialog.cpp b/library/qpedialog.cpp
index 06b0c94..0db161b 100644
--- a/library/qpedialog.cpp
+++ b/library/qpedialog.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -20,7 +20,8 @@
 
-#include "qpedialog.h"
-#include "qpeapplication.h"
-
 #define protected public
 #include <qdialog.h>
+#undef protected
+
+#include "qpedialog.h"
+#include "qpeapplication.h"
 
@@ -35,3 +36,3 @@ QPEDialogListener::~QPEDialogListener() {}
 
-void QPEDialogListener::appMessage( const QCString &msg, const QByteArray &data )
+void QPEDialogListener::appMessage( const QCString &msg, const QByteArray & )
 {
diff --git a/library/qpedialog.h b/library/qpedialog.h
index 1fde09a..ed77720 100644
--- a/library/qpedialog.h
+++ b/library/qpedialog.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/qpemenubar.cpp b/library/qpemenubar.cpp
index bb3ad8d..f0171ba 100644
--- a/library/qpemenubar.cpp
+++ b/library/qpemenubar.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -249,7 +249,9 @@ bool QPEMenuToolFocusManager::eventFilter( QObject *object, QEvent *event )
         QChildEvent *ce = (QChildEvent *)event;
-        if ( ce->child()->inherits( "QMenuBar" ) ) {
-            addWidget( (QWidget *)ce->child() );
-            ce->child()->installEventFilter( this );
-        } else if ( object->inherits( "QToolBar" ) && ce->child()->isWidgetType() ) {
-            addWidget( (QWidget *)ce->child() );
+        if ( ce->child()->isWidgetType() ) {
+            if ( ce->child()->inherits( "QMenuBar" ) ) {
+                addWidget( (QWidget *)ce->child() );
+                ce->child()->installEventFilter( this );
+            } else if ( object->inherits( "QToolBar" ) ) {
+                addWidget( (QWidget *)ce->child() );
+            }
         }
@@ -257,7 +259,9 @@ bool QPEMenuToolFocusManager::eventFilter( QObject *object, QEvent *event )
         QChildEvent *ce = (QChildEvent *)event;
-        if ( ce->child()->inherits( "QMenuBar" ) ) {
-            removeWidget( (QWidget *)ce->child() );
-            ce->child()->removeEventFilter( this );
-        } else if ( object->inherits( "QToolBar" ) && ce->child()->isWidgetType() ) {
-            removeWidget( (QWidget *)ce->child() );
+        if ( ce->child()->isWidgetType() ) {
+            if ( ce->child()->inherits( "QMenuBar" ) ) {
+                removeWidget( (QWidget *)ce->child() );
+                ce->child()->removeEventFilter( this );
+            } else if ( object->inherits( "QToolBar" ) ) {
+                removeWidget( (QWidget *)ce->child() );
+            }
         }
@@ -281,3 +285,2 @@ void QPEMenuToolFocusManager::deactivate()
 
-  \sa QMenuBar
 */
@@ -308,16 +311,14 @@ void QPEMenuBar::keyPressEvent( QKeyEvent *e )
 
-
-void QPEMenuBar::activateItem( int index )
-{
+/*!
+  \internal
+*/
+void QPEMenuBar::activateItem( int index ) {
     activateItemAt( index );
 }
-
-void QPEMenuBar::goodbye()
-{
+void QPEMenuBar::goodbye() {
     activateItemAt(-1);
-    for ( unsigned int i = 0; i < count(); i++ ) {
-        QMenuItem *mi = findItem( idAt(i) );
-        if ( mi->popup() ) {
+    for ( uint i = 0; i < count(); i++ ) {
+        QMenuItem* mi = findItem( idAt(i) );
+        if (mi->popup() )
             mi->popup()->hide();
-        }
     }
diff --git a/library/qpemenubar.h b/library/qpemenubar.h
index 5bfbe83..05abc4e 100644
--- a/library/qpemenubar.h
+++ b/library/qpemenubar.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -67,2 +67,7 @@ protected:
     virtual void keyPressEvent( QKeyEvent *e );
+
+    /* Patch from Mickey
+     * Sharp Qtopia1.5 seems to have these functions
+     * TO BE RESOLVED  - zecke
+     */
     void activateItem( int index );
diff --git a/library/quickexec.cpp b/library/quickexec.cpp
index f3b5089..fad5677 100644
--- a/library/quickexec.cpp
+++ b/library/quickexec.cpp
@@ -1 +1,21 @@
+/**********************************************************************
+** 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.
+**
+**********************************************************************/
+
 #include <stdio.h>
diff --git a/library/quuid.cpp b/library/quuid.cpp
index fb4387c..46fd816 100644
--- a/library/quuid.cpp
+++ b/library/quuid.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
diff --git a/library/quuid.h b/library/quuid.h
index 4f7a720..841a00f 100644
--- a/library/quuid.h
+++ b/library/quuid.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -92,2 +92,12 @@ struct Q_EXPORT QUuid
 
+    inline bool operator<(const QUuid &orig) const
+    {
+        return ( memcmp(this, &orig, sizeof(QUuid)) < 0);
+    }
+    
+    inline bool operator>(const QUuid &orig) const
+    {
+        return ( memcmp(this, &orig, sizeof(QUuid) ) > 0);
+    }
+    
 #if defined(Q_OS_WIN32)
@@ -121,2 +131,13 @@ struct Q_EXPORT QUuid
     }
+    
+    inline bool operator<(const QUuid &orig) const
+    {
+        return ( memcmp(this, &orig, sizeof(QUuid) ) < 0);
+    }
+    
+    inline bool operator>(const QUuid &orig) const
+    {
+        return ( memcmp(this, &orig, sizeof(QUuid) ) > 0);
+    }
+    
 #endif
@@ -125,3 +146,3 @@ struct Q_EXPORT QUuid
     {
-        memcpy( this, &uuid, sizeof(uuid_t) );
+        memcpy( this, uuid, sizeof(uuid_t) );
     }
diff --git a/library/resource.cpp b/library/resource.cpp
index 0915c45..0db2a75 100644
--- a/library/resource.cpp
+++ b/library/resource.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -20,4 +20,6 @@
 
+#define QTOPIA_INTERNAL_MIMEEXT
 #include "qpeapplication.h"
 #include "resource.h"
+#include "mimetype.h"
 #include <qdir.h>
@@ -35,2 +37,10 @@
   The resources may be provided from files or other sources.
+
+  The allSounds() function returns a list of all the sounds available.
+  A particular sound can be searched for using findSound().
+
+  Images can be loaded with loadImage(), loadPixmap(), loadBitmap()
+  and loadIconSet().
+
+  \ingroup qtopiaemb
 */
@@ -43,6 +53,6 @@
 /*!
-  Returns the QPixmap named \a pix. You should avoid including
-  any filename type extension (eg. .png, .xpm).
+  Returns the QPixmap called \a pix. You should avoid including
+  any filename type extension (e.g. .png, .xpm).
 */
-QPixmap Resource::loadPixmap( const QString &pix ) 
+QPixmap Resource::loadPixmap( const QString &pix )
 {
@@ -58,6 +68,6 @@ QPixmap Resource::loadPixmap( const QString &pix )
 /*!
-  Returns the QBitmap named \a pix. You should avoid including
-  any filename type extension (eg. .png, .xpm).
+  Returns the QBitmap called \a pix. You should avoid including
+  any filename type extension (e.g. .png, .xpm).
 */
-QBitmap Resource::loadBitmap( const QString &pix ) 
+QBitmap Resource::loadBitmap( const QString &pix )
 {
@@ -69,4 +79,4 @@ QBitmap Resource::loadBitmap( const QString &pix )
 /*!
-  Returns the filename of a pixmap named \a pix. You should avoid including
-  any filename type extension (eg. .png, .xpm .jpg .jpeg).
+  Returns the filename of a pixmap called \a pix. You should avoid including
+  any filename type extension (e.g. .png, .xpm).
 
@@ -78,11 +88,27 @@ QString Resource::findPixmap( const QString &pix )
 
-    if ( QFile( picsPath + pix + ".png").exists() )
-        return picsPath + pix + ".png";
-    else if ( QFile( picsPath + pix + ".jpeg").exists() )
-        return picsPath + pix + ".jpeg";
-    else if ( QFile( picsPath + pix + ".jpg").exists() )
-        return picsPath + pix + ".jpg";
-    else if ( QFile( picsPath + pix + ".xpm").exists() )
-        return picsPath + pix + ".xpm";
-    else if ( QFile( picsPath + pix ).exists() )
+    QString f;
+
+    // Common case optimizations...
+    f = picsPath + pix + ".png";
+    if ( QFile( f ).exists() )
+        return f;
+    f = picsPath + pix + ".xpm";
+    if ( QFile( f ).exists() )
+        return f;
+
+    // All formats...
+    QStrList fileFormats = QImageIO::inputFormats();
+    QString ff = fileFormats.first();
+    while ( fileFormats.current() ) {
+        QStringList exts = MimeType("image/"+ff.lower()).extensions();
+        for ( QStringList::ConstIterator it = exts.begin(); it!=exts.end(); ++it ) {
+            QString f = picsPath + pix + "." + *it;
+            if ( QFile(f).exists() )
+                return f;
+        }
+        ff = fileFormats.next();
+    }
+
+    // Finally, no (or existing) extension...
+    if ( QFile( picsPath + pix ).exists() )
         return picsPath + pix;
@@ -94,4 +120,9 @@ QString Resource::findPixmap( const QString &pix )
 /*!
-  Returns a sound file for a sound named \a name.
-  You should avoid including any filename type extension (eg. .wav, .au, .mp3).
+  Returns a sound file for a sound called \a name.
+
+  You should avoid including any filename type extension (e.g. .wav),
+  as the system will search for only those fileformats which are supported
+  by the library.
+
+  Currently, only WAV files are supported.
 */
@@ -121,5 +152,17 @@ QStringList Resource::allSounds()
 
+static QImage load_image(const QString &name)
+{
+    QImage img = qembed_findImage(name.latin1());
+    if ( img.isNull() ) {
+        // No inlined image, try file
+        QString f = Resource::findPixmap(name);
+        if ( !f.isEmpty() )
+            img.load(f);
+    }
+    return img;
+}
+
 /*!
-  Returns the QImage named \a name. You should avoid including
-  any filename type extension (eg. .png, .xpm .jpg).
+  Returns the QImage called \a name. You should avoid including
+  any filename type extension (e.g. .png, .xpm).
 */
@@ -127,5 +170,33 @@ QImage Resource::loadImage( const QString &name)
 {
-    QImage img = qembed_findImage(name.latin1());
-    if ( img.isNull() )
-        return QImage(findPixmap(name));
+        #ifndef QT_NO_DEPTH_32// have alpha-blended pixmaps
+    static QImage last_enabled;
+    static QString last_enabled_name;
+    if ( name == last_enabled_name )
+        return last_enabled;
+#endif
+    QImage img = load_image(name);
+        #ifndef QT_NO_DEPTH_32// have alpha-blended pixmaps
+    if ( img.isNull() ) {
+        // No file, try generating
+        if ( name[name.length()-1]=='d' && name.right(9)=="_disabled" ) {
+            last_enabled_name = name.left(name.length()-9);
+            last_enabled = load_image(last_enabled_name);
+            if ( last_enabled.isNull() ) {
+                last_enabled_name = QString::null;
+            } else {
+                img.detach();
+                img.create( last_enabled.width(), last_enabled.height(), 32 );
+                for ( int y = 0; y < img.height(); y++ ) {
+                    for ( int x = 0; x < img.width(); x++ ) {
+                        QRgb p = last_enabled.pixel( x, y );
+                        int a = qAlpha(p)/3;
+                        int g = qGray(qRed(p),qGreen(p),qBlue(p));
+                        img.setPixel( x, y, qRgba(g,g,g,a) );
+                    }
+                }
+                img.setAlphaBuffer( TRUE );
+            }
+        }
+    }
+#endif
     return img;
@@ -134,3 +205,3 @@ QImage Resource::loadImage( const QString &name)
 /*!
-  \fn QIconSet Resource::loadIconSet( const QString &name ) 
+  \fn QIconSet Resource::loadIconSet( const QString &name )
 
diff --git a/library/resource.h b/library/resource.h
index 982c58a..1f1ba9a 100644
--- a/library/resource.h
+++ b/library/resource.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -47,30 +47,7 @@ inline QIconSet Resource::loadIconSet( const QString &pix )
 {
-    QImage img = loadImage( pix );
-    QPixmap pm;
-    pm.convertFromImage( img );
-    QIconSet is( pm );
-    QIconSet::Size size = pm.width() <= 22 ? QIconSet::Small : QIconSet::Large;
-
     QPixmap dpm = loadPixmap( pix + "_disabled" );
-
-        #ifndef QT_NO_DEPTH_32// have alpha-blended pixmaps
-    if ( dpm.isNull() ) {
-        QImage dimg( img.width(), img.height(), 32 );
-        for ( int y = 0; y < img.height(); y++ ) {
-            for ( int x = 0; x < img.width(); x++ ) {
-                QRgb p = img.pixel( x, y );
-                uint a = (p & 0xff000000) / 3;
-                p = (p & 0x00ffffff) | (a & 0xff000000);
-                dimg.setPixel( x, y, p );
-            }
-        }
-
-        dimg.setAlphaBuffer( TRUE );
-        dpm.convertFromImage( dimg );
-    }
-#endif
-
+    QPixmap pm = loadPixmap( pix );
+    QIconSet is( pm );
     if ( !dpm.isNull() )
-        is.setPixmap( dpm, size, QIconSet::Disabled );
-
+        is.setPixmap( dpm, pm.width() <= 22 ? QIconSet::Small : QIconSet::Large, QIconSet::Disabled );
     return is;
diff --git a/library/backend/stringutil.h b/library/stringutil.h
index e9daf70..f6cc3f4 100644
--- a/library/backend/stringutil.h
+++ b/library/stringutil.h
@@ -1,14 +1,13 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** 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.
+** 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.
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
@@ -26,3 +25,3 @@
 #include <qstring.h>
-#include "qpcglobal.h"
+#include <qtopia/private/qpcglobal.h>
 
diff --git a/library/taskbarappletinterface.h b/library/taskbarappletinterface.h
index 7e20329..705dd9a 100644
--- a/library/taskbarappletinterface.h
+++ b/library/taskbarappletinterface.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -24,2 +24,3 @@
 #include <qpe/qcom.h>
+#include <qpixmap.h>
 
@@ -40,2 +41,13 @@ struct TaskbarAppletInterface : public QUnknownInterface
 
+// {7505E192-4977-465A-B72F-0A8DD491CF43} 
+#ifndef IID_TaskbarNamedApplet
+#define IID_TaskbarNamedApplet QUuid( 0x7505e192, 0x4977, 0x465a, 0xb7, 0x2f, 0x0a, 0x8d, 0xd4, 0x91, 0xcf, 0x43)
+#endif
+
+struct TaskbarNamedAppletInterface : public TaskbarAppletInterface
+{
+    virtual QString name() const = 0;
+    virtual QPixmap icon() const = 0;
+};
+
 #endif
diff --git a/library/textcodecinterface.h b/library/textcodecinterface.h
new file mode 100644
index 0000000..3b5fb5b
--- a/dev/null
+++ b/library/textcodecinterface.h
@@ -0,0 +1,44 @@
+/**********************************************************************
+** 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 TEXTCODECINTERFACE_H
+#define TEXTCODECINTERFACE_H
+
+#include <qstringlist.h>
+#include <qpe/qcom.h>
+
+class QTextCodec;
+
+#ifndef QT_NO_COMPONENT
+#ifndef IID_QtopiaTextCodec
+#define IID_QtopiaTextCodec QUuid( 0x3ee02ba3, 0x57dc, 0x9b1e, 0x40, 0xf4, 0xda, 0xdf, 0x21, 0x89, 0xb6, 0xb4)
+#endif
+#endif
+
+struct TextCodecInterface : public QUnknownInterface
+{
+public:
+    virtual QStringList names() const = 0;
+    virtual QTextCodec *createForName( const QString &name ) = 0;
+    
+    virtual QValueList<int> mibEnums() const = 0;
+    virtual QTextCodec *createForMib( int mib ) = 0;
+};
+
+#endif
diff --git a/library/timestring.cpp b/library/timestring.cpp
index d5d78ae..4c6fa72 100644
--- a/library/timestring.cpp
+++ b/library/timestring.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -119,5 +119,3 @@ QString DateFormat::numberDate(const QDate &d, int v) const
 
-    int pad = 0;
-    if (v & padNumber)
-        pad = 2;
+    int pad = 2;
 
@@ -128,6 +126,11 @@ QString DateFormat::numberDate(const QDate &d, int v) const
             case 0x0001:
-                buf += QString("%1").arg(d.day(), pad);
+              if (pad==2) buf += QString().sprintf("%02d",d.day());
+              else buf += QString().sprintf("%d",d.day());
                 break;
             case 0x0002:
-                buf += QString("%1").arg(d.month(), pad);
+              if (i==0) { // no padding with only MM/DD/YY format
+                pad=0;
+              }
+              if (pad==2) buf += QString().sprintf("%02d",d.month());
+              else buf += QString().sprintf("%d",d.month());
                 break;
@@ -138,8 +141,3 @@ QString DateFormat::numberDate(const QDate &d, int v) const
                         year = year % 100;
-
-                    if (year < 10)
-                        buf += "0";
-
-                    buf += QString::number(year);
-
+                    buf += QString().sprintf("%02d",year);
                 }
@@ -148,3 +146,3 @@ QString DateFormat::numberDate(const QDate &d, int v) const
         if (i < 2)
-            buf = _shortSeparator;
+            buf += _shortSeparator;
     }
@@ -163,3 +161,3 @@ QString DateFormat::wordDate(const QDate &d, int v) const
         buf += weekDay;
-        if (_longOrder & 0x0007 == 0x0002)
+        if ((_longOrder & 0x0007) == 0x0002)
             buf += ' ';
@@ -169,6 +167,2 @@ QString DateFormat::wordDate(const QDate &d, int v) const
 
-    int pad = 0;
-    if (v & padNumber)
-        pad = 2;
-
     for (int i = 0; i < 3; i++) {
@@ -177,6 +171,8 @@ QString DateFormat::wordDate(const QDate &d, int v) const
             case 0x0001:
-                buf += QString("%1").arg(d.day(), pad);
-                if (i < 2) { 
-                    if ((_shortOrder << ((i+1) * 3)) & 0x0007)
-                        buf += ", ";
+              if (i==1) {
+                buf += QString().sprintf("%02d, ",d.day());
+              } else {
+                buf += QString().sprintf("%2d",d.day());
+                if (separator()=='.') // 2002/1/11 
+                  buf += ". ";
                     else 
@@ -359,2 +355,11 @@ QString TimeString::shortTime( bool ampm )
 
+QString TimeString::numberDateString( const QDate &d, DateFormat dtf )
+{
+  return dtf.numberDate(d);
+}
+QString TimeString::longNumberDateString( const QDate &d, DateFormat dtf )
+{
+  return dtf.numberDate(d,DateFormat::longNumber);
+}
+
 #include "timestring.moc"
diff --git a/library/timestring.h b/library/timestring.h
index fd06d5b..f8cb3e6 100644
--- a/library/timestring.h
+++ b/library/timestring.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -116,3 +116,8 @@ public:
 
-
+    static QString numberDateString( const QDate &d, DateFormat );
+    static QString numberDateString( const QDate &d )
+    { return numberDateString( d, currentDateFormat() ); }
+    static QString longNumberDateString( const QDate &d, DateFormat );
+    static QString longNumberDateString( const QDate &d )
+    { return longNumberDateString( d, currentDateFormat() ); }
 
@@ -129,3 +134,3 @@ private:
 };
-#endif
 
+#endif
diff --git a/library/tzselect.cpp b/library/tzselect.cpp
index 5f102d5..6cc0bea 100644
--- a/library/tzselect.cpp
+++ b/library/tzselect.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -20,2 +20,4 @@
 
+#define QTOPIA_INTERNAL_TZSELECT_INC_LOCAL
+
 #include "tzselect.h"
@@ -32,2 +34,9 @@
 
+class TimeZoneSelectorPrivate
+{
+public:
+    TimeZoneSelectorPrivate() : includeLocal(FALSE) {}
+    bool includeLocal;
+};
+
 TZCombo::TZCombo( QWidget *p, const char* n )
@@ -38,2 +47,8 @@ TZCombo::TZCombo( QWidget *p, const char* n )
     QString tz = getenv("TZ");
+    if (parent()->inherits("TimeZoneSelector")) {
+        if ( ((TimeZoneSelector *)parent())->localIncluded() ) {
+            // overide to the 'local' type.
+            tz = "None";
+        }
+    }
     if ( !tz.isNull() ) {
@@ -41,3 +56,3 @@ TZCombo::TZCombo( QWidget *p, const char* n )
             index = 0;
-        for ( QStringList::Iterator it=identifiers.begin(); 
+        for ( QStringList::Iterator it=identifiers.begin();
               it!=identifiers.end(); ++it) {
@@ -78,7 +93,18 @@ void TZCombo::updateZones()
     bool tzFound = FALSE;
-    Config cfg("CityTime");
+    Config cfg("WorldTime");
     cfg.setGroup("TimeZones");
-    int i=0;
-    for ( ; 1; i++ ) {
-        QString zn = cfg.readEntry("Zone"+QString::number(i), QString::null);
+    int listIndex = 0;
+    if (parent()->inherits("TimeZoneSelector")) {
+        if ( ((TimeZoneSelector *)parent())->localIncluded() ) {
+            // overide to the 'local' type.
+            identifiers.append( "None" );
+            insertItem( tr("None") );
+            if ( cur == tr("None"))
+                curix = 0;
+            listIndex++;
+        }
+    }
+    int cfgIndex = 0;
+    while (1) {
+        QString zn = cfg.readEntry("Zone"+QString::number(cfgIndex), QString::null);
         if ( zn.isNull() )
@@ -87,3 +113,3 @@ void TZCombo::updateZones()
             tzFound = TRUE;
-        QString nm = cfg.readEntry("ZoneName"+QString::number(i));
+        QString nm = cfg.readEntry("ZoneName"+QString::number(cfgIndex));
         identifiers.append(zn);
@@ -91,12 +117,19 @@ void TZCombo::updateZones()
         if ( nm == cur )
-            curix = i;
+            curix = listIndex;
+        ++cfgIndex;
+        ++listIndex;
     }
-    if ( !tzFound && !tz.isEmpty()) {
-        int i =  tz.find( '/' );
-        QString nm = tz.mid( i+1 );
-        identifiers.append(tz);
-        insertItem(nm);
-        if ( nm == cur )
-            curix = i;
-        ++i;
+    if ( !listIndex ) {
+        QStringList list = timezoneDefaults();
+        for ( QStringList::Iterator it = list.begin(); it!=list.end(); ++it ) {
+            QString zn = *it;
+            QString nm = *++it;
+            if ( zn == tz )
+                tzFound = TRUE;
+            if ( nm == cur )
+                curix = listIndex;
+            identifiers.append(zn);
+            insertItem(nm);
+            ++listIndex;
+        }
     }
@@ -106,11 +139,13 @@ void TZCombo::updateZones()
         if ( *it == cur )
-            curix = i;
-        ++i;
+            curix = listIndex;
+        ++listIndex;
     }
-    if ( !i ) {
-        QStringList list = timezoneDefaults();
-        for ( QStringList::Iterator it = list.begin(); it!=list.end(); ++it ) {
-            identifiers.append(*it); ++it;
-            insertItem(*it);
-        }
+    if ( !tzFound && !tz.isEmpty()) {
+        int i =  tz.find( '/' );
+        QString nm = tz.mid( i+1 ).replace(QRegExp("_"), " ");
+        identifiers.append(tz);
+        insertItem(nm);
+        if ( nm == cur )
+            curix = listIndex;
+        ++listIndex;
     }
@@ -166,2 +201,3 @@ TimeZoneSelector::TimeZoneSelector(QWidget* p, const char* n) :
 {
+    d = new TimeZoneSelectorPrivate();
     // build the combobox before we do any updates...
@@ -170,4 +206,3 @@ TimeZoneSelector::TimeZoneSelector(QWidget* p, const char* n) :
     cmdTz = new QToolButton( this, "timezone button" );
-    QPixmap pixGlobe = Resource::loadPixmap( "citytime_icon" );
-    cmdTz->setPixmap( pixGlobe );
+    cmdTz->setIconSet( Resource::loadIconSet( "citytime_icon" ) );
     cmdTz->setMaximumSize( cmdTz->sizeHint() );
@@ -186,2 +221,13 @@ TimeZoneSelector::~TimeZoneSelector()
 
+void TimeZoneSelector::setLocalIncluded(bool b)
+{
+    d->includeLocal = b;
+    cmbTz->updateZones();
+}
+
+bool TimeZoneSelector::localIncluded() const
+{
+    return d->includeLocal;
+}
+
 
@@ -204,4 +250,4 @@ void TimeZoneSelector::slotExecute( void )
 {
-    // execute the city time application...
-    Global::execute( "citytime" );
+    // execute the world time application...
+    Global::execute( "worldtime" );
 }
diff --git a/library/tzselect.h b/library/tzselect.h
index 9898d84..55e45a3 100644
--- a/library/tzselect.h
+++ b/library/tzselect.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -27,2 +27,3 @@
 class QToolButton;
+class TimeZoneSelector;
 
@@ -42,2 +43,3 @@ public:
 protected:
+    friend class TimeZoneSelector;
     void keyPressEvent( QKeyEvent *e );
@@ -61,2 +63,10 @@ public:
     ~TimeZoneSelector();
+
+#ifdef QTOPIA_INTERNAL_TZSELECT_INC_LOCAL
+    // badly named.. not to be used outside of qtopia (not forward compatable)
+    // basically allows the "No Timezone" or "None" option.
+    void setLocalIncluded(bool);
+    bool localIncluded() const;
+#endif
+
     
diff --git a/library/windowdecorationinterface.h b/library/windowdecorationinterface.h
new file mode 100644
index 0000000..dbec0fe
--- a/dev/null
+++ b/library/windowdecorationinterface.h
@@ -0,0 +1,65 @@
+/**********************************************************************
+** Copyright (C) 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.
+**
+**********************************************************************/
+
+// !!! IMPORTANT !!!
+// This interface is still experimental and subject to change.
+
+#ifndef WINDOWDECORATIONINTERFACE_H
+#define WINDOWDECORATIONINTERFACE_H
+
+#include <qpe/qcom.h>
+#include <qpixmap.h>
+#include <qpalette.h>
+#include <qwsmanager_qws.h>
+
+// {11A45864-4CBA-4DDA-9846-FF234FD307CC} 
+#ifndef IID_WindowDecoration
+#define IID_WindowDecoration QUuid( 0x11a45864, 0x4cba, 0x4dda, 0x98, 0x46, 0xff, 0x23, 0x4f, 0xd3, 0x07, 0xcc)
+#endif
+
+struct WindowDecorationInterface : public QUnknownInterface
+{
+    virtual ~WindowDecorationInterface() {}
+
+    struct WindowData {
+        QRect rect;
+        QPalette palette;
+        QString caption;
+        enum Flags { Maximized=0x01, Dialog=0x02, Active=0x04 };
+        Q_UINT32 flags;
+        Q_UINT32 reserved;
+    };
+
+    enum Metric { TitleHeight, LeftBorder, RightBorder, TopBorder, BottomBorder, OKWidth, CloseWidth, HelpWidth, MaximizeWidth, CornerGrabSize };
+    virtual int metric( Metric m, const WindowData * ) const;
+
+    enum Area { Border, Title, TitleText };
+    virtual void drawArea( Area a, QPainter *, const WindowData * ) const;
+
+    enum Button { OK, Close, Help, Maximize };
+    virtual void drawButton( Button b, QPainter *, const WindowData *, int x, int y, int w, int h, QWSButton::State ) const;
+
+    virtual QRegion mask( const WindowData * ) const;
+
+    virtual QString name() const = 0;
+    virtual QPixmap icon() const = 0;
+};
+
+#endif
diff --git a/library/xmlreader.cpp b/library/xmlreader.cpp
index 1ae4485..1caab28 100644
--- a/library/xmlreader.cpp
+++ b/library/xmlreader.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -21,2 +21,8 @@
 
+/*! \class Node xmlreader.h
+  \brief A single element in an XML structure defined by XmlHandler
+
+  \ingroup qtopiaemb
+ */
+
 Node::Node()
@@ -80,2 +86,11 @@ QString Node::subData(const QString& tag) const
 
+/*! \class XmlHandler xmlreader.h
+  \brief XML document structure holder
+
+  This class provides a Node structure that developers can read their
+  xml data into.
+
+  \ingroup qtopiaemb
+*/
+
 XmlHandler::XmlHandler()
diff --git a/library/xmlreader.h b/library/xmlreader.h
index 2a51176..a4a6697 100644
--- a/library/xmlreader.h
+++ b/library/xmlreader.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **