--- a/phoneplugins/infowidgetplugin/infowidget/inc/infowidget.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/infowidgetplugin/infowidget/inc/infowidget.h Wed Aug 18 09:48:26 2010 +0300
@@ -29,6 +29,7 @@
class QGraphicsSceneMouseEvent;
class QGraphicsLinearLayout;
class QTranslator;
+class QGestureEvent;
class HbDialog;
class HbIconItem;
class HbMarqueeItem;
@@ -39,7 +40,8 @@
class HbAction;
class InfoWidgetEngine;
class InfoWidgetPreferences;
-
+
+
// Class declaration
class InfoWidget : public HbWidget
{
@@ -81,17 +83,13 @@
void setSpnDisplay(QString value);
protected:
- void mousePressEvent(QGraphicsSceneMouseEvent *event);
- void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
- void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+ void gestureEvent(QGestureEvent *event);
void changeEvent(QEvent *event);
void timerEvent(QTimerEvent *event);
void updateInfoDisplay();
bool readPersistentPreferences();
void initializeCheckBoxStates();
- bool installTranslator(QString translationFile);
- void removeTranslators();
private:
void updateItemsVisibility();
@@ -133,19 +131,12 @@
private:
Q_DISABLE_COPY(InfoWidget)
- // Engine for widget, owned
+ // Guarded objects, owned
QScopedPointer<InfoWidgetEngine> m_engine;
-
- // Widget preference store, owned
QScopedPointer<InfoWidgetPreferences> m_preferences;
+ QScopedPointer<InfoWidgetLayoutManager> m_layoutManager;
- // Layout manager for widget, owned
- QScopedPointer<InfoWidgetLayoutManager> m_layoutManager;
-
- // Translators, owned
- QList<QTranslator *> m_translators;
-
- // Current widget layout, not owned
+ // Widget main layout, not owned
QGraphicsLinearLayout *m_layout;
// Currently animating item(s), not owned
@@ -160,7 +151,6 @@
// Flags
bool m_layoutChanging;
- bool m_dragEvent;
bool m_initialized;
};