# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1284701393 -10800 # Node ID af30d8015c5864c064e18684e0d5b282b4bdb0f9 # Parent 68cdadcf169e86e82b1ddb4dd60c568e08b98acc Revision: 201035 Kit: 201037 diff -r 68cdadcf169e -r af30d8015c58 harvesterplugins/contacts/src/ccontactsplugin.cpp --- a/harvesterplugins/contacts/src/ccontactsplugin.cpp Thu Sep 02 20:27:46 2010 +0300 +++ b/harvesterplugins/contacts/src/ccontactsplugin.cpp Fri Sep 17 08:29:53 2010 +0300 @@ -436,7 +436,7 @@ if(iHLDisplayExcerpt) index_item->AddHLDisplayFieldL(*iHLDisplayExcerpt); #endif - AddFieldToDocumentAndExcerptL( *index_item, fieldSet, KUidContactFieldPhoneNumber, KContactsPhoneNumberField ); + AddFieldToDocumentAndExcerptL( *index_item, fieldSet, KUidContactFieldPhoneNumber, KContactsPhoneNumberField, CDocumentField::EStoreYes | CDocumentField::EIndexTokenized | CDocumentField::EIndexPhoneNumber ); AddFieldToDocumentAndExcerptL( *index_item, fieldSet, KUidContactFieldEMail, KContactsEMailField, CDocumentField::EStoreYes | CDocumentField::EIndexTokenized | CDocumentField::EIndexFreeText ); AddFieldToDocumentAndExcerptL( *index_item, fieldSet, KUidContactFieldSIPID, KContactsSIPIDField ); AddFieldToDocumentAndExcerptL( *index_item, fieldSet, KUidContactFieldCompanyName, KContactsCompanyNameField, CDocumentField::EStoreYes | CDocumentField::EIndexTokenized | CDocumentField::EIndexFreeText ); diff -r 68cdadcf169e -r af30d8015c58 harvesterplugins/inc/s60performance.h --- a/harvesterplugins/inc/s60performance.h Thu Sep 02 20:27:46 2010 +0300 +++ b/harvesterplugins/inc/s60performance.h Fri Sep 17 08:29:53 2010 +0300 @@ -17,4 +17,4 @@ //MACRO __PERFORMANCE_DATA // For enabling Highlighter -//MACRO USE_HIGHLIGHTER +MACRO USE_HIGHLIGHTER diff -r 68cdadcf169e -r af30d8015c58 package_definition.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_definition.xml Fri Sep 17 08:29:53 2010 +0300 @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 68cdadcf169e -r af30d8015c58 package_map.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_map.xml Fri Sep 17 08:29:53 2010 +0300 @@ -0,0 +1,1 @@ + diff -r 68cdadcf169e -r af30d8015c58 rom/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rom/bld.inf Fri Sep 17 08:29:53 2010 +0300 @@ -0,0 +1,34 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Build information file +* +*/ + + +#include + +PRJ_PLATFORMS + DEFAULT + +PRJ_EXPORTS +cpix_app.iby CORE_APP_LAYER_IBY_EXPORT_PATH(CPix_App.iby) + +../cenrep/20029ac7.cre /epoc32/winscw/c/private/10202be9/20029ac7.cre +../cenrep/20029ac7.cre /epoc32/data/z/private/10202be9/20029ac7.cre +../sis/cpixsearchapp_stub.sis /epoc32/data/z/system/install/cpixsearchapp_stub.sis + +PRJ_TESTMMPFILES + +PRJ_TESTEXPORTS +//@ToDO IDy creation diff -r 68cdadcf169e -r af30d8015c58 searchui/Searchapplication/src/main.cpp --- a/searchui/Searchapplication/src/main.cpp Thu Sep 02 20:27:46 2010 +0300 +++ b/searchui/Searchapplication/src/main.cpp Fri Sep 17 08:29:53 2010 +0300 @@ -29,37 +29,36 @@ // int main(int argc, char *argv[]) { - SEARCH_FUNC_ENTRY("SEARCH::Search::main"); - PERF_APP_LAUNCH_END("SearchApplication Main Called"); - HbApplication app(argc, argv); + SEARCH_FUNC_ENTRY("SEARCH::Search::main"); PERF_APP_LAUNCH_END("SearchApplication Main Called"); + SearchApplication search(argc, argv); QTranslator translator; QString lang = QLocale::system().name(); QString path = "Z:/resource/qt/translations/"; translator.load("search_" + lang, path); - app.installTranslator(&translator); + search.installTranslator(&translator); QTranslator commonTranslator; commonTranslator.load("common_" + lang, path); - app.installTranslator(&commonTranslator); + search.installTranslator(&commonTranslator); QTranslator musicTranslator; musicTranslator.load("musicplayer_" + lang, path); - app.installTranslator(&musicTranslator); + search.installTranslator(&musicTranslator); QTranslator contactsTranslator; contactsTranslator.load("contacts_" + lang, path); - app.installTranslator(&contactsTranslator); + search.installTranslator(&contactsTranslator); QTranslator calenderTranslator; calenderTranslator.load("calendar_" + lang, path); - app.installTranslator(&calenderTranslator); + search.installTranslator(&calenderTranslator); QTranslator notesTranslator; notesTranslator.load("notes_" + lang, path); - app.installTranslator(¬esTranslator); + search.installTranslator(¬esTranslator); PERF_APP_LAUNCH_END("Search Component Cunstructions starts"); - SearchApplication search; + PERF_APP_LAUNCH_END("Search Component Cunstructions Ends"); #ifdef ROM QDir::setCurrent("Z:/"); @@ -67,12 +66,9 @@ QDir::setCurrent("C:/"); SEARCHDEBUG("main() - SearchApplication's current dir set to C:/"); #endif //ROM - QObject::connect(&app, SIGNAL(aboutToQuit()), &search, SLOT(stop())); - QObject::connect(&search, SIGNAL(exit()), &app, SLOT(quit()), - Qt::QueuedConnection); search.start(); PERF_APP_LAUNCH_END("SearchApplication Ends, Main Event Loop"); - int ret = app.exec(); + int ret = search.exec(); SEARCH_FUNC_EXIT("SEARCH::Search::main"); return ret; } diff -r 68cdadcf169e -r af30d8015c58 searchui/indevicehandler/tsrc/t_indevicehandler/src/t_indevicehandler.cpp --- a/searchui/indevicehandler/tsrc/t_indevicehandler/src/t_indevicehandler.cpp Thu Sep 02 20:27:46 2010 +0300 +++ b/searchui/indevicehandler/tsrc/t_indevicehandler/src/t_indevicehandler.cpp Fri Sep 17 08:29:53 2010 +0300 @@ -2,6 +2,8 @@ #include "indevicehandler.h" #include #include +#include +#include SearchInDeviceHandlerTest::SearchInDeviceHandlerTest() { } @@ -136,23 +138,10 @@ //Will be corrected in later (estimate 4.6.0) Qt release for Symbian. int main(int argc, char *argv[]) { - QCoreApplication app(argc, argv); -#ifdef __WINSCW__ - char *new_argv[3]; - QString str = "C:\\data\\" + QFileInfo( - QCoreApplication::applicationFilePath()).baseName() + ".log"; - QByteArray bytes = str.toAscii(); - char arg1[] = "-o"; - new_argv[0] = argv[0]; - new_argv[1] = arg1; - new_argv[2] = bytes.data(); - SearchInDeviceHandlerTest tc; - return QTest::qExec(&tc, 3, new_argv); -#else - SearchInDeviceHandlerTest tc; - return QTest::qExec(&tc, argc, argv); -#endif - + HbApplication app(argc, argv); + SearchInDeviceHandlerTest tc; + int ret = QTest::qExec(&tc,argc, argv); + return ret; } #else //Q_OS_SYMBIAN QTEST_MAIN(SearchInDeviceHandlerTest) diff -r 68cdadcf169e -r af30d8015c58 searchui/indevicehandler/tsrc/t_indevicehandler/t_indevicehandler.pro --- a/searchui/indevicehandler/tsrc/t_indevicehandler/t_indevicehandler.pro Thu Sep 02 20:27:46 2010 +0300 +++ b/searchui/indevicehandler/tsrc/t_indevicehandler/t_indevicehandler.pro Fri Sep 17 08:29:53 2010 +0300 @@ -13,7 +13,7 @@ # # Description: Search stateprovider unit test project file # - +QT += testlib TEMPLATE = app diff -r 68cdadcf169e -r af30d8015c58 searchui/runtimeproviders/searchruntimeprovider/inc/searchruntime.h --- a/searchui/runtimeproviders/searchruntimeprovider/inc/searchruntime.h Thu Sep 02 20:27:46 2010 +0300 +++ b/searchui/runtimeproviders/searchruntimeprovider/inc/searchruntime.h Fri Sep 17 08:29:53 2010 +0300 @@ -78,6 +78,8 @@ * @since S60 ?S60_version. */ void handleStateMachineStopped(); + + void sendMattiEvent(); signals: @@ -85,6 +87,8 @@ * Emission of this signal initiates a transition to the final state. */ void stopStateMachine(); + + void sentMattiEventSignal(); private: diff -r 68cdadcf169e -r af30d8015c58 searchui/runtimeproviders/searchruntimeprovider/src/searchruntime.cpp --- a/searchui/runtimeproviders/searchruntimeprovider/src/searchruntime.cpp Thu Sep 02 20:27:46 2010 +0300 +++ b/searchui/runtimeproviders/searchruntimeprovider/src/searchruntime.cpp Fri Sep 17 08:29:53 2010 +0300 @@ -92,6 +92,7 @@ QState* wizardProgressiveState = stateProvider.createState( wizardProgressiveStateUri); + connect(wizardProgressiveState,SIGNAL(applicationReady()),this,SLOT(sendMattiEvent())); // set state specific data wizardProgressiveState->setParent(searchRootState); wizardProgressiveState->setObjectName(wizardProgressiveStateUri); @@ -103,6 +104,7 @@ QState* wizardOnlineState = stateProvider.createState( wizardOnlineStateUri); + connect(wizardOnlineState,SIGNAL(applicationReady()),this,SLOT(sendMattiEvent())); wizardOnlineState->setParent(searchRootState); wizardOnlineState->setObjectName(wizardOnlineStateUri); @@ -174,3 +176,7 @@ connect(this, SIGNAL(stopped()), SLOT(handleStateMachineStopped())); connect(this, SIGNAL(finished()), SLOT(handleStateMachineStopped())); } +void SearchRuntime::sendMattiEvent() + { + emit sentMattiEventSignal(); + } diff -r 68cdadcf169e -r af30d8015c58 searchui/searchapplication/inc/searchapplication.h --- a/searchui/searchapplication/inc/searchapplication.h Thu Sep 02 20:27:46 2010 +0300 +++ b/searchui/searchapplication/inc/searchapplication.h Fri Sep 17 08:29:53 2010 +0300 @@ -21,6 +21,7 @@ #include "search_global.h" #include +#include class QStateMachine; @@ -34,7 +35,7 @@ * @lib ?library * @since S60 ?S60_version */ -class SearchApplication : public QObject +class SearchApplication : public HbApplication { Q_OBJECT @@ -45,7 +46,7 @@ * @since S60 ?S60_version. * @param aParent Parent object. */ - SearchApplication(QObject* aParent = 0); + SearchApplication(int argc, char *argv[]); /** * Destructor. @@ -64,6 +65,8 @@ * @since S60 ?S60_version. */ void exit(); + + void applicationReady(); public slots: @@ -98,6 +101,8 @@ * @since S60 ?S60_version. */ void handleRuntimeFaulted(); + + void sentMattiEventSlot(); private: diff -r 68cdadcf169e -r af30d8015c58 searchui/searchapplication/src/searchapplication.cpp --- a/searchui/searchapplication/src/searchapplication.cpp Thu Sep 02 20:27:46 2010 +0300 +++ b/searchui/searchapplication/src/searchapplication.cpp Fri Sep 17 08:29:53 2010 +0300 @@ -19,26 +19,16 @@ #include #include #include +#include // --------------------------------------------------------------------------- // SearchApplication::SearchApplication // --------------------------------------------------------------------------- // -SearchApplication::SearchApplication(QObject* aParent) : - QObject(aParent), mRuntime(NULL) +SearchApplication::SearchApplication(int argc, char *argv[]) : + HbApplication(argc, argv), mRuntime(NULL) { - SEARCH_FUNC_ENTRY("SEARCH::SearchApplication::SearchApplication"); - - SearchRuntimeProvider *interface = new SearchRuntimeProvider(); - mRuntime = interface->createPlugin(); - if (mRuntime) - { - mRuntime->setParent(this); - connect(mRuntime, SIGNAL(started()),this, SLOT(handleRuntimeStarted())); - connect(mRuntime, SIGNAL(stopped()),this, SLOT(handleRuntimeStopped())); - connect(mRuntime, SIGNAL(faulted()),this, SLOT(handleRuntimeFaulted())); - } - SEARCH_FUNC_EXIT("SEARCH::SearchApplication::SearchApplication"); + SEARCH_FUNC_ENTRY("SEARCH::SearchApplication::SearchApplication"); SEARCH_FUNC_EXIT("SEARCH::SearchApplication::SearchApplication"); } // --------------------------------------------------------------------------- @@ -49,6 +39,10 @@ { if (mRuntime) { + mRuntime->stop(); + } + if (mRuntime) + { disconnect(mRuntime, SIGNAL(started()), this, SLOT(handleRuntimeStarted())); disconnect(mRuntime, SIGNAL(stopped()), this, @@ -59,7 +53,6 @@ delete mRuntime; } } - // --------------------------------------------------------------------------- // SearchApplication::start() // --------------------------------------------------------------------------- @@ -67,7 +60,20 @@ void SearchApplication::start() { SEARCH_FUNC_ENTRY("SEARCH::Search::start"); - + SearchRuntimeProvider *interface = new SearchRuntimeProvider(); + mRuntime = interface->createPlugin(); + if (mRuntime) + { + mRuntime->setParent(this); + connect(mRuntime, SIGNAL(started()), this, + SLOT(handleRuntimeStarted())); + connect(mRuntime, SIGNAL(stopped()), this, + SLOT(handleRuntimeStopped())); + connect(mRuntime, SIGNAL(faulted()), this, + SLOT(handleRuntimeFaulted())); + connect(mRuntime, SIGNAL(sentMattiEventSignal()), this, + SLOT(sentMattiEventSlot())); + } if (mRuntime) { mRuntime->start(); @@ -75,9 +81,7 @@ else { emit exit(); - } - - SEARCH_FUNC_EXIT("SEARCH::Search::start"); + } SEARCH_FUNC_EXIT("SEARCH::Search::start"); } // --------------------------------------------------------------------------- @@ -120,3 +124,8 @@ { emit exit(); } + +void SearchApplication::sentMattiEventSlot() + { + emit applicationReady(); + } diff -r 68cdadcf169e -r af30d8015c58 searchui/stateproviders/searchstateprovider/inc/searchuiloader.h --- a/searchui/stateproviders/searchstateprovider/inc/searchuiloader.h Thu Sep 02 20:27:46 2010 +0300 +++ b/searchui/stateproviders/searchstateprovider/inc/searchuiloader.h Fri Sep 17 08:29:53 2010 +0300 @@ -27,6 +27,7 @@ class HbSearchPanel; class TsTaskSettings; class SearchMainWindow; +class SearchHbApplication; class HbShrinkingVkbHost; SEARCH_CLASS( SearchStateProviderTest) @@ -110,7 +111,7 @@ HbSearchPanel* SearchPanel() { return mSearchPanel; - } + } private: /** * Constructor. @@ -221,4 +222,5 @@ */ void bringvkb(); }; + #endif //SEARCH_CONTROLLER_H diff -r 68cdadcf169e -r af30d8015c58 searchui/stateproviders/searchstateprovider/src/searchonlinestate.cpp --- a/searchui/stateproviders/searchstateprovider/src/searchonlinestate.cpp Thu Sep 02 20:27:46 2010 +0300 +++ b/searchui/stateproviders/searchstateprovider/src/searchonlinestate.cpp Fri Sep 17 08:29:53 2010 +0300 @@ -253,6 +253,6 @@ startOnlineSearch(searchKey); } } - }//PERF_APP_LAUNCH_END("SearchAppplication View is ready"); + } emit applicationReady(); } diff -r 68cdadcf169e -r af30d8015c58 searchui/stateproviders/searchstateprovider/src/searchprogressivestate.cpp --- a/searchui/stateproviders/searchstateprovider/src/searchprogressivestate.cpp Thu Sep 02 20:27:46 2010 +0300 +++ b/searchui/stateproviders/searchstateprovider/src/searchprogressivestate.cpp Fri Sep 17 08:29:53 2010 +0300 @@ -54,6 +54,7 @@ #include #include #include +#include #include #include QTM_USE_NAMESPACE @@ -62,6 +63,8 @@ const int totalcategories_activityreasonreason = 13; const int intial_iteration = 3; const int batch_iteration = 20; +#define SEARCHAPPUID "2002C377" + // --------------------------------------------------------------------------- // SearchProgressiveState::SearchProgressiveState // --------------------------------------------------------------------------- @@ -186,10 +189,8 @@ // SearchProgressiveState::onEntry // --------------------------------------------------------------------------- void SearchProgressiveState::onEntry(QEvent *event) - { - // WMS_LOG << "::onEntry"; + { QState::onEntry(event); - mStateStatus = true;// used for conditional execution for the slots that are connected as transitions if (mSearchPanel) { @@ -399,8 +400,7 @@ if (item->data(Qt::UserRole + 1).toString().contains("contact")) { PERF_RESULT_ITEM_FOR_LAUNCHING("contact") - mRequest = mAiwMgr->create("com.nokia.symbian.IContactsView", - "openContactCard(int)", true); + mRequest = mAiwMgr->create(XQI_CONTACTS_VIEW,XQOP_CONTACTS_VIEW_CONTACT_CARD, true); int uid = (item->data(Qt::UserRole)).toInt(&t); args << uid; @@ -469,9 +469,7 @@ else if (item->data(Qt::UserRole + 1).toString().contains("msg email")) { - mRequest = mAiwMgr->create("nmail", - "com.nokia.symbian.IEmailMessageView", - "viewMessage(QVariant,QVariant,QVariant)", true); + mRequest = mAiwMgr->create(XQI_EMAIL_MESSAGE_VIEW,XQOP_EMAIL_MESSAGE_VIEW, true); args << item->data(Qt::UserRole + 2).toULongLong(&t) << item->data( Qt::UserRole + 3).toULongLong(&t) @@ -480,8 +478,7 @@ else if (item->data(Qt::UserRole + 1).toString().contains("msg")) { PERF_RESULT_ITEM_FOR_LAUNCHING("msg") - mRequest = mAiwMgr->create("messaging", - "com.nokia.symbian.IMessageView", "view(int)", true); + mRequest = mAiwMgr->create(XQI_MESSAGE_VIEW, XQOP_MESSAGE_VIEW, true); int uid = (item->data(Qt::UserRole)).toInt(&t); args << uid; @@ -1097,7 +1094,11 @@ // SearchProgressiveState::LaunchApplicationL // --------------------------------------------------------------------------- void SearchProgressiveState::LaunchApplicationL(const QString aUid) - { + { + if(aUid.contains(SEARCHAPPUID,Qt::CaseInsensitive)) + { + return; + } QServiceManager serviceManager; QObject* mActivityManager = serviceManager.loadInterface( "com.nokia.qt.activities.ActivityManager"); @@ -1190,23 +1191,6 @@ icon = HbIcon("qtg_large_application"); mIconArray.append(icon); } - /*QList appUid; - appUid.append(TUid::Uid(0x20022EF9));//contact - appUid.append(TUid::Uid(0x10207C62));//audio - appUid.append(TUid::Uid(0x200211FE));//video - appUid.append(TUid::Uid(0x20000A14));//image - appUid.append(TUid::Uid(0x2001FE79));//msg - appUid.append(TUid::Uid(0x200255BA));//email - appUid.append(TUid::Uid(0x10005901));//calender - appUid.append(TUid::Uid(0x20029F80));//notes - //appUid.Append(TUid::Uid(0x20022F35));//application - appUid.append(TUid::Uid(0x10008D39));//bookmark - appUid.append(TUid::Uid(0x2002BCC0));//files - - for (int i = 0; i < appUid.count(); i++) - { - TRAP_IGNORE(mIconArray.append(getAppIconFromAppIdL(appUid.at(i)))); - }*/ } // --------------------------------------------------------------------------- // SearchProgressiveState::activityRequested diff -r 68cdadcf169e -r af30d8015c58 searchui/stateproviders/searchstateprovider/src/searchsettingsstate.cpp --- a/searchui/stateproviders/searchstateprovider/src/searchsettingsstate.cpp Thu Sep 02 20:27:46 2010 +0300 +++ b/searchui/stateproviders/searchstateprovider/src/searchsettingsstate.cpp Fri Sep 17 08:29:53 2010 +0300 @@ -11,12 +11,12 @@ * * Contributors: * - * Description: Implements the wizard activation and interactions. + * Description: Search Setting state. * */ #include "searchsettingsstate.h" - +#include "settingswidget.h" #include #include #include @@ -29,8 +29,6 @@ #include #include #include -#include"settingswidget.h" - // --------------------------------------------------------------------------- // SearchSettingsState::SearchSettingsState // --------------------------------------------------------------------------- @@ -46,10 +44,9 @@ connect(mWidget, SIGNAL(selectedItemCategory(int, bool)), this, SLOT(getItemCategory(int, bool))); - + connect(mWidget, SIGNAL(ISProvidersIcon(HbIcon, int)), this, - SLOT(slotISProvidersIcon(HbIcon, int))); - + SLOT(slotISProvidersIcon(HbIcon, int))); } // --------------------------------------------------------------------------- // SearchSettingsState::~SearchSettingsState @@ -59,7 +56,6 @@ { delete mDocumentLoader; delete mWidget; - } // --------------------------------------------------------------------------- // SearchSettingsState::slotISProvidersIcon @@ -67,9 +63,8 @@ // void SearchSettingsState::slotISProvidersIcon(HbIcon icon, int id) { - emit publishISProviderIcon(id,icon); + emit publishISProviderIcon(id, icon); } - // --------------------------------------------------------------------------- // SearchSettingsState::getItemCategory // --------------------------------------------------------------------------- @@ -84,7 +79,6 @@ // void SearchSettingsState::onEntry(QEvent *event) { - qDebug() << "search:SearchSettingsState::onEntry"; QState::onEntry(event); emit settingslaunched(); if (minitialCount) @@ -109,7 +103,6 @@ void SearchSettingsState::onExit(QEvent *event) { QState::onExit(event); - } // --------------------------------------------------------------------------- // SearchSettingsState::handleBackEvent diff -r 68cdadcf169e -r af30d8015c58 searchui/stateproviders/searchstateprovider/src/searchstateprovider.cpp --- a/searchui/stateproviders/searchstateprovider/src/searchstateprovider.cpp Thu Sep 02 20:27:46 2010 +0300 +++ b/searchui/stateproviders/searchstateprovider/src/searchstateprovider.cpp Fri Sep 17 08:29:53 2010 +0300 @@ -24,7 +24,6 @@ #include #include - // states const char initStateFileUri[] = "search.nokia.com/state/initstate"; @@ -49,7 +48,6 @@ // QState* SearchStateProvider::createState(const QString& uri) { - if (uri == wizardProgressiveStateUri) { return new SearchProgressiveState(); @@ -63,10 +61,8 @@ return new SearchInitState(); } else if (uri == wizardOnlineStateUri) - { - return new SearchOnlineState(); - } - - qDebug() << "SEARCH: No state found for mUri: " << uri; + { + return new SearchOnlineState(); + } return NULL; } diff -r 68cdadcf169e -r af30d8015c58 searchui/stateproviders/searchstateprovider/src/searchuiloader.cpp --- a/searchui/stateproviders/searchstateprovider/src/searchuiloader.cpp Thu Sep 02 20:27:46 2010 +0300 +++ b/searchui/stateproviders/searchstateprovider/src/searchuiloader.cpp Fri Sep 17 08:29:53 2010 +0300 @@ -109,6 +109,7 @@ mVirtualKeyboard = new HbShrinkingVkbHost(mView); mBringtoForground = true; + } // --------------------------------------------------------------------------- // SearchUiLoader::~SearchUiLoader @@ -153,6 +154,7 @@ } } } + // --------------------------------------------------------------------------- // SearchMainWindow::slotViewReady // --------------------------------------------------------------------------- diff -r 68cdadcf169e -r af30d8015c58 searchui/stateproviders/searchstateprovider/src/settingswidget.cpp --- a/searchui/stateproviders/searchstateprovider/src/settingswidget.cpp Thu Sep 02 20:27:46 2010 +0300 +++ b/searchui/stateproviders/searchstateprovider/src/settingswidget.cpp Fri Sep 17 08:29:53 2010 +0300 @@ -212,8 +212,7 @@ if (i.key() == mSelectedProvider) selectedindex = Iterator; Iterator++; - internetCategoryList.append(i.value()); - qDebug() << i.value(); + internetCategoryList.append(i.value()); } mModelItem->setContentWidgetData("items", internetCategoryList); diff -r 68cdadcf169e -r af30d8015c58 searchui/stateproviders/searchstateprovider/tsrc/t_searchstateprovider/inc/t_searchstateprovider.h --- a/searchui/stateproviders/searchstateprovider/tsrc/t_searchstateprovider/inc/t_searchstateprovider.h Thu Sep 02 20:27:46 2010 +0300 +++ b/searchui/stateproviders/searchstateprovider/tsrc/t_searchstateprovider/inc/t_searchstateprovider.h Fri Sep 17 08:29:53 2010 +0300 @@ -105,16 +105,7 @@ void testq_currentIndexChanged(); void selectedItemCategory(); - /** - * t_searchonlinestate.cpp - */ - void teststartOnlineSearch(); - void testonlinesetSettings(); - void testonlinecancelSearch(); - void testslotbackEventTriggered(); - void testslotIndeviceQuery(); - void testslotlaunchLink(); - void testslotviewReady(); + /** * t_searchstateprovider.cpp diff -r 68cdadcf169e -r af30d8015c58 searchui/stateproviders/searchstateprovider/tsrc/t_searchstateprovider/src/t_searchonlinestate.cpp --- a/searchui/stateproviders/searchstateprovider/tsrc/t_searchstateprovider/src/t_searchonlinestate.cpp Thu Sep 02 20:27:46 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,65 +0,0 @@ -#include "t_searchstateprovider.h" -#include "searchonlinestate.h" - -void SearchStateProviderTest::teststartOnlineSearch() - { - SearchOnlineState* onlinestate = new SearchOnlineState(); - QEvent *event = new QEvent(QEvent::None); - onlinestate->onEntry(event); - onlinestate->startOnlineSearch("query"); - delete onlinestate; - } -void SearchStateProviderTest::testonlinesetSettings() - { - SearchOnlineState* onlinestate = new SearchOnlineState(); - QEvent *event = new QEvent(QEvent::None); - onlinestate->onEntry(event); - onlinestate->mSearchQuery = "query"; - QSignalSpy spy(onlinestate, SIGNAL(onlineSearchQuery(QString))); - onlinestate->setSettings(); - QCOMPARE(spy.count(), 1); - QSignalSpy spy1(onlinestate, SIGNAL(switchOnlineToSettingsState())); - onlinestate->setSettings(); - QCOMPARE(spy1.count(), 1); - delete onlinestate; - } -void SearchStateProviderTest::testonlinecancelSearch() - { - SearchOnlineState* onlinestate = new SearchOnlineState(); - QEvent *event = new QEvent(QEvent::None); - onlinestate->onEntry(event); - onlinestate->cancelSearch(); - delete onlinestate; - } -void SearchStateProviderTest::testslotbackEventTriggered() - { - SearchOnlineState* onlinestate = new SearchOnlineState(); - QEvent *event = new QEvent(QEvent::None); - onlinestate->onEntry(event); - onlinestate->slotbackEventTriggered(); - delete onlinestate; - } -void SearchStateProviderTest::testslotIndeviceQuery() - { - SearchOnlineState* onlinestate = new SearchOnlineState(); - QEvent *event = new QEvent(QEvent::None); - onlinestate->onEntry(event); - onlinestate->slotIndeviceQuery("query"); - delete onlinestate; - } -void SearchStateProviderTest::testslotlaunchLink() - { - SearchOnlineState* onlinestate = new SearchOnlineState(); - QEvent *event = new QEvent(QEvent::None); - onlinestate->onEntry(event); - onlinestate->slotlaunchLink(1,"Query"); - delete onlinestate; - } -void SearchStateProviderTest::testslotviewReady() - { - SearchOnlineState* onlinestate = new SearchOnlineState(); - QEvent *event = new QEvent(QEvent::None); - onlinestate->onEntry(event); - onlinestate->slotviewReady(); - delete onlinestate; - } diff -r 68cdadcf169e -r af30d8015c58 searchui/stateproviders/searchstateprovider/tsrc/t_searchstateprovider/src/t_searchstateprovider.cpp --- a/searchui/stateproviders/searchstateprovider/tsrc/t_searchstateprovider/src/t_searchstateprovider.cpp Thu Sep 02 20:27:46 2010 +0300 +++ b/searchui/stateproviders/searchstateprovider/tsrc/t_searchstateprovider/src/t_searchstateprovider.cpp Fri Sep 17 08:29:53 2010 +0300 @@ -27,6 +27,8 @@ #include #include #include +#include +#include // --------------------------------------------------------------------------- // --------------------------------------------------------------------------- @@ -177,22 +179,11 @@ //Will be corrected in later (estimate 4.6.0) Qt release for Symbian. int main(int argc, char *argv[]) { - QCoreApplication app(argc, argv); -#ifdef __WINSCW__ - char *new_argv[3]; - QString str = "C:\\data\\" + QFileInfo( - QCoreApplication::applicationFilePath()).baseName() + ".log"; - QByteArray bytes = str.toAscii(); - char arg1[] = "-o"; - new_argv[0] = argv[0]; - new_argv[1] = arg1; - new_argv[2] = bytes.data(); + HbApplication app(argc, argv); SearchStateProviderTest tc; - return QTest::qExec(&tc, 3, new_argv); -#else - SearchStateProviderTest tc; - return QTest::qExec(&tc, argc, argv); -#endif + + int ret = QTest::qExec(&tc, argc, argv); + return ret; } #else //Q_OS_SYMBIAN QTEST_MAIN(SearchStateProviderTest) diff -r 68cdadcf169e -r af30d8015c58 searchui/stateproviders/searchstateprovider/tsrc/t_searchstateprovider/src/t_settingswidget.cpp --- a/searchui/stateproviders/searchstateprovider/tsrc/t_searchstateprovider/src/t_settingswidget.cpp Thu Sep 02 20:27:46 2010 +0300 +++ b/searchui/stateproviders/searchstateprovider/tsrc/t_searchstateprovider/src/t_settingswidget.cpp Fri Sep 17 08:29:53 2010 +0300 @@ -9,6 +9,7 @@ #include #include #include +#include // --------------------------------------------------------------------------- // --------------------------------------------------------------------------- // @@ -31,6 +32,13 @@ settingswizard->mCategoryDbMapping.insert("Contacts", true); settingswizard->mCategoryDbMapping.insert("Messages", true); + HbAction * action = new HbAction(); + //connect(action, SIGNAL(triggered()), this, SLOT(checkBoxOkEvent())); + settingswizard->mActions.append(action); + + action = new HbAction(); + //connect(action, SIGNAL(triggered()), this, SLOT(checkBoxCancelEvent())); + settingswizard->mActions.append(action); settingswizard->q_currentIndexChanged(0); @@ -88,6 +96,13 @@ SettingsWidget* settingswizard = new SettingsWidget(); settingswizard->mCategoryDbMapping.insert("Contacts", true); settingswizard->mCategoryDbMapping.insert("Messages", true); + HbAction * action = new HbAction(); + // connect(action, SIGNAL(triggered()), this, SLOT(checkBoxOkEvent())); + settingswizard->mActions.append(action); + + action = new HbAction(); + //connect(action, SIGNAL(triggered()), this, SLOT(checkBoxCancelEvent())); + settingswizard->mActions.append(action); settingswizard->q_currentIndexChanged(0); settingswizard->launchSettingWidget(); @@ -161,6 +176,13 @@ settingswizard->mCategoryDbMapping.insert("Contacts", true); settingswizard->mCategoryDbMapping.insert("Messages", true); + HbAction * action = new HbAction(); + // connect(action, SIGNAL(triggered()), this, SLOT(checkBoxOkEvent())); + settingswizard->mActions.append(action); + + action = new HbAction(); + //connect(action, SIGNAL(triggered()), this, SLOT(checkBoxCancelEvent())); + settingswizard->mActions.append(action); settingswizard->q_currentIndexChanged(0); @@ -176,6 +198,14 @@ settingswizard->mCategoryDbMapping.insert("Contacts", true); settingswizard->mCategoryDbMapping.insert("Messages", true); + + HbAction * action = new HbAction(); + // connect(action, SIGNAL(triggered()), this, SLOT(checkBoxOkEvent())); + settingswizard->mActions.append(action); + + action = new HbAction(); + //connect(action, SIGNAL(triggered()), this, SLOT(checkBoxCancelEvent())); + settingswizard->mActions.append(action); settingswizard->q_currentIndexChanged(0); QSignalSpy spy(settingswizard, SIGNAL(settingsEvent(bool))); @@ -190,6 +220,13 @@ settingswizard->initialize(); settingswizard->mCategoryDbMapping.insert("Contacts", true); settingswizard->mCategoryDbMapping.insert("Messages", true); + HbAction * action = new HbAction(); + // connect(action, SIGNAL(triggered()), this, SLOT(checkBoxOkEvent())); + settingswizard->mActions.append(action); + + action = new HbAction(); + //connect(action, SIGNAL(triggered()), this, SLOT(checkBoxCancelEvent())); + settingswizard->mActions.append(action); settingswizard->q_currentIndexChanged(0); @@ -220,6 +257,13 @@ settingswizard->mCategoryDbMapping.insert("Contacts", true); settingswizard->mCategoryDbMapping.insert("Messages", true); settingswizard->initialize(); + HbAction * action = new HbAction(); + // connect(action, SIGNAL(triggered()), this, SLOT(checkBoxOkEvent())); + settingswizard->mActions.append(action); + + action = new HbAction(); + //connect(action, SIGNAL(triggered()), this, SLOT(checkBoxCancelEvent())); + settingswizard->mActions.append(action); settingswizard->q_currentIndexChanged(0); settingswizard->q_currentIndexChanged(1); @@ -231,6 +275,13 @@ settingswizard->mCategoryDbMapping.insert("Contacts", true); settingswizard->mCategoryDbMapping.insert("Messages", true); + HbAction * action = new HbAction(); + // connect(action, SIGNAL(triggered()), this, SLOT(checkBoxOkEvent())); + settingswizard->mActions.append(action); + + action = new HbAction(); + //connect(action, SIGNAL(triggered()), this, SLOT(checkBoxCancelEvent())); + settingswizard->mActions.append(action); settingswizard->q_currentIndexChanged(0); QSignalSpy spy(settingswizard, SIGNAL(selectedItemCategory(int,bool))); settingswizard->loadDeviceSettings(); diff -r 68cdadcf169e -r af30d8015c58 searchui/stateproviders/searchstateprovider/tsrc/t_searchstateprovider/t_searchstateprovider.pro --- a/searchui/stateproviders/searchstateprovider/tsrc/t_searchstateprovider/t_searchstateprovider.pro Thu Sep 02 20:27:46 2010 +0300 +++ b/searchui/stateproviders/searchstateprovider/tsrc/t_searchstateprovider/t_searchstateprovider.pro Fri Sep 17 08:29:53 2010 +0300 @@ -13,27 +13,13 @@ # # Description: Search stateprovider unit test project file # - +QT += testlib TEMPLATE = app DEFINES += BUILD_SEARCHSTATEPROVIDER CONFIG += hb console mobility +MOBILITY = serviceframework -MOBILITY = serviceframework -symbian { - CONFIG(debug, debug|release) { - DESTDIR = ./debug - } else { - DESTDIR = ./release - } -} - -win32 { - - LIBS += -L$$PWD/../../../../../bin/debug - - DESTDIR = $$PWD/../../../../../bin/debug/ -} LIBS += -lsearchindevicehandler LIBS += -lxqservice @@ -52,10 +38,7 @@ LIBS += -lavkon LIBS += -ltstaskmonitorclient.dll -CONFIG += qtestlib \ - symbian_test \ - debug_and_release \ - console +CONFIG += qtestlib CONFIG += hb QT += xml \ @@ -78,11 +61,9 @@ CONFIG += symbian_test TARGET.UID2 = 0x100039CE TARGET.UID3 = 0x20026F9A -TARGET.CAPABILITY = CAP_APPLICATION AllFiles -TARGET.EPOCSTACKSIZE = 0x14000 // 80kB -TARGET.EPOCHEAPSIZE = 0x20000 0x800000 // 128kB - 16MB +TARGET.CAPABILITY = ALL -TCB -DRM INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE -INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE +INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE } include(t_searchstateprovider.pri) diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/applications/_1/_0.cfs Binary file searchui/tsrc/indexdb/data/applications/_1/_0.cfs has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/applications/_1/deletable Binary file searchui/tsrc/indexdb/data/applications/_1/deletable has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/applications/_1/segments Binary file searchui/tsrc/indexdb/data/applications/_1/segments has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/bookmark/_1/_0.cfs Binary file searchui/tsrc/indexdb/data/bookmark/_1/_0.cfs has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/bookmark/_1/deletable Binary file searchui/tsrc/indexdb/data/bookmark/_1/deletable has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/bookmark/_1/segments Binary file searchui/tsrc/indexdb/data/bookmark/_1/segments has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/calendar/_1/_0.cfs Binary file searchui/tsrc/indexdb/data/calendar/_1/_0.cfs has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/calendar/_1/deletable Binary file searchui/tsrc/indexdb/data/calendar/_1/deletable has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/calendar/_1/segments Binary file searchui/tsrc/indexdb/data/calendar/_1/segments has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/contact/_1/_0.cfs Binary file searchui/tsrc/indexdb/data/contact/_1/_0.cfs has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/contact/_1/deletable Binary file searchui/tsrc/indexdb/data/contact/_1/deletable has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/contact/_1/segments Binary file searchui/tsrc/indexdb/data/contact/_1/segments has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/cpixcontentinfo.sq Binary file searchui/tsrc/indexdb/data/cpixcontentinfo.sq has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/cpixreg.txt --- a/searchui/tsrc/indexdb/data/cpixreg.txt Thu Sep 02 20:27:46 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -@0:root applications=C:\Private\2001f6f7\indexing\indexdb\root\applications -@0:root bookmark=C:\Private\2001f6f7\indexing\indexdb\root\bookmark -@0:root calendar=C:\Private\2001f6f7\indexing\indexdb\root\calendar -@0:root contact=C:\Private\2001f6f7\indexing\indexdb\root\contact -@0:root notes=C:\Private\2001f6f7\indexing\indexdb\root\notes -@c:root file content=C:\Private\2001f6f7\indexing\indexdb\root\file\content -@c:root file folder=C:\Private\2001f6f7\indexing\indexdb\root\file\folder -@c:root media audio=C:\Private\2001f6f7\indexing\indexdb\root\media\audio -@c:root media image=C:\Private\2001f6f7\indexing\indexdb\root\media\image -@c:root media video=C:\Private\2001f6f7\indexing\indexdb\root\media\video -@c:root msg smsmms=C:\Private\2001f6f7\indexing\indexdb\root\msg\smsmms -@t:root file content=T:\Private\2001f6f7\indexing\indexdb\root\file\content -@t:root file folder=T:\Private\2001f6f7\indexing\indexdb\root\file\folder -@t:root media audio=T:\Private\2001f6f7\indexing\indexdb\root\media\audio -@t:root media image=T:\Private\2001f6f7\indexing\indexdb\root\media\image -@t:root media video=T:\Private\2001f6f7\indexing\indexdb\root\media\video -@u:root file content=U:\Private\2001f6f7\indexing\indexdb\root\file\content -@u:root file folder=U:\Private\2001f6f7\indexing\indexdb\root\file\folder -@u:root media audio=U:\Private\2001f6f7\indexing\indexdb\root\media\audio -@u:root media image=U:\Private\2001f6f7\indexing\indexdb\root\media\image -@u:root media video=U:\Private\2001f6f7\indexing\indexdb\root\media\video -@x:root file content=X:\Private\2001f6f7\indexing\indexdb\root\file\content -@x:root file folder=X:\Private\2001f6f7\indexing\indexdb\root\file\folder -@x:root media audio=X:\Private\2001f6f7\indexing\indexdb\root\media\audio -@x:root media image=X:\Private\2001f6f7\indexing\indexdb\root\media\image -@x:root media video=X:\Private\2001f6f7\indexing\indexdb\root\media\video -@y:root file content=Y:\Private\2001f6f7\indexing\indexdb\root\file\content -@y:root file folder=Y:\Private\2001f6f7\indexing\indexdb\root\file\folder -@y:root media audio=Y:\Private\2001f6f7\indexing\indexdb\root\media\audio -@y:root media image=Y:\Private\2001f6f7\indexing\indexdb\root\media\image -@y:root media video=Y:\Private\2001f6f7\indexing\indexdb\root\media\video diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/file/content/_0/_0.cfs Binary file searchui/tsrc/indexdb/data/file/content/_0/_0.cfs has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/file/content/_0/deletable Binary file searchui/tsrc/indexdb/data/file/content/_0/deletable has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/file/content/_0/segments Binary file searchui/tsrc/indexdb/data/file/content/_0/segments has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/file/folder/_1/_0.cfs Binary file searchui/tsrc/indexdb/data/file/folder/_1/_0.cfs has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/file/folder/_1/deletable Binary file searchui/tsrc/indexdb/data/file/folder/_1/deletable has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/file/folder/_1/segments Binary file searchui/tsrc/indexdb/data/file/folder/_1/segments has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/media/audio/_1/_0.cfs Binary file searchui/tsrc/indexdb/data/media/audio/_1/_0.cfs has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/media/audio/_1/deletable Binary file searchui/tsrc/indexdb/data/media/audio/_1/deletable has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/media/audio/_1/segments Binary file searchui/tsrc/indexdb/data/media/audio/_1/segments has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/media/image/_1/_0.cfs Binary file searchui/tsrc/indexdb/data/media/image/_1/_0.cfs has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/media/image/_1/deletable Binary file searchui/tsrc/indexdb/data/media/image/_1/deletable has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/media/image/_1/segments Binary file searchui/tsrc/indexdb/data/media/image/_1/segments has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/media/video/_0/_0.cfs Binary file searchui/tsrc/indexdb/data/media/video/_0/_0.cfs has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/media/video/_0/deletable Binary file searchui/tsrc/indexdb/data/media/video/_0/deletable has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/media/video/_0/segments Binary file searchui/tsrc/indexdb/data/media/video/_0/segments has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/msg/smsmms/_1/_0.cfs Binary file searchui/tsrc/indexdb/data/msg/smsmms/_1/_0.cfs has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/msg/smsmms/_1/deletable Binary file searchui/tsrc/indexdb/data/msg/smsmms/_1/deletable has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/msg/smsmms/_1/segments Binary file searchui/tsrc/indexdb/data/msg/smsmms/_1/segments has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/notes/_1/_0.cfs Binary file searchui/tsrc/indexdb/data/notes/_1/_0.cfs has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/notes/_1/deletable Binary file searchui/tsrc/indexdb/data/notes/_1/deletable has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/indexdb/data/notes/_1/segments Binary file searchui/tsrc/indexdb/data/notes/_1/segments has changed diff -r 68cdadcf169e -r af30d8015c58 searchui/tsrc/tsrc.pro --- a/searchui/tsrc/tsrc.pro Thu Sep 02 20:27:46 2010 +0300 +++ b/searchui/tsrc/tsrc.pro Fri Sep 17 08:29:53 2010 +0300 @@ -18,8 +18,7 @@ SUBDIRS += indexdb \ ../indevicehandler/tsrc \ - ../stateproviders/searchstateprovider/tsrc \ -../onlinehandler/tsrc + ../stateproviders/searchstateprovider/tsrc