diff --git a/CMakeLists.txt b/CMakeLists.txt index fec86abc5..53fe104c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,9 @@ set(QF_BUILD_QML_PLUGINS ON CACHE BOOL "Build with QML Plugins support") project(quickbox LANGUAGES C CXX) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_VISIBILITY_PRESET hidden) +set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) + include(CTest) set(CMAKE_SHARED_LIBRARY_PREFIX "") # we don't want CMake to prepend "lib" to our libraries, we prefer adding that ourselves diff --git a/libqf/CMakeLists.txt b/libqf/CMakeLists.txt index 453c5646b..c5c3e417a 100644 --- a/libqf/CMakeLists.txt +++ b/libqf/CMakeLists.txt @@ -1,5 +1,5 @@ add_subdirectory(libqfcore) -add_subdirectory(libqfqmlwidgets) +add_subdirectory(libqfgui) if(USE_QT6 AND QF_BUILD_QML_PLUGINS) add_subdirectory(plugins) diff --git a/libqf/libqfqmlwidgets/CMakeLists.txt b/libqf/libqfgui/CMakeLists.txt similarity index 77% rename from libqf/libqfqmlwidgets/CMakeLists.txt rename to libqf/libqfgui/CMakeLists.txt index 28ddb9c22..7de63a99b 100644 --- a/libqf/libqfqmlwidgets/CMakeLists.txt +++ b/libqf/libqfgui/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(libqfqmlwidgets SHARED +add_library(libqfgui SHARED src/action.cpp src/actiongroup.cpp src/checkbox.cpp @@ -104,42 +104,42 @@ add_library(libqfqmlwidgets SHARED src/texteditwidget.ui src/timeedit.cpp src/toolbar.cpp - style/qf_qmlwidgets_style.qrc + style/qf_gui_style.qrc - images/qf_qmlwidgets_images.qrc - images/flat/qf_qmlwidgets_images_flat.qrc - images/dark/qf_qmlwidgets_images_dark.qrc - src/reports/widgets/printtableviewwidget/reports/qf_qmlwidgets_printtablewidget_reports.qrc + images/qf_gui_images.qrc + images/flat/qf_gui_images_flat.qrc + images/dark/qf_gui_images_dark.qrc + src/reports/widgets/printtableviewwidget/reports/qf_gui_printtablewidget_reports.qrc ) qt6_add_translation(QM_FILES - libqfqmlwidgets-cs_CZ.ts - libqfqmlwidgets-fr_FR.ts - libqfqmlwidgets-nb_NO.ts - libqfqmlwidgets-nl_BE.ts - libqfqmlwidgets-pl_PL.ts - libqfqmlwidgets-ru_RU.ts - libqfqmlwidgets-uk_UA.ts + libqfgui-cs_CZ.ts + libqfgui-fr_FR.ts + libqfgui-nb_NO.ts + libqfgui-nl_BE.ts + libqfgui-pl_PL.ts + libqfgui-ru_RU.ts + libqfgui-uk_UA.ts ) -qt6_add_lupdate(libqfqmlwidgets TS_FILES - libqfqmlwidgets-cs_CZ.ts - libqfqmlwidgets-fr_FR.ts - libqfqmlwidgets-nb_NO.ts - libqfqmlwidgets-nl_BE.ts - libqfqmlwidgets-pl_PL.ts - libqfqmlwidgets-ru_RU.ts - libqfqmlwidgets-uk_UA.ts +qt6_add_lupdate(libqfgui TS_FILES + libqfgui-cs_CZ.ts + libqfgui-fr_FR.ts + libqfgui-nb_NO.ts + libqfgui-nl_BE.ts + libqfgui-pl_PL.ts + libqfgui-ru_RU.ts + libqfgui-uk_UA.ts ) -target_sources(libqfqmlwidgets PRIVATE ${QM_FILES}) +target_sources(libqfgui PRIVATE ${QM_FILES}) -target_link_libraries(libqfqmlwidgets PUBLIC Qt::Svg Qt::PrintSupport Qt::Sql Qt::Qml Qt::Widgets Qt::Xml libqfcore) -target_include_directories(libqfqmlwidgets PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) -target_include_directories(libqfqmlwidgets PUBLIC include) -target_compile_definitions(libqfqmlwidgets PRIVATE QFQMLWIDGETS_BUILD_DLL) +target_link_libraries(libqfgui PUBLIC Qt::Svg Qt::PrintSupport Qt::Sql Qt::Qml Qt::Widgets Qt::Xml libqfcore) +target_include_directories(libqfgui PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(libqfgui PUBLIC include) +target_compile_definitions(libqfgui PRIVATE QFGUI_BUILD_DLL) -install(TARGETS libqfqmlwidgets) +install(TARGETS libqfgui) install(FILES ${QM_FILES} DESTINATION ${CMAKE_INSTALL_BINDIR}/translations) diff --git a/libqf/libqfqmlwidgets/images/acrobat.png b/libqf/libqfgui/images/acrobat.png similarity index 100% rename from libqf/libqfqmlwidgets/images/acrobat.png rename to libqf/libqfgui/images/acrobat.png diff --git a/libqf/libqfqmlwidgets/images/alert.png b/libqf/libqfgui/images/alert.png similarity index 100% rename from libqf/libqfqmlwidgets/images/alert.png rename to libqf/libqfgui/images/alert.png diff --git a/libqf/libqfqmlwidgets/images/clone-row.png b/libqf/libqfgui/images/clone-row.png similarity index 100% rename from libqf/libqfqmlwidgets/images/clone-row.png rename to libqf/libqfgui/images/clone-row.png diff --git a/libqf/libqfqmlwidgets/images/clone.png b/libqf/libqfgui/images/clone.png similarity index 100% rename from libqf/libqfqmlwidgets/images/clone.png rename to libqf/libqfgui/images/clone.png diff --git a/libqf/libqfqmlwidgets/images/close.svg b/libqf/libqfgui/images/close.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/close.svg rename to libqf/libqfgui/images/close.svg diff --git a/libqf/libqfqmlwidgets/images/copy.png b/libqf/libqfgui/images/copy.png similarity index 100% rename from libqf/libqfqmlwidgets/images/copy.png rename to libqf/libqfgui/images/copy.png diff --git a/libqf/libqfqmlwidgets/images/copy.svg b/libqf/libqfgui/images/copy.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/copy.svg rename to libqf/libqfgui/images/copy.svg diff --git a/libqf/libqfqmlwidgets/images/dark/clone-row.svg b/libqf/libqfgui/images/dark/clone-row.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/clone-row.svg rename to libqf/libqfgui/images/dark/clone-row.svg diff --git a/libqf/libqfqmlwidgets/images/dark/copy.svg b/libqf/libqfgui/images/dark/copy.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/copy.svg rename to libqf/libqfgui/images/dark/copy.svg diff --git a/libqf/libqfqmlwidgets/images/dark/cut.svg b/libqf/libqfgui/images/dark/cut.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/cut.svg rename to libqf/libqfgui/images/dark/cut.svg diff --git a/libqf/libqfqmlwidgets/images/dark/delete-column.svg b/libqf/libqfgui/images/dark/delete-column.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/delete-column.svg rename to libqf/libqfgui/images/dark/delete-column.svg diff --git a/libqf/libqfqmlwidgets/images/dark/delete-row.svg b/libqf/libqfgui/images/dark/delete-row.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/delete-row.svg rename to libqf/libqfgui/images/dark/delete-row.svg diff --git a/libqf/libqfqmlwidgets/images/dark/delete.svg b/libqf/libqfgui/images/dark/delete.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/delete.svg rename to libqf/libqfgui/images/dark/delete.svg diff --git a/libqf/libqfqmlwidgets/images/dark/down.svg b/libqf/libqfgui/images/dark/down.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/down.svg rename to libqf/libqfgui/images/dark/down.svg diff --git a/libqf/libqfqmlwidgets/images/dark/find.svg b/libqf/libqfgui/images/dark/find.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/find.svg rename to libqf/libqfgui/images/dark/find.svg diff --git a/libqf/libqfqmlwidgets/images/dark/home.svg b/libqf/libqfgui/images/dark/home.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/home.svg rename to libqf/libqfgui/images/dark/home.svg diff --git a/libqf/libqfqmlwidgets/images/dark/insert-column.svg b/libqf/libqfgui/images/dark/insert-column.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/insert-column.svg rename to libqf/libqfgui/images/dark/insert-column.svg diff --git a/libqf/libqfqmlwidgets/images/dark/insert-row.svg b/libqf/libqfgui/images/dark/insert-row.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/insert-row.svg rename to libqf/libqfgui/images/dark/insert-row.svg diff --git a/libqf/libqfqmlwidgets/images/dark/left.svg b/libqf/libqfgui/images/dark/left.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/left.svg rename to libqf/libqfgui/images/dark/left.svg diff --git a/libqf/libqfqmlwidgets/images/dark/media-pause.svg b/libqf/libqfgui/images/dark/media-pause.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/media-pause.svg rename to libqf/libqfgui/images/dark/media-pause.svg diff --git a/libqf/libqfqmlwidgets/images/dark/media-play.svg b/libqf/libqfgui/images/dark/media-play.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/media-play.svg rename to libqf/libqfgui/images/dark/media-play.svg diff --git a/libqf/libqfqmlwidgets/images/dark/media-record.svg b/libqf/libqfgui/images/dark/media-record.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/media-record.svg rename to libqf/libqfgui/images/dark/media-record.svg diff --git a/libqf/libqfqmlwidgets/images/dark/media-skip-backward.svg b/libqf/libqfgui/images/dark/media-skip-backward.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/media-skip-backward.svg rename to libqf/libqfgui/images/dark/media-skip-backward.svg diff --git a/libqf/libqfqmlwidgets/images/dark/media-skip-forward.svg b/libqf/libqfgui/images/dark/media-skip-forward.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/media-skip-forward.svg rename to libqf/libqfgui/images/dark/media-skip-forward.svg diff --git a/libqf/libqfqmlwidgets/images/dark/media-step-backward.svg b/libqf/libqfgui/images/dark/media-step-backward.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/media-step-backward.svg rename to libqf/libqfgui/images/dark/media-step-backward.svg diff --git a/libqf/libqfqmlwidgets/images/dark/media-step-forward.svg b/libqf/libqfgui/images/dark/media-step-forward.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/media-step-forward.svg rename to libqf/libqfgui/images/dark/media-step-forward.svg diff --git a/libqf/libqfqmlwidgets/images/dark/media-stop.svg b/libqf/libqfgui/images/dark/media-stop.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/media-stop.svg rename to libqf/libqfgui/images/dark/media-stop.svg diff --git a/libqf/libqfqmlwidgets/images/dark/menu.svg b/libqf/libqfgui/images/dark/menu.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/menu.svg rename to libqf/libqfgui/images/dark/menu.svg diff --git a/libqf/libqfqmlwidgets/images/dark/new.svg b/libqf/libqfgui/images/dark/new.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/new.svg rename to libqf/libqfgui/images/dark/new.svg diff --git a/libqf/libqfqmlwidgets/images/dark/open.svg b/libqf/libqfgui/images/dark/open.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/open.svg rename to libqf/libqfgui/images/dark/open.svg diff --git a/libqf/libqfqmlwidgets/images/dark/paste.svg b/libqf/libqfgui/images/dark/paste.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/paste.svg rename to libqf/libqfgui/images/dark/paste.svg diff --git a/libqf/libqfqmlwidgets/images/dark/printer.svg b/libqf/libqfgui/images/dark/printer.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/printer.svg rename to libqf/libqfgui/images/dark/printer.svg diff --git a/libqf/libqfqmlwidgets/images/dark/qf_qmlwidgets_images_dark.qrc b/libqf/libqfgui/images/dark/qf_gui_images_dark.qrc similarity index 95% rename from libqf/libqfqmlwidgets/images/dark/qf_qmlwidgets_images_dark.qrc rename to libqf/libqfgui/images/dark/qf_gui_images_dark.qrc index 4d8871627..ca2c27e96 100644 --- a/libqf/libqfqmlwidgets/images/dark/qf_qmlwidgets_images_dark.qrc +++ b/libqf/libqfgui/images/dark/qf_gui_images_dark.qrc @@ -1,5 +1,5 @@ - + home.svg new.svg open.svg diff --git a/libqf/libqfqmlwidgets/images/dark/reload.svg b/libqf/libqfgui/images/dark/reload.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/reload.svg rename to libqf/libqfgui/images/dark/reload.svg diff --git a/libqf/libqfqmlwidgets/images/dark/revert.svg b/libqf/libqfgui/images/dark/revert.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/revert.svg rename to libqf/libqfgui/images/dark/revert.svg diff --git a/libqf/libqfqmlwidgets/images/dark/right.svg b/libqf/libqfgui/images/dark/right.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/right.svg rename to libqf/libqfgui/images/dark/right.svg diff --git a/libqf/libqfqmlwidgets/images/dark/save.svg b/libqf/libqfgui/images/dark/save.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/save.svg rename to libqf/libqfgui/images/dark/save.svg diff --git a/libqf/libqfqmlwidgets/images/dark/settings.svg b/libqf/libqfgui/images/dark/settings.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/settings.svg rename to libqf/libqfgui/images/dark/settings.svg diff --git a/libqf/libqfqmlwidgets/images/dark/sort-asc.svg b/libqf/libqfgui/images/dark/sort-asc.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/sort-asc.svg rename to libqf/libqfgui/images/dark/sort-asc.svg diff --git a/libqf/libqfqmlwidgets/images/dark/sort-desc.svg b/libqf/libqfgui/images/dark/sort-desc.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/sort-desc.svg rename to libqf/libqfgui/images/dark/sort-desc.svg diff --git a/libqf/libqfqmlwidgets/images/dark/up.svg b/libqf/libqfgui/images/dark/up.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/up.svg rename to libqf/libqfgui/images/dark/up.svg diff --git a/libqf/libqfqmlwidgets/images/dark/zoom_fitall.svg b/libqf/libqfgui/images/dark/zoom_fitall.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/zoom_fitall.svg rename to libqf/libqfgui/images/dark/zoom_fitall.svg diff --git a/libqf/libqfqmlwidgets/images/dark/zoom_fitheight.svg b/libqf/libqfgui/images/dark/zoom_fitheight.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/zoom_fitheight.svg rename to libqf/libqfgui/images/dark/zoom_fitheight.svg diff --git a/libqf/libqfqmlwidgets/images/dark/zoom_fitwidth.svg b/libqf/libqfgui/images/dark/zoom_fitwidth.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/dark/zoom_fitwidth.svg rename to libqf/libqfgui/images/dark/zoom_fitwidth.svg diff --git a/libqf/libqfqmlwidgets/images/delete-row.png b/libqf/libqfgui/images/delete-row.png similarity index 100% rename from libqf/libqfqmlwidgets/images/delete-row.png rename to libqf/libqfgui/images/delete-row.png diff --git a/libqf/libqfqmlwidgets/images/delete.png b/libqf/libqfgui/images/delete.png similarity index 100% rename from libqf/libqfqmlwidgets/images/delete.png rename to libqf/libqfgui/images/delete.png diff --git a/libqf/libqfqmlwidgets/images/down.svg b/libqf/libqfgui/images/down.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/down.svg rename to libqf/libqfgui/images/down.svg diff --git a/libqf/libqfqmlwidgets/images/edit.png b/libqf/libqfgui/images/edit.png similarity index 100% rename from libqf/libqfqmlwidgets/images/edit.png rename to libqf/libqfgui/images/edit.png diff --git a/libqf/libqfqmlwidgets/images/ffwd.png b/libqf/libqfgui/images/ffwd.png similarity index 100% rename from libqf/libqfqmlwidgets/images/ffwd.png rename to libqf/libqfgui/images/ffwd.png diff --git a/libqf/libqfqmlwidgets/images/find.png b/libqf/libqfgui/images/find.png similarity index 100% rename from libqf/libqfqmlwidgets/images/find.png rename to libqf/libqfgui/images/find.png diff --git a/libqf/libqfqmlwidgets/images/flat/.directory b/libqf/libqfgui/images/flat/.directory similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/.directory rename to libqf/libqfgui/images/flat/.directory diff --git a/libqf/libqfqmlwidgets/images/flat/clone-row.svg b/libqf/libqfgui/images/flat/clone-row.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/clone-row.svg rename to libqf/libqfgui/images/flat/clone-row.svg diff --git a/libqf/libqfqmlwidgets/images/flat/copy.svg b/libqf/libqfgui/images/flat/copy.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/copy.svg rename to libqf/libqfgui/images/flat/copy.svg diff --git a/libqf/libqfqmlwidgets/images/flat/cut.svg b/libqf/libqfgui/images/flat/cut.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/cut.svg rename to libqf/libqfgui/images/flat/cut.svg diff --git a/libqf/libqfqmlwidgets/images/flat/delete-column.svg b/libqf/libqfgui/images/flat/delete-column.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/delete-column.svg rename to libqf/libqfgui/images/flat/delete-column.svg diff --git a/libqf/libqfqmlwidgets/images/flat/delete-row.svg b/libqf/libqfgui/images/flat/delete-row.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/delete-row.svg rename to libqf/libqfgui/images/flat/delete-row.svg diff --git a/libqf/libqfqmlwidgets/images/flat/delete.svg b/libqf/libqfgui/images/flat/delete.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/delete.svg rename to libqf/libqfgui/images/flat/delete.svg diff --git a/libqf/libqfqmlwidgets/images/flat/down.svg b/libqf/libqfgui/images/flat/down.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/down.svg rename to libqf/libqfgui/images/flat/down.svg diff --git a/libqf/libqfqmlwidgets/images/flat/find.svg b/libqf/libqfgui/images/flat/find.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/find.svg rename to libqf/libqfgui/images/flat/find.svg diff --git a/libqf/libqfqmlwidgets/images/flat/home.svg b/libqf/libqfgui/images/flat/home.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/home.svg rename to libqf/libqfgui/images/flat/home.svg diff --git a/libqf/libqfqmlwidgets/images/flat/insert-column.svg b/libqf/libqfgui/images/flat/insert-column.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/insert-column.svg rename to libqf/libqfgui/images/flat/insert-column.svg diff --git a/libqf/libqfqmlwidgets/images/flat/insert-row.svg b/libqf/libqfgui/images/flat/insert-row.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/insert-row.svg rename to libqf/libqfgui/images/flat/insert-row.svg diff --git a/libqf/libqfqmlwidgets/images/flat/left.svg b/libqf/libqfgui/images/flat/left.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/left.svg rename to libqf/libqfgui/images/flat/left.svg diff --git a/libqf/libqfqmlwidgets/images/flat/media-pause.svg b/libqf/libqfgui/images/flat/media-pause.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/media-pause.svg rename to libqf/libqfgui/images/flat/media-pause.svg diff --git a/libqf/libqfqmlwidgets/images/flat/media-play.svg b/libqf/libqfgui/images/flat/media-play.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/media-play.svg rename to libqf/libqfgui/images/flat/media-play.svg diff --git a/libqf/libqfqmlwidgets/images/flat/media-record.svg b/libqf/libqfgui/images/flat/media-record.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/media-record.svg rename to libqf/libqfgui/images/flat/media-record.svg diff --git a/libqf/libqfqmlwidgets/images/flat/media-skip-backward.svg b/libqf/libqfgui/images/flat/media-skip-backward.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/media-skip-backward.svg rename to libqf/libqfgui/images/flat/media-skip-backward.svg diff --git a/libqf/libqfqmlwidgets/images/flat/media-skip-forward.svg b/libqf/libqfgui/images/flat/media-skip-forward.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/media-skip-forward.svg rename to libqf/libqfgui/images/flat/media-skip-forward.svg diff --git a/libqf/libqfqmlwidgets/images/flat/media-step-backward.svg b/libqf/libqfgui/images/flat/media-step-backward.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/media-step-backward.svg rename to libqf/libqfgui/images/flat/media-step-backward.svg diff --git a/libqf/libqfqmlwidgets/images/flat/media-step-forward.svg b/libqf/libqfgui/images/flat/media-step-forward.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/media-step-forward.svg rename to libqf/libqfgui/images/flat/media-step-forward.svg diff --git a/libqf/libqfqmlwidgets/images/flat/media-stop.svg b/libqf/libqfgui/images/flat/media-stop.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/media-stop.svg rename to libqf/libqfgui/images/flat/media-stop.svg diff --git a/libqf/libqfqmlwidgets/images/flat/menu.svg b/libqf/libqfgui/images/flat/menu.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/menu.svg rename to libqf/libqfgui/images/flat/menu.svg diff --git a/libqf/libqfqmlwidgets/images/flat/new.svg b/libqf/libqfgui/images/flat/new.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/new.svg rename to libqf/libqfgui/images/flat/new.svg diff --git a/libqf/libqfqmlwidgets/images/flat/open.svg b/libqf/libqfgui/images/flat/open.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/open.svg rename to libqf/libqfgui/images/flat/open.svg diff --git a/libqf/libqfqmlwidgets/images/flat/paste.svg b/libqf/libqfgui/images/flat/paste.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/paste.svg rename to libqf/libqfgui/images/flat/paste.svg diff --git a/libqf/libqfqmlwidgets/images/flat/printer.svg b/libqf/libqfgui/images/flat/printer.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/printer.svg rename to libqf/libqfgui/images/flat/printer.svg diff --git a/libqf/libqfqmlwidgets/images/flat/qf_qmlwidgets_images_flat.qrc b/libqf/libqfgui/images/flat/qf_gui_images_flat.qrc similarity index 95% rename from libqf/libqfqmlwidgets/images/flat/qf_qmlwidgets_images_flat.qrc rename to libqf/libqfgui/images/flat/qf_gui_images_flat.qrc index 1b67ed279..f8dc2ce8d 100644 --- a/libqf/libqfqmlwidgets/images/flat/qf_qmlwidgets_images_flat.qrc +++ b/libqf/libqfgui/images/flat/qf_gui_images_flat.qrc @@ -1,5 +1,5 @@ - + home.svg new.svg open.svg diff --git a/libqf/libqfqmlwidgets/images/flat/reload.svg b/libqf/libqfgui/images/flat/reload.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/reload.svg rename to libqf/libqfgui/images/flat/reload.svg diff --git a/libqf/libqfqmlwidgets/images/flat/revert.svg b/libqf/libqfgui/images/flat/revert.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/revert.svg rename to libqf/libqfgui/images/flat/revert.svg diff --git a/libqf/libqfqmlwidgets/images/flat/right.svg b/libqf/libqfgui/images/flat/right.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/right.svg rename to libqf/libqfgui/images/flat/right.svg diff --git a/libqf/libqfqmlwidgets/images/flat/save.svg b/libqf/libqfgui/images/flat/save.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/save.svg rename to libqf/libqfgui/images/flat/save.svg diff --git a/libqf/libqfqmlwidgets/images/flat/settings.svg b/libqf/libqfgui/images/flat/settings.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/settings.svg rename to libqf/libqfgui/images/flat/settings.svg diff --git a/libqf/libqfqmlwidgets/images/flat/sort-asc.svg b/libqf/libqfgui/images/flat/sort-asc.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/sort-asc.svg rename to libqf/libqfgui/images/flat/sort-asc.svg diff --git a/libqf/libqfqmlwidgets/images/flat/sort-desc.svg b/libqf/libqfgui/images/flat/sort-desc.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/sort-desc.svg rename to libqf/libqfgui/images/flat/sort-desc.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/account-login.svg b/libqf/libqfgui/images/flat/unused/account-login.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/account-login.svg rename to libqf/libqfgui/images/flat/unused/account-login.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/account-logout.svg b/libqf/libqfgui/images/flat/unused/account-logout.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/account-logout.svg rename to libqf/libqfgui/images/flat/unused/account-logout.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/action-redo.svg b/libqf/libqfgui/images/flat/unused/action-redo.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/action-redo.svg rename to libqf/libqfgui/images/flat/unused/action-redo.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/action-undo.svg b/libqf/libqfgui/images/flat/unused/action-undo.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/action-undo.svg rename to libqf/libqfgui/images/flat/unused/action-undo.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/align-center.svg b/libqf/libqfgui/images/flat/unused/align-center.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/align-center.svg rename to libqf/libqfgui/images/flat/unused/align-center.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/align-left.svg b/libqf/libqfgui/images/flat/unused/align-left.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/align-left.svg rename to libqf/libqfgui/images/flat/unused/align-left.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/align-right.svg b/libqf/libqfgui/images/flat/unused/align-right.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/align-right.svg rename to libqf/libqfgui/images/flat/unused/align-right.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/aperture.svg b/libqf/libqfgui/images/flat/unused/aperture.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/aperture.svg rename to libqf/libqfgui/images/flat/unused/aperture.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/arrow-bottom.svg b/libqf/libqfgui/images/flat/unused/arrow-bottom.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/arrow-bottom.svg rename to libqf/libqfgui/images/flat/unused/arrow-bottom.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/arrow-circle-bottom.svg b/libqf/libqfgui/images/flat/unused/arrow-circle-bottom.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/arrow-circle-bottom.svg rename to libqf/libqfgui/images/flat/unused/arrow-circle-bottom.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/arrow-circle-left.svg b/libqf/libqfgui/images/flat/unused/arrow-circle-left.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/arrow-circle-left.svg rename to libqf/libqfgui/images/flat/unused/arrow-circle-left.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/arrow-circle-right.svg b/libqf/libqfgui/images/flat/unused/arrow-circle-right.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/arrow-circle-right.svg rename to libqf/libqfgui/images/flat/unused/arrow-circle-right.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/arrow-circle-top.svg b/libqf/libqfgui/images/flat/unused/arrow-circle-top.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/arrow-circle-top.svg rename to libqf/libqfgui/images/flat/unused/arrow-circle-top.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/arrow-left.svg b/libqf/libqfgui/images/flat/unused/arrow-left.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/arrow-left.svg rename to libqf/libqfgui/images/flat/unused/arrow-left.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/arrow-right.svg b/libqf/libqfgui/images/flat/unused/arrow-right.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/arrow-right.svg rename to libqf/libqfgui/images/flat/unused/arrow-right.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/arrow-thick-bottom.svg b/libqf/libqfgui/images/flat/unused/arrow-thick-bottom.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/arrow-thick-bottom.svg rename to libqf/libqfgui/images/flat/unused/arrow-thick-bottom.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/arrow-thick-left.svg b/libqf/libqfgui/images/flat/unused/arrow-thick-left.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/arrow-thick-left.svg rename to libqf/libqfgui/images/flat/unused/arrow-thick-left.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/arrow-thick-right.svg b/libqf/libqfgui/images/flat/unused/arrow-thick-right.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/arrow-thick-right.svg rename to libqf/libqfgui/images/flat/unused/arrow-thick-right.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/arrow-thick-top.svg b/libqf/libqfgui/images/flat/unused/arrow-thick-top.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/arrow-thick-top.svg rename to libqf/libqfgui/images/flat/unused/arrow-thick-top.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/arrow-top.svg b/libqf/libqfgui/images/flat/unused/arrow-top.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/arrow-top.svg rename to libqf/libqfgui/images/flat/unused/arrow-top.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/audio-spectrum.svg b/libqf/libqfgui/images/flat/unused/audio-spectrum.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/audio-spectrum.svg rename to libqf/libqfgui/images/flat/unused/audio-spectrum.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/audio.svg b/libqf/libqfgui/images/flat/unused/audio.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/audio.svg rename to libqf/libqfgui/images/flat/unused/audio.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/badge.svg b/libqf/libqfgui/images/flat/unused/badge.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/badge.svg rename to libqf/libqfgui/images/flat/unused/badge.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/ban.svg b/libqf/libqfgui/images/flat/unused/ban.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/ban.svg rename to libqf/libqfgui/images/flat/unused/ban.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/bar-chart.svg b/libqf/libqfgui/images/flat/unused/bar-chart.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/bar-chart.svg rename to libqf/libqfgui/images/flat/unused/bar-chart.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/basket.svg b/libqf/libqfgui/images/flat/unused/basket.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/basket.svg rename to libqf/libqfgui/images/flat/unused/basket.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/battery-empty.svg b/libqf/libqfgui/images/flat/unused/battery-empty.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/battery-empty.svg rename to libqf/libqfgui/images/flat/unused/battery-empty.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/battery-full.svg b/libqf/libqfgui/images/flat/unused/battery-full.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/battery-full.svg rename to libqf/libqfgui/images/flat/unused/battery-full.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/beaker.svg b/libqf/libqfgui/images/flat/unused/beaker.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/beaker.svg rename to libqf/libqfgui/images/flat/unused/beaker.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/bell.svg b/libqf/libqfgui/images/flat/unused/bell.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/bell.svg rename to libqf/libqfgui/images/flat/unused/bell.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/bluetooth.svg b/libqf/libqfgui/images/flat/unused/bluetooth.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/bluetooth.svg rename to libqf/libqfgui/images/flat/unused/bluetooth.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/bold.svg b/libqf/libqfgui/images/flat/unused/bold.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/bold.svg rename to libqf/libqfgui/images/flat/unused/bold.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/bolt.svg b/libqf/libqfgui/images/flat/unused/bolt.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/bolt.svg rename to libqf/libqfgui/images/flat/unused/bolt.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/book.svg b/libqf/libqfgui/images/flat/unused/book.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/book.svg rename to libqf/libqfgui/images/flat/unused/book.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/bookmark.svg b/libqf/libqfgui/images/flat/unused/bookmark.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/bookmark.svg rename to libqf/libqfgui/images/flat/unused/bookmark.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/box.svg b/libqf/libqfgui/images/flat/unused/box.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/box.svg rename to libqf/libqfgui/images/flat/unused/box.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/briefcase.svg b/libqf/libqfgui/images/flat/unused/briefcase.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/briefcase.svg rename to libqf/libqfgui/images/flat/unused/briefcase.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/british-pound.svg b/libqf/libqfgui/images/flat/unused/british-pound.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/british-pound.svg rename to libqf/libqfgui/images/flat/unused/british-pound.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/browser.svg b/libqf/libqfgui/images/flat/unused/browser.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/browser.svg rename to libqf/libqfgui/images/flat/unused/browser.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/brush.svg b/libqf/libqfgui/images/flat/unused/brush.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/brush.svg rename to libqf/libqfgui/images/flat/unused/brush.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/bug.svg b/libqf/libqfgui/images/flat/unused/bug.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/bug.svg rename to libqf/libqfgui/images/flat/unused/bug.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/bullhorn.svg b/libqf/libqfgui/images/flat/unused/bullhorn.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/bullhorn.svg rename to libqf/libqfgui/images/flat/unused/bullhorn.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/calculator.svg b/libqf/libqfgui/images/flat/unused/calculator.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/calculator.svg rename to libqf/libqfgui/images/flat/unused/calculator.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/calendar.svg b/libqf/libqfgui/images/flat/unused/calendar.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/calendar.svg rename to libqf/libqfgui/images/flat/unused/calendar.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/camera-slr.svg b/libqf/libqfgui/images/flat/unused/camera-slr.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/camera-slr.svg rename to libqf/libqfgui/images/flat/unused/camera-slr.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/caret-bottom.svg b/libqf/libqfgui/images/flat/unused/caret-bottom.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/caret-bottom.svg rename to libqf/libqfgui/images/flat/unused/caret-bottom.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/caret-left.svg b/libqf/libqfgui/images/flat/unused/caret-left.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/caret-left.svg rename to libqf/libqfgui/images/flat/unused/caret-left.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/caret-right.svg b/libqf/libqfgui/images/flat/unused/caret-right.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/caret-right.svg rename to libqf/libqfgui/images/flat/unused/caret-right.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/caret-top.svg b/libqf/libqfgui/images/flat/unused/caret-top.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/caret-top.svg rename to libqf/libqfgui/images/flat/unused/caret-top.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/cart.svg b/libqf/libqfgui/images/flat/unused/cart.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/cart.svg rename to libqf/libqfgui/images/flat/unused/cart.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/chat.svg b/libqf/libqfgui/images/flat/unused/chat.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/chat.svg rename to libqf/libqfgui/images/flat/unused/chat.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/check.svg b/libqf/libqfgui/images/flat/unused/check.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/check.svg rename to libqf/libqfgui/images/flat/unused/check.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/chevron-bottom.svg b/libqf/libqfgui/images/flat/unused/chevron-bottom.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/chevron-bottom.svg rename to libqf/libqfgui/images/flat/unused/chevron-bottom.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/chevron-left.svg b/libqf/libqfgui/images/flat/unused/chevron-left.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/chevron-left.svg rename to libqf/libqfgui/images/flat/unused/chevron-left.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/chevron-right.svg b/libqf/libqfgui/images/flat/unused/chevron-right.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/chevron-right.svg rename to libqf/libqfgui/images/flat/unused/chevron-right.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/chevron-top.svg b/libqf/libqfgui/images/flat/unused/chevron-top.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/chevron-top.svg rename to libqf/libqfgui/images/flat/unused/chevron-top.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/circle-check.svg b/libqf/libqfgui/images/flat/unused/circle-check.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/circle-check.svg rename to libqf/libqfgui/images/flat/unused/circle-check.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/circle-x.svg b/libqf/libqfgui/images/flat/unused/circle-x.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/circle-x.svg rename to libqf/libqfgui/images/flat/unused/circle-x.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/clipboard.svg b/libqf/libqfgui/images/flat/unused/clipboard.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/clipboard.svg rename to libqf/libqfgui/images/flat/unused/clipboard.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/clock.svg b/libqf/libqfgui/images/flat/unused/clock.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/clock.svg rename to libqf/libqfgui/images/flat/unused/clock.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/cloud-download.svg b/libqf/libqfgui/images/flat/unused/cloud-download.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/cloud-download.svg rename to libqf/libqfgui/images/flat/unused/cloud-download.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/cloud-upload.svg b/libqf/libqfgui/images/flat/unused/cloud-upload.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/cloud-upload.svg rename to libqf/libqfgui/images/flat/unused/cloud-upload.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/cloud.svg b/libqf/libqfgui/images/flat/unused/cloud.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/cloud.svg rename to libqf/libqfgui/images/flat/unused/cloud.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/cloudy.svg b/libqf/libqfgui/images/flat/unused/cloudy.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/cloudy.svg rename to libqf/libqfgui/images/flat/unused/cloudy.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/code.svg b/libqf/libqfgui/images/flat/unused/code.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/code.svg rename to libqf/libqfgui/images/flat/unused/code.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/cog.svg b/libqf/libqfgui/images/flat/unused/cog.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/cog.svg rename to libqf/libqfgui/images/flat/unused/cog.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/collapse-down.svg b/libqf/libqfgui/images/flat/unused/collapse-down.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/collapse-down.svg rename to libqf/libqfgui/images/flat/unused/collapse-down.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/collapse-left.svg b/libqf/libqfgui/images/flat/unused/collapse-left.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/collapse-left.svg rename to libqf/libqfgui/images/flat/unused/collapse-left.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/collapse-right.svg b/libqf/libqfgui/images/flat/unused/collapse-right.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/collapse-right.svg rename to libqf/libqfgui/images/flat/unused/collapse-right.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/collapse-up.svg b/libqf/libqfgui/images/flat/unused/collapse-up.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/collapse-up.svg rename to libqf/libqfgui/images/flat/unused/collapse-up.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/command.svg b/libqf/libqfgui/images/flat/unused/command.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/command.svg rename to libqf/libqfgui/images/flat/unused/command.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/comment-square.svg b/libqf/libqfgui/images/flat/unused/comment-square.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/comment-square.svg rename to libqf/libqfgui/images/flat/unused/comment-square.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/compass.svg b/libqf/libqfgui/images/flat/unused/compass.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/compass.svg rename to libqf/libqfgui/images/flat/unused/compass.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/contrast.svg b/libqf/libqfgui/images/flat/unused/contrast.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/contrast.svg rename to libqf/libqfgui/images/flat/unused/contrast.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/copywriting.svg b/libqf/libqfgui/images/flat/unused/copywriting.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/copywriting.svg rename to libqf/libqfgui/images/flat/unused/copywriting.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/credit-card.svg b/libqf/libqfgui/images/flat/unused/credit-card.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/credit-card.svg rename to libqf/libqfgui/images/flat/unused/credit-card.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/crop.svg b/libqf/libqfgui/images/flat/unused/crop.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/crop.svg rename to libqf/libqfgui/images/flat/unused/crop.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/dashboard.svg b/libqf/libqfgui/images/flat/unused/dashboard.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/dashboard.svg rename to libqf/libqfgui/images/flat/unused/dashboard.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/data-transfer-download.svg b/libqf/libqfgui/images/flat/unused/data-transfer-download.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/data-transfer-download.svg rename to libqf/libqfgui/images/flat/unused/data-transfer-download.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/data-transfer-upload.svg b/libqf/libqfgui/images/flat/unused/data-transfer-upload.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/data-transfer-upload.svg rename to libqf/libqfgui/images/flat/unused/data-transfer-upload.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/dial.svg b/libqf/libqfgui/images/flat/unused/dial.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/dial.svg rename to libqf/libqfgui/images/flat/unused/dial.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/document.svg b/libqf/libqfgui/images/flat/unused/document.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/document.svg rename to libqf/libqfgui/images/flat/unused/document.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/dollar.svg b/libqf/libqfgui/images/flat/unused/dollar.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/dollar.svg rename to libqf/libqfgui/images/flat/unused/dollar.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/double-quote-sans-left.svg b/libqf/libqfgui/images/flat/unused/double-quote-sans-left.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/double-quote-sans-left.svg rename to libqf/libqfgui/images/flat/unused/double-quote-sans-left.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/double-quote-sans-right.svg b/libqf/libqfgui/images/flat/unused/double-quote-sans-right.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/double-quote-sans-right.svg rename to libqf/libqfgui/images/flat/unused/double-quote-sans-right.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/double-quote-serif-left.svg b/libqf/libqfgui/images/flat/unused/double-quote-serif-left.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/double-quote-serif-left.svg rename to libqf/libqfgui/images/flat/unused/double-quote-serif-left.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/double-quote-serif-right.svg b/libqf/libqfgui/images/flat/unused/double-quote-serif-right.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/double-quote-serif-right.svg rename to libqf/libqfgui/images/flat/unused/double-quote-serif-right.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/droplet.svg b/libqf/libqfgui/images/flat/unused/droplet.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/droplet.svg rename to libqf/libqfgui/images/flat/unused/droplet.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/eject.svg b/libqf/libqfgui/images/flat/unused/eject.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/eject.svg rename to libqf/libqfgui/images/flat/unused/eject.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/elevator.svg b/libqf/libqfgui/images/flat/unused/elevator.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/elevator.svg rename to libqf/libqfgui/images/flat/unused/elevator.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/ellipses.svg b/libqf/libqfgui/images/flat/unused/ellipses.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/ellipses.svg rename to libqf/libqfgui/images/flat/unused/ellipses.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/envelope-closed.svg b/libqf/libqfgui/images/flat/unused/envelope-closed.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/envelope-closed.svg rename to libqf/libqfgui/images/flat/unused/envelope-closed.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/envelope-open.svg b/libqf/libqfgui/images/flat/unused/envelope-open.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/envelope-open.svg rename to libqf/libqfgui/images/flat/unused/envelope-open.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/euro.svg b/libqf/libqfgui/images/flat/unused/euro.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/euro.svg rename to libqf/libqfgui/images/flat/unused/euro.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/excerpt.svg b/libqf/libqfgui/images/flat/unused/excerpt.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/excerpt.svg rename to libqf/libqfgui/images/flat/unused/excerpt.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/expand-down.svg b/libqf/libqfgui/images/flat/unused/expand-down.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/expand-down.svg rename to libqf/libqfgui/images/flat/unused/expand-down.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/expand-left.svg b/libqf/libqfgui/images/flat/unused/expand-left.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/expand-left.svg rename to libqf/libqfgui/images/flat/unused/expand-left.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/expand-right.svg b/libqf/libqfgui/images/flat/unused/expand-right.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/expand-right.svg rename to libqf/libqfgui/images/flat/unused/expand-right.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/expand-up.svg b/libqf/libqfgui/images/flat/unused/expand-up.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/expand-up.svg rename to libqf/libqfgui/images/flat/unused/expand-up.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/external-link.svg b/libqf/libqfgui/images/flat/unused/external-link.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/external-link.svg rename to libqf/libqfgui/images/flat/unused/external-link.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/eye.svg b/libqf/libqfgui/images/flat/unused/eye.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/eye.svg rename to libqf/libqfgui/images/flat/unused/eye.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/eyedropper.svg b/libqf/libqfgui/images/flat/unused/eyedropper.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/eyedropper.svg rename to libqf/libqfgui/images/flat/unused/eyedropper.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/file.svg b/libqf/libqfgui/images/flat/unused/file.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/file.svg rename to libqf/libqfgui/images/flat/unused/file.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/fire.svg b/libqf/libqfgui/images/flat/unused/fire.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/fire.svg rename to libqf/libqfgui/images/flat/unused/fire.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/flag.svg b/libqf/libqfgui/images/flat/unused/flag.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/flag.svg rename to libqf/libqfgui/images/flat/unused/flag.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/flash.svg b/libqf/libqfgui/images/flat/unused/flash.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/flash.svg rename to libqf/libqfgui/images/flat/unused/flash.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/folder.svg b/libqf/libqfgui/images/flat/unused/folder.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/folder.svg rename to libqf/libqfgui/images/flat/unused/folder.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/fork.svg b/libqf/libqfgui/images/flat/unused/fork.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/fork.svg rename to libqf/libqfgui/images/flat/unused/fork.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/fullscreen-enter.svg b/libqf/libqfgui/images/flat/unused/fullscreen-enter.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/fullscreen-enter.svg rename to libqf/libqfgui/images/flat/unused/fullscreen-enter.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/fullscreen-exit.svg b/libqf/libqfgui/images/flat/unused/fullscreen-exit.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/fullscreen-exit.svg rename to libqf/libqfgui/images/flat/unused/fullscreen-exit.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/globe.svg b/libqf/libqfgui/images/flat/unused/globe.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/globe.svg rename to libqf/libqfgui/images/flat/unused/globe.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/graph.svg b/libqf/libqfgui/images/flat/unused/graph.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/graph.svg rename to libqf/libqfgui/images/flat/unused/graph.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/grid-four-up.svg b/libqf/libqfgui/images/flat/unused/grid-four-up.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/grid-four-up.svg rename to libqf/libqfgui/images/flat/unused/grid-four-up.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/grid-three-up.svg b/libqf/libqfgui/images/flat/unused/grid-three-up.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/grid-three-up.svg rename to libqf/libqfgui/images/flat/unused/grid-three-up.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/grid-two-up.svg b/libqf/libqfgui/images/flat/unused/grid-two-up.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/grid-two-up.svg rename to libqf/libqfgui/images/flat/unused/grid-two-up.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/hard-drive.svg b/libqf/libqfgui/images/flat/unused/hard-drive.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/hard-drive.svg rename to libqf/libqfgui/images/flat/unused/hard-drive.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/header.svg b/libqf/libqfgui/images/flat/unused/header.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/header.svg rename to libqf/libqfgui/images/flat/unused/header.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/headphones.svg b/libqf/libqfgui/images/flat/unused/headphones.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/headphones.svg rename to libqf/libqfgui/images/flat/unused/headphones.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/heart.svg b/libqf/libqfgui/images/flat/unused/heart.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/heart.svg rename to libqf/libqfgui/images/flat/unused/heart.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/image.svg b/libqf/libqfgui/images/flat/unused/image.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/image.svg rename to libqf/libqfgui/images/flat/unused/image.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/inbox.svg b/libqf/libqfgui/images/flat/unused/inbox.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/inbox.svg rename to libqf/libqfgui/images/flat/unused/inbox.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/infinity.svg b/libqf/libqfgui/images/flat/unused/infinity.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/infinity.svg rename to libqf/libqfgui/images/flat/unused/infinity.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/info.svg b/libqf/libqfgui/images/flat/unused/info.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/info.svg rename to libqf/libqfgui/images/flat/unused/info.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/italic.svg b/libqf/libqfgui/images/flat/unused/italic.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/italic.svg rename to libqf/libqfgui/images/flat/unused/italic.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/justify-center.svg b/libqf/libqfgui/images/flat/unused/justify-center.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/justify-center.svg rename to libqf/libqfgui/images/flat/unused/justify-center.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/justify-left.svg b/libqf/libqfgui/images/flat/unused/justify-left.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/justify-left.svg rename to libqf/libqfgui/images/flat/unused/justify-left.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/justify-right.svg b/libqf/libqfgui/images/flat/unused/justify-right.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/justify-right.svg rename to libqf/libqfgui/images/flat/unused/justify-right.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/key.svg b/libqf/libqfgui/images/flat/unused/key.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/key.svg rename to libqf/libqfgui/images/flat/unused/key.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/laptop.svg b/libqf/libqfgui/images/flat/unused/laptop.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/laptop.svg rename to libqf/libqfgui/images/flat/unused/laptop.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/layers.svg b/libqf/libqfgui/images/flat/unused/layers.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/layers.svg rename to libqf/libqfgui/images/flat/unused/layers.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/lightbulb.svg b/libqf/libqfgui/images/flat/unused/lightbulb.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/lightbulb.svg rename to libqf/libqfgui/images/flat/unused/lightbulb.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/link-broken.svg b/libqf/libqfgui/images/flat/unused/link-broken.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/link-broken.svg rename to libqf/libqfgui/images/flat/unused/link-broken.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/link-intact.svg b/libqf/libqfgui/images/flat/unused/link-intact.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/link-intact.svg rename to libqf/libqfgui/images/flat/unused/link-intact.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/list-rich.svg b/libqf/libqfgui/images/flat/unused/list-rich.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/list-rich.svg rename to libqf/libqfgui/images/flat/unused/list-rich.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/list.svg b/libqf/libqfgui/images/flat/unused/list.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/list.svg rename to libqf/libqfgui/images/flat/unused/list.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/location.svg b/libqf/libqfgui/images/flat/unused/location.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/location.svg rename to libqf/libqfgui/images/flat/unused/location.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/lock-locked.svg b/libqf/libqfgui/images/flat/unused/lock-locked.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/lock-locked.svg rename to libqf/libqfgui/images/flat/unused/lock-locked.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/lock-unlocked.svg b/libqf/libqfgui/images/flat/unused/lock-unlocked.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/lock-unlocked.svg rename to libqf/libqfgui/images/flat/unused/lock-unlocked.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/loop-circular.svg b/libqf/libqfgui/images/flat/unused/loop-circular.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/loop-circular.svg rename to libqf/libqfgui/images/flat/unused/loop-circular.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/loop-square.svg b/libqf/libqfgui/images/flat/unused/loop-square.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/loop-square.svg rename to libqf/libqfgui/images/flat/unused/loop-square.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/magnifying-glass.svg b/libqf/libqfgui/images/flat/unused/magnifying-glass.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/magnifying-glass.svg rename to libqf/libqfgui/images/flat/unused/magnifying-glass.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/map-marker.svg b/libqf/libqfgui/images/flat/unused/map-marker.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/map-marker.svg rename to libqf/libqfgui/images/flat/unused/map-marker.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/map.svg b/libqf/libqfgui/images/flat/unused/map.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/map.svg rename to libqf/libqfgui/images/flat/unused/map.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/media-pause.svg b/libqf/libqfgui/images/flat/unused/media-pause.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/media-pause.svg rename to libqf/libqfgui/images/flat/unused/media-pause.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/media-play.svg b/libqf/libqfgui/images/flat/unused/media-play.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/media-play.svg rename to libqf/libqfgui/images/flat/unused/media-play.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/media-record.svg b/libqf/libqfgui/images/flat/unused/media-record.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/media-record.svg rename to libqf/libqfgui/images/flat/unused/media-record.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/media-skip-backward.svg b/libqf/libqfgui/images/flat/unused/media-skip-backward.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/media-skip-backward.svg rename to libqf/libqfgui/images/flat/unused/media-skip-backward.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/media-skip-forward.svg b/libqf/libqfgui/images/flat/unused/media-skip-forward.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/media-skip-forward.svg rename to libqf/libqfgui/images/flat/unused/media-skip-forward.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/media-step-backward.svg b/libqf/libqfgui/images/flat/unused/media-step-backward.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/media-step-backward.svg rename to libqf/libqfgui/images/flat/unused/media-step-backward.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/media-step-forward.svg b/libqf/libqfgui/images/flat/unused/media-step-forward.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/media-step-forward.svg rename to libqf/libqfgui/images/flat/unused/media-step-forward.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/media-stop.svg b/libqf/libqfgui/images/flat/unused/media-stop.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/media-stop.svg rename to libqf/libqfgui/images/flat/unused/media-stop.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/medical-cross.svg b/libqf/libqfgui/images/flat/unused/medical-cross.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/medical-cross.svg rename to libqf/libqfgui/images/flat/unused/medical-cross.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/microphone.svg b/libqf/libqfgui/images/flat/unused/microphone.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/microphone.svg rename to libqf/libqfgui/images/flat/unused/microphone.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/minus.svg b/libqf/libqfgui/images/flat/unused/minus.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/minus.svg rename to libqf/libqfgui/images/flat/unused/minus.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/monitor.svg b/libqf/libqfgui/images/flat/unused/monitor.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/monitor.svg rename to libqf/libqfgui/images/flat/unused/monitor.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/moon.svg b/libqf/libqfgui/images/flat/unused/moon.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/moon.svg rename to libqf/libqfgui/images/flat/unused/moon.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/move.svg b/libqf/libqfgui/images/flat/unused/move.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/move.svg rename to libqf/libqfgui/images/flat/unused/move.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/musical-note.svg b/libqf/libqfgui/images/flat/unused/musical-note.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/musical-note.svg rename to libqf/libqfgui/images/flat/unused/musical-note.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/new-table.svg b/libqf/libqfgui/images/flat/unused/new-table.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/new-table.svg rename to libqf/libqfgui/images/flat/unused/new-table.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/paperclip.svg b/libqf/libqfgui/images/flat/unused/paperclip.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/paperclip.svg rename to libqf/libqfgui/images/flat/unused/paperclip.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/pencil.svg b/libqf/libqfgui/images/flat/unused/pencil.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/pencil.svg rename to libqf/libqfgui/images/flat/unused/pencil.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/people.svg b/libqf/libqfgui/images/flat/unused/people.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/people.svg rename to libqf/libqfgui/images/flat/unused/people.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/person.svg b/libqf/libqfgui/images/flat/unused/person.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/person.svg rename to libqf/libqfgui/images/flat/unused/person.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/phone.svg b/libqf/libqfgui/images/flat/unused/phone.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/phone.svg rename to libqf/libqfgui/images/flat/unused/phone.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/pie-chart.svg b/libqf/libqfgui/images/flat/unused/pie-chart.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/pie-chart.svg rename to libqf/libqfgui/images/flat/unused/pie-chart.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/pin.svg b/libqf/libqfgui/images/flat/unused/pin.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/pin.svg rename to libqf/libqfgui/images/flat/unused/pin.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/play-circle.svg b/libqf/libqfgui/images/flat/unused/play-circle.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/play-circle.svg rename to libqf/libqfgui/images/flat/unused/play-circle.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/plus.svg b/libqf/libqfgui/images/flat/unused/plus.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/plus.svg rename to libqf/libqfgui/images/flat/unused/plus.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/power-standby.svg b/libqf/libqfgui/images/flat/unused/power-standby.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/power-standby.svg rename to libqf/libqfgui/images/flat/unused/power-standby.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/print.svg b/libqf/libqfgui/images/flat/unused/print.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/print.svg rename to libqf/libqfgui/images/flat/unused/print.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/project.svg b/libqf/libqfgui/images/flat/unused/project.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/project.svg rename to libqf/libqfgui/images/flat/unused/project.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/pulse.svg b/libqf/libqfgui/images/flat/unused/pulse.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/pulse.svg rename to libqf/libqfgui/images/flat/unused/pulse.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/puzzle-piece.svg b/libqf/libqfgui/images/flat/unused/puzzle-piece.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/puzzle-piece.svg rename to libqf/libqfgui/images/flat/unused/puzzle-piece.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/question-mark.svg b/libqf/libqfgui/images/flat/unused/question-mark.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/question-mark.svg rename to libqf/libqfgui/images/flat/unused/question-mark.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/rain.svg b/libqf/libqfgui/images/flat/unused/rain.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/rain.svg rename to libqf/libqfgui/images/flat/unused/rain.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/random.svg b/libqf/libqfgui/images/flat/unused/random.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/random.svg rename to libqf/libqfgui/images/flat/unused/random.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/resize-both.svg b/libqf/libqfgui/images/flat/unused/resize-both.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/resize-both.svg rename to libqf/libqfgui/images/flat/unused/resize-both.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/resize-height.svg b/libqf/libqfgui/images/flat/unused/resize-height.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/resize-height.svg rename to libqf/libqfgui/images/flat/unused/resize-height.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/resize-width.svg b/libqf/libqfgui/images/flat/unused/resize-width.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/resize-width.svg rename to libqf/libqfgui/images/flat/unused/resize-width.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/rss-alt.svg b/libqf/libqfgui/images/flat/unused/rss-alt.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/rss-alt.svg rename to libqf/libqfgui/images/flat/unused/rss-alt.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/rss.svg b/libqf/libqfgui/images/flat/unused/rss.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/rss.svg rename to libqf/libqfgui/images/flat/unused/rss.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/script.svg b/libqf/libqfgui/images/flat/unused/script.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/script.svg rename to libqf/libqfgui/images/flat/unused/script.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/share-boxed.svg b/libqf/libqfgui/images/flat/unused/share-boxed.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/share-boxed.svg rename to libqf/libqfgui/images/flat/unused/share-boxed.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/share.svg b/libqf/libqfgui/images/flat/unused/share.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/share.svg rename to libqf/libqfgui/images/flat/unused/share.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/shield.svg b/libqf/libqfgui/images/flat/unused/shield.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/shield.svg rename to libqf/libqfgui/images/flat/unused/shield.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/signal.svg b/libqf/libqfgui/images/flat/unused/signal.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/signal.svg rename to libqf/libqfgui/images/flat/unused/signal.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/signpost.svg b/libqf/libqfgui/images/flat/unused/signpost.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/signpost.svg rename to libqf/libqfgui/images/flat/unused/signpost.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/spreadsheet.svg b/libqf/libqfgui/images/flat/unused/spreadsheet.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/spreadsheet.svg rename to libqf/libqfgui/images/flat/unused/spreadsheet.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/star.svg b/libqf/libqfgui/images/flat/unused/star.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/star.svg rename to libqf/libqfgui/images/flat/unused/star.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/sun.svg b/libqf/libqfgui/images/flat/unused/sun.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/sun.svg rename to libqf/libqfgui/images/flat/unused/sun.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/tablet.svg b/libqf/libqfgui/images/flat/unused/tablet.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/tablet.svg rename to libqf/libqfgui/images/flat/unused/tablet.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/tag.svg b/libqf/libqfgui/images/flat/unused/tag.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/tag.svg rename to libqf/libqfgui/images/flat/unused/tag.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/tags.svg b/libqf/libqfgui/images/flat/unused/tags.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/tags.svg rename to libqf/libqfgui/images/flat/unused/tags.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/target.svg b/libqf/libqfgui/images/flat/unused/target.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/target.svg rename to libqf/libqfgui/images/flat/unused/target.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/task.svg b/libqf/libqfgui/images/flat/unused/task.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/task.svg rename to libqf/libqfgui/images/flat/unused/task.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/terminal.svg b/libqf/libqfgui/images/flat/unused/terminal.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/terminal.svg rename to libqf/libqfgui/images/flat/unused/terminal.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/text.svg b/libqf/libqfgui/images/flat/unused/text.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/text.svg rename to libqf/libqfgui/images/flat/unused/text.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/thumb-down.svg b/libqf/libqfgui/images/flat/unused/thumb-down.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/thumb-down.svg rename to libqf/libqfgui/images/flat/unused/thumb-down.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/thumb-up.svg b/libqf/libqfgui/images/flat/unused/thumb-up.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/thumb-up.svg rename to libqf/libqfgui/images/flat/unused/thumb-up.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/timer.svg b/libqf/libqfgui/images/flat/unused/timer.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/timer.svg rename to libqf/libqfgui/images/flat/unused/timer.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/transfer.svg b/libqf/libqfgui/images/flat/unused/transfer.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/transfer.svg rename to libqf/libqfgui/images/flat/unused/transfer.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/trash.svg b/libqf/libqfgui/images/flat/unused/trash.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/trash.svg rename to libqf/libqfgui/images/flat/unused/trash.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/underline.svg b/libqf/libqfgui/images/flat/unused/underline.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/underline.svg rename to libqf/libqfgui/images/flat/unused/underline.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/vertical-align-bottom.svg b/libqf/libqfgui/images/flat/unused/vertical-align-bottom.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/vertical-align-bottom.svg rename to libqf/libqfgui/images/flat/unused/vertical-align-bottom.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/vertical-align-center.svg b/libqf/libqfgui/images/flat/unused/vertical-align-center.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/vertical-align-center.svg rename to libqf/libqfgui/images/flat/unused/vertical-align-center.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/vertical-align-top.svg b/libqf/libqfgui/images/flat/unused/vertical-align-top.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/vertical-align-top.svg rename to libqf/libqfgui/images/flat/unused/vertical-align-top.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/video.svg b/libqf/libqfgui/images/flat/unused/video.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/video.svg rename to libqf/libqfgui/images/flat/unused/video.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/volume-high.svg b/libqf/libqfgui/images/flat/unused/volume-high.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/volume-high.svg rename to libqf/libqfgui/images/flat/unused/volume-high.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/volume-low.svg b/libqf/libqfgui/images/flat/unused/volume-low.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/volume-low.svg rename to libqf/libqfgui/images/flat/unused/volume-low.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/volume-off.svg b/libqf/libqfgui/images/flat/unused/volume-off.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/volume-off.svg rename to libqf/libqfgui/images/flat/unused/volume-off.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/warning.svg b/libqf/libqfgui/images/flat/unused/warning.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/warning.svg rename to libqf/libqfgui/images/flat/unused/warning.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/wifi.svg b/libqf/libqfgui/images/flat/unused/wifi.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/wifi.svg rename to libqf/libqfgui/images/flat/unused/wifi.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/wrench.svg b/libqf/libqfgui/images/flat/unused/wrench.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/wrench.svg rename to libqf/libqfgui/images/flat/unused/wrench.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/x.svg b/libqf/libqfgui/images/flat/unused/x.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/x.svg rename to libqf/libqfgui/images/flat/unused/x.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/yen.svg b/libqf/libqfgui/images/flat/unused/yen.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/yen.svg rename to libqf/libqfgui/images/flat/unused/yen.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/zoom-in.svg b/libqf/libqfgui/images/flat/unused/zoom-in.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/zoom-in.svg rename to libqf/libqfgui/images/flat/unused/zoom-in.svg diff --git a/libqf/libqfqmlwidgets/images/flat/unused/zoom-out.svg b/libqf/libqfgui/images/flat/unused/zoom-out.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/unused/zoom-out.svg rename to libqf/libqfgui/images/flat/unused/zoom-out.svg diff --git a/libqf/libqfqmlwidgets/images/flat/up.svg b/libqf/libqfgui/images/flat/up.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/up.svg rename to libqf/libqfgui/images/flat/up.svg diff --git a/libqf/libqfqmlwidgets/images/flat/zoom_fitall.svg b/libqf/libqfgui/images/flat/zoom_fitall.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/zoom_fitall.svg rename to libqf/libqfgui/images/flat/zoom_fitall.svg diff --git a/libqf/libqfqmlwidgets/images/flat/zoom_fitheight.svg b/libqf/libqfgui/images/flat/zoom_fitheight.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/zoom_fitheight.svg rename to libqf/libqfgui/images/flat/zoom_fitheight.svg diff --git a/libqf/libqfqmlwidgets/images/flat/zoom_fitwidth.svg b/libqf/libqfgui/images/flat/zoom_fitwidth.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/flat/zoom_fitwidth.svg rename to libqf/libqfgui/images/flat/zoom_fitwidth.svg diff --git a/libqf/libqfqmlwidgets/images/frev.png b/libqf/libqfgui/images/frev.png similarity index 100% rename from libqf/libqfqmlwidgets/images/frev.png rename to libqf/libqfgui/images/frev.png diff --git a/libqf/libqfqmlwidgets/images/fwd.png b/libqf/libqfgui/images/fwd.png similarity index 100% rename from libqf/libqfqmlwidgets/images/fwd.png rename to libqf/libqfgui/images/fwd.png diff --git a/libqf/libqfqmlwidgets/images/insert-row.png b/libqf/libqfgui/images/insert-row.png similarity index 100% rename from libqf/libqfqmlwidgets/images/insert-row.png rename to libqf/libqfgui/images/insert-row.png diff --git a/libqf/libqfqmlwidgets/images/left.svg b/libqf/libqfgui/images/left.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/left.svg rename to libqf/libqfgui/images/left.svg diff --git a/libqf/libqfqmlwidgets/images/light-blind.png b/libqf/libqfgui/images/light-blind.png similarity index 100% rename from libqf/libqfqmlwidgets/images/light-blind.png rename to libqf/libqfgui/images/light-blind.png diff --git a/libqf/libqfqmlwidgets/images/light-cyan.png b/libqf/libqfgui/images/light-cyan.png similarity index 100% rename from libqf/libqfqmlwidgets/images/light-cyan.png rename to libqf/libqfgui/images/light-cyan.png diff --git a/libqf/libqfqmlwidgets/images/light-green.png b/libqf/libqfgui/images/light-green.png similarity index 100% rename from libqf/libqfqmlwidgets/images/light-green.png rename to libqf/libqfgui/images/light-green.png diff --git a/libqf/libqfqmlwidgets/images/light-red.png b/libqf/libqfgui/images/light-red.png similarity index 100% rename from libqf/libqfqmlwidgets/images/light-red.png rename to libqf/libqfgui/images/light-red.png diff --git a/libqf/libqfqmlwidgets/images/light-yellow.png b/libqf/libqfgui/images/light-yellow.png similarity index 100% rename from libqf/libqfqmlwidgets/images/light-yellow.png rename to libqf/libqfgui/images/light-yellow.png diff --git a/libqf/libqfqmlwidgets/images/minus.png b/libqf/libqfgui/images/minus.png similarity index 100% rename from libqf/libqfqmlwidgets/images/minus.png rename to libqf/libqfgui/images/minus.png diff --git a/libqf/libqfqmlwidgets/images/network.png b/libqf/libqfgui/images/network.png similarity index 100% rename from libqf/libqfqmlwidgets/images/network.png rename to libqf/libqfgui/images/network.png diff --git a/libqf/libqfqmlwidgets/images/new.png b/libqf/libqfgui/images/new.png similarity index 100% rename from libqf/libqfqmlwidgets/images/new.png rename to libqf/libqfgui/images/new.png diff --git a/libqf/libqfqmlwidgets/images/paste.png b/libqf/libqfgui/images/paste.png similarity index 100% rename from libqf/libqfqmlwidgets/images/paste.png rename to libqf/libqfgui/images/paste.png diff --git a/libqf/libqfqmlwidgets/images/pencil.png b/libqf/libqfgui/images/pencil.png similarity index 100% rename from libqf/libqfqmlwidgets/images/pencil.png rename to libqf/libqfgui/images/pencil.png diff --git a/libqf/libqfqmlwidgets/images/plus.png b/libqf/libqfgui/images/plus.png similarity index 100% rename from libqf/libqfqmlwidgets/images/plus.png rename to libqf/libqfgui/images/plus.png diff --git a/libqf/libqfqmlwidgets/images/print-preview.png b/libqf/libqfgui/images/print-preview.png similarity index 100% rename from libqf/libqfqmlwidgets/images/print-preview.png rename to libqf/libqfgui/images/print-preview.png diff --git a/libqf/libqfqmlwidgets/images/print.png b/libqf/libqfgui/images/print.png similarity index 100% rename from libqf/libqfqmlwidgets/images/print.png rename to libqf/libqfgui/images/print.png diff --git a/libqf/libqfqmlwidgets/images/print.xcf b/libqf/libqfgui/images/print.xcf similarity index 100% rename from libqf/libqfqmlwidgets/images/print.xcf rename to libqf/libqfgui/images/print.xcf diff --git a/libqf/libqfqmlwidgets/images/qf_qmlwidgets_images.qrc b/libqf/libqfgui/images/qf_gui_images.qrc similarity index 97% rename from libqf/libqfqmlwidgets/images/qf_qmlwidgets_images.qrc rename to libqf/libqfgui/images/qf_gui_images.qrc index d4b7cd449..650d4afc1 100644 --- a/libqf/libqfqmlwidgets/images/qf_qmlwidgets_images.qrc +++ b/libqf/libqfgui/images/qf_gui_images.qrc @@ -1,5 +1,5 @@ - + under-construction.png alert.png wordwrap.png diff --git a/libqf/libqfqmlwidgets/images/reload.png b/libqf/libqfgui/images/reload.png similarity index 100% rename from libqf/libqfqmlwidgets/images/reload.png rename to libqf/libqfgui/images/reload.png diff --git a/libqf/libqfqmlwidgets/images/rev.png b/libqf/libqfgui/images/rev.png similarity index 100% rename from libqf/libqfqmlwidgets/images/rev.png rename to libqf/libqfgui/images/rev.png diff --git a/libqf/libqfqmlwidgets/images/revert.png b/libqf/libqfgui/images/revert.png similarity index 100% rename from libqf/libqfqmlwidgets/images/revert.png rename to libqf/libqfgui/images/revert.png diff --git a/libqf/libqfqmlwidgets/images/right.svg b/libqf/libqfgui/images/right.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/right.svg rename to libqf/libqfgui/images/right.svg diff --git a/libqf/libqfqmlwidgets/images/save.png b/libqf/libqfgui/images/save.png similarity index 100% rename from libqf/libqfqmlwidgets/images/save.png rename to libqf/libqfgui/images/save.png diff --git a/libqf/libqfqmlwidgets/images/settings.svg b/libqf/libqfgui/images/settings.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/settings.svg rename to libqf/libqfgui/images/settings.svg diff --git a/libqf/libqfqmlwidgets/images/sort-asc.png b/libqf/libqfgui/images/sort-asc.png similarity index 100% rename from libqf/libqfqmlwidgets/images/sort-asc.png rename to libqf/libqfgui/images/sort-asc.png diff --git a/libqf/libqfqmlwidgets/images/sort-desc.png b/libqf/libqfgui/images/sort-desc.png similarity index 100% rename from libqf/libqfqmlwidgets/images/sort-desc.png rename to libqf/libqfgui/images/sort-desc.png diff --git a/libqf/libqfqmlwidgets/images/sql_post.png b/libqf/libqfgui/images/sql_post.png similarity index 100% rename from libqf/libqfqmlwidgets/images/sql_post.png rename to libqf/libqfgui/images/sql_post.png diff --git a/libqf/libqfqmlwidgets/images/under-construction.png b/libqf/libqfgui/images/under-construction.png similarity index 100% rename from libqf/libqfqmlwidgets/images/under-construction.png rename to libqf/libqfgui/images/under-construction.png diff --git a/libqf/libqfqmlwidgets/images/up.svg b/libqf/libqfgui/images/up.svg similarity index 100% rename from libqf/libqfqmlwidgets/images/up.svg rename to libqf/libqfgui/images/up.svg diff --git a/libqf/libqfqmlwidgets/images/view.png b/libqf/libqfgui/images/view.png similarity index 100% rename from libqf/libqfqmlwidgets/images/view.png rename to libqf/libqfgui/images/view.png diff --git a/libqf/libqfqmlwidgets/images/wordwrap.png b/libqf/libqfgui/images/wordwrap.png similarity index 100% rename from libqf/libqfqmlwidgets/images/wordwrap.png rename to libqf/libqfgui/images/wordwrap.png diff --git a/libqf/libqfqmlwidgets/images/zoom_fitall.png b/libqf/libqfgui/images/zoom_fitall.png similarity index 100% rename from libqf/libqfqmlwidgets/images/zoom_fitall.png rename to libqf/libqfgui/images/zoom_fitall.png diff --git a/libqf/libqfqmlwidgets/images/zoom_fitheight.png b/libqf/libqfgui/images/zoom_fitheight.png similarity index 100% rename from libqf/libqfqmlwidgets/images/zoom_fitheight.png rename to libqf/libqfgui/images/zoom_fitheight.png diff --git a/libqf/libqfqmlwidgets/images/zoom_fitwidth.png b/libqf/libqfgui/images/zoom_fitwidth.png similarity index 100% rename from libqf/libqfqmlwidgets/images/zoom_fitwidth.png rename to libqf/libqfgui/images/zoom_fitwidth.png diff --git a/libqf/libqfqmlwidgets/images/zoom_in.png b/libqf/libqfgui/images/zoom_in.png similarity index 100% rename from libqf/libqfqmlwidgets/images/zoom_in.png rename to libqf/libqfgui/images/zoom_in.png diff --git a/libqf/libqfqmlwidgets/images/zoom_out.png b/libqf/libqfgui/images/zoom_out.png similarity index 100% rename from libqf/libqfqmlwidgets/images/zoom_out.png rename to libqf/libqfgui/images/zoom_out.png diff --git a/libqf/libqfqmlwidgets/images/zoomin_cursor_bitmap.png b/libqf/libqfgui/images/zoomin_cursor_bitmap.png similarity index 100% rename from libqf/libqfqmlwidgets/images/zoomin_cursor_bitmap.png rename to libqf/libqfgui/images/zoomin_cursor_bitmap.png diff --git a/libqf/libqfqmlwidgets/images/zoomin_cursor_mask.png b/libqf/libqfgui/images/zoomin_cursor_mask.png similarity index 100% rename from libqf/libqfqmlwidgets/images/zoomin_cursor_mask.png rename to libqf/libqfgui/images/zoomin_cursor_mask.png diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/action.h b/libqf/libqfgui/include/qf/gui/action.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/action.h rename to libqf/libqfgui/include/qf/gui/action.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/actiongroup.h b/libqf/libqfgui/include/qf/gui/actiongroup.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/actiongroup.h rename to libqf/libqfgui/include/qf/gui/actiongroup.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/checkbox.h b/libqf/libqfgui/include/qf/gui/checkbox.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/checkbox.h rename to libqf/libqfgui/include/qf/gui/checkbox.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/combobox.h b/libqf/libqfgui/include/qf/gui/combobox.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/combobox.h rename to libqf/libqfgui/include/qf/gui/combobox.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/datacontroller.h b/libqf/libqfgui/include/qf/gui/datacontroller.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/datacontroller.h rename to libqf/libqfgui/include/qf/gui/datacontroller.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/dateedit.h b/libqf/libqfgui/include/qf/gui/dateedit.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/dateedit.h rename to libqf/libqfgui/include/qf/gui/dateedit.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/datetimeedit.h b/libqf/libqfgui/include/qf/gui/datetimeedit.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/datetimeedit.h rename to libqf/libqfgui/include/qf/gui/datetimeedit.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/dialogbuttonbox.h b/libqf/libqfgui/include/qf/gui/dialogbuttonbox.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/dialogbuttonbox.h rename to libqf/libqfgui/include/qf/gui/dialogbuttonbox.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/dialogs/dialog.h b/libqf/libqfgui/include/qf/gui/dialogs/dialog.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/dialogs/dialog.h rename to libqf/libqfgui/include/qf/gui/dialogs/dialog.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/dialogs/filedialog.h b/libqf/libqfgui/include/qf/gui/dialogs/filedialog.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/dialogs/filedialog.h rename to libqf/libqfgui/include/qf/gui/dialogs/filedialog.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/dialogs/getiteminputdialog.h b/libqf/libqfgui/include/qf/gui/dialogs/getiteminputdialog.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/dialogs/getiteminputdialog.h rename to libqf/libqfgui/include/qf/gui/dialogs/getiteminputdialog.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/dialogs/inputdialog.h b/libqf/libqfgui/include/qf/gui/dialogs/inputdialog.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/dialogs/inputdialog.h rename to libqf/libqfgui/include/qf/gui/dialogs/inputdialog.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/dialogs/messagebox.h b/libqf/libqfgui/include/qf/gui/dialogs/messagebox.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/dialogs/messagebox.h rename to libqf/libqfgui/include/qf/gui/dialogs/messagebox.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/dialogs/previewdialog.h b/libqf/libqfgui/include/qf/gui/dialogs/previewdialog.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/dialogs/previewdialog.h rename to libqf/libqfgui/include/qf/gui/dialogs/previewdialog.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/dialogs/qmldialog.h b/libqf/libqfgui/include/qf/gui/dialogs/qmldialog.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/dialogs/qmldialog.h rename to libqf/libqfgui/include/qf/gui/dialogs/qmldialog.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/frame.h b/libqf/libqfgui/include/qf/gui/frame.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/frame.h rename to libqf/libqfgui/include/qf/gui/frame.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/application.h b/libqf/libqfgui/include/qf/gui/framework/application.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/application.h rename to libqf/libqfgui/include/qf/gui/framework/application.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/centralwidget.h b/libqf/libqfgui/include/qf/gui/framework/centralwidget.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/centralwidget.h rename to libqf/libqfgui/include/qf/gui/framework/centralwidget.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/cursoroverrider.h b/libqf/libqfgui/include/qf/gui/framework/cursoroverrider.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/cursoroverrider.h rename to libqf/libqfgui/include/qf/gui/framework/cursoroverrider.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/datadialogwidget.h b/libqf/libqfgui/include/qf/gui/framework/datadialogwidget.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/datadialogwidget.h rename to libqf/libqfgui/include/qf/gui/framework/datadialogwidget.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/dialogwidget.h b/libqf/libqfgui/include/qf/gui/framework/dialogwidget.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/dialogwidget.h rename to libqf/libqfgui/include/qf/gui/framework/dialogwidget.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/dockablewidget.h b/libqf/libqfgui/include/qf/gui/framework/dockablewidget.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/dockablewidget.h rename to libqf/libqfgui/include/qf/gui/framework/dockablewidget.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/dockwidget.h b/libqf/libqfgui/include/qf/gui/framework/dockwidget.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/dockwidget.h rename to libqf/libqfgui/include/qf/gui/framework/dockwidget.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/ipersistentoptions.h b/libqf/libqfgui/include/qf/gui/framework/ipersistentoptions.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/ipersistentoptions.h rename to libqf/libqfgui/include/qf/gui/framework/ipersistentoptions.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/ipersistentsettings.h b/libqf/libqfgui/include/qf/gui/framework/ipersistentsettings.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/ipersistentsettings.h rename to libqf/libqfgui/include/qf/gui/framework/ipersistentsettings.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/logwidget.h b/libqf/libqfgui/include/qf/gui/framework/logwidget.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/logwidget.h rename to libqf/libqfgui/include/qf/gui/framework/logwidget.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/mainwindow.h b/libqf/libqfgui/include/qf/gui/framework/mainwindow.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/mainwindow.h rename to libqf/libqfgui/include/qf/gui/framework/mainwindow.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/partswitch.h b/libqf/libqfgui/include/qf/gui/framework/partswitch.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/partswitch.h rename to libqf/libqfgui/include/qf/gui/framework/partswitch.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/partwidget.h b/libqf/libqfgui/include/qf/gui/framework/partwidget.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/partwidget.h rename to libqf/libqfgui/include/qf/gui/framework/partwidget.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/plugin.h b/libqf/libqfgui/include/qf/gui/framework/plugin.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/plugin.h rename to libqf/libqfgui/include/qf/gui/framework/plugin.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/pluginmanifest.h b/libqf/libqfgui/include/qf/gui/framework/pluginmanifest.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/pluginmanifest.h rename to libqf/libqfgui/include/qf/gui/framework/pluginmanifest.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/stackedcentralwidget.h b/libqf/libqfgui/include/qf/gui/framework/stackedcentralwidget.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/framework/stackedcentralwidget.h rename to libqf/libqfgui/include/qf/gui/framework/stackedcentralwidget.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/htmlviewwidget.h b/libqf/libqfgui/include/qf/gui/htmlviewwidget.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/htmlviewwidget.h rename to libqf/libqfgui/include/qf/gui/htmlviewwidget.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/idatawidget.h b/libqf/libqfgui/include/qf/gui/idatawidget.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/idatawidget.h rename to libqf/libqfgui/include/qf/gui/idatawidget.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/label.h b/libqf/libqfgui/include/qf/gui/label.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/label.h rename to libqf/libqfgui/include/qf/gui/label.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/layoutpropertiesattached.h b/libqf/libqfgui/include/qf/gui/layoutpropertiesattached.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/layoutpropertiesattached.h rename to libqf/libqfgui/include/qf/gui/layoutpropertiesattached.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/layouttypeproperties.h b/libqf/libqfgui/include/qf/gui/layouttypeproperties.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/layouttypeproperties.h rename to libqf/libqfgui/include/qf/gui/layouttypeproperties.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/lineedit.h b/libqf/libqfgui/include/qf/gui/lineedit.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/lineedit.h rename to libqf/libqfgui/include/qf/gui/lineedit.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/log.h b/libqf/libqfgui/include/qf/gui/log.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/log.h rename to libqf/libqfgui/include/qf/gui/log.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/menu.h b/libqf/libqfgui/include/qf/gui/menu.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/menu.h rename to libqf/libqfgui/include/qf/gui/menu.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/menubar.h b/libqf/libqfgui/include/qf/gui/menubar.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/menubar.h rename to libqf/libqfgui/include/qf/gui/menubar.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/model/datadocument.h b/libqf/libqfgui/include/qf/gui/model/datadocument.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/model/datadocument.h rename to libqf/libqfgui/include/qf/gui/model/datadocument.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/model/logtablemodel.h b/libqf/libqfgui/include/qf/gui/model/logtablemodel.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/model/logtablemodel.h rename to libqf/libqfgui/include/qf/gui/model/logtablemodel.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/model/sqldatadocument.h b/libqf/libqfgui/include/qf/gui/model/sqldatadocument.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/model/sqldatadocument.h rename to libqf/libqfgui/include/qf/gui/model/sqldatadocument.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/model/sqltablemodel.h b/libqf/libqfgui/include/qf/gui/model/sqltablemodel.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/model/sqltablemodel.h rename to libqf/libqfgui/include/qf/gui/model/sqltablemodel.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/model/tablemodel.h b/libqf/libqfgui/include/qf/gui/model/tablemodel.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/model/tablemodel.h rename to libqf/libqfgui/include/qf/gui/model/tablemodel.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/progressbar.h b/libqf/libqfgui/include/qf/gui/progressbar.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/progressbar.h rename to libqf/libqfgui/include/qf/gui/progressbar.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/banddatamodel.h b/libqf/libqfgui/include/qf/gui/reports/processor/banddatamodel.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/banddatamodel.h rename to libqf/libqfgui/include/qf/gui/reports/processor/banddatamodel.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/reportitem.h b/libqf/libqfgui/include/qf/gui/reports/processor/reportitem.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/reportitem.h rename to libqf/libqfgui/include/qf/gui/reports/processor/reportitem.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/reportitemband.h b/libqf/libqfgui/include/qf/gui/reports/processor/reportitemband.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/reportitemband.h rename to libqf/libqfgui/include/qf/gui/reports/processor/reportitemband.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/reportitembreak.h b/libqf/libqfgui/include/qf/gui/reports/processor/reportitembreak.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/reportitembreak.h rename to libqf/libqfgui/include/qf/gui/reports/processor/reportitembreak.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/reportitemdetail.h b/libqf/libqfgui/include/qf/gui/reports/processor/reportitemdetail.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/reportitemdetail.h rename to libqf/libqfgui/include/qf/gui/reports/processor/reportitemdetail.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/reportitemframe.h b/libqf/libqfgui/include/qf/gui/reports/processor/reportitemframe.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/reportitemframe.h rename to libqf/libqfgui/include/qf/gui/reports/processor/reportitemframe.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/reportitemimage.h b/libqf/libqfgui/include/qf/gui/reports/processor/reportitemimage.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/reportitemimage.h rename to libqf/libqfgui/include/qf/gui/reports/processor/reportitemimage.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/reportitempara.h b/libqf/libqfgui/include/qf/gui/reports/processor/reportitempara.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/reportitempara.h rename to libqf/libqfgui/include/qf/gui/reports/processor/reportitempara.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/reportitemreport.h b/libqf/libqfgui/include/qf/gui/reports/processor/reportitemreport.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/reportitemreport.h rename to libqf/libqfgui/include/qf/gui/reports/processor/reportitemreport.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/reportpainter.h b/libqf/libqfgui/include/qf/gui/reports/processor/reportpainter.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/reportpainter.h rename to libqf/libqfgui/include/qf/gui/reports/processor/reportpainter.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/reportprocessor.h b/libqf/libqfgui/include/qf/gui/reports/processor/reportprocessor.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/reportprocessor.h rename to libqf/libqfgui/include/qf/gui/reports/processor/reportprocessor.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/style/color.h b/libqf/libqfgui/include/qf/gui/reports/processor/style/color.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/style/color.h rename to libqf/libqfgui/include/qf/gui/reports/processor/style/color.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/style/pen.h b/libqf/libqfgui/include/qf/gui/reports/processor/style/pen.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/style/pen.h rename to libqf/libqfgui/include/qf/gui/reports/processor/style/pen.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/style/sheet.h b/libqf/libqfgui/include/qf/gui/reports/processor/style/sheet.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/processor/style/sheet.h rename to libqf/libqfgui/include/qf/gui/reports/processor/style/sheet.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/widgets/reportviewwidget.h b/libqf/libqfgui/include/qf/gui/reports/widgets/reportviewwidget.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/reports/widgets/reportviewwidget.h rename to libqf/libqfgui/include/qf/gui/reports/widgets/reportviewwidget.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/spinbox.h b/libqf/libqfgui/include/qf/gui/spinbox.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/spinbox.h rename to libqf/libqfgui/include/qf/gui/spinbox.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/splitter.h b/libqf/libqfgui/include/qf/gui/splitter.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/splitter.h rename to libqf/libqfgui/include/qf/gui/splitter.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/sqltableitemdelegate.h b/libqf/libqfgui/include/qf/gui/sqltableitemdelegate.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/sqltableitemdelegate.h rename to libqf/libqfgui/include/qf/gui/sqltableitemdelegate.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/statusbar.h b/libqf/libqfgui/include/qf/gui/statusbar.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/statusbar.h rename to libqf/libqfgui/include/qf/gui/statusbar.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/style.h b/libqf/libqfgui/include/qf/gui/style.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/style.h rename to libqf/libqfgui/include/qf/gui/style.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/tableitemdelegate.h b/libqf/libqfgui/include/qf/gui/tableitemdelegate.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/tableitemdelegate.h rename to libqf/libqfgui/include/qf/gui/tableitemdelegate.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/tableview.h b/libqf/libqfgui/include/qf/gui/tableview.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/tableview.h rename to libqf/libqfgui/include/qf/gui/tableview.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/tableviewtoolbar.h b/libqf/libqfgui/include/qf/gui/tableviewtoolbar.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/tableviewtoolbar.h rename to libqf/libqfgui/include/qf/gui/tableviewtoolbar.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/textedit.h b/libqf/libqfgui/include/qf/gui/textedit.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/textedit.h rename to libqf/libqfgui/include/qf/gui/textedit.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/texteditwidget.h b/libqf/libqfgui/include/qf/gui/texteditwidget.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/texteditwidget.h rename to libqf/libqfgui/include/qf/gui/texteditwidget.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/timeedit.h b/libqf/libqfgui/include/qf/gui/timeedit.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/timeedit.h rename to libqf/libqfgui/include/qf/gui/timeedit.h diff --git a/libqf/libqfqmlwidgets/include/qf/qmlwidgets/toolbar.h b/libqf/libqfgui/include/qf/gui/toolbar.h similarity index 100% rename from libqf/libqfqmlwidgets/include/qf/qmlwidgets/toolbar.h rename to libqf/libqfgui/include/qf/gui/toolbar.h diff --git a/libqf/libqfqmlwidgets/libqfqmlwidgets-cs_CZ.ts b/libqf/libqfgui/libqfgui-cs_CZ.ts similarity index 100% rename from libqf/libqfqmlwidgets/libqfqmlwidgets-cs_CZ.ts rename to libqf/libqfgui/libqfgui-cs_CZ.ts diff --git a/libqf/libqfqmlwidgets/libqfqmlwidgets-fr_FR.ts b/libqf/libqfgui/libqfgui-fr_FR.ts similarity index 100% rename from libqf/libqfqmlwidgets/libqfqmlwidgets-fr_FR.ts rename to libqf/libqfgui/libqfgui-fr_FR.ts diff --git a/libqf/libqfqmlwidgets/libqfqmlwidgets-nb_NO.ts b/libqf/libqfgui/libqfgui-nb_NO.ts similarity index 100% rename from libqf/libqfqmlwidgets/libqfqmlwidgets-nb_NO.ts rename to libqf/libqfgui/libqfgui-nb_NO.ts diff --git a/libqf/libqfqmlwidgets/libqfqmlwidgets-nl_BE.ts b/libqf/libqfgui/libqfgui-nl_BE.ts similarity index 100% rename from libqf/libqfqmlwidgets/libqfqmlwidgets-nl_BE.ts rename to libqf/libqfgui/libqfgui-nl_BE.ts diff --git a/libqf/libqfqmlwidgets/libqfqmlwidgets-pl_PL.ts b/libqf/libqfgui/libqfgui-pl_PL.ts similarity index 100% rename from libqf/libqfqmlwidgets/libqfqmlwidgets-pl_PL.ts rename to libqf/libqfgui/libqfgui-pl_PL.ts diff --git a/libqf/libqfqmlwidgets/libqfqmlwidgets-ru_RU.ts b/libqf/libqfgui/libqfgui-ru_RU.ts similarity index 100% rename from libqf/libqfqmlwidgets/libqfqmlwidgets-ru_RU.ts rename to libqf/libqfgui/libqfgui-ru_RU.ts diff --git a/libqf/libqfqmlwidgets/libqfqmlwidgets-uk_UA.ts b/libqf/libqfgui/libqfgui-uk_UA.ts similarity index 100% rename from libqf/libqfqmlwidgets/libqfqmlwidgets-uk_UA.ts rename to libqf/libqfgui/libqfgui-uk_UA.ts diff --git a/libqf/libqfqmlwidgets/src/action.cpp b/libqf/libqfgui/src/action.cpp similarity index 99% rename from libqf/libqfqmlwidgets/src/action.cpp rename to libqf/libqfgui/src/action.cpp index 9a40e8b4b..fba67706a 100644 --- a/libqf/libqfqmlwidgets/src/action.cpp +++ b/libqf/libqfgui/src/action.cpp @@ -4,7 +4,7 @@ #include -using namespace qf::qmlwidgets; +using namespace qf::gui; Action::Action(const QIcon &icon, const QString &text, QObject *parent) : QAction(parent) diff --git a/libqf/libqfqmlwidgets/src/action.h b/libqf/libqfgui/src/action.h similarity index 69% rename from libqf/libqfqmlwidgets/src/action.h rename to libqf/libqfgui/src/action.h index 2c956c2b9..43cd3be5b 100644 --- a/libqf/libqfqmlwidgets/src/action.h +++ b/libqf/libqfgui/src/action.h @@ -1,14 +1,14 @@ -#ifndef QF_QMLWIDGETS_ACTION_H -#define QF_QMLWIDGETS_ACTION_H +#ifndef QF_GUI_ACTION_H +#define QF_GUI_ACTION_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include namespace qf { -namespace qmlwidgets { +namespace gui { -class QFQMLWIDGETS_DECL_EXPORT Action : public QAction +class QFGUI_DECL_EXPORT Action : public QAction { Q_OBJECT Q_PROPERTY(QString oid READ oid WRITE setOid FINAL) @@ -40,11 +40,11 @@ class QFQMLWIDGETS_DECL_EXPORT Action : public QAction Q_INVOKABLE void addActionInto(QAction *action); Q_INVOKABLE void addActionBefore(QAction *action); Q_INVOKABLE void addActionAfter(QAction *new_act); - Q_INVOKABLE qf::qmlwidgets::Action *addMenuInto(const QString &id, const QString &text); - Q_INVOKABLE qf::qmlwidgets::Action *addMenuAfter(const QString &id, const QString &text); - Q_INVOKABLE qf::qmlwidgets::Action *addMenuBefore(const QString &id, const QString &text); - Q_INVOKABLE qf::qmlwidgets::Action *addSeparatorInto(const QString &id = QString()); - Q_INVOKABLE qf::qmlwidgets::Action *addSeparatorBefore(const QString &id = QString()); + Q_INVOKABLE qf::gui::Action *addMenuInto(const QString &id, const QString &text); + Q_INVOKABLE qf::gui::Action *addMenuAfter(const QString &id, const QString &text); + Q_INVOKABLE qf::gui::Action *addMenuBefore(const QString &id, const QString &text); + Q_INVOKABLE qf::gui::Action *addSeparatorInto(const QString &id = QString()); + Q_INVOKABLE qf::gui::Action *addSeparatorBefore(const QString &id = QString()); private: QWidget* parentMenu(); }; diff --git a/libqf/libqfqmlwidgets/src/actiongroup.cpp b/libqf/libqfgui/src/actiongroup.cpp similarity index 62% rename from libqf/libqfqmlwidgets/src/actiongroup.cpp rename to libqf/libqfgui/src/actiongroup.cpp index 1a956fd79..ce65f6a03 100644 --- a/libqf/libqfqmlwidgets/src/actiongroup.cpp +++ b/libqf/libqfgui/src/actiongroup.cpp @@ -1,13 +1,13 @@ #include "actiongroup.h" -namespace qf::qmlwidgets { +namespace qf::gui { ActionGroup::ActionGroup(QObject *parent) : Super(parent) { } -} // namespace qf::qmlwidgets +} // namespace qf::gui diff --git a/libqf/libqfgui/src/actiongroup.h b/libqf/libqfgui/src/actiongroup.h new file mode 100644 index 000000000..ca7e133cf --- /dev/null +++ b/libqf/libqfgui/src/actiongroup.h @@ -0,0 +1,25 @@ +#ifndef QF_GUI_ACTIONGROUP_H +#define QF_GUI_ACTIONGROUP_H + +#include "guiglobal.h" + +#include + +namespace qf { +namespace gui { + +class QFGUI_DECL_EXPORT ActionGroup : public QActionGroup +{ + Q_OBJECT +private: + typedef QActionGroup Super; +public: + ActionGroup(QObject *parent = nullptr); + + Q_INVOKABLE QAction* addAction(QAction *action) {return Super::addAction(action);} +}; + +} // namespace gui +} // namespace qf + +#endif // QF_GUI_ACTIONGROUP_H diff --git a/libqf/libqfqmlwidgets/src/checkbox.cpp b/libqf/libqfgui/src/checkbox.cpp similarity index 93% rename from libqf/libqfqmlwidgets/src/checkbox.cpp rename to libqf/libqfgui/src/checkbox.cpp index 885a365bb..7d66fa47c 100644 --- a/libqf/libqfqmlwidgets/src/checkbox.cpp +++ b/libqf/libqfgui/src/checkbox.cpp @@ -1,6 +1,6 @@ #include "checkbox.h" -namespace qf::qmlwidgets { +namespace qf::gui { CheckBox::CheckBox(QWidget *parent) : Super(parent) @@ -47,6 +47,6 @@ void CheckBox::onStateChanged(int st) emit dataValueChanged(st); } -} // namespace qf::qmlwidgets +} // namespace qf::gui diff --git a/libqf/libqfqmlwidgets/src/checkbox.h b/libqf/libqfgui/src/checkbox.h similarity index 69% rename from libqf/libqfqmlwidgets/src/checkbox.h rename to libqf/libqfgui/src/checkbox.h index 130b9f445..ab145609c 100644 --- a/libqf/libqfqmlwidgets/src/checkbox.h +++ b/libqf/libqfgui/src/checkbox.h @@ -1,16 +1,16 @@ -#ifndef QF_QMLWIDGETS_CHECKBOX_H -#define QF_QMLWIDGETS_CHECKBOX_H +#ifndef QF_GUI_CHECKBOX_H +#define QF_GUI_CHECKBOX_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include "idatawidget.h" #include #include namespace qf { -namespace qmlwidgets { +namespace gui { -class QFQMLWIDGETS_DECL_EXPORT CheckBox : public QCheckBox, public IDataWidget +class QFGUI_DECL_EXPORT CheckBox : public QCheckBox, public IDataWidget { Q_OBJECT Q_PROPERTY(QVariant dataValue READ dataValue WRITE setDataValue NOTIFY dataValueChanged) @@ -28,7 +28,7 @@ class QFQMLWIDGETS_DECL_EXPORT CheckBox : public QCheckBox, public IDataWidget Q_SLOT void onStateChanged(int st); }; -} // namespace qmlwidgets +} // namespace gui } // namespace qf -#endif // QF_QMLWIDGETS_CHECKBOX_H +#endif // QF_GUI_CHECKBOX_H diff --git a/libqf/libqfqmlwidgets/src/combobox.cpp b/libqf/libqfgui/src/combobox.cpp similarity index 98% rename from libqf/libqfqmlwidgets/src/combobox.cpp rename to libqf/libqfgui/src/combobox.cpp index 2f09ca494..991604aba 100644 --- a/libqf/libqfqmlwidgets/src/combobox.cpp +++ b/libqf/libqfgui/src/combobox.cpp @@ -10,7 +10,7 @@ #include #include -using namespace qf::qmlwidgets; +using namespace qf::gui; //=============================================================== // ComboBox @@ -259,7 +259,7 @@ void DbEnumComboBox::loadItems(bool force) QColor c = dbe.color(); if(c.isValid()) { setItemData(count() - 1, c, Qt::BackgroundRole); - setItemData(count() - 1, qf::qmlwidgets::model::TableModel::contrastTextColor(c), Qt::ForegroundRole); + setItemData(count() - 1, qf::gui::model::TableModel::contrastTextColor(c), Qt::ForegroundRole); } } } diff --git a/libqf/libqfqmlwidgets/src/combobox.h b/libqf/libqfgui/src/combobox.h similarity index 90% rename from libqf/libqfqmlwidgets/src/combobox.h rename to libqf/libqfgui/src/combobox.h index 34c0054ba..e86bcf9f1 100644 --- a/libqf/libqfqmlwidgets/src/combobox.h +++ b/libqf/libqfgui/src/combobox.h @@ -1,7 +1,7 @@ -#ifndef QF_QMLWIDGETS_COMBOBOX_H -#define QF_QMLWIDGETS_COMBOBOX_H +#ifndef QF_GUI_COMBOBOX_H +#define QF_GUI_COMBOBOX_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include "idatawidget.h" #include @@ -9,9 +9,9 @@ #include namespace qf { -namespace qmlwidgets { +namespace gui { -class QFQMLWIDGETS_DECL_EXPORT ComboBox : public QComboBox, public IDataWidget +class QFGUI_DECL_EXPORT ComboBox : public QComboBox, public IDataWidget { Q_OBJECT Q_PROPERTY(QVariant dataValue READ dataValue WRITE setDataValue NOTIFY dataValueChanged) @@ -48,7 +48,7 @@ class QFQMLWIDGETS_DECL_EXPORT ComboBox : public QComboBox, public IDataWidget bool m_ignoreIndexChangedSignals = false; }; -class QFQMLWIDGETS_DECL_EXPORT ForeignKeyComboBox : public ComboBox +class QFGUI_DECL_EXPORT ForeignKeyComboBox : public ComboBox { Q_OBJECT Q_PROPERTY(QString referencedTable READ referencedTable WRITE setReferencedTable NOTIFY referencedTableChanged) @@ -73,7 +73,7 @@ class QFQMLWIDGETS_DECL_EXPORT ForeignKeyComboBox : public ComboBox bool m_itemsLoaded = false; }; -class QFQMLWIDGETS_DECL_EXPORT DbEnumComboBox : public ComboBox +class QFGUI_DECL_EXPORT DbEnumComboBox : public ComboBox { Q_OBJECT Q_PROPERTY(QString groupName READ groupName WRITE setGroupName NOTIFY groupNameChanged) diff --git a/libqf/libqfqmlwidgets/src/datacontroller.cpp b/libqf/libqfgui/src/datacontroller.cpp similarity index 76% rename from libqf/libqfqmlwidgets/src/datacontroller.cpp rename to libqf/libqfgui/src/datacontroller.cpp index 4feba93db..14c11aac1 100644 --- a/libqf/libqfqmlwidgets/src/datacontroller.cpp +++ b/libqf/libqfgui/src/datacontroller.cpp @@ -4,7 +4,7 @@ #include -using namespace qf::qmlwidgets; +using namespace qf::gui; DataController::DataController(QObject *parent) : QObject(parent) @@ -15,20 +15,20 @@ DataController::DataController(QObject *parent) DataController::~DataController() = default; -qf::qmlwidgets::model::DataDocument *DataController::document(bool throw_exc) const +qf::gui::model::DataDocument *DataController::document(bool throw_exc) const { if(!m_document && throw_exc) QF_EXCEPTION("DataDocument is NULL!"); return m_document; } -void DataController::setDocument(qf::qmlwidgets::model::DataDocument *doc) +void DataController::setDocument(qf::gui::model::DataDocument *doc) { if(m_document != doc) { m_document = doc; - connect(doc, &qf::qmlwidgets::model::DataDocument::loaded, this, &DataController::documentLoaded); - connect(doc, &qf::qmlwidgets::model::DataDocument::valueChanged, this, &DataController::documentValueChanged); - connect(doc, &qf::qmlwidgets::model::DataDocument::aboutToSave, this, &DataController::documentAboutToSave); + connect(doc, &qf::gui::model::DataDocument::loaded, this, &DataController::documentLoaded); + connect(doc, &qf::gui::model::DataDocument::valueChanged, this, &DataController::documentValueChanged); + connect(doc, &qf::gui::model::DataDocument::aboutToSave, this, &DataController::documentAboutToSave); emit documentChanged(doc); } } diff --git a/libqf/libqfqmlwidgets/src/datacontroller.h b/libqf/libqfgui/src/datacontroller.h similarity index 63% rename from libqf/libqfqmlwidgets/src/datacontroller.h rename to libqf/libqfgui/src/datacontroller.h index c82669189..9a65b2a2f 100644 --- a/libqf/libqfqmlwidgets/src/datacontroller.h +++ b/libqf/libqfgui/src/datacontroller.h @@ -1,7 +1,7 @@ -#ifndef QF_QMLWIDGETS_DATACONTROLLER_H -#define QF_QMLWIDGETS_DATACONTROLLER_H +#ifndef QF_GUI_DATACONTROLLER_H +#define QF_GUI_DATACONTROLLER_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include "model/datadocument.h" #include @@ -10,14 +10,14 @@ #include namespace qf { -namespace qmlwidgets { +namespace gui { class IDataWidget; -class QFQMLWIDGETS_DECL_EXPORT DataController : public QObject +class QFGUI_DECL_EXPORT DataController : public QObject { Q_OBJECT - Q_PROPERTY(qf::qmlwidgets::model::DataDocument* document READ document WRITE setDocument NOTIFY documentChanged) + Q_PROPERTY(qf::gui::model::DataDocument* document READ document WRITE setDocument NOTIFY documentChanged) Q_PROPERTY(QWidget* widget READ widget WRITE setWidget NOTIFY widgetChanged) //Q_PROPERTY(QString dbConnectionName READ dbConnectionName WRITE setDbConnectionName) public: @@ -26,9 +26,9 @@ class QFQMLWIDGETS_DECL_EXPORT DataController : public QObject //QF_PROPERTY_IMPL2(QString, d, D, bConnectionName, QSqlDatabase::defaultConnection) - qf::qmlwidgets::model::DataDocument* document(bool throw_exc = qf::core::Exception::Throw) const; - void setDocument(qf::qmlwidgets::model::DataDocument *doc); - Q_SIGNAL void documentChanged(qf::qmlwidgets::model::DataDocument *doc); + qf::gui::model::DataDocument* document(bool throw_exc = qf::core::Exception::Throw) const; + void setDocument(qf::gui::model::DataDocument *doc); + Q_SIGNAL void documentChanged(qf::gui::model::DataDocument *doc); QWidget* widget() const { return m_dataWidgetsParent;} void setWidget(QWidget *w) @@ -49,11 +49,11 @@ class QFQMLWIDGETS_DECL_EXPORT DataController : public QObject Q_SLOT void documentValueChanged(const QString &data_id, const QVariant &old_val, const QVariant &new_val); Q_SLOT void documentAboutToSave(); protected: - qf::qmlwidgets::model::DataDocument *m_document = nullptr; + qf::gui::model::DataDocument *m_document = nullptr; QWidget *m_dataWidgetsParent = nullptr; QList m_dataWidgets; }; }} -#endif // QF_QMLWIDGETS_DATACONTROLLER_H +#endif // QF_GUI_DATACONTROLLER_H diff --git a/libqf/libqfqmlwidgets/src/dateedit.cpp b/libqf/libqfgui/src/dateedit.cpp similarity index 96% rename from libqf/libqfqmlwidgets/src/dateedit.cpp rename to libqf/libqfgui/src/dateedit.cpp index c7fc8bc00..9887e4018 100644 --- a/libqf/libqfqmlwidgets/src/dateedit.cpp +++ b/libqf/libqfgui/src/dateedit.cpp @@ -2,7 +2,7 @@ #include -using namespace qf::qmlwidgets; +using namespace qf::gui; DateEdit::DateEdit(QWidget *parent) : Super(parent) diff --git a/libqf/libqfqmlwidgets/src/dateedit.h b/libqf/libqfgui/src/dateedit.h similarity index 69% rename from libqf/libqfqmlwidgets/src/dateedit.h rename to libqf/libqfgui/src/dateedit.h index 4bdedff84..2b4bdaf88 100644 --- a/libqf/libqfqmlwidgets/src/dateedit.h +++ b/libqf/libqfgui/src/dateedit.h @@ -1,15 +1,15 @@ -#ifndef QF_QMLWIDGETS_DATEEDIT_H -#define QF_QMLWIDGETS_DATEEDIT_H +#ifndef QF_GUI_DATEEDIT_H +#define QF_GUI_DATEEDIT_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include "idatawidget.h" #include namespace qf { -namespace qmlwidgets { +namespace gui { -class QFQMLWIDGETS_DECL_EXPORT DateEdit : public QDateEdit, public IDataWidget +class QFGUI_DECL_EXPORT DateEdit : public QDateEdit, public IDataWidget { Q_OBJECT Q_PROPERTY(QVariant dataValue READ dataValue WRITE setDataValue NOTIFY dataValueChanged) @@ -28,7 +28,7 @@ class QFQMLWIDGETS_DECL_EXPORT DateEdit : public QDateEdit, public IDataWidget bool m_blockDateChanged = false; }; -} // namespace qmlwidgets +} // namespace gui } // namespace qf -#endif // QF_QMLWIDGETS_DATEEDIT_H +#endif // QF_GUI_DATEEDIT_H diff --git a/libqf/libqfqmlwidgets/src/datetimeedit.cpp b/libqf/libqfgui/src/datetimeedit.cpp similarity index 95% rename from libqf/libqfqmlwidgets/src/datetimeedit.cpp rename to libqf/libqfgui/src/datetimeedit.cpp index 9359921d1..73126ac7b 100644 --- a/libqf/libqfqmlwidgets/src/datetimeedit.cpp +++ b/libqf/libqfgui/src/datetimeedit.cpp @@ -3,7 +3,7 @@ #include -namespace qf::qmlwidgets { +namespace qf::gui { DateTimeEdit::DateTimeEdit(QWidget *parent) : Super(parent) @@ -54,5 +54,5 @@ void DateTimeEdit::onDateTimeChanged(const QDateTime &new_datetime) emit dataValueChanged(new_datetime); } -} // namespace qf::qmlwidgets +} // namespace qf::gui diff --git a/libqf/libqfqmlwidgets/src/datetimeedit.h b/libqf/libqfgui/src/datetimeedit.h similarity index 78% rename from libqf/libqfqmlwidgets/src/datetimeedit.h rename to libqf/libqfgui/src/datetimeedit.h index de536b3bb..6663d65b5 100644 --- a/libqf/libqfqmlwidgets/src/datetimeedit.h +++ b/libqf/libqfgui/src/datetimeedit.h @@ -1,14 +1,14 @@ #pragma once -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include "idatawidget.h" #include namespace qf { -namespace qmlwidgets { +namespace gui { -class QFQMLWIDGETS_DECL_EXPORT DateTimeEdit : public QDateTimeEdit, public IDataWidget +class QFGUI_DECL_EXPORT DateTimeEdit : public QDateTimeEdit, public IDataWidget { Q_OBJECT Q_PROPERTY(QVariant dataValue READ dataValue WRITE setDataValue NOTIFY dataValueChanged) @@ -27,6 +27,6 @@ class QFQMLWIDGETS_DECL_EXPORT DateTimeEdit : public QDateTimeEdit, public IData bool m_blockDateTimeChanged = false; }; -} // namespace qmlwidgets +} // namespace gui } // namespace qf diff --git a/libqf/libqfqmlwidgets/src/dialogbuttonbox.cpp b/libqf/libqfgui/src/dialogbuttonbox.cpp similarity index 90% rename from libqf/libqfqmlwidgets/src/dialogbuttonbox.cpp rename to libqf/libqfgui/src/dialogbuttonbox.cpp index 837de5e0c..18b152f7c 100644 --- a/libqf/libqfqmlwidgets/src/dialogbuttonbox.cpp +++ b/libqf/libqfgui/src/dialogbuttonbox.cpp @@ -2,7 +2,7 @@ #include -using namespace qf::qmlwidgets; +using namespace qf::gui; DialogButtonBox::DialogButtonBox(QWidget * parent) : QDialogButtonBox(parent) diff --git a/libqf/libqfqmlwidgets/src/dialogbuttonbox.h b/libqf/libqfgui/src/dialogbuttonbox.h similarity index 50% rename from libqf/libqfqmlwidgets/src/dialogbuttonbox.h rename to libqf/libqfgui/src/dialogbuttonbox.h index e28920b0e..252d4db61 100644 --- a/libqf/libqfqmlwidgets/src/dialogbuttonbox.h +++ b/libqf/libqfgui/src/dialogbuttonbox.h @@ -1,14 +1,14 @@ -#ifndef QF_QMLWIDGETS_DIALOGBUTTONBOX_H -#define QF_QMLWIDGETS_DIALOGBUTTONBOX_H +#ifndef QF_GUI_DIALOGBUTTONBOX_H +#define QF_GUI_DIALOGBUTTONBOX_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include namespace qf { -namespace qmlwidgets { +namespace gui { -class QFQMLWIDGETS_DECL_EXPORT DialogButtonBox : public QDialogButtonBox +class QFGUI_DECL_EXPORT DialogButtonBox : public QDialogButtonBox { Q_OBJECT public: diff --git a/libqf/libqfqmlwidgets/src/dialogs/dialog.cpp b/libqf/libqfgui/src/dialogs/dialog.cpp similarity index 82% rename from libqf/libqfqmlwidgets/src/dialogs/dialog.cpp rename to libqf/libqfgui/src/dialogs/dialog.cpp index 7321f815b..6857ece3d 100644 --- a/libqf/libqfqmlwidgets/src/dialogs/dialog.cpp +++ b/libqf/libqfgui/src/dialogs/dialog.cpp @@ -15,7 +15,7 @@ #include #include -using namespace qf::qmlwidgets::dialogs; +using namespace qf::gui::dialogs; Dialog::Dialog(QWidget *parent) : Dialog(QDialogButtonBox::NoButton, parent) @@ -48,9 +48,9 @@ void Dialog::setCentralWidget(QWidget *central_widget) sp.setVerticalPolicy(QSizePolicy::MinimumExpanding); m_centralWidget->setSizePolicy(sp); } - auto *dialog_widget = qobject_cast(central_widget); + auto *dialog_widget = qobject_cast(central_widget); if(dialog_widget) { - connect(dialog_widget, &qf::qmlwidgets::framework::DialogWidget::closeDialogRequest, this, &Dialog::done); + connect(dialog_widget, &qf::gui::framework::DialogWidget::closeDialogRequest, this, &Dialog::done); QMetaObject::invokeMethod(this, "settleDownDialogWidget", Qt::QueuedConnection); } else { @@ -62,7 +62,7 @@ void Dialog::setCentralWidget(QWidget *central_widget) void Dialog::settleDownDialogWidget() { - auto *dialog_widget = qobject_cast(m_centralWidget); + auto *dialog_widget = qobject_cast(m_centralWidget); if(dialog_widget) { QVariant dlg = QVariant::fromValue(this); bool ok = QMetaObject::invokeMethod(dialog_widget, "settleDownInDialog_qml", Q_ARG(QVariant, dlg)); @@ -76,7 +76,7 @@ void Dialog::settleDownDialogWidget() } } -qf::qmlwidgets::MenuBar* Dialog::menuBar() +qf::gui::MenuBar* Dialog::menuBar() { if(!m_menuBar) { m_menuBar = new MenuBar(this); @@ -84,16 +84,16 @@ qf::qmlwidgets::MenuBar* Dialog::menuBar() return m_menuBar; } -qf::qmlwidgets::ToolBar *Dialog::toolBar(const QString &name, bool create_if_not_exists) +qf::gui::ToolBar *Dialog::toolBar(const QString &name, bool create_if_not_exists) { - qf::qmlwidgets::ToolBar *ret = m_toolBars.value(name); + qf::gui::ToolBar *ret = m_toolBars.value(name); if(ret) { return ret; } if(!create_if_not_exists) { return nullptr; } - ret = new qf::qmlwidgets::ToolBar(this); + ret = new qf::gui::ToolBar(this); m_toolBars[name] = ret; updateLayout(); return ret; @@ -108,7 +108,7 @@ int Dialog::exec() void Dialog::done(int result) { qfLogFuncFrame() << result; - qf::qmlwidgets::framework::DialogWidget *dw = dialogWidget(); + qf::gui::framework::DialogWidget *dw = dialogWidget(); bool ok = true; if(dw) { ok = dw->acceptDialogDone(result); @@ -133,7 +133,7 @@ void Dialog::setRecordEditMode(int mode) if(m_dialogButtonBox) { auto bt_save = m_dialogButtonBox->button(QDialogButtonBox::Save); if(bt_save) { - if(mode == qf::qmlwidgets::model::DataDocument::ModeDelete) { + if(mode == qf::gui::model::DataDocument::ModeDelete) { bt_save->setText(tr("Delete")); } else { @@ -158,7 +158,7 @@ void Dialog::loadPersistentSettings() const QRect geometry = settings.value("geometry").toRect(); if(geometry.isValid()) { if(isSavePersistentPosition()) { - if(auto geometry2 = qf::qmlwidgets::internal::DesktopUtils::moveRectToVisibleDesktopScreen(geometry); geometry2.isValid()) { + if(auto geometry2 = qf::gui::internal::DesktopUtils::moveRectToVisibleDesktopScreen(geometry); geometry2.isValid()) { setGeometry(geometry2); return; } @@ -225,9 +225,9 @@ void Dialog::updateLayout() } -qf::qmlwidgets::framework::DialogWidget *Dialog::dialogWidget() +qf::gui::framework::DialogWidget *Dialog::dialogWidget() { - auto *ret = qobject_cast(m_centralWidget); + auto *ret = qobject_cast(m_centralWidget); return ret; } @@ -250,14 +250,14 @@ void Dialog::showEvent(QShowEvent *ev) void Dialog::updateCaptionFrame() { qfLogFuncFrame() << m_centralWidget; - auto *dialog_widget = qobject_cast(m_centralWidget); - auto *data_dialog_widget = qobject_cast(m_centralWidget); + auto *dialog_widget = qobject_cast(m_centralWidget); + auto *data_dialog_widget = qobject_cast(m_centralWidget); if(dialog_widget) { if(!m_captionFrame) { - m_captionFrame = new qf::qmlwidgets::dialogs::internal::CaptionFrame(this); - connect(dialog_widget, &qf::qmlwidgets::framework::DialogWidget::titleChanged, m_captionFrame, &qf::qmlwidgets::dialogs::internal::CaptionFrame::setText); + m_captionFrame = new qf::gui::dialogs::internal::CaptionFrame(this); + connect(dialog_widget, &qf::gui::framework::DialogWidget::titleChanged, m_captionFrame, &qf::gui::dialogs::internal::CaptionFrame::setText); if(data_dialog_widget) { - connect(data_dialog_widget, &qf::qmlwidgets::framework::DataDialogWidget::recordEditModeChanged, this, &Dialog::setRecordEditMode); + connect(data_dialog_widget, &qf::gui::framework::DataDialogWidget::recordEditModeChanged, this, &Dialog::setRecordEditMode); setRecordEditMode(data_dialog_widget->recordEditMode()); //qfInfo() << "conected:" << ok; } diff --git a/libqf/libqfqmlwidgets/src/dialogs/dialog.h b/libqf/libqfgui/src/dialogs/dialog.h similarity index 83% rename from libqf/libqfqmlwidgets/src/dialogs/dialog.h rename to libqf/libqfgui/src/dialogs/dialog.h index 2e170c4eb..e335069f7 100644 --- a/libqf/libqfqmlwidgets/src/dialogs/dialog.h +++ b/libqf/libqfgui/src/dialogs/dialog.h @@ -1,7 +1,7 @@ -#ifndef QF_QMLWIDGETS_DIALOGS_DIALOG_H -#define QF_QMLWIDGETS_DIALOGS_DIALOG_H +#ifndef QF_GUI_DIALOGS_DIALOG_H +#define QF_GUI_DIALOGS_DIALOG_H -#include "../qmlwidgetsglobal.h" +#include "../guiglobal.h" #include "../framework/ipersistentsettings.h" #include "../menubar.h" @@ -16,7 +16,7 @@ class QLabel; class QToolButton; namespace qf { -namespace qmlwidgets { +namespace gui { class DialogButtonBox; class ToolBar; @@ -31,11 +31,11 @@ namespace internal { class CaptionFrame; } -class QFQMLWIDGETS_DECL_EXPORT Dialog : public QDialog, public framework::IPersistentSettings +class QFGUI_DECL_EXPORT Dialog : public QDialog, public framework::IPersistentSettings { Q_OBJECT Q_PROPERTY(QString persistentSettingsId READ persistentSettingsId WRITE setPersistentSettingsId) - Q_PROPERTY(qf::qmlwidgets::DialogButtonBox* buttonBox READ buttonBox WRITE setButtonBox NOTIFY buttonBoxChanged) + Q_PROPERTY(qf::gui::DialogButtonBox* buttonBox READ buttonBox WRITE setButtonBox NOTIFY buttonBoxChanged) Q_PROPERTY(bool savePersistentPosition READ isSavePersistentPosition WRITE setSavePersistentPosition NOTIFY savePersistentPositionChanged) private: typedef QDialog Super; @@ -81,7 +81,7 @@ class QFQMLWIDGETS_DECL_EXPORT Dialog : public QDialog, public framework::IPersi void updateCaptionFrame(); void updateLayout(); - qf::qmlwidgets::framework::DialogWidget* dialogWidget(); + qf::gui::framework::DialogWidget* dialogWidget(); void showEvent(QShowEvent *ev) Q_DECL_OVERRIDE; protected: @@ -95,4 +95,4 @@ class QFQMLWIDGETS_DECL_EXPORT Dialog : public QDialog, public framework::IPersi }}} -#endif // QF_QMLWIDGETS_DIALOGS_DIALOG_H +#endif // QF_GUI_DIALOGS_DIALOG_H diff --git a/libqf/libqfqmlwidgets/src/dialogs/filedialog.cpp b/libqf/libqfgui/src/dialogs/filedialog.cpp similarity index 98% rename from libqf/libqfqmlwidgets/src/dialogs/filedialog.cpp rename to libqf/libqfgui/src/dialogs/filedialog.cpp index b1fe4270a..0e50e1716 100644 --- a/libqf/libqfqmlwidgets/src/dialogs/filedialog.cpp +++ b/libqf/libqfgui/src/dialogs/filedialog.cpp @@ -6,7 +6,7 @@ #include #include -using namespace qf::qmlwidgets::dialogs; +using namespace qf::gui::dialogs; FileDialog::FileDialog(QWidget *parent, Qt::WindowFlags flags) : QFileDialog(parent, flags) diff --git a/libqf/libqfqmlwidgets/src/dialogs/filedialog.h b/libqf/libqfgui/src/dialogs/filedialog.h similarity index 84% rename from libqf/libqfqmlwidgets/src/dialogs/filedialog.h rename to libqf/libqfgui/src/dialogs/filedialog.h index dab9eff3c..34d2cdb3a 100644 --- a/libqf/libqfqmlwidgets/src/dialogs/filedialog.h +++ b/libqf/libqfgui/src/dialogs/filedialog.h @@ -1,15 +1,15 @@ -#ifndef QF_QMLWIDGETS_DIALOGS_FILEDIALOG_H -#define QF_QMLWIDGETS_DIALOGS_FILEDIALOG_H +#ifndef QF_GUI_DIALOGS_FILEDIALOG_H +#define QF_GUI_DIALOGS_FILEDIALOG_H -#include "../qmlwidgetsglobal.h" +#include "../guiglobal.h" #include namespace qf { -namespace qmlwidgets { +namespace gui { namespace dialogs { -class QFQMLWIDGETS_DECL_EXPORT FileDialog : public QFileDialog +class QFGUI_DECL_EXPORT FileDialog : public QFileDialog { Q_OBJECT public: @@ -35,4 +35,4 @@ class QFQMLWIDGETS_DECL_EXPORT FileDialog : public QFileDialog }}} -#endif // QF_QMLWIDGETS_DIALOGS_FILEDIALOG_H +#endif // QF_GUI_DIALOGS_FILEDIALOG_H diff --git a/libqf/libqfqmlwidgets/src/dialogs/getiteminputdialog.cpp b/libqf/libqfgui/src/dialogs/getiteminputdialog.cpp similarity index 97% rename from libqf/libqfqmlwidgets/src/dialogs/getiteminputdialog.cpp rename to libqf/libqfgui/src/dialogs/getiteminputdialog.cpp index 4593fa982..552eb6385 100644 --- a/libqf/libqfqmlwidgets/src/dialogs/getiteminputdialog.cpp +++ b/libqf/libqfgui/src/dialogs/getiteminputdialog.cpp @@ -5,7 +5,7 @@ #include #include -using namespace qf::qmlwidgets::dialogs; +using namespace qf::gui::dialogs; GetItemInputDialog::GetItemInputDialog(QWidget *parent) : QDialog(parent) diff --git a/libqf/libqfqmlwidgets/src/dialogs/getiteminputdialog.h b/libqf/libqfgui/src/dialogs/getiteminputdialog.h similarity index 72% rename from libqf/libqfqmlwidgets/src/dialogs/getiteminputdialog.h rename to libqf/libqfgui/src/dialogs/getiteminputdialog.h index d13beeb09..d20ece08c 100644 --- a/libqf/libqfqmlwidgets/src/dialogs/getiteminputdialog.h +++ b/libqf/libqfgui/src/dialogs/getiteminputdialog.h @@ -1,7 +1,7 @@ -#ifndef QF_QMLWIDGETS_DIALOGS_GETITEMINPUTDIALOG_H -#define QF_QMLWIDGETS_DIALOGS_GETITEMINPUTDIALOG_H +#ifndef QF_GUI_DIALOGS_GETITEMINPUTDIALOG_H +#define QF_GUI_DIALOGS_GETITEMINPUTDIALOG_H -#include "../qmlwidgetsglobal.h" +#include "../guiglobal.h" #include #include @@ -10,10 +10,10 @@ class QLabel; class QComboBox; namespace qf { -namespace qmlwidgets { +namespace gui { namespace dialogs { -class QFQMLWIDGETS_DECL_EXPORT GetItemInputDialog : public QDialog +class QFGUI_DECL_EXPORT GetItemInputDialog : public QDialog { Q_OBJECT public: @@ -37,4 +37,4 @@ class QFQMLWIDGETS_DECL_EXPORT GetItemInputDialog : public QDialog }}} -#endif // QF_QMLWIDGETS_DIALOGS_GETITEMINPUTDIALOG_H +#endif // QF_GUI_DIALOGS_GETITEMINPUTDIALOG_H diff --git a/libqf/libqfqmlwidgets/src/dialogs/inputdialog.cpp b/libqf/libqfgui/src/dialogs/inputdialog.cpp similarity index 75% rename from libqf/libqfqmlwidgets/src/dialogs/inputdialog.cpp rename to libqf/libqfgui/src/dialogs/inputdialog.cpp index 9157b9e08..e12d8e30f 100644 --- a/libqf/libqfqmlwidgets/src/dialogs/inputdialog.cpp +++ b/libqf/libqfgui/src/dialogs/inputdialog.cpp @@ -1,6 +1,6 @@ #include "inputdialog.h" -using namespace qf::qmlwidgets::dialogs; +using namespace qf::gui::dialogs; InputDialog::InputDialog(QWidget *parent, Qt::WindowFlags flags) : QInputDialog(parent, flags) diff --git a/libqf/libqfqmlwidgets/src/dialogs/inputdialog.h b/libqf/libqfgui/src/dialogs/inputdialog.h similarity index 85% rename from libqf/libqfqmlwidgets/src/dialogs/inputdialog.h rename to libqf/libqfgui/src/dialogs/inputdialog.h index 803223f44..5daec90b2 100644 --- a/libqf/libqfqmlwidgets/src/dialogs/inputdialog.h +++ b/libqf/libqfgui/src/dialogs/inputdialog.h @@ -1,15 +1,15 @@ -#ifndef QF_QMLWIDGETS_DIALOGS_INPUTDIALOG_H -#define QF_QMLWIDGETS_DIALOGS_INPUTDIALOG_H +#ifndef QF_GUI_DIALOGS_INPUTDIALOG_H +#define QF_GUI_DIALOGS_INPUTDIALOG_H -#include "../qmlwidgetsglobal.h" +#include "../guiglobal.h" #include namespace qf { -namespace qmlwidgets { +namespace gui { namespace dialogs { -class QFQMLWIDGETS_DECL_EXPORT InputDialog : public QInputDialog +class QFGUI_DECL_EXPORT InputDialog : public QInputDialog { Q_OBJECT Q_PROPERTY(InputMode inputMode READ inputMode WRITE setInputMode) @@ -35,4 +35,4 @@ class QFQMLWIDGETS_DECL_EXPORT InputDialog : public QInputDialog }}} -#endif // QF_QMLWIDGETS_DIALOGS_INPUTDIALOG_H +#endif // QF_GUI_DIALOGS_INPUTDIALOG_H diff --git a/libqf/libqfqmlwidgets/src/dialogs/internal/captionframe.cpp b/libqf/libqfgui/src/dialogs/internal/captionframe.cpp similarity index 79% rename from libqf/libqfqmlwidgets/src/dialogs/internal/captionframe.cpp rename to libqf/libqfgui/src/dialogs/internal/captionframe.cpp index c562530e7..3e7f0a04d 100644 --- a/libqf/libqfqmlwidgets/src/dialogs/internal/captionframe.cpp +++ b/libqf/libqfgui/src/dialogs/internal/captionframe.cpp @@ -4,14 +4,14 @@ #include "../../style.h" #include -#include +#include #include #include #include #include -using namespace qf::qmlwidgets::dialogs::internal; +using namespace qf::gui::dialogs::internal; CaptionFrame::CaptionFrame(QWidget *parent) : QFrame(parent) @@ -74,7 +74,7 @@ QIcon CaptionFrame::createIcon() QString icon_path = m_iconSource; if(!icon_path.isEmpty()) { if(!icon_path.startsWith(QLatin1String(":/")) && !icon_path.startsWith('/')) { - qf::qmlwidgets::framework::Plugin *plugin = qf::qmlwidgets::framework::MainWindow::frameWork()->pluginForObject(this); + qf::gui::framework::Plugin *plugin = qf::gui::framework::MainWindow::frameWork()->pluginForObject(this); if(!plugin) { qfWarning() << "Cannot found plugin for:" << this << ", default icon will be set."; } @@ -88,14 +88,14 @@ QIcon CaptionFrame::createIcon() } } if(ico.isNull()) - ico = QIcon(":/qf/qmlwidgets/images/under-construction.png"); + ico = QIcon(":/qf/gui/images/under-construction.png"); } return ico; } void CaptionFrame::setRecordEditMode(int mode) { - qfLogFuncFrame() << "mode:" << qf::qmlwidgets::model::DataDocument::recordEditModeToString(qf::qmlwidgets::model::DataDocument::RecordEditMode(mode)); + qfLogFuncFrame() << "mode:" << qf::gui::model::DataDocument::recordEditModeToString(qf::gui::model::DataDocument::RecordEditMode(mode)); m_recordEditMode = mode; update(); } @@ -105,12 +105,12 @@ void CaptionFrame::update() qfLogFuncFrame() << "text:" << text(); QString label_text = text(); if(m_recordEditMode >= 0) { - auto mode = qf::qmlwidgets::model::DataDocument::RecordEditMode(m_recordEditMode); - if(mode == qf::qmlwidgets::model::DataDocument::ModeDelete) { + auto mode = qf::gui::model::DataDocument::RecordEditMode(m_recordEditMode); + if(mode == qf::gui::model::DataDocument::ModeDelete) { label_text = tr("Delete ") + label_text; setAlert(true); } - else if(mode == qf::qmlwidgets::model::DataDocument::ModeEdit) { + else if(mode == qf::gui::model::DataDocument::ModeEdit) { label_text = tr("Edit ") + label_text; } } @@ -118,7 +118,7 @@ void CaptionFrame::update() setVisible(is_visible); if(is_visible) { if(isAlert()) { - QPixmap pm = qf::qmlwidgets::Style::instance()->pixmap(":/qf/qmlwidgets/images/alert", 32); + QPixmap pm = qf::gui::Style::instance()->pixmap(":/qf/gui/images/alert", 32); m_captionIconLabel->setPixmap(pm); } else { diff --git a/libqf/libqfqmlwidgets/src/dialogs/internal/captionframe.h b/libqf/libqfgui/src/dialogs/internal/captionframe.h similarity index 87% rename from libqf/libqfqmlwidgets/src/dialogs/internal/captionframe.h rename to libqf/libqfgui/src/dialogs/internal/captionframe.h index f7577cb69..678c2c117 100644 --- a/libqf/libqfqmlwidgets/src/dialogs/internal/captionframe.h +++ b/libqf/libqfgui/src/dialogs/internal/captionframe.h @@ -1,5 +1,5 @@ -#ifndef QF_QMLWIDGETS_DIALOGS_DIALOG_INTERNAL_CAPTIONFRAME_H -#define QF_QMLWIDGETS_DIALOGS_DIALOG_INTERNAL_CAPTIONFRAME_H +#ifndef QF_GUI_DIALOGS_DIALOG_INTERNAL_CAPTIONFRAME_H +#define QF_GUI_DIALOGS_DIALOG_INTERNAL_CAPTIONFRAME_H #include @@ -10,7 +10,7 @@ class QLabel; class QToolButton; namespace qf { -namespace qmlwidgets { +namespace gui { namespace dialogs { namespace internal { diff --git a/libqf/libqfqmlwidgets/src/dialogs/messagebox.cpp b/libqf/libqfgui/src/dialogs/messagebox.cpp similarity index 98% rename from libqf/libqfqmlwidgets/src/dialogs/messagebox.cpp rename to libqf/libqfgui/src/dialogs/messagebox.cpp index b8aefeb18..476d6e095 100644 --- a/libqf/libqfqmlwidgets/src/dialogs/messagebox.cpp +++ b/libqf/libqfgui/src/dialogs/messagebox.cpp @@ -10,7 +10,7 @@ -namespace qf::qmlwidgets::dialogs { +namespace qf::gui::dialogs { MessageBox::MessageBox(QWidget *parent) : Super(parent) diff --git a/libqf/libqfqmlwidgets/src/dialogs/messagebox.h b/libqf/libqfgui/src/dialogs/messagebox.h similarity index 81% rename from libqf/libqfqmlwidgets/src/dialogs/messagebox.h rename to libqf/libqfgui/src/dialogs/messagebox.h index 492d91ff3..d0a73f74c 100644 --- a/libqf/libqfqmlwidgets/src/dialogs/messagebox.h +++ b/libqf/libqfgui/src/dialogs/messagebox.h @@ -1,7 +1,7 @@ -#ifndef QF_QMLWIDGETS_DIALOGS_MESSAGEBOX_H -#define QF_QMLWIDGETS_DIALOGS_MESSAGEBOX_H +#ifndef QF_GUI_DIALOGS_MESSAGEBOX_H +#define QF_GUI_DIALOGS_MESSAGEBOX_H -#include "../qmlwidgetsglobal.h" +#include "../guiglobal.h" #include @@ -11,10 +11,10 @@ namespace qf { namespace core { class Exception; } -namespace qmlwidgets { +namespace gui { namespace dialogs { -class QFQMLWIDGETS_DECL_EXPORT MessageBox : public QMessageBox +class QFGUI_DECL_EXPORT MessageBox : public QMessageBox { Q_OBJECT @@ -42,4 +42,4 @@ class QFQMLWIDGETS_DECL_EXPORT MessageBox : public QMessageBox }}} -#endif // QF_QMLWIDGETS_DIALOGS_MESSAGEBOX_H +#endif // QF_GUI_DIALOGS_MESSAGEBOX_H diff --git a/libqf/libqfqmlwidgets/src/dialogs/previewdialog.cpp b/libqf/libqfgui/src/dialogs/previewdialog.cpp similarity index 98% rename from libqf/libqfqmlwidgets/src/dialogs/previewdialog.cpp rename to libqf/libqfgui/src/dialogs/previewdialog.cpp index 84c003e60..e8c39357c 100644 --- a/libqf/libqfqmlwidgets/src/dialogs/previewdialog.cpp +++ b/libqf/libqfgui/src/dialogs/previewdialog.cpp @@ -13,7 +13,7 @@ #include #endif -using namespace qf::qmlwidgets::dialogs; +using namespace qf::gui::dialogs; PreviewDialog::PreviewDialog(QWidget *parent) : Super(parent) diff --git a/libqf/libqfqmlwidgets/src/dialogs/previewdialog.h b/libqf/libqfgui/src/dialogs/previewdialog.h similarity index 82% rename from libqf/libqfqmlwidgets/src/dialogs/previewdialog.h rename to libqf/libqfgui/src/dialogs/previewdialog.h index ca3cea3cc..ac8023027 100644 --- a/libqf/libqfqmlwidgets/src/dialogs/previewdialog.h +++ b/libqf/libqfgui/src/dialogs/previewdialog.h @@ -1,7 +1,7 @@ -#ifndef QF_QMLWIDGETS_DIALOGS_PREVIEWDIALOG_H -#define QF_QMLWIDGETS_DIALOGS_PREVIEWDIALOG_H +#ifndef QF_GUI_DIALOGS_PREVIEWDIALOG_H +#define QF_GUI_DIALOGS_PREVIEWDIALOG_H -#include "../qmlwidgetsglobal.h" +#include "../guiglobal.h" #include "dialog.h" #include "../framework/ipersistentsettings.h" @@ -15,10 +15,10 @@ namespace Ui { } namespace qf { -namespace qmlwidgets { +namespace gui { namespace dialogs { -class QFQMLWIDGETS_DECL_EXPORT PreviewDialog : public Dialog +class QFGUI_DECL_EXPORT PreviewDialog : public Dialog { Q_OBJECT private: @@ -47,4 +47,4 @@ class QFQMLWIDGETS_DECL_EXPORT PreviewDialog : public Dialog }}} -#endif // QF_QMLWIDGETS_DIALOGS_PREVIEWDIALOG_H +#endif // QF_GUI_DIALOGS_PREVIEWDIALOG_H diff --git a/libqf/libqfqmlwidgets/src/dialogs/previewdialog.ui b/libqf/libqfgui/src/dialogs/previewdialog.ui similarity index 95% rename from libqf/libqfqmlwidgets/src/dialogs/previewdialog.ui rename to libqf/libqfgui/src/dialogs/previewdialog.ui index 96ad5677a..d45c23ffd 100644 --- a/libqf/libqfqmlwidgets/src/dialogs/previewdialog.ui +++ b/libqf/libqfgui/src/dialogs/previewdialog.ui @@ -57,7 +57,7 @@ - :/qf/qmlwidgets/images/wordwrap.png:/qf/qmlwidgets/images/wordwrap.png + :/qf/gui/images/wordwrap.png:/qf/gui/images/wordwrap.png true diff --git a/libqf/libqfqmlwidgets/src/dialogs/qmldialog.cpp b/libqf/libqfgui/src/dialogs/qmldialog.cpp similarity index 84% rename from libqf/libqfqmlwidgets/src/dialogs/qmldialog.cpp rename to libqf/libqfgui/src/dialogs/qmldialog.cpp index 608cd7306..4c01ee41f 100644 --- a/libqf/libqfqmlwidgets/src/dialogs/qmldialog.cpp +++ b/libqf/libqfgui/src/dialogs/qmldialog.cpp @@ -8,7 +8,7 @@ #include #include -using namespace qf::qmlwidgets::dialogs; +using namespace qf::gui::dialogs; QmlDialog::QmlDialog(QWidget *parent) : Super(parent) @@ -32,12 +32,12 @@ int QmlDialog::standardButtons() return ret; } -qf::qmlwidgets::framework::DialogWidget *QmlDialog::dialogWidget() const +qf::gui::framework::DialogWidget *QmlDialog::dialogWidget() const { return qobject_cast(m_centralFrame); } -void QmlDialog::setDialogWidget(qf::qmlwidgets::framework::DialogWidget *w) +void QmlDialog::setDialogWidget(qf::gui::framework::DialogWidget *w) { QWidget *old_w = m_centralWidget; setCentralWidget(w); diff --git a/libqf/libqfqmlwidgets/src/dialogs/qmldialog.h b/libqf/libqfgui/src/dialogs/qmldialog.h similarity index 64% rename from libqf/libqfqmlwidgets/src/dialogs/qmldialog.h rename to libqf/libqfgui/src/dialogs/qmldialog.h index 57c71e433..3d6b8caf8 100644 --- a/libqf/libqfqmlwidgets/src/dialogs/qmldialog.h +++ b/libqf/libqfgui/src/dialogs/qmldialog.h @@ -1,7 +1,7 @@ -#ifndef QF_QMLWIDGETS_DIALOGS_QMLDIALOG_H -#define QF_QMLWIDGETS_DIALOGS_QMLDIALOG_H +#ifndef QF_GUI_DIALOGS_QMLDIALOG_H +#define QF_GUI_DIALOGS_QMLDIALOG_H -#include "../qmlwidgetsglobal.h" +#include "../guiglobal.h" #include "dialog.h" #include "../framework/ipersistentsettings.h" #include "../framework/dialogwidget.h" @@ -10,13 +10,13 @@ #include namespace qf { -namespace qmlwidgets { +namespace gui { class Frame; namespace dialogs { -class QFQMLWIDGETS_DECL_EXPORT QmlDialog : public Dialog, public QQmlParserStatus +class QFGUI_DECL_EXPORT QmlDialog : public Dialog, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -24,7 +24,7 @@ class QFQMLWIDGETS_DECL_EXPORT QmlDialog : public Dialog, public QQmlParserStatu Q_ENUM(QDialogButtonBox::StandardButton) Q_CLASSINFO("DefaultProperty", "widgets") Q_PROPERTY(QQmlListProperty widgets READ widgets) - Q_PROPERTY(qf::qmlwidgets::framework::DialogWidget* dialogWidget READ dialogWidget WRITE setDialogWidget NOTIFY dialogWidgetChanged) + Q_PROPERTY(qf::gui::framework::DialogWidget* dialogWidget READ dialogWidget WRITE setDialogWidget NOTIFY dialogWidgetChanged) Q_PROPERTY(int standardButtons READ standardButtons WRITE setStandardButtons) private: typedef Dialog Super; @@ -35,8 +35,8 @@ class QFQMLWIDGETS_DECL_EXPORT QmlDialog : public Dialog, public QQmlParserStatu void setStandardButtons(int bts) {setButtons((QDialogButtonBox::StandardButtons)bts);} int standardButtons(); - qf::qmlwidgets::framework::DialogWidget* dialogWidget() const; - Q_SLOT void setDialogWidget(qf::qmlwidgets::framework::DialogWidget* w); + qf::gui::framework::DialogWidget* dialogWidget() const; + Q_SLOT void setDialogWidget(qf::gui::framework::DialogWidget* w); Q_SIGNAL void dialogWidgetChanged(framework::DialogWidget* w); protected: QQmlListProperty widgets(); @@ -49,4 +49,4 @@ class QFQMLWIDGETS_DECL_EXPORT QmlDialog : public Dialog, public QQmlParserStatu }}} -#endif // QF_QMLWIDGETS_DIALOGS_QMLDIALOG_H +#endif // QF_GUI_DIALOGS_QMLDIALOG_H diff --git a/libqf/libqfqmlwidgets/src/exportcsvtableviewwidget.cpp b/libqf/libqfgui/src/exportcsvtableviewwidget.cpp similarity index 95% rename from libqf/libqfqmlwidgets/src/exportcsvtableviewwidget.cpp rename to libqf/libqfgui/src/exportcsvtableviewwidget.cpp index 57454f8cd..14cb9fa18 100644 --- a/libqf/libqfqmlwidgets/src/exportcsvtableviewwidget.cpp +++ b/libqf/libqfgui/src/exportcsvtableviewwidget.cpp @@ -1,9 +1,9 @@ #include "exportcsvtableviewwidget.h" #include "ui_exporttableviewwidget.h" -#include +#include -namespace qf::qmlwidgets { +namespace qf::gui { ExportCsvTableViewWidget::ExportCsvTableViewWidget(QTableView *table_view, QWidget *parent) : Super(table_view, parent) @@ -53,6 +53,6 @@ void ExportCsvTableViewWidget::setExportOptions(const QVariant& opts) const ui->lstCodec->setCurrentIndex(ui->lstCodec->findText(text_opts.codecName())); } -} // namespace qf::qmlwidgets +} // namespace qf::gui diff --git a/libqf/libqfgui/src/exportcsvtableviewwidget.h b/libqf/libqfgui/src/exportcsvtableviewwidget.h new file mode 100644 index 000000000..0dabd4f2e --- /dev/null +++ b/libqf/libqfgui/src/exportcsvtableviewwidget.h @@ -0,0 +1,24 @@ +#ifndef QF_GUI_EXPORTCSVTABLEVIEWWIDGET_H +#define QF_GUI_EXPORTCSVTABLEVIEWWIDGET_H + +#include "exporttableviewwidget.h" + +namespace qf { +namespace gui { + +class ExportCsvTableViewWidget : public qf::gui::ExportTableViewWidget +{ + Q_OBJECT +private: + typedef qf::gui::ExportTableViewWidget Super; +public: + ExportCsvTableViewWidget(QTableView *table_view, QWidget *parent = nullptr); +protected: + QVariant exportOptions() const Q_DECL_OVERRIDE; + void setExportOptions(const QVariant& opts) const Q_DECL_OVERRIDE; +}; + +} // namespace gui +} // namespace qf + +#endif // QF_GUI_EXPORTCSVTABLEVIEWWIDGET_H diff --git a/libqf/libqfqmlwidgets/src/exporttableviewwidget.cpp b/libqf/libqfgui/src/exporttableviewwidget.cpp similarity index 98% rename from libqf/libqfqmlwidgets/src/exporttableviewwidget.cpp rename to libqf/libqfgui/src/exporttableviewwidget.cpp index c0cb3fd73..1a0bbf231 100644 --- a/libqf/libqfqmlwidgets/src/exporttableviewwidget.cpp +++ b/libqf/libqfgui/src/exporttableviewwidget.cpp @@ -7,7 +7,7 @@ #include -namespace qf::qmlwidgets { +namespace qf::gui { ExportTableViewWidget::ExportTableViewWidget(QTableView *table_view, QWidget *parent) : Super(parent) @@ -98,5 +98,5 @@ void ExportTableViewWidget::setExportOptions(const QVariant &opts) const ui->edToLine->setValue(text_opts.toLine()); } -} // namespace qf::qmlwidgets +} // namespace qf::gui diff --git a/libqf/libqfqmlwidgets/src/exporttableviewwidget.h b/libqf/libqfgui/src/exporttableviewwidget.h similarity index 68% rename from libqf/libqfqmlwidgets/src/exporttableviewwidget.h rename to libqf/libqfgui/src/exporttableviewwidget.h index e8fc62093..f48e5219f 100644 --- a/libqf/libqfqmlwidgets/src/exporttableviewwidget.h +++ b/libqf/libqfgui/src/exporttableviewwidget.h @@ -1,5 +1,5 @@ -#ifndef QF_QMLWIDGETS_EXPORTTABLEVIEWWIDGET_H -#define QF_QMLWIDGETS_EXPORTTABLEVIEWWIDGET_H +#ifndef QF_GUI_EXPORTTABLEVIEWWIDGET_H +#define QF_GUI_EXPORTTABLEVIEWWIDGET_H #include "framework/dialogwidget.h" #include "framework/ipersistentoptions.h" @@ -10,17 +10,17 @@ class QTableView; namespace qf { //namespace core { namespace model { class TableModel; }} -namespace qmlwidgets { +namespace gui { namespace Ui { class ExportTableViewWidget; } -class ExportTableViewWidget : public qf::qmlwidgets::framework::DialogWidget, public qf::qmlwidgets::framework::IPersistentOptions +class ExportTableViewWidget : public qf::gui::framework::DialogWidget, public qf::gui::framework::IPersistentOptions { Q_OBJECT private: - typedef qf::qmlwidgets::framework::DialogWidget Super; + typedef qf::gui::framework::DialogWidget Super; public: explicit ExportTableViewWidget(QTableView *table_view, QWidget *parent = nullptr); ~ExportTableViewWidget() Q_DECL_OVERRIDE; @@ -39,7 +39,7 @@ class ExportTableViewWidget : public qf::qmlwidgets::framework::DialogWidget, pu Ui::ExportTableViewWidget *ui; }; -} // namespace qmlwidgets +} // namespace gui } // namespace qf -#endif // QF_QMLWIDGETS_EXPORTTABLEVIEWWIDGET_H +#endif // QF_GUI_EXPORTTABLEVIEWWIDGET_H diff --git a/libqf/libqfqmlwidgets/src/exporttableviewwidget.ui b/libqf/libqfgui/src/exporttableviewwidget.ui similarity index 97% rename from libqf/libqfqmlwidgets/src/exporttableviewwidget.ui rename to libqf/libqfgui/src/exporttableviewwidget.ui index 2564ca0e8..9807d68f2 100644 --- a/libqf/libqfqmlwidgets/src/exporttableviewwidget.ui +++ b/libqf/libqfgui/src/exporttableviewwidget.ui @@ -1,7 +1,7 @@ - qf::qmlwidgets::ExportTableViewWidget - + qf::gui::ExportTableViewWidget + 0 @@ -15,7 +15,7 @@ - + 0 @@ -331,7 +331,7 @@ - qf::qmlwidgets::SaveOptionsWidget + qf::gui::SaveOptionsWidget QWidget
src/saveoptionswidget.h
1 diff --git a/libqf/libqfqmlwidgets/src/frame.cpp b/libqf/libqfgui/src/frame.cpp similarity index 99% rename from libqf/libqfqmlwidgets/src/frame.cpp rename to libqf/libqfgui/src/frame.cpp index 8822123cf..52632e37b 100644 --- a/libqf/libqfqmlwidgets/src/frame.cpp +++ b/libqf/libqfgui/src/frame.cpp @@ -12,7 +12,7 @@ #include #include -using namespace qf::qmlwidgets; +using namespace qf::gui; static const int DefaultLayoutMargin = 1; diff --git a/libqf/libqfqmlwidgets/src/frame.h b/libqf/libqfgui/src/frame.h similarity index 88% rename from libqf/libqfqmlwidgets/src/frame.h rename to libqf/libqfgui/src/frame.h index 73ad1ec9c..167225ced 100644 --- a/libqf/libqfqmlwidgets/src/frame.h +++ b/libqf/libqfgui/src/frame.h @@ -1,7 +1,7 @@ -#ifndef QF_QMLWIDGETS_FRAME_H -#define QF_QMLWIDGETS_FRAME_H +#ifndef QF_GUI_FRAME_H +#define QF_GUI_FRAME_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include "layouttypeproperties.h" #include @@ -12,15 +12,15 @@ class QBoxLayout; namespace qf { -namespace qmlwidgets { +namespace gui { -class QFQMLWIDGETS_DECL_EXPORT Frame : public QFrame +class QFGUI_DECL_EXPORT Frame : public QFrame { Q_OBJECT Q_PROPERTY(QQmlListProperty widgets READ widgets) Q_CLASSINFO("DefaultProperty", "widgets") Q_PROPERTY(LayoutType layoutType READ layoutType WRITE setLayoutType NOTIFY layoutTypeChanged) - Q_PROPERTY(qf::qmlwidgets::LayoutTypeProperties* layoutProperties READ layoutTypeProperties WRITE setLayoutTypeProperties) + Q_PROPERTY(qf::gui::LayoutTypeProperties* layoutProperties READ layoutTypeProperties WRITE setLayoutTypeProperties) /// attachedObjects is a workaround for https://github.com/fvacek/quickbox/issues/2 Q_PROPERTY(QQmlListProperty attachedObjects READ attachedObjects) Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged) diff --git a/libqf/libqfqmlwidgets/src/framework/application.cpp b/libqf/libqfgui/src/framework/application.cpp similarity index 96% rename from libqf/libqfqmlwidgets/src/framework/application.cpp rename to libqf/libqfgui/src/framework/application.cpp index 4a72da71c..e2fa79991 100644 --- a/libqf/libqfqmlwidgets/src/framework/application.cpp +++ b/libqf/libqfgui/src/framework/application.cpp @@ -10,7 +10,7 @@ #include namespace qfu = qf::core::utils; -using namespace qf::qmlwidgets::framework; +using namespace qf::gui::framework; Application::Application(int &argc, char **argv) : Super(argc, argv) @@ -29,7 +29,7 @@ Application *Application::instance(bool must_exist) { auto *ret = qobject_cast(Super::instance()); if(!ret && must_exist) { - qfFatal("qf::qmlwidgets::framework::Application instance MUST exist."); + qfFatal("qf::gui::framework::Application instance MUST exist."); } return ret; } diff --git a/libqf/libqfqmlwidgets/src/framework/application.h b/libqf/libqfgui/src/framework/application.h similarity index 74% rename from libqf/libqfqmlwidgets/src/framework/application.h rename to libqf/libqfgui/src/framework/application.h index f37a2b317..e3956b7be 100644 --- a/libqf/libqfqmlwidgets/src/framework/application.h +++ b/libqf/libqfgui/src/framework/application.h @@ -1,7 +1,7 @@ -#ifndef QF_QMLWIDGETS_FRAMEWORK_APPLICATION_H -#define QF_QMLWIDGETS_FRAMEWORK_APPLICATION_H +#ifndef QF_GUI_FRAMEWORK_APPLICATION_H +#define QF_GUI_FRAMEWORK_APPLICATION_H -#include "../qmlwidgetsglobal.h" +#include "../guiglobal.h" #include #include @@ -10,12 +10,12 @@ class QQmlEngine; namespace qf { -namespace qmlwidgets { +namespace gui { namespace framework { class MainWindow; -class QFQMLWIDGETS_DECL_EXPORT Application : public QApplication +class QFGUI_DECL_EXPORT Application : public QApplication { Q_OBJECT friend class MainWindow; @@ -45,4 +45,4 @@ public slots: }}} -#endif // QF_QMLWIDGETS_FRAMEWORK_APPLICATION_H +#endif // QF_GUI_FRAMEWORK_APPLICATION_H diff --git a/libqf/libqfqmlwidgets/src/framework/centralwidget.cpp b/libqf/libqfgui/src/framework/centralwidget.cpp similarity index 82% rename from libqf/libqfqmlwidgets/src/framework/centralwidget.cpp rename to libqf/libqfgui/src/framework/centralwidget.cpp index 9e5342d17..91fcb349f 100644 --- a/libqf/libqfqmlwidgets/src/framework/centralwidget.cpp +++ b/libqf/libqfgui/src/framework/centralwidget.cpp @@ -5,7 +5,7 @@ #include #include -using namespace qf::qmlwidgets::framework; +using namespace qf::gui::framework; CentralWidget::CentralWidget(MainWindow *parent) : Super(parent) diff --git a/libqf/libqfqmlwidgets/src/framework/centralwidget.h b/libqf/libqfgui/src/framework/centralwidget.h similarity index 72% rename from libqf/libqfqmlwidgets/src/framework/centralwidget.h rename to libqf/libqfgui/src/framework/centralwidget.h index feb42abb7..838326fb2 100644 --- a/libqf/libqfqmlwidgets/src/framework/centralwidget.h +++ b/libqf/libqfgui/src/framework/centralwidget.h @@ -1,18 +1,18 @@ -#ifndef QF_QMLWIDGETS_FRAMEWORK_CENTRALWIDGET_H -#define QF_QMLWIDGETS_FRAMEWORK_CENTRALWIDGET_H +#ifndef QF_GUI_FRAMEWORK_CENTRALWIDGET_H +#define QF_GUI_FRAMEWORK_CENTRALWIDGET_H -#include "../qmlwidgetsglobal.h" +#include "../guiglobal.h" #include namespace qf { -namespace qmlwidgets { +namespace gui { namespace framework { class PartWidget; class MainWindow; -class QFQMLWIDGETS_DECL_EXPORT CentralWidget : public QWidget +class QFGUI_DECL_EXPORT CentralWidget : public QWidget { Q_OBJECT private: @@ -35,4 +35,4 @@ class QFQMLWIDGETS_DECL_EXPORT CentralWidget : public QWidget }}} -#endif // QF_QMLWIDGETS_FRAMEWORK_CENTRALWIDGET_H +#endif // QF_GUI_FRAMEWORK_CENTRALWIDGET_H diff --git a/libqf/libqfqmlwidgets/src/framework/cursoroverrider.cpp b/libqf/libqfgui/src/framework/cursoroverrider.cpp similarity index 85% rename from libqf/libqfqmlwidgets/src/framework/cursoroverrider.cpp rename to libqf/libqfgui/src/framework/cursoroverrider.cpp index abae8d747..dcf3d39a2 100644 --- a/libqf/libqfqmlwidgets/src/framework/cursoroverrider.cpp +++ b/libqf/libqfgui/src/framework/cursoroverrider.cpp @@ -2,7 +2,7 @@ #include -using namespace qf::qmlwidgets::framework; +using namespace qf::gui::framework; CursorOverrider::CursorOverrider(Qt::CursorShape cursor_shape) { diff --git a/libqf/libqfgui/src/framework/cursoroverrider.h b/libqf/libqfgui/src/framework/cursoroverrider.h new file mode 100644 index 000000000..f1992400e --- /dev/null +++ b/libqf/libqfgui/src/framework/cursoroverrider.h @@ -0,0 +1,21 @@ +#ifndef QF_GUI_FRAMEWORK_CURSOROVERRIDER_H +#define QF_GUI_FRAMEWORK_CURSOROVERRIDER_H + +#include "../guiglobal.h" + +#include + +namespace qf { +namespace gui { +namespace framework { + +class QFGUI_DECL_EXPORT CursorOverrider +{ +public: + CursorOverrider(Qt::CursorShape cursor_shape); + virtual ~CursorOverrider(); +}; + +}}} + +#endif // CURSOROVERRIDER_H diff --git a/libqf/libqfqmlwidgets/src/framework/datadialogwidget.cpp b/libqf/libqfgui/src/framework/datadialogwidget.cpp similarity index 63% rename from libqf/libqfqmlwidgets/src/framework/datadialogwidget.cpp rename to libqf/libqfgui/src/framework/datadialogwidget.cpp index 151c063f6..3a5b88188 100644 --- a/libqf/libqfqmlwidgets/src/framework/datadialogwidget.cpp +++ b/libqf/libqfgui/src/framework/datadialogwidget.cpp @@ -1,11 +1,11 @@ #include "datadialogwidget.h" #include "../dialogs/dialog.h" -#include +#include #include -namespace qfm = qf::qmlwidgets::model; -using namespace qf::qmlwidgets::framework; +namespace qfm = qf::gui::model; +using namespace qf::gui::framework; DataDialogWidget::DataDialogWidget(QWidget *parent) : Super(parent) @@ -14,23 +14,23 @@ DataDialogWidget::DataDialogWidget(QWidget *parent) DataDialogWidget::~DataDialogWidget() = default; -qf::qmlwidgets::DataController *DataDialogWidget::dataController() +qf::gui::DataController *DataDialogWidget::dataController() { if(!m_dataController) { - m_dataController = new qf::qmlwidgets::DataController(this); + m_dataController = new qf::gui::DataController(this); m_dataController->setWidget(this); } return m_dataController; } -void DataDialogWidget::setDataController(qf::qmlwidgets::DataController *dc) +void DataDialogWidget::setDataController(qf::gui::DataController *dc) { m_dataController = dc; } -qf::qmlwidgets::model::DataDocument *DataDialogWidget::dataDocument(bool throw_exc) +qf::gui::model::DataDocument *DataDialogWidget::dataDocument(bool throw_exc) { - qf::qmlwidgets::DataController *dc = dataController(); + qf::gui::DataController *dc = dataController(); return dc->document(throw_exc); } @@ -39,7 +39,7 @@ bool DataDialogWidget::load(const QVariant &id, int mode) auto *doc = dataDocument(!qf::core::Exception::Throw); if(doc) { connect(doc, &qfm::DataDocument::saved, this, &DataDialogWidget::dataSaved, Qt::UniqueConnection); - bool ok = doc->load(id, qf::qmlwidgets::model::DataDocument::RecordEditMode(mode)); + bool ok = doc->load(id, qf::gui::model::DataDocument::RecordEditMode(mode)); if(ok) emit recordEditModeChanged(mode); return ok; @@ -51,14 +51,14 @@ bool DataDialogWidget::acceptDialogDone(int result) { qfLogFuncFrame(); bool ret = true; - if(result == qf::qmlwidgets::dialogs::Dialog::ResultAccept) { + if(result == qf::gui::dialogs::Dialog::ResultAccept) { auto mode = recordEditMode(); - if(mode == qf::qmlwidgets::model::DataDocument::ModeDelete) { + if(mode == qf::gui::model::DataDocument::ModeDelete) { ret = dropData(); } - else if(mode == qf::qmlwidgets::model::DataDocument::ModeEdit - || mode == qf::qmlwidgets::model::DataDocument::ModeInsert - || mode == qf::qmlwidgets::model::DataDocument::ModeCopy) { + else if(mode == qf::gui::model::DataDocument::ModeEdit + || mode == qf::gui::model::DataDocument::ModeInsert + || mode == qf::gui::model::DataDocument::ModeCopy) { ret = saveData(); } } diff --git a/libqf/libqfqmlwidgets/src/framework/datadialogwidget.h b/libqf/libqfgui/src/framework/datadialogwidget.h similarity index 56% rename from libqf/libqfqmlwidgets/src/framework/datadialogwidget.h rename to libqf/libqfgui/src/framework/datadialogwidget.h index e0b69b49f..37c4c1d91 100644 --- a/libqf/libqfqmlwidgets/src/framework/datadialogwidget.h +++ b/libqf/libqfgui/src/framework/datadialogwidget.h @@ -1,32 +1,32 @@ #ifndef DATADIALOGWIDGET_H #define DATADIALOGWIDGET_H -#include "../qmlwidgetsglobal.h" +#include "../guiglobal.h" #include "../datacontroller.h" #include "dialogwidget.h" #include "../model/datadocument.h" namespace qf { -namespace qmlwidgets { +namespace gui { namespace framework { -class QFQMLWIDGETS_DECL_EXPORT DataDialogWidget : public DialogWidget +class QFGUI_DECL_EXPORT DataDialogWidget : public DialogWidget { Q_OBJECT - Q_PROPERTY(qf::qmlwidgets::DataController* dataController READ dataController WRITE setDataController) + Q_PROPERTY(qf::gui::DataController* dataController READ dataController WRITE setDataController) private: typedef DialogWidget Super; public: DataDialogWidget(QWidget *parent = nullptr); ~DataDialogWidget() Q_DECL_OVERRIDE; public: - qf::qmlwidgets::DataController *dataController(); - void setDataController(qf::qmlwidgets::DataController *dc); + qf::gui::DataController *dataController(); + void setDataController(qf::gui::DataController *dc); - qf::qmlwidgets::model::DataDocument* dataDocument(bool throw_exc = qf::core::Exception::Throw); + qf::gui::model::DataDocument* dataDocument(bool throw_exc = qf::core::Exception::Throw); - Q_SLOT virtual bool load(const QVariant &id = QVariant(), int mode = qf::qmlwidgets::model::DataDocument::ModeEdit); + Q_SLOT virtual bool load(const QVariant &id = QVariant(), int mode = qf::gui::model::DataDocument::ModeEdit); bool acceptDialogDone(int result) Q_DECL_OVERRIDE; @@ -38,7 +38,7 @@ class QFQMLWIDGETS_DECL_EXPORT DataDialogWidget : public DialogWidget virtual bool saveData(); virtual bool dropData(); protected: - qf::qmlwidgets::DataController *m_dataController = nullptr; + qf::gui::DataController *m_dataController = nullptr; }; }}} diff --git a/libqf/libqfqmlwidgets/src/framework/dialogwidget.cpp b/libqf/libqfgui/src/framework/dialogwidget.cpp similarity index 77% rename from libqf/libqfqmlwidgets/src/framework/dialogwidget.cpp rename to libqf/libqfgui/src/framework/dialogwidget.cpp index ed492d181..f46cd8f23 100644 --- a/libqf/libqfqmlwidgets/src/framework/dialogwidget.cpp +++ b/libqf/libqfgui/src/framework/dialogwidget.cpp @@ -7,7 +7,7 @@ #include #include -using namespace qf::qmlwidgets::framework; +using namespace qf::gui::framework; DialogWidget::DialogWidget(QWidget *parent) : Super(parent), IPersistentSettings(this) @@ -32,20 +32,20 @@ QVariant DialogWidget::acceptDialogDone_qml(const QVariant &result) void DialogWidget::settleDownInDialog_qml(const QVariant &dlg) { auto *o = dlg.value(); - auto *pdlg = qobject_cast(o); + auto *pdlg = qobject_cast(o); QF_ASSERT(pdlg != nullptr, "Invalid dialog", return); settleDownInDialog(pdlg); } -void DialogWidget::settleDownInDialog(qf::qmlwidgets::dialogs::Dialog *dlg) +void DialogWidget::settleDownInDialog(qf::gui::dialogs::Dialog *dlg) { Q_UNUSED(dlg); } -qf::qmlwidgets::Action* DialogWidget::action(const QString &name, bool throw_exc) +qf::gui::Action* DialogWidget::action(const QString &name, bool throw_exc) { qfLogFuncFrame() << "name:" << name; - qf::qmlwidgets::Action *ret = actions().value(name); + qf::gui::Action *ret = actions().value(name); if(!ret && throw_exc) QF_EXCEPTION(tr("Cannot find action name '%1'").arg(name)); return ret; diff --git a/libqf/libqfqmlwidgets/src/framework/dialogwidget.h b/libqf/libqfgui/src/framework/dialogwidget.h similarity index 71% rename from libqf/libqfqmlwidgets/src/framework/dialogwidget.h rename to libqf/libqfgui/src/framework/dialogwidget.h index 8cef046cf..13893c8a0 100644 --- a/libqf/libqfqmlwidgets/src/framework/dialogwidget.h +++ b/libqf/libqfgui/src/framework/dialogwidget.h @@ -1,7 +1,7 @@ -#ifndef QF_QMLWIDGETS_FRAMEWORK_DIALOGWIDGET_H -#define QF_QMLWIDGETS_FRAMEWORK_DIALOGWIDGET_H +#ifndef QF_GUI_FRAMEWORK_DIALOGWIDGET_H +#define QF_GUI_FRAMEWORK_DIALOGWIDGET_H -#include "../qmlwidgetsglobal.h" +#include "../guiglobal.h" #include "ipersistentsettings.h" #include "../frame.h" @@ -10,7 +10,7 @@ #include namespace qf { -namespace qmlwidgets { +namespace gui { class Action; @@ -20,7 +20,7 @@ class Dialog; namespace framework { -class QFQMLWIDGETS_DECL_EXPORT DialogWidget : public Frame, public IPersistentSettings +class QFGUI_DECL_EXPORT DialogWidget : public Frame, public IPersistentSettings { Q_OBJECT @@ -45,11 +45,11 @@ class QFQMLWIDGETS_DECL_EXPORT DialogWidget : public Frame, public IPersistentSe public: /// define this slot to allow QML code call C++ settleDownInDialog() implementation, /// when settleDownInDialog() is implemented in QML and hides C++ implementations - Q_INVOKABLE virtual void settleDownInDialog(qf::qmlwidgets::dialogs::Dialog *dlg); + Q_INVOKABLE virtual void settleDownInDialog(qf::gui::dialogs::Dialog *dlg); Q_INVOKABLE void settleDownInDialog_qml(const QVariant &dlg); - virtual qf::qmlwidgets::Action* action(const QString &name, bool throw_exc = true); + virtual qf::gui::Action* action(const QString &name, bool throw_exc = true); protected: - typedef QMap ActionMap; + typedef QMap ActionMap; protected: virtual ActionMap createActions(); virtual ActionMap actions(); @@ -59,4 +59,4 @@ class QFQMLWIDGETS_DECL_EXPORT DialogWidget : public Frame, public IPersistentSe }}} -#endif // QF_QMLWIDGETS_FRAMEWORK_DIALOGWIDGET_H +#endif // QF_GUI_FRAMEWORK_DIALOGWIDGET_H diff --git a/libqf/libqfqmlwidgets/src/framework/dockablewidget.cpp b/libqf/libqfgui/src/framework/dockablewidget.cpp similarity index 62% rename from libqf/libqfqmlwidgets/src/framework/dockablewidget.cpp rename to libqf/libqfgui/src/framework/dockablewidget.cpp index d44ec46c5..07c6776f2 100644 --- a/libqf/libqfqmlwidgets/src/framework/dockablewidget.cpp +++ b/libqf/libqfgui/src/framework/dockablewidget.cpp @@ -4,7 +4,7 @@ -namespace qf::qmlwidgets::framework { +namespace qf::gui::framework { DockableWidget::DockableWidget(QWidget *parent) : Super(parent) @@ -12,7 +12,7 @@ DockableWidget::DockableWidget(QWidget *parent) } -} // namespace qf::qmlwidgets::framework +} // namespace qf::gui::framework diff --git a/libqf/libqfgui/src/framework/dockablewidget.h b/libqf/libqfgui/src/framework/dockablewidget.h new file mode 100644 index 000000000..2b6606a49 --- /dev/null +++ b/libqf/libqfgui/src/framework/dockablewidget.h @@ -0,0 +1,23 @@ +#ifndef QF_GUI_FRAMEWORK_DOCKABLEWIDGET_H +#define QF_GUI_FRAMEWORK_DOCKABLEWIDGET_H + +#include "dialogwidget.h" + +namespace qf { +namespace gui { +namespace framework { + +class QFGUI_DECL_EXPORT DockableWidget : public qf::gui::framework::DialogWidget +{ + Q_OBJECT +private: + typedef qf::gui::framework::DialogWidget Super; +public: + DockableWidget(QWidget *parent = nullptr); +}; + +} // namespace framework +} // namespace gui +} // namespace qf + +#endif // QF_GUI_FRAMEWORK_DOCKABLEWIDGET_H diff --git a/libqf/libqfqmlwidgets/src/framework/dockwidget.cpp b/libqf/libqfgui/src/framework/dockwidget.cpp similarity index 96% rename from libqf/libqfqmlwidgets/src/framework/dockwidget.cpp rename to libqf/libqfgui/src/framework/dockwidget.cpp index 19e9222dd..68c9b18ff 100644 --- a/libqf/libqfqmlwidgets/src/framework/dockwidget.cpp +++ b/libqf/libqfgui/src/framework/dockwidget.cpp @@ -6,7 +6,7 @@ #include #include -using namespace qf::qmlwidgets::framework; +using namespace qf::gui::framework; DockWidget::DockWidget(const QString &window_title, QWidget *parent, Qt::WindowFlags flags) : Super(window_title, parent, flags) diff --git a/libqf/libqfqmlwidgets/src/framework/dockwidget.h b/libqf/libqfgui/src/framework/dockwidget.h similarity index 75% rename from libqf/libqfqmlwidgets/src/framework/dockwidget.h rename to libqf/libqfgui/src/framework/dockwidget.h index 836c452f3..1364ec5ee 100644 --- a/libqf/libqfqmlwidgets/src/framework/dockwidget.h +++ b/libqf/libqfgui/src/framework/dockwidget.h @@ -1,17 +1,17 @@ -#ifndef QF_QMLWIDGETS_FRAMEWORK_DOCKWIDGET_H -#define QF_QMLWIDGETS_FRAMEWORK_DOCKWIDGET_H +#ifndef QF_GUI_FRAMEWORK_DOCKWIDGET_H +#define QF_GUI_FRAMEWORK_DOCKWIDGET_H -#include "../qmlwidgetsglobal.h" +#include "../guiglobal.h" #include "../framework/ipersistentsettings.h" #include namespace qf { -namespace qmlwidgets { +namespace gui { class Frame; namespace framework { -class QFQMLWIDGETS_DECL_EXPORT DockWidget : public QDockWidget, public framework::IPersistentSettings +class QFGUI_DECL_EXPORT DockWidget : public QDockWidget, public framework::IPersistentSettings { Q_OBJECT Q_PROPERTY(QWidget* widget READ widget WRITE setQmlWidget) @@ -35,4 +35,4 @@ class QFQMLWIDGETS_DECL_EXPORT DockWidget : public QDockWidget, public framework }}} -#endif // QF_QMLWIDGETS_FRAMEWORK_DOCKWIDGET_H +#endif // QF_GUI_FRAMEWORK_DOCKWIDGET_H diff --git a/libqf/libqfqmlwidgets/src/framework/ipersistentoptions.cpp b/libqf/libqfgui/src/framework/ipersistentoptions.cpp similarity index 90% rename from libqf/libqfqmlwidgets/src/framework/ipersistentoptions.cpp rename to libqf/libqfgui/src/framework/ipersistentoptions.cpp index 8dfb4f573..263d57487 100644 --- a/libqf/libqfqmlwidgets/src/framework/ipersistentoptions.cpp +++ b/libqf/libqfgui/src/framework/ipersistentoptions.cpp @@ -2,7 +2,7 @@ #include -using namespace qf::qmlwidgets::framework; +using namespace qf::gui::framework; IPersistentOptions::IPersistentOptions(QObject *controlled_object) : m_controlledObject(controlled_object) diff --git a/libqf/libqfqmlwidgets/src/framework/ipersistentoptions.h b/libqf/libqfgui/src/framework/ipersistentoptions.h similarity index 64% rename from libqf/libqfqmlwidgets/src/framework/ipersistentoptions.h rename to libqf/libqfgui/src/framework/ipersistentoptions.h index 2eb660838..ab03b1e3b 100644 --- a/libqf/libqfqmlwidgets/src/framework/ipersistentoptions.h +++ b/libqf/libqfgui/src/framework/ipersistentoptions.h @@ -1,7 +1,7 @@ -#ifndef QF_QMLWIDGETS_FRAMEWORK_IPERSISTENTOPTIONS_H -#define QF_QMLWIDGETS_FRAMEWORK_IPERSISTENTOPTIONS_H +#ifndef QF_GUI_FRAMEWORK_IPERSISTENTOPTIONS_H +#define QF_GUI_FRAMEWORK_IPERSISTENTOPTIONS_H -#include "../qmlwidgetsglobal.h" +#include "../guiglobal.h" #include @@ -9,10 +9,10 @@ class QObject; class QVariant; namespace qf { -namespace qmlwidgets { +namespace gui { namespace framework { -class QFQMLWIDGETS_DECL_EXPORT IPersistentOptions +class QFGUI_DECL_EXPORT IPersistentOptions { public: IPersistentOptions(QObject *controlled_object); @@ -31,4 +31,4 @@ class QFQMLWIDGETS_DECL_EXPORT IPersistentOptions }}} -#endif // QF_QMLWIDGETS_FRAMEWORK_IPERSISTENTOPTIONS_H +#endif // QF_GUI_FRAMEWORK_IPERSISTENTOPTIONS_H diff --git a/libqf/libqfqmlwidgets/src/framework/ipersistentsettings.cpp b/libqf/libqfgui/src/framework/ipersistentsettings.cpp similarity index 98% rename from libqf/libqfqmlwidgets/src/framework/ipersistentsettings.cpp rename to libqf/libqfgui/src/framework/ipersistentsettings.cpp index 29333400a..c639c374c 100644 --- a/libqf/libqfqmlwidgets/src/framework/ipersistentsettings.cpp +++ b/libqf/libqfgui/src/framework/ipersistentsettings.cpp @@ -5,7 +5,7 @@ #include #include -using namespace qf::qmlwidgets::framework; +using namespace qf::gui::framework; IPersistentSettings::IPersistentSettings(QObject *controlled_object) : m_controlledObject(controlled_object) diff --git a/libqf/libqfqmlwidgets/src/framework/ipersistentsettings.h b/libqf/libqfgui/src/framework/ipersistentsettings.h similarity index 80% rename from libqf/libqfqmlwidgets/src/framework/ipersistentsettings.h rename to libqf/libqfgui/src/framework/ipersistentsettings.h index 303e16b6c..239dae588 100644 --- a/libqf/libqfqmlwidgets/src/framework/ipersistentsettings.h +++ b/libqf/libqfgui/src/framework/ipersistentsettings.h @@ -1,17 +1,17 @@ -#ifndef QF_QMLWIDGETS_FRAMEWORK_IPERSISTENTSETTINGS_H -#define QF_QMLWIDGETS_FRAMEWORK_IPERSISTENTSETTINGS_H +#ifndef QF_GUI_FRAMEWORK_IPERSISTENTSETTINGS_H +#define QF_GUI_FRAMEWORK_IPERSISTENTSETTINGS_H -#include "../qmlwidgetsglobal.h" +#include "../guiglobal.h" #include class QObject; namespace qf { -namespace qmlwidgets { +namespace gui { namespace framework { -class QFQMLWIDGETS_DECL_EXPORT IPersistentSettings +class QFGUI_DECL_EXPORT IPersistentSettings { public: IPersistentSettings(QObject *controlled_object); diff --git a/libqf/libqfqmlwidgets/src/framework/logwidget.cpp b/libqf/libqfgui/src/framework/logwidget.cpp similarity index 93% rename from libqf/libqfqmlwidgets/src/framework/logwidget.cpp rename to libqf/libqfgui/src/framework/logwidget.cpp index 54ad1e894..d01855768 100644 --- a/libqf/libqfqmlwidgets/src/framework/logwidget.cpp +++ b/libqf/libqfgui/src/framework/logwidget.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include @@ -18,14 +18,14 @@ #include #include -namespace qfm = qf::qmlwidgets::model; +namespace qfm = qf::gui::model; -namespace qf::qmlwidgets::framework { +namespace qf::gui::framework { LogWidgetTableView::LogWidgetTableView(QWidget *parent) : Super(parent) { - auto *style = qf::qmlwidgets::Style::instance(); + auto *style = qf::gui::Style::instance(); { m_copySelectionToClipboardAction = new QAction(tr("Copy")); m_copySelectionToClipboardAction->setObjectName("LogWidgetTableView copy action"); @@ -98,7 +98,7 @@ LogWidget::LogWidget(QWidget *parent) { auto *a = new QAction(tr("Maximal log length"), this); connect(a, &QAction::triggered, this, [this]() { - qf::qmlwidgets::model::LogTableModel *m = this->logTableModel(); + qf::gui::model::LogTableModel *m = this->logTableModel(); int max_rows = m->maximumRowCount(); bool ok; max_rows = QInputDialog::getInt(this, tr("Get number"), tr("Maximal log row count:"), max_rows, 0, std::numeric_limits::max(), 100, &ok); @@ -145,13 +145,13 @@ void LogWidget::clear() m_logTableModel->clear(); } -void LogWidget::setLogTableModel(qmlwidgets::model::LogTableModel *m) +void LogWidget::setLogTableModel(gui::model::LogTableModel *m) { if(m_logTableModel != m) { m_logTableModel = m; m_filterModel->setSourceModel(m_logTableModel); if(m_logTableModel) { - connect(m_logTableModel, &qmlwidgets::model::LogTableModel::logEntryInserted, this, &LogWidget::checkScrollToLastEntry, Qt::UniqueConnection); + connect(m_logTableModel, &gui::model::LogTableModel::logEntryInserted, this, &LogWidget::checkScrollToLastEntry, Qt::UniqueConnection); QScrollBar *sb = ui->tableView->verticalScrollBar(); if(sb) connect(sb, &QScrollBar::valueChanged, this, &LogWidget::onVerticalScrollBarValueChanged, Qt::UniqueConnection); @@ -170,7 +170,7 @@ void LogWidget::addLogEntry(const qf::core::LogEntryMap &le) addLog(le.level(), le.category(), le.file(), le.line(), le.message(), le.timeStamp(), le.function()); } -qf::qmlwidgets::model::LogTableModel *LogWidget::logTableModel() +qf::gui::model::LogTableModel *LogWidget::logTableModel() { if(!m_logTableModel) { auto *m = new qfm::LogTableModel(this); @@ -221,7 +221,7 @@ bool LogWidget::isAutoScroll() { QScrollBar *sb = ui->tableView->verticalScrollBar(); if(sb) { - if(logTableModel()->direction() == qf::qmlwidgets::model::LogTableModel::Direction::AppendToBottom) { + if(logTableModel()->direction() == qf::gui::model::LogTableModel::Direction::AppendToBottom) { //fprintf(stderr, "BOTTOM scrollbar min: %d max: %d value: %d\n", sb->minimum(), sb->maximum(), sb->value()); return (sb->value() == sb->maximum()); } @@ -353,7 +353,7 @@ void LogWidget::checkScrollToLastEntry() ui->tableView->horizontalHeader()->resizeSections(QHeaderView::ResizeToContents); } if(isAutoScroll()) { - if(logTableModel()->direction() == qf::qmlwidgets::model::LogTableModel::Direction::AppendToBottom) { + if(logTableModel()->direction() == qf::gui::model::LogTableModel::Direction::AppendToBottom) { ui->tableView->scrollToBottom(); } else { @@ -363,6 +363,6 @@ void LogWidget::checkScrollToLastEntry() } } -} // namespace qf::qmlwidgets::framework +} // namespace qf::gui::framework // namespace qmlwiggets diff --git a/libqf/libqfqmlwidgets/src/framework/logwidget.h b/libqf/libqfgui/src/framework/logwidget.h similarity index 75% rename from libqf/libqfqmlwidgets/src/framework/logwidget.h rename to libqf/libqfgui/src/framework/logwidget.h index 497535c7b..87de7e8d1 100644 --- a/libqf/libqfqmlwidgets/src/framework/logwidget.h +++ b/libqf/libqfgui/src/framework/logwidget.h @@ -1,5 +1,5 @@ -#ifndef QF_QMLWIDGETS_FRAMEWORK_LOGWIDGET_H -#define QF_QMLWIDGETS_FRAMEWORK_LOGWIDGET_H +#ifndef QF_GUI_FRAMEWORK_LOGWIDGET_H +#define QF_GUI_FRAMEWORK_LOGWIDGET_H #include "dockablewidget.h" @@ -10,9 +10,9 @@ class QAbstractButton; namespace qf::core { class LogEntryMap; } -namespace qf::qmlwidgets::model { class LogTableModel; } +namespace qf::gui::model { class LogTableModel; } -namespace qf::qmlwidgets::framework { +namespace qf::gui::framework { class LogFilterProxyModel; @@ -20,7 +20,7 @@ namespace Ui { class LogWidget; } -class QFQMLWIDGETS_DECL_EXPORT LogWidgetTableView : public QTableView +class QFGUI_DECL_EXPORT LogWidgetTableView : public QTableView { Q_OBJECT private: @@ -34,11 +34,11 @@ class QFQMLWIDGETS_DECL_EXPORT LogWidgetTableView : public QTableView QAction *m_copySelectionToClipboardAction; }; -class QFQMLWIDGETS_DECL_EXPORT LogWidget : public qf::qmlwidgets::framework::DockableWidget +class QFGUI_DECL_EXPORT LogWidget : public qf::gui::framework::DockableWidget { Q_OBJECT private: - typedef qf::qmlwidgets::framework::DockableWidget Super; + typedef qf::gui::framework::DockableWidget Super; public: explicit LogWidget(QWidget *parent = nullptr); ~LogWidget(); @@ -48,8 +48,8 @@ class QFQMLWIDGETS_DECL_EXPORT LogWidget : public qf::qmlwidgets::framework::Doc Q_SLOT void checkScrollToLastEntry(); void clear(); - virtual void setLogTableModel(qf::qmlwidgets::model::LogTableModel *m); - qf::qmlwidgets::model::LogTableModel* logTableModel(); + virtual void setLogTableModel(qf::gui::model::LogTableModel *m); + qf::gui::model::LogTableModel* logTableModel(); Q_SIGNAL void severityTresholdChanged(NecroLog::Level lvl); void setSeverityTreshold(NecroLog::Level lvl); @@ -74,7 +74,7 @@ class QFQMLWIDGETS_DECL_EXPORT LogWidget : public qf::qmlwidgets::framework::Doc bool isAutoScroll(); protected: - qf::qmlwidgets::model::LogTableModel* m_logTableModel = nullptr; + qf::gui::model::LogTableModel* m_logTableModel = nullptr; LogFilterProxyModel* m_filterModel = nullptr; private: Ui::LogWidget *ui; @@ -87,4 +87,4 @@ class QFQMLWIDGETS_DECL_EXPORT LogWidget : public qf::qmlwidgets::framework::Doc } -#endif // QF_QMLWIDGETS_FRAMEWORK_LOGWIDGET_H +#endif // QF_GUI_FRAMEWORK_LOGWIDGET_H diff --git a/libqf/libqfqmlwidgets/src/framework/logwidget.ui b/libqf/libqfgui/src/framework/logwidget.ui similarity index 73% rename from libqf/libqfqmlwidgets/src/framework/logwidget.ui rename to libqf/libqfgui/src/framework/logwidget.ui index 40dda0fd2..14bc6d65a 100644 --- a/libqf/libqfqmlwidgets/src/framework/logwidget.ui +++ b/libqf/libqfgui/src/framework/logwidget.ui @@ -1,7 +1,7 @@ - qf::qmlwidgets::framework::LogWidget - + qf::gui::framework::LogWidget + 0 @@ -58,7 +58,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -74,8 +74,8 @@ Clear - - :/qf/qmlwidgets/images/flat/delete.svg:/qf/qmlwidgets/images/flat/delete.svg + + :/qf/gui/images/flat/delete.svg:/qf/gui/images/flat/delete.svg true @@ -88,8 +88,8 @@ Copy to clipboard. - - :/qf/qmlwidgets/images/flat/copy.svg:/qf/qmlwidgets/images/flat/copy.svg + + :/qf/gui/images/flat/copy.svg:/qf/gui/images/flat/copy.svg true @@ -102,8 +102,8 @@ Resize columns to fit content - - :/qf/qmlwidgets/images/flat/zoom_fitwidth.svg:/qf/qmlwidgets/images/flat/zoom_fitwidth.svg + + :/qf/gui/images/flat/zoom_fitwidth.svg:/qf/gui/images/flat/zoom_fitwidth.svg true @@ -119,11 +119,11 @@ ... - - :/qf/qmlwidgets/images/flat/settings.svg:/qf/qmlwidgets/images/flat/settings.svg + + :/qf/gui/images/flat/settings.svg:/qf/gui/images/flat/settings.svg - QToolButton::InstantPopup + QToolButton::ToolButtonPopupMode::InstantPopup true @@ -133,15 +133,15 @@ - + - QAbstractItemView::NoEditTriggers + QAbstractItemView::EditTrigger::NoEditTriggers - QAbstractItemView::SelectRows + QAbstractItemView::SelectionBehavior::SelectRows - Qt::NoPen + Qt::PenStyle::NoPen true @@ -152,13 +152,13 @@ - qf::qmlwidgets::framework::LogWidgetTableView + qf::gui::framework::LogWidgetTableView QTableView
src/framework/logwidget.h
 - + diff --git a/libqf/libqfqmlwidgets/src/framework/mainwindow.cpp b/libqf/libqfgui/src/framework/mainwindow.cpp similarity index 92% rename from libqf/libqfqmlwidgets/src/framework/mainwindow.cpp rename to libqf/libqfgui/src/framework/mainwindow.cpp index 7f4c913a0..a512637fd 100644 --- a/libqf/libqfqmlwidgets/src/framework/mainwindow.cpp +++ b/libqf/libqfgui/src/framework/mainwindow.cpp @@ -24,7 +24,7 @@ #include #include -using namespace qf::qmlwidgets::framework; +using namespace qf::gui::framework; MainWindow* MainWindow::self = nullptr; @@ -168,7 +168,7 @@ bool MainWindow::setActivePart(const QString &feature_id) return centralWidget()->setActivePart(ix, true); } -void MainWindow::registerPlugin(qf::qmlwidgets::framework::Plugin *plugin) +void MainWindow::registerPlugin(qf::gui::framework::Plugin *plugin) { m_loadedPlugins.append(plugin); emit plugin->installed(); @@ -195,7 +195,7 @@ void MainWindow::setPersistentSettingDomains(const QString &organization_domain, //QSettings::setDefaultFormat(QSettings::IniFormat); } -qf::qmlwidgets::MenuBar *MainWindow::menuBar() +qf::gui::MenuBar *MainWindow::menuBar() { QMenuBar *mb = Super::menuBar(); auto *menu_bar = qobject_cast(mb); @@ -207,18 +207,18 @@ qf::qmlwidgets::MenuBar *MainWindow::menuBar() return menu_bar; } -qf::qmlwidgets::ToolBar *MainWindow::toolBar(const QString &name, bool create_if_not_exists) +qf::gui::ToolBar *MainWindow::toolBar(const QString &name, bool create_if_not_exists) { - qf::qmlwidgets::ToolBar *ret = m_toolBars.value(name); + qf::gui::ToolBar *ret = m_toolBars.value(name); if(!ret && !create_if_not_exists) return nullptr; - ret = new qf::qmlwidgets::ToolBar(this); + ret = new qf::gui::ToolBar(this); addToolBar(Qt::TopToolBarArea, ret); m_toolBars[name] = ret; return ret; } -qf::qmlwidgets::StatusBar *MainWindow::statusBar() +qf::gui::StatusBar *MainWindow::statusBar() { QStatusBar *sb = Super::statusBar(); auto *status_bar = qobject_cast(sb); @@ -230,7 +230,7 @@ qf::qmlwidgets::StatusBar *MainWindow::statusBar() return status_bar; } -void MainWindow::setStatusBar(qf::qmlwidgets::StatusBar *sbar) +void MainWindow::setStatusBar(qf::gui::StatusBar *sbar) { qfLogFuncFrame() << sbar << "previous:" << Super::statusBar(); sbar->setParent(nullptr); @@ -263,10 +263,10 @@ void MainWindow::setCentralWidget(CentralWidget *widget) void MainWindow::addDockWidget(Qt::DockWidgetArea area, QDockWidget *dockwidget) { Q_ASSERT(dockwidget); - if(auto* ps = dynamic_cast(dockwidget)) { + dockwidget->setParent(nullptr); + if(auto* ps = dynamic_cast(dockwidget)) { ps->loadPersistentSettingsRecursively(); } - dockwidget->setParent(nullptr); Super::addDockWidget(area, dockwidget); } @@ -321,11 +321,11 @@ Plugin *MainWindow::pluginForObject(QObject *qml_object) return ret; } -qf::qmlwidgets::dialogs::QmlDialog *MainWindow::createQmlDialog(QWidget *parent) +qf::gui::dialogs::QmlDialog *MainWindow::createQmlDialog(QWidget *parent) { if(parent == nullptr) parent = this; - auto *ret = new qf::qmlwidgets::dialogs::QmlDialog(parent); + auto *ret = new qf::gui::dialogs::QmlDialog(parent); //Application *app = Application::instance(); //QQmlEngine *qe = app->qmlEngine(); //qe->setObjectOwnership(ret, QQmlEngine::JavaScriptOwnership); diff --git a/libqf/libqfqmlwidgets/src/framework/mainwindow.h b/libqf/libqfgui/src/framework/mainwindow.h similarity index 66% rename from libqf/libqfqmlwidgets/src/framework/mainwindow.h rename to libqf/libqfgui/src/framework/mainwindow.h index 12e9a1868..a5f79bebb 100644 --- a/libqf/libqfqmlwidgets/src/framework/mainwindow.h +++ b/libqf/libqfgui/src/framework/mainwindow.h @@ -1,7 +1,7 @@ -#ifndef QF_QMLWIDGETS_FRAMEWORK_MAINWINDOW_H -#define QF_QMLWIDGETS_FRAMEWORK_MAINWINDOW_H +#ifndef QF_GUI_FRAMEWORK_MAINWINDOW_H +#define QF_GUI_FRAMEWORK_MAINWINDOW_H -#include "../qmlwidgetsglobal.h" +#include "../guiglobal.h" #include "ipersistentsettings.h" #include "../statusbar.h" //#include "pluginloader.h" @@ -17,7 +17,7 @@ class Settings; } } namespace qf { -namespace qmlwidgets { +namespace gui { class MenuBar; class ToolBar; @@ -34,13 +34,13 @@ class DockWidget; class PartWidget; class CentralWidget; class Plugin; -typedef QList PluginList; +typedef QList PluginList; -class QFQMLWIDGETS_DECL_EXPORT MainWindow : public QMainWindow, public IPersistentSettings +class QFGUI_DECL_EXPORT MainWindow : public QMainWindow, public IPersistentSettings { Q_OBJECT - Q_PROPERTY(qf::qmlwidgets::MenuBar* menuBar READ menuBar) - Q_PROPERTY(qf::qmlwidgets::StatusBar* statusBar READ statusBar) + Q_PROPERTY(qf::gui::MenuBar* menuBar READ menuBar) + Q_PROPERTY(qf::gui::StatusBar* statusBar READ statusBar) Q_PROPERTY(QString persistentSettingsId READ persistentSettingsId WRITE setPersistentSettingsId) Q_PROPERTY(QString uiLanguageName READ uiLanguageName WRITE setUiLanguageName NOTIFY uiLanguageNameChanged) private: @@ -54,27 +54,27 @@ class QFQMLWIDGETS_DECL_EXPORT MainWindow : public QMainWindow, public IPersiste CentralWidget* centralWidget(); void setCentralWidget(CentralWidget *widget); public: - void registerPlugin(qf::qmlwidgets::framework::Plugin *plugin); + void registerPlugin(qf::gui::framework::Plugin *plugin); virtual void loadPlugins(); - QList installedPlugins(); + QList installedPlugins(); /// framework API Q_INVOKABLE void setPersistentSettingDomains(const QString &organization_domain, const QString &organization_name, const QString &application_name = QString()); MenuBar* menuBar(); - Q_INVOKABLE qf::qmlwidgets::ToolBar* toolBar(const QString &name, bool create_if_not_exists = false); + Q_INVOKABLE qf::gui::ToolBar* toolBar(const QString &name, bool create_if_not_exists = false); StatusBar* statusBar(); - Q_INVOKABLE void setStatusBar(qf::qmlwidgets::StatusBar *sbar); + Q_INVOKABLE void setStatusBar(qf::gui::StatusBar *sbar); Q_INVOKABLE void addDockWidget(Qt::DockWidgetArea area, QDockWidget *dockwidget); - Q_INVOKABLE void addPartWidget(qf::qmlwidgets::framework::PartWidget *widget, const QString &feature_id = QString()); + Q_INVOKABLE void addPartWidget(qf::gui::framework::PartWidget *widget, const QString &feature_id = QString()); - Q_INVOKABLE qf::qmlwidgets::framework::Plugin* plugin(const QString &feature_id, bool throw_exc = false); - Q_INVOKABLE qf::qmlwidgets::framework::Plugin* pluginForObject(QObject *qml_object); + Q_INVOKABLE qf::gui::framework::Plugin* plugin(const QString &feature_id, bool throw_exc = false); + Q_INVOKABLE qf::gui::framework::Plugin* pluginForObject(QObject *qml_object); - Q_INVOKABLE qf::qmlwidgets::dialogs::QmlDialog* createQmlDialog(QWidget *parent = nullptr); + Q_INVOKABLE qf::gui::dialogs::QmlDialog* createQmlDialog(QWidget *parent = nullptr); Q_SLOT void loadPersistentSettings(); @@ -104,15 +104,15 @@ class QFQMLWIDGETS_DECL_EXPORT MainWindow : public QMainWindow, public IPersiste private: PluginList m_loadedPlugins; PluginLoader *m_pluginLoader = nullptr; - QMap m_toolBars; + QMap m_toolBars; static MainWindow *self; }; template static T* getPlugin() { - static_assert(std::is_base_of::value, "given type is not Plugin"); - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + static_assert(std::is_base_of::value, "given type is not Plugin"); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); T* ret = nullptr; for(auto *p : fwk->installedPlugins()) { ret = dynamic_cast(p); @@ -130,7 +130,7 @@ static PartWidget* initPluginWidget(QString title, QString featureId) { auto* widget = new Widget(); auto *part_widget = new PartWidget(title, featureId); - qf::qmlwidgets::framework::MainWindow::frameWork()->addPartWidget(part_widget); + qf::gui::framework::MainWindow::frameWork()->addPartWidget(part_widget); part_widget->addWidget(widget); widget->settleDownInPartWidget(part_widget); return part_widget; @@ -138,4 +138,4 @@ static PartWidget* initPluginWidget(QString title, QString featureId) }}} -#endif // QF_QMLWIDGETS_FRAMEWORK_MAINWINDOW_H +#endif // QF_GUI_FRAMEWORK_MAINWINDOW_H diff --git a/libqf/libqfqmlwidgets/src/framework/partswitch.cpp b/libqf/libqfgui/src/framework/partswitch.cpp similarity index 96% rename from libqf/libqfqmlwidgets/src/framework/partswitch.cpp rename to libqf/libqfgui/src/framework/partswitch.cpp index 9b8f39f36..9fdb1b3ea 100644 --- a/libqf/libqfqmlwidgets/src/framework/partswitch.cpp +++ b/libqf/libqfgui/src/framework/partswitch.cpp @@ -9,7 +9,7 @@ #include -using namespace qf::qmlwidgets::framework; +using namespace qf::gui::framework; PartSwitchToolButton::PartSwitchToolButton(QWidget *parent) : Super(parent), m_partIndex() @@ -34,7 +34,7 @@ PartSwitch::PartSwitch(StackedCentralWidget *central_widget, QWidget *parent) : } -qf::qmlwidgets::framework::PartSwitch::~PartSwitch() +qf::gui::framework::PartSwitch::~PartSwitch() = default; void PartSwitch::addPartWidget(PartWidget *widget) diff --git a/libqf/libqfqmlwidgets/src/framework/partswitch.h b/libqf/libqfgui/src/framework/partswitch.h similarity index 86% rename from libqf/libqfqmlwidgets/src/framework/partswitch.h rename to libqf/libqfgui/src/framework/partswitch.h index 7fd888663..76648b093 100644 --- a/libqf/libqfqmlwidgets/src/framework/partswitch.h +++ b/libqf/libqfgui/src/framework/partswitch.h @@ -1,5 +1,5 @@ -#ifndef QF_QMLWIDGETS_FRAMEWORK_PARTSWITCH_H -#define QF_QMLWIDGETS_FRAMEWORK_PARTSWITCH_H +#ifndef QF_GUI_FRAMEWORK_PARTSWITCH_H +#define QF_GUI_FRAMEWORK_PARTSWITCH_H #include #include @@ -7,7 +7,7 @@ #include namespace qf { -namespace qmlwidgets { +namespace gui { namespace framework { class MainWindow; @@ -53,4 +53,4 @@ class PartSwitch : public QToolBar }}} -#endif // QF_QMLWIDGETS_FRAMEWORK_PARTSWITCH_H +#endif // QF_GUI_FRAMEWORK_PARTSWITCH_H diff --git a/libqf/libqfqmlwidgets/src/framework/partwidget.cpp b/libqf/libqfgui/src/framework/partwidget.cpp similarity index 90% rename from libqf/libqfqmlwidgets/src/framework/partwidget.cpp rename to libqf/libqfgui/src/framework/partwidget.cpp index 0965a90e1..4e0773437 100644 --- a/libqf/libqfqmlwidgets/src/framework/partwidget.cpp +++ b/libqf/libqfgui/src/framework/partwidget.cpp @@ -13,7 +13,7 @@ #include #include -using namespace qf::qmlwidgets::framework; +using namespace qf::gui::framework; PartWidget::PartWidget(const QString &feature_id, QWidget *parent) : Super(parent) @@ -21,7 +21,7 @@ PartWidget::PartWidget(const QString &feature_id, QWidget *parent) { qfLogFuncFrame(); setFeatureId(feature_id); - m_captionFrame = new qf::qmlwidgets::dialogs::internal::CaptionFrame(this); + m_captionFrame = new qf::gui::dialogs::internal::CaptionFrame(this); m_centralFrame = new Frame(this); m_centralFrame->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); m_centralFrame->setLayoutType(Frame::LayoutVertical); @@ -78,7 +78,7 @@ void PartWidget::updateCaptionFrame() m_captionFrame->setIcon(ico); } -qf::qmlwidgets::MenuBar *PartWidget::menuBar() +qf::gui::MenuBar *PartWidget::menuBar() { if(!m_menuBar) { m_menuBar = new MenuBar(); @@ -89,9 +89,9 @@ qf::qmlwidgets::MenuBar *PartWidget::menuBar() return m_menuBar; } -qf::qmlwidgets::ToolBar *PartWidget::toolBar(const QString &name, bool create_if_not_exists) +qf::gui::ToolBar *PartWidget::toolBar(const QString &name, bool create_if_not_exists) { - qf::qmlwidgets::ToolBar *ret = m_toolBars.value(name); + qf::gui::ToolBar *ret = m_toolBars.value(name); if(ret) { return ret; } @@ -110,7 +110,7 @@ qf::qmlwidgets::ToolBar *PartWidget::toolBar(const QString &name, bool create_if m_toolBarsLayout->setSpacing(1); m_toolBarsLayout->addStretch(); } - ret = new qf::qmlwidgets::ToolBar(this); + ret = new qf::gui::ToolBar(this); m_toolBarsLayout->insertWidget(m_toolBars.count(), ret); m_toolBars[name] = ret; return ret; @@ -138,7 +138,7 @@ QIcon PartWidget::createIcon() } } if(ico.isNull()) - ico = QIcon(":/qf/qmlwidgets/images/under-construction.png"); + ico = QIcon(":/qf/gui/images/under-construction.png"); return ico; } @@ -164,7 +164,7 @@ QQmlListProperty PartWidget::widgets() return m_centralFrame->widgets(); } -qf::qmlwidgets::Frame *PartWidget::centralFrame() +qf::gui::Frame *PartWidget::centralFrame() { QF_ASSERT_EX(m_centralFrame != nullptr, "Centralframe is NULL"); return m_centralFrame; diff --git a/libqf/libqfqmlwidgets/src/framework/partwidget.h b/libqf/libqfgui/src/framework/partwidget.h similarity index 81% rename from libqf/libqfqmlwidgets/src/framework/partwidget.h rename to libqf/libqfgui/src/framework/partwidget.h index 03d6fa9be..9aec30ed6 100644 --- a/libqf/libqfqmlwidgets/src/framework/partwidget.h +++ b/libqf/libqfgui/src/framework/partwidget.h @@ -1,7 +1,7 @@ -#ifndef QF_QMLWIDGETS_FRAMEWORK_PARTWIDGET_H -#define QF_QMLWIDGETS_FRAMEWORK_PARTWIDGET_H +#ifndef QF_GUI_FRAMEWORK_PARTWIDGET_H +#define QF_GUI_FRAMEWORK_PARTWIDGET_H -#include "../qmlwidgetsglobal.h" +#include "../guiglobal.h" #include "ipersistentsettings.h" #include @@ -13,7 +13,7 @@ class QHBoxLayout; namespace qf { -namespace qmlwidgets { +namespace gui { class Frame; class MenuBar; class ToolBar; @@ -26,7 +26,7 @@ namespace framework { class Plugin; -class QFQMLWIDGETS_DECL_EXPORT PartWidget : public QWidget, public IPersistentSettings, public QQmlParserStatus +class QFGUI_DECL_EXPORT PartWidget : public QWidget, public IPersistentSettings, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -40,7 +40,7 @@ class QFQMLWIDGETS_DECL_EXPORT PartWidget : public QWidget, public IPersistentSe Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged) /// attachedObjects is a workaround for https://github.com/fvacek/quickbox/issues/2 Q_PROPERTY(QQmlListProperty attachedObjects READ attachedObjects) - Q_PROPERTY(qf::qmlwidgets::MenuBar* menuBar READ menuBar) + Q_PROPERTY(qf::gui::MenuBar* menuBar READ menuBar) private: typedef QWidget Super; public: @@ -68,7 +68,7 @@ class QFQMLWIDGETS_DECL_EXPORT PartWidget : public QWidget, public IPersistentSe Q_SLOT void updateCaptionFrame(); MenuBar* menuBar(); - Q_INVOKABLE qf::qmlwidgets::ToolBar* toolBar(const QString &name, bool create_if_not_exists = false); + Q_INVOKABLE qf::gui::ToolBar* toolBar(const QString &name, bool create_if_not_exists = false); void addWidget(QWidget *w); protected: QQmlListProperty widgets(); @@ -82,7 +82,7 @@ class QFQMLWIDGETS_DECL_EXPORT PartWidget : public QWidget, public IPersistentSe MenuBar *m_menuBar = nullptr; QMap m_toolBars; QHBoxLayout *m_toolBarsLayout = nullptr; - qf::qmlwidgets::dialogs::internal::CaptionFrame *m_captionFrame; + qf::gui::dialogs::internal::CaptionFrame *m_captionFrame; Frame *m_centralFrame; QString m_title; QString m_iconSource; @@ -92,4 +92,4 @@ class QFQMLWIDGETS_DECL_EXPORT PartWidget : public QWidget, public IPersistentSe }}} -#endif // QF_QMLWIDGETS_FRAMEWORK_PARTWIDGET_H +#endif // QF_GUI_FRAMEWORK_PARTWIDGET_H diff --git a/libqf/libqfqmlwidgets/src/framework/plugin.cpp b/libqf/libqfgui/src/framework/plugin.cpp similarity index 98% rename from libqf/libqfqmlwidgets/src/framework/plugin.cpp rename to libqf/libqfgui/src/framework/plugin.cpp index 7a4c8b901..02c97d977 100644 --- a/libqf/libqfqmlwidgets/src/framework/plugin.cpp +++ b/libqf/libqfgui/src/framework/plugin.cpp @@ -11,7 +11,7 @@ #include #include -using namespace qf::qmlwidgets::framework; +using namespace qf::gui::framework; QString Plugin::m_reportsDir; diff --git a/libqf/libqfqmlwidgets/src/framework/plugin.h b/libqf/libqfgui/src/framework/plugin.h similarity index 83% rename from libqf/libqfqmlwidgets/src/framework/plugin.h rename to libqf/libqfgui/src/framework/plugin.h index e45233edd..9ee173773 100644 --- a/libqf/libqfqmlwidgets/src/framework/plugin.h +++ b/libqf/libqfgui/src/framework/plugin.h @@ -1,7 +1,7 @@ -#ifndef QF_QMLWIDGETS_FRAMEWORK_PLUGIN_H -#define QF_QMLWIDGETS_FRAMEWORK_PLUGIN_H +#ifndef QF_GUI_FRAMEWORK_PLUGIN_H +#define QF_GUI_FRAMEWORK_PLUGIN_H -#include "../qmlwidgetsglobal.h" +#include "../guiglobal.h" #include @@ -10,10 +10,10 @@ class QQmlEngine; namespace qf { -namespace qmlwidgets { +namespace gui { namespace framework { -class QFQMLWIDGETS_DECL_EXPORT Plugin : public QObject +class QFGUI_DECL_EXPORT Plugin : public QObject { Q_OBJECT public: @@ -33,7 +33,7 @@ class QFQMLWIDGETS_DECL_EXPORT Plugin : public QObject QString featureId() const { return m_featureId; } //QString settingsDir() const { return "plugin/" + featureId(); } QString findReportFile(const QString &report_file_path) const; - struct QFQMLWIDGETS_DECL_EXPORT ReportFileInfo + struct QFGUI_DECL_EXPORT ReportFileInfo { QString reportName; QString reportFilePath; diff --git a/libqf/libqfqmlwidgets/src/framework/pluginmanifest.cpp b/libqf/libqfgui/src/framework/pluginmanifest.cpp similarity index 91% rename from libqf/libqfqmlwidgets/src/framework/pluginmanifest.cpp rename to libqf/libqfgui/src/framework/pluginmanifest.cpp index 640ba9946..e4e44dba7 100644 --- a/libqf/libqfqmlwidgets/src/framework/pluginmanifest.cpp +++ b/libqf/libqfgui/src/framework/pluginmanifest.cpp @@ -2,7 +2,7 @@ #include -using namespace qf::qmlwidgets::framework; +using namespace qf::gui::framework; PluginManifest::PluginManifest(QObject *parent) : QObject(parent) diff --git a/libqf/libqfqmlwidgets/src/framework/pluginmanifest.h b/libqf/libqfgui/src/framework/pluginmanifest.h similarity index 81% rename from libqf/libqfqmlwidgets/src/framework/pluginmanifest.h rename to libqf/libqfgui/src/framework/pluginmanifest.h index 1146e3975..7201ea310 100644 --- a/libqf/libqfqmlwidgets/src/framework/pluginmanifest.h +++ b/libqf/libqfgui/src/framework/pluginmanifest.h @@ -1,7 +1,7 @@ -#ifndef QF_QMLWIDGETS_FRAMEWORK_PLUGINMANIFEST_H -#define QF_QMLWIDGETS_FRAMEWORK_PLUGINMANIFEST_H +#ifndef QF_GUI_FRAMEWORK_PLUGINMANIFEST_H +#define QF_GUI_FRAMEWORK_PLUGINMANIFEST_H -#include "../qmlwidgetsglobal.h" +#include "../guiglobal.h" #include @@ -9,10 +9,10 @@ #include namespace qf { -namespace qmlwidgets { +namespace gui { namespace framework { -class QFQMLWIDGETS_DECL_EXPORT PluginManifest : public QObject +class QFGUI_DECL_EXPORT PluginManifest : public QObject { Q_OBJECT Q_PROPERTY(QString featureId READ featureId WRITE setFeatureId NOTIFY featureIdChanged FINAL) @@ -43,4 +43,4 @@ class QFQMLWIDGETS_DECL_EXPORT PluginManifest : public QObject }}} -#endif // QF_QMLWIDGETS_FRAMEWORK_PLUGINMANIFEST_H +#endif // QF_GUI_FRAMEWORK_PLUGINMANIFEST_H diff --git a/libqf/libqfqmlwidgets/src/framework/stackedcentralwidget.cpp b/libqf/libqfgui/src/framework/stackedcentralwidget.cpp similarity index 98% rename from libqf/libqfqmlwidgets/src/framework/stackedcentralwidget.cpp rename to libqf/libqfgui/src/framework/stackedcentralwidget.cpp index ed6beffef..6ad1ff965 100644 --- a/libqf/libqfqmlwidgets/src/framework/stackedcentralwidget.cpp +++ b/libqf/libqfgui/src/framework/stackedcentralwidget.cpp @@ -12,7 +12,7 @@ -namespace qf::qmlwidgets::framework { +namespace qf::gui::framework { StackedCentralWidget::StackedCentralWidget(MainWindow *parent) : Super(parent) diff --git a/libqf/libqfqmlwidgets/src/framework/stackedcentralwidget.h b/libqf/libqfgui/src/framework/stackedcentralwidget.h similarity index 85% rename from libqf/libqfqmlwidgets/src/framework/stackedcentralwidget.h rename to libqf/libqfgui/src/framework/stackedcentralwidget.h index 4ab1dfa8b..07ba2a4f0 100644 --- a/libqf/libqfqmlwidgets/src/framework/stackedcentralwidget.h +++ b/libqf/libqfgui/src/framework/stackedcentralwidget.h @@ -1,19 +1,19 @@ #ifndef STACKEDCENTRALWIDGET_H #define STACKEDCENTRALWIDGET_H -#include "../qmlwidgetsglobal.h" +#include "../guiglobal.h" #include "centralwidget.h" class QStackedWidget; namespace qf { -namespace qmlwidgets { +namespace gui { namespace framework { class PartWidget; class PartSwitch; -class QFQMLWIDGETS_DECL_EXPORT StackedCentralWidget : public CentralWidget +class QFGUI_DECL_EXPORT StackedCentralWidget : public CentralWidget { Q_OBJECT private: diff --git a/libqf/libqfqmlwidgets/src/graphics/graphics.cpp b/libqf/libqfgui/src/graphics/graphics.cpp similarity index 69% rename from libqf/libqfqmlwidgets/src/graphics/graphics.cpp rename to libqf/libqfgui/src/graphics/graphics.cpp index 95cf6a123..61f1eabb7 100644 --- a/libqf/libqfqmlwidgets/src/graphics/graphics.cpp +++ b/libqf/libqfgui/src/graphics/graphics.cpp @@ -12,7 +12,7 @@ #include #include -using namespace qf::qmlwidgets::graphics; +using namespace qf::gui::graphics; Rect Rect::united(const Rect & _r2) const { @@ -25,53 +25,53 @@ Rect Rect::united(const Rect & _r2) const return Rect(l, t, r-l, b-t); } -qreal qf::qmlwidgets::graphics::x2device(qreal x, QPaintDevice *dev) +qreal qf::gui::graphics::x2device(qreal x, QPaintDevice *dev) { QF_ASSERT_EX(dev, "dev is NULL"); double dpmm = dev->logicalDpiX() / 25.4; return x * dpmm; } -qreal qf::qmlwidgets::graphics::y2device(qreal y, QPaintDevice *dev) +qreal qf::gui::graphics::y2device(qreal y, QPaintDevice *dev) { QF_ASSERT_EX(dev, "dev is NULL"); double dpmm = dev->logicalDpiY() / 25.4; return y * dpmm; } -qreal qf::qmlwidgets::graphics::device2x(qreal x, QPaintDevice *dev) +qreal qf::gui::graphics::device2x(qreal x, QPaintDevice *dev) { QF_ASSERT_EX(dev, "dev is NULL"); double dpmm = dev->logicalDpiX() / 25.4; return x / dpmm; } -qreal qf::qmlwidgets::graphics::device2y(qreal y, QPaintDevice *dev) +qreal qf::gui::graphics::device2y(qreal y, QPaintDevice *dev) { QF_ASSERT_EX(dev, "dev is NULL"); double dpmm = dev->logicalDpiY() / 25.4; return y / dpmm; } -Rect qf::qmlwidgets::graphics::mm2device(const Rect &r, QPaintDevice *dev) +Rect qf::gui::graphics::mm2device(const Rect &r, QPaintDevice *dev) { Rect ret; ret.setLeft(x2device(r.left(), dev)); - ret.setTop(qf::qmlwidgets::graphics::y2device(r.top(), dev)); - ret.setWidth(qf::qmlwidgets::graphics::x2device(r.width(), dev)); - ret.setHeight(qf::qmlwidgets::graphics::y2device(r.height(), dev)); + ret.setTop(qf::gui::graphics::y2device(r.top(), dev)); + ret.setWidth(qf::gui::graphics::x2device(r.width(), dev)); + ret.setHeight(qf::gui::graphics::y2device(r.height(), dev)); return ret; } -Point qf::qmlwidgets::graphics::mm2device(const Point &p, QPaintDevice *dev) +Point qf::gui::graphics::mm2device(const Point &p, QPaintDevice *dev) { Point ret; - ret.setX(qf::qmlwidgets::graphics::x2device(p.x(), dev)); - ret.setY(qf::qmlwidgets::graphics::y2device(p.y(), dev)); + ret.setX(qf::gui::graphics::x2device(p.x(), dev)); + ret.setY(qf::gui::graphics::y2device(p.y(), dev)); return ret; } -Point qf::qmlwidgets::graphics::device2mm(const Point &p, QPaintDevice *dev) +Point qf::gui::graphics::device2mm(const Point &p, QPaintDevice *dev) { QF_ASSERT_EX(dev, "dev is NULL"); double x_dpmm = dev->logicalDpiX() / 25.4; @@ -82,7 +82,7 @@ Point qf::qmlwidgets::graphics::device2mm(const Point &p, QPaintDevice *dev) return ret; } -Rect qf::qmlwidgets::graphics::device2mm(const Rect &r, QPaintDevice *dev) +Rect qf::gui::graphics::device2mm(const Rect &r, QPaintDevice *dev) { QF_ASSERT_EX(dev, "dev is NULL"); double x_dpmm = dev->logicalDpiX() / 25.4; @@ -95,12 +95,12 @@ Rect qf::qmlwidgets::graphics::device2mm(const Rect &r, QPaintDevice *dev) return ret; } -QList< double > qf::qmlwidgets::graphics::makeLayoutSizes(const QStringList& section_sizes, double layout_size) +QList< double > qf::gui::graphics::makeLayoutSizes(const QStringList& section_sizes, double layout_size) { QVariantList vlst; foreach(QString s, section_sizes) vlst << s; - return qf::qmlwidgets::graphics::makeLayoutSizes(vlst, layout_size); + return qf::gui::graphics::makeLayoutSizes(vlst, layout_size); } static bool is_absolute_size(const QVariant &v) @@ -113,7 +113,7 @@ static bool is_absolute_size(const QVariant &v) return ret; } -QList< double > qf::qmlwidgets::graphics::makeLayoutSizes(const QVariantList& section_sizes, double layout_size) +QList< double > qf::gui::graphics::makeLayoutSizes(const QVariantList& section_sizes, double layout_size) { qfLogFuncFrame(); QList ret; @@ -152,11 +152,11 @@ QList< double > qf::qmlwidgets::graphics::makeLayoutSizes(const QVariantList& se } qfDebug() << "\t" << "abs_sum:" << abs_sum << "proc_sum:" << proc_sum << "proc_0_cnt:" << proc_0_cnt << "ly_size:" << layout_size; if(layout_size < abs_sum) { - qfWarning() << "qf::qmlwidgets::graphics::makeLayoutSizes(): Children cann't fit parent. ly_size:" << layout_size << "abs_sum:" << abs_sum; + qfWarning() << "qf::gui::graphics::makeLayoutSizes(): Children cann't fit parent. ly_size:" << layout_size << "abs_sum:" << abs_sum; layout_size = abs_sum; } if(proc_sum > 1) { - qfWarning() << "qf::qmlwidgets::graphics::makeLayoutSizes(): Relative sizes sum exceedes 100%."; + qfWarning() << "qf::gui::graphics::makeLayoutSizes(): Relative sizes sum exceedes 100%."; proc_sum = 1; } for(int i=0; i qf::qmlwidgets::graphics::makeLayoutSizes(const QVariantList& se double d = ret[i]; if(d == 0) { if(proc_0_cnt == 0) { - qfWarning() << "qf::qmlwidgets::graphics::makeLayoutSizes(): 0% count is 0 but 0% dimensions exist."; + qfWarning() << "qf::gui::graphics::makeLayoutSizes(): 0% count is 0 but 0% dimensions exist."; } else d = (1 - proc_sum) / proc_0_cnt; } @@ -177,7 +177,7 @@ QList< double > qf::qmlwidgets::graphics::makeLayoutSizes(const QVariantList& se -double qf::qmlwidgets::graphics::parseRational(const QString &rational_or_proc_repr) +double qf::gui::graphics::parseRational(const QString &rational_or_proc_repr) { double d = 0; int ix; diff --git a/libqf/libqfqmlwidgets/src/graphics/graphics.h b/libqf/libqfgui/src/graphics/graphics.h similarity index 93% rename from libqf/libqfqmlwidgets/src/graphics/graphics.h rename to libqf/libqfgui/src/graphics/graphics.h index 14b581678..87f5a9464 100644 --- a/libqf/libqfqmlwidgets/src/graphics/graphics.h +++ b/libqf/libqfgui/src/graphics/graphics.h @@ -5,10 +5,10 @@ // Copyright: See COPYING file that comes with this distribution // -#ifndef QF_QMLWIDGETS_GRAPHICS_GRAPHICS_H -#define QF_QMLWIDGETS_GRAPHICS_GRAPHICS_H +#ifndef QF_GUI_GRAPHICS_GRAPHICS_H +#define QF_GUI_GRAPHICS_GRAPHICS_H -#include "../qmlwidgetsglobal.h" +#include "../guiglobal.h" #include #include @@ -17,7 +17,7 @@ class QPaintDevice; //class QVariantList; namespace qf { -namespace qmlwidgets { +namespace gui { namespace graphics { enum Layout {LayoutInvalid = 0, LayoutHorizontal = 1, LayoutVertical, LayoutStacked}; @@ -90,5 +90,5 @@ QList makeLayoutSizes(const QVariantList §ion_sizes, double layout_s }}} -#endif // QF_QMLWIDGETS_GRAPHICS_GRAPHICS_H +#endif // QF_GUI_GRAPHICS_GRAPHICS_H diff --git a/libqf/libqfgui/src/guiglobal.h b/libqf/libqfgui/src/guiglobal.h new file mode 100644 index 000000000..9af49e153 --- /dev/null +++ b/libqf/libqfgui/src/guiglobal.h @@ -0,0 +1,14 @@ +#ifndef QFGUIGLOBAL_H +#define QFGUIGLOBAL_H + +#include + +#if defined(QFGUI_BUILD_DLL) +//#warning "EXPORT" +# define QFGUI_DECL_EXPORT Q_DECL_EXPORT +#else +//#warning "IMPORT" +# define QFGUI_DECL_EXPORT Q_DECL_IMPORT +#endif + +#endif // QFGUIGLOBAL_H diff --git a/libqf/libqfqmlwidgets/src/headerview.cpp b/libqf/libqfgui/src/headerview.cpp similarity index 99% rename from libqf/libqfqmlwidgets/src/headerview.cpp rename to libqf/libqfgui/src/headerview.cpp index 134a0d661..0a0daf629 100644 --- a/libqf/libqfqmlwidgets/src/headerview.cpp +++ b/libqf/libqfgui/src/headerview.cpp @@ -8,7 +8,7 @@ #include #include -using namespace qf::qmlwidgets; +using namespace qf::gui; HeaderView::HeaderView(Qt::Orientation orientation, QWidget *parent) : QHeaderView(orientation, parent), m_seekStringLabel(nullptr) diff --git a/libqf/libqfqmlwidgets/src/headerview.h b/libqf/libqfgui/src/headerview.h similarity index 85% rename from libqf/libqfqmlwidgets/src/headerview.h rename to libqf/libqfgui/src/headerview.h index 0222a1af6..686ff31a6 100644 --- a/libqf/libqfqmlwidgets/src/headerview.h +++ b/libqf/libqfgui/src/headerview.h @@ -1,16 +1,16 @@ #ifndef HEADERVIEW_H #define HEADERVIEW_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include class QLabel; namespace qf { -namespace qmlwidgets { +namespace gui { -class QFQMLWIDGETS_DECL_EXPORT HeaderView : public QHeaderView +class QFGUI_DECL_EXPORT HeaderView : public QHeaderView { Q_OBJECT private: diff --git a/libqf/libqfqmlwidgets/src/htmlviewwidget.cpp b/libqf/libqfgui/src/htmlviewwidget.cpp similarity index 69% rename from libqf/libqfqmlwidgets/src/htmlviewwidget.cpp rename to libqf/libqfgui/src/htmlviewwidget.cpp index 5531660f7..bf1d0f4d1 100644 --- a/libqf/libqfqmlwidgets/src/htmlviewwidget.cpp +++ b/libqf/libqfgui/src/htmlviewwidget.cpp @@ -2,7 +2,7 @@ #include "ui_htmlviewwidget.h" -namespace qf::qmlwidgets { +namespace qf::gui { HtmlViewWidget::HtmlViewWidget(QWidget *parent) : Super(parent), @@ -28,26 +28,26 @@ framework::DialogWidget::ActionMap HtmlViewWidget::createActions() /* QStyle *sty = style(); { - QIcon ico(":/qf/qmlwidgets/images/print"); - qf::qmlwidgets::Action *a = new qf::qmlwidgets::Action(ico, tr("Print"), this); + QIcon ico(":/qf/gui/images/print"); + qf::gui::Action *a = new qf::gui::Action(ico, tr("Print"), this); ret[QStringLiteral("print")] = a; connect(a, SIGNAL(triggered()), this, SLOT(print())); } { QIcon ico = sty->standardIcon(QStyle::SP_DialogSaveButton); - qf::qmlwidgets::Action *a = new qf::qmlwidgets::Action(ico, tr("Save"), this); + qf::gui::Action *a = new qf::gui::Action(ico, tr("Save"), this); ret[QStringLiteral("save")] = a; connect(a, SIGNAL(triggered()), this, SLOT(save())); } { QIcon ico = sty->standardIcon(QStyle::SP_DialogSaveButton); - qf::qmlwidgets::Action *a = new qf::qmlwidgets::Action(ico, tr("Save as"), this); + qf::gui::Action *a = new qf::gui::Action(ico, tr("Save as"), this); ret[QStringLiteral("saveAs")] = a; connect(a, SIGNAL(triggered()), this, SLOT(saveAs())); } { - QIcon ico(":/qf/qmlwidgets/images/wordwrap"); - qf::qmlwidgets::Action *a = new qf::qmlwidgets::Action(ico, tr("Wrap lines"), this); + QIcon ico(":/qf/gui/images/wordwrap"); + qf::gui::Action *a = new qf::gui::Action(ico, tr("Wrap lines"), this); a->setCheckable(true); ret[QStringLiteral("wrapLines")] = a; connect(a, SIGNAL(triggered(bool)), this, SLOT(wrapLines(bool))); @@ -60,18 +60,18 @@ void HtmlViewWidget::settleDownInDialog(dialogs::Dialog *dlg) { /* qfLogFuncFrame() << dlg; - qf::qmlwidgets::Action *act_file = dlg->menuBar()->actionForPath("file"); + qf::gui::Action *act_file = dlg->menuBar()->actionForPath("file"); act_file->setText(tr("&File")); act_file->addActionInto(action("save")); act_file->addActionInto(action("saveAs")); act_file->addSeparatorInto(); act_file->addActionInto(action("print")); - qf::qmlwidgets::Action *act_view = dlg->menuBar()->actionForPath("view"); + qf::gui::Action *act_view = dlg->menuBar()->actionForPath("view"); act_view->setText(tr("&View")); act_view->addActionInto(action("wrapLines")); - qf::qmlwidgets::ToolBar *tool_bar = dlg->toolBar("main", true); + qf::gui::ToolBar *tool_bar = dlg->toolBar("main", true); tool_bar->addAction(action("save")); tool_bar->addAction(action("print")); tool_bar->addAction(action("wrapLines")); @@ -79,5 +79,5 @@ void HtmlViewWidget::settleDownInDialog(dialogs::Dialog *dlg) Super::settleDownInDialog(dlg); } -} // namespace qf::qmlwidgets +} // namespace qf::gui diff --git a/libqf/libqfqmlwidgets/src/htmlviewwidget.h b/libqf/libqfgui/src/htmlviewwidget.h similarity index 50% rename from libqf/libqfqmlwidgets/src/htmlviewwidget.h rename to libqf/libqfgui/src/htmlviewwidget.h index 03f4e5739..f6f2d6773 100644 --- a/libqf/libqfqmlwidgets/src/htmlviewwidget.h +++ b/libqf/libqfgui/src/htmlviewwidget.h @@ -1,22 +1,22 @@ -#ifndef QF_QMLWIDGETS_HTMLVIEWWIDGET_H -#define QF_QMLWIDGETS_HTMLVIEWWIDGET_H +#ifndef QF_GUI_HTMLVIEWWIDGET_H +#define QF_GUI_HTMLVIEWWIDGET_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include "framework/dialogwidget.h" #include "framework/ipersistentoptions.h" namespace qf { -namespace qmlwidgets { +namespace gui { namespace Ui { class HtmlViewWidget; } -class QFQMLWIDGETS_DECL_EXPORT HtmlViewWidget : public qf::qmlwidgets::framework::DialogWidget +class QFGUI_DECL_EXPORT HtmlViewWidget : public qf::gui::framework::DialogWidget { Q_OBJECT private: - typedef qf::qmlwidgets::framework::DialogWidget Super; + typedef qf::gui::framework::DialogWidget Super; public: explicit HtmlViewWidget(QWidget *parent = nullptr); ~HtmlViewWidget() Q_DECL_OVERRIDE; @@ -26,12 +26,12 @@ class QFQMLWIDGETS_DECL_EXPORT HtmlViewWidget : public qf::qmlwidgets::framework private: ActionMap createActions() Q_DECL_OVERRIDE; - void settleDownInDialog(qf::qmlwidgets::dialogs::Dialog *dlg) Q_DECL_OVERRIDE; + void settleDownInDialog(qf::gui::dialogs::Dialog *dlg) Q_DECL_OVERRIDE; private: Ui::HtmlViewWidget *ui; }; -} // namespace qmlwidgets +} // namespace gui } // namespace qf -#endif // QF_QMLWIDGETS_HTMLVIEWWIDGET_H +#endif // QF_GUI_HTMLVIEWWIDGET_H diff --git a/libqf/libqfqmlwidgets/src/htmlviewwidget.ui b/libqf/libqfgui/src/htmlviewwidget.ui similarity index 87% rename from libqf/libqfqmlwidgets/src/htmlviewwidget.ui rename to libqf/libqfgui/src/htmlviewwidget.ui index 4b7a25eb1..ec4ed87f1 100644 --- a/libqf/libqfqmlwidgets/src/htmlviewwidget.ui +++ b/libqf/libqfgui/src/htmlviewwidget.ui @@ -1,7 +1,7 @@ - qf::qmlwidgets::HtmlViewWidget - + qf::gui::HtmlViewWidget + 0 diff --git a/libqf/libqfqmlwidgets/src/idatawidget.cpp b/libqf/libqfgui/src/idatawidget.cpp similarity index 91% rename from libqf/libqfqmlwidgets/src/idatawidget.cpp rename to libqf/libqfgui/src/idatawidget.cpp index 236f71a7d..7ecd890a1 100644 --- a/libqf/libqfqmlwidgets/src/idatawidget.cpp +++ b/libqf/libqfgui/src/idatawidget.cpp @@ -2,12 +2,12 @@ #include "datacontroller.h" -#include +#include #include -namespace qfm = qf::qmlwidgets::model; +namespace qfm = qf::gui::model; -namespace qf::qmlwidgets { +namespace qf::gui { IDataWidget::IDataWidget(QWidget *data_widget) : m_dataWidget(data_widget) diff --git a/libqf/libqfqmlwidgets/src/idatawidget.h b/libqf/libqfgui/src/idatawidget.h similarity index 75% rename from libqf/libqfqmlwidgets/src/idatawidget.h rename to libqf/libqfgui/src/idatawidget.h index 6d4344ea9..15daf99e1 100644 --- a/libqf/libqfqmlwidgets/src/idatawidget.h +++ b/libqf/libqfgui/src/idatawidget.h @@ -1,7 +1,7 @@ -#ifndef QF_QMLWIDGETS_IDATAWIDGET_H -#define QF_QMLWIDGETS_IDATAWIDGET_H +#ifndef QF_GUI_IDATAWIDGET_H +#define QF_GUI_IDATAWIDGET_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include "model/datadocument.h" @@ -20,12 +20,12 @@ class DataDocument; } } -namespace qmlwidgets { +namespace gui { class DataController; class DataDocument; -class QFQMLWIDGETS_DECL_EXPORT IDataWidget +class QFGUI_DECL_EXPORT IDataWidget { public: IDataWidget(QWidget *data_widget); @@ -43,7 +43,7 @@ class QFQMLWIDGETS_DECL_EXPORT IDataWidget QWidget* dataWidget() {return m_dataWidget;} protected: - qf::qmlwidgets::model::DataDocument* dataDocument(bool throw_exc = qf::core::Exception::Throw); + qf::gui::model::DataDocument* dataDocument(bool throw_exc = qf::core::Exception::Throw); bool checkSetDataValueFirstTime(); protected: QPointer m_dataController; @@ -55,4 +55,4 @@ class QFQMLWIDGETS_DECL_EXPORT IDataWidget }} -#endif // QF_QMLWIDGETS_IDATAWIDGET_H +#endif // QF_GUI_IDATAWIDGET_H diff --git a/libqf/libqfqmlwidgets/src/internal/desktoputils.cpp b/libqf/libqfgui/src/internal/desktoputils.cpp similarity index 85% rename from libqf/libqfqmlwidgets/src/internal/desktoputils.cpp rename to libqf/libqfgui/src/internal/desktoputils.cpp index dce440a08..43b0824ef 100644 --- a/libqf/libqfqmlwidgets/src/internal/desktoputils.cpp +++ b/libqf/libqfgui/src/internal/desktoputils.cpp @@ -5,7 +5,7 @@ -namespace qf::qmlwidgets::internal { +namespace qf::gui::internal { QRect DesktopUtils::moveRectToVisibleDesktopScreen(const QRect &rect) { @@ -26,7 +26,7 @@ QRect DesktopUtils::moveRectToVisibleDesktopScreen(const QRect &rect) } -} // namespace qf::qmlwidgets::internal +} // namespace qf::gui::internal diff --git a/libqf/libqfqmlwidgets/src/internal/desktoputils.h b/libqf/libqfgui/src/internal/desktoputils.h similarity index 50% rename from libqf/libqfqmlwidgets/src/internal/desktoputils.h rename to libqf/libqfgui/src/internal/desktoputils.h index 1eb923f65..c48d31c18 100644 --- a/libqf/libqfqmlwidgets/src/internal/desktoputils.h +++ b/libqf/libqfgui/src/internal/desktoputils.h @@ -1,10 +1,10 @@ -#ifndef QF_QMLWIDGETS_INTERNAL_DESKTOPUTILS_H -#define QF_QMLWIDGETS_INTERNAL_DESKTOPUTILS_H +#ifndef QF_GUI_INTERNAL_DESKTOPUTILS_H +#define QF_GUI_INTERNAL_DESKTOPUTILS_H class QRect; namespace qf { -namespace qmlwidgets { +namespace gui { namespace internal { class DesktopUtils @@ -14,7 +14,7 @@ class DesktopUtils }; } // namespace internal -} // namespace qmlwidgets +} // namespace gui } // namespace qf -#endif // QF_QMLWIDGETS_INTERNAL_DESKTOPUTILS_H +#endif // QF_GUI_INTERNAL_DESKTOPUTILS_H diff --git a/libqf/libqfqmlwidgets/src/internal/dlgtableviewcopyspecial.cpp b/libqf/libqfgui/src/internal/dlgtableviewcopyspecial.cpp similarity index 89% rename from libqf/libqfqmlwidgets/src/internal/dlgtableviewcopyspecial.cpp rename to libqf/libqfgui/src/internal/dlgtableviewcopyspecial.cpp index b75d0204d..1d425e331 100644 --- a/libqf/libqfqmlwidgets/src/internal/dlgtableviewcopyspecial.cpp +++ b/libqf/libqfgui/src/internal/dlgtableviewcopyspecial.cpp @@ -1,7 +1,7 @@ #include "dlgtableviewcopyspecial.h" #include "ui_dlgtableviewcopyspecial.h" -using namespace qf::qmlwidgets::internal; +using namespace qf::gui::internal; DlgTableViewCopySpecial::DlgTableViewCopySpecial(QWidget *parent) : Super(parent) @@ -35,7 +35,7 @@ QString DlgTableViewCopySpecial::rowsSeparator() return ui->edRowsSeparator->text(); } -qf::qmlwidgets::TableView::ReplaceEscapes DlgTableViewCopySpecial::replaceEscapes() +qf::gui::TableView::ReplaceEscapes DlgTableViewCopySpecial::replaceEscapes() { return static_cast(ui->lstReplaceEscapes->currentData().toInt()); } diff --git a/libqf/libqfqmlwidgets/src/internal/dlgtableviewcopyspecial.h b/libqf/libqfgui/src/internal/dlgtableviewcopyspecial.h similarity index 64% rename from libqf/libqfqmlwidgets/src/internal/dlgtableviewcopyspecial.h rename to libqf/libqfgui/src/internal/dlgtableviewcopyspecial.h index 753d1cab8..9944c6313 100644 --- a/libqf/libqfqmlwidgets/src/internal/dlgtableviewcopyspecial.h +++ b/libqf/libqfgui/src/internal/dlgtableviewcopyspecial.h @@ -1,12 +1,12 @@ -#ifndef QF_QMLWIDGETS_INTERNAL_DLGTABLEVIEWCOPYSPECIAL_H -#define QF_QMLWIDGETS_INTERNAL_DLGTABLEVIEWCOPYSPECIAL_H +#ifndef QF_GUI_INTERNAL_DLGTABLEVIEWCOPYSPECIAL_H +#define QF_GUI_INTERNAL_DLGTABLEVIEWCOPYSPECIAL_H #include #include "../tableview.h" namespace qf { -namespace qmlwidgets { +namespace gui { namespace internal { namespace Ui {class DlgTableViewCopySpecial;} @@ -23,11 +23,11 @@ class DlgTableViewCopySpecial : public QDialog QString fieldsSeparator(); QString rowsSeparator(); QString fieldsQuotes(); - qf::qmlwidgets::TableView::ReplaceEscapes replaceEscapes(); + qf::gui::TableView::ReplaceEscapes replaceEscapes(); private: Ui::DlgTableViewCopySpecial *ui; }; }}} -#endif // QF_QMLWIDGETS_INTERNAL_DLGTABLEVIEWCOPYSPECIAL_H +#endif // QF_GUI_INTERNAL_DLGTABLEVIEWCOPYSPECIAL_H diff --git a/libqf/libqfqmlwidgets/src/internal/dlgtableviewcopyspecial.ui b/libqf/libqfgui/src/internal/dlgtableviewcopyspecial.ui similarity index 91% rename from libqf/libqfqmlwidgets/src/internal/dlgtableviewcopyspecial.ui rename to libqf/libqfgui/src/internal/dlgtableviewcopyspecial.ui index bf623471b..d91a0bd69 100644 --- a/libqf/libqfqmlwidgets/src/internal/dlgtableviewcopyspecial.ui +++ b/libqf/libqfgui/src/internal/dlgtableviewcopyspecial.ui @@ -1,7 +1,7 @@ - qf::qmlwidgets::internal::DlgTableViewCopySpecial - + qf::gui::internal::DlgTableViewCopySpecial + 0 @@ -93,7 +93,7 @@ buttonBox accepted() - qf::qmlwidgets::internal::DlgTableViewCopySpecial + qf::gui::internal::DlgTableViewCopySpecial accept() @@ -109,7 +109,7 @@ buttonBox rejected() - qf::qmlwidgets::internal::DlgTableViewCopySpecial + qf::gui::internal::DlgTableViewCopySpecial reject() diff --git a/libqf/libqfqmlwidgets/src/internal/tableviewchoosecolumnswidget.cpp b/libqf/libqfgui/src/internal/tableviewchoosecolumnswidget.cpp similarity index 97% rename from libqf/libqfqmlwidgets/src/internal/tableviewchoosecolumnswidget.cpp rename to libqf/libqfgui/src/internal/tableviewchoosecolumnswidget.cpp index 5a5458816..1633ed640 100644 --- a/libqf/libqfqmlwidgets/src/internal/tableviewchoosecolumnswidget.cpp +++ b/libqf/libqfgui/src/internal/tableviewchoosecolumnswidget.cpp @@ -1,12 +1,12 @@ #include "tableviewchoosecolumnswidget.h" #include "ui_tableviewchoosecolumnswidget.h" -#include +#include #include #include -using namespace qf::qmlwidgets::internal; +using namespace qf::gui::internal; //================================================= // TableViewChooseColumnsWidget @@ -42,7 +42,7 @@ TableViewChooseColumnsWidget::~TableViewChooseColumnsWidget() delete ui; } -void TableViewChooseColumnsWidget::loadColumns(qf::qmlwidgets::model::TableModel *model) +void TableViewChooseColumnsWidget::loadColumns(qf::gui::model::TableModel *model) { if(model) { { diff --git a/libqf/libqfqmlwidgets/src/internal/tableviewchoosecolumnswidget.h b/libqf/libqfgui/src/internal/tableviewchoosecolumnswidget.h similarity index 70% rename from libqf/libqfqmlwidgets/src/internal/tableviewchoosecolumnswidget.h rename to libqf/libqfgui/src/internal/tableviewchoosecolumnswidget.h index 4676e886d..e562169c2 100644 --- a/libqf/libqfqmlwidgets/src/internal/tableviewchoosecolumnswidget.h +++ b/libqf/libqfgui/src/internal/tableviewchoosecolumnswidget.h @@ -1,14 +1,14 @@ -#ifndef QF_QMLWIDGETS_INTERNAL_TABLEVIEWCHOOSECOLUMNSWIDGET_H -#define QF_QMLWIDGETS_INTERNAL_TABLEVIEWCHOOSECOLUMNSWIDGET_H +#ifndef QF_GUI_INTERNAL_TABLEVIEWCHOOSECOLUMNSWIDGET_H +#define QF_GUI_INTERNAL_TABLEVIEWCHOOSECOLUMNSWIDGET_H #include class QStandardItemModel; -namespace qf::qmlwidgets::model { class TableModel; } +namespace qf::gui::model { class TableModel; } -namespace qf::qmlwidgets::internal { +namespace qf::gui::internal { namespace Ui { class TableViewChooseColumnsWidget; @@ -23,7 +23,7 @@ class TableViewChooseColumnsWidget : public QWidget protected: QStandardItemModel *f_exportedColumnsModel; public: - void loadColumns(qf::qmlwidgets::model::TableModel *model); + void loadColumns(qf::gui::model::TableModel *model); protected slots: void onColumnsAllClicked(); void onColumnsNoneClicked(); @@ -42,5 +42,5 @@ protected slots: } -#endif // QF_QMLWIDGETS_INTERNAL_TABLEVIEWCHOOSECOLUMNSWIDGET_H +#endif // QF_GUI_INTERNAL_TABLEVIEWCHOOSECOLUMNSWIDGET_H diff --git a/libqf/libqfqmlwidgets/src/internal/tableviewchoosecolumnswidget.ui b/libqf/libqfgui/src/internal/tableviewchoosecolumnswidget.ui similarity index 85% rename from libqf/libqfqmlwidgets/src/internal/tableviewchoosecolumnswidget.ui rename to libqf/libqfgui/src/internal/tableviewchoosecolumnswidget.ui index 7fac4b899..c5daa8e90 100644 --- a/libqf/libqfqmlwidgets/src/internal/tableviewchoosecolumnswidget.ui +++ b/libqf/libqfgui/src/internal/tableviewchoosecolumnswidget.ui @@ -1,7 +1,7 @@ - qf::qmlwidgets::internal::TableViewChooseColumnsWidget - + qf::gui::internal::TableViewChooseColumnsWidget + 0 @@ -63,15 +63,15 @@ ... - - :/qf/qmlwidgets/images/minus.png:/qf/qmlwidgets/images/minus.png + + :/qf/gui/images/minus.png:/qf/gui/images/minus.png - Qt::Horizontal + Qt::Orientation::Horizontal @@ -86,7 +86,7 @@ - 20 + 24 @@ -138,8 +138,8 @@ ... - - :/qf/qmlwidgets/images/reload.png:/qf/qmlwidgets/images/reload.png + + :/qf/gui/images/reload.png:/qf/gui/images/reload.png @@ -152,15 +152,15 @@ ... - - :/qf/qmlwidgets/images/plus.png:/qf/qmlwidgets/images/plus.png + + :/qf/gui/images/plus.png:/qf/gui/images/plus.png - Qt::Horizontal + Qt::Orientation::Horizontal @@ -185,7 +185,7 @@ - QAbstractItemView::ExtendedSelection + QAbstractItemView::SelectionMode::ExtendedSelection @@ -199,7 +199,7 @@ - QAbstractItemView::ExtendedSelection + QAbstractItemView::SelectionMode::ExtendedSelection @@ -213,7 +213,7 @@ - + diff --git a/libqf/libqfqmlwidgets/src/internal/tableviewcopytodialogwidget.cpp b/libqf/libqfgui/src/internal/tableviewcopytodialogwidget.cpp similarity index 79% rename from libqf/libqfqmlwidgets/src/internal/tableviewcopytodialogwidget.cpp rename to libqf/libqfgui/src/internal/tableviewcopytodialogwidget.cpp index dafeb7c91..b73e9bf27 100644 --- a/libqf/libqfqmlwidgets/src/internal/tableviewcopytodialogwidget.cpp +++ b/libqf/libqfgui/src/internal/tableviewcopytodialogwidget.cpp @@ -3,10 +3,10 @@ #include "../tableview.h" #include -#include +#include -namespace qfm = qf::qmlwidgets::model; -using namespace qf::qmlwidgets::internal; +namespace qfm = qf::gui::model; +using namespace qf::gui::internal; TableViewCopyToDialogWidget::TableViewCopyToDialogWidget(QWidget *parent) : Super(parent) @@ -30,7 +30,7 @@ QFTableViewWidget* TableViewCopyToDialogWidget::tableViewWidget() return ui->tableViewWidget; } */ -qf::qmlwidgets::TableView* TableViewCopyToDialogWidget::tableView() +qf::gui::TableView* TableViewCopyToDialogWidget::tableView() { return ui->tableView; } diff --git a/libqf/libqfqmlwidgets/src/internal/tableviewcopytodialogwidget.h b/libqf/libqfgui/src/internal/tableviewcopytodialogwidget.h similarity index 72% rename from libqf/libqfqmlwidgets/src/internal/tableviewcopytodialogwidget.h rename to libqf/libqfgui/src/internal/tableviewcopytodialogwidget.h index 2e2ad6244..dc8803515 100644 --- a/libqf/libqfqmlwidgets/src/internal/tableviewcopytodialogwidget.h +++ b/libqf/libqfgui/src/internal/tableviewcopytodialogwidget.h @@ -1,11 +1,11 @@ -#ifndef QF_QMLWIDGETS_INTERNAL_TABLEVIEWCOPYTODIALOGWIDGET_H -#define QF_QMLWIDGETS_INTERNAL_TABLEVIEWCOPYTODIALOGWIDGET_H +#ifndef QF_GUI_INTERNAL_TABLEVIEWCOPYTODIALOGWIDGET_H +#define QF_GUI_INTERNAL_TABLEVIEWCOPYTODIALOGWIDGET_H #include "../framework/dialogwidget.h" namespace qf { -namespace qmlwidgets { +namespace gui { class TableView; namespace internal { @@ -30,5 +30,5 @@ class TableViewCopyToDialogWidget : public framework::DialogWidget }}} -#endif // QF_QMLWIDGETS_INTERNAL_TABLEVIEWCOPYTODIALOGWIDGET_H +#endif // QF_GUI_INTERNAL_TABLEVIEWCOPYTODIALOGWIDGET_H diff --git a/libqf/libqfqmlwidgets/src/internal/tableviewcopytodialogwidget.ui b/libqf/libqfgui/src/internal/tableviewcopytodialogwidget.ui similarity index 76% rename from libqf/libqfqmlwidgets/src/internal/tableviewcopytodialogwidget.ui rename to libqf/libqfgui/src/internal/tableviewcopytodialogwidget.ui index f2ca48ba8..6b3763b08 100644 --- a/libqf/libqfqmlwidgets/src/internal/tableviewcopytodialogwidget.ui +++ b/libqf/libqfgui/src/internal/tableviewcopytodialogwidget.ui @@ -1,7 +1,7 @@ - qf::qmlwidgets::internal::TableViewCopyToDialogWidget - + qf::gui::internal::TableViewCopyToDialogWidget + 0 @@ -15,7 +15,7 @@ - + false @@ -35,7 +35,7 @@ - qf::qmlwidgets::TableView + qf::gui::TableView QWidget
src/tableview.h
1 diff --git a/libqf/libqfqmlwidgets/src/label.cpp b/libqf/libqfgui/src/label.cpp similarity index 96% rename from libqf/libqfqmlwidgets/src/label.cpp rename to libqf/libqfgui/src/label.cpp index 7cbd89e10..fcd952217 100644 --- a/libqf/libqfqmlwidgets/src/label.cpp +++ b/libqf/libqfgui/src/label.cpp @@ -2,7 +2,7 @@ #include -using namespace qf::qmlwidgets; +using namespace qf::gui; Label::Label(QWidget *parent) : Super(parent) diff --git a/libqf/libqfqmlwidgets/src/label.h b/libqf/libqfgui/src/label.h similarity index 85% rename from libqf/libqfqmlwidgets/src/label.h rename to libqf/libqfgui/src/label.h index 31cf1e9a4..328b81cfe 100644 --- a/libqf/libqfqmlwidgets/src/label.h +++ b/libqf/libqfgui/src/label.h @@ -1,16 +1,16 @@ -#ifndef QF_QMLWIDGETS_LABEL_H -#define QF_QMLWIDGETS_LABEL_H +#ifndef QF_GUI_LABEL_H +#define QF_GUI_LABEL_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include #include namespace qf { -namespace qmlwidgets { +namespace gui { -class QFQMLWIDGETS_DECL_EXPORT Label : public QLabel +class QFGUI_DECL_EXPORT Label : public QLabel { Q_OBJECT Q_PROPERTY(Qt::Alignment horizontalAlignment READ horizontalAlignment WRITE setHorizontalAlignment NOTIFY horizontalAlignmentChanged) diff --git a/libqf/libqfqmlwidgets/src/layoutpropertiesattached.cpp b/libqf/libqfgui/src/layoutpropertiesattached.cpp similarity index 92% rename from libqf/libqfqmlwidgets/src/layoutpropertiesattached.cpp rename to libqf/libqfgui/src/layoutpropertiesattached.cpp index a2c64329b..28cf2e82a 100644 --- a/libqf/libqfqmlwidgets/src/layoutpropertiesattached.cpp +++ b/libqf/libqfgui/src/layoutpropertiesattached.cpp @@ -2,7 +2,7 @@ #include -using namespace qf::qmlwidgets; +using namespace qf::gui; LayoutPropertiesAttached::LayoutPropertiesAttached(QObject *parent) : QObject(parent) diff --git a/libqf/libqfqmlwidgets/src/layoutpropertiesattached.h b/libqf/libqfgui/src/layoutpropertiesattached.h similarity index 58% rename from libqf/libqfqmlwidgets/src/layoutpropertiesattached.h rename to libqf/libqfgui/src/layoutpropertiesattached.h index b64ba307b..e78ddb2b3 100644 --- a/libqf/libqfqmlwidgets/src/layoutpropertiesattached.h +++ b/libqf/libqfgui/src/layoutpropertiesattached.h @@ -1,7 +1,7 @@ -#ifndef QF_QMLWIDGETS_LAYOUTPROPERTIESATTACHED_H -#define QF_QMLWIDGETS_LAYOUTPROPERTIESATTACHED_H +#ifndef QF_GUI_LAYOUTPROPERTIESATTACHED_H +#define QF_GUI_LAYOUTPROPERTIESATTACHED_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include "layouttypeproperties.h" #include @@ -10,16 +10,16 @@ #include namespace qf { -namespace qmlwidgets { +namespace gui { -class QFQMLWIDGETS_DECL_EXPORT LayoutPropertiesAttached : public QObject +class QFGUI_DECL_EXPORT LayoutPropertiesAttached : public QObject { Q_OBJECT Q_PROPERTY(int rowSpan READ rowSpan WRITE setRowSpan NOTIFY rowSpanChanged) Q_PROPERTY(int columnSpan READ rowSpan WRITE setColumnSpan NOTIFY columnSpanChanged) Q_PROPERTY(QString buddyText READ buddyText WRITE setBuddyText) - Q_PROPERTY(qf::qmlwidgets::LayoutTypeProperties::SizePolicy horizontalSizePolicy READ horizontalSizePolicy WRITE setHorizontalSizePolicy NOTIFY horizontalSizePolicyChanged) - Q_PROPERTY(qf::qmlwidgets::LayoutTypeProperties::SizePolicy verticalSizePolicy READ verticalSizePolicy WRITE setVerticalSizePolicy NOTIFY verticalSizePolicyChanged) + Q_PROPERTY(qf::gui::LayoutTypeProperties::SizePolicy horizontalSizePolicy READ horizontalSizePolicy WRITE setHorizontalSizePolicy NOTIFY horizontalSizePolicyChanged) + Q_PROPERTY(qf::gui::LayoutTypeProperties::SizePolicy verticalSizePolicy READ verticalSizePolicy WRITE setVerticalSizePolicy NOTIFY verticalSizePolicyChanged) public: explicit LayoutPropertiesAttached(QObject *parent = nullptr); public: @@ -34,7 +34,7 @@ class QFQMLWIDGETS_DECL_EXPORT LayoutPropertiesAttached : public QObject QString m_formLayoutBuddyText; }; -class QFQMLWIDGETS_DECL_EXPORT LayoutProperties : public QObject +class QFGUI_DECL_EXPORT LayoutProperties : public QObject { Q_OBJECT public: @@ -43,6 +43,6 @@ class QFQMLWIDGETS_DECL_EXPORT LayoutProperties : public QObject }} -QML_DECLARE_TYPEINFO(qf::qmlwidgets::LayoutProperties, QML_HAS_ATTACHED_PROPERTIES) +QML_DECLARE_TYPEINFO(qf::gui::LayoutProperties, QML_HAS_ATTACHED_PROPERTIES) #endif diff --git a/libqf/libqfqmlwidgets/src/layouttypeproperties.cpp b/libqf/libqfgui/src/layouttypeproperties.cpp similarity index 95% rename from libqf/libqfqmlwidgets/src/layouttypeproperties.cpp rename to libqf/libqfgui/src/layouttypeproperties.cpp index 3ad4cbb17..e9cbf6823 100644 --- a/libqf/libqfqmlwidgets/src/layouttypeproperties.cpp +++ b/libqf/libqfgui/src/layouttypeproperties.cpp @@ -2,7 +2,7 @@ #include -using namespace qf::qmlwidgets; +using namespace qf::gui; LayoutTypeProperties::LayoutTypeProperties(QObject *parent) : Super(parent), m_columns(-1), m_rows(-1), m_spacing(-1) diff --git a/libqf/libqfqmlwidgets/src/layouttypeproperties.h b/libqf/libqfgui/src/layouttypeproperties.h similarity index 85% rename from libqf/libqfqmlwidgets/src/layouttypeproperties.h rename to libqf/libqfgui/src/layouttypeproperties.h index 720327746..e82f64bc7 100644 --- a/libqf/libqfqmlwidgets/src/layouttypeproperties.h +++ b/libqf/libqfgui/src/layouttypeproperties.h @@ -1,20 +1,20 @@ -#ifndef QF_QMLWIDGETS_LAYOUTTYPEPROPERTIES_H -#define QF_QMLWIDGETS_LAYOUTTYPEPROPERTIES_H +#ifndef QF_GUI_LAYOUTTYPEPROPERTIES_H +#define QF_GUI_LAYOUTTYPEPROPERTIES_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include #include namespace qf { -namespace qmlwidgets { +namespace gui { /** * @brief The LayoutTypeProperties class * * If the Frame container has grid layout assigned, it is configured according to this properties */ -class QFQMLWIDGETS_DECL_EXPORT LayoutTypeProperties : public QObject +class QFGUI_DECL_EXPORT LayoutTypeProperties : public QObject { Q_OBJECT Q_PROPERTY(int spacing READ spacing WRITE setSpacing NOTIFY spacingChanged) diff --git a/libqf/libqfqmlwidgets/src/lineedit.cpp b/libqf/libqfgui/src/lineedit.cpp similarity index 96% rename from libqf/libqfqmlwidgets/src/lineedit.cpp rename to libqf/libqfgui/src/lineedit.cpp index a49377c88..3d76baafd 100644 --- a/libqf/libqfqmlwidgets/src/lineedit.cpp +++ b/libqf/libqfgui/src/lineedit.cpp @@ -2,7 +2,7 @@ #include -using namespace qf::qmlwidgets; +using namespace qf::gui; LineEdit::LineEdit(QWidget *parent) : Super(parent) diff --git a/libqf/libqfqmlwidgets/src/lineedit.h b/libqf/libqfgui/src/lineedit.h similarity index 70% rename from libqf/libqfqmlwidgets/src/lineedit.h rename to libqf/libqfgui/src/lineedit.h index 7f753a715..3759d3cfd 100644 --- a/libqf/libqfqmlwidgets/src/lineedit.h +++ b/libqf/libqfgui/src/lineedit.h @@ -1,15 +1,15 @@ -#ifndef QF_QMLWIDGETS_LINEEDIT_H -#define QF_QMLWIDGETS_LINEEDIT_H +#ifndef QF_GUI_LINEEDIT_H +#define QF_GUI_LINEEDIT_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include "idatawidget.h" #include namespace qf { -namespace qmlwidgets { +namespace gui { -class QFQMLWIDGETS_DECL_EXPORT LineEdit : public QLineEdit, public IDataWidget +class QFGUI_DECL_EXPORT LineEdit : public QLineEdit, public IDataWidget { Q_OBJECT Q_ENUM(EchoMode) @@ -29,4 +29,4 @@ class QFQMLWIDGETS_DECL_EXPORT LineEdit : public QLineEdit, public IDataWidget }} -#endif // QF_QMLWIDGETS_LINEEDIT_H +#endif // QF_GUI_LINEEDIT_H diff --git a/libqf/libqfqmlwidgets/src/log.h b/libqf/libqfgui/src/log.h similarity index 100% rename from libqf/libqfqmlwidgets/src/log.h rename to libqf/libqfgui/src/log.h diff --git a/libqf/libqfqmlwidgets/src/menubar.cpp b/libqf/libqfgui/src/menubar.cpp similarity index 97% rename from libqf/libqfqmlwidgets/src/menubar.cpp rename to libqf/libqfgui/src/menubar.cpp index 4ae837d5e..270706c2b 100644 --- a/libqf/libqfqmlwidgets/src/menubar.cpp +++ b/libqf/libqfgui/src/menubar.cpp @@ -9,7 +9,7 @@ #include #include -using namespace qf::qmlwidgets; +using namespace qf::gui; MenuBar::MenuBar(QWidget *parent) : Super(parent) diff --git a/libqf/libqfgui/src/menubar.h b/libqf/libqfgui/src/menubar.h new file mode 100644 index 000000000..f3bcdce97 --- /dev/null +++ b/libqf/libqfgui/src/menubar.h @@ -0,0 +1,26 @@ +#ifndef QF_GUI_MENUBAR_H +#define QF_GUI_MENUBAR_H + +#include "guiglobal.h" + +#include + +namespace qf { +namespace gui { + +class Action; + +class QFGUI_DECL_EXPORT MenuBar : public QMenuBar +{ + Q_OBJECT +private: + typedef QMenuBar Super; +public: + explicit MenuBar(QWidget *parent = nullptr); +public: + Q_INVOKABLE qf::gui::Action* actionForPath(const QString &path, bool create_if_not_exists = true); +}; + +}} + +#endif // QF_GUI_MENUBAR_H diff --git a/libqf/libqfqmlwidgets/src/model/datadocument.cpp b/libqf/libqfgui/src/model/datadocument.cpp similarity index 99% rename from libqf/libqfqmlwidgets/src/model/datadocument.cpp rename to libqf/libqfgui/src/model/datadocument.cpp index 81952d399..3ef63ab1e 100644 --- a/libqf/libqfqmlwidgets/src/model/datadocument.cpp +++ b/libqf/libqfgui/src/model/datadocument.cpp @@ -5,7 +5,7 @@ #include #include -namespace qf::qmlwidgets::model { +namespace qf::gui::model { DataDocument::DataDocument(QObject *parent) : QObject(parent) diff --git a/libqf/libqfqmlwidgets/src/model/datadocument.h b/libqf/libqfgui/src/model/datadocument.h similarity index 91% rename from libqf/libqfqmlwidgets/src/model/datadocument.h rename to libqf/libqfgui/src/model/datadocument.h index fb43c0dd0..b9237a58b 100644 --- a/libqf/libqfqmlwidgets/src/model/datadocument.h +++ b/libqf/libqfgui/src/model/datadocument.h @@ -6,14 +6,14 @@ #include namespace qf { -namespace qmlwidgets { +namespace gui { namespace model { -class QFQMLWIDGETS_DECL_EXPORT DataDocument : public QObject +class QFGUI_DECL_EXPORT DataDocument : public QObject { Q_OBJECT - Q_PROPERTY(qf::qmlwidgets::model::DataDocument::RecordEditMode mode READ mode WRITE setMode NOTIFY modeChanged) - Q_PROPERTY(qf::qmlwidgets::model::TableModel* model READ model WRITE setModel NOTIFY modelChanged) + Q_PROPERTY(qf::gui::model::DataDocument::RecordEditMode mode READ mode WRITE setMode NOTIFY modeChanged) + Q_PROPERTY(qf::gui::model::TableModel* model READ model WRITE setModel NOTIFY modelChanged) Q_PROPERTY(QVariant dataId READ dataId WRITE setDataId NOTIFY dataIdChanged) Q_PROPERTY(QString idFieldName READ idFieldName WRITE setIdFieldName NOTIFY idFieldNameChanged) public: diff --git a/libqf/libqfqmlwidgets/src/model/logtablemodel.cpp b/libqf/libqfgui/src/model/logtablemodel.cpp similarity index 99% rename from libqf/libqfqmlwidgets/src/model/logtablemodel.cpp rename to libqf/libqfgui/src/model/logtablemodel.cpp index 08516d9c7..52b0d979e 100644 --- a/libqf/libqfqmlwidgets/src/model/logtablemodel.cpp +++ b/libqf/libqfgui/src/model/logtablemodel.cpp @@ -8,7 +8,7 @@ Q_DECLARE_METATYPE(NecroLog::Level) -namespace qf::qmlwidgets::model { +namespace qf::gui::model { LogTableModel::Row::Row(NecroLog::Level severity, const QString &domain, const QString &file, int line, const QString &msg, const QDateTime &time_stamp, const QString &function, const QVariant &user_data) { diff --git a/libqf/libqfqmlwidgets/src/model/logtablemodel.h b/libqf/libqfgui/src/model/logtablemodel.h similarity index 91% rename from libqf/libqfqmlwidgets/src/model/logtablemodel.h rename to libqf/libqfgui/src/model/logtablemodel.h index 89107c195..66b6c77e9 100644 --- a/libqf/libqfqmlwidgets/src/model/logtablemodel.h +++ b/libqf/libqfgui/src/model/logtablemodel.h @@ -1,6 +1,6 @@ #pragma once -#include "../qmlwidgetsglobal.h" +#include "../guiglobal.h" #include #include @@ -12,17 +12,17 @@ namespace qf::core { class LogEntryMap; } namespace qf { -namespace qmlwidgets { +namespace gui { namespace model { -class QFQMLWIDGETS_DECL_EXPORT LogTableModel : public QAbstractTableModel +class QFGUI_DECL_EXPORT LogTableModel : public QAbstractTableModel { Q_OBJECT private: using Super = QAbstractTableModel; public: enum Cols {TimeStamp, Severity, Category, Message, File, Line, Function, UserData, Count}; - class QFQMLWIDGETS_DECL_EXPORT Row { + class QFGUI_DECL_EXPORT Row { public: explicit Row() {} explicit Row(NecroLogLevel severity, const QString& domain, const QString& file, int line, const QString& msg, const QDateTime& time_stamp, const QString& function = QString(), const QVariant &user_data = QVariant()); diff --git a/libqf/libqfqmlwidgets/src/model/sqldatadocument.cpp b/libqf/libqfgui/src/model/sqldatadocument.cpp similarity index 97% rename from libqf/libqfqmlwidgets/src/model/sqldatadocument.cpp rename to libqf/libqfgui/src/model/sqldatadocument.cpp index f9f6dc742..e1e3aa2bc 100644 --- a/libqf/libqfqmlwidgets/src/model/sqldatadocument.cpp +++ b/libqf/libqfgui/src/model/sqldatadocument.cpp @@ -2,7 +2,7 @@ #include -namespace qf::qmlwidgets::model { +namespace qf::gui::model { SqlDataDocument::SqlDataDocument(QObject *parent) : Super(parent) diff --git a/libqf/libqfqmlwidgets/src/model/sqldatadocument.h b/libqf/libqfgui/src/model/sqldatadocument.h similarity index 89% rename from libqf/libqfqmlwidgets/src/model/sqldatadocument.h rename to libqf/libqfgui/src/model/sqldatadocument.h index e725d9c90..ee56ac5b5 100644 --- a/libqf/libqfqmlwidgets/src/model/sqldatadocument.h +++ b/libqf/libqfgui/src/model/sqldatadocument.h @@ -4,10 +4,10 @@ #include "sqltablemodel.h" namespace qf { -namespace qmlwidgets { +namespace gui { namespace model { -class QFQMLWIDGETS_DECL_EXPORT SqlDataDocument : public DataDocument +class QFGUI_DECL_EXPORT SqlDataDocument : public DataDocument { Q_OBJECT public: diff --git a/libqf/libqfqmlwidgets/src/model/sqltablemodel.cpp b/libqf/libqfgui/src/model/sqltablemodel.cpp similarity index 99% rename from libqf/libqfqmlwidgets/src/model/sqltablemodel.cpp rename to libqf/libqfgui/src/model/sqltablemodel.cpp index 7dcd9bbf3..88f78c403 100644 --- a/libqf/libqfqmlwidgets/src/model/sqltablemodel.cpp +++ b/libqf/libqfgui/src/model/sqltablemodel.cpp @@ -19,7 +19,7 @@ namespace qfs = qf::core::sql; namespace qfu = qf::core::utils; -namespace qf::qmlwidgets::model { +namespace qf::gui::model { SqlTableModel::SqlTableModel(QObject *parent) : Super(parent) diff --git a/libqf/libqfqmlwidgets/src/model/sqltablemodel.h b/libqf/libqfgui/src/model/sqltablemodel.h similarity index 97% rename from libqf/libqfqmlwidgets/src/model/sqltablemodel.h rename to libqf/libqfgui/src/model/sqltablemodel.h index a7727b7c7..7c741dde8 100644 --- a/libqf/libqfqmlwidgets/src/model/sqltablemodel.h +++ b/libqf/libqfgui/src/model/sqltablemodel.h @@ -11,13 +11,13 @@ #include namespace qf { -namespace qmlwidgets { +namespace gui { namespace sql { class Connection; } namespace model { -class QFQMLWIDGETS_DECL_EXPORT SqlTableModel : public TableModel +class QFGUI_DECL_EXPORT SqlTableModel : public TableModel { Q_OBJECT Q_PROPERTY(QString query READ query WRITE setQuery NOTIFY queryChanged) diff --git a/libqf/libqfqmlwidgets/src/model/tablemodel.cpp b/libqf/libqfgui/src/model/tablemodel.cpp similarity index 99% rename from libqf/libqfqmlwidgets/src/model/tablemodel.cpp rename to libqf/libqfgui/src/model/tablemodel.cpp index 5e88d811e..210565be2 100644 --- a/libqf/libqfqmlwidgets/src/model/tablemodel.cpp +++ b/libqf/libqfgui/src/model/tablemodel.cpp @@ -15,7 +15,7 @@ namespace qfc = qf::core; namespace qfu = qf::core::utils; -namespace qf::qmlwidgets::model { +namespace qf::gui::model { //========================================= // TableModel::ColumnDefinition @@ -735,7 +735,7 @@ void TableModel::clearColumns(int new_column_count) m_columnsAutoGenerated = false; } -qf::qmlwidgets::model::TableModel::ColumnDefinition& TableModel::addColumn(const QString &field_name, const QString &caption) +qf::gui::model::TableModel::ColumnDefinition& TableModel::addColumn(const QString &field_name, const QString &caption) { return insertColumn(m_columns.count(), field_name, caption); } diff --git a/libqf/libqfqmlwidgets/src/model/tablemodel.h b/libqf/libqfgui/src/model/tablemodel.h similarity index 96% rename from libqf/libqfqmlwidgets/src/model/tablemodel.h rename to libqf/libqfgui/src/model/tablemodel.h index c9d425505..59d98e320 100644 --- a/libqf/libqfqmlwidgets/src/model/tablemodel.h +++ b/libqf/libqfgui/src/model/tablemodel.h @@ -1,6 +1,6 @@ #pragma once -#include "../qmlwidgetsglobal.h" +#include "../guiglobal.h" #include #include @@ -8,7 +8,7 @@ #include namespace qf { -namespace qmlwidgets { +namespace gui { namespace utils { class TreeTable; @@ -16,7 +16,7 @@ class TreeTable; namespace model { -class QFQMLWIDGETS_DECL_EXPORT TableModel : public QAbstractTableModel +class QFGUI_DECL_EXPORT TableModel : public QAbstractTableModel { Q_OBJECT Q_PROPERTY(bool nullReportedAsString READ isNullReportedAsString WRITE setNullReportedAsString NOTIFY nullReportedAsStringChanged) @@ -32,7 +32,7 @@ class QFQMLWIDGETS_DECL_EXPORT TableModel : public QAbstractTableModel FirstUnusedRole }; //enum RecordEditMode {ModeView, ModeEdit, ModeInsert, ModeCopy, ModeDelete}; public: - class QFQMLWIDGETS_DECL_EXPORT ColumnDefinition + class QFGUI_DECL_EXPORT ColumnDefinition { private: class SharedDummyHelper {}; @@ -186,7 +186,7 @@ class QFQMLWIDGETS_DECL_EXPORT TableModel : public QAbstractTableModel qf::core::utils::TableRow& tableRowRef(int row_no); qf::core::utils::TableRow tableRow(int row_no) const; - class QFQMLWIDGETS_DECL_EXPORT TreeTableExportOptions : public QVariantMap + class QFGUI_DECL_EXPORT TreeTableExportOptions : public QVariantMap { QF_VARIANTMAP_FIELD2(bool, is, set, ExportRawValues, true) public: @@ -223,5 +223,5 @@ class QFQMLWIDGETS_DECL_EXPORT TableModel : public QAbstractTableModel }}} -Q_DECLARE_METATYPE(qf::qmlwidgets::model::TableModel::ColumnDefinition) +Q_DECLARE_METATYPE(qf::gui::model::TableModel::ColumnDefinition) diff --git a/libqf/libqfqmlwidgets/src/progressbar.cpp b/libqf/libqfgui/src/progressbar.cpp similarity index 73% rename from libqf/libqfqmlwidgets/src/progressbar.cpp rename to libqf/libqfgui/src/progressbar.cpp index b00a3606e..c5c0db941 100644 --- a/libqf/libqfqmlwidgets/src/progressbar.cpp +++ b/libqf/libqfgui/src/progressbar.cpp @@ -1,6 +1,6 @@ #include "progressbar.h" -using namespace qf::qmlwidgets; +using namespace qf::gui; ProgressBar::ProgressBar(QWidget *parent) : Super(parent) diff --git a/libqf/libqfgui/src/progressbar.h b/libqf/libqfgui/src/progressbar.h new file mode 100644 index 000000000..3967c967e --- /dev/null +++ b/libqf/libqfgui/src/progressbar.h @@ -0,0 +1,22 @@ +#ifndef QF_GUI_PROGRESSBAR_H +#define QF_GUI_PROGRESSBAR_H + +#include "guiglobal.h" + +#include + +namespace qf { +namespace gui { + +class QFGUI_DECL_EXPORT ProgressBar : public QProgressBar +{ + Q_OBJECT +private: + typedef QProgressBar Super; +public: + explicit ProgressBar(QWidget *parent = nullptr); +}; + +}} + +#endif // PROGRESSBAR_H diff --git a/libqf/libqfqmlwidgets/src/reports/processor/attic/reportprocessorcontext.cpp b/libqf/libqfgui/src/reports/processor/attic/reportprocessorcontext.cpp similarity index 91% rename from libqf/libqfqmlwidgets/src/reports/processor/attic/reportprocessorcontext.cpp rename to libqf/libqfgui/src/reports/processor/attic/reportprocessorcontext.cpp index 14043c5f9..0b38a91a9 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/attic/reportprocessorcontext.cpp +++ b/libqf/libqfgui/src/reports/processor/attic/reportprocessorcontext.cpp @@ -9,9 +9,9 @@ #include -namespace qfg = qf::qmlwidgets::graphics; +namespace qfg = qf::gui::graphics; -using namespace qf::qmlwidgets::reports; +using namespace qf::gui::reports; //================================================= // ReportProcessorContext diff --git a/libqf/libqfqmlwidgets/src/reports/processor/attic/reportprocessorcontext.h b/libqf/libqfgui/src/reports/processor/attic/reportprocessorcontext.h similarity index 54% rename from libqf/libqfqmlwidgets/src/reports/processor/attic/reportprocessorcontext.h rename to libqf/libqfgui/src/reports/processor/attic/reportprocessorcontext.h index 4b75aa2d8..175e38353 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/attic/reportprocessorcontext.h +++ b/libqf/libqfgui/src/reports/processor/attic/reportprocessorcontext.h @@ -5,26 +5,26 @@ // Copyright: See COPYING file that comes with this distribution // -#ifndef QF_QMLWIDGETS_REPORTS_REPORTPROCESSORCONTEXT_H -#define QF_QMLWIDGETS_REPORTS_REPORTPROCESSORCONTEXT_H +#ifndef QF_GUI_REPORTS_REPORTPROCESSORCONTEXT_H +#define QF_GUI_REPORTS_REPORTPROCESSORCONTEXT_H -#include "../../qmlwidgetsglobal.h" +#include "../../guiglobal.h" #include "../../graphics/stylecache.h" #include #include namespace qf { -namespace qmlwidgets { +namespace gui { namespace reports { //! TODO: write class documentation. -class QFQMLWIDGETS_DECL_EXPORT ReportProcessorContext +class QFGUI_DECL_EXPORT ReportProcessorContext { private: struct Data : public QSharedData { - qf::qmlwidgets::graphics::StyleCache styleCache; + qf::gui::graphics::StyleCache styleCache; //QVariantMap options; //KeyVals keyVals; }; @@ -34,17 +34,17 @@ class QFQMLWIDGETS_DECL_EXPORT ReportProcessorContext static const ReportProcessorContext& sharedNull(); public: bool isNull() const {return d == sharedNull().d;} - const qf::qmlwidgets::graphics::StyleCache& styleCache() const {return d->styleCache;} - qf::qmlwidgets::graphics::StyleCache& styleCacheRef() {return d->styleCache;} + const qf::gui::graphics::StyleCache& styleCache() const {return d->styleCache;} + qf::gui::graphics::StyleCache& styleCacheRef() {return d->styleCache;} void clear(); public: ReportProcessorContext(); - /// protoze je qf::qmlwidgets::graphics::StyleCache explicitne sdilena, potrebuju konstruktor s jinou cachi, nez ma null() context, protoze jinak se styleCache chova jako staticka promenna + /// protoze je qf::gui::graphics::StyleCache explicitne sdilena, potrebuju konstruktor s jinou cachi, nez ma null() context, protoze jinak se styleCache chova jako staticka promenna /// vsechny contexty pouzivaji stejnou cache a to tu, kterou zalozi null context //ReportProcessorContext(const StyleCache &style_cache); }; }}} -#endif // QF_QMLWIDGETS_REPORTS_REPRTPROCESSORCONTEXT_H +#endif // QF_GUI_REPORTS_REPRTPROCESSORCONTEXT_H diff --git a/libqf/libqfqmlwidgets/src/reports/processor/banddatamodel.cpp b/libqf/libqfgui/src/reports/processor/banddatamodel.cpp similarity index 98% rename from libqf/libqfqmlwidgets/src/reports/processor/banddatamodel.cpp rename to libqf/libqfgui/src/reports/processor/banddatamodel.cpp index 946f8d767..dd0f272d2 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/banddatamodel.cpp +++ b/libqf/libqfgui/src/reports/processor/banddatamodel.cpp @@ -8,7 +8,7 @@ namespace qfu = qf::core::utils; -using namespace qf::qmlwidgets::reports; +using namespace qf::gui::reports; //======================================================= // BandDataModel diff --git a/libqf/libqfqmlwidgets/src/reports/processor/banddatamodel.h b/libqf/libqfgui/src/reports/processor/banddatamodel.h similarity index 90% rename from libqf/libqfqmlwidgets/src/reports/processor/banddatamodel.h rename to libqf/libqfgui/src/reports/processor/banddatamodel.h index ed3e10fa8..817d699ec 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/banddatamodel.h +++ b/libqf/libqfgui/src/reports/processor/banddatamodel.h @@ -4,10 +4,10 @@ // Copyright: See COPYING file that comes with this distribution // -#ifndef QF_QMLWIDGETS_REPORTS_BANDDTAMODEL_H -#define QF_QMLWIDGETS_REPORTS_BANDDTAMODEL_H +#ifndef QF_GUI_REPORTS_BANDDTAMODEL_H +#define QF_GUI_REPORTS_BANDDTAMODEL_H -#include "../../qmlwidgetsglobal.h" +#include "../../guiglobal.h" #include #include @@ -15,10 +15,10 @@ #include namespace qf { -namespace qmlwidgets { +namespace gui { namespace reports { -class QFQMLWIDGETS_DECL_EXPORT BandDataModel : public QObject +class QFGUI_DECL_EXPORT BandDataModel : public QObject { Q_OBJECT private: @@ -72,4 +72,4 @@ class TreeTableBandDataModel : public BandDataModel }}} -#endif // QF_QMLWIDGETS_REPORTS_BANDDTAMODEL_H +#endif // QF_GUI_REPORTS_BANDDTAMODEL_H diff --git a/libqf/libqfqmlwidgets/src/reports/processor/reportdocument.cpp b/libqf/libqfgui/src/reports/processor/reportdocument.cpp similarity index 94% rename from libqf/libqfqmlwidgets/src/reports/processor/reportdocument.cpp rename to libqf/libqfgui/src/reports/processor/reportdocument.cpp index e28f53350..78eb962fe 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/reportdocument.cpp +++ b/libqf/libqfgui/src/reports/processor/reportdocument.cpp @@ -11,7 +11,7 @@ //namespace qfu = qf::core::utils; -using namespace qf::qmlwidgets::reports; +using namespace qf::gui::reports; ReportDocument::ReportDocument(QQmlEngine *engine, QObject *parent) : Super(engine, parent) diff --git a/libqf/libqfqmlwidgets/src/reports/processor/reportdocument.h b/libqf/libqfgui/src/reports/processor/reportdocument.h similarity index 67% rename from libqf/libqfqmlwidgets/src/reports/processor/reportdocument.h rename to libqf/libqfgui/src/reports/processor/reportdocument.h index 80533c8fe..d2d3896d8 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/reportdocument.h +++ b/libqf/libqfgui/src/reports/processor/reportdocument.h @@ -1,5 +1,5 @@ -#ifndef QF_QMLWIDGETS_REPORTS_REPORTDOCUMENT_H -#define QF_QMLWIDGETS_REPORTS_REPORTDOCUMENT_H +#ifndef QF_GUI_REPORTS_REPORTDOCUMENT_H +#define QF_GUI_REPORTS_REPORTDOCUMENT_H #include @@ -7,7 +7,7 @@ #include namespace qf { -namespace qmlwidgets { +namespace gui { namespace reports { class ReportDocument : public QQmlComponent @@ -22,4 +22,4 @@ class ReportDocument : public QQmlComponent }}} -#endif // QF_QMLWIDGETS_REPORTS_REPORTDOCUMENT_H +#endif // QF_GUI_REPORTS_REPORTDOCUMENT_H diff --git a/libqf/libqfqmlwidgets/src/reports/processor/reportitem.cpp b/libqf/libqfgui/src/reports/processor/reportitem.cpp similarity index 99% rename from libqf/libqfqmlwidgets/src/reports/processor/reportitem.cpp rename to libqf/libqfgui/src/reports/processor/reportitem.cpp index eab8dea22..d8b09c542 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/reportitem.cpp +++ b/libqf/libqfgui/src/reports/processor/reportitem.cpp @@ -22,7 +22,7 @@ #include -using namespace qf::qmlwidgets::reports; +using namespace qf::gui::reports; //========================================================== // ReportItem @@ -384,7 +384,7 @@ ReportItemImage::PrintResult ReportItemGraph::printMetaPaintChildren(ReportItemM /// vypada to, jako ze tisk textu se do boundingrect nepocita /// jako zaklad vem rect, ktery je predepsan v reportu, do nej by se mel graf vejit - QRect r = qmlwidgets::graphics::mm2device(br, &pict).toRect(); + QRect r = gui::graphics::mm2device(br, &pict).toRect(); /// bounding rect obrazku grafu je vzdy od [0,0] r.moveTo(0, 0); //qfInfo() << "graph bounding_rect:" << Rect(r).toString(); diff --git a/libqf/libqfqmlwidgets/src/reports/processor/reportitem.h b/libqf/libqfgui/src/reports/processor/reportitem.h similarity index 97% rename from libqf/libqfqmlwidgets/src/reports/processor/reportitem.h rename to libqf/libqfgui/src/reports/processor/reportitem.h index abd11cedd..7f99f98d7 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/reportitem.h +++ b/libqf/libqfgui/src/reports/processor/reportitem.h @@ -4,10 +4,10 @@ // Copyright: See COPYING file that comes with this distribution // -#ifndef QF_QMLWIDGETS_REPORTS_REPORTITEM_H -#define QF_QMLWIDGETS_REPORTS_REPORTITEM_H +#ifndef QF_GUI_REPORTS_REPORTITEM_H +#define QF_GUI_REPORTS_REPORTITEM_H -#include "../../qmlwidgetsglobal.h" +#include "../../guiglobal.h" #include "../../graphics/graphics.h" //#include "style/pen.h" //#include "style/brush.h" @@ -30,7 +30,7 @@ class QDomElement; class QDomText; namespace qf { -namespace qmlwidgets { +namespace gui { namespace reports { class ReportProcessor; @@ -41,7 +41,7 @@ class ReportItemBand; class ReportItemMetaPaintFrame; //! Base class of report elements. -class QFQMLWIDGETS_DECL_EXPORT ReportItem : public QObject, public QQmlParserStatus +class QFGUI_DECL_EXPORT ReportItem : public QObject, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -402,7 +402,7 @@ class ReportItemTable : public ReportItemBand #ifdef REPORT_ITEM_GRAPH -class QFQMLWIDGETS_DECL_EXPORT ReportItemGraph : public ReportItemImage +class QFGUI_DECL_EXPORT ReportItemGraph : public ReportItemImage { Q_OBJECT private: @@ -417,5 +417,5 @@ class QFQMLWIDGETS_DECL_EXPORT ReportItemGraph : public ReportItemImage #endif }}} -#endif // QF_QMLWIDGETS_REPORTS_REPORTITEM_H +#endif // QF_GUI_REPORTS_REPORTITEM_H diff --git a/libqf/libqfqmlwidgets/src/reports/processor/reportitem_html.cpp b/libqf/libqfgui/src/reports/processor/reportitem_html.cpp similarity index 99% rename from libqf/libqfqmlwidgets/src/reports/processor/reportitem_html.cpp rename to libqf/libqfgui/src/reports/processor/reportitem_html.cpp index e0546f567..91eb320d4 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/reportitem_html.cpp +++ b/libqf/libqfgui/src/reports/processor/reportitem_html.cpp @@ -21,7 +21,7 @@ #include #include -using namespace qf::qmlwidgets::reports; +using namespace qf::gui::reports; namespace { QDomText setElementText(QDomElement &el, const QString &str) diff --git a/libqf/libqfqmlwidgets/src/reports/processor/reportitemband.cpp b/libqf/libqfgui/src/reports/processor/reportitemband.cpp similarity index 99% rename from libqf/libqfqmlwidgets/src/reports/processor/reportitemband.cpp rename to libqf/libqfgui/src/reports/processor/reportitemband.cpp index 6a3ee81ca..61744790c 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/reportitemband.cpp +++ b/libqf/libqfgui/src/reports/processor/reportitemband.cpp @@ -10,7 +10,7 @@ #include -using namespace qf::qmlwidgets::reports; +using namespace qf::gui::reports; ReportItemBand::ReportItemBand(ReportItem *parent) : Super(parent) diff --git a/libqf/libqfqmlwidgets/src/reports/processor/reportitemband.h b/libqf/libqfgui/src/reports/processor/reportitemband.h similarity index 88% rename from libqf/libqfqmlwidgets/src/reports/processor/reportitemband.h rename to libqf/libqfgui/src/reports/processor/reportitemband.h index 80e36afda..f2b7f0704 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/reportitemband.h +++ b/libqf/libqfgui/src/reports/processor/reportitemband.h @@ -4,26 +4,26 @@ // Copyright: See COPYING file that comes with this distribution // -#ifndef QF_QMLWIDGETS_REPORTS_REPORTITEMBAND_H -#define QF_QMLWIDGETS_REPORTS_REPORTITEMBAND_H +#ifndef QF_GUI_REPORTS_REPORTITEMBAND_H +#define QF_GUI_REPORTS_REPORTITEMBAND_H #include "reportitemframe.h" -#include "../../qmlwidgetsglobal.h" +#include "../../guiglobal.h" namespace qf { -namespace qmlwidgets { +namespace gui { namespace reports { class BandDataModel; class ReportItemDetail; -class QFQMLWIDGETS_DECL_EXPORT ReportItemBand : public ReportItemFrame +class QFGUI_DECL_EXPORT ReportItemBand : public ReportItemFrame { Q_OBJECT - //Q_PROPERTY(qf::qmlwidgets::reports::ReportItemFrame* header READ header WRITE setHeader NOTIFY headerChanged) + //Q_PROPERTY(qf::gui::reports::ReportItemFrame* header READ header WRITE setHeader NOTIFY headerChanged) Q_PROPERTY(bool headerOnBreak READ isHeaderOnBreak WRITE setHeaderOnBreak NOTIFY headerOnBreakChanged) Q_PROPERTY(QVariant modelData READ modelData WRITE setModelData NOTIFY modelDataChanged) - Q_PROPERTY(qf::qmlwidgets::reports::BandDataModel* dataModel READ model) + Q_PROPERTY(qf::gui::reports::BandDataModel* dataModel READ model) Q_PROPERTY(bool createFromData READ isCreateFromData WRITE setCreateFromData NOTIFY createFromDataChanged) //Q_PROPERTY(bool modelLoaded READ modelLoaded NOTIFY modelLoadedChanged) Q_CLASSINFO("property.keepFirst.doc", "Number of band details printed, which cannot be splitted by page/column break.") @@ -68,7 +68,7 @@ class QFQMLWIDGETS_DECL_EXPORT ReportItemBand : public ReportItemFrame #if 0 -class QFQMLWIDGETS_DECL_EXPORT ReportItemDetail : public ReportItemFrame +class QFGUI_DECL_EXPORT ReportItemDetail : public ReportItemFrame { Q_OBJECT friend class ReportItemBand; @@ -95,7 +95,7 @@ class QFQMLWIDGETS_DECL_EXPORT ReportItemDetail : public ReportItemFrame }; -class QFQMLWIDGETS_DECL_EXPORT ReportItemBand : public ReportItemFrame +class QFGUI_DECL_EXPORT ReportItemBand : public ReportItemFrame { Q_OBJECT Q_PROPERTY(QString dataSource READ dataSource WRITE setDataSource NOTIFY dataSourceChanged) @@ -138,4 +138,4 @@ class QFQMLWIDGETS_DECL_EXPORT ReportItemBand : public ReportItemFrame }}} -#endif // QF_QMLWIDGETS_REPORTS_REPORTITEMBAND_H +#endif // QF_GUI_REPORTS_REPORTITEMBAND_H diff --git a/libqf/libqfqmlwidgets/src/reports/processor/reportitembreak.cpp b/libqf/libqfgui/src/reports/processor/reportitembreak.cpp similarity index 93% rename from libqf/libqfqmlwidgets/src/reports/processor/reportitembreak.cpp rename to libqf/libqfgui/src/reports/processor/reportitembreak.cpp index 8fc7de0d9..71360a7e7 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/reportitembreak.cpp +++ b/libqf/libqfgui/src/reports/processor/reportitembreak.cpp @@ -4,7 +4,7 @@ -namespace qf::qmlwidgets::reports { +namespace qf::gui::reports { ReportItemBreak::ReportItemBreak(ReportItem *parent) : Super(parent) @@ -41,7 +41,7 @@ ReportItem::PrintResult ReportItemBreak::printMetaPaint(ReportItemMetaPaint *out return ret; } -} // namespace qf::qmlwidgets::reports +} // namespace qf::gui::reports diff --git a/libqf/libqfqmlwidgets/src/reports/processor/reportitembreak.h b/libqf/libqfgui/src/reports/processor/reportitembreak.h similarity index 78% rename from libqf/libqfqmlwidgets/src/reports/processor/reportitembreak.h rename to libqf/libqfgui/src/reports/processor/reportitembreak.h index 5c6cfeb01..7e6dd4250 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/reportitembreak.h +++ b/libqf/libqfgui/src/reports/processor/reportitembreak.h @@ -1,15 +1,15 @@ -#ifndef QF_QMLWIDGETS_REPORTS_REPORTITEMBREAK_H -#define QF_QMLWIDGETS_REPORTS_REPORTITEMBREAK_H +#ifndef QF_GUI_REPORTS_REPORTITEMBREAK_H +#define QF_GUI_REPORTS_REPORTITEMBREAK_H #include "reportitem.h" #include namespace qf { -namespace qmlwidgets { +namespace gui { namespace reports { -class QFQMLWIDGETS_DECL_EXPORT ReportItemBreak : public ReportItem +class QFGUI_DECL_EXPORT ReportItemBreak : public ReportItem { Q_OBJECT Q_PROPERTY(BreakType breakType READ breakType WRITE setBreakType NOTIFY breakTypeChanged) @@ -40,7 +40,7 @@ class QFQMLWIDGETS_DECL_EXPORT ReportItemBreak : public ReportItem }; } // namespace reports -} // namespace qmlwidgets +} // namespace gui } // namespace qf -#endif // QF_QMLWIDGETS_REPORTS_REPORTITEMBREAK_H +#endif // QF_GUI_REPORTS_REPORTITEMBREAK_H diff --git a/libqf/libqfqmlwidgets/src/reports/processor/reportitemdetail.cpp b/libqf/libqfgui/src/reports/processor/reportitemdetail.cpp similarity index 98% rename from libqf/libqfqmlwidgets/src/reports/processor/reportitemdetail.cpp rename to libqf/libqfgui/src/reports/processor/reportitemdetail.cpp index 2a4421a71..51cd489d2 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/reportitemdetail.cpp +++ b/libqf/libqfgui/src/reports/processor/reportitemdetail.cpp @@ -10,7 +10,7 @@ #include -using namespace qf::qmlwidgets::reports; +using namespace qf::gui::reports; //========================================================== // ReportItemDetail diff --git a/libqf/libqfqmlwidgets/src/reports/processor/reportitemdetail.h b/libqf/libqfgui/src/reports/processor/reportitemdetail.h similarity index 75% rename from libqf/libqfqmlwidgets/src/reports/processor/reportitemdetail.h rename to libqf/libqfgui/src/reports/processor/reportitemdetail.h index 465be9202..41710b1b0 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/reportitemdetail.h +++ b/libqf/libqfgui/src/reports/processor/reportitemdetail.h @@ -1,14 +1,14 @@ -#ifndef QF_QMLWIDGETS_REPORTS_REPORTITEMDETAIL_H -#define QF_QMLWIDGETS_REPORTS_REPORTITEMDETAIL_H +#ifndef QF_GUI_REPORTS_REPORTITEMDETAIL_H +#define QF_GUI_REPORTS_REPORTITEMDETAIL_H #include "reportitemframe.h" -#include "../../qmlwidgetsglobal.h" +#include "../../guiglobal.h" namespace qf { -namespace qmlwidgets { +namespace gui { namespace reports { -class QFQMLWIDGETS_DECL_EXPORT ReportItemDetail : public ReportItemFrame +class QFGUI_DECL_EXPORT ReportItemDetail : public ReportItemFrame { Q_OBJECT Q_PROPERTY(int rowCount READ rowCount NOTIFY rowCountChanged) @@ -34,4 +34,4 @@ class QFQMLWIDGETS_DECL_EXPORT ReportItemDetail : public ReportItemFrame }}} -#endif // QF_QMLWIDGETS_REPORTS_REPORTITEMDETAIL_H +#endif // QF_GUI_REPORTS_REPORTITEMDETAIL_H diff --git a/libqf/libqfqmlwidgets/src/reports/processor/reportitemframe.cpp b/libqf/libqfgui/src/reports/processor/reportitemframe.cpp similarity index 99% rename from libqf/libqfqmlwidgets/src/reports/processor/reportitemframe.cpp rename to libqf/libqfgui/src/reports/processor/reportitemframe.cpp index 43d76c9e5..d7bf6ebc7 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/reportitemframe.cpp +++ b/libqf/libqfgui/src/reports/processor/reportitemframe.cpp @@ -12,7 +12,7 @@ #include namespace qfc = qf::core; -using namespace qf::qmlwidgets::reports; +using namespace qf::gui::reports; //========================================================== // ReportItemFrame @@ -569,12 +569,12 @@ ReportItem::PrintResult ReportItemFrame::printMetaPaint(ReportItemMetaPaint *out QStringList sl = s.splitAndTrim(','); columns_gap = columnsGap(); double ly_size = frame_content_br.width() - (columns_gap * (sl.count() - 1)); - column_sizes = qf::qmlwidgets::graphics::makeLayoutSizes(sl, ly_size); + column_sizes = qf::gui::graphics::makeLayoutSizes(sl, ly_size); } auto *metapaint_frame = new ReportItemMetaPaintFrame(out, this); QF_ASSERT_EX(metapaint_frame != nullptr, "Meta paint item for item " + QString(this->metaObject()->className()) + " not created."); metapaint_frame->setInset(hinset(), vinset()); - metapaint_frame->setLayout((qf::qmlwidgets::graphics::Layout)layout()); + metapaint_frame->setLayout((qf::gui::graphics::Layout)layout()); metapaint_frame->setAlignment(horizontalAlignment(), verticalAlignment()); Rect column_br_helper = frame_content_br; for(int current_column_index=0; current_column_index items READ items) + Q_PROPERTY(QQmlListProperty items READ items) Q_PROPERTY(qreal hinset READ hinset WRITE setHinset NOTIFY hinsetChanged) Q_PROPERTY(qreal vinset READ vinset WRITE setVinset NOTIFY vinsetChanged) //Q_PROPERTY(qreal inset READ inset WRITE setInset NOTIFY insetChanged) @@ -56,16 +56,16 @@ class QFQMLWIDGETS_DECL_EXPORT ReportItemFrame : public ReportItem Q_PROPERTY(VAlignment valign READ verticalAlignment WRITE setVerticalAlignment NOTIFY verticalAlignmentChanged) Q_PROPERTY(QString columns READ columns WRITE setColumns NOTIFY columnsChanged) Q_PROPERTY(double columnsGap READ columnsGap WRITE setColumnsGap NOTIFY columnsGapChanged) - Q_PROPERTY(qf::qmlwidgets::reports::style::Pen* border READ border WRITE setBorder NOTIFY borderChanged) - Q_PROPERTY(qf::qmlwidgets::reports::style::Pen* topBorder READ topBorder WRITE setTopBorder NOTIFY topBorderChanged) - Q_PROPERTY(qf::qmlwidgets::reports::style::Pen* bottomBorder READ bottomBorder WRITE setBottomBorder NOTIFY bottomBorderChanged) - Q_PROPERTY(qf::qmlwidgets::reports::style::Pen* leftBorder READ leftBorder WRITE setLeftBorder NOTIFY leftBorderChanged) - Q_PROPERTY(qf::qmlwidgets::reports::style::Pen* rightBorder READ rightBorder WRITE setRightBorder NOTIFY rightBorderChanged) - Q_PROPERTY(qf::qmlwidgets::reports::style::Brush* fill READ fill WRITE setFill NOTIFY fillChanged) + Q_PROPERTY(qf::gui::reports::style::Pen* border READ border WRITE setBorder NOTIFY borderChanged) + Q_PROPERTY(qf::gui::reports::style::Pen* topBorder READ topBorder WRITE setTopBorder NOTIFY topBorderChanged) + Q_PROPERTY(qf::gui::reports::style::Pen* bottomBorder READ bottomBorder WRITE setBottomBorder NOTIFY bottomBorderChanged) + Q_PROPERTY(qf::gui::reports::style::Pen* leftBorder READ leftBorder WRITE setLeftBorder NOTIFY leftBorderChanged) + Q_PROPERTY(qf::gui::reports::style::Pen* rightBorder READ rightBorder WRITE setRightBorder NOTIFY rightBorderChanged) + Q_PROPERTY(qf::gui::reports::style::Brush* fill READ fill WRITE setFill NOTIFY fillChanged) Q_CLASSINFO("property.textStyle.doc", "Set text style for this frame and all the children recursively" ) - Q_PROPERTY(qf::qmlwidgets::reports::style::Text* textStyle READ textStyle WRITE setTextStyle NOTIFY textStyleChanged) + Q_PROPERTY(qf::gui::reports::style::Text* textStyle READ textStyle WRITE setTextStyle NOTIFY textStyleChanged) public: ReportItemFrame(ReportItem *parent = nullptr); ~ReportItemFrame() Q_DECL_OVERRIDE; @@ -212,4 +212,4 @@ class QFQMLWIDGETS_DECL_EXPORT ReportItemFrame : public ReportItem }}} -#endif // QF_QMLWIDGETS_REPORTS_REPORTITEMFRAME_H +#endif // QF_GUI_REPORTS_REPORTITEMFRAME_H diff --git a/libqf/libqfqmlwidgets/src/reports/processor/reportitemimage.cpp b/libqf/libqfgui/src/reports/processor/reportitemimage.cpp similarity index 99% rename from libqf/libqfqmlwidgets/src/reports/processor/reportitemimage.cpp rename to libqf/libqfgui/src/reports/processor/reportitemimage.cpp index 938f916bd..597533838 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/reportitemimage.cpp +++ b/libqf/libqfgui/src/reports/processor/reportitemimage.cpp @@ -13,7 +13,7 @@ #include namespace qfu = qf::core::utils; -using namespace qf::qmlwidgets::reports; +using namespace qf::gui::reports; //=============================================================== // ReportItemImage diff --git a/libqf/libqfqmlwidgets/src/reports/processor/reportitemimage.h b/libqf/libqfgui/src/reports/processor/reportitemimage.h similarity index 89% rename from libqf/libqfqmlwidgets/src/reports/processor/reportitemimage.h rename to libqf/libqfgui/src/reports/processor/reportitemimage.h index f26cb16bd..bf4fdfe04 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/reportitemimage.h +++ b/libqf/libqfgui/src/reports/processor/reportitemimage.h @@ -4,17 +4,17 @@ // Copyright: See COPYING file that comes with this distribution // -#ifndef QF_QMLWIDGETS_REPORTS_REPORTITEMIMAGE_H -#define QF_QMLWIDGETS_REPORTS_REPORTITEMIMAGE_H +#ifndef QF_GUI_REPORTS_REPORTITEMIMAGE_H +#define QF_GUI_REPORTS_REPORTITEMIMAGE_H #include "reportitemframe.h" -#include "../../qmlwidgetsglobal.h" +#include "../../guiglobal.h" namespace qf { -namespace qmlwidgets { +namespace gui { namespace reports { -class QFQMLWIDGETS_DECL_EXPORT ReportItemImage : public ReportItemFrame +class QFGUI_DECL_EXPORT ReportItemImage : public ReportItemFrame { Q_OBJECT @@ -80,4 +80,4 @@ class QFQMLWIDGETS_DECL_EXPORT ReportItemImage : public ReportItemFrame }}} -#endif // QF_QMLWIDGETS_REPORTS_REPORTITEMIMAGE_H +#endif // QF_GUI_REPORTS_REPORTITEMIMAGE_H diff --git a/libqf/libqfqmlwidgets/src/reports/processor/reportitempara.cpp b/libqf/libqfgui/src/reports/processor/reportitempara.cpp similarity index 96% rename from libqf/libqfqmlwidgets/src/reports/processor/reportitempara.cpp rename to libqf/libqfgui/src/reports/processor/reportitempara.cpp index d9e2807e5..fd2c91741 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/reportitempara.cpp +++ b/libqf/libqfgui/src/reports/processor/reportitempara.cpp @@ -10,7 +10,7 @@ #include #include -using namespace qf::qmlwidgets::reports; +using namespace qf::gui::reports; //========================================================== // ReportItemPara @@ -71,7 +71,7 @@ ReportItem::PrintResult ReportItemPara::printMetaPaintChildren(ReportItemMetaPai } Rect device_bounding_rect; /// velikost boundingRect je v mm, tak to prepocitej na body vystupniho zarizeni - device_bounding_rect = qmlwidgets::graphics::mm2device(bounding_rect, processor()->paintDevice()); + device_bounding_rect = gui::graphics::mm2device(bounding_rect, processor()->paintDevice()); bool render_check_mark = false; auto rx = ReportItemMetaPaint::checkReportSubstitutionRegExp; @@ -137,7 +137,7 @@ ReportItem::PrintResult ReportItemPara::printMetaPaintChildren(ReportItemMetaPai } } /// velikost boundingRect je v bodech vystupniho zarizeni, tak to prepocitej na mm - device_bounding_rect = qmlwidgets::graphics::device2mm(device_bounding_rect, processor()->paintDevice()); + device_bounding_rect = gui::graphics::device2mm(device_bounding_rect, processor()->paintDevice()); /// rendered rect is left aligned, if text is reight aligned or centered, the ReportItemMetaPaintText::paint() does it if(text_item_should_be_created ) { ReportItemMetaPaintText *mt; diff --git a/libqf/libqfqmlwidgets/src/reports/processor/reportitempara.h b/libqf/libqfgui/src/reports/processor/reportitempara.h similarity index 88% rename from libqf/libqfqmlwidgets/src/reports/processor/reportitempara.h rename to libqf/libqfgui/src/reports/processor/reportitempara.h index 27c65f2c1..f01c0d3b3 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/reportitempara.h +++ b/libqf/libqfgui/src/reports/processor/reportitempara.h @@ -4,21 +4,21 @@ // Copyright: See COPYING file that comes with this distribution // -#ifndef QF_QMLWIDGETS_REPORTS_REPORTITEMPARA_H -#define QF_QMLWIDGETS_REPORTS_REPORTITEMPARA_H +#ifndef QF_GUI_REPORTS_REPORTITEMPARA_H +#define QF_GUI_REPORTS_REPORTITEMPARA_H #include "reportitemframe.h" -#include "../../qmlwidgetsglobal.h" +#include "../../guiglobal.h" #include #include namespace qf { -namespace qmlwidgets { +namespace gui { namespace reports { -class QFQMLWIDGETS_DECL_EXPORT ReportItemPara : public ReportItemFrame +class QFGUI_DECL_EXPORT ReportItemPara : public ReportItemFrame { Q_OBJECT @@ -66,4 +66,4 @@ class QFQMLWIDGETS_DECL_EXPORT ReportItemPara : public ReportItemFrame }}} -#endif // QF_QMLWIDGETS_REPORTS_REPORTITEMPARA_H +#endif // QF_GUI_REPORTS_REPORTITEMPARA_H diff --git a/libqf/libqfqmlwidgets/src/reports/processor/reportitemreport.cpp b/libqf/libqfgui/src/reports/processor/reportitemreport.cpp similarity index 96% rename from libqf/libqfqmlwidgets/src/reports/processor/reportitemreport.cpp rename to libqf/libqfgui/src/reports/processor/reportitemreport.cpp index 17e6db68b..0adb7224b 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/reportitemreport.cpp +++ b/libqf/libqfgui/src/reports/processor/reportitemreport.cpp @@ -2,7 +2,7 @@ #include -using namespace qf::qmlwidgets::reports; +using namespace qf::gui::reports; //========================================================== // ReportItemReport diff --git a/libqf/libqfqmlwidgets/src/reports/processor/reportitemreport.h b/libqf/libqfgui/src/reports/processor/reportitemreport.h similarity index 76% rename from libqf/libqfqmlwidgets/src/reports/processor/reportitemreport.h rename to libqf/libqfgui/src/reports/processor/reportitemreport.h index 2f0239a26..b5f1c3785 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/reportitemreport.h +++ b/libqf/libqfgui/src/reports/processor/reportitemreport.h @@ -4,22 +4,22 @@ // Copyright: See COPYING file that comes with this distribution // -#ifndef QF_QMLWIDGETS_REPORTS_REPORTITEMREPORT_H -#define QF_QMLWIDGETS_REPORTS_REPORTITEMREPORT_H +#ifndef QF_GUI_REPORTS_REPORTITEMREPORT_H +#define QF_GUI_REPORTS_REPORTITEMREPORT_H #include "reportitemband.h" -#include "../../qmlwidgetsglobal.h" +#include "../../guiglobal.h" namespace qf { -namespace qmlwidgets { +namespace gui { namespace reports { -class QFQMLWIDGETS_DECL_EXPORT ReportItemReport : public ReportItemFrame +class QFGUI_DECL_EXPORT ReportItemReport : public ReportItemFrame { Q_OBJECT - Q_PROPERTY(qf::qmlwidgets::reports::style::Sheet* styleSheet READ styleSheet WRITE setStyleSheet NOTIFY styleSheetChanged) + Q_PROPERTY(qf::gui::reports::style::Sheet* styleSheet READ styleSheet WRITE setStyleSheet NOTIFY styleSheetChanged) Q_PROPERTY(int debugLevel READ debugLevel WRITE setDebugLevel) Q_PROPERTY(bool created READ isCreated NOTIFY createdChanged) private: @@ -45,7 +45,7 @@ class QFQMLWIDGETS_DECL_EXPORT ReportItemReport : public ReportItemFrame }; #if 0 -class QFQMLWIDGETS_DECL_EXPORT ReportItemBody : public ReportItemDetail +class QFGUI_DECL_EXPORT ReportItemBody : public ReportItemDetail { Q_OBJECT private: @@ -63,4 +63,4 @@ class QFQMLWIDGETS_DECL_EXPORT ReportItemBody : public ReportItemDetail #endif }}} -#endif // QF_QMLWIDGETS_REPORTS_REPORTITEMREPORT_H +#endif // QF_GUI_REPORTS_REPORTITEMREPORT_H diff --git a/libqf/libqfqmlwidgets/src/reports/processor/reportpainter.cpp b/libqf/libqfgui/src/reports/processor/reportpainter.cpp similarity index 94% rename from libqf/libqfqmlwidgets/src/reports/processor/reportpainter.cpp rename to libqf/libqfgui/src/reports/processor/reportpainter.cpp index 8cf95460d..d651675a7 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/reportpainter.cpp +++ b/libqf/libqfgui/src/reports/processor/reportpainter.cpp @@ -18,7 +18,7 @@ #include #include -using namespace qf::qmlwidgets::reports; +using namespace qf::gui::reports; //================================================= // ReportItemMetaPaint @@ -159,7 +159,7 @@ void ReportItemMetaPaint::expandChildVerticalSpringFrames() double layout_inset = insetVertical(); layout_size -= 2 * layout_inset; /// rozpocitej procenta, je to napsano pro oba layouty, ale asi to nepujde kvuli zalamovani textu pouzit nikdy pro horizontalni layout - if(layout() == qf::qmlwidgets::graphics::LayoutVertical) { + if(layout() == qf::gui::graphics::LayoutVertical) { qreal sum_percent = 0; int cnt_0_percent = 0; qreal sum_mm = 0; @@ -219,7 +219,7 @@ void ReportItemMetaPaint::expandChildVerticalSpringFrames() } } } - else if(layout() == qf::qmlwidgets::graphics::LayoutStacked) { + else if(layout() == qf::gui::graphics::LayoutStacked) { for(int i=0; ifillVLayoutRatio(); @@ -248,7 +248,7 @@ void ReportItemMetaPaint::alignChildren() if(dirty_rect.isValid()) { if(alignment() & ~(Qt::AlignLeft | Qt::AlignTop)) { Point offset; - if(layout() == qf::qmlwidgets::graphics::LayoutVertical && hasSpringChildrenFramesInVerticalLayout()) { + if(layout() == qf::gui::graphics::LayoutVertical && hasSpringChildrenFramesInVerticalLayout()) { /// pokud ma spring item ve vertikalnim layoutu, neni treba nic posouvat, o to se postara expandChildVerticalSpringFrames() } else { @@ -265,7 +265,7 @@ void ReportItemMetaPaint::alignChildren() } qfDebug() << "\t potisknuty blok:" << r1.toString(); qreal al = 0, d; - if(layout() == qf::qmlwidgets::graphics::LayoutHorizontal) { + if(layout() == qf::gui::graphics::LayoutHorizontal) { if(alignment() & Qt::AlignHCenter) al = 0.5; else if(alignment() & Qt::AlignRight) @@ -275,7 +275,7 @@ void ReportItemMetaPaint::alignChildren() offset.rx() = d * al - (r1.left() - dirty_rect.left()); } } - else if(layout() == qf::qmlwidgets::graphics::LayoutVertical) { + else if(layout() == qf::gui::graphics::LayoutVertical) { if(alignment() & Qt::AlignVCenter) al = 0.5; else if(alignment() & Qt::AlignBottom) al = 1; d = dirty_rect.height() - r1.height(); @@ -292,7 +292,7 @@ void ReportItemMetaPaint::alignChildren() qfDebug() << "\t\titem renderedRect:" << r1.toString(); qreal al = 0, d; - if(orthogonalLayout() == qf::qmlwidgets::graphics::LayoutHorizontal) { + if(orthogonalLayout() == qf::gui::graphics::LayoutHorizontal) { offset.rx() = 0; if(alignment() & Qt::AlignHCenter) al = 0.5; else if(alignment() & Qt::AlignRight) al = 1; @@ -302,7 +302,7 @@ void ReportItemMetaPaint::alignChildren() offset.rx() = d * al - (r1.left() - dirty_rect.left()); } } - else if(orthogonalLayout() == qf::qmlwidgets::graphics::LayoutVertical) { + else if(orthogonalLayout() == qf::gui::graphics::LayoutVertical) { offset.ry() = 0; al = 0; if(alignment() & Qt::AlignVCenter) al = 0.5; @@ -420,7 +420,7 @@ void ReportItemMetaPaintFrame::paint(ReportPainter *painter, unsigned mode) void ReportItemMetaPaintFrame::fillItem(QPainter *painter, bool selected) { - Rect r = qf::qmlwidgets::graphics::mm2device(renderedRect, painter->device()); + Rect r = qf::gui::graphics::mm2device(renderedRect, painter->device()); //qfDebug().color(QFLog::Yellow) << QF_FUNC_NAME << reportElement.tagName(); //qfInfo() << "\t logicalDpiX:" << painter->device()->logicalDpiX(); //qfInfo() << "\t logicalDpiY:" << painter->device()->logicalDpiY(); @@ -446,7 +446,7 @@ void ReportItemMetaPaintFrame::frameItem(QPainter *painter, bool selected) p.setWidth(2); painter->setPen(p); painter->setBrush(QBrush()); - painter->drawRect(qf::qmlwidgets::graphics::mm2device(renderedRect, painter->device())); + painter->drawRect(qf::gui::graphics::mm2device(renderedRect, painter->device())); } else { drawLine(painter, LBrd, lbrd); @@ -466,11 +466,11 @@ void ReportItemMetaPaintFrame::drawLine(QPainter *painter, LinePos where, const /// ted je w v milimetrech bool horizontal = (where == TBrd || where == BBrd); if(horizontal) - pen.setWidthF(qf::qmlwidgets::graphics::y2device(w, painter->device())); + pen.setWidthF(qf::gui::graphics::y2device(w, painter->device())); else - pen.setWidthF(qf::qmlwidgets::graphics::x2device(w, painter->device())); + pen.setWidthF(qf::gui::graphics::x2device(w, painter->device())); Point p1, p2; - Rect r = qf::qmlwidgets::graphics::mm2device(renderedRect, painter->device()); + Rect r = qf::gui::graphics::mm2device(renderedRect, painter->device()); if(where == TBrd) { p1 = r.topLeft(); p2 = r.topRight(); } else if(where == LBrd) { p1 = r.topLeft(); p2 = r.bottomLeft(); } else if(where == BBrd) { p1 = r.bottomLeft(); p2 = r.bottomRight(); } @@ -497,7 +497,7 @@ void ReportItemMetaPaintText::paint(ReportPainter *painter, unsigned mode) /// zazlut cely parent frame, az do ktereho se muze editovatelny text roztahnout auto *it = dynamic_cast(parent()); if(it) { - Rect r = qf::qmlwidgets::graphics::mm2device(it->renderedRect, painter->device()); + Rect r = qf::gui::graphics::mm2device(it->renderedRect, painter->device()); painter->fillRect(r, Qt::yellow); //is_yellow = true; } @@ -527,7 +527,7 @@ void ReportItemMetaPaintText::paint(ReportPainter *painter, unsigned mode) br.moveLeft(br.left() + ((pbr.width() - br.width()) / 2) - hinset); } } - br = qf::qmlwidgets::graphics::mm2device(br, painter->device()); + br = qf::gui::graphics::mm2device(br, painter->device()); br.adjust(0, 0, 1, 1); /// nekdy se stane, kvuji nepresnostem prepocitavani jednotek, ze se to vyrendruje pri tisku jinak, nez pri kompilaci, tohle trochu pomaha:) /// to samy jako v #if 0, jen se to tiskne stejnym zpusobem, jako se to kompilovalo, coz muze ukazat, proc to vypada jinak, nez cekam @@ -602,14 +602,14 @@ void ReportItemMetaPaintCheck::paint(ReportPainter * painter, unsigned mode) r.translate((w - r.width())/2., 0); else if(alignment_flags & Qt::AlignRight) r.translate(w - r.width(), 0); - painter->drawRect(qf::qmlwidgets::graphics::mm2device(r, painter->device())); + painter->drawRect(qf::gui::graphics::mm2device(r, painter->device())); if(check_on) { #ifdef CHECK_MARK_HOOK /// CHECK hook static QString s_check = "color: teal; style: solid; size:2"; painter->setPen(context().styleCache().pen(s_check)); - r = qf::qmlwidgets::graphics::mm2device(r, painter->device()); + r = qf::gui::graphics::mm2device(r, painter->device()); QPointF p1(r.left(), r.top() + r.height() / 2); QPointF p2(r.left() + r.width() / 2, r.bottom()); painter->drawLine(p1, p2); @@ -622,7 +622,7 @@ void ReportItemMetaPaintCheck::paint(ReportPainter * painter, unsigned mode) auto c = QColor::fromString("maroon"); p.setColor(c); painter->setPen(p); - r = qf::qmlwidgets::graphics::mm2device(r, painter->device()); + r = qf::gui::graphics::mm2device(r, painter->device()); painter->drawLine(r.topLeft(), r.bottomRight()); painter->drawLine(r.bottomLeft(), r.topRight()); #endif @@ -648,7 +648,7 @@ void ReportItemMetaPaintImage::paint(ReportPainter *painter, unsigned mode) } if(mode != PaintFill) return; - Rect br = qf::qmlwidgets::graphics::mm2device(renderedRect, painter->device()); + Rect br = qf::gui::graphics::mm2device(renderedRect, painter->device()); //br.adjust(0, 0, 1, 1); /// nekdy se stane, kvuji nepresnostem prepocitavani jednotek, ze se to vyrendruje pri tisku jinak, nez pri kompilaci, tohle trochu pomaha:) //r.setHeight(500); //painter->fillRect(r, QColor("#DDDDDD")); diff --git a/libqf/libqfqmlwidgets/src/reports/processor/reportpainter.h b/libqf/libqfgui/src/reports/processor/reportpainter.h similarity index 82% rename from libqf/libqfqmlwidgets/src/reports/processor/reportpainter.h rename to libqf/libqfgui/src/reports/processor/reportpainter.h index 60420d3ca..9fd14e4eb 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/reportpainter.h +++ b/libqf/libqfgui/src/reports/processor/reportpainter.h @@ -5,13 +5,13 @@ // Copyright: See COPYING file that comes with this distribution // -#ifndef QF_QMLWIDGETS_REPORTS_REPORTPAINTER_H -#define QF_QMLWIDGETS_REPORTS_REPORTPAINTER_H +#ifndef QF_GUI_REPORTS_REPORTPAINTER_H +#define QF_GUI_REPORTS_REPORTPAINTER_H #include "reportitemframe.h" #include "../../graphics/graphics.h" -//#include "../../qmlwidgetsglobal.h" +//#include "../../guiglobal.h" #include #include @@ -21,13 +21,13 @@ #include namespace qf { -namespace qmlwidgets { +namespace gui { namespace reports { class ReportPainter; //! Base trida objektu, ktere vzniknou prekladem reportu. -class QFQMLWIDGETS_DECL_EXPORT ReportItemMetaPaint : public qf::core::utils::TreeItemBase +class QFGUI_DECL_EXPORT ReportItemMetaPaint : public qf::core::utils::TreeItemBase { private: typedef qf::core::utils::TreeItemBase Super; @@ -43,9 +43,9 @@ class QFQMLWIDGETS_DECL_EXPORT ReportItemMetaPaint : public qf::core::utils::Tre static const QRegularExpression checkReportSubstitutionRegExp; static const QString checkReportSubstitution; //static const QString checkOffReportSubstitution; - typedef qf::qmlwidgets::graphics::Rect Rect; - typedef qf::qmlwidgets::graphics::Size Size; - typedef qf::qmlwidgets::graphics::Point Point; + typedef qf::gui::graphics::Rect Rect; + typedef qf::gui::graphics::Size Size; + typedef qf::gui::graphics::Point Point; class LayoutSetting : public QMap { public: @@ -63,8 +63,8 @@ class QFQMLWIDGETS_DECL_EXPORT ReportItemMetaPaint : public qf::core::utils::Tre void setInset(qreal horizontal, qreal vertical); qreal insetHorizontal() {return f_layoutSettings.value(LayoutSetting::HInset).toDouble();} qreal insetVertical() {return f_layoutSettings.value(LayoutSetting::VInset).toDouble();} - qf::qmlwidgets::graphics::Layout layout() const {return (qf::qmlwidgets::graphics::Layout)f_layoutSettings.value(LayoutSetting::Layout, qf::qmlwidgets::graphics::LayoutVertical).toInt();} - void setLayout(qf::qmlwidgets::graphics::Layout ly) {if(layout() != ly) f_layoutSettings[LayoutSetting::Layout] = ly;} + qf::gui::graphics::Layout layout() const {return (qf::gui::graphics::Layout)f_layoutSettings.value(LayoutSetting::Layout, qf::gui::graphics::LayoutVertical).toInt();} + void setLayout(qf::gui::graphics::Layout ly) {if(layout() != ly) f_layoutSettings[LayoutSetting::Layout] = ly;} Qt::Alignment alignment() const {return (Qt::Alignment)f_layoutSettings.value(LayoutSetting::Alignment, (int)(Qt::AlignLeft | Qt::AlignTop)).toInt();} void setAlignment(ReportItemFrame::HAlignment hal, ReportItemFrame::VAlignment val) { int al = static_cast(hal) | static_cast(val); @@ -76,12 +76,12 @@ class QFQMLWIDGETS_DECL_EXPORT ReportItemMetaPaint : public qf::core::utils::Tre double fillVLayoutRatio() {return f_layoutSettings.value(LayoutSetting::FillVLayoutRatio, -1).toDouble();} void setFillVLayoutRatio(double d) {if(fillVLayoutRatio() != d) f_layoutSettings[LayoutSetting::FillVLayoutRatio] = d;} - static qf::qmlwidgets::graphics::Layout orthogonalLayout(qf::qmlwidgets::graphics::Layout l) { - if(l == qf::qmlwidgets::graphics::LayoutHorizontal) return qf::qmlwidgets::graphics::LayoutVertical; - if(l == qf::qmlwidgets::graphics::LayoutVertical) return qf::qmlwidgets::graphics::LayoutHorizontal; - return qf::qmlwidgets::graphics::LayoutInvalid; + static qf::gui::graphics::Layout orthogonalLayout(qf::gui::graphics::Layout l) { + if(l == qf::gui::graphics::LayoutHorizontal) return qf::gui::graphics::LayoutVertical; + if(l == qf::gui::graphics::LayoutVertical) return qf::gui::graphics::LayoutHorizontal; + return qf::gui::graphics::LayoutInvalid; } - qf::qmlwidgets::graphics::Layout orthogonalLayout() const {return orthogonalLayout(layout());} + qf::gui::graphics::Layout orthogonalLayout() const {return orthogonalLayout(layout());} public: void setRenderedRectRect(const QRectF &new_size) {renderedRect = new_size;} @@ -137,7 +137,7 @@ class QFQMLWIDGETS_DECL_EXPORT ReportItemMetaPaint : public qf::core::utils::Tre }; -class QFQMLWIDGETS_DECL_EXPORT ReportItemMetaPaintReport : public ReportItemMetaPaint +class QFGUI_DECL_EXPORT ReportItemMetaPaintReport : public ReportItemMetaPaint { private: typedef ReportItemMetaPaint Super; @@ -169,7 +169,7 @@ class ReportItemMetaPaintFrame : public ReportItemMetaPaint void paint(ReportPainter *painter, unsigned mode = PaintAll) Q_DECL_OVERRIDE; }; -class QFQMLWIDGETS_DECL_EXPORT ReportItemMetaPaintText : public ReportItemMetaPaint +class QFGUI_DECL_EXPORT ReportItemMetaPaintText : public ReportItemMetaPaint { private: typedef ReportItemMetaPaint Super; @@ -196,7 +196,7 @@ class QFQMLWIDGETS_DECL_EXPORT ReportItemMetaPaintText : public ReportItemMetaPa }; -class QFQMLWIDGETS_DECL_EXPORT ReportItemMetaPaintCheck : public ReportItemMetaPaintText +class QFGUI_DECL_EXPORT ReportItemMetaPaintCheck : public ReportItemMetaPaintText { private: typedef ReportItemMetaPaintText Super; @@ -209,7 +209,7 @@ class QFQMLWIDGETS_DECL_EXPORT ReportItemMetaPaintCheck : public ReportItemMetaP }; -class QFQMLWIDGETS_DECL_EXPORT ReportItemMetaPaintImage : public ReportItemMetaPaint +class QFGUI_DECL_EXPORT ReportItemMetaPaintImage : public ReportItemMetaPaint { private: typedef ReportItemMetaPaintImage Super; @@ -228,7 +228,7 @@ class QFQMLWIDGETS_DECL_EXPORT ReportItemMetaPaintImage : public ReportItemMetaP }; -class QFQMLWIDGETS_DECL_EXPORT ReportPainter : public QPainter +class QFGUI_DECL_EXPORT ReportPainter : public QPainter { private: typedef QPainter Super; @@ -251,5 +251,5 @@ class QFQMLWIDGETS_DECL_EXPORT ReportPainter : public QPainter }}} -#endif // QF_QMLWIDGETS_REPORTS_REPORTPAINTER_H +#endif // QF_GUI_REPORTS_REPORTPAINTER_H diff --git a/libqf/libqfqmlwidgets/src/reports/processor/reportprocessor.cpp b/libqf/libqfgui/src/reports/processor/reportprocessor.cpp similarity index 98% rename from libqf/libqfqmlwidgets/src/reports/processor/reportprocessor.cpp rename to libqf/libqfgui/src/reports/processor/reportprocessor.cpp index 4c31c7315..aebf7f50c 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/reportprocessor.cpp +++ b/libqf/libqfgui/src/reports/processor/reportprocessor.cpp @@ -19,7 +19,7 @@ namespace qfu = qf::core::utils; -using namespace qf::qmlwidgets::reports; +using namespace qf::gui::reports; //=================================================== // ReportProcessor @@ -351,9 +351,9 @@ QQmlEngine *ReportProcessor::qmlEngine(bool throw_exc) { #if defined USE_APP_ENGINE QQmlEngine *ret = nullptr; - qf::qmlwidgets::framework::Application *app = qobject_cast(QCoreApplication::instance()); + qf::gui::framework::Application *app = qobject_cast(QCoreApplication::instance()); if(throw_exc) - QF_ASSERT_EX(app != nullptr, "Application is not a type of qf::qmlwidgets::framework::Application"); + QF_ASSERT_EX(app != nullptr, "Application is not a type of qf::gui::framework::Application"); if(app) { ret = app->qmlEngine(); if(throw_exc) diff --git a/libqf/libqfqmlwidgets/src/reports/processor/reportprocessor.h b/libqf/libqfgui/src/reports/processor/reportprocessor.h similarity index 92% rename from libqf/libqfqmlwidgets/src/reports/processor/reportprocessor.h rename to libqf/libqfgui/src/reports/processor/reportprocessor.h index 4a9971176..4485115b5 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/reportprocessor.h +++ b/libqf/libqfgui/src/reports/processor/reportprocessor.h @@ -5,10 +5,10 @@ // Copyright: See COPYING file that comes with this distribution // -#ifndef QF_QMLWIDGETS_REPORTS_REPORTPROCESSOR_H -#define QF_QMLWIDGETS_REPORTS_REPORTPROCESSOR_H +#ifndef QF_GUI_REPORTS_REPORTPROCESSOR_H +#define QF_GUI_REPORTS_REPORTPROCESSOR_H -#include "../../qmlwidgetsglobal.h" +#include "../../guiglobal.h" #include "reportitem.h" #include "reportdocument.h" //#include "reportprocessorcontext.h" @@ -27,7 +27,7 @@ class QPrinter; class QQmlEngine; namespace qf { -namespace qmlwidgets { +namespace gui { namespace reports { class ReportItem; @@ -36,13 +36,13 @@ class ReportItemMetaPaint; class ReportItemMetaPaintReport; -class QFQMLWIDGETS_DECL_EXPORT ReportProcessor : public QObject +class QFGUI_DECL_EXPORT ReportProcessor : public QObject { Q_OBJECT //! cislo stranky, ktera se zrovna zpracovava, pocitaji se od 0. Q_PROPERTY(int processedPageNo READ processedPageNo WRITE setProcessedPageNo NOTIFY processedPageNoChanged) public: - class QFQMLWIDGETS_DECL_EXPORT HtmlExportOptions : public QVariantMap + class QFGUI_DECL_EXPORT HtmlExportOptions : public QVariantMap { public: HtmlExportOptions(const QVariantMap &o = QVariantMap()) : QVariantMap(o) {} @@ -140,5 +140,5 @@ public slots: }}} -#endif // QF_QMLWIDGETS_REPORTS_REPORTPROCESSOR_H +#endif // QF_GUI_REPORTS_REPORTPROCESSOR_H diff --git a/libqf/libqfqmlwidgets/src/reports/processor/style/brush.cpp b/libqf/libqfgui/src/reports/processor/style/brush.cpp similarity index 96% rename from libqf/libqfqmlwidgets/src/reports/processor/style/brush.cpp rename to libqf/libqfgui/src/reports/processor/style/brush.cpp index 51d0fd01b..91f4e80cd 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/style/brush.cpp +++ b/libqf/libqfgui/src/reports/processor/style/brush.cpp @@ -2,7 +2,7 @@ #include -using namespace qf::qmlwidgets::reports::style; +using namespace qf::gui::reports::style; Brush::Brush(QObject *parent) : StyleObject(parent, StyleObject::SGBrush) diff --git a/libqf/libqfqmlwidgets/src/reports/processor/style/brush.h b/libqf/libqfgui/src/reports/processor/style/brush.h similarity index 74% rename from libqf/libqfqmlwidgets/src/reports/processor/style/brush.h rename to libqf/libqfgui/src/reports/processor/style/brush.h index 732a227a9..87d956d6f 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/style/brush.h +++ b/libqf/libqfgui/src/reports/processor/style/brush.h @@ -1,10 +1,10 @@ -#ifndef QF_QMLWIDGETS_REPORTS_STYLE_BRUSH_H -#define QF_QMLWIDGETS_REPORTS_STYLE_BRUSH_H +#ifndef QF_GUI_REPORTS_STYLE_BRUSH_H +#define QF_GUI_REPORTS_STYLE_BRUSH_H #include "styleobject.h" #include "color.h" -#include "../../../qmlwidgetsglobal.h" +#include "../../../guiglobal.h" #include @@ -12,17 +12,17 @@ #include namespace qf { -namespace qmlwidgets { +namespace gui { namespace reports { namespace style { -class QFQMLWIDGETS_DECL_EXPORT Brush : public StyleObject +class QFGUI_DECL_EXPORT Brush : public StyleObject { Q_OBJECT // there are some restrictions for assigning primitive types to default properties, see: pen.h Q_CLASSINFO("DefaultProperty", "basedOn") Q_PROPERTY(QVariant basedOn READ basedOn WRITE setBasedOn) - Q_PROPERTY(qf::qmlwidgets::reports::style::Color* color READ color WRITE setColor NOTIFY colorChanged) + Q_PROPERTY(qf::gui::reports::style::Color* color READ color WRITE setColor NOTIFY colorChanged) Q_PROPERTY(BrushStyle style READ style WRITE setStyle) public: explicit Brush(QObject *parent = nullptr); @@ -50,4 +50,4 @@ class QFQMLWIDGETS_DECL_EXPORT Brush : public StyleObject }}}} -#endif // QF_QMLWIDGETS_REPORTS_STYLE_BRUSH_H +#endif // QF_GUI_REPORTS_STYLE_BRUSH_H diff --git a/libqf/libqfqmlwidgets/src/reports/processor/style/color.cpp b/libqf/libqfgui/src/reports/processor/style/color.cpp similarity index 95% rename from libqf/libqfqmlwidgets/src/reports/processor/style/color.cpp rename to libqf/libqfgui/src/reports/processor/style/color.cpp index 9b64e2640..844309ea7 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/style/color.cpp +++ b/libqf/libqfgui/src/reports/processor/style/color.cpp @@ -3,7 +3,7 @@ #include -using namespace qf::qmlwidgets::reports::style; +using namespace qf::gui::reports::style; Color::Color(QObject *parent) : StyleObject(parent, StyleObject::SGColor) diff --git a/libqf/libqfqmlwidgets/src/reports/processor/style/color.h b/libqf/libqfgui/src/reports/processor/style/color.h similarity index 69% rename from libqf/libqfqmlwidgets/src/reports/processor/style/color.h rename to libqf/libqfgui/src/reports/processor/style/color.h index 7666104bb..e462042b7 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/style/color.h +++ b/libqf/libqfgui/src/reports/processor/style/color.h @@ -1,9 +1,9 @@ -#ifndef QF_QMLWIDGETS_REPORTS_STYLE_COLOR_H -#define QF_QMLWIDGETS_REPORTS_STYLE_COLOR_H +#ifndef QF_GUI_REPORTS_STYLE_COLOR_H +#define QF_GUI_REPORTS_STYLE_COLOR_H #include "styleobject.h" -#include "../../../qmlwidgetsglobal.h" +#include "../../../guiglobal.h" #include @@ -11,11 +11,11 @@ #include namespace qf { -namespace qmlwidgets { +namespace gui { namespace reports { namespace style { -class QFQMLWIDGETS_DECL_EXPORT Color : public StyleObject +class QFGUI_DECL_EXPORT Color : public StyleObject { Q_OBJECT Q_PROPERTY(QVariant def READ definition WRITE setDefinition NOTIFY definitionChanged) diff --git a/libqf/libqfqmlwidgets/src/reports/processor/style/compiledtextstyle.cpp b/libqf/libqfgui/src/reports/processor/style/compiledtextstyle.cpp similarity index 92% rename from libqf/libqfqmlwidgets/src/reports/processor/style/compiledtextstyle.cpp rename to libqf/libqfgui/src/reports/processor/style/compiledtextstyle.cpp index aea8c02bf..e25f4625f 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/style/compiledtextstyle.cpp +++ b/libqf/libqfgui/src/reports/processor/style/compiledtextstyle.cpp @@ -1,6 +1,6 @@ #include "compiledtextstyle.h" -using namespace qf::qmlwidgets::reports::style; +using namespace qf::gui::reports::style; //========================================================== // CompiledTextStyle diff --git a/libqf/libqfqmlwidgets/src/reports/processor/style/compiledtextstyle.h b/libqf/libqfgui/src/reports/processor/style/compiledtextstyle.h similarity index 76% rename from libqf/libqfqmlwidgets/src/reports/processor/style/compiledtextstyle.h rename to libqf/libqfgui/src/reports/processor/style/compiledtextstyle.h index 22a37d606..c45f5c9b3 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/style/compiledtextstyle.h +++ b/libqf/libqfgui/src/reports/processor/style/compiledtextstyle.h @@ -1,5 +1,5 @@ -#ifndef QF_QMLWIDGETS_REPORTS_STYLE_COMPILEDTEXTSTYLE_H -#define QF_QMLWIDGETS_REPORTS_STYLE_COMPILEDTEXTSTYLE_H +#ifndef QF_GUI_REPORTS_STYLE_COMPILEDTEXTSTYLE_H +#define QF_GUI_REPORTS_STYLE_COMPILEDTEXTSTYLE_H #include @@ -9,7 +9,7 @@ #include namespace qf { -namespace qmlwidgets { +namespace gui { namespace reports { namespace style { @@ -38,4 +38,4 @@ class CompiledTextStyle }}}} -#endif // QF_QMLWIDGETS_REPORTS_STYLE_COMPILEDTEXTSTYLE_H +#endif // QF_GUI_REPORTS_STYLE_COMPILEDTEXTSTYLE_H diff --git a/libqf/libqfqmlwidgets/src/reports/processor/style/font.cpp b/libqf/libqfgui/src/reports/processor/style/font.cpp similarity index 93% rename from libqf/libqfqmlwidgets/src/reports/processor/style/font.cpp rename to libqf/libqfgui/src/reports/processor/style/font.cpp index 7e8301544..1e55d2b04 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/style/font.cpp +++ b/libqf/libqfgui/src/reports/processor/style/font.cpp @@ -1,16 +1,13 @@ #include "font.h" -using namespace qf::qmlwidgets::reports::style; +using namespace qf::gui::reports::style; Font::Font(QObject *parent) : StyleObject(parent, StyleObject::SGFont) { } -Font::~Font() -{ - //qfLogFuncFrame(); -} +Font::~Font() = default; QFont Font::font() { diff --git a/libqf/libqfqmlwidgets/src/reports/processor/style/font.h b/libqf/libqfgui/src/reports/processor/style/font.h similarity index 89% rename from libqf/libqfqmlwidgets/src/reports/processor/style/font.h rename to libqf/libqfgui/src/reports/processor/style/font.h index 2bcec3879..5ef239bf1 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/style/font.h +++ b/libqf/libqfgui/src/reports/processor/style/font.h @@ -1,9 +1,9 @@ -#ifndef QF_QMLWIDGETS_REPORTS_STYLE_FONT_H -#define QF_QMLWIDGETS_REPORTS_STYLE_FONT_H +#ifndef QF_GUI_REPORTS_STYLE_FONT_H +#define QF_GUI_REPORTS_STYLE_FONT_H #include "styleobject.h" -#include "../../../qmlwidgetsglobal.h" +#include "../../../guiglobal.h" #include @@ -11,11 +11,11 @@ #include namespace qf { -namespace qmlwidgets { +namespace gui { namespace reports { namespace style { -class QFQMLWIDGETS_DECL_EXPORT Font : public StyleObject +class QFGUI_DECL_EXPORT Font : public StyleObject { Q_OBJECT // there are some restrictions for assigning primitive types to default properties, see: pen.h @@ -78,4 +78,4 @@ class QFQMLWIDGETS_DECL_EXPORT Font : public StyleObject }}}} -#endif // QF_QMLWIDGETS_REPORTS_STYLE_FONT_H +#endif // QF_GUI_REPORTS_STYLE_FONT_H diff --git a/libqf/libqfqmlwidgets/src/reports/processor/style/pen.cpp b/libqf/libqfgui/src/reports/processor/style/pen.cpp similarity index 97% rename from libqf/libqfqmlwidgets/src/reports/processor/style/pen.cpp rename to libqf/libqfgui/src/reports/processor/style/pen.cpp index 0031f5970..c232c4eec 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/style/pen.cpp +++ b/libqf/libqfgui/src/reports/processor/style/pen.cpp @@ -7,7 +7,7 @@ #include -using namespace qf::qmlwidgets::reports::style; +using namespace qf::gui::reports::style; Pen::Pen(QObject *parent) : StyleObject(parent, StyleObject::SGPen), m_width() diff --git a/libqf/libqfqmlwidgets/src/reports/processor/style/pen.h b/libqf/libqfgui/src/reports/processor/style/pen.h similarity index 83% rename from libqf/libqfqmlwidgets/src/reports/processor/style/pen.h rename to libqf/libqfgui/src/reports/processor/style/pen.h index 3acadaf1b..6d8470616 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/style/pen.h +++ b/libqf/libqfgui/src/reports/processor/style/pen.h @@ -1,9 +1,9 @@ -#ifndef QF_QMLWIDGETS_REPORTS_STYLE_PEN_H -#define QF_QMLWIDGETS_REPORTS_STYLE_PEN_H +#ifndef QF_GUI_REPORTS_STYLE_PEN_H +#define QF_GUI_REPORTS_STYLE_PEN_H #include "styleobject.h" #include "color.h" -#include "../../../qmlwidgetsglobal.h" +#include "../../../guiglobal.h" #include @@ -11,11 +11,11 @@ #include namespace qf { -namespace qmlwidgets { +namespace gui { namespace reports { namespace style { -class QFQMLWIDGETS_DECL_EXPORT Pen : public StyleObject +class QFGUI_DECL_EXPORT Pen : public StyleObject { Q_OBJECT // From qt doc: @@ -29,7 +29,7 @@ class QFQMLWIDGETS_DECL_EXPORT Pen : public StyleObject // border: Pen { Pen { ... } } WILL work Q_CLASSINFO("DefaultProperty", "basedOn") Q_PROPERTY(QVariant basedOn READ basedOn WRITE setBasedOn) - Q_PROPERTY(qf::qmlwidgets::reports::style::Color* color READ color WRITE setColor NOTIFY colorChanged) + Q_PROPERTY(qf::gui::reports::style::Color* color READ color WRITE setColor NOTIFY colorChanged) Q_PROPERTY(PenStyle style READ style WRITE setStyle NOTIFY styleChanged) Q_CLASSINFO("property.width.doc", "Pen width in points (1/72 inch).\n" "A line width of zero indicates a cosmetic pen.") @@ -67,4 +67,4 @@ class QFQMLWIDGETS_DECL_EXPORT Pen : public StyleObject }}}} -#endif // QF_QMLWIDGETS_REPORTS_STYLE_PEN_H +#endif // QF_GUI_REPORTS_STYLE_PEN_H diff --git a/libqf/libqfqmlwidgets/src/reports/processor/style/sheet.cpp b/libqf/libqfgui/src/reports/processor/style/sheet.cpp similarity index 98% rename from libqf/libqfqmlwidgets/src/reports/processor/style/sheet.cpp rename to libqf/libqfgui/src/reports/processor/style/sheet.cpp index 99c2b0ecb..3e954fbb4 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/style/sheet.cpp +++ b/libqf/libqfgui/src/reports/processor/style/sheet.cpp @@ -2,7 +2,7 @@ #include -using namespace qf::qmlwidgets::reports::style; +using namespace qf::gui::reports::style; //========================================================== // Sheet diff --git a/libqf/libqfqmlwidgets/src/reports/processor/style/sheet.h b/libqf/libqfgui/src/reports/processor/style/sheet.h similarity index 64% rename from libqf/libqfqmlwidgets/src/reports/processor/style/sheet.h rename to libqf/libqfgui/src/reports/processor/style/sheet.h index ec5f5083c..3eb67eeaf 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/style/sheet.h +++ b/libqf/libqfgui/src/reports/processor/style/sheet.h @@ -1,5 +1,5 @@ -#ifndef QF_QMLWIDGETS_REPORTS_STYLE_SHEET_H -#define QF_QMLWIDGETS_REPORTS_STYLE_SHEET_H +#ifndef QF_GUI_REPORTS_STYLE_SHEET_H +#define QF_GUI_REPORTS_STYLE_SHEET_H #include "color.h" #include "pen.h" @@ -7,7 +7,7 @@ #include "font.h" #include "text.h" -#include "../../../qmlwidgetsglobal.h" +#include "../../../guiglobal.h" #include @@ -19,20 +19,20 @@ #include namespace qf { -namespace qmlwidgets { +namespace gui { namespace reports { namespace style { -class QFQMLWIDGETS_DECL_EXPORT Sheet : public QObject +class QFGUI_DECL_EXPORT Sheet : public QObject { Q_OBJECT /// set name of prototype or prototype itself here Q_PROPERTY(QVariant basedOn READ basedOn WRITE setBasedOn) - Q_PROPERTY(QQmlListProperty colors READ colors) - Q_PROPERTY(QQmlListProperty pens READ pens) - Q_PROPERTY(QQmlListProperty brushes READ brushes) - Q_PROPERTY(QQmlListProperty fonts READ fonts) - Q_PROPERTY(QQmlListProperty textStyles READ textStyles) + Q_PROPERTY(QQmlListProperty colors READ colors) + Q_PROPERTY(QQmlListProperty pens READ pens) + Q_PROPERTY(QQmlListProperty brushes READ brushes) + Q_PROPERTY(QQmlListProperty fonts READ fonts) + Q_PROPERTY(QQmlListProperty textStyles READ textStyles) QF_PROPERTY_IMPL(QVariant, b, B, asedOn) public: @@ -62,4 +62,4 @@ class QFQMLWIDGETS_DECL_EXPORT Sheet : public QObject }}}} -#endif // QF_QMLWIDGETS_REPORTS_STYLE_SHEET_H +#endif // QF_GUI_REPORTS_STYLE_SHEET_H diff --git a/libqf/libqfqmlwidgets/src/reports/processor/style/styleobject.cpp b/libqf/libqfgui/src/reports/processor/style/styleobject.cpp similarity index 93% rename from libqf/libqfqmlwidgets/src/reports/processor/style/styleobject.cpp rename to libqf/libqfgui/src/reports/processor/style/styleobject.cpp index 56874c83c..aadfc477f 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/style/styleobject.cpp +++ b/libqf/libqfgui/src/reports/processor/style/styleobject.cpp @@ -6,7 +6,7 @@ #include -using namespace qf::qmlwidgets::reports::style; +using namespace qf::gui::reports::style; StyleObject::StyleObject(QObject *parent, StyleGroup style_group) : QObject(parent), m_styleGroup(style_group) @@ -31,7 +31,7 @@ void StyleObject::setName(const QString &s) } } -qf::qmlwidgets::reports::ReportItemReport *StyleObject::reportItem() +qf::gui::reports::ReportItemReport *StyleObject::reportItem() { ReportItemReport *ret = nullptr; QObject *it = this; @@ -50,7 +50,7 @@ qf::qmlwidgets::reports::ReportItemReport *StyleObject::reportItem() return ret; } -qf::qmlwidgets::reports::ReportProcessor *StyleObject::reportProcessor() +qf::gui::reports::ReportProcessor *StyleObject::reportProcessor() { ReportProcessor *ret = nullptr; ReportItemReport *rir = reportItem(); diff --git a/libqf/libqfqmlwidgets/src/reports/processor/style/styleobject.h b/libqf/libqfgui/src/reports/processor/style/styleobject.h similarity index 83% rename from libqf/libqfqmlwidgets/src/reports/processor/style/styleobject.h rename to libqf/libqfgui/src/reports/processor/style/styleobject.h index 512a02e37..b566185af 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/style/styleobject.h +++ b/libqf/libqfgui/src/reports/processor/style/styleobject.h @@ -1,7 +1,7 @@ -#ifndef QF_QMLWIDGETS_REPORTS_STYLE_STYLE_OBJECT_H -#define QF_QMLWIDGETS_REPORTS_STYLE_STYLE_OBJECT_H +#ifndef QF_GUI_REPORTS_STYLE_STYLE_OBJECT_H +#define QF_GUI_REPORTS_STYLE_STYLE_OBJECT_H -#include "../../../qmlwidgetsglobal.h" +#include "../../../guiglobal.h" #include #include @@ -11,7 +11,7 @@ class QVariant; class QEvent; namespace qf { -namespace qmlwidgets { +namespace gui { namespace reports { class ReportItemReport; @@ -21,7 +21,7 @@ namespace style { class Sheet; -class QFQMLWIDGETS_DECL_EXPORT StyleObject : public QObject, public QQmlParserStatus +class QFGUI_DECL_EXPORT StyleObject : public QObject, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/libqf/libqfqmlwidgets/src/reports/processor/style/text.cpp b/libqf/libqfgui/src/reports/processor/style/text.cpp similarity index 93% rename from libqf/libqfqmlwidgets/src/reports/processor/style/text.cpp rename to libqf/libqfgui/src/reports/processor/style/text.cpp index 33130d387..3a2e6a9f0 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/style/text.cpp +++ b/libqf/libqfgui/src/reports/processor/style/text.cpp @@ -7,7 +7,7 @@ #include -using namespace qf::qmlwidgets::reports::style; +using namespace qf::gui::reports::style; Text::Text(QObject *parent) : StyleObject(parent, StyleObject::SGText) diff --git a/libqf/libqfqmlwidgets/src/reports/processor/style/text.h b/libqf/libqfgui/src/reports/processor/style/text.h similarity index 61% rename from libqf/libqfqmlwidgets/src/reports/processor/style/text.h rename to libqf/libqfgui/src/reports/processor/style/text.h index 308317b87..83bc5f9f1 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/style/text.h +++ b/libqf/libqfgui/src/reports/processor/style/text.h @@ -1,30 +1,30 @@ -#ifndef QF_QMLWIDGETS_REPORTS_STYLE_TEXT_H -#define QF_QMLWIDGETS_REPORTS_STYLE_TEXT_H +#ifndef QF_GUI_REPORTS_STYLE_TEXT_H +#define QF_GUI_REPORTS_STYLE_TEXT_H #include "pen.h" #include "brush.h" #include "font.h" #include "compiledtextstyle.h" -#include "../../../qmlwidgetsglobal.h" +#include "../../../guiglobal.h" #include #include namespace qf { -namespace qmlwidgets { +namespace gui { namespace reports { namespace style { -class QFQMLWIDGETS_DECL_EXPORT Text : public StyleObject +class QFGUI_DECL_EXPORT Text : public StyleObject { Q_OBJECT // there are some restrictions for assigning primitive types to default properties, see: pen.h Q_CLASSINFO("DefaultProperty", "basedOn") Q_PROPERTY(QVariant basedOn READ basedOn WRITE setBasedOn) - Q_PROPERTY(qf::qmlwidgets::reports::style::Pen* pen READ pen WRITE setPen NOTIFY penChanged) - Q_PROPERTY(qf::qmlwidgets::reports::style::Font* font READ font WRITE setFont NOTIFY fontChanged) + Q_PROPERTY(qf::gui::reports::style::Pen* pen READ pen WRITE setPen NOTIFY penChanged) + Q_PROPERTY(qf::gui::reports::style::Font* font READ font WRITE setFont NOTIFY fontChanged) public: explicit Text(QObject *parent = nullptr); ~Text() Q_DECL_OVERRIDE; @@ -40,4 +40,4 @@ class QFQMLWIDGETS_DECL_EXPORT Text : public StyleObject }}}} -#endif // QF_QMLWIDGETS_REPORTS_STYLE_TEXT_H +#endif // QF_GUI_REPORTS_STYLE_TEXT_H diff --git a/libqf/libqfqmlwidgets/src/reports/reports.qrc b/libqf/libqfgui/src/reports/reports.qrc similarity index 100% rename from libqf/libqfqmlwidgets/src/reports/reports.qrc rename to libqf/libqfgui/src/reports/reports.qrc diff --git a/libqf/libqfqmlwidgets/src/reports/widgets/itemvalueeditorwidget.cpp b/libqf/libqfgui/src/reports/widgets/itemvalueeditorwidget.cpp similarity index 95% rename from libqf/libqfqmlwidgets/src/reports/widgets/itemvalueeditorwidget.cpp rename to libqf/libqfgui/src/reports/widgets/itemvalueeditorwidget.cpp index af56b5ab9..cfe81b2be 100644 --- a/libqf/libqfqmlwidgets/src/reports/widgets/itemvalueeditorwidget.cpp +++ b/libqf/libqfgui/src/reports/widgets/itemvalueeditorwidget.cpp @@ -10,7 +10,7 @@ #include -using namespace qf::qmlwidgets::reports; +using namespace qf::gui::reports; //================================================= // ItemValueEditorWidget diff --git a/libqf/libqfqmlwidgets/src/reports/widgets/itemvalueeditorwidget.h b/libqf/libqfgui/src/reports/widgets/itemvalueeditorwidget.h similarity index 79% rename from libqf/libqfqmlwidgets/src/reports/widgets/itemvalueeditorwidget.h rename to libqf/libqfgui/src/reports/widgets/itemvalueeditorwidget.h index 88bfcae3c..7cce23bab 100644 --- a/libqf/libqfqmlwidgets/src/reports/widgets/itemvalueeditorwidget.h +++ b/libqf/libqfgui/src/reports/widgets/itemvalueeditorwidget.h @@ -11,17 +11,17 @@ #include "../../framework/dialogwidget.h" namespace qf { -namespace qmlwidgets { +namespace gui { namespace reports { namespace Ui {class ItemValueEditorWidget;} -class ItemValueEditorWidget : public qf::qmlwidgets::framework::DialogWidget +class ItemValueEditorWidget : public qf::gui::framework::DialogWidget { Q_OBJECT private: - typedef qf::qmlwidgets::framework::DialogWidget Super; + typedef qf::gui::framework::DialogWidget Super; private: Ui::ItemValueEditorWidget *ui; public: diff --git a/libqf/libqfqmlwidgets/src/reports/widgets/itemvalueeditorwidget.ui b/libqf/libqfgui/src/reports/widgets/itemvalueeditorwidget.ui similarity index 81% rename from libqf/libqfqmlwidgets/src/reports/widgets/itemvalueeditorwidget.ui rename to libqf/libqfgui/src/reports/widgets/itemvalueeditorwidget.ui index 0ee82834e..8e2491c8f 100644 --- a/libqf/libqfqmlwidgets/src/reports/widgets/itemvalueeditorwidget.ui +++ b/libqf/libqfgui/src/reports/widgets/itemvalueeditorwidget.ui @@ -1,7 +1,7 @@ - qf::qmlwidgets::reports::ItemValueEditorWidget - + qf::gui::reports::ItemValueEditorWidget + 0 diff --git a/libqf/libqfqmlwidgets/src/reports/widgets/printtableviewwidget/printtableviewwidget.cpp b/libqf/libqfgui/src/reports/widgets/printtableviewwidget/printtableviewwidget.cpp similarity index 94% rename from libqf/libqfqmlwidgets/src/reports/widgets/printtableviewwidget/printtableviewwidget.cpp rename to libqf/libqfgui/src/reports/widgets/printtableviewwidget/printtableviewwidget.cpp index 242f5d9fb..4a9895f89 100644 --- a/libqf/libqfqmlwidgets/src/reports/widgets/printtableviewwidget/printtableviewwidget.cpp +++ b/libqf/libqfgui/src/reports/widgets/printtableviewwidget/printtableviewwidget.cpp @@ -9,7 +9,7 @@ namespace qfu = qf::core::utils; -using namespace qf::qmlwidgets::reports; +using namespace qf::gui::reports; PrintTableViewWidget::PrintTableViewWidget(TableView *table_view, QWidget *parent) : Super(parent), @@ -20,8 +20,8 @@ PrintTableViewWidget::PrintTableViewWidget(TableView *table_view, QWidget *paren connect(ui->btChooseReportFileName, &QPushButton::clicked, this, &PrintTableViewWidget::chooseReporFileName); { QComboBox *cbx = ui->lstQrcReports; - cbx->addItem(tr("portrait"), ":/qf/qmlwidgets/reports/portrait.qml"); - cbx->addItem(tr("landscape"), ":/qf/qmlwidgets/reports/landscape.qml"); + cbx->addItem(tr("portrait"), ":/qf/gui/reports/portrait.qml"); + cbx->addItem(tr("landscape"), ":/qf/gui/reports/landscape.qml"); cbx->setCurrentIndex(-1); connect(cbx, &QComboBox::activated, this, &PrintTableViewWidget::onLstQrcReportsActivated); } diff --git a/libqf/libqfqmlwidgets/src/reports/widgets/printtableviewwidget/printtableviewwidget.h b/libqf/libqfgui/src/reports/widgets/printtableviewwidget/printtableviewwidget.h similarity index 72% rename from libqf/libqfqmlwidgets/src/reports/widgets/printtableviewwidget/printtableviewwidget.h rename to libqf/libqfgui/src/reports/widgets/printtableviewwidget/printtableviewwidget.h index e24dd14cf..08618e12c 100644 --- a/libqf/libqfqmlwidgets/src/reports/widgets/printtableviewwidget/printtableviewwidget.h +++ b/libqf/libqfgui/src/reports/widgets/printtableviewwidget/printtableviewwidget.h @@ -1,5 +1,5 @@ -#ifndef QF_QMLWIDGETS_REPORTS_PRINTTABLEVIEWWIDGET_H -#define QF_QMLWIDGETS_REPORTS_PRINTTABLEVIEWWIDGET_H +#ifndef QF_GUI_REPORTS_PRINTTABLEVIEWWIDGET_H +#define QF_GUI_REPORTS_PRINTTABLEVIEWWIDGET_H #include "../../../framework/dialogwidget.h" #include "../../../framework/ipersistentoptions.h" @@ -7,7 +7,7 @@ #include namespace qf { -namespace qmlwidgets { +namespace gui { class TableView; namespace reports { @@ -15,11 +15,11 @@ namespace Ui { class PrintTableViewWidget; } -class PrintTableViewWidget : public qf::qmlwidgets::framework::DialogWidget, public qf::qmlwidgets::framework::IPersistentOptions +class PrintTableViewWidget : public qf::gui::framework::DialogWidget, public qf::gui::framework::IPersistentOptions { Q_OBJECT private: - typedef qf::qmlwidgets::framework::DialogWidget Super; + typedef qf::gui::framework::DialogWidget Super; public: explicit PrintTableViewWidget(TableView *table_view, QWidget *parent = nullptr); ~PrintTableViewWidget() Q_DECL_OVERRIDE; @@ -48,4 +48,4 @@ class PrintTableViewWidget : public qf::qmlwidgets::framework::DialogWidget, pub }}} -#endif // QF_QMLWIDGETS_REPORTS_PRINTTABLEVIEWWIDGET_H +#endif // QF_GUI_REPORTS_PRINTTABLEVIEWWIDGET_H diff --git a/libqf/libqfqmlwidgets/src/reports/widgets/printtableviewwidget/printtableviewwidget.ui b/libqf/libqfgui/src/reports/widgets/printtableviewwidget/printtableviewwidget.ui similarity index 91% rename from libqf/libqfqmlwidgets/src/reports/widgets/printtableviewwidget/printtableviewwidget.ui rename to libqf/libqfgui/src/reports/widgets/printtableviewwidget/printtableviewwidget.ui index 2343d304b..a7eeb8dd5 100644 --- a/libqf/libqfqmlwidgets/src/reports/widgets/printtableviewwidget/printtableviewwidget.ui +++ b/libqf/libqfgui/src/reports/widgets/printtableviewwidget/printtableviewwidget.ui @@ -1,7 +1,7 @@ - qf::qmlwidgets::reports::PrintTableViewWidget - + qf::gui::reports::PrintTableViewWidget + 0 @@ -15,7 +15,7 @@ - + @@ -133,7 +133,7 @@ - + 0 @@ -150,13 +150,13 @@ - qf::qmlwidgets::internal::TableViewChooseColumnsWidget + qf::gui::internal::TableViewChooseColumnsWidget QWidget
src/internal/tableviewchoosecolumnswidget.h
1 - qf::qmlwidgets::SaveOptionsWidget + qf::gui::SaveOptionsWidget QWidget
src/saveoptionswidget.h
1 diff --git a/libqf/libqfqmlwidgets/src/reports/widgets/printtableviewwidget/reports/HeaderFooter.qml b/libqf/libqfgui/src/reports/widgets/printtableviewwidget/reports/HeaderFooter.qml similarity index 100% rename from libqf/libqfqmlwidgets/src/reports/widgets/printtableviewwidget/reports/HeaderFooter.qml rename to libqf/libqfgui/src/reports/widgets/printtableviewwidget/reports/HeaderFooter.qml diff --git a/libqf/libqfqmlwidgets/src/reports/widgets/printtableviewwidget/reports/MyStyle.qml b/libqf/libqfgui/src/reports/widgets/printtableviewwidget/reports/MyStyle.qml similarity index 100% rename from libqf/libqfqmlwidgets/src/reports/widgets/printtableviewwidget/reports/MyStyle.qml rename to libqf/libqfgui/src/reports/widgets/printtableviewwidget/reports/MyStyle.qml diff --git a/libqf/libqfqmlwidgets/src/reports/widgets/printtableviewwidget/reports/landscape.qml b/libqf/libqfgui/src/reports/widgets/printtableviewwidget/reports/landscape.qml similarity index 100% rename from libqf/libqfqmlwidgets/src/reports/widgets/printtableviewwidget/reports/landscape.qml rename to libqf/libqfgui/src/reports/widgets/printtableviewwidget/reports/landscape.qml diff --git a/libqf/libqfqmlwidgets/src/reports/widgets/printtableviewwidget/reports/portrait.qml b/libqf/libqfgui/src/reports/widgets/printtableviewwidget/reports/portrait.qml similarity index 100% rename from libqf/libqfqmlwidgets/src/reports/widgets/printtableviewwidget/reports/portrait.qml rename to libqf/libqfgui/src/reports/widgets/printtableviewwidget/reports/portrait.qml diff --git a/libqf/libqfqmlwidgets/src/reports/widgets/printtableviewwidget/reports/qf_qmlwidgets_printtablewidget_reports.qrc b/libqf/libqfgui/src/reports/widgets/printtableviewwidget/reports/qf_gui_printtablewidget_reports.qrc similarity index 82% rename from libqf/libqfqmlwidgets/src/reports/widgets/printtableviewwidget/reports/qf_qmlwidgets_printtablewidget_reports.qrc rename to libqf/libqfgui/src/reports/widgets/printtableviewwidget/reports/qf_gui_printtablewidget_reports.qrc index b7cd2e933..2f779f948 100644 --- a/libqf/libqfqmlwidgets/src/reports/widgets/printtableviewwidget/reports/qf_qmlwidgets_printtablewidget_reports.qrc +++ b/libqf/libqfgui/src/reports/widgets/printtableviewwidget/reports/qf_gui_printtablewidget_reports.qrc @@ -1,5 +1,5 @@ - + portrait.qml landscape.qml MyStyle.qml diff --git a/libqf/libqfqmlwidgets/src/reports/widgets/reportviewwidget.cpp b/libqf/libqfgui/src/reports/widgets/reportviewwidget.cpp similarity index 93% rename from libqf/libqfqmlwidgets/src/reports/widgets/reportviewwidget.cpp rename to libqf/libqfgui/src/reports/widgets/reportviewwidget.cpp index 51d49e462..e3868fdea 100644 --- a/libqf/libqfqmlwidgets/src/reports/widgets/reportviewwidget.cpp +++ b/libqf/libqfgui/src/reports/widgets/reportviewwidget.cpp @@ -44,7 +44,7 @@ #include -using namespace qf::qmlwidgets::reports; +using namespace qf::gui::reports; //==================================================== // ReportViewWidget::ScrollArea @@ -74,7 +74,7 @@ bool ReportViewWidget::showReport2(QWidget *parent , const QString &persistent_settings_id , const QVariantMap &report_init_properties) { - auto *w = new qf::qmlwidgets::reports::ReportViewWidget(); + auto *w = new qf::gui::reports::ReportViewWidget(); w->setWindowTitle(window_title); if(!persistent_settings_id.isEmpty()) w->setPersistentSettingsId(persistent_settings_id); @@ -86,11 +86,11 @@ bool ReportViewWidget::showReport2(QWidget *parent w->setTableData(it.key(), it.value()); } if(!parent) - parent = qf::qmlwidgets::framework::MainWindow::frameWork(); - qf::qmlwidgets::dialogs::Dialog dlg(parent); + parent = qf::gui::framework::MainWindow::frameWork(); + qf::gui::dialogs::Dialog dlg(parent); dlg.setCentralWidget(w); auto report_printed = std::make_shared(false); - connect(w, &qf::qmlwidgets::reports::ReportViewWidget::reportPrinted, [report_printed](int) { + connect(w, &qf::gui::reports::ReportViewWidget::reportPrinted, [report_printed](int) { *report_printed = true; }); dlg.exec(); @@ -149,8 +149,8 @@ void ReportViewWidget::ScrollArea::keyPressEvent(QKeyEvent* ev) static bool c_init = false; if(!c_init) { c_init = true; - QBitmap b1(":/qf/qmlwidgets/images/zoomin_cursor_bitmap.png"); - QBitmap b2(":/qf/qmlwidgets/images/zoomin_cursor_mask.png"); + QBitmap b1(":/qf/gui/images/zoomin_cursor_bitmap.png"); + QBitmap b2(":/qf/gui/images/zoomin_cursor_mask.png"); c = QCursor(b1, b2, 18, 12); } setCursor(c); @@ -396,10 +396,10 @@ void ReportViewWidget::setReportProcessor(ReportProcessor * proc) connect(m_reportProcessor, &ReportProcessor::pageProcessed, this, &ReportViewWidget::onPageProcessed); } -qf::qmlwidgets::StatusBar *ReportViewWidget::statusBar() +qf::gui::StatusBar *ReportViewWidget::statusBar() { if(!m_statusBar) { - m_statusBar = new qmlwidgets::StatusBar(nullptr); + m_statusBar = new gui::StatusBar(nullptr); zoomStatusSpinBox = new QSpinBox(); zoomStatusSpinBox->setSingleStep(10); zoomStatusSpinBox->setMinimum(10); @@ -419,7 +419,7 @@ void ReportViewWidget::view_zoomIn(const QPoint ¢er_pos) const QRect visible_rect(-m_scrollArea->widget()->pos(), m_scrollArea->viewport()->size()); //QSizeF old_report_size = f_scrollArea->widget()->size(); QPointF old_abs_center_pos = visible_rect.topLeft() + center_pos; - qfDebug() << "visible rect:" << qmlwidgets::graphics::Rect(visible_rect).toString(); + qfDebug() << "visible rect:" << gui::graphics::Rect(visible_rect).toString(); QScrollBar *hsb = m_scrollArea->horizontalScrollBar(); QScrollBar *vsb = m_scrollArea->verticalScrollBar(); @@ -449,7 +449,7 @@ void ReportViewWidget::view_zoomOut(const QPoint ¢er_pos) qfLogFuncFrame() << "center_pos:" << center_pos.x() << center_pos.y(); const QRect visible_rect(-m_scrollArea->widget()->pos(), m_scrollArea->viewport()->size()); QPointF old_abs_center_pos = visible_rect.topLeft() + center_pos; - qfDebug() << "visible rect:" << qmlwidgets::graphics::Rect(visible_rect).toString(); + qfDebug() << "visible rect:" << gui::graphics::Rect(visible_rect).toString(); QScrollBar *hsb = m_scrollArea->horizontalScrollBar(); QScrollBar *vsb = m_scrollArea->verticalScrollBar(); @@ -516,10 +516,10 @@ void ReportViewWidget::setScale(qreal _scale) refreshWidget(); } -void ReportViewWidget::settleDownInDialog(qf::qmlwidgets::dialogs::Dialog *dlg) +void ReportViewWidget::settleDownInDialog(qf::gui::dialogs::Dialog *dlg) { qfLogFuncFrame(); - qf::qmlwidgets::Action *act_file = dlg->menuBar()->actionForPath("file"); + qf::gui::Action *act_file = dlg->menuBar()->actionForPath("file"); act_file->setText(tr("&File")); act_file->addActionInto(action("file.print")); act_file->addActionInto(action("file.printPreview")); @@ -527,7 +527,7 @@ void ReportViewWidget::settleDownInDialog(qf::qmlwidgets::dialogs::Dialog *dlg) act_file->addActionInto(action("file.export.pdf")); act_file->addActionInto(action("file.export.html")); - qf::qmlwidgets::Action *act_view = dlg->menuBar()->actionForPath("view"); + qf::gui::Action *act_view = dlg->menuBar()->actionForPath("view"); act_view->setText(tr("&View")); act_view->addActionInto(action("view.firstPage")); act_view->addActionInto(action("view.prevPage")); @@ -538,7 +538,7 @@ void ReportViewWidget::settleDownInDialog(qf::qmlwidgets::dialogs::Dialog *dlg) act_view->addActionInto(action("view.zoomFitWidth")); act_view->addActionInto(action("view.zoomFitHeight")); - qf::qmlwidgets::ToolBar *tool_bar = dlg->toolBar("main", true); + qf::gui::ToolBar *tool_bar = dlg->toolBar("main", true); tool_bar->addAction(action("file.print")); tool_bar->addAction(action("file.export.pdf")); tool_bar->addSeparator(); @@ -556,92 +556,92 @@ void ReportViewWidget::settleDownInDialog(qf::qmlwidgets::dialogs::Dialog *dlg) tool_bar->addAction(action("view.zoomFitHeight")); } -qf::qmlwidgets::framework::DialogWidget::ActionMap ReportViewWidget::createActions() +qf::gui::framework::DialogWidget::ActionMap ReportViewWidget::createActions() { auto *style = Style::instance(); ActionMap ret; { - qf::qmlwidgets::Action *a; - a = new qf::qmlwidgets::Action(tr("First page"), this); + qf::gui::Action *a; + a = new qf::gui::Action(tr("First page"), this); a->setIcon(style->icon("frev")); ret[QStringLiteral("view.firstPage")] = a; connect(a, &QAction::triggered, this, &ReportViewWidget::view_firstPage); } { - qf::qmlwidgets::Action *a; - a = new qf::qmlwidgets::Action(tr("Prev page"), this); + qf::gui::Action *a; + a = new qf::gui::Action(tr("Prev page"), this); a->setIcon(style->icon("rev")); ret[QStringLiteral("view.prevPage")] = a; connect(a, &QAction::triggered, this, [this]() { view_prevPage(); }); } { - qf::qmlwidgets::Action *a; - a = new qf::qmlwidgets::Action(tr("Next page"), this); + qf::gui::Action *a; + a = new qf::gui::Action(tr("Next page"), this); a->setIcon(style->icon("fwd")); ret[QStringLiteral("view.nextPage")] = a; connect(a, &QAction::triggered, this, [this]() { view_nextPage(); }); } { - qf::qmlwidgets::Action *a; - a = new qf::qmlwidgets::Action(tr("Last page"), this); + qf::gui::Action *a; + a = new qf::gui::Action(tr("Last page"), this); a->setIcon(style->icon("ffwd")); ret[QStringLiteral("view.lastPage")] = a; connect(a, &QAction::triggered, this, &ReportViewWidget::view_lastPage); } { - qf::qmlwidgets::Action *a; - a = new qf::qmlwidgets::Action(tr("Zoom in"), this); + qf::gui::Action *a; + a = new qf::gui::Action(tr("Zoom in"), this); a->setIcon(style->icon("zoom_in")); ret[QStringLiteral("view.zoomIn")] = a; connect(a, &QAction::triggered, this, [this]() { view_zoomIn(); }); } { - qf::qmlwidgets::Action *a; - a = new qf::qmlwidgets::Action(tr("Zoom out"), this); + qf::gui::Action *a; + a = new qf::gui::Action(tr("Zoom out"), this); a->setIcon(style->icon("zoom_out")); ret[QStringLiteral("view.zoomOut")] = a; connect(a, &QAction::triggered, this, [this]() { view_zoomOut(); }); } { - qf::qmlwidgets::Action *a; - a = new qf::qmlwidgets::Action(tr("Zoom to fit width"), this); + qf::gui::Action *a; + a = new qf::gui::Action(tr("Zoom to fit width"), this); a->setIcon(style->icon("zoom_fitwidth")); ret[QStringLiteral("view.zoomFitWidth")] = a; connect(a, &QAction::triggered, this, &ReportViewWidget::view_zoomToFitWidth); } { - qf::qmlwidgets::Action *a; - a = new qf::qmlwidgets::Action(tr("Zoom to fit height"), this); + qf::gui::Action *a; + a = new qf::gui::Action(tr("Zoom to fit height"), this); a->setIcon(style->icon("zoom_fitheight")); ret[QStringLiteral("view.zoomFitHeight")] = a; connect(a, &QAction::triggered, this, &ReportViewWidget::view_zoomToFitHeight); } { - qf::qmlwidgets::Action *a; - a = new qf::qmlwidgets::Action(tr("&Print"), this); + qf::gui::Action *a; + a = new qf::gui::Action(tr("&Print"), this); a->setIcon(style->icon("printer")); //a->setTooltip(tr("Tisk")); ret[QStringLiteral("file.print")] = a; connect(a, &QAction::triggered, this, &ReportViewWidget::file_print); } { - qf::qmlwidgets::Action *a; - a = new qf::qmlwidgets::Action(tr("Print pre&view"), this); + qf::gui::Action *a; + a = new qf::gui::Action(tr("Print pre&view"), this); a->setIcon(style->icon("print-preview")); ret[QStringLiteral("file.printPreview")] = a; connect(a, &QAction::triggered, this, &ReportViewWidget::file_printPreview); } { - qf::qmlwidgets::Action *a; - a = new qf::qmlwidgets::Action(tr("Export PD&F"), this); + qf::gui::Action *a; + a = new qf::gui::Action(tr("Export PD&F"), this); a->setIcon(style->icon("acrobat")); a->setToolTip(tr("Export in the Adobe Acrobat PDF format")); ret[QStringLiteral("file.export.pdf")] = a; connect(a, &QAction::triggered, this, &ReportViewWidget::file_export_pdf); } { - qf::qmlwidgets::Action *a; - a = new qf::qmlwidgets::Action(tr("Export &HTML"), this); + qf::gui::Action *a; + a = new qf::gui::Action(tr("Export &HTML"), this); a->setIcon(style->icon("network")); a->setToolTip(tr("Export data in HTML")); ret[QStringLiteral("file.export.html")] = a; @@ -656,8 +656,8 @@ void ReportViewWidget::setupPainterWidgetSize() ReportItemMetaPaintFrame *frm = currentPage(); if(!frm) return; - qmlwidgets::graphics::Rect r1 = frm->renderedRect.adjusted(-PageBorder, -PageBorder, PageBorder, PageBorder); - qmlwidgets::graphics::Rect r2 = qmlwidgets::graphics::mm2device(r1, m_painterWidget); + gui::graphics::Rect r1 = frm->renderedRect.adjusted(-PageBorder, -PageBorder, PageBorder, PageBorder); + gui::graphics::Rect r2 = gui::graphics::mm2device(r1, m_painterWidget); //qfDebug() << "\tframe rect:" << r.toString(); QSizeF s = r2.size(); s *= scale(); @@ -672,7 +672,7 @@ void ReportViewWidget::setupPainter(ReportPainter *p) p->pageCount = pageCount(); p->setSelectedItem(m_selectedItem); p->scale(scale(), scale()); - p->translate(qmlwidgets::graphics::mm2device(qmlwidgets::graphics::Point(PageBorder, PageBorder), p->device())); + p->translate(gui::graphics::mm2device(gui::graphics::Point(PageBorder, PageBorder), p->device())); #if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) m_painterInverseMatrix = p->matrix().inverted(); #else diff --git a/libqf/libqfqmlwidgets/src/reports/widgets/reportviewwidget.h b/libqf/libqfgui/src/reports/widgets/reportviewwidget.h similarity index 92% rename from libqf/libqfqmlwidgets/src/reports/widgets/reportviewwidget.h rename to libqf/libqfgui/src/reports/widgets/reportviewwidget.h index a00165bff..8f57048ce 100644 --- a/libqf/libqfqmlwidgets/src/reports/widgets/reportviewwidget.h +++ b/libqf/libqfgui/src/reports/widgets/reportviewwidget.h @@ -4,10 +4,10 @@ // Copyright: See COPYING file that comes with this distribution // -#ifndef QF_QMLWIDGETS_REPORTS_REPORTVIEWWIDGET_H -#define QF_QMLWIDGETS_REPORTS_REPORTVIEWWIDGET_H +#ifndef QF_GUI_REPORTS_REPORTVIEWWIDGET_H +#define QF_GUI_REPORTS_REPORTVIEWWIDGET_H -#include "../../qmlwidgetsglobal.h" +#include "../../guiglobal.h" #include "../../framework/dialogwidget.h" #include @@ -22,7 +22,7 @@ class QSpinBox; class QPrinter; namespace qf { -namespace qmlwidgets { +namespace gui { class Action; class StatusBar; @@ -36,11 +36,11 @@ class ReportPainter; class ReportProcessor; -class QFQMLWIDGETS_DECL_EXPORT ReportViewWidget : public qf::qmlwidgets::framework::DialogWidget +class QFGUI_DECL_EXPORT ReportViewWidget : public qf::gui::framework::DialogWidget { Q_OBJECT private: - typedef qf::qmlwidgets::framework::DialogWidget Super; + typedef qf::gui::framework::DialogWidget Super; public: ReportViewWidget(QWidget *parent = nullptr); ~ReportViewWidget() Q_DECL_OVERRIDE; @@ -89,12 +89,12 @@ class QFQMLWIDGETS_DECL_EXPORT ReportViewWidget : public qf::qmlwidgets::framew static const int PageBorder = 5; - qf::qmlwidgets::StatusBar *m_statusBar; + qf::gui::StatusBar *m_statusBar; private: void selectItem(const QPointF &p); ReportItemMetaPaint* selectItem_helper(ReportItemMetaPaint *it, const QPointF &p); protected: - qf::qmlwidgets::StatusBar* statusBar(); + qf::gui::StatusBar* statusBar(); QSpinBox *zoomStatusSpinBox; /// nastavi painteru scale a offset @@ -169,7 +169,7 @@ public slots: qreal scale() const {return m_scale;} void setScale(qreal _scale); - void settleDownInDialog(qf::qmlwidgets::dialogs::Dialog *dlg) Q_DECL_OVERRIDE; + void settleDownInDialog(qf::gui::dialogs::Dialog *dlg) Q_DECL_OVERRIDE; ActionMap createActions() Q_DECL_OVERRIDE; ReportItemMetaPaint* selectedItem() const {return m_selectedItem;} @@ -223,5 +223,5 @@ protected slots: }}} -#endif // QF_QMLWIDGETS_REPORTS_REPORTVIEWWIDGET_H +#endif // QF_GUI_REPORTS_REPORTVIEWWIDGET_H diff --git a/libqf/libqfqmlwidgets/src/reports/widgets/reportviewwidget.ui.xml b/libqf/libqfgui/src/reports/widgets/reportviewwidget.ui.xml similarity index 100% rename from libqf/libqfqmlwidgets/src/reports/widgets/reportviewwidget.ui.xml rename to libqf/libqfgui/src/reports/widgets/reportviewwidget.ui.xml diff --git a/libqf/libqfqmlwidgets/src/saveoptionswidget.cpp b/libqf/libqfgui/src/saveoptionswidget.cpp similarity index 99% rename from libqf/libqfqmlwidgets/src/saveoptionswidget.cpp rename to libqf/libqfgui/src/saveoptionswidget.cpp index c1d632e94..fccafe9af 100644 --- a/libqf/libqfqmlwidgets/src/saveoptionswidget.cpp +++ b/libqf/libqfgui/src/saveoptionswidget.cpp @@ -12,7 +12,7 @@ #include #include -using namespace qf::qmlwidgets; +using namespace qf::gui; //================================================= // SaveOptionsWidget //================================================= diff --git a/libqf/libqfqmlwidgets/src/saveoptionswidget.h b/libqf/libqfgui/src/saveoptionswidget.h similarity index 85% rename from libqf/libqfqmlwidgets/src/saveoptionswidget.h rename to libqf/libqfgui/src/saveoptionswidget.h index 8ddf69c1b..5a35a3fe3 100644 --- a/libqf/libqfqmlwidgets/src/saveoptionswidget.h +++ b/libqf/libqfgui/src/saveoptionswidget.h @@ -1,12 +1,12 @@ -#ifndef QF_QMLWIDGETS_SAVEOPTIONS_WIDGET_H -#define QF_QMLWIDGETS_SAVEOPTIONS_WIDGET_H +#ifndef QF_GUI_SAVEOPTIONS_WIDGET_H +#define QF_GUI_SAVEOPTIONS_WIDGET_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include namespace qf { -namespace qmlwidgets { +namespace gui { namespace framework { class IPersistentOptions; @@ -16,7 +16,7 @@ namespace Ui { class SaveOptionsWidget; } -class QFQMLWIDGETS_DECL_EXPORT SaveOptionsWidget : public QWidget +class QFGUI_DECL_EXPORT SaveOptionsWidget : public QWidget { Q_OBJECT private: @@ -59,5 +59,5 @@ protected slots: }} -#endif // QF_QMLWIDGETS_SAVEOPTIONS_WIDGET_H +#endif // QF_GUI_SAVEOPTIONS_WIDGET_H diff --git a/libqf/libqfqmlwidgets/src/saveoptionswidget.ui b/libqf/libqfgui/src/saveoptionswidget.ui similarity index 96% rename from libqf/libqfqmlwidgets/src/saveoptionswidget.ui rename to libqf/libqfgui/src/saveoptionswidget.ui index a50f78749..b636111e1 100644 --- a/libqf/libqfqmlwidgets/src/saveoptionswidget.ui +++ b/libqf/libqfgui/src/saveoptionswidget.ui @@ -1,7 +1,7 @@ - qf::qmlwidgets::SaveOptionsWidget - + qf::gui::SaveOptionsWidget + 0 diff --git a/libqf/libqfqmlwidgets/src/spinbox.cpp b/libqf/libqfgui/src/spinbox.cpp similarity index 97% rename from libqf/libqfqmlwidgets/src/spinbox.cpp rename to libqf/libqfgui/src/spinbox.cpp index 223dbc1b5..03a0c5998 100644 --- a/libqf/libqfqmlwidgets/src/spinbox.cpp +++ b/libqf/libqfgui/src/spinbox.cpp @@ -1,7 +1,7 @@ #include "spinbox.h" #include #include -using namespace qf::qmlwidgets; +using namespace qf::gui; SpinBox::SpinBox(QWidget *parent) : Super(parent) diff --git a/libqf/libqfqmlwidgets/src/spinbox.h b/libqf/libqfgui/src/spinbox.h similarity index 72% rename from libqf/libqfqmlwidgets/src/spinbox.h rename to libqf/libqfgui/src/spinbox.h index 5846c97b9..23c08da9e 100644 --- a/libqf/libqfqmlwidgets/src/spinbox.h +++ b/libqf/libqfgui/src/spinbox.h @@ -1,15 +1,15 @@ -#ifndef QF_QMLWIDGETS_SPINBOX_H -#define QF_QMLWIDGETS_SPINBOX_H +#ifndef QF_GUI_SPINBOX_H +#define QF_GUI_SPINBOX_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include "idatawidget.h" #include namespace qf { -namespace qmlwidgets { +namespace gui { -class QFQMLWIDGETS_DECL_EXPORT SpinBox : public QSpinBox, public IDataWidget +class QFGUI_DECL_EXPORT SpinBox : public QSpinBox, public IDataWidget { Q_OBJECT Q_PROPERTY(QVariant dataValue READ dataValue WRITE setDataValue NOTIFY dataValueChanged) @@ -30,4 +30,4 @@ class QFQMLWIDGETS_DECL_EXPORT SpinBox : public QSpinBox, public IDataWidget }} -#endif // QF_QMLWIDGETS_SPINBOX_H +#endif // QF_GUI_SPINBOX_H diff --git a/libqf/libqfqmlwidgets/src/splitter.cpp b/libqf/libqfgui/src/splitter.cpp similarity index 98% rename from libqf/libqfqmlwidgets/src/splitter.cpp rename to libqf/libqfgui/src/splitter.cpp index 72454c334..81a714e67 100644 --- a/libqf/libqfqmlwidgets/src/splitter.cpp +++ b/libqf/libqfgui/src/splitter.cpp @@ -4,7 +4,7 @@ #include -using namespace qf::qmlwidgets; +using namespace qf::gui; Splitter::Splitter(QWidget *parent) : QSplitter(parent), framework::IPersistentSettings(this) diff --git a/libqf/libqfqmlwidgets/src/splitter.h b/libqf/libqfgui/src/splitter.h similarity index 82% rename from libqf/libqfqmlwidgets/src/splitter.h rename to libqf/libqfgui/src/splitter.h index d8ab41d6b..70bc984ab 100644 --- a/libqf/libqfqmlwidgets/src/splitter.h +++ b/libqf/libqfgui/src/splitter.h @@ -1,7 +1,7 @@ -#ifndef QF_QMLWIDGETS_SPLITTER_H -#define QF_QMLWIDGETS_SPLITTER_H +#ifndef QF_GUI_SPLITTER_H +#define QF_GUI_SPLITTER_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include "framework/ipersistentsettings.h" #include @@ -10,9 +10,9 @@ class QWidget; namespace qf { -namespace qmlwidgets { +namespace gui { -class QFQMLWIDGETS_DECL_EXPORT Splitter : public QSplitter, public framework::IPersistentSettings +class QFGUI_DECL_EXPORT Splitter : public QSplitter, public framework::IPersistentSettings { Q_OBJECT Q_PROPERTY(QQmlListProperty widgets READ widgets) diff --git a/libqf/libqfqmlwidgets/src/sqltableitemdelegate.cpp b/libqf/libqfgui/src/sqltableitemdelegate.cpp similarity index 74% rename from libqf/libqfqmlwidgets/src/sqltableitemdelegate.cpp rename to libqf/libqfgui/src/sqltableitemdelegate.cpp index c23b1747f..4fd5edb5a 100644 --- a/libqf/libqfqmlwidgets/src/sqltableitemdelegate.cpp +++ b/libqf/libqfgui/src/sqltableitemdelegate.cpp @@ -1,14 +1,14 @@ #include "sqltableitemdelegate.h" #include "tableview.h" -#include +#include #include #include #include #include -using namespace qf::qmlwidgets; +using namespace qf::gui; SqlTableItemDelegate::SqlTableItemDelegate(TableView *parent) : Super(parent) @@ -27,13 +27,13 @@ QString SqlTableItemDelegate::displayText(const QVariant &value, const QLocale & */ QWidget *SqlTableItemDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const { - QVariant v = index.data(qf::qmlwidgets::model::TableModel::ColumnDefinitionRole); - auto cd = v.value(); + QVariant v = index.data(qf::gui::model::TableModel::ColumnDefinitionRole); + auto cd = v.value(); if(cd.castType() == qMetaTypeId()) { auto *editor = new QComboBox(parent); - auto m = qobject_cast(view()->tableModel()); + auto m = qobject_cast(view()->tableModel()); if(m) { - qf::qmlwidgets::model::SqlTableModel::DbEnumCastProperties props(cd.castProperties()); + qf::gui::model::SqlTableModel::DbEnumCastProperties props(cd.castProperties()); qf::core::sql::DbEnumCache& db_enum_cache = qf::core::sql::DbEnumCache::instanceForConnection(m->connectionName()); Q_FOREACH(auto dbe, db_enum_cache.dbEnumsForGroup(props.groupName())) { QString cap = dbe.fillInPlaceholders(props.captionFormat()); @@ -41,7 +41,7 @@ QWidget *SqlTableItemDelegate::createEditor(QWidget *parent, const QStyleOptionV QColor c = dbe.color(); if(c.isValid()) { editor->setItemData(editor->count() - 1, c, Qt::BackgroundRole); - editor->setItemData(editor->count() - 1, qf::qmlwidgets::model::TableModel::contrastTextColor(c), Qt::ForegroundRole); + editor->setItemData(editor->count() - 1, qf::gui::model::TableModel::contrastTextColor(c), Qt::ForegroundRole); } } } @@ -54,8 +54,8 @@ QWidget *SqlTableItemDelegate::createEditor(QWidget *parent, const QStyleOptionV void SqlTableItemDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const { - QVariant v = index.data(qf::qmlwidgets::model::TableModel::ColumnDefinitionRole); - auto cd = v.value(); + QVariant v = index.data(qf::gui::model::TableModel::ColumnDefinitionRole); + auto cd = v.value(); if(cd.castType() == qMetaTypeId()) { auto cbx = qobject_cast(editor); if(cbx) { @@ -72,8 +72,8 @@ void SqlTableItemDelegate::setEditorData(QWidget *editor, const QModelIndex &ind void SqlTableItemDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const { - QVariant v = index.data(qf::qmlwidgets::model::TableModel::ColumnDefinitionRole); - auto cd = v.value(); + QVariant v = index.data(qf::gui::model::TableModel::ColumnDefinitionRole); + auto cd = v.value(); if(cd.castType() == qMetaTypeId()) { auto cbx = qobject_cast(editor); if(cbx) { diff --git a/libqf/libqfqmlwidgets/src/sqltableitemdelegate.h b/libqf/libqfgui/src/sqltableitemdelegate.h similarity index 76% rename from libqf/libqfqmlwidgets/src/sqltableitemdelegate.h rename to libqf/libqfgui/src/sqltableitemdelegate.h index 091334498..0c6988db8 100644 --- a/libqf/libqfqmlwidgets/src/sqltableitemdelegate.h +++ b/libqf/libqfgui/src/sqltableitemdelegate.h @@ -1,12 +1,12 @@ -#ifndef QF_QMLWIDGETS_SQLTABLEITEMDELEGATE_H -#define QF_QMLWIDGETS_SQLTABLEITEMDELEGATE_H +#ifndef QF_GUI_SQLTABLEITEMDELEGATE_H +#define QF_GUI_SQLTABLEITEMDELEGATE_H #include "tableitemdelegate.h" namespace qf { -namespace qmlwidgets { +namespace gui { -class QFQMLWIDGETS_DECL_EXPORT SqlTableItemDelegate : public TableItemDelegate +class QFGUI_DECL_EXPORT SqlTableItemDelegate : public TableItemDelegate { Q_OBJECT private: @@ -24,7 +24,7 @@ class QFQMLWIDGETS_DECL_EXPORT SqlTableItemDelegate : public TableItemDelegate //Q_SLOT void commitAndCloseEditor(); }; -} // namespace qmlwidgets +} // namespace gui } // namespace qf -#endif // QF_QMLWIDGETS_SQLTABLEITEMDELEGATE_H +#endif // QF_GUI_SQLTABLEITEMDELEGATE_H diff --git a/libqf/libqfqmlwidgets/src/statusbar.cpp b/libqf/libqfgui/src/statusbar.cpp similarity index 90% rename from libqf/libqfqmlwidgets/src/statusbar.cpp rename to libqf/libqfgui/src/statusbar.cpp index 764795473..88ffbc53d 100644 --- a/libqf/libqfqmlwidgets/src/statusbar.cpp +++ b/libqf/libqfgui/src/statusbar.cpp @@ -2,14 +2,14 @@ #include -using namespace qf::qmlwidgets; +using namespace qf::gui; StatusBar::StatusBar(QWidget *parent) : Super(parent) { } -qf::qmlwidgets::StatusBar::~StatusBar() +qf::gui::StatusBar::~StatusBar() { qfLogFuncFrame() << this; } diff --git a/libqf/libqfqmlwidgets/src/statusbar.h b/libqf/libqfgui/src/statusbar.h similarity index 73% rename from libqf/libqfqmlwidgets/src/statusbar.h rename to libqf/libqfgui/src/statusbar.h index 1f39a7b1d..33a98637b 100644 --- a/libqf/libqfqmlwidgets/src/statusbar.h +++ b/libqf/libqfgui/src/statusbar.h @@ -1,16 +1,16 @@ -#ifndef QF_QMLWIDGETS_STATUSBAR_H -#define QF_QMLWIDGETS_STATUSBAR_H +#ifndef QF_GUI_STATUSBAR_H +#define QF_GUI_STATUSBAR_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include class QWidget; namespace qf { -namespace qmlwidgets { +namespace gui { -class QFQMLWIDGETS_DECL_EXPORT StatusBar : public QStatusBar +class QFGUI_DECL_EXPORT StatusBar : public QStatusBar { Q_OBJECT private: diff --git a/libqf/libqfqmlwidgets/src/style.cpp b/libqf/libqfgui/src/style.cpp similarity index 99% rename from libqf/libqfqmlwidgets/src/style.cpp rename to libqf/libqfgui/src/style.cpp index 51ce03efb..79dd3a0ad 100644 --- a/libqf/libqfqmlwidgets/src/style.cpp +++ b/libqf/libqfgui/src/style.cpp @@ -11,7 +11,7 @@ #include #include -namespace qf::qmlwidgets { +namespace qf::gui { bool isDarkTheme() { diff --git a/libqf/libqfqmlwidgets/src/style.h b/libqf/libqfgui/src/style.h similarity index 76% rename from libqf/libqfqmlwidgets/src/style.h rename to libqf/libqfgui/src/style.h index 6e3698e0d..7e884b828 100644 --- a/libqf/libqfqmlwidgets/src/style.h +++ b/libqf/libqfgui/src/style.h @@ -1,7 +1,7 @@ -#ifndef QF_QMLWIDGETS_STYLE_H -#define QF_QMLWIDGETS_STYLE_H +#ifndef QF_GUI_STYLE_H +#define QF_GUI_STYLE_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include @@ -11,11 +11,11 @@ class QFileInfo; namespace qf { -namespace qmlwidgets { +namespace gui { -QFQMLWIDGETS_DECL_EXPORT bool isDarkTheme(); +QFGUI_DECL_EXPORT bool isDarkTheme(); -class QFQMLWIDGETS_DECL_EXPORT Style : public QObject +class QFGUI_DECL_EXPORT Style : public QObject { Q_OBJECT public: @@ -41,4 +41,4 @@ class QFQMLWIDGETS_DECL_EXPORT Style : public QObject }} -#endif // QF_QMLWIDGETS_STYLE_H +#endif // QF_GUI_STYLE_H diff --git a/libqf/libqfqmlwidgets/src/tableitemdelegate.cpp b/libqf/libqfgui/src/tableitemdelegate.cpp similarity index 98% rename from libqf/libqfqmlwidgets/src/tableitemdelegate.cpp rename to libqf/libqfgui/src/tableitemdelegate.cpp index dad4d9e74..bd857ad5f 100644 --- a/libqf/libqfqmlwidgets/src/tableitemdelegate.cpp +++ b/libqf/libqfgui/src/tableitemdelegate.cpp @@ -7,7 +7,7 @@ #include -using namespace qf::qmlwidgets; +using namespace qf::gui; TableItemDelegate::TableItemDelegate(TableView *parent) : Super(parent) diff --git a/libqf/libqfqmlwidgets/src/tableitemdelegate.h b/libqf/libqfgui/src/tableitemdelegate.h similarity index 73% rename from libqf/libqfqmlwidgets/src/tableitemdelegate.h rename to libqf/libqfgui/src/tableitemdelegate.h index f11498c0b..ea193a1e4 100644 --- a/libqf/libqfqmlwidgets/src/tableitemdelegate.h +++ b/libqf/libqfgui/src/tableitemdelegate.h @@ -1,16 +1,16 @@ -#ifndef QF_QMLWIDGETS_TABLEITEMDELEGATE_H -#define QF_QMLWIDGETS_TABLEITEMDELEGATE_H +#ifndef QF_GUI_TABLEITEMDELEGATE_H +#define QF_GUI_TABLEITEMDELEGATE_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include namespace qf { -namespace qmlwidgets { +namespace gui { class TableView; -class QFQMLWIDGETS_DECL_EXPORT TableItemDelegate : public QStyledItemDelegate +class QFGUI_DECL_EXPORT TableItemDelegate : public QStyledItemDelegate { Q_OBJECT private: @@ -28,4 +28,4 @@ class QFQMLWIDGETS_DECL_EXPORT TableItemDelegate : public QStyledItemDelegate }} -#endif // QF_QMLWIDGETS_TABLEITEMDELEGATE_H +#endif // QF_GUI_TABLEITEMDELEGATE_H diff --git a/libqf/libqfqmlwidgets/src/tableview.cpp b/libqf/libqfgui/src/tableview.cpp similarity index 96% rename from libqf/libqfqmlwidgets/src/tableview.cpp rename to libqf/libqfgui/src/tableview.cpp index 731bdfde8..b0583ff06 100644 --- a/libqf/libqfqmlwidgets/src/tableview.cpp +++ b/libqf/libqfgui/src/tableview.cpp @@ -24,8 +24,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -49,8 +49,8 @@ namespace qfc = qf::core; namespace qfu = qf::core::utils; -namespace qfm = qf::qmlwidgets::model; -using namespace qf::qmlwidgets; +namespace qfm = qf::gui::model; +using namespace qf::gui; TableView::TableView(QWidget *parent) : Super(parent), framework::IPersistentSettings(this) @@ -155,19 +155,19 @@ void TableView::setModel(QAbstractItemModel *model) Super::setModel(model); } -qf::qmlwidgets::model::TableModel *TableView::tableModel() const +qf::gui::model::TableModel *TableView::tableModel() const { - auto *ret = qobject_cast(lastProxyModel()->sourceModel()); + auto *ret = qobject_cast(lastProxyModel()->sourceModel()); return ret; } -void TableView::setTableModel(qmlwidgets::model::TableModel *m) +void TableView::setTableModel(gui::model::TableModel *m) { - qf::qmlwidgets::model::TableModel *old_m = tableModel(); + qf::gui::model::TableModel *old_m = tableModel(); if (old_m != m) { QAbstractProxyModel *pxm = lastProxyModel(); pxm->setSourceModel(m); - m_proxyModel->setSortRole(qf::qmlwidgets::model::TableModel::SortRole); + m_proxyModel->setSortRole(qf::gui::model::TableModel::SortRole); if(pxm->columnCount() > 0) { qfDebug() << persistentSettingsPath() << "Load persistent settings."; // it does not make sense to load column widths unless we have table columns @@ -284,7 +284,7 @@ void TableView::reload(bool preserve_sorting) sort_order = horizontalHeader()->sortIndicatorOrder(); horizontalHeader()->setSortIndicator(-1, Qt::AscendingOrder); } - qf::qmlwidgets::model::TableModel *table_model = tableModel(); + qf::gui::model::TableModel *table_model = tableModel(); if(table_model) { QModelIndex ix = currentIndex(); int r = ix.row(); @@ -395,7 +395,7 @@ void TableView::cloneRowInline() if(ix.row() < 0) return; int tri1 = toTableModelRowNo(ix.row()); - qmlwidgets::model::TableModel *tm = tableModel(); + gui::model::TableModel *tm = tableModel(); tm->cloneRow(tri1); m_proxyModel->sort(); setCurrentIndex(m_proxyModel->index(ix.row() + 1, ix.column())); @@ -646,7 +646,7 @@ void TableView::setValueInSelection_helper(const QVariant &new_val) } else if(selected_row_indexes.count() > 1) { qfc::sql::Connection conn; - auto *sql_m = qobject_cast(tableModel()); + auto *sql_m = qobject_cast(tableModel()); if(sql_m) { try { conn = sql_m->sqlConnection(); @@ -740,11 +740,11 @@ void TableView::editCellContentInEditor() void TableView::exportCSV() { - qmlwidgets::model::TableModel *m = tableModel(); + gui::model::TableModel *m = tableModel(); if(!m) return; - auto *w = new qf::qmlwidgets::ExportCsvTableViewWidget(this, this); + auto *w = new qf::gui::ExportCsvTableViewWidget(this, this); if(!persistentSettingsPath().isEmpty()) { w->setPersistentOptionsPath(persistentSettingsPath() + "/exportCSV"); w->loadPersistentOptions(); @@ -752,12 +752,12 @@ void TableView::exportCSV() dialogs::Dialog dlg(this); auto *bb = new DialogButtonBox(QDialogButtonBox::Cancel, this); QAbstractButton *bt_apply = bb->addButton(QDialogButtonBox::Apply); - connect(bt_apply, &QAbstractButton::clicked, w, &qf::qmlwidgets::ExportCsvTableViewWidget::applyOptions, Qt::QueuedConnection); + connect(bt_apply, &QAbstractButton::clicked, w, &qf::gui::ExportCsvTableViewWidget::applyOptions, Qt::QueuedConnection); dlg.setButtonBox(bb); dlg.setCentralWidget(w); dlg.setPersistentSettingsId("exportCSV"); dlg.loadPersistentSettingsRecursively(); - connect(w, &qf::qmlwidgets::ExportCsvTableViewWidget::exportRequest, this, &TableView::exportCSV_helper); + connect(w, &qf::gui::ExportCsvTableViewWidget::exportRequest, this, &TableView::exportCSV_helper); dlg.exec(); } @@ -820,14 +820,14 @@ void TableView::selectCurrentRow() selectRow(ix.row()); } -qf::core::utils::TreeTable TableView::toTreeTable(const QString &table_name, const QVariantList &_exported_columns, const qf::qmlwidgets::model::TableModel::TreeTableExportOptions &opts) const +qf::core::utils::TreeTable TableView::toTreeTable(const QString &table_name, const QVariantList &_exported_columns, const qf::gui::model::TableModel::TreeTableExportOptions &opts) const { qfu::TreeTable ret(table_name); QVariantList exported_columns = _exported_columns; QAbstractItemModel *proxy_model = model(); if(!proxy_model) return ret; - qmlwidgets::model::TableModel *table_model = tableModel(); + gui::model::TableModel *table_model = tableModel(); if(!table_model) return ret; const core::utils::Table &table = table_model->table(); @@ -859,12 +859,12 @@ qf::core::utils::TreeTable TableView::toTreeTable(const QString &table_name, con //qfWarning() << fld.toString(); } else { - t = proxy_model->headerData(ix, Qt::Horizontal, qmlwidgets::model::TableModel::FieldTypeRole).toInt(); + t = proxy_model->headerData(ix, Qt::Horizontal, gui::model::TableModel::FieldTypeRole).toInt(); } - cd.setName(proxy_model->headerData(ix, Qt::Horizontal, qmlwidgets::model::TableModel::FieldNameRole).toString()); + cd.setName(proxy_model->headerData(ix, Qt::Horizontal, gui::model::TableModel::FieldNameRole).toString()); cd.setType(t); cd.setHeader(cap); - //ret.appendColumn(proxy_model->headerData(ix, Qt::Horizontal, qmlwidgets::model::TableModel::FieldNameRole).toString(), t, cap); + //ret.appendColumn(proxy_model->headerData(ix, Qt::Horizontal, gui::model::TableModel::FieldNameRole).toString(), t, cap); } cd.setWidth(col.value("width")); ret.appendColumn(cd); @@ -886,7 +886,7 @@ qf::core::utils::TreeTable TableView::toTreeTable(const QString &table_name, con else { QModelIndex mix = proxy_model->index(i, ix); if(raw_values) { - val = proxy_model->data(mix, qmlwidgets::model::TableModel::RawValueRole); + val = proxy_model->data(mix, gui::model::TableModel::RawValueRole); //qfWarning() << col << val.typeName() << "val:" << val.toString(); } else { @@ -912,7 +912,7 @@ void TableView::exportReport_helper(const QVariant& _options) qfu::TreeTable ttable; { - qf::qmlwidgets::model::TableModel::TreeTableExportOptions opts; + qf::gui::model::TableModel::TreeTableExportOptions opts; //opts.setExportRawValues(true); ttable = toTreeTable("data", exported_columns, opts); } @@ -953,13 +953,13 @@ void TableView::exportCSV_helper(const QVariant &export_options) QAbstractItemModel *m = model(); if(!m) return; - QString fn = qf::qmlwidgets::dialogs::FileDialog::getSaveFileName(this, tr("Save as ..."), "data.csv", "Coma Separated Values *.csv (*.csv)"); + QString fn = qf::gui::dialogs::FileDialog::getSaveFileName(this, tr("Save as ..."), "data.csv", "Coma Separated Values *.csv (*.csv)"); if(fn.isEmpty()) return; QFile f(fn); if(!f.open(QFile::WriteOnly)) { - qf::qmlwidgets::dialogs::MessageBox::showError(this, tr("Cannot open file '%1' for writing.").arg(f.fileName())); + qf::gui::dialogs::MessageBox::showError(this, tr("Cannot open file '%1' for writing.").arg(f.fileName())); return; } try { @@ -1016,7 +1016,7 @@ void TableView::exportCSV_helper(const QVariant &export_options) } } catch(qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(this, e); + qf::gui::dialogs::MessageBox::showException(this, e); } } @@ -1085,7 +1085,7 @@ int TableView::logicalColumnIndex(const QString &field_name) const { auto *m = model(); if(m) for (int i = 0; i < m->columnCount(); ++i) { - QString fldn = m->headerData(i, Qt::Horizontal, qf::qmlwidgets::model::TableModel::FieldNameRole).toString(); + QString fldn = m->headerData(i, Qt::Horizontal, qf::gui::model::TableModel::FieldNameRole).toString(); if(qf::core::Utils::fieldNameEndsWith(fldn, field_name)) return i; } @@ -1317,7 +1317,7 @@ void TableView::loadPersistentSettings() qfDebug() << path << "Cannot load persistent settings, horizontal header does not exist or it is empty."; return; } - qf::qmlwidgets::model::TableModel *mod = tableModel(); + qf::gui::model::TableModel *mod = tableModel(); if(!mod || mod->columnCount() == 0) { qfDebug() << path << "Cannot load persistent settings, table model does not exist or it is empty."; return; @@ -1973,7 +1973,7 @@ void TableView::copySpecial_helper(const QTableView *table_view, const QString & for (auto col : cols) { QModelIndex ix = m->index(row, col); QString s; - if(!ix.data(qf::qmlwidgets::model::TableModel::ValueIsNullRole).toBool()) { + if(!ix.data(qf::gui::model::TableModel::ValueIsNullRole).toBool()) { s = ix.data(Qt::DisplayRole).toString(); if(s.isEmpty()) { QVariant v = ix.data(Qt::CheckStateRole); @@ -2168,10 +2168,10 @@ void TableView::removeSelectedRowsInline() continuous_sections << continuous_section; } if(rows_to_delete.count() == 1) { - if(!qf::qmlwidgets::dialogs::MessageBox::askYesNo(this, tr("Do you really want to remove row?"), true)) return; + if(!qf::gui::dialogs::MessageBox::askYesNo(this, tr("Do you really want to remove row?"), true)) return; } else { - if(!qf::qmlwidgets::dialogs::MessageBox::askYesNo(this, tr("Do you really want to remove all selected rows?"), true)) return; + if(!qf::gui::dialogs::MessageBox::askYesNo(this, tr("Do you really want to remove all selected rows?"), true)) return; } QModelIndex ix = currentIndex(); //ignoreCurrentChanged = true; /// na false ho nastavi currentChanged() diff --git a/libqf/libqfqmlwidgets/src/tableview.h b/libqf/libqfgui/src/tableview.h similarity index 89% rename from libqf/libqfqmlwidgets/src/tableview.h rename to libqf/libqfgui/src/tableview.h index 4ee530c56..56b8f81ca 100644 --- a/libqf/libqfqmlwidgets/src/tableview.h +++ b/libqf/libqfgui/src/tableview.h @@ -1,7 +1,7 @@ -#ifndef QF_QMLWIDGETS_TABLEVIEW_H -#define QF_QMLWIDGETS_TABLEVIEW_H +#ifndef QF_GUI_TABLEVIEW_H +#define QF_GUI_TABLEVIEW_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include "framework/ipersistentsettings.h" #include "model/datadocument.h" @@ -15,17 +15,17 @@ class QSortFilterProxyModel; class QAbstractButton; namespace qf { -namespace qmlwidgets { +namespace gui { class Action; class TableViewProxyModel; -class QFQMLWIDGETS_DECL_EXPORT TableView : public QTableView, public framework::IPersistentSettings +class QFGUI_DECL_EXPORT TableView : public QTableView, public framework::IPersistentSettings { Q_OBJECT Q_PROPERTY(QString persistentSettingsId READ persistentSettingsId WRITE setPersistentSettingsId) - Q_PROPERTY(qf::qmlwidgets::model::TableModel* model READ tableModel WRITE setTableModel) + Q_PROPERTY(qf::gui::model::TableModel* model READ tableModel WRITE setTableModel) Q_PROPERTY(RowEditorMode rowEditorMode READ rowEditorMode WRITE setRowEditorMode NOTIFY rowEditorModeChanged) Q_PROPERTY(InlineEditSaveStrategy inlineEditSaveStrategy READ inlineEditSaveStrategy WRITE setInlineEditSaveStrategy NOTIFY inlineEditSaveStrategyChanged) Q_PROPERTY(QString idColumnName READ idColumnName WRITE setIdColumnName) @@ -52,11 +52,11 @@ class QFQMLWIDGETS_DECL_EXPORT TableView : public QTableView, public framework:: EditRowsMixed }; enum RecordEditMode { - ModeView = qf::qmlwidgets::model::DataDocument::ModeView, - ModeEdit = qf::qmlwidgets::model::DataDocument::ModeEdit, - ModeInsert = qf::qmlwidgets::model::DataDocument::ModeInsert, - ModeCopy = qf::qmlwidgets::model::DataDocument::ModeCopy, - ModeDelete = qf::qmlwidgets::model::DataDocument::ModeDelete + ModeView = qf::gui::model::DataDocument::ModeView, + ModeEdit = qf::gui::model::DataDocument::ModeEdit, + ModeInsert = qf::gui::model::DataDocument::ModeInsert, + ModeCopy = qf::gui::model::DataDocument::ModeCopy, + ModeDelete = qf::gui::model::DataDocument::ModeDelete }; QF_PROPERTY_IMPL2(InlineEditSaveStrategy, i, I, nlineEditSaveStrategy, OnEditedValueCommit) @@ -67,8 +67,8 @@ class QFQMLWIDGETS_DECL_EXPORT TableView : public QTableView, public framework:: public: QSortFilterProxyModel* sortFilterProxyModel() const; - qf::qmlwidgets::model::TableModel* tableModel() const; - void setTableModel(qf::qmlwidgets::model::TableModel* m); + qf::gui::model::TableModel* tableModel() const; + void setTableModel(qf::gui::model::TableModel* m); //Q_SIGNAL void tableModelChanged(); Q_SIGNAL void currentRowChanged(int current_row); @@ -169,7 +169,7 @@ class QFQMLWIDGETS_DECL_EXPORT TableView : public QTableView, public framework:: void seek(const QString &prefix_str); void cancelSeek(); - qf::core::utils::TreeTable toTreeTable(const QString& table_name = QString(), const QVariantList& exported_columns = QVariantList(), const qf::qmlwidgets::model::TableModel::TreeTableExportOptions &opts = qf::qmlwidgets::model::TableModel::TreeTableExportOptions()) const; + qf::core::utils::TreeTable toTreeTable(const QString& table_name = QString(), const QVariantList& exported_columns = QVariantList(), const qf::gui::model::TableModel::TreeTableExportOptions &opts = qf::gui::model::TableModel::TreeTableExportOptions()) const; void exportReport_helper(const QVariant& _options); void exportCSV_helper(const QVariant& export_options); protected: @@ -225,4 +225,4 @@ class QFQMLWIDGETS_DECL_EXPORT TableView : public QTableView, public framework:: }} -#endif // QF_QMLWIDGETS_TABLEVIEW_H +#endif // QF_GUI_TABLEVIEW_H diff --git a/libqf/libqfqmlwidgets/src/tableviewproxymodel.cpp b/libqf/libqfgui/src/tableviewproxymodel.cpp similarity index 96% rename from libqf/libqfqmlwidgets/src/tableviewproxymodel.cpp rename to libqf/libqfgui/src/tableviewproxymodel.cpp index 8892ef049..2cc66b208 100644 --- a/libqf/libqfqmlwidgets/src/tableviewproxymodel.cpp +++ b/libqf/libqfgui/src/tableviewproxymodel.cpp @@ -2,18 +2,18 @@ #include #include -#include +#include #include #include -//namespace qfm = qf::qmlwidgets::model; -using namespace qf::qmlwidgets; +//namespace qfm = qf::gui::model; +using namespace qf::gui; TableViewProxyModel::TableViewProxyModel(QObject *parent) : Super(parent) { - setSortRole(qf::qmlwidgets::model::TableModel::SortRole); + setSortRole(qf::gui::model::TableModel::SortRole); } TableViewProxyModel::~TableViewProxyModel() diff --git a/libqf/libqfqmlwidgets/src/tableviewproxymodel.h b/libqf/libqfgui/src/tableviewproxymodel.h similarity index 87% rename from libqf/libqfqmlwidgets/src/tableviewproxymodel.h rename to libqf/libqfgui/src/tableviewproxymodel.h index 3a4c05270..14d0d5ad4 100644 --- a/libqf/libqfqmlwidgets/src/tableviewproxymodel.h +++ b/libqf/libqfgui/src/tableviewproxymodel.h @@ -1,10 +1,10 @@ -#ifndef QF_QMLWIDGETS_TABLEVIEWPROXYMODEL_H -#define QF_QMLWIDGETS_TABLEVIEWPROXYMODEL_H +#ifndef QF_GUI_TABLEVIEWPROXYMODEL_H +#define QF_GUI_TABLEVIEWPROXYMODEL_H #include namespace qf { -namespace qmlwidgets { +namespace gui { class TableViewProxyModel : public QSortFilterProxyModel { @@ -38,4 +38,4 @@ class TableViewProxyModel : public QSortFilterProxyModel }} -#endif // QF_QMLWIDGETS_TABLEVIEWPROXYMODEL_H +#endif // QF_GUI_TABLEVIEWPROXYMODEL_H diff --git a/libqf/libqfqmlwidgets/src/tableviewtoolbar.cpp b/libqf/libqfgui/src/tableviewtoolbar.cpp similarity index 98% rename from libqf/libqfqmlwidgets/src/tableviewtoolbar.cpp rename to libqf/libqfgui/src/tableviewtoolbar.cpp index 3ea53a8ae..061d27380 100644 --- a/libqf/libqfqmlwidgets/src/tableviewtoolbar.cpp +++ b/libqf/libqfgui/src/tableviewtoolbar.cpp @@ -12,7 +12,7 @@ //namespace qfc = qf::core; //namespace qfu = qf::core::utils; -using namespace qf::qmlwidgets; +using namespace qf::gui; void FilterCombo::keyReleaseEvent(QKeyEvent *ev) { diff --git a/libqf/libqfqmlwidgets/src/tableviewtoolbar.h b/libqf/libqfgui/src/tableviewtoolbar.h similarity index 65% rename from libqf/libqfqmlwidgets/src/tableviewtoolbar.h rename to libqf/libqfgui/src/tableviewtoolbar.h index 8f181379f..429338fdf 100644 --- a/libqf/libqfqmlwidgets/src/tableviewtoolbar.h +++ b/libqf/libqfgui/src/tableviewtoolbar.h @@ -1,13 +1,13 @@ -#ifndef QF_QMLWIDGETS_TABLEVIEWTOOLBAR_H -#define QF_QMLWIDGETS_TABLEVIEWTOOLBAR_H +#ifndef QF_GUI_TABLEVIEWTOOLBAR_H +#define QF_GUI_TABLEVIEWTOOLBAR_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include #include namespace qf { -namespace qmlwidgets { +namespace gui { class TableView; class Action; @@ -26,19 +26,19 @@ class FilterCombo : public QComboBox void keyReleaseEvent(QKeyEvent *ev) Q_DECL_OVERRIDE; }; -class QFQMLWIDGETS_DECL_EXPORT TableViewToolBar : public QToolBar +class QFGUI_DECL_EXPORT TableViewToolBar : public QToolBar { Q_OBJECT using Super = QToolBar; - Q_PROPERTY(qf::qmlwidgets::TableView* tableView READ tableView WRITE setTableView FINAL) + Q_PROPERTY(qf::gui::TableView* tableView READ tableView WRITE setTableView FINAL) public: explicit TableViewToolBar(QWidget *parent = nullptr); ~TableViewToolBar() Q_DECL_OVERRIDE = default; public: void setTableView(TableView *table_view); - qf::qmlwidgets::TableView* tableView() const { return m_tableView; } + qf::gui::TableView* tableView() const { return m_tableView; } signals: void filterStringChanged(const QString &s); private: @@ -46,11 +46,11 @@ class QFQMLWIDGETS_DECL_EXPORT TableViewToolBar : public QToolBar Q_SLOT void emitFilterStringChanged(); Q_SLOT void onFilterDialogRequest(); private: - qf::qmlwidgets::TableView* m_tableView = nullptr; + qf::gui::TableView* m_tableView = nullptr; QList m_pendingActions; FilterCombo *m_filterCombo = nullptr; }; }} -#endif // QF_QMLWIDGETS_TABLEVIEWTOOLBAR_H +#endif // QF_GUI_TABLEVIEWTOOLBAR_H diff --git a/libqf/libqfqmlwidgets/src/textedit.cpp b/libqf/libqfgui/src/textedit.cpp similarity index 94% rename from libqf/libqfqmlwidgets/src/textedit.cpp rename to libqf/libqfgui/src/textedit.cpp index f292e82dc..2777dcaa1 100644 --- a/libqf/libqfqmlwidgets/src/textedit.cpp +++ b/libqf/libqfgui/src/textedit.cpp @@ -3,7 +3,7 @@ #include -namespace qf::qmlwidgets { +namespace qf::gui { TextEdit::TextEdit(QWidget *parent) : Super(parent) @@ -53,5 +53,5 @@ void TextEdit::onTextChanged() emit dataValueChanged(toPlainText()); } -} // namespace qf::qmlwidgets +} // namespace qf::gui diff --git a/libqf/libqfqmlwidgets/src/textedit.h b/libqf/libqfgui/src/textedit.h similarity index 79% rename from libqf/libqfqmlwidgets/src/textedit.h rename to libqf/libqfgui/src/textedit.h index 166676b52..941c84652 100644 --- a/libqf/libqfqmlwidgets/src/textedit.h +++ b/libqf/libqfgui/src/textedit.h @@ -1,15 +1,15 @@ #ifndef TEXTEDIT_H #define TEXTEDIT_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include "idatawidget.h" #include namespace qf { -namespace qmlwidgets { +namespace gui { -class QFQMLWIDGETS_DECL_EXPORT TextEdit : public QPlainTextEdit, public IDataWidget +class QFGUI_DECL_EXPORT TextEdit : public QPlainTextEdit, public IDataWidget { Q_OBJECT Q_PROPERTY(QVariant dataValue READ dataValue WRITE setDataValue NOTIFY dataValueChanged) @@ -28,7 +28,7 @@ class QFQMLWIDGETS_DECL_EXPORT TextEdit : public QPlainTextEdit, public IDataWid bool m_blockTextChanged = false; }; -} // namespace qmlwidgets +} // namespace gui } // namespace qf #endif // TEXTEDIT_H diff --git a/libqf/libqfqmlwidgets/src/texteditwidget.cpp b/libqf/libqfgui/src/texteditwidget.cpp similarity index 90% rename from libqf/libqfqmlwidgets/src/texteditwidget.cpp rename to libqf/libqfgui/src/texteditwidget.cpp index b21c71830..90ccd4ab3 100644 --- a/libqf/libqfqmlwidgets/src/texteditwidget.cpp +++ b/libqf/libqfgui/src/texteditwidget.cpp @@ -20,7 +20,7 @@ #endif namespace qfu = qf::core::utils; -using namespace qf::qmlwidgets; +using namespace qf::gui; TextEditWidget::TextEditWidget(QWidget *parent) : Super(parent), @@ -124,26 +124,26 @@ framework::DialogWidget::ActionMap TextEditWidget::createActions() QStyle *sty = style(); { - QIcon ico(":/qf/qmlwidgets/images/print"); - auto *a = new qf::qmlwidgets::Action(ico, tr("Print"), this); + QIcon ico(":/qf/gui/images/print"); + auto *a = new qf::gui::Action(ico, tr("Print"), this); ret[QStringLiteral("print")] = a; connect(a, SIGNAL(triggered()), this, SLOT(print())); } { QIcon ico = sty->standardIcon(QStyle::SP_DialogSaveButton); - auto *a = new qf::qmlwidgets::Action(ico, tr("Save"), this); + auto *a = new qf::gui::Action(ico, tr("Save"), this); ret[QStringLiteral("save")] = a; connect(a, SIGNAL(triggered()), this, SLOT(save())); } { QIcon ico = sty->standardIcon(QStyle::SP_DialogSaveButton); - auto *a = new qf::qmlwidgets::Action(ico, tr("Save as"), this); + auto *a = new qf::gui::Action(ico, tr("Save as"), this); ret[QStringLiteral("saveAs")] = a; connect(a, SIGNAL(triggered()), this, SLOT(saveAs())); } { - QIcon ico(":/qf/qmlwidgets/images/wordwrap"); - auto *a = new qf::qmlwidgets::Action(ico, tr("Wrap lines"), this); + QIcon ico(":/qf/gui/images/wordwrap"); + auto *a = new qf::gui::Action(ico, tr("Wrap lines"), this); a->setCheckable(true); ret[QStringLiteral("wrapLines")] = a; connect(a, SIGNAL(triggered(bool)), this, SLOT(wrapLines(bool))); @@ -155,18 +155,18 @@ framework::DialogWidget::ActionMap TextEditWidget::createActions() void TextEditWidget::settleDownInDialog(dialogs::Dialog *dlg) { qfLogFuncFrame() << dlg; - qf::qmlwidgets::Action *act_file = dlg->menuBar()->actionForPath("file"); + qf::gui::Action *act_file = dlg->menuBar()->actionForPath("file"); act_file->setText(tr("&File")); act_file->addActionInto(action("save")); act_file->addActionInto(action("saveAs")); act_file->addSeparatorInto(); act_file->addActionInto(action("print")); - qf::qmlwidgets::Action *act_view = dlg->menuBar()->actionForPath("view"); + qf::gui::Action *act_view = dlg->menuBar()->actionForPath("view"); act_view->setText(tr("&View")); act_view->addActionInto(action("wrapLines")); - qf::qmlwidgets::ToolBar *tool_bar = dlg->toolBar("main", true); + qf::gui::ToolBar *tool_bar = dlg->toolBar("main", true); tool_bar->addAction(action("save")); tool_bar->addAction(action("print")); tool_bar->addAction(action("wrapLines")); diff --git a/libqf/libqfqmlwidgets/src/texteditwidget.h b/libqf/libqfgui/src/texteditwidget.h similarity index 80% rename from libqf/libqfqmlwidgets/src/texteditwidget.h rename to libqf/libqfgui/src/texteditwidget.h index a4ad18ce0..941444b91 100644 --- a/libqf/libqfqmlwidgets/src/texteditwidget.h +++ b/libqf/libqfgui/src/texteditwidget.h @@ -1,7 +1,7 @@ -#ifndef QF_QMLWIDGETS_TEXTEDITWIDGET_H -#define QF_QMLWIDGETS_TEXTEDITWIDGET_H +#ifndef QF_GUI_TEXTEDITWIDGET_H +#define QF_GUI_TEXTEDITWIDGET_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include "framework/dialogwidget.h" #include "framework/ipersistentoptions.h" @@ -10,7 +10,7 @@ class QTextEdit; namespace qf { -namespace qmlwidgets { +namespace gui { namespace dialogs { class Dialog; @@ -19,13 +19,13 @@ namespace Ui { class TextEditWidget; } -class QFQMLWIDGETS_DECL_EXPORT TextEditWidget : public qf::qmlwidgets::framework::DialogWidget //, public qf::qmlwidgets::framework::IPersistentOptions +class QFGUI_DECL_EXPORT TextEditWidget : public qf::gui::framework::DialogWidget //, public qf::gui::framework::IPersistentOptions { Q_OBJECT Q_PROPERTY(QString codecName READ codecName WRITE setCodecName NOTIFY codecNameChanged) Q_PROPERTY(QString suggestedFileName READ suggestedFileName WRITE setSuggestedFileName NOTIFY suggestedFileNameChanged) private: - typedef qf::qmlwidgets::framework::DialogWidget Super; + typedef qf::gui::framework::DialogWidget Super; public: TextEditWidget(QWidget *parent = nullptr); ~TextEditWidget() Q_DECL_OVERRIDE; @@ -51,7 +51,7 @@ class QFQMLWIDGETS_DECL_EXPORT TextEditWidget : public qf::qmlwidgets::framework void save_helper(const QString &file_name); private: ActionMap createActions() Q_DECL_OVERRIDE; - void settleDownInDialog(qf::qmlwidgets::dialogs::Dialog *dlg) Q_DECL_OVERRIDE; + void settleDownInDialog(qf::gui::dialogs::Dialog *dlg) Q_DECL_OVERRIDE; Q_SLOT void wrapLines(bool checked); private: diff --git a/libqf/libqfqmlwidgets/src/texteditwidget.ui b/libqf/libqfgui/src/texteditwidget.ui similarity index 89% rename from libqf/libqfqmlwidgets/src/texteditwidget.ui rename to libqf/libqfgui/src/texteditwidget.ui index 1d9f7969f..02da0f5ce 100644 --- a/libqf/libqfqmlwidgets/src/texteditwidget.ui +++ b/libqf/libqfgui/src/texteditwidget.ui @@ -1,7 +1,7 @@ - qf::qmlwidgets::TextEditWidget - + qf::gui::TextEditWidget + 0 diff --git a/libqf/libqfqmlwidgets/src/timeedit.cpp b/libqf/libqfgui/src/timeedit.cpp similarity index 96% rename from libqf/libqfqmlwidgets/src/timeedit.cpp rename to libqf/libqfgui/src/timeedit.cpp index 1aaad74a5..0ac737d2b 100644 --- a/libqf/libqfqmlwidgets/src/timeedit.cpp +++ b/libqf/libqfgui/src/timeedit.cpp @@ -2,7 +2,7 @@ #include -using namespace qf::qmlwidgets; +using namespace qf::gui; TimeEdit::TimeEdit(QWidget *parent) : Super(parent) diff --git a/libqf/libqfqmlwidgets/src/timeedit.h b/libqf/libqfgui/src/timeedit.h similarity index 74% rename from libqf/libqfqmlwidgets/src/timeedit.h rename to libqf/libqfgui/src/timeedit.h index abbbd6f3e..b0cb8f089 100644 --- a/libqf/libqfqmlwidgets/src/timeedit.h +++ b/libqf/libqfgui/src/timeedit.h @@ -1,15 +1,15 @@ -#ifndef QF_QMLWIDGETS_TIMEEDIT_H -#define QF_QMLWIDGETS_TIMEEDIT_H +#ifndef QF_GUI_TIMEEDIT_H +#define QF_GUI_TIMEEDIT_H -#include "qmlwidgetsglobal.h" +#include "guiglobal.h" #include "idatawidget.h" #include namespace qf { -namespace qmlwidgets { +namespace gui { -class QFQMLWIDGETS_DECL_EXPORT TimeEdit : public QTimeEdit, public IDataWidget +class QFGUI_DECL_EXPORT TimeEdit : public QTimeEdit, public IDataWidget { Q_OBJECT Q_PROPERTY(QVariant dataValue READ dataValue WRITE setDataValue NOTIFY dataValueChanged) diff --git a/libqf/libqfqmlwidgets/src/toolbar.cpp b/libqf/libqfgui/src/toolbar.cpp similarity index 77% rename from libqf/libqfqmlwidgets/src/toolbar.cpp rename to libqf/libqfgui/src/toolbar.cpp index 4dadc8152..d57a482a6 100644 --- a/libqf/libqfqmlwidgets/src/toolbar.cpp +++ b/libqf/libqfgui/src/toolbar.cpp @@ -1,6 +1,6 @@ #include "toolbar.h" -using namespace qf::qmlwidgets; +using namespace qf::gui; ToolBar::ToolBar(QWidget *parent) : Super(parent) diff --git a/libqf/libqfgui/src/toolbar.h b/libqf/libqfgui/src/toolbar.h new file mode 100644 index 000000000..fe1f16d9c --- /dev/null +++ b/libqf/libqfgui/src/toolbar.h @@ -0,0 +1,26 @@ +#ifndef QF_GUI_TOOLBAR_H +#define QF_GUI_TOOLBAR_H + +#include "guiglobal.h" + +#include + +namespace qf { +namespace gui { + +//class Action; + +class QFGUI_DECL_EXPORT ToolBar : public QToolBar +{ + Q_OBJECT +private: + typedef QToolBar Super; +public: + ToolBar(QWidget *parent = nullptr); + ~ToolBar() Q_DECL_OVERRIDE; +}; + +}} + +#endif // QF_GUI_TOOLBAR_H + diff --git a/libqf/libqfqmlwidgets/style/dark.css b/libqf/libqfgui/style/dark.css similarity index 100% rename from libqf/libqfqmlwidgets/style/dark.css rename to libqf/libqfgui/style/dark.css diff --git a/libqf/libqfqmlwidgets/style/qf_qmlwidgets_style.qrc b/libqf/libqfgui/style/qf_gui_style.qrc similarity index 54% rename from libqf/libqfqmlwidgets/style/qf_qmlwidgets_style.qrc rename to libqf/libqfgui/style/qf_gui_style.qrc index 187fcf158..0ae7a4b72 100644 --- a/libqf/libqfqmlwidgets/style/qf_qmlwidgets_style.qrc +++ b/libqf/libqfgui/style/qf_gui_style.qrc @@ -1,5 +1,5 @@ - + dark.css diff --git a/libqf/libqfqmlwidgets/src/actiongroup.h b/libqf/libqfqmlwidgets/src/actiongroup.h deleted file mode 100644 index 0e501bf1e..000000000 --- a/libqf/libqfqmlwidgets/src/actiongroup.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef QF_QMLWIDGETS_ACTIONGROUP_H -#define QF_QMLWIDGETS_ACTIONGROUP_H - -#include "qmlwidgetsglobal.h" - -#include - -namespace qf { -namespace qmlwidgets { - -class QFQMLWIDGETS_DECL_EXPORT ActionGroup : public QActionGroup -{ - Q_OBJECT -private: - typedef QActionGroup Super; -public: - ActionGroup(QObject *parent = nullptr); - - Q_INVOKABLE QAction* addAction(QAction *action) {return Super::addAction(action);} -}; - -} // namespace qmlwidgets -} // namespace qf - -#endif // QF_QMLWIDGETS_ACTIONGROUP_H diff --git a/libqf/libqfqmlwidgets/src/exportcsvtableviewwidget.h b/libqf/libqfqmlwidgets/src/exportcsvtableviewwidget.h deleted file mode 100644 index 4d4d11239..000000000 --- a/libqf/libqfqmlwidgets/src/exportcsvtableviewwidget.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef QF_QMLWIDGETS_EXPORTCSVTABLEVIEWWIDGET_H -#define QF_QMLWIDGETS_EXPORTCSVTABLEVIEWWIDGET_H - -#include "exporttableviewwidget.h" - -namespace qf { -namespace qmlwidgets { - -class ExportCsvTableViewWidget : public qf::qmlwidgets::ExportTableViewWidget -{ - Q_OBJECT -private: - typedef qf::qmlwidgets::ExportTableViewWidget Super; -public: - ExportCsvTableViewWidget(QTableView *table_view, QWidget *parent = nullptr); -protected: - QVariant exportOptions() const Q_DECL_OVERRIDE; - void setExportOptions(const QVariant& opts) const Q_DECL_OVERRIDE; -}; - -} // namespace qmlwidgets -} // namespace qf - -#endif // QF_QMLWIDGETS_EXPORTCSVTABLEVIEWWIDGET_H diff --git a/libqf/libqfqmlwidgets/src/framework/cursoroverrider.h b/libqf/libqfqmlwidgets/src/framework/cursoroverrider.h deleted file mode 100644 index 7f5a7f008..000000000 --- a/libqf/libqfqmlwidgets/src/framework/cursoroverrider.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef QF_QMLWIDGETS_FRAMEWORK_CURSOROVERRIDER_H -#define QF_QMLWIDGETS_FRAMEWORK_CURSOROVERRIDER_H - -#include "../qmlwidgetsglobal.h" - -#include - -namespace qf { -namespace qmlwidgets { -namespace framework { - -class QFQMLWIDGETS_DECL_EXPORT CursorOverrider -{ -public: - CursorOverrider(Qt::CursorShape cursor_shape); - virtual ~CursorOverrider(); -}; - -}}} - -#endif // CURSOROVERRIDER_H diff --git a/libqf/libqfqmlwidgets/src/framework/dockablewidget.h b/libqf/libqfqmlwidgets/src/framework/dockablewidget.h deleted file mode 100644 index 9a1e39744..000000000 --- a/libqf/libqfqmlwidgets/src/framework/dockablewidget.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef QF_QMLWIDGETS_FRAMEWORK_DOCKABLEWIDGET_H -#define QF_QMLWIDGETS_FRAMEWORK_DOCKABLEWIDGET_H - -#include "dialogwidget.h" - -namespace qf { -namespace qmlwidgets { -namespace framework { - -class QFQMLWIDGETS_DECL_EXPORT DockableWidget : public qf::qmlwidgets::framework::DialogWidget -{ - Q_OBJECT -private: - typedef qf::qmlwidgets::framework::DialogWidget Super; -public: - DockableWidget(QWidget *parent = nullptr); -}; - -} // namespace framework -} // namespace qmlwidgets -} // namespace qf - -#endif // QF_QMLWIDGETS_FRAMEWORK_DOCKABLEWIDGET_H diff --git a/libqf/libqfqmlwidgets/src/graphics/attic/graph/graph.cpp b/libqf/libqfqmlwidgets/src/graphics/attic/graph/graph.cpp deleted file mode 100644 index 5e4aad760..000000000 --- a/libqf/libqfqmlwidgets/src/graphics/attic/graph/graph.cpp +++ /dev/null @@ -1,1111 +0,0 @@ - -// -// Author: Frantisek Vacek , (C) 2007 - 2014 -// -// Copyright: See COPYING file that comes with this distribution -// - -#include "graph.h" - -#include -#include -#include - -namespace qfc = qf::core; -namespace qfu = qf::core::utils; -using namespace qf::qmlwidgets::graphics; - -//====================================================== -// Graph::Serie -//====================================================== -const Graph::Serie & Graph::Serie::sharedNull() -{ - static Serie n = Serie(SharedDummyHelper()); - return n; -} - -Graph::Serie::Serie(Graph::Serie::SharedDummyHelper ) -{ - d = new Data(); -} - -Graph::Serie::Serie() -{ - *this = sharedNull(); -} - -//====================================================== -// Graph::Axis -//====================================================== -const Graph::Axis & Graph::Axis::sharedNull() -{ - static Axis n = Axis(SharedDummyHelper()); - return n; -} - -Graph::Axis::Axis(SharedDummyHelper ) -{ - d = new Data(); -} - -Graph::Axis::Axis() -{ - *this = sharedNull(); -} - -//====================================================== -// Graph::Legend -//====================================================== -const Graph::Legend & Graph::Legend::sharedNull() -{ - static Legend n = Legend(SharedDummyHelper()); - return n; -} - -Graph::Legend::Legend(Graph::Legend::SharedDummyHelper ) -{ - d = new Data(); -} - -Graph::Legend::Legend() -{ - *this = sharedNull(); -} - -//====================================================== -// Graph::Axis -//====================================================== - -qreal Graph::Axis::value2pos(qreal value, const Rect &grid_rect) -{ - //qfInfo() << "value:" << value; - qreal ret = 0; - if(valuesFrom() == TakeValues) { - ret = (value - min()) / (max() - min()); - } - else if(valuesFrom() == TakeOrder) { - ret = (value + tick()/2 - min()) / (max() - min()); - } - if(direction() == DirectionX) { - ret *= grid_rect.width(); - ret += grid_rect.left(); - } - else { - ret *= grid_rect.height(); - ret = grid_rect.bottom() - ret; - } - return ret; -} - -qreal Graph::Axis::tickSize(const Rect &grid_rect) -{ - qreal ret = 0; - ret = tick() / (max() - min()); - if(direction() == DirectionX) { - ret *= grid_rect.width(); - } - else { - ret *= grid_rect.height(); - } - return ret; -} - -QString Graph::Axis::formatTickLabel(const QVariant & label_value) -{ - QString ret; - QString fmt = labelFormat(); - if(!fmt.isEmpty()) { - if(label_value.type() == QVariant::String) { - ret = label_value.toString(); - } - else if(label_value.type() == QVariant::Double) { - ret = qfc::String::number(label_value.toDouble(), fmt); - } - else if(label_value.type() == QVariant::Int) { - ret = qfc::String::number(label_value.toInt(), fmt); - } - else { - ret = qfc::String::number(label_value.toDouble(), fmt); - } - } - else - ret = label_value.toString(); - return ret; -} - -//====================================================== -// Graph -//====================================================== -QStringList Graph::colorNamesPull; - -Graph::Graph() -{ - d = &_d; -} - -Graph::Graph(const QVariantMap &def, const qfu::TreeTable &_data) -{ - d = &_d; - setDefinition(def); - setData(_data); -} - -Graph::~Graph() -{ -} - -struct SerieSort_helper -{ - int index; - double value; - - bool operator<(const SerieSort_helper &other) const { return other.value < value; } - - SerieSort_helper(int ix, double val) : index(ix), value(val) {} -}; - -void Graph::createSeries() -{ - int serie_no = 0; - QVariantList v_series = definition().value("series").toList(); - for(auto v : v_series) { - QVariantMap m_serie = v.toMap(); - QString colname = m_serie.value("colname").toString(); - Serie serie; - { - QString s = m_serie.value("point").toMap().value("color").toString(); - QColor color; - if(s.isEmpty()) - color = colorForIndex(serie_no); - else - color = styleCache().color(s); - //qfInfo() << colname << color.name(); - serie.setColor(color); - } - { - QString s = data().value(QString("CAPTION(%1)").arg(colname)).toString(); - serie.setColumnCaption(s); - } - { - qfu::TreeTable t = data(); - int ix = t.columns().indexOf(colname); - QVariantList vlst; - for(int i=0; i sorted_indexes; - //qfInfo() << "sortcolname:" << sort_colname; - QList sorted; - qfu::TreeTable t = data(); - int sort_col_ix = t.columns().indexOf(sort_colname); - for(int i=0; iseriesMap[colname] = serie; - serie_no++; - } -} - -void Graph::createAxes() -{ - QVariantList v_series = definition().value("series").toList(); - for(auto v : v_series) { - QVariantMap m_serie = v.toMap(); - QString colname = m_serie.value("colname").toString(); - QVariantMap m_axis = m_serie.value("axis").toMap(); - - Serie serie = seriesMap().value(colname); - - Axis axis; - axis.setDirection(m_axis.value("direction", "y") == "y"? Axis::DirectionY: Axis::DirectionX); - axis.setValuesFrom((m_axis.value("valuesFrom", "takeValue") == "takeValue")? Axis::TakeValues: Axis::TakeOrder); - axis.setHidden(m_axis.value("hidden", false).toBool()); - QVariantMap m_label = m_axis.value("label").toMap(); - if(!m_label.isEmpty()) { - QString s = m_label.value("text").toString(); - s.replace("${COLUMN_CAPTION}", serie.columnCaption()); - axis.setLabel(s); - axis.setLabelStyle(m_label.value("textStyle", "default").toString()); - } - QVariantMap m_gridlines = m_axis.value("gridLines").toMap(); - if(!m_gridlines.isEmpty()) { - axis.setGridLines(true); - } - - if(axis.valuesFrom() == Axis::TakeValues) { - QVariantList values = serie.values(); - QVariantMap m_axis_ticks = m_axis.value("ticks").toMap(); - if(!m_axis_ticks.isEmpty()) { - axis.setLabelFormat(m_axis_ticks.value("labelFormat").toString()); - - QString same_as_colname = m_axis_ticks.value("sameAs").toString(); - if(same_as_colname.isEmpty()) { - /// najdi min - max - foreach(QVariant v, values) { - double d = v.toDouble(); - axis.setMin(qMin(axis.min(), d)); - axis.setMax(qMax(axis.max(), d)); - } - QVariantMap m_range = m_axis_ticks.value("range").toMap(); - if(m_range.value("min").isValid()) - axis.setMin(m_range.value("min").toDouble()); - if(m_range.value("max").isValid()) - axis.setMax(m_range.value("max").toDouble()); - //qfInfo() << "axis:" << axis.toString(); - double range = axis.max() - axis.min(); - if(range > 0) { - double tick_range = range / 10; - double exponent = floor(log10(tick_range)); - tick_range = tick_range * pow(10, -exponent); - int int_tick_range; - /// find closest 1, 2, 5 or 10 - if(tick_range < 1.5) int_tick_range = 1; - else if(tick_range < 3.5) int_tick_range = 2; - else if(tick_range < 7.5) int_tick_range = 5; - else int_tick_range = 10; - tick_range = int_tick_range * pow(10, exponent); - axis.setMin(tick_range * floor(axis.min() / tick_range)); - axis.setMax(tick_range * ceil(axis.max() / tick_range)); - axis.setTick(tick_range); - } - } - else { - Axis original = axisForSerie(same_as_colname); - axis.setMin(original.min()); - axis.setMax(original.max()); - axis.setTick(original.tick()); - } - } - } - else if(axis.valuesFrom() == Axis::TakeOrder) { - QVariantList values = serie.values(); - axis.setMin(0); - axis.setMax(values.count()); - axis.setTick(1); - } - d->axesMap[colname] = axis; - } -} - -Graph::Axis Graph::axisForSerie(const QString & colname) -{ - return axesMap().value(colname); -} - -QString Graph::title() const -{ - return definition().value("title").toMap().value("text").toString(); -} - -void Graph::draw(QPainter *painter, const QSizeF &size) -{ - qfLogFuncFrame() << "painter:" << painter << "size:" << size.width() << "x" << size.height(); - d->painter = painter; - d->boundingRect = QRectF(0, 0, size.width(), size.height()); - d->gridRect = boundingRect(); - createSeries(); - createAxes(); - drawTitle(); - { - Rect gr = gridRect(); - //qfInfo() << "gridRect1:" << gridRect().toString(); - d->gridRect.setWidth(0); - Rect r = drawLegends(true); - //qfInfo() << "r:" << r.toString(); - d->gridRect = gr; - d->gridRect.adjust(0, 0, -r.width(), 0); - } - drawAxes(); - drawGrid(); - drawSeries(); - drawBox(); - drawLegends(false); -} - -void Graph::drawTitle() -{ - qfLogFuncFrame() << "boundingRect width:" << boundingRect().width() << "boundingRect height:" << boundingRect().height(); - if(!title().isEmpty()) { - QString t = title(); - TextStyle st = styleCache().style(definition().value("title").toMap().value("textStyle").toString()); - painter()->setFont(st.font); - painter()->setPen(st.pen); - painter()->setBrush(st.brush); - //painter()->setBrush(QBrush(Qt::red)); - - Rect br = mm2device(boundingRect()); - Rect br2; - //qfInfo() << "font:" << painter()->font().toString(); - painter()->drawText(br, Qt::AlignHCenter, t, &br2); - br2 = device2mm(br2); - //qfInfo() << "rect:" << rect().toString(); - //qfInfo() << "br:" << br.toString(); - d->gridRect.setTop(br2.bottom()); - //qfInfo() << "grid rect:" << gridRect().toString(); - } -} - -Rect Graph::drawLegends(bool do_not_draw) -{ - Rect bounding_rect; - Rect br = gridRect(); - //qfInfo() << "gridRect" << gridRect().toString(); - //qfInfo() << "boundingRect" << boundingRect().toString(); - /// vytiskni to do mezery mezi gridRect a boundingRect - br.setLeft(br.right()); - br.setRight(boundingRect().right()); - //qfInfo() << "br:" << br.toString(); - for(auto v : definition().value("legends").toList()) { - QVariantMap m_legend = v.toMap(); - QString id = drawLegend(m_legend, br, do_not_draw); - Legend legend = legendMap().value(id); - if(!legend.isNull()) { - if(bounding_rect.isNull()) - bounding_rect = legend.boundingRect(); - else { - Rect r = legend.boundingRect(); - r.moveTo(bounding_rect.bottomLeft()); - bounding_rect = bounding_rect.united(r); - } - br.moveTo(bounding_rect.bottomLeft()); - } - } - //qfInfo() << "whole br:" << bounding_rect.toString(); - return bounding_rect; -} - -void Graph::drawBox() -{ - qfLogFuncFrame() << "boundingRect width:" << boundingRect().width() << "boundingRect height:" << boundingRect().height(); - painter()->setPen(Qt::black); - painter()->setBrush(QBrush()); - //painter()->drawRect(mm2device(rect())); - Rect gr = mm2device(gridRect()); - //painter()->fillRect(gr, QBrush(QColor("khaki"))); - //painter()->setPen(QColor("maroon")); - painter()->drawRect(gr); - qfDebug() << "\t RETURN" << QF_FUNC_NAME; - return; - //painter()->drawLine(gr.topLeft(), gr.bottomRight()); - //painter()->drawLine(gr.topRight(), gr.bottomLeft()); -} - -void Graph::drawGrid() -{ - qfLogFuncFrame(); - painter()->setPen(styleCache().pen("graphgrid")); - QMapIterator i(axesMap()); - while (i.hasNext()) { - i.next(); - Axis axis = i.value(); - if(axis.isGridLines() && axis.tick() > 0) { - Rect gr = gridRect(); - for(double dd = axis.min() + axis.tick(); dd < axis.max(); dd += axis.tick()) { - Point p1, p2; - qreal rr = axis.value2pos(dd, gridRect()); - if(axis.direction() == Axis::DirectionX) { - p1 = gr.bottomLeft(); - p1.rx() += rr; - p2 = p1; - p2.ry() = gr.topLeft().y(); - } - else if(axis.direction() == Axis::DirectionY) { - p1 = gr.bottomLeft(); - p1.ry() -= rr; - p2 = p1; - p2.rx() = gr.topRight().x(); - } - qfDebug() << "\t line" << p1.toString() << "->" << p2.toString(); - painter()->drawLine(mm2device(p1), mm2device(p2)); - } - } - } -} - -void Graph::drawAxes() -{ - qfLogFuncFrame() << "boundingRect width:" << boundingRect().width() << "boundingRect height:" << boundingRect().height(); - //Rect gr = mm2device(gridRect()); - QVariantList v_series = definition().value("series").toList(); - /// vytiskni nanecisto osy Y, aby se nastavil gridrect ve smeru X - Rect gr = gridRect(); - for(auto v : v_series) { - QVariantMap m_serie = v.toMap(); - QVariantMap m_axis = m_serie.value("axis").toMap(); - QString colname = m_serie.value("colname", "invalid colname").toString(); - if(m_axis.value("direction", "y").toString() == "y") { - drawAxis(colname, gr, true); - Axis axis = axisForSerie(colname); - if(!axis.isHidden()) - gr.setTopLeft(axis.boundingRect().topRight()); - } - } - /// vytiskni osy X, aby se nastavil gridrect ve smeru Y - for(auto v : v_series) { - QVariantMap m_serie = v.toMap(); - QVariantMap m_axis = m_serie.value("axis").toMap(); - QString colname = m_serie.value("colname", "invalid colname").toString(); - if(m_axis.value("direction", "y") == "x") { - drawAxis(colname, gr, false); - Axis axis = axisForSerie(colname); - if(!axis.isHidden()) - gr.setBottomLeft(axis.boundingRect().topLeft()); - } - } - //gr.setHeight(gridRect().height()); - gr.setTopLeft(gridRect().topLeft()); - /// vytiskni nacisto osy Y - for(auto v : v_series) { - QVariantMap m_serie = v.toMap(); - QVariantMap m_axis = m_serie.value("axis").toMap(); - QString colname = m_serie.value("colname", "invalid colname").toString(); - if(m_axis.value("direction", "y") == "y") { - drawAxis(colname, gr, false); - Axis axis = axisForSerie(colname); - if(!axis.isHidden()) - gr.setTopLeft(axis.boundingRect().topRight()); - } - } - d->gridRect = gr; -} - -void Graph::drawAxis(const QString &colname, const Rect &_bounding_rect, bool do_not_draw) -{ - if(colname.isEmpty()) return; - - Serie serie = seriesMap().value(colname); - Axis axis = axisForSerie(colname); - do_not_draw = do_not_draw || axis.isHidden(); - - Rect bounding_rect = _bounding_rect; - //axis.boundingRect = _bounding_rect; - if(axis.direction() == Axis::DirectionY) { - //axis.boundingRect = bounding_rect; - //bnd_rect.setWidth(0); - if(!axis.label().isEmpty()) { - QString t = axis.label(); - TextStyle st = styleCache().style(axis.labelStyle()); - painter()->setFont(st.font); - painter()->setPen(st.pen); - painter()->setBrush(st.brush); - - //Rect br(gr.topLeft(), Size(gr.height(), gr.width())); - Rect br = mm2device(_bounding_rect); - Rect br1 = br.transposed(); - //painter()->drawText(gr, Qt::AlignHCenter, t, &br2); - painter()->save(); - //painter()->translate(gr.left(), gr.top() + gr.height()/2); - //qfInfo() << br.toString(); - painter()->translate(br.bottomLeft()); - /// label se kresli na vysku - painter()->rotate(-90); - //painter()->translate(-br.topLeft()); - //painter()->translate(mm2device(Point(-rect().height(), 0))); - br1.moveTo(Point()); - //painter()->setPen(QPen(QColor(Qt::yellow))); - //painter()->drawRect(br1); - Rect br2; - if(do_not_draw) br2 = painter()->boundingRect(br1, Qt::AlignHCenter, t); - else painter()->drawText(br1, Qt::AlignHCenter, t, &br2); - painter()->restore(); - br2 = device2mm(br2); - bounding_rect.adjust(br2.height(), 0, 0 , 0); - ///- bnd_rect.adjust(0, 0, br2.height(), 0); - } - painter()->setPen(QPen()); - //QVariantMap m_ticks = m_axis.cd("ticks").toMap(); - if(axis.tick() > 0) { - /// zjisti sirku textu hodnot - Rect gr = mm2device(bounding_rect); - Rect br; - for(double dd=axis.min(); dd<=axis.max(); dd+=axis.tick()) { - QString s = axis.formatTickLabel(dd); - Rect r = painter()->boundingRect(gr, Qt::AlignLeft, s); - if(br.isNull()) br = r; - else br = br.united(r); - //qfInfo() << dd; - } - Rect br2 = device2mm(br); - bounding_rect.setLeft(br2.right() + 2); /// mezera mezi popisky a osou - ///- axis.boundingRect.adjust(0, 0, br2.widht() + 2, 0); - if(!do_not_draw) { - /// vytiskni osu Y - Rect gr = mm2device(bounding_rect); - painter()->setPen(styleCache().pen("graphaxis")); - painter()->drawLine(gr.topLeft(), gr.bottomLeft()); - /// vytiskni popisky - TextStyle st = styleCache().style("default"); - painter()->setFont(st.font); - painter()->setPen(st.pen); - painter()->setBrush(st.brush); - for(double dd=axis.min(); dd<=axis.max(); dd+=axis.tick()) { - //qfInfo() << "val:" << dd << "tomm:" << axis.value2mm(dd); - qreal pos = axis.value2pos(dd, mm2device(bounding_rect)); - Rect r = br; - r.moveTop(pos); - r.translate(0, -QFontMetricsF(painter()->font()).height()/2); - //qfInfo() << QFontMetricsF(painter()->font()).height(); - //painter()->setPen(QPen(QColor(Qt::red))); - //painter()->drawRect(r); - QString s = axis.formatTickLabel(dd); - painter()->drawText(r, Qt::AlignRight, s); - } - /// vytiskni carky - painter()->setPen(styleCache().pen("graphaxis")); - for(double dd=axis.min(); dd<=axis.max(); dd+=axis.tick()) { - //qfInfo() << "val:" << dd << "tomm:" << axis.value2mm(dd); - qreal pos = axis.value2pos(dd, mm2device(bounding_rect)); - Rect r = br; - r = br.translated(br.width() + x2device(1), 0); - r.setWidth(x2device(2)); - r.moveTop(pos); - painter()->drawLine(r.topLeft(), r.topRight()); - } - } - } - { - Rect r = _bounding_rect; - r.setTopRight(bounding_rect.topLeft()); - axis.setBoundingRect(r); - } - } - else if(axis.direction() == Axis::DirectionX) { - //axis.boundingRect = gridRect(); - //bnd_rect.adjust(0, bnd_rect.height(), 0, 0); - //QVariantMap m_label = m_axis.cd("label").toMap(); - if(!axis.label().isEmpty()) { - QString t = axis.label(); - TextStyle st = styleCache().style(axis.labelStyle()); - painter()->setFont(st.font); - painter()->setPen(st.pen); - painter()->setBrush(st.brush); - - Rect br = mm2device(bounding_rect); - Rect br2; - if(do_not_draw) br2 = painter()->boundingRect(br, Qt::AlignHCenter | Qt::AlignBottom, t); - else painter()->drawText(br, Qt::AlignCenter | Qt::AlignBottom, t, &br2); - br2 = device2mm(br2); - bounding_rect.adjust(0, 0, 0, -br2.height()); - ///- axis.boundingRect.adjust(0, -br2.height(), 0, 0); - } - painter()->setPen(QPen()); - //QVariantMap m_ticks = m_axis.cd("ticks").toMap(); - if(axis.tick() > 0) { - /// zjisti vysku textu hodnot - QStringList labels; - if(axis.valuesFrom() == Axis::TakeValues) { - for(double dd=axis.min(); dd<=axis.max(); dd+=axis.tick()) { - QString s = axis.formatTickLabel(dd); - labels << s; - } - } - else if(axis.valuesFrom() == Axis::TakeOrder) { - QStringList lbls; - foreach(QVariant v, serie.values()) { - lbls << v.toString(); - } - /// pokud je sorting serad labels podle setrideni - if(serie.isSorted()) { - for(int i=0; isetFont(st.font); - painter()->setPen(st.pen); - painter()->setBrush(st.brush); - double angle = 0; - double tick_size = axis.tickSize(bounding_rect); - QList rects; - QFontMetricsF fm(painter()->font()); - foreach(QString s, labels) { - Rect r = fm.boundingRect(s); - if(r.width() >= tick_size) angle = 45; /// kdyz se popisky nevejdou, musi se naklonit - rects << r; - } - //angle = 0; - static const double Pi = 3.1415926535897932384626433832795028841968; - double height = fm.height(); - foreach(const Rect &r, rects) { - double h = r.width()*sin(angle*Pi/180) + r.height()*cos(angle*Pi/180); - height = qMax(h, height); - } - height = device2y(height); - - bounding_rect.adjust(0, 0, 0, -(height + 2)); /// mezera mezi popisky a osou - ///- axis.boundingRect.adjust(0, -(height + 2), 0, 0); - Rect gr = mm2device(bounding_rect); - /// vytiskni osu X - if(!do_not_draw) { - painter()->setPen(styleCache().pen("graphaxis")); - painter()->drawLine(gr.bottomLeft(), gr.bottomRight()); - } - /// vytiskni popisky - painter()->setFont(st.font); - painter()->setPen(st.pen); - painter()->setBrush(st.brush); - int i = 0; - for(double dd=axis.min(); dd<=axis.max() && idrawText(pt1, labels[i]); - } - else { - //Rect r = rects[i]; - if(!do_not_draw) { - Rect r = rects[i]; - //r.moveTo(pt1); - //r.translate(-r.width(), 0); - //painter()->drawRect(r); - - painter()->save(); - painter()->translate(pt1); - painter()->rotate(-angle); - r.moveTo(-r.width(), 0); - //painter()->setPen(QColor(Qt::green)); - //painter()->drawRect(r); - painter()->drawText(Point(-r.width(), r.height() / 2), labels[i]); - painter()->restore(); - //painter()->drawLine(Point(), pt1); - } - //pt1 += Point(rects[i].width(), 0); - } - //painter()->setPen(QColor(Qt::red)); - //painter()->drawRect(r); - //if(!do_not_draw) painter()->drawText(r.topLeft(), labels[i]); - - pt = Point(pos, bounding_rect.bottom() - 1); - pt = mm2device(pt); - pt1 = Point(pos, bounding_rect.bottom() + 1); - pt1 = mm2device(pt1); - //r = Rect(pos, br.top() - Graphics::x2device(3), pos, br.top() - Graphics::x2device(1)); - if(!do_not_draw) painter()->drawLine(pt, pt1); - } - } - { - Rect r = _bounding_rect; - r.setTopLeft(bounding_rect.bottomLeft()); - axis.setBoundingRect(r); - } - } - //qfInfo() << "adding axis" << colname << axis.colname; - axesMapRef()[colname] = axis; -} -/* -QString Graph::createLegend(const QFDomElement & el_legend) -{ - Legend legend; - QString legend_id = el_legend.value("id"); - QVariantMap m_labels = el_legend.cd("labels").toMap(); - QStringList labels; - QList colors; - //int label_no = 0; - for(QVariantMap m_label=el_labels.firstChildElement("label"); !!el_label; el_label = el_label.nextSiblingElement("label")) { - QString serie_name = el_label.value("serie"); - QString text = el_label.text(); - if(serie_name.isEmpty()) { - QString caption_serie_name = el_label.value("captionForEachInSerie"); - QString value_serie_name = el_label.value("valuesFromSerie"); - if(!caption_serie_name.isEmpty()) { - Serie caption_serie = seriesMap().value(caption_serie_name); - Serie value_serie = seriesMap().value(value_serie_name); - /// legenda je z nazvu serie a hodnoty (napr. pie graph) - int ix = 0; - foreach(QVariant v, caption_serie.values()) { - QString s = text; - s.replace("CAPTION", v.toString()); - if(!value_serie.isNull()) { - QVariant v = value_serie.values().value(ix); - s.replace("VALUE", v.toString()); - } - labels << s; - colors << colorForIndex(ix); - ix++; - } - } - } - else { - Serie serie = seriesMap().value(serie_name); - Axis axis = axisForSerie(serie_name); - QString s = text; - s.replace("AXIS_LABEL", axis.label()); - labels << s; - colors << serie.color(); - } - } - legend.setColors(colors); - legend.setLabels(labels); - d->legendMap[legend_id] = legend; - return legend_id; -} -*/ -QString Graph::drawLegend(const QVariantMap& m_legend, const Rect & _bounding_rect, bool do_not_draw) -{ - QStringList labels; - QList colors; - Serie caption_serie; - //bool legend_from_series = false; - QString legend_id = m_legend.value("id").toString(); - Legend legend; - { - QVariantList v_labels = m_legend.value("labels").toList(); - for(auto v : v_labels) { - QVariantMap m_label = v.toMap(); - QString serie_name = m_label.value("serie").toString(); - QString text = m_label.value("text").toString(); - if(serie_name.isEmpty()) { - QString caption_serie_name = m_label.value("captionForEachInSerie").toString(); - QString value_serie_name = m_label.value("valuesFromSerie").toString(); - QString value_format = m_label.value("valueFormat").toString(); - if(!caption_serie_name.isEmpty()) { - caption_serie = seriesMap().value(caption_serie_name); - Serie value_serie = seriesMap().value(value_serie_name); - /// legenda je z nazvu serie a hodnoty (napr. pie graph) - int i = 0; - foreach(QVariant v, caption_serie.values()) { - QString s = text; - s.replace("${CAPTION}", v.toString()); - if(!value_serie.isNull()) { - QVariant v = value_serie.values().value(i); - QString val_str = v.toString(); - if(v.type() == QVariant::Double) - val_str = qfc::String::number(v.toDouble(), value_format); - else if(v.type() == QVariant::Int) - val_str = qfc::String::number(v.toInt(), value_format); - s.replace("${VALUE}", val_str); - } - labels << s; - QColor c = colorForIndex(i); - //qfInfo() << c.name(); - colors << c; - i++; - } - } - } - else { - //legend_from_series = true; - Serie serie = seriesMap().value(serie_name); - Axis axis = axisForSerie(serie_name); - QString s = text; - s.replace("${AXIS_LABEL}", axis.label()); - labels << s; - colors << serie.color(); - } - } - } - Rect bounding_rect = _bounding_rect; - /// zmensi o ramecek - bounding_rect.adjust(2, 2, -2, -2); - //qfInfo() << "*** bounding_rect" << bounding_rect.toString(); - //if(bounding_rect.isNull()) bounding_rect = legend.boundingRect(); - QPainter *p = painter(); - p->setFont(styleCache().font("default")); - QFontMetricsF fm(p->font()); - Rect legend_br; - Rect br1 = mm2device(bounding_rect); - //qfInfo() << "\t br1:" << br1.toString(); - int box_h = (int)fm.height() / 2; - br1.adjust(2*box_h, 0, 0, 0); - for(int i=0; idrawText(br1, Qt::AlignLeft, s, &r); - //qfInfo() << "r:" << r.toString(); - if(legend_br.isNull()) legend_br = r; - else legend_br = legend_br.united(r); - /// vytiskni ctverecek - Rect box_r = r; - box_r.translate(-2 * box_h, box_h / 2); - box_r.setWidth(box_h); - box_r.setHeight(box_h); - if(!do_not_draw) { - //qfInfo() << "colors.count():" << colors.count(); - //qfInfo() << "ix:" << ix << colors.value(ix).name(); - //p->fillRect(box_r, colors.value(ix)); - p->setBrush(colors.value(ix)); - p->drawRect(box_r); - } - br1.translate(0, r.height()); - } - legend_br.adjust(-2 * box_h, 0, 0, 0); - //p->drawRect(legend_br); - //br1 = mm2device(bounding_rect); - legend_br = device2mm(legend_br); - /// zvets o ramecek - legend_br.adjust(-2, -2, 2, 2); - /// legendu vycentrujeme vertikalne - //double legend_y_offset = (br1.height() - legend_br.height()) / 2; - //if(legend_y_offset < 0) legend_y_offset = 0; - //legend_br.translate(0, legend_y_offset); - /// a zarovname doleva - //legend_br.translate(legend_br.width() - br1.width(), 0); - { - //qfInfo() << "drawLegend:" << legend_br.toString(); - legend.setBoundingRect(legend_br); - d->legendMap[legend_id] = legend; - } - return legend_id; -} - -QColor Graph::colorForIndex(int ix) -{ - QColor ret; - if(colorNamesPull.isEmpty()) { - colorNamesPull - << "lightskyblue" - << "gold" - << "plum" - << "orange" - << "burlywood" - << "coral" - << "navajowhite" - << "olive" - << "chartreuse" - << "aquamarine" - << "peru" - << "royalblue" - << "silver" - << "red" - << "blue" - << "green" - << "violet"; - } - if(ix < colorNamesPull.count()) { - ret = QColor(colorNamesPull.value(ix)); - } - else { - int h = (ix * 60) % 360; /// na hrubo po 60 stupnich - ix %= 60; - h += (ix * 15) % 60; - ix %= 15; - h += ix; - ret.setHsv(h, 128, 255); - } - return ret; -} - -Graph* Graph::createGraph(const QVariantMap &m_def, const qfu::TreeTable &data) -{ - QString type = m_def.value("type").toString(); - if(type == "histogram") - return new HistogramGraph(m_def, data); - if(type == "pie") - return new PieGraph(m_def, data); - qfWarning() << "Unsupported graph type:" << type; - return NULL; -} - -//====================================================== -// HistogramGraph -//====================================================== -void HistogramGraph::drawSeries() -{ - qfLogFuncFrame() << "boundingRect width:" << boundingRect().width() << "boundingRect height:" << boundingRect().height(); - //return; - QPainter *p = painter(); - p->setPen(styleCache().pen("graphaxis")); - - QVariantList v_series = definition().value("series").toList(); - for(auto v : v_series) { - /// najdi osu X - QVariantMap m_serie_x = v.toMap(); - QString colname_x = m_serie_x.value("colname").toString(); - Axis axis_x = axisForSerie(colname_x); - Serie serie_x = seriesMap().value(colname_x); - if(axis_x.direction() == Axis::DirectionX) { - for(auto v : v_series) { - QVariantMap m_serie_y = v.toMap(); - QString colname_y = m_serie_y.value("colname").toString(); - //qfInfo() << "colname_y:" << colname_y; - Axis axis_y = axisForSerie(colname_y); - Serie serie_y = seriesMap().value(colname_y); - /// najdi osy Y - if(axis_y.direction() == Axis::DirectionY) { - QColor color = serie_y.color(); - //qfInfo() << colname_y << "color:" << color.name(); - for(int i=0; ifillRect(r, QBrush(color)); - p->setBrush(QBrush(color)); - //p->setBrush(QBrush(QColor(255, 0, 0, 127))); - p->setPen(QPen()); - //qfInfo() << "brush color:" << QString::number(p->brush().color().rgba(), 16); - p->drawRect(r); - //break; - } - } - } - break; - } - } -} - -//====================================================== -// PieGraph -//====================================================== -void PieGraph::drawSeries() -{ - qfLogFuncFrame() << "boundingRect width:" << boundingRect().width() << "boundingRect height:" << boundingRect().height(); - //return; - double h3d = definition().value("h3d").toDouble(); - QVariantList v_series = definition().value("series").toList(); - for(auto v : v_series) { - QVariantMap m_serie_x = v.toMap(); - QString colname_x = m_serie_x.value("colname").toString(); - Axis axis_x = axisForSerie(colname_x); - if(axis_x.direction() == Axis::DirectionX) { - Serie serie_x = seriesMap().value(colname_x); - for(auto v : v_series) { - QVariantMap m_serie_y = v.toMap(); - QString colname_y = m_serie_y.value("colname").toString(); - Axis axis_y = axisForSerie(colname_y); - if(axis_y.direction() == Axis::DirectionY) { - Serie serie_y = seriesMap().value(colname_y); - - QPainter *p = painter(); - - /// udelej ctverec - Rect top_gr = gridRect(); - top_gr.adjust(0, 0, 0, -h3d); - Rect h3d_gr = top_gr; - h3d_gr.translate(0, h3d); - //gr.setWidth(qMin(gr.width(), gr.height())); - //gr.setHeight(qMin(gr.width(), gr.height())); - /// vycentruj ho - //gr.translate((gridRect().width()-gr.width()) / 2, (gridRect().height()-gr.height()) / 2); - top_gr = mm2device(top_gr); - h3d_gr = mm2device(h3d_gr); - - double sum = 0; - foreach(QVariant v, serie_y.values()) sum += v.toDouble(); - if(sum > 0) { - painter()->setPen(styleCache().pen("graphaxis")); - if(h3d > 0) { - /// spodni graf - Rect gr = h3d_gr; - qreal start = 0; - double top_main_axis_y = top_gr.top() + top_gr.height() / 2; - Point last_point = top_gr.topLeft() + QPointF(0, top_main_axis_y); - for(int i=0; i 180) { - qreal st = start; - qreal sp = span; - if(start < 180) { - st = 180; - sp -= 180 - start; - } - QPainterPath pp(last_point); - pp.arcTo(gr, st, sp); - last_point = pp.pointAtPercent(1); - pp.lineTo(QPointF(last_point.x(), top_main_axis_y)); - pp.lineTo(QPointF(pp.pointAtPercent(0).x(), top_main_axis_y)); - pp.lineTo(pp.pointAtPercent(0)); - pp.closeSubpath(); - p->setBrush(colorForIndex(ix)); - p->drawPath(pp); - //break; - } - start += span; - } - /// obdelniky - } - { - /// horni graf - Rect gr = top_gr; - qreal start = 0; - for(int i=0; isetBrush(colorForIndex(ix)); - qreal span; - if(i == serie_y.values().count()-1) span = 1 * 360 - start; - else span = (int)y; - if(span == 0) continue; /// nulove vysece nema cenu tisknout, jenom to dela zbytecny chyby pri kresleni - { - QPainterPath pp(gr.center()); - pp.arcTo(gr, start, span); - pp.closeSubpath(); - p->setBrush(colorForIndex(ix)); - p->drawPath(pp); - } - start += span; - } - } - } - } - } - break; - } - } -} - - - - - - - - - - - - diff --git a/libqf/libqfqmlwidgets/src/graphics/attic/graph/graph.h b/libqf/libqfqmlwidgets/src/graphics/attic/graph/graph.h deleted file mode 100644 index 5ddcaf80f..000000000 --- a/libqf/libqfqmlwidgets/src/graphics/attic/graph/graph.h +++ /dev/null @@ -1,270 +0,0 @@ - -// -// Author: Frantisek Vacek , (C) 2014 -// -// Copyright: See COPYING file that comes with this distribution -// - -#ifndef QF_QMLWIDGETS_GRAPHICS_GRAPH_H -#define QF_QMLWIDGETS_GRAPHICS_GRAPH_H - -#include "../../qmlwidgetsglobal.h" -#include "../stylecache.h" -#include "../graphics.h" - -#include -#include - -#include -#include - -#include -//class QPainter; - -namespace qf { -namespace qmlwidgets { -namespace graphics { - -//! TODO: write class documentation. -class QFQMLWIDGETS_DECL_EXPORT Graph -{ - public: - typedef StyleCache::Style TextStyle; - public: - class QFQMLWIDGETS_DECL_EXPORT Axis - { - public: - enum ValuesFrom {TakeValues, TakeOrder}; - enum Direction {DirectionX, DirectionY}; - private: - class SharedDummyHelper {}; - struct Data : public QSharedData { - QString label; - QString labelStyle; - QString labelFormat; - double min, max, tick; - QString serieName; - ValuesFrom valuesFrom; - Direction direction; - Rect boundingRect; - bool hidden; - bool gridLines; - - Data( ): min(HUGE_VAL), max(-HUGE_VAL), tick(0), valuesFrom(TakeValues), direction(DirectionY), hidden(false),gridLines(false) {} - }; - QSharedDataPointer d; - static const Axis& sharedNull(); - Axis(SharedDummyHelper); /// null row constructor - public: - bool isNull() const {return d == sharedNull().d;} - - QString serieName() const {return d->serieName;} - void setSerieName(const QString &nm) {d->serieName = nm;} - QString label() const {return d->label;} - void setLabel(const QString &lbl) {d->label = lbl;} - QString labelStyle() const {return d->labelStyle;} - void setLabelStyle(const QString &lblst) {d->labelStyle = lblst;} - QString labelFormat() const {return d->labelFormat;} - void setLabelFormat(const QString &fmt) {d->labelFormat = fmt;} - double min() const {return d->min;} - void setMin(double dd) {d->min = dd;} - double max() const {return d->max;} - void setMax(double dd) {d->max = dd;} - double tick() const {return d->tick;} - void setTick(double dd) {d->tick = dd;} - Direction direction() const {return d->direction;} - void setDirection(Direction dd) {d->direction = dd;} - ValuesFrom valuesFrom() const {return d->valuesFrom;} - void setValuesFrom(ValuesFrom dd) {d->valuesFrom = dd;} - Rect boundingRect() const {return d->boundingRect;} - void setBoundingRect(const Rect &r) {d->boundingRect = r;} - bool isHidden() const {return d->hidden;} - void setHidden(bool b) {d->hidden = b;} - bool isGridLines() const {return d->gridLines;} - void setGridLines(bool b) {d->gridLines = b;} - - /// vraci mm souradnici value v grafu - qreal value2pos(qreal value, const Rect &grid_rect); - qreal tickSize(const Rect &grid_rect); - - QString formatTickLabel(const QVariant &label_value); - - QString toString() const { - return QString("min: %2, max: %3, tick: %4").arg(min()).arg(max()).arg(tick()); - } - public: - Axis(); - }; - class QFQMLWIDGETS_DECL_EXPORT Legend - { - public: - typedef QList ColorList; - private: - class SharedDummyHelper {}; - struct Data : public QSharedData { - //ColorList colors; - //QStringList labels; - Rect boundingRect; - }; - QSharedDataPointer d; - static const Legend& sharedNull(); - Legend(SharedDummyHelper); /// null row constructor - public: - bool isNull() const {return d == sharedNull().d;} - - //const ColorList colors() const {return d->colors;} - //void setColors(const ColorList &clst) {d->colors = clst;} - //const QStringList labels() const {return d->labels;} - //void setLabels(const QStringList &lbls) {d->labels = lbls;} - Rect boundingRect() const {return d->boundingRect;} - void setBoundingRect(const Rect &r) {d->boundingRect = r;} - public: - Legend(); - }; - class QFQMLWIDGETS_DECL_EXPORT Serie - { - public: - //typedef QList ColorList; - private: - class SharedDummyHelper {}; - struct Data : public QSharedData { - QString columnCaption; - QColor color; - QVariantList values; - QList sortedValuesIndexes; - }; - QSharedDataPointer d; - static const Serie& sharedNull(); - Serie(SharedDummyHelper); /// null row constructor - public: - bool isNull() const {return d == sharedNull().d;} - - const QVariantList& values() const {return d->values;} - QVariantList& valuesRef() {return d->values;} - void setValues(const QVariantList &vals) {d->values = vals;} - const QList& sortedValuesIndexes() const {return d->sortedValuesIndexes;} - void setSortedValuesIndexes(const QList &ixs) {d->sortedValuesIndexes = ixs;} - QColor color() const {return d->color;} - void setColor(const QColor &c) {d->color = c;} - - QString columnCaption() const {return d->columnCaption;} - void setColumnCaption(const QString &s) {d->columnCaption = s;} - - bool isSorted() const {return !sortedValuesIndexes().isEmpty();} - public: - Serie(); - }; - protected: - typedef QMap SeriesMap; - typedef QMap AxesMap; - typedef QMap LegendMap; - struct Data - { - qf::core::utils::TreeTable data; - QVariantMap definition; - QPainter *painter; - Rect boundingRect;/// obdelnik celeho grafu vcetne os [mm] - Rect gridRect; /// obdelnik grafu bez os (pouce to, kam se vykresluji data) [mm] - qf::qmlwidgets::graphics::StyleCache styleCache; - SeriesMap seriesMap; - AxesMap axesMap; - LegendMap legendMap; - - Data() { - painter = NULL; - } - }; - Data _d; - Data *d; - protected: - QPainter* painter() { - if(!d->painter) QF_EXCEPTION("painter is NULL"); - return d->painter; - } - const Rect& boundingRect() const {return d->boundingRect;} - const Rect& gridRect() const {return d->gridRect;} - - AxesMap& axesMapRef() {return d->axesMap;} - const AxesMap& axesMap() const {return d->axesMap;} - Axis axisForSerie(const QString &colname); - - const LegendMap& legendMap() const {return d->legendMap;} - const SeriesMap& seriesMap() const {return d->seriesMap;} - - qreal x2device(qreal x) {return qf::qmlwidgets::graphics::x2device(x, painter()->device());} - qreal y2device(qreal y) {return qf::qmlwidgets::graphics::y2device(y, painter()->device());} - qreal device2x(qreal x) {return qf::qmlwidgets::graphics::device2x(x, painter()->device());} - qreal device2y(qreal y) {return qf::qmlwidgets::graphics::device2y(y, painter()->device());} - Point mm2device(const Point &p) {return qf::qmlwidgets::graphics::mm2device(p, painter()->device());} - Rect mm2device(const Rect &r) {return qf::qmlwidgets::graphics::mm2device(r, painter()->device());} - Point device2mm(const Point &p) {return qf::qmlwidgets::graphics::device2mm(p, painter()->device());} - Rect device2mm(const Rect &r) {return qf::qmlwidgets::graphics::device2mm(r, painter()->device());} - - QString title() const; - - virtual void createSeries(); - virtual void createAxes(); - - virtual void drawAxis(const QString &colname, const Rect &_bounding_rect, bool do_not_draw = false); - /// vraci legend id - virtual QString drawLegend(const QVariantMap &m_legend, const Rect &_bounding_rect = Rect(), bool do_not_draw = false); - // vraci legend id - //virtual QString createLegend(const QDomElement &el_legend); - - virtual void drawTitle(); - virtual Rect drawLegends(bool do_not_draw); - virtual void drawAxes(); - virtual void drawSeries() {} - virtual void drawBox(); - virtual void drawGrid(); - - static QStringList colorNamesPull; - static QColor colorForIndex(int ix); - public: - void setDefinition(const QVariantMap &def) {d->definition = def;} - const QVariantMap& definition() const {return d->definition;} - void setData(const qf::core::utils::TreeTable _data) {d->data = _data;} - const qf::core::utils::TreeTable& data() const {return d->data;} - - void setStyleCache(const qf::qmlwidgets::graphics::StyleCache &cache) {d->styleCache = cache;} - qf::qmlwidgets::graphics::StyleCache& styleCacheRef() {return d->styleCache;} - const qf::qmlwidgets::graphics::StyleCache& styleCache() const {return d->styleCache;} - - virtual void draw(QPainter *painter, const QSizeF &size); - public: - static Graph* createGraph(const QVariantMap &m_def, const qf::core::utils::TreeTable &data = qf::core::utils::TreeTable()); - public: - Graph(); - Graph(const QVariantMap &def, const qf::core::utils::TreeTable &data = qf::core::utils::TreeTable()); - virtual ~Graph(); -}; - -class QFQMLWIDGETS_DECL_EXPORT HistogramGraph : public Graph -{ -private: - typedef Graph Super; - protected: - virtual void drawSeries(); - public: - HistogramGraph() : Graph() {} - HistogramGraph(const QVariantMap &def, const qf::core::utils::TreeTable &data = qf::core::utils::TreeTable()) - : Super(def, data) {} -}; - -class QFQMLWIDGETS_DECL_EXPORT PieGraph : public Graph -{ -private: - typedef Graph Super; -protected: - virtual void drawBox() {} - virtual void drawSeries(); - public: - PieGraph() : Graph() {} - PieGraph(const QVariantMap &def, const qf::core::utils::TreeTable &data = qf::core::utils::TreeTable()) - : Super(def, data) {} -}; - -}}} - -#endif // QF_QMLWIDGETS_GRAPHICS_GRAPH_H - diff --git a/libqf/libqfqmlwidgets/src/graphics/attic/stylecache.cpp b/libqf/libqfqmlwidgets/src/graphics/attic/stylecache.cpp deleted file mode 100644 index a5dd552b5..000000000 --- a/libqf/libqfqmlwidgets/src/graphics/attic/stylecache.cpp +++ /dev/null @@ -1,514 +0,0 @@ -#include "stylecache.h" - -#include -#include - - -namespace qfc = qf::core; -using namespace qf::qmlwidgets::graphics; - -const QString StyleCache::basedOnString = "basedon"; -const QString StyleCache::defaultString = "default"; - -StyleCache::StyleCache() -{ - d = new Data(); - //qfWarning() << "new CACHE" << d.constData(); - //qfError() << QFLog::stackTrace(); -} - -StyleCache::~StyleCache() -{ -} - -StyleCache::StringMap StyleCache::splitStyleDefinition(const QString &_def) -{ - StringMap ret; - qfc::String def = _def.trimmed(); - QStringList sl = def.splitBracketed(';', '{', '}', '\'', qfc::String::TrimParts, QString::SkipEmptyParts); - foreach(qfc::String s, sl) { - int ix = s.indexOf(':'); - if(ix > 0) { - qfc::String val = s.slice(ix+1).trimmed(); - if(val[0] == '{' && val[-1] == '}') { - val = val.slice(1, -1); - val = val.trimmed(); - } - ret[s.slice(0, ix)] = val; - } - else { - /// 'jmeno" bez ':' znamena "basedon: jmeno" - ret[basedOnString] = s; - } - } - return ret; -} - -QColor StyleCache::color(const QString &_s) const -{ - qfc::String s1 = _s.trimmed(); - if(s1.isEmpty()) - s1 = defaultString; - if(cachedColors().contains(s1)) { - return cachedColors().value(s1); - } - - QColor c;// = colors().value(s); - qfc::String def_s = definedColors().value(s1, s1); - if(def_s == defaultString) { - /// neexistuje defaultni definice, takze default bude defaultni cerna - c = Qt::black; - } - else { - if(def_s.startsWith("RGB(", Qt::CaseInsensitive)) { - QStringList sl = def_s.slice(4, -1).split(','); - QRgb rgb = 0xFF; - foreach(QString s, sl) { - rgb <<= 8; - rgb += s.toInt() & 0xFF; - //qfDebug() << "%%%%%%%%%%:" << s << (s.toInt() & 0xFF) << "#" << QString::number(rgb, 16); - } - c = QColor(rgb); - //qfDebug() << "COLOR RGB:" << _s << c.name(); - } - else if(def_s.startsWith("ARGB(", Qt::CaseInsensitive)) { - QStringList sl = def_s.slice(5, -1).split(','); - c = QColor(sl.value(1).toInt(), sl.value(2).toInt(), sl.value(3).toInt(), sl.value(0).toInt()); - //qfDebug() << "COLOR RGB:" << _s << c.name(); - } - else c = QColor(def_s); - } - const_cast(this)->cachedColorsRef()[s1] = c; - return c; -} - -QPen StyleCache::pen(const QString &_s) const -{ - static QVector dash_pattern; - if(dash_pattern.isEmpty()) dash_pattern << 8 << 5; - qfc::String s1 = _s.trimmed(); - //qfDebug() << QF_FUNC_NAME << "def:" << s1; - if(s1.isEmpty()) - s1 = defaultString; - if(cachedPens().contains(s1)) { - //qfDebug() << "\tCACHED"; - return cachedPens().value(s1); - } - /// neni v cache, najdi definici - qfc::String def_s = definedPens().value(s1, s1); /// bud je to nazev definovaneho pera nebo vlastni definice - QPen p; - if(def_s == defaultString) { - /// neexistuje defaultni definice, takze default bude defaultni pero - } - else { - StringMap map = splitStyleDefinition(def_s); - qfc::String based_on = map.take(basedOnString); - if(!based_on.isEmpty() && based_on != s1) - p = pen(based_on); - bool width_set = false; - QMapIterator i(map); - while (i.hasNext()) { - i.next(); - QString key = i.key().trimmed(); - qfc::String val = i.value().trimmed(); - if(!val.isEmpty()) { - if(key == "style") { - if(val == "solid") p.setStyle(Qt::SolidLine); - else if(val == "dash") p.setDashPattern(dash_pattern);///p.setStyle(Qt::DashLine); prekreslovani Qt::DashLine trva dlouho pri zvetseni - else if(val == "dot") p.setStyle(Qt::DotLine); - else if(val == "dashdot") p.setStyle(Qt::DashDotLine); - else if(val == "dashdotdot") p.setStyle(Qt::DashDotDotLine); - else { - QVector patt; - QStringList sl = val.splitAndTrim(','); - foreach(QString s, sl) patt << s.toDouble(); - //foreach(double d, patt) qfInfo() << d; - p.setDashPattern(patt); - } - } - else if(key == "cap") { - if(val == "square") p.setCapStyle(Qt::SquareCap); - else if(val == "flat") p.setCapStyle(Qt::FlatCap); - else if(val == "round") p.setCapStyle(Qt::RoundCap); - } - else if(key == "join") { - if(val == "bevel") p.setJoinStyle(Qt::BevelJoin); - else if(val == "miter") p.setJoinStyle(Qt::MiterJoin); - else if(val == "round") p.setJoinStyle(Qt::RoundJoin); - } - else if(key == "size") { - qreal d = val.toDouble(); - // budeme vychazet, ze QT to maji v milimetrech a my v pt - //d = d * 25.4 / 72; - width_set = true; - if(d > 0) p.setWidthF(d); - } - else if(key == "color") { - QColor c = color(val); - if(c.isValid()) p.setColor(c); - } - else qfWarning() << "invalid pen definition attribute:" << key; - } - } - if(!width_set && p.widthF() == 0) p.setWidthF(1); - } - qfDebug() << "\treturn width:" << p.widthF() << "color:" << p.color().name() << "style:" << p.style(); - const_cast(this)->cachedPensRef()[s1] = p; - return p; -} - -QBrush StyleCache::brush(const QString &_s) const -{ - qfc::String s1 = _s.trimmed(); - qfDebug() << QF_FUNC_NAME << "def:" << s1; - if(s1.isEmpty()) - s1 = defaultString; - if(cachedBrushes().contains(s1)) { - //qfDebug() << "\tCACHED"; - return cachedBrushes().value(s1); - } - - /// neni v cache, najdi definici - qfc::String def_s = definedBrushes().value(s1, s1); /// bud je to nazev definovaneho pera nebo vlastni definice - QBrush b; - if(def_s == defaultString) { - /// neexistuje defaultni definice, takze default bude defaultni brush - } - else { - StringMap map = splitStyleDefinition(def_s); - qfc::String based_on = map.take(basedOnString); - if(!based_on.isEmpty() && based_on != s1) - b = brush(based_on); - if(!map.isEmpty()) { - b.setStyle(Qt::SolidPattern); - QMapIterator i(map); - while (i.hasNext()) { - i.next(); - QString key = i.key().trimmed(); - qfc::String val = i.value().trimmed(); - if(!val.isEmpty()) { - if(key == "style") { - if(val == "solid") b.setStyle(Qt::SolidPattern); - else if(val == "vertical") b.setStyle(Qt::VerPattern); - else if(val == "horizontal") b.setStyle(Qt::HorPattern); - else if(val == "diagonal") b.setStyle(Qt::BDiagPattern); - else if(val == "revdiagonal") b.setStyle(Qt::FDiagPattern); - else if(val == "cross") b.setStyle(Qt::CrossPattern); - else if(val == "diagonalcross") b.setStyle(Qt::DiagCrossPattern); - } - else if(key == "color") { - QColor c = color(val); - if(c.isValid()) b.setColor(c); - } - else { - qfWarning() << "!invalid brush definition attribute:" << key; - b = QBrush(); - } - } - } - } - } - qfDebug() << "\treturn brush color:" << b.color().name(); - const_cast(this)->cachedBrushesRef()[s1] = b; - return b; -} - -QFont StyleCache::font(const QString &_s) const -{ -// qfDebug() << QF_FUNC_NAME << _s; - qfc::String s1 = _s.trimmed(); - if(s1.isEmpty()) - s1 = defaultString; - - if(cachedFonts().contains(s1)) { - QFont f = cachedFonts().value(s1); - //qfDebug() << "\tCACHED" << s << ":" << f.toString(); - return f; - } - - //qfDebug().color(QFLog::Yellow).noSpace() << QF_FUNC_NAME << " '" << s1 << "'"; - /// neni v cache, najdi definici - qfc::String def_s = definedFonts().value(s1, s1); /// bud je to nazev definovaneho pera nebo vlastni definice - QFont f; - if(def_s == defaultString) { - /// neexistuje defaultni definice, takze default bude defaultni font - } - else { - StringMap map = splitStyleDefinition(def_s); - qfc::String based_on = map.take(basedOnString); - if(!based_on.isEmpty() && based_on != s1) { - qfDebug() << "\t based_on:" << based_on; - f = font(based_on); - } - else { - if(!map.contains("family")) map["family"] = "Nimbus Sans L"; - if(!map.contains("size")) map["size"] = QString::number(9); - } - QMapIterator i(map); - while (i.hasNext()) { - i.next(); - QString key = i.key().trimmed(); - qfc::String val = i.value().trimmed(); - qfDebug() << "\t key:" << key << "val:" << val; - if(!val.isEmpty()) { - if(key == "family") { - qfDebug() << "\tset family:" << val; - f.setFamily(val); - } - else if(key == "familyhint") { /// nefunguje v X11 - if(val == "sansserif") f.setStyleHint(QFont::SansSerif); - else if(val == "serif") f.setStyleHint(QFont::Serif); - else if(val == "typewriter") f.setStyleHint(QFont::TypeWriter); - f.setFamily("neexistujici-family"); - } - else if(key == "weight") { - if(val == "light") f.setWeight(QFont::Light); - else if(val == "normal") f.setWeight(QFont::Normal); - else if(val == "demibold") f.setWeight(QFont::DemiBold); - else if(val == "bold") f.setWeight(QFont::Bold); - else if(val == "black") f.setWeight(QFont::Black); - } - else if(key == "style") { - if(val == "normal") f.setStyle(QFont::StyleNormal); - else if(val == "italic") f.setStyle(QFont::StyleItalic); - else if(val == "oblique") f.setStyle(QFont::StyleOblique); - } - else if(key == "size") { - bool incr = (val[0] == '+' || val[0] == '-'); - //if(incr) val = val.slice(1); - qreal d = val.toDouble(); - qreal sz = 0; - //static const double correction = 1;//0.5 * 32. / 60. * 1.2; - if(incr) { - //qfWarning() << "val:" << val << "d:" << d; - sz = f.pointSizeF(); - //qfWarning() << "old size:" << sz; - sz += d;// * correction; - //qfWarning() << "new size:" << sz; - } - else { - sz = d;// * correction; - } - if(sz > 0) { - f.setPointSizeF(sz); - qfDebug() << "\tset size:" << sz; - } - } - else qfWarning() << "invalid font definition attribute:" << key; - } - } - } - //qfInfo() << "\treturn:" << s1 << "->" << f.toString(); - const_cast(this)->cachedFontsRef()[s1] = f; - return f; -} - -StyleCache::Style StyleCache::style(const QString &_s) const -{ - //if(_s == "reportheading") qfDebug().noSpace().color(QFLog::Green) << QF_FUNC_NAME << " '" << _s << "'"; - qfc::String s1 = _s.trimmed(); - if(s1.isEmpty()) - s1 = defaultString; - Style sty; - if(cachedStyles().contains(s1)) { - sty = cachedStyles().value(s1); - //qfInfo() << "CACHED:" << _s << ":" << sty.toString() << d.constData(); - return sty; - } -/* - if(false) { - QMapIterator i(map); - while (i.hasNext()) { - i.next(); - QString key = i.key().trimmed(); - qfc::String val = i.value().trimmed(); - qfDebug() << "\t [" << key << "] =" << val; - } - } -*/ - /// neni v cache, najdi definici - qfc::String def_s = definedStyles().value(s1, s1); /// bud je to nazev definovaneho pera nebo vlastni definice - //qfInfo() << "NOT CACHED:" << def_s; - if(def_s == defaultString) { - /// neexistuje defaultni definice, takze default bude defaultni styl - sty.font = font(defaultString); - sty.pen = pen(defaultString); - sty.brush = brush(defaultString); - } - else { - StringMap map = splitStyleDefinition(def_s); - qfc::String based_on = map.take(basedOnString); - if(!based_on.isEmpty() && based_on != s1) { - sty = style(based_on); - qfDebug() << "\tbase style:" << based_on << sty.toString(); - QMapIterator i(map); - while (i.hasNext()) { - i.next(); - QString key = i.key().trimmed(); - qfc::String val = i.value().trimmed(); - if(!val.isEmpty()) { - if(key == "pen") { sty.pen = pen(val); } - else if(key == "brush") { sty.brush = brush(val); } - else if(key == "font") { sty.font = font(val); } - else qfWarning() << "invalid style definition attribute:" << key; - } - } - } - else { - sty.font = font(map.value("font")); - sty.pen = pen(map.value("pen")); - sty.brush = brush(map.value("brush")); - } - } - //qfInfo() << "\treturn:" << d.constData() << sty.toString(); - const_cast(this)->cachedStylesRef()[s1] = sty; - return sty; -} - -QString StyleCache::toString() const -{ - QString ret; - QTextStream ts(&ret); - ts << "\tdefined colors:" << endl; - foreach(QString s, definedColors().keys()) { - ts << "\t\t[" << s << "]" << definedColors()[s] << endl; - } - ts << "\tdefined pens:" << endl; - foreach(QString s, definedPens().keys()) { - ts << "\t\t[" << s << "]" << definedPens()[s] << endl; - } - ts << "\tdefined brushes:" << endl; - foreach(QString s, definedBrushes().keys()) { - ts << "\t\t[" << s << "]" << definedBrushes()[s] << endl; - } - ts << "\tdefined fonts:" << endl; - foreach(QString s, definedFonts().keys()) { - ts<< "\t\t[" << s << "]" << definedFonts()[s] << endl; - } - ts << "\tdefined styles:" << endl; - foreach(QString s, definedStyles().keys()) { - ts << "\t\t[" << s << "]" << definedStyles()[s] << endl; - } - - ts << "cached colors:" << endl; - foreach(QString s, cachedColors().keys()) { - ts << "\t\t[" << s << "]" << cachedColors()[s].name() << endl; - } - ts << "cached pens:" << endl; - foreach(QString s, cachedPens().keys()) { - ts << "\t\t[" << s << "]" << cachedPens()[s].color().name() << endl; - } - ts << "cached brushes:" << endl; - foreach(QString s, cachedBrushes().keys()) { - ts << "\t\t[" << s << "]" << cachedBrushes()[s].color().name() << endl; - } - ts << "cached fonts:" << endl; - foreach(QString s, cachedFonts().keys()) { - ts<< "\t\t[" << s << "]" << cachedFonts()[s].toString() << endl; - } - ts << "cached styles:" << endl; - foreach(QString s, cachedStyles().keys()) { - ts << "\t\t[" << s << "]" << cachedStyles()[s].toString() << endl; - } - return ret; -} -/*-- -static QString attrs2def(const QDomElement &el) -{ - QString def; - QDomNamedNodeMap attrs = el.attributes(); - for(int i=0; i" << def; - if(definedFontsRef().isEmpty() && key != "default") definedFontsRef()["default"] = def; - definedFontsRef()[key] = def; - } - } - - /// Styles - for(el1=el_stylesheet.firstChildElement("styles"); !!el1; el1=el1.nextSiblingElement("styles")) { - //qfDebug().color(QFLog::Yellow) << "\tSTYLES"; - for(el=el1.firstChildElement("style"); !!el; el=el.nextSiblingElement("style")) { - QString key = el.attribute("name"); - if(key.isEmpty()) { qfWarning() << "empty style name"; continue; } - QString def = attrs2def(el); - //qfInfo() << d.constData() << key << "=" << def; - //Style s = style(def); - if(definedStylesRef().isEmpty() && key != "default") definedStylesRef()["default"] = def; - //qfInfo() << key << "->" << def; - definedStylesRef()[key] = def; - } - } -} - -void StyleCache::readStyleSheet(style::Sheet *stylesheet) -{ - qfLogFuncFrame() << stylesheet; - qfError() << "NIY"; -} ---*/ - - diff --git a/libqf/libqfqmlwidgets/src/graphics/attic/stylecache.h b/libqf/libqfqmlwidgets/src/graphics/attic/stylecache.h deleted file mode 100644 index 01d61c976..000000000 --- a/libqf/libqfqmlwidgets/src/graphics/attic/stylecache.h +++ /dev/null @@ -1,111 +0,0 @@ -#ifndef QF_QMLWIDGETS_REPORTS_STYLECACHE_H -#define QF_QMLWIDGETS_REPORTS_STYLECACHE_H - -#include "../qmlwidgetsglobal.h" - -#include -#include -#include -#include -#include - -namespace qf { -namespace qmlwidgets { -namespace graphics { - -//! TODO: write class documentation. -class StyleCache -{ - protected: - static const QString basedOnString; - static const QString defaultString; - public: - typedef QMap StringMap; - typedef QMap PenMap; - typedef QMap BrushMap; - typedef QMap FontMap; - struct Style { - QPen pen; QBrush brush; QFont font; - - QString toString() const - { - QString ret; - ret += "font: " + font.toString(); - ret += " pen: " + pen.color().name(); - ret += " brush: " + brush.color().name(); - return ret; - } - }; - typedef QMap StyleMap; - typedef QMap ColorMap; - private: - struct StyleSheetDefinition - { - StringMap colors; - StringMap pens; - StringMap brushes; - StringMap fonts; - StringMap styles; - }; - struct StyleSheetCache - { - ColorMap colors; - PenMap pens; - BrushMap brushes; - FontMap fonts; - StyleMap styles; - }; - struct Data : public QSharedData - { - StyleSheetDefinition defined; - StyleSheetCache cached; - }; - QExplicitlySharedDataPointer d; - protected: - static StringMap splitStyleDefinition(const QString &def); - - const StringMap& definedColors() const {return d->defined.colors;} - const StringMap& definedPens() const {return d->defined.pens;} - const StringMap& definedBrushes() const {return d->defined.brushes;} - const StringMap& definedFonts() const {return d->defined.fonts;} - const StringMap& definedStyles() const {return d->defined.styles;} - - const ColorMap& cachedColors() const {return d->cached.colors;} - const PenMap& cachedPens() const {return d->cached.pens;} - const BrushMap& cachedBrushes() const {return d->cached.brushes;} - const FontMap& cachedFonts() const {return d->cached.fonts;} - const StyleMap& cachedStyles() const {return d->cached.styles;} - - StringMap& definedColorsRef() {return d->defined.colors;} - StringMap& definedPensRef() {return d->defined.pens;} - StringMap& definedBrushesRef() {return d->defined.brushes;} - StringMap& definedFontsRef() {return d->defined.fonts;} - StringMap& definedStylesRef() {return d->defined.styles;} - - ColorMap& cachedColorsRef() {return d->cached.colors;} - PenMap& cachedPensRef() {return d->cached.pens;} - BrushMap& cachedBrushesRef() {return d->cached.brushes;} - FontMap& cachedFontsRef() {return d->cached.fonts;} - StyleMap& cachedStylesRef() {return d->cached.styles;} - public: - QColor color(const QString &_s) const; - QPen pen(const QString &_s) const; - QBrush brush(const QString &_s) const; - QFont font(const QString &_s) const; - Style style(const QString &_s) const; - - //void readStyleSheet(const QDomElement &el_stylesheet); - //void readStyleSheet(style::Sheet *stylesheet); - /// predefinovanim neceho a zmazani cache zpusobi, ze nove NECO se projevi ve vsech odvozenych definicich - void clearCache() {d->cached = StyleSheetCache();} - - QString toString() const; - public: - StyleCache(); - virtual ~StyleCache(); -}; - -}}} - -#endif - diff --git a/libqf/libqfqmlwidgets/src/menu.cpp b/libqf/libqfqmlwidgets/src/menu.cpp deleted file mode 100644 index a2346cc01..000000000 --- a/libqf/libqfqmlwidgets/src/menu.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include "menu.h" - -#include - -using namespace qf::qmlwidgets; - -Menu::Menu(QWidget *parent) : - Super(parent) -{ -} - diff --git a/libqf/libqfqmlwidgets/src/menu.h b/libqf/libqfqmlwidgets/src/menu.h deleted file mode 100644 index df3c88822..000000000 --- a/libqf/libqfqmlwidgets/src/menu.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef QF_QMLWIDGETS_MENU_H -#define QF_QMLWIDGETS_MENU_H - -not used for now - -#include "qmlwidgetsglobal.h" - -#include - -namespace qf { -namespace qmlwidgets { - -class QFQMLWIDGETS_DECL_EXPORT Menu : public QMenu -{ - Q_OBJECT -private: - typedef QMenu Super; -public: - explicit Menu(QWidget *parent = 0); -public: -}; - -}} - -#endif // MENU_H diff --git a/libqf/libqfqmlwidgets/src/menubar.h b/libqf/libqfqmlwidgets/src/menubar.h deleted file mode 100644 index d383c0214..000000000 --- a/libqf/libqfqmlwidgets/src/menubar.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef QF_QMLWIDGETS_MENUBAR_H -#define QF_QMLWIDGETS_MENUBAR_H - -#include "qmlwidgetsglobal.h" - -#include - -namespace qf { -namespace qmlwidgets { - -class Action; - -class QFQMLWIDGETS_DECL_EXPORT MenuBar : public QMenuBar -{ - Q_OBJECT -private: - typedef QMenuBar Super; -public: - explicit MenuBar(QWidget *parent = nullptr); -public: - Q_INVOKABLE qf::qmlwidgets::Action* actionForPath(const QString &path, bool create_if_not_exists = true); -}; - -}} - -#endif // QF_QMLWIDGETS_MENUBAR_H diff --git a/libqf/libqfqmlwidgets/src/progressbar.h b/libqf/libqfqmlwidgets/src/progressbar.h deleted file mode 100644 index e1aa1a055..000000000 --- a/libqf/libqfqmlwidgets/src/progressbar.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef QF_QMLWIDGETS_PROGRESSBAR_H -#define QF_QMLWIDGETS_PROGRESSBAR_H - -#include "qmlwidgetsglobal.h" - -#include - -namespace qf { -namespace qmlwidgets { - -class QFQMLWIDGETS_DECL_EXPORT ProgressBar : public QProgressBar -{ - Q_OBJECT -private: - typedef QProgressBar Super; -public: - explicit ProgressBar(QWidget *parent = nullptr); -}; - -}} - -#endif // PROGRESSBAR_H diff --git a/libqf/libqfqmlwidgets/src/qmlwidgetsglobal.h b/libqf/libqfqmlwidgets/src/qmlwidgetsglobal.h deleted file mode 100644 index 412464097..000000000 --- a/libqf/libqfqmlwidgets/src/qmlwidgetsglobal.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef QFQMLWIDGETSGLOBAL_H -#define QFQMLWIDGETSGLOBAL_H - -#include - -#if defined(QFQMLWIDGETS_BUILD_DLL) -//#warning "EXPORT" -# define QFQMLWIDGETS_DECL_EXPORT Q_DECL_EXPORT -#else -//#warning "IMPORT" -# define QFQMLWIDGETS_DECL_EXPORT Q_DECL_IMPORT -#endif - -#endif // QFQMLWIDGETSGLOBAL_H diff --git a/libqf/libqfqmlwidgets/src/toolbar.h b/libqf/libqfqmlwidgets/src/toolbar.h deleted file mode 100644 index 3e8264d78..000000000 --- a/libqf/libqfqmlwidgets/src/toolbar.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef QF_QMLWIDGETS_TOOLBAR_H -#define QF_QMLWIDGETS_TOOLBAR_H - -#include "qmlwidgetsglobal.h" - -#include - -namespace qf { -namespace qmlwidgets { - -//class Action; - -class QFQMLWIDGETS_DECL_EXPORT ToolBar : public QToolBar -{ - Q_OBJECT -private: - typedef QToolBar Super; -public: - ToolBar(QWidget *parent = nullptr); - ~ToolBar() Q_DECL_OVERRIDE; -}; - -}} - -#endif // QF_QMLWIDGETS_TOOLBAR_H - diff --git a/libqf/plugins/qf/core/CMakeLists.txt b/libqf/plugins/qf/core/CMakeLists.txt index de6d0546c..efc38b8e4 100644 --- a/libqf/plugins/qf/core/CMakeLists.txt +++ b/libqf/plugins/qf/core/CMakeLists.txt @@ -37,7 +37,7 @@ target_link_libraries(qfcoreplugin PUBLIC Qt::Core # Qt::Gui Qt::Qml - libqfqmlwidgets + libqfgui ) set(PLUGIN_DEST_DIR ${CMAKE_INSTALL_BINDIR}/qml/qf/core) diff --git a/libqf/plugins/qf/core/src/model/sqldatadocument.cpp b/libqf/plugins/qf/core/src/model/sqldatadocument.cpp index 46957a627..062f7cd96 100644 --- a/libqf/plugins/qf/core/src/model/sqldatadocument.cpp +++ b/libqf/plugins/qf/core/src/model/sqldatadocument.cpp @@ -2,11 +2,11 @@ #include "../sql/sqlquerybuilder.h" -#include +#include #include -namespace qfm = qf::qmlwidgets::model; +namespace qfm = qf::gui::model; using namespace qf::core::qml; SqlDataDocument::SqlDataDocument(QObject *parent) diff --git a/libqf/plugins/qf/core/src/model/sqldatadocument.h b/libqf/plugins/qf/core/src/model/sqldatadocument.h index 1b5f713b0..6af708763 100644 --- a/libqf/plugins/qf/core/src/model/sqldatadocument.h +++ b/libqf/plugins/qf/core/src/model/sqldatadocument.h @@ -3,7 +3,7 @@ #include "../sql/sqlquerybuilder.h" -#include +#include namespace qf { namespace core { @@ -11,12 +11,12 @@ namespace qml { //class SqlQueryBuilder; -class SqlDataDocument : public qf::qmlwidgets::model::SqlDataDocument +class SqlDataDocument : public qf::gui::model::SqlDataDocument { Q_OBJECT Q_PROPERTY(qf::core::qml::SqlQueryBuilder* queryBuilder READ qmlSqlQueryBuilder) private: - typedef qf::qmlwidgets::model::SqlDataDocument Super; + typedef qf::gui::model::SqlDataDocument Super; public: SqlDataDocument(QObject *parent = nullptr); ~SqlDataDocument() Q_DECL_OVERRIDE; diff --git a/libqf/plugins/qf/core/src/model/sqltablemodel.h b/libqf/plugins/qf/core/src/model/sqltablemodel.h index e2bbe3363..cc399527a 100644 --- a/libqf/plugins/qf/core/src/model/sqltablemodel.h +++ b/libqf/plugins/qf/core/src/model/sqltablemodel.h @@ -3,7 +3,7 @@ #include "tablemodelcolumn.h" -#include +#include #include @@ -14,14 +14,14 @@ namespace qml { class SqlQueryBuilder; class TableModelColumn; -class SqlTableModel : public qf::qmlwidgets::model::SqlTableModel +class SqlTableModel : public qf::gui::model::SqlTableModel { Q_OBJECT Q_PROPERTY(qf::core::qml::SqlQueryBuilder* queryBuilder READ sqlQueryBuilder /*NOTIFY queryBuilderChanged*/) Q_PROPERTY(QQmlListProperty columns READ columns /*NOTIFY columnsChanged*/) Q_CLASSINFO("DefaultProperty", "columns") private: - typedef qf::qmlwidgets::model::SqlTableModel Super; + typedef qf::gui::model::SqlTableModel Super; public: explicit SqlTableModel(QObject *parent = nullptr); ~SqlTableModel() Q_DECL_OVERRIDE; diff --git a/libqf/plugins/qf/core/src/model/tablemodelcolumn.cpp b/libqf/plugins/qf/core/src/model/tablemodelcolumn.cpp index d2539ea47..7939310cf 100644 --- a/libqf/plugins/qf/core/src/model/tablemodelcolumn.cpp +++ b/libqf/plugins/qf/core/src/model/tablemodelcolumn.cpp @@ -38,7 +38,7 @@ void TableModelColumn::setReadOnly(bool arg) void TableModelColumn::setCastType(int arg) { - //qf::qmlwidgets::model::TableModel *m = qobject_cast(parent()); + //qf::gui::model::TableModel *m = qobject_cast(parent()); //qfWarning() << arg << m; m_columnDefinition.setCastType(arg); if(m_columnIndex >= 0) diff --git a/libqf/plugins/qf/core/src/model/tablemodelcolumn.h b/libqf/plugins/qf/core/src/model/tablemodelcolumn.h index 512275802..47e0ac3aa 100644 --- a/libqf/plugins/qf/core/src/model/tablemodelcolumn.h +++ b/libqf/plugins/qf/core/src/model/tablemodelcolumn.h @@ -1,7 +1,7 @@ #ifndef TABLEMODELCOLUMN_H #define TABLEMODELCOLUMN_H -#include +#include #include @@ -20,7 +20,7 @@ class TableModelColumn : public QObject explicit TableModelColumn(QObject *parent = nullptr); ~TableModelColumn() Q_DECL_OVERRIDE; - const qf::qmlwidgets::model::TableModel::ColumnDefinition& columnDefinition() {return m_columnDefinition; } + const qf::gui::model::TableModel::ColumnDefinition& columnDefinition() {return m_columnDefinition; } QString fieldName() const { return m_columnDefinition.fieldName(); } void setFieldName(QString arg); @@ -38,7 +38,7 @@ class TableModelColumn : public QObject signals: void updated(int column_index); private: - qf::qmlwidgets::model::TableModel::ColumnDefinition m_columnDefinition; + qf::gui::model::TableModel::ColumnDefinition m_columnDefinition; int m_columnIndex = -1; }; diff --git a/libqf/plugins/qf/core/src/qfcore_plugin.cpp b/libqf/plugins/qf/core/src/qfcore_plugin.cpp index cafd7cbee..a8fafb0d1 100644 --- a/libqf/plugins/qf/core/src/qfcore_plugin.cpp +++ b/libqf/plugins/qf/core/src/qfcore_plugin.cpp @@ -18,8 +18,8 @@ //#include //#include -//#include -//#include +//#include +//#include //#include @@ -44,10 +44,10 @@ void QFCorePlugin::registerTypes(const char *uri) qmlRegisterType(uri, 1, 0, "SqlRecord"); qmlRegisterType(uri, 1, 0, "SqlQueryBuilder"); qmlRegisterType(uri, 1, 0, "SqlTableModel"); - qmlRegisterType(uri, 1, 0, "TableModel"); + qmlRegisterType(uri, 1, 0, "TableModel"); qmlRegisterType(uri, 1, 0, "ModelColumn"); - qmlRegisterType(uri, 1, 0, "DataDocument"); + qmlRegisterType(uri, 1, 0, "DataDocument"); qmlRegisterType(uri, 1, 0, "SqlDataDocument"); qmlRegisterType(uri, 1, 0, "Settings"); diff --git a/libqf/plugins/qf/qmlreports/CMakeLists.txt b/libqf/plugins/qf/qmlreports/CMakeLists.txt index e59227ceb..d4d600e32 100644 --- a/libqf/plugins/qf/qmlreports/CMakeLists.txt +++ b/libqf/plugins/qf/qmlreports/CMakeLists.txt @@ -21,7 +21,7 @@ target_link_libraries(qfqmlreportsplugin PUBLIC Qt::Core Qt::Gui Qt::Qml - libqfqmlwidgets + libqfgui ) set(PLUGIN_DEST_DIR ${CMAKE_INSTALL_BINDIR}/qml/qf/qmlreports) diff --git a/libqf/plugins/qf/qmlreports/src/qfqmlreports_plugin.cpp b/libqf/plugins/qf/qmlreports/src/qfqmlreports_plugin.cpp index 262639285..af28a056a 100644 --- a/libqf/plugins/qf/qmlreports/src/qfqmlreports_plugin.cpp +++ b/libqf/plugins/qf/qmlreports/src/qfqmlreports_plugin.cpp @@ -1,16 +1,16 @@ #include "qfqmlreports_plugin.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include @@ -20,22 +20,22 @@ void QFQmlReportPlugin::registerTypes(const char *uri) { Q_ASSERT(uri == QLatin1String("qf.qmlreports")); - qmlRegisterType(uri, 1, 0, "Item"); - qmlRegisterType(uri, 1, 0, "Report"); - qmlRegisterType(uri, 1, 0, "Frame"); - qmlRegisterType(uri, 1, 0, "Space"); - qmlRegisterType(uri, 1, 0, "DataModel"); - qmlRegisterType(uri, 1, 0, "Band"); - qmlRegisterType(uri, 1, 0, "Detail"); - qmlRegisterType(uri, 1, 0, "Para"); - qmlRegisterType(uri, 1, 0, "Image"); - qmlRegisterType(uri, 1, 0, "Break"); - qmlRegisterType(uri, 1, 0, "StyleSheet"); - qmlRegisterType(uri, 1, 0, "Color"); - qmlRegisterType(uri, 1, 0, "Pen"); - qmlRegisterType(uri, 1, 0, "Brush"); - qmlRegisterType(uri, 1, 0, "Font"); - qmlRegisterType(uri, 1, 0, "TextStyle"); + qmlRegisterType(uri, 1, 0, "Item"); + qmlRegisterType(uri, 1, 0, "Report"); + qmlRegisterType(uri, 1, 0, "Frame"); + qmlRegisterType(uri, 1, 0, "Space"); + qmlRegisterType(uri, 1, 0, "DataModel"); + qmlRegisterType(uri, 1, 0, "Band"); + qmlRegisterType(uri, 1, 0, "Detail"); + qmlRegisterType(uri, 1, 0, "Para"); + qmlRegisterType(uri, 1, 0, "Image"); + qmlRegisterType(uri, 1, 0, "Break"); + qmlRegisterType(uri, 1, 0, "StyleSheet"); + qmlRegisterType(uri, 1, 0, "Color"); + qmlRegisterType(uri, 1, 0, "Pen"); + qmlRegisterType(uri, 1, 0, "Brush"); + qmlRegisterType(uri, 1, 0, "Font"); + qmlRegisterType(uri, 1, 0, "TextStyle"); // Auto-increment the import to stay in sync with ALL future QtQuick minor versions qmlRegisterModule(uri, 1, 0); diff --git a/libquickevent/libquickeventgui/CMakeLists.txt b/libquickevent/libquickeventgui/CMakeLists.txt index 9cb690502..2a1be2380 100644 --- a/libquickevent/libquickeventgui/CMakeLists.txt +++ b/libquickevent/libquickeventgui/CMakeLists.txt @@ -32,7 +32,7 @@ qt6_add_lupdate(libquickeventgui TS_FILES target_sources(libquickeventgui PRIVATE ${QM_FILES}) target_compile_definitions(libquickeventgui PRIVATE QUICKEVENTGUI_BUILD_DLL) -target_link_libraries(libquickeventgui PUBLIC Qt::Core Qt::Multimedia libquickeventcore libqfqmlwidgets) +target_link_libraries(libquickeventgui PUBLIC Qt::Core Qt::Multimedia libquickeventcore libqfgui) target_include_directories(libquickeventgui PUBLIC include) install(TARGETS libquickeventgui) diff --git a/libquickevent/libquickeventgui/src/og/itemdelegate.cpp b/libquickevent/libquickeventgui/src/og/itemdelegate.cpp index d9a673127..2bbf4cd8d 100644 --- a/libquickevent/libquickeventgui/src/og/itemdelegate.cpp +++ b/libquickevent/libquickeventgui/src/og/itemdelegate.cpp @@ -11,7 +11,7 @@ namespace quickevent::gui::og { -ItemDelegate::ItemDelegate(qf::qmlwidgets::TableView *parent) +ItemDelegate::ItemDelegate(qf::gui::TableView *parent) : Super(parent) { QItemEditorFactory *fact = itemEditorFactory(); diff --git a/libquickevent/libquickeventgui/src/og/itemdelegate.h b/libquickevent/libquickeventgui/src/og/itemdelegate.h index db2ee0275..bc3c9699b 100644 --- a/libquickevent/libquickeventgui/src/og/itemdelegate.h +++ b/libquickevent/libquickeventgui/src/og/itemdelegate.h @@ -3,7 +3,7 @@ #include "../quickeventguiglobal.h" -#include +#include class QItemEditorCreatorBase; @@ -11,13 +11,13 @@ namespace quickevent { namespace gui { namespace og { -class QUICKEVENTGUI_DECL_EXPORT ItemDelegate : public qf::qmlwidgets::SqlTableItemDelegate +class QUICKEVENTGUI_DECL_EXPORT ItemDelegate : public qf::gui::SqlTableItemDelegate { Q_OBJECT private: - typedef qf::qmlwidgets::SqlTableItemDelegate Super; + typedef qf::gui::SqlTableItemDelegate Super; public: - ItemDelegate(qf::qmlwidgets::TableView * parent = nullptr); + ItemDelegate(qf::gui::TableView * parent = nullptr); ~ItemDelegate() Q_DECL_OVERRIDE; private: QItemEditorFactory *m_factory = nullptr; diff --git a/libquickevent/libquickeventgui/src/og/sqltablemodel.h b/libquickevent/libquickeventgui/src/og/sqltablemodel.h index 4f65db683..03c5d5d74 100644 --- a/libquickevent/libquickeventgui/src/og/sqltablemodel.h +++ b/libquickevent/libquickeventgui/src/og/sqltablemodel.h @@ -3,17 +3,17 @@ #include "../quickeventguiglobal.h" -#include +#include namespace quickevent { namespace gui { namespace og { -class QUICKEVENTGUI_DECL_EXPORT SqlTableModel : public qf::qmlwidgets::model::SqlTableModel +class QUICKEVENTGUI_DECL_EXPORT SqlTableModel : public qf::gui::model::SqlTableModel { Q_OBJECT private: - typedef qf::qmlwidgets::model::SqlTableModel Super; + typedef qf::gui::model::SqlTableModel Super; public: SqlTableModel(QObject *parent = nullptr); ~SqlTableModel(); diff --git a/libquickevent/libquickeventgui/src/og/timeedit.h b/libquickevent/libquickeventgui/src/og/timeedit.h index d1394502d..fb5e4eeea 100644 --- a/libquickevent/libquickeventgui/src/og/timeedit.h +++ b/libquickevent/libquickeventgui/src/og/timeedit.h @@ -5,7 +5,7 @@ #include -#include +#include #include @@ -13,13 +13,13 @@ namespace quickevent { namespace gui { namespace og { -class QUICKEVENTGUI_DECL_EXPORT TimeEdit : public qf::qmlwidgets::LineEdit +class QUICKEVENTGUI_DECL_EXPORT TimeEdit : public qf::gui::LineEdit { Q_OBJECT Q_PROPERTY(quickevent::core::og::TimeMs timeMs READ timeMs WRITE setTimeMs NOTIFY timeMsChanged USER true) private: - typedef qf::qmlwidgets::LineEdit Super; + typedef qf::gui::LineEdit Super; public: TimeEdit(QWidget *parent = nullptr); ~TimeEdit() Q_DECL_OVERRIDE; diff --git a/libquickevent/libquickeventgui/src/reportoptionsdialog.cpp b/libquickevent/libquickeventgui/src/reportoptionsdialog.cpp index 02c603d0f..da17ed18e 100644 --- a/libquickevent/libquickeventgui/src/reportoptionsdialog.cpp +++ b/libquickevent/libquickeventgui/src/reportoptionsdialog.cpp @@ -1,8 +1,8 @@ #include "reportoptionsdialog.h" #include "ui_reportoptionsdialog.h" -#include -#include +#include +#include #include #include @@ -25,7 +25,7 @@ auto default_persistent_settings_id = QStringLiteral("reportOptionsDialog"); ReportOptionsDialog::ReportOptionsDialog(QWidget *parent) : QDialog(parent) - , qf::qmlwidgets::framework::IPersistentSettings(this) + , qf::gui::framework::IPersistentSettings(this) , ui(new Ui::ReportOptionsDialog) { ui->setupUi(this); @@ -90,7 +90,7 @@ QString ReportOptionsDialog::persistentSettingsPath() bool ReportOptionsDialog::setPersistentSettingsId(const QString &id) { - bool ret = qf::qmlwidgets::framework::IPersistentSettings::setPersistentSettingsId(id); + bool ret = qf::gui::framework::IPersistentSettings::setPersistentSettingsId(id); if(ret) emit persistentSettingsIdChanged(id); return ret; diff --git a/libquickevent/libquickeventgui/src/reportoptionsdialog.h b/libquickevent/libquickeventgui/src/reportoptionsdialog.h index 298ba764a..e4b22c6f9 100644 --- a/libquickevent/libquickeventgui/src/reportoptionsdialog.h +++ b/libquickevent/libquickeventgui/src/reportoptionsdialog.h @@ -2,7 +2,7 @@ #include "quickeventguiglobal.h" -#include +#include #include @@ -16,7 +16,7 @@ namespace Ui { class ReportOptionsDialog; } -class QUICKEVENTGUI_DECL_EXPORT ReportOptionsDialog : public QDialog, public qf::qmlwidgets::framework::IPersistentSettings +class QUICKEVENTGUI_DECL_EXPORT ReportOptionsDialog : public QDialog, public qf::gui::framework::IPersistentSettings { Q_OBJECT diff --git a/libquickevent/libquickeventgui/src/si/siidedit.h b/libquickevent/libquickeventgui/src/si/siidedit.h index 4e9b5f652..b151012ff 100644 --- a/libquickevent/libquickeventgui/src/si/siidedit.h +++ b/libquickevent/libquickeventgui/src/si/siidedit.h @@ -5,19 +5,19 @@ #include -#include +#include namespace quickevent { namespace gui { namespace si { -class QUICKEVENTGUI_DECL_EXPORT SiIdEdit : public qf::qmlwidgets::SpinBox +class QUICKEVENTGUI_DECL_EXPORT SiIdEdit : public qf::gui::SpinBox { Q_OBJECT Q_PROPERTY(quickevent::core::si::SiId siid READ siid WRITE setSiid USER true) private: - typedef qf::qmlwidgets::SpinBox Super; + typedef qf::gui::SpinBox Super; protected: void fixup(QString &input) const override; int valueFromText(const QString &text) const override; diff --git a/quickevent/app/quickevent/CMakeLists.txt b/quickevent/app/quickevent/CMakeLists.txt index 36d1828fa..f5bb7412a 100644 --- a/quickevent/app/quickevent/CMakeLists.txt +++ b/quickevent/app/quickevent/CMakeLists.txt @@ -265,7 +265,7 @@ qt6_add_lupdate(quickevent TS_FILES target_sources(quickevent PRIVATE ${QM_FILES}) target_include_directories(quickevent PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src) -target_link_libraries(quickevent PUBLIC libquickeventcore libquickeventgui libqfqmlwidgets libsiut) +target_link_libraries(quickevent PUBLIC libquickeventcore libquickeventgui libqfgui libsiut) install(TARGETS quickevent) install(FILES ${QM_FILES} DESTINATION ${CMAKE_INSTALL_BINDIR}/translations) diff --git a/quickevent/app/quickevent/plugins/CardReader/src/cardchecker.cpp b/quickevent/app/quickevent/plugins/CardReader/src/cardchecker.cpp index 9d07772da..bbdf0d63b 100644 --- a/quickevent/app/quickevent/plugins/CardReader/src/cardchecker.cpp +++ b/quickevent/app/quickevent/plugins/CardReader/src/cardchecker.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include @@ -17,7 +17,7 @@ #include namespace qfs = qf::core::sql; -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Event::EventPlugin; using Runs::RunsPlugin; diff --git a/quickevent/app/quickevent/plugins/CardReader/src/cardreaderplugin.cpp b/quickevent/app/quickevent/plugins/CardReader/src/cardreaderplugin.cpp index d906ce196..09d5005a3 100644 --- a/quickevent/app/quickevent/plugins/CardReader/src/cardreaderplugin.cpp +++ b/quickevent/app/quickevent/plugins/CardReader/src/cardreaderplugin.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include @@ -32,7 +32,7 @@ //#define QF_TIMESCOPE_ENABLED #include -namespace qff = qf::qmlwidgets::framework; +namespace qff = qf::gui::framework; namespace qfs = qf::core::sql; using ::PartWidget; using qff::getPlugin; diff --git a/quickevent/app/quickevent/plugins/CardReader/src/cardreaderplugin.h b/quickevent/app/quickevent/plugins/CardReader/src/cardreaderplugin.h index 6ecb28979..fbcb7476a 100644 --- a/quickevent/app/quickevent/plugins/CardReader/src/cardreaderplugin.h +++ b/quickevent/app/quickevent/plugins/CardReader/src/cardreaderplugin.h @@ -2,7 +2,7 @@ #define CARDREADER_CARDREADERPLUGIN_H #include -#include +#include #include @@ -17,13 +17,13 @@ class ReadCard; class PunchRecord; class CheckedCard; -class CardReaderPlugin : public qf::qmlwidgets::framework::Plugin +class CardReaderPlugin : public qf::gui::framework::Plugin { Q_OBJECT //Q_PROPERTY(QQmlListProperty cardCheckers READ cardCheckersListProperty) //Q_PROPERTY(int currentCardCheckerIndex READ currentCardCheckerIndex WRITE setCurrentCardCheckerIndex NOTIFY currentCardCheckerIndexChanged) private: - typedef qf::qmlwidgets::framework::Plugin Super; + typedef qf::gui::framework::Plugin Super; public: CardReaderPlugin(QObject *parent = nullptr); diff --git a/quickevent/app/quickevent/plugins/CardReader/src/cardreadersettingspage.cpp b/quickevent/app/quickevent/plugins/CardReader/src/cardreadersettingspage.cpp index 65d18267e..e51e020e5 100644 --- a/quickevent/app/quickevent/plugins/CardReader/src/cardreadersettingspage.cpp +++ b/quickevent/app/quickevent/plugins/CardReader/src/cardreadersettingspage.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include @@ -38,7 +38,7 @@ CardReaderSettingsPage::CardReaderSettingsPage(QWidget *parent) m_caption = tr("Card reader"); { auto *cbx = ui->cbxCardCheckType; - for(auto *checker : qf::qmlwidgets::framework::getPlugin()->cardCheckers()) { + for(auto *checker : qf::gui::framework::getPlugin()->cardCheckers()) { cbx->addItem(checker->caption(), checker->nameId()); } } diff --git a/quickevent/app/quickevent/plugins/CardReader/src/cardreaderwidget.cpp b/quickevent/app/quickevent/plugins/CardReader/src/cardreaderwidget.cpp index bc9207b9a..ee8528af6 100644 --- a/quickevent/app/quickevent/plugins/CardReader/src/cardreaderwidget.cpp +++ b/quickevent/app/quickevent/plugins/CardReader/src/cardreaderwidget.cpp @@ -20,26 +20,26 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include #include -#include +#include #include #include #include @@ -63,9 +63,9 @@ namespace qfc = qf::core; namespace qfs = qf::core::sql; -namespace qfw = qf::qmlwidgets; -namespace qfd = qf::qmlwidgets::dialogs; -using qf::qmlwidgets::framework::getPlugin; +namespace qfw = qf::gui; +namespace qfd = qf::gui::dialogs; +using qf::gui::framework::getPlugin; using Event::EventPlugin; using CardReader::CardReaderPlugin; using Receipts::ReceiptsPlugin; @@ -345,7 +345,7 @@ void CardReaderWidget::onCustomContextMenuRequest(const QPoint & pos) getPlugin()->printCard(card_id); } else if(a == &a_recalculate_times) { - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); int curr_ix = 0; QList sel_ixs = ui->tblCards->selectedRowsIndexes(); for(int ix : sel_ixs) { @@ -386,7 +386,7 @@ void CardReaderWidget::settleDownInPartWidget(::PartWidget *part_widget) if(ok) { siut::SiStationConfig cfg(result.toMap()); QString msg = cfg.toString(); - qf::qmlwidgets::dialogs::MessageBox::showInfo(this, msg); + qf::gui::dialogs::MessageBox::showInfo(this, msg); } }, Qt::QueuedConnection); this->siDriver()->setSiTask(cmd); @@ -426,19 +426,19 @@ void CardReaderWidget::settleDownInPartWidget(::PartWidget *part_widget) auto *m_import_cards = a_tools->addMenuInto("importCards", tr("Import cards")); { auto *a = new qfw::Action(tr("Laps only CSV")); - connect(a, &qf::qmlwidgets::Action::triggered, this, &CardReaderWidget::importCards_lapsOnlyCsv); + connect(a, &qf::gui::Action::triggered, this, &CardReaderWidget::importCards_lapsOnlyCsv); m_import_cards->addActionInto(a); } { auto *a = new qfw::Action(tr("SI reader backup memory CSV")); - connect(a, &qf::qmlwidgets::Action::triggered, this, &CardReaderWidget::importCards_SIReaderBackupMemoryCsv); + connect(a, &qf::gui::Action::triggered, this, &CardReaderWidget::importCards_SIReaderBackupMemoryCsv); m_import_cards->addActionInto(a); m_import_cards->addActionInto(a); } } { auto *a = new qfw::Action(tr("Test audio")); - connect(a, &qf::qmlwidgets::Action::triggered, this, &CardReaderWidget::operatorAudioNotify); + connect(a, &qf::gui::Action::triggered, this, &CardReaderWidget::operatorAudioNotify); a_tools->addActionInto(a); } } @@ -499,7 +499,7 @@ void CardReaderWidget::onDbEventNotify(const QString &domain, int connection_id, void CardReaderWidget::createActions() { { - auto *a = new qf::qmlwidgets::Action(tr("Assign card to runner\tCtrl + Enter"), this); + auto *a = new qf::gui::Action(tr("Assign card to runner\tCtrl + Enter"), this); a->setShortcut(Qt::CTRL | Qt::Key_Return); // Qt::Key_Return is the main enter key, Qt::Key_Enter is on the numeric keyboard addAction(a); connect(a, &QAction::triggered, this, &CardReaderWidget::assignRunnerToSelectedCard); @@ -563,7 +563,7 @@ void CardReaderWidget::onOpenCommTriggered(bool checked) QString parity = settings.parity(); if(!commPort()->openComm(device, baud_rate, data_bits, parity, stop_bits > 1)) { QString error_msg = commPort()->errorToUserHint(); - qf::qmlwidgets::dialogs::MessageBox::showError(this, tr("Error open device %1 - %2").arg(device).arg(error_msg)); + qf::gui::dialogs::MessageBox::showError(this, tr("Error open device %1 - %2").arg(device).arg(error_msg)); } //theApp()->scriptDriver()->callExtensionFunction("onCommConnect", QVariantList() << device); } @@ -874,16 +874,16 @@ void CardReaderWidget::importCards_lapsOnlyCsv() // 7203463,"2,28","3,34","2,42","3,29","3,12","1,38","1,13","3,18","1,17","0,15" // CSV rows can be commented by # qfLogFuncFrame(); - qf::qmlwidgets::dialogs::MessageBox::showInfo(this, tr("

CSV record must have format:

" + qf::gui::dialogs::MessageBox::showInfo(this, tr("

CSV record must have format:

" "

7203463,\"2,28\",\"3,34\",\"2,42\",\"3,29\",\"3,12\",\"1,38\",\"1,13\",\"3,18\",\"1,17\",\"0,15\"

" "

Any row can be commented by leading #

" "

Decimal point is also supported, the quotes can be omited than.

")); - QString fn = qf::qmlwidgets::dialogs::FileDialog::getOpenFileName(this, tr("Import CSV")); + QString fn = qf::gui::dialogs::FileDialog::getOpenFileName(this, tr("Import CSV")); if(fn.isEmpty()) return; QFile f(fn); if(!f.open(QFile::ReadOnly)) { - qf::qmlwidgets::dialogs::MessageBox::showError(this, tr("Cannot open file '%1' for reading.").arg(f.fileName())); + qf::gui::dialogs::MessageBox::showError(this, tr("Cannot open file '%1' for reading.").arg(f.fileName())); return; } QTextStream ts(&f); @@ -959,7 +959,7 @@ void CardReaderWidget::importCards_lapsOnlyCsv() transaction.commit(); } catch (const qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(this, e); + qf::gui::dialogs::MessageBox::showException(this, e); } } @@ -1060,16 +1060,16 @@ void CardReaderWidget::importCards_SIReaderBackupMemoryCsv() col_Record_1_DOW, col_Record_1_time, }; - //qf::qmlwidgets::dialogs::MessageBox::showInfo(this, tr("

CSV record must have format:

" + //qf::gui::dialogs::MessageBox::showInfo(this, tr("

CSV record must have format:

" // "

7203463,\"2,28\",\"3,34\",\"2,42\",\"3,29\",\"3,12\",\"1,38\",\"1,13\",\"3,18\",\"1,17\",\"0,15\"

" // "

Any row can be commented by leading #

" // "

Decimal point is also supported, the quotes can be omited than.

")); - QString fn = qf::qmlwidgets::dialogs::FileDialog::getOpenFileName(this, tr("Import TXT")); + QString fn = qf::gui::dialogs::FileDialog::getOpenFileName(this, tr("Import TXT")); if(fn.isEmpty()) return; QFile f(fn); if(!f.open(QFile::ReadOnly)) { - qf::qmlwidgets::dialogs::MessageBox::showError(this, tr("Cannot open file '%1' for reading.").arg(f.fileName())); + qf::gui::dialogs::MessageBox::showError(this, tr("Cannot open file '%1' for reading.").arg(f.fileName())); return; } int stage_id = getPlugin()->currentStageId(); @@ -1143,7 +1143,7 @@ void CardReaderWidget::importCards_SIReaderBackupMemoryCsv() transaction.commit(); } catch (const qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(this, e); + qf::gui::dialogs::MessageBox::showException(this, e); } } @@ -1166,7 +1166,7 @@ void CardReaderWidget::readStationBackupMemory() }); connect(si_task, &siut::SiTaskStationConfig::finished, this, [this](bool ok, QVariant result) { if(ok) { - //qf::qmlwidgets::dialogs::MessageBox::showInfo(this, "memory read"); + //qf::gui::dialogs::MessageBox::showInfo(this, "memory read"); QVariantMap m = result.toMap(); int station_number = m.value("stationNumber").toInt(); QVariantList punches = m.value("punches").toList(); @@ -1193,9 +1193,9 @@ void CardReaderWidget::readStationBackupMemory() opts.setDocumentTitle(tr("Station backup memory")); QString html = qf::core::utils::HtmlUtils::fromHtmlList(html_body, opts); - qf::qmlwidgets::dialogs::Dialog dlg(QDialogButtonBox::Save | QDialogButtonBox::Cancel, this); + qf::gui::dialogs::Dialog dlg(QDialogButtonBox::Save | QDialogButtonBox::Cancel, this); /* - qf::qmlwidgets::DialogButtonBox *bbx = dlg.buttonBox(); + qf::gui::DialogButtonBox *bbx = dlg.buttonBox(); QPushButton *bt_set_off_race = new QPushButton(tr("Set off-race")); bt_set_off_race->setToolTip(tr("All runners without CHECK will be marked as off-race.")); bool set_off_race = false; @@ -1204,7 +1204,7 @@ void CardReaderWidget::readStationBackupMemory() }); bbx->addButton(bt_set_off_race, QDialogButtonBox::AcceptRole); */ - auto *w = new qf::qmlwidgets::HtmlViewWidget(); + auto *w = new qf::gui::HtmlViewWidget(); dlg.setCentralWidget(w); w->setHtmlText(html); if(dlg.exec()) { diff --git a/quickevent/app/quickevent/plugins/CardReader/src/cardreaderwidget.h b/quickevent/app/quickevent/plugins/CardReader/src/cardreaderwidget.h index 353bc55c9..8dd7c2409 100644 --- a/quickevent/app/quickevent/plugins/CardReader/src/cardreaderwidget.h +++ b/quickevent/app/quickevent/plugins/CardReader/src/cardreaderwidget.h @@ -19,7 +19,7 @@ namespace Ui { namespace quickevent::gui::og { class SqlTableModel; } namespace qf { -namespace qmlwidgets { +namespace gui { class Action; namespace framework { class PartWidget; class Plugin; } } @@ -108,7 +108,7 @@ private slots: void onTestButtonClicked(); private: Ui::CardReaderWidget *ui; - qf::qmlwidgets::Action *m_actAssignCard = nullptr; + qf::gui::Action *m_actAssignCard = nullptr; quickevent::gui::og::SqlTableModel *m_cardsModel = nullptr; quickevent::gui::audio::Player *m_audioPlayer = nullptr; siut::DeviceDriver *f_siDriver = nullptr; diff --git a/quickevent/app/quickevent/plugins/CardReader/src/cardreaderwidget.ui b/quickevent/app/quickevent/plugins/CardReader/src/cardreaderwidget.ui index b18fbb9c2..1c93d8d97 100644 --- a/quickevent/app/quickevent/plugins/CardReader/src/cardreaderwidget.ui +++ b/quickevent/app/quickevent/plugins/CardReader/src/cardreaderwidget.ui @@ -17,7 +17,7 @@ - + @@ -103,20 +103,20 @@ - + - qf::qmlwidgets::TableView + qf::gui::TableView QTableView -
qf/qmlwidgets/tableview.h
+
qf/gui/tableview.h
 - qf::qmlwidgets::TableViewToolBar + qf::gui::TableViewToolBar QWidget -
qf/qmlwidgets/tableviewtoolbar.h
+
qf/gui/tableviewtoolbar.h
1 diff --git a/quickevent/app/quickevent/plugins/CardReader/src/services/mqttpunches.cpp b/quickevent/app/quickevent/plugins/CardReader/src/services/mqttpunches.cpp index d1fb43788..21bb84245 100644 --- a/quickevent/app/quickevent/plugins/CardReader/src/services/mqttpunches.cpp +++ b/quickevent/app/quickevent/plugins/CardReader/src/services/mqttpunches.cpp @@ -7,8 +7,8 @@ //#include #include -#include -#include +#include +#include #include #include @@ -28,8 +28,8 @@ #include #endif -//namespace qfm = qf::qmlwidgets::model; -using qf::qmlwidgets::framework::getPlugin; +//namespace qfm = qf::gui::model; +using qf::gui::framework::getPlugin; using CardReader::CardReaderPlugin; @@ -92,7 +92,7 @@ void MqttPunches::onRawSIDataUdpSocketReadyRead() #endif } -qf::qmlwidgets::framework::DialogWidget *MqttPunches::createDetailWidget() +qf::gui::framework::DialogWidget *MqttPunches::createDetailWidget() { auto *w = new MqttPunchesWidget(); return w; diff --git a/quickevent/app/quickevent/plugins/CardReader/src/services/mqttpunches.h b/quickevent/app/quickevent/plugins/CardReader/src/services/mqttpunches.h index 91159d271..59056214d 100644 --- a/quickevent/app/quickevent/plugins/CardReader/src/services/mqttpunches.h +++ b/quickevent/app/quickevent/plugins/CardReader/src/services/mqttpunches.h @@ -38,7 +38,7 @@ class MqttPunches : public Event::services::Service private: void onDbEventNotify(const QString &domain, int connection_id, const QVariant &data); void onRawSIDataUdpSocketReadyRead(); - qf::qmlwidgets::framework::DialogWidget *createDetailWidget() override; + qf::gui::framework::DialogWidget *createDetailWidget() override; QUdpSocket *rawDataUdpSocket(); void init(); private: diff --git a/quickevent/app/quickevent/plugins/CardReader/src/services/mqttpuncheswidget.h b/quickevent/app/quickevent/plugins/CardReader/src/services/mqttpuncheswidget.h index aab28e603..f275077bc 100644 --- a/quickevent/app/quickevent/plugins/CardReader/src/services/mqttpuncheswidget.h +++ b/quickevent/app/quickevent/plugins/CardReader/src/services/mqttpuncheswidget.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace CardReader { namespace services { @@ -9,11 +9,11 @@ namespace Ui { class MqttPunchesWidget; } -class MqttPunchesWidget : public qf::qmlwidgets::framework::DialogWidget +class MqttPunchesWidget : public qf::gui::framework::DialogWidget { Q_OBJECT - using Super = qf::qmlwidgets::framework::DialogWidget; + using Super = qf::gui::framework::DialogWidget; public: explicit MqttPunchesWidget(QWidget *parent = nullptr); ~MqttPunchesWidget(); diff --git a/quickevent/app/quickevent/plugins/CardReader/src/services/qropunch.cpp b/quickevent/app/quickevent/plugins/CardReader/src/services/qropunch.cpp index 72aaec121..1d8cfdaa3 100644 --- a/quickevent/app/quickevent/plugins/CardReader/src/services/qropunch.cpp +++ b/quickevent/app/quickevent/plugins/CardReader/src/services/qropunch.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include @@ -17,7 +17,7 @@ #include #include -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; namespace CardReader::services { @@ -51,7 +51,7 @@ QString QrOPunch::serviceName() return QStringLiteral("QrOPunch"); } -qf::qmlwidgets::framework::DialogWidget *QrOPunch::createDetailWidget() +qf::gui::framework::DialogWidget *QrOPunch::createDetailWidget() { auto *w = new QrOPunchWidget(); return w; diff --git a/quickevent/app/quickevent/plugins/CardReader/src/services/qropunch.h b/quickevent/app/quickevent/plugins/CardReader/src/services/qropunch.h index 8efa92587..80a73282f 100644 --- a/quickevent/app/quickevent/plugins/CardReader/src/services/qropunch.h +++ b/quickevent/app/quickevent/plugins/CardReader/src/services/qropunch.h @@ -38,7 +38,7 @@ class QrOPunch : public Event::services::Service static QString serviceName(); private: - qf::qmlwidgets::framework::DialogWidget *createDetailWidget() override; + qf::gui::framework::DialogWidget *createDetailWidget() override; void init(); void onTcpReadoutReceived(const QVariant &data); void onNewConnection(); diff --git a/quickevent/app/quickevent/plugins/CardReader/src/services/qropunchwidget.h b/quickevent/app/quickevent/plugins/CardReader/src/services/qropunchwidget.h index 9e0cfd199..974313764 100644 --- a/quickevent/app/quickevent/plugins/CardReader/src/services/qropunchwidget.h +++ b/quickevent/app/quickevent/plugins/CardReader/src/services/qropunchwidget.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace CardReader { namespace services { @@ -11,11 +11,11 @@ namespace Ui { class QrOPunch; -class QrOPunchWidget : public qf::qmlwidgets::framework::DialogWidget +class QrOPunchWidget : public qf::gui::framework::DialogWidget { Q_OBJECT - using Super = qf::qmlwidgets::framework::DialogWidget; + using Super = qf::gui::framework::DialogWidget; public: explicit QrOPunchWidget(QWidget *parent = nullptr); ~QrOPunchWidget() override; diff --git a/quickevent/app/quickevent/plugins/CardReader/src/services/racomclient.cpp b/quickevent/app/quickevent/plugins/CardReader/src/services/racomclient.cpp index 4ea375b0e..2712e2456 100644 --- a/quickevent/app/quickevent/plugins/CardReader/src/services/racomclient.cpp +++ b/quickevent/app/quickevent/plugins/CardReader/src/services/racomclient.cpp @@ -9,8 +9,8 @@ //#include #include -#include -#include +#include +#include #include #include @@ -31,8 +31,8 @@ #include #endif -//namespace qfm = qf::qmlwidgets::model; -using qf::qmlwidgets::framework::getPlugin; +//namespace qfm = qf::gui::model; +using qf::gui::framework::getPlugin; using Event::EventPlugin; using CardReader::CardReaderPlugin; @@ -267,7 +267,7 @@ void RacomClient::onRawSIDataUdpSocketReadyRead() #endif } -qf::qmlwidgets::framework::DialogWidget *RacomClient::createDetailWidget() +qf::gui::framework::DialogWidget *RacomClient::createDetailWidget() { auto *w = new RacomClientWidget(); return w; diff --git a/quickevent/app/quickevent/plugins/CardReader/src/services/racomclient.h b/quickevent/app/quickevent/plugins/CardReader/src/services/racomclient.h index 86290f444..f89274a9c 100644 --- a/quickevent/app/quickevent/plugins/CardReader/src/services/racomclient.h +++ b/quickevent/app/quickevent/plugins/CardReader/src/services/racomclient.h @@ -78,7 +78,7 @@ class RacomClient : public Event::services::Service private: void onDbEventNotify(const QString &domain, int connection_id, const QVariant &data); void onRawSIDataUdpSocketReadyRead(); - qf::qmlwidgets::framework::DialogWidget *createDetailWidget() override; + qf::gui::framework::DialogWidget *createDetailWidget() override; QUdpSocket *rawDataUdpSocket(); void init(); private: diff --git a/quickevent/app/quickevent/plugins/CardReader/src/services/racomclientwidget.cpp b/quickevent/app/quickevent/plugins/CardReader/src/services/racomclientwidget.cpp index dc219013d..9111a305c 100644 --- a/quickevent/app/quickevent/plugins/CardReader/src/services/racomclientwidget.cpp +++ b/quickevent/app/quickevent/plugins/CardReader/src/services/racomclientwidget.cpp @@ -2,7 +2,7 @@ #include "ui_racomclientwidget.h" #include "racomclient.h" -#include +#include #include @@ -46,7 +46,7 @@ bool RacomClientWidget::acceptDialogDone(int result) if(!fn.isEmpty()) { QFile file(fn); if(!file.open(QIODevice::WriteOnly | QIODevice::Append)) { - qf::qmlwidgets::dialogs::MessageBox::showError(this, tr("File '%1' cannot be open for writing.").arg(fn)); + qf::gui::dialogs::MessageBox::showError(this, tr("File '%1' cannot be open for writing.").arg(fn)); return false; } } diff --git a/quickevent/app/quickevent/plugins/CardReader/src/services/racomclientwidget.h b/quickevent/app/quickevent/plugins/CardReader/src/services/racomclientwidget.h index b7b20f43a..abf7daed7 100644 --- a/quickevent/app/quickevent/plugins/CardReader/src/services/racomclientwidget.h +++ b/quickevent/app/quickevent/plugins/CardReader/src/services/racomclientwidget.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace CardReader { namespace services { @@ -11,11 +11,11 @@ class RacomClientWidget; class RacomClient; -class RacomClientWidget : public qf::qmlwidgets::framework::DialogWidget +class RacomClientWidget : public qf::gui::framework::DialogWidget { Q_OBJECT - using Super = qf::qmlwidgets::framework::DialogWidget; + using Super = qf::gui::framework::DialogWidget; public: explicit RacomClientWidget(QWidget *parent = nullptr); ~RacomClientWidget() override; diff --git a/quickevent/app/quickevent/plugins/Classes/src/classdefdocument.h b/quickevent/app/quickevent/plugins/Classes/src/classdefdocument.h index 47bd20287..1a3c0185f 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/classdefdocument.h +++ b/quickevent/app/quickevent/plugins/Classes/src/classdefdocument.h @@ -1,13 +1,13 @@ #ifndef CLASSDEFDOCUMENT_H #define CLASSDEFDOCUMENT_H -#include +#include -class ClassDefDocument : public qf::qmlwidgets::model::SqlDataDocument +class ClassDefDocument : public qf::gui::model::SqlDataDocument { Q_OBJECT private: - typedef qf::qmlwidgets::model::SqlDataDocument Super; + typedef qf::gui::model::SqlDataDocument Super; public: ClassDefDocument(QObject *parent = nullptr); }; diff --git a/quickevent/app/quickevent/plugins/Classes/src/classdefwidget.h b/quickevent/app/quickevent/plugins/Classes/src/classdefwidget.h index 062b3a350..76048894f 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/classdefwidget.h +++ b/quickevent/app/quickevent/plugins/Classes/src/classdefwidget.h @@ -1,22 +1,22 @@ #ifndef CLASSDEFWIDGET_H #define CLASSDEFWIDGET_H -#include +#include namespace Ui { class ClassDefWidget; } -class ClassDefWidget : public qf::qmlwidgets::framework::DataDialogWidget +class ClassDefWidget : public qf::gui::framework::DataDialogWidget { Q_OBJECT private: - typedef qf::qmlwidgets::framework::DataDialogWidget Super; + typedef qf::gui::framework::DataDialogWidget Super; public: ClassDefWidget(QWidget *parent = nullptr); ~ClassDefWidget() Q_DECL_OVERRIDE; - bool load(const QVariant &id = QVariant(), int mode = qf::qmlwidgets::model::DataDocument::ModeEdit) Q_DECL_OVERRIDE; + bool load(const QVariant &id = QVariant(), int mode = qf::gui::model::DataDocument::ModeEdit) Q_DECL_OVERRIDE; private: Ui::ClassDefWidget *ui; }; diff --git a/quickevent/app/quickevent/plugins/Classes/src/classdefwidget.ui b/quickevent/app/quickevent/plugins/Classes/src/classdefwidget.ui index b25dafc02..231123acc 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/classdefwidget.ui +++ b/quickevent/app/quickevent/plugins/Classes/src/classdefwidget.ui @@ -36,7 +36,7 @@ - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -52,7 +52,7 @@ - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -68,7 +68,7 @@ - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -95,7 +95,7 @@ - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -108,7 +108,7 @@ - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -128,7 +128,7 @@ - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -147,9 +147,9 @@ - qf::qmlwidgets::SpinBox + qf::gui::SpinBox QSpinBox -
qf/qmlwidgets/spinbox.h
+
qf/gui/spinbox.h
 diff --git a/quickevent/app/quickevent/plugins/Classes/src/classdocument.cpp b/quickevent/app/quickevent/plugins/Classes/src/classdocument.cpp index 880a66658..58c81e2cf 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/classdocument.cpp +++ b/quickevent/app/quickevent/plugins/Classes/src/classdocument.cpp @@ -2,14 +2,14 @@ #include -#include -#include +#include +#include #include #include #include -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Event::EventPlugin; namespace Classes { diff --git a/quickevent/app/quickevent/plugins/Classes/src/classdocument.h b/quickevent/app/quickevent/plugins/Classes/src/classdocument.h index 32fd92933..e98d61859 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/classdocument.h +++ b/quickevent/app/quickevent/plugins/Classes/src/classdocument.h @@ -1,15 +1,15 @@ #ifndef CLASSES_CLASSDOCUMENT_H #define CLASSES_CLASSDOCUMENT_H -#include +#include namespace Classes { -class ClassDocument : public qf::qmlwidgets::model::SqlDataDocument +class ClassDocument : public qf::gui::model::SqlDataDocument { Q_OBJECT private: - typedef qf::qmlwidgets::model::SqlDataDocument Super; + typedef qf::gui::model::SqlDataDocument Super; public: ClassDocument(QObject *parent = nullptr); protected: diff --git a/quickevent/app/quickevent/plugins/Classes/src/classesplugin.cpp b/quickevent/app/quickevent/plugins/Classes/src/classesplugin.cpp index b079ddb74..148b738c4 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/classesplugin.cpp +++ b/quickevent/app/quickevent/plugins/Classes/src/classesplugin.cpp @@ -7,9 +7,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -22,8 +22,8 @@ #include -namespace qff = qf::qmlwidgets::framework; -//namespace qfd = qf::qmlwidgets::dialogs; +namespace qff = qf::gui::framework; +//namespace qfd = qf::gui::dialogs; namespace qfs = qf::core::sql; using ::PartWidget; using qff::getPlugin; @@ -293,8 +293,8 @@ void ClassesPlugin::createCourses(int stage_id, const QList &co transaction.commit(); } catch (const qf::core::Exception &e) { - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); - qf::qmlwidgets::dialogs::MessageBox::showException(fwk, e); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); + qf::gui::dialogs::MessageBox::showException(fwk, e); } } diff --git a/quickevent/app/quickevent/plugins/Classes/src/classesplugin.h b/quickevent/app/quickevent/plugins/Classes/src/classesplugin.h index 6f7619dfd..3eb3f0fe4 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/classesplugin.h +++ b/quickevent/app/quickevent/plugins/Classes/src/classesplugin.h @@ -5,12 +5,12 @@ #include -#include +#include #include namespace qf { -namespace qmlwidgets { +namespace gui { class Action; namespace framework { class PartWidget; } } @@ -31,16 +31,16 @@ struct ClassDef void load(int class_id, int stage_id, bool is_relays); }; -class ClassesPlugin : public qf::qmlwidgets::framework::Plugin +class ClassesPlugin : public qf::gui::framework::Plugin { Q_OBJECT - Q_PROPERTY(qf::qmlwidgets::framework::PartWidget* partWidget READ partWidget FINAL) + Q_PROPERTY(qf::gui::framework::PartWidget* partWidget READ partWidget FINAL) private: - typedef qf::qmlwidgets::framework::Plugin Super; + typedef qf::gui::framework::Plugin Super; public: ClassesPlugin(QObject *parent = nullptr); - qf::qmlwidgets::framework::PartWidget *partWidget() {return m_partWidget;} + qf::gui::framework::PartWidget *partWidget() {return m_partWidget;} QObject* createClassDocument(QObject *parent); void createClass(const QString &class_name); @@ -52,7 +52,7 @@ class ClassesPlugin : public qf::qmlwidgets::framework::Plugin Q_SLOT void onInstalled(); Q_SIGNAL void nativeInstalled(); private: - qf::qmlwidgets::framework::PartWidget *m_partWidget = nullptr; + qf::gui::framework::PartWidget *m_partWidget = nullptr; }; } diff --git a/quickevent/app/quickevent/plugins/Classes/src/classestableview.cpp b/quickevent/app/quickevent/plugins/Classes/src/classestableview.cpp index c7a663dad..17498b6cd 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/classestableview.cpp +++ b/quickevent/app/quickevent/plugins/Classes/src/classestableview.cpp @@ -3,12 +3,12 @@ #include #include -#include -#include +#include +#include #include -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Classes::ClassesPlugin; ClassesTableView::ClassesTableView(QWidget *parent) @@ -29,13 +29,13 @@ void ClassesTableView::insertRow() reload(); } catch (qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(this, e); + qf::gui::dialogs::MessageBox::showException(this, e); } } void ClassesTableView::removeSelectedRows() { - if(!qf::qmlwidgets::dialogs::MessageBox::askYesNo(this, tr("Really delete all selected classes? This action cannot be undone!"), false)) + if(!qf::gui::dialogs::MessageBox::askYesNo(this, tr("Really delete all selected classes? This action cannot be undone!"), false)) return; try { qf::core::sql::Transaction transaction; @@ -47,6 +47,6 @@ void ClassesTableView::removeSelectedRows() reload(); } catch (qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(this, e); + qf::gui::dialogs::MessageBox::showException(this, e); } } diff --git a/quickevent/app/quickevent/plugins/Classes/src/classestableview.h b/quickevent/app/quickevent/plugins/Classes/src/classestableview.h index 55cfef35b..61f4c8c50 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/classestableview.h +++ b/quickevent/app/quickevent/plugins/Classes/src/classestableview.h @@ -1,13 +1,13 @@ #ifndef CLASSESTABLEVIEW_H #define CLASSESTABLEVIEW_H -#include +#include -class ClassesTableView : public qf::qmlwidgets::TableView +class ClassesTableView : public qf::gui::TableView { Q_OBJECT private: - typedef qf::qmlwidgets::TableView Super; + typedef qf::gui::TableView Super; public: ClassesTableView(QWidget *parent = nullptr); diff --git a/quickevent/app/quickevent/plugins/Classes/src/classeswidget.cpp b/quickevent/app/quickevent/plugins/Classes/src/classeswidget.cpp index 08bc96d11..904d2dfa3 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/classeswidget.cpp +++ b/quickevent/app/quickevent/plugins/Classes/src/classeswidget.cpp @@ -10,19 +10,19 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include +#include #include #include #include @@ -40,11 +40,11 @@ static const auto SkipEmptyParts = Qt::SkipEmptyParts; #endif namespace qfc = qf::core; -namespace qfw = qf::qmlwidgets; -namespace qfd = qf::qmlwidgets::dialogs; -namespace qfm = qf::qmlwidgets::model; +namespace qfw = qf::gui; +namespace qfd = qf::gui::dialogs; +namespace qfm = qf::gui::model; namespace qfs = qf::core::sql; -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Event::EventPlugin; using Classes::ClassesPlugin; @@ -215,7 +215,7 @@ ClassesWidget::ClassesWidget(QWidget *parent) : ui->tblCourseCodes->setTableModel(m); m_courseCodesModel = m; } - connect(ui->tblClasses, &qf::qmlwidgets::TableView::currentRowChanged, this, &ClassesWidget::reloadCourseCodes); + connect(ui->tblClasses, &qf::gui::TableView::currentRowChanged, this, &ClassesWidget::reloadCourseCodes); connect(ui->chkUseAllMaps, &QCheckBox::toggled, this, [this](bool checked) { auto evplugin = getPlugin(); auto data = evplugin->stageData(selectedStageId()); @@ -296,7 +296,7 @@ void ClassesWidget::settleDownInPartWidget(::PartWidget *part_widget) void ClassesWidget::edit_courses() { - qf::qmlwidgets::dialogs::Dialog dlg(QDialogButtonBox::Close, this); + qf::gui::dialogs::Dialog dlg(QDialogButtonBox::Close, this); auto *w = new EditCoursesWidget(); dlg.setCentralWidget(w); dlg.exec(); @@ -305,7 +305,7 @@ void ClassesWidget::edit_courses() void ClassesWidget::edit_codes() { - qf::qmlwidgets::dialogs::Dialog dlg(QDialogButtonBox::Close, this); + qf::gui::dialogs::Dialog dlg(QDialogButtonBox::Close, this); auto *w = new EditCodesWidget(); dlg.setCentralWidget(w); //auto *bt_apply = dlg.buttonBox()->button(QDialogButtonBox::Apply); @@ -325,7 +325,7 @@ void ClassesWidget::edit_classes_layout() "Consider setting \"Interval\" column for all classes before continuing.")); } auto *w = new drawing::DrawingGanttWidget; - qf::qmlwidgets::dialogs::Dialog dlg(this); + qf::gui::dialogs::Dialog dlg(this); //dlg.setButtons(QDialogButtonBox::Save); dlg.setCentralWidget(w); w->load(selectedStageId()); @@ -444,7 +444,7 @@ void ClassesWidget::reloadCourseCodes() void ClassesWidget::importCourses(const QList &course_defs, const QList &code_defs) { - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); QString msg = tr("Delete all courses definitions for stage %1?").arg(selectedStageId()); bool delete_current = qfd::MessageBox::askYesNo(fwk, msg, false); getPlugin()->createCourses(selectedStageId(), course_defs, code_defs, delete_current); @@ -531,8 +531,8 @@ void ClassesWidget::import_ocad_txt() importCourses(defined_courses_map.values(), QList()); } catch (const qf::core::Exception &e) { - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); - qf::qmlwidgets::dialogs::MessageBox::showException(fwk, e); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); + qf::gui::dialogs::MessageBox::showException(fwk, e); } } } @@ -621,8 +621,8 @@ void ClassesWidget::import_ocad_v8() importCourses(defined_courses_map.values(), QList()); } catch (const qf::core::Exception &e) { - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); - qf::qmlwidgets::dialogs::MessageBox::showException(fwk, e); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); + qf::gui::dialogs::MessageBox::showException(fwk, e); } } } @@ -712,8 +712,8 @@ void ClassesWidget::import_ocad_iofxml_2() } } catch (const qf::core::Exception &e) { - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); - qf::qmlwidgets::dialogs::MessageBox::showException(fwk, e); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); + qf::gui::dialogs::MessageBox::showException(fwk, e); } } @@ -824,7 +824,7 @@ void ClassesWidget::import_ocad_iofxml_3() //qfInfo() << cd.name() << ":" << class_name << normalized_class_name; if(class_name != normalized_class_name || class_name.contains('+')) { if(!split_class_names_prompted) { - split_class_names_enabled = qf::qmlwidgets::dialogs::MessageBox::askYesNo(this, tr("Class name '%1' seems to be combined, separate it to more classes?").arg(class_name)); + split_class_names_enabled = qf::gui::dialogs::MessageBox::askYesNo(this, tr("Class name '%1' seems to be combined, separate it to more classes?").arg(class_name)); split_class_names_prompted = true; } } @@ -842,8 +842,8 @@ void ClassesWidget::import_ocad_iofxml_3() } } catch (const qf::core::Exception &e) { - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); - qf::qmlwidgets::dialogs::MessageBox::showException(fwk, e); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); + qf::gui::dialogs::MessageBox::showException(fwk, e); } } diff --git a/quickevent/app/quickevent/plugins/Classes/src/classeswidget.h b/quickevent/app/quickevent/plugins/Classes/src/classeswidget.h index 6a6cc8c7d..1b952645d 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/classeswidget.h +++ b/quickevent/app/quickevent/plugins/Classes/src/classeswidget.h @@ -11,8 +11,8 @@ namespace Ui { class ClassesWidget; } -namespace qf::qmlwidgets { class ForeignKeyComboBox; } -namespace qf::qmlwidgets::model { class SqlTableModel; } +namespace qf::gui { class ForeignKeyComboBox; } +namespace qf::gui::model { class SqlTableModel; } namespace quickevent { namespace core { class CodeDef; }} @@ -48,8 +48,8 @@ class ClassesWidget : public QFrame void importCourses(const QList &course_defs, const QList &code_defs); private: Ui::ClassesWidget *ui; - qf::qmlwidgets::model::SqlTableModel *m_classesModel; - qf::qmlwidgets::model::SqlTableModel *m_courseCodesModel; + qf::gui::model::SqlTableModel *m_classesModel; + qf::gui::model::SqlTableModel *m_courseCodesModel; QComboBox *m_cbxStage = nullptr; CourseItemDelegate *m_courseItemDelegate = nullptr; }; diff --git a/quickevent/app/quickevent/plugins/Classes/src/classeswidget.ui b/quickevent/app/quickevent/plugins/Classes/src/classeswidget.ui index 06190ca03..8fd36854e 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/classeswidget.ui +++ b/quickevent/app/quickevent/plugins/Classes/src/classeswidget.ui @@ -36,7 +36,7 @@ 5 - + Qt::Horizontal @@ -72,7 +72,7 @@ 0 - + 0 @@ -138,10 +138,10 @@ - + - + @@ -151,20 +151,20 @@ - qf::qmlwidgets::TableView + qf::gui::TableView QTableView -
qf/qmlwidgets/tableview.h
+
qf/gui/tableview.h
 - qf::qmlwidgets::TableViewToolBar + qf::gui::TableViewToolBar QWidget -
qf/qmlwidgets/tableviewtoolbar.h
+
qf/gui/tableviewtoolbar.h
1 - qf::qmlwidgets::Splitter + qf::gui::Splitter QSplitter -
qf/qmlwidgets/splitter.h
+
qf/gui/splitter.h
1 diff --git a/quickevent/app/quickevent/plugins/Classes/src/drawing/classitem.cpp b/quickevent/app/quickevent/plugins/Classes/src/drawing/classitem.cpp index 93cd2838a..6c416ea7b 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/drawing/classitem.cpp +++ b/quickevent/app/quickevent/plugins/Classes/src/drawing/classitem.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include @@ -21,9 +21,9 @@ #include #include -namespace qfd = qf::qmlwidgets::dialogs; +namespace qfd = qf::gui::dialogs; namespace qfc = qf::core; -namespace qfm = qf::qmlwidgets::model; +namespace qfm = qf::gui::model; namespace drawing { @@ -462,7 +462,7 @@ void ClassItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) bool ok = dlg.exec(); if(ok) { //qfInfo() << "OK"; - qf::qmlwidgets::model::DataDocument *doc = w->dataDocument(); + qf::gui::model::DataDocument *doc = w->dataDocument(); ClassData dt = data(); dt.setStartTimeMin(doc->value("startTimeMin").toInt()); dt.setStartIntervalMin(doc->value("startIntervalMin").toInt()); diff --git a/quickevent/app/quickevent/plugins/Classes/src/drawing/drawingganttwidget.cpp b/quickevent/app/quickevent/plugins/Classes/src/drawing/drawingganttwidget.cpp index ddd8bd3bb..cdedb0083 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/drawing/drawingganttwidget.cpp +++ b/quickevent/app/quickevent/plugins/Classes/src/drawing/drawingganttwidget.cpp @@ -5,11 +5,11 @@ #include "ganttitem.h" #include "ganttscene.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -28,8 +28,8 @@ DrawingGanttWidget::DrawingGanttWidget(QWidget *parent) : connect(ui->actSave, &QAction::triggered, this, &DrawingGanttWidget::onActSaveTriggered); connect(ui->actFind, &QAction::triggered, this, &DrawingGanttWidget::onActFindTriggered); - ui->actSave->setIcon(qf::qmlwidgets::Style::instance()->icon("save")); - ui->actFind->setIcon(qf::qmlwidgets::Style::instance()->icon("find")); + ui->actSave->setIcon(qf::gui::Style::instance()->icon("save")); + ui->actFind->setIcon(qf::gui::Style::instance()->icon("find")); m_ganttScene = new GanttScene(this); ui->ganttView->setScene(m_ganttScene); @@ -40,9 +40,9 @@ DrawingGanttWidget::~DrawingGanttWidget() delete ui; } -void DrawingGanttWidget::settleDownInDialog(qf::qmlwidgets::dialogs::Dialog *dlg) +void DrawingGanttWidget::settleDownInDialog(qf::gui::dialogs::Dialog *dlg) { - qf::qmlwidgets::ToolBar *tb = dlg->toolBar("main", true); + qf::gui::ToolBar *tb = dlg->toolBar("main", true); tb->addAction(ui->actSave); m_edFind = new QLineEdit(); m_edFind->setMaximumWidth(QFontMetrics(font()).horizontalAdvance('X') * 8); diff --git a/quickevent/app/quickevent/plugins/Classes/src/drawing/drawingganttwidget.h b/quickevent/app/quickevent/plugins/Classes/src/drawing/drawingganttwidget.h index b61b5dc02..b7b23314b 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/drawing/drawingganttwidget.h +++ b/quickevent/app/quickevent/plugins/Classes/src/drawing/drawingganttwidget.h @@ -1,7 +1,7 @@ #ifndef DRAWING_DRAWINGGANTTWIDGET_H #define DRAWING_DRAWINGGANTTWIDGET_H -#include +#include class QLineEdit; class QCheckBox; @@ -14,16 +14,16 @@ class DrawingGanttWidget; class GanttScene; -class DrawingGanttWidget : public qf::qmlwidgets::framework::DialogWidget +class DrawingGanttWidget : public qf::gui::framework::DialogWidget { Q_OBJECT private: - typedef qf::qmlwidgets::framework::DialogWidget Super; + typedef qf::gui::framework::DialogWidget Super; public: explicit DrawingGanttWidget(QWidget *parent = nullptr); ~DrawingGanttWidget() override; - void settleDownInDialog(qf::qmlwidgets::dialogs::Dialog *dlg) Q_DECL_OVERRIDE; + void settleDownInDialog(qf::gui::dialogs::Dialog *dlg) Q_DECL_OVERRIDE; void load(int stage_id); private slots: diff --git a/quickevent/app/quickevent/plugins/Classes/src/drawing/ganttitem.cpp b/quickevent/app/quickevent/plugins/Classes/src/drawing/ganttitem.cpp index 5afc179f2..2fea6fb4b 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/drawing/ganttitem.cpp +++ b/quickevent/app/quickevent/plugins/Classes/src/drawing/ganttitem.cpp @@ -4,7 +4,7 @@ #include "ganttruler.h" #include "ganttscene.h" -#include +#include #include #include @@ -15,7 +15,7 @@ #include namespace qfs = qf::core::sql; -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Event::EventPlugin; using namespace drawing; diff --git a/quickevent/app/quickevent/plugins/Classes/src/drawing/ganttscene.cpp b/quickevent/app/quickevent/plugins/Classes/src/drawing/ganttscene.cpp index 9bd5616bb..802e70171 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/drawing/ganttscene.cpp +++ b/quickevent/app/quickevent/plugins/Classes/src/drawing/ganttscene.cpp @@ -1,7 +1,7 @@ #include "ganttitem.h" #include "ganttscene.h" -#include +#include #include @@ -10,7 +10,7 @@ #include using namespace drawing; -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Event::EventPlugin; GanttScene::GanttScene(QObject * parent) diff --git a/quickevent/app/quickevent/plugins/Classes/src/editcodeswidget.cpp b/quickevent/app/quickevent/plugins/Classes/src/editcodeswidget.cpp index ccf8e4360..587071712 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/editcodeswidget.cpp +++ b/quickevent/app/quickevent/plugins/Classes/src/editcodeswidget.cpp @@ -1,9 +1,9 @@ #include "editcodeswidget.h" #include "ui_editcodeswidget.h" -#include +#include -namespace qfm = qf::qmlwidgets::model; +namespace qfm = qf::gui::model; namespace qfs = qf::core::sql; EditCodesWidget::EditCodesWidget(QWidget *parent) diff --git a/quickevent/app/quickevent/plugins/Classes/src/editcodeswidget.h b/quickevent/app/quickevent/plugins/Classes/src/editcodeswidget.h index 820319bf4..d2e16c1e4 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/editcodeswidget.h +++ b/quickevent/app/quickevent/plugins/Classes/src/editcodeswidget.h @@ -1,25 +1,25 @@ #ifndef EDITCODESWIDGET_H #define EDITCODESWIDGET_H -#include +#include namespace Ui { class EditCodesWidget; } -namespace qf::qmlwidgets::model { class SqlTableModel; } +namespace qf::gui::model { class SqlTableModel; } -class EditCodesWidget : public qf::qmlwidgets::framework::DialogWidget +class EditCodesWidget : public qf::gui::framework::DialogWidget { Q_OBJECT private: - typedef qf::qmlwidgets::framework::DialogWidget Super; + typedef qf::gui::framework::DialogWidget Super; public: explicit EditCodesWidget(QWidget *parent = 0); ~EditCodesWidget() Q_DECL_OVERRIDE; private: Ui::EditCodesWidget *ui; - qf::qmlwidgets::model::SqlTableModel *m_tableModel; + qf::gui::model::SqlTableModel *m_tableModel; }; #endif // EDITCODESWIDGET_H diff --git a/quickevent/app/quickevent/plugins/Classes/src/editcodeswidget.ui b/quickevent/app/quickevent/plugins/Classes/src/editcodeswidget.ui index 510eebfed..062631a2e 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/editcodeswidget.ui +++ b/quickevent/app/quickevent/plugins/Classes/src/editcodeswidget.ui @@ -30,24 +30,24 @@ 5 - + - + - qf::qmlwidgets::TableViewToolBar + qf::gui::TableViewToolBar QWidget -
qf/qmlwidgets/tableviewtoolbar.h
+
qf/gui/tableviewtoolbar.h
1 - qf::qmlwidgets::TableView + qf::gui::TableView QTableView -
qf/qmlwidgets/tableview.h
+
qf/gui/tableview.h
 diff --git a/quickevent/app/quickevent/plugins/Classes/src/editcoursecodeswidget.cpp b/quickevent/app/quickevent/plugins/Classes/src/editcoursecodeswidget.cpp index 7190baeee..43c06300c 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/editcoursecodeswidget.cpp +++ b/quickevent/app/quickevent/plugins/Classes/src/editcoursecodeswidget.cpp @@ -1,19 +1,19 @@ #include "editcoursecodeswidget.h" #include "ui_editcoursecodeswidget.h" -#include +#include #include #include -#include +#include #include #include #include namespace qfc = qf::core; -namespace qfd = qf::qmlwidgets::dialogs; +namespace qfd = qf::gui::dialogs; namespace qfs = qf::core::sql; EditCourseCodesWidget::EditCourseCodesWidget(QWidget *parent) @@ -94,7 +94,7 @@ void EditCourseCodesWidget::save() bool EditCourseCodesWidget::acceptDialogDone(int result) { qfLogFuncFrame() << "result:" << result; - if(result && m_edited && qf::qmlwidgets::dialogs::MessageBox::askYesNo(this, tr("Save changes?"))) { + if(result && m_edited && qf::gui::dialogs::MessageBox::askYesNo(this, tr("Save changes?"))) { save(); } return true; diff --git a/quickevent/app/quickevent/plugins/Classes/src/editcoursecodeswidget.h b/quickevent/app/quickevent/plugins/Classes/src/editcoursecodeswidget.h index 85fdf40ca..20b64199c 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/editcoursecodeswidget.h +++ b/quickevent/app/quickevent/plugins/Classes/src/editcoursecodeswidget.h @@ -1,7 +1,7 @@ #ifndef EDITCOURSECODESWIDGET_H #define EDITCOURSECODESWIDGET_H -#include +#include class QStandardItemModel; @@ -13,11 +13,11 @@ namespace qf { namespace core { namespace model { class SqlTableModel; } } } -class EditCourseCodesWidget : public qf::qmlwidgets::framework::DialogWidget +class EditCourseCodesWidget : public qf::gui::framework::DialogWidget { Q_OBJECT private: - typedef qf::qmlwidgets::framework::DialogWidget Super; + typedef qf::gui::framework::DialogWidget Super; public: explicit EditCourseCodesWidget(QWidget *parent = 0); ~EditCourseCodesWidget() Q_DECL_OVERRIDE; diff --git a/quickevent/app/quickevent/plugins/Classes/src/editcoursecodeswidget.ui b/quickevent/app/quickevent/plugins/Classes/src/editcoursecodeswidget.ui index fbe48f823..e81b101b7 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/editcoursecodeswidget.ui +++ b/quickevent/app/quickevent/plugins/Classes/src/editcoursecodeswidget.ui @@ -78,8 +78,8 @@ Move selected codes up - - :/qf/qmlwidgets/images/up.svg:/qf/qmlwidgets/images/up.svg + + :/qf/gui/images/up.svg:/qf/gui/images/up.svg @@ -89,8 +89,8 @@ Move selected codes down - - :/qf/qmlwidgets/images/down.svg:/qf/qmlwidgets/images/down.svg + + :/qf/gui/images/down.svg:/qf/gui/images/down.svg @@ -150,8 +150,8 @@ Add selected codes - - :/qf/qmlwidgets/images/left.svg:/qf/qmlwidgets/images/left.svg + + :/qf/gui/images/left.svg:/qf/gui/images/left.svg @@ -161,8 +161,8 @@ Remove selected codes - - :/qf/qmlwidgets/images/right.svg:/qf/qmlwidgets/images/right.svg + + :/qf/gui/images/right.svg:/qf/gui/images/right.svg @@ -219,7 +219,7 @@ - + diff --git a/quickevent/app/quickevent/plugins/Classes/src/editcourseswidget.cpp b/quickevent/app/quickevent/plugins/Classes/src/editcourseswidget.cpp index 49fb61c22..b2b5d069a 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/editcourseswidget.cpp +++ b/quickevent/app/quickevent/plugins/Classes/src/editcourseswidget.cpp @@ -3,15 +3,15 @@ #include "ui_editcourseswidget.h" #include -#include +#include #include -#include -#include +#include +#include #include -namespace qfw = qf::qmlwidgets; -namespace qfm = qf::qmlwidgets::model; +namespace qfw = qf::gui; +namespace qfm = qf::gui::model; namespace qfs = qf::core::sql; class CoursesTableModel : public qfm::SqlTableModel @@ -36,15 +36,15 @@ class CoursesTableModel : public qfm::SqlTableModel CoursesTableModel(QObject *parent) : Super(parent) { clearColumns(Col_COUNT); - setColumn(Col_id, qf::qmlwidgets::model::TableModel::ColumnDefinition("id", tr("Id")).setReadOnly(true)); - setColumn(Col_name, qf::qmlwidgets::model::TableModel::ColumnDefinition("courses.name", tr("Name"))); - setColumn(Col_length, qf::qmlwidgets::model::TableModel::ColumnDefinition("courses.length", tr("Length"))); - setColumn(Col_climb, qf::qmlwidgets::model::TableModel::ColumnDefinition("courses.climb", tr("Climb"))); - setColumn(Col_mapCount, qf::qmlwidgets::model::TableModel::ColumnDefinition("courses.mapCount", tr("Maps"))); - setColumn(Col_runCount, qf::qmlwidgets::model::TableModel::ColumnDefinition("run_count", tr("Runners"))); - setColumn(Col_note, qf::qmlwidgets::model::TableModel::ColumnDefinition("courses.note", tr("Note"))); - setColumn(Col_codeCount, qf::qmlwidgets::model::TableModel::ColumnDefinition("code_count", tr("Code count")).setReadOnly(true)); - setColumn(Col_codeList, qf::qmlwidgets::model::TableModel::ColumnDefinition("code_list", tr("Codes")).setReadOnly(true)); + setColumn(Col_id, qf::gui::model::TableModel::ColumnDefinition("id", tr("Id")).setReadOnly(true)); + setColumn(Col_name, qf::gui::model::TableModel::ColumnDefinition("courses.name", tr("Name"))); + setColumn(Col_length, qf::gui::model::TableModel::ColumnDefinition("courses.length", tr("Length"))); + setColumn(Col_climb, qf::gui::model::TableModel::ColumnDefinition("courses.climb", tr("Climb"))); + setColumn(Col_mapCount, qf::gui::model::TableModel::ColumnDefinition("courses.mapCount", tr("Maps"))); + setColumn(Col_runCount, qf::gui::model::TableModel::ColumnDefinition("run_count", tr("Runners"))); + setColumn(Col_note, qf::gui::model::TableModel::ColumnDefinition("courses.note", tr("Note"))); + setColumn(Col_codeCount, qf::gui::model::TableModel::ColumnDefinition("code_count", tr("Code count")).setReadOnly(true)); + setColumn(Col_codeList, qf::gui::model::TableModel::ColumnDefinition("code_list", tr("Codes")).setReadOnly(true)); } public: QVariant data(const QModelIndex &index, int role) const override @@ -147,7 +147,7 @@ void EditCoursesWidget::editCourseCodes(const QModelIndex &ix) int course_id = m->tableRow(row_no).value("courses.id").toInt(); if(course_id <= 0) return; - qf::qmlwidgets::dialogs::Dialog dlg(QDialogButtonBox::Close | QDialogButtonBox::Ok | QDialogButtonBox::Apply | QDialogButtonBox::Reset, this); + qf::gui::dialogs::Dialog dlg(QDialogButtonBox::Close | QDialogButtonBox::Ok | QDialogButtonBox::Apply | QDialogButtonBox::Reset, this); auto *w = new EditCourseCodesWidget(); connect(w, &EditCourseCodesWidget::courseCodesSaved, ui->tblCourses, &qfw::TableView::reloadCurrentRow); { diff --git a/quickevent/app/quickevent/plugins/Classes/src/editcourseswidget.h b/quickevent/app/quickevent/plugins/Classes/src/editcourseswidget.h index ae4bf2996..d2bcdeb3a 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/editcourseswidget.h +++ b/quickevent/app/quickevent/plugins/Classes/src/editcourseswidget.h @@ -1,19 +1,19 @@ #ifndef EDITCOURSESWIDGET_H #define EDITCOURSESWIDGET_H -#include +#include namespace Ui { class EditCoursesWidget; } -namespace qf::qmlwidgets::model { class SqlTableModel; } +namespace qf::gui::model { class SqlTableModel; } -class EditCoursesWidget : public qf::qmlwidgets::framework::DialogWidget +class EditCoursesWidget : public qf::gui::framework::DialogWidget { Q_OBJECT private: - typedef qf::qmlwidgets::framework::DialogWidget Super; + typedef qf::gui::framework::DialogWidget Super; public: explicit EditCoursesWidget(QWidget *parent = 0); ~EditCoursesWidget() Q_DECL_OVERRIDE; @@ -21,7 +21,7 @@ class EditCoursesWidget : public qf::qmlwidgets::framework::DialogWidget void editCourseCodes(const QModelIndex &ix); private: Ui::EditCoursesWidget *ui; - qf::qmlwidgets::model::SqlTableModel *m_coursesModel; + qf::gui::model::SqlTableModel *m_coursesModel; }; #endif // EDITCOURSESWIDGET_H diff --git a/quickevent/app/quickevent/plugins/Classes/src/editcourseswidget.ui b/quickevent/app/quickevent/plugins/Classes/src/editcourseswidget.ui index f819734a8..bda208e2a 100644 --- a/quickevent/app/quickevent/plugins/Classes/src/editcourseswidget.ui +++ b/quickevent/app/quickevent/plugins/Classes/src/editcourseswidget.ui @@ -30,7 +30,7 @@ 3 - + Qt::Horizontal @@ -55,10 +55,10 @@ 3 - + - + @@ -68,20 +68,20 @@ - qf::qmlwidgets::TableViewToolBar + qf::gui::TableViewToolBar QWidget -
qf/qmlwidgets/tableviewtoolbar.h
+
qf/gui/tableviewtoolbar.h
1 - qf::qmlwidgets::TableView + qf::gui::TableView QTableView -
qf/qmlwidgets/tableview.h
+
qf/gui/tableview.h
 - qf::qmlwidgets::Splitter + qf::gui::Splitter QSplitter -
qf/qmlwidgets/splitter.h
+
qf/gui/splitter.h
1 diff --git a/quickevent/app/quickevent/plugins/Competitors/src/competitordocument.cpp b/quickevent/app/quickevent/plugins/Competitors/src/competitordocument.cpp index 4551c718f..27fd738da 100644 --- a/quickevent/app/quickevent/plugins/Competitors/src/competitordocument.cpp +++ b/quickevent/app/quickevent/plugins/Competitors/src/competitordocument.cpp @@ -3,8 +3,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -12,7 +12,7 @@ #include using namespace Competitors; -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Event::EventPlugin; using Runs::RunsPlugin; diff --git a/quickevent/app/quickevent/plugins/Competitors/src/competitordocument.h b/quickevent/app/quickevent/plugins/Competitors/src/competitordocument.h index 04a764da7..997868fd8 100644 --- a/quickevent/app/quickevent/plugins/Competitors/src/competitordocument.h +++ b/quickevent/app/quickevent/plugins/Competitors/src/competitordocument.h @@ -1,17 +1,17 @@ #ifndef COMPETITORS_COMPETITORDOCUMENT_H #define COMPETITORS_COMPETITORDOCUMENT_H -#include +#include #include namespace Competitors { -class CompetitorDocument : public qf::qmlwidgets::model::SqlDataDocument +class CompetitorDocument : public qf::gui::model::SqlDataDocument { Q_OBJECT private: - typedef qf::qmlwidgets::model::SqlDataDocument Super; + typedef qf::gui::model::SqlDataDocument Super; public: CompetitorDocument(QObject *parent = nullptr); diff --git a/quickevent/app/quickevent/plugins/Competitors/src/competitorwidget.cpp b/quickevent/app/quickevent/plugins/Competitors/src/competitorwidget.cpp index c9f6b95ae..99ab498ff 100644 --- a/quickevent/app/quickevent/plugins/Competitors/src/competitorwidget.cpp +++ b/quickevent/app/quickevent/plugins/Competitors/src/competitorwidget.cpp @@ -14,9 +14,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -32,10 +32,10 @@ #include -namespace qfw = qf::qmlwidgets; +namespace qfw = qf::gui; namespace qfc = qf::core; namespace qfs = qf::core::sql; -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Event::EventPlugin; namespace { @@ -163,7 +163,7 @@ CompetitorWidget::CompetitorWidget(QWidget *parent) : setTitle(tr("Competitor")); { - qf::qmlwidgets::ForeignKeyComboBox *cbx = ui->cbxClass; + qf::gui::ForeignKeyComboBox *cbx = ui->cbxClass; if(is_relays) { cbx->setEnabled(false); } @@ -181,7 +181,7 @@ CompetitorWidget::CompetitorWidget(QWidget *parent) : m_runsModel = new CompetitorRunsModel(this); ui->tblRuns->setTableModel(m_runsModel); ui->tblRuns->setPersistentSettingsId(ui->tblRuns->objectName()); - ui->tblRuns->setInlineEditSaveStrategy(qf::qmlwidgets::TableView::OnManualSubmit); + ui->tblRuns->setInlineEditSaveStrategy(qf::gui::TableView::OnManualSubmit); ui->tblRuns->setItemDelegate(new quickevent::gui::og::ItemDelegate(ui->tblRuns)); ui->tblRuns->horizontalHeader()->setSectionHidden(CompetitorRunsModel::col_relays_name, !is_relays); @@ -256,7 +256,7 @@ CompetitorWidget::~CompetitorWidget() bool CompetitorWidget::loadRunsTable() { //bool is_relays = getPlugin()->eventConfig()->isRelays(); - qf::qmlwidgets::model::DataDocument *doc = dataController()->document(); + qf::gui::model::DataDocument *doc = dataController()->document(); qf::core::sql::QueryBuilder qb; qb.select2("runs", "*") .select2("classes", "name") @@ -311,11 +311,11 @@ void CompetitorWidget::onRunsTableCustomContextMenuRequest(const QPoint &pos) */ bool CompetitorWidget::load(const QVariant &id, int mode) { - ui->chkFind->setChecked(mode == qf::qmlwidgets::model::DataDocument::ModeInsert); - if(mode == qf::qmlwidgets::model::DataDocument::ModeInsert) { + ui->chkFind->setChecked(mode == qf::gui::model::DataDocument::ModeInsert); + if(mode == qf::gui::model::DataDocument::ModeInsert) { ui->edFind->setFocus(); } - else if(mode == qf::qmlwidgets::model::DataDocument::ModeView || mode == qf::qmlwidgets::model::DataDocument::ModeDelete) { + else if(mode == qf::gui::model::DataDocument::ModeView || mode == qf::gui::model::DataDocument::ModeDelete) { ui->frmFind->hide(); } if(Super::load(id, mode)) @@ -469,7 +469,7 @@ QList CompetitorWidget::possibleStartTimesMs(int run_id) // if(!saveData()) // return; -// qf::qmlwidgets::model::DataDocument*doc = dataController()->document(); +// qf::gui::model::DataDocument*doc = dataController()->document(); // int competitor_id = doc->value("competitors.id").toInt(); // int class_id = ui->cbxClass->currentData().toInt(); // QString sort_col = QStringLiteral("runs.startTimeMs"); @@ -528,7 +528,7 @@ bool CompetitorWidget::saveData() bool is_relays = getPlugin()->eventConfig()->isRelays(); auto *doc = qobject_cast(dataController()->document()); if(!is_relays && doc->value(QStringLiteral("classId")).toInt() == 0) { - qf::qmlwidgets::dialogs::MessageBox::showWarning(this, tr("Class should be entered.")); + qf::gui::dialogs::MessageBox::showWarning(this, tr("Class should be entered.")); return false; } if(Super::saveData()) diff --git a/quickevent/app/quickevent/plugins/Competitors/src/competitorwidget.h b/quickevent/app/quickevent/plugins/Competitors/src/competitorwidget.h index 9a5668d9d..df0ab370e 100644 --- a/quickevent/app/quickevent/plugins/Competitors/src/competitorwidget.h +++ b/quickevent/app/quickevent/plugins/Competitors/src/competitorwidget.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include @@ -10,16 +10,16 @@ namespace Ui { class CompetitorWidget; } -class CompetitorWidget : public qf::qmlwidgets::framework::DataDialogWidget +class CompetitorWidget : public qf::gui::framework::DataDialogWidget { Q_OBJECT private: - typedef qf::qmlwidgets::framework::DataDialogWidget Super; + typedef qf::gui::framework::DataDialogWidget Super; public: explicit CompetitorWidget(QWidget *parent = nullptr); ~CompetitorWidget() override; - bool load(const QVariant &id = QVariant(), int mode = qf::qmlwidgets::model::DataDocument::ModeEdit) override; + bool load(const QVariant &id = QVariant(), int mode = qf::gui::model::DataDocument::ModeEdit) override; void loadFromRegistrations(int siid); void save(); private slots: diff --git a/quickevent/app/quickevent/plugins/Competitors/src/competitorwidget.ui b/quickevent/app/quickevent/plugins/Competitors/src/competitorwidget.ui index 232cd8ee4..c4dd46852 100644 --- a/quickevent/app/quickevent/plugins/Competitors/src/competitorwidget.ui +++ b/quickevent/app/quickevent/plugins/Competitors/src/competitorwidget.ui @@ -59,7 +59,7 @@ - + competitors.registration @@ -96,7 +96,7 @@ - + competitors.classId @@ -113,7 +113,7 @@ - + competitors.country @@ -140,7 +140,7 @@ - + competitors.club @@ -167,7 +167,7 @@ - + competitors.licence @@ -194,7 +194,7 @@ - + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter @@ -207,14 +207,14 @@ - + competitors.firstName - + competitors.note @@ -231,7 +231,7 @@ - + competitors.lastName @@ -315,7 +315,7 @@ 3 - + @@ -324,19 +324,19 @@ - qf::qmlwidgets::TableView + qf::gui::TableView QTableView -
qf/qmlwidgets/tableview.h
+
qf/gui/tableview.h
 - qf::qmlwidgets::LineEdit + qf::gui::LineEdit QLineEdit -
qf/qmlwidgets/lineedit.h
+
qf/gui/lineedit.h
 - qf::qmlwidgets::ForeignKeyComboBox + qf::gui::ForeignKeyComboBox QComboBox -
qf/qmlwidgets/combobox.h
+
qf/gui/combobox.h
 quickevent::gui::si::SiIdEdit @@ -349,9 +349,9 @@
plugins/Event/src/findregistrationedit.h
 - qf::qmlwidgets::SpinBox + qf::gui::SpinBox QSpinBox -
qf/qmlwidgets/spinbox.h
+
qf/gui/spinbox.h
 diff --git a/quickevent/app/quickevent/plugins/Core/src/coreplugin.cpp b/quickevent/app/quickevent/plugins/Core/src/coreplugin.cpp index 0a58bb117..aefb7db88 100644 --- a/quickevent/app/quickevent/plugins/Core/src/coreplugin.cpp +++ b/quickevent/app/quickevent/plugins/Core/src/coreplugin.cpp @@ -5,9 +5,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include @@ -20,8 +20,8 @@ #include #include -namespace qfw = qf::qmlwidgets; -namespace qff = qf::qmlwidgets::framework; +namespace qfw = qf::gui; +namespace qff = qf::gui::framework; namespace Core { diff --git a/quickevent/app/quickevent/plugins/Core/src/coreplugin.h b/quickevent/app/quickevent/plugins/Core/src/coreplugin.h index 366b6c7d1..f23fdba59 100644 --- a/quickevent/app/quickevent/plugins/Core/src/coreplugin.h +++ b/quickevent/app/quickevent/plugins/Core/src/coreplugin.h @@ -1,6 +1,6 @@ #pragma once -#include +#include class QSettings; @@ -8,10 +8,10 @@ namespace Core { class SettingsDialog; -class CorePlugin : public qf::qmlwidgets::framework::Plugin +class CorePlugin : public qf::gui::framework::Plugin { Q_OBJECT - using Super = qf::qmlwidgets::framework::Plugin; + using Super = qf::gui::framework::Plugin; public: CorePlugin(QObject *parent = nullptr); diff --git a/quickevent/app/quickevent/plugins/Core/src/widgets/appstatusbar.h b/quickevent/app/quickevent/plugins/Core/src/widgets/appstatusbar.h index cc33a9c97..869dc0b70 100644 --- a/quickevent/app/quickevent/plugins/Core/src/widgets/appstatusbar.h +++ b/quickevent/app/quickevent/plugins/Core/src/widgets/appstatusbar.h @@ -2,21 +2,21 @@ #include -#include +#include class QLabel; class QProgressBar; namespace Core { -class AppStatusBar : public qf::qmlwidgets::StatusBar +class AppStatusBar : public qf::gui::StatusBar { Q_OBJECT Q_PROPERTY(QString eventName READ eventName WRITE setEventName NOTIFY eventNameChanged) Q_PROPERTY(int stageNo READ stageNo WRITE setStageNo NOTIFY stageNoChanged) private: - typedef qf::qmlwidgets::StatusBar Super; + typedef qf::gui::StatusBar Super; public: AppStatusBar(QWidget *parent = nullptr); ~AppStatusBar() Q_DECL_OVERRIDE; diff --git a/quickevent/app/quickevent/plugins/Core/src/widgets/reportssettingspage.cpp b/quickevent/app/quickevent/plugins/Core/src/widgets/reportssettingspage.cpp index abe8e1caf..ef3f824e0 100644 --- a/quickevent/app/quickevent/plugins/Core/src/widgets/reportssettingspage.cpp +++ b/quickevent/app/quickevent/plugins/Core/src/widgets/reportssettingspage.cpp @@ -3,8 +3,8 @@ #include "../reportssettings.h" #include -#include -#include +#include +#include #include #include @@ -22,8 +22,8 @@ ReportsSettingsPage::ReportsSettingsPage(QWidget *parent) : connect(ui->btSelectCustomReportsDirectory, &QAbstractButton::clicked, this, &ReportsSettingsPage::onSelectCustomReportsDirectoryClicked); - ui->edReportsDirectory->setPlaceholderText(qf::qmlwidgets::framework::Plugin::defaultReportsDir()); - ui->lblHelp->setText(ui->lblHelp->text().arg(qf::qmlwidgets::framework::Plugin::defaultReportsDir())); + ui->edReportsDirectory->setPlaceholderText(qf::gui::framework::Plugin::defaultReportsDir()); + ui->lblHelp->setText(ui->lblHelp->text().arg(qf::gui::framework::Plugin::defaultReportsDir())); connect(ui->btSetDefaultReportsDir, &QAbstractButton::clicked, this, [this]() { setReportsDirectory({}); @@ -37,7 +37,7 @@ ReportsSettingsPage::~ReportsSettingsPage() void ReportsSettingsPage::setReportsDirectory(const QString dir) { - auto default_reports_dir = qf::qmlwidgets::framework::Plugin::defaultReportsDir(); + auto default_reports_dir = qf::gui::framework::Plugin::defaultReportsDir(); if (dir == default_reports_dir) { ui->edReportsDirectory->setText({}); } @@ -71,7 +71,7 @@ void ReportsSettingsPage::save() ReportsSettings settings; auto dir = ui->edReportsDirectory->text().trimmed(); settings.setReportsDirectory(dir); - qf::qmlwidgets::framework::Plugin::setReportsDir(dir); + qf::gui::framework::Plugin::setReportsDir(dir); } QString ReportsSettingsPage::reportsDirectoryFromSettings() const @@ -79,7 +79,7 @@ QString ReportsSettingsPage::reportsDirectoryFromSettings() const ReportsSettings settings; auto dir = settings.reportsDirectory(); if(dir.isEmpty()) - dir = qf::qmlwidgets::framework::Plugin::defaultReportsDir(); + dir = qf::gui::framework::Plugin::defaultReportsDir(); return dir; } diff --git a/quickevent/app/quickevent/plugins/Core/src/widgets/reportssettingspage.ui b/quickevent/app/quickevent/plugins/Core/src/widgets/reportssettingspage.ui index bbf621f6a..fbbc4b1a4 100644 --- a/quickevent/app/quickevent/plugins/Core/src/widgets/reportssettingspage.ui +++ b/quickevent/app/quickevent/plugins/Core/src/widgets/reportssettingspage.ui @@ -49,8 +49,8 @@ ... - - :/qf/qmlwidgets/images/flat/reload.svg:/qf/qmlwidgets/images/flat/reload.svg + + :/qf/gui/images/flat/reload.svg:/qf/gui/images/flat/reload.svg @@ -85,7 +85,7 @@ - + diff --git a/quickevent/app/quickevent/plugins/Core/src/widgets/settingsdialog.cpp b/quickevent/app/quickevent/plugins/Core/src/widgets/settingsdialog.cpp index 1aa7b8fb1..f53431ec5 100644 --- a/quickevent/app/quickevent/plugins/Core/src/widgets/settingsdialog.cpp +++ b/quickevent/app/quickevent/plugins/Core/src/widgets/settingsdialog.cpp @@ -4,8 +4,8 @@ #include "settingspage.h" #include -#include -#include +#include +#include #include #include diff --git a/quickevent/app/quickevent/plugins/Event/src/connectdbdialogwidget.cpp b/quickevent/app/quickevent/plugins/Event/src/connectdbdialogwidget.cpp index 68892e634..9ea535b6a 100644 --- a/quickevent/app/quickevent/plugins/Event/src/connectdbdialogwidget.cpp +++ b/quickevent/app/quickevent/plugins/Event/src/connectdbdialogwidget.cpp @@ -2,8 +2,8 @@ #include "ui_connectdbdialogwidget.h" #include "connectionsettings.h" -#include -//#include +#include +//#include ConnectDbDialogWidget::ConnectDbDialogWidget(QWidget *parent) : Super(parent), @@ -106,8 +106,8 @@ void ConnectDbDialogWidget::saveSettings() void ConnectDbDialogWidget::onSingleWorkingDirectoryClicked() { - //qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); - QString wd = qf::qmlwidgets::dialogs::FileDialog::getExistingDirectory(this, tr("Event files directory"), ui->edSingleWorkingDir->text()); + //qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); + QString wd = qf::gui::dialogs::FileDialog::getExistingDirectory(this, tr("Event files directory"), ui->edSingleWorkingDir->text()); if(!wd.isEmpty()) ui->edSingleWorkingDir->setText(wd); } diff --git a/quickevent/app/quickevent/plugins/Event/src/connectdbdialogwidget.h b/quickevent/app/quickevent/plugins/Event/src/connectdbdialogwidget.h index 52c953371..c646197c1 100644 --- a/quickevent/app/quickevent/plugins/Event/src/connectdbdialogwidget.h +++ b/quickevent/app/quickevent/plugins/Event/src/connectdbdialogwidget.h @@ -3,17 +3,17 @@ #include "eventplugin.h" -#include +#include namespace Ui { class ConnectDbDialogWidget; } -class ConnectDbDialogWidget : public qf::qmlwidgets::framework::DialogWidget +class ConnectDbDialogWidget : public qf::gui::framework::DialogWidget { Q_OBJECT private: - using Super = qf::qmlwidgets::framework::DialogWidget; + using Super = qf::gui::framework::DialogWidget; public: explicit ConnectDbDialogWidget(QWidget *parent = nullptr); ~ConnectDbDialogWidget(); diff --git a/quickevent/app/quickevent/plugins/Event/src/dbschema.cpp b/quickevent/app/quickevent/plugins/Event/src/dbschema.cpp index 656e11967..f00315221 100644 --- a/quickevent/app/quickevent/plugins/Event/src/dbschema.cpp +++ b/quickevent/app/quickevent/plugins/Event/src/dbschema.cpp @@ -1,8 +1,8 @@ #include "dbschema.h" #include "eventplugin.h" -//#include -#include +//#include +#include #include #include @@ -27,7 +27,7 @@ QObject *DbSchema::dbSchemaRoot() qfLogFuncFrame(); if(m_dbschemaComponent == nullptr) { auto *qml_engine = qmlEngine(); - //auto *app = qf::qmlwidgets::framework::Application::instance(); + //auto *app = qf::gui::framework::Application::instance(); QString dbschema_file = m_eventPlugin->qmlDir() + "/DbSchema.qml"; m_dbschemaComponent = new QQmlComponent(qml_engine, qml_engine); QUrl dbschema_url = QUrl::fromLocalFile(dbschema_file); diff --git a/quickevent/app/quickevent/plugins/Event/src/eventconfig.cpp b/quickevent/app/quickevent/plugins/Event/src/eventconfig.cpp index 8988b6792..18b160370 100644 --- a/quickevent/app/quickevent/plugins/Event/src/eventconfig.cpp +++ b/quickevent/app/quickevent/plugins/Event/src/eventconfig.cpp @@ -7,8 +7,8 @@ #include #include -#include -#include +#include +#include #include @@ -126,8 +126,8 @@ void EventConfig::save(const QString &path_to_save) } } catch(const qf::core::Exception &e) { - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); - qf::qmlwidgets::dialogs::MessageBox::showException(fwk, e); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); + qf::gui::dialogs::MessageBox::showException(fwk, e); } } diff --git a/quickevent/app/quickevent/plugins/Event/src/eventdialogwidget.h b/quickevent/app/quickevent/plugins/Event/src/eventdialogwidget.h index f02a33ea0..1f7ba95cf 100644 --- a/quickevent/app/quickevent/plugins/Event/src/eventdialogwidget.h +++ b/quickevent/app/quickevent/plugins/Event/src/eventdialogwidget.h @@ -1,17 +1,17 @@ #ifndef EVENTDIALOGWIDGET_H #define EVENTDIALOGWIDGET_H -#include +#include namespace Ui { class EventDialogWidget; } -class EventDialogWidget : public qf::qmlwidgets::framework::DialogWidget +class EventDialogWidget : public qf::gui::framework::DialogWidget { Q_OBJECT private: - typedef qf::qmlwidgets::framework::DialogWidget Super; + typedef qf::gui::framework::DialogWidget Super; public: explicit EventDialogWidget(QWidget *parent = nullptr); ~EventDialogWidget() Q_DECL_OVERRIDE; diff --git a/quickevent/app/quickevent/plugins/Event/src/eventplugin.cpp b/quickevent/app/quickevent/plugins/Event/src/eventplugin.cpp index 830f9d0ad..44197bac4 100644 --- a/quickevent/app/quickevent/plugins/Event/src/eventplugin.cpp +++ b/quickevent/app/quickevent/plugins/Event/src/eventplugin.cpp @@ -19,17 +19,17 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -60,9 +60,9 @@ #include -namespace qfw = qf::qmlwidgets; -namespace qff = qf::qmlwidgets::framework; -namespace qfd = qf::qmlwidgets::dialogs; +namespace qfw = qf::gui; +namespace qff = qf::gui::framework; +namespace qfd = qf::gui::dialogs; namespace qfs = qf::core::sql; using qff::getPlugin; @@ -358,7 +358,7 @@ void EventPlugin::onInstalled() act_stage->setVisible(false); - auto *style = qf::qmlwidgets::Style::instance(); + auto *style = qf::gui::Style::instance(); QIcon ico(style->icon("settings")); m_actEditStage = new qfw::Action(ico, "Stage settings"); m_actEditStage->setVisible(false); @@ -414,7 +414,7 @@ void EventPlugin::onInstalled() a->setShortcut(QKeySequence("ctrl+shift+R")); fwk->menuBar()->actionForPath("view")->addActionInto(a); } - auto core_plugin = qf::qmlwidgets::framework::getPlugin(); + auto core_plugin = qf::gui::framework::getPlugin(); core_plugin->settingsDialog()->addPage(new LentCardsSettingsPage()); } } @@ -448,7 +448,7 @@ void EventPlugin::editStage() //qfLogFuncFrame();// << "id:" << id << "mode:" << mode; int stage_id = currentStageId(); auto *w = new Event::StageWidget(); - auto *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + auto *fwk = qf::gui::framework::MainWindow::frameWork(); qfd::Dialog dlg(QDialogButtonBox::Save | QDialogButtonBox::Cancel, fwk); dlg.setDefaultButton(QDialogButtonBox::Save); dlg.setCentralWidget(w); @@ -836,11 +836,11 @@ bool EventPlugin::createEvent(const QString &event_name, const QVariantMap &even event_id = event_w->eventId(); new_params = event_w->saveParams(); if(event_id.isEmpty()) { - qf::qmlwidgets::dialogs::MessageBox::showError(fwk, tr("Event ID cannot be empty.")); + qf::gui::dialogs::MessageBox::showError(fwk, tr("Event ID cannot be empty.")); continue; } if(existing_event_ids.contains(event_id)) { - qf::qmlwidgets::dialogs::MessageBox::showError(fwk, tr("Event ID %1 exists already.").arg(event_id)); + qf::gui::dialogs::MessageBox::showError(fwk, tr("Event ID %1 exists already.").arg(event_id)); continue; } break; @@ -1168,7 +1168,7 @@ void EventPlugin::exportEvent_qbe() qfLogFuncFrame(); qff::MainWindow *fwk = qff::MainWindow::frameWork(); QString ext = ".qbe"; - QString ex_fn = qf::qmlwidgets::dialogs::FileDialog::getSaveFileName (fwk, tr("Export as Quick Event"), singleFileStorageDir(), tr("Quick Event files *%1 (*%1)").arg(ext)); + QString ex_fn = qf::gui::dialogs::FileDialog::getSaveFileName (fwk, tr("Export as Quick Event"), singleFileStorageDir(), tr("Quick Event files *%1 (*%1)").arg(ext)); if(ex_fn.isEmpty()) return; if(!ex_fn.endsWith(ext, Qt::CaseInsensitive)) @@ -1238,7 +1238,7 @@ void EventPlugin::importEvent_qbe() qfLogFuncFrame(); qff::MainWindow *fwk = qff::MainWindow::frameWork(); QString ext = ".qbe"; - QString fn = qf::qmlwidgets::dialogs::FileDialog::getOpenFileName (fwk, tr("Import as Quick Event"), QString(), tr("Quick Event files *%1 (*%1)").arg(ext)); + QString fn = qf::gui::dialogs::FileDialog::getOpenFileName (fwk, tr("Import as Quick Event"), QString(), tr("Quick Event files *%1 (*%1)").arg(ext)); if(fn.isEmpty()) return; QString event_name = qf::core::utils::FileUtils::baseName(fn) + "_2"; @@ -1367,10 +1367,10 @@ void EventPlugin::reloadRegistrationsModel() m_registrationsTable = qf::core::utils::Table(); } -qf::qmlwidgets::model::SqlTableModel* EventPlugin::registrationsModel() +qf::gui::model::SqlTableModel* EventPlugin::registrationsModel() { if(!m_registrationsModel) { - m_registrationsModel = new qf::qmlwidgets::model::SqlTableModel(this); + m_registrationsModel = new qf::gui::model::SqlTableModel(this); m_registrationsModel->addColumn("competitorName", tr("Name")); m_registrationsModel->addColumn("registration", tr("Reg")); m_registrationsModel->addColumn("licence", tr("Lic")); @@ -1389,7 +1389,7 @@ qf::qmlwidgets::model::SqlTableModel* EventPlugin::registrationsModel() const qf::core::utils::Table &EventPlugin::registrationsTable() { - qf::qmlwidgets::model::SqlTableModel *m = registrationsModel(); + qf::gui::model::SqlTableModel *m = registrationsModel(); if(m_registrationsTable.isNull() && !m->table().isNull()) { m_registrationsTable = m->table(); auto c_nsk = QStringLiteral("competitorNameAscii7"); diff --git a/quickevent/app/quickevent/plugins/Event/src/eventplugin.h b/quickevent/app/quickevent/plugins/Event/src/eventplugin.h index 31a7401ba..823496c79 100644 --- a/quickevent/app/quickevent/plugins/Event/src/eventplugin.h +++ b/quickevent/app/quickevent/plugins/Event/src/eventplugin.h @@ -4,7 +4,7 @@ #include "eventconfig.h" #include "stage.h" -#include +#include #include #include @@ -13,9 +13,9 @@ #include namespace qf::core::sql { class Query; class Connection; } -namespace qf::qmlwidgets { class Action; } -namespace qf::qmlwidgets::framework { class DockWidget; } -namespace qf::qmlwidgets::model { class SqlTableModel; } +namespace qf::gui { class Action; } +namespace qf::gui::framework { class DockWidget; } +namespace qf::gui::model { class SqlTableModel; } class QComboBox; class DbSchema; @@ -26,7 +26,7 @@ namespace Event { static constexpr auto START_LIST_IOFXML3_FILE = "startlist-iof3.xml"; static constexpr auto RESULTS_IOFXML3_FILE = "results-iof3.xml"; -class EventPlugin : public qf::qmlwidgets::framework::Plugin +class EventPlugin : public qf::gui::framework::Plugin { Q_OBJECT Q_PROPERTY(QObject* eventConfig READ eventConfig) @@ -36,7 +36,7 @@ class EventPlugin : public qf::qmlwidgets::framework::Plugin Q_PROPERTY(bool eventOpen READ isEventOpen WRITE setEventOpen NOTIFY eventOpenChanged) Q_PROPERTY(bool sqlServerConnected READ isSqlServerConnected NOTIFY sqlServerConnectedChanged) private: - using Super = qf::qmlwidgets::framework::Plugin; + using Super = qf::gui::framework::Plugin; public: enum class ConnectionType : int {SqlServer = 0, SingleFile}; public: @@ -111,7 +111,7 @@ class EventPlugin : public qf::qmlwidgets::framework::Plugin Q_SLOT void onInstalled(); - qf::qmlwidgets::model::SqlTableModel* registrationsModel(); + qf::gui::model::SqlTableModel* registrationsModel(); const qf::core::utils::Table& registrationsTable(); public: @@ -142,16 +142,16 @@ class EventPlugin : public qf::qmlwidgets::framework::Plugin void onServiceDockVisibleChanged(bool on = true); private: - qf::qmlwidgets::Action *m_actConnectDb = nullptr; - qf::qmlwidgets::Action *m_actEvent = nullptr; - qf::qmlwidgets::Action *m_actImport = nullptr; - qf::qmlwidgets::Action *m_actExport = nullptr; - qf::qmlwidgets::Action *m_actCreateEvent = nullptr; - qf::qmlwidgets::Action *m_actOpenEvent = nullptr; - qf::qmlwidgets::Action *m_actEditEvent = nullptr; - qf::qmlwidgets::Action *m_actExportEvent_qbe = nullptr; - qf::qmlwidgets::Action *m_actImportEvent_qbe = nullptr; - qf::qmlwidgets::Action *m_actEditStage = nullptr; + qf::gui::Action *m_actConnectDb = nullptr; + qf::gui::Action *m_actEvent = nullptr; + qf::gui::Action *m_actImport = nullptr; + qf::gui::Action *m_actExport = nullptr; + qf::gui::Action *m_actCreateEvent = nullptr; + qf::gui::Action *m_actOpenEvent = nullptr; + qf::gui::Action *m_actEditEvent = nullptr; + qf::gui::Action *m_actExportEvent_qbe = nullptr; + qf::gui::Action *m_actImportEvent_qbe = nullptr; + qf::gui::Action *m_actEditStage = nullptr; Event::EventConfig *m_eventConfig = nullptr; bool m_sqlServerConnected = false; QComboBox *m_cbxStage = nullptr; @@ -159,10 +159,10 @@ class EventPlugin : public qf::qmlwidgets::framework::Plugin QMap m_stageCache; QMap m_classNameCache; - qf::qmlwidgets::framework::DockWidget *m_servicesDockWidget = nullptr; - qf::qmlwidgets::framework::DockWidget *m_registrationsDockWidget = nullptr; + qf::gui::framework::DockWidget *m_servicesDockWidget = nullptr; + qf::gui::framework::DockWidget *m_registrationsDockWidget = nullptr; - qf::qmlwidgets::model::SqlTableModel *m_registrationsModel = nullptr; + qf::gui::model::SqlTableModel *m_registrationsModel = nullptr; qf::core::utils::Table m_registrationsTable; }; diff --git a/quickevent/app/quickevent/plugins/Event/src/findregistrationedit.cpp b/quickevent/app/quickevent/plugins/Event/src/findregistrationedit.cpp index bc5bb9715..8fa9aa61d 100644 --- a/quickevent/app/quickevent/plugins/Event/src/findregistrationedit.cpp +++ b/quickevent/app/quickevent/plugins/Event/src/findregistrationedit.cpp @@ -2,10 +2,10 @@ #include "eventplugin.h" -#include -#include +#include +#include -#include +#include #include #include @@ -13,7 +13,7 @@ #include #include -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Event::EventPlugin; class FindRegistrationsModel : public QAbstractTableModel diff --git a/quickevent/app/quickevent/plugins/Event/src/lentcardssettingspage.cpp b/quickevent/app/quickevent/plugins/Event/src/lentcardssettingspage.cpp index 5e5394574..1e59aacb2 100644 --- a/quickevent/app/quickevent/plugins/Event/src/lentcardssettingspage.cpp +++ b/quickevent/app/quickevent/plugins/Event/src/lentcardssettingspage.cpp @@ -1,9 +1,9 @@ #include "lentcardssettingspage.h" #include "ui_lentcardssettingspage.h" -#include +#include -namespace qfm = qf::qmlwidgets::model; +namespace qfm = qf::gui::model; namespace qfs = qf::core::sql; LentCardsSettingsPage::LentCardsSettingsPage(QWidget *parent) diff --git a/quickevent/app/quickevent/plugins/Event/src/lentcardssettingspage.h b/quickevent/app/quickevent/plugins/Event/src/lentcardssettingspage.h index 2275d63a9..38210c804 100644 --- a/quickevent/app/quickevent/plugins/Event/src/lentcardssettingspage.h +++ b/quickevent/app/quickevent/plugins/Event/src/lentcardssettingspage.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include @@ -8,7 +8,7 @@ namespace Ui { class LentCardsSettingsPage; } -namespace qf::qmlwidgets::model { class SqlTableModel; } +namespace qf::gui::model { class SqlTableModel; } class LentCardsSettingsPage : public Core::SettingsPage { @@ -25,6 +25,6 @@ class LentCardsSettingsPage : public Core::SettingsPage private: Ui::LentCardsSettingsPage *ui; - qf::qmlwidgets::model::SqlTableModel *m_tableModel; + qf::gui::model::SqlTableModel *m_tableModel; }; diff --git a/quickevent/app/quickevent/plugins/Event/src/lentcardssettingspage.ui b/quickevent/app/quickevent/plugins/Event/src/lentcardssettingspage.ui index a518f54b5..6b169db7f 100644 --- a/quickevent/app/quickevent/plugins/Event/src/lentcardssettingspage.ui +++ b/quickevent/app/quickevent/plugins/Event/src/lentcardssettingspage.ui @@ -30,23 +30,23 @@ 1 - + - + - qf::qmlwidgets::TableView + qf::gui::TableView QTableView -
qf/qmlwidgets/tableview.h
+
qf/gui/tableview.h
 - qf::qmlwidgets::TableViewToolBar + qf::gui::TableViewToolBar QWidget -
qf/qmlwidgets/tableviewtoolbar.h
+
qf/gui/tableviewtoolbar.h
1 diff --git a/quickevent/app/quickevent/plugins/Event/src/registrationswidget.cpp b/quickevent/app/quickevent/plugins/Event/src/registrationswidget.cpp index 3b2469b89..6f55145bb 100644 --- a/quickevent/app/quickevent/plugins/Event/src/registrationswidget.cpp +++ b/quickevent/app/quickevent/plugins/Event/src/registrationswidget.cpp @@ -2,14 +2,14 @@ #include "ui_registrationswidget.h" #include "eventplugin.h" -#include +#include -#include +#include #include #include #include -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Event::EventPlugin; RegistrationsWidget::RegistrationsWidget(QWidget *parent) : @@ -37,15 +37,15 @@ void RegistrationsWidget::checkModel() return; if(!ui->tblRegistrations->tableModel()) { - qf::qmlwidgets::model::SqlTableModel *reg_model = getPlugin()->registrationsModel(); + qf::gui::model::SqlTableModel *reg_model = getPlugin()->registrationsModel(); ui->tblRegistrations->setTableModel(reg_model); - connect(reg_model, &qf::qmlwidgets::model::SqlTableModel::reloaded, this, [this]() { + connect(reg_model, &qf::gui::model::SqlTableModel::reloaded, this, [this]() { ui->tblRegistrations->horizontalHeader()->resizeSections(QHeaderView::ResizeToContents); }); } } -qf::qmlwidgets::TableView *RegistrationsWidget::tableView() +qf::gui::TableView *RegistrationsWidget::tableView() { return ui->tblRegistrations; } diff --git a/quickevent/app/quickevent/plugins/Event/src/registrationswidget.h b/quickevent/app/quickevent/plugins/Event/src/registrationswidget.h index 091f3d912..79f5934ed 100644 --- a/quickevent/app/quickevent/plugins/Event/src/registrationswidget.h +++ b/quickevent/app/quickevent/plugins/Event/src/registrationswidget.h @@ -8,7 +8,7 @@ class RegistrationsWidget; } namespace qf { -namespace qmlwidgets { +namespace gui { class TableView; }} @@ -26,7 +26,7 @@ class RegistrationsWidget : public QWidget void checkModel(); //void setFocusToWidget(FocusWidget fw); - qf::qmlwidgets::TableView* tableView(); + qf::gui::TableView* tableView(); private: Ui::RegistrationsWidget *ui; //QSortFilterProxyModel *m_tableModel = nullptr; diff --git a/quickevent/app/quickevent/plugins/Event/src/registrationswidget.ui b/quickevent/app/quickevent/plugins/Event/src/registrationswidget.ui index e16d6e141..7da892e45 100644 --- a/quickevent/app/quickevent/plugins/Event/src/registrationswidget.ui +++ b/quickevent/app/quickevent/plugins/Event/src/registrationswidget.ui @@ -30,23 +30,23 @@ 2 - + - + - qf::qmlwidgets::TableView + qf::gui::TableView QTableView -
qf/qmlwidgets/tableview.h
+
qf/gui/tableview.h
 - qf::qmlwidgets::TableViewToolBar + qf::gui::TableViewToolBar QWidget -
qf/qmlwidgets/tableviewtoolbar.h
+
qf/gui/tableviewtoolbar.h
1 diff --git a/quickevent/app/quickevent/plugins/Event/src/services/emmaclient.cpp b/quickevent/app/quickevent/plugins/Event/src/services/emmaclient.cpp index 868dab048..fb368bd47 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/emmaclient.cpp +++ b/quickevent/app/quickevent/plugins/Event/src/services/emmaclient.cpp @@ -6,8 +6,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -25,7 +25,7 @@ #include namespace qfs = qf::core::sql; -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Event::EventPlugin; using Relays::RelaysPlugin; using Runs::RunsPlugin; @@ -285,7 +285,7 @@ void EmmaClient::onCardChecked(const QVariantMap &data) out << s << "\n";*/ } -qf::qmlwidgets::framework::DialogWidget *EmmaClient::createDetailWidget() +qf::gui::framework::DialogWidget *EmmaClient::createDetailWidget() { auto *w = new EmmaClientWidget(); return w; diff --git a/quickevent/app/quickevent/plugins/Event/src/services/emmaclient.h b/quickevent/app/quickevent/plugins/Event/src/services/emmaclient.h index 9beecadcc..49b123f9e 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/emmaclient.h +++ b/quickevent/app/quickevent/plugins/Event/src/services/emmaclient.h @@ -54,7 +54,7 @@ class EmmaClient : public Service bool createExportDir() const; void onDbEventNotify(const QString &domain, int connection_id, const QVariant &data); void onCardChecked(const QVariantMap &data); - qf::qmlwidgets::framework::DialogWidget *createDetailWidget() override; + qf::gui::framework::DialogWidget *createDetailWidget() override; private: void onExportTimerTimeOut(); void init(); diff --git a/quickevent/app/quickevent/plugins/Event/src/services/emmaclientwidget.cpp b/quickevent/app/quickevent/plugins/Event/src/services/emmaclientwidget.cpp index b8b47dc4f..48833f987 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/emmaclientwidget.cpp +++ b/quickevent/app/quickevent/plugins/Event/src/services/emmaclientwidget.cpp @@ -2,14 +2,14 @@ #include "ui_emmaclientwidget.h" #include "emmaclient.h" #include "../eventplugin.h" -#include +#include -#include +#include #include #include -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; namespace Event::services { @@ -74,7 +74,7 @@ bool EmmaClientWidget::acceptDialogDone(int result) { if(result == QDialog::Accepted) { if(!saveSettings()) { - qf::qmlwidgets::dialogs::MessageBox::showError(this, tr("Cannot create directory '%1'.").arg(ui->edExportDir->text().trimmed())); + qf::gui::dialogs::MessageBox::showError(this, tr("Cannot create directory '%1'.").arg(ui->edExportDir->text().trimmed())); return false; } } diff --git a/quickevent/app/quickevent/plugins/Event/src/services/emmaclientwidget.h b/quickevent/app/quickevent/plugins/Event/src/services/emmaclientwidget.h index b24bcde3b..97c94a30e 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/emmaclientwidget.h +++ b/quickevent/app/quickevent/plugins/Event/src/services/emmaclientwidget.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace Event { namespace services { @@ -11,11 +11,11 @@ class EmmaClientWidget; class EmmaClient; -class EmmaClientWidget : public qf::qmlwidgets::framework::DialogWidget +class EmmaClientWidget : public qf::gui::framework::DialogWidget { Q_OBJECT - using Super = qf::qmlwidgets::framework::DialogWidget; + using Super = qf::gui::framework::DialogWidget; public: explicit EmmaClientWidget(QWidget *parent = nullptr); ~EmmaClientWidget(); diff --git a/quickevent/app/quickevent/plugins/Event/src/services/ofeed/ofeedclient.cpp b/quickevent/app/quickevent/plugins/Event/src/services/ofeed/ofeedclient.cpp index 6e242cadb..cb2bdaf86 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/ofeed/ofeedclient.cpp +++ b/quickevent/app/quickevent/plugins/Event/src/services/ofeed/ofeedclient.cpp @@ -3,8 +3,8 @@ #include "../../eventplugin.h" -#include -#include +#include +#include #include #include @@ -38,7 +38,7 @@ #include using Event::EventPlugin; -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Relays::RelaysPlugin; using Runs::RunsPlugin; @@ -97,7 +97,7 @@ void OFeedClient::exportStartListIofXml3(std::function on_success) sendFile("start list upload", "/rest/v1/upload/iof", str, on_success); } -qf::qmlwidgets::framework::DialogWidget *OFeedClient::createDetailWidget() +qf::gui::framework::DialogWidget *OFeedClient::createDetailWidget() { auto *w = new OFeedClientWidget(); return w; diff --git a/quickevent/app/quickevent/plugins/Event/src/services/ofeed/ofeedclient.h b/quickevent/app/quickevent/plugins/Event/src/services/ofeed/ofeedclient.h index fbe999eeb..2cd3f7f64 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/ofeed/ofeedclient.h +++ b/quickevent/app/quickevent/plugins/Event/src/services/ofeed/ofeedclient.h @@ -48,7 +48,7 @@ class OFeedClient : public Service QTimer *m_exportTimer = nullptr; QNetworkAccessManager *m_networkManager = nullptr; private: - qf::qmlwidgets::framework::DialogWidget *createDetailWidget() override; + qf::gui::framework::DialogWidget *createDetailWidget() override; void onExportTimerTimeOut(); void init(); void sendFile(QString name, QString request_path, QString file, std::function on_success = nullptr); diff --git a/quickevent/app/quickevent/plugins/Event/src/services/ofeed/ofeedclientwidget.cpp b/quickevent/app/quickevent/plugins/Event/src/services/ofeed/ofeedclientwidget.cpp index a4ed906a5..0517dd29c 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/ofeed/ofeedclientwidget.cpp +++ b/quickevent/app/quickevent/plugins/Event/src/services/ofeed/ofeedclientwidget.cpp @@ -2,8 +2,8 @@ #include "ui_ofeedclientwidget.h" #include "ofeedclient.h" -#include -#include +#include +#include #include #include diff --git a/quickevent/app/quickevent/plugins/Event/src/services/ofeed/ofeedclientwidget.h b/quickevent/app/quickevent/plugins/Event/src/services/ofeed/ofeedclientwidget.h index 917e8aa9f..bce494bd2 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/ofeed/ofeedclientwidget.h +++ b/quickevent/app/quickevent/plugins/Event/src/services/ofeed/ofeedclientwidget.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace Event { namespace services { @@ -11,11 +11,11 @@ class OFeedClientWidget; class OFeedClient; -class OFeedClientWidget : public qf::qmlwidgets::framework::DialogWidget +class OFeedClientWidget : public qf::gui::framework::DialogWidget { Q_OBJECT - using Super = qf::qmlwidgets::framework::DialogWidget; + using Super = qf::gui::framework::DialogWidget; public: explicit OFeedClientWidget(QWidget *parent = nullptr); ~OFeedClientWidget(); diff --git a/quickevent/app/quickevent/plugins/Event/src/services/oresultsclient.cpp b/quickevent/app/quickevent/plugins/Event/src/services/oresultsclient.cpp index b880ca50f..0bf6a6f46 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/oresultsclient.cpp +++ b/quickevent/app/quickevent/plugins/Event/src/services/oresultsclient.cpp @@ -3,8 +3,8 @@ #include "../eventplugin.h" -#include -#include +#include +#include #include #include @@ -24,7 +24,7 @@ #include #include -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Event::EventPlugin; using Relays::RelaysPlugin; using Runs::RunsPlugin; @@ -81,7 +81,7 @@ void OResultsClient::exportStartListIofXml3(std::function on_success) sendFile("start list upload", "/start-lists", str, on_success); } -qf::qmlwidgets::framework::DialogWidget *OResultsClient::createDetailWidget() +qf::gui::framework::DialogWidget *OResultsClient::createDetailWidget() { auto *w = new OResultsClientWidget(); return w; diff --git a/quickevent/app/quickevent/plugins/Event/src/services/oresultsclient.h b/quickevent/app/quickevent/plugins/Event/src/services/oresultsclient.h index d8ef89dde..500024a2c 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/oresultsclient.h +++ b/quickevent/app/quickevent/plugins/Event/src/services/oresultsclient.h @@ -42,7 +42,7 @@ class OResultsClient : public Service const QString API_URL = "https://api.oresults.eu"; private: void loadSettings() override; - qf::qmlwidgets::framework::DialogWidget *createDetailWidget() override; + qf::gui::framework::DialogWidget *createDetailWidget() override; void onExportTimerTimeOut(); void init(); void sendFile(QString name, QString request_path, QString file, std::function on_success = nullptr); diff --git a/quickevent/app/quickevent/plugins/Event/src/services/oresultsclientwidget.cpp b/quickevent/app/quickevent/plugins/Event/src/services/oresultsclientwidget.cpp index 18bf194d7..79cc7d1ac 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/oresultsclientwidget.cpp +++ b/quickevent/app/quickevent/plugins/Event/src/services/oresultsclientwidget.cpp @@ -1,9 +1,9 @@ #include "oresultsclientwidget.h" #include "ui_oresultsclientwidget.h" #include "oresultsclient.h" -#include +#include -#include +#include #include diff --git a/quickevent/app/quickevent/plugins/Event/src/services/oresultsclientwidget.h b/quickevent/app/quickevent/plugins/Event/src/services/oresultsclientwidget.h index 5f14dc3a5..b8eb1c7fd 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/oresultsclientwidget.h +++ b/quickevent/app/quickevent/plugins/Event/src/services/oresultsclientwidget.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace Event { namespace services { @@ -11,11 +11,11 @@ class OResultsClientWidget; class OResultsClient; -class OResultsClientWidget : public qf::qmlwidgets::framework::DialogWidget +class OResultsClientWidget : public qf::gui::framework::DialogWidget { Q_OBJECT - using Super = qf::qmlwidgets::framework::DialogWidget; + using Super = qf::gui::framework::DialogWidget; public: explicit OResultsClientWidget(QWidget *parent = nullptr); ~OResultsClientWidget(); diff --git a/quickevent/app/quickevent/plugins/Event/src/services/qx/qxclientservice.cpp b/quickevent/app/quickevent/plugins/Event/src/services/qx/qxclientservice.cpp index e1fa29743..c88dd183f 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/qx/qxclientservice.cpp +++ b/quickevent/app/quickevent/plugins/Event/src/services/qx/qxclientservice.cpp @@ -4,7 +4,7 @@ #include "../../eventplugin.h" #include "../../../../Runs/src/runsplugin.h" -#include +#include #include #include #include @@ -25,10 +25,10 @@ #include using namespace qf::core; -using namespace qf::qmlwidgets; -using namespace qf::qmlwidgets::dialogs; +using namespace qf::gui; +using namespace qf::gui::dialogs; using namespace qf::core::sql; -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Event::EventPlugin; using Runs::RunsPlugin; @@ -99,7 +99,7 @@ void QxClientService::stop() Super::stop(); } -qf::qmlwidgets::framework::DialogWidget *QxClientService::createDetailWidget() +qf::gui::framework::DialogWidget *QxClientService::createDetailWidget() { auto *w = new QxClientServiceWidget(); return w; diff --git a/quickevent/app/quickevent/plugins/Event/src/services/qx/qxclientservice.h b/quickevent/app/quickevent/plugins/Event/src/services/qx/qxclientservice.h index 79007bec0..636a54c4d 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/qx/qxclientservice.h +++ b/quickevent/app/quickevent/plugins/Event/src/services/qx/qxclientservice.h @@ -70,7 +70,7 @@ class QxClientService : public Service int eventId() const; private: void loadSettings() override; - qf::qmlwidgets::framework::DialogWidget *createDetailWidget() override; + qf::gui::framework::DialogWidget *createDetailWidget() override; void postFileCompressed(std::optional path, std::optional name, QByteArray data, QObject *context, std::function call_back = nullptr); enum class SpecFile {StartListIofXml3, RunsCsvJson}; void uploadSpecFile(SpecFile file, QByteArray data, QObject *context, const std::function &call_back = nullptr); diff --git a/quickevent/app/quickevent/plugins/Event/src/services/qx/qxclientservicewidget.cpp b/quickevent/app/quickevent/plugins/Event/src/services/qx/qxclientservicewidget.cpp index 58ef01b6a..e9a04902e 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/qx/qxclientservicewidget.cpp +++ b/quickevent/app/quickevent/plugins/Event/src/services/qx/qxclientservicewidget.cpp @@ -4,8 +4,8 @@ #include -#include -#include +#include +#include #include #include @@ -15,7 +15,7 @@ #include #include -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; namespace Event::services::qx { diff --git a/quickevent/app/quickevent/plugins/Event/src/services/qx/qxclientservicewidget.h b/quickevent/app/quickevent/plugins/Event/src/services/qx/qxclientservicewidget.h index f5840d512..f1b108a30 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/qx/qxclientservicewidget.h +++ b/quickevent/app/quickevent/plugins/Event/src/services/qx/qxclientservicewidget.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace Event::services::qx { @@ -10,11 +10,11 @@ class QxClientServiceWidget; class QxClientService; -class QxClientServiceWidget : public qf::qmlwidgets::framework::DialogWidget +class QxClientServiceWidget : public qf::gui::framework::DialogWidget { Q_OBJECT - using Super = qf::qmlwidgets::framework::DialogWidget; + using Super = qf::gui::framework::DialogWidget; public: explicit QxClientServiceWidget(QWidget *parent = nullptr); ~QxClientServiceWidget() override; diff --git a/quickevent/app/quickevent/plugins/Event/src/services/qx/qxlateregistrationswidget.cpp b/quickevent/app/quickevent/plugins/Event/src/services/qx/qxlateregistrationswidget.cpp index 285209fca..f0747e77a 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/qx/qxlateregistrationswidget.cpp +++ b/quickevent/app/quickevent/plugins/Event/src/services/qx/qxlateregistrationswidget.cpp @@ -7,18 +7,18 @@ #include -#include -#include +#include +#include #include #include #include #include -namespace qfm = qf::qmlwidgets::model; +namespace qfm = qf::gui::model; namespace qfs = qf::core::sql; -namespace qfw = qf::qmlwidgets; -using qf::qmlwidgets::framework::getPlugin; +namespace qfw = qf::gui; +using qf::gui::framework::getPlugin; namespace Event::services::qx { diff --git a/quickevent/app/quickevent/plugins/Event/src/services/qx/qxlateregistrationswidget.h b/quickevent/app/quickevent/plugins/Event/src/services/qx/qxlateregistrationswidget.h index 3439049be..6c972c739 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/qx/qxlateregistrationswidget.h +++ b/quickevent/app/quickevent/plugins/Event/src/services/qx/qxlateregistrationswidget.h @@ -2,7 +2,7 @@ #include -namespace qf::qmlwidgets::model { class SqlTableModel; } +namespace qf::gui::model { class SqlTableModel; } namespace Event::services::qx { @@ -36,7 +36,7 @@ class QxLateRegistrationsWidget : public QWidget private: Ui::QxLateRegistrationsWidget *ui; - qf::qmlwidgets::model::SqlTableModel *m_model; + qf::gui::model::SqlTableModel *m_model; }; } diff --git a/quickevent/app/quickevent/plugins/Event/src/services/qx/qxlateregistrationswidget.ui b/quickevent/app/quickevent/plugins/Event/src/services/qx/qxlateregistrationswidget.ui index a1ebf08eb..07bf69ed4 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/qx/qxlateregistrationswidget.ui +++ b/quickevent/app/quickevent/plugins/Event/src/services/qx/qxlateregistrationswidget.ui @@ -30,7 +30,7 @@ - + 0 @@ -121,20 +121,20 @@ - + - qf::qmlwidgets::TableView + qf::gui::TableView QTableView -
qf/qmlwidgets/tableview.h
+
qf/gui/tableview.h
 - qf::qmlwidgets::TableViewToolBar + qf::gui::TableViewToolBar QWidget -
qf/qmlwidgets/tableviewtoolbar.h
+
qf/gui/tableviewtoolbar.h
1 diff --git a/quickevent/app/quickevent/plugins/Event/src/services/qx/runchangedialog.cpp b/quickevent/app/quickevent/plugins/Event/src/services/qx/runchangedialog.cpp index 6b01dc76b..c44c38a94 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/qx/runchangedialog.cpp +++ b/quickevent/app/quickevent/plugins/Event/src/services/qx/runchangedialog.cpp @@ -110,7 +110,7 @@ void RunChangeDialog::loadOrigValues() } Competitors::CompetitorDocument doc; - doc.load(m_competitorId, qf::qmlwidgets::model::DataDocument::ModeView); + doc.load(m_competitorId, qf::gui::model::DataDocument::ModeView); m_origValues.first_name = doc.value("firstName").toString(); m_origValues.last_name = doc.value("lastName").toString(); @@ -237,7 +237,7 @@ void RunChangeDialog::resolveChanges(bool is_accepted) void RunChangeDialog::applyLocalChanges(bool is_accepted) { - using namespace qf::qmlwidgets::model; + using namespace qf::gui::model; bool is_insert = m_runId == 0; Competitors::CompetitorDocument doc; diff --git a/quickevent/app/quickevent/plugins/Event/src/services/service.cpp b/quickevent/app/quickevent/plugins/Event/src/services/service.cpp index 35d2cd288..0c469327c 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/service.cpp +++ b/quickevent/app/quickevent/plugins/Event/src/services/service.cpp @@ -2,17 +2,17 @@ #include "../eventplugin.h" -#include -#include -#include +#include +#include +#include #include #include -namespace qff = qf::qmlwidgets::framework; -namespace qfd = qf::qmlwidgets::dialogs; -using qf::qmlwidgets::framework::getPlugin; +namespace qff = qf::gui::framework; +namespace qfd = qf::gui::dialogs; +using qf::gui::framework::getPlugin; using Event::EventPlugin; @@ -147,7 +147,7 @@ Service *Service::serviceByName(const QString &service_name) return nullptr; } -qf::qmlwidgets::framework::DialogWidget *Service::createDetailWidget() +qf::gui::framework::DialogWidget *Service::createDetailWidget() { return nullptr; } diff --git a/quickevent/app/quickevent/plugins/Event/src/services/service.h b/quickevent/app/quickevent/plugins/Event/src/services/service.h index 78856e6f6..3942fb694 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/service.h +++ b/quickevent/app/quickevent/plugins/Event/src/services/service.h @@ -4,7 +4,7 @@ #include -namespace qf { namespace qmlwidgets { namespace framework { class DialogWidget; }}} +namespace qf { namespace gui { namespace framework { class DialogWidget; }}} namespace Event { class EventPlugin; } namespace Event { @@ -73,7 +73,7 @@ class Service : public QObject emit statusChanged(st); } - virtual qf::qmlwidgets::framework::DialogWidget *createDetailWidget(); + virtual qf::gui::framework::DialogWidget *createDetailWidget(); protected: QVariantMap m_settings; private: diff --git a/quickevent/app/quickevent/plugins/Event/src/services/servicewidget.cpp b/quickevent/app/quickevent/plugins/Event/src/services/servicewidget.cpp index 6b3561847..e37afbc28 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/servicewidget.cpp +++ b/quickevent/app/quickevent/plugins/Event/src/services/servicewidget.cpp @@ -22,21 +22,21 @@ ServiceWidget::~ServiceWidget() void ServiceWidget::setStatus(Service::Status st) { m_isRunning = (st == Service::Status::Running); - static QIcon ico_play(":/qf/qmlwidgets/images/flat/media-play"); - static QIcon ico_stop(":/qf/qmlwidgets/images/flat/media-stop"); + static QIcon ico_play(":/qf/gui/images/flat/media-play"); + static QIcon ico_stop(":/qf/gui/images/flat/media-stop"); ui->btPlay->setIcon(m_isRunning? ico_stop: ico_play); switch (st) { case Service::Status::Running: - ui->lblStatus->setPixmap(QPixmap(":/qf/qmlwidgets/images/light-green")); + ui->lblStatus->setPixmap(QPixmap(":/qf/gui/images/light-green")); break; case Service::Status::Stopped: - ui->lblStatus->setPixmap(QPixmap(":/qf/qmlwidgets/images/light-red")); + ui->lblStatus->setPixmap(QPixmap(":/qf/gui/images/light-red")); break; //case Service::Status::Failed: - // ui->lblStatus->setPixmap(QPixmap(":/qf/qmlwidgets/images/light-red")); + // ui->lblStatus->setPixmap(QPixmap(":/qf/gui/images/light-red")); // break; case Service::Status::Unknown: - ui->lblStatus->setPixmap(QPixmap(":/qf/qmlwidgets/images/light-blind")); + ui->lblStatus->setPixmap(QPixmap(":/qf/gui/images/light-blind")); break; } } diff --git a/quickevent/app/quickevent/plugins/Event/src/services/servicewidget.ui b/quickevent/app/quickevent/plugins/Event/src/services/servicewidget.ui index e51ea7fb1..627fbd80a 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/servicewidget.ui +++ b/quickevent/app/quickevent/plugins/Event/src/services/servicewidget.ui @@ -94,16 +94,16 @@ - - :/qf/qmlwidgets/images/flat/media-play.svg:/qf/qmlwidgets/images/flat/media-play.svg + + :/qf/gui/images/flat/media-play.svg:/qf/gui/images/flat/media-play.svg - - :/qf/qmlwidgets/images/flat/settings.svg:/qf/qmlwidgets/images/flat/settings.svg + + :/qf/gui/images/flat/settings.svg:/qf/gui/images/flat/settings.svg @@ -113,7 +113,7 @@ - + diff --git a/quickevent/app/quickevent/plugins/Event/src/stagedocument.h b/quickevent/app/quickevent/plugins/Event/src/stagedocument.h index 4ec5d1de8..5c2b07992 100644 --- a/quickevent/app/quickevent/plugins/Event/src/stagedocument.h +++ b/quickevent/app/quickevent/plugins/Event/src/stagedocument.h @@ -1,15 +1,15 @@ #ifndef EVENT_STAGEDOCUMENT_H #define EVENT_STAGEDOCUMENT_H -#include +#include namespace Event { -class StageDocument : public qf::qmlwidgets::model::SqlDataDocument +class StageDocument : public qf::gui::model::SqlDataDocument { Q_OBJECT private: - typedef qf::qmlwidgets::model::SqlDataDocument Super; + typedef qf::gui::model::SqlDataDocument Super; public: StageDocument(QObject *parent = nullptr); }; diff --git a/quickevent/app/quickevent/plugins/Event/src/stagewidget.cpp b/quickevent/app/quickevent/plugins/Event/src/stagewidget.cpp index c06093495..8156d0142 100644 --- a/quickevent/app/quickevent/plugins/Event/src/stagewidget.cpp +++ b/quickevent/app/quickevent/plugins/Event/src/stagewidget.cpp @@ -29,7 +29,7 @@ bool StageWidget::load(const QVariant &id, int mode) bool ok = Super::load(id, mode); if(ok) { QDateTime dt; - qf::qmlwidgets::model::DataDocument *doc = dataDocument(); + qf::gui::model::DataDocument *doc = dataDocument(); const auto START_DATE_TIME = QStringLiteral("startDateTime"); dt = doc->value(START_DATE_TIME).toDateTime().toLocalTime(); /* @@ -51,7 +51,7 @@ bool StageWidget::saveData() QDate d = ui->dateEdit->date(); QTime t = ui->timeEdit->time(); QDateTime dt(d, t, QTimeZone::systemTimeZone()); - qf::qmlwidgets::model::DataDocument *doc = dataDocument(); + qf::gui::model::DataDocument *doc = dataDocument(); const auto START_DATE_TIME = QStringLiteral("startDateTime"); doc->setValue(START_DATE_TIME, dt); /* diff --git a/quickevent/app/quickevent/plugins/Event/src/stagewidget.h b/quickevent/app/quickevent/plugins/Event/src/stagewidget.h index 4cc348cc2..1361b80a7 100644 --- a/quickevent/app/quickevent/plugins/Event/src/stagewidget.h +++ b/quickevent/app/quickevent/plugins/Event/src/stagewidget.h @@ -1,7 +1,7 @@ #ifndef EVENT_STAGEWIDGET_H #define EVENT_STAGEWIDGET_H -#include +#include #include @@ -11,16 +11,16 @@ namespace Ui { class StageWidget; } -class StageWidget : public qf::qmlwidgets::framework::DataDialogWidget +class StageWidget : public qf::gui::framework::DataDialogWidget { Q_OBJECT private: - using Super = qf::qmlwidgets::framework::DataDialogWidget; + using Super = qf::gui::framework::DataDialogWidget; public: explicit StageWidget(QWidget *parent = 0); ~StageWidget(); - bool load(const QVariant &id = QVariant(), int mode = qf::qmlwidgets::model::DataDocument::ModeEdit) Q_DECL_OVERRIDE; + bool load(const QVariant &id = QVariant(), int mode = qf::gui::model::DataDocument::ModeEdit) Q_DECL_OVERRIDE; protected: bool saveData() Q_DECL_OVERRIDE; private: diff --git a/quickevent/app/quickevent/plugins/Event/src/stagewidget.ui b/quickevent/app/quickevent/plugins/Event/src/stagewidget.ui index 9751940d4..1b532ce4c 100644 --- a/quickevent/app/quickevent/plugins/Event/src/stagewidget.ui +++ b/quickevent/app/quickevent/plugins/Event/src/stagewidget.ui @@ -25,7 +25,7 @@ - + dd.MM. yyyy @@ -45,7 +45,7 @@ - + H:mm:ss @@ -55,14 +55,14 @@ - qf::qmlwidgets::TimeEdit + qf::gui::TimeEdit QTimeEdit -
qf/qmlwidgets/timeedit.h
+
qf/gui/timeedit.h
 - qf::qmlwidgets::DateEdit + qf::gui::DateEdit QDateEdit -
qf/qmlwidgets/dateedit.h
+
qf/gui/dateedit.h
 diff --git a/quickevent/app/quickevent/plugins/Oris/src/chooseoriseventdialog.cpp b/quickevent/app/quickevent/plugins/Oris/src/chooseoriseventdialog.cpp index fb9fe6628..d67238ae4 100644 --- a/quickevent/app/quickevent/plugins/Oris/src/chooseoriseventdialog.cpp +++ b/quickevent/app/quickevent/plugins/Oris/src/chooseoriseventdialog.cpp @@ -19,6 +19,8 @@ ChooseOrisEventDialog::ChooseOrisEventDialog(OrisImporter *importer, QWidget *pa , m_importer(importer) { ui->setupUi(this); + + connect(ui->cbxOrisEvent, &QComboBox::currentIndexChanged, this, &ChooseOrisEventDialog::onOrisEvent_currentIndexChanged); } ChooseOrisEventDialog::~ChooseOrisEventDialog() @@ -87,7 +89,7 @@ void ChooseOrisEventDialog::load() }); } -void ChooseOrisEventDialog::on_cbxOrisEvent_currentIndexChanged(int ix) +void ChooseOrisEventDialog::onOrisEvent_currentIndexChanged(int ix) { int event_id = ui->cbxOrisEvent->itemData(ix).toInt(); ui->edEventId->setValue(event_id); diff --git a/quickevent/app/quickevent/plugins/Oris/src/chooseoriseventdialog.h b/quickevent/app/quickevent/plugins/Oris/src/chooseoriseventdialog.h index dcbe331e3..b9aad6315 100644 --- a/quickevent/app/quickevent/plugins/Oris/src/chooseoriseventdialog.h +++ b/quickevent/app/quickevent/plugins/Oris/src/chooseoriseventdialog.h @@ -22,7 +22,7 @@ class ChooseOrisEventDialog : public QDialog int exec() Q_DECL_OVERRIDE; int eventId(); private slots: - void on_cbxOrisEvent_currentIndexChanged(int ix); + void onOrisEvent_currentIndexChanged(int ix); private: void load(); diff --git a/quickevent/app/quickevent/plugins/Oris/src/orisimporter.cpp b/quickevent/app/quickevent/plugins/Oris/src/orisimporter.cpp index dd6fbb911..5f5e242fc 100644 --- a/quickevent/app/quickevent/plugins/Oris/src/orisimporter.cpp +++ b/quickevent/app/quickevent/plugins/Oris/src/orisimporter.cpp @@ -5,14 +5,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -69,7 +69,7 @@ QByteArray convertCp1250ToUtf8(const QByteArray &input) { } #endif -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Event::EventPlugin; void OrisImporter::saveJsonBackup(const QString &fn, const QJsonDocument &jsd) @@ -114,18 +114,18 @@ void OrisImporter::getJsonAndProcess(const QUrl &url, QObject *context, std::fun { auto *manager = networkAccessManager(); auto *reply = manager->get(url); - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); connect(context, &QObject::destroyed, reply, &qf::core::network::NetworkReply::deleteLater); // NOLINT(readability-suspicious-call-argument) - connect(reply, &qf::core::network::NetworkReply::downloadProgress, fwk, &qf::qmlwidgets::framework::MainWindow::showProgress); + connect(reply, &qf::core::network::NetworkReply::downloadProgress, fwk, &qf::gui::framework::MainWindow::showProgress); connect(reply, &qf::core::network::NetworkReply::finished, context, [reply, process_call_back](bool get_ok) { qfInfo() << "Get:" << reply->url().toString() << "OK:" << get_ok; - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); if(get_ok) { QJsonParseError err; QJsonDocument jsd = QJsonDocument::fromJson(reply->data(), &err); if(err.error != QJsonParseError::NoError) { qfError() << reply->data(); - qf::qmlwidgets::dialogs::MessageBox::showError(fwk, tr("JSON document parse error: %1 at: %2 near: %3") + qf::gui::dialogs::MessageBox::showError(fwk, tr("JSON document parse error: %1 at: %2 near: %3") .arg(err.errorString()) .arg(err.offset) .arg(reply->data().mid(err.offset, 50).constData())); @@ -134,7 +134,7 @@ void OrisImporter::getJsonAndProcess(const QUrl &url, QObject *context, std::fun process_call_back(jsd); } else { - qf::qmlwidgets::dialogs::MessageBox::showError(fwk, "http get error on: " + reply->url().toString() + ", " + reply->errorString()); + qf::gui::dialogs::MessageBox::showError(fwk, "http get error on: " + reply->url().toString() + ", " + reply->errorString()); } reply->deleteLater(); }); @@ -144,17 +144,17 @@ void OrisImporter::getTextAndProcess(const QUrl &url, QObject *context, std::fun { auto *manager = networkAccessManager(); qf::core::network::NetworkReply *reply = manager->get(url); - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); connect(context, &QObject::destroyed, reply, &qf::core::network::NetworkReply::deleteLater); // NOLINT(readability-suspicious-call-argument) - connect(reply, &qf::core::network::NetworkReply::downloadProgress, fwk, &qf::qmlwidgets::framework::MainWindow::showProgress); + connect(reply, &qf::core::network::NetworkReply::downloadProgress, fwk, &qf::gui::framework::MainWindow::showProgress); connect(reply, &qf::core::network::NetworkReply::finished, context, [reply, process_call_back](bool get_ok) { qfInfo() << "Get:" << reply->url().toString() << "OK:" << get_ok; - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); if(get_ok) { process_call_back(reply->data()); } else { - qf::qmlwidgets::dialogs::MessageBox::showError(fwk, "http get error on: " + reply->url().toString() + ", " + reply->errorString()); + qf::gui::dialogs::MessageBox::showError(fwk, "http get error on: " + reply->url().toString() + ", " + reply->errorString()); } reply->deleteLater(); }); @@ -162,11 +162,11 @@ void OrisImporter::getTextAndProcess(const QUrl &url, QObject *context, std::fun void OrisImporter::syncCurrentEventEntries(std::function success_callback) { - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); - //if(!qf::qmlwidgets::dialogs::MessageBox::askYesNo(fwk, tr("All runners entries imported from Oris will be synchronized, manual changes will be lost!"))) + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); + //if(!qf::gui::dialogs::MessageBox::askYesNo(fwk, tr("All runners entries imported from Oris will be synchronized, manual changes will be lost!"))) int oris_id = getPlugin()->eventConfig()->importId(); if(oris_id == 0) { - qf::qmlwidgets::dialogs::MessageBox::showError(fwk, tr("Cannot find Oris import ID.")); + qf::gui::dialogs::MessageBox::showError(fwk, tr("Cannot find Oris import ID.")); return; } syncEventEntries(oris_id, success_callback); @@ -175,20 +175,20 @@ void OrisImporter::syncCurrentEventEntries(std::function success_callba void OrisImporter::syncRelaysEntries(int event_id, std::function success_callback) { /* - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); if(!getPlugin()->eventConfig()->isRelays()) { - qf::qmlwidgets::dialogs::MessageBox::showError(fwk, tr("Not relays event.")); + qf::gui::dialogs::MessageBox::showError(fwk, tr("Not relays event.")); return; } int oris_id = getPlugin()->eventConfig()->importId(); if(oris_id == 0) { - qf::qmlwidgets::dialogs::MessageBox::showError(fwk, tr("Cannot find Oris import ID.")); + qf::gui::dialogs::MessageBox::showError(fwk, tr("Cannot find Oris import ID.")); return; } */ QUrl url(QString("https://oris.orientacnisporty.cz/ExportPrihlasek?id=%1").arg(event_id)); getTextAndProcess(url, this, [=](const QByteArray &data) { - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); try { qfLogScope("syncRelaysEntries"); qf::core::sql::Transaction transaction; @@ -339,12 +339,12 @@ void OrisImporter::syncRelaysEntries(int event_id, std::function succes q.execThrow("DELETE FROM competitors WHERE importId=1"); q.execThrow("DELETE FROM relays WHERE importId=1"); transaction.commit(); - qf::qmlwidgets::dialogs::MessageBox::showInfo(fwk, tr("Import finished successfully.")); + qf::gui::dialogs::MessageBox::showInfo(fwk, tr("Import finished successfully.")); if(success_callback) success_callback(); } catch (qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(fwk, e); + qf::gui::dialogs::MessageBox::showException(fwk, e); } }); } @@ -352,7 +352,7 @@ void OrisImporter::syncRelaysEntries(int event_id, std::function succes void OrisImporter::chooseAndImport() { qfLogFuncFrame(); - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); ChooseOrisEventDialog dlg(this, fwk); if(!dlg.exec()) return; @@ -380,7 +380,7 @@ void OrisImporter::importEvent(int event_id, std::function success_call { QUrl url(QString("https://oris.orientacnisporty.cz/API/?format=json&method=getEvent&id=%1").arg(event_id)); getJsonAndProcess(url, this, [this, event_id, success_callback](const QJsonDocument &jsd) { - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); try { saveJsonBackup("Event", jsd); QJsonObject data = jsd.object().value(QStringLiteral("Data")).toObject(); @@ -446,7 +446,7 @@ void OrisImporter::importEvent(int event_id, std::function success_call fwk->hideProgress(); } catch (qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(fwk, e); + qf::gui::dialogs::MessageBox::showException(fwk, e); } syncEventEntries(event_id, success_callback); }); @@ -518,7 +518,7 @@ void OrisImporter::syncEventEntries(int event_id, std::function success getJsonAndProcess(url, this, [=](const QJsonDocument &jsd) { static const QString json_fn = "EventEntries"; saveJsonBackup(json_fn, jsd); - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); try { int stage_cnt = getPlugin()->stageCount(); qf::core::sql::Query q; @@ -683,7 +683,7 @@ void OrisImporter::syncEventEntries(int event_id, std::function success QVariantList tr = QVariantList() << QStringLiteral("tr"); if(doc->mode() == Competitors::CompetitorDocument::ModeInsert) { doc->setProperty(KEY_IS_DATA_DIRTY, true); - for(QString fldn : fields) { + for(const auto &fldn : fields) { auto td = QVariantList() << QStringLiteral("td") << field_string(doc, fldn); tr.insert(tr.length(), td); } @@ -691,7 +691,7 @@ void OrisImporter::syncEventEntries(int event_id, std::function success } else if(doc->mode() == Competitors::CompetitorDocument::ModeEdit) { static QVariantMap green_attrs{{QStringLiteral("bgcolor"), QStringLiteral("khaki")}}; - for(QString fldn : fields) { + for(const auto &fldn : fields) { bool is_dirty = false; if(fldn == QLatin1String(KEY_RUNS)) { Runs runs(doc->property(KEY_RUNS)); @@ -741,38 +741,37 @@ void OrisImporter::syncEventEntries(int event_id, std::function success f.write(html.toUtf8()); } #endif - qf::qmlwidgets::dialogs::Dialog dlg(QDialogButtonBox::Save | QDialogButtonBox::Cancel, fwk); - qf::qmlwidgets::DialogButtonBox *bbx = dlg.buttonBox(); + qf::gui::dialogs::Dialog dlg(QDialogButtonBox::Save | QDialogButtonBox::Cancel, fwk); + qf::gui::DialogButtonBox *bbx = dlg.buttonBox(); auto *bt_no_drops = new QPushButton(tr("Save without drops")); - bool no_drops = false; - connect(bt_no_drops, &QPushButton::clicked, [&no_drops]() { - no_drops = true; + auto no_drops = std::make_shared(false); + connect(bt_no_drops, &QPushButton::clicked, [no_drops]() { + *no_drops = true; }); bbx->addButton(bt_no_drops, QDialogButtonBox::AcceptRole); auto *bt_export = new QPushButton(tr("Export")); - connect(bt_export, &QPushButton::clicked, [fwk, html]() { - QString fn = qf::qmlwidgets::dialogs::FileDialog::getSaveFileName(fwk, tr("Export as ..."), "changes.html", tr("HTML files *.html (*.html)")); + connect(bt_export, &QPushButton::clicked, fwk, [fwk, html]() { + QString fn = qf::gui::dialogs::FileDialog::getSaveFileName(fwk, tr("Export as ..."), "changes.html", tr("HTML files *.html (*.html)")); if(fn.isEmpty()) return; if(!fn.endsWith(".html", Qt::CaseInsensitive)) fn = fn + ".html"; QFile f(fn); if(!f.open(QFile::WriteOnly)) { - qf::qmlwidgets::dialogs::MessageBox::showError(fwk, tr("Cannot open file '%1' for writing.").arg(f.fileName())); + qf::gui::dialogs::MessageBox::showError(fwk, tr("Cannot open file '%1' for writing.").arg(f.fileName())); return; } f.write(html.toUtf8()); }); bbx->addButton(bt_export, QDialogButtonBox::ActionRole); - auto *w = new qf::qmlwidgets::HtmlViewWidget(); + auto *w = new qf::gui::HtmlViewWidget(); dlg.setCentralWidget(w); w->setHtmlText(html); if(dlg.exec()) { qfLogScope("importEventEntries"); qf::core::sql::Transaction transaction; - //QMap cid_sid_changes; // competitorId->siId for(Competitors::CompetitorDocument *doc : doc_lst) { doc->setEmitDbEventsOnSave(false); if(doc->mode() == Competitors::CompetitorDocument::ModeInsert || doc->mode() == Competitors::CompetitorDocument::ModeEdit) { @@ -795,7 +794,7 @@ void OrisImporter::syncEventEntries(int event_id, std::function success } } else if(doc->mode() == Competitors::CompetitorDocument::ModeDelete) { - if(!no_drops) + if(!*no_drops) doc->drop(); } } @@ -808,7 +807,7 @@ void OrisImporter::syncEventEntries(int event_id, std::function success success_callback(); } catch (qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(fwk, e); + qf::gui::dialogs::MessageBox::showException(fwk, e); } }); } @@ -825,7 +824,7 @@ void OrisImporter::importRegistrations(std::function success_callback) QUrl url(QString("https://oris.orientacnisporty.cz/API/?format=json&method=getRegistration&sport=%1&year=%2").arg(sport_id).arg(year)); getJsonAndProcess(url, this, [=](const QJsonDocument &jsd) { saveJsonBackup("Registrations", jsd); - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); QJsonObject data = jsd.object().value(QStringLiteral("Data")).toObject(); // import clubs int items_processed = 0; @@ -872,7 +871,7 @@ void OrisImporter::importRegistrations(std::function success_callback) success_callback(); } catch (qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(fwk, e); + qf::gui::dialogs::MessageBox::showException(fwk, e); } }); } @@ -882,7 +881,7 @@ void OrisImporter::importClubs(std::function success_callback) QUrl url("https://oris.orientacnisporty.cz/API/?format=json&method=getCSOSClubList"); getJsonAndProcess(url, this, [=](const QJsonDocument &jsd) { saveJsonBackup("Clubs", jsd); - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); QJsonObject data = jsd.object().value(QStringLiteral("Data")).toObject(); // import clubs int items_processed = 0; @@ -913,7 +912,7 @@ void OrisImporter::importClubs(std::function success_callback) success_callback(); } catch (qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(fwk, e); + qf::gui::dialogs::MessageBox::showException(fwk, e); } }); } @@ -924,7 +923,7 @@ void OrisImporter::getAndImportClub(const QString &club, const QString &key) getJsonAndProcess(url, this, [club](const QJsonDocument &jsd) { saveJsonBackup(QString("Club_%1").arg(club), jsd); QJsonObject data = jsd.object().value(QStringLiteral("Data")).toObject(); - auto *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + auto *fwk = qf::gui::framework::MainWindow::frameWork(); try { qf::core::sql::Query q; q.prepare("INSERT INTO clubs (name, abbr, importId) VALUES (:name, :abbr, :importId)", qf::core::Exception::Throw); @@ -936,14 +935,14 @@ void OrisImporter::getAndImportClub(const QString &club, const QString &key) q.exec(qf::core::Exception::Throw); } catch (qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(fwk, e); + qf::gui::dialogs::MessageBox::showException(fwk, e); } }); } void OrisImporter::importMissingOneTimeClubs() { - auto *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + auto *fwk = qf::gui::framework::MainWindow::frameWork(); auto event_key = getPlugin()->eventConfig()->orisEventKey(); if (event_key.isEmpty()) { QMessageBox::warning(fwk,tr("Warning"),tr("For import one-time clubs, you need to fill ORIS Event Key in File->Event->Edit event")); @@ -1002,7 +1001,7 @@ void OrisImporter::importMissingOneTimeClubs() qfInfo() << "Import of"<< items_processed << "new one-time clubs started..."; } catch (qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(fwk, e); + qf::gui::dialogs::MessageBox::showException(fwk, e); } } diff --git a/quickevent/app/quickevent/plugins/Oris/src/orisplugin.cpp b/quickevent/app/quickevent/plugins/Oris/src/orisplugin.cpp index 56a27ef98..ed994071f 100644 --- a/quickevent/app/quickevent/plugins/Oris/src/orisplugin.cpp +++ b/quickevent/app/quickevent/plugins/Oris/src/orisplugin.cpp @@ -3,22 +3,22 @@ #include "txtimporter.h" #include "xmlimporter.h" -#include -#include -#include +#include +#include +#include #include #include -namespace qff = qf::qmlwidgets::framework; -namespace qfw = qf::qmlwidgets; -using qf::qmlwidgets::framework::getPlugin; +namespace qff = qf::gui::framework; +namespace qfw = qf::gui; +using qf::gui::framework::getPlugin; using Event::EventPlugin; namespace Oris { OrisPlugin::OrisPlugin(QObject *parent) - : Super("Oris", parent)//, qf::qmlwidgets::framework::IPersistentSettings(this) + : Super("Oris", parent)//, qf::gui::framework::IPersistentSettings(this) { //setPersistentSettingsId("Oris"); m_orisImporter = new OrisImporter(this); @@ -35,7 +35,7 @@ void OrisPlugin::onInstalled() qff::MainWindow *fwk = qff::MainWindow::frameWork(); //console.warn("Oris installed"); qfw::Action *act_import = fwk->menuBar()->actionForPath("file/import"); - qf::qmlwidgets::Action *act_import_oris = act_import->addMenuInto("oris", tr("&ORIS")); + qf::gui::Action *act_import_oris = act_import->addMenuInto("oris", tr("&ORIS")); { qfw::Action *a = act_import_oris->addActionInto("event", tr("&Event")); connect(a, &qfw::Action::triggered, m_orisImporter, &OrisImporter::chooseAndImport); @@ -44,25 +44,10 @@ void OrisPlugin::onInstalled() qfw::Action *a = act_import_oris->addActionInto("syncEntries", tr("&Sync current event entries")); connect(a, &qfw::Action::triggered, m_orisImporter, [this]() { m_orisImporter->syncCurrentEventEntries(); }); a->setEnabled(false); - connect(getPlugin(), &Event::EventPlugin::eventOpenChanged, [a](bool is_event_open) { + connect(getPlugin(), &Event::EventPlugin::eventOpenChanged, a, [a](bool is_event_open) { a->setEnabled(is_event_open); }); } - /* - //act_import_oris->addSeparatorInto(); - { - qfw::Action *a = act_import_oris->addActionInto("syncRelaysEntries", tr("Sync &relays entries")); - connect(a, &qfw::Action::triggered, m_orisImporter, &OrisImporter::syncRelaysEntries); - a->setVisible(false); - connect(event_plugin, &Event::EventPlugin::eventOpenChanged, [a](bool is_db_open) { - bool is_relays = false; - if(is_db_open) { - is_relays = getPlugin()->eventConfig()->isRelays(); - } - a->setVisible(is_relays); - }); - } - */ act_import_oris->addSeparatorInto(); { auto a = act_import_oris->addActionInto("clubs", tr("&Clubs and registrations")); @@ -72,23 +57,23 @@ void OrisPlugin::onInstalled() }); }); a->setEnabled(false); - connect(getPlugin(), &Event::EventPlugin::eventOpenChanged, [a](bool is_event_open) { + connect(getPlugin(), &Event::EventPlugin::eventOpenChanged, a, [a](bool is_event_open) { a->setEnabled(is_event_open); }); } { auto a = act_import_oris->addActionInto("onet-time-clubs", tr("&Update one-time clubs")); - connect(a, &qfw::Action::triggered, m_orisImporter, [this]() { + connect(a, &qfw::Action::triggered, this, [this]() { m_orisImporter->importMissingOneTimeClubs(); }); a->setEnabled(false); - connect(getPlugin(), &Event::EventPlugin::eventOpenChanged, [a](bool is_event_open) { + connect(getPlugin(), &Event::EventPlugin::eventOpenChanged, a, [a](bool is_event_open) { a->setEnabled(is_event_open); }); } - qf::qmlwidgets::Action *act_import_txt = act_import->addMenuInto("text", tr("&Text file")); + qf::gui::Action *act_import_txt = act_import->addMenuInto("text", tr("&Text file")); act_import_txt->setEnabled(false); - connect(getPlugin(), &Event::EventPlugin::eventOpenChanged, [act_import_txt](bool is_event_open) { + connect(getPlugin(), &Event::EventPlugin::eventOpenChanged, act_import_txt, [act_import_txt](bool is_event_open) { act_import_txt->setEnabled(is_event_open); }); { diff --git a/quickevent/app/quickevent/plugins/Oris/src/orisplugin.h b/quickevent/app/quickevent/plugins/Oris/src/orisplugin.h index abf984881..ac9027e15 100644 --- a/quickevent/app/quickevent/plugins/Oris/src/orisplugin.h +++ b/quickevent/app/quickevent/plugins/Oris/src/orisplugin.h @@ -1,7 +1,7 @@ #pragma once -#include -//#include +#include +//#include class OrisImporter; class TxtImporter; @@ -9,10 +9,10 @@ class XmlImporter; namespace Oris { -class OrisPlugin : public qf::qmlwidgets::framework::Plugin//, public qf::qmlwidgets::framework::IPersistentSettings +class OrisPlugin : public qf::gui::framework::Plugin//, public qf::gui::framework::IPersistentSettings { Q_OBJECT - using Super = qf::qmlwidgets::framework::Plugin; + using Super = qf::gui::framework::Plugin; public: OrisPlugin(QObject *parent = nullptr); private: diff --git a/quickevent/app/quickevent/plugins/Oris/src/txtimporter.cpp b/quickevent/app/quickevent/plugins/Oris/src/txtimporter.cpp index 17cee8277..a5a09368e 100644 --- a/quickevent/app/quickevent/plugins/Oris/src/txtimporter.cpp +++ b/quickevent/app/quickevent/plugins/Oris/src/txtimporter.cpp @@ -1,8 +1,8 @@ #include "txtimporter.h" -#include -#include -#include +#include +#include +#include #include #include @@ -14,8 +14,8 @@ #include -namespace qfd = qf::qmlwidgets::dialogs; -using qf::qmlwidgets::framework::getPlugin; +namespace qfd = qf::gui::dialogs; +using qf::gui::framework::getPlugin; using Event::EventPlugin; TxtImporter::TxtImporter(QObject *parent) @@ -25,8 +25,8 @@ TxtImporter::TxtImporter(QObject *parent) void TxtImporter::importCompetitorsCSOS() { - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); - qf::qmlwidgets::dialogs::MessageBox mbx(fwk); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); + qf::gui::dialogs::MessageBox mbx(fwk); mbx.setIcon(QMessageBox::Information); mbx.setText(tr("Import windows-1250 coded fixed column size text files in CSOS format.")); mbx.setInformativeText(tr("Each row should have following columns: " @@ -84,14 +84,14 @@ void TxtImporter::importCompetitorsCSOS() emit getPlugin()->reloadDataRequest(); } catch (qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(fwk, e); + qf::gui::dialogs::MessageBox::showException(fwk, e); } } void TxtImporter::importCompetitorsCSV() { - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); - qf::qmlwidgets::dialogs::MessageBox mbx(fwk); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); + qf::gui::dialogs::MessageBox mbx(fwk); mbx.setIcon(QMessageBox::Information); mbx.setText(tr("Import UTF8 text file with comma separated values with first row as header.
Separator is comma(,)")); mbx.setInformativeText(tr("Each row should have following columns: " @@ -144,14 +144,14 @@ void TxtImporter::importCompetitorsCSV() emit getPlugin()->reloadDataRequest(); } catch (qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(fwk, e); + qf::gui::dialogs::MessageBox::showException(fwk, e); } } void TxtImporter::importRankingCsv() { qfLogFuncFrame(); - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); QString fn = qfd::FileDialog::getOpenFileName(fwk, tr("Open file"), QString(), tr("Oris ranking CSV files (*.txt *.csv)")); if(fn.isEmpty()) return; @@ -191,7 +191,7 @@ void TxtImporter::importRankingCsv() qfInfo() << fn << n << "lines imported"; } catch (const qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(fwk, e); + qf::gui::dialogs::MessageBox::showException(fwk, e); } } @@ -261,8 +261,8 @@ int TxtImporter::getStartTimeMSec(QString str, int start00_msec) void TxtImporter::importRunsCzeCSV() { - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); - qf::qmlwidgets::dialogs::MessageBox mbx(fwk); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); + qf::gui::dialogs::MessageBox mbx(fwk); mbx.setIcon(QMessageBox::Information); mbx.setText(tr("Import UTF8 text file with comma separated values with first row as header.
Separator is semicolon(;).
Updates only existing runners (key is Czech registration).")); mbx.setInformativeText(tr("Each row should have following columns: " @@ -369,14 +369,14 @@ void TxtImporter::importRunsCzeCSV() qfInfo() << fn << n << "lines imported"; } catch (const qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(fwk, e); + qf::gui::dialogs::MessageBox::showException(fwk, e); } } void TxtImporter::importRunsIdCSV() { - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); - qf::qmlwidgets::dialogs::MessageBox mbx(fwk); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); + qf::gui::dialogs::MessageBox mbx(fwk); mbx.setIcon(QMessageBox::Information); mbx.setText(tr("Import UTF8 text file with comma separated values with first row as header.
Separator is semicolon(;).
Updates only existing runners (key is id in module(table) runs).")); mbx.setInformativeText(tr("Each row should have following columns: " @@ -483,14 +483,14 @@ void TxtImporter::importRunsIdCSV() qfInfo() << fn << n << "lines imported"; } catch (const qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(fwk, e); + qf::gui::dialogs::MessageBox::showException(fwk, e); } } void TxtImporter::importRunsIofCSV() { - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); - qf::qmlwidgets::dialogs::MessageBox mbx(fwk); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); + qf::gui::dialogs::MessageBox mbx(fwk); mbx.setIcon(QMessageBox::Information); mbx.setText(tr("Import UTF8 text file with comma separated values with first row as header.
Separator is semicolon(;).
Updates only existing runners (key is IOF ID).")); mbx.setInformativeText(tr("Each row should have following columns: " @@ -597,6 +597,6 @@ void TxtImporter::importRunsIofCSV() qfInfo() << fn << n << "lines imported"; } catch (const qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(fwk, e); + qf::gui::dialogs::MessageBox::showException(fwk, e); } } diff --git a/quickevent/app/quickevent/plugins/Oris/src/xmlimporter.cpp b/quickevent/app/quickevent/plugins/Oris/src/xmlimporter.cpp index 1f9d1f7aa..f2088f7d0 100644 --- a/quickevent/app/quickevent/plugins/Oris/src/xmlimporter.cpp +++ b/quickevent/app/quickevent/plugins/Oris/src/xmlimporter.cpp @@ -1,8 +1,8 @@ #include "xmlimporter.h" -#include -#include -#include +#include +#include +#include #include #include @@ -14,9 +14,9 @@ #include #include -// namespace qfw = qf::qmlwidgets; -namespace qfd = qf::qmlwidgets::dialogs; -using qf::qmlwidgets::framework::getPlugin; +// namespace qfw = qf::gui; +namespace qfd = qf::gui::dialogs; +using qf::gui::framework::getPlugin; using Event::EventPlugin; XmlImporter::XmlImporter(QObject *parent) @@ -407,7 +407,7 @@ bool XmlImporter::importEntries(QXmlStreamReader &reader, const XmlCreators crea it++; } bool ok; - QString item = QInputDialog::getItem(qf::qmlwidgets::framework::MainWindow::frameWork(), tr("Select which race import"), + QString item = QInputDialog::getItem(qf::gui::framework::MainWindow::frameWork(), tr("Select which race import"), tr("Races:"), items, 0, false, &ok); if (ok && !item.isEmpty()) selected_race = races[item]; @@ -729,7 +729,7 @@ bool XmlImporter::importRegistration(QXmlStreamReader &reader, const XmlCreators bool XmlImporter::importEvent(QXmlStreamReader &reader, const XmlCreators creator) { if (creator == XmlCreators::Oris) { - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); qfd::MessageBox::showWarning(fwk, QString(tr("EventList from ORIS is not yet supported. It requires a different type of handling."))); return false; // ORIS has only list with all races - need to select/find current race } @@ -779,7 +779,7 @@ bool XmlImporter::importEvent(QXmlStreamReader &reader, const XmlCreators creato it++; } bool ok; - QString item = QInputDialog::getItem(qf::qmlwidgets::framework::MainWindow::frameWork(), tr("Select which race import"), + QString item = QInputDialog::getItem(qf::gui::framework::MainWindow::frameWork(), tr("Select which race import"), tr("Races:"), items, 0, false, &ok); if (ok && !item.isEmpty()) event_race = races[item]; @@ -814,7 +814,7 @@ bool XmlImporter::importEvent(QXmlStreamReader &reader, const XmlCreators creato bool XmlImporter::importXML30() { - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); QString fn = qfd::FileDialog::getOpenFileName(fwk, tr("Open IOF XML 3.0 file"), QString(), tr("IOF XML v3 files (*.xml)")); if(fn.isEmpty()) return false; diff --git a/quickevent/app/quickevent/plugins/Receipts/src/receiptsplugin.cpp b/quickevent/app/quickevent/plugins/Receipts/src/receiptsplugin.cpp index 59386f735..613ee6a92 100644 --- a/quickevent/app/quickevent/plugins/Receipts/src/receiptsplugin.cpp +++ b/quickevent/app/quickevent/plugins/Receipts/src/receiptsplugin.cpp @@ -14,14 +14,14 @@ #include #include #include -#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include "partwidget.h" @@ -35,7 +35,7 @@ #include namespace qfu = qf::core::utils; -namespace qff = qf::qmlwidgets::framework; +namespace qff = qf::gui::framework; using ::PartWidget; using qff::getPlugin; using Event::EventPlugin; @@ -52,7 +52,7 @@ ReceiptsPlugin::ReceiptsPlugin(QObject *parent) void ReceiptsPlugin::onInstalled() { qff::initPluginWidget(tr("Receipts"), featureId()); - auto core_plugin = qf::qmlwidgets::framework::getPlugin(); + auto core_plugin = qf::gui::framework::getPlugin(); core_plugin->settingsDialog()->addPage(new ReceiptsSettingsPage()); } @@ -158,7 +158,7 @@ QVariantMap ReceiptsPlugin::receiptTablesData(int card_id) QMap lap_stand; // position->standing in lap QMap lap_stand_cummulative; // position->cummulative standing after lap { - qf::qmlwidgets::model::SqlTableModel model; + qf::gui::model::SqlTableModel model; qf::core::sql::QueryBuilder qb; qb.select2("competitors", "*") .select2("runs", "*") @@ -420,7 +420,7 @@ void ReceiptsPlugin::previewCard(int card_id) { qfLogFuncFrame() << "card id:" << card_id; //qfInfo() << "previewReceipe_classic, card id:" << card_id; - auto *w = new qf::qmlwidgets::reports::ReportViewWidget(); + auto *w = new qf::gui::reports::ReportViewWidget(); w->setPersistentSettingsId("cardPreview"); w->setWindowTitle(tr("Card")); w->setReport(findReportFile("sicard.qml")); @@ -429,7 +429,7 @@ void ReceiptsPlugin::previewCard(int card_id) w->setTableData(k, v); } qff::MainWindow *fwk = qff::MainWindow::frameWork(); - qf::qmlwidgets::dialogs::Dialog dlg(fwk); + qf::gui::dialogs::Dialog dlg(fwk); dlg.setCentralWidget(w); dlg.exec(); } @@ -467,7 +467,7 @@ void ReceiptsPlugin::previewReceipt(int card_id) qfLogFuncFrame() << "card id:" << card_id; //qfInfo() << "previewReceipe_classic, card id:" << card_id; ReceiptsSettings settings; - auto *w = new qf::qmlwidgets::reports::ReportViewWidget(); + auto *w = new qf::gui::reports::ReportViewWidget(); if (settings.receiptPath().isEmpty()) { auto fwk = qff::MainWindow::frameWork(); QMessageBox::warning(fwk,tr("Warning"),tr("Receipt report type is not defined.\nPlease go to Settings->Receipts and set receipt type.")); @@ -481,7 +481,7 @@ void ReceiptsPlugin::previewReceipt(int card_id) w->setTableData(k, v); } auto fwk = qff::MainWindow::frameWork(); - qf::qmlwidgets::dialogs::Dialog dlg(fwk); + qf::gui::dialogs::Dialog dlg(fwk); dlg.setCentralWidget(w); dlg.exec(); } diff --git a/quickevent/app/quickevent/plugins/Receipts/src/receiptsplugin.h b/quickevent/app/quickevent/plugins/Receipts/src/receiptsplugin.h index 8e542a64f..01d0a28d0 100644 --- a/quickevent/app/quickevent/plugins/Receipts/src/receiptsplugin.h +++ b/quickevent/app/quickevent/plugins/Receipts/src/receiptsplugin.h @@ -1,7 +1,7 @@ #ifndef RECEIPTS_RECEIPTSPLUGIN_H #define RECEIPTS_RECEIPTSPLUGIN_H -#include +#include #include @@ -20,11 +20,11 @@ class ReceiptsSettings; namespace Receipts { -class ReceiptsPlugin : public qf::qmlwidgets::framework::Plugin +class ReceiptsPlugin : public qf::gui::framework::Plugin { Q_OBJECT private: - typedef qf::qmlwidgets::framework::Plugin Super; + typedef qf::gui::framework::Plugin Super; public: ReceiptsPlugin(QObject *parent = nullptr); diff --git a/quickevent/app/quickevent/plugins/Receipts/src/receiptsprinter.cpp b/quickevent/app/quickevent/plugins/Receipts/src/receiptsprinter.cpp index 75b7bb440..0b579b815 100644 --- a/quickevent/app/quickevent/plugins/Receipts/src/receiptsprinter.cpp +++ b/quickevent/app/quickevent/plugins/Receipts/src/receiptsprinter.cpp @@ -4,9 +4,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include @@ -25,9 +25,7 @@ #include #include -namespace qfu = qf::core::utils; -namespace qff = qf::qmlwidgets::framework; -using qf::qmlwidgets::framework::getPlugin; +namespace qff = qf::gui::framework; using Receipts::ReceiptsPlugin; #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) @@ -56,7 +54,7 @@ bool ReceiptsPrinter::printReceipt(const QString &report_file_name, const QVaria QF_TIME_SCOPE("init graphics printer"); QPrinterInfo pi = QPrinterInfo::printerInfo(settings.graphicsPrinterName()); if(pi.isNull()) { - for(auto s : QPrinterInfo::availablePrinterNames()) { + for(const auto &s : QPrinterInfo::availablePrinterNames()) { qfInfo() << "available printer:" << s; } pi = QPrinterInfo::defaultPrinter(); @@ -77,14 +75,14 @@ bool ReceiptsPrinter::printReceipt(const QString &report_file_name, const QVaria qff::MainWindow *fwk = qff::MainWindow::frameWork(); paint_device = fwk; } - qf::qmlwidgets::reports::ReportProcessor rp(paint_device); + qf::gui::reports::ReportProcessor rp(paint_device); { QF_TIME_SCOPE("setting report and data"); - auto *plugin = qf::qmlwidgets::framework::getPlugin(); + auto *plugin = qf::gui::framework::getPlugin(); if(!rp.setReport(plugin->findReportFile(report_file_name))) return false; - for(auto key : report_data.keys()) { - rp.setTableData(key, report_data.value(key)); + for(const auto &[key, val] : report_data.asKeyValueRange()) { + rp.setTableData(key, val); } } if(settings.printerTypeEnum() == ReceiptsSettings::PrinterType::GraphicPrinter) { @@ -93,25 +91,25 @@ bool ReceiptsPrinter::printReceipt(const QString &report_file_name, const QVaria QF_TIME_SCOPE("process report"); rp.process(); } - qf::qmlwidgets::reports::ReportItemMetaPaintReport *doc; + qf::gui::reports::ReportItemMetaPaintReport *doc; { QF_TIME_SCOPE("getting processor output"); doc = rp.processorOutput(); } - qf::qmlwidgets::reports::ReportItemMetaPaint *it = doc->child(0); + qf::gui::reports::ReportItemMetaPaint *it = doc->child(0); if(it) { QF_TIME_SCOPE("draw meta-paint"); - qf::qmlwidgets::reports::ReportPainter painter(paint_device); + qf::gui::reports::ReportPainter painter(paint_device); painter.drawMetaPaint(it); } QF_SAFE_DELETE(printer); return true; } - else if(settings.printerTypeEnum() == ReceiptsSettings::PrinterType::CharacterPrinter) { + if(settings.printerTypeEnum() == ReceiptsSettings::PrinterType::CharacterPrinter) { QDomDocument doc; doc.setContent(QLatin1String("")); QDomElement el_body = doc.documentElement().firstChildElement("body"); - qf::qmlwidgets::reports::ReportProcessor::HtmlExportOptions opts; + qf::gui::reports::ReportProcessor::HtmlExportOptions opts; opts.setConvertBandsToTables(false); rp.processHtml(el_body, opts); //qfInfo() << doc.toString(); @@ -120,16 +118,14 @@ bool ReceiptsPrinter::printReceipt(const QString &report_file_name, const QVaria QFile f(fn); if(f.open(QFile::WriteOnly)) { //qfInfo() << "writing receipt data to:" << fn; - for(QByteArray ba : data_lines) { + for(const auto &ba : data_lines) { f.write(ba); f.write("\n"); } return true; } - else { - qfError() << "Cannot open file" << f.fileName() << "for writing!"; - return false; - } + qfError() << "Cannot open file" << f.fileName() << "for writing!"; + return false; }; switch(settings.characterPrinterTypeEnum()) { case ReceiptsSettings::CharacterPrinteType::Directory: { @@ -137,7 +133,7 @@ bool ReceiptsPrinter::printReceipt(const QString &report_file_name, const QVaria QString fn = settings.characterPrinterDirectory(); qf::core::utils::FileUtils::ensurePath(fn); QCryptographicHash ch(QCryptographicHash::Sha1); - for(QByteArray ba : data_lines) + for(const auto &ba : data_lines) ch.addData(ba); fn += '/' + QString::number(card_id) + '-' + QString::fromLatin1(ch.result().toHex().mid(0, 8)) + ".txt"; @@ -169,7 +165,7 @@ bool ReceiptsPrinter::printReceipt(const QString &report_file_name, const QVaria socket.writeDatagram(dgram, host_addr, port); return true; } - else { + { QTcpSocket socket; socket.connectToHost(host_addr, port, QIODevice::WriteOnly); if (socket.waitForConnected(1000)) { @@ -185,12 +181,10 @@ bool ReceiptsPrinter::printReceipt(const QString &report_file_name, const QVaria } return true; } - else { - qfError() << "Cannot open tcp connection to address " - << host << " on port " << port - << " reason: " << socket.error(); - return false; - } + qfError() << "Cannot open tcp connection to address " + << host << " on port " << port + << " reason: " << socket.error(); + return false; } } return false; @@ -245,7 +239,7 @@ struct PrintData {} bool isCommand() const {return command != Command::Text;} int textLength() const {return isCommand()? 0: data.length();} - const QByteArray toByteArray() const + QByteArray toByteArray() const { QByteArray ret; switch(command) { @@ -279,17 +273,15 @@ class DirectPrintContext public: PrintLine line; int horizontalLayoutNestCount = 0; - //int printerLineWidth = 42; }; void ReceiptsPrinter::createPrinterData_helper(const QDomElement &el, DirectPrintContext *print_context, const QString &text_encoding) { - //QByteArray text; PrintLine pre_commands; PrintLine post_commands; int text_width = 0; bool is_halign = el.tagName() == QLatin1String("div") - && el.attribute(qf::qmlwidgets::reports::ReportProcessor::HTML_ATTRIBUTE_LAYOUT) == QLatin1String("horizontal"); + && el.attribute(qf::gui::reports::ReportProcessor::HTML_ATTRIBUTE_LAYOUT) == QLatin1String("horizontal"); if(is_halign) print_context->horizontalLayoutNestCount++; QDomNamedNodeMap attrs = el.attributes(); @@ -382,9 +374,7 @@ QByteArray ReceiptsPrinter::encodeText(const QString text, const QString &text_e auto from_utf16 = QStringEncoder(enc.value()); return from_utf16(text); } - else { - return qf::core::Collator::toAscii7(QLocale::Czech, text, false); - } + return qf::core::Collator::toAscii7(QLocale::Czech, text, false); #else QByteArray ret; QTextCodec *tc = nullptr; @@ -400,7 +390,8 @@ QByteArray ReceiptsPrinter::encodeText(const QString text, const QString &text_e #endif } -static QList alignPrinterData(DirectPrintContext *print_context, const ReceiptsSettings &receipts_settings) +namespace { +QList alignPrinterData(DirectPrintContext *print_context, const ReceiptsSettings &receipts_settings) { QList ret; int line_length = receipts_settings.characterPrinterLineLength(); @@ -419,8 +410,7 @@ static QList alignPrinterData(DirectPrintContext *print_context, cons if(is_eol) { int fixed_text_len = 0; int spring_cnt = 0; - for (int j = 0; j < line.length(); ++j) { - const PrintData &pd2 = line[j]; + for (const auto &pd2 : line) { if(pd2.width < 0) spring_cnt++; else if(pd2.width > 0) @@ -428,8 +418,7 @@ static QList alignPrinterData(DirectPrintContext *print_context, cons else fixed_text_len += pd2.textLength(); } - for (int j = 0; j < line.length(); ++j) { - PrintData &pd2 = line[j]; + for (auto &pd2 : line) { if(pd2.isCommand()) continue; int w = pd2.width; @@ -443,7 +432,7 @@ static QList alignPrinterData(DirectPrintContext *print_context, cons else if(pd2.alignment == Qt::AlignRight) pd2.data = QByteArray(w_rest, ' ') + pd2.data; else if(pd2.alignment == Qt::AlignHCenter) - pd2.data = QByteArray(w_rest/2+1, ' ') + pd2.data + QByteArray(w_rest/2+1, ' '); + pd2.data = QByteArray((w_rest/2) + 1, ' ') + pd2.data + QByteArray(w_rest/2 + 1, ' '); } pd2.data = pd2.data.mid(0, w); pd2.width = 0; @@ -461,7 +450,7 @@ static QList alignPrinterData(DirectPrintContext *print_context, cons return ret; } -static QList interpretControlCodes(const QList &lines, const ReceiptsSettings &receipts_settings) +QList interpretControlCodes(const QList &lines, const ReceiptsSettings &receipts_settings) { QList ret; int line_length = receipts_settings.characterPrinterLineLength(); @@ -496,6 +485,7 @@ static QList interpretControlCodes(const QList &lines, co } return ret; } +} QList ReceiptsPrinter::createPrinterData(const QDomElement &body, const ReceiptsSettings &receipts_settings) { diff --git a/quickevent/app/quickevent/plugins/Receipts/src/receiptssettingspage.cpp b/quickevent/app/quickevent/plugins/Receipts/src/receiptssettingspage.cpp index 60dd3fc8d..bfd4907d5 100644 --- a/quickevent/app/quickevent/plugins/Receipts/src/receiptssettingspage.cpp +++ b/quickevent/app/quickevent/plugins/Receipts/src/receiptssettingspage.cpp @@ -4,7 +4,7 @@ #include "receiptssettings.h" #include "receiptsprinteroptionsdialog.h" -#include +#include #include #include @@ -80,7 +80,7 @@ void ReceiptsSettingsPage::loadReceptList() { qfLogFuncFrame(); ui->cbxReceipt->clear(); - auto *receipts_plugin = qf::qmlwidgets::framework::getPlugin(); + auto *receipts_plugin = qf::gui::framework::getPlugin(); for(const auto &i : receipts_plugin->listReportFiles("receipts")) { qfDebug() << i.reportName << i.reportFilePath; ui->cbxReceipt->addItem(i.reportName, i.reportFilePath); diff --git a/quickevent/app/quickevent/plugins/Receipts/src/receiptswidget.cpp b/quickevent/app/quickevent/plugins/Receipts/src/receiptswidget.cpp index e11685ed4..aaa08e27c 100644 --- a/quickevent/app/quickevent/plugins/Receipts/src/receiptswidget.cpp +++ b/quickevent/app/quickevent/plugins/Receipts/src/receiptswidget.cpp @@ -9,12 +9,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include @@ -37,8 +37,8 @@ #include namespace qfs = qf::core::sql; -namespace qfw = qf::qmlwidgets; -using qf::qmlwidgets::framework::getPlugin; +namespace qfw = qf::gui; +using qf::gui::framework::getPlugin; using Event::EventPlugin; using Receipts::ReceiptsPlugin; diff --git a/quickevent/app/quickevent/plugins/Receipts/src/receiptswidget.h b/quickevent/app/quickevent/plugins/Receipts/src/receiptswidget.h index c41b6477a..83fb0ab60 100644 --- a/quickevent/app/quickevent/plugins/Receipts/src/receiptswidget.h +++ b/quickevent/app/quickevent/plugins/Receipts/src/receiptswidget.h @@ -9,10 +9,10 @@ namespace Ui { class ReceiptsWidget; } -namespace qf::qmlwidgets::model { class SqlTableModel; } +namespace qf::gui::model { class SqlTableModel; } namespace qf { -namespace qmlwidgets { +namespace gui { class Action; namespace framework { class PartWidget; @@ -64,7 +64,7 @@ class ReceiptsWidget : public QFrame bool thisReaderOnly(); private: Ui::ReceiptsWidget *ui; - qf::qmlwidgets::model::SqlTableModel *m_cardsModel = nullptr; + qf::gui::model::SqlTableModel *m_cardsModel = nullptr; }; #endif // RECEIPTSWIDGET_H diff --git a/quickevent/app/quickevent/plugins/Receipts/src/receiptswidget.ui b/quickevent/app/quickevent/plugins/Receipts/src/receiptswidget.ui index efa6ef726..18de8a406 100644 --- a/quickevent/app/quickevent/plugins/Receipts/src/receiptswidget.ui +++ b/quickevent/app/quickevent/plugins/Receipts/src/receiptswidget.ui @@ -35,7 +35,7 @@ 7 - + true @@ -70,20 +70,20 @@ - + - qf::qmlwidgets::TableView + qf::gui::TableView QTableView -
qf/qmlwidgets/tableview.h
+
qf/gui/tableview.h
 - qf::qmlwidgets::TableViewToolBar + qf::gui::TableViewToolBar QWidget -
qf/qmlwidgets/tableviewtoolbar.h
+
qf/gui/tableviewtoolbar.h
1 diff --git a/quickevent/app/quickevent/plugins/Relays/src/addlegdialogwidget.cpp b/quickevent/app/quickevent/plugins/Relays/src/addlegdialogwidget.cpp index 34421ffb3..f6cefa1de 100644 --- a/quickevent/app/quickevent/plugins/Relays/src/addlegdialogwidget.cpp +++ b/quickevent/app/quickevent/plugins/Relays/src/addlegdialogwidget.cpp @@ -1,21 +1,21 @@ #include "addlegdialogwidget.h" #include "ui_addlegdialogwidget.h" -#include -#include +#include +#include #include #include #include #include -#include +#include #include // #include #include #include -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; // using Competitors::CompetitorsPlugin; using Event::EventPlugin; @@ -31,7 +31,7 @@ AddLegDialogWidget::AddLegDialogWidget(QWidget *parent) m_defaultStatusText = ui->lblStatus->text(); - auto *competitors_model = new qf::qmlwidgets::model::SqlTableModel(this); + auto *competitors_model = new qf::gui::model::SqlTableModel(this); //competitors_model->addColumn("relays.club", tr("Club")); competitors_model->addColumn("relayName", tr("Name")); competitors_model->addColumn("runs.leg", tr("Leg")); @@ -60,13 +60,13 @@ AddLegDialogWidget::AddLegDialogWidget(QWidget *parent) auto *reg_model = getPlugin()->registrationsModel(); ui->tblRegistrations->setTableModel(reg_model); ui->tblRegistrations->setReadOnly(true); - connect(reg_model, &qf::qmlwidgets::model::SqlTableModel::reloaded, this, [this]() { + connect(reg_model, &qf::gui::model::SqlTableModel::reloaded, this, [this]() { ui->tblRegistrations->horizontalHeader()->resizeSections(QHeaderView::ResizeToContents); }); connect(ui->edFilter, &QLineEdit::textChanged, this, &AddLegDialogWidget::onFilterTextChanged); - connect(ui->tblCompetitors, &qf::qmlwidgets::TableView::doubleClicked, this, &AddLegDialogWidget::onCompetitorSelected); - connect(ui->tblRegistrations, &qf::qmlwidgets::TableView::doubleClicked, this, &AddLegDialogWidget::onRegistrationSelected); + connect(ui->tblCompetitors, &qf::gui::TableView::doubleClicked, this, &AddLegDialogWidget::onCompetitorSelected); + connect(ui->tblRegistrations, &qf::gui::TableView::doubleClicked, this, &AddLegDialogWidget::onRegistrationSelected); connect(ui->btUseUnregRunner, &QPushButton::clicked, this, &AddLegDialogWidget::onUnregistredRunnerAdded); } @@ -94,7 +94,7 @@ void AddLegDialogWidget::onCompetitorSelected() int curr_run_id = row.value("runs.id").toInt(); int curr_relay_id = row.value("relayId").toInt(); if(curr_relay_id > 0 && curr_relay_id != relayId()) { - if(false == qf::qmlwidgets::dialogs::MessageBox::askYesNo(this, tr("Competitor has different relay assigned already. Move it to current one?"))) + if(false == qf::gui::dialogs::MessageBox::askYesNo(this, tr("Competitor has different relay assigned already. Move it to current one?"))) return; if(row.value("relays.classId").toInt() != classId()) { qf::core::sql::Query q; diff --git a/quickevent/app/quickevent/plugins/Relays/src/addlegdialogwidget.h b/quickevent/app/quickevent/plugins/Relays/src/addlegdialogwidget.h index b96249f89..ee2c66a47 100644 --- a/quickevent/app/quickevent/plugins/Relays/src/addlegdialogwidget.h +++ b/quickevent/app/quickevent/plugins/Relays/src/addlegdialogwidget.h @@ -1,18 +1,18 @@ #ifndef ADDLEGDIALOGWIDGET_H #define ADDLEGDIALOGWIDGET_H -#include +#include #include namespace Ui { class AddLegDialogWidget; } -class AddLegDialogWidget : public qf::qmlwidgets::framework::DialogWidget +class AddLegDialogWidget : public qf::gui::framework::DialogWidget { Q_OBJECT - using Super = qf::qmlwidgets::framework::DialogWidget; + using Super = qf::gui::framework::DialogWidget; QF_FIELD_IMPL2(int, r, R, elayId, 0) QF_FIELD_IMPL2(int, c, C, lassId, 0) diff --git a/quickevent/app/quickevent/plugins/Relays/src/addlegdialogwidget.ui b/quickevent/app/quickevent/plugins/Relays/src/addlegdialogwidget.ui index f56be9cd0..39ce6d8d2 100644 --- a/quickevent/app/quickevent/plugins/Relays/src/addlegdialogwidget.ui +++ b/quickevent/app/quickevent/plugins/Relays/src/addlegdialogwidget.ui @@ -70,7 +70,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -186,9 +186,9 @@ - qf::qmlwidgets::TableView + qf::gui::TableView QTableView -
qf/qmlwidgets/tableview.h
+
qf/gui/tableview.h
 quickevent::gui::si::SiIdEdit diff --git a/quickevent/app/quickevent/plugins/Relays/src/relaydocument.cpp b/quickevent/app/quickevent/plugins/Relays/src/relaydocument.cpp index 3c59f7342..00fab783f 100644 --- a/quickevent/app/quickevent/plugins/Relays/src/relaydocument.cpp +++ b/quickevent/app/quickevent/plugins/Relays/src/relaydocument.cpp @@ -2,8 +2,8 @@ #include -#include -#include +#include +#include #include #include @@ -11,7 +11,7 @@ #include using namespace Relays; -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Event::EventPlugin; RelayDocument:: RelayDocument(QObject *parent) diff --git a/quickevent/app/quickevent/plugins/Relays/src/relaydocument.h b/quickevent/app/quickevent/plugins/Relays/src/relaydocument.h index 3c6575ee9..d3da78f82 100644 --- a/quickevent/app/quickevent/plugins/Relays/src/relaydocument.h +++ b/quickevent/app/quickevent/plugins/Relays/src/relaydocument.h @@ -1,15 +1,15 @@ #ifndef RELAYS_RELAYDOCUMENT_H #define RELAYS_RELAYDOCUMENT_H -#include +#include namespace Relays { -class RelayDocument : public qf::qmlwidgets::model::SqlDataDocument +class RelayDocument : public qf::gui::model::SqlDataDocument { Q_OBJECT private: - typedef qf::qmlwidgets::model::SqlDataDocument Super; + typedef qf::gui::model::SqlDataDocument Super; public: RelayDocument(QObject *parent = nullptr); protected: diff --git a/quickevent/app/quickevent/plugins/Relays/src/relaysplugin.cpp b/quickevent/app/quickevent/plugins/Relays/src/relaysplugin.cpp index d6ff97ca5..a2381e38d 100644 --- a/quickevent/app/quickevent/plugins/Relays/src/relaysplugin.cpp +++ b/quickevent/app/quickevent/plugins/Relays/src/relaysplugin.cpp @@ -8,16 +8,16 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include -#include +#include #include #include #include @@ -28,9 +28,9 @@ #include -namespace qff = qf::qmlwidgets::framework; -namespace qfd = qf::qmlwidgets::dialogs; -namespace qfm = qf::qmlwidgets::model; +namespace qff = qf::gui::framework; +namespace qfd = qf::gui::dialogs; +namespace qfm = qf::gui::model; namespace qfs = qf::core::sql; namespace qog = quickevent::core::og; using ::PartWidget; @@ -470,8 +470,8 @@ qf::core::utils::TreeTable RelaysPlugin::nLegsClassResultsTable(int class_id, in QVariant RelaysPlugin::startListByClassesTableData(const QString &class_filter, bool with_vacants) { qfLogFuncFrame() << class_filter; - qf::qmlwidgets::model::SqlTableModel model; - qf::qmlwidgets::model::SqlTableModel model2; + qf::gui::model::SqlTableModel model; + qf::gui::model::SqlTableModel model2; { qf::core::sql::QueryBuilder qb; qb.select2("classes", "id, name") diff --git a/quickevent/app/quickevent/plugins/Relays/src/relaysplugin.h b/quickevent/app/quickevent/plugins/Relays/src/relaysplugin.h index e623b719b..30a54408c 100644 --- a/quickevent/app/quickevent/plugins/Relays/src/relaysplugin.h +++ b/quickevent/app/quickevent/plugins/Relays/src/relaysplugin.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include @@ -9,7 +9,7 @@ namespace qf { namespace core { namespace model { class SqlTableModel; }} namespace core { namespace utils { class TreeTable; }} -namespace qmlwidgets { +namespace gui { class Action; namespace framework { class PartWidget; @@ -22,17 +22,17 @@ namespace quickevent { namespace core { namespace si { class CheckedCard; }}} namespace Relays { -class RelaysPlugin : public qf::qmlwidgets::framework::Plugin +class RelaysPlugin : public qf::gui::framework::Plugin { Q_OBJECT - Q_PROPERTY(qf::qmlwidgets::framework::PartWidget* partWidget READ partWidget FINAL) + Q_PROPERTY(qf::gui::framework::PartWidget* partWidget READ partWidget FINAL) private: - using Super = qf::qmlwidgets::framework::Plugin; + using Super = qf::gui::framework::Plugin; public: RelaysPlugin(QObject *parent = nullptr); ~RelaysPlugin() override = default; - qf::qmlwidgets::framework::PartWidget *partWidget() {return m_partWidget;} + qf::gui::framework::PartWidget *partWidget() {return m_partWidget;} Q_INVOKABLE QObject* createRelayDocument(QObject *parent); Q_INVOKABLE int editRelay(int id, int mode); @@ -52,7 +52,7 @@ class RelaysPlugin : public qf::qmlwidgets::framework::Plugin void onDbEventNotify(const QString &domain, int connection_id, const QVariant &data); void processRunnerFinished(const quickevent::core::si::CheckedCard &checked_card); private: - qf::qmlwidgets::framework::PartWidget *m_partWidget = nullptr; + qf::gui::framework::PartWidget *m_partWidget = nullptr; }; } diff --git a/quickevent/app/quickevent/plugins/Relays/src/relayswidget.cpp b/quickevent/app/quickevent/plugins/Relays/src/relayswidget.cpp index 2488299e9..5fc8829e8 100644 --- a/quickevent/app/quickevent/plugins/Relays/src/relayswidget.cpp +++ b/quickevent/app/quickevent/plugins/Relays/src/relayswidget.cpp @@ -14,21 +14,21 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include +#include #include #include #include @@ -47,10 +47,10 @@ #include namespace qfs = qf::core::sql; -namespace qfw = qf::qmlwidgets; -namespace qfd = qf::qmlwidgets::dialogs; -namespace qfm = qf::qmlwidgets::model; -using qf::qmlwidgets::framework::getPlugin; +namespace qfw = qf::gui; +namespace qfd = qf::gui::dialogs; +namespace qfm = qf::gui::model; +using qf::gui::framework::getPlugin; using Event::EventPlugin; using Relays::RelaysPlugin; @@ -219,7 +219,7 @@ void RelaysWidget::reset() m_cbxClasses->loadItems(true); m_cbxClasses->insertItem(0, tr("--- all ---"), 0); m_cbxClasses->setCurrentIndex(0); - connect(m_cbxClasses, &qf::qmlwidgets::ForeignKeyComboBox::currentDataChanged, this, &RelaysWidget::reload, Qt::UniqueConnection); + connect(m_cbxClasses, &qf::gui::ForeignKeyComboBox::currentDataChanged, this, &RelaysWidget::reload, Qt::UniqueConnection); m_cbxClasses->blockSignals(false); } reload(); @@ -251,7 +251,7 @@ void RelaysWidget::editRelay(const QVariant &id, int mode) dlg.setDefaultButton(QDialogButtonBox::Save); QPushButton *bt_save_and_next = dlg.buttonBox()->addButton(tr("Save and &next"), QDialogButtonBox::AcceptRole); bool save_and_next = false; - connect(dlg.buttonBox(), &qf::qmlwidgets::DialogButtonBox::clicked, this, [&save_and_next, bt_save_and_next](QAbstractButton *button) { + connect(dlg.buttonBox(), &qf::gui::DialogButtonBox::clicked, this, [&save_and_next, bt_save_and_next](QAbstractButton *button) { save_and_next = (button == bt_save_and_next); }); dlg.setCentralWidget(w); @@ -262,7 +262,7 @@ void RelaysWidget::editRelay(const QVariant &id, int mode) int class_id = m_cbxClasses->currentData().toInt(); doc->setValue("relays.classId", class_id); } - connect(doc, &Relays:: RelayDocument::saved, ui->tblRelays, &qf::qmlwidgets::TableView::rowExternallySaved, Qt::QueuedConnection); + connect(doc, &Relays:: RelayDocument::saved, ui->tblRelays, &qf::gui::TableView::rowExternallySaved, Qt::QueuedConnection); bool ok = dlg.exec(); //if(ok) // transaction.commit(); @@ -270,7 +270,7 @@ void RelaysWidget::editRelay(const QVariant &id, int mode) // transaction.rollback(); if(ok && save_and_next) { QTimer::singleShot(0, this, [this]() { - this->editRelay(QVariant(), qf::qmlwidgets::model::DataDocument::ModeInsert); + this->editRelay(QVariant(), qf::gui::model::DataDocument::ModeInsert); }); } } @@ -354,8 +354,8 @@ void RelaysWidget::relays_assignNumbers() QVariant RelaysWidget::startListByClubsTableData(bool with_vacants) { qfLogFuncFrame(); - qf::qmlwidgets::model::SqlTableModel model; - qf::qmlwidgets::model::SqlTableModel model2; + qf::gui::model::SqlTableModel model; + qf::gui::model::SqlTableModel model2; { qf::core::sql::QueryBuilder qb1; qb1.select("relays.club") @@ -441,7 +441,7 @@ void RelaysWidget::print_start_list_classes() bool vacants = dlg.isStartListPrintVacants(); QVariant td = getPlugin()->startListByClassesTableData(dlg.sqlWhereExpression(), vacants); auto report_name = (dlg.options().isRelayShowLegsDetails()) ? "startList_classes.qml" : "startList_classes_condensed.qml"; - qf::qmlwidgets::reports::ReportViewWidget::showReport(this + qf::gui::reports::ReportViewWidget::showReport(this , getPlugin()->findReportFile(report_name) , td , tr("Start list by classes") @@ -464,7 +464,7 @@ void RelaysWidget::print_start_list_clubs() bool vacants = dlg.isStartListPrintVacants(); QVariant td = startListByClubsTableData(vacants); auto report_name = (dlg.options().isRelayShowLegsDetails()) ? "startList_clubs.qml" : "startList_clubs_condensed.qml"; - qf::qmlwidgets::reports::ReportViewWidget::showReport(this, + qf::gui::reports::ReportViewWidget::showReport(this, getPlugin()->findReportFile(report_name) , td , tr("Start list by clubs") @@ -492,7 +492,7 @@ void RelaysWidget::print_results_nlegs() //qfDebug() << opts; qfDebug() << "opts.resultNumPlaces:" << opts.resultNumPlaces(); auto td = getPlugin()->nLegsResultsTable(dlg.sqlWhereExpression(), opts.legsCount(), opts.resultNumPlaces(), opts.isResultExcludeDisq()); - qf::qmlwidgets::reports::ReportViewWidget::showReport(this, + qf::gui::reports::ReportViewWidget::showReport(this, getPlugin()->findReportFile("results.qml") , td.toVariant() , tr("Results") @@ -516,7 +516,7 @@ void RelaysWidget::print_results_overal() //qfDebug() << opts; qfDebug() << "opts.resultNumPlaces:" << opts.resultNumPlaces(); auto td = getPlugin()->nLegsResultsTable(dlg.sqlWhereExpression(), 999, opts.resultNumPlaces(), opts.isResultExcludeDisq()); - qf::qmlwidgets::reports::ReportViewWidget::showReport(this, + qf::gui::reports::ReportViewWidget::showReport(this, getPlugin()->findReportFile("results.qml") , td.toVariant() , tr("Results") @@ -540,7 +540,7 @@ void RelaysWidget::print_results_overal_condensed() //qfDebug() << opts; qfDebug() << "opts.resultNumPlaces:" << opts.resultNumPlaces(); auto td = getPlugin()->nLegsResultsTable(dlg.sqlWhereExpression(), 999, opts.resultNumPlaces(), opts.isResultExcludeDisq()); - qf::qmlwidgets::reports::ReportViewWidget::showReport(this, + qf::gui::reports::ReportViewWidget::showReport(this, getPlugin()->findReportFile("results_condensed.qml") , td.toVariant() , tr("Results") @@ -553,7 +553,7 @@ void RelaysWidget::print_results_overal_condensed() void RelaysWidget::save_xml_file(QString str, QString fn) { qfLogFuncFrame(); QString ext = ".xml"; - fn = qf::qmlwidgets::dialogs::FileDialog::getSaveFileName(this, tr("Save as %1").arg(ext.mid(1).toUpper()), fn, '*' + ext); + fn = qf::gui::dialogs::FileDialog::getSaveFileName(this, tr("Save as %1").arg(ext.mid(1).toUpper()), fn, '*' + ext); if(!fn.isEmpty()) { if(!fn.endsWith(ext, Qt::CaseInsensitive)) fn += ext; @@ -583,8 +583,8 @@ void RelaysWidget::export_results_iofxml3() { } void RelaysWidget::relays_importBibs() { - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); - qf::qmlwidgets::dialogs::MessageBox mbx(fwk); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); + qf::gui::dialogs::MessageBox mbx(fwk); mbx.setIcon(QMessageBox::Information); mbx.setText(tr("Import UTF8 text file with comma separated values with first row as header.
Separator is semicolon(;).
Updates only existing relays (key is Club, Relay Name & Class).")); mbx.setInformativeText(tr("Each row should have following columns: " @@ -700,13 +700,13 @@ void RelaysWidget::relays_importBibs() { QMessageBox::information(this, tr("Information"), QString(tr("Import file finished. Imported %1 of %2 lines\n\nPress refresh button to show imported data.").arg(i).arg(n-1))); } catch (const qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(fwk, e); + qf::gui::dialogs::MessageBox::showException(fwk, e); } } void RelaysWidget::relays_addVacants() { - auto fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + auto fwk = qf::gui::framework::MainWindow::frameWork(); QMap rel_classes; qf::core::sql::Query q; q.exec("SELECT id, name FROM classes"); @@ -737,6 +737,6 @@ void RelaysWidget::relays_addVacants() } } catch (const qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(fwk, e); + qf::gui::dialogs::MessageBox::showException(fwk, e); } } diff --git a/quickevent/app/quickevent/plugins/Relays/src/relayswidget.h b/quickevent/app/quickevent/plugins/Relays/src/relayswidget.h index 4dc77edb4..ba874492a 100644 --- a/quickevent/app/quickevent/plugins/Relays/src/relayswidget.h +++ b/quickevent/app/quickevent/plugins/Relays/src/relayswidget.h @@ -10,8 +10,8 @@ namespace Ui { class RelaysWidget; } -namespace qf::qmlwidgets::model { class SqlTableModel; } -namespace qf::qmlwidgets { class ForeignKeyComboBox; } +namespace qf::gui::model { class SqlTableModel; } +namespace qf::gui { class ForeignKeyComboBox; } class RelaysWidget : public QFrame { @@ -52,8 +52,8 @@ class RelaysWidget : public QFrame //void printResults(const QString &settings_id, const QVariantMap &default_options); private: Ui::RelaysWidget *ui; - qf::qmlwidgets::model::SqlTableModel *m_tblModel; - qf::qmlwidgets::ForeignKeyComboBox *m_cbxClasses = nullptr; + qf::gui::model::SqlTableModel *m_tblModel; + qf::gui::ForeignKeyComboBox *m_cbxClasses = nullptr; void save_xml_file(QString str, QString fn); }; diff --git a/quickevent/app/quickevent/plugins/Relays/src/relayswidget.ui b/quickevent/app/quickevent/plugins/Relays/src/relayswidget.ui index e91d001fd..c2664ac5b 100644 --- a/quickevent/app/quickevent/plugins/Relays/src/relayswidget.ui +++ b/quickevent/app/quickevent/plugins/Relays/src/relayswidget.ui @@ -36,23 +36,23 @@ 5 - + - + - qf::qmlwidgets::TableView + qf::gui::TableView QTableView -
qf/qmlwidgets/tableview.h
+
qf/gui/tableview.h
 - qf::qmlwidgets::TableViewToolBar + qf::gui::TableViewToolBar QWidget -
qf/qmlwidgets/tableviewtoolbar.h
+
qf/gui/tableviewtoolbar.h
1 diff --git a/quickevent/app/quickevent/plugins/Relays/src/relaywidget.cpp b/quickevent/app/quickevent/plugins/Relays/src/relaywidget.cpp index 6b73b202a..defbb4d5c 100644 --- a/quickevent/app/quickevent/plugins/Relays/src/relaywidget.cpp +++ b/quickevent/app/quickevent/plugins/Relays/src/relaywidget.cpp @@ -12,10 +12,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -29,7 +29,7 @@ #include #include -namespace qfd = qf::qmlwidgets::dialogs; +namespace qfd = qf::gui::dialogs; namespace { @@ -96,7 +96,7 @@ RelayWidget:: RelayWidget(QWidget *parent) : setTitle(tr("Relay")); { - qf::qmlwidgets::ForeignKeyComboBox *cbx = ui->cbxClass; + qf::gui::ForeignKeyComboBox *cbx = ui->cbxClass; cbx->setReferencedTable("classes"); cbx->setReferencedField("id"); cbx->setReferencedCaptionField("name"); @@ -107,7 +107,7 @@ RelayWidget:: RelayWidget(QWidget *parent) : ui->tblLegs->setTableModel(m_legsModel); ui->tblLegs->setPersistentSettingsId(ui->tblLegs->objectName()); ui->tblLegs->setDirtyRowsMenuSectionEnabled(false); - ui->tblLegs->setInlineEditSaveStrategy(qf::qmlwidgets::TableView::OnEditedValueCommit); + ui->tblLegs->setInlineEditSaveStrategy(qf::gui::TableView::OnEditedValueCommit); ui->tblLegs->setItemDelegate(new quickevent::gui::og::ItemDelegate(ui->tblLegs)); //ui->tblLegs->setContextMenuPolicy(Qt::CustomContextMenu); //connect(ui->tblLegs, &qfw::TableView::customContextMenuRequested, this, & RelayWidget::onRunsTableCustomContextMenuRequest); @@ -152,11 +152,11 @@ bool RelayWidget::saveData() { auto doc = qobject_cast(dataController()->document()); if(doc->value(QStringLiteral("classId")).toInt() == 0) { - qf::qmlwidgets::dialogs::MessageBox::showWarning(this, tr("Class should be entered.")); + qf::gui::dialogs::MessageBox::showWarning(this, tr("Class should be entered.")); return false; } if(doc->dataId() == 0) { - qf::qmlwidgets::dialogs::MessageBox::showWarning(this, tr("Relay ID invalid.")); + qf::gui::dialogs::MessageBox::showWarning(this, tr("Relay ID invalid.")); return false; } bool ret = false; @@ -166,7 +166,7 @@ bool RelayWidget::saveData() checkLegsStartTimes(); } catch (qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(this, e); + qf::gui::dialogs::MessageBox::showException(this, e); } return ret; } @@ -206,7 +206,7 @@ void RelayWidget::addLeg() //dlg.setDefaultButton(QDialogButtonBox::Ok); QPushButton *bt_add_current = dlg.buttonBox()->addButton(tr("Add current"), QDialogButtonBox::AcceptRole); bool add_current = false; - connect(dlg.buttonBox(), &qf::qmlwidgets::DialogButtonBox::clicked, [&add_current, bt_add_current](QAbstractButton *button) { + connect(dlg.buttonBox(), &qf::gui::DialogButtonBox::clicked, [&add_current, bt_add_current](QAbstractButton *button) { add_current = (button == bt_add_current); }); */ diff --git a/quickevent/app/quickevent/plugins/Relays/src/relaywidget.h b/quickevent/app/quickevent/plugins/Relays/src/relaywidget.h index aaf79acfb..e0a5726c0 100644 --- a/quickevent/app/quickevent/plugins/Relays/src/relaywidget.h +++ b/quickevent/app/quickevent/plugins/Relays/src/relaywidget.h @@ -1,22 +1,22 @@ #ifndef RELAYWIDGET_H #define RELAYWIDGET_H -#include +#include namespace quickevent::gui::og { class SqlTableModel; } namespace Ui { class RelayWidget; } -class RelayWidget : public qf::qmlwidgets::framework::DataDialogWidget +class RelayWidget : public qf::gui::framework::DataDialogWidget { Q_OBJECT private: - typedef qf::qmlwidgets::framework::DataDialogWidget Super; + typedef qf::gui::framework::DataDialogWidget Super; public: explicit RelayWidget(QWidget *parent = nullptr); ~RelayWidget() Q_DECL_OVERRIDE; - bool load(const QVariant &id = QVariant(), int mode = qf::qmlwidgets::model::DataDocument::ModeEdit) Q_DECL_OVERRIDE; + bool load(const QVariant &id = QVariant(), int mode = qf::gui::model::DataDocument::ModeEdit) Q_DECL_OVERRIDE; private: Q_SLOT bool loadLegsTable(); //Q_SLOT bool saveLegsTable(); diff --git a/quickevent/app/quickevent/plugins/Relays/src/relaywidget.ui b/quickevent/app/quickevent/plugins/Relays/src/relaywidget.ui index d5ac34088..277101020 100644 --- a/quickevent/app/quickevent/plugins/Relays/src/relaywidget.ui +++ b/quickevent/app/quickevent/plugins/Relays/src/relaywidget.ui @@ -76,21 +76,21 @@ - + relays.classId - + relays.name - + relays.club @@ -107,7 +107,7 @@ - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -120,7 +120,7 @@ - + relays.note @@ -179,8 +179,8 @@ Add leg Ctrl+Ins - - :/qf/qmlwidgets/images/flat/insert-row.svg:/qf/qmlwidgets/images/flat/insert-row.svg + + :/qf/gui/images/flat/insert-row.svg:/qf/gui/images/flat/insert-row.svg Ctrl+Ins @@ -193,8 +193,8 @@ Remove leg Ctrl+Del - - :/qf/qmlwidgets/images/flat/delete-row.svg:/qf/qmlwidgets/images/flat/delete-row.svg + + :/qf/gui/images/flat/delete-row.svg:/qf/gui/images/flat/delete-row.svg Ctrl+Del @@ -207,8 +207,8 @@ Move leg down Ctrl+D - - :/qf/qmlwidgets/images/flat/down.svg:/qf/qmlwidgets/images/flat/down.svg + + :/qf/gui/images/flat/down.svg:/qf/gui/images/flat/down.svg Ctrl+D @@ -221,8 +221,8 @@ Move leg up Ctrl+U - - :/qf/qmlwidgets/images/flat/up.svg:/qf/qmlwidgets/images/flat/up.svg + + :/qf/gui/images/flat/up.svg:/qf/gui/images/flat/up.svg Ctrl+U @@ -235,8 +235,8 @@ Reload Ctrl+R - - :/qf/qmlwidgets/images/flat/reload.svg:/qf/qmlwidgets/images/flat/reload.svg + + :/qf/gui/images/flat/reload.svg:/qf/gui/images/flat/reload.svg Ctrl+R @@ -247,30 +247,30 @@ - + - qf::qmlwidgets::TableView + qf::gui::TableView QTableView -
qf/qmlwidgets/tableview.h
+
qf/gui/tableview.h
 - qf::qmlwidgets::LineEdit + qf::gui::LineEdit QLineEdit -
qf/qmlwidgets/lineedit.h
+
qf/gui/lineedit.h
 - qf::qmlwidgets::ForeignKeyComboBox + qf::gui::ForeignKeyComboBox QComboBox -
qf/qmlwidgets/combobox.h
+
qf/gui/combobox.h
 - qf::qmlwidgets::SpinBox + qf::gui::SpinBox QSpinBox -
qf/qmlwidgets/spinbox.h
+
qf/gui/spinbox.h
 @@ -287,7 +287,7 @@ tblLegs - + diff --git a/quickevent/app/quickevent/plugins/Runs/src/eventstatisticsoptions.cpp b/quickevent/app/quickevent/plugins/Runs/src/eventstatisticsoptions.cpp index d67e349b7..e676525ca 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/eventstatisticsoptions.cpp +++ b/quickevent/app/quickevent/plugins/Runs/src/eventstatisticsoptions.cpp @@ -7,7 +7,7 @@ EventStatisticsOptions::EventStatisticsOptions(QWidget *parent) : QDialog(parent) - , qf::qmlwidgets::framework::IPersistentSettings(this) + , qf::gui::framework::IPersistentSettings(this) , ui(new Ui::EventStatisticsOptions) { ui->setupUi(this); diff --git a/quickevent/app/quickevent/plugins/Runs/src/eventstatisticsoptions.h b/quickevent/app/quickevent/plugins/Runs/src/eventstatisticsoptions.h index 1ecc15f8f..35a98871e 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/eventstatisticsoptions.h +++ b/quickevent/app/quickevent/plugins/Runs/src/eventstatisticsoptions.h @@ -1,7 +1,7 @@ #ifndef EVENTSTATISTICSOPTIONS_H #define EVENTSTATISTICSOPTIONS_H -#include +#include #include @@ -11,7 +11,7 @@ namespace Ui { class EventStatisticsOptions; } -class EventStatisticsOptions : public QDialog, public qf::qmlwidgets::framework::IPersistentSettings +class EventStatisticsOptions : public QDialog, public qf::gui::framework::IPersistentSettings { Q_OBJECT private: diff --git a/quickevent/app/quickevent/plugins/Runs/src/eventstatisticswidget.cpp b/quickevent/app/quickevent/plugins/Runs/src/eventstatisticswidget.cpp index db9c3d31a..6f30b8a6e 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/eventstatisticswidget.cpp +++ b/quickevent/app/quickevent/plugins/Runs/src/eventstatisticswidget.cpp @@ -11,9 +11,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -25,7 +25,7 @@ #include #include -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Event::EventPlugin; using Runs::RunsPlugin; @@ -220,12 +220,12 @@ class FooterModel : public QAbstractTableModel QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - qf::qmlwidgets::model::TableModel* masterModel() const; - void setMasterModel(qf::qmlwidgets::model::TableModel *masterModel); + qf::gui::model::TableModel* masterModel() const; + void setMasterModel(qf::gui::model::TableModel *masterModel); void reload(); private: - qf::qmlwidgets::model::TableModel *m_masterModel = nullptr; + qf::gui::model::TableModel *m_masterModel = nullptr; QVector m_columnSums; }; @@ -265,16 +265,16 @@ QVariant FooterModel::headerData(int section, Qt::Orientation orientation, int r return Super::headerData(section, orientation, role); } -qf::qmlwidgets::model::TableModel *FooterModel::masterModel() const +qf::gui::model::TableModel *FooterModel::masterModel() const { QF_ASSERT_EX(m_masterModel != nullptr, "Master model is NULL"); return m_masterModel; } -void FooterModel::setMasterModel(qf::qmlwidgets::model::TableModel *masterModel) +void FooterModel::setMasterModel(qf::gui::model::TableModel *masterModel) { m_masterModel = masterModel; - connect(m_masterModel, &qf::qmlwidgets::model::SqlTableModel::reloaded, this, &FooterModel::reload); + connect(m_masterModel, &qf::gui::model::SqlTableModel::reloaded, this, &FooterModel::reload); } void FooterModel::reload() @@ -567,7 +567,7 @@ void EventStatisticsWidget::printResultsForRows(const QList &rows) props["isBreakAfterEachClass"] = (opts.breakType() != (int)quickevent::gui::ReportOptionsDialog::BreakType::None); props["isColumnBreak"] = (opts.breakType() == (int)quickevent::gui::ReportOptionsDialog::BreakType::Column); props["options"] = opts; - report_printed = qf::qmlwidgets::reports::ReportViewWidget::showReport(this + report_printed = qf::gui::reports::ReportViewWidget::showReport(this , getPlugin()->findReportFile("results_stage.qml") , td , tr("Results by classes") diff --git a/quickevent/app/quickevent/plugins/Runs/src/eventstatisticswidget.ui b/quickevent/app/quickevent/plugins/Runs/src/eventstatisticswidget.ui index 4d4735f2d..d7dad9c0e 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/eventstatisticswidget.ui +++ b/quickevent/app/quickevent/plugins/Runs/src/eventstatisticswidget.ui @@ -73,8 +73,8 @@ Print results in selected rows - - :/qf/qmlwidgets/images/flat/printer.svg:/qf/qmlwidgets/images/flat/printer.svg + + :/qf/gui/images/flat/printer.svg:/qf/gui/images/flat/printer.svg true @@ -87,8 +87,8 @@ Clear new results in selected rows - - :/qf/qmlwidgets/images/flat/delete.svg:/qf/qmlwidgets/images/flat/delete.svg + + :/qf/gui/images/flat/delete.svg:/qf/gui/images/flat/delete.svg true @@ -101,8 +101,8 @@ Reload table - - :/qf/qmlwidgets/images/flat/reload.svg:/qf/qmlwidgets/images/flat/reload.svg + + :/qf/gui/images/flat/reload.svg:/qf/gui/images/flat/reload.svg true @@ -115,8 +115,8 @@ Options - - :/qf/qmlwidgets/images/flat/settings.svg:/qf/qmlwidgets/images/flat/settings.svg + + :/qf/gui/images/flat/settings.svg:/qf/gui/images/flat/settings.svg true @@ -145,7 +145,7 @@ 0 - + @@ -153,13 +153,13 @@ - qf::qmlwidgets::TableView + qf::gui::TableView QTableView -
qf/qmlwidgets/tableview.h
+
qf/gui/tableview.h
 - + diff --git a/quickevent/app/quickevent/plugins/Runs/src/findrunneredit.cpp b/quickevent/app/quickevent/plugins/Runs/src/findrunneredit.cpp index de68b9a6f..95ab8ef8f 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/findrunneredit.cpp +++ b/quickevent/app/quickevent/plugins/Runs/src/findrunneredit.cpp @@ -2,11 +2,11 @@ //#include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/quickevent/app/quickevent/plugins/Runs/src/findrunnerwidget.cpp b/quickevent/app/quickevent/plugins/Runs/src/findrunnerwidget.cpp index 5d33c440f..dcfb21c95 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/findrunnerwidget.cpp +++ b/quickevent/app/quickevent/plugins/Runs/src/findrunnerwidget.cpp @@ -2,14 +2,14 @@ #include "ui_findrunnerwidget.h" #include "runsplugin.h" -#include +#include -#include +#include #include #include #include -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Runs::RunsPlugin; using Event::EventPlugin; diff --git a/quickevent/app/quickevent/plugins/Runs/src/findrunnerwidget.h b/quickevent/app/quickevent/plugins/Runs/src/findrunnerwidget.h index f81164dfd..16d22b793 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/findrunnerwidget.h +++ b/quickevent/app/quickevent/plugins/Runs/src/findrunnerwidget.h @@ -9,7 +9,7 @@ namespace core { namespace model { class SqlTableModel; }} -namespace qmlwidgets { +namespace gui { class TableView; } } diff --git a/quickevent/app/quickevent/plugins/Runs/src/printawardsoptionsdialogwidget.cpp b/quickevent/app/quickevent/plugins/Runs/src/printawardsoptionsdialogwidget.cpp index 33f30e075..4a74a00e4 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/printawardsoptionsdialogwidget.cpp +++ b/quickevent/app/quickevent/plugins/Runs/src/printawardsoptionsdialogwidget.cpp @@ -2,7 +2,7 @@ #include "ui_printawardsoptionsdialogwidget.h" #include "runsplugin.h" -#include +#include #include @@ -16,7 +16,7 @@ PrintAwardsOptionsDialogWidget::PrintAwardsOptionsDialogWidget(QWidget *parent) ui->setupUi(this); ui->edNumPlaces->setValue(3); - auto *runs_plugin = qf::qmlwidgets::framework::getPlugin(); + auto *runs_plugin = qf::gui::framework::getPlugin(); for(const auto &i : runs_plugin->listReportFiles("awards")) { qfDebug() << i.reportName << i.reportFilePath; ui->edReportPath->addItem(i.reportName, i.reportFilePath); diff --git a/quickevent/app/quickevent/plugins/Runs/src/printawardsoptionsdialogwidget.h b/quickevent/app/quickevent/plugins/Runs/src/printawardsoptionsdialogwidget.h index 1833264ba..aa2796ccd 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/printawardsoptionsdialogwidget.h +++ b/quickevent/app/quickevent/plugins/Runs/src/printawardsoptionsdialogwidget.h @@ -1,7 +1,7 @@ #ifndef PRINTAWARDSOPTIONSDIALOGWIDGET_H #define PRINTAWARDSOPTIONSDIALOGWIDGET_H -#include +#include #include @@ -9,11 +9,11 @@ namespace Ui { class PrintAwardsOptionsDialogWidget; } -class PrintAwardsOptionsDialogWidget : public qf::qmlwidgets::framework::DialogWidget +class PrintAwardsOptionsDialogWidget : public qf::gui::framework::DialogWidget { Q_OBJECT private: - using Super = qf::qmlwidgets::framework::DialogWidget; + using Super = qf::gui::framework::DialogWidget; public: explicit PrintAwardsOptionsDialogWidget(QWidget *parent = 0); ~PrintAwardsOptionsDialogWidget(); diff --git a/quickevent/app/quickevent/plugins/Runs/src/runsplugin.cpp b/quickevent/app/quickevent/plugins/Runs/src/runsplugin.cpp index 9a15308c4..b909e2457 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/runsplugin.cpp +++ b/quickevent/app/quickevent/plugins/Runs/src/runsplugin.cpp @@ -18,13 +18,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include @@ -43,7 +43,7 @@ #include #include -namespace qff = qf::qmlwidgets::framework; +namespace qff = qf::gui::framework; namespace qfu = qf::core::utils; namespace qfs = qf::core::sql; using ::PartWidget; @@ -80,7 +80,7 @@ const qf::core::utils::Table &RunsPlugin::runnersTable(int stage_id) .join("competitors.classId", "classes.id") .joinRestricted("competitors.id", "runs.competitorId", "runs.stageId=" QF_IARG(stage_id), "JOIN") .orderBy("classes.name, lastName, firstName"); - qf::qmlwidgets::model::SqlTableModel m; + qf::gui::model::SqlTableModel m; m.setQueryBuilder(qb, false); m.reload(); m_runnersTableCache = m.table(); @@ -347,7 +347,7 @@ void RunsPlugin::showRunsTable(int stage_id, int class_id, bool show_offrace, co { auto *w = new RunsTableDialogWidget(); w->reload(stage_id, class_id, show_offrace, sort_column, select_competitor_id); - qf::qmlwidgets::dialogs::Dialog dlg(this->m_partWidget); + qf::gui::dialogs::Dialog dlg(this->m_partWidget); //dlg.setButtons(QDialogButtonBox::Cancel); dlg.setCentralWidget(w); dlg.exec(); @@ -356,7 +356,7 @@ void RunsPlugin::showRunsTable(int stage_id, int class_id, bool show_offrace, co QWidget* RunsPlugin::createReportOptionsDialog(QWidget *parent) { if(!parent) { - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); parent = fwk; } auto *ret = new quickevent::gui::ReportOptionsDialog(parent); @@ -367,7 +367,7 @@ QWidget* RunsPlugin::createReportOptionsDialog(QWidget *parent) QWidget *RunsPlugin::createNStagesReportOptionsDialog(QWidget *parent) { if(!parent) { - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); parent = fwk; } return new Runs::NStagesReportOptionsDialog(parent); @@ -560,7 +560,7 @@ qf::core::utils::Table RunsPlugin::nstagesClassResultsTable(int stages_count, in qb.select(QF_IARG(UNREAL_TIME_MSEC) " AS timeMs"); qb.select(QF_IARG(UNREAL_TIME_MSEC) " AS timeLossMs"); qb.select("'' AS pos"); - qf::qmlwidgets::model::SqlTableModel mod; + qf::gui::model::SqlTableModel mod; mod.setQueryBuilder(qb, false); mod.reload(); QMap competitor_id_to_row; @@ -649,7 +649,7 @@ qf::core::utils::TreeTable RunsPlugin::nstagesResultsTable(const QString &class_ qfLogFuncFrame(); //qf::core::utils::Table::FieldList cols; //cols << qf::core::utils::Table::Field("") - qf::qmlwidgets::model::SqlTableModel mod; + qf::gui::model::SqlTableModel mod; { qfs::QueryBuilder qb; qb.select2("classes", "id, name") @@ -695,7 +695,7 @@ qf::core::utils::TreeTable RunsPlugin::currentStageResultsTable(const QString &c qf::core::utils::TreeTable RunsPlugin::stageResultsTable(int stage_id, const QString &class_filter, int max_competitors_in_class, bool exclude_disq, bool add_laps) { qfLogFuncFrame(); - qf::qmlwidgets::model::SqlTableModel model; + qf::gui::model::SqlTableModel model; { qf::core::sql::QueryBuilder qb; qb.select2("classes", "id, name") @@ -919,7 +919,7 @@ QVariantMap RunsPlugin::printAwardsOptionsWithDialog(const QVariantMap &opts) QVariantMap ret; auto *w = new PrintAwardsOptionsDialogWidget(); w->setPrintOptions(opts); - qf::qmlwidgets::dialogs::Dialog dlg(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, m_partWidget); + qf::gui::dialogs::Dialog dlg(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, m_partWidget); dlg.setCentralWidget(w); if(dlg.exec()) { ret = w->printOptions(); @@ -1394,7 +1394,7 @@ qf::core::utils::TreeTable RunsPlugin::startListClassesTable(const QString &wher qb.where(where_expr); QVariantMap qpm; qpm["stage_id"] = stage_id; - qf::qmlwidgets::model::SqlTableModel m; + qf::gui::model::SqlTableModel m; m.setQueryBuilder(qb); m.setQueryParameters(qpm); m.reload(); @@ -1453,7 +1453,7 @@ qf::core::utils::TreeTable RunsPlugin::startListClassesTable(const QString &wher int class_id = tt_row.value(QStringLiteral("classes.id")).toInt(); //console.debug("class id:", class_id); qpm["class_id"] = class_id; - qf::qmlwidgets::model::SqlTableModel m2; + qf::gui::model::SqlTableModel m2; m2.setQueryBuilder(qb2); m2.setQueryParameters(qpm); m2.reload(); @@ -1513,7 +1513,7 @@ qf::core::utils::TreeTable RunsPlugin::startListClubsTable(const quickevent::gui QString qs = "SELECT t2.clubAbbr, clubs.name FROM ( " + qs1 + " ) AS t2" + " LEFT JOIN clubs ON t2.clubAbbr=clubs.abbr" + " ORDER BY t2.clubAbbr"; - qf::qmlwidgets::model::SqlTableModel m; + qf::gui::model::SqlTableModel m; m.setQuery(qs); m.reload(); auto tt = m.toTreeTable(); @@ -1560,7 +1560,7 @@ qf::core::utils::TreeTable RunsPlugin::startListClubsTable(const quickevent::gui .orderBy(order_sql_part); QVariantMap qpm; qpm["stage_id"] = stage_id; - qf::qmlwidgets::model::SqlTableModel m2; + qf::gui::model::SqlTableModel m2; m2.setQueryBuilder(qb); m2.setQueryParameters(qpm); for(int i=0; i()->eventConfig()->stageCount(); //props["stageNumber"] = selectedStageId(); - qf::qmlwidgets::reports::ReportViewWidget::showReport(fwk + qf::gui::reports::ReportViewWidget::showReport(fwk , findReportFile("results_stageSpeaker.qml") , tt.toVariant() , tr("Results by classes") @@ -1936,7 +1936,7 @@ void RunsPlugin::report_resultsAwards() QVariantMap props; props["eventConfig"] = QVariant::fromValue(getPlugin()->eventConfig()); auto tt = stageResultsTable(opts.value("stageId").toInt(), QString(), opts.value("numPlaces").toInt()); - qf::qmlwidgets::reports::ReportViewWidget::showReport(fwk + qf::gui::reports::ReportViewWidget::showReport(fwk , findReportFile(rep_path) , tt.toVariant() , tr("Stage awards") @@ -1963,7 +1963,7 @@ void RunsPlugin::report_resultsNStages() QVariantMap props; props["stagesCount"] = dlg.stagesCount(); props["options"] = opts; - qf::qmlwidgets::reports::ReportViewWidget::showReport(fwk + qf::gui::reports::ReportViewWidget::showReport(fwk , findReportFile("results_nstages.qml") , tt.toVariant() , tr("Results after %n stage(s)", "", dlg.stagesCount()) @@ -1990,7 +1990,7 @@ void RunsPlugin::report_resultsNStagesSpeaker() QVariantMap props; props["stagesCount"] = dlg.stagesCount(); props["options"] = opts; - qf::qmlwidgets::reports::ReportViewWidget::showReport(fwk + qf::gui::reports::ReportViewWidget::showReport(fwk , findReportFile("results_nstagesSpeaker.qml") , tt.toVariant() , tr("Results after %n stage(s)", "", dlg.stagesCount()) @@ -2012,7 +2012,7 @@ void RunsPlugin::report_nStagesAwards() QVariantMap props; props["eventConfig"] = QVariant::fromValue(getPlugin()->eventConfig()); auto tt = nstagesResultsTable(QString(), opts.value("stageId").toInt(), opts.value("numPlaces").toInt()); - qf::qmlwidgets::reports::ReportViewWidget::showReport(fwk + qf::gui::reports::ReportViewWidget::showReport(fwk , findReportFile(rep_path) , tt.toVariant() , tr("Awards after %1 stages").arg(opts.value("stageId").toInt()) @@ -2227,7 +2227,7 @@ void RunsPlugin::export_startListClubsHtml() QString RunsPlugin::export_resultsHtmlStage(bool with_laps) { - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); fwk->showProgress(tr("Preparing data"), 1, 2); int stage_id = selectedStageId(); QString file_dir = QDir::tempPath() + "/quickevent/e" + QString::number(stage_id); @@ -2342,7 +2342,7 @@ QString RunsPlugin::export_resultsHtmlStage(bool with_laps) void RunsPlugin::export_resultsHtmlStageWithLaps() { QString fn = export_resultsHtmlStage(true); - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); if(fn.isEmpty()) QMessageBox::warning(fwk, tr("Warning"), tr("Export error")); else diff --git a/quickevent/app/quickevent/plugins/Runs/src/runsplugin.h b/quickevent/app/quickevent/plugins/Runs/src/runsplugin.h index ef2e1f65b..b2891e68f 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/runsplugin.h +++ b/quickevent/app/quickevent/plugins/Runs/src/runsplugin.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include @@ -17,7 +17,7 @@ namespace qf { class TreeTable; } } - namespace qmlwidgets { + namespace gui { class Action; namespace framework { class PartWidget; @@ -30,13 +30,13 @@ namespace qf::core::sql { class QueryBuilder; } namespace Runs { -class RunsPlugin : public qf::qmlwidgets::framework::Plugin +class RunsPlugin : public qf::gui::framework::Plugin { Q_OBJECT - //Q_PROPERTY(qf::qmlwidgets::framework::PartWidget* partWidget READ partWidget FINAL) + //Q_PROPERTY(qf::gui::framework::PartWidget* partWidget READ partWidget FINAL) Q_PROPERTY(int selectedStageId READ selectedStageId WRITE setSelectedStageId NOTIFY selectedStageIdChanged) private: - typedef qf::qmlwidgets::framework::Plugin Super; + typedef qf::gui::framework::Plugin Super; public: static constexpr int UNREAL_TIME_MSEC = quickevent::core::og::TimeMs::UNREAL_TIME_MSEC; public: @@ -45,7 +45,7 @@ class RunsPlugin : public qf::qmlwidgets::framework::Plugin QF_PROPERTY_IMPL2(int, s, S, electedStageId, 1) - //qf::qmlwidgets::framework::PartWidget *partWidget() {return m_partWidget;} + //qf::gui::framework::PartWidget *partWidget() {return m_partWidget;} const qf::core::utils::Table& runnersTable(int stage_id); Q_SLOT void clearRunnersTableCache(); @@ -139,11 +139,11 @@ class RunsPlugin : public qf::qmlwidgets::framework::Plugin void addStartTimeTextToClass(qf::core::utils::TreeTable &tt2, const qint64 start00_epoch_sec, const quickevent::gui::ReportOptionsDialog::StartTimeFormat start_time_format); void addStartTimeTextToClass(qf::core::utils::TreeTable &tt2, const int stages_count, const QVector &start00_epoch_sec, const quickevent::gui::ReportOptionsDialog::StartTimeFormat start_time_format); private: - qf::qmlwidgets::framework::PartWidget *m_partWidget = nullptr; + qf::gui::framework::PartWidget *m_partWidget = nullptr; qf::core::utils::Table m_runnersTableCache; int m_runnersTableCacheStageId = 0; - qf::qmlwidgets::framework::DockWidget *m_eventStatisticsDockWidget = nullptr; - qf::qmlwidgets::framework::DockWidget *m_qxLateRegistrationsDockWidget = nullptr; + qf::gui::framework::DockWidget *m_eventStatisticsDockWidget = nullptr; + qf::gui::framework::DockWidget *m_qxLateRegistrationsDockWidget = nullptr; }; } diff --git a/quickevent/app/quickevent/plugins/Runs/src/runstabledialogwidget.cpp b/quickevent/app/quickevent/plugins/Runs/src/runstabledialogwidget.cpp index 0098dae02..98f042f6c 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/runstabledialogwidget.cpp +++ b/quickevent/app/quickevent/plugins/Runs/src/runstabledialogwidget.cpp @@ -1,14 +1,14 @@ #include "runstabledialogwidget.h" #include "ui_runstabledialogwidget.h" -#include +#include #include #include #include -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Event::EventPlugin; RunsTableDialogWidget::RunsTableDialogWidget(QWidget *parent) : diff --git a/quickevent/app/quickevent/plugins/Runs/src/runstabledialogwidget.h b/quickevent/app/quickevent/plugins/Runs/src/runstabledialogwidget.h index 924804381..484e37196 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/runstabledialogwidget.h +++ b/quickevent/app/quickevent/plugins/Runs/src/runstabledialogwidget.h @@ -3,7 +3,7 @@ #include -#include +#include namespace Ui { class RunsTableDialogWidget; @@ -11,11 +11,11 @@ class RunsTableDialogWidget; class RunsTableWidget; -class RunsTableDialogWidget : public qf::qmlwidgets::framework::DialogWidget +class RunsTableDialogWidget : public qf::gui::framework::DialogWidget { Q_OBJECT private: - typedef qf::qmlwidgets::framework::DialogWidget Super; + typedef qf::gui::framework::DialogWidget Super; public: explicit RunsTableDialogWidget(QWidget *parent = 0); ~RunsTableDialogWidget(); diff --git a/quickevent/app/quickevent/plugins/Runs/src/runstableitemdelegate.cpp b/quickevent/app/quickevent/plugins/Runs/src/runstableitemdelegate.cpp index 7e745a345..d6e9606a8 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/runstableitemdelegate.cpp +++ b/quickevent/app/quickevent/plugins/Runs/src/runstableitemdelegate.cpp @@ -3,10 +3,10 @@ #include -#include -#include +#include +#include -#include +#include #include #include #include @@ -15,10 +15,10 @@ #include -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Event::EventPlugin; -RunsTableItemDelegate::RunsTableItemDelegate(qf::qmlwidgets::TableView * parent) +RunsTableItemDelegate::RunsTableItemDelegate(qf::gui::TableView * parent) : Super(parent) { } @@ -42,7 +42,7 @@ void RunsTableItemDelegate::paintBackground(QPainter *painter, const QStyleOptio { Super::paintBackground(painter, option, index); - qf::qmlwidgets::TableView *v = view(); + qf::gui::TableView *v = view(); if(!v) return; diff --git a/quickevent/app/quickevent/plugins/Runs/src/runstableitemdelegate.h b/quickevent/app/quickevent/plugins/Runs/src/runstableitemdelegate.h index 8a30bc7b0..b07cf0a8e 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/runstableitemdelegate.h +++ b/quickevent/app/quickevent/plugins/Runs/src/runstableitemdelegate.h @@ -12,7 +12,7 @@ class RunsTableItemDelegate : public quickevent::gui::og::ItemDelegate private: typedef quickevent::gui::og::ItemDelegate Super; public: - RunsTableItemDelegate(qf::qmlwidgets::TableView * parent = nullptr); + RunsTableItemDelegate(qf::gui::TableView * parent = nullptr); QF_PROPERTY_BOOL_IMPL2(s, S, tartTimeHighlightVisible, false) diff --git a/quickevent/app/quickevent/plugins/Runs/src/runstablemodel.cpp b/quickevent/app/quickevent/plugins/Runs/src/runstablemodel.cpp index a51609545..c91d6fe4d 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/runstablemodel.cpp +++ b/quickevent/app/quickevent/plugins/Runs/src/runstablemodel.cpp @@ -4,8 +4,8 @@ #include #include "../../Event/src/eventplugin.h" -#include -#include +#include +#include #include #include @@ -14,7 +14,7 @@ #include -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Event::EventPlugin; RunsTableModel::RunsTableModel(QObject *parent) diff --git a/quickevent/app/quickevent/plugins/Runs/src/runstablewidget.cpp b/quickevent/app/quickevent/plugins/Runs/src/runstablewidget.cpp index b875f50a4..db1b4b8ed 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/runstablewidget.cpp +++ b/quickevent/app/quickevent/plugins/Runs/src/runstablewidget.cpp @@ -10,10 +10,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -30,8 +30,8 @@ namespace qfc = qf::core; namespace qfs = qf::core::sql; -namespace qfw = qf::qmlwidgets; -using qf::qmlwidgets::framework::getPlugin; +namespace qfw = qf::gui; +using qf::gui::framework::getPlugin; using Event::EventPlugin; using Runs::RunsPlugin; using Receipts::ReceiptsPlugin; @@ -45,7 +45,7 @@ RunsTableWidget::RunsTableWidget(QWidget *parent) : ui->tblRunsToolBar->setTableView(ui->tblRuns); ui->tblRuns->setShowExceptionDialog(false); - connect(ui->tblRuns, &qf::qmlwidgets::TableView::sqlException, this, &RunsTableWidget::onTableViewSqlException, Qt::QueuedConnection); + connect(ui->tblRuns, &qf::gui::TableView::sqlException, this, &RunsTableWidget::onTableViewSqlException, Qt::QueuedConnection); // ui->tblRuns->setEditRowsMenuSectionEnabled(false); ui->tblRuns->setCloneRowEnabled(false); ui->tblRuns->setDirtyRowsMenuSectionEnabled(false); @@ -76,7 +76,7 @@ RunsTableWidget::RunsTableWidget(QWidget *parent) : Q_UNUSED(id1) Q_UNUSED(id2) if(!err_msg.isEmpty()) { - qf::qmlwidgets::dialogs::MessageBox::showError(this, err_msg); + qf::gui::dialogs::MessageBox::showError(this, err_msg); } //ui->tblRuns->reload(true); m_runsModel->reload(); @@ -91,7 +91,7 @@ RunsTableWidget::RunsTableWidget(QWidget *parent) : if(col == RunsTableModel::col_runFlags || col == RunsTableModel::col_cardFlags) { return; } - if (mode == qf::qmlwidgets::model::DataDocument::ModeInsert) { + if (mode == qf::gui::model::DataDocument::ModeInsert) { emit editCompetitorRequest(0, mode); } else { @@ -211,7 +211,7 @@ void RunsTableWidget::reload() updateStartTimeHighlight(); } -qf::qmlwidgets::TableView *RunsTableWidget::tableView() +qf::gui::TableView *RunsTableWidget::tableView() { return ui->tblRuns; } @@ -234,7 +234,7 @@ void RunsTableWidget::onCustomContextMenuRequest(const QPoint &pos) << &a_change_class; QAction *a = QMenu::exec(lst, ui->tblRuns->viewport()->mapToGlobal(pos)); if(a == &a_load_card) { - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); int curr_ix = 0; QList sel_ixs = ui->tblRuns->selectedRowsIndexes(); QList runid_to_reload; @@ -301,7 +301,7 @@ void RunsTableWidget::onCustomContextMenuRequest(const QPoint &pos) } } catch (const qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(this, e); + qf::gui::dialogs::MessageBox::showException(this, e); } } else if(a == &a_clear_start_times) { @@ -321,7 +321,7 @@ void RunsTableWidget::onCustomContextMenuRequest(const QPoint &pos) runsModel()->reload(); } catch (const qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(this, e); + qf::gui::dialogs::MessageBox::showException(this, e); } } else if(a == &a_change_class) { @@ -362,15 +362,15 @@ void RunsTableWidget::onTableViewSqlException(const QString &what, const QString if(what.contains(QLatin1String("runs.stageId")) && what.contains(QLatin1String("runs.siId"))) { // "UNIQUE constraint failed: runs.stageId, runs.siId Unable to fetch row" // duplicate SI insertion attempt - qf::qmlwidgets::dialogs::MessageBox::showError(this, tr("Duplicate SI inserted.")); + qf::gui::dialogs::MessageBox::showError(this, tr("Duplicate SI inserted.")); return; } - qf::qmlwidgets::dialogs::MessageBox::showException(this, what, where, stack_trace); + qf::gui::dialogs::MessageBox::showException(this, what, where, stack_trace); } void RunsTableWidget::onBadTableDataInput(const QString &message) { - qf::qmlwidgets::dialogs::MessageBox::showError(this, message); + qf::gui::dialogs::MessageBox::showError(this, message); } diff --git a/quickevent/app/quickevent/plugins/Runs/src/runstablewidget.h b/quickevent/app/quickevent/plugins/Runs/src/runstablewidget.h index d28cca818..0fd3e80db 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/runstablewidget.h +++ b/quickevent/app/quickevent/plugins/Runs/src/runstablewidget.h @@ -4,7 +4,7 @@ class RunsTableModel; class RunsTableItemDelegate; -namespace qf::qmlwidgets { class TableView; } +namespace qf::gui { class TableView; } namespace Ui { class RunsTableWidget; @@ -24,7 +24,7 @@ class RunsTableWidget : public QWidget void reload(); RunsTableModel* runsModel() {return m_runsModel;} - qf::qmlwidgets::TableView* tableView(); + qf::gui::TableView* tableView(); Q_SIGNAL void editCompetitorRequest(int competitor_id, int mode); private: diff --git a/quickevent/app/quickevent/plugins/Runs/src/runstablewidget.ui b/quickevent/app/quickevent/plugins/Runs/src/runstablewidget.ui index 7a8793aad..096710905 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/runstablewidget.ui +++ b/quickevent/app/quickevent/plugins/Runs/src/runstablewidget.ui @@ -35,7 +35,7 @@ 5 - + 0 @@ -108,20 +108,20 @@ - + - qf::qmlwidgets::TableView + qf::gui::TableView QTableView -
qf/qmlwidgets/tableview.h
+
qf/gui/tableview.h
 - qf::qmlwidgets::TableViewToolBar + qf::gui::TableViewToolBar QWidget -
qf/qmlwidgets/tableviewtoolbar.h
+
qf/gui/tableviewtoolbar.h
1 diff --git a/quickevent/app/quickevent/plugins/Runs/src/runswidget.cpp b/quickevent/app/quickevent/plugins/Runs/src/runswidget.cpp index f89856e33..d1f87253b 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/runswidget.cpp +++ b/quickevent/app/quickevent/plugins/Runs/src/runswidget.cpp @@ -11,19 +11,19 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include +#include #include #include #include @@ -49,12 +49,12 @@ static const auto SkipEmptyParts = Qt::SkipEmptyParts; namespace qfc = qf::core; namespace qfu = qf::core::utils; namespace qfs = qf::core::sql; -namespace qfw = qf::qmlwidgets; -namespace qff = qf::qmlwidgets::framework; -namespace qfd = qf::qmlwidgets::dialogs; -namespace qfm = qf::qmlwidgets::model; +namespace qfw = qf::gui; +namespace qff = qf::gui::framework; +namespace qfd = qf::gui::dialogs; +namespace qfm = qf::gui::model; -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Event::EventPlugin; using Runs::RunsPlugin; @@ -130,7 +130,7 @@ void RunsWidget::reset(int class_id) m_cbxClasses->setCurrentIndex(0); else m_cbxClasses->setCurrentData(class_id); - connect(m_cbxClasses, &qf::qmlwidgets::ForeignKeyComboBox::currentDataChanged, this, &RunsWidget::reload, Qt::UniqueConnection); + connect(m_cbxClasses, &qf::gui::ForeignKeyComboBox::currentDataChanged, this, &RunsWidget::reload, Qt::UniqueConnection); m_cbxClasses->blockSignals(false); } reload(); @@ -250,7 +250,7 @@ void RunsWidget::settleDownInPartWidget(::PartWidget *part_widget) QVariantMap props; props["stageId"] = selectedStageId(); props["options"] = opts; - qf::qmlwidgets::reports::ReportViewWidget::showReport(fwk + qf::gui::reports::ReportViewWidget::showReport(fwk , getPlugin()->findReportFile("competitorsWithCardRent.qml") , QVariant() , tr("Competitors with rented cards") @@ -506,7 +506,7 @@ QList RunsWidget::competitorsForClass(int stage_ void RunsWidget::import_start_times_ob2000() { qfLogFuncFrame(); - QString fn = qf::qmlwidgets::dialogs::FileDialog::getOpenFileName(this, tr("Import")); + QString fn = qf::gui::dialogs::FileDialog::getOpenFileName(this, tr("Import")); if(!fn.isEmpty()) { QFile f(fn); if(f.open(QFile::ReadOnly)) { @@ -577,7 +577,7 @@ void RunsWidget::import_start_times_ob2000() transaction.commit(); } catch (const qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(this, e); + qf::gui::dialogs::MessageBox::showException(this, e); } ui->wRunsTableWidget->runsModel()->reload(); } @@ -672,7 +672,7 @@ void RunsWidget::onDrawClicked() QList class_ids; int class_id = m_cbxClasses->currentData().toInt(); if(class_id == 0) { - if(!qf::qmlwidgets::dialogs::MessageBox::askYesNo(this, tr("Draw all classes without draw lock?"), false)) + if(!qf::gui::dialogs::MessageBox::askYesNo(this, tr("Draw all classes without draw lock?"), false)) return; qf::core::sql::QueryBuilder qb; qb.select2("classdefs", "classId") @@ -688,7 +688,7 @@ void RunsWidget::onDrawClicked() else { bool is_locked = isLockedForDrawing(class_id, stage_id); if(is_locked) { - qf::qmlwidgets::dialogs::MessageBox::showInfo(this, tr("Class is locked for drawing.")); + qf::gui::dialogs::MessageBox::showInfo(this, tr("Class is locked for drawing.")); return; } class_ids << class_id; @@ -874,7 +874,7 @@ void RunsWidget::onDrawClicked() // save drawing to SQL int interval = q_classdefs.value("startIntervalMin").toInt() * 60 * 1000; if(interval == 0 && !is_relays) { - if(!qf::qmlwidgets::dialogs::MessageBox::askYesNo(this, tr("Start interval is zero, proceed anyway?"), false)) + if(!qf::gui::dialogs::MessageBox::askYesNo(this, tr("Start interval is zero, proceed anyway?"), false)) continue; } int start0 = q_classdefs.value("startTimeMin").toInt() * 60 * 1000; @@ -944,7 +944,7 @@ void RunsWidget::onDrawClicked() transaction.commit(); } catch (const qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(this, e); + qf::gui::dialogs::MessageBox::showException(this, e); } ui->wRunsTableWidget->reload(); } @@ -954,7 +954,7 @@ void RunsWidget::onDrawRemoveClicked() int class_id = m_cbxClasses->currentData().toInt(); if(class_id == 0) return; - if(!qf::qmlwidgets::dialogs::MessageBox::askYesNo(this, tr("Reset all start times and unlock drawing for this class?"), false)) + if(!qf::gui::dialogs::MessageBox::askYesNo(this, tr("Reset all start times and unlock drawing for this class?"), false)) return; try { auto *runs_model = ui->wRunsTableWidget->runsModel(); @@ -970,7 +970,7 @@ void RunsWidget::onDrawRemoveClicked() runs_model->reload(); } catch (const qf::core::Exception &e) { - qf::qmlwidgets::dialogs::MessageBox::showException(this, e); + qf::gui::dialogs::MessageBox::showException(this, e); } } @@ -1093,7 +1093,7 @@ void RunsWidget::report_competitorsStatistics() qfs::QueryBuilder qb; qb.select2("classes", "id, name").from("classes").orderBy("classes.name"); - qf::qmlwidgets::model::SqlTableModel m; + qf::gui::model::SqlTableModel m; m.setQueryBuilder(qb); m.reload(); qfu::TreeTable tt = m.toTreeTable(); @@ -1135,7 +1135,7 @@ void RunsWidget::report_competitorsStatistics() //props["isColumnBreak"] = (opts.breakType() == (int)quickevent::gui::ReportOptionsDialog::BreakType::Column); props["stageCount"] = stage_cnt; QString rep_fn = getPlugin()->findReportFile("competitorsStatistics.qml"); - qf::qmlwidgets::reports::ReportViewWidget::showReport(this + qf::gui::reports::ReportViewWidget::showReport(this , rep_fn , tt.toVariant() , tr("Competitors statistics") @@ -1155,15 +1155,15 @@ void RunsWidget::editCompetitor_helper(const QVariant &id, int mode, int siid) w->setWindowTitle(tr("Edit Competitor")); qfd::Dialog dlg(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); dlg.setDefaultButton(QDialogButtonBox::Ok); - if(mode == qf::qmlwidgets::model::DataDocument::ModeInsert || mode == qf::qmlwidgets::model::DataDocument::ModeEdit) { + if(mode == qf::gui::model::DataDocument::ModeInsert || mode == qf::gui::model::DataDocument::ModeEdit) { QPushButton *bt_save = dlg.buttonBox()->addButton(tr("Save"), QDialogButtonBox::ApplyRole); - connect(dlg.buttonBox(), &qf::qmlwidgets::DialogButtonBox::clicked, &dlg, [w, bt_save](QAbstractButton *button) { + connect(dlg.buttonBox(), &qf::gui::DialogButtonBox::clicked, &dlg, [w, bt_save](QAbstractButton *button) { if (button == bt_save) { w->save(); } }); QPushButton *bt_save_and_next = dlg.buttonBox()->addButton(tr("Ok and &next"), QDialogButtonBox::AcceptRole); - connect(dlg.buttonBox(), &qf::qmlwidgets::DialogButtonBox::clicked, &dlg, [&save_and_next, bt_save_and_next](QAbstractButton *button) { + connect(dlg.buttonBox(), &qf::gui::DialogButtonBox::clicked, &dlg, [&save_and_next, bt_save_and_next](QAbstractButton *button) { save_and_next = (button == bt_save_and_next); }); } @@ -1186,13 +1186,13 @@ void RunsWidget::editCompetitor_helper(const QVariant &id, int mode, int siid) w->loadFromRegistrations(siid); } } - connect(doc, &Competitors::CompetitorDocument::saved, ui->wRunsTableWidget->tableView(), &qf::qmlwidgets::TableView::rowExternallySaved, Qt::QueuedConnection); + connect(doc, &Competitors::CompetitorDocument::saved, ui->wRunsTableWidget->tableView(), &qf::gui::TableView::rowExternallySaved, Qt::QueuedConnection); ok = dlg.exec(); } if(ok && save_and_next) { QTimer::singleShot(0, this, [this]() { - this->editCompetitor(QVariant(), qf::qmlwidgets::model::DataDocument::ModeInsert); + this->editCompetitor(QVariant(), qf::gui::model::DataDocument::ModeInsert); }); } } diff --git a/quickevent/app/quickevent/plugins/Runs/src/runswidget.h b/quickevent/app/quickevent/plugins/Runs/src/runswidget.h index 16165646e..526e97d0a 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/runswidget.h +++ b/quickevent/app/quickevent/plugins/Runs/src/runswidget.h @@ -16,7 +16,7 @@ namespace model { class SqlTableModel; } } -namespace qmlwidgets { +namespace gui { class ForeignKeyComboBox; } } @@ -91,7 +91,7 @@ class RunsWidget : public QFrame KeepOrder, RelaysFirstLeg, GroupedC, GroupedCB, GroupedRanking}; Ui::RunsWidget *ui; - qf::qmlwidgets::ForeignKeyComboBox *m_cbxClasses = nullptr; + qf::gui::ForeignKeyComboBox *m_cbxClasses = nullptr; QComboBox *m_cbxStage = nullptr; QComboBox *m_cbxLeg = nullptr; QAction *m_toolbarActionLabelLeg = nullptr; diff --git a/quickevent/app/quickevent/plugins/Runs/src/services/resultsexporter.cpp b/quickevent/app/quickevent/plugins/Runs/src/services/resultsexporter.cpp index 63098c371..5f6dfc79d 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/services/resultsexporter.cpp +++ b/quickevent/app/quickevent/plugins/Runs/src/services/resultsexporter.cpp @@ -6,8 +6,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -21,13 +21,12 @@ #include #include -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Event::EventPlugin; using Runs::RunsPlugin; using Relays::RelaysPlugin; -namespace Runs { -namespace services { +namespace Runs::services { ResultsExporter::ResultsExporter(QObject *parent) : Super(ResultsExporter::serviceName(), parent) @@ -57,7 +56,7 @@ void ResultsExporter::stop() { m_exportTimer->stop(); } -bool ResultsExporter::exportResults() +bool ResultsExporter::exportResults() const { ResultsExporterSettings ss = settings(); if(!QDir().mkpath(ss.exportDir())) { @@ -86,7 +85,7 @@ bool ResultsExporter::exportResults() } return true; } - else if(ss.outputFormat() == static_cast(ResultsExporterSettings::OutputFormat::HtmlMulti)) { + if(ss.outputFormat() == static_cast(ResultsExporterSettings::OutputFormat::HtmlMulti)) { quickevent::core::exporters::StageResultsHtmlExporter exp; exp.setOutDir(ss.exportDir()); exp.generateHtml(); @@ -94,7 +93,7 @@ bool ResultsExporter::exportResults() whenFinishedRunCmd(); return true; } - else if(ss.outputFormat() == static_cast(ResultsExporterSettings::OutputFormat::CSVMulti)) { + if(ss.outputFormat() == static_cast(ResultsExporterSettings::OutputFormat::CSVMulti)) { bool is_iof_race = getPlugin()->eventConfig()->isIofRace(); quickevent::core::exporters::StageResultsCsvExporter exp(is_iof_race); exp.setOutDir(ss.exportDir()); @@ -106,7 +105,7 @@ bool ResultsExporter::exportResults() whenFinishedRunCmd(); return true; } - else if(ss.outputFormat() == static_cast(ResultsExporterSettings::OutputFormat::CSV)) { + if(ss.outputFormat() == static_cast(ResultsExporterSettings::OutputFormat::CSV)) { bool is_iof_race = getPlugin()->eventConfig()->isIofRace(); quickevent::core::exporters::StageResultsCsvExporter exp(is_iof_race); exp.setOutDir(ss.exportDir()); @@ -122,13 +121,13 @@ bool ResultsExporter::exportResults() return false; } -void ResultsExporter::whenFinishedRunCmd() +void ResultsExporter::whenFinishedRunCmd() const { ResultsExporterSettings ss = settings(); QString cmd = ss.whenFinishedRunCmd(); if(!cmd.isEmpty()) { qfInfo() << "Starting process:" << cmd; - QProcess *proc = new QProcess(); + auto *proc = new QProcess(); connect(proc, &QProcess::readyReadStandardOutput, [proc]() { QByteArray ba = proc->readAllStandardOutput(); qfInfo() << "PROC stdout:" << ba; @@ -157,7 +156,7 @@ void ResultsExporter::onExportTimerTimeOut() stop(); } -qf::qmlwidgets::framework::DialogWidget *ResultsExporter::createDetailWidget() +qf::gui::framework::DialogWidget *ResultsExporter::createDetailWidget() { auto *w = new ResultsExporterWidget(); return w; @@ -187,4 +186,4 @@ void ResultsExporter::init() } } -}} +} diff --git a/quickevent/app/quickevent/plugins/Runs/src/services/resultsexporter.h b/quickevent/app/quickevent/plugins/Runs/src/services/resultsexporter.h index 731a7a5a0..f4f5d0b1e 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/services/resultsexporter.h +++ b/quickevent/app/quickevent/plugins/Runs/src/services/resultsexporter.h @@ -37,12 +37,12 @@ class ResultsExporter : public Event::services::Service void stop() override; ResultsExporterSettings settings() const {return ResultsExporterSettings(m_settings);} - qf::qmlwidgets::framework::DialogWidget *createDetailWidget() override; + qf::gui::framework::DialogWidget *createDetailWidget() override; static QString serviceName(); - bool exportResults(); - void whenFinishedRunCmd(); + bool exportResults() const; + void whenFinishedRunCmd() const; private: void loadSettings() override; void onExportTimerTimeOut(); diff --git a/quickevent/app/quickevent/plugins/Runs/src/services/resultsexporterwidget.cpp b/quickevent/app/quickevent/plugins/Runs/src/services/resultsexporterwidget.cpp index 782a0af23..6df435a57 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/services/resultsexporterwidget.cpp +++ b/quickevent/app/quickevent/plugins/Runs/src/services/resultsexporterwidget.cpp @@ -2,15 +2,14 @@ #include "ui_resultsexporterwidget.h" #include "resultsexporter.h" -#include +#include #include #include #include -namespace Runs { -namespace services { +namespace Runs::services { ResultsExporterWidget::ResultsExporterWidget(QWidget *parent) : Super(parent) @@ -104,7 +103,7 @@ bool ResultsExporterWidget::acceptDialogDone(int result) { if(result == QDialog::Accepted) { if(!saveSettings()) { - qf::qmlwidgets::dialogs::MessageBox::showError(this, tr("Cannot create directory '%1'.").arg(ui->edExportDir->text().trimmed())); + qf::gui::dialogs::MessageBox::showError(this, tr("Cannot create directory '%1'.").arg(ui->edExportDir->text().trimmed())); return false; } } @@ -113,9 +112,9 @@ bool ResultsExporterWidget::acceptDialogDone(int result) ResultsExporter *ResultsExporterWidget::service() { - ResultsExporter *svc = qobject_cast(Event::services::Service::serviceByName(ResultsExporter::serviceName())); + auto *svc = qobject_cast(Event::services::Service::serviceByName(ResultsExporter::serviceName())); QF_ASSERT(svc, ResultsExporter::serviceName() + " doesn't exist", return nullptr); return svc; } -}} +} diff --git a/quickevent/app/quickevent/plugins/Runs/src/services/resultsexporterwidget.h b/quickevent/app/quickevent/plugins/Runs/src/services/resultsexporterwidget.h index 66b7ac81f..2c19b5e88 100644 --- a/quickevent/app/quickevent/plugins/Runs/src/services/resultsexporterwidget.h +++ b/quickevent/app/quickevent/plugins/Runs/src/services/resultsexporterwidget.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace Runs { namespace services { @@ -11,11 +11,11 @@ class ResultsExporterWidget; class ResultsExporter; -class ResultsExporterWidget : public qf::qmlwidgets::framework::DialogWidget +class ResultsExporterWidget : public qf::gui::framework::DialogWidget { Q_OBJECT - using Super = qf::qmlwidgets::framework::DialogWidget; + using Super = qf::gui::framework::DialogWidget; public: explicit ResultsExporterWidget(QWidget *parent = nullptr); ~ResultsExporterWidget(); diff --git a/quickevent/app/quickevent/plugins/Speaker/src/codeclassresultswidget.cpp b/quickevent/app/quickevent/plugins/Speaker/src/codeclassresultswidget.cpp index 4c7f1d212..72d542210 100644 --- a/quickevent/app/quickevent/plugins/Speaker/src/codeclassresultswidget.cpp +++ b/quickevent/app/quickevent/plugins/Speaker/src/codeclassresultswidget.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include @@ -20,7 +20,7 @@ #include #include -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Event::EventPlugin; CodeClassResultsWidget::CodeClassResultsWidget(QWidget *parent) diff --git a/quickevent/app/quickevent/plugins/Speaker/src/codeclassresultswidget.ui b/quickevent/app/quickevent/plugins/Speaker/src/codeclassresultswidget.ui index 5dcdc3d5c..28487d194 100644 --- a/quickevent/app/quickevent/plugins/Speaker/src/codeclassresultswidget.ui +++ b/quickevent/app/quickevent/plugins/Speaker/src/codeclassresultswidget.ui @@ -71,15 +71,15 @@ - + - qf::qmlwidgets::TableView + qf::gui::TableView QTableView -
qf/qmlwidgets/tableview.h
+
qf/gui/tableview.h
 diff --git a/quickevent/app/quickevent/plugins/Speaker/src/punchestableview.h b/quickevent/app/quickevent/plugins/Speaker/src/punchestableview.h index ed7dfc833..3eec918cd 100644 --- a/quickevent/app/quickevent/plugins/Speaker/src/punchestableview.h +++ b/quickevent/app/quickevent/plugins/Speaker/src/punchestableview.h @@ -1,12 +1,12 @@ #pragma once -#include +#include -class PunchesTableView : public qf::qmlwidgets::TableView +class PunchesTableView : public qf::gui::TableView { Q_OBJECT private: - using Super = qf::qmlwidgets::TableView; + using Super = qf::gui::TableView; public: PunchesTableView(QWidget *parent); diff --git a/quickevent/app/quickevent/plugins/Speaker/src/speakerplugin.cpp b/quickevent/app/quickevent/plugins/Speaker/src/speakerplugin.cpp index 769294852..a8b811eca 100644 --- a/quickevent/app/quickevent/plugins/Speaker/src/speakerplugin.cpp +++ b/quickevent/app/quickevent/plugins/Speaker/src/speakerplugin.cpp @@ -1,22 +1,21 @@ #include "speakerplugin.h" #include "speakerwidget.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include -namespace qff = qf::qmlwidgets::framework; -namespace qfw = qf::qmlwidgets; +namespace qff = qf::gui::framework; using ::PartWidget; namespace Speaker { SpeakerPlugin::SpeakerPlugin(QObject *parent) - : Super("Speaker", parent), qf::qmlwidgets::framework::IPersistentSettings(this) + : Super("Speaker", parent), qf::gui::framework::IPersistentSettings(this) { setPersistentSettingsId("SpeakerPlugin"); connect(this, &SpeakerPlugin::installed, this, &SpeakerPlugin::onInstalled, Qt::QueuedConnection); diff --git a/quickevent/app/quickevent/plugins/Speaker/src/speakerplugin.h b/quickevent/app/quickevent/plugins/Speaker/src/speakerplugin.h index 4dc3637e1..2a5c026b7 100644 --- a/quickevent/app/quickevent/plugins/Speaker/src/speakerplugin.h +++ b/quickevent/app/quickevent/plugins/Speaker/src/speakerplugin.h @@ -1,14 +1,14 @@ #ifndef SPEAKER_H #define SPEAKER_H -#include -#include +#include +#include namespace qf { namespace core { namespace model { class SqlTableModel; }} -namespace qmlwidgets { +namespace gui { class Action; namespace framework { class PartWidget; class DockWidget; } } @@ -17,17 +17,17 @@ namespace framework { class PartWidget; class DockWidget; } namespace Speaker { -class SpeakerPlugin : public qf::qmlwidgets::framework::Plugin, public qf::qmlwidgets::framework::IPersistentSettings +class SpeakerPlugin : public qf::gui::framework::Plugin, public qf::gui::framework::IPersistentSettings { Q_OBJECT - using Super = qf::qmlwidgets::framework::Plugin; + using Super = qf::gui::framework::Plugin; public: SpeakerPlugin(QObject *parent = nullptr); private: void onInstalled(); // void doDbVacuum(); private: - qf::qmlwidgets::framework::PartWidget *m_partWidget = nullptr; + qf::gui::framework::PartWidget *m_partWidget = nullptr; }; } diff --git a/quickevent/app/quickevent/plugins/Speaker/src/speakerwidget.cpp b/quickevent/app/quickevent/plugins/Speaker/src/speakerwidget.cpp index 22e23d7d0..46d93ea05 100644 --- a/quickevent/app/quickevent/plugins/Speaker/src/speakerwidget.cpp +++ b/quickevent/app/quickevent/plugins/Speaker/src/speakerwidget.cpp @@ -13,13 +13,13 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include #include #include @@ -30,7 +30,7 @@ #include namespace qfs = qf::core::sql; -using qf::qmlwidgets::framework::getPlugin; +using qf::gui::framework::getPlugin; using Event::EventPlugin; SpeakerWidget::SpeakerWidget(QWidget *parent) : @@ -71,8 +71,8 @@ SpeakerWidget::SpeakerWidget(QWidget *parent) : ui->tblPunches->setTableModel(m); m_punchesModel = m; - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); - connect(fwk, &qf::qmlwidgets::framework::MainWindow::aboutToClose, this, &SpeakerWidget::saveSettings); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); + connect(fwk, &qf::gui::framework::MainWindow::aboutToClose, this, &SpeakerWidget::saveSettings); } SpeakerWidget::~SpeakerWidget() @@ -210,7 +210,7 @@ void SpeakerWidget::onCodeClassActivated(int class_id, int code) dw->setAllowedAreas(Qt::AllDockWidgetAreas); dw->setWidget(w); //dw->show(); - auto *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + auto *fwk = qf::gui::framework::MainWindow::frameWork(); fwk->addDockWidget(Qt::LeftDockWidgetArea, dw); dw->setFloating(true); } diff --git a/quickevent/app/quickevent/plugins/Speaker/src/speakerwidget.h b/quickevent/app/quickevent/plugins/Speaker/src/speakerwidget.h index 8be7db2cc..7d134ef7c 100644 --- a/quickevent/app/quickevent/plugins/Speaker/src/speakerwidget.h +++ b/quickevent/app/quickevent/plugins/Speaker/src/speakerwidget.h @@ -9,7 +9,7 @@ namespace Ui { class SpeakerWidget; } -namespace qf::qmlwidgets { class ForeignKeyComboBox; } +namespace qf::gui { class ForeignKeyComboBox; } namespace quickevent::gui::og { class SqlTableModel; } namespace quickevent::core::si { class PunchRecord; } @@ -44,7 +44,7 @@ class SpeakerWidget : public QFrame private: Ui::SpeakerWidget *ui; quickevent::gui::og::SqlTableModel *m_punchesModel = nullptr; - qf::qmlwidgets::framework::PartWidget *m_partWidget = nullptr; + qf::gui::framework::PartWidget *m_partWidget = nullptr; bool m_resetRequest = false; bool m_settingsLoaded = false; }; diff --git a/quickevent/app/quickevent/plugins/Speaker/src/speakerwidget.ui b/quickevent/app/quickevent/plugins/Speaker/src/speakerwidget.ui index 41a1a61f6..f4e8234fa 100644 --- a/quickevent/app/quickevent/plugins/Speaker/src/speakerwidget.ui +++ b/quickevent/app/quickevent/plugins/Speaker/src/speakerwidget.ui @@ -67,7 +67,7 @@ 5 - + @@ -91,9 +91,9 @@ - qf::qmlwidgets::TableViewToolBar + qf::gui::TableViewToolBar QWidget -
qf/qmlwidgets/tableviewtoolbar.h
+
qf/gui/tableviewtoolbar.h
1 diff --git a/quickevent/app/quickevent/src/application.cpp b/quickevent/app/quickevent/src/application.cpp index 182de4f80..43e2bb666 100644 --- a/quickevent/app/quickevent/src/application.cpp +++ b/quickevent/app/quickevent/src/application.cpp @@ -1,8 +1,8 @@ #include "application.h" #include "appclioptions.h" -#include -#include +#include +#include #include @@ -23,13 +23,13 @@ Application::Application(int &argc, char **argv, AppCliOptions *cli_opts) setFont(app_font); } - auto *style = qf::qmlwidgets::Style::instance(); - if (qf::qmlwidgets::isDarkTheme()) { - style->addIconSearchPath(":/qf/qmlwidgets/images/dark"); + auto *style = qf::gui::Style::instance(); + if (qf::gui::isDarkTheme()) { + style->addIconSearchPath(":/qf/gui/images/dark"); } else { - style->addIconSearchPath(":/qf/qmlwidgets/images/flat"); + style->addIconSearchPath(":/qf/gui/images/flat"); } - style->addIconSearchPath(":/qf/qmlwidgets/images"); + style->addIconSearchPath(":/qf/gui/images"); loadStyleSheet(); @@ -60,7 +60,7 @@ Application::Application(int &argc, char **argv, AppCliOptions *cli_opts) SetDllDirectory(reinterpret_cast(plugin_path.utf16())); #endif #endif - //qf::qmlwidgets::reports::ReportProcessor::qmlEngineImportPaths().append(plugin_path); + //qf::gui::reports::ReportProcessor::qmlEngineImportPaths().append(plugin_path); } Application *Application::instance(bool must_exist) diff --git a/quickevent/app/quickevent/src/application.h b/quickevent/app/quickevent/src/application.h index 8fbeab0bb..e1828fc1a 100644 --- a/quickevent/app/quickevent/src/application.h +++ b/quickevent/app/quickevent/src/application.h @@ -1,18 +1,18 @@ #ifndef APPLICATION_H #define APPLICATION_H -#include +#include class AppCliOptions; class TableModelLogDevice; namespace qf { namespace core { class LogEntryMap; }} -class Application : public qf::qmlwidgets::framework::Application +class Application : public qf::gui::framework::Application { Q_OBJECT private: - typedef qf::qmlwidgets::framework::Application Super; + typedef qf::gui::framework::Application Super; public: Application(int & argc, char ** argv, AppCliOptions *cli_opts); ~Application() override = default; diff --git a/quickevent/app/quickevent/src/loggerwidget.cpp b/quickevent/app/quickevent/src/loggerwidget.cpp index 52ace84c0..8662efa8f 100644 --- a/quickevent/app/quickevent/src/loggerwidget.cpp +++ b/quickevent/app/quickevent/src/loggerwidget.cpp @@ -1,17 +1,17 @@ #include "loggerwidget.h" #include "application.h" -#include +#include -#include +#include LoggerWidget::LoggerWidget(QWidget *parent) : Super(parent) { addCategoryActions(tr(""), QString(), NecroLog::Level::Info); - m_logModel = new qf::qmlwidgets::model::LogTableModel(this); - connect(Application::instance(), &Application::newLogEntry, m_logModel, &qf::qmlwidgets::model::LogTableModel::addLogEntry, Qt::QueuedConnection); + m_logModel = new qf::gui::model::LogTableModel(this); + connect(Application::instance(), &Application::newLogEntry, m_logModel, &qf::gui::model::LogTableModel::addLogEntry, Qt::QueuedConnection); setLogTableModel(m_logModel); } diff --git a/quickevent/app/quickevent/src/loggerwidget.h b/quickevent/app/quickevent/src/loggerwidget.h index 80155aa5a..5962d580f 100644 --- a/quickevent/app/quickevent/src/loggerwidget.h +++ b/quickevent/app/quickevent/src/loggerwidget.h @@ -1,24 +1,24 @@ #ifndef LOGGERWIDGET_H #define LOGGERWIDGET_H -#include +#include namespace qf { namespace core { class LogEntryMap; }} class LoggerLogDevice; -class LoggerWidget : public qf::qmlwidgets::framework::LogWidget +class LoggerWidget : public qf::gui::framework::LogWidget { Q_OBJECT private: - typedef qf::qmlwidgets::framework::LogWidget Super; + typedef qf::gui::framework::LogWidget Super; public: explicit LoggerWidget(QWidget *parent = 0); ~LoggerWidget() Q_DECL_OVERRIDE; void onDockWidgetVisibleChanged(bool visible) Q_DECL_OVERRIDE; private: - qf::qmlwidgets::model::LogTableModel *m_logModel = nullptr; + qf::gui::model::LogTableModel *m_logModel = nullptr; }; #endif // LOGGERWIDGET_H diff --git a/quickevent/app/quickevent/src/main.cpp b/quickevent/app/quickevent/src/main.cpp index 31a873e72..360c24c69 100644 --- a/quickevent/app/quickevent/src/main.cpp +++ b/quickevent/app/quickevent/src/main.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include @@ -119,7 +119,7 @@ int main(int argc, char *argv[]) for(const auto &file_name : { QStringLiteral("libqfcore"), - QStringLiteral("libqfqmlwidgets"), + QStringLiteral("libqfgui"), QStringLiteral("libquickeventcore"), QStringLiteral("libquickeventgui"), QStringLiteral("libsiut"), diff --git a/quickevent/app/quickevent/src/mainwindow.cpp b/quickevent/app/quickevent/src/mainwindow.cpp index de91ed429..88c8914a0 100644 --- a/quickevent/app/quickevent/src/mainwindow.cpp +++ b/quickevent/app/quickevent/src/mainwindow.cpp @@ -1,11 +1,11 @@ #include "mainwindow.h" #include "loggerwidget.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include @@ -30,12 +30,12 @@ MainWindow::~MainWindow() = default; void MainWindow::onPluginsLoaded() { { - auto *dw = new qf::qmlwidgets::framework::DockWidget(nullptr); + auto *dw = new qf::gui::framework::DockWidget(nullptr); dw->setObjectName("loggingDockWidget"); dw->setWindowTitle(tr("Application log")); addDockWidget(Qt::BottomDockWidgetArea, dw); auto *w = new LoggerWidget(); - connect(dw, &qf::qmlwidgets::framework::DockWidget::visibilityChanged, w, &LoggerWidget::onDockWidgetVisibleChanged); + connect(dw, &qf::gui::framework::DockWidget::visibilityChanged, w, &LoggerWidget::onDockWidgetVisibleChanged); dw->setWidget(w); dw->hide(); auto *a = dw->toggleViewAction(); @@ -44,7 +44,7 @@ void MainWindow::onPluginsLoaded() menuBar()->actionForPath("view")->addActionInto(a); } - auto *w = qobject_cast(centralWidget()); + auto *w = qobject_cast(centralWidget()); menuBar()->actionForPath("view/toolbar")->addActionInto(w->partSwitch()->toggleViewAction()); centralWidget()->setActivePart("Runs", true); diff --git a/quickevent/app/quickevent/src/mainwindow.h b/quickevent/app/quickevent/src/mainwindow.h index a1de24f40..856569fcf 100644 --- a/quickevent/app/quickevent/src/mainwindow.h +++ b/quickevent/app/quickevent/src/mainwindow.h @@ -1,13 +1,13 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include +#include -class MainWindow : public qf::qmlwidgets::framework::MainWindow +class MainWindow : public qf::gui::framework::MainWindow { Q_OBJECT private: - using Super = qf::qmlwidgets::framework::MainWindow; + using Super = qf::gui::framework::MainWindow; public: explicit MainWindow(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); ~MainWindow() override; diff --git a/quickevent/app/quickevent/src/partwidget.cpp b/quickevent/app/quickevent/src/partwidget.cpp index d0d0de31f..7140fa89c 100644 --- a/quickevent/app/quickevent/src/partwidget.cpp +++ b/quickevent/app/quickevent/src/partwidget.cpp @@ -3,14 +3,14 @@ #include -#include -#include +#include +#include PartWidget::PartWidget(const QString& title, const QString &feature_id, QWidget *parent) : Super(feature_id, parent) { - using namespace qf::qmlwidgets::framework; + using namespace qf::gui::framework; setPersistentSettingsId(featureId()); setTitle(title); @@ -25,9 +25,9 @@ PartWidget::PartWidget(const QString& title, const QString &feature_id, QWidget void PartWidget::onActiveChanged() { if(isActive()) { - qf::qmlwidgets::framework::MainWindow *fwk = qf::qmlwidgets::framework::MainWindow::frameWork(); + qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); QF_ASSERT(fwk != nullptr, "Invalid FrameWork", return); - qf::qmlwidgets::framework::Plugin *event_plugin = fwk->plugin("Event", qf::core::Exception::Throw); + qf::gui::framework::Plugin *event_plugin = fwk->plugin("Event", qf::core::Exception::Throw); bool sql_connected = event_plugin->property("sqlServerConnected").toBool(); QString event_name = event_plugin->property("eventName").toString(); if(sql_connected && !event_name.isEmpty()) { diff --git a/quickevent/app/quickevent/src/partwidget.h b/quickevent/app/quickevent/src/partwidget.h index 5fe0fbc12..dac28d1b8 100644 --- a/quickevent/app/quickevent/src/partwidget.h +++ b/quickevent/app/quickevent/src/partwidget.h @@ -1,12 +1,12 @@ #pragma once -#include +#include -class PartWidget : public qf::qmlwidgets::framework::PartWidget +class PartWidget : public qf::gui::framework::PartWidget { Q_OBJECT private: - typedef qf::qmlwidgets::framework::PartWidget Super; + typedef qf::gui::framework::PartWidget Super; public: explicit PartWidget(const QString &title, const QString &feature_id, QWidget *parent = nullptr); diff --git a/quickevent/app/quickevent/style/default.css b/quickevent/app/quickevent/style/default.css index 3ce4d5d95..36655c72e 100644 --- a/quickevent/app/quickevent/style/default.css +++ b/quickevent/app/quickevent/style/default.css @@ -22,27 +22,27 @@ QMenu::item, QMenuBar::item { background: darkgray; } -qf--qmlwidgets--framework--PartSwitch { +qf--gui--framework--PartSwitch { background: #525252; /* background-color: #525252; */ /* color: white; */ /* border: 2px solid gray; */ } -qf--qmlwidgets--framework--PartSwitch::handle { +qf--gui--framework--PartSwitch::handle { /* * background: #525252; * background: lightgray; */ } -qf--qmlwidgets--framework--PartSwitch QToolButton { +qf--gui--framework--PartSwitch QToolButton { /* background-color: #525252; */ color: white; padding: 2px; } -qf--qmlwidgets--framework--PartSwitch QToolButton:hover { +qf--gui--framework--PartSwitch QToolButton:hover { /* * background: lightsteelblue; * color: black; @@ -53,7 +53,7 @@ qf--qmlwidgets--framework--PartSwitch QToolButton:hover { border: 2px outset #525252; } -qf--qmlwidgets--framework--PartSwitch QToolButton:checked { +qf--gui--framework--PartSwitch QToolButton:checked { /*background: green; color: red;*/ background: #f0f0f0; @@ -61,7 +61,7 @@ qf--qmlwidgets--framework--PartSwitch QToolButton:checked { border: 1px solid #525252; } -qf--qmlwidgets--dialogs--internal--CaptionFrame { +qf--gui--dialogs--internal--CaptionFrame { /*background: #FDE364; yellow */ /*background: #FFA842; orange */ /* background: lightsteelblue; */ @@ -75,12 +75,12 @@ QWidget#CaptionFrame { color:black; font-weight: bold; } -qf--qmlwidgets--dialogs--internal--CaptionFrame[alert="true"] { +qf--gui--dialogs--internal--CaptionFrame[alert="true"] { background: salmon; /*background: #FFA842;*/ } -qf--qmlwidgets--dialogs--internal--CaptionFrame QLabel { +qf--gui--dialogs--internal--CaptionFrame QLabel { font: 14pt; /* color: white; */ color:black; diff --git a/quickshow/src/main.cpp b/quickshow/src/main.cpp index ce1c9a71f..4d080effd 100644 --- a/quickshow/src/main.cpp +++ b/quickshow/src/main.cpp @@ -54,10 +54,10 @@ int main(int argc, char *argv[]) for(const auto &file_name : { QStringLiteral("libqfcore"), - QStringLiteral("libqfqmlwidgets"), + QStringLiteral("libqfgui"), QStringLiteral("quickshow"), }) { - QTranslator *translator = new QTranslator(&app); + auto *translator = new QTranslator(&app); bool ok = translator->load(QLocale(lc_name), file_name, QString("-"), QString(":/i18n")); if (ok) { ok = QCoreApplication::installTranslator(translator); @@ -65,7 +65,7 @@ int main(int argc, char *argv[]) qfInfo() << "Installing translator file:" << file_name << " ... " << (ok? "OK": "ERROR"); } { - QTranslator *translator = new QTranslator(&app); + auto *translator = new QTranslator(&app); const auto file_name = QStringLiteral("qt"); bool ok = translator->load(QLocale(lc_name), file_name, QString("_"), QString("translations")); if (ok) { @@ -78,5 +78,5 @@ int main(int argc, char *argv[]) MainWindow w; w.show(); - return app.exec(); + return Application::exec(); } diff --git a/tools/qsqlmon/CMakeLists.txt b/tools/qsqlmon/CMakeLists.txt index 8a492fd19..7fe91d77c 100644 --- a/tools/qsqlmon/CMakeLists.txt +++ b/tools/qsqlmon/CMakeLists.txt @@ -51,7 +51,7 @@ qt6_add_lupdate(qsqlmon TS_FILES ) target_sources(qsqlmon PRIVATE ${QM_FILES}) -target_link_libraries(qsqlmon PRIVATE libqfqmlwidgets) +target_link_libraries(qsqlmon PRIVATE libqfgui) target_include_directories(qsqlmon PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) install(TARGETS qsqlmon) diff --git a/tools/qsqlmon/src/columnselectorwidget.h b/tools/qsqlmon/src/columnselectorwidget.h index 5fb5870ec..4f83fecde 100644 --- a/tools/qsqlmon/src/columnselectorwidget.h +++ b/tools/qsqlmon/src/columnselectorwidget.h @@ -9,18 +9,18 @@ #define COLUMNSELECTORWIDGET_H -#include +#include class QSqlDatabase; namespace Ui {class ColumnSelectorWidget;} -class ColumnSelectorWidget : public qf::qmlwidgets::framework::DialogWidget +class ColumnSelectorWidget : public qf::gui::framework::DialogWidget { Q_OBJECT Q_PROPERTY(QString persistentSettingsId READ persistentSettingsId WRITE setPersistentSettingsId) private: - typedef qf::qmlwidgets::framework::DialogWidget Super; + typedef qf::gui::framework::DialogWidget Super; Ui::ColumnSelectorWidget *ui; protected: QString m_tableName; diff --git a/tools/qsqlmon/src/dlgaltertable.cpp b/tools/qsqlmon/src/dlgaltertable.cpp index f9b11b0b5..40dd596b3 100644 --- a/tools/qsqlmon/src/dlgaltertable.cpp +++ b/tools/qsqlmon/src/dlgaltertable.cpp @@ -6,8 +6,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -75,7 +75,7 @@ void DlgAlterTable::onFieldInsert_clicked(bool append) QStringList sql_commands; if(connection().driverName().endsWith("SQLITE")) { if(!append) { - qf::qmlwidgets::dialogs::MessageBox::showInfo(this, "Not supported in SQLite version <= 3.2.2"); + qf::gui::dialogs::MessageBox::showInfo(this, "Not supported in SQLite version <= 3.2.2"); } QString fld_name = dlg.edName->text(); QString qs = "ALTER TABLE %1 ADD COLUMN %2 "; @@ -88,7 +88,7 @@ void DlgAlterTable::onFieldInsert_clicked(bool append) } else if(connection().driverName().endsWith("PSQL")) { if(!append) { - qf::qmlwidgets::dialogs::MessageBox::showInfo(this, "Columns insertion is not supported in PSQL"); + qf::gui::dialogs::MessageBox::showInfo(this, "Columns insertion is not supported in PSQL"); } QString fld_name = dlg.edName->text(); QString qs = "ALTER TABLE %1.%2 ADD COLUMN %3 "; @@ -118,7 +118,7 @@ void DlgAlterTable::onFieldInsert_clicked(bool append) //refresh(); } else { - qf::qmlwidgets::dialogs::MessageBox::showInfo(this, "Not supported yet."); + qf::gui::dialogs::MessageBox::showInfo(this, "Not supported yet."); continue; } bool sql_ok = true; @@ -126,7 +126,7 @@ void DlgAlterTable::onFieldInsert_clicked(bool append) if(!sql_commands.isEmpty()) { bool do_exec = true; if(dlg.isShowCommand()) { - do_exec = qf::qmlwidgets::dialogs::PreviewDialog::exec(this, sql_cmd, QString(), "dlgShowCommand"); + do_exec = qf::gui::dialogs::PreviewDialog::exec(this, sql_cmd, QString(), "dlgShowCommand"); } if(do_exec) { sql_ok = execCommand(sql_cmd); @@ -210,14 +210,14 @@ void DlgAlterTable::onFieldEdit_clicked() sql_commands << s; } else { - qf::qmlwidgets::dialogs::MessageBox::showInfo(this, "Not supported yet."); + qf::gui::dialogs::MessageBox::showInfo(this, "Not supported yet."); continue; } if(!sql_commands.isEmpty()) { QString s = sql_commands.join(";\n"); bool ok = true; if(dlg.isShowCommand()) { - ok = qf::qmlwidgets::dialogs::PreviewDialog::exec(this, s, QString(), "dlgShowCommand"); + ok = qf::gui::dialogs::PreviewDialog::exec(this, s, QString(), "dlgShowCommand"); } if(ok) if(!execCommand(s)) @@ -235,7 +235,7 @@ void DlgAlterTable::onFieldDelete_clicked() if(lstFields->currentRow() < 0) return; QString fld_name = lstFields->currentItem()->text(); - if(qf::qmlwidgets::dialogs::MessageBox::askYesNo(this, tr("Realy drop column '%1'").arg(fld_name))) { + if(qf::gui::dialogs::MessageBox::askYesNo(this, tr("Realy drop column '%1'").arg(fld_name))) { QString s = "ALTER TABLE %1 DROP COLUMN \"%2\""; s = s.arg(m_tableName).arg(fld_name); execCommand(s); @@ -288,14 +288,14 @@ void DlgAlterTable::onIndexEdit_clicked() execCommand(dlg.createIndexCommand()); refresh(); } - //qf::qmlwidgets::dialogs::MessageBox::showInfo(this, tr("If you want to edit index, drop it and create again.")); + //qf::gui::dialogs::MessageBox::showInfo(this, tr("If you want to edit index, drop it and create again.")); } void DlgAlterTable::onIndexDelete_clicked() { if(lstIndexes->currentRow() < 0) return; QString indexname = lstIndexes->currentItem()->text(); - if(qf::qmlwidgets::dialogs::MessageBox::askYesNo(this, tr("Do you realy want to drop index %1?").arg(indexname), true)) { + if(qf::gui::dialogs::MessageBox::askYesNo(this, tr("Do you realy want to drop index %1?").arg(indexname), true)) { execCommand(dropIndexCommand(indexname)); refresh(); } diff --git a/tools/qsqlmon/src/dlgcolumndef.cpp b/tools/qsqlmon/src/dlgcolumndef.cpp index 7372df3bf..e0c029664 100644 --- a/tools/qsqlmon/src/dlgcolumndef.cpp +++ b/tools/qsqlmon/src/dlgcolumndef.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include @@ -96,14 +96,11 @@ DlgColumnDef::DlgColumnDef(QWidget * parent, const QString& table) connect(lstCharacterSet, SIGNAL(activated(QString)), this, SLOT(on_lstCharacterSet_activated(QString))); } -DlgColumnDef::~DlgColumnDef() -{ -} +DlgColumnDef::~DlgColumnDef() = default; QSqlDatabase DlgColumnDef::connection() { - //qfLogFuncFrame(); - MainWindow *w = qf::core::Utils::findParent(this); + auto *w = qf::core::Utils::findParent(this); return w->activeConnection(); } @@ -186,11 +183,11 @@ void DlgColumnDef::loadColumnDefinition(const qf::core::sql::FieldInfo &fi) chkPrimaryKey->setChecked(fi.isPriKey()); txtComment->setPlainText(fi.comment()); if(connection().driverName().endsWith("SQLITE")) { - qf::qmlwidgets::dialogs::MessageBox::showInfo(this, "SQLite ver 3.2.2 can only rename already created fields"); + qf::gui::dialogs::MessageBox::showInfo(this, "SQLite ver 3.2.2 can only rename already created fields"); edName->setEnabled(true); } else if(connection().driverName().endsWith("PSQL")) { - //qf::qmlwidgets::dialogs::MessageBox::showInfo(this, "Altering columns is not fully supported yet."); + //qf::gui::dialogs::MessageBox::showInfo(this, "Altering columns is not fully supported yet."); edName->setEnabled(true); lstType->setEnabled(true); edDefaultValue->setEnabled(true); diff --git a/tools/qsqlmon/src/dlgeditconnection.cpp b/tools/qsqlmon/src/dlgeditconnection.cpp index 5739ed0a6..edae61098 100644 --- a/tools/qsqlmon/src/dlgeditconnection.cpp +++ b/tools/qsqlmon/src/dlgeditconnection.cpp @@ -1,7 +1,7 @@ #include "dlgeditconnection.h" #include -#include +#include #include @@ -120,7 +120,7 @@ void DlgEditConnection::onDriverCurrentIndexChanged(const QString &s) void DlgEditConnection::onFindDatabaseFileClicked() { QString s = edDatabase->text(); - s = qf::qmlwidgets::dialogs::FileDialog::getOpenFileName(this, tr("Open database file"), s); + s = qf::gui::dialogs::FileDialog::getOpenFileName(this, tr("Open database file"), s); if(!s.isEmpty()) edDatabase->setText(s); } diff --git a/tools/qsqlmon/src/dlgindexdef.ui b/tools/qsqlmon/src/dlgindexdef.ui index 293f850ba..fa32a341f 100644 --- a/tools/qsqlmon/src/dlgindexdef.ui +++ b/tools/qsqlmon/src/dlgindexdef.ui @@ -242,8 +242,8 @@ - - :/qf/qmlwidgets/images/right.svg:/qf/qmlwidgets/images/right.svg + + :/qf/gui/images/right.svg:/qf/gui/images/right.svg RemoveFieldFromIndex @@ -254,8 +254,8 @@ - - :/qf/qmlwidgets/images/left.svg:/qf/qmlwidgets/images/left.svg + + :/qf/gui/images/left.svg:/qf/gui/images/left.svg AddFieldToIndex @@ -266,7 +266,7 @@ - + diff --git a/tools/qsqlmon/src/mainwindow.cpp b/tools/qsqlmon/src/mainwindow.cpp index 4619d260c..5ca799f74 100644 --- a/tools/qsqlmon/src/mainwindow.cpp +++ b/tools/qsqlmon/src/mainwindow.cpp @@ -18,13 +18,13 @@ #include #include #include -#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -50,7 +50,7 @@ MainWindow::MainWindow(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, flags) - , qf::qmlwidgets::framework::IPersistentSettings(this) + , qf::gui::framework::IPersistentSettings(this) { //setAttribute(Qt::WA_DeleteOnClose); f_sqlDelimiter = ';'; @@ -125,16 +125,16 @@ void MainWindow::lazyInit() serverDock->ui.treeServers->resizeColumnToContents(0); } -qf::qmlwidgets::model::SqlTableModel* MainWindow::queryViewModel() +qf::gui::model::SqlTableModel* MainWindow::queryViewModel() { auto *m1 = ui.queryView->tableView()->tableModel(); - auto *m = qobject_cast(m1); + auto *m = qobject_cast(m1); qfDebug() << "model:" << m1 << m; - //QF_CHECK(m!=nullptr, "Model is NULL or not a kind of qf::qmlwidgets::model::SqlTableModel."); + //QF_CHECK(m!=nullptr, "Model is NULL or not a kind of qf::gui::model::SqlTableModel."); return m; } -void MainWindow::setQueryViewModel(qf::qmlwidgets::model::SqlTableModel *m) +void MainWindow::setQueryViewModel(qf::gui::model::SqlTableModel *m) { qfDebug() << "set model:" << m; ui.queryView->tableView()->setTableModel(m); @@ -209,7 +209,7 @@ qf::core::sql::Connection MainWindow::setActiveConnection1(const qf::core::sql:: QObject *old_model = queryViewModel(); qfDebug() << "\t deletenig old model:" << old_model; QF_SAFE_DELETE(old_model); - auto *m = new qf::qmlwidgets::model::SqlTableModel(this); + auto *m = new qf::gui::model::SqlTableModel(this); m->setConnectionName(c.connectionName()); qfDebug() << "\t new table model created:" << m; setQueryViewModel(m); @@ -554,7 +554,7 @@ bool MainWindow::execQuery(const QString& query_str) { qfDebug() << QF_FUNC_NAME; if(!activeConnection().isOpen()) { - qf::qmlwidgets::dialogs::MessageBox::showInfo(this, tr("No active connection !")); + qf::gui::dialogs::MessageBox::showInfo(this, tr("No active connection !")); return false; } @@ -564,7 +564,7 @@ bool MainWindow::execQuery(const QString& query_str) bool is_select = qs.startsWith(QLatin1String("SELECT"), Qt::CaseInsensitive); do { if(is_select) { - qf::qmlwidgets::model::SqlTableModel *m = queryViewModel(); + qf::gui::model::SqlTableModel *m = queryViewModel(); m->clearColumns(); m->setQuery(qs); ok = m->reload(); @@ -574,7 +574,7 @@ bool MainWindow::execQuery(const QString& query_str) } else { QString msg = m->recentlyExecutedQueryError().text(); - qf::qmlwidgets::dialogs::MessageBox::showError(this, msg); + qf::gui::dialogs::MessageBox::showError(this, msg); appendInfo(msg); } } @@ -583,7 +583,7 @@ bool MainWindow::execQuery(const QString& query_str) ok = q.exec(qs); if(!ok) { QString msg = q.lastError().text(); - qf::qmlwidgets::dialogs::MessageBox::showError(this, msg); + qf::gui::dialogs::MessageBox::showError(this, msg); appendInfo(msg); } else { @@ -612,7 +612,7 @@ bool MainWindow::execCommand(const QString& query_str) { qfDebug() << QF_FUNC_NAME << "\n\t" << query_str; if(!activeConnection().isOpen()) { - qf::qmlwidgets::dialogs::MessageBox::showInfo(this, tr("No active connection !")); + qf::gui::dialogs::MessageBox::showInfo(this, tr("No active connection !")); return true; } appendInfo(query_str); @@ -623,7 +623,7 @@ bool MainWindow::execCommand(const QString& query_str) } else { QString msg = q.lastError().text(); - qf::qmlwidgets::dialogs::MessageBox::showError(this, msg); + qf::gui::dialogs::MessageBox::showError(this, msg); appendInfo(msg); } return ok; @@ -718,7 +718,7 @@ void MainWindow::executeSelectedLines() void MainWindow::executeSqlScript() { - QString s = qf::qmlwidgets::dialogs::FileDialog::getOpenFileName(this, "Choose a file", QString(), "SQL script (*.sql);; All files (*)"); + QString s = qf::gui::dialogs::FileDialog::getOpenFileName(this, "Choose a file", QString(), "SQL script (*.sql);; All files (*)"); if(!s.isEmpty()) { QFile f(s); if(f.open(QFile::ReadOnly)) { @@ -943,8 +943,8 @@ void MainWindow::treeServersContextMenuRequest(const QPoint& point) addServer(connection); } else if(a == act_removeConnection) { - if(qf::qmlwidgets::dialogs::MessageBox::askYesNo(this, tr("Delete connection ?"), false)) { - qf::qmlwidgets::dialogs::MessageBox::showError(this, "NIY"); + if(qf::gui::dialogs::MessageBox::askYesNo(this, tr("Delete connection ?"), false)) { + qf::gui::dialogs::MessageBox::showError(this, "NIY"); /* old impl QObject *o = model->take(mi); Q_ASSERT(o == connection); @@ -1021,14 +1021,14 @@ void MainWindow::treeServersContextMenuRequest(const QPoint& point) else if(a == actCreateDatabaseScript) { qf::core::sql::Connection dbi(activeConnection()); QString s = dbi.createSchemaSqlCommand(current_schema->objectName(), false); - qf::qmlwidgets::dialogs::PreviewDialog dlg(this); + qf::gui::dialogs::PreviewDialog dlg(this); new QFSqlSyntaxHighlighter(dlg.editor()); dlg.exec(s, "create_" + current_schema->objectName() +".sql", "dlgTextView"); } else if(a == actDumpDatabaseScript) { QString s = current_schema->createScript(Schema::CreateTableSql | Schema::DumpTableSql | Schema::IncludeViews); qfInfo() << s; - qf::qmlwidgets::dialogs::MessageBox::showError(this, "NIY"); + qf::gui::dialogs::MessageBox::showError(this, "NIY"); /* QString fn = QFFileUtils::joinPath(qfApp()->tempDir(), sch->objectName() + ".sql"); QUrl url = QFFileUtils::saveText(s, fn); @@ -1037,7 +1037,7 @@ void MainWindow::treeServersContextMenuRequest(const QPoint& point) */ } else if(a == actDropSchema) { - if(qf::qmlwidgets::dialogs::MessageBox::askYesNo(this, tr("Realy drop schema '%1'").arg(current_schema->objectName()), true)) { + if(qf::gui::dialogs::MessageBox::askYesNo(this, tr("Realy drop schema '%1'").arg(current_schema->objectName()), true)) { QString qs = "DROP SCHEMA " + current_schema->objectName(); qf::core::sql::Connection c = activeConnection(); if(c.driverName().endsWith("PSQL", Qt::CaseInsensitive)) { @@ -1052,7 +1052,7 @@ void MainWindow::treeServersContextMenuRequest(const QPoint& point) } } else if(a == actCheckDatabase) { - qf::qmlwidgets::dialogs::MessageBox::showError(this, "NIY"); + qf::gui::dialogs::MessageBox::showError(this, "NIY"); /* sch->open(); QList lst = sch->findChildren(); @@ -1178,13 +1178,13 @@ void MainWindow::treeServersContextMenuRequest(const QPoint& point) execQuery(s.arg(full_table_name)); } else if(activeConnection().driverName().endsWith("MYSQL")) { - qf::qmlwidgets::dialogs::MessageBox::showInfo(this, tr("Not implemented yet.")); + qf::gui::dialogs::MessageBox::showInfo(this, tr("Not implemented yet.")); } } else if(a == actCreateScript) { qf::core::sql::Connection dbi(activeConnection()); QString s = dbi.createTableSqlCommand(full_table_name); - qf::qmlwidgets::dialogs::PreviewDialog dlg(this); + qf::gui::dialogs::PreviewDialog dlg(this); new QFSqlSyntaxHighlighter(dlg.editor()); dlg.exec(s, "create_" + table->objectName()+".sql", "dlgTextView"); } @@ -1193,14 +1193,14 @@ void MainWindow::treeServersContextMenuRequest(const QPoint& point) QString s = dbi.createTableSqlCommand(full_table_name); s += "\n\n"; s += dbi.dumpTableSqlCommand(full_table_name); - qf::qmlwidgets::dialogs::PreviewDialog dlg(this); + qf::gui::dialogs::PreviewDialog dlg(this); new QFSqlSyntaxHighlighter(dlg.editor()); dlg.exec(s, "dump_" + table->objectName()+".sql", "dlgTextView"); } else if(a == actColumnSelector) { qf::core::sql::Connection conn = activeConnection(); auto *w = new ColumnSelectorWidget(table->objectName(), conn); - qf::qmlwidgets::dialogs::Dialog dlg(this); + qf::gui::dialogs::Dialog dlg(this); dlg.setCentralWidget(w); connect(w, SIGNAL(columnNamesCopiedToClipboard(QString)), sqlDock->sqlTextEdit(), SLOT(paste())); if(dlg.exec() == QDialog::Accepted) {} @@ -1224,7 +1224,7 @@ void MainWindow::treeServersContextMenuRequest(const QPoint& point) QString s = table->objectName(); QString what = "TABLE"; if(table->kind == QSql::Views) what = "VIEW"; - if(qf::qmlwidgets::dialogs::MessageBox::askYesNo(this, tr("Realy drop the table '%1'").arg(s), true)) { + if(qf::gui::dialogs::MessageBox::askYesNo(this, tr("Realy drop the table '%1'").arg(s), true)) { s = "DROP " + what + " " + s; execCommand(s); QModelIndex parix = mi.parent(); @@ -1236,7 +1236,7 @@ void MainWindow::treeServersContextMenuRequest(const QPoint& point) } else if(a == actTruncateTable) { if(table->kind == QSql::Tables) { - if(qf::qmlwidgets::dialogs::MessageBox::askYesNo(this, tr("Realy truncate the table '%1'").arg(full_table_name), true)) { + if(qf::gui::dialogs::MessageBox::askYesNo(this, tr("Realy truncate the table '%1'").arg(full_table_name), true)) { if(activeConnection().driverName().endsWith("SQLITE")) { QString s = "DELETE FROM " + full_table_name; execCommand(s); @@ -1275,7 +1275,7 @@ void MainWindow::treeServersContextMenuRequest(const QPoint& point) //------------------------------------------------------------------------- void MainWindow::addServer(Connection *connection_to_copy) { - //qf::qmlwidgets::dialogs::MessageBox::showError(this, "NIY"); + //qf::gui::dialogs::MessageBox::showError(this, "NIY"); Ui::ServerTreeWidget &ui_srv = serverDock->ui; auto *model = qobject_cast(ui_srv.treeServers->model()); @@ -1293,7 +1293,7 @@ void MainWindow::addServer(Connection *connection_to_copy) void MainWindow::changeLog() { - qf::qmlwidgets::dialogs::MessageBox::showError(this, "NIY"); + qf::gui::dialogs::MessageBox::showError(this, "NIY"); /* QFile f(":/ChangeLog"); QFDlgHtmlView::exec(this, f, "dlgChangeLog"); @@ -1303,13 +1303,13 @@ void MainWindow::changeLog() void MainWindow::mysqlSyntax() { QUrl url = QUrl::fromLocalFile(":/doc/syntax/mysqlsyntax.html"); - qf::qmlwidgets::dialogs::PreviewDialog::exec(this, url, "dlgSqlSyntax"); + qf::gui::dialogs::PreviewDialog::exec(this, url, "dlgSqlSyntax"); } void MainWindow::sqliteSyntax() { QUrl url = QUrl::fromLocalFile(":/doc/syntax/sqlitesyntax.html"); - qf::qmlwidgets::dialogs::PreviewDialog::exec(this, url, "dlgSqlSyntax"); + qf::gui::dialogs::PreviewDialog::exec(this, url, "dlgSqlSyntax"); } void MainWindow::availableDrivers() @@ -1326,7 +1326,7 @@ void MainWindow::availableDrivers() ts << "\t'" << s << "'" << '\n'; } } - qf::qmlwidgets::dialogs::PreviewDialog::exec(this, s); + qf::gui::dialogs::PreviewDialog::exec(this, s); } void MainWindow::checkDrivers() @@ -1356,7 +1356,7 @@ void MainWindow::checkDrivers() } } } - qf::qmlwidgets::dialogs::PreviewDialog::exec(this, msg); + qf::gui::dialogs::PreviewDialog::exec(this, msg); } void MainWindow::tearOffTable() @@ -1378,7 +1378,7 @@ void MainWindow::tearOffTable() //ui.queryView->setContextMenuPolicy(); connect(ui.queryView, &TableViewWidget::statusBarAction, this, &MainWindow::onTableStatusBarAction); ly->addWidget(ui.queryView); - auto *m = new qf::qmlwidgets::model::SqlTableModel(ui.queryView); + auto *m = new qf::gui::model::SqlTableModel(ui.queryView); m->setConnectionName(activeConnection().connectionName()); setQueryViewModel(m); } @@ -1427,7 +1427,7 @@ void MainWindow::setProgressValue(double val, const QString & label_text) void MainWindow::showSqlJournal() { - qf::qmlwidgets::dialogs::MessageBox::showError(this, "NIY"); + qf::gui::dialogs::MessageBox::showError(this, "NIY"); /* QString s = theApp()->sqlJournal()->content().join("\n"); QFDlgTextView dlg(this); diff --git a/tools/qsqlmon/src/mainwindow.h b/tools/qsqlmon/src/mainwindow.h index 90dbbd0ab..e5b2a95a2 100644 --- a/tools/qsqlmon/src/mainwindow.h +++ b/tools/qsqlmon/src/mainwindow.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include @@ -23,9 +23,9 @@ class Connection; class Database; class QSpinBox; -namespace qf::qmlwidgets::model { class SqlTableModel; } +namespace qf::gui::model { class SqlTableModel; } -class MainWindow : public QMainWindow, public qf::qmlwidgets::framework::IPersistentSettings +class MainWindow : public QMainWindow, public qf::gui::framework::IPersistentSettings { Q_OBJECT Q_PROPERTY(QString persistentSettingsId READ persistentSettingsId WRITE setPersistentSettingsId) @@ -98,8 +98,8 @@ private slots: QList > tearOffDialogs; - qf::qmlwidgets::model::SqlTableModel* queryViewModel(); - void setQueryViewModel(qf::qmlwidgets::model::SqlTableModel *m); + qf::gui::model::SqlTableModel* queryViewModel(); + void setQueryViewModel(qf::gui::model::SqlTableModel *m); //QList statusBarWidgets; private: QAction* action(const QString& action_name) { diff --git a/tools/qsqlmon/src/servertreeitem.cpp b/tools/qsqlmon/src/servertreeitem.cpp index a418ffcbc..2f65a654d 100644 --- a/tools/qsqlmon/src/servertreeitem.cpp +++ b/tools/qsqlmon/src/servertreeitem.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include @@ -29,14 +29,11 @@ ServerTreeItem::ServerTreeItem(QObject *parent, const QString& name) setObjectName(name); } -ServerTreeItem::~ServerTreeItem() -{ - //qfDebug() << QF_FUNC_NAME << this << objectName(); -} +ServerTreeItem::~ServerTreeItem() = default; MainWindow * ServerTreeItem::mainWindow() { - MainWindow *ret = qf::core::Utils::findParent(model()); + auto *ret = qf::core::Utils::findParent(model()); return ret; } @@ -45,7 +42,7 @@ QFObjectItemModel* ServerTreeItem::model() //qfDebug() << QF_FUNC_NAME; QObject *o = this; while(o) { - QFObjectItemModelRoot *r = qobject_cast(o); + auto *r = qobject_cast(o); if(r) { //qfDebug() << "\tmodel:" << r->model(); //r->model()->dumpObjectInfo(); @@ -78,10 +75,7 @@ void ServerTreeItem::driverDestroyed(QObject *o) //=================================================== // Connection //=================================================== -Connection::~Connection() -{ - //qDebug() << "destructor:" << this; -} +Connection::~Connection() = default; Connection::Connection(const Params &_params, QObject *parent) : ServerTreeItem(parent, QString()) @@ -137,7 +131,7 @@ Database* Connection::open() m->append(olst, ix); } else { - //qf::qmlwidgets::dialogs::MessageBox::showError(mainWindow(), d->sqlConnection().lastError().text()); + //qf::gui::dialogs::MessageBox::showError(mainWindow(), d->sqlConnection().lastError().text()); QF_SAFE_DELETE(d); } return d; @@ -246,12 +240,7 @@ Database::Database(QObject *parent, const QString& name) connect(this, SIGNAL(connectionInfo(const QString&)), o, SLOT(appendInfo(const QString&))); } -Database::~Database() -{ - //qfDebug() << QF_FUNC_NAME << "############"; - //close(); - //qDebug() << "destructor:" << this; -} +Database::~Database() = default; QVariant Database::icon(int col) { @@ -280,7 +269,7 @@ QVariant Database::text(int col) QString Database::connectionSignature() { QString s; - Connection *c = qobject_cast(parent()); + auto *c = qobject_cast(parent()); if(c) { s = objectName() + "[" + c->params().param("driver").toString() + "]" + c->params().param("user").toString() + "@" + c->params().param("host").toString() @@ -293,7 +282,7 @@ QStringList Database::databases() { qfLogFuncFrame(); QStringList sl; - QSqlDriver *driver = sqlConnection().driver(); + auto *driver = sqlConnection().driver(); QF_ASSERT(driver != nullptr, "driver is NULL", return QStringList()); @@ -322,9 +311,9 @@ int defaultPort(const QString &driver_name) { if(driver_name.endsWith("PSQL")) return 5432; - else if(driver_name.endsWith("MYSQL")) + if(driver_name.endsWith("MYSQL")) return 3306; - else if(driver_name.endsWith("IBASE")) + if(driver_name.endsWith("IBASE")) return 3050; return 0; } @@ -380,7 +369,7 @@ QStringList Database::schemas() const bool Database::open() { qfLogFuncFrame(); - Connection *c = qobject_cast(parent()); + auto *c = qobject_cast(parent()); QF_ASSERT(c!=nullptr, "Parent is not a kind of Connection", return false); @@ -424,7 +413,7 @@ bool Database::open() //qfInfo() << "password:" << password(); if(!m_sqlConnection.open()) { m_sqlConnection.setConnectOptions(); - qf::qmlwidgets::dialogs::MessageBox::showError(mainWindow(), + qf::gui::dialogs::MessageBox::showError(mainWindow(), tr("Error opening database %1").arg(connectionSignature()) + "\n\n" + m_sqlConnection.lastError().text()); @@ -470,9 +459,9 @@ bool Database::open() } else { foreach(QString s, schemas()) { - Schema *sch = new Schema(nullptr, s); + auto *sch = new Schema(nullptr, s); olst << sch; - connect(sch, SIGNAL(progressValue(double, const QString&)), mainWindow(), SLOT(setProgressValue(double, const QString&))); + connect(sch, &Schema::progressValue, mainWindow(), &MainWindow::setProgressValue); } } m->append(olst, ix); @@ -676,17 +665,14 @@ void Schema::close() //=================================================== // Table //=================================================== -Table::~Table() -{ - //qDebug() << "destructor:" << this; -} +Table::~Table() = default; QVariant Table::icon(int col) { if(col == 0) { if(kind == QSql::Tables) return QVariant::fromValue(QIcon(":/images/table.png")); - else if(kind == QSql::Views) + if(kind == QSql::Views) return QVariant::fromValue(QIcon(":/images/view.png")); } return QVariant(); @@ -695,7 +681,8 @@ QVariant Table::icon(int col) QVariant Table::text(int col) { QVariant ret; - if(col == 0) ret = objectName(); + if(col == 0) + ret = objectName(); return ret; } @@ -705,7 +692,8 @@ QString Table::schema() const const Schema *d = nullptr; while(o) { d = qobject_cast(o); - if(d) return d->objectName(); + if(d) + return d->objectName(); o = o->parent(); } return ""; diff --git a/tools/qsqlmon/src/tableviewwidget.cpp b/tools/qsqlmon/src/tableviewwidget.cpp index 6cfa059e0..1c572409b 100644 --- a/tools/qsqlmon/src/tableviewwidget.cpp +++ b/tools/qsqlmon/src/tableviewwidget.cpp @@ -40,14 +40,14 @@ TableViewWidget::~TableViewWidget() delete ui; } -qf::qmlwidgets::TableView *TableViewWidget::tableView() +qf::gui::TableView *TableViewWidget::tableView() { return ui->tableView; } void TableViewWidget::updateStatus() { - qf::qmlwidgets::model::TableModel *m = tableView()->tableModel(); + qf::gui::model::TableModel *m = tableView()->tableModel(); if(m) { ui->lblRowCnt->setText(QString("%1 rows").arg(m->rowCount())); } diff --git a/tools/qsqlmon/src/tableviewwidget.h b/tools/qsqlmon/src/tableviewwidget.h index 11540a4a5..a64dbadd2 100644 --- a/tools/qsqlmon/src/tableviewwidget.h +++ b/tools/qsqlmon/src/tableviewwidget.h @@ -1,7 +1,7 @@ #ifndef TABLEVIEWWIDGET_H #define TABLEVIEWWIDGET_H -#include +#include #include @@ -9,11 +9,11 @@ namespace Ui { class TableViewWidget; } -class TableView : public qf::qmlwidgets::TableView +class TableView : public qf::gui::TableView { Q_OBJECT private: - typedef qf::qmlwidgets::TableView Super; + typedef qf::gui::TableView Super; public: TableView(QWidget *parent = nullptr); }; @@ -26,7 +26,7 @@ class TableViewWidget : public QWidget explicit TableViewWidget(QWidget *parent = nullptr); ~TableViewWidget(); public: - qf::qmlwidgets::TableView* tableView(); + qf::gui::TableView* tableView(); Q_SLOT void updateStatus(); Q_SLOT void setInfo(const QString &info); diff --git a/tools/qsqlmon/src/tableviewwidget.ui b/tools/qsqlmon/src/tableviewwidget.ui index 460adedee..5c19f6780 100644 --- a/tools/qsqlmon/src/tableviewwidget.ui +++ b/tools/qsqlmon/src/tableviewwidget.ui @@ -30,7 +30,7 @@ 5 - + @@ -586,9 +586,9 @@
tableviewwidget.h
 - qf::qmlwidgets::TableViewToolBar + qf::gui::TableViewToolBar QWidget -
qf/qmlwidgets/tableviewtoolbar.h
+
qf/gui/tableviewtoolbar.h
1 diff --git a/tools/qsqlmon/src/theapp.cpp b/tools/qsqlmon/src/theapp.cpp index edc2270cc..1f2eb28ba 100644 --- a/tools/qsqlmon/src/theapp.cpp +++ b/tools/qsqlmon/src/theapp.cpp @@ -8,7 +8,7 @@ #include "theapp.h" #include "driver/qfhttpmysql/qfhttpmysql.h" -#include +#include #include @@ -35,7 +35,7 @@ void SqlJournal::log(const QString& msg) class QFHttpMySqlDriverCreator : public QSqlDriverCreatorBase { public: - virtual QSqlDriver * createObject () const {return new QFHttpMySqlDriver();} + QSqlDriver* createObject() const override {return new QFHttpMySqlDriver();} }; //====================================================== @@ -46,9 +46,9 @@ SqlJournal TheApp::f_sqlJournal; TheApp::TheApp(int & argc, char ** argv) : QApplication(argc, argv) { - auto *style = qf::qmlwidgets::Style::instance(); - //style->addIconSearchPath(":/qf/qmlwidgets/images/flat"); - style->addIconSearchPath(":/qf/qmlwidgets/images"); + auto *style = qf::gui::Style::instance(); + //style->addIconSearchPath(":/qf/gui/images/flat"); + style->addIconSearchPath(":/qf/gui/images"); QSqlDatabase::registerSqlDriver("QFHTTPMYSQL", new QFHttpMySqlDriverCreator()); @@ -58,15 +58,11 @@ TheApp::TheApp(int & argc, char ** argv) setOneTimeConnectionSettings(args.value(ix + 1)); } -TheApp::~TheApp() -{ - //qfDebug() << QF_FUNC_NAME << "config()->dataDocument().isEmpty():" << config()->dataDocument().isEmpty(); - //if(!config()->dataDocument().isEmpty()) config()->save(); -} +TheApp::~TheApp() = default; TheApp* TheApp::instance() { - TheApp *a = qobject_cast(QApplication::instance()); + auto *a = qobject_cast(QApplication::instance()); QF_ASSERT_EX(a!=nullptr, "Application is not initialized yet"); return a; } @@ -75,29 +71,7 @@ qf::core::utils::Crypt TheApp::crypt() { return qf::core::utils::Crypt(); } -/* -QFXmlConfig* TheApp::config(bool throw_exc) -{ - Q_UNUSED(throw_exc); - QFXmlConfig *ret = f_config; - return ret; -} -void TheApp::redirectLog() -{ - bool log_to_file = config()->value("/log", "0").toBool(); - bool redirected = false; - if(log_to_file) { - QString fn = config()->value("/log/file", "err.log").toString(); - FILE *f = fopen(qPrintable(fn), "wb"); - if(f) { - redirected = true; - QFLog::redirectDefaultLogFile(f); - } - } - if(!redirected) QFLog::redirectDefaultLogFile(); -} -*/ QString TheApp::versionString() const { return QCoreApplication::applicationVersion(); @@ -107,12 +81,4 @@ SqlJournal * TheApp::sqlJournal() { return &f_sqlJournal; } -/* -QFSearchDirs* TheApp::reportProcessorSearchDirs() -{ - if(!f_reportProcessorSearchDirs) { - f_reportProcessorSearchDirs = new QFSearchDirs(); - } - return f_reportProcessorSearchDirs; -} -*/ +