--- a/homescreenapp/hsdomainmodel/inc/hsdomainmodeldatastructures.h Thu Jun 24 13:11:40 2010 +0100
+++ b/homescreenapp/hsdomainmodel/inc/hsdomainmodeldatastructures.h Fri Jun 25 19:19:22 2010 +0300
@@ -18,10 +18,9 @@
#ifndef HSDOMAINMODELDATASTRUCTURES_H
#define HSDOMAINMODELDATASTRUCTURES_H
-#include <QRectF>
+#include <QPointF>
+
#include "hsdomainmodel_global.h"
-#include <HbFeedback>
-#include <QMetaEnum>
class HSDOMAINMODEL_EXPORT HsSceneData
{
@@ -31,9 +30,6 @@
{}
int id;
- QString portraitWallpaper;
- QString landscapeWallpaper;
-
};
class HSDOMAINMODEL_EXPORT HsPageData
@@ -86,72 +82,4 @@
int widgetId;
};
-class HSDOMAINMODEL_EXPORT HsGeneralConfiguration
-{
-public:
- int bounceEffect; // pixels, bounce effect reservation, half in left side and half in right side of wallpaper
- qreal tapAndHoldDistance; // pixels
- int widgetTapAndHoldTimeout; // ms, duration of long press before action is triggered on widget
- int sceneTapAndHoldTimeout; // ms, duration of long press before action is triggered on background
- qreal pageChangeZoneWidth; // pixels
- qreal pageIndicatorSpacing; // pixels
- int pageChangeAnimationDuration; // ms, this is how long page change animation takes
- int pageChangeZoneAnimationDuration; // ms, this is how long crawling is done before page is actually changed
- int pageChangeZoneReverseAnimationDuration; // ms, animation duration back to starting position when crawling ends before page is changed
- int pageRemovedAnimationDuration; // ms
- int newPageAddedAnimationDuration; // ms
- int widgetDragEffectDuration; // ms
- int widgetDropEffectDuration; // ms
- int boundaryFeedbackEffectDistance; // pixels, when widget is moved within n pixels from first page right border or
- // n pixels from last page's left border, feedback effect is played
- int defaultPageId; // id of default page (which cannot be removed)
- int maximumPageCount; // maximum number of pages
- qreal maximumWidgetHeight; // px
- qreal maximumWidgetWidth; // px
- qreal minimumWidgetHeight; // px
- qreal minimumWidgetWidth; // px
- bool shortcutLabelsVisible; // display labels under shortcut widgets
- qreal pageChangePanDistance; // un, amount of pan needed to change page
-};
-
-class HSDOMAINMODEL_EXPORT HsFeedbackConfiguration
-{
-public:
- HbFeedback::InstantEffect feedbackFromString(const QString &feedback)
- {
- int index = HbFeedback::staticMetaObject.indexOfEnumerator("InstantEffect");
- QMetaEnum metaEnum = HbFeedback::staticMetaObject.enumerator(index);
-
- int intFeedback = metaEnum.keysToValue(feedback.toAscii());
-
- if (intFeedback < HbFeedback::None || intFeedback > HbFeedback::InstantMaxUser) {
- return HbFeedback::None;
- }
-
- return static_cast<HbFeedback::InstantEffect>(intFeedback);
- }
-
-public:
- HbFeedback::InstantEffect pageChangeFeedbackType;
- HbFeedback::InstantEffect widgetPickFeedbackType;
- HbFeedback::InstantEffect widgetDropFeedbackType;
- HbFeedback::InstantEffect widgetRepositionFeedbackType;
- HbFeedback::InstantEffect widgetOverTrashbinFeedbackType;
- HbFeedback::InstantEffect widgetDropToTrashbinFeedbackType;
- HbFeedback::InstantEffect shortcutWidgetTapFeedbackType;
- HbFeedback::InstantEffect widgetMoveBlockedFeedbackType;
- HbFeedback::InstantEffect clockWidgetTapFeedbackType;
- HbFeedback::InstantEffect widgetSnappingFeedbackType;
-};
-
-class HSDOMAINMODEL_EXPORT HsSnapConfiguration
-{
-public:
- bool snappingEnabled; // variable to tell if snapping is enabled or not
- qreal snapForce; // this is the distance at which the widget starts being attracted to the line
- qreal snapGap; // the gap at which the objects settle into from each other when they snap
- qreal borderGap; // (the gap from the border edges when the widget settles on the edges of the page
- int timeout; // time in milliseconds after which the snapping line will be shown
-};
-
#endif // HSDOMAINMODELDATASTRUCTURES_H