- fixed a bug in style loading

- changed the config key format for styles

1 files changed, 7 insertions, 2 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 533d7bd..e92b4dd 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -966,521 +966,526 @@ void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data
             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
 }
 
 /*!
   \internal
 */
 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;
         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)
 {
 #ifdef Q_WS_QWS
 
     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);
     }
 
 #endif
 }
 
 
 /*!
   Sets widget \a mw as the mainWidget() and shows it. For small windows,
   consider passing TRUE for \a nomaximize rather than the default FALSE.
 
   \sa showMainDocumentWidget()
 */
 void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize )
 {
     d->show(mw,nomaximize );
 }
 
 /*!
   Sets widget \a mw as the mainWidget() and shows it. For small windows,
   consider passing TRUE for \a nomaximize rather than the default FALSE.
 
   This calls designates the application as
   a \link docwidget.html document-oriented\endlink application.
 
   The \a mw widget \e must have this slot: setDocument(const QString&).
 
   \sa showMainWidget()
 */
 void QPEApplication::showMainDocumentWidget( QWidget* mw, bool nomaximize )
 {
     if ( mw && argc() == 2 )
         Global::setDocument( mw, QString::fromUtf8(argv()[1]) );
 
     d->show(mw, nomaximize );
 }
 
 
 /*!
   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.
 
   \sa keepRunning()
 */
 void QPEApplication::setKeepRunning()
 {
     if ( qApp && qApp->inherits( "QPEApplication" ) ) {
         QPEApplication * qpeApp = ( QPEApplication* ) qApp;
         qpeApp->d->keep_running = TRUE;
     }
 }
 
 /*!
   Returns TRUE if the application will quit after processing the
   current list of qcop messages; otherwise returns FALSE.
 
   \sa setKeepRunning()
 */
 bool QPEApplication::keepRunning() const
 {
   return d->keep_running;
 }
 
 /*!
   \internal
 */
 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 );
     }
 #else
     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 );
     }
 #endif
 #ifndef QT_NO_STYLE_MOTIF
     else if ( style == "Motif" ) {
         setStyle( new QMotifStyle );
     }
 #endif
 #ifndef QT_NO_STYLE_MOTIFPLUS
     else if ( style == "MotifPlus" ) {
         setStyle( new QMotifPlusStyle );
     }
 #endif
 
     else {
         QStyle *sty = 0;
-        QString path = QPEApplication::qpeDir ( ) + "/plugins/styles/lib" + style. lower ( ) + ".so";
+        QString path = QPEApplication::qpeDir ( ) + "/plugins/styles/";
+        
+        if ( style. find ( ".so" ) > 0 )
+	    	path += style;
+	   	else
+	   		path = path + "lib" + style. lower ( ) + ".so"; // compatibility
 
         static QLibrary *lastlib = 0;
         static StyleInterface *lastiface = 0;
 
         QLibrary *lib = new QLibrary ( path );
         StyleInterface *iface = 0;
 
-        if ( lib-> queryInterface ( IID_Style, ( QUnknownInterface ** ) &iface ) == QS_OK )
+        if (( lib-> queryInterface ( IID_Style, ( QUnknownInterface ** ) &iface ) == QS_OK ) && iface )
             sty = iface-> create ( );
 
         if ( sty ) {
             setStyle ( sty );
 
             if ( lastiface )
                 lastiface-> release ( );
             lastiface = iface;
 
             if ( lastlib ) {
                 lastlib-> unload ( );
                 delete lastlib;
             }
             lastlib = lib;
         }
         else {
             if ( iface )
                 iface-> release ( );
             delete lib;
 
             setStyle ( new QPEStyle ( ));
         }
     }
 #endif
 }
 
 /*!
   \internal
 */
 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();
     }
 #ifndef SINGLE_APP
     { QCopEnvelope envelope( "QPE/System", "forceQuit()" );
     }
     processEvents(); // ensure the message goes out.
     sleep( 1 ); // You have 1 second to comply.
 #endif
 }
 
 /*!
   \internal
 */
 void QPEApplication::shutdown()
 {
     // Implement in server's QPEApplication subclass
 }
 
 /*!
   \internal
 */
 void QPEApplication::restart()
 {
     // Implement in server's QPEApplication subclass
 }
 
 static QPtrDict<void>* stylusDict = 0;
 static void createDict()
 {
     if ( !stylusDict )
         stylusDict = new QPtrDict<void>;
 }
 
 /*!
   Returns the current StylusMode for widget \a w.
 
   \sa setStylusOperation() StylusMode
 */
 QPEApplication::StylusMode QPEApplication::stylusOperation( QWidget* w )
 {
     if ( stylusDict )
         return ( StylusMode ) ( int ) stylusDict->find( w );
     return LeftOnly;
 }
 
 /*!
     \enum QPEApplication::StylusMode
 
     \value LeftOnly the stylus only generates LeftButton
                        events (the default).
     \value RightOnHold the stylus generates RightButton events
                        if the user uses the press-and-hold gesture.
 
     \sa setStylusOperation() stylusOperation()
 */
 
 /*!
   Causes widget \a w to receive mouse events according to the stylus
   \a mode.
 
   \sa stylusOperation() StylusMode
 */
 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 );
     }
 }
 
 
 /*!
   \reimp
 */
 bool QPEApplication::eventFilter( QObject *o, QEvent *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 ) {
                     d->presstimer = startTimer(500); // #### pref.
         d->presswidget = (QWidget*)o;
         d->presspos = me->pos();
         d->rightpressed = FALSE;
     }
     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;
 }
 
 /*!
   \reimp
 */
 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;
     }
 }
 
 void QPEApplication::removeSenderFromStylusDict()
 {
     stylusDict->remove
   ( ( void* ) sender() );
     if ( d->presswidget == sender() )
         d->presswidget = 0;
 }
 
 /*!
   \internal
 */
 bool QPEApplication::keyboardGrabbed() const
 {
     return d->kbgrabber;
 }
 
 
 /*!
   Reverses the effect of grabKeyboard(). This is called automatically
   on program exit.
 */
 void QPEApplication::ungrabKeyboard()
 {
     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;
     }
 }
 
 /*!
   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.
 
   \sa ungrabKeyboard()
 */
 void QPEApplication::grabKeyboard()
 {
     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;