WebSVN – tpanel – Diff – /trunk/tqtmain.cpp

     if (!gPageManager)
+    {
         EXCEPTFATALMSG("The class TPageManager was not initialized!");
+    }
-#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
+    mGestureFilter = new TQGestureFilter(this);
+    connect(mGestureFilter, &TQGestureFilter::gestureEvent, this, &MainWindow::onGestureEvent);
     setAttribute(Qt::WA_AcceptTouchEvents, true);   // We accept touch events
     grabGesture(Qt::PinchGesture);                  // We use a pinch gesture to open the settings dialog
     grabGesture(Qt::SwipeGesture);                  // We support swiping also
 #ifdef Q_OS_IOS                                     // Block autorotate on IOS
             else
                 mSensor->setCurrentOrientation(Qt::LandscapeOrientation);
+        }
+    }
 #endif  // Q_OS_IOS
-#endif  // defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
     // We create the central widget here to make sure the application
     // initializes correct. On mobiles the whole screen is used while on
     // desktops a window with the necessary size is created.
     QWidget *central = new QWidget;
+    }
     if (mIosRotate)
         delete mIosRotate;
 #endif
+    if (mGestureFilter)
+    {
+        disconnect(mGestureFilter, &TQGestureFilter::gestureEvent, this, &MainWindow::onGestureEvent);
+        delete mGestureFilter;
+    }
+}
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
 /**
  * @brief Small thread to invoke the initialization on an Android device.
         event->accept();
+    }
+}
 /**
- * @brief MainWindow::eventFilter filters the QEvent::MouseMove event
- * Beside the filtering of the MouseEvent, it waits for a gesture and
- * call the method gestureEvent() which handles the gesture and opens the
- * setting dialog.
- * @param obj   The object where the event occured.
- * @param event The event.
- * @return `true` when the event should be ignored.
- */
-bool MainWindow::eventFilter(QObject *obj, QEvent *event)
-{
-    ulong handle = 0;
-    if (obj)
-    {
-        if ((handle = extractHandle(obj->objectName().toStdString())) != 0)
-        {
-            OBJECT_t *o = findObject(handle);
-            if (o && o->type == OBJ_SUBVIEW)
-            {
-                MSG_DEBUG("Event of object " << handleToString(handle) << " was not filtered out.");
-                return false;
-            }
-        }
-        else
-            return false;
-    }
-    if (event->type() == QEvent::MouseMove)
-    {
-        QMouseEvent *mev = dynamic_cast<QMouseEvent *>(event);
-        QWidget *w = childAt(mev->x(), mev->y());
-        if (w)
-        {
-            MSG_DEBUG("Object " << w->objectName().toStdString() << " is under mouse cursor.");
-            QObject *par = w->parent();
-            if (par)
-            {
-                MSG_DEBUG("The parent is " << par->objectName().toStdString());
-                if (par->objectName().startsWith("Item_"))
-                {
-                    QObject *ppar = par->parent();
-                    if (ppar)
-                    {
-                        MSG_DEBUG("The pparent is " << ppar->objectName().toStdString());
-                        if (ppar->objectName().startsWith("View_"))
-                            return false;
-                    }
-                }
-            }
-        }
-        return true;    // Filter event out, i.e. stop it being handled further.
-    }
-//    if (event->type() == QEvent::Gesture)
-//        return gestureEvent(static_cast<QGestureEvent*>(event));
-    return false;
-//    return QWidget::eventFilter(obj, event);
-}
-/**
  * @brief MainWindow::event Looks for a gesture
  * @param event The event occured
  * @return TRUE if event was accepted
  */
 bool MainWindow::event(QEvent* event)
+{
     if (event->type() == QEvent::Gesture)
         return gestureEvent(static_cast<QGestureEvent*>(event));
-    return QWidget::event(event);
+    return QMainWindow::event(event);
+}
 /**
  * @brief MainWindow::gestureEvent handles a pinch event
  * If a pinch event occured where the scale factor increased, the settings
+{
     DECL_TRACER("MainWindow::gestureEvent(QGestureEvent* event)");
     if (QGesture *pinch = event->gesture(Qt::PinchGesture))
+    {
-#ifdef QT_DEBUG
-        string gs;
-#endif
         QPinchGesture *pg = static_cast<QPinchGesture *>(pinch);
 #ifdef QT_DEBUG
+        string gs;
         switch(pg->state())
+        {
             case Qt::NoGesture:         gs.assign("no gesture"); break;
             case Qt::GestureStarted:    gs.assign("gesture started"); break;
             case Qt::GestureUpdated:    gs.assign("gesture updated"); break;
+        {
             MSG_DEBUG("total scale: " << pg->totalScaleFactor() << ", scale: " << pg->scaleFactor() << ", last scale: " << pg->lastScaleFactor());
             if (pg->totalScaleFactor() > pg->scaleFactor())
                 settings();
+            return true;
+        }
+    }
     else if (QGesture *swipe = event->gesture(Qt::SwipeGesture))
+    {
-        string gs;
         if (!gPageManager)
             return false;
         QSwipeGesture *sw = static_cast<QSwipeGesture *>(swipe);
         MSG_DEBUG("Swipe gesture detected.");
                 gPageManager->onSwipeEvent(TPageManager::SW_RIGHT);
             else if (sw->verticalDirection() == QSwipeGesture::Up)
                 gPageManager->onSwipeEvent(TPageManager::SW_UP);
             else if (sw->verticalDirection() == QSwipeGesture::Down)
                 gPageManager->onSwipeEvent(TPageManager::SW_DOWN);
+            return true;
+        }
+    }
     return false;
+}
+}
 void MainWindow::mouseMoveEvent(QMouseEvent* event)
+{
     DECL_TRACER("MainWindow::mouseMoveEvent(QMouseEvent* event)");
+    Q_UNUSED(event);
 /*
     QWidget *w = childAt(event->x(), event->y());
     if (w)
+    {
 void MainWindow::keyReleaseEvent(QKeyEvent *event)
+{
     DECL_TRACER("MainWindow::keyReleaseEvent(QKeyEvent *event)");
-    if (event && event->key() == Qt::Key_Back && !mToolbar)
-        return;
+    Q_UNUSED(event);
+}
 /**
  * @brief MainWindow::onScreenOrientationChanged sets invers or normal orientation.
  * This method sets according to the actual set orientation the invers
             nobj.top = scale(top);
+        }
         nobj.object.label = new QLabel("", par->object.widget);
         nobj.object.label->setObjectName(QString("Label_") + handleToString(handle).c_str());
+        if (mGestureFilter)
+        {
-        nobj.object.label->installEventFilter(this);
+            nobj.object.label->installEventFilter(mGestureFilter);
-        nobj.object.label->grabGesture(Qt::PinchGesture);
+            nobj.object.label->grabGesture(Qt::PinchGesture);
-        nobj.object.label->grabGesture(Qt::SwipeGesture);
+            nobj.object.label->grabGesture(Qt::SwipeGesture);
+        }
         nobj.object.label->move(nobj.left, nobj.top);
         nobj.object.label->setFixedSize(nobj.width, nobj.height);
         if (passthrough)
             nobj.object.label->setAttribute(Qt::WA_TransparentForMouseEvents);
     if (!obj->object.widget)
+    {
         obj->object.widget = new QWidget;
         obj->object.widget->setObjectName(QString("Page_") + handleToString(handle).c_str());
+        if (mGestureFilter)
+        {
-        obj->object.widget->installEventFilter(this);
+            obj->object.widget->installEventFilter(mGestureFilter);
-        obj->object.widget->grabGesture(Qt::PinchGesture);
+            obj->object.widget->grabGesture(Qt::PinchGesture);
-        obj->object.widget->grabGesture(Qt::SwipeGesture);
+            obj->object.widget->grabGesture(Qt::SwipeGesture);
+        }
         obj->object.widget->setAutoFillBackground(true);
         obj->invalid = false;
         obj->object.widget->move(0, 0);
 #if defined(Q_OS_IOS) || defined(Q_OS_ANDROID)
         obj->object.widget->setFixedSize(obj->width, obj->height);
     obj->width = scWidth;
     obj->height = scHeight;
     obj->invalid = false;
     obj->remove = false;
     // filter move event
+    if (mGestureFilter)
+    {
-    obj->object.widget->installEventFilter(this);
+        obj->object.widget->installEventFilter(mGestureFilter);
-    obj->object.widget->grabGesture(Qt::PinchGesture);
+        obj->object.widget->grabGesture(Qt::PinchGesture);
-    obj->object.widget->grabGesture(Qt::SwipeGesture);
+        obj->object.widget->grabGesture(Qt::SwipeGesture);
+    }
     obj->aniDirection = true;
     obj->animate = animate;
     if (shouldAdd)
+    {
     if (gPageManager)
         gPageManager->inputCursorPositionChanged(handle, oldPos, newPos);
+}
+void MainWindow::onGestureEvent(QObject *obj, QGestureEvent *event)
+{
+    DECL_TRACER("MainWindow::onGestureEvent(QObject *obj, QGestureEvent *event)");
+    Q_UNUSED(obj);
+    gestureEvent(event);
+}
 QPixmap MainWindow::scaleImage(QPixmap& pix)
+{
     DECL_TRACER("MainWindow::scaleImage(QPixmap& pix)");
     int width = scale(pix.width());

Subversion Repositories tpanel

(root)/trunk/tqtmain.cpp @ 324 – Rev 321 → 323