--- a/main/glxaiwservicehandler.cpp Fri May 28 21:11:54 2010 +0530
+++ b/main/glxaiwservicehandler.cpp Fri Jun 11 17:53:15 2010 +0530
@@ -65,11 +65,20 @@
mDSDIService(NULL),
mImageViewerService(NULL)
{
- mFetcherService = new GlxGetImageService(this);
- mNSDIService = new GlxGetImageServiceNSDI(this);
- mDSDIService = new GlxGetImageServiceDSDI(this);
-
- mImageViewerService = new GlxImageViewerService(this);
+ QString currentInterfaceName = XQServiceUtil::interfaceName();
+ if( 0 == currentInterfaceName.compare(QLatin1String("com.nokia.symbian.IImageFetch")))
+ {
+ mFetcherService = new GlxGetImageService(this);
+ }
+ else if( 0 == currentInterfaceName.compare(QLatin1String("Image")))
+ {
+ mNSDIService = new GlxGetImageServiceNSDI(this);
+ mDSDIService = new GlxGetImageServiceDSDI(this);
+ }
+ else if( 0 == currentInterfaceName.compare(QLatin1String("com.nokia.symbian.IFileView")))
+ {
+ mImageViewerService = new GlxImageViewerService(this);
+ }
#ifdef _DEBUG
QString t;
@@ -117,7 +126,7 @@
{
qDebug() << "GlxFetcher::itemSelected";
- if (mFetcherService->isActive())
+ if (mFetcherService && mFetcherService->isActive())
{
qDebug() << "GlxFetcher::itemSelected mFetcherService->isActive()";
QVariant variant = mModel->data(index, GlxUriRole);
@@ -129,7 +138,7 @@
}
}
- if (mNSDIService->isActive())
+ else if (mNSDIService && mNSDIService->isActive())
{
qDebug() << "GlxFetcher::itemSelected mNSDIService->isActive()";
QVariant variant = mModel->data(index, GlxUriRole);
@@ -141,7 +150,7 @@
}
}
- if (mDSDIService->isActive())
+ else if (mDSDIService && mDSDIService->isActive())
{
qDebug() << "GlxFetcher::itemSelected mDSDIService->isActive()";
QVariant variant = mModel->data(index, GlxUriRole);
@@ -156,9 +165,10 @@
-void GlxAiwServiceHandler::launchFetcher()
+void GlxAiwServiceHandler::launchFetcher(QString viewTitle)
{
qDebug() << "GlxAiwServiceHandler::launchFetcher START";
+ qApp->setApplicationName(viewTitle);
HbStyleLoader::registerFilePath(":/data/photos.css");
GlxModelParm modelParm(KGlxCollectionPluginAllImplementationUid, 0);
mModel = new GlxMediaModel(modelParm);
@@ -323,7 +333,11 @@
void GlxGetImageService::fetch()
{
mImageRequestIndex = setCurrentRequestAsync();
- mServiceApp->launchFetcher();
+ QString title = requestInfo().info("WindowTitle").toString();
+ if(title.isNull()){
+ title = QString("Image Fetcher");
+ }
+ mServiceApp->launchFetcher(title);
}
// ----------------------------------------------------------------------------
@@ -412,7 +426,11 @@
{
qDebug() << "GlxGetImageServiceNSDI::fetch START";
mImageRequestIndex = setCurrentRequestAsync();
- mServiceApp->launchFetcher();
+ QString title = requestInfo().info("WindowTitle").toString();
+ if(title.isNull()){
+ title = QString("Image Fetcher");
+ }
+ mServiceApp->launchFetcher(title);
qDebug() << "GlxGetImageServiceNSDI::fetch END";
}
@@ -491,7 +509,11 @@
Q_UNUSED(filter)
Q_UNUSED(flag)
mImageRequestIndex = setCurrentRequestAsync();
- mServiceApp->launchFetcher();
+ QString title = requestInfo().info("WindowTitle").toString();
+ if(title.isNull()){
+ title = QString("Image Fetcher");
+ }
+ mServiceApp->launchFetcher(title);
}
// ----------GlxImageViewerService---------------