diff options
Diffstat (limited to 'examples/widgets/draganddrop')
22 files changed, 49 insertions, 44 deletions
diff --git a/examples/widgets/draganddrop/draggableicons/dragwidget.cpp b/examples/widgets/draganddrop/draggableicons/dragwidget.cpp index 2422911fac..b9441f8a8a 100644 --- a/examples/widgets/draganddrop/draggableicons/dragwidget.cpp +++ b/examples/widgets/draganddrop/draggableicons/dragwidget.cpp @@ -159,9 +159,9 @@ void DragWidget::mousePressEvent(QMouseEvent *event) child->setPixmap(tempPixmap); - if (drag->exec(Qt::CopyAction | Qt::MoveAction, Qt::CopyAction) == Qt::MoveAction) + if (drag->exec(Qt::CopyAction | Qt::MoveAction, Qt::CopyAction) == Qt::MoveAction) { child->close(); - else { + } else { child->show(); child->setPixmap(pixmap); } diff --git a/examples/widgets/draganddrop/draggableicons/dragwidget.h b/examples/widgets/draganddrop/draggableicons/dragwidget.h index b6154430fe..dcacec8e3d 100644 --- a/examples/widgets/draganddrop/draggableicons/dragwidget.h +++ b/examples/widgets/draganddrop/draggableicons/dragwidget.h @@ -52,7 +52,7 @@ QT_END_NAMESPACE class DragWidget : public QFrame { public: - DragWidget(QWidget *parent=0); + DragWidget(QWidget *parent = 0); protected: void dragEnterEvent(QDragEnterEvent *event); @@ -62,4 +62,4 @@ protected: }; //! [0] -#endif +#endif // DRAGWIDGET_H diff --git a/examples/widgets/draganddrop/draggableicons/main.cpp b/examples/widgets/draganddrop/draggableicons/main.cpp index 6e1110b1f3..03798b8e40 100644 --- a/examples/widgets/draganddrop/draggableicons/main.cpp +++ b/examples/widgets/draganddrop/draggableicons/main.cpp @@ -40,6 +40,7 @@ #include <QApplication> #include <QHBoxLayout> + #include "dragwidget.h" int main(int argc, char *argv[]) diff --git a/examples/widgets/draganddrop/draggabletext/draglabel.cpp b/examples/widgets/draganddrop/draggabletext/draglabel.cpp index cd9d5ba09e..0f50f19fa2 100644 --- a/examples/widgets/draganddrop/draggabletext/draglabel.cpp +++ b/examples/widgets/draganddrop/draggabletext/draglabel.cpp @@ -38,8 +38,6 @@ ** ****************************************************************************/ -#include <QtWidgets> - #include "draglabel.h" DragLabel::DragLabel(const QString &text, QWidget *parent) diff --git a/examples/widgets/draganddrop/draggabletext/draglabel.h b/examples/widgets/draganddrop/draggabletext/draglabel.h index 404e1fbecf..3921f6bb1f 100644 --- a/examples/widgets/draganddrop/draggabletext/draglabel.h +++ b/examples/widgets/draganddrop/draggabletext/draglabel.h @@ -55,4 +55,4 @@ public: DragLabel(const QString &text, QWidget *parent); }; -#endif +#endif // DRAGLABEL_H diff --git a/examples/widgets/draganddrop/draggabletext/dragwidget.cpp b/examples/widgets/draganddrop/draggabletext/dragwidget.cpp index 98e73701b3..5424b9a741 100644 --- a/examples/widgets/draganddrop/draggabletext/dragwidget.cpp +++ b/examples/widgets/draganddrop/draggabletext/dragwidget.cpp @@ -147,8 +147,7 @@ void DragWidget::mousePressEvent(QMouseEvent *event) QMimeData *mimeData = new QMimeData; mimeData->setText(child->text()); mimeData->setData("application/x-hotspot", - QByteArray::number(hotSpot.x()) - + " " + QByteArray::number(hotSpot.y())); + QByteArray::number(hotSpot.x()) + " " + QByteArray::number(hotSpot.y())); QPixmap pixmap(child->size()); child->render(&pixmap); diff --git a/examples/widgets/draganddrop/draggabletext/dragwidget.h b/examples/widgets/draganddrop/draggabletext/dragwidget.h index 77b44c07f1..dd222489c9 100644 --- a/examples/widgets/draganddrop/draggabletext/dragwidget.h +++ b/examples/widgets/draganddrop/draggabletext/dragwidget.h @@ -59,4 +59,4 @@ protected: void mousePressEvent(QMouseEvent *event); }; -#endif +#endif // DRAGWIDGET_H diff --git a/examples/widgets/draganddrop/draggabletext/main.cpp b/examples/widgets/draganddrop/draggabletext/main.cpp index 126484a6a5..c68d251224 100644 --- a/examples/widgets/draganddrop/draggabletext/main.cpp +++ b/examples/widgets/draganddrop/draggabletext/main.cpp @@ -39,6 +39,7 @@ ****************************************************************************/ #include <QApplication> + #include "dragwidget.h" int main(int argc, char *argv[]) diff --git a/examples/widgets/draganddrop/dropsite/droparea.cpp b/examples/widgets/draganddrop/dropsite/droparea.cpp index e4c087852a..9982529d98 100644 --- a/examples/widgets/draganddrop/dropsite/droparea.cpp +++ b/examples/widgets/draganddrop/dropsite/droparea.cpp @@ -38,10 +38,11 @@ ** ****************************************************************************/ -#include <QtWidgets> - #include "droparea.h" +#include <QDragEnterEvent> +#include <QMimeData> + //! [DropArea constructor] DropArea::DropArea(QWidget *parent) : QLabel(parent) diff --git a/examples/widgets/draganddrop/dropsite/droparea.h b/examples/widgets/draganddrop/dropsite/droparea.h index ac66182a70..8784090325 100644 --- a/examples/widgets/draganddrop/dropsite/droparea.h +++ b/examples/widgets/draganddrop/dropsite/droparea.h @@ -74,4 +74,4 @@ private: }; //! [DropArea header part2] -#endif +#endif // DROPAREA_H diff --git a/examples/widgets/draganddrop/dropsite/dropsitewindow.h b/examples/widgets/draganddrop/dropsite/dropsitewindow.h index a4aeaf4fc5..45fdd36d3f 100644 --- a/examples/widgets/draganddrop/dropsite/dropsitewindow.h +++ b/examples/widgets/draganddrop/dropsite/dropsitewindow.h @@ -74,4 +74,4 @@ private: }; //! [DropSiteWindow header] -#endif +#endif // DROPSITEWINDOW_H diff --git a/examples/widgets/draganddrop/fridgemagnets/draglabel.cpp b/examples/widgets/draganddrop/fridgemagnets/draglabel.cpp index 327929132b..004ebd3fe5 100644 --- a/examples/widgets/draganddrop/fridgemagnets/draglabel.cpp +++ b/examples/widgets/draganddrop/fridgemagnets/draglabel.cpp @@ -38,10 +38,10 @@ ** ****************************************************************************/ -#include <QtWidgets> - #include "draglabel.h" +#include <QtWidgets> + //! [0] DragLabel::DragLabel(const QString &text, QWidget *parent) : QLabel(parent) @@ -49,8 +49,7 @@ DragLabel::DragLabel(const QString &text, QWidget *parent) QFontMetrics metric(font()); QSize size = metric.size(Qt::TextSingleLine, text); - QImage image(size.width() + 12, size.height() + 12, - QImage::Format_ARGB32_Premultiplied); + QImage image(size.width() + 12, size.height() + 12, QImage::Format_ARGB32_Premultiplied); image.fill(qRgba(0, 0, 0, 0)); QFont font; diff --git a/examples/widgets/draganddrop/fridgemagnets/draglabel.h b/examples/widgets/draganddrop/fridgemagnets/draglabel.h index c659a3a81f..e1fa2a2ba4 100644 --- a/examples/widgets/draganddrop/fridgemagnets/draglabel.h +++ b/examples/widgets/draganddrop/fridgemagnets/draglabel.h @@ -61,4 +61,4 @@ private: }; //! [0] -#endif +#endif // DRAGLABEL_H diff --git a/examples/widgets/draganddrop/fridgemagnets/dragwidget.cpp b/examples/widgets/draganddrop/fridgemagnets/dragwidget.cpp index e45db9ec96..3aa8855ae1 100644 --- a/examples/widgets/draganddrop/fridgemagnets/dragwidget.cpp +++ b/examples/widgets/draganddrop/fridgemagnets/dragwidget.cpp @@ -38,11 +38,11 @@ ** ****************************************************************************/ -#include <QtWidgets> - #include "draglabel.h" #include "dragwidget.h" +#include <QtWidgets> + //! [0] DragWidget::DragWidget(QWidget *parent) : QWidget(parent) diff --git a/examples/widgets/draganddrop/fridgemagnets/dragwidget.h b/examples/widgets/draganddrop/fridgemagnets/dragwidget.h index 150702376e..851803affa 100644 --- a/examples/widgets/draganddrop/fridgemagnets/dragwidget.h +++ b/examples/widgets/draganddrop/fridgemagnets/dragwidget.h @@ -62,4 +62,4 @@ protected: }; //! [0] -#endif +#endif // DRAGWIDGET_H diff --git a/examples/widgets/draganddrop/fridgemagnets/main.cpp b/examples/widgets/draganddrop/fridgemagnets/main.cpp index 6ba0e42554..6eee38460a 100644 --- a/examples/widgets/draganddrop/fridgemagnets/main.cpp +++ b/examples/widgets/draganddrop/fridgemagnets/main.cpp @@ -39,6 +39,7 @@ ****************************************************************************/ #include <QApplication> + #include "dragwidget.h" int main(int argc, char *argv[]) diff --git a/examples/widgets/draganddrop/puzzle/mainwindow.cpp b/examples/widgets/draganddrop/puzzle/mainwindow.cpp index 47300f3f28..bc0f4d6838 100644 --- a/examples/widgets/draganddrop/puzzle/mainwindow.cpp +++ b/examples/widgets/draganddrop/puzzle/mainwindow.cpp @@ -38,13 +38,13 @@ ** ****************************************************************************/ -#include <QtWidgets> -#include <stdlib.h> - #include "mainwindow.h" #include "pieceslist.h" #include "puzzlewidget.h" +#include <QtWidgets> +#include <stdlib.h> + MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) { @@ -59,9 +59,10 @@ void MainWindow::openImage(const QString &path) { QString fileName = path; - if (fileName.isNull()) + if (fileName.isNull()) { fileName = QFileDialog::getOpenFileName(this, tr("Open Image"), "", "Image Files (*.png *.jpg *.bmp)"); + } if (!fileName.isEmpty()) { QPixmap newImage; @@ -79,9 +80,9 @@ void MainWindow::openImage(const QString &path) void MainWindow::setCompleted() { QMessageBox::information(this, tr("Puzzle Completed"), - tr("Congratulations! You have completed the puzzle!\n" - "Click OK to start again."), - QMessageBox::Ok); + tr("Congratulations! You have completed the puzzle!\n" + "Click OK to start again."), + QMessageBox::Ok); setupPuzzle(); } diff --git a/examples/widgets/draganddrop/puzzle/mainwindow.h b/examples/widgets/draganddrop/puzzle/mainwindow.h index 3283bea39c..c975f50243 100644 --- a/examples/widgets/draganddrop/puzzle/mainwindow.h +++ b/examples/widgets/draganddrop/puzzle/mainwindow.h @@ -73,4 +73,4 @@ private: PuzzleWidget *puzzleWidget; }; -#endif +#endif // MAINWINDOW_H diff --git a/examples/widgets/draganddrop/puzzle/pieceslist.cpp b/examples/widgets/draganddrop/puzzle/pieceslist.cpp index eab48b3562..434d5a0344 100644 --- a/examples/widgets/draganddrop/puzzle/pieceslist.cpp +++ b/examples/widgets/draganddrop/puzzle/pieceslist.cpp @@ -38,10 +38,12 @@ ** ****************************************************************************/ -#include <QtWidgets> - #include "pieceslist.h" +#include <QDrag> +#include <QDragEnterEvent> +#include <QMimeData> + PiecesList::PiecesList(int pieceSize, QWidget *parent) : QListWidget(parent), m_PieceSize(pieceSize) { @@ -66,8 +68,9 @@ void PiecesList::dragMoveEvent(QDragMoveEvent *event) if (event->mimeData()->hasFormat("image/x-puzzle-piece")) { event->setDropAction(Qt::MoveAction); event->accept(); - } else + } else { event->ignore(); + } } void PiecesList::dropEvent(QDropEvent *event) @@ -83,8 +86,9 @@ void PiecesList::dropEvent(QDropEvent *event) event->setDropAction(Qt::MoveAction); event->accept(); - } else + } else { event->ignore(); + } } void PiecesList::addPiece(QPixmap pixmap, QPoint location) @@ -93,8 +97,7 @@ void PiecesList::addPiece(QPixmap pixmap, QPoint location) pieceItem->setIcon(QIcon(pixmap)); pieceItem->setData(Qt::UserRole, QVariant(pixmap)); pieceItem->setData(Qt::UserRole+1, location); - pieceItem->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable - | Qt::ItemIsDragEnabled); + pieceItem->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled); } void PiecesList::startDrag(Qt::DropActions /*supportedActions*/) diff --git a/examples/widgets/draganddrop/puzzle/pieceslist.h b/examples/widgets/draganddrop/puzzle/pieceslist.h index 7824654a8d..19fa27a72a 100644 --- a/examples/widgets/draganddrop/puzzle/pieceslist.h +++ b/examples/widgets/draganddrop/puzzle/pieceslist.h @@ -60,4 +60,4 @@ protected: int m_PieceSize; }; -#endif +#endif // PIECESLIST_H diff --git a/examples/widgets/draganddrop/puzzle/puzzlewidget.cpp b/examples/widgets/draganddrop/puzzle/puzzlewidget.cpp index 3798b2ec7b..f48ef08745 100644 --- a/examples/widgets/draganddrop/puzzle/puzzlewidget.cpp +++ b/examples/widgets/draganddrop/puzzle/puzzlewidget.cpp @@ -38,10 +38,13 @@ ** ****************************************************************************/ -#include <QtWidgets> - #include "puzzlewidget.h" +#include <QDrag> +#include <QDragEnterEvent> +#include <QMimeData> +#include <QPainter> + PuzzleWidget::PuzzleWidget(int imageSize, QWidget *parent) : QWidget(parent), m_ImageSize(imageSize) { @@ -130,9 +133,8 @@ void PuzzleWidget::dropEvent(QDropEvent *event) int PuzzleWidget::findPiece(const QRect &pieceRect) const { for (int i = 0; i < pieceRects.size(); ++i) { - if (pieceRect == pieceRects[i]) { + if (pieceRect == pieceRects[i]) return i; - } } return -1; } @@ -192,9 +194,8 @@ void PuzzleWidget::paintEvent(QPaintEvent *event) painter.drawRect(highlightedRect.adjusted(0, 0, -1, -1)); } - for (int i = 0; i < pieceRects.size(); ++i) { + for (int i = 0; i < pieceRects.size(); ++i) painter.drawPixmap(pieceRects[i], piecePixmaps[i]); - } painter.end(); } diff --git a/examples/widgets/draganddrop/puzzle/puzzlewidget.h b/examples/widgets/draganddrop/puzzle/puzzlewidget.h index 996c0aa184..6322eec93e 100644 --- a/examples/widgets/draganddrop/puzzle/puzzlewidget.h +++ b/examples/widgets/draganddrop/puzzle/puzzlewidget.h @@ -86,4 +86,4 @@ private: int m_ImageSize; }; -#endif +#endif // PUZZLEWIDGET_H |