Merged branches from BRANCH_1_0

1 files changed, 21 insertions, 13 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
@@ -191,8 +191,8 @@ bool QPEManager::eventFilter( QObject *o, QEvent *e )
 			    if ( ((HackWidget*)w)->needsOk() )
-				text = tr("Click to close this window, discarding changes.");
+				text = QObject::tr("Click to close this window, discarding changes.");
 			    else
-				text = tr("Click to close this window.");
+				text = QObject::tr("Click to close this window.");
 			    break;
 			case QWSDecoration::Minimize:
-			    text = tr("Click to close this window and apply changes.");
+			    text = QObject::tr("Click to close this window and apply changes.");
 			    break;
@@ -200,5 +200,5 @@ bool QPEManager::eventFilter( QObject *o, QEvent *e )
 			    if ( w->isMaximized() )
-				text = tr("Click to make this window moveable.");
+				text = QObject::tr("Click to make this window moveable.");
 			    else
-				text = tr("Click to make this window use all available screen area.");
+				text = QObject::tr("Click to make this window use all available screen area.");
 			    break;
@@ -510,6 +510,14 @@ void QPEDecoration::init ( const QString &plugin )
     }
-        
+
     WindowDecorationInterface *iface = 0;
-    QString path = QPEApplication::qpeDir() + "/plugins/decorations";
-    QLibrary *lib = new QLibrary( path + "/" + plugin );
+    QString path = QPEApplication::qpeDir() + "/plugins/decorations/";
+
+    if ( plugin.find( ".so" ) > 0 ) {
+        // full library name supplied
+        path += plugin;
+    } else {
+        path += "lib" + plugin.lower() + ".so"; // compatibility
+    }
+
+    QLibrary *lib = new QLibrary( path );
     if ( lib->queryInterface( IID_WindowDecoration, (QUnknownInterface**)&iface ) == QS_OK && iface ) {
@@ -527,6 +535,6 @@ void QPEDecoration::init ( const QString &plugin )
 	helpExists = QFile::exists( *it + "/" + helpFile );
-    	//qDebug ( "Checking %s/%s for help: %d", (*it).latin1(), helpFile.latin1(),helpExists); 
+    	//qDebug ( "Checking %s/%s for help: %d", (*it).latin1(), helpFile.latin1(),helpExists);
     }
     qpeManager = new QPEManager( this );
-    
+
     // Qtopia 1.5 compatibility
@@ -534,3 +542,3 @@ void QPEDecoration::init ( const QString &plugin )
     imageClose = *closeImage ( 15 );
-    imageHelp  = *helpImage ( 15 ); 
+    imageHelp  = *helpImage ( 15 );
 }
@@ -872,3 +880,3 @@ void QPEDecoration::help( QWidget *w )
 	QWhatsThis::enterWhatsThisMode();
-	QWhatsThis::leaveWhatsThisMode( qApp->tr(
+	QWhatsThis::leaveWhatsThisMode( QObject::tr(
 	    "<Qt>Comprehensive help is not available for this application, "
@@ -885,3 +893,3 @@ void QPEDecoration::windowData( const QWidget *w, WindowDecorationInterface::Win
     if ( qpeManager->whatsThisWidget() == w )
-	wd.caption = qApp->tr("What's this..." );
+	wd.caption = QObject::tr("What's this..." );
     else