--- a/deviceupdatesui/deviceupdates/src/main.cpp Sat May 01 10:55:27 2010 +0530
+++ b/deviceupdatesui/deviceupdates/src/main.cpp Tue Jul 13 03:42:03 2010 +0530
@@ -23,53 +23,43 @@
int main(int argc, char *argv[])
{
+ HbApplication app(argc, argv);
+ //HbView* newview= new HbView();
- HbApplication app(argc, argv);
- //HbView* newview= new HbView();
-
- QTranslator *translator = new QTranslator();
+ QTranslator *translator = new QTranslator();
QString lang = QLocale::system().name();
qDebug("OMADM Loading qm file");
qDebug()<<lang;
QString path = "z:/resource/qt/translations/";
- // bool fine = translator->load("deviceupdates_" + lang, path);/*finally required once localisation available*/
- bool fine = translator->load("deviceupdates_en.qm", path);
- if(fine)
- qApp->installTranslator(translator);
- else
- qDebug("omadm translator loading failed");
- QTranslator *commontranslator = new QTranslator();
+ bool fine = translator->load("deviceupdates_" + lang, path);/*finally required once localisation available*/
+ //bool fine = translator->load("deviceupdates_en.qm", path);
+ if(fine)
+ qApp->installTranslator(translator);
+ else
+ qDebug("omadm translator loading failed");
- fine = commontranslator->load("common_" + lang + ".qm", path);/*finally required once localisation available*/
- //fine = commontranslator->load("common_en" , path);
- if(fine)
- qApp->installTranslator(translator);
- else
- qDebug("omadm common translator loading failed");
+ QTranslator *commontranslator = new QTranslator();
- app.setApplicationName(hbTrId("txt_device_update_subhead_device_updates"));
-
- CRepository *cenrep = CRepository::NewL(KUidSmlSyncApp);
- TInt val(0);
- if(cenrep)
- {
- cenrep->Get(KNsmlDmUILaunch, val);
- {
- if(val==1)
- {
- QTranslator *tempTranslator = new QTranslator();
- QString lang = QLocale::system().name();
- tempTranslator->load("control_panel_" + lang, path);
- qApp->installTranslator(tempTranslator);
- app.setApplicationName(hbTrId("txt_applib_list_control_panel"));
- val=0;
- cenrep->Set(KNsmlDmUILaunch, val);
- delete cenrep;
- cenrep = NULL;
- }
- }
- }
+ fine = commontranslator->load("common_" + lang + ".qm", path);/*finally required once localisation available*/
+ //fine = commontranslator->load("common_en" , path);
+ if(fine)
+ qApp->installTranslator(translator);
+ else
+ qDebug("omadm common translator loading failed");
+
+ if( argc == 2) // Launch via Control Panel
+ {
+ QTranslator *cptranslator = new QTranslator();
+ cptranslator->load("control_panel_" + lang, path);
+ qApp->installTranslator(cptranslator);
+ app.setApplicationName(hbTrId("txt_applib_list_control_panel"));
+ }
+ else
+ {
+ app.setApplicationName(hbTrId("txt_device_update_subhead_device_updates"));
+ }
+
HbMainWindow window;
DMFotaView* view = new DMFotaView(&window);