# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1282113582 -10800 # Node ID 88ff81299c113c856e2ca2fae165f2c497542dbd # Parent 624e91e1e0299d38d45f0363132faf021bae82a3 Revision: 201031 Kit: 201033 diff -r 624e91e1e029 -r 88ff81299c11 ftuapplication/ftuapplication.pri --- a/ftuapplication/ftuapplication.pri Tue Jul 06 14:06:30 2010 +0300 +++ b/ftuapplication/ftuapplication.pri Wed Aug 18 09:39:42 2010 +0300 @@ -17,4 +17,4 @@ HEADERS += ./inc/*.h SOURCES += ./src/*.cpp -RESOURCES += ../translations/translations.qrc + diff -r 624e91e1e029 -r 88ff81299c11 ftuapplication/src/main.cpp --- a/ftuapplication/src/main.cpp Tue Jul 06 14:06:30 2010 +0300 +++ b/ftuapplication/src/main.cpp Wed Aug 18 09:39:42 2010 +0300 @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include @@ -37,31 +37,9 @@ HbApplication app(argc, argv); - QTranslator translator; - QString translation = "ftu_"; - if(argc > 1){ - translation.append(argv[1]); - } - else{ - // another option to load locale could be QLocale::system().language()) - translation.append(QLocale::system().name()); // this seems to be ftu_en_US in Windows and ftu_en_GB in WINSCW emulator and hardware - } - translator.load(translation, ":/translations" ); - app.installTranslator(&translator); - - QString exampleWizardsTranslation = "ftuexamplewizards_"; - if(argc > 1){ - exampleWizardsTranslation.append(argv[1]); - } - else{ - exampleWizardsTranslation.append(QLocale::system().name()); - } - QTranslator exampleWizardsTranslator; - - exampleWizardsTranslator.load(exampleWizardsTranslation, ":/translations" ); - app.installTranslator(&exampleWizardsTranslator); - + HbTranslator *translator = new HbTranslator("/resource/qt/translations/","firsttimesetup"); + FtuFirstTimeUse ftuFirstTimeUse; #ifdef ROM QDir::setCurrent("Z:/"); @@ -76,5 +54,6 @@ QDEBUG("FTU::FtuFirstTimeUse::main"); //Work around to make sure that ftu exits User::Exit(0); + delete translator; return ret; } diff -r 624e91e1e029 -r 88ff81299c11 stateproviders/ftustateprovider/ftustateprovider.pri --- a/stateproviders/ftustateprovider/ftustateprovider.pri Tue Jul 06 14:06:30 2010 +0300 +++ b/stateproviders/ftustateprovider/ftustateprovider.pri Wed Aug 18 09:39:42 2010 +0300 @@ -18,3 +18,5 @@ SOURCES += ./src/*.cpp RESOURCES += resources/resources.qrc + +DOCML += resources/ftustateprovider.docml diff -r 624e91e1e029 -r 88ff81299c11 stateproviders/ftustateprovider/inc/ftuwizardactivatedstate.h --- a/stateproviders/ftustateprovider/inc/ftuwizardactivatedstate.h Tue Jul 06 14:06:30 2010 +0300 +++ b/stateproviders/ftustateprovider/inc/ftuwizardactivatedstate.h Wed Aug 18 09:39:42 2010 +0300 @@ -37,6 +37,7 @@ class FtuContentService; class FtuWizard; class HbMenu; +class HbTranslator; /** @ingroup group_ftustateprovider * @brief The state handles wizard activation and interaction. @@ -200,6 +201,7 @@ */ QGraphicsWidget* mCurrentView; + HbTranslator *mTranslator; FTU_TEST_FRIEND_CLASS(FtuStateProviderTest) }; diff -r 624e91e1e029 -r 88ff81299c11 stateproviders/ftustateprovider/inc/ftuwizardmenustate.h --- a/stateproviders/ftustateprovider/inc/ftuwizardmenustate.h Tue Jul 06 14:06:30 2010 +0300 +++ b/stateproviders/ftustateprovider/inc/ftuwizardmenustate.h Wed Aug 18 09:39:42 2010 +0300 @@ -37,6 +37,7 @@ class HbAction; class FtuStateCenrepHandler; class HbMenu; +class HbTranslator; /** @ingroup group_ftustateprovider * @brief The state where wizard menu is shown @@ -144,7 +145,7 @@ FtuStateCenrepHandler* mCenrepHandler; QList mCompletedWizardList; - + HbTranslator *mTranslator; FTU_TEST_FRIEND_CLASS(FtuStateProviderTest) }; diff -r 624e91e1e029 -r 88ff81299c11 stateproviders/ftustateprovider/src/ftuwizardactivatedstate.cpp --- a/stateproviders/ftustateprovider/src/ftuwizardactivatedstate.cpp Tue Jul 06 14:06:30 2010 +0300 +++ b/stateproviders/ftustateprovider/src/ftuwizardactivatedstate.cpp Wed Aug 18 09:39:42 2010 +0300 @@ -36,6 +36,7 @@ #include #include #include +#include const char *FTUSTATEPROVIDER_DOCML2 = ":/xml/ftustateprovider.docml"; @@ -68,12 +69,13 @@ mWizardStackedWidget(NULL), mBackAction(NULL), mPreviousView(NULL), - mCurrentView(NULL) + mCurrentView(NULL), + mTranslator(NULL) { mMainWindow = hbInstance->allMainWindows().at(0); mDocumentLoader = new HbDocumentLoader(); mPluginView = new HbView(); - + mTranslator = new HbTranslator("/resource/qt/translations/","firsttimesetup"); bool ok = false; mDocumentLoader->load(FTUSTATEPROVIDER_DOCML2, &ok); QGraphicsWidget *widget = mDocumentLoader->findWidget(WIZARD_VIEW); @@ -82,7 +84,7 @@ mPluginView->setWidget(widget); mMainWindow->addView(mPluginView); - mPluginView->setTitle(qtTrId("txt_ftu_title_setup")); + mPluginView->setTitle(hbTrId("txt_ftu_title_setup")); mPluginTitleLabel = qobject_cast(mDocumentLoader->findWidget(WIZARD_INFOTEXT_LABEL)); @@ -106,6 +108,10 @@ { delete mBackAction; } + if(mTranslator){ + delete mTranslator; + mTranslator = NULL; + } } // --------------------------------------------------------------------------- diff -r 624e91e1e029 -r 88ff81299c11 stateproviders/ftustateprovider/src/ftuwizardmenustate.cpp --- a/stateproviders/ftustateprovider/src/ftuwizardmenustate.cpp Tue Jul 06 14:06:30 2010 +0300 +++ b/stateproviders/ftustateprovider/src/ftuwizardmenustate.cpp Wed Aug 18 09:39:42 2010 +0300 @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -55,11 +56,12 @@ mInfoText(NULL), mListView(NULL), mDocumentLoader(NULL), - mModel(NULL) + mModel(NULL), + mTranslator(NULL) { mMainWindow = hbInstance->allMainWindows().at(0); mModel = new QStandardItemModel(this); - + mTranslator = new HbTranslator("/resource/qt/translations/","firsttimesetup"); mDocumentLoader = new HbDocumentLoader(); bool ok = false; mDocumentLoader->load(FTUSTATEPROVIDER_DOCML, &ok); @@ -67,7 +69,7 @@ Q_ASSERT_X(ok && (widget != 0), "ftustateprovider", "invalid DocML file"); mTocView = qobject_cast(widget); - mTocView->setTitle(qtTrId("txt_long_caption_FTU_widget")); + mTocView->setTitle(hbTrId("txt_long_caption_FTU_widget")); mMainWindow->addView(mTocView); // Set as initial view. @@ -92,6 +94,10 @@ } delete mDocumentLoader; delete mCenrepHandler; + if(mTranslator){ + delete mTranslator; + mTranslator = NULL; + } } // --------------------------------------------------------------------------- @@ -232,7 +238,7 @@ void FtuWizardMenuState::createInfoText() { mInfoText = qobject_cast(mDocumentLoader->findWidget(TOC_INFOTEXT_LABEL)); - mInfoText->setPlainText(qtTrId("txt_ftu_subhead_select_setting_you_want_to_edit")); + mInfoText->setPlainText(hbTrId("txt_ftu_subhead_select_setting_you_want_to_edit")); } // --------------------------------------------------------------------------- @@ -278,14 +284,14 @@ QList iconList; HbIcon icon (wizards[index]->wizardSettings().mTocDefaultIcon.filePath()); iconList.append(icon); - HbIcon rightIcon(QString(qtTrId("qtg_small_tick"))); + HbIcon rightIcon(QString("qtg_small_tick")); if(progress < progressCompelete) { QString progressStr; QString progressNumber; progressNumber.setNum(progress); - progressStr = qtTrId("txt_ftu_list_progress_status").arg(progressNumber); + progressStr = hbTrId("txt_ftu_list_progress_status").arg(progressNumber); data << progressStr; } else