Merged branches from BRANCH_1_0

1 files changed, 35 insertions, 21 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 619b4cb..4e08a1f 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -271,9 +271,12 @@ class ResourceMimeFactory : public QMimeSourceFactory
 {
 public:
-        ResourceMimeFactory()
+        ResourceMimeFactory() : resImage( 0 )
         {
                 setFilePath( Global::helpPath() );
                 setExtensionType( "html", "text/html;charset=UTF-8" );
         }
+        ~ResourceMimeFactory() {
+            delete resImage;
+        }
 
         const QMimeSource* data( const QString& abs_name ) const
@@ -289,6 +292,9 @@ public:
                                         name = name.left( dot );
                                 QImage img = Resource::loadImage( name );
-                                if ( !img.isNull() )
-                                        r = new QImageDrag( img );
+                                if ( !img.isNull() ) {
+                                    delete resImage;
+                                    resImage = new QImageDrag( img );
+                                    r = resImage;
+                                }
                         }
                         while ( !r && sl > 0 );
@@ -296,4 +302,6 @@ public:
                 return r;
         }
+private:
+    mutable QImageDrag *resImage;
 };
 
@@ -984,17 +992,17 @@ void QPEApplication::applyStyle()
 
         // Widget style
-        QString style = config.readEntry( "Style", "Light" );
+        QString style = config.readEntry( "Style", "FlatStyle" );
 
         // don't set a custom style
         if ( nostyle & Opie::Force_Style )
-                style = "Light";
+                style = "FlatStyle";
 
         internalSetStyle ( style );
 
-        // Colors
-        QColor bgcolor( config.readEntry( "Background", "#E5E1D5" ) );
-        QColor btncolor( config.readEntry( "Button", "#D6CDBB" ) );
+        // Colors - from /etc/colors/Liquid.scheme
+        QColor bgcolor( config.readEntry( "Background", "#E0E0E0" ) );
+        QColor btncolor( config.readEntry( "Button", "#96c8fa" ) );
         QPalette pal( btncolor, bgcolor );
-        QString color = config.readEntry( "Highlight", "#800000" );
+        QString color = config.readEntry( "Highlight", "#73adef" );
         pal.setColor( QColorGroup::Highlight, QColor( color ) );
         color = config.readEntry( "HighlightedText", "#FFFFFF" );
@@ -1013,5 +1021,5 @@ void QPEApplication::applyStyle()
 
         // Window Decoration
-        QString dec = config.readEntry( "Decoration", "Qtopia" );
+        QString dec = config.readEntry( "Decoration", "Flat" );
 
         // don't set a custom deco
@@ -1299,16 +1307,22 @@ void QPEApplication::pidMessage( const QCString& msg, const QByteArray& data)
                 if ( mw )
                         Global::setDocument( mw, doc );
+        } else {
+            bool p = d->keep_running;
+            d->keep_running = FALSE;
+            emit appMessage( msg, data);
+            if ( d->keep_running ) {
+                d->notbusysent = FALSE;
+                raiseAppropriateWindow();
+                if ( !p ) {
+                    // Tell the system we're still chugging along...
+#ifndef QT_NO_COP
+                    QCopEnvelope e("QPE/System", "appRaised(QString)");
+                    e << d->appName;
+#endif
+                }
+            }
+            if ( p )
+                d->keep_running = p;
         }
-        else if ( msg == "nextView()" ) {
-                qDebug("got nextView()");
-                /*
-                  if ( raiseAppropriateWindow() )
-                */
-                emit appMessage( msg, data);
-        }
-        else {
-                emit appMessage( msg, data);
-        }
-
 #endif
 }