diff options
Diffstat (limited to 'examples/widgets/draganddrop/dropsite')
4 files changed, 50 insertions, 37 deletions
diff --git a/examples/widgets/draganddrop/dropsite/CMakeLists.txt b/examples/widgets/draganddrop/dropsite/CMakeLists.txt index 86ce3b71af..ae8d00eb91 100644 --- a/examples/widgets/draganddrop/dropsite/CMakeLists.txt +++ b/examples/widgets/draganddrop/dropsite/CMakeLists.txt @@ -1,16 +1,13 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + cmake_minimum_required(VERSION 3.16) project(dropsite LANGUAGES CXX) -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/draganddrop/dropsite") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) +qt_standard_project_setup() + qt_add_executable(dropsite droparea.cpp droparea.h dropsitewindow.cpp dropsitewindow.h @@ -22,14 +19,21 @@ set_target_properties(dropsite PROPERTIES MACOSX_BUNDLE TRUE ) -target_link_libraries(dropsite PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets +target_link_libraries(dropsite PRIVATE + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS dropsite - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +qt_generate_deploy_app_script( + TARGET dropsite + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR ) +install(SCRIPT ${deploy_script}) diff --git a/examples/widgets/draganddrop/dropsite/droparea.cpp b/examples/widgets/draganddrop/dropsite/droparea.cpp index 096f59fe16..1b2ff1820d 100644 --- a/examples/widgets/draganddrop/dropsite/droparea.cpp +++ b/examples/widgets/draganddrop/dropsite/droparea.cpp @@ -6,6 +6,8 @@ #include <QDragEnterEvent> #include <QMimeData> +using namespace Qt::StringLiterals; + //! [DropArea constructor] DropArea::DropArea(QWidget *parent) : QLabel(parent) @@ -46,8 +48,8 @@ void DropArea::dropEvent(QDropEvent *event) //! [dropEvent() function part2] if (mimeData->hasImage()) { setPixmap(qvariant_cast<QPixmap>(mimeData->imageData())); - } else if (mimeData->hasFormat(QLatin1String("text/markdown"))) { - setText(QString::fromUtf8(mimeData->data(QLatin1String("text/markdown")))); + } else if (mimeData->hasFormat(u"text/markdown"_s)) { + setText(QString::fromUtf8(mimeData->data(u"text/markdown"_s))); setTextFormat(Qt::MarkdownText); } else if (mimeData->hasHtml()) { setText(mimeData->html()); @@ -58,8 +60,8 @@ void DropArea::dropEvent(QDropEvent *event) } else if (mimeData->hasUrls()) { QList<QUrl> urlList = mimeData->urls(); QString text; - for (int i = 0; i < urlList.size() && i < 32; ++i) - text += urlList.at(i).path() + QLatin1Char('\n'); + for (qsizetype i = 0, count = qMin(urlList.size(), qsizetype(32)); i < count; ++i) + text += urlList.at(i).path() + u'\n'; setText(text); } else { setText(tr("Cannot display data")); diff --git a/examples/widgets/draganddrop/dropsite/droparea.h b/examples/widgets/draganddrop/dropsite/droparea.h index 507f8d854f..3e5947b236 100644 --- a/examples/widgets/draganddrop/dropsite/droparea.h +++ b/examples/widgets/draganddrop/dropsite/droparea.h @@ -31,9 +31,6 @@ protected: void dragMoveEvent(QDragMoveEvent *event) override; void dragLeaveEvent(QDragLeaveEvent *event) override; void dropEvent(QDropEvent *event) override; - -private: - QLabel *label; }; //! [DropArea header part2] diff --git a/examples/widgets/draganddrop/dropsite/dropsitewindow.cpp b/examples/widgets/draganddrop/dropsite/dropsitewindow.cpp index 0208f76a50..2969fdf7ae 100644 --- a/examples/widgets/draganddrop/dropsite/dropsitewindow.cpp +++ b/examples/widgets/draganddrop/dropsite/dropsitewindow.cpp @@ -1,11 +1,23 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -#include <QtWidgets> +#include <QPushButton> +#include <QDialogButtonBox> +#include <QHeaderView> +#include <QTableWidget> +#include <QTableWidgetItem> +#include <QVBoxLayout> + +#include <QClipboard> +#include <QGuiApplication> + +#include <QMimeData> #include "droparea.h" #include "dropsitewindow.h" +using namespace Qt::StringLiterals; + //! [constructor part1] DropSiteWindow::DropSiteWindow() { @@ -23,13 +35,10 @@ DropSiteWindow::DropSiteWindow() //! [constructor part2] //! [constructor part3] - QStringList labels; - labels << tr("Format") << tr("Content"); - formatsTable = new QTableWidget; formatsTable->setColumnCount(2); formatsTable->setEditTriggers(QAbstractItemView::NoEditTriggers); - formatsTable->setHorizontalHeaderLabels(labels); + formatsTable->setHorizontalHeaderLabels({tr("Format"), tr("Content")}); formatsTable->horizontalHeader()->setStretchLastSection(true); //! [constructor part3] @@ -60,7 +69,7 @@ DropSiteWindow::DropSiteWindow() mainLayout->addWidget(buttonBox); setWindowTitle(tr("Drop Site")); - setMinimumSize(350, 500); + resize(700, 500); } //! [constructor part5] @@ -83,20 +92,21 @@ void DropSiteWindow::updateFormatsTable(const QMimeData *mimeData) //! [updateFormatsTable() part3] QString text; - if (format == QLatin1String("text/plain")) { + if (format == u"text/plain") { text = mimeData->text().simplified(); - } else if (format == QLatin1String("text/markdown")) { - text = QString::fromUtf8(mimeData->data(QLatin1String("text/markdown"))); - } else if (format == QLatin1String("text/html")) { + } else if (format == u"text/markdown") { + text = QString::fromUtf8(mimeData->data(u"text/markdown"_s)); + } else if (format == u"text/html") { text = mimeData->html().simplified(); - } else if (format == QLatin1String("text/uri-list")) { + } else if (format == u"text/uri-list") { QList<QUrl> urlList = mimeData->urls(); - for (int i = 0; i < urlList.size() && i < 32; ++i) - text.append(urlList.at(i).toString() + QLatin1Char(' ')); + for (qsizetype i = 0, count = qMin(urlList.size(), qsizetype(32)); i < count; ++i) + text.append(urlList.at(i).toString() + u' '); } else { QByteArray data = mimeData->data(format); - for (int i = 0; i < data.size() && i < 32; ++i) - text.append(QStringLiteral("%1 ").arg(uchar(data[i]), 2, 16, QLatin1Char('0')).toUpper()); + if (data.size() > 32) + data.truncate(32); + text = QString::fromLatin1(data.toHex(' ')).toUpper(); } //! [updateFormatsTable() part3] |