changes to make the style interface BC with Qtopia 1.6, while still

supporting our extended features

2 files changed, 20 insertions, 21 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index e92b4dd..f65f3ab 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -1044,385 +1044,385 @@ bool QPEApplication::raiseAppropriateWindow()
   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/";
         
         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 ) && iface )
-            sty = iface-> create ( );
+            sty = iface-> style ( );
 
         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 )
 {
diff --git a/library/styleinterface.h b/library/styleinterface.h
index 9fea636..b50f239 100644
--- a/library/styleinterface.h
+++ b/library/styleinterface.h
@@ -1,68 +1,67 @@
 /**********************************************************************
 ** Copyright (C) 2002 Robert Griebl.  All rights reserved.
 **
 ** This file is part of OPIE (http://www.opie.info).
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #ifndef STYLEINTERFACE_H
 #define STYLEINTERFACE_H
 
 #include <qpe/qcom.h>
 
 #ifndef QT_NO_COMPONENT
 
-// {6C33B4F9-D529-453A-8FB3-DA42B21872BD}  
-# ifndef IID_Style 
-#  define IID_Style QUuid( 0x6c33b4f9, 0xd529, 0x453a, 0x8f, 0xb3, 0xda, 0x42, 0xb2, 0x18, 0x72, 0xbd) 
+// {17AF792C-E461-49A9-9B71-068B9A8DDAE4}
+#ifndef IID_Style
+#define IID_Style QUuid( 0x17af792c, 0xe461, 0x49a9, 0x9b, 0x71, 0x06, 0x8b, 0x9a, 0x8d, 0xda, 0xe4)
 #endif
 
-// {9757A252-3FD4-438F-A756-80BE4A9FB8DC}
-# ifndef IID_StyleSettings
-#  define IID_StyleSettings QUuid( 0x9757a252, 0x3fd4, 0x438f, 0xa7, 0x56, 0x80, 0xbe, 0x4a, 0x9f, 0xb8, 0xdc)
-# endif
+// {6C33B4F9-D529-453A-8FB3-DA42B21872BD}  
+# ifndef IID_StyleExtended
+#  define IID_StyleExtended QUuid( 0x6c33b4f9, 0xd529, 0x453a, 0x8f, 0xb3, 0xda, 0x42, 0xb2, 0x18, 0x72, 0xbd) 
+#endif
 
 #endif
 
 class QWidget;
 class QStyle;
 
+
+class QStyle;
+
 struct StyleInterface : public QUnknownInterface
 {
         //! Return a new style.
-        virtual QStyle *create ( ) = 0;
-        
-        //! Return a (longer) description for the style.
-        virtual QString description ( ) = 0;
-
+        virtual QStyle *style() = 0;
         //! Return a short name for the style.
-        virtual QString name ( ) = 0;
-        
-        //! Return the library basename (libliquid.so => liquid)
-        virtual QCString key ( ) = 0;
-        
-        //! QT_VERSION like 1.2.3 == 123
-        virtual unsigned int version ( ) = 0;
+        virtual QString name() const = 0;
 };
 
-struct StyleSettingsInterface : public QUnknownInterface
+struct StyleExtendedInterface : public StyleInterface
 {
+        //! Return a (longer) description for the style.
+        virtual QString description ( ) = 0;
+
+        //! Does this style support customization
+        virtual bool hasSettings ( ) const = 0;
+        
         //! Return a new settings page.
         virtual QWidget *create ( QWidget *parent, const char *name = 0 ) = 0;
         
         //! Callback for appearance app when OK is clicked (return true when style has to re-applied).
         virtual bool accept ( ) = 0;
         
         //! Callback for appeaeance app when Cancel is clicked.
         virtual void reject ( ) = 0;
 };
 
 #endif