FCL/sf/app/homescreen: comparison homescreenapp/hsdomainmodel/src/hsscene.cpp

equal deleted inserted replaced

-:03646e8da489
+:30f14686fb04
 #include <QApplication>
 #include <HbInstance>
 #include <HbMainWindow>
-#include <HbDeviceProfile>
 #include "hsdomainmodeldatastructures.h"
 #include "hsscene.h"
 #include "hspage.h"
 #include "hswidgethost.h"
 #include "hsdatabase.h"
 #include "hswallpaper.h"
 #include "hsconfiguration.h"
+/*!
+\class HsScene
+\ingroup group_hsdomainmodel
+\brief Represents a scene in the framework.
+HsScene can have a wallpaper.
+*/
 /*!
 Destructor.
 */
 HsScene::~HsScene()
 {
 HsSceneData sceneData;
 if (!db->scene(sceneData)) {
 return false;
 }
-mMaximumPageCount = HsConfiguration::maximumPageCount();
+mDatabaseId = sceneData.id;
-calculateWidgetSizeLimitations();
-if (sceneData.portraitWallpaper.isEmpty()) {
-mWallpaper->setImagesById();
-} else {
-mWallpaper->setImagesByPaths(
-sceneData.landscapeWallpaper,
-sceneData.portraitWallpaper);
-}
 QList<HsPageData> pageDatas;
 if (!db->pages(pageDatas) || pageDatas.empty()) {
 return false;
 }
+if (HSCONFIGURATION_GET(sceneType) == HsConfiguration::SceneWallpaper) {
+mWallpaper = new HsSceneWallpaper(this);
+}
 foreach (HsPageData pageData, pageDatas) {
 HsPage *page = new HsPage;
 page->setDatabaseId(pageData.id);
 if (page->load()) {
 mPages.append(page);
 } else {
 delete page;
 continue;
 }
-if (pageData.id == HsConfiguration::defaultPageId()) {
+if (pageData.id == HSCONFIGURATION_GET(defaultPageId)) {
 mActivePage = page;
 mActivePage->setRemovable(false);
 }
 }
-QApplication::instance()->installEventFilter(this);
 	return true;
 }
 /*!
-Calculate maximum and minimum widget sizes
+Return wallpaper.
-*/
-void HsScene::calculateWidgetSizeLimitations()
-{
-// 1un = 6.7px = 2mm
-mMaximumWidgetSizeInUnits = QSizeF(HsConfiguration::maximumWidgetWidth(),
-HsConfiguration::maximumWidgetHeight());
-mMinimumWidgetSizeInUnits = QSizeF(HsConfiguration::minimumWidgetWidth(),
-HsConfiguration::minimumWidgetHeight());
-HbDeviceProfile profile;
-qreal unitToPixelFactor = profile.unitValue();
-mMaximumWidgetSizeInPixels = unitToPixelFactor * mMaximumWidgetSizeInUnits;
-mMinimumWidgetSizeInPixels = unitToPixelFactor * mMinimumWidgetSizeInUnits;
-}
-/*!
-Return wallpaper.
 */
 HsWallpaper *HsScene::wallpaper() const
 {
 return mWallpaper;
 }
 */
 QList<HsPage *> HsScene::pages() const
 {
 return mPages;
 }
 /*!
 Add page \a page.
 */
 bool HsScene::addPage(HsPage *page)
 {
 if (!page) {
 return false;
 }
 if (mPages.contains(page)) {
 return true;
 }
 HsDatabase *db = HsDatabase::instance();
 HsPageData data;
 data.id = page->databaseId();
 if (!db->page(data)) {
 return false;
 }
 if (!db->updatePage(data)) {
 db->rollback();
 return false;
 }
 }
 db->commit();
 mPages.insert(addPosition, page);
 return true;
 }
 /*!
 Removes page \a page.
 */
 bool HsScene::removePage(HsPage *page)
 {
 db->commit();
 mPages.removeOne(page);
 return true;
 }
 /*!
 Set active page \a page.
 */
 bool HsScene::setActivePage(HsPage *page)
 {
 if (!page) {
 return false;
 }
 if (!mPages.contains(page)) {
 return false;
 }
 if (page == mActivePage) {
 {
 return mPages.indexOf(mActivePage);
 }
 /*!
-Return maximum number of pages.
-*/
-int HsScene::maximumPageCount() const
-{
-return mMaximumPageCount;
-}
-/*!
-Return maximum widget size in pixels.
-*/
-QSizeF HsScene::maximumWidgetSizeInPixels() const
-{
-return mMaximumWidgetSizeInPixels;
-}
-/*!
-Return minimum widget size in pixels.
-*/
-QSizeF HsScene::minimumWidgetSizeInPixels() const
-{
-return mMinimumWidgetSizeInPixels;
-}
-/*!
-Return maximum widget size in units.
-*/
-QSizeF HsScene::maximumWidgetSizeInUnits() const
-{
-return mMaximumWidgetSizeInUnits;
-}
-/*!
-Return minimum widget size in units.
-*/
-QSizeF HsScene::minimumWidgetSizeInUnits() const
-{
-return mMinimumWidgetSizeInUnits;
-}
-/*!
 Set active widget \a widget.
 */
 void HsScene::setActiveWidget(HsWidgetHost *widget)
 {
 mActiveWidget = widget;
 }
 /*!
 Return active widget.
 */
 HsWidgetHost *HsScene::activeWidget() const
 {
 return mActiveWidget;
 }
 /*!
 Toggle application online state. Defaults
 to true.
 */
 void HsScene::setOnline(bool online)
 {
 mIsOnline = online;
 {
 return mIsOnline;
 }
 /*!
 Singleton.
 */
 HsScene *HsScene::instance()
 {
-if (!mInstance) {
-mInstance = new HsScene;
-mInstance->setParent(HsScene::mainWindow());
-}
 return mInstance;
+}
+HsScene *HsScene::takeInstance()
+{
+HsScene *instance = mInstance;
+mInstance = 0;
+return instance;
+}
+void HsScene::setInstance(HsScene *instance)
+{
+if (mInstance != instance) {
+delete mInstance;
+mInstance = instance;
+}
 }
 /*!
 Return main window.
 */
 /*!
 Constructor
 */
 HsScene::HsScene(QObject *parent)
 : QObject(parent),
 mDatabaseId(-1),
 mWallpaper(0),
 mActivePage(0),
 mActiveWidget(0),
-mIsOnline(true),
+mIsOnline(true)
-mMaximumPageCount(1),
+{
-mMaximumWidgetSizeInPixels(321.6, 261.3),
-mMinimumWidgetSizeInPixels(58.625, 58.625),
-mMaximumWidgetSizeInUnits(48, 39),
-mMinimumWidgetSizeInUnits(8.75, 8.75)
-{
-mWallpaper = new HsWallpaper;
 }
 /*!
 Points to the scene instance.
 */

changeset 60	30f14686fb04
parent 55	03646e8da489
child 61	2b1b11a301d2