author | sandman <sandman> | 2002-11-25 22:12:18 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-11-25 22:12:18 (UTC) |
commit | 4e6b2585987290f874697cbec7c289b4df29f82b (patch) (unidiff) | |
tree | e19415ef5374ffa3730380813298111e24711590 /library | |
parent | 7bd8ef9197506897d3a5287a013934f89658d60a (diff) | |
download | opie-4e6b2585987290f874697cbec7c289b4df29f82b.zip opie-4e6b2585987290f874697cbec7c289b4df29f82b.tar.gz opie-4e6b2585987290f874697cbec7c289b4df29f82b.tar.bz2 |
Some changes to the QPEDecoration c'tor internals:
Since the current deco plugin is unloaded, when a new Deco is created
via new (even if this new deco is never used or deleted immediatly afer-
wards), we have to remember the plugin name, in case someone calls the
default c'tor (without supplying a plugin name)
-rw-r--r-- | library/qpeapplication.cpp | 9 | ||||
-rw-r--r-- | library/qpedecoration_qws.cpp | 41 | ||||
-rw-r--r-- | library/qpedecoration_qws.h | 2 |
3 files changed, 25 insertions, 27 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index a54fb20..c8e6e74 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -901,3 +901,3 @@ void QPEApplication::setDefaultRotation( int r ) | |||
901 | // exported to libpreload.so | 901 | // exported to libpreload.so |
902 | bool opie_block_style = false; | 902 | int opie_block_style = 0; |
903 | 903 | ||
@@ -912,3 +912,3 @@ void QPEApplication::applyStyle() | |||
912 | // don't block ourselves ... | 912 | // don't block ourselves ... |
913 | opie_block_style = false; | 913 | opie_block_style = 0; |
914 | 914 | ||
@@ -977,2 +977,4 @@ void QPEApplication::applyStyle() | |||
977 | 977 | ||
978 | //qDebug ( "Setting Deco: %s -- old %s (%d)", dec.latin1(), d-> decorationName.latin1(), nostyle); | ||
979 | |||
978 | if ( dec != d->decorationName ) { | 980 | if ( dec != d->decorationName ) { |
@@ -995,3 +997,4 @@ void QPEApplication::applyStyle() | |||
995 | // revert to global blocking policy ... | 997 | // revert to global blocking policy ... |
996 | opie_block_style = config. readBoolEntry ( "ForceStyle", false ); | 998 | opie_block_style = config. readBoolEntry ( "ForceStyle", false ) ? 0xff : 0x00; |
999 | opie_block_style -= nostyle; | ||
997 | } | 1000 | } |
diff --git a/library/qpedecoration_qws.cpp b/library/qpedecoration_qws.cpp index 6221f5b..5e0c32a 100644 --- a/library/qpedecoration_qws.cpp +++ b/library/qpedecoration_qws.cpp | |||
@@ -482,2 +482,3 @@ static WindowDecorationInterface *wdiface = 0; | |||
482 | static QLibrary *wdlib = 0; | 482 | static QLibrary *wdlib = 0; |
483 | static QString libname; | ||
483 | 484 | ||
@@ -488,25 +489,3 @@ QPEDecoration::QPEDecoration() | |||
488 | { | 489 | { |
489 | if ( wdlib ) { | 490 | init ( libname ); |
490 | wdiface->release(); | ||
491 | wdlib->unload(); | ||
492 | delete wdlib; | ||
493 | wdlib = 0; | ||
494 | } else { | ||
495 | delete wdiface; | ||
496 | } | ||
497 | wdiface = new DefaultWindowDecoration; | ||
498 | |||
499 | helpFile = QString(qApp->argv()[0]) + ".html"; | ||
500 | QStringList helpPath = Global::helpPath(); | ||
501 | helpExists = FALSE; | ||
502 | for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it) { | ||
503 | helpExists = QFile::exists( *it + "/" + helpFile ); | ||
504 | qDebug ( "Checking %s/%s for help: %d", (*it).latin1(), helpFile.latin1(),helpExists); | ||
505 | } | ||
506 | qpeManager = new QPEManager( this ); | ||
507 | |||
508 | // for backward compatibility: | ||
509 | imageOk = *okImage ( 15 ); | ||
510 | imageClose = *closeImage ( 15 ); | ||
511 | imageHelp = *helpImage ( 15 ); | ||
512 | } | 491 | } |
@@ -516,2 +495,9 @@ QPEDecoration::QPEDecoration( const QString &plugin ) | |||
516 | { | 495 | { |
496 | init ( plugin ); | ||
497 | } | ||
498 | |||
499 | void QPEDecoration::init ( const QString &plugin ) | ||
500 | { | ||
501 | libname = plugin; | ||
502 | |||
517 | if ( wdlib ) { | 503 | if ( wdlib ) { |
@@ -524,2 +510,3 @@ QPEDecoration::QPEDecoration( const QString &plugin ) | |||
524 | } | 510 | } |
511 | |||
525 | WindowDecorationInterface *iface = 0; | 512 | WindowDecorationInterface *iface = 0; |
@@ -540,4 +527,10 @@ QPEDecoration::QPEDecoration( const QString &plugin ) | |||
540 | helpExists = QFile::exists( *it + "/" + helpFile ); | 527 | helpExists = QFile::exists( *it + "/" + helpFile ); |
541 | qDebug ( "Checking %s/%s for help: %d", (*it).latin1(), helpFile.latin1(),helpExists); } | 528 | //qDebug ( "Checking %s/%s for help: %d", (*it).latin1(), helpFile.latin1(),helpExists); |
529 | } | ||
542 | qpeManager = new QPEManager( this ); | 530 | qpeManager = new QPEManager( this ); |
531 | |||
532 | // Qtopia 1.5 compatibility | ||
533 | imageOk = *okImage ( 15 ); | ||
534 | imageClose = *closeImage ( 15 ); | ||
535 | imageHelp = *helpImage ( 15 ); | ||
543 | } | 536 | } |
diff --git a/library/qpedecoration_qws.h b/library/qpedecoration_qws.h index 691c6f6..6628ba2 100644 --- a/library/qpedecoration_qws.h +++ b/library/qpedecoration_qws.h | |||
@@ -65,2 +65,4 @@ private: | |||
65 | 65 | ||
66 | void init ( const QString & ); | ||
67 | |||
66 | protected: | 68 | protected: |