summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpedecoration_qws.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/library/qpedecoration_qws.cpp b/library/qpedecoration_qws.cpp
index 9cbe92b..6221f5b 100644
--- a/library/qpedecoration_qws.cpp
+++ b/library/qpedecoration_qws.cpp
@@ -443,128 +443,133 @@ void WindowDecorationInterface::drawButton( Button b, QPainter *p, const WindowD
443QRegion WindowDecorationInterface::mask( const WindowData *wd ) const 443QRegion WindowDecorationInterface::mask( const WindowData *wd ) const
444{ 444{
445 int th = metric(TitleHeight,wd); 445 int th = metric(TitleHeight,wd);
446 QRect rect( wd->rect ); 446 QRect rect( wd->rect );
447 QRect r(rect.left() - metric(LeftBorder,wd), 447 QRect r(rect.left() - metric(LeftBorder,wd),
448 rect.top() - th - metric(TopBorder,wd), 448 rect.top() - th - metric(TopBorder,wd),
449 rect.width() + metric(LeftBorder,wd) + metric(RightBorder,wd), 449 rect.width() + metric(LeftBorder,wd) + metric(RightBorder,wd),
450 rect.height() + th + metric(TopBorder,wd) + metric(BottomBorder,wd)); 450 rect.height() + th + metric(TopBorder,wd) + metric(BottomBorder,wd));
451 return QRegion(r) - rect; 451 return QRegion(r) - rect;
452} 452}
453 453
454class DefaultWindowDecoration : public WindowDecorationInterface 454class DefaultWindowDecoration : public WindowDecorationInterface
455{ 455{
456public: 456public:
457 DefaultWindowDecoration() : ref(0) {} 457 DefaultWindowDecoration() : ref(0) {}
458 QString name() const { 458 QString name() const {
459 return "Default"; 459 return "Default";
460 } 460 }
461 QPixmap icon() const { 461 QPixmap icon() const {
462 return QPixmap(); 462 return QPixmap();
463 } 463 }
464 QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface ) { 464 QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface ) {
465 *iface = 0; 465 *iface = 0;
466 if ( uuid == IID_QUnknown ) 466 if ( uuid == IID_QUnknown )
467 *iface = this; 467 *iface = this;
468 else if ( uuid == IID_WindowDecoration ) 468 else if ( uuid == IID_WindowDecoration )
469 *iface = this; 469 *iface = this;
470 470
471 if ( *iface ) 471 if ( *iface )
472 (*iface)->addRef(); 472 (*iface)->addRef();
473 return QS_OK; 473 return QS_OK;
474 } 474 }
475 Q_REFCOUNT 475 Q_REFCOUNT
476 476
477private: 477private:
478 ulong ref; 478 ulong ref;
479}; 479};
480 480
481static WindowDecorationInterface *wdiface = 0; 481static WindowDecorationInterface *wdiface = 0;
482static QLibrary *wdlib = 0; 482static QLibrary *wdlib = 0;
483 483
484//=========================================================================== 484//===========================================================================
485 485
486QPEDecoration::QPEDecoration() 486QPEDecoration::QPEDecoration()
487 : QWSDefaultDecoration() 487 : QWSDefaultDecoration()
488{ 488{
489 if ( wdlib ) { 489 if ( wdlib ) {
490 wdiface->release(); 490 wdiface->release();
491 wdlib->unload(); 491 wdlib->unload();
492 delete wdlib; 492 delete wdlib;
493 wdlib = 0; 493 wdlib = 0;
494 } else { 494 } else {
495 delete wdiface; 495 delete wdiface;
496 } 496 }
497 wdiface = new DefaultWindowDecoration; 497 wdiface = new DefaultWindowDecoration;
498 498
499 helpFile = QString(qApp->argv()[0]) + ".html"; 499 helpFile = QString(qApp->argv()[0]) + ".html";
500 QStringList helpPath = Global::helpPath(); 500 QStringList helpPath = Global::helpPath();
501 helpExists = FALSE; 501 helpExists = FALSE;
502 for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it) { 502 for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it) {
503 helpExists = QFile::exists( *it + "/" + helpFile ); 503 helpExists = QFile::exists( *it + "/" + helpFile );
504 qDebug ( "Checking %s/%s for help: %d", (*it).latin1(), helpFile.latin1(),helpExists); 504 qDebug ( "Checking %s/%s for help: %d", (*it).latin1(), helpFile.latin1(),helpExists);
505 } 505 }
506 qpeManager = new QPEManager( this ); 506 qpeManager = new QPEManager( this );
507
508 // for backward compatibility:
509 imageOk = *okImage ( 15 );
510 imageClose = *closeImage ( 15 );
511 imageHelp = *helpImage ( 15 );
507} 512}
508 513
509QPEDecoration::QPEDecoration( const QString &plugin ) 514QPEDecoration::QPEDecoration( const QString &plugin )
510 : QWSDefaultDecoration() 515 : QWSDefaultDecoration()
511{ 516{
512 if ( wdlib ) { 517 if ( wdlib ) {
513 wdiface->release(); 518 wdiface->release();
514 wdlib->unload(); 519 wdlib->unload();
515 delete wdlib; 520 delete wdlib;
516 wdlib = 0; 521 wdlib = 0;
517 } else { 522 } else {
518 delete wdiface; 523 delete wdiface;
519 } 524 }
520 WindowDecorationInterface *iface = 0; 525 WindowDecorationInterface *iface = 0;
521 QString path = QPEApplication::qpeDir() + "/plugins/decorations"; 526 QString path = QPEApplication::qpeDir() + "/plugins/decorations";
522 QLibrary *lib = new QLibrary( path + "/" + plugin ); 527 QLibrary *lib = new QLibrary( path + "/" + plugin );
523 if ( lib->queryInterface( IID_WindowDecoration, (QUnknownInterface**)&iface ) == QS_OK && iface ) { 528 if ( lib->queryInterface( IID_WindowDecoration, (QUnknownInterface**)&iface ) == QS_OK && iface ) {
524 wdiface = iface; 529 wdiface = iface;
525 wdlib = lib; 530 wdlib = lib;
526 } else { 531 } else {
527 delete lib; 532 delete lib;
528 wdiface = new DefaultWindowDecoration; 533 wdiface = new DefaultWindowDecoration;
529 } 534 }
530 535
531 helpFile = QString(qApp->argv()[0]) + ".html"; 536 helpFile = QString(qApp->argv()[0]) + ".html";
532 QStringList helpPath = Global::helpPath(); 537 QStringList helpPath = Global::helpPath();
533 helpExists = FALSE; 538 helpExists = FALSE;
534 for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it) { 539 for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it) {
535 helpExists = QFile::exists( *it + "/" + helpFile ); 540 helpExists = QFile::exists( *it + "/" + helpFile );
536 qDebug ( "Checking %s/%s for help: %d", (*it).latin1(), helpFile.latin1(),helpExists); } 541 qDebug ( "Checking %s/%s for help: %d", (*it).latin1(), helpFile.latin1(),helpExists); }
537 qpeManager = new QPEManager( this ); 542 qpeManager = new QPEManager( this );
538} 543}
539 544
540QPEDecoration::~QPEDecoration() 545QPEDecoration::~QPEDecoration()
541{ 546{
542 delete qpeManager; 547 delete qpeManager;
543} 548}
544 549
545const char **QPEDecoration::menuPixmap() 550const char **QPEDecoration::menuPixmap()
546{ 551{
547 return (const char **)0; 552 return (const char **)0;
548} 553}
549 554
550const char **QPEDecoration::closePixmap() 555const char **QPEDecoration::closePixmap()
551{ 556{
552 return (const char **)qpe_close_xpm; 557 return (const char **)qpe_close_xpm;
553} 558}
554 559
555const char **QPEDecoration::minimizePixmap() 560const char **QPEDecoration::minimizePixmap()
556{ 561{
557 return (const char **)qpe_accept_xpm; 562 return (const char **)qpe_accept_xpm;
558} 563}
559 564
560const char **QPEDecoration::maximizePixmap() 565const char **QPEDecoration::maximizePixmap()
561{ 566{
562 return (const char **)0; 567 return (const char **)0;
563} 568}
564 569
565const char **QPEDecoration::normalizePixmap() 570const char **QPEDecoration::normalizePixmap()
566{ 571{
567 return (const char **)0; 572 return (const char **)0;
568} 573}
569 574
570int QPEDecoration::getTitleHeight( const QWidget *w ) 575int QPEDecoration::getTitleHeight( const QWidget *w )