| -rw-r--r-- | library/qpedecoration_qws.cpp | 147 | ||||
| -rw-r--r-- | library/qpedecoration_qws.h | 9 |
2 files changed, 100 insertions, 56 deletions
diff --git a/library/qpedecoration_qws.cpp b/library/qpedecoration_qws.cpp index bac1a75..7842ebd 100644 --- a/library/qpedecoration_qws.cpp +++ b/library/qpedecoration_qws.cpp @@ -18,4 +18,5 @@ ** **********************************************************************/ +#ifdef QWS #define QTOPIA_INTERNAL_LANGLIST #include <qapplication.h> @@ -25,4 +26,5 @@ #include <qtimer.h> #include <qwhatsthis.h> +#include <qpopupmenu.h> #include "qcopenvelope_qws.h" #include "qpedecoration_qws.h" @@ -35,4 +37,5 @@ #include "qlibrary.h" #include "windowdecorationinterface.h" +#include <qpe/qlibrary.h> #include <qfile.h> #include <qsignal.h> @@ -40,5 +43,5 @@ #include <stdlib.h> -extern QRect qt_maxWindowRect; +extern Q_EXPORT QRect qt_maxWindowRect; #define WHATSTHIS_MODE @@ -96,10 +99,11 @@ static const char * const qpe_accept_xpm[] = { #endif // QT_NO_IMAGEIO_XPM -class HackWidget : public QWidget +class DecorHackWidget : public QWidget { public: bool needsOk() { return (getWState() & WState_Reserved1 ) || - (inherits( "QDialog" ) && !inherits( "QMessageBox" ) ); + (inherits("QDialog") && !inherits("QMessageBox") + && !inherits("QWizard") ); } }; @@ -189,17 +193,17 @@ bool QPEManager::eventFilter( QObject *o, QEvent *e ) switch ( inRegion ) { case QWSDecoration::Close: - if ( ((HackWidget*)w)->needsOk() ) - text = QObject::tr("Click to close this window, discarding changes."); + if ( ((DecorHackWidget*)w)->needsOk() ) + text = tr("Click to close this window, discarding changes."); else - text = QObject::tr("Click to close this window."); + text = tr("Click to close this window."); break; case QWSDecoration::Minimize: - text = QObject::tr("Click to close this window and apply changes."); + text = tr("Click to close this window and apply changes."); break; case QWSDecoration::Maximize: if ( w->isMaximized() ) - text = QObject::tr("Click to make this window moveable."); + text = tr("Click to make this window movable."); else - text = QObject::tr("Click to make this window use all available screen area."); + text = tr("Click to make this window use all available screen area."); break; default: @@ -455,7 +459,8 @@ class DefaultWindowDecoration : public WindowDecorationInterface { public: - DefaultWindowDecoration() : ref(0) {} + DefaultWindowDecoration(){} QString name() const { - return "Default"; + return qApp->translate("WindowDecoration", "Default", + "List box text for default window decoration"); } QPixmap icon() const { @@ -468,4 +473,6 @@ public: else if ( uuid == IID_WindowDecoration ) *iface = this; + else + return QS_FALSE; if ( *iface ) @@ -475,18 +482,42 @@ public: Q_REFCOUNT -private: - ulong ref; }; static WindowDecorationInterface *wdiface = 0; -static QLibrary *wdlib = 0; +static QLibrary* wdlib = 0; static QString libname; //=========================================================================== +bool QPEDecoration::helpExists() const +{ + if ( helpFile.isNull() ) { + QStringList helpPath = Global::helpPath(); + QString hf = QString(qApp->argv()[0]) + ".html"; + bool he = FALSE; + for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !he; ++it) + he = QFile::exists( *it + "/" + hf ); + ((QPEDecoration*)this)->helpFile = hf; + ((QPEDecoration*)this)->helpexists = he; + return he; + } + return helpexists; +} QPEDecoration::QPEDecoration() : QWSDefaultDecoration() { - init ( libname ); + if ( wdlib ) { + delete wdlib; + wdlib = 0; + } else { + delete wdiface; + } + wdiface = new DefaultWindowDecoration; + + helpexists = FALSE; // We don't know (flagged by helpFile being null) + qpeManager = new QPEManager( this ); + imageOk = Resource::loadImage( "OKButton" ); + imageClose = Resource::loadImage( "CloseButton" ); + imageHelp = Resource::loadImage( "HelpButton" ); } @@ -494,18 +525,13 @@ QPEDecoration::QPEDecoration( const QString &plugin ) : QWSDefaultDecoration() { - init ( plugin ); -} - -void QPEDecoration::init ( const QString &plugin ) -{ libname = plugin; if ( wdlib ) { - wdiface->release(); - wdlib->unload(); - delete wdlib; - wdlib = 0; + wdiface->release(); + wdlib->unload(); + delete wdlib; + wdlib = 0; } else { - delete wdiface; + delete wdiface; } @@ -537,17 +563,8 @@ void QPEDecoration::init ( const QString &plugin ) } - 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 ); - //qDebug ( "Checking %s/%s for help: %d", (*it).latin1(), helpFile.latin1(),helpExists); - } - qpeManager = new QPEManager( this ); - // Qtopia 1.5 compatibility - imageOk = *okImage ( 15 ); - imageClose = *closeImage ( 15 ); - imageHelp = *helpImage ( 15 ); + + helpexists = FALSE; // We don't know (flagged by helpFile being null) + qpeManager = new QPEManager( this ); } @@ -615,5 +632,5 @@ QRegion QPEDecoration::region(const QWidget *widget, const QRect &rect, QWSDecor int maximizeWidth = wdiface->metric(WindowDecorationInterface::MaximizeWidth,&wd); int left = rect.right() - maximizeWidth - closeWidth; - if ( ((HackWidget *)widget)->needsOk() ) + if ( ((DecorHackWidget *)widget)->needsOk() ) left -= okWidth; QRect r(left, rect.top() - titleHeight, closeWidth, titleHeight); @@ -622,5 +639,5 @@ QRegion QPEDecoration::region(const QWidget *widget, const QRect &rect, QWSDecor break; case Minimize: - if ( ((HackWidget *)widget)->needsOk() ) { + if ( ((DecorHackWidget *)widget)->needsOk() ) { QRect r(rect.right() - okWidth, rect.top() - titleHeight, okWidth, titleHeight); @@ -632,5 +649,5 @@ QRegion QPEDecoration::region(const QWidget *widget, const QRect &rect, QWSDecor { int left = rect.right() - closeWidth; - if ( ((HackWidget *)widget)->needsOk() ) + if ( ((DecorHackWidget *)widget)->needsOk() ) left -= okWidth; QRect r(left, rect.top() - titleHeight, closeWidth, titleHeight); @@ -641,5 +658,5 @@ QRegion QPEDecoration::region(const QWidget *widget, const QRect &rect, QWSDecor if ( !widget->isMaximized() ) { int width = rect.width() - helpWidth - closeWidth; - if ( ((HackWidget *)widget)->needsOk() ) + if ( ((DecorHackWidget *)widget)->needsOk() ) width -= okWidth; QRect r(rect.left()+helpWidth, rect.top() - titleHeight, @@ -650,5 +667,5 @@ QRegion QPEDecoration::region(const QWidget *widget, const QRect &rect, QWSDecor break; case Help: - if ( helpExists || widget->testWFlags(Qt::WStyle_ContextHelp) ) { + if ( helpExists() || widget->testWFlags(Qt::WStyle_ContextHelp) ) { QRect r(rect.left(), rect.top() - titleHeight, helpWidth, titleHeight); @@ -753,9 +770,9 @@ void QPEDecoration::paint(QPainter *painter, const QWidget *widget) // title bar rect - QRect tr( rect.left(), rect.top() - titleHeight, rect.width(), titleHeight ); + QRect tbr( rect.left(), rect.top() - titleHeight, rect.width(), titleHeight ); #ifndef QT_NO_PALETTE QRegion oldClip = painter->clipRegion(); - painter->setClipRegion( oldClip - QRegion( tr ) ); // reduce flicker + painter->setClipRegion( oldClip - QRegion( tbr ) ); // reduce flicker wdiface->drawArea( WindowDecorationInterface::Border, painter, &wd ); painter->setClipRegion( oldClip ); @@ -797,7 +814,7 @@ void QPEDecoration::paintButton(QPainter *painter, const QWidget *w, break; case Minimize: - if ( ((HackWidget *)w)->needsOk() ) + if ( ((DecorHackWidget *)w)->needsOk() ) b = WindowDecorationInterface::OK; - else if ( helpExists ) + else if ( helpExists() ) b = WindowDecorationInterface::Help; else @@ -819,5 +836,5 @@ void QPEDecoration::paintButton(QPainter *painter, const QWidget *w, int titleHeight = wdiface->metric(WindowDecorationInterface::TitleHeight,&wd); QRect rect(w->rect()); - QRect tr( rect.left(), rect.top() - titleHeight, rect.width(), titleHeight ); + QRect tbr( rect.left(), rect.top() - titleHeight, rect.width(), titleHeight ); QRect brect(region(w, w->rect(), type).boundingRect()); @@ -829,5 +846,5 @@ void QPEDecoration::paintButton(QPainter *painter, const QWidget *w, QRegion oldClip = painter->clipRegion(); - painter->setClipRegion( QRect(brect.x(), tr.y(), brect.width(), tr.height()) ); // reduce flicker + painter->setClipRegion( QRect(brect.x(), tbr.y(), brect.width(), tbr.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 ); @@ -849,4 +866,18 @@ void QPEDecoration::maximize( QWidget *widget ) } +QPopupMenu *QPEDecoration::menu( const QWidget *, const QPoint & ) +{ + QPopupMenu *m = new QPopupMenu(); + + m->insertItem(QPEManager::tr("Restore"), (int)Normalize); + m->insertItem(QPEManager::tr("Move"), (int)Title); + m->insertItem(QPEManager::tr("Size"), (int)BottomRight); + m->insertItem(QPEManager::tr("Maximize"), (int)Maximize); + m->insertSeparator(); + m->insertItem(QPEManager::tr("Close"), (int)Close); + + return m; +} + #ifndef QT_NO_DIALOG class HackDialog : public QDialog @@ -872,5 +903,5 @@ void QPEDecoration::minimize( QWidget *widget ) } #endif - else if ( ((HackWidget *)widget)->needsOk() ) { + else if ( ((DecorHackWidget *)widget)->needsOk() ) { QSignal s; s.connect( widget, SLOT( accept() ) ); @@ -883,9 +914,18 @@ void QPEDecoration::minimize( QWidget *widget ) void QPEDecoration::help( QWidget *w ) { - if ( helpExists ) { - Global::execute( "helpbrowser", helpFile ); + if ( helpExists() ) { + QString hf = helpFile; + QString localHelpFile = QString(qApp->argv()[0]) + "-" + w->name() + ".html"; + QStringList helpPath = Global::helpPath(); + for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end(); ++it) { + if ( QFile::exists( *it + "/" + localHelpFile ) ) { + hf = localHelpFile; + break; + } + } + Global::execute( "helpbrowser", hf ); } else if ( w && w->testWFlags(Qt::WStyle_ContextHelp) ) { QWhatsThis::enterWhatsThisMode(); - QWhatsThis::leaveWhatsThisMode( QObject::tr( + QWhatsThis::leaveWhatsThisMode( QObject::tr( "<Qt>Comprehensive help is not available for this application, " "however there is context-sensitive help.<p>To use context-sensitive help:<p>" @@ -900,5 +940,5 @@ void QPEDecoration::windowData( const QWidget *w, WindowDecorationInterface::Win wd.rect = w->rect(); if ( qpeManager->whatsThisWidget() == w ) - wd.caption = QObject::tr("What's this..." ); + wd.caption = QObject::tr( "What's this..." ); else wd.caption = w->caption(); @@ -925,2 +965,3 @@ 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 d0a2005..ca670cd 100644 --- a/library/qpedecoration_qws.h +++ b/library/qpedecoration_qws.h @@ -23,4 +23,5 @@ #ifdef QWS +#include <qpe/global.h> #include <qwsdefaultdecoration_qws.h> #include <qimage.h> @@ -34,4 +35,5 @@ class QPEManager; class QTimer; +#include <qwidget.h> class QPEDecoration : public QWSDefaultDecoration @@ -48,4 +50,5 @@ public: void maximize( QWidget * ); void minimize( QWidget * ); + virtual QPopupMenu *menu( const QWidget *, const QPoint & ); virtual void help( QWidget * ); @@ -64,5 +67,5 @@ private: void windowData( const QWidget *w, WindowDecorationInterface::WindowData &wd ) const; - void init ( const QString & ); + bool helpExists() const; protected: @@ -71,5 +74,5 @@ protected: QImage imageHelp; QString helpFile; - bool helpExists; + bool helpexists : 1; QPEManager *qpeManager; }; @@ -102,5 +105,5 @@ protected: QTime pressTime; QTimer *wtTimer; - bool inWhatsThis; + bool inWhatsThis : 1; QGuardedPtr<QWidget> whatsThis; }; |