--- a/logsui/logsapp/src/logsservicehandler.cpp Thu Jun 24 14:44:14 2010 +0300
+++ b/logsui/logsapp/src/logsservicehandler.cpp Thu Jul 08 11:31:03 2010 +0300
@@ -18,7 +18,6 @@
#include "logsservicehandler.h"
#include "logslogger.h"
#include "logsdefs.h"
-#include "logsmainwindow.h"
#include <xqserviceutil.h>
//SYSTEM
@@ -27,9 +26,8 @@
// LogsServiceHandler::LogsServiceHandler
// -----------------------------------------------------------------------------
//
-LogsServiceHandler::LogsServiceHandler(LogsMainWindow& mainWindow)
- : XQServiceProvider(QLatin1String("logs.com.nokia.symbian.ILogsView"),0),
- mMainWindow(mainWindow)
+LogsServiceHandler::LogsServiceHandler()
+ : XQServiceProvider(QLatin1String("logs.com.nokia.symbian.ILogsView"),0)
{
LOGS_QDEBUG( "logs [UI] -> LogsServiceHandler::LogsServiceHandler(), ILogsView" )
@@ -63,11 +61,24 @@
QVariant(false)).toBool();
QString dialpadText = params.value(logsDialpadTextParam,
QVariant(QString())).toString();
-
+
LOGS_QDEBUG_2( "logs [UI] activatedView:", activatedView )
LOGS_QDEBUG_2( "logs [UI] showDialpad:", showDialpad )
LOGS_QDEBUG_2( "logs [UI] dialpadText:", dialpadText )
+ if (params.contains(logsViewIndexParamNew)) {
+ activatedView = params.value(logsViewIndexParamNew).toInt();
+ LOGS_QDEBUG_2( "logs [UI] new activatedView:", activatedView )
+ }
+ if (params.contains(logsShowDialpadParamNew)) {
+ showDialpad = params.value(logsShowDialpadParamNew).toBool();
+ LOGS_QDEBUG_2( "logs [UI] new showDialpad:", showDialpad )
+ }
+ if (params.contains(logsDialpadTextParamNew)) {
+ dialpadText = params.value(logsDialpadTextParamNew).toString();
+ LOGS_QDEBUG_2( "logs [UI] new dialpadText:", dialpadText )
+ }
+
if ( activatedView < LogsServices::ViewAll ||
activatedView > LogsServices::ViewMissed ){
LOGS_QDEBUG( "logs [UI] <- LogsServiceHandler::show(), incorrect view" )
@@ -76,9 +87,6 @@
mIsAppStartedUsingService = true;
- LOGS_QDEBUG( "logs [UI] Bring app to foreground" )
- mMainWindow.bringAppToForeground();
-
if (!dialpadText.isEmpty()) {
emit activateView(dialpadText);
} else {