equal
deleted
inserted
replaced
341 Singleton. |
341 Singleton. |
342 */ |
342 */ |
343 HsScene *HsScene::instance() |
343 HsScene *HsScene::instance() |
344 { |
344 { |
345 if (!mInstance) { |
345 if (!mInstance) { |
346 mInstance.reset(new HsScene); |
346 mInstance = new HsScene; |
347 } |
347 mInstance->setParent(HsScene::mainWindow()); |
348 return mInstance.data(); |
348 } |
|
349 return mInstance; |
349 } |
350 } |
350 |
351 |
351 /*! |
352 /*! |
352 Return main window. |
353 Return main window. |
353 */ |
354 */ |
391 mWallpaper(0), |
392 mWallpaper(0), |
392 mActivePage(0), |
393 mActivePage(0), |
393 mActiveWidget(0), |
394 mActiveWidget(0), |
394 mIsOnline(true), |
395 mIsOnline(true), |
395 mMaximumPageCount(1), |
396 mMaximumPageCount(1), |
396 mMaximumWidgetSizeInPixels(341, 268), |
397 mMaximumWidgetSizeInPixels(321.6, 261.3), |
397 mMinimumWidgetSizeInPixels(20, 20), |
398 mMinimumWidgetSizeInPixels(58.625, 58.625), |
398 mMaximumWidgetSizeInUnits(51, 40), |
399 mMaximumWidgetSizeInUnits(48, 39), |
399 mMinimumWidgetSizeInUnits(3, 3) |
400 mMinimumWidgetSizeInUnits(8.75, 8.75) |
400 { |
401 { |
401 mWallpaper = new HsWallpaper; |
402 mWallpaper = new HsWallpaper; |
402 } |
403 } |
403 |
404 |
404 /*! |
405 /*! |
405 Points to the scene instance. |
406 Points to the scene instance. |
406 */ |
407 */ |
407 QScopedPointer<HsScene> HsScene::mInstance(0); |
408 HsScene *HsScene::mInstance = 0; |