FCL/sf/app/search: comparison searchui/stateproviders/searchstateprovider/inc/searchprogressivestate.h

equal deleted inserted replaced

-:2f67eb14d003
+:4a2987baf8f7
 */
 #ifndef PROGRESSIVE_SEARCH_STATE_H
 #define PROGRESSIVE_SEARCH_STATE_H
-#include <qabstractitemmodel.h>
 #include <qstate.h>
 #include <qstringlist.h>
 #include <qdatetime.h>
 #include <qpixmap.h>
 #include <hbicon.h>
 #include <xqappmgr.h>
 #include <xqaiwrequest.h>
 #include "search_global.h"
 #include <f32file.h>
-//Uncomment to enable performance measurements.
+#ifdef OST_TRACE_COMPILER_IN_USE //defined in Search_global.h
-//#define OST_TRACE_COMPILER_IN_USE
-#ifdef OST_TRACE_COMPILER_IN_USE
 #define PERF_CAT_API_TIME_RESTART  m_categorySearchApiTime.restart();
 #define PERF_CAT_UI_TIME_RESTART  m_categorySearchUiTime.restart();
 #define PERF_CAT_TOTAL_TIME_RESTART  m_totalSearchUiTime.restart();
 #define PERF_CAT_API_ENDLOG qDebug() << "Search on category (API): " << mTemplist.at( mDatabasecount-1 ) << "took "<< m_categorySearchApiTime.elapsed() << " msec";
 #define PERF_CAT_UI_ENDLOG qDebug() << "Search on category (UI): " << mTemplist.at( mDatabasecount-1 ) << "took "<< m_categorySearchUiTime.elapsed() << " msec";
 #define PERF_CAT_HITS_ENDLOG qDebug() << "Hits on category: " << mTemplist.at( mDatabasecount-1 ) << ": "<< aResultCount;
 #define PERF_CAT_GETDOC_TIME_RESTART m_categoryGetDocumentApiTime.restart();
 #define PERF_CAT_GETDOC_TIME_ACCUMULATE m_getDocumentCatergoryTimeAccumulator += m_categoryGetDocumentApiTime.elapsed();
 #define PERF_CAT_GETDOC_ACCUMULATOR_RESET m_getDocumentCatergoryTimeAccumulator = 0;
 #define PERF_CAT_GETDOC_ACCUMULATOR_ENDLOG qDebug() << "Get Doc on category (API): " << mTemplist.at( mDatabasecount-1 ) << "took " << m_getDocumentCatergoryTimeAccumulator << "msec";
+#define PERF_RESULT_ITEM_LAUNCH_TIME_RESTART m_resultItemLaunchTime.restart();
+#define PERF_RESULT_ITEM_FOR_LAUNCHING(string) qDebug() <<"Result_Item_Launching: Launching "<<string ;
+#define PERF_RESULT_ITEM_LAUNCH_TIME_ENDLOG(string) qDebug() <<"Result_Item_Launching:"<<string<<"took "<<m_resultItemLaunchTime.elapsed()<<" msec";
 #else
 #define PERF_CAT_API_TIME_RESTART
 #define PERF_CAT_UI_TIME_RESTART
 #define PERF_CAT_TOTAL_TIME_RESTART
 #define PERF_CAT_HITS_ENDLOG
 #define PERF_CAT_GETDOC_TIME_RESTART
 #define PERF_CAT_GETDOC_TIME_ACCUMULATE
 #define PERF_CAT_GETDOC_ACCUMULATOR_RESET
 #define PERF_CAT_GETDOC_ACCUMULATOR_ENDLOG
+#define PERF_RESULT_ITEM_LAUNCH_TIME_RESTART
+#define PERF_RESULT_ITEM_FOR_LAUNCHING(string)
+#define PERF_RESULT_ITEM_LAUNCH_TIME_ENDLOG(string)
 #endif //OST_TRACE_COMPILER_IN_USE
 class HbMainWindow;
 class HbView;
-class HbListView;
 class HbDocumentLoader;
-class QStandardItemModel;
 class HbSearchPanel;
 class CFbsBitmap;
 class InDeviceHandler;
 class QCPixDocument;
-class NotesEditor;
+class NotesEditorInterface;
 class EventViewerPluginInterface;
+class HbListWidget;
+class HbListWidgetItem;
+class QPluginLoader;
 SEARCH_CLASS( SearchStateProviderTest)
 /** @ingroup group_searchstateprovider
 * @brief The state where progressive search state is shown
 *
 * @see StateMachine
 /**
 * slot connects to list view to launch the respective application
 * @since S60 ?S60_version.
 * @param aIndex index of the activated item.
 */
-void openResultitem(QModelIndex aIndex);
+void openResultitem(HbListWidgetItem * item);
 /**
 * slot connects to settings state to get the selected category information
 * @since S60 ?S60_version.
 * @param aCategory category(database) name.
 * @param aKeyword search keyword.
 */
 void startNewSearch(const QString &aKeyword);
 /**
-* slot connects to search state  for internet search
-* @since S60 ?S60_version.
-*/
-void _customizeGoButton(bool avalue);
-/**
 * slot implemented to avoid repeated search for the same category
 * selection when user search for mutiple times
 * @since S60 ?S60_version.
 */
 void settingsaction(bool avalue);
 * Slot implemented to delete the calenderviewer plugin
 * @since S60 ?S60_version.
 */
 void _viewingCompleted();
+void viewReady();
+void slotOnlineQuery(QString);
+void slotISProvidersIcon(int, HbIcon);
 private:
 /**
 * initiate the fresh search for selected category separately
 *
 /**
 * prepares the suggestion link item on result list view to provide suggestion links
 *
 * @param aKeyword search keyword.
 */
-void createSuggestionLink(bool aFlag);
+void createSuggestionLink();
 /**
 * Function to include corrrect Qimage format to be taken from bitmap
 *  @param mode Bitmap display mode.
 */
 /**
 * Signalled when user selects an to switch the settings state
 * setting state will be  activated.
 */
-void settingsState();
+void switchProToSettingsState();
+void inDeviceSearchQuery(QString);
+void launchLink(int,QString);
 private:
 HbMainWindow* mMainWindow;
 /**
 /**
 * The List View widget.
 * Own.
 */
-HbListView* mListView;
+HbListWidget* mListView;
 /**
 * Document handler to load .docml.
 * Own.
 */
 * The searchpanel widget.
 * Own.
 */
 HbSearchPanel* mSearchPanel;
-/**
-* model for list view
-* Own.
-*/
-QStandardItemModel* mModel;
 /**
 * qt interface for CPix engine
 * Own.
 */
 /**
 * to create Notes editor
 *
 */
-NotesEditor *notesEditor;
+NotesEditorInterface *mNotesEditor;
+/**
+* to create Notes plugin loader
+*
+*/
+QPluginLoader *mNotespluginLoader;
+QMap<int, HbIcon> mISprovidersIcon;
+bool mOnlineQueryAvailable;
 private:
 /**
 * Application manager handler to perform resultitem opening.
 *
 #ifdef OST_TRACE_COMPILER_IN_USE
 QTime m_totalSearchUiTime;
 QTime m_categorySearchUiTime;
 QTime m_categorySearchApiTime;
 QTime m_categoryGetDocumentApiTime;
+QTime m_resultItemLaunchTime;
 //use long to safeguard overflow from long running operations.
 long m_getDocumentCatergoryTimeAccumulator;
 #endif
-SEARCH_FRIEND_CLASS    (SearchStateProviderTest)
+SEARCH_FRIEND_CLASS (SearchStateProviderTest)
 };
 #endif //PROGRESSIVE_SEARCH_STATE_H

changeset 9	4a2987baf8f7
parent 5	3bc31ad99ee7
child 13	0a2ec6860a93