Fixed a translation bug regarding launcher applets, that got in when I

merged with Qtopia 1.6 (TT bug).
found by Héctor GarcíaÁlvarez <hector@disoft.es>, but I modified his patch,
since running the applet widget constructor *before* the QTranslator gets
installed seems like a bad idea.

2 files changed, 18 insertions, 16 deletions

diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp
index 917f4c1..7373ea8 100644
--- a/core/launcher/startmenu.cpp
+++ b/core/launcher/startmenu.cpp
@@ -283,102 +283,103 @@ void StartMenu::clearApplets()
 
     for ( QIntDictIterator<MenuApplet> it ( applets ); it. current ( ); ++it ) {
     	MenuApplet *applet = it. current ( );
     	if ( launchMenu ) {
     		launchMenu-> removeItem ( applet-> id );
     		delete applet-> popup;
     	}
     
         applet-> iface-> release();
         applet-> library-> unload();
         delete applet-> library;
     }
     applets.clear();
 }
 
 
 
 void StartMenu::loadApplets()
 {
     Config cfg( "StartMenu" );
     cfg.setGroup( "Applets" );
     
     // SafeMode causes too much problems, so we disable it for now --
     // maybe we should reenable it for OPIE 1.0 - sandman 26.09.02
     
     bool safe = false; //cfg.readBoolEntry("SafeMode",FALSE);
     if ( safe && !safety_tid )
         return;
     cfg.writeEntry("SafeMode",TRUE);
     cfg.write();
     QStringList exclude = cfg.readListEntry( "ExcludeApplets", ',' );
 
+    QString lang = getenv( "LANG" );
     QString path = QPEApplication::qpeDir() + "/plugins/applets";
     QDir dir( path, "lib*.so" );
     QStringList list = dir.entryList();
     QStringList::Iterator it;
     int napplets=0;
     MenuApplet* *xapplets = new MenuApplet*[list.count()];
     for ( it = list.begin(); it != list.end(); ++it ) {
         if ( exclude.find( *it ) != exclude.end() )
             continue;
         MenuAppletInterface *iface = 0;
         QLibrary *lib = new QLibrary( path + "/" + *it );
         if (( lib->queryInterface( IID_MenuApplet, (QUnknownInterface**)&iface ) == QS_OK ) && iface ) {
             MenuApplet *applet = new MenuApplet;
             xapplets[napplets++] = applet;
             applet->library = lib;
             applet->iface = iface;
+            
+            QTranslator *trans = new QTranslator(qApp);
+            QString type = (*it).left( (*it).find(".") );
+            QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";
+            if ( trans->load( tfn ))
+                qApp->installTranslator( trans );
+            else
+                delete trans;            
         } else {
             exclude += *it;
             delete lib;
         }
     }
     cfg.writeEntry( "ExcludeApplets", exclude, ',' );
     qsort(xapplets,napplets,sizeof(applets[0]),compareAppletPositions);
 
 	if ( sepId )
 		launchMenu-> removeItem ( sepId );
 	sepId = ( launchMenu-> count ( )) ? launchMenu-> insertSeparator ( ) : 0;
                
     while (napplets--) {
         MenuApplet *applet = xapplets[napplets];
-        QString lang = getenv( "LANG" );
-        QTranslator * trans = new QTranslator(qApp);
-        QString type = (*it).left( (*it).find(".") );
-        QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";
-        if ( trans->load( tfn ))
-            qApp->installTranslator( trans );
-        else
-            delete trans;
             
         applet-> popup = applet-> iface-> popup ( this );
         
         if ( applet-> popup )
 	    	applet-> id = launchMenu-> insertItem ( applet-> iface-> icon ( ), applet-> iface-> text ( ), applet-> popup );
 	    else 
 	    	applet-> id = launchMenu-> insertItem ( applet-> iface-> icon ( ), applet-> iface-> text ( ) );
         applets.insert ( applet-> id, new MenuApplet(*applet));
     }
     delete xapplets;
     
     if ( sepId && ( launchMenu-> idAt ( launchMenu-> count ( ) - 1 ) == sepId )) { // no applets
     	launchMenu-> removeItem ( sepId );
     	sepId = 0;
     }
 	if ( !launchMenu-> count ( )) // if we don't do this QPopupMenu will insert a dummy Separator, which won't go away later
 		sepId = launchMenu-> insertSeparator ( );
     
     if ( !safety_tid )
         safety_tid = startTimer(2000); // TT has 5000, but this is a PITA for a developer ;) (sandman)
 }
 
 void StartMenu::timerEvent(QTimerEvent* e)
 {
     if ( e->timerId() == safety_tid ) {
         Config cfg( "StartMenu" );
         cfg.setGroup( "Applets" );
         cfg.writeEntry( "SafeMode", FALSE );
         killTimer(safety_tid);
         safety_tid = 0;
     }
 }
diff --git a/core/launcher/systray.cpp b/core/launcher/systray.cpp
index 406c662..4859e48 100644
--- a/core/launcher/systray.cpp
+++ b/core/launcher/systray.cpp
@@ -62,91 +62,92 @@ void SysTray::clearApplets()
     hide();
 #ifndef SINGLE_APP
     QValueList<TaskbarApplet>::Iterator mit;
     for ( mit = appletList.begin(); mit != appletList.end(); ++mit ) {
 	(*mit).iface->release();
 	(*mit).library->unload();
 	delete (*mit).library;
     }
 #endif
     appletList.clear();
     if ( layout )
 	delete layout;
     layout = new QHBoxLayout( this, 0, 1 );
     layout->setAutoAdd(TRUE);
 }
 
 void SysTray::addApplets()
 {
 #ifndef SINGLE_APP
     Config cfg( "Taskbar" );
     cfg.setGroup( "Applets" );
     
     // SafeMode causes too much problems, so we disable it for now --
     // maybe we should reenable it for OPIE 1.0 - sandman 26.09.02
     
     bool safe = false; //cfg.readBoolEntry("SafeMode",FALSE);
     if ( safe && !safety_tid )
 	return;
     cfg.writeEntry("SafeMode",TRUE);
     cfg.write();
     QStringList exclude = cfg.readListEntry( "ExcludeApplets", ',' );
 
+    QString lang = getenv( "LANG" );
     QString path = QPEApplication::qpeDir() + "/plugins/applets";
     QDir dir( path, "lib*.so" );
     QStringList list = dir.entryList();
     QStringList::Iterator it;
     int napplets=0;
     TaskbarApplet* *applets = new TaskbarApplet*[list.count()];
     for ( it = list.begin(); it != list.end(); ++it ) {
 	if ( exclude.find( *it ) != exclude.end() )
 	    continue;
 	TaskbarAppletInterface *iface = 0;
 	QLibrary *lib = new QLibrary( path + "/" + *it );
 	if (( lib->queryInterface( IID_TaskbarApplet, (QUnknownInterface**)&iface ) == QS_OK ) && iface ) {
 	    TaskbarApplet *applet = new TaskbarApplet;
 	    applets[napplets++] = applet;
 	    applet->library = lib;
 	    applet->iface = iface;
+	    
+	    QTranslator *trans = new QTranslator(qApp);
+	    QString type = (*it).left( (*it).find(".") );
+	    QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";
+	    if ( trans->load( tfn ))
+		qApp->installTranslator( trans );
+	    else
+		delete trans;	    
 	} else {
 	    exclude += *it;
 	    delete lib;
 	}
     }
     cfg.writeEntry( "ExcludeApplets", exclude, ',' );
     qsort(applets,napplets,sizeof(applets[0]),compareAppletPositions);
     while (napplets--) {
 	TaskbarApplet *applet = applets[napplets];
 	applet->applet = applet->iface->applet( this );
 	appletList.append(*applet);
-	QString lang = getenv( "LANG" );
-	QTranslator * trans = new QTranslator(qApp);
-	QString type = (*it).left( (*it).find(".") );
-	QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";
-	if ( trans->load( tfn ))
-	    qApp->installTranslator( trans );
-	else
-	    delete trans;
     }
     delete applets;
 #else
     TaskbarApplet applet;
     applet.iface = new ClockAppletImpl();
     applet.applet = applet.iface->applet( this );
     appletList.append( a );
 #endif
     show();
 
     if ( !safety_tid )
 	safety_tid = startTimer(2000); // TT has 5000, but this is a PITA for a developer ;) (sandman)
 }
 
 void SysTray::timerEvent(QTimerEvent* e)
 {
     if ( e->timerId() == safety_tid ) {
 	Config cfg( "Taskbar" );
 	cfg.setGroup( "Applets" );
 	cfg.writeEntry( "SafeMode", FALSE );
 	killTimer(safety_tid);
 	safety_tid = 0;
     }
 }