--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmainwindow.cpp Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmainwindow.cpp Wed Aug 18 09:40:07 2010 +0300
@@ -21,11 +21,11 @@
#include "hsmainwindow.h"
#include "hsmenuview.h"
-#include <qservicemanager.h>
+
/*!
Constructor
*/
-QTM_USE_NAMESPACE
+
/*
@@ -36,7 +36,7 @@
*/
-HsMainWindow::HsMainWindow() : mActivityClient(NULL)
+HsMainWindow::HsMainWindow()
{
}
@@ -51,68 +51,14 @@
Add the \menuView to first instance of HbMainWindow registered in HbInstance.
\param view View to be added to HbMainWindow.
*/
-void HsMainWindow::setCurrentView(const HsMenuView &menuView)
+void HsMainWindow::setCurrentView(HbView *view)
{
HbMainWindow *const hbW(
HbInstance::instance()->allMainWindows().value(0));
- connect( hbW, SIGNAL(viewReady()), SIGNAL(viewIsReady()),
- Qt::UniqueConnection );
-
- HbView *const view = menuView.view();
-
if (!hbW->views().contains(view)) {
hbW->addView(view);
}
- hbW->setCurrentView(view);
+ bool animate = !hbW->isObscured();
+ hbW->setCurrentView(view, animate);
}
-
-
-/*!
- Grabs screenshot from actual main window
- \retval QPixmap& containing screenshot
-*/
-QPixmap HsMainWindow::grabScreenshot()
- {
- HbMainWindow *const hbW(
- HbInstance::instance()->allMainWindows().value(0));
- return QPixmap::grabWidget(hbW, hbW->rect());
- }
-
-/*!
- Saves applib activity with current view screenshot
-*/
-void HsMainWindow::saveActivity()
-{
-#ifdef Q_OS_SYMBIAN
-
- if (!mActivityClient) {
- QServiceManager serviceManager;
- mActivityClient = serviceManager.loadInterface("com.nokia.qt.activities.ActivityClient");
- if (!mActivityClient) {
- qWarning("Cannot initialize critical com.nokia.qt.activities.ActivityClient service.");
- }
- }
-
- if (mActivityClient) {
- bool retok;
- bool ok = QMetaObject::invokeMethod(mActivityClient, "removeActivity",
- Q_RETURN_ARG(bool, retok), Q_ARG(QString, appLibActivity()));
- if (!ok) {
- qWarning("remove appLibActivity failed");
- }
-
- QVariant variant;
- QVariantHash metadata;
- metadata.insert("screenshot", grabScreenshot());
-
- ok = QMetaObject::invokeMethod(mActivityClient, "addActivity", Q_RETURN_ARG(bool, retok),
- Q_ARG(QString, appLibActivity() ), Q_ARG(QVariant, QVariant(variant)),
- Q_ARG(QVariantHash, metadata));
- if (!ok) {
- qWarning("add appLibActivity failed");
- }
- }
-#endif//Q_OS_SYMBIAN
-}
-