diff --git a/.reuse/dep5 b/.reuse/dep5 index 643981bdc..fe9161226 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -19,7 +19,7 @@ Copyright: None License: CC0-1.0 #interface -Files: include/dtkwidget/DWidget/* +Files: include/DWidget/* Copyright: None License: CC0-1.0 @@ -69,12 +69,12 @@ Copyright: UnionTech Software Technology Co., Ltd. License: LGPL-3.0-or-later # svg -Files: examples/dwidget-examples/collections/icons/texts/* plugin/dtkuidemo/logo_icon.svg +Files: examples/collections/icons/texts/* plugin/dtkuidemo/logo_icon.svg Copyright: UnionTech Software Technology Co., Ltd. License: LGPL-3.0-or-later #example png -Files: examples/dwidget-examples/collections/images/* +Files: examples/collections/images/* Copyright: UnionTech Software Technology Co., Ltd. License: LGPL-3.0-or-later diff --git a/CMakeLists.txt b/CMakeLists.txt index 022ac79d1..9088b3295 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,81 +1,156 @@ -cmake_minimum_required (VERSION 3.10) - -set (DVERSION "5.6.2" CACHE STRING "define project version") -project (DtkWidget - VERSION ${DVERSION} - DESCRIPTION "DTK Widget module" - HOMEPAGE_URL "https://github.com/linuxdeepin/dtkwidget" - LANGUAGES CXX C +cmake_minimum_required(VERSION 3.10) + +set(VERSION + "5.6.4" + CACHE STRING "define project version" +) + +project(DtkWidget + VERSION ${VERSION} + DESCRIPTION "DTK Widget module" + HOMEPAGE_URL "https://github.com/linuxdeepin/dtkwidget" + LANGUAGES CXX C ) -#set(BREAKVERSION "5") + +set(LIB_NAME dtkwidget) + include(GNUInstallDirs) include(CMakePackageConfigHelpers) +set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +if(UNIX AND NOT APPLE) + set(LINUX TRUE) +endif() + # Set build option -set (BUILD_PLUGINS ON CACHE BOOL "BUILD PLUGIN EXAMPLES") +set(BUILD_PLUGINS + ON + CACHE BOOL "Build plugin and plugin example" +) # Set install path -if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) set(CMAKE_INSTALL_PREFIX /usr) -endif () -set (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libdtk-${CMAKE_PROJECT_VERSION}/DWidget") -set (TOOL_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/libdtk-${CMAKE_PROJECT_VERSION}/DWidget/bin") -set (LIBRARY_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}") -set (MKSPECS_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/qt5/mkspecs/modules" CACHE STRING "INSTALL DIR FOR qt pri files") +endif() + +if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Release) +endif() + +set(INCLUDE_INSTALL_DIR + "${CMAKE_INSTALL_INCLUDEDIR}/dtk${PROJECT_VERSION_MAJOR}/DWidget" +) +set(TOOL_INSTALL_DIR + "${CMAKE_INSTALL_LIBDIR}/dtk${PROJECT_VERSION_MAJOR}/DWidget/bin" +) +set(LIBRARY_INSTALL_DIR + "${CMAKE_INSTALL_LIBDIR}" +) +set(MKSPECS_INSTALL_DIR + "${CMAKE_INSTALL_LIBDIR}/qt5/mkspecs/modules" + CACHE STRING "Install dir for qt pri files" +) +set(CONFIG_INSTALL_DIR + "${CMAKE_INSTALL_LIBDIR}/cmake/DtkWidget" + CACHE STRING "Install directory for cmake files" +) +set(PKGCONFIG_INSTALL_DIR + "${CMAKE_INSTALL_LIBDIR}/pkgconfig" + CACHE STRING "Install directory for pkgconfig files" +) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -Wextra") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed") -if (CMAKE_BUILD_TYPE STREQUAL "Debug") - set(BUILD_TESTING ON) -else () - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Ofast") -endif () +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + set(BUILD_TESTING ON) +else() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Ofast") +endif() +# find_package +find_package(Dtk REQUIRED COMPONENTS Core Gui) +find_package(QT NAMES Qt5 REQUIRED COMPONENTS Core) +find_package(Qt5 REQUIRED COMPONENTS + Core + Network + Concurrent + Widgets + PrintSupport + LinguistTools + X11Extras + DBus +) +find_package(PkgConfig REQUIRED) +file(GLOB D_HEADERS "${PROJECT_SOURCE_DIR}/include/DWidget/*") -add_subdirectory(src) +set(AUTOCONFIG ${CMAKE_CURRENT_BINARY_DIR}/dtkwidget_config.h) +get_filename_component(CONFIG_INCLUDE ${AUTOCONFIG} DIRECTORY) +set(CONFIG_CONTENT) +string(APPEND CONFIG_CONTENT "// This is an auto-generated config\n") + +foreach(header ${D_HEADERS}) + get_filename_component(thename ${header} NAME) + string(APPEND CONFIG_CONTENT "#define DTKWIDGET_CLASS_${thename}\n") +endforeach() + +file(WRITE ${AUTOCONFIG} ${CONFIG_CONTENT}) +file(GLOB_RECURSE PUBLIC_HEADERS "${PROJECT_SOURCE_DIR}/include/*.h") +list(APPEND PUBLIC_HEADERS ${D_HEADERS} ${AUTOCONFIG}) + +add_subdirectory(src) add_subdirectory(examples) add_subdirectory(tools) if(BUILD_TESTING) - message("==================================") - message(" Now Testing is enabled ") - message("==================================") - enable_testing() - add_subdirectory(tests) + message("==================================") + message(" Now Testing is enabled ") + message("==================================") + enable_testing() + add_subdirectory(tests) endif() + if(BUILD_PLUGINS) - message("===================================") - message(" You can build and run plugins now ") - message("===================================") - add_subdirectory(plugin) + message("===================================") + message(" You can build and run plugins now ") + message("===================================") + add_subdirectory(plugin) endif() -find_package (Qt5 CONFIG REQUIRED COMPONENTS DBus Xml) -set (BUILD_DOCS ON CACHE BOOL "Generate doxygen-based documentation") +set(BUILD_DOCS + ON + CACHE BOOL "Generate doxygen-based documentation" +) -if (BUILD_DOCS) - add_subdirectory(docs) -endif () +if(BUILD_DOCS) + add_subdirectory(docs) +endif() -configure_package_config_file(misc/DtkWidgetConfig.cmake.in +configure_package_config_file( + misc/DtkWidgetConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/DtkWidgetConfig.cmake - INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/DtkWidget" - PATH_VARS INCLUDE_INSTALL_DIR LIBRARY_INSTALL_DIR TOOL_INSTALL_DIR + INSTALL_DESTINATION ${CONFIG_INSTALL_DIR} + PATH_VARS TOOL_INSTALL_DIR ) + write_basic_package_version_file( - "${CMAKE_CURRENT_BINARY_DIR}/DtkWidgetConfigVersion.cmake" - VERSION ${DVERSION} + ${CMAKE_CURRENT_BINARY_DIR}/DtkWidgetConfigVersion.cmake + VERSION ${VERSION} COMPATIBILITY SameMajorVersion ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/DtkWidgetConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/DtkWidgetConfigVersion.cmake - DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/DtkWidget" + DESTINATION ${CONFIG_INSTALL_DIR} ) configure_file(misc/dtkwidget.pc.in dtkwidget.pc @ONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dtkwidget.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dtkwidget.pc DESTINATION ${PKGCONFIG_INSTALL_DIR}) configure_file(misc/qt_lib_dtkwidget.pri.in qt_lib_dtkwidget.pri @ONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qt_lib_dtkwidget.pri DESTINATION "${MKSPECS_INSTALL_DIR}") +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qt_lib_dtkwidget.pri DESTINATION ${MKSPECS_INSTALL_DIR}) diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index 4733efc08..8ba5c4729 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -20,11 +20,11 @@ build() { cd $deepin_source_name cmake -GNinja \ -DHUNTER_ENABLED=OFF \ - -DMKSPECS_INSTALL_DIR=/usr/lib/qt/mkspecs/modules/\ + -DMKSPECS_INSTALL_DIR=lib/qt/mkspecs/modules/\ -DBUILD_PLUGINS=OFF \ -DBUILD_DOCS=ON \ - -DQCH_INSTALL_DESTINATION=/usr/share/doc/qt \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DQCH_INSTALL_DESTINATION=share/doc/qt \ + -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release ninja diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec635144f..000000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control index 2169eb2ae..dac4aab24 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: dtkwidget Section: libdevel Priority: optional Maintainer: Deepin Packages Builder -Build-Depends: debhelper (>= 9), pkg-config, libudev-dev, +Build-Depends: debhelper-compat (= 12), pkg-config, libudev-dev, libqt5x11extras5-dev, libxext-dev, qttools5-dev-tools, qttools5-dev, x11proto-xext-dev, libxcb-util0-dev, libstartup-notification0-dev, libmtdev-dev, qtbase5-private-dev, libegl1-mesa-dev, libudev-dev, diff --git a/debian/dtkwidget5-examples.install b/debian/dtkwidget5-examples.install index 97c3fdab0..ed5abd301 100644 --- a/debian/dtkwidget5-examples.install +++ b/debian/dtkwidget5-examples.install @@ -1 +1,2 @@ usr/lib/*/*/*/examples/* +usr/share/dsg/configs/overrides/dtk-example/* diff --git a/debian/libdtkwidget5.install b/debian/libdtkwidget5.install index 5bb4217a1..76af5ad1a 100644 --- a/debian/libdtkwidget5.install +++ b/debian/libdtkwidget5.install @@ -1,2 +1,3 @@ usr/lib/*/lib*.so.* usr/share/*/*/translations/* +usr/share/dsg/configs/org.deepin.dtkwidget.feature-display.json diff --git a/debian/libdtkwidget5.install.amd64 b/debian/libdtkwidget5.install.amd64 index fa08da37b..37cd02d71 100644 --- a/debian/libdtkwidget5.install.amd64 +++ b/debian/libdtkwidget5.install.amd64 @@ -1,3 +1,4 @@ usr/lib/*/lib*.so.* #usr/lib/*/libmsc.so usr/share/*/*/translations/* +usr/share/dsg/configs/org.deepin.dtkwidget.feature-display.json diff --git a/debian/libdtkwidget5.install.i386 b/debian/libdtkwidget5.install.i386 index fa08da37b..37cd02d71 100644 --- a/debian/libdtkwidget5.install.i386 +++ b/debian/libdtkwidget5.install.i386 @@ -1,3 +1,4 @@ usr/lib/*/lib*.so.* #usr/lib/*/libmsc.so usr/share/*/*/translations/* +usr/share/dsg/configs/org.deepin.dtkwidget.feature-display.json diff --git a/debian/rules b/debian/rules index 47608b842..332bb7a66 100755 --- a/debian/rules +++ b/debian/rules @@ -17,10 +17,10 @@ else endif %: - dh $@ --parallel + dh $@ override_dh_auto_configure: - dh_auto_configure -- -DBUILD_PLUGINS=OFF -DBUILD_DOCS=OFF -DDVERSION=$(_PACK_VER) + dh_auto_configure -- -DBUILD_PLUGINS=OFF -DBUILD_DOCS=OFF -DVERSION=$(_PACK_VER) #override_dh_auto_configure: # dh_auto_configure -- LIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH) #override_dh_makeshlibs: @@ -33,4 +33,3 @@ override_dh_auto_configure: override_dh_makeshlibs: dh_makeshlibs -V "libdtkwidget5 (>= $(shell echo $(VERSION) | cut -d '.' -f 1,2))" - diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 4f0d21393..c67ec5049 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -21,12 +21,12 @@ set (DOXYGEN_TAGFILES "qtcore.tags=qthelp://org.qt-project.qtcore/qtcore/" CACHE set (DOXYGEN_PREDEFINED "D_DECL_DEPRECATED_X(x)=" - "\"DCORE_BEGIN_NAMESPACE=namespace Dtk { namespace Core {\"" - "\"DCORE_END_NAMESPACE=}}\"" - "\"DCORE_USE_NAMESPACE=using namespace Dtk::Core\;\"" - "\"DWIDGET_BEGIN_NAMESPACE=namespace Dtk { namespace Widget {\"" - "\"DWIDGET_END_NAMESPACE=}}\"" - "\"DWIDGET_USE_NAMESPACE=using namespace Dtk::Widget\;\"" + "DCORE_BEGIN_NAMESPACE=namespace Dtk { namespace Core {" + "DCORE_END_NAMESPACE=}}" + "DCORE_USE_NAMESPACE=using namespace Dtk::Core;" + "DWIDGET_BEGIN_NAMESPACE=namespace Dtk { namespace Widget {" + "DWIDGET_END_NAMESPACE=}}" + "DWIDGET_USE_NAMESPACE=using namespace Dtk::Widget;" ) set (BUILD_THEME OFF CACHE BOOL "Build doxgen theme") diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 241c4414a..cd988bbd0 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,2 +1,2 @@ -add_subdirectory(dwidget-examples/collections) -add_subdirectory(dwidget-examples/PrintPreviewSettingsPlugin) +add_subdirectory(collections) +add_subdirectory(PrintPreviewSettingsPlugin) diff --git a/examples/PrintPreviewSettingsPlugin/CMakeLists.txt b/examples/PrintPreviewSettingsPlugin/CMakeLists.txt new file mode 100644 index 000000000..1e11cccee --- /dev/null +++ b/examples/PrintPreviewSettingsPlugin/CMakeLists.txt @@ -0,0 +1,12 @@ +set(PLUGIN_NAME PrintPreviewSettingsPlugin) + +find_package(Qt5 REQUIRED COMPONENTS Core) + +add_library(${PLUGIN_NAME} SHARED + settingsplugin.h + settingsplugin.cpp +) + +target_link_libraries(${PLUGIN_NAME} PRIVATE + ${LIB_NAME} +) diff --git a/examples/dwidget-examples/PrintPreviewSettingsPlugin/PrintPreviewSettingsPlugin.json b/examples/PrintPreviewSettingsPlugin/PrintPreviewSettingsPlugin.json similarity index 100% rename from examples/dwidget-examples/PrintPreviewSettingsPlugin/PrintPreviewSettingsPlugin.json rename to examples/PrintPreviewSettingsPlugin/PrintPreviewSettingsPlugin.json diff --git a/examples/dwidget-examples/PrintPreviewSettingsPlugin/settingsplugin.cpp b/examples/PrintPreviewSettingsPlugin/settingsplugin.cpp similarity index 100% rename from examples/dwidget-examples/PrintPreviewSettingsPlugin/settingsplugin.cpp rename to examples/PrintPreviewSettingsPlugin/settingsplugin.cpp diff --git a/examples/dwidget-examples/PrintPreviewSettingsPlugin/settingsplugin.h b/examples/PrintPreviewSettingsPlugin/settingsplugin.h similarity index 100% rename from examples/dwidget-examples/PrintPreviewSettingsPlugin/settingsplugin.h rename to examples/PrintPreviewSettingsPlugin/settingsplugin.h diff --git a/examples/collections/CMakeLists.txt b/examples/collections/CMakeLists.txt new file mode 100644 index 000000000..e667d3890 --- /dev/null +++ b/examples/collections/CMakeLists.txt @@ -0,0 +1,62 @@ +set(BIN_NAME collections) +set(CMAKE_AUTOUIC ON) + +find_package(Qt5 REQUIRED COMPONENTS Gui Widgets) + +add_executable(${BIN_NAME} + images.qrc + resources.qrc + icons/theme-icons.qrc + cameraform.ui + mainwindow.h + buttonexample.h + examplewindowinterface.h + pagewindowinterface.h + editexample.h + sliderexample.h + listviewexample.h + windowexample.h + tooltipexample.h + spinnerexample.h + dialogexample.h + progressbarexample.h + layoutexample.h + scrollbarexample.h + rubberbandexample.h + widgetexample.h + lcdnumberexample.h + menuexample.h + imageviewerexample.h + main.cpp + mainwindow.cpp + buttonexample.cpp + examplewindowinterface.cpp + pagewindowinterface.cpp + editexample.cpp + sliderexample.cpp + listviewexample.cpp + windowexample.cpp + tooltipexample.cpp + spinnerexample.cpp + dialogexample.cpp + progressbarexample.cpp + layoutexample.cpp + scrollbarexample.cpp + rubberbandexample.cpp + widgetexample.cpp + lcdnumberexample.cpp + menuexample.cpp + imageviewerexample.cpp +) + +target_link_libraries(${BIN_NAME} PRIVATE + Qt5::Widgets + Qt5::GuiPrivate + ${LIB_NAME} +) +install( + TARGETS ${BIN_NAME} + DESTINATION "${CMAKE_INSTALL_LIBDIR}/dtk${PROJECT_VERSION_MAJOR}/DWidget/examples/" +) + +dconfig_override_files(APPID dtk-example META_NAME org.deepin.dtkwidget.feature-display FILES ${CMAKE_CURRENT_LIST_DIR}/org.deepin.dtkwiget.feature-display.json) diff --git a/examples/dwidget-examples/collections/buttonexample.cpp b/examples/collections/buttonexample.cpp similarity index 100% rename from examples/dwidget-examples/collections/buttonexample.cpp rename to examples/collections/buttonexample.cpp diff --git a/examples/dwidget-examples/collections/buttonexample.h b/examples/collections/buttonexample.h similarity index 100% rename from examples/dwidget-examples/collections/buttonexample.h rename to examples/collections/buttonexample.h diff --git a/examples/dwidget-examples/collections/cameraform.ui b/examples/collections/cameraform.ui similarity index 100% rename from examples/dwidget-examples/collections/cameraform.ui rename to examples/collections/cameraform.ui diff --git a/examples/dwidget-examples/collections/dialogexample.cpp b/examples/collections/dialogexample.cpp similarity index 100% rename from examples/dwidget-examples/collections/dialogexample.cpp rename to examples/collections/dialogexample.cpp diff --git a/examples/dwidget-examples/collections/dialogexample.h b/examples/collections/dialogexample.h similarity index 100% rename from examples/dwidget-examples/collections/dialogexample.h rename to examples/collections/dialogexample.h diff --git a/examples/dwidget-examples/collections/editexample.cpp b/examples/collections/editexample.cpp similarity index 100% rename from examples/dwidget-examples/collections/editexample.cpp rename to examples/collections/editexample.cpp diff --git a/examples/dwidget-examples/collections/editexample.h b/examples/collections/editexample.h similarity index 100% rename from examples/dwidget-examples/collections/editexample.h rename to examples/collections/editexample.h diff --git a/examples/dwidget-examples/collections/examplewindowinterface.cpp b/examples/collections/examplewindowinterface.cpp similarity index 100% rename from examples/dwidget-examples/collections/examplewindowinterface.cpp rename to examples/collections/examplewindowinterface.cpp diff --git a/examples/dwidget-examples/collections/examplewindowinterface.h b/examples/collections/examplewindowinterface.h similarity index 100% rename from examples/dwidget-examples/collections/examplewindowinterface.h rename to examples/collections/examplewindowinterface.h diff --git a/examples/dwidget-examples/collections/icons/texts/icon_Dial_16px.svg b/examples/collections/icons/texts/icon_Dial_16px.svg similarity index 100% rename from examples/dwidget-examples/collections/icons/texts/icon_Dial_16px.svg rename to examples/collections/icons/texts/icon_Dial_16px.svg diff --git a/examples/dwidget-examples/collections/icons/texts/icon_Dialog_16px.svg b/examples/collections/icons/texts/icon_Dialog_16px.svg similarity index 100% rename from examples/dwidget-examples/collections/icons/texts/icon_Dialog_16px.svg rename to examples/collections/icons/texts/icon_Dialog_16px.svg diff --git a/examples/dwidget-examples/collections/icons/texts/icon_LCDNumber_16px.svg b/examples/collections/icons/texts/icon_LCDNumber_16px.svg similarity index 100% rename from examples/dwidget-examples/collections/icons/texts/icon_LCDNumber_16px.svg rename to examples/collections/icons/texts/icon_LCDNumber_16px.svg diff --git a/examples/dwidget-examples/collections/icons/texts/icon_Layout_16px.svg b/examples/collections/icons/texts/icon_Layout_16px.svg similarity index 100% rename from examples/dwidget-examples/collections/icons/texts/icon_Layout_16px.svg rename to examples/collections/icons/texts/icon_Layout_16px.svg diff --git a/examples/dwidget-examples/collections/icons/texts/icon_ListView_16px.svg b/examples/collections/icons/texts/icon_ListView_16px.svg similarity index 100% rename from examples/dwidget-examples/collections/icons/texts/icon_ListView_16px.svg rename to examples/collections/icons/texts/icon_ListView_16px.svg diff --git a/examples/dwidget-examples/collections/icons/texts/icon_ProgressBar_16px.svg b/examples/collections/icons/texts/icon_ProgressBar_16px.svg similarity index 100% rename from examples/dwidget-examples/collections/icons/texts/icon_ProgressBar_16px.svg rename to examples/collections/icons/texts/icon_ProgressBar_16px.svg diff --git a/examples/dwidget-examples/collections/icons/texts/icon_RubberBand_16px.svg b/examples/collections/icons/texts/icon_RubberBand_16px.svg similarity index 100% rename from examples/dwidget-examples/collections/icons/texts/icon_RubberBand_16px.svg rename to examples/collections/icons/texts/icon_RubberBand_16px.svg diff --git a/examples/dwidget-examples/collections/icons/texts/icon_ScrollBar_16px.svg b/examples/collections/icons/texts/icon_ScrollBar_16px.svg similarity index 100% rename from examples/dwidget-examples/collections/icons/texts/icon_ScrollBar_16px.svg rename to examples/collections/icons/texts/icon_ScrollBar_16px.svg diff --git a/examples/dwidget-examples/collections/icons/texts/icon_Spinner_16px.svg b/examples/collections/icons/texts/icon_Spinner_16px.svg similarity index 100% rename from examples/dwidget-examples/collections/icons/texts/icon_Spinner_16px.svg rename to examples/collections/icons/texts/icon_Spinner_16px.svg diff --git a/examples/dwidget-examples/collections/icons/texts/icon_Tooltip_16px.svg b/examples/collections/icons/texts/icon_Tooltip_16px.svg similarity index 100% rename from examples/dwidget-examples/collections/icons/texts/icon_Tooltip_16px.svg rename to examples/collections/icons/texts/icon_Tooltip_16px.svg diff --git a/examples/dwidget-examples/collections/icons/texts/icon_Widget_16px.svg b/examples/collections/icons/texts/icon_Widget_16px.svg similarity index 100% rename from examples/dwidget-examples/collections/icons/texts/icon_Widget_16px.svg rename to examples/collections/icons/texts/icon_Widget_16px.svg diff --git a/examples/dwidget-examples/collections/icons/texts/icon_Window_16px.svg b/examples/collections/icons/texts/icon_Window_16px.svg similarity index 100% rename from examples/dwidget-examples/collections/icons/texts/icon_Window_16px.svg rename to examples/collections/icons/texts/icon_Window_16px.svg diff --git a/examples/dwidget-examples/collections/icons/texts/icon_button_16px.svg b/examples/collections/icons/texts/icon_button_16px.svg similarity index 100% rename from examples/dwidget-examples/collections/icons/texts/icon_button_16px.svg rename to examples/collections/icons/texts/icon_button_16px.svg diff --git a/examples/dwidget-examples/collections/icons/texts/icon_edit_16px.svg b/examples/collections/icons/texts/icon_edit_16px.svg similarity index 100% rename from examples/dwidget-examples/collections/icons/texts/icon_edit_16px.svg rename to examples/collections/icons/texts/icon_edit_16px.svg diff --git a/examples/dwidget-examples/collections/icons/texts/icon_menu_16px.svg b/examples/collections/icons/texts/icon_menu_16px.svg similarity index 100% rename from examples/dwidget-examples/collections/icons/texts/icon_menu_16px.svg rename to examples/collections/icons/texts/icon_menu_16px.svg diff --git a/examples/dwidget-examples/collections/icons/texts/icon_slider_16px.svg b/examples/collections/icons/texts/icon_slider_16px.svg similarity index 100% rename from examples/dwidget-examples/collections/icons/texts/icon_slider_16px.svg rename to examples/collections/icons/texts/icon_slider_16px.svg diff --git a/examples/dwidget-examples/collections/icons/theme-icons.qrc b/examples/collections/icons/theme-icons.qrc similarity index 100% rename from examples/dwidget-examples/collections/icons/theme-icons.qrc rename to examples/collections/icons/theme-icons.qrc diff --git a/examples/dwidget-examples/collections/images.qrc b/examples/collections/images.qrc similarity index 100% rename from examples/dwidget-examples/collections/images.qrc rename to examples/collections/images.qrc diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner01.png b/examples/collections/images/Spinner/Spinner01.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner01.png rename to examples/collections/images/Spinner/Spinner01.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner02.png b/examples/collections/images/Spinner/Spinner02.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner02.png rename to examples/collections/images/Spinner/Spinner02.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner03.png b/examples/collections/images/Spinner/Spinner03.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner03.png rename to examples/collections/images/Spinner/Spinner03.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner04.png b/examples/collections/images/Spinner/Spinner04.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner04.png rename to examples/collections/images/Spinner/Spinner04.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner05.png b/examples/collections/images/Spinner/Spinner05.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner05.png rename to examples/collections/images/Spinner/Spinner05.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner06.png b/examples/collections/images/Spinner/Spinner06.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner06.png rename to examples/collections/images/Spinner/Spinner06.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner07.png b/examples/collections/images/Spinner/Spinner07.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner07.png rename to examples/collections/images/Spinner/Spinner07.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner08.png b/examples/collections/images/Spinner/Spinner08.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner08.png rename to examples/collections/images/Spinner/Spinner08.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner09.png b/examples/collections/images/Spinner/Spinner09.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner09.png rename to examples/collections/images/Spinner/Spinner09.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner10.png b/examples/collections/images/Spinner/Spinner10.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner10.png rename to examples/collections/images/Spinner/Spinner10.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner11.png b/examples/collections/images/Spinner/Spinner11.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner11.png rename to examples/collections/images/Spinner/Spinner11.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner12.png b/examples/collections/images/Spinner/Spinner12.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner12.png rename to examples/collections/images/Spinner/Spinner12.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner13.png b/examples/collections/images/Spinner/Spinner13.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner13.png rename to examples/collections/images/Spinner/Spinner13.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner14.png b/examples/collections/images/Spinner/Spinner14.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner14.png rename to examples/collections/images/Spinner/Spinner14.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner15.png b/examples/collections/images/Spinner/Spinner15.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner15.png rename to examples/collections/images/Spinner/Spinner15.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner16.png b/examples/collections/images/Spinner/Spinner16.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner16.png rename to examples/collections/images/Spinner/Spinner16.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner17.png b/examples/collections/images/Spinner/Spinner17.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner17.png rename to examples/collections/images/Spinner/Spinner17.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner18.png b/examples/collections/images/Spinner/Spinner18.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner18.png rename to examples/collections/images/Spinner/Spinner18.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner19.png b/examples/collections/images/Spinner/Spinner19.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner19.png rename to examples/collections/images/Spinner/Spinner19.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner20.png b/examples/collections/images/Spinner/Spinner20.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner20.png rename to examples/collections/images/Spinner/Spinner20.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner21.png b/examples/collections/images/Spinner/Spinner21.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner21.png rename to examples/collections/images/Spinner/Spinner21.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner22.png b/examples/collections/images/Spinner/Spinner22.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner22.png rename to examples/collections/images/Spinner/Spinner22.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner23.png b/examples/collections/images/Spinner/Spinner23.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner23.png rename to examples/collections/images/Spinner/Spinner23.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner24.png b/examples/collections/images/Spinner/Spinner24.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner24.png rename to examples/collections/images/Spinner/Spinner24.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner25.png b/examples/collections/images/Spinner/Spinner25.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner25.png rename to examples/collections/images/Spinner/Spinner25.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner26.png b/examples/collections/images/Spinner/Spinner26.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner26.png rename to examples/collections/images/Spinner/Spinner26.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner27.png b/examples/collections/images/Spinner/Spinner27.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner27.png rename to examples/collections/images/Spinner/Spinner27.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner28.png b/examples/collections/images/Spinner/Spinner28.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner28.png rename to examples/collections/images/Spinner/Spinner28.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner29.png b/examples/collections/images/Spinner/Spinner29.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner29.png rename to examples/collections/images/Spinner/Spinner29.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner30.png b/examples/collections/images/Spinner/Spinner30.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner30.png rename to examples/collections/images/Spinner/Spinner30.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner31.png b/examples/collections/images/Spinner/Spinner31.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner31.png rename to examples/collections/images/Spinner/Spinner31.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner32.png b/examples/collections/images/Spinner/Spinner32.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner32.png rename to examples/collections/images/Spinner/Spinner32.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner33.png b/examples/collections/images/Spinner/Spinner33.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner33.png rename to examples/collections/images/Spinner/Spinner33.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner34.png b/examples/collections/images/Spinner/Spinner34.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner34.png rename to examples/collections/images/Spinner/Spinner34.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner35.png b/examples/collections/images/Spinner/Spinner35.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner35.png rename to examples/collections/images/Spinner/Spinner35.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner36.png b/examples/collections/images/Spinner/Spinner36.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner36.png rename to examples/collections/images/Spinner/Spinner36.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner37.png b/examples/collections/images/Spinner/Spinner37.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner37.png rename to examples/collections/images/Spinner/Spinner37.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner38.png b/examples/collections/images/Spinner/Spinner38.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner38.png rename to examples/collections/images/Spinner/Spinner38.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner39.png b/examples/collections/images/Spinner/Spinner39.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner39.png rename to examples/collections/images/Spinner/Spinner39.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner40.png b/examples/collections/images/Spinner/Spinner40.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner40.png rename to examples/collections/images/Spinner/Spinner40.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner41.png b/examples/collections/images/Spinner/Spinner41.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner41.png rename to examples/collections/images/Spinner/Spinner41.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner42.png b/examples/collections/images/Spinner/Spinner42.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner42.png rename to examples/collections/images/Spinner/Spinner42.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner43.png b/examples/collections/images/Spinner/Spinner43.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner43.png rename to examples/collections/images/Spinner/Spinner43.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner44.png b/examples/collections/images/Spinner/Spinner44.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner44.png rename to examples/collections/images/Spinner/Spinner44.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner45.png b/examples/collections/images/Spinner/Spinner45.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner45.png rename to examples/collections/images/Spinner/Spinner45.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner46.png b/examples/collections/images/Spinner/Spinner46.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner46.png rename to examples/collections/images/Spinner/Spinner46.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner47.png b/examples/collections/images/Spinner/Spinner47.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner47.png rename to examples/collections/images/Spinner/Spinner47.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner48.png b/examples/collections/images/Spinner/Spinner48.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner48.png rename to examples/collections/images/Spinner/Spinner48.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner49.png b/examples/collections/images/Spinner/Spinner49.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner49.png rename to examples/collections/images/Spinner/Spinner49.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner50.png b/examples/collections/images/Spinner/Spinner50.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner50.png rename to examples/collections/images/Spinner/Spinner50.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner51.png b/examples/collections/images/Spinner/Spinner51.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner51.png rename to examples/collections/images/Spinner/Spinner51.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner52.png b/examples/collections/images/Spinner/Spinner52.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner52.png rename to examples/collections/images/Spinner/Spinner52.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner53.png b/examples/collections/images/Spinner/Spinner53.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner53.png rename to examples/collections/images/Spinner/Spinner53.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner54.png b/examples/collections/images/Spinner/Spinner54.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner54.png rename to examples/collections/images/Spinner/Spinner54.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner55.png b/examples/collections/images/Spinner/Spinner55.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner55.png rename to examples/collections/images/Spinner/Spinner55.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner56.png b/examples/collections/images/Spinner/Spinner56.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner56.png rename to examples/collections/images/Spinner/Spinner56.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner57.png b/examples/collections/images/Spinner/Spinner57.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner57.png rename to examples/collections/images/Spinner/Spinner57.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner58.png b/examples/collections/images/Spinner/Spinner58.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner58.png rename to examples/collections/images/Spinner/Spinner58.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner59.png b/examples/collections/images/Spinner/Spinner59.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner59.png rename to examples/collections/images/Spinner/Spinner59.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner60.png b/examples/collections/images/Spinner/Spinner60.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner60.png rename to examples/collections/images/Spinner/Spinner60.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner61.png b/examples/collections/images/Spinner/Spinner61.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner61.png rename to examples/collections/images/Spinner/Spinner61.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner62.png b/examples/collections/images/Spinner/Spinner62.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner62.png rename to examples/collections/images/Spinner/Spinner62.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner63.png b/examples/collections/images/Spinner/Spinner63.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner63.png rename to examples/collections/images/Spinner/Spinner63.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner64.png b/examples/collections/images/Spinner/Spinner64.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner64.png rename to examples/collections/images/Spinner/Spinner64.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner65.png b/examples/collections/images/Spinner/Spinner65.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner65.png rename to examples/collections/images/Spinner/Spinner65.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner66.png b/examples/collections/images/Spinner/Spinner66.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner66.png rename to examples/collections/images/Spinner/Spinner66.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner67.png b/examples/collections/images/Spinner/Spinner67.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner67.png rename to examples/collections/images/Spinner/Spinner67.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner68.png b/examples/collections/images/Spinner/Spinner68.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner68.png rename to examples/collections/images/Spinner/Spinner68.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner69.png b/examples/collections/images/Spinner/Spinner69.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner69.png rename to examples/collections/images/Spinner/Spinner69.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner70.png b/examples/collections/images/Spinner/Spinner70.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner70.png rename to examples/collections/images/Spinner/Spinner70.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner71.png b/examples/collections/images/Spinner/Spinner71.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner71.png rename to examples/collections/images/Spinner/Spinner71.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner72.png b/examples/collections/images/Spinner/Spinner72.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner72.png rename to examples/collections/images/Spinner/Spinner72.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner73.png b/examples/collections/images/Spinner/Spinner73.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner73.png rename to examples/collections/images/Spinner/Spinner73.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner74.png b/examples/collections/images/Spinner/Spinner74.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner74.png rename to examples/collections/images/Spinner/Spinner74.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner75.png b/examples/collections/images/Spinner/Spinner75.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner75.png rename to examples/collections/images/Spinner/Spinner75.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner76.png b/examples/collections/images/Spinner/Spinner76.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner76.png rename to examples/collections/images/Spinner/Spinner76.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner77.png b/examples/collections/images/Spinner/Spinner77.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner77.png rename to examples/collections/images/Spinner/Spinner77.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner78.png b/examples/collections/images/Spinner/Spinner78.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner78.png rename to examples/collections/images/Spinner/Spinner78.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner79.png b/examples/collections/images/Spinner/Spinner79.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner79.png rename to examples/collections/images/Spinner/Spinner79.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner80.png b/examples/collections/images/Spinner/Spinner80.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner80.png rename to examples/collections/images/Spinner/Spinner80.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner81.png b/examples/collections/images/Spinner/Spinner81.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner81.png rename to examples/collections/images/Spinner/Spinner81.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner82.png b/examples/collections/images/Spinner/Spinner82.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner82.png rename to examples/collections/images/Spinner/Spinner82.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner83.png b/examples/collections/images/Spinner/Spinner83.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner83.png rename to examples/collections/images/Spinner/Spinner83.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner84.png b/examples/collections/images/Spinner/Spinner84.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner84.png rename to examples/collections/images/Spinner/Spinner84.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner85.png b/examples/collections/images/Spinner/Spinner85.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner85.png rename to examples/collections/images/Spinner/Spinner85.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner86.png b/examples/collections/images/Spinner/Spinner86.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner86.png rename to examples/collections/images/Spinner/Spinner86.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner87.png b/examples/collections/images/Spinner/Spinner87.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner87.png rename to examples/collections/images/Spinner/Spinner87.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner88.png b/examples/collections/images/Spinner/Spinner88.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner88.png rename to examples/collections/images/Spinner/Spinner88.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner89.png b/examples/collections/images/Spinner/Spinner89.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner89.png rename to examples/collections/images/Spinner/Spinner89.png diff --git a/examples/dwidget-examples/collections/images/Spinner/Spinner90.png b/examples/collections/images/Spinner/Spinner90.png similarity index 100% rename from examples/dwidget-examples/collections/images/Spinner/Spinner90.png rename to examples/collections/images/Spinner/Spinner90.png diff --git a/examples/dwidget-examples/collections/images/button.png b/examples/collections/images/button.png similarity index 100% rename from examples/dwidget-examples/collections/images/button.png rename to examples/collections/images/button.png diff --git a/examples/dwidget-examples/collections/images/buttonChecked.png b/examples/collections/images/buttonChecked.png similarity index 100% rename from examples/dwidget-examples/collections/images/buttonChecked.png rename to examples/collections/images/buttonChecked.png diff --git a/examples/dwidget-examples/collections/images/buttonHover.png b/examples/collections/images/buttonHover.png similarity index 100% rename from examples/dwidget-examples/collections/images/buttonHover.png rename to examples/collections/images/buttonHover.png diff --git a/examples/dwidget-examples/collections/images/buttonPress.png b/examples/collections/images/buttonPress.png similarity index 100% rename from examples/dwidget-examples/collections/images/buttonPress.png rename to examples/collections/images/buttonPress.png diff --git a/examples/dwidget-examples/collections/images/default_background.jpg b/examples/collections/images/default_background.jpg similarity index 100% rename from examples/dwidget-examples/collections/images/default_background.jpg rename to examples/collections/images/default_background.jpg diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_01.png b/examples/collections/images/eLoading/eLoading_01.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_01.png rename to examples/collections/images/eLoading/eLoading_01.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_02.png b/examples/collections/images/eLoading/eLoading_02.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_02.png rename to examples/collections/images/eLoading/eLoading_02.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_03.png b/examples/collections/images/eLoading/eLoading_03.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_03.png rename to examples/collections/images/eLoading/eLoading_03.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_04.png b/examples/collections/images/eLoading/eLoading_04.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_04.png rename to examples/collections/images/eLoading/eLoading_04.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_05.png b/examples/collections/images/eLoading/eLoading_05.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_05.png rename to examples/collections/images/eLoading/eLoading_05.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_06.png b/examples/collections/images/eLoading/eLoading_06.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_06.png rename to examples/collections/images/eLoading/eLoading_06.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_07.png b/examples/collections/images/eLoading/eLoading_07.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_07.png rename to examples/collections/images/eLoading/eLoading_07.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_08.png b/examples/collections/images/eLoading/eLoading_08.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_08.png rename to examples/collections/images/eLoading/eLoading_08.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_09.png b/examples/collections/images/eLoading/eLoading_09.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_09.png rename to examples/collections/images/eLoading/eLoading_09.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_10.png b/examples/collections/images/eLoading/eLoading_10.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_10.png rename to examples/collections/images/eLoading/eLoading_10.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_11.png b/examples/collections/images/eLoading/eLoading_11.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_11.png rename to examples/collections/images/eLoading/eLoading_11.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_12.png b/examples/collections/images/eLoading/eLoading_12.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_12.png rename to examples/collections/images/eLoading/eLoading_12.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_13.png b/examples/collections/images/eLoading/eLoading_13.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_13.png rename to examples/collections/images/eLoading/eLoading_13.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_14.png b/examples/collections/images/eLoading/eLoading_14.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_14.png rename to examples/collections/images/eLoading/eLoading_14.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_15.png b/examples/collections/images/eLoading/eLoading_15.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_15.png rename to examples/collections/images/eLoading/eLoading_15.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_16.png b/examples/collections/images/eLoading/eLoading_16.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_16.png rename to examples/collections/images/eLoading/eLoading_16.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_17.png b/examples/collections/images/eLoading/eLoading_17.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_17.png rename to examples/collections/images/eLoading/eLoading_17.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_18.png b/examples/collections/images/eLoading/eLoading_18.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_18.png rename to examples/collections/images/eLoading/eLoading_18.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_19.png b/examples/collections/images/eLoading/eLoading_19.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_19.png rename to examples/collections/images/eLoading/eLoading_19.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_20.png b/examples/collections/images/eLoading/eLoading_20.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_20.png rename to examples/collections/images/eLoading/eLoading_20.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_21.png b/examples/collections/images/eLoading/eLoading_21.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_21.png rename to examples/collections/images/eLoading/eLoading_21.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_22.png b/examples/collections/images/eLoading/eLoading_22.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_22.png rename to examples/collections/images/eLoading/eLoading_22.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_23.png b/examples/collections/images/eLoading/eLoading_23.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_23.png rename to examples/collections/images/eLoading/eLoading_23.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_24.png b/examples/collections/images/eLoading/eLoading_24.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_24.png rename to examples/collections/images/eLoading/eLoading_24.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_25.png b/examples/collections/images/eLoading/eLoading_25.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_25.png rename to examples/collections/images/eLoading/eLoading_25.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_26.png b/examples/collections/images/eLoading/eLoading_26.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_26.png rename to examples/collections/images/eLoading/eLoading_26.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_27.png b/examples/collections/images/eLoading/eLoading_27.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_27.png rename to examples/collections/images/eLoading/eLoading_27.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_28.png b/examples/collections/images/eLoading/eLoading_28.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_28.png rename to examples/collections/images/eLoading/eLoading_28.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_29.png b/examples/collections/images/eLoading/eLoading_29.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_29.png rename to examples/collections/images/eLoading/eLoading_29.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_30.png b/examples/collections/images/eLoading/eLoading_30.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_30.png rename to examples/collections/images/eLoading/eLoading_30.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_31.png b/examples/collections/images/eLoading/eLoading_31.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_31.png rename to examples/collections/images/eLoading/eLoading_31.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_32.png b/examples/collections/images/eLoading/eLoading_32.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_32.png rename to examples/collections/images/eLoading/eLoading_32.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_33.png b/examples/collections/images/eLoading/eLoading_33.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_33.png rename to examples/collections/images/eLoading/eLoading_33.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_34.png b/examples/collections/images/eLoading/eLoading_34.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_34.png rename to examples/collections/images/eLoading/eLoading_34.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_35.png b/examples/collections/images/eLoading/eLoading_35.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_35.png rename to examples/collections/images/eLoading/eLoading_35.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_36.png b/examples/collections/images/eLoading/eLoading_36.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_36.png rename to examples/collections/images/eLoading/eLoading_36.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_37.png b/examples/collections/images/eLoading/eLoading_37.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_37.png rename to examples/collections/images/eLoading/eLoading_37.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_38.png b/examples/collections/images/eLoading/eLoading_38.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_38.png rename to examples/collections/images/eLoading/eLoading_38.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_39.png b/examples/collections/images/eLoading/eLoading_39.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_39.png rename to examples/collections/images/eLoading/eLoading_39.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_40.png b/examples/collections/images/eLoading/eLoading_40.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_40.png rename to examples/collections/images/eLoading/eLoading_40.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_41.png b/examples/collections/images/eLoading/eLoading_41.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_41.png rename to examples/collections/images/eLoading/eLoading_41.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_42.png b/examples/collections/images/eLoading/eLoading_42.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_42.png rename to examples/collections/images/eLoading/eLoading_42.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_43.png b/examples/collections/images/eLoading/eLoading_43.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_43.png rename to examples/collections/images/eLoading/eLoading_43.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_44.png b/examples/collections/images/eLoading/eLoading_44.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_44.png rename to examples/collections/images/eLoading/eLoading_44.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_45.png b/examples/collections/images/eLoading/eLoading_45.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_45.png rename to examples/collections/images/eLoading/eLoading_45.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_46.png b/examples/collections/images/eLoading/eLoading_46.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_46.png rename to examples/collections/images/eLoading/eLoading_46.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_47.png b/examples/collections/images/eLoading/eLoading_47.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_47.png rename to examples/collections/images/eLoading/eLoading_47.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_48.png b/examples/collections/images/eLoading/eLoading_48.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_48.png rename to examples/collections/images/eLoading/eLoading_48.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_49.png b/examples/collections/images/eLoading/eLoading_49.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_49.png rename to examples/collections/images/eLoading/eLoading_49.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_50.png b/examples/collections/images/eLoading/eLoading_50.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_50.png rename to examples/collections/images/eLoading/eLoading_50.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_51.png b/examples/collections/images/eLoading/eLoading_51.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_51.png rename to examples/collections/images/eLoading/eLoading_51.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_52.png b/examples/collections/images/eLoading/eLoading_52.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_52.png rename to examples/collections/images/eLoading/eLoading_52.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_53.png b/examples/collections/images/eLoading/eLoading_53.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_53.png rename to examples/collections/images/eLoading/eLoading_53.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_54.png b/examples/collections/images/eLoading/eLoading_54.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_54.png rename to examples/collections/images/eLoading/eLoading_54.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_55.png b/examples/collections/images/eLoading/eLoading_55.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_55.png rename to examples/collections/images/eLoading/eLoading_55.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_56.png b/examples/collections/images/eLoading/eLoading_56.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_56.png rename to examples/collections/images/eLoading/eLoading_56.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_57.png b/examples/collections/images/eLoading/eLoading_57.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_57.png rename to examples/collections/images/eLoading/eLoading_57.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_58.png b/examples/collections/images/eLoading/eLoading_58.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_58.png rename to examples/collections/images/eLoading/eLoading_58.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_59.png b/examples/collections/images/eLoading/eLoading_59.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_59.png rename to examples/collections/images/eLoading/eLoading_59.png diff --git a/examples/dwidget-examples/collections/images/eLoading/eLoading_60.png b/examples/collections/images/eLoading/eLoading_60.png similarity index 100% rename from examples/dwidget-examples/collections/images/eLoading/eLoading_60.png rename to examples/collections/images/eLoading/eLoading_60.png diff --git a/examples/dwidget-examples/collections/images/example/DArrowRectangle.png b/examples/collections/images/example/DArrowRectangle.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DArrowRectangle.png rename to examples/collections/images/example/DArrowRectangle.png diff --git a/examples/dwidget-examples/collections/images/example/DBackgroundGroup.png b/examples/collections/images/example/DBackgroundGroup.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DBackgroundGroup.png rename to examples/collections/images/example/DBackgroundGroup.png diff --git a/examples/dwidget-examples/collections/images/example/DButtonBox.png b/examples/collections/images/example/DButtonBox.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DButtonBox.png rename to examples/collections/images/example/DButtonBox.png diff --git a/examples/dwidget-examples/collections/images/example/DCalendarWidget.png b/examples/collections/images/example/DCalendarWidget.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DCalendarWidget.png rename to examples/collections/images/example/DCalendarWidget.png diff --git a/examples/dwidget-examples/collections/images/example/DCheckButton.png b/examples/collections/images/example/DCheckButton.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DCheckButton.png rename to examples/collections/images/example/DCheckButton.png diff --git a/examples/dwidget-examples/collections/images/example/DColumViewPicIcon_1.png b/examples/collections/images/example/DColumViewPicIcon_1.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DColumViewPicIcon_1.png rename to examples/collections/images/example/DColumViewPicIcon_1.png diff --git a/examples/dwidget-examples/collections/images/example/DColumViewPicIcon_2.png b/examples/collections/images/example/DColumViewPicIcon_2.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DColumViewPicIcon_2.png rename to examples/collections/images/example/DColumViewPicIcon_2.png diff --git a/examples/dwidget-examples/collections/images/example/DColumViewPicIcon_3.png b/examples/collections/images/example/DColumViewPicIcon_3.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DColumViewPicIcon_3.png rename to examples/collections/images/example/DColumViewPicIcon_3.png diff --git a/examples/dwidget-examples/collections/images/example/DColumViewPicIcon_4.png b/examples/collections/images/example/DColumViewPicIcon_4.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DColumViewPicIcon_4.png rename to examples/collections/images/example/DColumViewPicIcon_4.png diff --git a/examples/dwidget-examples/collections/images/example/DColumViewPicIcon_5.png b/examples/collections/images/example/DColumViewPicIcon_5.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DColumViewPicIcon_5.png rename to examples/collections/images/example/DColumViewPicIcon_5.png diff --git a/examples/dwidget-examples/collections/images/example/DColumViewPicIcon_6.png b/examples/collections/images/example/DColumViewPicIcon_6.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DColumViewPicIcon_6.png rename to examples/collections/images/example/DColumViewPicIcon_6.png diff --git a/examples/dwidget-examples/collections/images/example/DColumViewPicIcon_7.png b/examples/collections/images/example/DColumViewPicIcon_7.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DColumViewPicIcon_7.png rename to examples/collections/images/example/DColumViewPicIcon_7.png diff --git a/examples/dwidget-examples/collections/images/example/DColumViewPicIcon_8.png b/examples/collections/images/example/DColumViewPicIcon_8.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DColumViewPicIcon_8.png rename to examples/collections/images/example/DColumViewPicIcon_8.png diff --git a/examples/dwidget-examples/collections/images/example/DColumViewPicIcon_9.png b/examples/collections/images/example/DColumViewPicIcon_9.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DColumViewPicIcon_9.png rename to examples/collections/images/example/DColumViewPicIcon_9.png diff --git a/examples/dwidget-examples/collections/images/example/DComboBox_1.png b/examples/collections/images/example/DComboBox_1.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DComboBox_1.png rename to examples/collections/images/example/DComboBox_1.png diff --git a/examples/dwidget-examples/collections/images/example/DComboBox_2.png b/examples/collections/images/example/DComboBox_2.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DComboBox_2.png rename to examples/collections/images/example/DComboBox_2.png diff --git a/examples/dwidget-examples/collections/images/example/DCommandLinkButton.png b/examples/collections/images/example/DCommandLinkButton.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DCommandLinkButton.png rename to examples/collections/images/example/DCommandLinkButton.png diff --git a/examples/dwidget-examples/collections/images/example/DCrumbEdit.png b/examples/collections/images/example/DCrumbEdit.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DCrumbEdit.png rename to examples/collections/images/example/DCrumbEdit.png diff --git a/examples/dwidget-examples/collections/images/example/DDialog.png b/examples/collections/images/example/DDialog.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DDialog.png rename to examples/collections/images/example/DDialog.png diff --git a/examples/dwidget-examples/collections/images/example/DDialog_1.png b/examples/collections/images/example/DDialog_1.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DDialog_1.png rename to examples/collections/images/example/DDialog_1.png diff --git a/examples/dwidget-examples/collections/images/example/DDialog_2.png b/examples/collections/images/example/DDialog_2.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DDialog_2.png rename to examples/collections/images/example/DDialog_2.png diff --git a/examples/dwidget-examples/collections/images/example/DFileChooserEdit.png b/examples/collections/images/example/DFileChooserEdit.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DFileChooserEdit.png rename to examples/collections/images/example/DFileChooserEdit.png diff --git a/examples/dwidget-examples/collections/images/example/DFileDialog.png b/examples/collections/images/example/DFileDialog.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DFileDialog.png rename to examples/collections/images/example/DFileDialog.png diff --git a/examples/dwidget-examples/collections/images/example/DFileDialog_1.png b/examples/collections/images/example/DFileDialog_1.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DFileDialog_1.png rename to examples/collections/images/example/DFileDialog_1.png diff --git a/examples/dwidget-examples/collections/images/example/DFileDialog_2.png b/examples/collections/images/example/DFileDialog_2.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DFileDialog_2.png rename to examples/collections/images/example/DFileDialog_2.png diff --git a/examples/dwidget-examples/collections/images/example/DFloatingButton.png b/examples/collections/images/example/DFloatingButton.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DFloatingButton.png rename to examples/collections/images/example/DFloatingButton.png diff --git a/examples/dwidget-examples/collections/images/example/DFontComboBox.png b/examples/collections/images/example/DFontComboBox.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DFontComboBox.png rename to examples/collections/images/example/DFontComboBox.png diff --git a/examples/dwidget-examples/collections/images/example/DFrame.png b/examples/collections/images/example/DFrame.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DFrame.png rename to examples/collections/images/example/DFrame.png diff --git a/examples/dwidget-examples/collections/images/example/DGroupBox.png b/examples/collections/images/example/DGroupBox.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DGroupBox.png rename to examples/collections/images/example/DGroupBox.png diff --git a/examples/dwidget-examples/collections/images/example/DHeaderView.png b/examples/collections/images/example/DHeaderView.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DHeaderView.png rename to examples/collections/images/example/DHeaderView.png diff --git a/examples/dwidget-examples/collections/images/example/DIconButton.png b/examples/collections/images/example/DIconButton.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DIconButton.png rename to examples/collections/images/example/DIconButton.png diff --git a/examples/dwidget-examples/collections/images/example/DIpv4LineEdit.png b/examples/collections/images/example/DIpv4LineEdit.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DIpv4LineEdit.png rename to examples/collections/images/example/DIpv4LineEdit.png diff --git a/examples/dwidget-examples/collections/images/example/DKeySequenceEdit.png b/examples/collections/images/example/DKeySequenceEdit.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DKeySequenceEdit.png rename to examples/collections/images/example/DKeySequenceEdit.png diff --git a/examples/dwidget-examples/collections/images/example/DLCDNumber.png b/examples/collections/images/example/DLCDNumber.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DLCDNumber.png rename to examples/collections/images/example/DLCDNumber.png diff --git a/examples/dwidget-examples/collections/images/example/DLineEdit.png b/examples/collections/images/example/DLineEdit.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DLineEdit.png rename to examples/collections/images/example/DLineEdit.png diff --git a/examples/dwidget-examples/collections/images/example/DListViewBrowser_1.svg b/examples/collections/images/example/DListViewBrowser_1.svg similarity index 100% rename from examples/dwidget-examples/collections/images/example/DListViewBrowser_1.svg rename to examples/collections/images/example/DListViewBrowser_1.svg diff --git a/examples/dwidget-examples/collections/images/example/DListViewBrowser_2.svg b/examples/collections/images/example/DListViewBrowser_2.svg similarity index 100% rename from examples/dwidget-examples/collections/images/example/DListViewBrowser_2.svg rename to examples/collections/images/example/DListViewBrowser_2.svg diff --git a/examples/dwidget-examples/collections/images/example/DListViewBrowser_3.svg b/examples/collections/images/example/DListViewBrowser_3.svg similarity index 100% rename from examples/dwidget-examples/collections/images/example/DListViewBrowser_3.svg rename to examples/collections/images/example/DListViewBrowser_3.svg diff --git a/examples/dwidget-examples/collections/images/example/DListViewBrowser_4.svg b/examples/collections/images/example/DListViewBrowser_4.svg similarity index 100% rename from examples/dwidget-examples/collections/images/example/DListViewBrowser_4.svg rename to examples/collections/images/example/DListViewBrowser_4.svg diff --git a/examples/dwidget-examples/collections/images/example/DListViewEditAction.svg b/examples/collections/images/example/DListViewEditAction.svg similarity index 100% rename from examples/dwidget-examples/collections/images/example/DListViewEditAction.svg rename to examples/collections/images/example/DListViewEditAction.svg diff --git a/examples/dwidget-examples/collections/images/example/DListViewScreen_1.svg b/examples/collections/images/example/DListViewScreen_1.svg similarity index 100% rename from examples/dwidget-examples/collections/images/example/DListViewScreen_1.svg rename to examples/collections/images/example/DListViewScreen_1.svg diff --git a/examples/dwidget-examples/collections/images/example/DListViewScreen_2.svg b/examples/collections/images/example/DListViewScreen_2.svg similarity index 100% rename from examples/dwidget-examples/collections/images/example/DListViewScreen_2.svg rename to examples/collections/images/example/DListViewScreen_2.svg diff --git a/examples/dwidget-examples/collections/images/example/DListViewScreen_3.svg b/examples/collections/images/example/DListViewScreen_3.svg similarity index 100% rename from examples/dwidget-examples/collections/images/example/DListViewScreen_3.svg rename to examples/collections/images/example/DListViewScreen_3.svg diff --git a/examples/dwidget-examples/collections/images/example/DListViewScreen_4.svg b/examples/collections/images/example/DListViewScreen_4.svg similarity index 100% rename from examples/dwidget-examples/collections/images/example/DListViewScreen_4.svg rename to examples/collections/images/example/DListViewScreen_4.svg diff --git a/examples/dwidget-examples/collections/images/example/DListView_1.png b/examples/collections/images/example/DListView_1.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DListView_1.png rename to examples/collections/images/example/DListView_1.png diff --git a/examples/dwidget-examples/collections/images/example/DListView_2.png b/examples/collections/images/example/DListView_2.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DListView_2.png rename to examples/collections/images/example/DListView_2.png diff --git a/examples/dwidget-examples/collections/images/example/DListView_3.png b/examples/collections/images/example/DListView_3.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DListView_3.png rename to examples/collections/images/example/DListView_3.png diff --git a/examples/dwidget-examples/collections/images/example/DMainWindow.png b/examples/collections/images/example/DMainWindow.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DMainWindow.png rename to examples/collections/images/example/DMainWindow.png diff --git a/examples/dwidget-examples/collections/images/example/DMenu.png b/examples/collections/images/example/DMenu.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DMenu.png rename to examples/collections/images/example/DMenu.png diff --git a/examples/dwidget-examples/collections/images/example/DMenuPicture_1.png b/examples/collections/images/example/DMenuPicture_1.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DMenuPicture_1.png rename to examples/collections/images/example/DMenuPicture_1.png diff --git a/examples/dwidget-examples/collections/images/example/DMenuPicture_2.png b/examples/collections/images/example/DMenuPicture_2.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DMenuPicture_2.png rename to examples/collections/images/example/DMenuPicture_2.png diff --git a/examples/dwidget-examples/collections/images/example/DMenuPicture_3.png b/examples/collections/images/example/DMenuPicture_3.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DMenuPicture_3.png rename to examples/collections/images/example/DMenuPicture_3.png diff --git a/examples/dwidget-examples/collections/images/example/DMenuPicture_4.png b/examples/collections/images/example/DMenuPicture_4.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DMenuPicture_4.png rename to examples/collections/images/example/DMenuPicture_4.png diff --git a/examples/dwidget-examples/collections/images/example/DMessageManager.png b/examples/collections/images/example/DMessageManager.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DMessageManager.png rename to examples/collections/images/example/DMessageManager.png diff --git a/examples/dwidget-examples/collections/images/example/DPasswordEdit.png b/examples/collections/images/example/DPasswordEdit.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DPasswordEdit.png rename to examples/collections/images/example/DPasswordEdit.png diff --git a/examples/dwidget-examples/collections/images/example/DProgressBar_1.png b/examples/collections/images/example/DProgressBar_1.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DProgressBar_1.png rename to examples/collections/images/example/DProgressBar_1.png diff --git a/examples/dwidget-examples/collections/images/example/DProgressBar_2.png b/examples/collections/images/example/DProgressBar_2.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DProgressBar_2.png rename to examples/collections/images/example/DProgressBar_2.png diff --git a/examples/dwidget-examples/collections/images/example/DPushButton.png b/examples/collections/images/example/DPushButton.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DPushButton.png rename to examples/collections/images/example/DPushButton.png diff --git a/examples/dwidget-examples/collections/images/example/DRadioButton.png b/examples/collections/images/example/DRadioButton.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DRadioButton.png rename to examples/collections/images/example/DRadioButton.png diff --git a/examples/dwidget-examples/collections/images/example/DRubberBand.png b/examples/collections/images/example/DRubberBand.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DRubberBand.png rename to examples/collections/images/example/DRubberBand.png diff --git a/examples/dwidget-examples/collections/images/example/DScrollBar.png b/examples/collections/images/example/DScrollBar.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DScrollBar.png rename to examples/collections/images/example/DScrollBar.png diff --git a/examples/dwidget-examples/collections/images/example/DScrollBar_1.png b/examples/collections/images/example/DScrollBar_1.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DScrollBar_1.png rename to examples/collections/images/example/DScrollBar_1.png diff --git a/examples/dwidget-examples/collections/images/example/DSearchComboBox.png b/examples/collections/images/example/DSearchComboBox.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DSearchComboBox.png rename to examples/collections/images/example/DSearchComboBox.png diff --git a/examples/dwidget-examples/collections/images/example/DSearchEdit.png b/examples/collections/images/example/DSearchEdit.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DSearchEdit.png rename to examples/collections/images/example/DSearchEdit.png diff --git a/examples/dwidget-examples/collections/images/example/DSizegrip.png b/examples/collections/images/example/DSizegrip.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DSizegrip.png rename to examples/collections/images/example/DSizegrip.png diff --git a/examples/dwidget-examples/collections/images/example/DSlider_1.png b/examples/collections/images/example/DSlider_1.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DSlider_1.png rename to examples/collections/images/example/DSlider_1.png diff --git a/examples/dwidget-examples/collections/images/example/DSlider_2.png b/examples/collections/images/example/DSlider_2.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DSlider_2.png rename to examples/collections/images/example/DSlider_2.png diff --git a/examples/dwidget-examples/collections/images/example/DSpinBox.png b/examples/collections/images/example/DSpinBox.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DSpinBox.png rename to examples/collections/images/example/DSpinBox.png diff --git a/examples/dwidget-examples/collections/images/example/DSpinner.png b/examples/collections/images/example/DSpinner.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DSpinner.png rename to examples/collections/images/example/DSpinner.png diff --git a/examples/dwidget-examples/collections/images/example/DSplitter.png b/examples/collections/images/example/DSplitter.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DSplitter.png rename to examples/collections/images/example/DSplitter.png diff --git a/examples/dwidget-examples/collections/images/example/DStatusBar.png b/examples/collections/images/example/DStatusBar.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DStatusBar.png rename to examples/collections/images/example/DStatusBar.png diff --git a/examples/dwidget-examples/collections/images/example/DSuggestButton.png b/examples/collections/images/example/DSuggestButton.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DSuggestButton.png rename to examples/collections/images/example/DSuggestButton.png diff --git a/examples/dwidget-examples/collections/images/example/DSwitchButton.png b/examples/collections/images/example/DSwitchButton.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DSwitchButton.png rename to examples/collections/images/example/DSwitchButton.png diff --git a/examples/dwidget-examples/collections/images/example/DTabBar_1.png b/examples/collections/images/example/DTabBar_1.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DTabBar_1.png rename to examples/collections/images/example/DTabBar_1.png diff --git a/examples/dwidget-examples/collections/images/example/DTabBar_2.png b/examples/collections/images/example/DTabBar_2.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DTabBar_2.png rename to examples/collections/images/example/DTabBar_2.png diff --git a/examples/dwidget-examples/collections/images/example/DTextEdit.png b/examples/collections/images/example/DTextEdit.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DTextEdit.png rename to examples/collections/images/example/DTextEdit.png diff --git a/examples/dwidget-examples/collections/images/example/DTitlebar_1.png b/examples/collections/images/example/DTitlebar_1.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DTitlebar_1.png rename to examples/collections/images/example/DTitlebar_1.png diff --git a/examples/dwidget-examples/collections/images/example/DTitlebar_2.png b/examples/collections/images/example/DTitlebar_2.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DTitlebar_2.png rename to examples/collections/images/example/DTitlebar_2.png diff --git a/examples/dwidget-examples/collections/images/example/DTitlebar_3.png b/examples/collections/images/example/DTitlebar_3.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DTitlebar_3.png rename to examples/collections/images/example/DTitlebar_3.png diff --git a/examples/dwidget-examples/collections/images/example/DTitlebar_4.png b/examples/collections/images/example/DTitlebar_4.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DTitlebar_4.png rename to examples/collections/images/example/DTitlebar_4.png diff --git a/examples/dwidget-examples/collections/images/example/DToolButton.png b/examples/collections/images/example/DToolButton.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DToolButton.png rename to examples/collections/images/example/DToolButton.png diff --git a/examples/dwidget-examples/collections/images/example/DToolTip.png b/examples/collections/images/example/DToolTip.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DToolTip.png rename to examples/collections/images/example/DToolTip.png diff --git a/examples/dwidget-examples/collections/images/example/DTreeView.png b/examples/collections/images/example/DTreeView.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DTreeView.png rename to examples/collections/images/example/DTreeView.png diff --git a/examples/dwidget-examples/collections/images/example/DTreeViewIcon_1.svg b/examples/collections/images/example/DTreeViewIcon_1.svg similarity index 100% rename from examples/dwidget-examples/collections/images/example/DTreeViewIcon_1.svg rename to examples/collections/images/example/DTreeViewIcon_1.svg diff --git a/examples/dwidget-examples/collections/images/example/DTreeViewIcon_2.svg b/examples/collections/images/example/DTreeViewIcon_2.svg similarity index 100% rename from examples/dwidget-examples/collections/images/example/DTreeViewIcon_2.svg rename to examples/collections/images/example/DTreeViewIcon_2.svg diff --git a/examples/dwidget-examples/collections/images/example/DTreeViewIcon_3.svg b/examples/collections/images/example/DTreeViewIcon_3.svg similarity index 100% rename from examples/dwidget-examples/collections/images/example/DTreeViewIcon_3.svg rename to examples/collections/images/example/DTreeViewIcon_3.svg diff --git a/examples/dwidget-examples/collections/images/example/DTreeViewIcon_4.svg b/examples/collections/images/example/DTreeViewIcon_4.svg similarity index 100% rename from examples/dwidget-examples/collections/images/example/DTreeViewIcon_4.svg rename to examples/collections/images/example/DTreeViewIcon_4.svg diff --git a/examples/dwidget-examples/collections/images/example/DTreeViewIcon_5.svg b/examples/collections/images/example/DTreeViewIcon_5.svg similarity index 100% rename from examples/dwidget-examples/collections/images/example/DTreeViewIcon_5.svg rename to examples/collections/images/example/DTreeViewIcon_5.svg diff --git a/examples/dwidget-examples/collections/images/example/DVerticalline.png b/examples/collections/images/example/DVerticalline.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DVerticalline.png rename to examples/collections/images/example/DVerticalline.png diff --git a/examples/dwidget-examples/collections/images/example/DWarningButton.png b/examples/collections/images/example/DWarningButton.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DWarningButton.png rename to examples/collections/images/example/DWarningButton.png diff --git a/examples/dwidget-examples/collections/images/example/DWaterProgress.png b/examples/collections/images/example/DWaterProgress.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/DWaterProgress.png rename to examples/collections/images/example/DWaterProgress.png diff --git a/examples/dwidget-examples/collections/images/example/Oval_186.svg b/examples/collections/images/example/Oval_186.svg similarity index 100% rename from examples/dwidget-examples/collections/images/example/Oval_186.svg rename to examples/collections/images/example/Oval_186.svg diff --git a/examples/dwidget-examples/collections/images/example/background.png b/examples/collections/images/example/background.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/background.png rename to examples/collections/images/example/background.png diff --git a/examples/dwidget-examples/collections/images/example/dock_notice.png b/examples/collections/images/example/dock_notice.png similarity index 100% rename from examples/dwidget-examples/collections/images/example/dock_notice.png rename to examples/collections/images/example/dock_notice.png diff --git a/examples/dwidget-examples/collections/images/example/drive-harddisk-48px.svg b/examples/collections/images/example/drive-harddisk-48px.svg similarity index 100% rename from examples/dwidget-examples/collections/images/example/drive-harddisk-48px.svg rename to examples/collections/images/example/drive-harddisk-48px.svg diff --git a/examples/dwidget-examples/collections/images/example/drive-harddisk-48px_1.svg b/examples/collections/images/example/drive-harddisk-48px_1.svg similarity index 100% rename from examples/dwidget-examples/collections/images/example/drive-harddisk-48px_1.svg rename to examples/collections/images/example/drive-harddisk-48px_1.svg diff --git a/examples/dwidget-examples/collections/images/example/drive-harddisk-48px_2.svg b/examples/collections/images/example/drive-harddisk-48px_2.svg similarity index 100% rename from examples/dwidget-examples/collections/images/example/drive-harddisk-48px_2.svg rename to examples/collections/images/example/drive-harddisk-48px_2.svg diff --git a/examples/dwidget-examples/collections/images/example/drive-harddisk-48px_3.svg b/examples/collections/images/example/drive-harddisk-48px_3.svg similarity index 100% rename from examples/dwidget-examples/collections/images/example/drive-harddisk-48px_3.svg rename to examples/collections/images/example/drive-harddisk-48px_3.svg diff --git a/examples/dwidget-examples/collections/images/example/movie-logo.svg b/examples/collections/images/example/movie-logo.svg similarity index 100% rename from examples/dwidget-examples/collections/images/example/movie-logo.svg rename to examples/collections/images/example/movie-logo.svg diff --git a/examples/dwidget-examples/collections/images/google-chrome-32-px.svg b/examples/collections/images/google-chrome-32-px.svg similarity index 100% rename from examples/dwidget-examples/collections/images/google-chrome-32-px.svg rename to examples/collections/images/google-chrome-32-px.svg diff --git a/examples/dwidget-examples/collections/images/loading_indicator.png b/examples/collections/images/loading_indicator.png similarity index 100% rename from examples/dwidget-examples/collections/images/loading_indicator.png rename to examples/collections/images/loading_indicator.png diff --git a/examples/dwidget-examples/collections/images/logo_icon.svg b/examples/collections/images/logo_icon.svg similarity index 100% rename from examples/dwidget-examples/collections/images/logo_icon.svg rename to examples/collections/images/logo_icon.svg diff --git a/examples/dwidget-examples/collections/images/reload_normal.png b/examples/collections/images/reload_normal.png similarity index 100% rename from examples/dwidget-examples/collections/images/reload_normal.png rename to examples/collections/images/reload_normal.png diff --git a/examples/dwidget-examples/collections/imageviewerexample.cpp b/examples/collections/imageviewerexample.cpp similarity index 100% rename from examples/dwidget-examples/collections/imageviewerexample.cpp rename to examples/collections/imageviewerexample.cpp diff --git a/examples/dwidget-examples/collections/imageviewerexample.h b/examples/collections/imageviewerexample.h similarity index 100% rename from examples/dwidget-examples/collections/imageviewerexample.h rename to examples/collections/imageviewerexample.h diff --git a/examples/dwidget-examples/collections/layoutexample.cpp b/examples/collections/layoutexample.cpp similarity index 100% rename from examples/dwidget-examples/collections/layoutexample.cpp rename to examples/collections/layoutexample.cpp diff --git a/examples/dwidget-examples/collections/layoutexample.h b/examples/collections/layoutexample.h similarity index 100% rename from examples/dwidget-examples/collections/layoutexample.h rename to examples/collections/layoutexample.h diff --git a/examples/dwidget-examples/collections/lcdnumberexample.cpp b/examples/collections/lcdnumberexample.cpp similarity index 100% rename from examples/dwidget-examples/collections/lcdnumberexample.cpp rename to examples/collections/lcdnumberexample.cpp diff --git a/examples/dwidget-examples/collections/lcdnumberexample.h b/examples/collections/lcdnumberexample.h similarity index 100% rename from examples/dwidget-examples/collections/lcdnumberexample.h rename to examples/collections/lcdnumberexample.h diff --git a/examples/dwidget-examples/collections/listviewexample.cpp b/examples/collections/listviewexample.cpp similarity index 100% rename from examples/dwidget-examples/collections/listviewexample.cpp rename to examples/collections/listviewexample.cpp diff --git a/examples/dwidget-examples/collections/listviewexample.h b/examples/collections/listviewexample.h similarity index 100% rename from examples/dwidget-examples/collections/listviewexample.h rename to examples/collections/listviewexample.h diff --git a/examples/dwidget-examples/collections/main.cpp b/examples/collections/main.cpp similarity index 100% rename from examples/dwidget-examples/collections/main.cpp rename to examples/collections/main.cpp diff --git a/examples/dwidget-examples/collections/mainwindow.cpp b/examples/collections/mainwindow.cpp similarity index 100% rename from examples/dwidget-examples/collections/mainwindow.cpp rename to examples/collections/mainwindow.cpp diff --git a/examples/dwidget-examples/collections/mainwindow.h b/examples/collections/mainwindow.h similarity index 100% rename from examples/dwidget-examples/collections/mainwindow.h rename to examples/collections/mainwindow.h diff --git a/examples/dwidget-examples/collections/menuexample.cpp b/examples/collections/menuexample.cpp similarity index 100% rename from examples/dwidget-examples/collections/menuexample.cpp rename to examples/collections/menuexample.cpp diff --git a/examples/dwidget-examples/collections/menuexample.h b/examples/collections/menuexample.h similarity index 100% rename from examples/dwidget-examples/collections/menuexample.h rename to examples/collections/menuexample.h diff --git a/examples/dwidget-examples/collections/org.deepin.dtkwiget.feature-display.json b/examples/collections/org.deepin.dtkwiget.feature-display.json similarity index 100% rename from examples/dwidget-examples/collections/org.deepin.dtkwiget.feature-display.json rename to examples/collections/org.deepin.dtkwiget.feature-display.json diff --git a/examples/dwidget-examples/collections/pagewindowinterface.cpp b/examples/collections/pagewindowinterface.cpp similarity index 100% rename from examples/dwidget-examples/collections/pagewindowinterface.cpp rename to examples/collections/pagewindowinterface.cpp diff --git a/examples/dwidget-examples/collections/pagewindowinterface.h b/examples/collections/pagewindowinterface.h similarity index 100% rename from examples/dwidget-examples/collections/pagewindowinterface.h rename to examples/collections/pagewindowinterface.h diff --git a/examples/dwidget-examples/collections/progressbarexample.cpp b/examples/collections/progressbarexample.cpp similarity index 100% rename from examples/dwidget-examples/collections/progressbarexample.cpp rename to examples/collections/progressbarexample.cpp diff --git a/examples/dwidget-examples/collections/progressbarexample.h b/examples/collections/progressbarexample.h similarity index 100% rename from examples/dwidget-examples/collections/progressbarexample.h rename to examples/collections/progressbarexample.h diff --git a/examples/dwidget-examples/collections/resources.qrc b/examples/collections/resources.qrc similarity index 100% rename from examples/dwidget-examples/collections/resources.qrc rename to examples/collections/resources.qrc diff --git a/examples/dwidget-examples/collections/resources/data/dfm-settings.json b/examples/collections/resources/data/dfm-settings.json similarity index 100% rename from examples/dwidget-examples/collections/resources/data/dfm-settings.json rename to examples/collections/resources/data/dfm-settings.json diff --git a/examples/dwidget-examples/collections/resources/data/dt-settings.json b/examples/collections/resources/data/dt-settings.json similarity index 100% rename from examples/dwidget-examples/collections/resources/data/dt-settings.json rename to examples/collections/resources/data/dt-settings.json diff --git a/examples/dwidget-examples/collections/resources/data/titlebar-settings.json b/examples/collections/resources/data/titlebar-settings.json similarity index 100% rename from examples/dwidget-examples/collections/resources/data/titlebar-settings.json rename to examples/collections/resources/data/titlebar-settings.json diff --git a/examples/dwidget-examples/collections/rubberbandexample.cpp b/examples/collections/rubberbandexample.cpp similarity index 100% rename from examples/dwidget-examples/collections/rubberbandexample.cpp rename to examples/collections/rubberbandexample.cpp diff --git a/examples/dwidget-examples/collections/rubberbandexample.h b/examples/collections/rubberbandexample.h similarity index 100% rename from examples/dwidget-examples/collections/rubberbandexample.h rename to examples/collections/rubberbandexample.h diff --git a/examples/dwidget-examples/collections/scrollbarexample.cpp b/examples/collections/scrollbarexample.cpp similarity index 100% rename from examples/dwidget-examples/collections/scrollbarexample.cpp rename to examples/collections/scrollbarexample.cpp diff --git a/examples/dwidget-examples/collections/scrollbarexample.h b/examples/collections/scrollbarexample.h similarity index 100% rename from examples/dwidget-examples/collections/scrollbarexample.h rename to examples/collections/scrollbarexample.h diff --git a/examples/dwidget-examples/collections/sliderexample.cpp b/examples/collections/sliderexample.cpp similarity index 100% rename from examples/dwidget-examples/collections/sliderexample.cpp rename to examples/collections/sliderexample.cpp diff --git a/examples/dwidget-examples/collections/sliderexample.h b/examples/collections/sliderexample.h similarity index 100% rename from examples/dwidget-examples/collections/sliderexample.h rename to examples/collections/sliderexample.h diff --git a/examples/dwidget-examples/collections/spinnerexample.cpp b/examples/collections/spinnerexample.cpp similarity index 100% rename from examples/dwidget-examples/collections/spinnerexample.cpp rename to examples/collections/spinnerexample.cpp diff --git a/examples/dwidget-examples/collections/spinnerexample.h b/examples/collections/spinnerexample.h similarity index 100% rename from examples/dwidget-examples/collections/spinnerexample.h rename to examples/collections/spinnerexample.h diff --git a/examples/dwidget-examples/collections/tooltipexample.cpp b/examples/collections/tooltipexample.cpp similarity index 100% rename from examples/dwidget-examples/collections/tooltipexample.cpp rename to examples/collections/tooltipexample.cpp diff --git a/examples/dwidget-examples/collections/tooltipexample.h b/examples/collections/tooltipexample.h similarity index 100% rename from examples/dwidget-examples/collections/tooltipexample.h rename to examples/collections/tooltipexample.h diff --git a/examples/dwidget-examples/collections/widgetexample.cpp b/examples/collections/widgetexample.cpp similarity index 100% rename from examples/dwidget-examples/collections/widgetexample.cpp rename to examples/collections/widgetexample.cpp diff --git a/examples/dwidget-examples/collections/widgetexample.h b/examples/collections/widgetexample.h similarity index 100% rename from examples/dwidget-examples/collections/widgetexample.h rename to examples/collections/widgetexample.h diff --git a/examples/dwidget-examples/collections/windowexample.cpp b/examples/collections/windowexample.cpp similarity index 100% rename from examples/dwidget-examples/collections/windowexample.cpp rename to examples/collections/windowexample.cpp diff --git a/examples/dwidget-examples/collections/windowexample.h b/examples/collections/windowexample.h similarity index 100% rename from examples/dwidget-examples/collections/windowexample.h rename to examples/collections/windowexample.h diff --git a/examples/dwidget-examples/PrintPreviewSettingsPlugin/CMakeLists.txt b/examples/dwidget-examples/PrintPreviewSettingsPlugin/CMakeLists.txt deleted file mode 100644 index 9db396f55..000000000 --- a/examples/dwidget-examples/PrintPreviewSettingsPlugin/CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(LIB_NAME PrintPreviewSettingsPlugin) -set(CMAKE_AUTOUIC ON) -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) - -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_EXPORT_COMPILE_COMMANDS ON) - - -find_package(DtkGui REQUIRED) -find_package(DtkCore REQUIRED) -#find_package(DtkWidget REQUIRED) - -find_package(Qt5 REQUIRED COMPONENTS Core) -find_package(Qt5 REQUIRED COMPONENTS Widgets) -#find_package(Qt5 REQUIRED COMPONENTS Svg) -find_package(Qt5 REQUIRED COMPONENTS PrintSupport) - -add_library(${LIB_NAME} SHARED - settingsplugin.h - settingsplugin.cpp -) -target_link_libraries(${LIB_NAME} PRIVATE - Qt5::Widgets - Qt5::Core - # Qt5::Svg - Qt5::PrintSupport - dtkwidget - ${DtkGui_LIBRARIES} - ${DtkCore_LIBRARIES} -) -target_include_directories(${LIB_NAME} PUBLIC - ../../../include/dtkwidget/DWidget/ - ../../../include/dtkwidget/widgets/ - ../../../include/dtkwidget/util/ - ../../../include/dtkwidget/global/ -) diff --git a/examples/dwidget-examples/PrintPreviewSettingsPlugin/PrintPreviewSettingsPlugin.pro b/examples/dwidget-examples/PrintPreviewSettingsPlugin/PrintPreviewSettingsPlugin.pro deleted file mode 100644 index 75d2f8888..000000000 --- a/examples/dwidget-examples/PrintPreviewSettingsPlugin/PrintPreviewSettingsPlugin.pro +++ /dev/null @@ -1,32 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2022-05-10T10:54:04 -# -#------------------------------------------------- - -QT += widgets core gui printsupport dtkcore dtkgui - -TARGET = PrintPreviewSettingsPlugin -TEMPLATE = lib -CONFIG += plugin - -DESTDIR = /usr/share/deepin/dtk/plugins/printsupport -DEFINES += QT_DEPRECATED_WARNINGS - -INCLUDEPATH += $$PWD/../../../src -INCLUDEPATH += $$PWD/../../../src/widgets -INCLUDEPATH += $$PWD/../../../src/util -DEPENDPATH += $$PWD/../../../src -unix: LIBS += -L$$OUT_PWD/../../../src -ldtkwidget - -SOURCES += \ - settingsplugin.cpp - -HEADERS += \ - settingsplugin.h -DISTFILES += PrintPreviewSettingsPlugin.json - -unix { - target.path = /usr/lib - INSTALLS += target -} diff --git a/examples/dwidget-examples/collections/CMakeLists.txt b/examples/dwidget-examples/collections/CMakeLists.txt deleted file mode 100644 index 81075fab0..000000000 --- a/examples/dwidget-examples/collections/CMakeLists.txt +++ /dev/null @@ -1,91 +0,0 @@ -#cmake_minimum_required(VERSION 3.5) -#project(collections) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(BIN_NAME collections) -set(CMAKE_AUTOUIC ON) -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) - -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_EXPORT_COMPILE_COMMANDS ON) - - -find_package(DtkGui REQUIRED) -find_package(DtkCore REQUIRED) -#find_package(DtkWidget REQUIRED) - -find_package(Qt5 REQUIRED COMPONENTS Core) -find_package(Qt5 REQUIRED COMPONENTS Widgets) -#find_package(Qt5 REQUIRED COMPONENTS Svg) -find_package(Qt5 REQUIRED COMPONENTS PrintSupport) - -set(IMAGES images.qrc) -set(RESCOUCES resources.qrc) -set(THEME icons/theme-icons.qrc) -add_executable(${BIN_NAME} - ${IMAGES} - ${RESCOUCES} - ${THEME} - cameraform.ui - - mainwindow.h - buttonexample.h - examplewindowinterface.h - pagewindowinterface.h - editexample.h - sliderexample.h - listviewexample.h - windowexample.h - tooltipexample.h - spinnerexample.h - dialogexample.h - progressbarexample.h - layoutexample.h - scrollbarexample.h - rubberbandexample.h - widgetexample.h - lcdnumberexample.h - menuexample.h - imageviewerexample.h - - main.cpp - mainwindow.cpp - buttonexample.cpp - examplewindowinterface.cpp - pagewindowinterface.cpp - editexample.cpp - sliderexample.cpp - listviewexample.cpp - windowexample.cpp - tooltipexample.cpp - spinnerexample.cpp - dialogexample.cpp - progressbarexample.cpp - layoutexample.cpp - scrollbarexample.cpp - rubberbandexample.cpp - widgetexample.cpp - lcdnumberexample.cpp - menuexample.cpp - imageviewerexample.cpp -) -target_link_libraries(${BIN_NAME} PRIVATE - Qt5::Widgets - Qt5::Core - # Qt5::Svg - Qt5::PrintSupport - dtkwidget - ${DtkGui_LIBRARIES} - ${DtkCore_LIBRARIES} -) -target_include_directories(${BIN_NAME} PUBLIC - ../../../include/dtkwidget/DWidget/ - ../../../include/dtkwidget/widgets/ - ../../../include/dtkwidget/util/ - ../../../include/dtkwidget/global/ - ${Qt5Gui_PRIVATE_INCLUDE_DIRS} -) -install(TARGETS ${BIN_NAME} DESTINATION "${CMAKE_INSTALL_LIBDIR}/libdtk-${CMAKE_PROJECT_VERSION}/DWidget/examples/") -dconfig_override_files(APPID dtk-example META_NAME org.deepin.dtkwidget.feature-display FILES ./org.deepin.dtkwiget.feature-display.json) diff --git a/include/dtkwidget/DWidget/DAboutDialog b/include/DWidget/DAboutDialog similarity index 100% rename from include/dtkwidget/DWidget/DAboutDialog rename to include/DWidget/DAboutDialog diff --git a/include/dtkwidget/DWidget/DAbstractDialog b/include/DWidget/DAbstractDialog similarity index 100% rename from include/dtkwidget/DWidget/DAbstractDialog rename to include/DWidget/DAbstractDialog diff --git a/include/dtkwidget/DWidget/DAccessibilityChecker b/include/DWidget/DAccessibilityChecker similarity index 100% rename from include/dtkwidget/DWidget/DAccessibilityChecker rename to include/DWidget/DAccessibilityChecker diff --git a/include/dtkwidget/DWidget/DAccessibleWidget b/include/DWidget/DAccessibleWidget similarity index 100% rename from include/dtkwidget/DWidget/DAccessibleWidget rename to include/DWidget/DAccessibleWidget diff --git a/include/dtkwidget/DWidget/DAlertControl b/include/DWidget/DAlertControl similarity index 100% rename from include/dtkwidget/DWidget/DAlertControl rename to include/DWidget/DAlertControl diff --git a/include/dtkwidget/DWidget/DAnchors b/include/DWidget/DAnchors similarity index 100% rename from include/dtkwidget/DWidget/DAnchors rename to include/DWidget/DAnchors diff --git a/include/dtkwidget/DWidget/DApplication b/include/DWidget/DApplication similarity index 100% rename from include/dtkwidget/DWidget/DApplication rename to include/DWidget/DApplication diff --git a/include/dtkwidget/DWidget/DApplicationHelper b/include/DWidget/DApplicationHelper similarity index 100% rename from include/dtkwidget/DWidget/DApplicationHelper rename to include/DWidget/DApplicationHelper diff --git a/include/dtkwidget/DWidget/DApplicationSettings b/include/DWidget/DApplicationSettings similarity index 100% rename from include/dtkwidget/DWidget/DApplicationSettings rename to include/DWidget/DApplicationSettings diff --git a/include/dtkwidget/DWidget/DArrowButton b/include/DWidget/DArrowButton similarity index 100% rename from include/dtkwidget/DWidget/DArrowButton rename to include/DWidget/DArrowButton diff --git a/include/dtkwidget/DWidget/DArrowLineDrawer b/include/DWidget/DArrowLineDrawer similarity index 100% rename from include/dtkwidget/DWidget/DArrowLineDrawer rename to include/DWidget/DArrowLineDrawer diff --git a/include/dtkwidget/DWidget/DArrowLineExpand b/include/DWidget/DArrowLineExpand similarity index 100% rename from include/dtkwidget/DWidget/DArrowLineExpand rename to include/DWidget/DArrowLineExpand diff --git a/include/dtkwidget/DWidget/DArrowRectangle b/include/DWidget/DArrowRectangle similarity index 100% rename from include/dtkwidget/DWidget/DArrowRectangle rename to include/DWidget/DArrowRectangle diff --git a/include/dtkwidget/DWidget/DBackgroundGroup b/include/DWidget/DBackgroundGroup similarity index 100% rename from include/dtkwidget/DWidget/DBackgroundGroup rename to include/DWidget/DBackgroundGroup diff --git a/include/dtkwidget/DWidget/DBlurEffectWidget b/include/DWidget/DBlurEffectWidget similarity index 100% rename from include/dtkwidget/DWidget/DBlurEffectWidget rename to include/DWidget/DBlurEffectWidget diff --git a/include/dtkwidget/DWidget/DButtonBox b/include/DWidget/DButtonBox similarity index 100% rename from include/dtkwidget/DWidget/DButtonBox rename to include/DWidget/DButtonBox diff --git a/include/dtkwidget/DWidget/DCalendarWidget b/include/DWidget/DCalendarWidget similarity index 100% rename from include/dtkwidget/DWidget/DCalendarWidget rename to include/DWidget/DCalendarWidget diff --git a/include/dtkwidget/DWidget/DCheckBox b/include/DWidget/DCheckBox similarity index 100% rename from include/dtkwidget/DWidget/DCheckBox rename to include/DWidget/DCheckBox diff --git a/include/dtkwidget/DWidget/DClipEffectWidget b/include/DWidget/DClipEffectWidget similarity index 100% rename from include/dtkwidget/DWidget/DClipEffectWidget rename to include/DWidget/DClipEffectWidget diff --git a/include/dtkwidget/DWidget/DColorDialog b/include/DWidget/DColorDialog similarity index 100% rename from include/dtkwidget/DWidget/DColorDialog rename to include/DWidget/DColorDialog diff --git a/include/dtkwidget/DWidget/DColoredProgressBar b/include/DWidget/DColoredProgressBar similarity index 100% rename from include/dtkwidget/DWidget/DColoredProgressBar rename to include/DWidget/DColoredProgressBar diff --git a/include/dtkwidget/DWidget/DColumnView b/include/DWidget/DColumnView similarity index 100% rename from include/dtkwidget/DWidget/DColumnView rename to include/DWidget/DColumnView diff --git a/include/dtkwidget/DWidget/DComboBox b/include/DWidget/DComboBox similarity index 100% rename from include/dtkwidget/DWidget/DComboBox rename to include/DWidget/DComboBox diff --git a/include/dtkwidget/DWidget/DCommandLinkButton b/include/DWidget/DCommandLinkButton similarity index 100% rename from include/dtkwidget/DWidget/DCommandLinkButton rename to include/DWidget/DCommandLinkButton diff --git a/include/dtkwidget/DWidget/DCrumbEdit b/include/DWidget/DCrumbEdit similarity index 100% rename from include/dtkwidget/DWidget/DCrumbEdit rename to include/DWidget/DCrumbEdit diff --git a/include/dtkwidget/DWidget/DDataWidgetMapper b/include/DWidget/DDataWidgetMapper similarity index 100% rename from include/dtkwidget/DWidget/DDataWidgetMapper rename to include/DWidget/DDataWidgetMapper diff --git a/include/dtkwidget/DWidget/DDateEdit b/include/DWidget/DDateEdit similarity index 100% rename from include/dtkwidget/DWidget/DDateEdit rename to include/DWidget/DDateEdit diff --git a/include/dtkwidget/DWidget/DDateTimeEdit b/include/DWidget/DDateTimeEdit similarity index 100% rename from include/dtkwidget/DWidget/DDateTimeEdit rename to include/DWidget/DDateTimeEdit diff --git a/include/dtkwidget/DWidget/DDesktopServices b/include/DWidget/DDesktopServices similarity index 100% rename from include/dtkwidget/DWidget/DDesktopServices rename to include/DWidget/DDesktopServices diff --git a/include/dtkwidget/DWidget/DDial b/include/DWidget/DDial similarity index 100% rename from include/dtkwidget/DWidget/DDial rename to include/DWidget/DDial diff --git a/include/dtkwidget/DWidget/DDialog b/include/DWidget/DDialog similarity index 100% rename from include/dtkwidget/DWidget/DDialog rename to include/DWidget/DDialog diff --git a/include/dtkwidget/DWidget/DDialogButtonBox b/include/DWidget/DDialogButtonBox similarity index 100% rename from include/dtkwidget/DWidget/DDialogButtonBox rename to include/DWidget/DDialogButtonBox diff --git a/include/dtkwidget/DWidget/DDialogCloseButton b/include/DWidget/DDialogCloseButton similarity index 100% rename from include/dtkwidget/DWidget/DDialogCloseButton rename to include/DWidget/DDialogCloseButton diff --git a/include/dtkwidget/DWidget/DDockWidget b/include/DWidget/DDockWidget similarity index 100% rename from include/dtkwidget/DWidget/DDockWidget rename to include/DWidget/DDockWidget diff --git a/include/dtkwidget/DWidget/DDoubleSpinBox b/include/DWidget/DDoubleSpinBox similarity index 100% rename from include/dtkwidget/DWidget/DDoubleSpinBox rename to include/DWidget/DDoubleSpinBox diff --git a/include/dtkwidget/DWidget/DDrawer b/include/DWidget/DDrawer similarity index 100% rename from include/dtkwidget/DWidget/DDrawer rename to include/DWidget/DDrawer diff --git a/include/dtkwidget/DWidget/DDrawerGroup b/include/DWidget/DDrawerGroup similarity index 100% rename from include/dtkwidget/DWidget/DDrawerGroup rename to include/DWidget/DDrawerGroup diff --git a/include/dtkwidget/DWidget/DErrorMessage b/include/DWidget/DErrorMessage similarity index 100% rename from include/dtkwidget/DWidget/DErrorMessage rename to include/DWidget/DErrorMessage diff --git a/include/dtkwidget/DWidget/DExpandGroup b/include/DWidget/DExpandGroup similarity index 100% rename from include/dtkwidget/DWidget/DExpandGroup rename to include/DWidget/DExpandGroup diff --git a/include/dtkwidget/DWidget/DFeatureDisplayDialog b/include/DWidget/DFeatureDisplayDialog similarity index 100% rename from include/dtkwidget/DWidget/DFeatureDisplayDialog rename to include/DWidget/DFeatureDisplayDialog diff --git a/include/dtkwidget/DWidget/DFileChooserEdit b/include/DWidget/DFileChooserEdit similarity index 100% rename from include/dtkwidget/DWidget/DFileChooserEdit rename to include/DWidget/DFileChooserEdit diff --git a/include/dtkwidget/DWidget/DFileDialog b/include/DWidget/DFileDialog similarity index 100% rename from include/dtkwidget/DWidget/DFileDialog rename to include/DWidget/DFileDialog diff --git a/include/dtkwidget/DWidget/DFileIconProvider b/include/DWidget/DFileIconProvider similarity index 100% rename from include/dtkwidget/DWidget/DFileIconProvider rename to include/DWidget/DFileIconProvider diff --git a/include/dtkwidget/DWidget/DFloatingButton b/include/DWidget/DFloatingButton similarity index 100% rename from include/dtkwidget/DWidget/DFloatingButton rename to include/DWidget/DFloatingButton diff --git a/include/dtkwidget/DWidget/DFloatingMessage b/include/DWidget/DFloatingMessage similarity index 100% rename from include/dtkwidget/DWidget/DFloatingMessage rename to include/DWidget/DFloatingMessage diff --git a/include/dtkwidget/DWidget/DFloatingWidget b/include/DWidget/DFloatingWidget similarity index 100% rename from include/dtkwidget/DWidget/DFloatingWidget rename to include/DWidget/DFloatingWidget diff --git a/include/dtkwidget/DWidget/DFocusFrame b/include/DWidget/DFocusFrame similarity index 100% rename from include/dtkwidget/DWidget/DFocusFrame rename to include/DWidget/DFocusFrame diff --git a/include/dtkwidget/DWidget/DFontComboBox b/include/DWidget/DFontComboBox similarity index 100% rename from include/dtkwidget/DWidget/DFontComboBox rename to include/DWidget/DFontComboBox diff --git a/include/dtkwidget/DWidget/DFontDialog b/include/DWidget/DFontDialog similarity index 100% rename from include/dtkwidget/DWidget/DFontDialog rename to include/DWidget/DFontDialog diff --git a/include/dtkwidget/DWidget/DFontSizeManager b/include/DWidget/DFontSizeManager similarity index 100% rename from include/dtkwidget/DWidget/DFontSizeManager rename to include/DWidget/DFontSizeManager diff --git a/include/dtkwidget/DWidget/DFrame b/include/DWidget/DFrame similarity index 100% rename from include/dtkwidget/DWidget/DFrame rename to include/DWidget/DFrame diff --git a/include/dtkwidget/DWidget/DGraphicsClipEffect b/include/DWidget/DGraphicsClipEffect similarity index 100% rename from include/dtkwidget/DWidget/DGraphicsClipEffect rename to include/DWidget/DGraphicsClipEffect diff --git a/include/dtkwidget/DWidget/DGraphicsDropShadowEffect b/include/DWidget/DGraphicsDropShadowEffect similarity index 100% rename from include/dtkwidget/DWidget/DGraphicsDropShadowEffect rename to include/DWidget/DGraphicsDropShadowEffect diff --git a/include/dtkwidget/DWidget/DGraphicsView b/include/DWidget/DGraphicsView similarity index 100% rename from include/dtkwidget/DWidget/DGraphicsView rename to include/DWidget/DGraphicsView diff --git a/include/dtkwidget/DWidget/DGroupBox b/include/DWidget/DGroupBox similarity index 100% rename from include/dtkwidget/DWidget/DGroupBox rename to include/DWidget/DGroupBox diff --git a/include/dtkwidget/DWidget/DHeaderView b/include/DWidget/DHeaderView similarity index 100% rename from include/dtkwidget/DWidget/DHeaderView rename to include/DWidget/DHeaderView diff --git a/include/dtkwidget/DWidget/DHiDPIHelper b/include/DWidget/DHiDPIHelper similarity index 100% rename from include/dtkwidget/DWidget/DHiDPIHelper rename to include/DWidget/DHiDPIHelper diff --git a/include/dtkwidget/DWidget/DHorizontalLine b/include/DWidget/DHorizontalLine similarity index 100% rename from include/dtkwidget/DWidget/DHorizontalLine rename to include/DWidget/DHorizontalLine diff --git a/include/dtkwidget/DWidget/DHorizontalSlider b/include/DWidget/DHorizontalSlider similarity index 100% rename from include/dtkwidget/DWidget/DHorizontalSlider rename to include/DWidget/DHorizontalSlider diff --git a/include/dtkwidget/DWidget/DIconButton b/include/DWidget/DIconButton similarity index 100% rename from include/dtkwidget/DWidget/DIconButton rename to include/DWidget/DIconButton diff --git a/include/dtkwidget/DWidget/DImageButton b/include/DWidget/DImageButton similarity index 100% rename from include/dtkwidget/DWidget/DImageButton rename to include/DWidget/DImageButton diff --git a/include/dtkwidget/DWidget/DImageViewer b/include/DWidget/DImageViewer similarity index 100% rename from include/dtkwidget/DWidget/DImageViewer rename to include/DWidget/DImageViewer diff --git a/include/dtkwidget/DWidget/DInputDialog b/include/DWidget/DInputDialog similarity index 100% rename from include/dtkwidget/DWidget/DInputDialog rename to include/DWidget/DInputDialog diff --git a/include/dtkwidget/DWidget/DIpv4LineEdit b/include/DWidget/DIpv4LineEdit similarity index 100% rename from include/dtkwidget/DWidget/DIpv4LineEdit rename to include/DWidget/DIpv4LineEdit diff --git a/include/dtkwidget/DWidget/DKeySequenceEdit b/include/DWidget/DKeySequenceEdit similarity index 100% rename from include/dtkwidget/DWidget/DKeySequenceEdit rename to include/DWidget/DKeySequenceEdit diff --git a/include/dtkwidget/DWidget/DLCDNumber b/include/DWidget/DLCDNumber similarity index 100% rename from include/dtkwidget/DWidget/DLCDNumber rename to include/DWidget/DLCDNumber diff --git a/include/dtkwidget/DWidget/DLabel b/include/DWidget/DLabel similarity index 100% rename from include/dtkwidget/DWidget/DLabel rename to include/DWidget/DLabel diff --git a/include/dtkwidget/DWidget/DLineEdit b/include/DWidget/DLineEdit similarity index 100% rename from include/dtkwidget/DWidget/DLineEdit rename to include/DWidget/DLineEdit diff --git a/include/dtkwidget/DWidget/DListView b/include/DWidget/DListView similarity index 100% rename from include/dtkwidget/DWidget/DListView rename to include/DWidget/DListView diff --git a/include/dtkwidget/DWidget/DListWidget b/include/DWidget/DListWidget similarity index 100% rename from include/dtkwidget/DWidget/DListWidget rename to include/DWidget/DListWidget diff --git a/include/dtkwidget/DWidget/DMDIArea b/include/DWidget/DMDIArea similarity index 100% rename from include/dtkwidget/DWidget/DMDIArea rename to include/DWidget/DMDIArea diff --git a/include/dtkwidget/DWidget/DMainWindow b/include/DWidget/DMainWindow similarity index 100% rename from include/dtkwidget/DWidget/DMainWindow rename to include/DWidget/DMainWindow diff --git a/include/dtkwidget/DWidget/DMdiArea b/include/DWidget/DMdiArea similarity index 100% rename from include/dtkwidget/DWidget/DMdiArea rename to include/DWidget/DMdiArea diff --git a/include/dtkwidget/DWidget/DMdiSubWindow b/include/DWidget/DMdiSubWindow similarity index 100% rename from include/dtkwidget/DWidget/DMdiSubWindow rename to include/DWidget/DMdiSubWindow diff --git a/include/dtkwidget/DWidget/DMenu b/include/DWidget/DMenu similarity index 100% rename from include/dtkwidget/DWidget/DMenu rename to include/DWidget/DMenu diff --git a/include/dtkwidget/DWidget/DMenuBar b/include/DWidget/DMenuBar similarity index 100% rename from include/dtkwidget/DWidget/DMenuBar rename to include/DWidget/DMenuBar diff --git a/include/dtkwidget/DWidget/DMessageBox b/include/DWidget/DMessageBox similarity index 100% rename from include/dtkwidget/DWidget/DMessageBox rename to include/DWidget/DMessageBox diff --git a/include/dtkwidget/DWidget/DMessageManager b/include/DWidget/DMessageManager similarity index 100% rename from include/dtkwidget/DWidget/DMessageManager rename to include/DWidget/DMessageManager diff --git a/include/dtkwidget/DWidget/DOpenGLWidget b/include/DWidget/DOpenGLWidget similarity index 100% rename from include/dtkwidget/DWidget/DOpenGLWidget rename to include/DWidget/DOpenGLWidget diff --git a/include/dtkwidget/DWidget/DPageIndicator b/include/DWidget/DPageIndicator similarity index 100% rename from include/dtkwidget/DWidget/DPageIndicator rename to include/DWidget/DPageIndicator diff --git a/include/dtkwidget/DWidget/DPaletteHelper b/include/DWidget/DPaletteHelper similarity index 100% rename from include/dtkwidget/DWidget/DPaletteHelper rename to include/DWidget/DPaletteHelper diff --git a/include/dtkwidget/DWidget/DPasswordEdit b/include/DWidget/DPasswordEdit similarity index 100% rename from include/dtkwidget/DWidget/DPasswordEdit rename to include/DWidget/DPasswordEdit diff --git a/include/dtkwidget/DWidget/DPlainTextEdit b/include/DWidget/DPlainTextEdit similarity index 100% rename from include/dtkwidget/DWidget/DPlainTextEdit rename to include/DWidget/DPlainTextEdit diff --git a/include/dtkwidget/DWidget/DPlatformWindowHandle b/include/DWidget/DPlatformWindowHandle similarity index 100% rename from include/dtkwidget/DWidget/DPlatformWindowHandle rename to include/DWidget/DPlatformWindowHandle diff --git a/include/dtkwidget/DWidget/DPrintPreviewDialog b/include/DWidget/DPrintPreviewDialog similarity index 100% rename from include/dtkwidget/DWidget/DPrintPreviewDialog rename to include/DWidget/DPrintPreviewDialog diff --git a/include/dtkwidget/DWidget/DProgressBar b/include/DWidget/DProgressBar similarity index 100% rename from include/dtkwidget/DWidget/DProgressBar rename to include/DWidget/DProgressBar diff --git a/include/dtkwidget/DWidget/DPushButton b/include/DWidget/DPushButton similarity index 100% rename from include/dtkwidget/DWidget/DPushButton rename to include/DWidget/DPushButton diff --git a/include/dtkwidget/DWidget/DQuickWidget b/include/DWidget/DQuickWidget similarity index 100% rename from include/dtkwidget/DWidget/DQuickWidget rename to include/DWidget/DQuickWidget diff --git a/include/dtkwidget/DWidget/DRadioButton b/include/DWidget/DRadioButton similarity index 100% rename from include/dtkwidget/DWidget/DRadioButton rename to include/DWidget/DRadioButton diff --git a/include/dtkwidget/DWidget/DRubberBand b/include/DWidget/DRubberBand similarity index 100% rename from include/dtkwidget/DWidget/DRubberBand rename to include/DWidget/DRubberBand diff --git a/include/dtkwidget/DWidget/DScrollArea b/include/DWidget/DScrollArea similarity index 100% rename from include/dtkwidget/DWidget/DScrollArea rename to include/DWidget/DScrollArea diff --git a/include/dtkwidget/DWidget/DScrollBar b/include/DWidget/DScrollBar similarity index 100% rename from include/dtkwidget/DWidget/DScrollBar rename to include/DWidget/DScrollBar diff --git a/include/dtkwidget/DWidget/DSearchComboBox b/include/DWidget/DSearchComboBox similarity index 100% rename from include/dtkwidget/DWidget/DSearchComboBox rename to include/DWidget/DSearchComboBox diff --git a/include/dtkwidget/DWidget/DSearchEdit b/include/DWidget/DSearchEdit similarity index 100% rename from include/dtkwidget/DWidget/DSearchEdit rename to include/DWidget/DSearchEdit diff --git a/include/dtkwidget/DWidget/DSegmentedControl b/include/DWidget/DSegmentedControl similarity index 100% rename from include/dtkwidget/DWidget/DSegmentedControl rename to include/DWidget/DSegmentedControl diff --git a/include/dtkwidget/DWidget/DSegmentedHighlight b/include/DWidget/DSegmentedHighlight similarity index 100% rename from include/dtkwidget/DWidget/DSegmentedHighlight rename to include/DWidget/DSegmentedHighlight diff --git a/include/dtkwidget/DWidget/DSettingsDialog b/include/DWidget/DSettingsDialog similarity index 100% rename from include/dtkwidget/DWidget/DSettingsDialog rename to include/DWidget/DSettingsDialog diff --git a/include/dtkwidget/DWidget/DSettingsWidgetFactory b/include/DWidget/DSettingsWidgetFactory similarity index 100% rename from include/dtkwidget/DWidget/DSettingsWidgetFactory rename to include/DWidget/DSettingsWidgetFactory diff --git a/include/dtkwidget/DWidget/DShadowLine b/include/DWidget/DShadowLine similarity index 100% rename from include/dtkwidget/DWidget/DShadowLine rename to include/DWidget/DShadowLine diff --git a/include/dtkwidget/DWidget/DSimpleListItem b/include/DWidget/DSimpleListItem similarity index 100% rename from include/dtkwidget/DWidget/DSimpleListItem rename to include/DWidget/DSimpleListItem diff --git a/include/dtkwidget/DWidget/DSimpleListView b/include/DWidget/DSimpleListView similarity index 100% rename from include/dtkwidget/DWidget/DSimpleListView rename to include/DWidget/DSimpleListView diff --git a/include/dtkwidget/DWidget/DSizeMode b/include/DWidget/DSizeMode similarity index 100% rename from include/dtkwidget/DWidget/DSizeMode rename to include/DWidget/DSizeMode diff --git a/include/dtkwidget/DWidget/DSlider b/include/DWidget/DSlider similarity index 100% rename from include/dtkwidget/DWidget/DSlider rename to include/DWidget/DSlider diff --git a/include/dtkwidget/DWidget/DSpinBox b/include/DWidget/DSpinBox similarity index 100% rename from include/dtkwidget/DWidget/DSpinBox rename to include/DWidget/DSpinBox diff --git a/include/dtkwidget/DWidget/DSpinner b/include/DWidget/DSpinner similarity index 100% rename from include/dtkwidget/DWidget/DSpinner rename to include/DWidget/DSpinner diff --git a/include/dtkwidget/DWidget/DSplitter b/include/DWidget/DSplitter similarity index 100% rename from include/dtkwidget/DWidget/DSplitter rename to include/DWidget/DSplitter diff --git a/include/dtkwidget/DWidget/DStackedWidget b/include/DWidget/DStackedWidget similarity index 100% rename from include/dtkwidget/DWidget/DStackedWidget rename to include/DWidget/DStackedWidget diff --git a/include/dtkwidget/DWidget/DStandardItem b/include/DWidget/DStandardItem similarity index 100% rename from include/dtkwidget/DWidget/DStandardItem rename to include/DWidget/DStandardItem diff --git a/include/dtkwidget/DWidget/DStatusBar b/include/DWidget/DStatusBar similarity index 100% rename from include/dtkwidget/DWidget/DStatusBar rename to include/DWidget/DStatusBar diff --git a/include/dtkwidget/DWidget/DStyle b/include/DWidget/DStyle similarity index 100% rename from include/dtkwidget/DWidget/DStyle rename to include/DWidget/DStyle diff --git a/include/dtkwidget/DWidget/DStyleHelper b/include/DWidget/DStyleHelper similarity index 100% rename from include/dtkwidget/DWidget/DStyleHelper rename to include/DWidget/DStyleHelper diff --git a/include/dtkwidget/DWidget/DStyleOption b/include/DWidget/DStyleOption similarity index 100% rename from include/dtkwidget/DWidget/DStyleOption rename to include/DWidget/DStyleOption diff --git a/include/dtkwidget/DWidget/DStyleOptionBackgroundGroup b/include/DWidget/DStyleOptionBackgroundGroup similarity index 100% rename from include/dtkwidget/DWidget/DStyleOptionBackgroundGroup rename to include/DWidget/DStyleOptionBackgroundGroup diff --git a/include/dtkwidget/DWidget/DStyleOptionButton b/include/DWidget/DStyleOptionButton similarity index 100% rename from include/dtkwidget/DWidget/DStyleOptionButton rename to include/DWidget/DStyleOptionButton diff --git a/include/dtkwidget/DWidget/DStyleOptionLineEdit b/include/DWidget/DStyleOptionLineEdit similarity index 100% rename from include/dtkwidget/DWidget/DStyleOptionLineEdit rename to include/DWidget/DStyleOptionLineEdit diff --git a/include/dtkwidget/DWidget/DStyleOptionViewItem b/include/DWidget/DStyleOptionViewItem similarity index 100% rename from include/dtkwidget/DWidget/DStyleOptionViewItem rename to include/DWidget/DStyleOptionViewItem diff --git a/include/dtkwidget/DWidget/DStylePainter b/include/DWidget/DStylePainter similarity index 100% rename from include/dtkwidget/DWidget/DStylePainter rename to include/DWidget/DStylePainter diff --git a/include/dtkwidget/DWidget/DStyledIconEngine b/include/DWidget/DStyledIconEngine similarity index 100% rename from include/dtkwidget/DWidget/DStyledIconEngine rename to include/DWidget/DStyledIconEngine diff --git a/include/dtkwidget/DWidget/DStyledItemDelegate b/include/DWidget/DStyledItemDelegate similarity index 100% rename from include/dtkwidget/DWidget/DStyledItemDelegate rename to include/DWidget/DStyledItemDelegate diff --git a/include/dtkwidget/DWidget/DSuggestButton b/include/DWidget/DSuggestButton similarity index 100% rename from include/dtkwidget/DWidget/DSuggestButton rename to include/DWidget/DSuggestButton diff --git a/include/dtkwidget/DWidget/DSwitchButton b/include/DWidget/DSwitchButton similarity index 100% rename from include/dtkwidget/DWidget/DSwitchButton rename to include/DWidget/DSwitchButton diff --git a/include/dtkwidget/DWidget/DTabBar b/include/DWidget/DTabBar similarity index 100% rename from include/dtkwidget/DWidget/DTabBar rename to include/DWidget/DTabBar diff --git a/include/dtkwidget/DWidget/DTabWidget b/include/DWidget/DTabWidget similarity index 100% rename from include/dtkwidget/DWidget/DTabWidget rename to include/DWidget/DTabWidget diff --git a/include/dtkwidget/DWidget/DTableView b/include/DWidget/DTableView similarity index 100% rename from include/dtkwidget/DWidget/DTableView rename to include/DWidget/DTableView diff --git a/include/dtkwidget/DWidget/DTableWidget b/include/DWidget/DTableWidget similarity index 100% rename from include/dtkwidget/DWidget/DTableWidget rename to include/DWidget/DTableWidget diff --git a/include/dtkwidget/DWidget/DTabletWindowOptionButton b/include/DWidget/DTabletWindowOptionButton similarity index 100% rename from include/dtkwidget/DWidget/DTabletWindowOptionButton rename to include/DWidget/DTabletWindowOptionButton diff --git a/include/dtkwidget/DWidget/DTextBrowser b/include/DWidget/DTextBrowser similarity index 100% rename from include/dtkwidget/DWidget/DTextBrowser rename to include/DWidget/DTextBrowser diff --git a/include/dtkwidget/DWidget/DTextEdit b/include/DWidget/DTextEdit similarity index 100% rename from include/dtkwidget/DWidget/DTextEdit rename to include/DWidget/DTextEdit diff --git a/include/dtkwidget/DWidget/DThemeManager b/include/DWidget/DThemeManager similarity index 100% rename from include/dtkwidget/DWidget/DThemeManager rename to include/DWidget/DThemeManager diff --git a/include/dtkwidget/DWidget/DTileRules b/include/DWidget/DTileRules similarity index 100% rename from include/dtkwidget/DWidget/DTileRules rename to include/DWidget/DTileRules diff --git a/include/dtkwidget/DWidget/DTimeEdit b/include/DWidget/DTimeEdit similarity index 100% rename from include/dtkwidget/DWidget/DTimeEdit rename to include/DWidget/DTimeEdit diff --git a/include/dtkwidget/DWidget/DTipLabel b/include/DWidget/DTipLabel similarity index 100% rename from include/dtkwidget/DWidget/DTipLabel rename to include/DWidget/DTipLabel diff --git a/include/dtkwidget/DWidget/DTitlebar b/include/DWidget/DTitlebar similarity index 100% rename from include/dtkwidget/DWidget/DTitlebar rename to include/DWidget/DTitlebar diff --git a/include/dtkwidget/DWidget/DToast b/include/DWidget/DToast similarity index 100% rename from include/dtkwidget/DWidget/DToast rename to include/DWidget/DToast diff --git a/include/dtkwidget/DWidget/DToolBar b/include/DWidget/DToolBar similarity index 100% rename from include/dtkwidget/DWidget/DToolBar rename to include/DWidget/DToolBar diff --git a/include/dtkwidget/DWidget/DToolBox b/include/DWidget/DToolBox similarity index 100% rename from include/dtkwidget/DWidget/DToolBox rename to include/DWidget/DToolBox diff --git a/include/dtkwidget/DWidget/DToolButton b/include/DWidget/DToolButton similarity index 100% rename from include/dtkwidget/DWidget/DToolButton rename to include/DWidget/DToolButton diff --git a/include/dtkwidget/DWidget/DToolTip b/include/DWidget/DToolTip similarity index 100% rename from include/dtkwidget/DWidget/DToolTip rename to include/DWidget/DToolTip diff --git a/include/dtkwidget/DWidget/DTreeView b/include/DWidget/DTreeView similarity index 100% rename from include/dtkwidget/DWidget/DTreeView rename to include/DWidget/DTreeView diff --git a/include/dtkwidget/DWidget/DTreeWidget b/include/DWidget/DTreeWidget similarity index 100% rename from include/dtkwidget/DWidget/DTreeWidget rename to include/DWidget/DTreeWidget diff --git a/include/dtkwidget/DWidget/DUndoView b/include/DWidget/DUndoView similarity index 100% rename from include/dtkwidget/DWidget/DUndoView rename to include/DWidget/DUndoView diff --git a/include/dtkwidget/DWidget/DVerticalLine b/include/DWidget/DVerticalLine similarity index 100% rename from include/dtkwidget/DWidget/DVerticalLine rename to include/DWidget/DVerticalLine diff --git a/include/dtkwidget/DWidget/DVerticalSlider b/include/DWidget/DVerticalSlider similarity index 100% rename from include/dtkwidget/DWidget/DVerticalSlider rename to include/DWidget/DVerticalSlider diff --git a/include/dtkwidget/DWidget/DWarningButton b/include/DWidget/DWarningButton similarity index 100% rename from include/dtkwidget/DWidget/DWarningButton rename to include/DWidget/DWarningButton diff --git a/include/dtkwidget/DWidget/DWaterProgress b/include/DWidget/DWaterProgress similarity index 100% rename from include/dtkwidget/DWidget/DWaterProgress rename to include/DWidget/DWaterProgress diff --git a/include/dtkwidget/DWidget/DWebView b/include/DWidget/DWebView similarity index 100% rename from include/dtkwidget/DWidget/DWebView rename to include/DWidget/DWebView diff --git a/include/dtkwidget/DWidget/DWhatsThis b/include/DWidget/DWhatsThis similarity index 100% rename from include/dtkwidget/DWidget/DWhatsThis rename to include/DWidget/DWhatsThis diff --git a/include/dtkwidget/DWidget/DWidget b/include/DWidget/DWidget similarity index 100% rename from include/dtkwidget/DWidget/DWidget rename to include/DWidget/DWidget diff --git a/include/dtkwidget/DWidget/DWidgetUtil b/include/DWidget/DWidgetUtil similarity index 100% rename from include/dtkwidget/DWidget/DWidgetUtil rename to include/DWidget/DWidgetUtil diff --git a/include/dtkwidget/DWidget/DWindowCloseButton b/include/DWidget/DWindowCloseButton similarity index 100% rename from include/dtkwidget/DWidget/DWindowCloseButton rename to include/DWidget/DWindowCloseButton diff --git a/include/dtkwidget/DWidget/DWindowMaxButton b/include/DWidget/DWindowMaxButton similarity index 100% rename from include/dtkwidget/DWidget/DWindowMaxButton rename to include/DWidget/DWindowMaxButton diff --git a/include/dtkwidget/DWidget/DWindowMinButton b/include/DWidget/DWindowMinButton similarity index 100% rename from include/dtkwidget/DWidget/DWindowMinButton rename to include/DWidget/DWindowMinButton diff --git a/include/dtkwidget/DWidget/DWindowOptionButton b/include/DWidget/DWindowOptionButton similarity index 100% rename from include/dtkwidget/DWidget/DWindowOptionButton rename to include/DWidget/DWindowOptionButton diff --git a/include/dtkwidget/DWidget/DWindowQuitFullButton b/include/DWidget/DWindowQuitFullButton similarity index 100% rename from include/dtkwidget/DWidget/DWindowQuitFullButton rename to include/DWidget/DWindowQuitFullButton diff --git a/include/dtkwidget/DWidget/DWizard b/include/DWidget/DWizard similarity index 100% rename from include/dtkwidget/DWidget/DWizard rename to include/DWidget/DWizard diff --git a/include/dtkwidget/DWidget/DWizardPage b/include/DWidget/DWizardPage similarity index 100% rename from include/dtkwidget/DWidget/DWizardPage rename to include/DWidget/DWizardPage diff --git a/include/dtkwidget/DWidget/DtkWidgets b/include/DWidget/DtkWidgets similarity index 100% rename from include/dtkwidget/DWidget/DtkWidgets rename to include/DWidget/DtkWidgets diff --git a/include/dtkwidget/global/dtkwidget_global.h b/include/global/dtkwidget_global.h similarity index 100% rename from include/dtkwidget/global/dtkwidget_global.h rename to include/global/dtkwidget_global.h diff --git a/include/dtkwidget/util/daccessibilitychecker.h b/include/util/daccessibilitychecker.h similarity index 100% rename from include/dtkwidget/util/daccessibilitychecker.h rename to include/util/daccessibilitychecker.h diff --git a/include/dtkwidget/util/dapplicationsettings.h b/include/util/dapplicationsettings.h similarity index 100% rename from include/dtkwidget/util/dapplicationsettings.h rename to include/util/dapplicationsettings.h diff --git a/include/dtkwidget/util/ddesktopservices.h b/include/util/ddesktopservices.h similarity index 100% rename from include/dtkwidget/util/ddesktopservices.h rename to include/util/ddesktopservices.h diff --git a/include/dtkwidget/util/dfileiconprovider.h b/include/util/dfileiconprovider.h similarity index 100% rename from include/dtkwidget/util/dfileiconprovider.h rename to include/util/dfileiconprovider.h diff --git a/include/dtkwidget/util/dhidpihelper.h b/include/util/dhidpihelper.h similarity index 100% rename from include/dtkwidget/util/dhidpihelper.h rename to include/util/dhidpihelper.h diff --git a/include/dtkwidget/util/dregionmonitor.h b/include/util/dregionmonitor.h similarity index 100% rename from include/dtkwidget/util/dregionmonitor.h rename to include/util/dregionmonitor.h diff --git a/include/dtkwidget/util/dsizemode.h b/include/util/dsizemode.h similarity index 100% rename from include/dtkwidget/util/dsizemode.h rename to include/util/dsizemode.h diff --git a/include/dtkwidget/util/dthumbnailprovider.h b/include/util/dthumbnailprovider.h similarity index 100% rename from include/dtkwidget/util/dthumbnailprovider.h rename to include/util/dthumbnailprovider.h diff --git a/include/dtkwidget/util/dtrashmanager.h b/include/util/dtrashmanager.h similarity index 100% rename from include/dtkwidget/util/dtrashmanager.h rename to include/util/dtrashmanager.h diff --git a/include/dtkwidget/util/dwidgetutil.h b/include/util/dwidgetutil.h similarity index 100% rename from include/dtkwidget/util/dwidgetutil.h rename to include/util/dwidgetutil.h diff --git a/include/dtkwidget/widgets/daboutdialog.h b/include/widgets/daboutdialog.h similarity index 100% rename from include/dtkwidget/widgets/daboutdialog.h rename to include/widgets/daboutdialog.h diff --git a/include/dtkwidget/widgets/dabstractdialog.h b/include/widgets/dabstractdialog.h similarity index 100% rename from include/dtkwidget/widgets/dabstractdialog.h rename to include/widgets/dabstractdialog.h diff --git a/include/dtkwidget/widgets/dalertcontrol.h b/include/widgets/dalertcontrol.h similarity index 100% rename from include/dtkwidget/widgets/dalertcontrol.h rename to include/widgets/dalertcontrol.h diff --git a/include/dtkwidget/widgets/danchors.h b/include/widgets/danchors.h similarity index 100% rename from include/dtkwidget/widgets/danchors.h rename to include/widgets/danchors.h diff --git a/include/dtkwidget/widgets/dapplication.h b/include/widgets/dapplication.h similarity index 100% rename from include/dtkwidget/widgets/dapplication.h rename to include/widgets/dapplication.h diff --git a/include/dtkwidget/widgets/dapplicationhelper.h b/include/widgets/dapplicationhelper.h similarity index 100% rename from include/dtkwidget/widgets/dapplicationhelper.h rename to include/widgets/dapplicationhelper.h diff --git a/include/dtkwidget/widgets/darrowbutton.h b/include/widgets/darrowbutton.h similarity index 100% rename from include/dtkwidget/widgets/darrowbutton.h rename to include/widgets/darrowbutton.h diff --git a/include/dtkwidget/widgets/darrowlinedrawer.h b/include/widgets/darrowlinedrawer.h similarity index 100% rename from include/dtkwidget/widgets/darrowlinedrawer.h rename to include/widgets/darrowlinedrawer.h diff --git a/include/dtkwidget/widgets/darrowlineexpand.h b/include/widgets/darrowlineexpand.h similarity index 100% rename from include/dtkwidget/widgets/darrowlineexpand.h rename to include/widgets/darrowlineexpand.h diff --git a/include/dtkwidget/widgets/darrowrectangle.h b/include/widgets/darrowrectangle.h similarity index 100% rename from include/dtkwidget/widgets/darrowrectangle.h rename to include/widgets/darrowrectangle.h diff --git a/include/dtkwidget/widgets/dbackgroundgroup.h b/include/widgets/dbackgroundgroup.h similarity index 100% rename from include/dtkwidget/widgets/dbackgroundgroup.h rename to include/widgets/dbackgroundgroup.h diff --git a/include/dtkwidget/widgets/dbaseexpand.h b/include/widgets/dbaseexpand.h similarity index 100% rename from include/dtkwidget/widgets/dbaseexpand.h rename to include/widgets/dbaseexpand.h diff --git a/include/dtkwidget/widgets/dbaseline.h b/include/widgets/dbaseline.h similarity index 100% rename from include/dtkwidget/widgets/dbaseline.h rename to include/widgets/dbaseline.h diff --git a/include/dtkwidget/widgets/dblureffectwidget.h b/include/widgets/dblureffectwidget.h similarity index 100% rename from include/dtkwidget/widgets/dblureffectwidget.h rename to include/widgets/dblureffectwidget.h diff --git a/include/dtkwidget/widgets/dboxwidget.h b/include/widgets/dboxwidget.h similarity index 100% rename from include/dtkwidget/widgets/dboxwidget.h rename to include/widgets/dboxwidget.h diff --git a/include/dtkwidget/widgets/dbuttonbox.h b/include/widgets/dbuttonbox.h similarity index 100% rename from include/dtkwidget/widgets/dbuttonbox.h rename to include/widgets/dbuttonbox.h diff --git a/include/dtkwidget/widgets/dcircleprogress.h b/include/widgets/dcircleprogress.h similarity index 100% rename from include/dtkwidget/widgets/dcircleprogress.h rename to include/widgets/dcircleprogress.h diff --git a/include/dtkwidget/widgets/dclipeffectwidget.h b/include/widgets/dclipeffectwidget.h similarity index 100% rename from include/dtkwidget/widgets/dclipeffectwidget.h rename to include/widgets/dclipeffectwidget.h diff --git a/include/dtkwidget/widgets/dcoloredprogressbar.h b/include/widgets/dcoloredprogressbar.h similarity index 100% rename from include/dtkwidget/widgets/dcoloredprogressbar.h rename to include/widgets/dcoloredprogressbar.h diff --git a/include/dtkwidget/widgets/dcombobox.h b/include/widgets/dcombobox.h similarity index 100% rename from include/dtkwidget/widgets/dcombobox.h rename to include/widgets/dcombobox.h diff --git a/include/dtkwidget/widgets/dcommandlinkbutton.h b/include/widgets/dcommandlinkbutton.h similarity index 100% rename from include/dtkwidget/widgets/dcommandlinkbutton.h rename to include/widgets/dcommandlinkbutton.h diff --git a/include/dtkwidget/widgets/dconstants.h b/include/widgets/dconstants.h similarity index 100% rename from include/dtkwidget/widgets/dconstants.h rename to include/widgets/dconstants.h diff --git a/include/dtkwidget/widgets/dcrumbedit.h b/include/widgets/dcrumbedit.h similarity index 100% rename from include/dtkwidget/widgets/dcrumbedit.h rename to include/widgets/dcrumbedit.h diff --git a/include/dtkwidget/widgets/ddialog.h b/include/widgets/ddialog.h similarity index 100% rename from include/dtkwidget/widgets/ddialog.h rename to include/widgets/ddialog.h diff --git a/include/dtkwidget/widgets/ddialogclosebutton.h b/include/widgets/ddialogclosebutton.h similarity index 100% rename from include/dtkwidget/widgets/ddialogclosebutton.h rename to include/widgets/ddialogclosebutton.h diff --git a/include/dtkwidget/widgets/ddrawer.h b/include/widgets/ddrawer.h similarity index 100% rename from include/dtkwidget/widgets/ddrawer.h rename to include/widgets/ddrawer.h diff --git a/include/dtkwidget/widgets/ddrawergroup.h b/include/widgets/ddrawergroup.h similarity index 100% rename from include/dtkwidget/widgets/ddrawergroup.h rename to include/widgets/ddrawergroup.h diff --git a/include/dtkwidget/widgets/denhancedwidget.h b/include/widgets/denhancedwidget.h similarity index 100% rename from include/dtkwidget/widgets/denhancedwidget.h rename to include/widgets/denhancedwidget.h diff --git a/include/dtkwidget/widgets/dexpandgroup.h b/include/widgets/dexpandgroup.h similarity index 100% rename from include/dtkwidget/widgets/dexpandgroup.h rename to include/widgets/dexpandgroup.h diff --git a/include/dtkwidget/widgets/dfeaturedisplaydialog.h b/include/widgets/dfeaturedisplaydialog.h similarity index 100% rename from include/dtkwidget/widgets/dfeaturedisplaydialog.h rename to include/widgets/dfeaturedisplaydialog.h diff --git a/include/dtkwidget/widgets/dfilechooseredit.h b/include/widgets/dfilechooseredit.h similarity index 100% rename from include/dtkwidget/widgets/dfilechooseredit.h rename to include/widgets/dfilechooseredit.h diff --git a/include/dtkwidget/widgets/dfiledialog.h b/include/widgets/dfiledialog.h similarity index 100% rename from include/dtkwidget/widgets/dfiledialog.h rename to include/widgets/dfiledialog.h diff --git a/include/dtkwidget/widgets/dfloatingbutton.h b/include/widgets/dfloatingbutton.h similarity index 100% rename from include/dtkwidget/widgets/dfloatingbutton.h rename to include/widgets/dfloatingbutton.h diff --git a/include/dtkwidget/widgets/dfloatingmessage.h b/include/widgets/dfloatingmessage.h similarity index 100% rename from include/dtkwidget/widgets/dfloatingmessage.h rename to include/widgets/dfloatingmessage.h diff --git a/include/dtkwidget/widgets/dfloatingwidget.h b/include/widgets/dfloatingwidget.h similarity index 100% rename from include/dtkwidget/widgets/dfloatingwidget.h rename to include/widgets/dfloatingwidget.h diff --git a/include/dtkwidget/widgets/dflowlayout.h b/include/widgets/dflowlayout.h similarity index 100% rename from include/dtkwidget/widgets/dflowlayout.h rename to include/widgets/dflowlayout.h diff --git a/include/dtkwidget/widgets/dfontcombobox.h b/include/widgets/dfontcombobox.h similarity index 100% rename from include/dtkwidget/widgets/dfontcombobox.h rename to include/widgets/dfontcombobox.h diff --git a/include/dtkwidget/widgets/dframe.h b/include/widgets/dframe.h similarity index 100% rename from include/dtkwidget/widgets/dframe.h rename to include/widgets/dframe.h diff --git a/include/dtkwidget/widgets/dgraphicsclipeffect.h b/include/widgets/dgraphicsclipeffect.h similarity index 100% rename from include/dtkwidget/widgets/dgraphicsclipeffect.h rename to include/widgets/dgraphicsclipeffect.h diff --git a/include/dtkwidget/widgets/dgraphicsgloweffect.h b/include/widgets/dgraphicsgloweffect.h similarity index 100% rename from include/dtkwidget/widgets/dgraphicsgloweffect.h rename to include/widgets/dgraphicsgloweffect.h diff --git a/include/dtkwidget/widgets/dheaderline.h b/include/widgets/dheaderline.h similarity index 100% rename from include/dtkwidget/widgets/dheaderline.h rename to include/widgets/dheaderline.h diff --git a/include/dtkwidget/widgets/dialog_constants.h b/include/widgets/dialog_constants.h similarity index 100% rename from include/dtkwidget/widgets/dialog_constants.h rename to include/widgets/dialog_constants.h diff --git a/include/dtkwidget/widgets/diconbutton.h b/include/widgets/diconbutton.h similarity index 100% rename from include/dtkwidget/widgets/diconbutton.h rename to include/widgets/diconbutton.h diff --git a/include/dtkwidget/widgets/dimagebutton.h b/include/widgets/dimagebutton.h similarity index 100% rename from include/dtkwidget/widgets/dimagebutton.h rename to include/widgets/dimagebutton.h diff --git a/include/dtkwidget/widgets/dimageviewer.h b/include/widgets/dimageviewer.h similarity index 100% rename from include/dtkwidget/widgets/dimageviewer.h rename to include/widgets/dimageviewer.h diff --git a/include/dtkwidget/widgets/dinputdialog.h b/include/widgets/dinputdialog.h similarity index 100% rename from include/dtkwidget/widgets/dinputdialog.h rename to include/widgets/dinputdialog.h diff --git a/include/dtkwidget/widgets/dinputdialog_p.h b/include/widgets/dinputdialog_p.h similarity index 100% rename from include/dtkwidget/widgets/dinputdialog_p.h rename to include/widgets/dinputdialog_p.h diff --git a/include/dtkwidget/widgets/dipv4lineedit.h b/include/widgets/dipv4lineedit.h similarity index 100% rename from include/dtkwidget/widgets/dipv4lineedit.h rename to include/widgets/dipv4lineedit.h diff --git a/include/dtkwidget/widgets/dkeysequenceedit.h b/include/widgets/dkeysequenceedit.h similarity index 100% rename from include/dtkwidget/widgets/dkeysequenceedit.h rename to include/widgets/dkeysequenceedit.h diff --git a/include/dtkwidget/widgets/dlabel.h b/include/widgets/dlabel.h similarity index 100% rename from include/dtkwidget/widgets/dlabel.h rename to include/widgets/dlabel.h diff --git a/include/dtkwidget/widgets/dlineedit.h b/include/widgets/dlineedit.h similarity index 100% rename from include/dtkwidget/widgets/dlineedit.h rename to include/widgets/dlineedit.h diff --git a/include/dtkwidget/widgets/dlistview.h b/include/widgets/dlistview.h similarity index 100% rename from include/dtkwidget/widgets/dlistview.h rename to include/widgets/dlistview.h diff --git a/include/dtkwidget/widgets/dloadingindicator.h b/include/widgets/dloadingindicator.h similarity index 100% rename from include/dtkwidget/widgets/dloadingindicator.h rename to include/widgets/dloadingindicator.h diff --git a/include/dtkwidget/widgets/dmainwindow.h b/include/widgets/dmainwindow.h similarity index 100% rename from include/dtkwidget/widgets/dmainwindow.h rename to include/widgets/dmainwindow.h diff --git a/include/dtkwidget/widgets/dmessagemanager.h b/include/widgets/dmessagemanager.h similarity index 100% rename from include/dtkwidget/widgets/dmessagemanager.h rename to include/widgets/dmessagemanager.h diff --git a/include/dtkwidget/widgets/dmpriscontrol.h b/include/widgets/dmpriscontrol.h similarity index 100% rename from include/dtkwidget/widgets/dmpriscontrol.h rename to include/widgets/dmpriscontrol.h diff --git a/include/dtkwidget/widgets/dpageindicator.h b/include/widgets/dpageindicator.h similarity index 100% rename from include/dtkwidget/widgets/dpageindicator.h rename to include/widgets/dpageindicator.h diff --git a/include/dtkwidget/widgets/dpalettehelper.h b/include/widgets/dpalettehelper.h similarity index 100% rename from include/dtkwidget/widgets/dpalettehelper.h rename to include/widgets/dpalettehelper.h diff --git a/include/dtkwidget/widgets/dpasswordedit.h b/include/widgets/dpasswordedit.h similarity index 100% rename from include/dtkwidget/widgets/dpasswordedit.h rename to include/widgets/dpasswordedit.h diff --git a/include/dtkwidget/widgets/dpicturesequenceview.h b/include/widgets/dpicturesequenceview.h similarity index 100% rename from include/dtkwidget/widgets/dpicturesequenceview.h rename to include/widgets/dpicturesequenceview.h diff --git a/include/dtkwidget/widgets/dplatformwindowhandle.h b/include/widgets/dplatformwindowhandle.h similarity index 100% rename from include/dtkwidget/widgets/dplatformwindowhandle.h rename to include/widgets/dplatformwindowhandle.h diff --git a/include/dtkwidget/widgets/dprintpickcolorwidget.h b/include/widgets/dprintpickcolorwidget.h similarity index 100% rename from include/dtkwidget/widgets/dprintpickcolorwidget.h rename to include/widgets/dprintpickcolorwidget.h diff --git a/include/dtkwidget/widgets/dprintpreviewdialog.h b/include/widgets/dprintpreviewdialog.h similarity index 100% rename from include/dtkwidget/widgets/dprintpreviewdialog.h rename to include/widgets/dprintpreviewdialog.h diff --git a/include/dtkwidget/widgets/dprintpreviewsettinginfo.h b/include/widgets/dprintpreviewsettinginfo.h similarity index 100% rename from include/dtkwidget/widgets/dprintpreviewsettinginfo.h rename to include/widgets/dprintpreviewsettinginfo.h diff --git a/include/dtkwidget/widgets/dprintpreviewsettinginterface.h b/include/widgets/dprintpreviewsettinginterface.h similarity index 100% rename from include/dtkwidget/widgets/dprintpreviewsettinginterface.h rename to include/widgets/dprintpreviewsettinginterface.h diff --git a/include/dtkwidget/widgets/dprintpreviewwidget.h b/include/widgets/dprintpreviewwidget.h similarity index 100% rename from include/dtkwidget/widgets/dprintpreviewwidget.h rename to include/widgets/dprintpreviewwidget.h diff --git a/include/dtkwidget/widgets/dprogressbar.h b/include/widgets/dprogressbar.h similarity index 100% rename from include/dtkwidget/widgets/dprogressbar.h rename to include/widgets/dprogressbar.h diff --git a/include/dtkwidget/widgets/dsearchcombobox.h b/include/widgets/dsearchcombobox.h similarity index 100% rename from include/dtkwidget/widgets/dsearchcombobox.h rename to include/widgets/dsearchcombobox.h diff --git a/include/dtkwidget/widgets/dsearchedit.h b/include/widgets/dsearchedit.h similarity index 100% rename from include/dtkwidget/widgets/dsearchedit.h rename to include/widgets/dsearchedit.h diff --git a/include/dtkwidget/widgets/dsegmentedcontrol.h b/include/widgets/dsegmentedcontrol.h similarity index 100% rename from include/dtkwidget/widgets/dsegmentedcontrol.h rename to include/widgets/dsegmentedcontrol.h diff --git a/include/dtkwidget/widgets/dsettingsdialog.h b/include/widgets/dsettingsdialog.h similarity index 100% rename from include/dtkwidget/widgets/dsettingsdialog.h rename to include/widgets/dsettingsdialog.h diff --git a/include/dtkwidget/widgets/dsettingswidgetfactory.h b/include/widgets/dsettingswidgetfactory.h similarity index 100% rename from include/dtkwidget/widgets/dsettingswidgetfactory.h rename to include/widgets/dsettingswidgetfactory.h diff --git a/include/dtkwidget/widgets/dshadowline.h b/include/widgets/dshadowline.h similarity index 100% rename from include/dtkwidget/widgets/dshadowline.h rename to include/widgets/dshadowline.h diff --git a/include/dtkwidget/widgets/dshortcutedit.h b/include/widgets/dshortcutedit.h similarity index 100% rename from include/dtkwidget/widgets/dshortcutedit.h rename to include/widgets/dshortcutedit.h diff --git a/include/dtkwidget/widgets/dsimplelistitem.h b/include/widgets/dsimplelistitem.h similarity index 100% rename from include/dtkwidget/widgets/dsimplelistitem.h rename to include/widgets/dsimplelistitem.h diff --git a/include/dtkwidget/widgets/dsimplelistview.h b/include/widgets/dsimplelistview.h similarity index 100% rename from include/dtkwidget/widgets/dsimplelistview.h rename to include/widgets/dsimplelistview.h diff --git a/include/dtkwidget/widgets/dslider.h b/include/widgets/dslider.h similarity index 100% rename from include/dtkwidget/widgets/dslider.h rename to include/widgets/dslider.h diff --git a/include/dtkwidget/widgets/dspinbox.h b/include/widgets/dspinbox.h similarity index 100% rename from include/dtkwidget/widgets/dspinbox.h rename to include/widgets/dspinbox.h diff --git a/include/dtkwidget/widgets/dspinner.h b/include/widgets/dspinner.h similarity index 100% rename from include/dtkwidget/widgets/dspinner.h rename to include/widgets/dspinner.h diff --git a/include/dtkwidget/widgets/dstackwidget.h b/include/widgets/dstackwidget.h similarity index 100% rename from include/dtkwidget/widgets/dstackwidget.h rename to include/widgets/dstackwidget.h diff --git a/include/dtkwidget/widgets/dstyle.h b/include/widgets/dstyle.h similarity index 100% rename from include/dtkwidget/widgets/dstyle.h rename to include/widgets/dstyle.h diff --git a/include/dtkwidget/widgets/dstyleditemdelegate.h b/include/widgets/dstyleditemdelegate.h similarity index 100% rename from include/dtkwidget/widgets/dstyleditemdelegate.h rename to include/widgets/dstyleditemdelegate.h diff --git a/include/dtkwidget/widgets/dstyleoption.h b/include/widgets/dstyleoption.h similarity index 100% rename from include/dtkwidget/widgets/dstyleoption.h rename to include/widgets/dstyleoption.h diff --git a/include/dtkwidget/widgets/dsuggestbutton.h b/include/widgets/dsuggestbutton.h similarity index 100% rename from include/dtkwidget/widgets/dsuggestbutton.h rename to include/widgets/dsuggestbutton.h diff --git a/include/dtkwidget/widgets/dswitchbutton.h b/include/widgets/dswitchbutton.h similarity index 100% rename from include/dtkwidget/widgets/dswitchbutton.h rename to include/widgets/dswitchbutton.h diff --git a/include/dtkwidget/widgets/dswitchlineexpand.h b/include/widgets/dswitchlineexpand.h similarity index 100% rename from include/dtkwidget/widgets/dswitchlineexpand.h rename to include/widgets/dswitchlineexpand.h diff --git a/include/dtkwidget/widgets/dtabbar.h b/include/widgets/dtabbar.h similarity index 100% rename from include/dtkwidget/widgets/dtabbar.h rename to include/widgets/dtabbar.h diff --git a/include/dtkwidget/widgets/dtabletwindowoptionbutton.h b/include/widgets/dtabletwindowoptionbutton.h similarity index 100% rename from include/dtkwidget/widgets/dtabletwindowoptionbutton.h rename to include/widgets/dtabletwindowoptionbutton.h diff --git a/include/dtkwidget/widgets/dtextedit.h b/include/widgets/dtextedit.h similarity index 100% rename from include/dtkwidget/widgets/dtextedit.h rename to include/widgets/dtextedit.h diff --git a/include/dtkwidget/widgets/dthememanager.h b/include/widgets/dthememanager.h similarity index 100% rename from include/dtkwidget/widgets/dthememanager.h rename to include/widgets/dthememanager.h diff --git a/include/dtkwidget/widgets/dtickeffect.h b/include/widgets/dtickeffect.h similarity index 100% rename from include/dtkwidget/widgets/dtickeffect.h rename to include/widgets/dtickeffect.h diff --git a/include/dtkwidget/widgets/dtiplabel.h b/include/widgets/dtiplabel.h similarity index 100% rename from include/dtkwidget/widgets/dtiplabel.h rename to include/widgets/dtiplabel.h diff --git a/include/dtkwidget/widgets/dtitlebar.h b/include/widgets/dtitlebar.h similarity index 100% rename from include/dtkwidget/widgets/dtitlebar.h rename to include/widgets/dtitlebar.h diff --git a/include/dtkwidget/widgets/dtitlebarsettings.h b/include/widgets/dtitlebarsettings.h similarity index 100% rename from include/dtkwidget/widgets/dtitlebarsettings.h rename to include/widgets/dtitlebarsettings.h diff --git a/include/dtkwidget/widgets/dtoast.h b/include/widgets/dtoast.h similarity index 100% rename from include/dtkwidget/widgets/dtoast.h rename to include/widgets/dtoast.h diff --git a/include/dtkwidget/widgets/dtoolbutton.h b/include/widgets/dtoolbutton.h similarity index 100% rename from include/dtkwidget/widgets/dtoolbutton.h rename to include/widgets/dtoolbutton.h diff --git a/include/dtkwidget/widgets/dtooltip.h b/include/widgets/dtooltip.h similarity index 100% rename from include/dtkwidget/widgets/dtooltip.h rename to include/widgets/dtooltip.h diff --git a/include/dtkwidget/widgets/dwarningbutton.h b/include/widgets/dwarningbutton.h similarity index 100% rename from include/dtkwidget/widgets/dwarningbutton.h rename to include/widgets/dwarningbutton.h diff --git a/include/dtkwidget/widgets/dwaterprogress.h b/include/widgets/dwaterprogress.h similarity index 100% rename from include/dtkwidget/widgets/dwaterprogress.h rename to include/widgets/dwaterprogress.h diff --git a/include/dtkwidget/widgets/dwidgetstype.h b/include/widgets/dwidgetstype.h similarity index 100% rename from include/dtkwidget/widgets/dwidgetstype.h rename to include/widgets/dwidgetstype.h diff --git a/include/dtkwidget/widgets/dwindowclosebutton.h b/include/widgets/dwindowclosebutton.h similarity index 100% rename from include/dtkwidget/widgets/dwindowclosebutton.h rename to include/widgets/dwindowclosebutton.h diff --git a/include/dtkwidget/widgets/dwindowmaxbutton.h b/include/widgets/dwindowmaxbutton.h similarity index 100% rename from include/dtkwidget/widgets/dwindowmaxbutton.h rename to include/widgets/dwindowmaxbutton.h diff --git a/include/dtkwidget/widgets/dwindowminbutton.h b/include/widgets/dwindowminbutton.h similarity index 100% rename from include/dtkwidget/widgets/dwindowminbutton.h rename to include/widgets/dwindowminbutton.h diff --git a/include/dtkwidget/widgets/dwindowoptionbutton.h b/include/widgets/dwindowoptionbutton.h similarity index 100% rename from include/dtkwidget/widgets/dwindowoptionbutton.h rename to include/widgets/dwindowoptionbutton.h diff --git a/include/dtkwidget/widgets/dwindowquitfullbutton.h b/include/widgets/dwindowquitfullbutton.h similarity index 100% rename from include/dtkwidget/widgets/dwindowquitfullbutton.h rename to include/widgets/dwindowquitfullbutton.h diff --git a/misc/DtkWidgetConfig.cmake.in b/misc/DtkWidgetConfig.cmake.in index 04abadbae..e2c43d9c9 100644 --- a/misc/DtkWidgetConfig.cmake.in +++ b/misc/DtkWidgetConfig.cmake.in @@ -1,16 +1,13 @@ @PACKAGE_INIT@ -set_and_check(DtkWidget_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@") -set_and_check(DtkWidget_LIBRARY_DIRS "@PACKAGE_LIBRARY_INSTALL_DIR@") -set(DtkWidget_TOOL_DIRS "@PACKAGE_TOOL_INSTALL_DIR@") - include(CMakeFindDependencyMacro) -find_dependency(Dtk REQUIRED Core Gui) -find_library(DtkWidget_LIBRARIES dtkwidget ${DtkWidget_LIBRARY_DIRS}) -set(DtkWidget_LIBRARIES ${DtkWidget_LIBRARIES} ${DtkCore_LIBRARIES} ${DtkGui_LIBRARIES}) - -include_directories("${DtkWidget_INCLUDE_DIRS}") - +find_dependency(Dtk COMPONENTS Core Gui) +find_dependency(Qt@QT_VERSION_MAJOR@ COMPONENTS Core Widgets DBus Network PrintSupport) +include(${CMAKE_CURRENT_LIST_DIR}/DtkWidgetTargets.cmake) +set(DtkWidget_LIBRARIES Dtk::Widget) +get_target_property(DtkWidget_INCLUDE_DIRS Dtk::Widget INTERFACE_INCLUDE_DIRECTORIES) +get_target_property(DtkWidget_LIBRARY_DIRS Dtk::Widget INTERFACE_LINK_DIRECTORIES) +set(DtkWidget_TOOL_DIRS "@PACKAGE_TOOL_INSTALL_DIR@") check_required_components(DtkWidget) # Keep deprecated variables for compatibility diff --git a/misc/dtkwidget.pc.in b/misc/dtkwidget.pc.in index 531fb2fcc..3d51dae26 100644 --- a/misc/dtkwidget.pc.in +++ b/misc/dtkwidget.pc.in @@ -1,11 +1,11 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=@LIBRARY_INSTALL_DIR@ -includedir=@INCLUDE_INSTALL_DIR@ +libdir=${prefix}/@LIBRARY_INSTALL_DIR@ +includedir=${prefix}/@INCLUDE_INSTALL_DIR@ Name: dtkwidget Description: Deepin Tool Kit dtkwidget header files Version: @PROJECT_VERSION@ -Libs: -L${libdir} -ldtkwidget +Libs: -L${libdir} -ldtkwidget Cflags: -I${includedir} -Requires: dtkcore, dtkgui +Requires: dtkcore dtkgui Qt@QT_VERSION_MAJOR@Core Qt@QT_VERSION_MAJOR@Widgets Qt@QT_VERSION_MAJOR@DBus Qt@QT_VERSION_MAJOR@Network Qt@QT_VERSION_MAJOR@PrintSupport diff --git a/misc/qt_lib_dtkwidget.pri.in b/misc/qt_lib_dtkwidget.pri.in index d939bfada..c4e64e0d0 100644 --- a/misc/qt_lib_dtkwidget.pri.in +++ b/misc/qt_lib_dtkwidget.pri.in @@ -4,9 +4,9 @@ QT.dtkwidget.MINOR_VERSION = @PROJECT_VERSION_MINOR@ QT.dtkwidget.PATCH_VERSION = @PROJECT_VERSION_PATCH@ QT.dtkwidget.name = dtkwidget QT.dtkwidget.module = dtkwidget -QT.dtkwidget.tools = @TOOL_INSTALL_DIR@ -QT.dtkwidget.libs = @LIBRARY_INSTALL_DIR@ -QT.dtkwidget.includes = @INCLUDE_INSTALL_DIR@ +QT.dtkwidget.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@ +QT.dtkwidget.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@ +QT.dtkwidget.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ QT.dtkwidget.frameworks = QT.dtkwidget.depends = core gui dtkcore network concurrent dtkgui printsupport printsupport_private widgets widgets_private gui_private x11extras dbus QT.dtkwidget.module_config = v2 internal_module ltcg diff --git a/plugin/dtkuidemo/CMakeLists.txt b/plugin/dtkuidemo/CMakeLists.txt index 7b94fb655..3ca1d807c 100644 --- a/plugin/dtkuidemo/CMakeLists.txt +++ b/plugin/dtkuidemo/CMakeLists.txt @@ -1,45 +1,21 @@ -#cmake_minimum_required(VERSION 3.5) - -#project(dtkuidemo VERSION 0.1 LANGUAGES CXX) set(DEMO dtkuidemo) -set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(CMAKE_EXPORT_COMPILE_COMMANDS ON) - set(CMAKE_AUTOUIC ON) -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) - -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) +# We must find Qt5Widgets explicitly to include Qt5::uic target for AUTOUIC, although Qt5::Widgets is implicitly linked to demo through dtkwidget +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets) -find_package(DtkGui REQUIRED) -#find_package(DtkWidget REQUIRED) -find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets) -find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets) -find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core) -set(RCC_FILES dtkuidemo.qrc) add_executable( - ${DEMO} - main.cpp - mainwindow.h - mainwindow.cpp - mainwindow.ui - ${RCC_FILES} + ${DEMO} + main.cpp + mainwindow.h + mainwindow.cpp + dtkuidemo.qrc + mainwindow.ui ) -target_link_libraries( - ${DEMO} PRIVATE - dtkwidget - Qt${QT_VERSION_MAJOR}::Widgets - Qt${QT_VERSION_MAJOR}::Core - ${DtkGui_LIBRARIES} -) -target_include_directories(${DEMO} PUBLIC - #${DtkWidget_INCLUDE_DIRS} - ${Qt5Gui_PRIVATE_INCLUDE_DIRS} - ../../../include/dtkwidget/DWidget/ - ../../../include/dtkwidget/widgets/ - ../../../include/dtkwidget/util/ - ../../../include/dtkwidget/global/ + +target_link_libraries(${DEMO} PRIVATE + Qt${QT_VERSION_MAJOR}::Core + Qt${QT_VERSION_MAJOR}::GuiPrivate + ${LIB_NAME} ) diff --git a/plugin/dtkuiplugin/CMakeLists.txt b/plugin/dtkuiplugin/CMakeLists.txt index 36984fae8..ad2c5a3a7 100644 --- a/plugin/dtkuiplugin/CMakeLists.txt +++ b/plugin/dtkuiplugin/CMakeLists.txt @@ -1,68 +1,46 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) set(UIPLUGIN dtkuiplugin) project(${UIPLUGIN} VERSION 1.0.0 LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(CMAKE_EXPORT_COMPILE_COMMANDS ON) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS UiPlugin Gui) -set(CMAKE_AUTOUIC ON) -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) +set(LIB_DWIDGET ${LIB_NAME}) -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - -find_package(DtkGui REQUIRED) -find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets) -find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets) -find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core) -find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS UiPlugin) - -set(LIB_DWIDGET dtkwidget) -set(INC_DWIDGET) if (CMAKE_PROJECT_NAME STREQUAL ${UIPLUGIN}) message("compile ${UIPLUGIN} individually") + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + set(CMAKE_AUTOMOC ON) + set(CMAKE_AUTORCC ON) + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) include(GNUInstallDirs) - if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) set(CMAKE_INSTALL_PREFIX /usr) - endif () + endif() find_package(DtkWidget REQUIRED) - set(LIB_DWIDGET ${DtkWidget_LIBRARIES}) - set(INC_DWIDGET ${DTKWIDGET_INCLUDE_DIR}) -else() - list(APPEND INC_DWIDGET ${CMAKE_CURRENT_LIST_DIR}/../../../include/dtkwidget/DWidget) - list(APPEND INC_DWIDGET ${CMAKE_CURRENT_LIST_DIR}/../../../include/dtkwidget/widgets) - list(APPEND INC_DWIDGET ${CMAKE_CURRENT_LIST_DIR}/../../../include/dtkwidget/util) - list(APPEND INC_DWIDGET ${CMAKE_CURRENT_LIST_DIR}/../../../include/dtkwidget/global) + set(LIB_DWIDGET Dtk::Widget) endif() -set(RCC_FILES dtkuiplugin.qrc) add_library( ${UIPLUGIN} SHARED dcustomerplugins.h dcustomerplugins.cpp dcustomermacrowidget.h - ${RCC_FILES} + dtkuiplugin.qrc ) target_link_libraries( ${UIPLUGIN} PRIVATE ${LIB_DWIDGET} - Qt${QT_VERSION_MAJOR}::Widgets - Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::UiPlugin - Dtk::Gui -) - -target_include_directories(${UIPLUGIN} PUBLIC - ${Qt5Gui_PRIVATE_INCLUDE_DIRS} - ${INC_DWIDGET} + Qt${QT_VERSION_MAJOR}::GuiPrivate ) -set (INSTALL_PLUGIN OFF CACHE BOOL "install dtk designer plugin") -if (INSTALL_PLUGIN) - set(QT_PLUGIN_DESIGNER_PATH "qt5/plugins/designer/") +set(INSTALL_PLUGIN OFF CACHE BOOL "Install dtk designer plugin") +if(INSTALL_PLUGIN) + set(QT_PLUGIN_DESIGNER_PATH "qt5/plugins/designer") install(TARGETS ${UIPLUGIN} DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/${QT_PLUGIN_DESIGNER_PATH}") - message("install path:" "${CMAKE_INSTALL_FULL_LIBDIR}/${QT_PLUGIN_DESIGNER_PATH}") + message(STATUS "Install path:" "${CMAKE_INSTALL_FULL_LIBDIR}/${QT_PLUGIN_DESIGNER_PATH}") endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 56e7bfd4c..d471c0dc5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,113 +1,100 @@ -# SET the version -#cmake_minimum_required(VERSION 3.5) - -set(LIB_NAME dtkwidget) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_EXPORT_COMPILE_COMMANDS ON) -set(CMAKE_AUTOUIC ON) -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) - -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_EXPORT_COMPILE_COMMANDS ON) -# find_package -find_package(Dtk REQUIRED COMPONENTS Core Gui) - -find_package(Qt5 REQUIRED COMPONENTS Core) -find_package(Qt5 REQUIRED COMPONENTS Network) -find_package(Qt5 REQUIRED COMPONENTS Concurrent) -find_package(Qt5 REQUIRED COMPONENTS Widgets) -find_package(Qt5 REQUIRED COMPONENTS PrintSupport) -#find_package(Qt5 REQUIRED COMPONENTS Multimedia) -find_package(Qt5 REQUIRED COMPONENTS LinguistTools) - -find_package(PkgConfig REQUIRED) - -pkg_check_modules(QGSettings REQUIRED gsettings-qt) -pkg_check_modules(XCBUTIL REQUIRED xcb-util) -pkg_check_modules(STARUPNOTIFICATION REQUIRED libstartup-notification-1.0) -pkg_check_modules(XEXT REQUIRED xext) -pkg_check_modules(XI REQUIRED xi) -pkg_check_modules(X11 REQUIRED x11) +pkg_check_modules(QGSettings REQUIRED IMPORTED_TARGET gsettings-qt) +pkg_check_modules(XcbUtil REQUIRED IMPORTED_TARGET xcb-util) +pkg_check_modules(StartupNotification REQUIRED IMPORTED_TARGET libstartup-notification-1.0) +pkg_check_modules(Xext REQUIRED IMPORTED_TARGET xext) +pkg_check_modules(Xi REQUIRED IMPORTED_TARGET xi) +pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11) include(util/util.cmake) include(widgets/widgets.cmake) -#file(GLOB UTILHEAEDER ../include/dtkwidget/util/*.h) -if (UNIX AND NOT APPLE) - set(LINUX TRUE) -endif() +file(GLOB TRANSLATIONS translations/*.ts) +qt5_add_translation(QM_FILES ${TRANSLATIONS}) + +add_library(${LIB_NAME} SHARED + ${WIDGETS} + ${QM_FILES} + ${UTIL} + ${PUBLIC_HEADERS} +) -set(CONFIGNAME ../include/dtkwidget/global/dtkwidget_config.h) -file(WRITE ${CONFIGNAME} "// it is auto make config\n") -file(GLOB CONFIGSOURCE ../include/dtkwidget/DWidget/*) +set(TRANSLATIONS_INSTALL_DIR + "dtk${PROJECT_VERSION_MAJOR}/DWidget/translations" +) -foreach(FILENAME ${CONFIGSOURCE}) - get_filename_component(thefile ${FILENAME} NAME) - file(APPEND ${CONFIGNAME} "#define DTKWIDGET_CLASS_${thefile}\n") -endforeach() +target_compile_definitions(${LIB_NAME} PRIVATE + SN_API_NOT_YET_FROZEN + DTK_NO_MULTIMEDIA + DWIDGET_TRANSLATIONS_DIR="${TRANSLATIONS_INSTALL_DIR}" +) -file(GLOB TRANSLATE translations/*.ts) -qt5_add_translation(TRANSLATEDFILES ${TRANSLATE}) +if(DTK_STATIC_TRANSLATION) +target_compile_definitions(${LIB_NAME} PRIVATE + DTK_STATIC_TRANSLATION +) +endif() -add_definitions(-DSN_API_NOT_YET_FROZEN) -add_definitions(-DDTK_NO_MULTIMEDIA) -#TranslateDir -add_definitions(-DDWIDGET_TRANSLATIONS_DIR="libdtk-${CMAKE_PROJECT_VERSION}/DWidget/translations") -find_package(Qt5 COMPONENTS X11Extras) -find_package(Qt5 COMPONENTS DBus) -add_library(${LIB_NAME} SHARED - ${widgets_SRC} - ${TRANSLATEDFILES} - ${util_SRC} +target_include_directories(${LIB_NAME} +PUBLIC + $ + $ + $ + $ + $ + $ +INTERFACE + $ ) -target_link_libraries( - ${LIB_NAME} PRIVATE - Qt5::Widgets - Qt5::Network - Qt5::Concurrent - Qt5::Core - Qt5::DBus - Qt5::X11Extras - Qt5::PrintSupport - ${DtkGui_LIBRARIES} - ${DtkCore_LIBRARIES} - ${QGSettings_LIBRARIES} - ${STARUPNOTIFICATION_LIBRARIES} - ${XEXT_LIBRARIES} - ${XI_LIBRARIES} - ${X11_LIBRARIES} - ${XCBUTIL_LIBRARIES} + +target_link_libraries(${LIB_NAME} +PUBLIC + Qt5::Widgets + Qt5::Network + Qt5::Core + Qt5::DBus + Qt5::PrintSupport + Dtk::Gui + Dtk::Core +PRIVATE + Qt5::Concurrent + Qt5::X11Extras + Qt5::GuiPrivate + Qt5::WidgetsPrivate + Qt5::PrintSupportPrivate + PkgConfig::QGSettings + PkgConfig::StartupNotification + PkgConfig::Xext + PkgConfig::Xi + PkgConfig::X11 + PkgConfig::XcbUtil ) -target_include_directories(${LIB_NAME} PUBLIC - ../include/dtkwidget/DWidget/ - ../include/dtkwidget/util/ - ../include/dtkwidget/widgets/ - ../include/dtkwidget/global/ - ../include/ - ${Qt5Gui_PRIVATE_INCLUDE_DIRS} - ${Qt5Widgets_PRIVATE_INCLUDE_DIRS} - ${Qt5PrintSupport_PRIVATE_INCLUDE_DIRS} - ${QGSettings_INCLUDE_DIRS} - ${STARUPNOTIFICATION_INCLUDE_DIRS} - ${XEXT_INCLUDE_DIRS} - ${XI_INCLUDE_DIRS} - ${X11_INCLUDE_DIRS} - ${XCBUTIL_INCLUDE_DIRS} +target_link_directories(${LIB_NAME} INTERFACE + $ + $ ) -set_target_properties(${LIB_NAME} PROPERTIES + +set_target_properties(${LIB_NAME} + PROPERTIES VERSION ${CMAKE_PROJECT_VERSION} SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR} + EXPORT_NAME Widget + PUBLIC_HEADER "${PUBLIC_HEADERS}" +) +install( + TARGETS ${LIB_NAME} + EXPORT DtkWidgetTargets + DESTINATION ${LIBRARY_INSTALL_DIR} + PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR} +) + +install( + EXPORT DtkWidgetTargets + FILE DtkWidgetTargets.cmake + NAMESPACE Dtk:: + DESTINATION ${CONFIG_INSTALL_DIR} ) -install(TARGETS ${LIB_NAME} DESTINATION ${LIBRARY_INSTALL_DIR}) -install(DIRECTORY ../include/dtkwidget/DWidget/ DESTINATION "${INCLUDE_INSTALL_DIR}" FILES_MATCHING PATTERN "*") -install(DIRECTORY ../include/dtkwidget/util/ DESTINATION "${INCLUDE_INSTALL_DIR}" FILES_MATCHING PATTERN "*") -install(DIRECTORY ../include/dtkwidget/global/ DESTINATION "${INCLUDE_INSTALL_DIR}" FILES_MATCHING PATTERN "*") -install(DIRECTORY ../include/dtkwidget/widgets/ DESTINATION "${INCLUDE_INSTALL_DIR}" FILES_MATCHING PATTERN "*") -install(FILES ${TRANSLATEDFILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/libdtk-${CMAKE_PROJECT_VERSION}/DWidget/translations") +install(FILES ${QM_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/${TRANSLATIONS_INSTALL_DIR}") -DCONFIG_META_FILES(COMMONID org.deepin.dtkwidget FILES "./org.deepin.dtkwidget.feature-display.json") +dconfig_meta_files(COMMONID org.deepin.dtkwidget FILES ${CMAKE_CURRENT_LIST_DIR}/org.deepin.dtkwidget.feature-display.json) diff --git a/src/util/daccessibilitychecker.cpp b/src/util/daccessibilitychecker.cpp index 9e8396760..fe029fc12 100644 --- a/src/util/daccessibilitychecker.cpp +++ b/src/util/daccessibilitychecker.cpp @@ -1,9 +1,9 @@ -// SPDX-FileCopyrightText: 2021 - 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2021 - 2023 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: LGPL-3.0-or-later -#include "dtkwidget/util/daccessibilitychecker.h" +#include "daccessibilitychecker.h" #include diff --git a/src/util/dapplicationsettings.cpp b/src/util/dapplicationsettings.cpp index 47b30747f..1e5e4d0df 100644 --- a/src/util/dapplicationsettings.cpp +++ b/src/util/dapplicationsettings.cpp @@ -1,9 +1,9 @@ -// SPDX-FileCopyrightText: 2019 - 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2019 - 2023 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: LGPL-3.0-or-later -#include "dtkwidget/util/dapplicationsettings.h" +#include "dapplicationsettings.h" #include #include diff --git a/src/util/ddesktopservices_linux.cpp b/src/util/ddesktopservices_linux.cpp index 2f77287d9..51ceadf43 100644 --- a/src/util/ddesktopservices_linux.cpp +++ b/src/util/ddesktopservices_linux.cpp @@ -1,8 +1,8 @@ -// SPDX-FileCopyrightText: 2017 - 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2017 - 2023 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: LGPL-3.0-or-later -#include "dtkwidget/util/ddesktopservices.h" +#include "ddesktopservices.h" #include #include #include diff --git a/src/util/ddesktopservices_win.cpp b/src/util/ddesktopservices_win.cpp index 3690de403..8f77e3efa 100644 --- a/src/util/ddesktopservices_win.cpp +++ b/src/util/ddesktopservices_win.cpp @@ -1,8 +1,8 @@ -// SPDX-FileCopyrightText: 2017 - 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2017 - 2023 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: LGPL-3.0-or-later -#include "dtkwidget/util/ddesktopservices.h" +#include "ddesktopservices.h" DWIDGET_BEGIN_NAMESPACE diff --git a/src/util/dfileiconprovider.cpp b/src/util/dfileiconprovider.cpp index 9e56b0808..a6ef67f07 100644 --- a/src/util/dfileiconprovider.cpp +++ b/src/util/dfileiconprovider.cpp @@ -1,11 +1,11 @@ -// SPDX-FileCopyrightText: 2017 - 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2017 - 2023 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: LGPL-3.0-or-later #include #include -#include "dtkwidget/util/dfileiconprovider.h" +#include "dfileiconprovider.h" #include #include diff --git a/src/util/dhidpihelper.cpp b/src/util/dhidpihelper.cpp index 6f643c62d..904fb6fab 100644 --- a/src/util/dhidpihelper.cpp +++ b/src/util/dhidpihelper.cpp @@ -1,8 +1,8 @@ -// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2022 - 2023 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: LGPL-3.0-or-later -#include "dtkwidget/util/dhidpihelper.h" +#include "dhidpihelper.h" #include #include diff --git a/src/util/dregionmonitor.cpp b/src/util/dregionmonitor.cpp index d3a2b8f1e..f04598af0 100644 --- a/src/util/dregionmonitor.cpp +++ b/src/util/dregionmonitor.cpp @@ -1,8 +1,8 @@ -// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2022 - 2023 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: LGPL-3.0-or-later -#include "dtkwidget/util/dregionmonitor.h" +#include "dregionmonitor.h" #include "private/dregionmonitor_p.h" DWIDGET_BEGIN_NAMESPACE diff --git a/src/util/dthumbnailprovider.cpp b/src/util/dthumbnailprovider.cpp index b0dea52d1..25c08ba6a 100644 --- a/src/util/dthumbnailprovider.cpp +++ b/src/util/dthumbnailprovider.cpp @@ -1,8 +1,8 @@ -// SPDX-FileCopyrightText: 2017 - 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2017 - 2023 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: LGPL-3.0-or-later -#include "dtkwidget/util/dthumbnailprovider.h" +#include "dthumbnailprovider.h" #include #include diff --git a/src/util/dtrashmanager_linux.cpp b/src/util/dtrashmanager_linux.cpp index e1772a0b7..df3dca76f 100644 --- a/src/util/dtrashmanager_linux.cpp +++ b/src/util/dtrashmanager_linux.cpp @@ -1,8 +1,8 @@ -// SPDX-FileCopyrightText: 2017 - 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2017 - 2023 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: LGPL-3.0-or-later -#include "dtkwidget/util/dtrashmanager.h" +#include "dtrashmanager.h" #include #include diff --git a/src/util/dtrashmanager_win.cpp b/src/util/dtrashmanager_win.cpp index f76ce5958..78ee49ab6 100644 --- a/src/util/dtrashmanager_win.cpp +++ b/src/util/dtrashmanager_win.cpp @@ -1,8 +1,8 @@ -// SPDX-FileCopyrightText: 2017 - 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2017 - 2023 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: LGPL-3.0-or-later -#include "dtkwidget/util/dtrashmanager.h" +#include "dtrashmanager.h" #include diff --git a/src/util/dwidgetutil.cpp b/src/util/dwidgetutil.cpp index dc1c8bd0e..51f942bf0 100644 --- a/src/util/dwidgetutil.cpp +++ b/src/util/dwidgetutil.cpp @@ -1,8 +1,8 @@ -// SPDX-FileCopyrightText: 2017 - 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2017 - 2023 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: LGPL-3.0-or-later -#include "dtkwidget/util/dwidgetutil.h" +#include "dwidgetutil.h" #include #include diff --git a/src/util/util.cmake b/src/util/util.cmake index b326e6797..53a2cfbb5 100644 --- a/src/util/util.cmake +++ b/src/util/util.cmake @@ -1,17 +1,12 @@ -file(GLOB UTILHEAEDER ${CMAKE_CURRENT_LIST_DIR}/../../include/dtkwidget/util/*.h) -set(UTILESOURCE - ${CMAKE_CURRENT_LIST_DIR}/dfileiconprovider.cpp - ${CMAKE_CURRENT_LIST_DIR}/dthumbnailprovider.cpp - ${CMAKE_CURRENT_LIST_DIR}/dwidgetutil.cpp - ${CMAKE_CURRENT_LIST_DIR}/dhidpihelper.cpp - ${CMAKE_CURRENT_LIST_DIR}/dapplicationsettings.cpp - ${CMAKE_CURRENT_LIST_DIR}/daccessibilitychecker.cpp - ${CMAKE_CURRENT_LIST_DIR}/ddesktopservices_linux.cpp - ${CMAKE_CURRENT_LIST_DIR}/dtrashmanager_linux.cpp - ${CMAKE_CURRENT_LIST_DIR}/dregionmonitor.cpp -) -set(util_SRC - ${CMAKE_CURRENT_LIST_DIR}/private/dregionmonitor_p.h - ${UTILESOURCE} - ${UTILHEAEDER} -) +file(GLOB_RECURSE UTIL_HEADERS "${CMAKE_CURRENT_LIST_DIR}/*.h") +file(GLOB_RECURSE UTIL_SOURCES "${CMAKE_CURRENT_LIST_DIR}/*.cpp") +if(LINUX) + list(REMOVE_ITEM UTIL_SOURCES + ${CMAKE_CURRENT_LIST_DIR}/ddesktopservices_win.cpp + ${CMAKE_CURRENT_LIST_DIR}/dtrashmanager_win.cpp) +else() + list(REMOVE_ITEM UTIL_SOURCES + ${CMAKE_CURRENT_LIST_DIR}/ddesktopservices_linux.cpp + ${CMAKE_CURRENT_LIST_DIR}/dtrashmanager_linux.cpp) +endif() +set(UTIL ${UTIL_SOURCES} ${UTIL_HEADERS}) diff --git a/src/widgets/widgets.cmake b/src/widgets/widgets.cmake index ac07b4ac3..f01f02f46 100644 --- a/src/widgets/widgets.cmake +++ b/src/widgets/widgets.cmake @@ -1,35 +1,19 @@ # TODO Maybe need to check if is apple or else -file(GLOB PRIVATEMPRISHEADER ${CMAKE_CURRENT_LIST_DIR}/private/mpris/*.h) -file(GLOB PRIVATEMPRISSOURCE ${CMAKE_CURRENT_LIST_DIR}/private/mpris/*.cpp) -file(GLOB WIDGETSOURCE ${CMAKE_CURRENT_LIST_DIR}/*.cpp) -file(GLOB WIDGETHEADER ${CMAKE_CURRENT_LIST_DIR}/../../include/dtkwidget/widgets/*) -file(GLOB WIDGETPROVATEHEADER ${CMAKE_CURRENT_LIST_DIR}/private/*.h) -file(GLOB WIDGETPROVATESOURCE ${CMAKE_CURRENT_LIST_DIR}/private/*.cpp) +file(GLOB MPRIS_HEADERS ${CMAKE_CURRENT_LIST_DIR}/private/mpris/*.h) +file(GLOB MPRIS_SOURCES ${CMAKE_CURRENT_LIST_DIR}/private/mpris/*.cpp) +file(GLOB WIDGETS_SOURCES ${CMAKE_CURRENT_LIST_DIR}/*.cpp ${CMAKE_CURRENT_LIST_DIR}/private/*.cpp) +file(GLOB WIDGETS_PRIVATE_HEADERS ${CMAKE_CURRENT_LIST_DIR}/private/*.h) file(GLOB SETTINGS ${CMAKE_CURRENT_LIST_DIR}/private/settings/*) -file(GLOB NOTIFICATION ${CMAKE_CURRENT_LIST_DIR}/private/startupnotifications/*) -set(KEYBOARD - ${CMAKE_CURRENT_LIST_DIR}/private/keyboardmonitor/dkeyboardmonitor.h - ${CMAKE_CURRENT_LIST_DIR}/private/keyboardmonitor/dkeyboardmonitor.cpp -) -set(ICONS ${CMAKE_CURRENT_LIST_DIR}/icons.qrc) -set(ICONTHEME ${CMAKE_CURRENT_LIST_DIR}/assets/icons/dtk-icon-theme.qrc) -set(widgets_SRC - ${PRIVATEMPRISHEADER} - ${PRIVATEMPRISSOURCE} - +file(GLOB NOTIFICATIONS ${CMAKE_CURRENT_LIST_DIR}/private/startupnotifications/*) +file(GLOB KEYBOARD ${CMAKE_CURRENT_LIST_DIR}/private/keyboardmonitor/*) +file(GLOB_RECURSE RESOURCES ${CMAKE_CURRENT_LIST_DIR}/*.qrc) +set(WIDGETS + ${MPRIS_HEADERS} + ${MPRIS_SOURCES} + ${WIDGETS_SOURCES} + ${WIDGETS_PRIVATE_HEADERS} ${SETTINGS} - - ${NOTIFICATION} - + ${NOTIFICATIONS} ${KEYBOARD} - - ${WIDGETPROVATEHEADER} - ${WIDGETPROVATESOURCE} - - ${ICONS} - - ${ICONTHEME} - - ${WIDGETHEADER} - ${WIDGETSOURCE} + ${RESOURCES} ) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index abc2b54f3..6bc932dc5 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,200 +1,173 @@ -#cmake_minimum_required(VERSION 3.5) +set(BIN_NAME "ut-${LIB_NAME}") -set(BIN_NAME "ut-${PROJECT_NAME}") -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_EXPORT_COMPILE_COMMANDS ON) -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_CXX_FLAGS "-fno-access-control") -add_compile_options(-fsanitize=address) -add_link_options(-fsanitize=address) - -add_definitions(-DSN_API_NOT_YET_FROZEN) -add_definitions(-DDTK_NO_MULTIMEDIA) -#TrainslateDir -add_definitions(-DDWIDGET_TRANSLATIONS_DIR="libdtk-${CMAKE_PROJECT_VERSION}/DWidget/translate") - - -find_package(DtkGui REQUIRED) -find_package(DtkCore REQUIRED) -#find_package(DtkWidget REQUIRED) - -find_package(Qt5 REQUIRED COMPONENTS Core) find_package(Qt5 REQUIRED COMPONENTS Test) -find_package(Qt5 REQUIRED COMPONENTS Network) -find_package(Qt5 REQUIRED COMPONENTS Concurrent) -find_package(Qt5 REQUIRED COMPONENTS Widgets) -find_package(Qt5 REQUIRED COMPONENTS PrintSupport) -#find_package(Qt5 REQUIRED COMPONENTS Multimedia) -find_package(Qt5 COMPONENTS X11Extras) -find_package(Qt5 COMPONENTS DBus) - find_package(GTest REQUIRED) -find_package(PkgConfig REQUIRED) - -pkg_check_modules(QGSettings REQUIRED gsettings-qt) -pkg_check_modules(XCBUTIL REQUIRED xcb-util) -pkg_check_modules(STARUPNOTIFICATION REQUIRED libstartup-notification-1.0) -pkg_check_modules(XEXT REQUIRED xext) -pkg_check_modules(XI REQUIRED xi) -pkg_check_modules(X11 REQUIRED x11) +pkg_check_modules(QGSettings REQUIRED IMPORTED_TARGET gsettings-qt) +pkg_check_modules(XcbUtil REQUIRED IMPORTED_TARGET xcb-util) +pkg_check_modules(StartupNotification REQUIRED IMPORTED_TARGET libstartup-notification-1.0) +pkg_check_modules(Xext REQUIRED IMPORTED_TARGET xext) +pkg_check_modules(Xi REQUIRED IMPORTED_TARGET xi) +pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11) set(WIDGET_TEST - testcases/widgets/ut_daboutdialog.cpp - testcases/widgets/ut_dabstractdialog.cpp - testcases/widgets/ut_dalertcontrol.cpp - testcases/widgets/ut_danchor.cpp - # TODO break the test - #testcases/widgets/ut_danchors.cpp - testcases/widgets/ut_darrowbutton.cpp - testcases/widgets/ut_darrowlinedrawer.cpp - testcases/widgets/ut_darrowlineexpand.cpp - testcases/widgets/ut_darrowrectangle.cpp - testcases/widgets/ut_dbackgroundgroup.cpp - testcases/widgets/ut_dbaseexpand.cpp - testcases/widgets/ut_dbaseline.cpp - testcases/widgets/ut_dblureffectwidget.cpp - testcases/widgets/ut_dboxwidget.cpp - testcases/widgets/ut_dbuttonbox.cpp - testcases/widgets/ut_dcircleprogress.cpp - testcases/widgets/ut_dclipeffectwidget.cpp - testcases/widgets/ut_dcoloredprogressbar.cpp - testcases/widgets/ut_dcommandlinkbutton.cpp - testcases/widgets/ut_dcrumbedit.cpp - testcases/widgets/ut_ddialog.cpp - testcases/widgets/ut_ddialogclosebutton.cpp - testcases/widgets/ut_ddrawer.cpp - testcases/widgets/ut_ddrawergroup.cpp - testcases/widgets/ut_denhancedwidget.cpp - # TODO test break - #testcases/widgets/ut_dexpandgroup.cpp - testcases/widgets/ut_dfilechooseredit.cpp - testcases/widgets/ut_dfiledialog.cpp - testcases/widgets/ut_dfloatingbutton.cpp - testcases/widgets/ut_dfloatingmessage.cpp - testcases/widgets/ut_dfloatingwidget.cpp - # TODO break - # testcases/widgets/ut_dflowlayout.cpp - testcases/widgets/ut_dframe.cpp - testcases/widgets/ut_dgraphicsclipeffect.cpp - testcases/widgets/ut_dgraphicsgloweffect.cpp - testcases/widgets/ut_dheaderline.cpp - testcases/widgets/ut_diconbutton.cpp - testcases/widgets/ut_dimageviewer.cpp - testcases/widgets/ut_dinputdialog.cpp - testcases/widgets/ut_dipv4lineedit.cpp - testcases/widgets/ut_dkeysequenceedit.cpp - testcases/widgets/ut_dlabel.cpp - testcases/widgets/ut_dlineedit.cpp - testcases/widgets/ut_dlistview.cpp - testcases/widgets/ut_dloadingindicator.cpp - testcases/widgets/ut_dmainwindow.cpp - testcases/widgets/ut_dmessagemanager.cpp - testcases/widgets/ut_dmpriscontrol.cpp - testcases/widgets/ut_dpageindicator.cpp - testcases/widgets/ut_dpasswordedit.cpp - testcases/widgets/ut_dpicturesequenceview.cpp - # TODO PREAK - #testcases/widgets/ut_dprintpickcolorwidget.cpp - #testcases/widgets/ut_dprintpreviewdialog.cpp - testcases/widgets/ut_dprintpreviewwidget.cpp - testcases/widgets/ut_dprogressbar.cpp - testcases/widgets/ut_dpushbutton.cpp - #TODO BREAK kf.windowsystem: Could not find any platform plugin - # testcases/widgets/ut_dsearchcombobox.cpp - testcases/widgets/ut_dsearchedit.cpp - testcases/widgets/ut_dsettingsdialog.cpp - testcases/widgets/ut_dsettingswidgetfactory.cpp - testcases/widgets/ut_dshaowline.cpp - testcases/widgets/ut_dsimplelistview.cpp - testcases/widgets/ut_dslider.cpp - # TODO break - #testcases/widgets/ut_dspinbox.cpp - # testcases/widgets/ut_dspinner.cpp - testcases/widgets/ut_dstackwidget.cpp - testcases/widgets/ut_dstyleditemdelegate.cpp - testcases/widgets/ut_dstyleoption.cpp - testcases/widgets/ut_dsuggestbutton.cpp - testcases/widgets/ut_dswitchbutton.cpp - testcases/widgets/ut_dtabbar.cpp - testcases/widgets/ut_dtextedit.cpp - testcases/widgets/ut_dtickeffect.cpp - testcases/widgets/ut_dtiplabel.cpp - testcases/widgets/ut_dtitlebar.cpp - testcases/widgets/ut_dtitlebarsettings.cpp - testcases/widgets/ut_dtoolbutton.cpp - testcases/widgets/ut_dtooltip.cpp - testcases/widgets/ut_dwarningbutton.cpp - # FIXME break - # testcases/widgets/ut_dwaterprogress.cpp - testcases/widgets/ut_dwindowclosebutton.cpp - testcases/widgets/ut_dwindowmaxbutton.cpp - testcases/widgets/ut_dwindowminbutton.cpp - testcases/widgets/ut_dwindowoptionbutton.cpp - testcases/widgets/ut_dwindowquitfullbutton.cpp + testcases/widgets/ut_daboutdialog.cpp + testcases/widgets/ut_dabstractdialog.cpp + testcases/widgets/ut_dalertcontrol.cpp + testcases/widgets/ut_danchor.cpp + # TODO break the test + #testcases/widgets/ut_danchors.cpp + testcases/widgets/ut_darrowbutton.cpp + testcases/widgets/ut_darrowlinedrawer.cpp + testcases/widgets/ut_darrowlineexpand.cpp + testcases/widgets/ut_darrowrectangle.cpp + testcases/widgets/ut_dbackgroundgroup.cpp + testcases/widgets/ut_dbaseexpand.cpp + testcases/widgets/ut_dbaseline.cpp + testcases/widgets/ut_dblureffectwidget.cpp + testcases/widgets/ut_dboxwidget.cpp + testcases/widgets/ut_dbuttonbox.cpp + testcases/widgets/ut_dcircleprogress.cpp + testcases/widgets/ut_dclipeffectwidget.cpp + testcases/widgets/ut_dcoloredprogressbar.cpp + testcases/widgets/ut_dcommandlinkbutton.cpp + testcases/widgets/ut_dcrumbedit.cpp + testcases/widgets/ut_ddialog.cpp + testcases/widgets/ut_ddialogclosebutton.cpp + testcases/widgets/ut_ddrawer.cpp + testcases/widgets/ut_ddrawergroup.cpp + testcases/widgets/ut_denhancedwidget.cpp + # TODO test break + #testcases/widgets/ut_dexpandgroup.cpp + testcases/widgets/ut_dfilechooseredit.cpp + testcases/widgets/ut_dfiledialog.cpp + testcases/widgets/ut_dfloatingbutton.cpp + testcases/widgets/ut_dfloatingmessage.cpp + testcases/widgets/ut_dfloatingwidget.cpp + # TODO break + # testcases/widgets/ut_dflowlayout.cpp + testcases/widgets/ut_dframe.cpp + testcases/widgets/ut_dgraphicsclipeffect.cpp + testcases/widgets/ut_dgraphicsgloweffect.cpp + testcases/widgets/ut_dheaderline.cpp + testcases/widgets/ut_diconbutton.cpp + testcases/widgets/ut_dimageviewer.cpp + testcases/widgets/ut_dinputdialog.cpp + testcases/widgets/ut_dipv4lineedit.cpp + testcases/widgets/ut_dkeysequenceedit.cpp + testcases/widgets/ut_dlabel.cpp + testcases/widgets/ut_dlineedit.cpp + testcases/widgets/ut_dlistview.cpp + testcases/widgets/ut_dloadingindicator.cpp + testcases/widgets/ut_dmainwindow.cpp + testcases/widgets/ut_dmessagemanager.cpp + testcases/widgets/ut_dmpriscontrol.cpp + testcases/widgets/ut_dpageindicator.cpp + testcases/widgets/ut_dpasswordedit.cpp + testcases/widgets/ut_dpicturesequenceview.cpp + # TODO PREAK + #testcases/widgets/ut_dprintpickcolorwidget.cpp + #testcases/widgets/ut_dprintpreviewdialog.cpp + testcases/widgets/ut_dprintpreviewwidget.cpp + testcases/widgets/ut_dprogressbar.cpp + testcases/widgets/ut_dpushbutton.cpp + #TODO BREAK kf.windowsystem: Could not find any platform plugin + # testcases/widgets/ut_dsearchcombobox.cpp + testcases/widgets/ut_dsearchedit.cpp + testcases/widgets/ut_dsettingsdialog.cpp + testcases/widgets/ut_dsettingswidgetfactory.cpp + testcases/widgets/ut_dshaowline.cpp + testcases/widgets/ut_dsimplelistview.cpp + testcases/widgets/ut_dslider.cpp + # TODO break + #testcases/widgets/ut_dspinbox.cpp + # testcases/widgets/ut_dspinner.cpp + testcases/widgets/ut_dstackwidget.cpp + testcases/widgets/ut_dstyleditemdelegate.cpp + testcases/widgets/ut_dstyleoption.cpp + testcases/widgets/ut_dsuggestbutton.cpp + testcases/widgets/ut_dswitchbutton.cpp + testcases/widgets/ut_dtabbar.cpp + testcases/widgets/ut_dtextedit.cpp + testcases/widgets/ut_dtickeffect.cpp + testcases/widgets/ut_dtiplabel.cpp + testcases/widgets/ut_dtitlebar.cpp + testcases/widgets/ut_dtoolbutton.cpp + testcases/widgets/ut_dtooltip.cpp + testcases/widgets/ut_dwarningbutton.cpp + # FIXME break + # testcases/widgets/ut_dwaterprogress.cpp + testcases/widgets/ut_dwindowclosebutton.cpp + testcases/widgets/ut_dwindowmaxbutton.cpp + testcases/widgets/ut_dwindowminbutton.cpp + testcases/widgets/ut_dwindowoptionbutton.cpp + testcases/widgets/ut_dwindowquitfullbutton.cpp ) -include(../src/util/util.cmake) -include(../src/widgets/widgets.cmake) +include(${PROJECT_SOURCE_DIR}/src/util/util.cmake) +include(${PROJECT_SOURCE_DIR}/src/widgets/widgets.cmake) set(RESCOUCES data.qrc) add_executable(${BIN_NAME} - main.cpp - ${util_SRC} - ${widgets_SRC} - ${RESCOUCES} - ${WIDGET_TEST} + main.cpp + ${UTIL} + ${WIDGETS} + ${WIDGET_TEST} + ${PUBLIC_HEADERS} +) + +target_compile_definitions(${BIN_NAME} PRIVATE + SN_API_NOT_YET_FROZEN + DTK_NO_MULTIMEDIA + DWIDGET_TRANSLATIONS_DIR="dtk${PROJECT_VERSION_MAJOR}/DWidget/translations" ) + if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") target_compile_options(${BIN_NAME} PRIVATE -fprofile-instr-generate -ftest-coverage) endif() if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") target_compile_options(${BIN_NAME} PRIVATE -fprofile-arcs -ftest-coverage) endif() -target_link_libraries(${BIN_NAME} PRIVATE - Qt5::Test - Qt5::Widgets - Qt5::Core - Qt5::DBus - Qt5::PrintSupport - Qt5::Concurrent - Qt5::X11Extras - Qt5::Network - #${GLIB_LDFLAGS} - ${QGSettings_LIBRARIES} - ${STARUPNOTIFICATION_LIBRARIES} - ${XEXT_LIBRARIES} - ${XI_LIBRARIES} - ${DtkGui_LIBRARIES} - ${DtkCore_LIBRARIES} - ${GTEST_LIBRARIES} - ${X11_LIBRARIES} - ${XCBUTIL_LIBRARIES} - -lpthread - -lm - -lgcov + +target_compile_options(${BIN_NAME} PRIVATE -fno-access-control -fsanitize=address) +target_link_options(${BIN_NAME} PRIVATE -fsanitize=address) + +target_include_directories(${BIN_NAME} PRIVATE + ${PROJECT_SOURCE_DIR}/src/widgets + ${PROJECT_SOURCE_DIR}/include/DWidget + ${PROJECT_SOURCE_DIR}/include/util + ${PROJECT_SOURCE_DIR}/include/widgets + ${PROJECT_SOURCE_DIR}/include/global + ${PROJECT_SOURCE_DIR}/include + ${CONFIG_INCLUDE} ) -target_include_directories(${BIN_NAME} PUBLIC - ../include/dtkwidget/util/ - ../include/dtkwidget/global/ - ../include/dtkwidget/DWidget/ - ../include/dtkwidget/widgets/ - ../include/ - ../src/widgets/ - #../src/platforms/x11 - ${Qt5Gui_PRIVATE_INCLUDE_DIRS} - ${Qt5Widgets_PRIVATE_INCLUDE_DIRS} - ${Qt5PrintSupport_PRIVATE_INCLUDE_DIRS} - ${QGSettings_INCLUDE_DIRS} - ${STARUPNOTIFICATION_INCLUDE_DIRS} - ${XEXT_INCLUDE_DIRS} - ${XI_INCLUDE_DIRS} - ${X11_INCLUDE_DIRS} - ${XCBUTIL_INCLUDE_DIRS} - #${GLIB_INCLUDE_DIRS} + +target_link_libraries(${BIN_NAME} PRIVATE + Qt5::Test + Qt5::Widgets + Qt5::WidgetsPrivate + Qt5::Core + Qt5::GuiPrivate + Qt5::DBus + Qt5::PrintSupport + Qt5::PrintSupportPrivate + Qt5::Concurrent + Qt5::X11Extras + Qt5::Network + PkgConfig::QGSettings + PkgConfig::StartupNotification + PkgConfig::Xext + PkgConfig::Xi + PkgConfig::X11 + PkgConfig::XcbUtil + Dtk::Gui + Dtk::Core + GTest::GTest + gmock + pthread + m + gcov ) + add_test(NAME ${BIN_NAME} COMMAND ${BIN_NAME}) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 1b477927a..2e3209af5 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -1,33 +1 @@ -#cmake_minimum_required(VERSION 3.5) -set(BIN_NAME dtk-svgc) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-Wl,--as-needed") -set(CMAKE_EXPORT_COMPILE_COMMANDS ON) -set(CMAKE_AUTOUIC ON) -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) - -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_EXPORT_COMPILE_COMMANDS ON) -# find_package -find_package(DtkGui REQUIRED) -#find_package(DtkCore REQUIRED) - -#find_package(Qt5 REQUIRED COMPONENTS Core) -#find_package(Qt5 REQUIRED COMPONENTS Widgets) -find_package(Qt5 REQUIRED COMPONENTS Svg) - -add_executable( - ${BIN_NAME} - svgc/main.cpp -) -target_link_libraries( - ${BIN_NAME} PRIVATE - #Qt5::Core - Qt5::Svg - ${DtkGui_LIBRARIES} - # ${DtkCore_LIBRARIES} -) -install(TARGETS ${BIN_NAME} DESTINATION "${TOOL_INSTALL_DIR}") +add_subdirectory(svgc) diff --git a/tools/svgc/CMakeLists.txt b/tools/svgc/CMakeLists.txt new file mode 100644 index 000000000..2a04e9b9e --- /dev/null +++ b/tools/svgc/CMakeLists.txt @@ -0,0 +1,17 @@ +set(BIN_NAME dtk-svgc) + +find_package(Dtk REQUIRED COMPONENTS Gui) +find_package(Qt5 REQUIRED COMPONENTS Svg) + +add_executable( + ${BIN_NAME} + main.cpp +) + +target_link_libraries( + ${BIN_NAME} PRIVATE + Qt5::Svg + Dtk::Gui +) + +install(TARGETS ${BIN_NAME} DESTINATION "${TOOL_INSTALL_DIR}") diff --git a/tools/svgc/svgc.pro b/tools/svgc/svgc.pro deleted file mode 100644 index d79e809a5..000000000 --- a/tools/svgc/svgc.pro +++ /dev/null @@ -1,31 +0,0 @@ -QT += gui svg -QT += dtkcore dtkgui - -TARGET = dtk-svgc -CONFIG += c++11 -CONFIG -= app_bundle - -# The following define makes your compiler emit warnings if you use -# any feature of Qt which as been marked deprecated (the exact warnings -# depend on your compiler). Please consult the documentation of the -# deprecated API in order to know how to port your code away from it. -DEFINES += QT_DEPRECATED_WARNINGS - -# You can also make your code fail to compile if you use deprecated APIs. -# In order to do so, uncomment the following line. -# You can also select to disable deprecated APIs only up to a certain version of Qt. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - -DEFINES += QT_MESSAGELOGCONTEXT - -!isEmpty(DTK_STATIC_LIB){ - DEFINES += DTK_STATIC_LIB -} - -SOURCES += main.cpp - -DTK_MODULE_NAME=dtkwidget -load(dtk_build_config) -target.path = $$TOOL_INSTALL_DIR - -INSTALLS += target