Restored overwriting paintEvent.

[quick-widgets] / quickwidget.hpp

diff --git a/quickwidget.hpp b/quickwidget.hpp
index f0a6bd2..7f974fe 100644 (file)
--- a/quickwidget.hpp
+++ b/quickwidget.hpp
@@ -1,63 +1,71 @@
-#ifndef QUICKWIDGET_HPP\r
-#define QUICKWIDGET_HPP\r
-\r
-#include <QtCore>\r
-#include <QtGui>\r
-#include <q-extras/qemaemo5dynamicwidgethelper.h>\r
-\r
-class QDeclarativeView;\r
-class QuickWidgetWrapper;\r
-\r
-\r
-class QuickWidget : public QeMaemo5DynamicHomescreenWidget\r
-{\r
-    Q_OBJECT\r
-\r
-private:\r
-    void initView(const QString& fileName, const QSize& size=QSize());\r
-    QSize size_;\r
-    QDeclarativeView* view_;\r
-    QuickWidgetWrapper* wrapper_;\r
-\r
-protected:\r
-//    void showSettingsDialog();\r
-    bool restoreWidgetState();\r
-    void errorWidget();\r
-    bool x11Event(XEvent *event);\r
-\r
-public:\r
-    static QuickWidget *createAndShowNew(const QString& fileName, const QSize& size=QSize());\r
-\r
-    explicit QuickWidget(QWidget *parent = 0);\r
-    Q_INVOKABLE bool onHomescreen() { return isVisibleOnCurrentHomescreen(); }\r
-    ~QuickWidget();\r
-\r
-};\r
-\r
-class QuickWidgetWrapper : public QObject\r
-{\r
-    Q_OBJECT\r
-\r
-public:\r
-    QuickWidgetWrapper(QuickWidget *owner) : m_owner(owner) {;}\r
-    Q_PROPERTY(bool isActiveWindow READ onHomeScreen NOTIFY onHomeScreenChanged);\r
-\r
-    bool onHomeScreen() const { return homeScreen; }\r
-\r
-    void setOnHomeScreen(bool active)\r
-    {\r
-        if (active == homeScreen)\r
-            return;\r
-        homeScreen = active;\r
-        emit onHomeScreenChanged();\r
-    }\r
-\r
-Q_SIGNALS:\r
-    void onHomeScreenChanged();\r
-\r
-private:\r
-    QuickWidget *m_owner;\r
-    bool homeScreen;\r
-};\r
-\r
-#endif // QuickWidget_HPP\r
+#ifndef QUICKWIDGET_HPP
+#define QUICKWIDGET_HPP
+
+#include <QtCore>
+#include <QtGui>
+#include <q-extras/qemaemo5dynamicwidgethelper.h>
+
+class QDeclarativeView;
+class QuickWidgetWrapper;
+
+
+class QuickWidget : public QeMaemo5DynamicHomescreenWidget
+{
+    Q_OBJECT
+
+private:
+    void initView(const QString& fileName, const QSize& size=QSize(),
+                 bool rotate=false);
+    QSize size_;
+    QDeclarativeView* view_;
+    QuickWidgetWrapper* wrapper_;
+    bool landscape_;
+
+protected:
+//    void showSettingsDialog();
+    bool restoreWidgetState();
+    void errorWidget();
+    void paintEvent(QPaintEvent *event);
+
+public slots:
+  void resizer(const QSize& size);
+  void rotateScreen(const QString& orientation);
+
+public:
+    static QuickWidget *createAndShowNew(const QString& fileName, 
+                                        const QSize& size=QSize(),
+                                        bool rotate=false);
+
+    explicit QuickWidget(QWidget *parent = 0);
+    ~QuickWidget();
+
+};
+
+class QuickWidgetWrapper : public QObject
+{
+    Q_OBJECT
+
+Q_SIGNALS:
+    void onHomeScreenChanged();
+
+public:
+    QuickWidgetWrapper(QuickWidget *owner) : m_owner(owner) {;}
+    Q_PROPERTY(bool isActiveWindow READ onHomeScreen NOTIFY onHomeScreenChanged);
+
+    bool onHomeScreen() const { return m_homeScreen; }
+
+public slots:
+    void setOnHomeScreen(bool active)
+    {
+        if (active == m_homeScreen)
+            return;
+        m_homeScreen = active;
+        emit onHomeScreenChanged();
+    }
+
+private:
+    QuickWidget *m_owner;
+    bool m_homeScreen;
+};
+
+#endif // QuickWidget_HPP