diff --git a/examples/gestures/imagegestures/imagegestures.pro b/examples/gestures/imagegestures/imagegestures.pro index e9d19ee..399669f 100644 --- a/examples/gestures/imagegestures/imagegestures.pro +++ b/examples/gestures/imagegestures/imagegestures.pro @@ -23,3 +23,6 @@ maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) symbian: warning(This example does not work on Symbian platform) maemo5: warning(This example does not work on Maemo platform) simulator: warning(This example does not work on Simulator platform) + + +CONFIG+=console diff --git a/examples/gestures/imagegestures/imagewidget.cpp b/examples/gestures/imagegestures/imagewidget.cpp index 6dd28c5..5aab9d2 100644 --- a/examples/gestures/imagegestures/imagewidget.cpp +++ b/examples/gestures/imagegestures/imagewidget.cpp @@ -57,9 +57,21 @@ ImageWidget::ImageWidget(QWidget *parent) setMinimumSize(QSize(100,100)); //! [enable gestures] + const QStringList args = QApplication::arguments(); grabGesture(Qt::PanGesture); grabGesture(Qt::PinchGesture); grabGesture(Qt::SwipeGesture); + if (args.contains("-t")) { + qDebug("Qt::TapGesture"); + grabGesture(Qt::TapGesture); + } + if (args.contains("-h")) { + qDebug("Qt::TapAndHoldGesture"); + grabGesture(Qt::TapAndHoldGesture); + } + + + //! [enable gestures] } //! [constructor] @@ -103,6 +115,7 @@ void ImageWidget::mouseDoubleClickEvent(QMouseEvent *) //! [gesture event handler] bool ImageWidget::gestureEvent(QGestureEvent *event) { + qDebug() << __FUNCTION__ << event->type() << event->gestures(); if (QGesture *swipe = event->gesture(Qt::SwipeGesture)) swipeTriggered(static_cast(swipe)); else if (QGesture *pan = event->gesture(Qt::PanGesture)) @@ -115,6 +128,7 @@ bool ImageWidget::gestureEvent(QGestureEvent *event) void ImageWidget::panTriggered(QPanGesture *gesture) { + qDebug() << __FUNCTION__ << gesture; #ifndef QT_NO_CURSOR switch (gesture->state()) { case Qt::GestureStarted: @@ -133,6 +147,7 @@ void ImageWidget::panTriggered(QPanGesture *gesture) void ImageWidget::pinchTriggered(QPinchGesture *gesture) { + qDebug() << __FUNCTION__ << gesture; QPinchGesture::ChangeFlags changeFlags = gesture->changeFlags(); if (changeFlags & QPinchGesture::RotationAngleChanged) { qreal value = gesture->property("rotationAngle").toReal(); @@ -153,6 +168,7 @@ void ImageWidget::pinchTriggered(QPinchGesture *gesture) //! [swipe function] void ImageWidget::swipeTriggered(QSwipeGesture *gesture) { + qDebug() << __FUNCTION__ << gesture; if (gesture->state() == Qt::GestureFinished) { if (gesture->horizontalDirection() == QSwipeGesture::Left || gesture->verticalDirection() == QSwipeGesture::Up) @@ -195,6 +211,9 @@ QImage ImageWidget::loadImage(const QString &fileName) qDebug() << fileName << ": corrupted image"; return QImage(); } + if (image.width() > 500) + image = image.scaled(QSize(500, 500), Qt::KeepAspectRatio); + qDebug() << __FUNCTION__ << fileName << image.size(); return image; } @@ -234,6 +253,7 @@ void ImageWidget::goPrevImage() void ImageWidget::goToImage(int index) { + qDebug() << __FUNCTION__ << index << files.size(); if (files.isEmpty()) return; diff --git a/examples/gestures/imagegestures/main.cpp b/examples/gestures/imagegestures/main.cpp index 54b0934..f0615e7 100644 --- a/examples/gestures/imagegestures/main.cpp +++ b/examples/gestures/imagegestures/main.cpp @@ -45,14 +45,18 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); + const QStringList args = QApplication::arguments(); + if (args.contains("-n")) { + qDebug("Qt::AA_NativeWindows"); + QApplication::setAttribute(Qt::AA_NativeWindows); + } MainWidget w; + w.move(100, 100); + w.resize(800, 800); w.show(); - if (QApplication::arguments().size() > 1) - w.openDirectory(QApplication::arguments().at(1)); - else - w.openDirectory(QFileDialog::getExistingDirectory(0, "Select image folder")); + w.openDirectory(QDesktopServices::storageLocation(QDesktopServices::PicturesLocation)); return app.exec(); }