diff options
Diffstat (limited to 'examples/widgets/tools')
75 files changed, 56 insertions, 3328 deletions
diff --git a/examples/widgets/tools/CMakeLists.txt b/examples/widgets/tools/CMakeLists.txt index edf951fe18..a5ec5c4a3e 100644 --- a/examples/widgets/tools/CMakeLists.txt +++ b/examples/widgets/tools/CMakeLists.txt @@ -1,18 +1,8 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause qt_internal_add_example(completer) qt_internal_add_example(customcompleter) qt_internal_add_example(regularexpression) -qt_internal_add_example(settingseditor) -qt_internal_add_example(styleplugin) qt_internal_add_example(treemodelcompleter) qt_internal_add_example(undoframework) - -if(QT_FEATURE_library) - qt_internal_add_example(echoplugin) - - if(QT_FEATURE_inputdialog) - qt_internal_add_example(plugandpaint) - endif() -endif() diff --git a/examples/widgets/tools/completer/CMakeLists.txt b/examples/widgets/tools/completer/CMakeLists.txt index 0af779388f..a4ad8055b9 100644 --- a/examples/widgets/tools/completer/CMakeLists.txt +++ b/examples/widgets/tools/completer/CMakeLists.txt @@ -1,15 +1,9 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(completer LANGUAGES CXX) -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/tools/completer") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) qt_standard_project_setup() @@ -45,7 +39,14 @@ qt_add_resources(completer "completer" ) install(TARGETS completer - 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 completer + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR ) +install(SCRIPT ${deploy_script}) diff --git a/examples/widgets/tools/completer/main.cpp b/examples/widgets/tools/completer/main.cpp index 4ea6bc1ac9..060dfe5bd8 100644 --- a/examples/widgets/tools/completer/main.cpp +++ b/examples/widgets/tools/completer/main.cpp @@ -7,8 +7,6 @@ //! [0] int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(completer); - QApplication app(argc, argv); MainWindow window; window.show(); diff --git a/examples/widgets/tools/customcompleter/CMakeLists.txt b/examples/widgets/tools/customcompleter/CMakeLists.txt index 9e1ee1222a..8340f2cfdf 100644 --- a/examples/widgets/tools/customcompleter/CMakeLists.txt +++ b/examples/widgets/tools/customcompleter/CMakeLists.txt @@ -1,15 +1,9 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(customcompleter LANGUAGES CXX) -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/tools/customcompleter") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) qt_standard_project_setup() @@ -44,7 +38,14 @@ qt_add_resources(customcompleter "customcompleter" ) install(TARGETS customcompleter - 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 customcompleter + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR ) +install(SCRIPT ${deploy_script}) diff --git a/examples/widgets/tools/customcompleter/main.cpp b/examples/widgets/tools/customcompleter/main.cpp index 13e8544b90..060dfe5bd8 100644 --- a/examples/widgets/tools/customcompleter/main.cpp +++ b/examples/widgets/tools/customcompleter/main.cpp @@ -7,8 +7,6 @@ //! [0] int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(customcompleter); - QApplication app(argc, argv); MainWindow window; window.show(); diff --git a/examples/widgets/tools/echoplugin/CMakeLists.txt b/examples/widgets/tools/echoplugin/CMakeLists.txt deleted file mode 100644 index cfe76f4a73..0000000000 --- a/examples/widgets/tools/echoplugin/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause - -cmake_minimum_required(VERSION 3.16) -project(plugandpaint LANGUAGES CXX) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/tools/echoplugin") - -find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) - -qt_standard_project_setup() - -add_subdirectory(plugin) -add_subdirectory(echowindow) diff --git a/examples/widgets/tools/echoplugin/echoplugin.pro b/examples/widgets/tools/echoplugin/echoplugin.pro deleted file mode 100644 index 1e3d625b2f..0000000000 --- a/examples/widgets/tools/echoplugin/echoplugin.pro +++ /dev/null @@ -1,5 +0,0 @@ -#! [0] -TEMPLATE = subdirs -SUBDIRS = echowindow \ - plugin -#! [0] diff --git a/examples/widgets/tools/echoplugin/echowindow/CMakeLists.txt b/examples/widgets/tools/echoplugin/echowindow/CMakeLists.txt deleted file mode 100644 index 728e6d4856..0000000000 --- a/examples/widgets/tools/echoplugin/echowindow/CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause - -qt_add_executable(echopluginwindow - echointerface.h - echowindow.cpp echowindow.h - main.cpp -) - -set_target_properties(echopluginwindow PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -target_link_libraries(echopluginwindow PRIVATE - Qt6::Core - Qt6::Gui - Qt6::Widgets -) - -if(NOT QT6_IS_SHARED_LIBS_BUILD) - target_link_libraries(echopluginwindow PRIVATE - echoplugin - ) -endif() - -install(TARGETS echopluginwindow - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/widgets/tools/echoplugin/echowindow/echointerface.h b/examples/widgets/tools/echoplugin/echowindow/echointerface.h deleted file mode 100644 index c36578fd21..0000000000 --- a/examples/widgets/tools/echoplugin/echowindow/echointerface.h +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef ECHOINTERFACE_H -#define ECHOINTERFACE_H - -#include <QObject> -#include <QString> - -//! [0] -class EchoInterface -{ -public: - virtual ~EchoInterface() = default; - virtual QString echo(const QString &message) = 0; -}; - - -QT_BEGIN_NAMESPACE - -#define EchoInterface_iid "org.qt-project.Qt.Examples.EchoInterface" - -Q_DECLARE_INTERFACE(EchoInterface, EchoInterface_iid) -QT_END_NAMESPACE - -//! [0] -#endif diff --git a/examples/widgets/tools/echoplugin/echowindow/echowindow.cpp b/examples/widgets/tools/echoplugin/echowindow/echowindow.cpp deleted file mode 100644 index 718c412c33..0000000000 --- a/examples/widgets/tools/echoplugin/echowindow/echowindow.cpp +++ /dev/null @@ -1,90 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include "echowindow.h" - -#include <QCoreApplication> -#include <QDir> -#include <QLabel> -#include <QLayout> -#include <QLineEdit> -#include <QMessageBox> -#include <QPluginLoader> -#include <QPushButton> - -//! [0] -EchoWindow::EchoWindow() -{ - createGUI(); - setLayout(layout); - setWindowTitle("Echo Plugin Example"); - - if (!loadPlugin()) { - QMessageBox::information(this, "Error", "Could not load the plugin"); - lineEdit->setEnabled(false); - button->setEnabled(false); - } -} -//! [0] - -//! [1] -void EchoWindow::sendEcho() -{ - QString text = echoInterface->echo(lineEdit->text()); - label->setText(text); -} -//! [1] - -//! [2] -void EchoWindow::createGUI() -{ - lineEdit = new QLineEdit; - label = new QLabel; - label->setFrameStyle(QFrame::Box | QFrame::Plain); - button = new QPushButton(tr("Send Message")); - - connect(lineEdit, &QLineEdit::editingFinished, - this, &EchoWindow::sendEcho); - connect(button, &QPushButton::clicked, - this, &EchoWindow::sendEcho); - - layout = new QGridLayout; - layout->addWidget(new QLabel(tr("Message:")), 0, 0); - layout->addWidget(lineEdit, 0, 1); - layout->addWidget(new QLabel(tr("Answer:")), 1, 0); - layout->addWidget(label, 1, 1); - layout->addWidget(button, 2, 1, Qt::AlignRight); - layout->setSizeConstraint(QLayout::SetFixedSize); -} -//! [2] - -//! [3] -bool EchoWindow::loadPlugin() -{ - QDir pluginsDir(QCoreApplication::applicationDirPath()); -#if defined(Q_OS_WIN) - if (pluginsDir.dirName().toLower() == "debug" || pluginsDir.dirName().toLower() == "release") - pluginsDir.cdUp(); -#elif defined(Q_OS_MAC) - if (pluginsDir.dirName() == "MacOS") { - pluginsDir.cdUp(); - pluginsDir.cdUp(); - pluginsDir.cdUp(); - } -#endif - pluginsDir.cd("plugins"); - const QStringList entries = pluginsDir.entryList(QDir::Files); - for (const QString &fileName : entries) { - QPluginLoader pluginLoader(pluginsDir.absoluteFilePath(fileName)); - QObject *plugin = pluginLoader.instance(); - if (plugin) { - echoInterface = qobject_cast<EchoInterface *>(plugin); - if (echoInterface) - return true; - pluginLoader.unload(); - } - } - - return false; -} -//! [3] diff --git a/examples/widgets/tools/echoplugin/echowindow/echowindow.h b/examples/widgets/tools/echoplugin/echowindow/echowindow.h deleted file mode 100644 index 25d08162a9..0000000000 --- a/examples/widgets/tools/echoplugin/echowindow/echowindow.h +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef ECHODIALOG_H -#define ECHODIALOG_H - -#include <QWidget> - -#include "echointerface.h" - -QT_BEGIN_NAMESPACE -class QString; -class QLineEdit; -class QLabel; -class QPushButton; -class QGridLayout; -QT_END_NAMESPACE - -//! [0] -class EchoWindow : public QWidget -{ - Q_OBJECT - -public: - EchoWindow(); - -private slots: - void sendEcho(); - -private: - void createGUI(); - bool loadPlugin(); - - EchoInterface *echoInterface; - QLineEdit *lineEdit; - QLabel *label; - QPushButton *button; - QGridLayout *layout; -}; -//! [0] - -#endif diff --git a/examples/widgets/tools/echoplugin/echowindow/echowindow.pro b/examples/widgets/tools/echoplugin/echowindow/echowindow.pro deleted file mode 100644 index 092258dd30..0000000000 --- a/examples/widgets/tools/echoplugin/echowindow/echowindow.pro +++ /dev/null @@ -1,21 +0,0 @@ -QT += widgets - -HEADERS = echowindow.h \ - echointerface.h -SOURCES = echowindow.cpp \ - main.cpp - -TARGET = echoplugin -QMAKE_PROJECT_NAME = echopluginwindow -win32 { - CONFIG(debug, release|debug):DESTDIR = ../debug/ - CONFIG(release, release|debug):DESTDIR = ../release/ -} else { - DESTDIR = ../ -} - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/echoplugin -INSTALLS += target - -CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/widgets/tools/echoplugin/echowindow/main.cpp b/examples/widgets/tools/echoplugin/echowindow/main.cpp deleted file mode 100644 index c48af33773..0000000000 --- a/examples/widgets/tools/echoplugin/echowindow/main.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include <QApplication> - -#include "echowindow.h" -#include "echointerface.h" - -//! [0] -int main(int argv, char *args[]) -{ - QApplication app(argv, args); - - EchoWindow window; - window.show(); - - return app.exec(); -} -//! [0] diff --git a/examples/widgets/tools/echoplugin/plugin/CMakeLists.txt b/examples/widgets/tools/echoplugin/plugin/CMakeLists.txt deleted file mode 100644 index d691eb4735..0000000000 --- a/examples/widgets/tools/echoplugin/plugin/CMakeLists.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause - -qt_add_plugin(echoplugin - CLASS_NAME EchoPlugin - echoplugin.cpp echoplugin.h -) - -set_target_properties(echoplugin PROPERTIES - LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/echowindow" -) - -target_include_directories(echoplugin PRIVATE - ../echowindow -) - -target_link_libraries(echoplugin PRIVATE - Qt6::Core - Qt6::Gui - Qt6::Widgets -) - -install(TARGETS echoplugin - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/widgets/tools/echoplugin/plugin/echoplugin.cpp b/examples/widgets/tools/echoplugin/plugin/echoplugin.cpp deleted file mode 100644 index 55ccedb39e..0000000000 --- a/examples/widgets/tools/echoplugin/plugin/echoplugin.cpp +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include "echoplugin.h" - -//! [0] -QString EchoPlugin::echo(const QString &message) -{ - return message; -} -//! [0] diff --git a/examples/widgets/tools/echoplugin/plugin/echoplugin.h b/examples/widgets/tools/echoplugin/plugin/echoplugin.h deleted file mode 100644 index 13e630da03..0000000000 --- a/examples/widgets/tools/echoplugin/plugin/echoplugin.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef ECHOPLUGIN_H -#define ECHOPLUGIN_H - -#include <QObject> -#include <QtPlugin> -#include "echointerface.h" - -//! [0] -class EchoPlugin : public QObject, EchoInterface -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.EchoInterface" FILE "echoplugin.json") - Q_INTERFACES(EchoInterface) - -public: - QString echo(const QString &message) override; -}; -//! [0] - -#endif diff --git a/examples/widgets/tools/echoplugin/plugin/echoplugin.json b/examples/widgets/tools/echoplugin/plugin/echoplugin.json deleted file mode 100644 index 0967ef424b..0000000000 --- a/examples/widgets/tools/echoplugin/plugin/echoplugin.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/examples/widgets/tools/echoplugin/plugin/plugin.pro b/examples/widgets/tools/echoplugin/plugin/plugin.pro deleted file mode 100644 index a4b54b18f6..0000000000 --- a/examples/widgets/tools/echoplugin/plugin/plugin.pro +++ /dev/null @@ -1,18 +0,0 @@ -#! [0] -TEMPLATE = lib -CONFIG += plugin -QT += widgets -INCLUDEPATH += ../echowindow -HEADERS = echoplugin.h -SOURCES = echoplugin.cpp -TARGET = $$qtLibraryTarget(echoplugin) -DESTDIR = ../plugins -#! [0] - -EXAMPLE_FILES = echoplugin.json - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/echoplugin/plugins -INSTALLS += target - -CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/widgets/tools/plugandpaint/CMakeLists.txt b/examples/widgets/tools/plugandpaint/CMakeLists.txt deleted file mode 100644 index 61b7ad728e..0000000000 --- a/examples/widgets/tools/plugandpaint/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause - -cmake_minimum_required(VERSION 3.16) -project(plugandpaint LANGUAGES CXX) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/tools/plugandpaint") - -find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) - -qt_standard_project_setup() - -add_subdirectory(plugins) -add_subdirectory(app) diff --git a/examples/widgets/tools/plugandpaint/app/CMakeLists.txt b/examples/widgets/tools/plugandpaint/app/CMakeLists.txt deleted file mode 100644 index 5ab3171284..0000000000 --- a/examples/widgets/tools/plugandpaint/app/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause - -qt_add_executable(plugandpaint - interfaces.h - main.cpp - mainwindow.cpp mainwindow.h - paintarea.cpp paintarea.h - plugindialog.cpp plugindialog.h -) - -set_target_properties(plugandpaint PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -target_link_libraries(plugandpaint PRIVATE - Qt6::Widgets - pnp_basictools -) - -if(NOT QT6_IS_SHARED_LIBS_BUILD) - target_link_libraries(plugandpaint PRIVATE - pnp_extrafilters - ) -endif() - -install(TARGETS plugandpaint - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/widgets/tools/plugandpaint/app/app.pro b/examples/widgets/tools/plugandpaint/app/app.pro deleted file mode 100644 index e5ff02ecf2..0000000000 --- a/examples/widgets/tools/plugandpaint/app/app.pro +++ /dev/null @@ -1,37 +0,0 @@ -#! [0] -TARGET = plugandpaint -DESTDIR = .. - -QT += widgets - -HEADERS = interfaces.h \ - mainwindow.h \ - paintarea.h \ - plugindialog.h -SOURCES = main.cpp \ - mainwindow.cpp \ - paintarea.cpp \ - plugindialog.cpp - -LIBS = -L../plugins - -macx-xcode { - LIBS += -lpnp_basictools$($${QMAKE_XCODE_LIBRARY_SUFFIX_SETTING}) -} else { - android { - LIBS += -lpnp_basictools_$${QT_ARCH} - } else { - LIBS += -lpnp_basictools - } - if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { - mac:LIBS = $$member(LIBS, 0) $$member(LIBS, 1)_debug - win32:LIBS = $$member(LIBS, 0) $$member(LIBS, 1)d - } -} -#! [0] - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/plugandpaint -INSTALLS += target - -CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/widgets/tools/plugandpaint/app/interfaces.h b/examples/widgets/tools/plugandpaint/app/interfaces.h deleted file mode 100644 index 9cd0e34fda..0000000000 --- a/examples/widgets/tools/plugandpaint/app/interfaces.h +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef INTERFACES_H -#define INTERFACES_H - -#include <QtPlugin> - -QT_BEGIN_NAMESPACE -class QImage; -class QPainter; -class QWidget; -class QPainterPath; -class QPoint; -class QRect; -class QString; -QT_END_NAMESPACE - -//! [0] -class BrushInterface -{ -public: - virtual ~BrushInterface() = default; - - virtual QStringList brushes() const = 0; - virtual QRect mousePress(const QString &brush, QPainter &painter, - const QPoint &pos) = 0; - virtual QRect mouseMove(const QString &brush, QPainter &painter, - const QPoint &oldPos, const QPoint &newPos) = 0; - virtual QRect mouseRelease(const QString &brush, QPainter &painter, - const QPoint &pos) = 0; -}; -//! [0] - -//! [1] -class ShapeInterface -{ -public: - virtual ~ShapeInterface() = default; - - virtual QStringList shapes() const = 0; - virtual QPainterPath generateShape(const QString &shape, - QWidget *parent) = 0; -}; -//! [1] - -//! [2] -class FilterInterface -{ -public: - virtual ~FilterInterface() = default; - - virtual QStringList filters() const = 0; - virtual QImage filterImage(const QString &filter, const QImage &image, - QWidget *parent) = 0; -}; -//! [2] - -QT_BEGIN_NAMESPACE -//! [3] //! [4] -#define BrushInterface_iid "org.qt-project.Qt.Examples.PlugAndPaint.BrushInterface/1.0" - -Q_DECLARE_INTERFACE(BrushInterface, BrushInterface_iid) -//! [3] - -#define ShapeInterface_iid "org.qt-project.Qt.Examples.PlugAndPaint.ShapeInterface/1.0" - -Q_DECLARE_INTERFACE(ShapeInterface, ShapeInterface_iid) -//! [5] -#define FilterInterface_iid "org.qt-project.Qt.Examples.PlugAndPaint.FilterInterface/1.0" - -Q_DECLARE_INTERFACE(FilterInterface, FilterInterface_iid) -//! [4] //! [5] -QT_END_NAMESPACE - -#endif diff --git a/examples/widgets/tools/plugandpaint/app/main.cpp b/examples/widgets/tools/plugandpaint/app/main.cpp deleted file mode 100644 index 3fc647dcca..0000000000 --- a/examples/widgets/tools/plugandpaint/app/main.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -//! [0] -#include "mainwindow.h" - -#include <QApplication> -#include <QtPlugin> - -Q_IMPORT_PLUGIN(BasicToolsPlugin) - -int main(int argc, char *argv[]) -{ - QApplication app(argc, argv); - MainWindow window; - window.show(); - return app.exec(); -} -//! [0] diff --git a/examples/widgets/tools/plugandpaint/app/mainwindow.cpp b/examples/widgets/tools/plugandpaint/app/mainwindow.cpp deleted file mode 100644 index 8e58ae4ba8..0000000000 --- a/examples/widgets/tools/plugandpaint/app/mainwindow.cpp +++ /dev/null @@ -1,282 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - - -#include "mainwindow.h" -#include "interfaces.h" -#include "paintarea.h" -#include "plugindialog.h" - -#include <QAction> -#include <QActionGroup> -#include <QApplication> -#include <QColorDialog> -#include <QFileDialog> -#include <QInputDialog> -#include <QMenu> -#include <QMenuBar> -#include <QMessageBox> -#include <QPluginLoader> -#include <QScrollArea> -#include <QTimer> - -MainWindow::MainWindow() : paintArea(new PaintArea) - , scrollArea(new QScrollArea) -{ - scrollArea->setBackgroundRole(QPalette::Dark); - scrollArea->setWidget(paintArea); - setCentralWidget(scrollArea); - - createActions(); - createMenus(); - loadPlugins(); - - setWindowTitle(tr("Plug & Paint")); - - if (!brushActionGroup->actions().isEmpty()) - brushActionGroup->actions().first()->trigger(); - - QTimer::singleShot(500, this, &MainWindow::aboutPlugins); -} - -void MainWindow::open() -{ - const QString fileName = QFileDialog::getOpenFileName(this, - tr("Open File"), - QDir::currentPath()); - if (!fileName.isEmpty()) { - if (!paintArea->openImage(fileName)) { - QMessageBox::information(this, tr("Plug & Paint"), - tr("Cannot load %1.").arg(fileName)); - return; - } - paintArea->adjustSize(); - } -} - -bool MainWindow::saveAs() -{ - const QString initialPath = QDir::currentPath() + "/untitled.png"; - - const QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), - initialPath); - if (fileName.isEmpty()) - return false; - - return paintArea->saveImage(fileName, "png"); -} - -void MainWindow::brushColor() -{ - const QColor newColor = QColorDialog::getColor(paintArea->brushColor()); - if (newColor.isValid()) - paintArea->setBrushColor(newColor); -} - -void MainWindow::brushWidth() -{ - bool ok; - const int newWidth = QInputDialog::getInt(this, tr("Plug & Paint"), - tr("Select brush width:"), - paintArea->brushWidth(), - 1, 50, 1, &ok); - if (ok) - paintArea->setBrushWidth(newWidth); -} - -//! [0] -void MainWindow::changeBrush() -{ - auto action = qobject_cast<QAction *>(sender()); - if (!action) - return; - auto iBrush = qobject_cast<BrushInterface *>(action->parent()); - if (!iBrush) - return; - const QString brush = action->text(); - - paintArea->setBrush(iBrush, brush); -} -//! [0] - -//! [1] -void MainWindow::insertShape() -{ - auto action = qobject_cast<QAction *>(sender()); - if (!action) - return; - auto iShape = qobject_cast<ShapeInterface *>(action->parent()); - if (!iShape) - return; - - const QPainterPath path = iShape->generateShape(action->text(), this); - if (!path.isEmpty()) - paintArea->insertShape(path); -} -//! [1] - -//! [2] -void MainWindow::applyFilter() -{ - auto action = qobject_cast<QAction *>(sender()); - if (!action) - return; - auto iFilter = qobject_cast<FilterInterface *>(action->parent()); - if (!iFilter) - return; - - const QImage image = iFilter->filterImage(action->text(), paintArea->image(), - this); - paintArea->setImage(image); -} -//! [2] - -void MainWindow::about() -{ - QMessageBox::about(this, tr("About Plug & Paint"), - tr("The <b>Plug & Paint</b> example demonstrates how to write Qt " - "applications that can be extended through plugins.")); -} - -//! [3] -void MainWindow::aboutPlugins() -{ - PluginDialog dialog(pluginsDir.path(), pluginFileNames, this); - dialog.exec(); -} -//! [3] - -void MainWindow::createActions() -{ - openAct = new QAction(tr("&Open..."), this); - openAct->setShortcuts(QKeySequence::Open); - connect(openAct, &QAction::triggered, this, &MainWindow::open); - - saveAsAct = new QAction(tr("&Save As..."), this); - saveAsAct->setShortcuts(QKeySequence::SaveAs); - connect(saveAsAct, &QAction::triggered, this, &MainWindow::saveAs); - - exitAct = new QAction(tr("E&xit"), this); - exitAct->setShortcuts(QKeySequence::Quit); - connect(exitAct, &QAction::triggered, this, &MainWindow::close); - - brushColorAct = new QAction(tr("&Brush Color..."), this); - connect(brushColorAct, &QAction::triggered, this, &MainWindow::brushColor); - - brushWidthAct = new QAction(tr("&Brush Width..."), this); - connect(brushWidthAct, &QAction::triggered, this, &MainWindow::brushWidth); - - brushActionGroup = new QActionGroup(this); - - aboutAct = new QAction(tr("&About"), this); - connect(aboutAct, &QAction::triggered, this, &MainWindow::about); - - aboutQtAct = new QAction(tr("About &Qt"), this); - connect(aboutQtAct, &QAction::triggered, qApp, &QApplication::aboutQt); - - aboutPluginsAct = new QAction(tr("About &Plugins"), this); - connect(aboutPluginsAct, &QAction::triggered, this, &MainWindow::aboutPlugins); -} - -void MainWindow::createMenus() -{ - fileMenu = menuBar()->addMenu(tr("&File")); - fileMenu->addAction(openAct); - fileMenu->addAction(saveAsAct); - fileMenu->addSeparator(); - fileMenu->addAction(exitAct); - - brushMenu = menuBar()->addMenu(tr("&Brush")); - brushMenu->addAction(brushColorAct); - brushMenu->addAction(brushWidthAct); - brushMenu->addSeparator(); - - shapesMenu = menuBar()->addMenu(tr("&Shapes")); - - filterMenu = menuBar()->addMenu(tr("&Filter")); - - menuBar()->addSeparator(); - - helpMenu = menuBar()->addMenu(tr("&Help")); - helpMenu->addAction(aboutAct); - helpMenu->addAction(aboutQtAct); - helpMenu->addAction(aboutPluginsAct); -} - -//! [4] -void MainWindow::loadPlugins() -{ - const auto staticInstances = QPluginLoader::staticInstances(); - for (QObject *plugin : staticInstances) - populateMenus(plugin); -//! [4] //! [5] - - pluginsDir = QDir(QCoreApplication::applicationDirPath()); - -#if defined(Q_OS_WIN) - if (pluginsDir.dirName().toLower() == "debug" || pluginsDir.dirName().toLower() == "release") - pluginsDir.cdUp(); -#elif defined(Q_OS_MAC) - if (pluginsDir.dirName() == "MacOS") { - pluginsDir.cdUp(); - pluginsDir.cdUp(); - pluginsDir.cdUp(); - } -#endif - pluginsDir.cd("plugins"); -//! [5] - -//! [6] - const auto entryList = pluginsDir.entryList(QDir::Files); - for (const QString &fileName : entryList) { - QPluginLoader loader(pluginsDir.absoluteFilePath(fileName)); - QObject *plugin = loader.instance(); - if (plugin) { - populateMenus(plugin); - pluginFileNames += fileName; -//! [6] //! [7] - } -//! [7] //! [8] - } -//! [8] - -//! [9] - brushMenu->setEnabled(!brushActionGroup->actions().isEmpty()); - shapesMenu->setEnabled(!shapesMenu->actions().isEmpty()); - filterMenu->setEnabled(!filterMenu->actions().isEmpty()); -} -//! [9] - -//! [10] -void MainWindow::populateMenus(QObject *plugin) -{ - auto iBrush = qobject_cast<BrushInterface *>(plugin); - if (iBrush) - addToMenu(plugin, iBrush->brushes(), brushMenu, &MainWindow::changeBrush, - brushActionGroup); - - auto iShape = qobject_cast<ShapeInterface *>(plugin); - if (iShape) - addToMenu(plugin, iShape->shapes(), shapesMenu, &MainWindow::insertShape); - - auto iFilter = qobject_cast<FilterInterface *>(plugin); - if (iFilter) - addToMenu(plugin, iFilter->filters(), filterMenu, &MainWindow::applyFilter); -} -//! [10] - -void MainWindow::addToMenu(QObject *plugin, const QStringList &texts, - QMenu *menu, Member member, - QActionGroup *actionGroup) -{ - for (const QString &text : texts) { - auto action = new QAction(text, plugin); - connect(action, &QAction::triggered, this, member); - menu->addAction(action); - - if (actionGroup) { - action->setCheckable(true); - actionGroup->addAction(action); - } - } -} diff --git a/examples/widgets/tools/plugandpaint/app/mainwindow.h b/examples/widgets/tools/plugandpaint/app/mainwindow.h deleted file mode 100644 index bc09471ba5..0000000000 --- a/examples/widgets/tools/plugandpaint/app/mainwindow.h +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include <QDir> -#include <QMainWindow> -#include <QStringList> - -QT_BEGIN_NAMESPACE -class QAction; -class QActionGroup; -class QMenu; -class QScrollArea; -QT_END_NAMESPACE -class PaintArea; - -class MainWindow : public QMainWindow -{ - Q_OBJECT - -public: - MainWindow(); - -private slots: - void open(); - bool saveAs(); - void brushColor(); - void brushWidth(); - void changeBrush(); - void insertShape(); - void applyFilter(); - void about(); - void aboutPlugins(); - -private: - typedef void (MainWindow::*Member)(); - - void createActions(); - void createMenus(); - void loadPlugins(); - void populateMenus(QObject *plugin); - void addToMenu(QObject *plugin, const QStringList &texts, QMenu *menu, - Member member, QActionGroup *actionGroup = nullptr); - - PaintArea *paintArea = nullptr; - QScrollArea *scrollArea = nullptr; - QDir pluginsDir; - QStringList pluginFileNames; - - QMenu *fileMenu = nullptr; - QMenu *brushMenu = nullptr; - QMenu *shapesMenu = nullptr; - QMenu *filterMenu = nullptr; - QMenu *helpMenu = nullptr; - QActionGroup *brushActionGroup = nullptr; - QAction *openAct = nullptr; - QAction *saveAsAct = nullptr; - QAction *exitAct = nullptr; - QAction *brushWidthAct = nullptr; - QAction *brushColorAct = nullptr; - QAction *aboutAct = nullptr; - QAction *aboutQtAct = nullptr; - QAction *aboutPluginsAct = nullptr; -}; - -#endif diff --git a/examples/widgets/tools/plugandpaint/app/paintarea.cpp b/examples/widgets/tools/plugandpaint/app/paintarea.cpp deleted file mode 100644 index 3596f7979c..0000000000 --- a/examples/widgets/tools/plugandpaint/app/paintarea.cpp +++ /dev/null @@ -1,152 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - - -#include "paintarea.h" -#include "interfaces.h" - -#include <QMouseEvent> -#include <QPainter> - -PaintArea::PaintArea(QWidget *parent) : QWidget(parent) -{ - setAttribute(Qt::WA_StaticContents); - setAttribute(Qt::WA_OpaquePaintEvent); - - theImage.fill(qRgb(255, 255, 255)); -} - -bool PaintArea::openImage(const QString &fileName) -{ - QImage image; - if (!image.load(fileName)) - return false; - - setImage(image); - return true; -} - -bool PaintArea::saveImage(const QString &fileName, const char *fileFormat) -{ - return theImage.save(fileName, fileFormat); -} - -void PaintArea::setImage(const QImage &image) -{ - theImage = image.convertToFormat(QImage::Format_RGB32); - update(); - updateGeometry(); -} - -void PaintArea::insertShape(const QPainterPath &path) -{ - pendingPath = path; -#ifndef QT_NO_CURSOR - setCursor(Qt::CrossCursor); -#endif -} - -void PaintArea::setBrushColor(const QColor &color) -{ - this->color = color; -} - -void PaintArea::setBrushWidth(int width) -{ - thickness = width; -} - -//! [0] -void PaintArea::setBrush(BrushInterface *brushInterface, const QString &brush) -{ - this->brushInterface = brushInterface; - this->brush = brush; -} -//! [0] - -QSize PaintArea::sizeHint() const -{ - return theImage.size(); -} - -void PaintArea::paintEvent(QPaintEvent * /* event */) -{ - QPainter painter(this); - painter.drawImage(QPoint(0, 0), theImage); -} - -void PaintArea::mousePressEvent(QMouseEvent *event) -{ - if (event->button() == Qt::LeftButton) { - if (!pendingPath.isEmpty()) { - QPainter painter(&theImage); - setupPainter(painter); - - const QRectF boundingRect = pendingPath.boundingRect(); - QLinearGradient gradient(boundingRect.topRight(), - boundingRect.bottomLeft()); - gradient.setColorAt(0.0, QColor(color.red(), color.green(), - color.blue(), 63)); - gradient.setColorAt(1.0, QColor(color.red(), color.green(), - color.blue(), 191)); - painter.setBrush(gradient); - painter.translate(event->position().toPoint() - boundingRect.center()); - painter.drawPath(pendingPath); - - pendingPath = QPainterPath(); -#ifndef QT_NO_CURSOR - unsetCursor(); -#endif - update(); - } else { - if (brushInterface) { - QPainter painter(&theImage); - setupPainter(painter); - const QRect rect = brushInterface->mousePress(brush, painter, - event->position().toPoint()); - update(rect); - } - - lastPos = event->position().toPoint(); - } - } -} - -//! [1] -void PaintArea::mouseMoveEvent(QMouseEvent *event) -{ - if ((event->buttons() & Qt::LeftButton) && lastPos != QPoint(-1, -1)) { - if (brushInterface) { - QPainter painter(&theImage); - setupPainter(painter); - const QRect rect = brushInterface->mouseMove(brush, painter, lastPos, - event->position().toPoint()); - update(rect); - } - - lastPos = event->position().toPoint(); - } -} -//! [1] - -void PaintArea::mouseReleaseEvent(QMouseEvent *event) -{ - if (event->button() == Qt::LeftButton && lastPos != QPoint(-1, -1)) { - if (brushInterface) { - QPainter painter(&theImage); - setupPainter(painter); - QRect rect = brushInterface->mouseRelease(brush, painter, - event->position().toPoint()); - update(rect); - } - - lastPos = QPoint(-1, -1); - } -} - -void PaintArea::setupPainter(QPainter &painter) -{ - painter.setRenderHint(QPainter::Antialiasing, true); - painter.setPen(QPen(color, thickness, Qt::SolidLine, Qt::RoundCap, - Qt::RoundJoin)); -} diff --git a/examples/widgets/tools/plugandpaint/app/paintarea.h b/examples/widgets/tools/plugandpaint/app/paintarea.h deleted file mode 100644 index f24db0ba89..0000000000 --- a/examples/widgets/tools/plugandpaint/app/paintarea.h +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef PAINTAREA_H -#define PAINTAREA_H - -#include <QColor> -#include <QImage> -#include <QPainterPath> -#include <QWidget> - -class BrushInterface; - -class PaintArea : public QWidget -{ - Q_OBJECT - -public: - PaintArea(QWidget *parent = nullptr); - - bool openImage(const QString &fileName); - bool saveImage(const QString &fileName, const char *fileFormat); - void setImage(const QImage &image); - void insertShape(const QPainterPath &path); - void setBrushColor(const QColor &color); - void setBrushWidth(int width); - void setBrush(BrushInterface *brushInterface, const QString &brush); - - QImage image() const { return theImage; } - QColor brushColor() const { return color; } - int brushWidth() const { return thickness; } - QSize sizeHint() const override; - -protected: - void paintEvent(QPaintEvent *event) override; - void mousePressEvent(QMouseEvent *event) override; - void mouseMoveEvent(QMouseEvent *event) override; - void mouseReleaseEvent(QMouseEvent *event) override; - -private: - void setupPainter(QPainter &painter); - - QImage theImage = {500, 400, QImage::Format_RGB32}; - QColor color = Qt::blue; - int thickness = 3; - - BrushInterface *brushInterface = nullptr; - QString brush; - QPoint lastPos = {-1, -1}; - - QPainterPath pendingPath; -}; - -#endif diff --git a/examples/widgets/tools/plugandpaint/app/plugindialog.cpp b/examples/widgets/tools/plugandpaint/app/plugindialog.cpp deleted file mode 100644 index 2ff5c4b1e3..0000000000 --- a/examples/widgets/tools/plugandpaint/app/plugindialog.cpp +++ /dev/null @@ -1,118 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - - -#include "plugindialog.h" -#include "interfaces.h" - -#include <QDir> -#include <QGridLayout> -#include <QHeaderView> -#include <QLabel> -#include <QPluginLoader> -#include <QPushButton> -#include <QStringList> -#include <QTreeWidget> -#include <QTreeWidgetItem> - -PluginDialog::PluginDialog(const QString &path, const QStringList &fileNames, - QWidget *parent) : - QDialog(parent), - label(new QLabel), - treeWidget(new QTreeWidget), - okButton(new QPushButton(tr("OK"))) -{ - treeWidget->setAlternatingRowColors(false); - treeWidget->setSelectionMode(QAbstractItemView::NoSelection); - treeWidget->setColumnCount(1); - treeWidget->header()->hide(); - - okButton->setDefault(true); - - connect(okButton, &QAbstractButton::clicked, this, &QWidget::close); - - QGridLayout *mainLayout = new QGridLayout; - mainLayout->setColumnStretch(0, 1); - mainLayout->setColumnStretch(2, 1); - mainLayout->addWidget(label, 0, 0, 1, 3); - mainLayout->addWidget(treeWidget, 1, 0, 1, 3); - mainLayout->addWidget(okButton, 2, 1); - setLayout(mainLayout); - - interfaceIcon.addPixmap(style()->standardPixmap(QStyle::SP_DirOpenIcon), - QIcon::Normal, QIcon::On); - interfaceIcon.addPixmap(style()->standardPixmap(QStyle::SP_DirClosedIcon), - QIcon::Normal, QIcon::Off); - featureIcon.addPixmap(style()->standardPixmap(QStyle::SP_FileIcon)); - - setWindowTitle(tr("Plugin Information")); - findPlugins(path, fileNames); -} - -//! [0] -void PluginDialog::findPlugins(const QString &path, - const QStringList &fileNames) -{ - label->setText(tr("Plug & Paint found the following plugins\n" - "(looked in %1):") - .arg(QDir::toNativeSeparators(path))); - - const QDir dir(path); - - const auto staticInstances = QPluginLoader::staticInstances(); - for (QObject *plugin : staticInstances) - populateTreeWidget(plugin, tr("%1 (Static Plugin)") - .arg(plugin->metaObject()->className())); - - for (const QString &fileName : fileNames) { - QPluginLoader loader(dir.absoluteFilePath(fileName)); - QObject *plugin = loader.instance(); - if (plugin) - populateTreeWidget(plugin, fileName); - } -} -//! [0] - -//! [1] -void PluginDialog::populateTreeWidget(QObject *plugin, const QString &text) -{ - auto pluginItem = new QTreeWidgetItem(treeWidget); - pluginItem->setText(0, text); - pluginItem->setExpanded(true); - - QFont boldFont = pluginItem->font(0); - boldFont.setBold(true); - pluginItem->setFont(0, boldFont); - - if (plugin) { - auto iBrush = qobject_cast<BrushInterface *>(plugin); - if (iBrush) - addItems(pluginItem, "BrushInterface", iBrush->brushes()); - - auto iShape = qobject_cast<ShapeInterface *>(plugin); - if (iShape) - addItems(pluginItem, "ShapeInterface", iShape->shapes()); - - auto iFilter = qobject_cast<FilterInterface *>(plugin); - if (iFilter) - addItems(pluginItem, "FilterInterface", iFilter->filters()); - } -} -//! [1] - -void PluginDialog::addItems(QTreeWidgetItem *pluginItem, - const char *interfaceName, - const QStringList &features) -{ - auto interfaceItem = new QTreeWidgetItem(pluginItem); - interfaceItem->setText(0, interfaceName); - interfaceItem->setIcon(0, interfaceIcon); - - for (QString feature : features) { - if (feature.endsWith("...")) - feature.chop(3); - auto featureItem = new QTreeWidgetItem(interfaceItem); - featureItem->setText(0, feature); - featureItem->setIcon(0, featureIcon); - } -} diff --git a/examples/widgets/tools/plugandpaint/app/plugindialog.h b/examples/widgets/tools/plugandpaint/app/plugindialog.h deleted file mode 100644 index 32b8aa6fe0..0000000000 --- a/examples/widgets/tools/plugandpaint/app/plugindialog.h +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef PLUGINDIALOG_H -#define PLUGINDIALOG_H - -#include <QDialog> -#include <QIcon> - -QT_BEGIN_NAMESPACE -class QLabel; -class QPushButton; -class QTreeWidget; -class QTreeWidgetItem; -QT_END_NAMESPACE - -class PluginDialog : public QDialog -{ - Q_OBJECT - -public: - PluginDialog(const QString &path, const QStringList &fileNames, - QWidget *parent = nullptr); - -private: - void findPlugins(const QString &path, const QStringList &fileNames); - void populateTreeWidget(QObject *plugin, const QString &text); - void addItems(QTreeWidgetItem *pluginItem, const char *interfaceName, - const QStringList &features); - - QLabel *label = nullptr; - QTreeWidget *treeWidget = nullptr; - QPushButton *okButton = nullptr; - QIcon interfaceIcon; - QIcon featureIcon; -}; - -#endif diff --git a/examples/widgets/tools/plugandpaint/plugandpaint.pro b/examples/widgets/tools/plugandpaint/plugandpaint.pro deleted file mode 100644 index 58c4dbbb6e..0000000000 --- a/examples/widgets/tools/plugandpaint/plugandpaint.pro +++ /dev/null @@ -1,7 +0,0 @@ -QT_FOR_CONFIG += widgets -requires(qtConfig(inputdialog)) - -TEMPLATE = subdirs -SUBDIRS = plugins app - -app.depends = plugins diff --git a/examples/widgets/tools/plugandpaint/plugins/CMakeLists.txt b/examples/widgets/tools/plugandpaint/plugins/CMakeLists.txt deleted file mode 100644 index 9a2d66d99e..0000000000 --- a/examples/widgets/tools/plugandpaint/plugins/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(basictools) -add_subdirectory(extrafilters) diff --git a/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt b/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt deleted file mode 100644 index 86d58b9f08..0000000000 --- a/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause - -qt_add_plugin(pnp_basictools - STATIC - CLASS_NAME BasicToolsPlugin - basictoolsplugin.cpp basictoolsplugin.h -) - -target_include_directories(pnp_basictools PRIVATE - ../../app -) - -target_link_libraries(pnp_basictools PRIVATE - Qt6::Core - Qt6::Gui - Qt6::Widgets -) diff --git a/examples/widgets/tools/plugandpaint/plugins/basictools/basictools.json b/examples/widgets/tools/plugandpaint/plugins/basictools/basictools.json deleted file mode 100644 index 0967ef424b..0000000000 --- a/examples/widgets/tools/plugandpaint/plugins/basictools/basictools.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/examples/widgets/tools/plugandpaint/plugins/basictools/basictools.pro b/examples/widgets/tools/plugandpaint/plugins/basictools/basictools.pro deleted file mode 100644 index f5ba95252c..0000000000 --- a/examples/widgets/tools/plugandpaint/plugins/basictools/basictools.pro +++ /dev/null @@ -1,17 +0,0 @@ -#! [0] -TEMPLATE = lib -CONFIG += plugin static -QT += widgets -INCLUDEPATH += ../../app -HEADERS = basictoolsplugin.h -SOURCES = basictoolsplugin.cpp -TARGET = $$qtLibraryTarget(pnp_basictools) -DESTDIR = ../../plugins -#! [0] - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/plugandpaint/plugins -INSTALLS += target - -CONFIG += install_ok # Do not cargo-cult this! -uikit: CONFIG += debug_and_release diff --git a/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.cpp b/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.cpp deleted file mode 100644 index 6a350f38a4..0000000000 --- a/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.cpp +++ /dev/null @@ -1,150 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include "basictoolsplugin.h" - -#include <QInputDialog> -#include <QPainter> -#include <QRandomGenerator> -#include <QtMath> - -//! [0] -QStringList BasicToolsPlugin::brushes() const -{ - return {tr("Pencil"), tr("Air Brush"), tr("Random Letters")}; -} -//! [0] - -//! [1] -QRect BasicToolsPlugin::mousePress(const QString &brush, QPainter &painter, - const QPoint &pos) -{ - return mouseMove(brush, painter, pos, pos); -} -//! [1] - -//! [2] -QRect BasicToolsPlugin::mouseMove(const QString &brush, QPainter &painter, - const QPoint &oldPos, const QPoint &newPos) -{ - painter.save(); - - int rad = painter.pen().width() / 2; - QRect boundingRect = QRect(oldPos, newPos).normalized() - .adjusted(-rad, -rad, +rad, +rad); - QColor color = painter.pen().color(); - int thickness = painter.pen().width(); - QColor transparentColor(color.red(), color.green(), color.blue(), 0); -//! [2] //! [3] - - if (brush == tr("Pencil")) { - painter.drawLine(oldPos, newPos); - } else if (brush == tr("Air Brush")) { - int numSteps = 2 + (newPos - oldPos).manhattanLength() / 2; - - painter.setBrush(QBrush(color, Qt::Dense6Pattern)); - painter.setPen(Qt::NoPen); - - for (int i = 0; i < numSteps; ++i) { - int x = oldPos.x() + i * (newPos.x() - oldPos.x()) / (numSteps - 1); - int y = oldPos.y() + i * (newPos.y() - oldPos.y()) / (numSteps - 1); - - painter.drawEllipse(x - (thickness / 2), y - (thickness / 2), - thickness, thickness); - } - } else if (brush == tr("Random Letters")) { - QChar ch(QRandomGenerator::global()->bounded('A', 'Z' + 1)); - - QFont biggerFont = painter.font(); - biggerFont.setBold(true); - biggerFont.setPointSize(biggerFont.pointSize() + thickness); - painter.setFont(biggerFont); - - painter.drawText(newPos, QString(ch)); - - QFontMetrics metrics(painter.font()); - boundingRect = metrics.boundingRect(ch); - boundingRect.translate(newPos); - boundingRect.adjust(-10, -10, +10, +10); - } - painter.restore(); - return boundingRect; -} -//! [3] - -//! [4] -QRect BasicToolsPlugin::mouseRelease(const QString & /* brush */, - QPainter & /* painter */, - const QPoint & /* pos */) -{ - return QRect(0, 0, 0, 0); -} -//! [4] - -//! [5] -QStringList BasicToolsPlugin::shapes() const -{ - return {tr("Circle"), tr("Star"), tr("Text...")}; -} -//! [5] - -//! [6] -QPainterPath BasicToolsPlugin::generateShape(const QString &shape, - QWidget *parent) -{ - QPainterPath path; - - if (shape == tr("Circle")) { - path.addEllipse(0, 0, 50, 50); - } else if (shape == tr("Star")) { - path.moveTo(90, 50); - for (int i = 1; i < 5; ++i) { - path.lineTo(50 + 40 * std::cos(0.8 * i * M_PI), - 50 + 40 * std::sin(0.8 * i * M_PI)); - } - path.closeSubpath(); - } else if (shape == tr("Text...")) { - QString text = QInputDialog::getText(parent, tr("Text Shape"), - tr("Enter text:"), - QLineEdit::Normal, tr("Qt")); - if (!text.isEmpty()) { - QFont timesFont("Times", 50); - timesFont.setStyleStrategy(QFont::ForceOutline); - path.addText(0, 0, timesFont, text); - } - } - - return path; -} -//! [6] - -//! [7] -QStringList BasicToolsPlugin::filters() const -{ - return {tr("Invert Pixels"), tr("Swap RGB"), tr("Grayscale")}; -} -//! [7] - -//! [8] -QImage BasicToolsPlugin::filterImage(const QString &filter, const QImage &image, - QWidget * /* parent */) -{ - QImage result = image.convertToFormat(QImage::Format_RGB32); - - if (filter == tr("Invert Pixels")) { - result.invertPixels(); - } else if (filter == tr("Swap RGB")) { - result = result.rgbSwapped(); - } else if (filter == tr("Grayscale")) { - for (int y = 0; y < result.height(); ++y) { - for (int x = 0; x < result.width(); ++x) { - QRgb pixel = result.pixel(x, y); - int gray = qGray(pixel); - int alpha = qAlpha(pixel); - result.setPixel(x, y, qRgba(gray, gray, gray, alpha)); - } - } - } - return result; -} -//! [8] diff --git a/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.h b/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.h deleted file mode 100644 index 9fb3295bf5..0000000000 --- a/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.h +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef BASICTOOLSPLUGIN_H -#define BASICTOOLSPLUGIN_H - -//! [0] -#include <interfaces.h> - -#include <QImage> -#include <QObject> -#include <QPainterPath> -#include <QRect> -#include <QStringList> -#include <QtPlugin> - -//! [1] -class BasicToolsPlugin : public QObject, - public BrushInterface, - public ShapeInterface, - public FilterInterface -{ - Q_OBJECT -//! [4] - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.PlugAndPaint.BrushInterface" FILE "basictools.json") -//! [4] - Q_INTERFACES(BrushInterface ShapeInterface FilterInterface) -//! [0] - -//! [2] -public: -//! [1] - // BrushInterface - QStringList brushes() const override; - QRect mousePress(const QString &brush, QPainter &painter, - const QPoint &pos) override; - QRect mouseMove(const QString &brush, QPainter &painter, - const QPoint &oldPos, const QPoint &newPos) override; - QRect mouseRelease(const QString &brush, QPainter &painter, - const QPoint &pos) override; - - // ShapeInterface - QStringList shapes() const override; - QPainterPath generateShape(const QString &shape, QWidget *parent) override; - - // FilterInterface - QStringList filters() const override; - QImage filterImage(const QString &filter, const QImage &image, - QWidget *parent) override; -//! [3] -}; -//! [2] //! [3] - -#endif diff --git a/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt b/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt deleted file mode 100644 index cc883df049..0000000000 --- a/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause - -qt_add_plugin(pnp_extrafilters - CLASS_NAME ExtraFiltersPlugin - extrafiltersplugin.cpp extrafiltersplugin.h -) - -set_target_properties(pnp_extrafilters PROPERTIES - LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/app" -) - -target_include_directories(pnp_extrafilters PRIVATE - ../../app -) - -target_link_libraries(pnp_extrafilters PRIVATE - Qt6::Core - Qt6::Gui - Qt6::Widgets -) - -install(TARGETS pnp_extrafilters - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}/plugins" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}/plugins" -) diff --git a/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafilters.json b/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafilters.json deleted file mode 100644 index 0967ef424b..0000000000 --- a/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafilters.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafilters.pro b/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafilters.pro deleted file mode 100644 index e137b04823..0000000000 --- a/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafilters.pro +++ /dev/null @@ -1,17 +0,0 @@ -#! [0] -TEMPLATE = lib -CONFIG += plugin -QT += widgets -INCLUDEPATH += ../../app -HEADERS = extrafiltersplugin.h -SOURCES = extrafiltersplugin.cpp -TARGET = $$qtLibraryTarget(pnp_extrafilters) -DESTDIR = ../../plugins - -#! [0] -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/plugandpaint/plugins -INSTALLS += target - -CONFIG += install_ok # Do not cargo-cult this! -uikit: CONFIG += debug_and_release diff --git a/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.cpp b/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.cpp deleted file mode 100644 index 5356efc328..0000000000 --- a/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.cpp +++ /dev/null @@ -1,82 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include "extrafiltersplugin.h" - -#include <QInputDialog> - -QStringList ExtraFiltersPlugin::filters() const -{ - return {tr("Flip Horizontally"), tr("Flip Vertically"), - tr("Smudge..."), tr("Threshold...")}; -} - -QImage ExtraFiltersPlugin::filterImage(const QString &filter, - const QImage &image, QWidget *parent) -{ - QImage original = image.convertToFormat(QImage::Format_RGB32); - QImage result = original; - - if (filter == tr("Flip Horizontally")) { - for (int y = 0; y < original.height(); ++y) { - for (int x = 0; x < original.width(); ++x) { - QRgb pixel = original.pixel(original.width() - x - 1, y); - result.setPixel(x, y, pixel); - } - } - } else if (filter == tr("Flip Vertically")) { - for (int y = 0; y < original.height(); ++y) { - for (int x = 0; x < original.width(); ++x) { - QRgb pixel = original.pixel(x, original.height() - y - 1); - result.setPixel(x, y, pixel); - } - } - } else if (filter == tr("Smudge...")) { - bool ok; - int numIters = QInputDialog::getInt(parent, tr("Smudge Filter"), - tr("Enter number of iterations:"), - 5, 1, 20, 1, &ok); - if (ok) { - for (int i = 0; i < numIters; ++i) { - for (int y = 1; y < original.height() - 1; ++y) { - for (int x = 1; x < original.width() - 1; ++x) { - QRgb p1 = original.pixel(x, y); - QRgb p2 = original.pixel(x, y + 1); - QRgb p3 = original.pixel(x, y - 1); - QRgb p4 = original.pixel(x + 1, y); - QRgb p5 = original.pixel(x - 1, y); - - int red = (qRed(p1) + qRed(p2) + qRed(p3) + qRed(p4) - + qRed(p5)) / 5; - int green = (qGreen(p1) + qGreen(p2) + qGreen(p3) - + qGreen(p4) + qGreen(p5)) / 5; - int blue = (qBlue(p1) + qBlue(p2) + qBlue(p3) - + qBlue(p4) + qBlue(p5)) / 5; - int alpha = (qAlpha(p1) + qAlpha(p2) + qAlpha(p3) - + qAlpha(p4) + qAlpha(p5)) / 5; - - result.setPixel(x, y, qRgba(red, green, blue, alpha)); - } - } - } - } - } else if (filter == tr("Threshold...")) { - bool ok; - int threshold = QInputDialog::getInt(parent, tr("Threshold Filter"), - tr("Enter threshold:"), - 10, 1, 256, 1, &ok); - if (ok) { - int factor = 256 / threshold; - for (int y = 0; y < original.height(); ++y) { - for (int x = 0; x < original.width(); ++x) { - QRgb pixel = original.pixel(x, y); - result.setPixel(x, y, qRgba(qRed(pixel) / factor * factor, - qGreen(pixel) / factor * factor, - qBlue(pixel) / factor * factor, - qAlpha(pixel))); - } - } - } - } - return result; -} diff --git a/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.h b/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.h deleted file mode 100644 index 0fc50d2fd0..0000000000 --- a/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.h +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef EXTRAFILTERSPLUGIN_H -#define EXTRAFILTERSPLUGIN_H - -//! [0] -#include <interfaces.h> - -#include <QObject> -#include <QtPlugin> -#include <QStringList> -#include <QImage> - -class ExtraFiltersPlugin : public QObject, public FilterInterface -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.PlugAndPaint.FilterInterface" FILE "extrafilters.json") - Q_INTERFACES(FilterInterface) - -public: - QStringList filters() const override; - QImage filterImage(const QString &filter, const QImage &image, - QWidget *parent) override; -}; -//! [0] - -#endif diff --git a/examples/widgets/tools/plugandpaint/plugins/plugins.pro b/examples/widgets/tools/plugandpaint/plugins/plugins.pro deleted file mode 100644 index e15220c621..0000000000 --- a/examples/widgets/tools/plugandpaint/plugins/plugins.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = basictools \ - extrafilters diff --git a/examples/widgets/tools/regularexpression/CMakeLists.txt b/examples/widgets/tools/regularexpression/CMakeLists.txt index 0ba29861fc..af7701f1cf 100644 --- a/examples/widgets/tools/regularexpression/CMakeLists.txt +++ b/examples/widgets/tools/regularexpression/CMakeLists.txt @@ -1,15 +1,9 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(regularexpression LANGUAGES CXX) -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/tools/regularexpression") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) qt_standard_project_setup() @@ -43,7 +37,14 @@ qt_add_resources(regularexpression "regularexpression" ) install(TARGETS regularexpression - 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 regularexpression + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR ) +install(SCRIPT ${deploy_script}) diff --git a/examples/widgets/tools/settingseditor/CMakeLists.txt b/examples/widgets/tools/settingseditor/CMakeLists.txt deleted file mode 100644 index 7ffa732f2b..0000000000 --- a/examples/widgets/tools/settingseditor/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause - -cmake_minimum_required(VERSION 3.16) -project(settingseditor LANGUAGES CXX) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/tools/settingseditor") - -find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) - -qt_standard_project_setup() - -qt_add_executable(settingseditor - locationdialog.cpp locationdialog.h - main.cpp - mainwindow.cpp mainwindow.h - settingstree.cpp settingstree.h - variantdelegate.cpp variantdelegate.h -) - -set_target_properties(settingseditor PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -target_link_libraries(settingseditor PRIVATE - Qt6::Core - Qt6::Gui - Qt6::Widgets -) - -install(TARGETS settingseditor - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/widgets/tools/settingseditor/inifiles/licensepage.ini b/examples/widgets/tools/settingseditor/inifiles/licensepage.ini deleted file mode 100644 index 608d1b7885..0000000000 --- a/examples/widgets/tools/settingseditor/inifiles/licensepage.ini +++ /dev/null @@ -1,46 +0,0 @@ -[Field%201] -Bottom=89 -Flags=MULTILINE|VSCROLL|READONLY -Left=4 -Right=296 -State=No license agreement file found. Please contact support. -Top=14 -Type=Text - -[Field%202] -Bottom=8 -Left=4 -Right=294 -Text=Press Page Down to see the rest of the agreement. -Top=0 -Type=Label - -[Field%203] -Bottom=111 -Left=4 -Right=297 -Text=If you accept the terms of the agreement, select the first option below. You must accept the agreement to install this software. Click Next to continue. -Top=92 -Type=Label - -[Field%204] -Bottom=129 -Flags=GROUP|NOTIFY -Left=4 -Right=299 -Text=I &accept the terms in the License Agreement -Top=120 -Type=RadioButton - -[Field%205] -Bottom=140 -Flags=NOTIFY -Left=4 -Right=300 -State=1 -Text=I &do not accept the terms in the License Agreement -Top=129 -Type=RadioButton - -[Settings] -NumFields=5 diff --git a/examples/widgets/tools/settingseditor/inifiles/qsa.ini b/examples/widgets/tools/settingseditor/inifiles/qsa.ini deleted file mode 100644 index 56a2964ee5..0000000000 --- a/examples/widgets/tools/settingseditor/inifiles/qsa.ini +++ /dev/null @@ -1,26 +0,0 @@ -[Field%201] -Bottom=65 -Left=0 -Right=299 -Text=QSA Build Options -Top=9 -Type=Groupbox - -[Field%202] -Bottom=37 -Left=20 -Right=284 -Text=Don't compile QSA Workbench into QSA. -Top=27 -Type=Checkbox - -[Field%203] -Bottom=56 -Left=20 -Right=247 -Text=Don't compile QSA Workbench nor QSA Editor into QSA. -Top=45 -Type=Checkbox - -[Settings] -NumFields=3 diff --git a/examples/widgets/tools/settingseditor/locationdialog.cpp b/examples/widgets/tools/settingseditor/locationdialog.cpp deleted file mode 100644 index cef83c0e49..0000000000 --- a/examples/widgets/tools/settingseditor/locationdialog.cpp +++ /dev/null @@ -1,193 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include "locationdialog.h" - -#include <QBoxLayout> -#include <QComboBox> -#include <QDialogButtonBox> -#include <QDir> -#include <QPushButton> -#include <QGroupBox> -#include <QHeaderView> -#include <QLabel> -#include <QLineEdit> -#include <QTableWidget> -#include <QTableWidgetItem> - -LocationDialog::LocationDialog(QWidget *parent) - : QDialog(parent) -{ - formatComboBox = new QComboBox; - formatComboBox->addItem(tr("Native")); - formatComboBox->addItem(tr("INI")); - - scopeComboBox = new QComboBox; - scopeComboBox->addItem(tr("User")); - scopeComboBox->addItem(tr("System")); - - organizationComboBox = new QComboBox; - organizationComboBox->addItem(tr("QtProject")); - organizationComboBox->setEditable(true); - - applicationComboBox = new QComboBox; - applicationComboBox->addItem(tr("Any")); - applicationComboBox->addItem(tr("Qt Creator")); - applicationComboBox->addItem(tr("Application Example")); - applicationComboBox->addItem(tr("Assistant")); - applicationComboBox->addItem(tr("Designer")); - applicationComboBox->addItem(tr("Linguist")); - applicationComboBox->setEditable(true); - applicationComboBox->setCurrentIndex(1); - - formatLabel = new QLabel(tr("&Format:")); - formatLabel->setBuddy(formatComboBox); - - scopeLabel = new QLabel(tr("&Scope:")); - scopeLabel->setBuddy(scopeComboBox); - - organizationLabel = new QLabel(tr("&Organization:")); - organizationLabel->setBuddy(organizationComboBox); - - applicationLabel = new QLabel(tr("&Application:")); - applicationLabel->setBuddy(applicationComboBox); - - locationsGroupBox = new QGroupBox(tr("Setting Locations")); - - const QStringList labels{tr("Location"), tr("Access")}; - - locationsTable = new QTableWidget; - locationsTable->setSelectionMode(QAbstractItemView::SingleSelection); - locationsTable->setSelectionBehavior(QAbstractItemView::SelectRows); - locationsTable->setEditTriggers(QAbstractItemView::NoEditTriggers); - locationsTable->setColumnCount(2); - locationsTable->setHorizontalHeaderLabels(labels); - locationsTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch); - locationsTable->horizontalHeader()->resizeSection(1, 180); - connect(locationsTable, &QTableWidget::itemActivated, this, &LocationDialog::itemActivated); - - buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); - - connect(formatComboBox, &QComboBox::activated, - this, &LocationDialog::updateLocationsTable); - connect(scopeComboBox, &QComboBox::activated, - this, &LocationDialog::updateLocationsTable); - connect(organizationComboBox->lineEdit(), - &QLineEdit::editingFinished, - this, &LocationDialog::updateLocationsTable); - connect(applicationComboBox->lineEdit(), - &QLineEdit::editingFinished, - this, &LocationDialog::updateLocationsTable); - connect(applicationComboBox, &QComboBox::activated, - this, &LocationDialog::updateLocationsTable); - connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); - connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); - - QVBoxLayout *locationsLayout = new QVBoxLayout(locationsGroupBox); - locationsLayout->addWidget(locationsTable); - - QGridLayout *mainLayout = new QGridLayout(this); - mainLayout->addWidget(formatLabel, 0, 0); - mainLayout->addWidget(formatComboBox, 0, 1); - mainLayout->addWidget(scopeLabel, 1, 0); - mainLayout->addWidget(scopeComboBox, 1, 1); - mainLayout->addWidget(organizationLabel, 2, 0); - mainLayout->addWidget(organizationComboBox, 2, 1); - mainLayout->addWidget(applicationLabel, 3, 0); - mainLayout->addWidget(applicationComboBox, 3, 1); - mainLayout->addWidget(locationsGroupBox, 4, 0, 1, 2); - mainLayout->addWidget(buttonBox, 5, 0, 1, 2); - - updateLocationsTable(); - - setWindowTitle(tr("Open Application Settings")); - resize(650, 400); -} - -QSettings::Format LocationDialog::format() const -{ - if (formatComboBox->currentIndex() == 0) - return QSettings::NativeFormat; - else - return QSettings::IniFormat; -} - -QSettings::Scope LocationDialog::scope() const -{ - if (scopeComboBox->currentIndex() == 0) - return QSettings::UserScope; - else - return QSettings::SystemScope; -} - -QString LocationDialog::organization() const -{ - return organizationComboBox->currentText(); -} - -QString LocationDialog::application() const -{ - if (applicationComboBox->currentText() == tr("Any")) - return QString(); - else - return applicationComboBox->currentText(); -} - -void LocationDialog::itemActivated(QTableWidgetItem *) -{ - buttonBox->button(QDialogButtonBox::Ok)->animateClick(); -} - -void LocationDialog::updateLocationsTable() -{ - locationsTable->setUpdatesEnabled(false); - locationsTable->setRowCount(0); - - for (int i = 0; i < 2; ++i) { - if (i == 0 && scope() == QSettings::SystemScope) - continue; - - QSettings::Scope actualScope = (i == 0) ? QSettings::UserScope - : QSettings::SystemScope; - for (int j = 0; j < 2; ++j) { - if (j == 0 && application().isEmpty()) - continue; - - QString actualApplication; - if (j == 0) - actualApplication = application(); - QSettings settings(format(), actualScope, organization(), - actualApplication); - - int row = locationsTable->rowCount(); - locationsTable->setRowCount(row + 1); - - QTableWidgetItem *item0 = new QTableWidgetItem(QDir::toNativeSeparators(settings.fileName())); - - QTableWidgetItem *item1 = new QTableWidgetItem; - bool disable = (settings.childKeys().isEmpty() - && settings.childGroups().isEmpty()); - - if (row == 0) { - if (settings.isWritable()) { - item1->setText(tr("Read-write")); - disable = false; - } else { - item1->setText(tr("Read-only")); - } - buttonBox->button(QDialogButtonBox::Ok)->setDisabled(disable); - } else { - item1->setText(tr("Read-only fallback")); - } - - if (disable) { - item0->setFlags(item0->flags() & ~Qt::ItemIsEnabled); - item1->setFlags(item1->flags() & ~Qt::ItemIsEnabled); - } - - locationsTable->setItem(row, 0, item0); - locationsTable->setItem(row, 1, item1); - } - } - locationsTable->setUpdatesEnabled(true); -} diff --git a/examples/widgets/tools/settingseditor/locationdialog.h b/examples/widgets/tools/settingseditor/locationdialog.h deleted file mode 100644 index 4bcef76ce7..0000000000 --- a/examples/widgets/tools/settingseditor/locationdialog.h +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef LOCATIONDIALOG_H -#define LOCATIONDIALOG_H - -#include <QDialog> -#include <QSettings> - -QT_BEGIN_NAMESPACE -class QComboBox; -class QDialogButtonBox; -class QGroupBox; -class QLabel; -class QTableWidget; -class QTableWidgetItem; -QT_END_NAMESPACE - -class LocationDialog : public QDialog -{ - Q_OBJECT - -public: - LocationDialog(QWidget *parent = nullptr); - - QSettings::Format format() const; - QSettings::Scope scope() const; - QString organization() const; - QString application() const; - -private slots: - void updateLocationsTable(); - void itemActivated(QTableWidgetItem *); - -private: - QLabel *formatLabel; - QLabel *scopeLabel; - QLabel *organizationLabel; - QLabel *applicationLabel; - QComboBox *formatComboBox; - QComboBox *scopeComboBox; - QComboBox *organizationComboBox; - QComboBox *applicationComboBox; - QGroupBox *locationsGroupBox; - QTableWidget *locationsTable; - QDialogButtonBox *buttonBox; -}; - -#endif diff --git a/examples/widgets/tools/settingseditor/main.cpp b/examples/widgets/tools/settingseditor/main.cpp deleted file mode 100644 index f49701be5c..0000000000 --- a/examples/widgets/tools/settingseditor/main.cpp +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include <QApplication> - -#include "mainwindow.h" - -int main(int argc, char *argv[]) -{ - QApplication app(argc, argv); - QCoreApplication::setApplicationName("Settings Editor"); - QCoreApplication::setApplicationVersion(QT_VERSION_STR); - - MainWindow mainWin; - mainWin.show(); - return app.exec(); -} diff --git a/examples/widgets/tools/settingseditor/mainwindow.cpp b/examples/widgets/tools/settingseditor/mainwindow.cpp deleted file mode 100644 index 68178a3747..0000000000 --- a/examples/widgets/tools/settingseditor/mainwindow.cpp +++ /dev/null @@ -1,175 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include "locationdialog.h" -#include "mainwindow.h" -#include "settingstree.h" - -#include <QAction> -#include <QApplication> -#include <QFileDialog> -#include <QInputDialog> -#include <QLineEdit> -#include <QMenuBar> -#include <QMessageBox> -#include <QScreen> -#include <QStandardPaths> -#include <QStatusBar> - -MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) - , settingsTree(new SettingsTree) -{ - setCentralWidget(settingsTree); - - createActions(); - - autoRefreshAct->setChecked(true); - fallbacksAct->setChecked(true); - - setWindowTitle(QCoreApplication::applicationName()); - const QRect availableGeometry = screen()->availableGeometry(); - adjustSize(); - move((availableGeometry.width() - width()) / 2, (availableGeometry.height() - height()) / 2); -} - -void MainWindow::openSettings() -{ - if (!locationDialog) - locationDialog = new LocationDialog(this); - - if (locationDialog->exec() != QDialog::Accepted) - return; - - SettingsPtr settings(new QSettings(locationDialog->format(), - locationDialog->scope(), - locationDialog->organization(), - locationDialog->application())); - - setSettingsObject(settings); - fallbacksAct->setEnabled(true); -} - -void MainWindow::openIniFile() -{ - const QString directory = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation); - const QString fileName = - QFileDialog::getOpenFileName(this, tr("Open INI File"), - directory, tr("INI Files (*.ini *.conf)")); - if (fileName.isEmpty()) - return; - - SettingsPtr settings(new QSettings(fileName, QSettings::IniFormat)); - - setSettingsObject(settings); - fallbacksAct->setEnabled(false); -} - -void MainWindow::openPropertyList() -{ - const QString directory = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation); - const QString fileName = - QFileDialog::getOpenFileName(this, tr("Open Property List"), - directory, tr("Property List Files (*.plist)")); - if (fileName.isEmpty()) - return; - - SettingsPtr settings(new QSettings(fileName, QSettings::NativeFormat)); - setSettingsObject(settings); - fallbacksAct->setEnabled(false); -} - -void MainWindow::openRegistryPath() -{ - const QString path = - QInputDialog::getText(this, tr("Open Registry Path"), - tr("Enter the path in the Windows registry:"), - QLineEdit::Normal, "HKEY_CURRENT_USER\\"); - if (path.isEmpty()) - return; - - SettingsPtr settings(new QSettings(path, QSettings::NativeFormat)); - - setSettingsObject(settings); - fallbacksAct->setEnabled(false); -} - -void MainWindow::about() -{ - QMessageBox::about(this, tr("About Settings Editor"), - tr("The <b>Settings Editor</b> example shows how to access " - "application settings using Qt.")); -} - -void MainWindow::createActions() -{ - QMenu *fileMenu = menuBar()->addMenu(tr("&File")); - - QAction *openSettingsAct = fileMenu->addAction(tr("&Open Application Settings..."), this, &MainWindow::openSettings); - openSettingsAct->setShortcuts(QKeySequence::Open); - - QAction *openIniFileAct = fileMenu->addAction(tr("Open I&NI File..."), this, &MainWindow::openIniFile); - openIniFileAct->setShortcut(tr("Ctrl+N")); - -#ifdef Q_OS_MACOS - QAction *openPropertyListAct = fileMenu->addAction(tr("Open Apple &Property List..."), this, &MainWindow::openPropertyList); - openPropertyListAct->setShortcut(tr("Ctrl+P")); -#endif // Q_OS_MACOS - -#ifdef Q_OS_WIN - QAction *openRegistryPathAct = fileMenu->addAction(tr("Open Windows &Registry Path..."), this, &MainWindow::openRegistryPath); - openRegistryPathAct->setShortcut(tr("Ctrl+G")); -#endif // Q_OS_WIN - - fileMenu->addSeparator(); - - refreshAct = fileMenu->addAction(tr("&Refresh"), settingsTree, &SettingsTree::refresh); - refreshAct->setShortcut(tr("Ctrl+R")); - refreshAct->setEnabled(false); - - fileMenu->addSeparator(); - - QAction *exitAct = fileMenu->addAction(tr("E&xit"), this, &QWidget::close); - exitAct->setShortcuts(QKeySequence::Quit); - - QMenu *optionsMenu = menuBar()->addMenu(tr("&Options")); - - autoRefreshAct = optionsMenu->addAction(tr("&Auto-Refresh")); - autoRefreshAct->setShortcut(tr("Ctrl+A")); - autoRefreshAct->setCheckable(true); - autoRefreshAct->setEnabled(false); - connect(autoRefreshAct, &QAction::triggered, - settingsTree, &SettingsTree::setAutoRefresh); - connect(autoRefreshAct, &QAction::triggered, - refreshAct, &QAction::setDisabled); - - fallbacksAct = optionsMenu->addAction(tr("&Fallbacks")); - fallbacksAct->setShortcut(tr("Ctrl+F")); - fallbacksAct->setCheckable(true); - fallbacksAct->setEnabled(false); - connect(fallbacksAct, &QAction::triggered, - settingsTree, &SettingsTree::setFallbacksEnabled); - - QMenu *helpMenu = menuBar()->addMenu(tr("&Help")); - helpMenu->addAction(tr("&About"), this, &MainWindow::about); - helpMenu->addAction(tr("About &Qt"), qApp, &QCoreApplication::quit); -} - -void MainWindow::setSettingsObject(const SettingsPtr &settings) -{ - settings->setFallbacksEnabled(fallbacksAct->isChecked()); - settingsTree->setSettingsObject(settings); - - refreshAct->setEnabled(true); - autoRefreshAct->setEnabled(true); - - QString niceName = QDir::cleanPath(settings->fileName()); - int pos = niceName.lastIndexOf(QLatin1Char('/')); - if (pos != -1) - niceName.remove(0, pos + 1); - - if (!settings->isWritable()) - niceName = tr("%1 (read only)").arg(niceName); - - setWindowTitle(tr("%1 - %2").arg(niceName, QCoreApplication::applicationName())); - statusBar()->showMessage(tr("Opened \"%1\"").arg(QDir::toNativeSeparators(settings->fileName()))); -} diff --git a/examples/widgets/tools/settingseditor/mainwindow.h b/examples/widgets/tools/settingseditor/mainwindow.h deleted file mode 100644 index 84bdaef966..0000000000 --- a/examples/widgets/tools/settingseditor/mainwindow.h +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include <QMainWindow> -#include <QSharedPointer> - -QT_BEGIN_NAMESPACE -class QAction; -class QSettings; -QT_END_NAMESPACE -class LocationDialog; -class SettingsTree; - -class MainWindow : public QMainWindow -{ - Q_OBJECT - -public: - typedef QSharedPointer<QSettings> SettingsPtr; - - MainWindow(QWidget *parent = nullptr); - -private slots: - void openSettings(); - void openIniFile(); - void openPropertyList(); - void openRegistryPath(); - void about(); - -private: - void createActions(); - void setSettingsObject(const SettingsPtr &settings); - - SettingsTree *settingsTree = nullptr; - LocationDialog *locationDialog = nullptr; - QAction *refreshAct = nullptr; - QAction *autoRefreshAct = nullptr; - QAction *fallbacksAct = nullptr; -}; - -#endif diff --git a/examples/widgets/tools/settingseditor/settingseditor.pro b/examples/widgets/tools/settingseditor/settingseditor.pro deleted file mode 100644 index 4880b7e582..0000000000 --- a/examples/widgets/tools/settingseditor/settingseditor.pro +++ /dev/null @@ -1,18 +0,0 @@ -QT += widgets -requires(qtConfig(tablewidget)) - -HEADERS = locationdialog.h \ - mainwindow.h \ - settingstree.h \ - variantdelegate.h -SOURCES = locationdialog.cpp \ - main.cpp \ - mainwindow.cpp \ - settingstree.cpp \ - variantdelegate.cpp - -EXAMPLE_FILES = inifiles - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/settingseditor -INSTALLS += target diff --git a/examples/widgets/tools/settingseditor/settingstree.cpp b/examples/widgets/tools/settingseditor/settingstree.cpp deleted file mode 100644 index 5de2a8cff1..0000000000 --- a/examples/widgets/tools/settingseditor/settingstree.cpp +++ /dev/null @@ -1,231 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include "settingstree.h" -#include "variantdelegate.h" - -#include <QApplication> -#include <QHeaderView> -#include <QScreen> -#include <QSettings> - -SettingsTree::SettingsTree(QWidget *parent) - : QTreeWidget(parent), - m_typeChecker(new TypeChecker) -{ - setItemDelegate(new VariantDelegate(m_typeChecker, this)); - - setHeaderLabels({tr("Setting"), tr("Type"), tr("Value")}); - header()->setSectionResizeMode(0, QHeaderView::ResizeToContents); - header()->setSectionResizeMode(1, QHeaderView::ResizeToContents); - header()->setSectionResizeMode(2, QHeaderView::Stretch); - - refreshTimer.setInterval(2000); - - groupIcon.addPixmap(style()->standardPixmap(QStyle::SP_DirClosedIcon), - QIcon::Normal, QIcon::Off); - groupIcon.addPixmap(style()->standardPixmap(QStyle::SP_DirOpenIcon), - QIcon::Normal, QIcon::On); - keyIcon.addPixmap(style()->standardPixmap(QStyle::SP_FileIcon)); - - connect(&refreshTimer, &QTimer::timeout, this, &SettingsTree::maybeRefresh); -} - -SettingsTree::~SettingsTree() = default; - -void SettingsTree::setSettingsObject(const SettingsPtr &newSettings) -{ - settings = newSettings; - clear(); - - if (settings.isNull()) { - refreshTimer.stop(); - } else { - refresh(); - if (autoRefresh) - refreshTimer.start(); - } -} - -QSize SettingsTree::sizeHint() const -{ - const QRect availableGeometry = screen()->availableGeometry(); - return QSize(availableGeometry.width() * 2 / 3, availableGeometry.height() * 2 / 3); -} - -void SettingsTree::setAutoRefresh(bool autoRefresh) -{ - this->autoRefresh = autoRefresh; - if (!settings.isNull()) { - if (autoRefresh) { - maybeRefresh(); - refreshTimer.start(); - } else { - refreshTimer.stop(); - } - } -} - -void SettingsTree::setFallbacksEnabled(bool enabled) -{ - if (!settings.isNull()) { - settings->setFallbacksEnabled(enabled); - refresh(); - } -} - -void SettingsTree::maybeRefresh() -{ - if (state() != EditingState) - refresh(); -} - -void SettingsTree::refresh() -{ - if (settings.isNull()) - return; - - disconnect(this, &QTreeWidget::itemChanged, - this, &SettingsTree::updateSetting); - - settings->sync(); - updateChildItems(nullptr); - - connect(this, &QTreeWidget::itemChanged, - this, &SettingsTree::updateSetting); -} - -bool SettingsTree::event(QEvent *event) -{ - if (event->type() == QEvent::WindowActivate) { - if (isActiveWindow() && autoRefresh) - maybeRefresh(); - } - return QTreeWidget::event(event); -} - -void SettingsTree::updateSetting(QTreeWidgetItem *item) -{ - QString key = item->text(0); - QTreeWidgetItem *ancestor = item->parent(); - while (ancestor) { - key.prepend(ancestor->text(0) + QLatin1Char('/')); - ancestor = ancestor->parent(); - } - - settings->setValue(key, item->data(2, Qt::UserRole)); - if (autoRefresh) - refresh(); -} - -void SettingsTree::updateChildItems(QTreeWidgetItem *parent) -{ - int dividerIndex = 0; - - const QStringList childGroups = settings->childGroups(); - for (const QString &group : childGroups) { - QTreeWidgetItem *child; - int childIndex = findChild(parent, group, dividerIndex); - if (childIndex != -1) { - child = childAt(parent, childIndex); - child->setText(1, QString()); - child->setText(2, QString()); - child->setData(2, Qt::UserRole, QVariant()); - moveItemForward(parent, childIndex, dividerIndex); - } else { - child = createItem(group, parent, dividerIndex); - } - child->setIcon(0, groupIcon); - ++dividerIndex; - - settings->beginGroup(group); - updateChildItems(child); - settings->endGroup(); - } - - const QStringList childKeys = settings->childKeys(); - for (const QString &key : childKeys) { - QTreeWidgetItem *child; - int childIndex = findChild(parent, key, 0); - - if (childIndex == -1 || childIndex >= dividerIndex) { - if (childIndex != -1) { - child = childAt(parent, childIndex); - for (int i = 0; i < child->childCount(); ++i) - delete childAt(child, i); - moveItemForward(parent, childIndex, dividerIndex); - } else { - child = createItem(key, parent, dividerIndex); - } - child->setIcon(0, keyIcon); - ++dividerIndex; - } else { - child = childAt(parent, childIndex); - } - - QVariant value = settings->value(key); - if (value.userType() == QMetaType::UnknownType) { - child->setText(1, "Invalid"); - } else { - if (value.typeId() == QMetaType::QString) { - const QString stringValue = value.toString(); - if (m_typeChecker->boolExp.match(stringValue).hasMatch()) { - value.setValue(stringValue.compare("true", Qt::CaseInsensitive) == 0); - } else if (m_typeChecker->signedIntegerExp.match(stringValue).hasMatch()) - value.setValue(stringValue.toInt()); - } - - child->setText(1, value.typeName()); - } - child->setText(2, VariantDelegate::displayText(value)); - child->setData(2, Qt::UserRole, value); - } - - while (dividerIndex < childCount(parent)) - delete childAt(parent, dividerIndex); -} - -QTreeWidgetItem *SettingsTree::createItem(const QString &text, - QTreeWidgetItem *parent, int index) -{ - QTreeWidgetItem *after = nullptr; - if (index != 0) - after = childAt(parent, index - 1); - - QTreeWidgetItem *item; - if (parent) - item = new QTreeWidgetItem(parent, after); - else - item = new QTreeWidgetItem(this, after); - - item->setText(0, text); - item->setFlags(item->flags() | Qt::ItemIsEditable); - return item; -} - -QTreeWidgetItem *SettingsTree::childAt(QTreeWidgetItem *parent, int index) const -{ - return (parent ? parent->child(index) : topLevelItem(index)); -} - -int SettingsTree::childCount(QTreeWidgetItem *parent) const -{ - return (parent ? parent->childCount() : topLevelItemCount()); -} - -int SettingsTree::findChild(QTreeWidgetItem *parent, const QString &text, - int startIndex) const -{ - for (int i = startIndex; i < childCount(parent); ++i) { - if (childAt(parent, i)->text(0) == text) - return i; - } - return -1; -} - -void SettingsTree::moveItemForward(QTreeWidgetItem *parent, int oldIndex, - int newIndex) -{ - for (int i = 0; i < oldIndex - newIndex; ++i) - delete childAt(parent, newIndex); -} diff --git a/examples/widgets/tools/settingseditor/settingstree.h b/examples/widgets/tools/settingseditor/settingstree.h deleted file mode 100644 index 8dfa52113f..0000000000 --- a/examples/widgets/tools/settingseditor/settingstree.h +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef SETTINGSTREE_H -#define SETTINGSTREE_H - -#include <QIcon> -#include <QTimer> -#include <QTreeWidget> -#include <QSharedPointer> - -QT_BEGIN_NAMESPACE -class QSettings; -QT_END_NAMESPACE - -struct TypeChecker; - -class SettingsTree : public QTreeWidget -{ - Q_OBJECT - -public: - using SettingsPtr = QSharedPointer<QSettings>; - using TypeCheckerPtr = QSharedPointer<TypeChecker>; - - SettingsTree(QWidget *parent = nullptr); - ~SettingsTree(); - - void setSettingsObject(const SettingsPtr &settings); - QSize sizeHint() const override; - -public slots: - void setAutoRefresh(bool autoRefresh); - void setFallbacksEnabled(bool enabled); - void maybeRefresh(); - void refresh(); - -protected: - bool event(QEvent *event) override; - -private slots: - void updateSetting(QTreeWidgetItem *item); - -private: - void updateChildItems(QTreeWidgetItem *parent); - QTreeWidgetItem *createItem(const QString &text, QTreeWidgetItem *parent, - int index); - QTreeWidgetItem *childAt(QTreeWidgetItem *parent, int index) const; - int childCount(QTreeWidgetItem *parent) const; - int findChild(QTreeWidgetItem *parent, const QString &text, int startIndex) const; - void moveItemForward(QTreeWidgetItem *parent, int oldIndex, int newIndex); - - SettingsPtr settings; - TypeCheckerPtr m_typeChecker; - QTimer refreshTimer; - QIcon groupIcon; - QIcon keyIcon; - bool autoRefresh = false; -}; - -#endif diff --git a/examples/widgets/tools/settingseditor/variantdelegate.cpp b/examples/widgets/tools/settingseditor/variantdelegate.cpp deleted file mode 100644 index ed51a1645b..0000000000 --- a/examples/widgets/tools/settingseditor/variantdelegate.cpp +++ /dev/null @@ -1,377 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include "variantdelegate.h" - -#include <QCheckBox> -#include <QDateTime> -#include <QLineEdit> -#include <QSpinBox> -#include <QRegularExpressionValidator> -#include <QTextStream> - -#include <algorithm> - -static bool isPrintableChar(char c) -{ - return uchar(c) >= 32 && uchar(c) < 128; -} - -static bool isPrintable(const QByteArray &ba) -{ - return std::all_of(ba.cbegin(), ba.cend(), isPrintableChar); -} - -static QString byteArrayToString(const QByteArray &ba) -{ - if (isPrintable(ba)) - return QString::fromLatin1(ba); - QString result; - for (char c : ba) { - if (isPrintableChar(c)) { - if (c == '\\') - result += QLatin1Char(c); - result += QLatin1Char(c); - } else { - const uint uc = uchar(c); - result += "\\x"; - if (uc < 16) - result += '0'; - result += QString::number(uc, 16); - } - } - return result; -} - -TypeChecker::TypeChecker() -{ - boolExp.setPattern("^(true)|(false)$"); - boolExp.setPatternOptions(QRegularExpression::CaseInsensitiveOption); - Q_ASSERT(boolExp.isValid()); - - byteArrayExp.setPattern(R"RX(^[\x00-\xff]*$)RX"); - charExp.setPattern("^.$"); - Q_ASSERT(charExp.isValid()); - colorExp.setPattern(R"RX(^\(([0-9]*),([0-9]*),([0-9]*),([0-9]*)\)$)RX"); - Q_ASSERT(colorExp.isValid()); - doubleExp.setPattern(""); - pointExp.setPattern(R"RX(^\((-?[0-9]*),(-?[0-9]*)\)$)RX"); - Q_ASSERT(pointExp.isValid()); - rectExp.setPattern(R"RX(^\((-?[0-9]*),(-?[0-9]*),(-?[0-9]*),(-?[0-9]*)\)$)RX"); - Q_ASSERT(rectExp.isValid()); - signedIntegerExp.setPattern("^-?[0-9]*$"); - Q_ASSERT(signedIntegerExp.isValid()); - sizeExp = pointExp; - unsignedIntegerExp.setPattern("^[0-9]+$"); - Q_ASSERT(unsignedIntegerExp.isValid()); - - const QString datePattern = "([0-9]{,4})-([0-9]{,2})-([0-9]{,2})"; - dateExp.setPattern('^' + datePattern + '$'); - Q_ASSERT(dateExp.isValid()); - const QString timePattern = "([0-9]{,2}):([0-9]{,2}):([0-9]{,2})"; - timeExp.setPattern('^' + timePattern + '$'); - Q_ASSERT(timeExp.isValid()); - dateTimeExp.setPattern('^' + datePattern + 'T' + timePattern + '$'); - Q_ASSERT(dateTimeExp.isValid()); -} - -VariantDelegate::VariantDelegate(const QSharedPointer<TypeChecker> &typeChecker, - QObject *parent) - : QStyledItemDelegate(parent), - m_typeChecker(typeChecker) -{ -} - -void VariantDelegate::paint(QPainter *painter, - const QStyleOptionViewItem &option, - const QModelIndex &index) const -{ - if (index.column() == 2) { - QVariant value = index.model()->data(index, Qt::UserRole); - if (!isSupportedType(value.userType())) { - QStyleOptionViewItem myOption = option; - myOption.state &= ~QStyle::State_Enabled; - QStyledItemDelegate::paint(painter, myOption, index); - return; - } - } - - QStyledItemDelegate::paint(painter, option, index); -} - -QWidget *VariantDelegate::createEditor(QWidget *parent, - const QStyleOptionViewItem & /* option */, - const QModelIndex &index) const -{ - if (index.column() != 2) - return nullptr; - - QVariant originalValue = index.model()->data(index, Qt::UserRole); - if (!isSupportedType(originalValue.userType())) - return nullptr; - - switch (originalValue.userType()) { - case QMetaType::Bool: - return new QCheckBox(parent); - break; - case QMetaType::Int: - case QMetaType::LongLong: { - auto spinBox = new QSpinBox(parent); - spinBox->setRange(-32767, 32767); - return spinBox; - } - case QMetaType::UInt: - case QMetaType::ULongLong: { - auto spinBox = new QSpinBox(parent); - spinBox->setRange(0, 63335); - return spinBox; - } - default: - break; - } - - QLineEdit *lineEdit = new QLineEdit(parent); - lineEdit->setFrame(false); - - QRegularExpression regExp; - - switch (originalValue.userType()) { - case QMetaType::Bool: - regExp = m_typeChecker->boolExp; - break; - case QMetaType::QByteArray: - regExp = m_typeChecker->byteArrayExp; - break; - case QMetaType::QChar: - regExp = m_typeChecker->charExp; - break; - case QMetaType::QColor: - regExp = m_typeChecker->colorExp; - break; - case QMetaType::QDate: - regExp = m_typeChecker->dateExp; - break; - case QMetaType::QDateTime: - regExp = m_typeChecker->dateTimeExp; - break; - case QMetaType::Double: - regExp = m_typeChecker->doubleExp; - break; - case QMetaType::Int: - case QMetaType::LongLong: - regExp = m_typeChecker->signedIntegerExp; - break; - case QMetaType::QPoint: - regExp = m_typeChecker->pointExp; - break; - case QMetaType::QRect: - regExp = m_typeChecker->rectExp; - break; - case QMetaType::QSize: - regExp = m_typeChecker->sizeExp; - break; - case QMetaType::QTime: - regExp = m_typeChecker->timeExp; - break; - case QMetaType::UInt: - case QMetaType::ULongLong: - regExp = m_typeChecker->unsignedIntegerExp; - break; - default: - break; - } - - if (regExp.isValid()) { - QValidator *validator = new QRegularExpressionValidator(regExp, lineEdit); - lineEdit->setValidator(validator); - } - - return lineEdit; -} - -void VariantDelegate::setEditorData(QWidget *editor, - const QModelIndex &index) const -{ - QVariant value = index.model()->data(index, Qt::UserRole); - if (auto spinBox = qobject_cast<QSpinBox *>(editor)) { - const auto userType = value.userType(); - if (userType == QMetaType::UInt || userType == QMetaType::ULongLong) - spinBox->setValue(value.toUInt()); - else - spinBox->setValue(value.toInt()); - } else if (auto checkBox = qobject_cast<QCheckBox *>(editor)) { - checkBox->setChecked(value.toBool()); - } else if (QLineEdit *lineEdit = qobject_cast<QLineEdit *>(editor)) { - if (value.userType() == QMetaType::QByteArray - && !isPrintable(value.toByteArray())) { - lineEdit->setReadOnly(true); - } - lineEdit->setText(displayText(value)); - } -} - -void VariantDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, - const QModelIndex &index) const -{ - const QVariant originalValue = index.model()->data(index, Qt::UserRole); - QVariant value; - - if (auto spinBox = qobject_cast<QSpinBox *>(editor)) { - value.setValue(spinBox->value()); - } else if (auto checkBox = qobject_cast<QCheckBox *>(editor)) { - value.setValue(checkBox->isChecked()); - } else if (QLineEdit *lineEdit = qobject_cast<QLineEdit *>(editor)) { - if (!lineEdit->isModified()) - return; - - QString text = lineEdit->text(); - const QValidator *validator = lineEdit->validator(); - if (validator) { - int pos; - if (validator->validate(text, pos) != QValidator::Acceptable) - return; - } - - QRegularExpressionMatch match; - - switch (originalValue.userType()) { - case QMetaType::QChar: - value = text.at(0); - break; - case QMetaType::QColor: - match = m_typeChecker->colorExp.match(text); - value = QColor(qMin(match.captured(1).toInt(), 255), - qMin(match.captured(2).toInt(), 255), - qMin(match.captured(3).toInt(), 255), - qMin(match.captured(4).toInt(), 255)); - break; - case QMetaType::QDate: - { - QDate date = QDate::fromString(text, Qt::ISODate); - if (!date.isValid()) - return; - value = date; - } - break; - case QMetaType::QDateTime: - { - QDateTime dateTime = QDateTime::fromString(text, Qt::ISODate); - if (!dateTime.isValid()) - return; - value = dateTime; - } - break; - case QMetaType::QPoint: - match = m_typeChecker->pointExp.match(text); - value = QPoint(match.captured(1).toInt(), match.captured(2).toInt()); - break; - case QMetaType::QRect: - match = m_typeChecker->rectExp.match(text); - value = QRect(match.captured(1).toInt(), match.captured(2).toInt(), - match.captured(3).toInt(), match.captured(4).toInt()); - break; - case QMetaType::QSize: - match = m_typeChecker->sizeExp.match(text); - value = QSize(match.captured(1).toInt(), match.captured(2).toInt()); - break; - case QMetaType::QStringList: - value = text.split(','); - break; - case QMetaType::QTime: - { - QTime time = QTime::fromString(text, Qt::ISODate); - if (!time.isValid()) - return; - value = time; - } - break; - default: - value = text; - value.convert(originalValue.metaType()); - } - } - - model->setData(index, displayText(value), Qt::DisplayRole); - model->setData(index, value, Qt::UserRole); -} - -bool VariantDelegate::isSupportedType(int type) -{ - switch (type) { - case QMetaType::Bool: - case QMetaType::QByteArray: - case QMetaType::QChar: - case QMetaType::QColor: - case QMetaType::QDate: - case QMetaType::QDateTime: - case QMetaType::Double: - case QMetaType::Int: - case QMetaType::LongLong: - case QMetaType::QPoint: - case QMetaType::QRect: - case QMetaType::QSize: - case QMetaType::QString: - case QMetaType::QStringList: - case QMetaType::QTime: - case QMetaType::UInt: - case QMetaType::ULongLong: - return true; - default: - return false; - } -} - -QString VariantDelegate::displayText(const QVariant &value) -{ - switch (value.userType()) { - case QMetaType::Bool: - return value.toBool() ? "✓" : "☐"; - case QMetaType::QByteArray: - return byteArrayToString(value.toByteArray()); - case QMetaType::QChar: - case QMetaType::Double: - case QMetaType::Int: - case QMetaType::LongLong: - case QMetaType::QString: - case QMetaType::UInt: - case QMetaType::ULongLong: - return value.toString(); - case QMetaType::QColor: - { - QColor color = qvariant_cast<QColor>(value); - return QString("(%1,%2,%3,%4)") - .arg(color.red()).arg(color.green()) - .arg(color.blue()).arg(color.alpha()); - } - case QMetaType::QDate: - return value.toDate().toString(Qt::ISODate); - case QMetaType::QDateTime: - return value.toDateTime().toString(Qt::ISODate); - case QMetaType::UnknownType: - return "<Invalid>"; - case QMetaType::QPoint: - { - QPoint point = value.toPoint(); - return QString("(%1,%2)").arg(point.x()).arg(point.y()); - } - case QMetaType::QRect: - { - QRect rect = value.toRect(); - return QString("(%1,%2,%3,%4)") - .arg(rect.x()).arg(rect.y()) - .arg(rect.width()).arg(rect.height()); - } - case QMetaType::QSize: - { - QSize size = value.toSize(); - return QString("(%1,%2)").arg(size.width()).arg(size.height()); - } - case QMetaType::QStringList: - return value.toStringList().join(','); - case QMetaType::QTime: - return value.toTime().toString(Qt::ISODate); - default: - break; - } - return QString("<%1>").arg(value.typeName()); -} diff --git a/examples/widgets/tools/settingseditor/variantdelegate.h b/examples/widgets/tools/settingseditor/variantdelegate.h deleted file mode 100644 index dc06d51bbc..0000000000 --- a/examples/widgets/tools/settingseditor/variantdelegate.h +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef VARIANTDELEGATE_H -#define VARIANTDELEGATE_H - -#include <QStyledItemDelegate> -#include <QRegularExpression> -#include <QSharedPointer> - -struct TypeChecker -{ - TypeChecker(); - - QRegularExpression boolExp; - QRegularExpression byteArrayExp; - QRegularExpression charExp; - QRegularExpression colorExp; - QRegularExpression dateExp; - QRegularExpression dateTimeExp; - QRegularExpression doubleExp; - QRegularExpression pointExp; - QRegularExpression rectExp; - QRegularExpression signedIntegerExp; - QRegularExpression sizeExp; - QRegularExpression timeExp; - QRegularExpression unsignedIntegerExp; -}; - -class VariantDelegate : public QStyledItemDelegate -{ - Q_OBJECT - -public: - explicit VariantDelegate(const QSharedPointer<TypeChecker> &typeChecker, - QObject *parent = nullptr); - - void paint(QPainter *painter, const QStyleOptionViewItem &option, - const QModelIndex &index) const override; - QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, - const QModelIndex &index) const override; - void setEditorData(QWidget *editor, const QModelIndex &index) const override; - void setModelData(QWidget *editor, QAbstractItemModel *model, - const QModelIndex &index) const override; - - static bool isSupportedType(int type); - static QString displayText(const QVariant &value); - -private: - QSharedPointer<TypeChecker> m_typeChecker; -}; - -#endif diff --git a/examples/widgets/tools/styleplugin/CMakeLists.txt b/examples/widgets/tools/styleplugin/CMakeLists.txt deleted file mode 100644 index 7e46a7b2af..0000000000 --- a/examples/widgets/tools/styleplugin/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause - -cmake_minimum_required(VERSION 3.16) -project(styleplugin LANGUAGES CXX) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/tools/styleplugin") - -find_package(Qt6 REQUIRED COMPONENTS Widgets) - -qt_standard_project_setup() - -add_subdirectory(stylewindow) -add_subdirectory(plugin) diff --git a/examples/widgets/tools/styleplugin/plugin/CMakeLists.txt b/examples/widgets/tools/styleplugin/plugin/CMakeLists.txt deleted file mode 100644 index 494a4a90f6..0000000000 --- a/examples/widgets/tools/styleplugin/plugin/CMakeLists.txt +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause - -#! [0] -qt_add_plugin(simplestyleplugin - CLASS_NAME SimpleStylePlugin - simplestyle.cpp simplestyle.h - simplestyleplugin.cpp simplestyleplugin.h -) -#! [0] - -if(QT_FEATURE_debug AND APPLE) - set_property(TARGET simplestyleplugin - APPEND_STRING PROPERTY OUTPUT_NAME "_debug") -endif() - -get_target_property(is_bundle styleplugin MACOSX_BUNDLE) -if(APPLE AND is_bundle) -#! [1] - set_target_properties(simplestyleplugin PROPERTIES - LIBRARY_OUTPUT_DIRECTORY "$<TARGET_BUNDLE_CONTENT_DIR:styleplugin>/PlugIns/styles" - ) -#! [1] -else() -#! [2] - set_target_properties(simplestyleplugin PROPERTIES - LIBRARY_OUTPUT_DIRECTORY "$<TARGET_FILE_DIR:styleplugin>/styles" - ) -#! [2] -endif() - -target_link_libraries(simplestyleplugin PRIVATE - Qt6::Core - Qt6::Gui - Qt6::Widgets -) - -install(TARGETS simplestyleplugin - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/widgets/tools/styleplugin/plugin/plugin.pro b/examples/widgets/tools/styleplugin/plugin/plugin.pro deleted file mode 100644 index 5ab00016ca..0000000000 --- a/examples/widgets/tools/styleplugin/plugin/plugin.pro +++ /dev/null @@ -1,34 +0,0 @@ -#! [0] -TEMPLATE = lib -CONFIG += plugin -QT += widgets -HEADERS = simplestyle.h \ - simplestyleplugin.h -SOURCES = simplestyle.cpp \ - simplestyleplugin.cpp -TARGET = simplestyleplugin -#! [0] -win32 { - CONFIG(debug, release|debug):DESTDIR = ../debug/styles/ - CONFIG(release, release|debug):DESTDIR = ../release/styles/ -} else { - macos { - # The non-app-bundle case is not supported with qmake, because - # the plugin project cannot know whether the app is built - # as a bundle or not. - DESTDIR = ../styleplugin.app/Contents/PlugIns/styles/ - contains(QT_CONFIG, debug) { - TARGET = $$join(TARGET,,,_debug) - } - } else { - DESTDIR = ../styles/ - } -} - -EXAMPLE_FILES += simplestyle.json - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/styleplugin/styles -INSTALLS += target - -CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/widgets/tools/styleplugin/plugin/simplestyle.cpp b/examples/widgets/tools/styleplugin/plugin/simplestyle.cpp deleted file mode 100644 index fa60d50140..0000000000 --- a/examples/widgets/tools/styleplugin/plugin/simplestyle.cpp +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include "simplestyle.h" - -void SimpleStyle::polish(QPalette &palette) -{ - palette.setBrush(QPalette::Text, Qt::red); -} diff --git a/examples/widgets/tools/styleplugin/plugin/simplestyle.h b/examples/widgets/tools/styleplugin/plugin/simplestyle.h deleted file mode 100644 index 315c4d836c..0000000000 --- a/examples/widgets/tools/styleplugin/plugin/simplestyle.h +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef SIMPLESTYLE_H -#define SIMPLESTYLE_H - -#include <QProxyStyle> - -class SimpleStyle : public QProxyStyle -{ - Q_OBJECT - -public: - SimpleStyle() = default; - - void polish(QPalette &palette) override; -}; - -#endif diff --git a/examples/widgets/tools/styleplugin/plugin/simplestyle.json b/examples/widgets/tools/styleplugin/plugin/simplestyle.json deleted file mode 100644 index a708e2aafe..0000000000 --- a/examples/widgets/tools/styleplugin/plugin/simplestyle.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "Keys": [ "simplestyle" ] -} diff --git a/examples/widgets/tools/styleplugin/plugin/simplestyleplugin.cpp b/examples/widgets/tools/styleplugin/plugin/simplestyleplugin.cpp deleted file mode 100644 index f28d22ccc9..0000000000 --- a/examples/widgets/tools/styleplugin/plugin/simplestyleplugin.cpp +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include "simplestyleplugin.h" -#include "simplestyle.h" - -//! [0] -QStringList SimpleStylePlugin::keys() const -{ - return {"SimpleStyle"}; -} -//! [0] - -//! [1] -QStyle *SimpleStylePlugin::create(const QString &key) -{ - if (key.toLower() == "simplestyle") - return new SimpleStyle; - return nullptr; -} -//! [1] diff --git a/examples/widgets/tools/styleplugin/plugin/simplestyleplugin.h b/examples/widgets/tools/styleplugin/plugin/simplestyleplugin.h deleted file mode 100644 index 8a3dc45210..0000000000 --- a/examples/widgets/tools/styleplugin/plugin/simplestyleplugin.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef SIMPLESTYLEPLUGIN_H -#define SIMPLESTYLEPLUGIN_H - -#include <QStylePlugin> - -//! [0] -class SimpleStylePlugin : public QStylePlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QStyleFactoryInterface" FILE "simplestyle.json") - -public: - SimpleStylePlugin() = default; - - QStringList keys() const; - QStyle *create(const QString &key) override; -}; -//! [0] - -#endif diff --git a/examples/widgets/tools/styleplugin/styleplugin.pro b/examples/widgets/tools/styleplugin/styleplugin.pro deleted file mode 100644 index 4f120637b0..0000000000 --- a/examples/widgets/tools/styleplugin/styleplugin.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = stylewindow \ - plugin diff --git a/examples/widgets/tools/styleplugin/stylewindow/CMakeLists.txt b/examples/widgets/tools/styleplugin/stylewindow/CMakeLists.txt deleted file mode 100644 index 3c1ac7670f..0000000000 --- a/examples/widgets/tools/styleplugin/stylewindow/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause - -qt_add_executable(styleplugin - main.cpp - stylewindow.cpp stylewindow.h -) - -set_target_properties(styleplugin PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -target_link_libraries(styleplugin PRIVATE - Qt6::Core - Qt6::Gui - Qt6::Widgets -) - -if(NOT QT6_IS_SHARED_LIBS_BUILD) - target_link_libraries(styleplugin PRIVATE - simplestyleplugin - ) -endif() - -install(TARGETS styleplugin - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/widgets/tools/styleplugin/stylewindow/main.cpp b/examples/widgets/tools/styleplugin/stylewindow/main.cpp deleted file mode 100644 index 0b0a295410..0000000000 --- a/examples/widgets/tools/styleplugin/stylewindow/main.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include <QApplication> -#include <QStyleFactory> - -#include "stylewindow.h" - -//! [0] -int main(int argv, char *args[]) -{ - QApplication app(argv, args); - - QStyle *style = QStyleFactory::create("simplestyle"); - if (!style) - qFatal("Cannot load the 'simplestyle' plugin."); - - QApplication::setStyle(style); - - StyleWindow window; - window.resize(350, 50); - window.show(); - - return app.exec(); -} -//! [0] diff --git a/examples/widgets/tools/styleplugin/stylewindow/stylewindow.cpp b/examples/widgets/tools/styleplugin/stylewindow/stylewindow.cpp deleted file mode 100644 index 9268666c21..0000000000 --- a/examples/widgets/tools/styleplugin/stylewindow/stylewindow.cpp +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include <QGridLayout> -#include <QGroupBox> -#include <QTextEdit> - -#include "stylewindow.h" - -StyleWindow::StyleWindow() -{ - QTextEdit *styledTextEdit = new QTextEdit(tr("The quick brown fox jumps over the lazy dog")); - - QGridLayout *layout = new QGridLayout; - layout->addWidget(styledTextEdit); - - QGroupBox *styleBox = new QGroupBox(tr("A simple styled text edit")); - styleBox->setLayout(layout); - - QGridLayout *outerLayout = new QGridLayout; - outerLayout->addWidget(styleBox, 0, 0); - setLayout(outerLayout); - - setWindowTitle(tr("Style Plugin Example")); -} diff --git a/examples/widgets/tools/styleplugin/stylewindow/stylewindow.h b/examples/widgets/tools/styleplugin/stylewindow/stylewindow.h deleted file mode 100644 index 50fa6b29f7..0000000000 --- a/examples/widgets/tools/styleplugin/stylewindow/stylewindow.h +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef STYLEWINDOW_H -#define STYLEWINDOW_H - -#include <QWidget> - -class StyleWindow : public QWidget -{ - Q_OBJECT - -public: - StyleWindow(); -}; - -#endif diff --git a/examples/widgets/tools/styleplugin/stylewindow/stylewindow.pro b/examples/widgets/tools/styleplugin/stylewindow/stylewindow.pro deleted file mode 100644 index cdc1bd2fda..0000000000 --- a/examples/widgets/tools/styleplugin/stylewindow/stylewindow.pro +++ /dev/null @@ -1,19 +0,0 @@ -QT += widgets - -HEADERS = stylewindow.h -SOURCES = stylewindow.cpp \ - main.cpp - -TARGET = styleplugin -win32 { - debug:DESTDIR = ../debug/ - release:DESTDIR = ../release/ -} else { - DESTDIR = ../ -} - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/styleplugin -INSTALLS += target - -CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/widgets/tools/tools.pro b/examples/widgets/tools/tools.pro index 4a9dce3412..a6d483f7e2 100644 --- a/examples/widgets/tools/tools.pro +++ b/examples/widgets/tools/tools.pro @@ -2,16 +2,7 @@ TEMPLATE = subdirs SUBDIRS = \ completer \ customcompleter \ - echoplugin \ - plugandpaint \ regularexpression \ - settingseditor \ - styleplugin \ treemodelcompleter \ undoframework -!qtConfig(library) { - SUBDIRS -= \ - echoplugin \ - plugandpaint -} diff --git a/examples/widgets/tools/treemodelcompleter/CMakeLists.txt b/examples/widgets/tools/treemodelcompleter/CMakeLists.txt index 42b3ed7aea..4f512db3ee 100644 --- a/examples/widgets/tools/treemodelcompleter/CMakeLists.txt +++ b/examples/widgets/tools/treemodelcompleter/CMakeLists.txt @@ -1,15 +1,9 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(treemodelcompleter LANGUAGES CXX) -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/tools/treemodelcompleter") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) qt_standard_project_setup() @@ -44,7 +38,14 @@ qt_add_resources(treemodelcompleter "treemodelcompleter" ) install(TARGETS treemodelcompleter - 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 treemodelcompleter + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR ) +install(SCRIPT ${deploy_script}) diff --git a/examples/widgets/tools/treemodelcompleter/main.cpp b/examples/widgets/tools/treemodelcompleter/main.cpp index 50ca573129..060dfe5bd8 100644 --- a/examples/widgets/tools/treemodelcompleter/main.cpp +++ b/examples/widgets/tools/treemodelcompleter/main.cpp @@ -7,8 +7,6 @@ //! [0] int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(treemodelcompleter); - QApplication app(argc, argv); MainWindow window; window.show(); diff --git a/examples/widgets/tools/undoframework/CMakeLists.txt b/examples/widgets/tools/undoframework/CMakeLists.txt index 753d4205dc..27912f04c7 100644 --- a/examples/widgets/tools/undoframework/CMakeLists.txt +++ b/examples/widgets/tools/undoframework/CMakeLists.txt @@ -1,15 +1,9 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(undoframework LANGUAGES CXX) -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/tools/undoframework") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) qt_standard_project_setup() @@ -51,7 +45,14 @@ qt_add_resources(undoframework "undoframework" ) install(TARGETS undoframework - 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 undoframework + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR ) +install(SCRIPT ${deploy_script}) diff --git a/examples/widgets/tools/undoframework/main.cpp b/examples/widgets/tools/undoframework/main.cpp index c43b2fccd7..8dfa3ffb4b 100644 --- a/examples/widgets/tools/undoframework/main.cpp +++ b/examples/widgets/tools/undoframework/main.cpp @@ -8,8 +8,6 @@ //! [0] int main(int argv, char *args[]) { - Q_INIT_RESOURCE(undoframework); - QApplication app(argv, args); MainWindow mainWindow; |