-rw-r--r-- | library/qpedecoration_qws.cpp | 7 | ||||
-rw-r--r-- | library/task-opie-applets.control | 2 | ||||
-rw-r--r-- | library/task-opie-complete.control | 2 | ||||
-rw-r--r-- | library/task-opie-games.control | 2 | ||||
-rw-r--r-- | library/task-opie-pim.control | 2 | ||||
-rw-r--r-- | library/task-opie-settings.control | 2 |
6 files changed, 10 insertions, 7 deletions
diff --git a/library/qpedecoration_qws.cpp b/library/qpedecoration_qws.cpp index 708dd23..214c721 100644 --- a/library/qpedecoration_qws.cpp +++ b/library/qpedecoration_qws.cpp | |||
@@ -455,128 +455,131 @@ QRegion WindowDecorationInterface::mask( const WindowData *wd ) const | |||
455 | class DefaultWindowDecoration : public WindowDecorationInterface | 455 | class DefaultWindowDecoration : public WindowDecorationInterface |
456 | { | 456 | { |
457 | public: | 457 | public: |
458 | DefaultWindowDecoration() : ref(0) {} | 458 | DefaultWindowDecoration() : ref(0) {} |
459 | QString name() const { | 459 | QString name() const { |
460 | return "Default"; | 460 | return "Default"; |
461 | } | 461 | } |
462 | QPixmap icon() const { | 462 | QPixmap icon() const { |
463 | return QPixmap(); | 463 | return QPixmap(); |
464 | } | 464 | } |
465 | QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface ) { | 465 | QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface ) { |
466 | *iface = 0; | 466 | *iface = 0; |
467 | if ( uuid == IID_QUnknown ) | 467 | if ( uuid == IID_QUnknown ) |
468 | *iface = this; | 468 | *iface = this; |
469 | else if ( uuid == IID_WindowDecoration ) | 469 | else if ( uuid == IID_WindowDecoration ) |
470 | *iface = this; | 470 | *iface = this; |
471 | 471 | ||
472 | if ( *iface ) | 472 | if ( *iface ) |
473 | (*iface)->addRef(); | 473 | (*iface)->addRef(); |
474 | return QS_OK; | 474 | return QS_OK; |
475 | } | 475 | } |
476 | Q_REFCOUNT | 476 | Q_REFCOUNT |
477 | 477 | ||
478 | private: | 478 | private: |
479 | ulong ref; | 479 | ulong ref; |
480 | }; | 480 | }; |
481 | 481 | ||
482 | static WindowDecorationInterface *wdiface = 0; | 482 | static WindowDecorationInterface *wdiface = 0; |
483 | static QLibrary *wdlib = 0; | 483 | static QLibrary *wdlib = 0; |
484 | 484 | ||
485 | //=========================================================================== | 485 | //=========================================================================== |
486 | 486 | ||
487 | QPEDecoration::QPEDecoration() | 487 | QPEDecoration::QPEDecoration() |
488 | : QWSDefaultDecoration() | 488 | : QWSDefaultDecoration() |
489 | { | 489 | { |
490 | if ( wdlib ) { | 490 | if ( wdlib ) { |
491 | wdiface->release(); | 491 | wdiface->release(); |
492 | wdlib->unload(); | 492 | wdlib->unload(); |
493 | delete wdlib; | 493 | delete wdlib; |
494 | wdlib = 0; | 494 | wdlib = 0; |
495 | } else { | 495 | } else { |
496 | delete wdiface; | 496 | delete wdiface; |
497 | } | 497 | } |
498 | wdiface = new DefaultWindowDecoration; | 498 | wdiface = new DefaultWindowDecoration; |
499 | 499 | ||
500 | helpFile = QString(qApp->argv()[0]) + ".html"; | 500 | helpFile = QString(qApp->argv()[0]) + ".html"; |
501 | QStringList helpPath = Global::helpPath(); | 501 | QStringList helpPath = Global::helpPath(); |
502 | helpExists = FALSE; | 502 | helpExists = FALSE; |
503 | for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it) | 503 | for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it) { |
504 | helpExists = QFile::exists( *it + "/" + helpFile ); | 504 | helpExists = QFile::exists( *it + "/" + helpFile ); |
505 | qDebug ( "Checking %s/%s for help: %d", (*it).latin1(), helpFile.latin1(),helpExists); | ||
506 | } | ||
505 | qpeManager = new QPEManager( this ); | 507 | qpeManager = new QPEManager( this ); |
506 | } | 508 | } |
507 | 509 | ||
508 | QPEDecoration::QPEDecoration( const QString &plugin ) | 510 | QPEDecoration::QPEDecoration( const QString &plugin ) |
509 | : QWSDefaultDecoration() | 511 | : QWSDefaultDecoration() |
510 | { | 512 | { |
511 | if ( wdlib ) { | 513 | if ( wdlib ) { |
512 | wdiface->release(); | 514 | wdiface->release(); |
513 | wdlib->unload(); | 515 | wdlib->unload(); |
514 | delete wdlib; | 516 | delete wdlib; |
515 | wdlib = 0; | 517 | wdlib = 0; |
516 | } else { | 518 | } else { |
517 | delete wdiface; | 519 | delete wdiface; |
518 | } | 520 | } |
519 | WindowDecorationInterface *iface = 0; | 521 | WindowDecorationInterface *iface = 0; |
520 | QString path = QPEApplication::qpeDir() + "/plugins/decorations"; | 522 | QString path = QPEApplication::qpeDir() + "/plugins/decorations"; |
521 | QLibrary *lib = new QLibrary( path + "/" + plugin ); | 523 | QLibrary *lib = new QLibrary( path + "/" + plugin ); |
522 | if ( lib->queryInterface( IID_WindowDecoration, (QUnknownInterface**)&iface ) == QS_OK && iface ) { | 524 | if ( lib->queryInterface( IID_WindowDecoration, (QUnknownInterface**)&iface ) == QS_OK && iface ) { |
523 | wdiface = iface; | 525 | wdiface = iface; |
524 | wdlib = lib; | 526 | wdlib = lib; |
525 | } else { | 527 | } else { |
526 | delete lib; | 528 | delete lib; |
527 | wdiface = new DefaultWindowDecoration; | 529 | wdiface = new DefaultWindowDecoration; |
528 | } | 530 | } |
529 | 531 | ||
530 | helpFile = QString(qApp->argv()[0]) + ".html"; | 532 | helpFile = QString(qApp->argv()[0]) + ".html"; |
531 | QStringList helpPath = Global::helpPath(); | 533 | QStringList helpPath = Global::helpPath(); |
532 | helpExists = FALSE; | 534 | helpExists = FALSE; |
533 | for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it) | 535 | for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it) { |
534 | helpExists = QFile::exists( *it + "/" + helpFile ); | 536 | helpExists = QFile::exists( *it + "/" + helpFile ); |
537 | qDebug ( "Checking %s/%s for help: %d", (*it).latin1(), helpFile.latin1(),helpExists); } | ||
535 | qpeManager = new QPEManager( this ); | 538 | qpeManager = new QPEManager( this ); |
536 | } | 539 | } |
537 | 540 | ||
538 | QPEDecoration::~QPEDecoration() | 541 | QPEDecoration::~QPEDecoration() |
539 | { | 542 | { |
540 | delete qpeManager; | 543 | delete qpeManager; |
541 | } | 544 | } |
542 | 545 | ||
543 | const char **QPEDecoration::menuPixmap() | 546 | const char **QPEDecoration::menuPixmap() |
544 | { | 547 | { |
545 | return (const char **)0; | 548 | return (const char **)0; |
546 | } | 549 | } |
547 | 550 | ||
548 | const char **QPEDecoration::closePixmap() | 551 | const char **QPEDecoration::closePixmap() |
549 | { | 552 | { |
550 | return (const char **)qpe_close_xpm; | 553 | return (const char **)qpe_close_xpm; |
551 | } | 554 | } |
552 | 555 | ||
553 | const char **QPEDecoration::minimizePixmap() | 556 | const char **QPEDecoration::minimizePixmap() |
554 | { | 557 | { |
555 | return (const char **)qpe_accept_xpm; | 558 | return (const char **)qpe_accept_xpm; |
556 | } | 559 | } |
557 | 560 | ||
558 | const char **QPEDecoration::maximizePixmap() | 561 | const char **QPEDecoration::maximizePixmap() |
559 | { | 562 | { |
560 | return (const char **)0; | 563 | return (const char **)0; |
561 | } | 564 | } |
562 | 565 | ||
563 | const char **QPEDecoration::normalizePixmap() | 566 | const char **QPEDecoration::normalizePixmap() |
564 | { | 567 | { |
565 | return (const char **)0; | 568 | return (const char **)0; |
566 | } | 569 | } |
567 | 570 | ||
568 | int QPEDecoration::getTitleHeight( const QWidget *w ) | 571 | int QPEDecoration::getTitleHeight( const QWidget *w ) |
569 | { | 572 | { |
570 | WindowDecorationInterface::WindowData wd; | 573 | WindowDecorationInterface::WindowData wd; |
571 | windowData( w, wd ); | 574 | windowData( w, wd ); |
572 | return wdiface->metric(WindowDecorationInterface::TitleHeight,&wd); | 575 | return wdiface->metric(WindowDecorationInterface::TitleHeight,&wd); |
573 | } | 576 | } |
574 | 577 | ||
575 | /* | 578 | /* |
576 | If rect is empty, no frame is added. (a hack, really) | 579 | If rect is empty, no frame is added. (a hack, really) |
577 | */ | 580 | */ |
578 | QRegion QPEDecoration::region(const QWidget *widget, const QRect &rect, QWSDecoration::Region type) | 581 | QRegion QPEDecoration::region(const QWidget *widget, const QRect &rect, QWSDecoration::Region type) |
579 | { | 582 | { |
580 | qpeManager->updateActive(); | 583 | qpeManager->updateActive(); |
581 | 584 | ||
582 | WindowDecorationInterface::WindowData wd; | 585 | WindowDecorationInterface::WindowData wd; |
diff --git a/library/task-opie-applets.control b/library/task-opie-applets.control index f0e7780..11e2eae 100644 --- a/library/task-opie-applets.control +++ b/library/task-opie-applets.control | |||
@@ -1,9 +1,9 @@ | |||
1 | Files: | 1 | Files: |
2 | Priority: optional | 2 | Priority: optional |
3 | Section: opie/applications | 3 | Section: opie/applications |
4 | Maintainer: Maximilian Reiss <max.reiss@gmx.de> | 4 | Maintainer: Maximilian Reiss <max.reiss@gmx.de> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION-$SUB_VERSION | 6 | Version: $QPE_VERSION-$SUB_VERSION |
7 | Depends: opie-batteryapplet, opie-clockapplet, opie-vmemo, opie-volumeapplet, opie-screenshotapplet, opie-netmonapplet, opie-pickboard, opie-keyboard, opie-jumpx, opie-handwriting, opie-dvorak, opie-unikeyboard | 7 | Depends: opie-batteryapplet, opie-clockapplet, opie-vmemo, opie-volumeapplet, opie-screenshotapplet, opie-netmonapplet, opie-pickboard, opie-keyboard, opie-jumpx, opie-handwriting, opie-dvorak, opie-unikeyboard |
8 | Description: Opie taskbar applets | 8 | Description: Opie taskbar applets |
9 | All applets for the taskbar \ No newline at end of file | 9 | All applets for the taskbar |
diff --git a/library/task-opie-complete.control b/library/task-opie-complete.control index 226a278..6dafc0c 100644 --- a/library/task-opie-complete.control +++ b/library/task-opie-complete.control | |||
@@ -1,9 +1,9 @@ | |||
1 | Files: | 1 | Files: |
2 | Priority: optional | 2 | Priority: optional |
3 | Section: opie/applications | 3 | Section: opie/applications |
4 | Maintainer: Maximilian Reiss <max.reiss@gmx.de> | 4 | Maintainer: Maximilian Reiss <max.reiss@gmx.de> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION-$SUB_VERSION | 6 | Version: $QPE_VERSION-$SUB_VERSION |
7 | Depends: task-opie, task-opie-apps, task-opie-settings, task-opie-games, task-opie-applets | 7 | Depends: task-opie, task-opie-apps, task-opie-settings, task-opie-games, task-opie-applets |
8 | Description: All off Opie | 8 | Description: All off Opie |
9 | All apps that are in the feed. \ No newline at end of file | 9 | All apps that are in the feed. |
diff --git a/library/task-opie-games.control b/library/task-opie-games.control index 014a56d..9695a40 100644 --- a/library/task-opie-games.control +++ b/library/task-opie-games.control | |||
@@ -1,9 +1,9 @@ | |||
1 | Files: | 1 | Files: |
2 | Priority: optional | 2 | Priority: optional |
3 | Section: opie/games | 3 | Section: opie/games |
4 | Maintainer: Maximilian Reiss <max.reiss@gmx.de> | 4 | Maintainer: Maximilian Reiss <max.reiss@gmx.de> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION-$SUB_VERSION | 6 | Version: $QPE_VERSION-$SUB_VERSION |
7 | Depends: opie-fifteen, opie-go, opie-kbill, opie-kcheckers, opie-kpacman, opie-minesweep, opie-parashoot, opie-qasteroids, opie-snake, opie-solitaire, opie-tetrix, opie-tictac, opie-wordgame | 7 | Depends: opie-fifteen, opie-go, opie-kbill, opie-kcheckers, opie-kpacman, opie-minesweep, opie-parashoot, opie-qasteroids, opie-snake, opie-solitaire, opie-tetrix, opie-tictac, opie-wordgame |
8 | Description: Opie game pack | 8 | Description: Opie game pack |
9 | The full load of Opie games. \ No newline at end of file | 9 | The full load of Opie games. |
diff --git a/library/task-opie-pim.control b/library/task-opie-pim.control index e971780..6df8c22 100644 --- a/library/task-opie-pim.control +++ b/library/task-opie-pim.control | |||
@@ -1,9 +1,9 @@ | |||
1 | Files: | 1 | Files: |
2 | Priority: optional | 2 | Priority: optional |
3 | Section: opie/applications | 3 | Section: opie/applications |
4 | Maintainer: Maximilian Reiss <max.reiss@gmx.de> | 4 | Maintainer: Maximilian Reiss <max.reiss@gmx.de> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION-$SUB_VERSION | 6 | Version: $QPE_VERSION-$SUB_VERSION |
7 | Depends: opie-datebook, opie-todo, opie-addressbook, task-opie-today, opie-drawpad, opie-keyboard | 7 | Depends: opie-datebook, opie-todo, opie-addressbook, task-opie-today, opie-drawpad, opie-keyboard |
8 | Description: Opie pim applications | 8 | Description: Opie pim applications |
9 | Base pack of opie pim applications. Also includes keyboard input. \ No newline at end of file | 9 | Base pack of opie pim applications. Also includes keyboard input. |
diff --git a/library/task-opie-settings.control b/library/task-opie-settings.control index 2fbb4e8..0b572b0 100644 --- a/library/task-opie-settings.control +++ b/library/task-opie-settings.control | |||
@@ -1,9 +1,9 @@ | |||
1 | Files: | 1 | Files: |
2 | Priority: optional | 2 | Priority: optional |
3 | Section: opie/applications | 3 | Section: opie/applications |
4 | Maintainer: Maximilian Reiss <max.reiss@gmx.de> | 4 | Maintainer: Maximilian Reiss <max.reiss@gmx.de> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION-$SUB_VERSION | 6 | Version: $QPE_VERSION-$SUB_VERSION |
7 | Depends: opie-appearance, opie-security, opie-systemtime, opie-light-and-power, opie-rotation, opie-tabmanager, opie-wlansetup | 7 | Depends: opie-appearance, opie-security, opie-systemtime, opie-light-and-power, opie-rotation, opie-tabmanager, opie-wlansetup |
8 | Description: Opie settings app | 8 | Description: Opie settings app |
9 | All settings apps \ No newline at end of file | 9 | All settings apps |