-rw-r--r-- | library/qpedecoration_qws.cpp | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/library/qpedecoration_qws.cpp b/library/qpedecoration_qws.cpp index 5e0c32a..933542d 100644 --- a/library/qpedecoration_qws.cpp +++ b/library/qpedecoration_qws.cpp | |||
@@ -188,20 +188,20 @@ bool QPEManager::eventFilter( QObject *o, QEvent *e ) | |||
188 | QString text; | 188 | QString text; |
189 | switch ( inRegion ) { | 189 | switch ( inRegion ) { |
190 | case QWSDecoration::Close: | 190 | case QWSDecoration::Close: |
191 | if ( ((HackWidget*)w)->needsOk() ) | 191 | if ( ((HackWidget*)w)->needsOk() ) |
192 | text = tr("Click to close this window, discarding changes."); | 192 | text = QObject::tr("Click to close this window, discarding changes."); |
193 | else | 193 | else |
194 | text = tr("Click to close this window."); | 194 | text = QObject::tr("Click to close this window."); |
195 | break; | 195 | break; |
196 | case QWSDecoration::Minimize: | 196 | case QWSDecoration::Minimize: |
197 | text = tr("Click to close this window and apply changes."); | 197 | text = QObject::tr("Click to close this window and apply changes."); |
198 | break; | 198 | break; |
199 | case QWSDecoration::Maximize: | 199 | case QWSDecoration::Maximize: |
200 | if ( w->isMaximized() ) | 200 | if ( w->isMaximized() ) |
201 | text = tr("Click to make this window moveable."); | 201 | text = QObject::tr("Click to make this window moveable."); |
202 | else | 202 | else |
203 | text = tr("Click to make this window use all available screen area."); | 203 | text = QObject::tr("Click to make this window use all available screen area."); |
204 | break; | 204 | break; |
205 | default: | 205 | default: |
206 | break; | 206 | break; |
207 | } | 207 | } |
@@ -509,10 +509,18 @@ void QPEDecoration::init ( const QString &plugin ) | |||
509 | delete wdiface; | 509 | delete wdiface; |
510 | } | 510 | } |
511 | 511 | ||
512 | WindowDecorationInterface *iface = 0; | 512 | WindowDecorationInterface *iface = 0; |
513 | QString path = QPEApplication::qpeDir() + "/plugins/decorations"; | 513 | QString path = QPEApplication::qpeDir() + "/plugins/decorations/"; |
514 | QLibrary *lib = new QLibrary( path + "/" + plugin ); | 514 | |
515 | if ( plugin.find( ".so" ) > 0 ) { | ||
516 | // full library name supplied | ||
517 | path += plugin; | ||
518 | } else { | ||
519 | path += "lib" + plugin.lower() + ".so"; // compatibility | ||
520 | } | ||
521 | |||
522 | QLibrary *lib = new QLibrary( path ); | ||
515 | if ( lib->queryInterface( IID_WindowDecoration, (QUnknownInterface**)&iface ) == QS_OK && iface ) { | 523 | if ( lib->queryInterface( IID_WindowDecoration, (QUnknownInterface**)&iface ) == QS_OK && iface ) { |
516 | wdiface = iface; | 524 | wdiface = iface; |
517 | wdlib = lib; | 525 | wdlib = lib; |
518 | } else { | 526 | } else { |
@@ -869,9 +877,9 @@ void QPEDecoration::help( QWidget *w ) | |||
869 | if ( helpExists ) { | 877 | if ( helpExists ) { |
870 | Global::execute( "helpbrowser", helpFile ); | 878 | Global::execute( "helpbrowser", helpFile ); |
871 | } else if ( w && w->testWFlags(Qt::WStyle_ContextHelp) ) { | 879 | } else if ( w && w->testWFlags(Qt::WStyle_ContextHelp) ) { |
872 | QWhatsThis::enterWhatsThisMode(); | 880 | QWhatsThis::enterWhatsThisMode(); |
873 | QWhatsThis::leaveWhatsThisMode( qApp->tr( | 881 | QWhatsThis::leaveWhatsThisMode( QObject::tr( |
874 | "<Qt>Comprehensive help is not available for this application, " | 882 | "<Qt>Comprehensive help is not available for this application, " |
875 | "however there is context-sensitive help.<p>To use context-sensitive help:<p>" | 883 | "however there is context-sensitive help.<p>To use context-sensitive help:<p>" |
876 | "<ol><li>click and hold the help button." | 884 | "<ol><li>click and hold the help button." |
877 | "<li>when the title bar shows <b>What's this...</b>, " | 885 | "<li>when the title bar shows <b>What's this...</b>, " |
@@ -882,9 +890,9 @@ void QPEDecoration::help( QWidget *w ) | |||
882 | void QPEDecoration::windowData( const QWidget *w, WindowDecorationInterface::WindowData &wd ) const | 890 | void QPEDecoration::windowData( const QWidget *w, WindowDecorationInterface::WindowData &wd ) const |
883 | { | 891 | { |
884 | wd.rect = w->rect(); | 892 | wd.rect = w->rect(); |
885 | if ( qpeManager->whatsThisWidget() == w ) | 893 | if ( qpeManager->whatsThisWidget() == w ) |
886 | wd.caption = qApp->tr("What's this..." ); | 894 | wd.caption = QObject::tr("What's this..." ); |
887 | else | 895 | else |
888 | wd.caption = w->caption(); | 896 | wd.caption = w->caption(); |
889 | wd.palette = qApp->palette(); | 897 | wd.palette = qApp->palette(); |
890 | wd.flags = 0; | 898 | wd.flags = 0; |