From 2c65e2323c26592e74003314ae0a7e0c2e5571da Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Mon, 26 Oct 2020 13:42:42 +0100 Subject: [PATCH 01/48] QmlDesigner: Fix delegateMargin not used warning Change-Id: I981607f68cad9a55e3d8f4b43e33eb14db515c47 Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/components/navigator/navigatorview.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.h b/src/plugins/qmldesigner/components/navigator/navigatorview.h index 451de3be71c..b78c9e612a2 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.h +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.h @@ -43,7 +43,7 @@ QT_END_NAMESPACE namespace QmlDesigner { -static int delegateMargin = 2; +const int delegateMargin = 2; class NavigatorWidget; class NavigatorTreeModel; From 6c841dfbd023c378a09abb01500ebeaad0b8d802 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Fri, 23 Oct 2020 17:09:51 +0200 Subject: [PATCH 02/48] GitHub Actions: Update to use Clang 11.0.0 Change-Id: I015a71a4f53ff3be8609a00bdef47c93161af882 Reviewed-by: Eike Ziller --- .github/workflows/build_cmake.yml | 6 +++--- scripts/common.py | 16 +++++++++------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index cc9a25788f4..45d9c8144f1 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -4,7 +4,7 @@ on: [push, pull_request] env: QT_VERSION: 5.15.1 - CLANG_VERSION: 100 + CLANG_VERSION: 110 ELFUTILS_VERSION: 0.175 CMAKE_VERSION: 3.18.3 NINJA_VERSION: 1.10.1 @@ -34,7 +34,7 @@ jobs: } - { name: "Ubuntu Latest GCC", artifact: "Linux", - os: ubuntu-latest, + os: ubuntu-20.04, cc: "gcc", cxx: "g++" } - { @@ -251,7 +251,7 @@ jobs: set(libclang "libclang-release_${clang_version}-based-windows-vs2019_32.7z") endif() elseif ("${{ runner.os }}" STREQUAL "Linux") - set(libclang "libclang-release_${clang_version}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z") + set(libclang "libclang-release_${clang_version}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z") elseif ("${{ runner.os }}" STREQUAL "macOS") set(libclang "libclang-release_${clang_version}-based-mac.7z") endif() diff --git a/scripts/common.py b/scripts/common.py index d033108648d..a828faca2de 100644 --- a/scripts/common.py +++ b/scripts/common.py @@ -133,16 +133,17 @@ def get_rpath(libfilepath, chrpath=None): chrpath = 'chrpath' try: output = subprocess.check_output([chrpath, '-l', libfilepath]).strip() + decoded_output = output.decode(encoding) if encoding else output except subprocess.CalledProcessError: # no RPATH or RUNPATH return [] marker = 'RPATH=' - index = output.decode(encoding).find(marker) + index = decoded_output.find(marker) if index < 0: marker = 'RUNPATH=' - index = output.find(marker) + index = decoded_output.find(marker) if index < 0: return [] - return output[index + len(marker):].split(':') + return decoded_output[index + len(marker):].split(':') def fix_rpaths(path, qt_deploy_path, qt_install_info, chrpath=None): if chrpath is None: @@ -155,12 +156,13 @@ def fix_rpaths(path, qt_deploy_path, qt_install_info, chrpath=None): if len(rpath) <= 0: return # remove previous Qt RPATH - new_rpath = filter(lambda path: not path.startswith(qt_install_prefix) and not path.startswith(qt_install_libs), - rpath) + new_rpath = list(filter(lambda path: not path.startswith(qt_install_prefix) and not path.startswith(qt_install_libs), + rpath)) # check for Qt linking lddOutput = subprocess.check_output(['ldd', filepath]) - if lddOutput.decode(encoding).find('libQt5') >= 0 or lddOutput.find('libicu') >= 0: + lddDecodedOutput = lddOutput.decode(encoding) if encoding else lddOutput + if lddDecodedOutput.find('libQt5') >= 0 or lddDecodedOutput.find('libicu') >= 0: # add Qt RPATH if necessary relative_path = os.path.relpath(qt_deploy_path, os.path.dirname(filepath)) if relative_path == '.': @@ -180,7 +182,7 @@ def fix_rpaths(path, qt_deploy_path, qt_install_info, chrpath=None): def is_unix_executable(filepath): # Whether a file is really a binary executable and not a script and not a symlink (unix only) if os.path.exists(filepath) and os.access(filepath, os.X_OK) and not os.path.islink(filepath): - with open(filepath) as f: + with open(filepath, 'rb') as f: return f.read(2) != "#!" def is_unix_library(filepath): From a8a6a9e77480048f47b5848aea33582f83e02b84 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 6 Oct 2020 14:05:45 +0200 Subject: [PATCH 03/48] ProjectExplorer: Make project window state persistent Task-number: QTCREATORBUG-24690 Change-Id: Ia261fc5a98681676e8d67e6d840f2f48073cdbb2 Reviewed-by: hjk --- src/plugins/projectexplorer/projectwindow.cpp | 30 +++++++++++++++++++ src/plugins/projectexplorer/projectwindow.h | 6 ++++ 2 files changed, 36 insertions(+) diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp index ce7a2db229a..f9da875f9ea 100644 --- a/src/plugins/projectexplorer/projectwindow.cpp +++ b/src/plugins/projectexplorer/projectwindow.cpp @@ -661,8 +661,38 @@ void ProjectWindow::activateProjectPanel(Utils::Id panelId) d->activateProjectPanel(panelId); } +void ProjectWindow::hideEvent(QHideEvent *event) +{ + savePersistentSettings(); + FancyMainWindow::hideEvent(event); +} + +void ProjectWindow::showEvent(QShowEvent *event) +{ + loadPersistentSettings(); + FancyMainWindow::showEvent(event); +} + ProjectWindow::~ProjectWindow() = default; +const char PROJECT_WINDOW_KEY[] = "ProjectExplorer.ProjectWindow"; + +void ProjectWindow::savePersistentSettings() const +{ + QSettings * const settings = ICore::settings(); + settings->beginGroup(PROJECT_WINDOW_KEY); + saveSettings(settings); + settings->endGroup(); +} + +void ProjectWindow::loadPersistentSettings() +{ + QSettings * const settings = ICore::settings(); + settings->beginGroup(PROJECT_WINDOW_KEY); + restoreSettings(settings); + settings->endGroup(); +} + QSize SelectorDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const { QSize s = QStyledItemDelegate::sizeHint(option, index); diff --git a/src/plugins/projectexplorer/projectwindow.h b/src/plugins/projectexplorer/projectwindow.h index 09c242034c8..c048a4ac460 100644 --- a/src/plugins/projectexplorer/projectwindow.h +++ b/src/plugins/projectexplorer/projectwindow.h @@ -64,6 +64,12 @@ public: void activateProjectPanel(Utils::Id panelId); private: + void hideEvent(QHideEvent *event) override; + void showEvent(QShowEvent *event) override; + + void savePersistentSettings() const; + void loadPersistentSettings(); + const std::unique_ptr d; }; From 7e5ec83c1bfff8f0fabcea88f091086e0996524b Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 26 Oct 2020 14:17:28 +0100 Subject: [PATCH 04/48] Get qbs build closer to building with Qt 6 Change-Id: Idf96a03db3b3f1aa5af07fb59f261250d7787e61 Reviewed-by: Christian Stenger --- qbs/imports/QtcProduct.qbs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs index 0509b79d784..829394d798f 100644 --- a/qbs/imports/QtcProduct.qbs +++ b/qbs/imports/QtcProduct.qbs @@ -29,6 +29,10 @@ Product { } } Depends { name: "Qt.core"; versionAtLeast: "5.14.0" } + Depends { + name: "Qt.core5compat" + condition: Utilities.versionCompare(Qt.core.version, "6") >= 0 + } // TODO: Should fall back to what came from Qt.core for Qt < 5.7, but we cannot express that // atm. Conditionally pulling in a module that sets the property is also not possible, From 20a620745982368f71ac890dedfde6429d9e4e84 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 23 Oct 2020 14:29:42 +0200 Subject: [PATCH 05/48] cmake build: Disable clangpchmanagerbackend and refactoringbackend By default. Previously only the corresponding plugins were disabled, but not even building the backends makes more sense. Change-Id: I36d61869a3050f37da1f480dea89e7539dda599a Reviewed-by: Cristian Adam Reviewed-by: Marco Bubke --- cmake/QtCreatorAPI.cmake | 8 ++++++-- src/plugins/clangpchmanager/CMakeLists.txt | 3 +-- src/plugins/clangrefactoring/CMakeLists.txt | 3 +-- src/tools/clangpchmanagerbackend/CMakeLists.txt | 1 + src/tools/clangrefactoringbackend/CMakeLists.txt | 1 + 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index 2e1183c75ed..ee7b61f1f9c 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -541,7 +541,7 @@ endfunction() function(add_qtc_executable name) cmake_parse_arguments(_arg "SKIP_INSTALL;SKIP_TRANSLATION;ALLOW_ASCII_CASTS" - "DESTINATION;COMPONENT" + "DESTINATION;COMPONENT;BUILD_DEFAULT" "DEPENDS;DEFINES;INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PROPERTIES" ${ARGN}) if ($_arg_UNPARSED_ARGUMENTS) @@ -556,7 +556,11 @@ function(add_qtc_executable name) update_cached_list(__QTC_EXECUTABLES "${name}") string(TOUPPER "BUILD_EXECUTABLE_${name}" _build_executable_var) - set(_build_executable_default ${BUILD_EXECUTABLES_BY_DEFAULT}) + if (DEFINED _arg_BUILD_DEFAULT) + set(_build_executable_default ${_arg_BUILD_DEFAULT}) + else() + set(_build_executable_default ${BUILD_EXECUTABLES_BY_DEFAULT}) + endif() if (DEFINED ENV{QTC_${_build_executable_var}}) set(_build_executable_default "$ENV{QTC_${_build_executable_var}}") endif() diff --git a/src/plugins/clangpchmanager/CMakeLists.txt b/src/plugins/clangpchmanager/CMakeLists.txt index c1c9b29f93c..bae46003faf 100644 --- a/src/plugins/clangpchmanager/CMakeLists.txt +++ b/src/plugins/clangpchmanager/CMakeLists.txt @@ -1,6 +1,5 @@ add_qtc_plugin(ClangPchManager - BUILD_DEFAULT OFF - CONDITION TARGET libclang + CONDITION TARGET libclang AND TARGET clangpchmanagerbackend DEPENDS ClangSupport CPlusPlus DEFINES CLANGPCHMANAGER_LIB PLUGIN_DEPENDS Core CppTools diff --git a/src/plugins/clangrefactoring/CMakeLists.txt b/src/plugins/clangrefactoring/CMakeLists.txt index 95c926dc2d0..6caa24247e0 100644 --- a/src/plugins/clangrefactoring/CMakeLists.txt +++ b/src/plugins/clangrefactoring/CMakeLists.txt @@ -1,6 +1,5 @@ add_qtc_plugin(ClangRefactoring - BUILD_DEFAULT OFF - CONDITION TARGET libclang + CONDITION TARGET libclang AND TARGET clangrefactoringbackend DEPENDS ClangSupport CPlusPlus PLUGIN_DEPENDS Core CppTools TextEditor ClangPchManager SOURCES ${TEST_SOURCES} diff --git a/src/tools/clangpchmanagerbackend/CMakeLists.txt b/src/tools/clangpchmanagerbackend/CMakeLists.txt index cdbc111bab1..cd5fbb72a50 100644 --- a/src/tools/clangpchmanagerbackend/CMakeLists.txt +++ b/src/tools/clangpchmanagerbackend/CMakeLists.txt @@ -1,6 +1,7 @@ add_subdirectory(source) add_qtc_executable(clangpchmanagerbackend + BUILD_DEFAULT OFF DEPENDS clangrefactoringbackend_lib clangpchmanagerbackend_lib Sqlite ClangSupport diff --git a/src/tools/clangrefactoringbackend/CMakeLists.txt b/src/tools/clangrefactoringbackend/CMakeLists.txt index fdf1011cba2..f32a22c25b9 100644 --- a/src/tools/clangrefactoringbackend/CMakeLists.txt +++ b/src/tools/clangrefactoringbackend/CMakeLists.txt @@ -1,6 +1,7 @@ add_subdirectory(source) add_qtc_executable(clangrefactoringbackend + BUILD_DEFAULT OFF DEPENDS clangrefactoringbackend_lib Sqlite ClangSupport SOURCES From 045881089f10b45715f9a9eb752a805670c649a1 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 26 Oct 2020 10:19:08 +0100 Subject: [PATCH 06/48] QmakeProject: Don't crash on project import Amends fc1fc6a07af58f. Fixes: QTCREATORBUG-24802 Change-Id: I62e7e0bab82ae1b025c053785b77586aa78bcd1f Reviewed-by: Christian Kandeler --- src/plugins/qmakeprojectmanager/qmakestep.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index 620b3645f70..1f1d1bae4b6 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -614,7 +614,8 @@ void QMakeStep::userArgumentsChanged() { if (m_ignoreChange) return; - qmakeAdditonalArgumentsLineEdit->setText(m_userArgs); + if (qmakeAdditonalArgumentsLineEdit) + qmakeAdditonalArgumentsLineEdit->setText(m_userArgs); updateAbiWidgets(); updateEffectiveQMakeCall(); } @@ -723,6 +724,9 @@ bool QMakeStep::isAndroidKit() const void QMakeStep::updateAbiWidgets() { + if (!abisLabel) + return; + BaseQtVersion *qtVersion = QtKitAspect::qtVersion(target()->kit()); if (!qtVersion) return; @@ -762,7 +766,8 @@ void QMakeStep::updateAbiWidgets() void QMakeStep::updateEffectiveQMakeCall() { - qmakeArgumentsEdit->setPlainText(effectiveQMakeCall()); + if (qmakeArgumentsEdit) + qmakeArgumentsEdit->setPlainText(effectiveQMakeCall()); } void QMakeStep::recompileMessageBoxFinished(int button) From 781d54249e262bec3a6fc0d9cf56d5d97819179d Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 26 Oct 2020 16:16:43 +0100 Subject: [PATCH 07/48] cmake build: add qtc_add_resources to API Adapted from qt6_add_resources. Takes a list of files and compiles these into a resource file. Change-Id: I375aa17b76e283b90bc0cbe8b6859520bcac7da3 Reviewed-by: Cristian Adam --- cmake/QtCreatorAPI.cmake | 81 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index ee7b61f1f9c..725af7134ef 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -842,3 +842,84 @@ function(qtc_copy_to_builddir custom_target_name) add_custom_target("${custom_target_name}" ALL DEPENDS ${timestampFiles}) endfunction() + +function(qtc_add_resources target resourceName) + cmake_parse_arguments(rcc "" "PREFIX;LANG;BASE" "FILES;OPTIONS" ${ARGN}) + + string(REPLACE "/" "_" resourceName ${resourceName}) + string(REPLACE "." "_" resourceName ${resourceName}) + + # Apply base to all files + if (rcc_BASE) + foreach(file IN LISTS rcc_FILES) + set(resource_file "${rcc_BASE}/${file}") + file(TO_CMAKE_PATH ${resource_file} resource_file) + list(APPEND resource_files ${resource_file}) + endforeach() + else() + set(resource_files ${rcc_FILES}) + endif() + + set(newResourceName ${resourceName}) + set(resources ${resource_files}) + + set(generatedResourceFile "${CMAKE_CURRENT_BINARY_DIR}/.rcc/generated_${newResourceName}.qrc") + set(generatedSourceCode "${CMAKE_CURRENT_BINARY_DIR}/.rcc/qrc_${newResourceName}.cpp") + + # Generate .qrc file: + + # + set(qrcContents "\n \n") + + set(resource_dependencies) + foreach(file IN LISTS resources) + set(file_resource_path ${file}) + + if (NOT IS_ABSOLUTE ${file}) + set(file "${CMAKE_CURRENT_SOURCE_DIR}/${file}") + endif() + + ### FIXME: escape file paths to be XML conform + # ... + string(APPEND qrcContents " ") + string(APPEND qrcContents "${file}\n") + list(APPEND files "${file}") + list(APPEND resource_dependencies ${file}) + target_sources(${target} PRIVATE "${file}") + set_property(SOURCE "${file}" PROPERTY HEADER_FILE_ONLY ON) + endforeach() + + # + string(APPEND qrcContents " \n\n") + + file(WRITE "${generatedResourceFile}.in" "${qrcContents}") + configure_file("${generatedResourceFile}.in" "${generatedResourceFile}") + + set_property(TARGET ${target} APPEND PROPERTY _qt_generated_qrc_files "${generatedResourceFile}") + + set(rccArgs --name "${newResourceName}" + --output "${generatedSourceCode}" "${generatedResourceFile}") + if(rcc_OPTIONS) + list(APPEND rccArgs ${rcc_OPTIONS}) + endif() + + # Process .qrc file: + add_custom_command(OUTPUT "${generatedSourceCode}" + COMMAND Qt5::rcc ${rccArgs} + DEPENDS + ${resource_dependencies} + ${generatedResourceFile} + "Qt5::rcc" + COMMENT "RCC ${newResourceName}" + VERBATIM) + + target_sources(${target} PRIVATE "${generatedSourceCode}") + set_property(SOURCE "${generatedSourceCode}" PROPERTY SKIP_AUTOGEN ON) +endfunction() From 6e846b6606eafe18082f48f63f3f98e9446fd978 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Mon, 26 Oct 2020 09:07:31 +0100 Subject: [PATCH 08/48] TextEditor: skip painting annotations for disabled text marks Change-Id: Id05bfe5bd120b2bbb2e2b70fb29a99b8c430e459 Reviewed-by: Christian Stenger --- src/plugins/texteditor/texteditor.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index 6bd05f9b2c0..927cf294af3 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -4157,6 +4157,8 @@ void TextEditorWidgetPrivate::updateLineAnnotation(const PaintEventData &data, } for (const TextMark *mark : qAsConst(marks)) { + if (!mark->isVisible()) + continue; boundingRect = QRectF(x, boundingRect.top(), q->viewport()->width() - x, boundingRect.height()); if (boundingRect.isEmpty()) break; From 0f02fd7c8740808a5f87f7197acf17ffda538f32 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Mon, 26 Oct 2020 16:06:55 +0100 Subject: [PATCH 09/48] QmlDesigner: Check if index is positive Task-number: QDS-2999 Change-Id: I61f4aba59124e6b0eeb0089da31631e7f4e59cbf Reviewed-by: Thomas Hartmann --- .../components/listmodeleditor/listmodeleditordialog.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/qmldesigner/components/listmodeleditor/listmodeleditordialog.cpp b/src/plugins/qmldesigner/components/listmodeleditor/listmodeleditordialog.cpp index 0cf73976a84..107a0940ebc 100644 --- a/src/plugins/qmldesigner/components/listmodeleditor/listmodeleditordialog.cpp +++ b/src/plugins/qmldesigner/components/listmodeleditor/listmodeleditordialog.cpp @@ -131,6 +131,9 @@ void ListModelEditorDialog::removeColumns() void ListModelEditorDialog::changeHeader(int column) { + if (column < 0) + return; + const QString propertyName = QString::fromUtf8(m_model->propertyNames()[column]); bool ok; From 43facbe090ecd2bc61f89b5f017d172f6d254c11 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 27 Oct 2020 09:26:06 +0100 Subject: [PATCH 10/48] Revert "cmake build: Disable clangpchmanagerbackend and refactoringbackend" The change breaks the dev package: The imported target "QtCreator::clangrefactoringbackend_lib" references the file "/home/qt/work/build/qtc_build/lib/qtcreator/libclangrefactoringbackend_lib.a" but this file does not exist. This reverts commit 20a620745982368f71ac890dedfde6429d9e4e84. Change-Id: I68f3b6948bde611b9e5b841d1fde2b136877cbfc Reviewed-by: Eike Ziller --- cmake/QtCreatorAPI.cmake | 8 ++------ src/plugins/clangpchmanager/CMakeLists.txt | 3 ++- src/plugins/clangrefactoring/CMakeLists.txt | 3 ++- src/tools/clangpchmanagerbackend/CMakeLists.txt | 1 - src/tools/clangrefactoringbackend/CMakeLists.txt | 1 - 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index 725af7134ef..13d81a0a94b 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -541,7 +541,7 @@ endfunction() function(add_qtc_executable name) cmake_parse_arguments(_arg "SKIP_INSTALL;SKIP_TRANSLATION;ALLOW_ASCII_CASTS" - "DESTINATION;COMPONENT;BUILD_DEFAULT" + "DESTINATION;COMPONENT" "DEPENDS;DEFINES;INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PROPERTIES" ${ARGN}) if ($_arg_UNPARSED_ARGUMENTS) @@ -556,11 +556,7 @@ function(add_qtc_executable name) update_cached_list(__QTC_EXECUTABLES "${name}") string(TOUPPER "BUILD_EXECUTABLE_${name}" _build_executable_var) - if (DEFINED _arg_BUILD_DEFAULT) - set(_build_executable_default ${_arg_BUILD_DEFAULT}) - else() - set(_build_executable_default ${BUILD_EXECUTABLES_BY_DEFAULT}) - endif() + set(_build_executable_default ${BUILD_EXECUTABLES_BY_DEFAULT}) if (DEFINED ENV{QTC_${_build_executable_var}}) set(_build_executable_default "$ENV{QTC_${_build_executable_var}}") endif() diff --git a/src/plugins/clangpchmanager/CMakeLists.txt b/src/plugins/clangpchmanager/CMakeLists.txt index bae46003faf..c1c9b29f93c 100644 --- a/src/plugins/clangpchmanager/CMakeLists.txt +++ b/src/plugins/clangpchmanager/CMakeLists.txt @@ -1,5 +1,6 @@ add_qtc_plugin(ClangPchManager - CONDITION TARGET libclang AND TARGET clangpchmanagerbackend + BUILD_DEFAULT OFF + CONDITION TARGET libclang DEPENDS ClangSupport CPlusPlus DEFINES CLANGPCHMANAGER_LIB PLUGIN_DEPENDS Core CppTools diff --git a/src/plugins/clangrefactoring/CMakeLists.txt b/src/plugins/clangrefactoring/CMakeLists.txt index 6caa24247e0..95c926dc2d0 100644 --- a/src/plugins/clangrefactoring/CMakeLists.txt +++ b/src/plugins/clangrefactoring/CMakeLists.txt @@ -1,5 +1,6 @@ add_qtc_plugin(ClangRefactoring - CONDITION TARGET libclang AND TARGET clangrefactoringbackend + BUILD_DEFAULT OFF + CONDITION TARGET libclang DEPENDS ClangSupport CPlusPlus PLUGIN_DEPENDS Core CppTools TextEditor ClangPchManager SOURCES ${TEST_SOURCES} diff --git a/src/tools/clangpchmanagerbackend/CMakeLists.txt b/src/tools/clangpchmanagerbackend/CMakeLists.txt index cd5fbb72a50..cdbc111bab1 100644 --- a/src/tools/clangpchmanagerbackend/CMakeLists.txt +++ b/src/tools/clangpchmanagerbackend/CMakeLists.txt @@ -1,7 +1,6 @@ add_subdirectory(source) add_qtc_executable(clangpchmanagerbackend - BUILD_DEFAULT OFF DEPENDS clangrefactoringbackend_lib clangpchmanagerbackend_lib Sqlite ClangSupport diff --git a/src/tools/clangrefactoringbackend/CMakeLists.txt b/src/tools/clangrefactoringbackend/CMakeLists.txt index f32a22c25b9..fdf1011cba2 100644 --- a/src/tools/clangrefactoringbackend/CMakeLists.txt +++ b/src/tools/clangrefactoringbackend/CMakeLists.txt @@ -1,7 +1,6 @@ add_subdirectory(source) add_qtc_executable(clangrefactoringbackend - BUILD_DEFAULT OFF DEPENDS clangrefactoringbackend_lib Sqlite ClangSupport SOURCES From d7ab6210afe923e6e9793543d518f262d074d029 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Thu, 1 Oct 2020 14:39:21 +0200 Subject: [PATCH 11/48] ClangTools: Do not show text marks for suppressed diagnostics Do not generate marks for automatic runs and hide them for the explicitly invoked analyzes. Change-Id: Ic48e7b13c424c51e7e1759c588c94bbd45e6d1bb Reviewed-by: Christian Stenger --- .../clangtools/clangtoolsdiagnosticmodel.cpp | 10 +++++++--- .../clangtools/clangtoolsdiagnosticmodel.h | 1 + .../clangtools/documentclangtoolrunner.cpp | 20 +++++++++++++++++++ .../clangtools/documentclangtoolrunner.h | 4 ++++ 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp index ef5c6d974d8..aa4fbede31d 100644 --- a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp +++ b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp @@ -629,8 +629,10 @@ bool DiagnosticFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &s const Diagnostic &diag = diagnosticItem->diagnostic(); // Filtered out? - if (m_filterOptions && !m_filterOptions->checks.contains(diag.name)) + if (m_filterOptions && !m_filterOptions->checks.contains(diag.name)) { + diagnosticItem->textMark()->setVisible(false); return false; + } // Explicitly suppressed? foreach (const SuppressedDiagnostic &d, m_suppressedDiagnostics) { @@ -640,10 +642,12 @@ bool DiagnosticFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &s QFileInfo fi(filePath); if (fi.isRelative()) filePath = m_lastProjectDirectory.toString() + QLatin1Char('/') + filePath; - if (filePath == diag.location.filePath) + if (filePath == diag.location.filePath) { + diagnosticItem->textMark()->setVisible(false); return false; + } } - + diagnosticItem->textMark()->setVisible(true); return true; } diff --git a/src/plugins/clangtools/clangtoolsdiagnosticmodel.h b/src/plugins/clangtools/clangtoolsdiagnosticmodel.h index 695cd088e51..0e21006cab3 100644 --- a/src/plugins/clangtools/clangtoolsdiagnosticmodel.h +++ b/src/plugins/clangtools/clangtoolsdiagnosticmodel.h @@ -74,6 +74,7 @@ public: ~DiagnosticItem() override; const Diagnostic &diagnostic() const { return m_diagnostic; } + TextEditor::TextMark *textMark() { return m_mark; } FixitStatus fixItStatus() const { return m_fixitStatus; } void setFixItStatus(const FixitStatus &status); diff --git a/src/plugins/clangtools/documentclangtoolrunner.cpp b/src/plugins/clangtools/documentclangtoolrunner.cpp index fadac9b8628..9e2b388e5da 100644 --- a/src/plugins/clangtools/documentclangtoolrunner.cpp +++ b/src/plugins/clangtools/documentclangtoolrunner.cpp @@ -194,6 +194,9 @@ void DocumentClangToolRunner::run() const RunSettings &runSettings = projectSettings->useGlobalSettings() ? ClangToolsSettings::instance()->runSettings() : projectSettings->runSettings(); + + m_suppressed = projectSettings->suppressedDiagnostics(); + m_lastProjectDirectory = project->projectDirectory(); m_projectSettingsUpdate = connect(projectSettings.data(), &ClangToolsProjectSettings::changed, this, @@ -293,6 +296,9 @@ void DocumentClangToolRunner::onSuccess() TextEditor::RefactorMarkers markers; for (const Diagnostic &diagnostic : diagnostics) { + if (isSuppressed(diagnostic)) + continue; + auto mark = new DiagnosticMark(diagnostic); mark->source = m_currentRunner->name(); @@ -351,6 +357,20 @@ void DocumentClangToolRunner::cancel() } } +bool DocumentClangToolRunner::isSuppressed(const Diagnostic &diagnostic) const +{ + auto equalsSuppressed = [this, &diagnostic](const SuppressedDiagnostic &suppressed) { + if (suppressed.description != diagnostic.description) + return false; + QString filePath = suppressed.filePath.toString(); + QFileInfo fi(filePath); + if (fi.isRelative()) + filePath = m_lastProjectDirectory.toString() + QLatin1Char('/') + filePath; + return filePath == diagnostic.location.filePath; + }; + return Utils::anyOf(m_suppressed, equalsSuppressed); +} + const CppTools::ClangDiagnosticConfig DocumentClangToolRunner::getDiagnosticConfig(ProjectExplorer::Project *project) { const auto projectSettings = ClangToolsProjectSettings::getSettings(project); diff --git a/src/plugins/clangtools/documentclangtoolrunner.h b/src/plugins/clangtools/documentclangtoolrunner.h index e15ec336551..4cf8f25308e 100644 --- a/src/plugins/clangtools/documentclangtoolrunner.h +++ b/src/plugins/clangtools/documentclangtoolrunner.h @@ -27,6 +27,7 @@ #include "clangfileinfo.h" #include "clangtoolsdiagnostic.h" +#include "clangtoolsprojectsettings.h" #include #include @@ -67,6 +68,7 @@ private: void cancel(); + bool isSuppressed(const Diagnostic &diagnostic) const; const CppTools::ClangDiagnosticConfig getDiagnosticConfig(ProjectExplorer::Project *project); template @@ -82,6 +84,8 @@ private: FileInfo m_fileInfo; QMetaObject::Connection m_projectSettingsUpdate; QSet m_editorsWithMarkers; + SuppressedDiagnosticsList m_suppressed; + Utils::FilePath m_lastProjectDirectory; }; } // namespace Internal From 061a56143c5f71b63e40cc54e109417d2dd6446f Mon Sep 17 00:00:00 2001 From: David Schulz Date: Fri, 23 Oct 2020 13:02:08 +0200 Subject: [PATCH 12/48] ClangTools: show all checks in clazy settings Show all checks if no filter is selected, otherwise checks with no categories will never be visible (qt-keywords). Change-Id: I2809afc050c7da6386a3e01d90c8ea6bcb7cab68 Reviewed-by: Leena Miettinen Reviewed-by: Christian Stenger --- .../analyze/creator-clang-static-analyzer.qdoc | 2 +- src/plugins/clangtools/clazychecks.ui | 2 +- .../clangtools/diagnosticconfigswidget.cpp | 15 ++++----------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc b/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc index 4f1ce5a8bd9..8fe248fa21b 100644 --- a/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc +++ b/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc @@ -188,7 +188,7 @@ \li In the \uicontrol {Topic Filter} field, select a topic to view only checks related to that area in the \uicontrol Checks field. - \li To view all checks again, select \uicontrol {Reset to All}. + \li To view all checks again, select \uicontrol {Reset Filter}. \li To view more information about the checks online, select the \uicontrol {Web Page} links next to them. diff --git a/src/plugins/clangtools/clazychecks.ui b/src/plugins/clangtools/clazychecks.ui index 0818b8d31e8..5704a6c2429 100644 --- a/src/plugins/clangtools/clazychecks.ui +++ b/src/plugins/clangtools/clazychecks.ui @@ -69,7 +69,7 @@ - Reset to All + Reset Filter diff --git a/src/plugins/clangtools/diagnosticconfigswidget.cpp b/src/plugins/clangtools/diagnosticconfigswidget.cpp index 9d076f8e29e..9375e84c21f 100644 --- a/src/plugins/clangtools/diagnosticconfigswidget.cpp +++ b/src/plugins/clangtools/diagnosticconfigswidget.cpp @@ -199,13 +199,6 @@ static bool needsLink(ProjectExplorer::Tree *node) { return !node->isDir && !node->fullPath.toString().startsWith("clang-analyzer-"); } -static void selectAll(QAbstractItemView *view) -{ - view->setSelectionMode(QAbstractItemView::MultiSelection); - view->selectAll(); - view->setSelectionMode(QAbstractItemView::SingleSelection); -} - class BaseChecksTreeModel : public ProjectExplorer::SelectableFilesModel { Q_OBJECT @@ -628,7 +621,7 @@ public: const auto *node = ClazyChecksTree::fromIndex(index); if (node->kind == ClazyChecksTree::CheckNode) { const QStringList topics = node->check.topics; - return Utils::anyOf(m_topics, [topics](const QString &topic) { + return m_topics.isEmpty() || Utils::anyOf(m_topics, [topics](const QString &topic) { return topics.contains(topic); }); } @@ -717,8 +710,9 @@ DiagnosticConfigsWidget::DiagnosticConfigsWidget(const ClangDiagnosticConfigs &c topicsModel->sort(0); m_clazyChecks->topicsView->setModel(topicsModel); connect(m_clazyChecks->topicsResetButton, &QPushButton::clicked, [this](){ - selectAll(m_clazyChecks->topicsView); + m_clazyChecks->topicsView->clearSelection(); }); + m_clazyChecks->topicsView->setSelectionMode(QAbstractItemView::MultiSelection); connect(m_clazyChecks->topicsView->selectionModel(), &QItemSelectionModel::selectionChanged, [this, topicsModel](const QItemSelection &, const QItemSelection &) { @@ -731,7 +725,6 @@ DiagnosticConfigsWidget::DiagnosticConfigsWidget(const ClangDiagnosticConfigs &c this->syncClazyChecksGroupBox(); }); - selectAll(m_clazyChecks->topicsView); connect(m_clazyChecks->checksView, &QTreeView::clicked, [model = m_clazySortFilterProxyModel](const QModelIndex &index) { @@ -866,7 +859,7 @@ void DiagnosticConfigsWidget::syncClazyWidgets(const ClangDiagnosticConfig &conf const bool enabled = !config.isReadOnly(); m_clazyChecks->topicsResetButton->setEnabled(enabled); m_clazyChecks->enableLowerLevelsCheckBox->setEnabled(enabled); - selectAll(m_clazyChecks->topicsView); + m_clazyChecks->topicsView->clearSelection(); m_clazyChecks->topicsView->setEnabled(enabled); m_clazyTreeModel->setEnabled(enabled); From 9d3c156fd322b6405ab3188b40d7a32af23ec809 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Fri, 23 Oct 2020 16:26:49 +0300 Subject: [PATCH 13/48] Android: fix parsing Andorid Abis for Qt 6 Amends 4946677df48f74e029df11cacaeba2a2cc53ae69, to allow parsing the correct supported Abis from qmake. Fixes: QTCREATORBUG-24828 Change-Id: I20f8cbf5c0f1bcdf3debb0d9b5c47fa77de163ab Reviewed-by: Alessandro Portale --- src/plugins/android/androidqtversion.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp index 2f306671eb3..a5da746ccf8 100644 --- a/src/plugins/android/androidqtversion.cpp +++ b/src/plugins/android/androidqtversion.cpp @@ -171,9 +171,8 @@ int AndroidQtVersion::minimumNDK() const void AndroidQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const { - if (supportsMultipleQtAbis()) - m_androidAbis = evaluator->values("ALL_ANDROID_ABIS"); - else + m_androidAbis = evaluator->values("ALL_ANDROID_ABIS"); + if (m_androidAbis.isEmpty()) m_androidAbis = QStringList{evaluator->value("ANDROID_TARGET_ARCH")}; const QString androidPlatform = evaluator->value("ANDROID_PLATFORM"); if (!androidPlatform.isEmpty()) { From 9c0544c3863da962d07209d823c387066596da1c Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 21 Sep 2020 11:56:18 +0200 Subject: [PATCH 14/48] Doc: List all licenses applied to KSyntaxHighlighting Added license files. Fixes: QTCREATORBUG-24618 Change-Id: Ibeeb69f9f072d2c11e0c7a3839bd760986807dd8 Reviewed-by: David Schulz Reviewed-by: Kai Koehne --- .../overview/creator-acknowledgements.qdoc | 316 +++++++- .../src/overview/license-mit.qdocinc | 22 + .../data/syntax/licenses/LICENSE.GPLv2 | 282 ++++++++ .../data/syntax/licenses/LICENSE.GPLv3 | 674 ++++++++++++++++++ .../data/syntax/licenses/LICENSE.LGPLv21 | 504 +++++++++++++ .../data/syntax/licenses/LICENSE.LGPLv3 | 163 +++++ 6 files changed, 1923 insertions(+), 38 deletions(-) create mode 100644 doc/qtcreator/src/overview/license-mit.qdocinc create mode 100644 src/libs/3rdparty/syntax-highlighting/data/syntax/licenses/LICENSE.GPLv2 create mode 100644 src/libs/3rdparty/syntax-highlighting/data/syntax/licenses/LICENSE.GPLv3 create mode 100644 src/libs/3rdparty/syntax-highlighting/data/syntax/licenses/LICENSE.LGPLv21 create mode 100644 src/libs/3rdparty/syntax-highlighting/data/syntax/licenses/LICENSE.LGPLv3 diff --git a/doc/qtcreator/src/overview/creator-acknowledgements.qdoc b/doc/qtcreator/src/overview/creator-acknowledgements.qdoc index a49a2540282..9a02f948692 100644 --- a/doc/qtcreator/src/overview/creator-acknowledgements.qdoc +++ b/doc/qtcreator/src/overview/creator-acknowledgements.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -58,23 +58,7 @@ Copyright (c) 2008-2015 Jesse Beder. - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. + \include license-mit.qdocinc \li \b{Syntax highlighting engine for Kate syntax definitions} @@ -83,29 +67,285 @@ text rendering (e.g. as HTML), supporting both integration with a custom editor as well as a ready-to-use QSyntaxHighlighter sub-class. - Distributed under the: - \badcode - MIT License + The following files are part of KDE's kate project, kdelibs/kate: - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: + \list + \li \b alert.xml - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. + Author: Dominik Haumann (dhaumann@kde.org). - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - \endcode + Distributed under the MIT license. + + \include license-mit.qdocinc + + \li \b bash.xml + + Copyright (c) 2004 by Wilbert Berendsen (wilbert@kde.nl). + + Changes by: Matthew Woehlke (mw_triad@users.sourceforge.net), + Sebastian Pipping (webmaster@hartwork.org), and + Luiz Angelo Daros de Luca (luizluca@gmail.com). + + Released under the \l{https://www.gnu.org/licenses/lgpl-2.1.html} + {GNU Lesser General Public License Version 2.1 (LGPLv2.1)}. + + \li \b cmake.xml + + Copyright 2004 Alexander Neundorf (neundorf@kde.org). + + Copyright 2005 Dominik Haumann (dhdev@gmx.de). + + Copyright 2007,2008,2013,2014 Matthew Woehlke (mw_triad@users.sourceforge.net). + + Copyright 2013-2015,2017-2020 Alex Turbov (i.zaufi@gmail.com). + + Released under the \l{https://www.gnu.org/licenses/lgpl-2.1.html} + {GNU Lesser General Public License Version 2.1 (LGPLv2.1)} or later. + + \badcode + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + \endcode + + \li \b css.xml + + Author: Wilbert Berendsen (wilbert@kde.nl). + + Changes: + Version 7 and 8 by Jonathan Poelen, + Version 2.13 and 4 by Guo Yunhe (guoyunhebrave@gmail.com), + Version 2.08 by Joseph Wenninger, + Version 2.06 by Mte90, + Version 2.03 by Milian Wolff. + + Released under the \l{https://www.gnu.org/licenses/lgpl-2.1.html} + {GNU Lesser General Public License Version 2.1 (LGPLv2.1)}. + + \li \b doxygen.xml + + Author: Dominik Haumann (dhaumann@kde.org). + + Distributed under the MIT license. + + \include license-mit.qdocinc + + \li \b dtd.xml + + Author: Andriy Lesyuk (s-andy@in.if.ua). + + Released under the \l{https://www.gnu.org/licenses/lgpl-2.1.html} + {GNU Lesser General Public License Version 2.1 (LGPLv2.1)}. + + \li \b html.xml + + Author: Wilbert Berendsen (wilbert@kde.nl). + + Released under the \l{https://www.gnu.org/licenses/lgpl-2.1.html} + {GNU Lesser General Public License Version 2.1 (LGPLv2.1)}. + + \li \b ini.xml + + Author: Jan Janssen (medhefgo@web.de). + + Released under the \l{https://www.gnu.org/licenses/lgpl-2.1.html} + {GNU Lesser General Public License Version 2.1 (LGPLv2.1)}. + + \li \b java.xml + + Author: Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br). + + Released under the \l{https://www.gnu.org/licenses/lgpl-2.1.html} + {GNU Lesser General Public License Version 2.1 (LGPLv2.1)}. + + \li \b javadoc.xml + + Author: Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br). + + Released under the \l{https://www.gnu.org/licenses/lgpl-2.1.html} + {GNU Lesser General Public License Version 2.1 (LGPLv2.1)}. + + \li \b json.xml + + Author: Sebastian Pipping (sebastian@pipping.org). + + Released under the \l{https://www.gnu.org/licenses/gpl-3.0.html} + {GNU General Public License Version 3 (GPLv3)} or later. + + \li \b makefile.xml + + Author: v0.9 by Per Wigren (wigren@home.se). + + Changes: Joseph Wenninger (jowenn@kde.org), + Rui Santana (santana.rui@gmail.com), + v2.0 by Andreas Nordal (andreas.nordal@gmail.com), + v2.1 by Alex Turbov (i.zaufi@gmail.com), + v4 by Alex Richardson (arichardson.kde@gmail.com). + + \li \b markdown.xml + + Copyright 2008 Darrin Yeager (http://www.dyeager.org/). + + Dual-licensed under both the \l{https://www.gnu.org/licenses/gpl-2.0.html} + {GNU General Public License Version 2 (GPLv2)} BSD licenses. + + Extended 2009 Claes Holmerson (http://github.com/claes/kate-markdown/). + + Extended 2019 Nibaldo Gonz\unicode{0x00E1}lez S. (nibgonz@gmail.com). + Changes under MIT license. + + \badcode + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + \endcode + + \include license-mit.qdocinc + + \li \b modelines.xml + + Author: Alex Turbov (i.zaufi@gmail.com). + + Distributed under the MIT license. + + \include license-mit.qdocinc + + \li \b perl.xml + + Copyright (C) 2001, 2002, 2003, 2004 Anders Lund (anders@alweb.dk). + + \badcode + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + \endcode + + \li \b perl6.xml + + Author: Jonathan Poelen (jonathan.poelen@gmail.com). + + Distributed under the MIT license. + + \include license-mit.qdocinc + + \li \b powershell.xml + + Authors: Motoki Kashihara (motoki8791@gmail.com), + Michael Lombardi (Michael.T.Lombardi@outlook.com). + + Distributed under the MIT license. + + \include license-mit.qdocinc + + \li \b python.xml + + Author: Michael Bueker + + Changes: v0.9 by Per Wigren, + v1.9 by Michael Bueker, + v1.97 by Paul Giannaros, + v1.99 by Primoz Anzur, + v2.01 by Paul Giannaros. + + \li \b qdocconf.xml + + Author: Volker Krause (vkrause@kde.org). + + Distributed under the MIT license. + + \include license-mit.qdocinc + + \li \b ruby.xml + + Copyright (C) 2004 by Sebastian Vuorinen (sebastian dot vuorinen at helsinki dot fi). + + Copyright (C) 2004 by Stefan Lang (langstefan@gmx.at). + + Copyright (C) 2008 by Robin Pedersen (robinpeder@gmail.com). + + Copyright (C) 2011 by Miquel Sabat\unicode{0xe9} (mikisabate@gmail.com). + + \badcode + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + \endcode + + \li \b valgrind-suppression.xml + + Author: Milian Wolff (mail@milianw.de). + + Released under the \l{https://www.gnu.org/licenses/lgpl-2.1.html} + {GNU Lesser General Public License Version 2.1 (LGPLv2.1)}. + + \li \b xml.xml + + Author: Wilbert Berendsen (wilbert@kde.nl). + + Released under the \l{https://www.gnu.org/licenses/lgpl-2.1.html} + {GNU Lesser General Public License Version 2.1 (LGPLv2.1)}. + + \li \b yacc.xml + + YACC.XML supports syntax highlighting for Yacc/Bison source under Kate. + + Copyright (C) 2004, Jan Villat (jan.villat@net2000.ch). + + Changes by: Nibaldo Gonz\unicode{0x00E1}lez (nibgonz@gmail.com), + Sebastian Pipping (webmaster@hartwork.org). + + Released under the \l{https://www.gnu.org/licenses/lgpl-2.1.html} + {GNU Lesser General Public License Version 2.1 (LGPLv2.1)}. + + \endlist The source code of KSyntaxHighlighting can be found here: diff --git a/doc/qtcreator/src/overview/license-mit.qdocinc b/doc/qtcreator/src/overview/license-mit.qdocinc new file mode 100644 index 00000000000..0f563093e60 --- /dev/null +++ b/doc/qtcreator/src/overview/license-mit.qdocinc @@ -0,0 +1,22 @@ + \badcode + MIT License + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + \endcode diff --git a/src/libs/3rdparty/syntax-highlighting/data/syntax/licenses/LICENSE.GPLv2 b/src/libs/3rdparty/syntax-highlighting/data/syntax/licenses/LICENSE.GPLv2 new file mode 100644 index 00000000000..b9033aeae64 --- /dev/null +++ b/src/libs/3rdparty/syntax-highlighting/data/syntax/licenses/LICENSE.GPLv2 @@ -0,0 +1,282 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your freedom +to share and change it. By contrast, the GNU General Public License is +intended to guarantee your freedom to share and change free software +--to make sure the software is free for all its users. This General +Public License applies to most of the Free Software Foundation's +software and to any other program whose authors commit to using it. +(Some other Free Software Foundation software is covered by the GNU +Lesser General Public License instead.) You can apply it to your +programs, too. + +When we speak of free software, we are referring to freedom, not price. +Our General Public Licenses are designed to make sure that you have the +freedom to distribute copies of free software (and charge for this +service if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone +to deny you these rights or to ask you to surrender the rights. These +restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis + or for a fee, you must give the recipients all the rights that you +have. You must make sure that they, too, receive or can get the source +code. And you must show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + +Finally, any free program is threatened constantly by software patents. +We wish to avoid the danger that redistributors of a free program will +individually obtain patent licenses, in effect making the program +proprietary. To prevent this, we have made it clear that any patent +must be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and +modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a +notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of running +the Program is not restricted, and the output from the Program is +covered only if its contents constitute a work based on the Program +(independent of having been made by running the Program). Whether that +is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source +code as you receive it, in any medium, provided that you conspicuously +and appropriately publish on each copy an appropriate copyright notice +and disclaimer of warranty; keep intact all the notices that refer to +this License and to the absence of any warranty; and give any other +recipients of the Program a copy of this License along with the +Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of +it, thus forming a work based on the Program, and copy and distribute +such modifications or work under the terms of Section 1 above, provided +that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but does + not normally print such an announcement, your work based on the + Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of a +storage or distribution medium does not bring the other work under the +scope of this License. + +3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software + interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your cost + of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to control +compilation and installation of the executable. However, as a special +exception, the source code distributed need not include anything that +is normally distributed (in either source or binary form) with the +major components (compiler, kernel, and so on) of the operating system +on which the executable runs, unless that component itself accompanies +the executable. + +If distribution of executable or object code is made by offering access +to copy from a designated place, then offering equivalent access to +copy the source code from the same place counts as distribution of the +source code, even though third parties are not compelled to copy the +source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt otherwise +to copy, modify, sublicense or distribute the Program is void, and will +automatically terminate your rights under this License. However, +parties who have received copies, or rights, from you under this License +will not have their licenses terminated so long as such parties remain +in full compliance. + +5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further restrictions +on the recipients' exercise of the rights granted herein. You are not +responsible for enforcing compliance by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent license +would not permit royalty-free redistribution of the Program by all +those who receive copies directly or indirectly through you, then the +only way you could satisfy both it and this License would be to refrain +entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License may +add an explicit geographical distribution limitation excluding those +countries, so that distribution is permitted only in or among countries +not thus excluded. In such case, this License incorporates the limitation +as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail +to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Program does not specify a version +number of this License, you may choose any version ever published by +the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the +author to ask for permission. For software which is copyrighted by +the Free Software Foundation, write to the Free Software Foundation; +we sometimes make exceptions for this. Our decision will be guided by +the two goals of preserving the free status of all derivatives of our +free software and of promoting the sharing and reuse of software +generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, +EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE +ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH +YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL +NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY +MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE +TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + +END OF TERMS AND CONDITIONS diff --git a/src/libs/3rdparty/syntax-highlighting/data/syntax/licenses/LICENSE.GPLv3 b/src/libs/3rdparty/syntax-highlighting/data/syntax/licenses/LICENSE.GPLv3 new file mode 100644 index 00000000000..94a9ed024d3 --- /dev/null +++ b/src/libs/3rdparty/syntax-highlighting/data/syntax/licenses/LICENSE.GPLv3 @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/src/libs/3rdparty/syntax-highlighting/data/syntax/licenses/LICENSE.LGPLv21 b/src/libs/3rdparty/syntax-highlighting/data/syntax/licenses/LICENSE.LGPLv21 new file mode 100644 index 00000000000..ec3ce5f2b05 --- /dev/null +++ b/src/libs/3rdparty/syntax-highlighting/data/syntax/licenses/LICENSE.LGPLv21 @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/src/libs/3rdparty/syntax-highlighting/data/syntax/licenses/LICENSE.LGPLv3 b/src/libs/3rdparty/syntax-highlighting/data/syntax/licenses/LICENSE.LGPLv3 new file mode 100644 index 00000000000..eb332415518 --- /dev/null +++ b/src/libs/3rdparty/syntax-highlighting/data/syntax/licenses/LICENSE.LGPLv3 @@ -0,0 +1,163 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright © 2007 Free Software Foundation, Inc. +Everyone is permitted to copy and distribute verbatim copies of this +licensedocument, but changing it is not allowed. + +This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + +0. Additional Definitions. + + As used herein, “this License” refers to version 3 of the GNU Lesser +General Public License, and the “GNU GPL” refers to version 3 of the +GNU General Public License. + + “The Library” refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An “Application” is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A “Combined Work” is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the “Linked +Version”. + + The “Minimal Corresponding Source” for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The “Corresponding Application Code” for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + +1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + +2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort + to ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + +3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this + license document. + +4. Combined Works. + + You may convey a Combined Work under terms of your choice that, taken +together, effectively do not restrict modification of the portions of +the Library contained in the Combined Work and reverse engineering for +debugging such modifications, if you also do each of the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this + license document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of + this License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with + the Library. A suitable mechanism is one that (a) uses at run + time a copy of the Library already present on the user's + computer system, and (b) will operate properly with a modified + version of the Library that is interface-compatible with the + Linked Version. + + e) Provide Installation Information, but only if you would + otherwise be required to provide such information under section 6 + of the GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the Application + with a modified version of the Linked Version. (If you use option + 4d0, the Installation Information must accompany the Minimal + Corresponding Source and Corresponding Application Code. If you + use option 4d1, you must provide the Installation Information in + the manner specified by section 6 of the GNU GPL for conveying + Corresponding Source.) + +5. Combined Libraries. + + You may place library facilities that are a work based on the Library +side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities, conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of + it is a work based on the Library, and explaining where to find + the accompanying uncombined form of the same work. + +6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +as you received it specifies that a certain numbered version of the +GNU Lesser General Public License “or any later version” applies to +it, you have the option of following the terms and conditions either +of that published version or of any later version published by the +Free Software Foundation. If the Library as you received it does not +specify a version number of the GNU Lesser General Public License, +you may choose any version of the GNU Lesser General Public License +ever published by the Free Software Foundation. + +If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the Library. + From 2b32b2e4400c58f464fa44375adc819b4d5a0fd7 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 23 Oct 2020 16:37:59 +0200 Subject: [PATCH 15/48] clangbackend: Provide highlighting for structured bindings These are reported by libclang as "unexposed declarations". Fixes: QTCREATORBUG-24769 Change-Id: I7a74b707f4203becabaa74b90758a7b396ee23bd Reviewed-by: Christian Stenger --- src/tools/clangbackend/source/tokeninfo.cpp | 1 + tests/unit/unittest/data/highlightingmarks.cpp | 5 +++++ tests/unit/unittest/tokenprocessor-test.cpp | 8 ++++++++ 3 files changed, 14 insertions(+) diff --git a/src/tools/clangbackend/source/tokeninfo.cpp b/src/tools/clangbackend/source/tokeninfo.cpp index 47b8188986c..6b2e56c8ac1 100644 --- a/src/tools/clangbackend/source/tokeninfo.cpp +++ b/src/tools/clangbackend/source/tokeninfo.cpp @@ -374,6 +374,7 @@ void TokenInfo::identifierKind(const Cursor &cursor, Recursion recursion) case CXCursor_ParmDecl: case CXCursor_VarDecl: case CXCursor_VariableRef: + case CXCursor_UnexposedDecl: // structured bindings; see https://reviews.llvm.org/D78213 variableKind(cursor.referenced()); break; case CXCursor_DeclRefExpr: diff --git a/tests/unit/unittest/data/highlightingmarks.cpp b/tests/unit/unittest/data/highlightingmarks.cpp index 33dfbe91dec..346071dea15 100644 --- a/tests/unit/unittest/data/highlightingmarks.cpp +++ b/tests/unit/unittest/data/highlightingmarks.cpp @@ -731,3 +731,8 @@ class Property { ) }; + +void structuredBindingTest() { + const int a[] = {1, 2}; + const auto [x, y] = a; +} diff --git a/tests/unit/unittest/tokenprocessor-test.cpp b/tests/unit/unittest/tokenprocessor-test.cpp index f74fb0dbedd..62a84af59d0 100644 --- a/tests/unit/unittest/tokenprocessor-test.cpp +++ b/tests/unit/unittest/tokenprocessor-test.cpp @@ -1759,6 +1759,14 @@ TEST_F(TokenProcessor, TemplateAlias) ASSERT_THAT(infos[0], HasTwoTypes(HighlightingType::Type, HighlightingType::TypeAlias)); } +TEST_F(TokenProcessor, StructuredBinding) +{ + const auto infos = translationUnit.tokenInfosInRange(sourceRange(737, 23)); + + ASSERT_THAT(infos[3], IsHighlightingMark(737u, 17u, 1u, HighlightingType::LocalVariable)); + ASSERT_THAT(infos[5], IsHighlightingMark(737u, 20u, 1u, HighlightingType::LocalVariable)); +} + Data *TokenProcessor::d; void TokenProcessor::SetUpTestCase() From eef708192e340551c37a7307085c77fa326a0a78 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Mon, 26 Oct 2020 18:59:45 +0100 Subject: [PATCH 16/48] SSH: Use Utils::PathChooser::browseButtonLabel() for button We have not used this yet to avoid depending on Utils. Now that the depedency is there anyway, we can use this simplification. Change-Id: Ic3ff8174aaebc4da289daf1ab4331a10536cdf98 Reviewed-by: Eike Ziller Reviewed-by: Leena Miettinen Reviewed-by: Christian Kandeler --- src/libs/ssh/sshkeycreationdialog.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/libs/ssh/sshkeycreationdialog.cpp b/src/libs/ssh/sshkeycreationdialog.cpp index 9c4fe8db2b2..538315850a7 100644 --- a/src/libs/ssh/sshkeycreationdialog.cpp +++ b/src/libs/ssh/sshkeycreationdialog.cpp @@ -29,6 +29,7 @@ #include "sshsettings.h" #include +#include #include #include @@ -45,12 +46,7 @@ SshKeyCreationDialog::SshKeyCreationDialog(QWidget *parent) : QDialog(parent), m_ui(new Ui::SshKeyCreationDialog) { m_ui->setupUi(this); - // Not using Utils::PathChooser::browseButtonLabel to avoid dependency -#ifdef Q_OS_MAC - m_ui->privateKeyFileButton->setText(tr("Choose...")); -#else - m_ui->privateKeyFileButton->setText(tr("Browse...")); -#endif + m_ui->privateKeyFileButton->setText(Utils::PathChooser::browseButtonLabel()); const QString defaultPath = QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + QLatin1String("/.ssh/qtc_id"); setPrivateKeyFile(defaultPath); From 0ebb004d8510b9c28fd0faab4f5ba53c490c28bd Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 27 Oct 2020 11:07:50 +0100 Subject: [PATCH 17/48] CppEditor: Make "Complete Switch" quickfix work with enum classes Fixes: QTCREATORBUG-20475 Change-Id: Id21a007ab4b652dcfe49d97bfa4c9fa77bacf8c4 Reviewed-by: Christian Stenger --- src/plugins/cppeditor/cppquickfix_test.cpp | 249 +++++++++++++++++++++ src/plugins/cppeditor/cppquickfixes.cpp | 7 +- 2 files changed, 255 insertions(+), 1 deletion(-) diff --git a/src/plugins/cppeditor/cppquickfix_test.cpp b/src/plugins/cppeditor/cppquickfix_test.cpp index e5257df4c0c..b45fe7e911e 100644 --- a/src/plugins/cppeditor/cppquickfix_test.cpp +++ b/src/plugins/cppeditor/cppquickfix_test.cpp @@ -373,6 +373,32 @@ void CppEditorPlugin::test_quickfix_data() "}\n" ); + // Same as above for enum class. + QTest::newRow("CompleteSwitchCaseStatement_basic1_enum class") + << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _( + "enum class EnumType { V1, V2 };\n" + "\n" + "void f()\n" + "{\n" + " EnumType t;\n" + " @switch (t) {\n" + " }\n" + "}\n" + ) << _( + "enum class EnumType { V1, V2 };\n" + "\n" + "void f()\n" + "{\n" + " EnumType t;\n" + " switch (t) {\n" + " case EnumType::V1:\n" + " break;\n" + " case EnumType::V2:\n" + " break;\n" + " }\n" + "}\n" + ); + // Checks: All enum values are added as case statements for a blank switch when // the variable is declared alongside the enum definition. QTest::newRow("CompleteSwitchCaseStatement_basic1_enum_with_declaration") @@ -398,6 +424,30 @@ void CppEditorPlugin::test_quickfix_data() "}\n" ); + // Same as above for enum class. + QTest::newRow("CompleteSwitchCaseStatement_basic1_enum_with_declaration_enumClass") + << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _( + "enum class EnumType { V1, V2 } t;\n" + "\n" + "void f()\n" + "{\n" + " @switch (t) {\n" + " }\n" + "}\n" + ) << _( + "enum class EnumType { V1, V2 } t;\n" + "\n" + "void f()\n" + "{\n" + " switch (t) {\n" + " case EnumType::V1:\n" + " break;\n" + " case EnumType::V2:\n" + " break;\n" + " }\n" + "}\n" + ); + // Checks: All enum values are added as case statements for a blank switch // for anonymous enums. QTest::newRow("CompleteSwitchCaseStatement_basic1_anonymous_enum") @@ -453,6 +503,36 @@ void CppEditorPlugin::test_quickfix_data() "}\n" ); + // Same as above for enum class. + QTest::newRow("CompleteSwitchCaseStatement_basic2_enumClass") + << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _( + "enum class EnumType { V1, V2 };\n" + "\n" + "void f()\n" + "{\n" + " EnumType t;\n" + " @switch (t) {\n" + " default:\n" + " break;\n" + " }\n" + "}\n" + ) << _( + "enum class EnumType { V1, V2 };\n" + "\n" + "void f()\n" + "{\n" + " EnumType t;\n" + " switch (t) {\n" + " case EnumType::V1:\n" + " break;\n" + " case EnumType::V2:\n" + " break;\n" + " default:\n" + " break;\n" + " }\n" + "}\n" + ); + // Checks: Enum type in class is found. QTest::newRow("CompleteSwitchCaseStatement_enumTypeInClass") << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _( @@ -475,6 +555,28 @@ void CppEditorPlugin::test_quickfix_data() "}\n" ); + // Same as above for enum class. + QTest::newRow("CompleteSwitchCaseStatement_enumClassInClass") + << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _( + "struct C { enum class EnumType { V1, V2 }; };\n" + "\n" + "void f(C::EnumType t) {\n" + " @switch (t) {\n" + " }\n" + "}\n" + ) << _( + "struct C { enum class EnumType { V1, V2 }; };\n" + "\n" + "void f(C::EnumType t) {\n" + " switch (t) {\n" + " case C::EnumType::V1:\n" + " break;\n" + " case C::EnumType::V2:\n" + " break;\n" + " }\n" + "}\n" + ); + // Checks: Enum type in namespace is found. QTest::newRow("CompleteSwitchCaseStatement_enumTypeInNamespace") << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _( @@ -497,6 +599,28 @@ void CppEditorPlugin::test_quickfix_data() "}\n" ); + // Same as above for enum class. + QTest::newRow("CompleteSwitchCaseStatement_enumClassInNamespace") + << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _( + "namespace N { enum class EnumType { V1, V2 }; };\n" + "\n" + "void f(N::EnumType t) {\n" + " @switch (t) {\n" + " }\n" + "}\n" + ) << _( + "namespace N { enum class EnumType { V1, V2 }; };\n" + "\n" + "void f(N::EnumType t) {\n" + " switch (t) {\n" + " case N::EnumType::V1:\n" + " break;\n" + " case N::EnumType::V2:\n" + " break;\n" + " }\n" + "}\n" + ); + // Checks: The missing enum value is added. QTest::newRow("CompleteSwitchCaseStatement_oneValueMissing") << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _( @@ -529,6 +653,38 @@ void CppEditorPlugin::test_quickfix_data() "}\n" ); + // Checks: Same as above for enum class. + QTest::newRow("CompleteSwitchCaseStatement_oneValueMissing_enumClass") + << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _( + "enum class EnumType { V1, V2 };\n" + "\n" + "void f()\n" + "{\n" + " EnumType t;\n" + " @switch (t) {\n" + " case EnumType::V2:\n" + " break;\n" + " default:\n" + " break;\n" + " }\n" + "}\n" + ) << _( + "enum class EnumType { V1, V2 };\n" + "\n" + "void f()\n" + "{\n" + " EnumType t;\n" + " switch (t) {\n" + " case EnumType::V1:\n" + " break;\n" + " case EnumType::V2:\n" + " break;\n" + " default:\n" + " break;\n" + " }\n" + "}\n" + ); + // Checks: Find the correct enum type despite there being a declaration with the same name. QTest::newRow("CompleteSwitchCaseStatement_QTCREATORBUG10366_1") << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _( @@ -553,6 +709,30 @@ void CppEditorPlugin::test_quickfix_data() "}\n" ); + // Same as above for enum class. + QTest::newRow("CompleteSwitchCaseStatement_QTCREATORBUG10366_1_enumClass") + << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _( + "enum class test { TEST_1, TEST_2 };\n" + "\n" + "void f() {\n" + " enum test test;\n" + " @switch (test) {\n" + " }\n" + "}\n" + ) << _( + "enum class test { TEST_1, TEST_2 };\n" + "\n" + "void f() {\n" + " enum test test;\n" + " switch (test) {\n" + " case test::TEST_1:\n" + " break;\n" + " case test::TEST_2:\n" + " break;\n" + " }\n" + "}\n" + ); + // Checks: Find the correct enum type despite there being a declaration with the same name. QTest::newRow("CompleteSwitchCaseStatement_QTCREATORBUG10366_2") << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _( @@ -581,6 +761,34 @@ void CppEditorPlugin::test_quickfix_data() "}\n" ); + // Same as above for enum class. + QTest::newRow("CompleteSwitchCaseStatement_QTCREATORBUG10366_2_enumClass") + << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _( + "enum class test1 { Wrong11, Wrong12 };\n" + "enum class test { Right1, Right2 };\n" + "enum class test2 { Wrong21, Wrong22 };\n" + "\n" + "int main() {\n" + " enum test test;\n" + " @switch (test) {\n" + " }\n" + "}\n" + ) << _( + "enum class test1 { Wrong11, Wrong12 };\n" + "enum class test { Right1, Right2 };\n" + "enum class test2 { Wrong21, Wrong22 };\n" + "\n" + "int main() {\n" + " enum test test;\n" + " switch (test) {\n" + " case test::Right1:\n" + " break;\n" + " case test::Right2:\n" + " break;\n" + " }\n" + "}\n" + ); + // Checks: Do not crash on incomplete case statetement. QTest::newRow("CompleteSwitchCaseStatement_doNotCrashOnIncompleteCase") << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _( @@ -596,6 +804,21 @@ void CppEditorPlugin::test_quickfix_data() "" ); + // Same as above for enum class. + QTest::newRow("CompleteSwitchCaseStatement_doNotCrashOnIncompleteCase_enumClass") + << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _( + "enum class E {};\n" + "void f(E o)\n" + "{\n" + " @switch (o)\n" + " {\n" + " case\n" + " }\n" + "}\n" + ) << _( + "" + ); + // Checks: complete switch statement where enum is goes via a template type parameter QTest::newRow("CompleteSwitchCaseStatement_QTCREATORBUG-24752") << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _( @@ -622,6 +845,32 @@ void CppEditorPlugin::test_quickfix_data() "}\n" ); + // Same as above for enum class. + QTest::newRow("CompleteSwitchCaseStatement_QTCREATORBUG-24752_enumClass") + << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _( + "enum class E {A, B};\n" + "template struct S {\n" + " static T theType() { return T(); }\n" + "};\n" + "int main() {\n" + " @switch (S::theType()) {\n" + " }\n" + "}\n" + ) << _( + "enum class E {A, B};\n" + "template struct S {\n" + " static T theType() { return T(); }\n" + "};\n" + "int main() {\n" + " switch (S::theType()) {\n" + " case E::A:\n" + " break;\n" + " case E::B:\n" + " break;\n" + " }\n" + "}\n" + ); + // Checks: // 1. If the name does not start with ("m_" or "_") and does not // end with "_", we are forced to prefix the getter with "get". diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp index 2265d2ea5c7..a59f2c18f2d 100644 --- a/src/plugins/cppeditor/cppquickfixes.cpp +++ b/src/plugins/cppeditor/cppquickfixes.cpp @@ -2740,7 +2740,12 @@ static Enum *findEnum(const QList &results, const LookupContext &ctx return e; if (const NamedType *namedType = type->asNamedType()) { if (ClassOrNamespace *con = ctxt.lookupType(namedType->name(), result.scope())) { - const QList enums = con->unscopedEnums(); + QList enums = con->unscopedEnums(); + const QList symbols = con->symbols(); + for (Symbol * const s : symbols) { + if (const auto e = s->asEnum()) + enums << e; + } const Name *referenceName = namedType->name(); if (const QualifiedNameId *qualifiedName = referenceName->asQualifiedNameId()) referenceName = qualifiedName->name(); From 7ae976a8b9dbb6c0105526f23541baa6823973b6 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 27 Oct 2020 09:25:05 +0100 Subject: [PATCH 18/48] cmake build: Use qtc_add_resources for StudioWelcome Avoids creating resource file if plugin is disabled. Change-Id: Ia3e1a127c49cae4b03547367a78ca7dd8c3689f3 Reviewed-by: Alessandro Portale --- cmake/QtCreatorAPI.cmake | 13 ------------- src/plugins/studiowelcome/CMakeLists.txt | 17 ++++++++--------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index 13d81a0a94b..ccba5909d3f 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -774,19 +774,6 @@ function(finalize_qtc_gtest test_name exclude_sources_regex) endforeach() endfunction() -# This is the CMake equivalent of "RESOURCES = $$files()" from qmake -function(qtc_glob_resources) - cmake_parse_arguments(_arg "" "QRC_FILE;ROOT;GLOB" "" ${ARGN}) - - file(GLOB_RECURSE fileList RELATIVE "${_arg_ROOT}" "${_arg_ROOT}/${_arg_GLOB}") - set(qrcData "\n") - foreach(file IN LISTS fileList) - string(APPEND qrcData " ${_arg_ROOT}/${file}\n") - endforeach() - string(APPEND qrcData "") - file(WRITE "${_arg_QRC_FILE}" "${qrcData}") -endfunction() - function(qtc_copy_to_builddir custom_target_name) cmake_parse_arguments(_arg "CREATE_SUBDIRS" "DESTINATION" "FILES;DIRECTORIES" ${ARGN}) set(timestampFiles) diff --git a/src/plugins/studiowelcome/CMakeLists.txt b/src/plugins/studiowelcome/CMakeLists.txt index c82b4fa2361..b04caf2a6d4 100644 --- a/src/plugins/studiowelcome/CMakeLists.txt +++ b/src/plugins/studiowelcome/CMakeLists.txt @@ -1,11 +1,3 @@ -set(qmlQrcFile "${CMAKE_CURRENT_BINARY_DIR}/StudioWelcome_qml.qrc") - -qtc_glob_resources( - QRC_FILE "${qmlQrcFile}" - ROOT "${CMAKE_CURRENT_SOURCE_DIR}" - GLOB "qml/*" -) - add_qtc_plugin(StudioWelcome DEPENDS Qt5::QuickWidgets PLUGIN_DEPENDS Core ProjectExplorer QtSupport @@ -14,8 +6,15 @@ add_qtc_plugin(StudioWelcome studiowelcomeplugin.cpp studiowelcomeplugin.h studiowelcome_global.h studiowelcome.qrc - ${qmlQrcFile} "${PROJECT_SOURCE_DIR}/src/share/3rdparty/studiofonts/studiofonts.qrc" EXTRA_TRANSLATIONS qml ) + +if (TARGET StudioWelcome) + file(GLOB_RECURSE qmlfiles + RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" + qml/* + ) + qtc_add_resources(StudioWelcome StudioWelcome_qml FILES ${qmlfiles}) +endif() From 2bc736a4f757d99e31da5a43df7a05e9c821075e Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Mon, 26 Oct 2020 12:04:16 +0100 Subject: [PATCH 19/48] Git: Do not refresh branch view when hidden Change-Id: Ia2e327b6396657255f9b40b792d794a647fc5745 Reviewed-by: Orgad Shaneh --- src/plugins/git/branchview.cpp | 10 ++++++++++ src/plugins/git/branchview.h | 3 +++ 2 files changed, 13 insertions(+) diff --git a/src/plugins/git/branchview.cpp b/src/plugins/git/branchview.cpp index 0328d5aefc7..b0c97935050 100644 --- a/src/plugins/git/branchview.cpp +++ b/src/plugins/git/branchview.cpp @@ -164,6 +164,11 @@ void BranchView::refresh(const QString &repository, bool force) m_addButton->setToolTip(tr("Add Branch...")); m_branchView->setEnabled(true); } + + // Do not refresh the model when the view is hidden + if (!isVisible()) + return; + QString errorMessage; if (!m_model->refresh(m_repository, &errorMessage)) VcsBase::VcsOutputWindow::appendError(errorMessage); @@ -174,6 +179,11 @@ void BranchView::refreshCurrentBranch() m_model->refreshCurrentBranch(); } +void BranchView::showEvent(QShowEvent *) +{ + refreshCurrentRepository(); +} + QToolButton *BranchView::addButton() const { return m_addButton; diff --git a/src/plugins/git/branchview.h b/src/plugins/git/branchview.h index faceea2ef57..a02bfa2567f 100644 --- a/src/plugins/git/branchview.h +++ b/src/plugins/git/branchview.h @@ -65,6 +65,9 @@ public: QAction *m_includeOldEntriesAction = nullptr; QAction *m_includeTagsAction = nullptr; +protected: + void showEvent(QShowEvent *) override; + private: void refreshCurrentRepository(); void resizeColumns(); From d890534ec5626be46c7bbe47f46367b472f01d69 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 27 Oct 2020 15:27:57 +0200 Subject: [PATCH 20/48] Project: Add CMakeLists.txt to qmake project Change-Id: Ifc8246bb801c7e9350c0aabe8debd847063192ac Reviewed-by: Eike Ziller --- qtcreator.pri | 1 + 1 file changed, 1 insertion(+) diff --git a/qtcreator.pri b/qtcreator.pri index 5879ded545a..5c586e2d76b 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -244,6 +244,7 @@ qt { QBSFILE = $$replace(_PRO_FILE_, \\.pro$, .qbs) exists($$QBSFILE):DISTFILES += $$QBSFILE +DISTFILES += $$_PRO_FILE_PWD_/CMakeLists.txt !isEmpty(QTC_PLUGIN_DEPENDS) { LIBS *= -L$$IDE_PLUGIN_PATH # plugin path from output directory From 725f8a01e87b6e43733ecf2686f29cf2d26a3c5f Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 27 Oct 2020 16:13:08 +0200 Subject: [PATCH 21/48] Project: Add files in cmake directory to qmake project Change-Id: I96a1a32ebe4914a04fd3dc64a77f98cf3a2c5a2e Reviewed-by: Eike Ziller --- qtcreator.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/qtcreator.pro b/qtcreator.pro index 7d055942ad6..cd3ae73669a 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -20,6 +20,7 @@ DISTFILES += dist/copyright_template.txt \ $$files(dist/changes-*) \ qtcreator.qbs \ $$files(qbs/*, true) \ + $$files(cmake/*) \ $$files(scripts/*.py) \ $$files(scripts/*.sh) \ $$files(scripts/*.pl) From 9da8a3f5406326299ea61ff7561b3252f59dcb20 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 27 Oct 2020 11:12:49 +0100 Subject: [PATCH 22/48] Welcome: Link to Qt Design Studio QuickTip: Interactive 3D Change-Id: I4fd574060f9d753b1fc1279e4387cf721668431c Reviewed-by: Mahmoud Badri Reviewed-by: Alessandro Portale --- src/plugins/qtsupport/qtcreator_tutorials.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/qtsupport/qtcreator_tutorials.xml b/src/plugins/qtsupport/qtcreator_tutorials.xml index cfb994c4527..362d87fd77f 100644 --- a/src/plugins/qtsupport/qtcreator_tutorials.xml +++ b/src/plugins/qtsupport/qtcreator_tutorials.xml @@ -62,6 +62,10 @@ qt creator,qt quick,bindings,quick tip,qml,video,2020 + + + qt creator,qt quick,3D,FBX,quick tip,video,2020 + qt creator,qt quick,slider,quick tip,controls,video,2020 From 091fb1fc7d9975032f5a1047b611211c0a9c0de5 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 27 Oct 2020 12:03:36 +0200 Subject: [PATCH 23/48] QmlDesigner: Fix stall at asset import icon creation ProcessFinished signaling has changed so that sender() returns nullptr, so changed the processFinished handling to simply remove all finished processes. Change-Id: I6c1d37737cf7fd15840daa1c7d73f2620fab1102 Fixes: QDS-3004 Reviewed-by: Mahmoud Badri Reviewed-by: Thomas Hartmann --- .../itemlibrary/itemlibraryassetimporter.cpp | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp index ca00b66f462..cfb946a95df 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp @@ -184,20 +184,18 @@ void ItemLibraryAssetImporter::processFinished(int exitCode, QProcess::ExitStatu Q_UNUSED(exitCode) Q_UNUSED(exitStatus) - auto process = qobject_cast(sender()); - if (process) { - m_qmlPuppetProcesses.erase( - std::remove_if(m_qmlPuppetProcesses.begin(), - m_qmlPuppetProcesses.end(), - [&](const auto &entry) { return entry.get() == process; })); - const QString progressTitle = tr("Generating icons."); - if (m_qmlPuppetProcesses.empty()) { - notifyProgress(100, progressTitle); - finalizeQuick3DImport(); - } else { - notifyProgress(int(100. * (1. - double(m_qmlPuppetCount) / double(m_qmlPuppetProcesses.size()))), - progressTitle); - } + m_qmlPuppetProcesses.erase( + std::remove_if(m_qmlPuppetProcesses.begin(), m_qmlPuppetProcesses.end(), [&](const auto &entry) { + return !entry || entry->state() == QProcess::NotRunning; + })); + + const QString progressTitle = tr("Generating icons."); + if (m_qmlPuppetProcesses.empty()) { + notifyProgress(100, progressTitle); + finalizeQuick3DImport(); + } else { + notifyProgress(int(100. * (1. - double(m_qmlPuppetCount) / double(m_qmlPuppetProcesses.size()))), + progressTitle); } } From 0a4a1693ec0c33962c62e9eedbe336caed4f5c4d Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 26 Oct 2020 07:59:23 +0200 Subject: [PATCH 24/48] Revert "BareMetal: Get rid of DefaultGdbServerProvider" And rename it "Generic". It *is* useful for pre-configuring a device with address, then simply debugging with F5 instead of going through the Attach to Running Debug Server dialog and manually choosing the address, port and ELF file. This reverts commit 46afac5687e053cba829834db1394fe80a5afa0f. Change-Id: If1e2115e38f38431d70dc8745ffe11ac1a13a7fa Reviewed-by: Denis Shienkov Reviewed-by: hjk --- src/plugins/baremetal/CMakeLists.txt | 1 + src/plugins/baremetal/baremetal.qbs | 1 + src/plugins/baremetal/baremetalconstants.h | 1 + .../baremetal/debugserverprovidermanager.cpp | 4 +- .../baremetal/debugservers/gdb/gdbservers.pri | 6 +- .../gdb/genericgdbserverprovider.cpp | 135 ++++++++++++++++++ .../gdb/genericgdbserverprovider.h | 83 +++++++++++ 7 files changed, 228 insertions(+), 3 deletions(-) create mode 100644 src/plugins/baremetal/debugservers/gdb/genericgdbserverprovider.cpp create mode 100644 src/plugins/baremetal/debugservers/gdb/genericgdbserverprovider.h diff --git a/src/plugins/baremetal/CMakeLists.txt b/src/plugins/baremetal/CMakeLists.txt index 0a6721c4e76..046e0531c33 100644 --- a/src/plugins/baremetal/CMakeLists.txt +++ b/src/plugins/baremetal/CMakeLists.txt @@ -14,6 +14,7 @@ add_qtc_plugin(BareMetal debugserverprovidermanager.cpp debugserverprovidermanager.h debugserverproviderssettingspage.cpp debugserverproviderssettingspage.h debugservers/gdb/gdbserverprovider.cpp debugservers/gdb/gdbserverprovider.h + debugservers/gdb/genericgdbserverprovider.cpp debugservers/gdb/genericgdbserverprovider.h debugservers/gdb/openocdgdbserverprovider.cpp debugservers/gdb/openocdgdbserverprovider.h debugservers/gdb/stlinkutilgdbserverprovider.cpp debugservers/gdb/stlinkutilgdbserverprovider.h debugservers/gdb/jlinkgdbserverprovider.cpp debugservers/gdb/jlinkgdbserverprovider.h diff --git a/src/plugins/baremetal/baremetal.qbs b/src/plugins/baremetal/baremetal.qbs index c1942018002..f9631304500 100644 --- a/src/plugins/baremetal/baremetal.qbs +++ b/src/plugins/baremetal/baremetal.qbs @@ -42,6 +42,7 @@ QtcPlugin { prefix: "debugservers/gdb/" files: [ "gdbserverprovider.cpp", "gdbserverprovider.h", + "genericgdbserverprovider.cpp", "genericgdbserverprovider.h", "openocdgdbserverprovider.cpp", "openocdgdbserverprovider.h", "stlinkutilgdbserverprovider.cpp", "stlinkutilgdbserverprovider.h", "jlinkgdbserverprovider.cpp", "jlinkgdbserverprovider.h", diff --git a/src/plugins/baremetal/baremetalconstants.h b/src/plugins/baremetal/baremetalconstants.h index 816aa0a51a2..e446d77ed27 100644 --- a/src/plugins/baremetal/baremetalconstants.h +++ b/src/plugins/baremetal/baremetalconstants.h @@ -39,6 +39,7 @@ const char DEBUG_SERVER_PROVIDERS_SETTINGS_ID[] = "EE.BareMetal.DebugServerProvi // GDB Debugger Server Provider Ids. const char GDBSERVER_OPENOCD_PROVIDER_ID[] = "BareMetal.GdbServerProvider.OpenOcd"; const char GDBSERVER_JLINK_PROVIDER_ID[] = "BareMetal.GdbServerProvider.JLink"; +const char GDBSERVER_GENERIC_PROVIDER_ID[] = "BareMetal.GdbServerProvider.Generic"; const char GDBSERVER_STLINK_UTIL_PROVIDER_ID[] = "BareMetal.GdbServerProvider.STLinkUtil"; const char GDBSERVER_EBLINK_PROVIDER_ID[] = "BareMetal.GdbServerProvider.EBlink"; diff --git a/src/plugins/baremetal/debugserverprovidermanager.cpp b/src/plugins/baremetal/debugserverprovidermanager.cpp index 5081588783a..d594e2eb8f5 100644 --- a/src/plugins/baremetal/debugserverprovidermanager.cpp +++ b/src/plugins/baremetal/debugserverprovidermanager.cpp @@ -27,6 +27,7 @@ #include "idebugserverprovider.h" // GDB debug servers. +#include "debugservers/gdb/genericgdbserverprovider.h" #include "debugservers/gdb/openocdgdbserverprovider.h" #include "debugservers/gdb/stlinkutilgdbserverprovider.h" #include "debugservers/gdb/jlinkgdbserverprovider.h" @@ -61,7 +62,8 @@ static DebugServerProviderManager *m_instance = nullptr; DebugServerProviderManager::DebugServerProviderManager() : m_configFile(Utils::FilePath::fromString(Core::ICore::userResourcePath() + fileNameKeyC)) - , m_factories({new JLinkGdbServerProviderFactory, + , m_factories({new GenericGdbServerProviderFactory, + new JLinkGdbServerProviderFactory, new OpenOcdGdbServerProviderFactory, new StLinkUtilGdbServerProviderFactory, new EBlinkGdbServerProviderFactory, diff --git a/src/plugins/baremetal/debugservers/gdb/gdbservers.pri b/src/plugins/baremetal/debugservers/gdb/gdbservers.pri index 3d6d4c31807..cd7e4c88717 100644 --- a/src/plugins/baremetal/debugservers/gdb/gdbservers.pri +++ b/src/plugins/baremetal/debugservers/gdb/gdbservers.pri @@ -1,13 +1,15 @@ HEADERS += \ $$PWD/eblinkgdbserverprovider.h \ $$PWD/gdbserverprovider.h \ + $$PWD/genericgdbserverprovider.h \ + $$PWD/jlinkgdbserverprovider.h \ $$PWD/openocdgdbserverprovider.h \ $$PWD/stlinkutilgdbserverprovider.h \ - $$PWD/jlinkgdbserverprovider.h \ SOURCES += \ $$PWD/eblinkgdbserverprovider.cpp \ $$PWD/gdbserverprovider.cpp \ + $$PWD/genericgdbserverprovider.cpp \ + $$PWD/jlinkgdbserverprovider.cpp \ $$PWD/openocdgdbserverprovider.cpp \ $$PWD/stlinkutilgdbserverprovider.cpp \ - $$PWD/jlinkgdbserverprovider.cpp \ diff --git a/src/plugins/baremetal/debugservers/gdb/genericgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/genericgdbserverprovider.cpp new file mode 100644 index 00000000000..3a95e07e705 --- /dev/null +++ b/src/plugins/baremetal/debugservers/gdb/genericgdbserverprovider.cpp @@ -0,0 +1,135 @@ +/**************************************************************************** +** +** Copyright (C) 2020 Denis Shienkov +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Creator. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +****************************************************************************/ + +#include "genericgdbserverprovider.h" + +#include +#include + +#include +#include + +#include +#include +#include + +namespace BareMetal { +namespace Internal { + +// GenericGdbServerProvider + +GenericGdbServerProvider::GenericGdbServerProvider() + : GdbServerProvider(Constants::GDBSERVER_GENERIC_PROVIDER_ID) +{ + setChannel("localhost", 3333); + setSettingsKeyBase("BareMetal.GenericGdbServerProvider"); + setTypeDisplayName(GdbServerProvider::tr("Generic")); + setConfigurationWidgetCreator([this] { return new GenericGdbServerProviderConfigWidget(this); }); +} + +QSet GenericGdbServerProvider::supportedStartupModes() const +{ + return {StartupOnNetwork}; +} + +// GenericGdbServerProviderFactory + +GenericGdbServerProviderFactory::GenericGdbServerProviderFactory() +{ + setId(Constants::GDBSERVER_GENERIC_PROVIDER_ID); + setDisplayName(GdbServerProvider::tr("Generic")); + setCreator([] { return new GenericGdbServerProvider; }); +} + +// GdbServerProviderConfigWidget + +GenericGdbServerProviderConfigWidget::GenericGdbServerProviderConfigWidget( + GenericGdbServerProvider *provider) + : GdbServerProviderConfigWidget(provider) +{ + Q_ASSERT(provider); + + m_hostWidget = new HostWidget(this); + m_mainLayout->addRow(tr("Host:"), m_hostWidget); + + m_useExtendedRemoteCheckBox = new QCheckBox(this); + m_useExtendedRemoteCheckBox->setToolTip("Use GDB target extended-remote"); + m_mainLayout->addRow(tr("Extended mode:"), m_useExtendedRemoteCheckBox); + m_initCommandsTextEdit = new QPlainTextEdit(this); + m_initCommandsTextEdit->setToolTip(defaultInitCommandsTooltip()); + m_mainLayout->addRow(tr("Init commands:"), m_initCommandsTextEdit); + m_resetCommandsTextEdit = new QPlainTextEdit(this); + m_resetCommandsTextEdit->setToolTip(defaultResetCommandsTooltip()); + m_mainLayout->addRow(tr("Reset commands:"), m_resetCommandsTextEdit); + + addErrorLabel(); + setFromProvider(); + + const auto chooser = new Utils::VariableChooser(this); + chooser->addSupportedWidget(m_initCommandsTextEdit); + chooser->addSupportedWidget(m_resetCommandsTextEdit); + + connect(m_hostWidget, &HostWidget::dataChanged, + this, &GdbServerProviderConfigWidget::dirty); + connect(m_useExtendedRemoteCheckBox, &QCheckBox::stateChanged, + this, &GdbServerProviderConfigWidget::dirty); + connect(m_initCommandsTextEdit, &QPlainTextEdit::textChanged, + this, &GdbServerProviderConfigWidget::dirty); + connect(m_resetCommandsTextEdit, &QPlainTextEdit::textChanged, + this, &GdbServerProviderConfigWidget::dirty); +} + +void GenericGdbServerProviderConfigWidget::apply() +{ + const auto p = static_cast(m_provider); + Q_ASSERT(p); + + p->setChannel(m_hostWidget->channel()); + p->setUseExtendedRemote(m_useExtendedRemoteCheckBox->isChecked()); + p->setInitCommands(m_initCommandsTextEdit->toPlainText()); + p->setResetCommands(m_resetCommandsTextEdit->toPlainText()); + IDebugServerProviderConfigWidget::apply(); +} + +void GenericGdbServerProviderConfigWidget::discard() +{ + setFromProvider(); + IDebugServerProviderConfigWidget::discard(); +} + +void GenericGdbServerProviderConfigWidget::setFromProvider() +{ + const auto p = static_cast(m_provider); + Q_ASSERT(p); + + const QSignalBlocker blocker(this); + m_hostWidget->setChannel(p->channel()); + m_useExtendedRemoteCheckBox->setChecked(p->useExtendedRemote()); + m_initCommandsTextEdit->setPlainText(p->initCommands()); + m_resetCommandsTextEdit->setPlainText(p->resetCommands()); +} + +} // namespace Internal +} // namespace ProjectExplorer diff --git a/src/plugins/baremetal/debugservers/gdb/genericgdbserverprovider.h b/src/plugins/baremetal/debugservers/gdb/genericgdbserverprovider.h new file mode 100644 index 00000000000..90d75496dc0 --- /dev/null +++ b/src/plugins/baremetal/debugservers/gdb/genericgdbserverprovider.h @@ -0,0 +1,83 @@ +/**************************************************************************** +** +** Copyright (C) 2020 Denis Shienkov +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Creator. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +****************************************************************************/ + +#pragma once + +#include "gdbserverprovider.h" + +QT_BEGIN_NAMESPACE +class QCheckBox; +class QPlainTextEdit; +QT_END_NAMESPACE + +namespace BareMetal { +namespace Internal { + +// GenericGdbServerProvider + +class GenericGdbServerProvider final : public GdbServerProvider +{ +private: + GenericGdbServerProvider(); + QSet supportedStartupModes() const final; + + friend class GenericGdbServerProviderConfigWidget; + friend class GenericGdbServerProviderFactory; + friend class BareMetalDevice; +}; + +// GenericGdbServerProviderFactory + +class GenericGdbServerProviderFactory final : public IDebugServerProviderFactory +{ +public: + GenericGdbServerProviderFactory(); +}; + +// GenericGdbServerProviderConfigWidget + +class GenericGdbServerProviderConfigWidget final + : public GdbServerProviderConfigWidget +{ + Q_OBJECT + +public: + explicit GenericGdbServerProviderConfigWidget( + GenericGdbServerProvider *provider); + +private: + void apply() final; + void discard() final; + + void setFromProvider(); + + HostWidget *m_hostWidget = nullptr; + QCheckBox *m_useExtendedRemoteCheckBox = nullptr; + QPlainTextEdit *m_initCommandsTextEdit = nullptr; + QPlainTextEdit *m_resetCommandsTextEdit = nullptr; +}; + +} // namespace Internal +} // namespace BareMetal From f487e471aab3081de551c21daa83b64a3669264b Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 26 Oct 2020 10:38:59 +0200 Subject: [PATCH 25/48] BareMetal: Remove qualifiers from setting keys They're pure noise, since there should be no conflicts between base and derived classes, and there can't be multiple classes for the same provider. This maintains compatibility when upgrading from earlier versions, but not for downgrades. Change-Id: I02655410172ff170fca4893f7b37c2fb1f316aff Reviewed-by: Denis Shienkov Reviewed-by: hjk --- .../baremetal/debugserverprovidermanager.cpp | 8 ++- .../gdb/eblinkgdbserverprovider.cpp | 23 ++++---- .../debugservers/gdb/gdbserverprovider.cpp | 10 ++-- .../gdb/genericgdbserverprovider.cpp | 1 - .../gdb/jlinkgdbserverprovider.cpp | 15 +++-- .../gdb/openocdgdbserverprovider.cpp | 9 ++- .../gdb/stlinkutilgdbserverprovider.cpp | 11 ++-- .../uvsc/jlinkuvscserverprovider.cpp | 6 +- .../uvsc/simulatoruvscserverprovider.cpp | 2 +- .../uvsc/stlinkuvscserverprovider.cpp | 6 +- .../debugservers/uvsc/uvscserverprovider.cpp | 6 +- .../uvsc/uvtargetdeviceselection.cpp | 58 +++++++++---------- .../uvsc/uvtargetdriverselection.cpp | 10 ++-- src/plugins/baremetal/iarewtoolchain.cpp | 6 +- .../baremetal/idebugserverprovider.cpp | 27 ++++----- src/plugins/baremetal/idebugserverprovider.h | 2 - src/plugins/baremetal/keiltoolchain.cpp | 6 +- src/plugins/baremetal/sdcctoolchain.cpp | 4 +- 18 files changed, 101 insertions(+), 109 deletions(-) diff --git a/src/plugins/baremetal/debugserverprovidermanager.cpp b/src/plugins/baremetal/debugserverprovidermanager.cpp index d594e2eb8f5..6ab84c02082 100644 --- a/src/plugins/baremetal/debugserverprovidermanager.cpp +++ b/src/plugins/baremetal/debugserverprovidermanager.cpp @@ -117,7 +117,13 @@ void DebugServerProviderManager::restoreProviders() if (!data.contains(key)) break; - const QVariantMap map = data.value(key).toMap(); + QVariantMap map = data.value(key).toMap(); + const QStringList keys = map.keys(); + for (const QString &key : keys) { + const int lastDot = key.lastIndexOf('.'); + if (lastDot != -1) + map[key.mid(lastDot + 1)] = map[key]; + } bool restored = false; for (IDebugServerProviderFactory *f : qAsConst(m_factories)) { if (f->canRestore(map)) { diff --git a/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp index bd6e3422852..8503bbf6c7f 100644 --- a/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp @@ -46,17 +46,17 @@ using namespace Utils; namespace BareMetal { namespace Internal { -const char executableFileKeyC[] = "BareMetal.EBlinkGdbServerProvider.ExecutableFile"; -const char verboseLevelKeyC[] = "BareMetal.EBlinkGdbServerProvider.VerboseLevel"; -const char deviceScriptC[] = "BareMetal.EBlinkGdbServerProvider.DeviceScript"; -const char interfaceTypeC[] = "BareMetal.EBlinkGdbServerProvider.InterfaceType"; -const char interfaceResetOnConnectC[] = "BareMetal.EBlinkGdbServerProvider.interfaceResetOnConnect"; -const char interfaceSpeedC[] = "BareMetal.EBlinkGdbServerProvider.InterfaceSpeed"; -const char interfaceExplicidDeviceC[] = "BareMetal.EBlinkGdbServerProvider.InterfaceExplicidDevice"; -const char targetNameC[] = "BareMetal.EBlinkGdbServerProvider.TargetName"; -const char targetDisableStackC[] = "BareMetal.EBlinkGdbServerProvider.TargetDisableStack"; -const char gdbShutDownAfterDisconnectC[] = "BareMetal.EBlinkGdbServerProvider.GdbShutDownAfterDisconnect"; -const char gdbNotUseCacheC[] = "BareMetal.EBlinkGdbServerProvider.GdbNotUseCache"; +const char executableFileKeyC[] = "ExecutableFile"; +const char verboseLevelKeyC[] = "VerboseLevel"; +const char deviceScriptC[] = "DeviceScript"; +const char interfaceTypeC[] = "InterfaceType"; +const char interfaceResetOnConnectC[] = "interfaceResetOnConnect"; +const char interfaceSpeedC[] = "InterfaceSpeed"; +const char interfaceExplicidDeviceC[] = "InterfaceExplicidDevice"; +const char targetNameC[] = "TargetName"; +const char targetDisableStackC[] = "TargetDisableStack"; +const char gdbShutDownAfterDisconnectC[] = "GdbShutDownAfterDisconnect"; +const char gdbNotUseCacheC[] = "GdbNotUseCache"; // EBlinkGdbServerProvider @@ -66,7 +66,6 @@ EBlinkGdbServerProvider::EBlinkGdbServerProvider() setInitCommands(defaultInitCommands()); setResetCommands(defaultResetCommands()); setChannel("127.0.0.1", 2331); - setSettingsKeyBase("BareMetal.EBlinkGdbServerProvider"); setTypeDisplayName(GdbServerProvider::tr("EBlink")); setConfigurationWidgetCreator([this] { return new EBlinkGdbServerProviderConfigWidget(this); }); } diff --git a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp index 77dfee82ff3..e8287bcf474 100644 --- a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp @@ -49,11 +49,11 @@ using namespace Utils; namespace BareMetal { namespace Internal { -const char startupModeKeyC[] = "BareMetal.GdbServerProvider.Mode"; -const char peripheralDescriptionFileKeyC[] = "BareMetal.GdbServerProvider.PeripheralDescriptionFile"; -const char initCommandsKeyC[] = "BareMetal.GdbServerProvider.InitCommands"; -const char resetCommandsKeyC[] = "BareMetal.GdbServerProvider.ResetCommands"; -const char useExtendedRemoteKeyC[] = "BareMetal.GdbServerProvider.UseExtendedRemote"; +const char startupModeKeyC[] = "Mode"; +const char peripheralDescriptionFileKeyC[] = "PeripheralDescriptionFile"; +const char initCommandsKeyC[] = "InitCommands"; +const char resetCommandsKeyC[] = "ResetCommands"; +const char useExtendedRemoteKeyC[] = "UseExtendedRemote"; // GdbServerProvider diff --git a/src/plugins/baremetal/debugservers/gdb/genericgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/genericgdbserverprovider.cpp index 3a95e07e705..3440f4e77c7 100644 --- a/src/plugins/baremetal/debugservers/gdb/genericgdbserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/gdb/genericgdbserverprovider.cpp @@ -44,7 +44,6 @@ GenericGdbServerProvider::GenericGdbServerProvider() : GdbServerProvider(Constants::GDBSERVER_GENERIC_PROVIDER_ID) { setChannel("localhost", 3333); - setSettingsKeyBase("BareMetal.GenericGdbServerProvider"); setTypeDisplayName(GdbServerProvider::tr("Generic")); setConfigurationWidgetCreator([this] { return new GenericGdbServerProviderConfigWidget(this); }); } diff --git a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp index 052ada87347..73475186bcf 100644 --- a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp @@ -46,13 +46,13 @@ using namespace Utils; namespace BareMetal { namespace Internal { -const char executableFileKeyC[] = "BareMetal.JLinkGdbServerProvider.ExecutableFile"; -const char jlinkDeviceKeyC[] = "BareMetal.JLinkGdbServerProvider.JLinkDevice"; -const char jlinkHostInterfaceKeyC[] = "BareMetal.JLinkGdbServerProvider.JLinkHostInterface"; -const char jlinkHostInterfaceIPAddressKeyC[] = "BareMetal.JLinkGdbServerProvider.JLinkHostInterfaceIPAddress"; -const char jlinkTargetInterfaceKeyC[] = "BareMetal.JLinkGdbServerProvider.JLinkTargetInterface"; -const char jlinkTargetInterfaceSpeedKeyC[] = "BareMetal.JLinkGdbServerProvider.JLinkTargetInterfaceSpeed"; -const char additionalArgumentsKeyC[] = "BareMetal.JLinkGdbServerProvider.AdditionalArguments"; +const char executableFileKeyC[] = "ExecutableFile"; +const char jlinkDeviceKeyC[] = "JLinkDevice"; +const char jlinkHostInterfaceKeyC[] = "JLinkHostInterface"; +const char jlinkHostInterfaceIPAddressKeyC[] = "JLinkHostInterfaceIPAddress"; +const char jlinkTargetInterfaceKeyC[] = "JLinkTargetInterface"; +const char jlinkTargetInterfaceSpeedKeyC[] = "JLinkTargetInterfaceSpeed"; +const char additionalArgumentsKeyC[] = "AdditionalArguments"; // JLinkGdbServerProvider @@ -62,7 +62,6 @@ JLinkGdbServerProvider::JLinkGdbServerProvider() setInitCommands(defaultInitCommands()); setResetCommands(defaultResetCommands()); setChannel("localhost", 2331); - setSettingsKeyBase("BareMetal.JLinkGdbServerProvider"); setTypeDisplayName(GdbServerProvider::tr("JLink")); setConfigurationWidgetCreator([this] { return new JLinkGdbServerProviderConfigWidget(this); }); } diff --git a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp index 74361dc2d4d..0e32338af72 100644 --- a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp @@ -44,10 +44,10 @@ using namespace Utils; namespace BareMetal { namespace Internal { -const char executableFileKeyC[] = "BareMetal.OpenOcdGdbServerProvider.ExecutableFile"; -const char rootScriptsDirKeyC[] = "BareMetal.OpenOcdGdbServerProvider.RootScriptsDir"; -const char configurationFileKeyC[] = "BareMetal.OpenOcdGdbServerProvider.ConfigurationPath"; -const char additionalArgumentsKeyC[] = "BareMetal.OpenOcdGdbServerProvider.AdditionalArguments"; +const char executableFileKeyC[] = "ExecutableFile"; +const char rootScriptsDirKeyC[] = "RootScriptsDir"; +const char configurationFileKeyC[] = "ConfigurationPath"; +const char additionalArgumentsKeyC[] = "AdditionalArguments"; // OpenOcdGdbServerProvider @@ -57,7 +57,6 @@ OpenOcdGdbServerProvider::OpenOcdGdbServerProvider() setInitCommands(defaultInitCommands()); setResetCommands(defaultResetCommands()); setChannel("localhost", 3333); - setSettingsKeyBase("BareMetal.OpenOcdGdbServerProvider"); setTypeDisplayName(GdbServerProvider::tr("OpenOCD")); setConfigurationWidgetCreator([this] { return new OpenOcdGdbServerProviderConfigWidget(this); }); } diff --git a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp index 0c280f2f429..c853df8b265 100644 --- a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp @@ -44,11 +44,11 @@ using namespace Utils; namespace BareMetal { namespace Internal { -const char executableFileKeyC[] = "BareMetal.StLinkUtilGdbServerProvider.ExecutableFile"; -const char verboseLevelKeyC[] = "BareMetal.StLinkUtilGdbServerProvider.VerboseLevel"; -const char extendedModeKeyC[] = "BareMetal.StLinkUtilGdbServerProvider.ExtendedMode"; -const char resetBoardKeyC[] = "BareMetal.StLinkUtilGdbServerProvider.ResetBoard"; -const char transportLayerKeyC[] = "BareMetal.StLinkUtilGdbServerProvider.TransportLayer"; +const char executableFileKeyC[] = "ExecutableFile"; +const char verboseLevelKeyC[] = "VerboseLevel"; +const char extendedModeKeyC[] = "ExtendedMode"; +const char resetBoardKeyC[] = "ResetBoard"; +const char transportLayerKeyC[] = "TransportLayer"; // StLinkUtilGdbServerProvider @@ -58,7 +58,6 @@ StLinkUtilGdbServerProvider::StLinkUtilGdbServerProvider() setInitCommands(defaultInitCommands()); setResetCommands(defaultResetCommands()); setChannel("localhost", 4242); - setSettingsKeyBase("BareMetal.StLinkUtilGdbServerProvider"); setTypeDisplayName(GdbServerProvider::tr("ST-LINK Utility")); setConfigurationWidgetCreator([this] { return new StLinkUtilGdbServerProviderConfigWidget(this); }); } diff --git a/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp index 1a269dcc7f6..60ba7eff8aa 100644 --- a/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp @@ -52,9 +52,9 @@ namespace Internal { using namespace Uv; -constexpr char adapterOptionsKeyC[] = "BareMetal.JLinkUvscServerProvider.AdapterOptions"; -constexpr char adapterPortKeyC[] = "BareMetal.JLinkUvscServerProvider.AdapterPort"; -constexpr char adapterSpeedKeyC[] = "BareMetal.JLinkUvscServerProvider.AdapterSpeed"; +constexpr char adapterOptionsKeyC[] = "AdapterOptions"; +constexpr char adapterPortKeyC[] = "AdapterPort"; +constexpr char adapterSpeedKeyC[] = "AdapterSpeed"; static int decodeSpeedCode(JLinkUvscAdapterOptions::Speed speed) { diff --git a/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.cpp index b37ff75ec9a..f5056844c45 100644 --- a/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.cpp @@ -50,7 +50,7 @@ namespace Internal { using namespace Uv; -const char limitSpeedKeyC[] = "BareMetal.SimulatorUvscServerProvider.LimitSpeed"; +const char limitSpeedKeyC[] = "LimitSpeed"; static DriverSelection defaultSimulatorDriverSelection() { diff --git a/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp index 98adbb212af..717c7b9ce98 100644 --- a/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp @@ -52,9 +52,9 @@ namespace Internal { using namespace Uv; -constexpr char adapterOptionsKeyC[] = "BareMetal.StLinkUvscServerProvider.AdapterOptions"; -constexpr char adapterPortKeyC[] = "BareMetal.StLinkUvscServerProvider.AdapterPort"; -constexpr char adapterSpeedKeyC[] = "BareMetal.StLinkUvscServerProvider.AdapterSpeed"; +constexpr char adapterOptionsKeyC[] = "AdapterOptions"; +constexpr char adapterPortKeyC[] = "AdapterPort"; +constexpr char adapterSpeedKeyC[] = "AdapterSpeed"; static QString buildAdapterOptions(const StLinkUvscAdapterOptions &opts) { diff --git a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp index 59b0b6d3734..05aaa59c429 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp @@ -58,9 +58,9 @@ namespace Internal { using namespace Uv; // Whole software package selection keys. -constexpr char toolsIniKeyC[] = "BareMetal.UvscServerProvider.ToolsIni"; -constexpr char deviceSelectionKeyC[] = "BareMetal.UvscServerProvider.DeviceSelection"; -constexpr char driverSelectionKeyC[] = "BareMetal.UvscServerProvider.DriverSelection"; +constexpr char toolsIniKeyC[] = "ToolsIni"; +constexpr char deviceSelectionKeyC[] = "DeviceSelection"; +constexpr char driverSelectionKeyC[] = "DriverSelection"; constexpr int defaultPortNumber = 5101; diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.cpp b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.cpp index 7bb3eca8968..4c287199cdd 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.cpp @@ -38,39 +38,39 @@ namespace Internal { namespace Uv { // Software package data keys. -constexpr char packageDescrKeyC[] = "BareMetal.UvscServerProvider.PackageDescription"; -constexpr char packageFileKeyC[] = "BareMetal.UvscServerProvider.PackageFile"; -constexpr char packageNameKeyC[] = "BareMetal.UvscServerProvider.PackageName"; -constexpr char packageUrlKeyC[] = "BareMetal.UvscServerProvider.PackageUrl"; -constexpr char packageVendorNameKeyC[] = "BareMetal.UvscServerProvider.PackageVendorName"; -constexpr char packageVendorIdKeyC[] = "BareMetal.UvscServerProvider.PackageVendorId"; -constexpr char packageVersionKeyC[] = "BareMetal.UvscServerProvider.PackageVersion"; +constexpr char packageDescrKeyC[] = "PackageDescription"; +constexpr char packageFileKeyC[] = "PackageFile"; +constexpr char packageNameKeyC[] = "PackageName"; +constexpr char packageUrlKeyC[] = "PackageUrl"; +constexpr char packageVendorNameKeyC[] = "PackageVendorName"; +constexpr char packageVendorIdKeyC[] = "PackageVendorId"; +constexpr char packageVersionKeyC[] = "PackageVersion"; // Device data keys. -constexpr char deviceNameKeyC[] = "BareMetal.UvscServerProvider.DeviceName"; -constexpr char deviceDescrKeyC[] = "BareMetal.UvscServerProvider.DeviceDescription"; -constexpr char deviceFamilyKeyC[] = "BareMetal.UvscServerProvider.DeviceFamily"; -constexpr char deviceSubFamilyKeyC[] = "BareMetal.UvscServerProvider.DeviceSubFamily"; -constexpr char deviceVendorNameKeyC[] = "BareMetal.UvscServerProvider.DeviceVendorName"; -constexpr char deviceVendorIdKeyC[] = "BareMetal.UvscServerProvider.DeviceVendorId"; -constexpr char deviceSvdKeyC[] = "BareMetal.UvscServerProvider.DeviceSVD"; +constexpr char deviceNameKeyC[] = "DeviceName"; +constexpr char deviceDescrKeyC[] = "DeviceDescription"; +constexpr char deviceFamilyKeyC[] = "DeviceFamily"; +constexpr char deviceSubFamilyKeyC[] = "DeviceSubFamily"; +constexpr char deviceVendorNameKeyC[] = "DeviceVendorName"; +constexpr char deviceVendorIdKeyC[] = "DeviceVendorId"; +constexpr char deviceSvdKeyC[] = "DeviceSVD"; // Device CPU data keys. -constexpr char deviceClockKeyC[] = "BareMetal.UvscServerProvider.DeviceClock"; -constexpr char deviceCoreKeyC[] = "BareMetal.UvscServerProvider.DeviceCore"; -constexpr char deviceFpuKeyC[] = "BareMetal.UvscServerProvider.DeviceFPU"; -constexpr char deviceMpuKeyC[] = "BareMetal.UvscServerProvider.DeviceMPU"; +constexpr char deviceClockKeyC[] = "DeviceClock"; +constexpr char deviceCoreKeyC[] = "DeviceCore"; +constexpr char deviceFpuKeyC[] = "DeviceFPU"; +constexpr char deviceMpuKeyC[] = "DeviceMPU"; // Device MEMORY data keys. -constexpr char deviceMemoryKeyC[] = "BareMetal.UvscServerProvider.DeviceMemory"; -constexpr char deviceMemoryIdKeyC[] = "BareMetal.UvscServerProvider.DeviceMemoryId"; -constexpr char deviceMemoryStartKeyC[] = "BareMetal.UvscServerProvider.DeviceMemoryStart"; -constexpr char deviceMemorySizeKeyC[] = "BareMetal.UvscServerProvider.DeviceMemorySize"; +constexpr char deviceMemoryKeyC[] = "DeviceMemory"; +constexpr char deviceMemoryIdKeyC[] = "DeviceMemoryId"; +constexpr char deviceMemoryStartKeyC[] = "DeviceMemoryStart"; +constexpr char deviceMemorySizeKeyC[] = "DeviceMemorySize"; // Device ALGORITHM data keys. -constexpr char deviceAlgorithmKeyC[] = "BareMetal.UvscServerProvider.DeviceAlgorithm"; -constexpr char deviceAlgorithmPathKeyC[] = "BareMetal.UvscServerProvider.DeviceAlgorithmPath"; -constexpr char deviceAlgorithmFlashStartKeyC[] = "BareMetal.UvscServerProvider.DeviceAlgorithmStart"; -constexpr char deviceAlgorithmFlashSizeKeyC[] = "BareMetal.UvscServerProvider.DeviceAlgorithmSize"; -constexpr char deviceAlgorithmRamStartKeyC[] = "BareMetal.UvscServerProvider.DeviceAlgorithmRamStart"; -constexpr char deviceAlgorithmRamSizeKeyC[] = "BareMetal.UvscServerProvider.DeviceAlgorithmRamSize"; -constexpr char deviceAlgorithmIndexKeyC[] = "BareMetal.UvscServerProvider.DeviceAlgorithmIndex"; +constexpr char deviceAlgorithmKeyC[] = "DeviceAlgorithm"; +constexpr char deviceAlgorithmPathKeyC[] = "DeviceAlgorithmPath"; +constexpr char deviceAlgorithmFlashStartKeyC[] = "DeviceAlgorithmStart"; +constexpr char deviceAlgorithmFlashSizeKeyC[] = "DeviceAlgorithmSize"; +constexpr char deviceAlgorithmRamStartKeyC[] = "DeviceAlgorithmRamStart"; +constexpr char deviceAlgorithmRamSizeKeyC[] = "DeviceAlgorithmRamSize"; +constexpr char deviceAlgorithmIndexKeyC[] = "DeviceAlgorithmIndex"; // DeviceSelection diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.cpp b/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.cpp index 41350613ca8..c8ab64a1335 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.cpp @@ -36,11 +36,11 @@ namespace Internal { namespace Uv { // Driver data keys. -constexpr char driverIndexKeyC[] = "BareMetal.UvscServerProvider.DriverIndex"; -constexpr char driverCpuDllIndexKeyC[] = "BareMetal.UvscServerProvider.DriverCpuDllIndex"; -constexpr char driverDllKeyC[] = "BareMetal.UvscServerProvider.DriverDll"; -constexpr char driverCpuDllsKeyC[] = "BareMetal.UvscServerProvider.DriverCpuDlls"; -constexpr char driverNameKeyC[] = "BareMetal.UvscServerProvider.DriverName"; +constexpr char driverIndexKeyC[] = "DriverIndex"; +constexpr char driverCpuDllIndexKeyC[] = "DriverCpuDllIndex"; +constexpr char driverDllKeyC[] = "DriverDll"; +constexpr char driverCpuDllsKeyC[] = "DriverCpuDlls"; +constexpr char driverNameKeyC[] = "DriverName"; // DriverSelection diff --git a/src/plugins/baremetal/iarewtoolchain.cpp b/src/plugins/baremetal/iarewtoolchain.cpp index 84b57d4db69..0296a3e8094 100644 --- a/src/plugins/baremetal/iarewtoolchain.cpp +++ b/src/plugins/baremetal/iarewtoolchain.cpp @@ -58,9 +58,9 @@ namespace Internal { // Helpers: -static const char compilerCommandKeyC[] = "BareMetal.IarToolChain.CompilerPath"; -static const char compilerPlatformCodeGenFlagsKeyC[] = "BareMetal.IarToolChain.PlatformCodeGenFlags"; -static const char targetAbiKeyC[] = "BareMetal.IarToolChain.TargetAbi"; +static const char compilerCommandKeyC[] = "CompilerPath"; +static const char compilerPlatformCodeGenFlagsKeyC[] = "PlatformCodeGenFlags"; +static const char targetAbiKeyC[] = "TargetAbi"; static bool compilerExists(const FilePath &compilerPath) { diff --git a/src/plugins/baremetal/idebugserverprovider.cpp b/src/plugins/baremetal/idebugserverprovider.cpp index 02deed298a4..553a0f76568 100644 --- a/src/plugins/baremetal/idebugserverprovider.cpp +++ b/src/plugins/baremetal/idebugserverprovider.cpp @@ -43,12 +43,12 @@ using namespace ProjectExplorer; namespace BareMetal { namespace Internal { -const char idKeyC[] = "BareMetal.IDebugServerProvider.Id"; -const char displayNameKeyC[] = "BareMetal.IDebugServerProvider.DisplayName"; -const char engineTypeKeyC[] = "BareMetal.IDebugServerProvider.EngineType"; +const char idKeyC[] = "Id"; +const char displayNameKeyC[] = "DisplayName"; +const char engineTypeKeyC[] = "EngineType"; -const char hostKeySuffixC[] = ".Host"; -const char portKeySuffixC[] = ".Port"; +const char hostKeyC[] = "Host"; +const char portKeyC[] = "Port"; static QString createId(const QString &id) { @@ -139,11 +139,6 @@ void IDebugServerProvider::setEngineType(DebuggerEngineType engineType) providerUpdated(); } -void IDebugServerProvider::setSettingsKeyBase(const QString &settingsBase) -{ - m_settingsBase = settingsBase; -} - bool IDebugServerProvider::operator==(const IDebugServerProvider &other) const { if (this == &other) @@ -170,8 +165,8 @@ QVariantMap IDebugServerProvider::toMap() const {idKeyC, m_id}, {displayNameKeyC, m_displayName}, {engineTypeKeyC, m_engineType}, - {m_settingsBase + hostKeySuffixC, m_channel.host()}, - {m_settingsBase + portKeySuffixC, m_channel.port()}, + {hostKeyC, m_channel.host()}, + {portKeyC, m_channel.port()}, }; } @@ -201,8 +196,8 @@ bool IDebugServerProvider::fromMap(const QVariantMap &data) m_displayName = data.value(displayNameKeyC).toString(); m_engineType = static_cast( data.value(engineTypeKeyC, NoEngineType).toInt()); - m_channel.setHost(data.value(m_settingsBase + hostKeySuffixC).toString()); - m_channel.setPort(data.value(m_settingsBase + portKeySuffixC).toInt()); + m_channel.setHost(data.value(hostKeyC).toString()); + m_channel.setPort(data.value(portKeyC).toInt()); return true; } @@ -238,9 +233,7 @@ IDebugServerProvider *IDebugServerProviderFactory::create() const IDebugServerProvider *IDebugServerProviderFactory::restore(const QVariantMap &data) const { IDebugServerProvider *p = m_creator(); - const auto updated = data; - - if (p->fromMap(updated)) + if (p->fromMap(data)) return p; delete p; return nullptr; diff --git a/src/plugins/baremetal/idebugserverprovider.h b/src/plugins/baremetal/idebugserverprovider.h index cf82d8c7b9b..19792dcaf0b 100644 --- a/src/plugins/baremetal/idebugserverprovider.h +++ b/src/plugins/baremetal/idebugserverprovider.h @@ -104,7 +104,6 @@ public: protected: void setTypeDisplayName(const QString &typeDisplayName); void setEngineType(Debugger::DebuggerEngineType engineType); - void setSettingsKeyBase(const QString &settingsBase); void providerUpdated(); void resetId(); @@ -112,7 +111,6 @@ protected: QString m_id; mutable QString m_displayName; QString m_typeDisplayName; - QString m_settingsBase; QUrl m_channel; Debugger::DebuggerEngineType m_engineType = Debugger::NoEngineType; QSet m_devices; diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp index ac548bf3c14..3728017baa9 100644 --- a/src/plugins/baremetal/keiltoolchain.cpp +++ b/src/plugins/baremetal/keiltoolchain.cpp @@ -60,9 +60,9 @@ namespace Internal { // Helpers: -static const char compilerCommandKeyC[] = "BareMetal.KeilToolchain.CompilerPath"; -static const char compilerPlatformCodeGenFlagsKeyC[] = "BareMetal.KeilToolchain.PlatformCodeGenFlags"; -static const char targetAbiKeyC[] = "BareMetal.KeilToolchain.TargetAbi"; +static const char compilerCommandKeyC[] = "CompilerPath"; +static const char compilerPlatformCodeGenFlagsKeyC[] = "PlatformCodeGenFlags"; +static const char targetAbiKeyC[] = "TargetAbi"; static bool compilerExists(const FilePath &compilerPath) { diff --git a/src/plugins/baremetal/sdcctoolchain.cpp b/src/plugins/baremetal/sdcctoolchain.cpp index aa701d08f09..fe9754cce80 100644 --- a/src/plugins/baremetal/sdcctoolchain.cpp +++ b/src/plugins/baremetal/sdcctoolchain.cpp @@ -58,8 +58,8 @@ namespace Internal { // Helpers: -static const char compilerCommandKeyC[] = "BareMetal.SdccToolChain.CompilerPath"; -static const char targetAbiKeyC[] = "BareMetal.SdccToolChain.TargetAbi"; +static const char compilerCommandKeyC[] = "CompilerPath"; +static const char targetAbiKeyC[] = "TargetAbi"; static bool compilerExists(const FilePath &compilerPath) { From b77318cb746fff43b22d704f53688ff5ce6591f2 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 27 Oct 2020 13:06:58 +0100 Subject: [PATCH 26/48] WelcomeScreen: Don't rely on image format auto-detection The examples and marketplace pages show images that are decoded from data buffers. This happened without specifying the encoding format, which triggers image auto-detection. The negligible overhead of the auto-detection is usually not a problem, but the probing of image QImageIOHandlers that goes along with auto- detection can emit warnings. A concrete example is a warning in the TGA plugin which was added in Qt 5.15.1. Task-number: QTCREATORBUG-24853 Change-Id: I596604bde7621acf92e825f45e0c23ac4e90b78d Reviewed-by: Christian Stenger --- src/plugins/marketplace/productlistmodel.cpp | 4 +++- src/plugins/qtsupport/exampleslistmodel.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/marketplace/productlistmodel.cpp b/src/plugins/marketplace/productlistmodel.cpp index 0e240cc243e..13aabe176b8 100644 --- a/src/plugins/marketplace/productlistmodel.cpp +++ b/src/plugins/marketplace/productlistmodel.cpp @@ -33,6 +33,7 @@ #include #include +#include #include #include #include @@ -380,7 +381,8 @@ void SectionedProducts::onImageDownloadFinished(QNetworkReply *reply) if (reply->error() == QNetworkReply::NoError) { const QByteArray data = reply->readAll(); QPixmap pixmap; - if (pixmap.loadFromData(data)) { + const QString imageFormat = QFileInfo(reply->request().url().fileName()).suffix(); + if (pixmap.loadFromData(data, imageFormat.toLatin1())) { const QString url = reply->request().url().toString(); QPixmapCache::insert(url, pixmap.scaled(ProductListModel::defaultImageSize, Qt::KeepAspectRatio, Qt::SmoothTransformation)); diff --git a/src/plugins/qtsupport/exampleslistmodel.cpp b/src/plugins/qtsupport/exampleslistmodel.cpp index 9c895db6269..a983752838e 100644 --- a/src/plugins/qtsupport/exampleslistmodel.cpp +++ b/src/plugins/qtsupport/exampleslistmodel.cpp @@ -513,7 +513,7 @@ QPixmap ExamplesListModel::fetchPixmapAndUpdatePixmapCache(const QString &url) c if (!fetchedData.isEmpty()) { QBuffer imgBuffer(&fetchedData); imgBuffer.open(QIODevice::ReadOnly); - QImageReader reader(&imgBuffer); + QImageReader reader(&imgBuffer, QFileInfo(url).suffix().toLatin1()); QImage img = reader.read(); img = ScreenshotCropper::croppedImage(img, url, ListModel::defaultImageSize); pixmap = QPixmap::fromImage(img); From 6ba5054c1090ed6b5a34e43b3eb33f91932df7fa Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Mon, 26 Oct 2020 11:45:29 +0100 Subject: [PATCH 27/48] QmlDesigner: Simplify threading in image cache generator Change-Id: Ib969e6dae268c4564239d11c761873092e2dbb17 Reviewed-by: Thomas Hartmann Reviewed-by: Tim Jenssen --- .../imagecache/imagecachegenerator.cpp | 108 +++++++----------- .../imagecache/imagecachegenerator.h | 19 +-- tests/unit/unittest/imagecache-test.cpp | 12 +- .../unittest/imagecachegenerator-test.cpp | 30 +++-- 4 files changed, 76 insertions(+), 93 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/imagecache/imagecachegenerator.cpp b/src/plugins/qmldesigner/designercore/imagecache/imagecachegenerator.cpp index a6783fbf489..5b8f737515a 100644 --- a/src/plugins/qmldesigner/designercore/imagecache/imagecachegenerator.cpp +++ b/src/plugins/qmldesigner/designercore/imagecache/imagecachegenerator.cpp @@ -32,14 +32,23 @@ namespace QmlDesigner { +ImageCacheGenerator::ImageCacheGenerator(ImageCacheCollectorInterface &collector, + ImageCacheStorageInterface &storage) + : m_collector{collector} + , m_storage(storage) +{ + m_backgroundThread.reset(QThread::create([this]() { startGeneration(); })); + m_backgroundThread->start(); +} + ImageCacheGenerator::~ImageCacheGenerator() { - std::lock_guard threadLock{*m_threadMutex.get()}; + clean(); + stopThread(); + m_condition.notify_all(); if (m_backgroundThread) m_backgroundThread->wait(); - - clean(); } void ImageCacheGenerator::generateImage(Utils::SmallStringView name, @@ -48,50 +57,32 @@ void ImageCacheGenerator::generateImage(Utils::SmallStringView name, AbortCallback &&abortCallback) { { - std::lock_guard lock{m_dataMutex}; + std::lock_guard lock{m_mutex}; m_tasks.emplace_back(name, timeStamp, std::move(captureCallback), std::move(abortCallback)); } - startGenerationAsynchronously(); + m_condition.notify_all(); } void ImageCacheGenerator::clean() { - std::lock_guard dataLock{m_dataMutex}; + std::lock_guard lock{m_mutex}; + for (Task &task : m_tasks) + task.abortCallback(); m_tasks.clear(); } -class ReleaseProcessing +void ImageCacheGenerator::startGeneration() { -public: - ReleaseProcessing(std::atomic_flag &processing) - : m_processing(processing) - { - m_processing.test_and_set(std::memory_order_acquire); - } + while (isRunning()) { + waitForEntries(); - ~ReleaseProcessing() { m_processing.clear(std::memory_order_release); } - -private: - std::atomic_flag &m_processing; -}; - -void ImageCacheGenerator::startGeneration(std::shared_ptr threadMutex) -{ - ReleaseProcessing guard(m_processing); - - while (true) { Task task; { - std::unique_lock threadLock{*threadMutex.get(), std::defer_lock_t{}}; + std::lock_guard lock{m_mutex}; - if (!threadLock.try_lock()) - return; - - std::lock_guard dataLock{m_dataMutex}; - - if (m_tasks.empty()) { + if (m_finishing) { m_storage.walCheckpointFull(); return; } @@ -103,15 +94,7 @@ void ImageCacheGenerator::startGeneration(std::shared_ptr threadMute m_collector.start( task.filePath, - [this, threadMutex, task](QImage &&image) { - std::unique_lock lock{*threadMutex.get(), std::defer_lock_t{}}; - - if (!lock.try_lock()) - return; - - if (threadMutex.use_count() == 1) - return; - + [this, task](QImage &&image) { if (image.isNull()) task.abortCallback(); else @@ -119,41 +102,34 @@ void ImageCacheGenerator::startGeneration(std::shared_ptr threadMute m_storage.storeImage(std::move(task.filePath), task.timeStamp, image); }, - [this, threadMutex, task] { - std::unique_lock lock{*threadMutex.get(), std::defer_lock_t{}}; - - if (!lock.try_lock()) - return; - - if (threadMutex.use_count() == 1) - return; - + [this, task] { task.abortCallback(); m_storage.storeImage(std::move(task.filePath), task.timeStamp, {}); }); + + std::lock_guard lock{m_mutex}; + if (m_tasks.empty()) + m_storage.walCheckpointFull(); } } -void ImageCacheGenerator::startGenerationAsynchronously() +void ImageCacheGenerator::waitForEntries() { - if (m_processing.test_and_set(std::memory_order_acquire)) - return; + std::unique_lock lock{m_mutex}; + if (m_tasks.empty()) + m_condition.wait(lock, [&] { return m_tasks.size() || m_finishing; }); +} - std::unique_lock lock{*m_threadMutex.get(), std::defer_lock_t{}}; +void ImageCacheGenerator::stopThread() +{ + std::unique_lock lock{m_mutex}; + m_finishing = true; +} - if (!lock.try_lock()) - return; - - if (m_backgroundThread) - m_backgroundThread->wait(); - - m_backgroundThread.reset(QThread::create( - [this](std::shared_ptr threadMutex) { startGeneration(threadMutex); }, - m_threadMutex)); - m_backgroundThread->start(); - // m_backgroundThread = std::thread( - // [this](std::shared_ptr threadMutex) { startGeneration(threadMutex); }, - // m_threadMutex); +bool ImageCacheGenerator::isRunning() +{ + std::unique_lock lock{m_mutex}; + return !m_finishing; } } // namespace QmlDesigner diff --git a/src/plugins/qmldesigner/designercore/imagecache/imagecachegenerator.h b/src/plugins/qmldesigner/designercore/imagecache/imagecachegenerator.h index 207622714b6..945d53eabe5 100644 --- a/src/plugins/qmldesigner/designercore/imagecache/imagecachegenerator.h +++ b/src/plugins/qmldesigner/designercore/imagecache/imagecachegenerator.h @@ -46,10 +46,7 @@ class ImageCacheStorageInterface; class ImageCacheGenerator final : public ImageCacheGeneratorInterface { public: - ImageCacheGenerator(ImageCacheCollectorInterface &collector, ImageCacheStorageInterface &storage) - : m_collector{collector} - , m_storage(storage) - {} + ImageCacheGenerator(ImageCacheCollectorInterface &collector, ImageCacheStorageInterface &storage); ~ImageCacheGenerator(); @@ -79,17 +76,21 @@ private: Sqlite::TimeStamp timeStamp; }; - void startGeneration(std::shared_ptr threadMutex); - void startGenerationAsynchronously(); + void startGeneration(); + + void waitForEntries(); + void stopThread(); + bool isRunning(); +private: private: std::unique_ptr m_backgroundThread; - std::mutex m_dataMutex; - std::shared_ptr m_threadMutex{std::make_shared()}; + mutable std::mutex m_mutex; + std::condition_variable m_condition; std::vector m_tasks; ImageCacheCollectorInterface &m_collector; ImageCacheStorageInterface &m_storage; - std::atomic_flag m_processing = ATOMIC_FLAG_INIT; + bool m_finishing{false}; }; } // namespace QmlDesigner diff --git a/tests/unit/unittest/imagecache-test.cpp b/tests/unit/unittest/imagecache-test.cpp index 42193357749..f3f2c825180 100644 --- a/tests/unit/unittest/imagecache-test.cpp +++ b/tests/unit/unittest/imagecache-test.cpp @@ -39,12 +39,12 @@ class ImageCache : public testing::Test protected: Notification notification; Notification waitInThread; + NiceMock> mockAbortCallback; + NiceMock> mockCaptureCallback; NiceMock mockStorage; NiceMock mockGenerator; NiceMock mockTimeStampProvider; QmlDesigner::ImageCache cache{mockStorage, mockGenerator, mockTimeStampProvider}; - NiceMock> mockAbortCallback; - NiceMock> mockCaptureCallback; QImage image1{10, 10, QImage::Format_ARGB32}; }; @@ -260,14 +260,10 @@ TEST_F(ImageCache, RequestIconCallsAbortCallbackFromGenerator) TEST_F(ImageCache, CleanRemovesEntries) { - EXPECT_CALL(mockGenerator, generateImage(Eq("/path/to/Component1.qml"), _, _, _)) - .WillRepeatedly([&](auto &&, auto, auto &&mockCaptureCallback, auto &&) { - mockCaptureCallback(QImage{}); - waitInThread.wait(); - }); EXPECT_CALL(mockGenerator, generateImage(_, _, _, _)) .WillRepeatedly([&](auto &&, auto, auto &&mockCaptureCallback, auto &&) { mockCaptureCallback(QImage{}); + waitInThread.wait(); }); cache.requestIcon("/path/to/Component1.qml", mockCaptureCallback.AsStdFunction(), @@ -284,7 +280,7 @@ TEST_F(ImageCache, CleanRemovesEntries) TEST_F(ImageCache, CleanCallsAbort) { - ON_CALL(mockGenerator, generateImage(Eq("/path/to/Component1.qml"), _, _, _)) + ON_CALL(mockGenerator, generateImage(_, _, _, _)) .WillByDefault( [&](auto &&, auto, auto &&mockCaptureCallback, auto &&) { waitInThread.wait(); }); cache.requestIcon("/path/to/Component1.qml", diff --git a/tests/unit/unittest/imagecachegenerator-test.cpp b/tests/unit/unittest/imagecachegenerator-test.cpp index f152bd83ad3..3b183d00672 100644 --- a/tests/unit/unittest/imagecachegenerator-test.cpp +++ b/tests/unit/unittest/imagecachegenerator-test.cpp @@ -106,10 +106,22 @@ TEST_F(ImageCacheGenerator, DontCrashAtDestructingGenerator) captureCallback(QImage{image1}); }); - generator.generateImage("name", {}, imageCallbackMock.AsStdFunction(), {}); - generator.generateImage("name2", {}, imageCallbackMock.AsStdFunction(), {}); - generator.generateImage("name3", {}, imageCallbackMock.AsStdFunction(), {}); - generator.generateImage("name4", {}, imageCallbackMock.AsStdFunction(), {}); + generator.generateImage("name", + {}, + imageCallbackMock.AsStdFunction(), + abortCallbackMock.AsStdFunction()); + generator.generateImage("name2", + {}, + imageCallbackMock.AsStdFunction(), + abortCallbackMock.AsStdFunction()); + generator.generateImage("name3", + {}, + imageCallbackMock.AsStdFunction(), + abortCallbackMock.AsStdFunction()); + generator.generateImage("name4", + {}, + imageCallbackMock.AsStdFunction(), + abortCallbackMock.AsStdFunction()); } TEST_F(ImageCacheGenerator, StoreImage) @@ -168,11 +180,10 @@ TEST_F(ImageCacheGenerator, StoreNullImageForAbortCallback) { ON_CALL(collectorMock, start(_, _, _)).WillByDefault([&](auto, auto, auto abortCallback) { abortCallback(); - notification.notify(); }); - EXPECT_CALL(abortCallbackMock, Call()).WillOnce([&]() { notification.notify(); }); - EXPECT_CALL(storageMock, storeImage(Eq("name"), Eq(Sqlite::TimeStamp{11}), Eq(QImage{}))); + EXPECT_CALL(storageMock, storeImage(Eq("name"), Eq(Sqlite::TimeStamp{11}), Eq(QImage{}))) + .WillOnce([&](auto, auto, auto) { notification.notify(); }); generator.generateImage("name", {11}, @@ -183,7 +194,6 @@ TEST_F(ImageCacheGenerator, StoreNullImageForAbortCallback) TEST_F(ImageCacheGenerator, AbortForEmptyImage) { - NiceMock> abortCallbackMock; ON_CALL(collectorMock, start(Eq("name"), _, _)).WillByDefault([&](auto, auto captureCallback, auto) { captureCallback(QImage{}); }); @@ -216,7 +226,7 @@ TEST_F(ImageCacheGenerator, CallWalCheckpointFullIfQueueIsEmpty) notification.wait(); } -TEST_F(ImageCacheGenerator, Clean) +TEST_F(ImageCacheGenerator, CleanIsCallingAbortCallback) { ON_CALL(collectorMock, start(_, _, _)).WillByDefault([&](auto, auto captureCallback, auto) { captureCallback({}); @@ -231,7 +241,7 @@ TEST_F(ImageCacheGenerator, Clean) imageCallbackMock.AsStdFunction(), abortCallbackMock.AsStdFunction()); - EXPECT_CALL(imageCallbackMock, Call(_)).Times(0); + EXPECT_CALL(abortCallbackMock, Call()).Times(AtLeast(1)); generator.clean(); waitInThread.notify(); From 4c7fd32fa0f7ed00af8fc96b7a710927fcc4e8e0 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 27 Oct 2020 13:11:46 +0100 Subject: [PATCH 28/48] cmake build: Add support for setting user file extension Via QtCreatorIDEBranding.cmake Task-number: QTCREATORBUG-22488 Change-Id: I42699732640b67672b87b2de06f10b9da57bee7e Reviewed-by: Cristian Adam --- src/plugins/projectexplorer/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/plugins/projectexplorer/CMakeLists.txt b/src/plugins/projectexplorer/CMakeLists.txt index 13ede53da94..87e3a45bfd8 100644 --- a/src/plugins/projectexplorer/CMakeLists.txt +++ b/src/plugins/projectexplorer/CMakeLists.txt @@ -183,6 +183,11 @@ add_qtc_plugin(ProjectExplorer xcodebuildparser.cpp xcodebuildparser.h ) +extend_qtc_plugin(ProjectExplorer + CONDITION PROJECT_USER_FILE_EXTENSION + DEFINES "PROJECT_USER_FILE_EXTENSION=${PROJECT_USER_FILE_EXTENSION}" +) + if (TARGET libclang) set(CLANG_BINDIR "$") endif() From 240fba0222d1f9db8b8be48cc27c015e2c5a3f9b Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 27 Oct 2020 13:28:37 +0100 Subject: [PATCH 29/48] cmake build: Allow branding to change documentation file Task-number: QTCREATORBUG-22488 Change-Id: I80a1feafa7b027dc99acdb019359037ae0259573 Reviewed-by: Cristian Adam --- cmake/QtCreatorIDEBranding.cmake | 6 ++++-- doc/CMakeLists.txt | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake index 3f5164ebb07..473c6fdaf62 100644 --- a/cmake/QtCreatorIDEBranding.cmake +++ b/cmake/QtCreatorIDEBranding.cmake @@ -1,5 +1,3 @@ -#PROJECT_USER_FILE_EXTENSION = .user - set(IDE_VERSION "4.13.82") # The IDE version. set(IDE_VERSION_COMPAT "4.13.82") # The IDE Compatibility version. set(IDE_VERSION_DISPLAY "4.14.0-beta1") # The IDE display version. @@ -11,3 +9,7 @@ set(IDE_DISPLAY_NAME "Qt Creator") # The IDE display name. set(IDE_ID "qtcreator") # The IDE id (no spaces, lowercase!) set(IDE_CASED_ID "QtCreator") # The cased IDE id (no spaces!) set(IDE_BUNDLE_IDENTIFIER "org.qt-project.${IDE_ID}") # The macOS application bundle identifier. + +set(PROJECT_USER_FILE_EXTENSION .user) +set(IDE_DOC_FILE "qtcreator/qtcreator.qdocconf") +set(IDE_DOC_FILE_ONLINE "qtcreator/qtcreator-online.qdocconf") diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index c453903cf09..8425aa50241 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -32,7 +32,7 @@ function(_find_all_includes _ret_includes _ret_framework_paths) endfunction() if (WITH_DOCS) - add_qtc_documentation("qtcreator/qtcreator.qdocconf") + add_qtc_documentation(${IDE_DOC_FILE}) if (BUILD_DEVELOPER_DOCS) _find_all_includes(_all_includes _framework_paths) add_qtc_documentation("qtcreatordev/qtcreator-dev.qdocconf" @@ -42,7 +42,7 @@ if (WITH_DOCS) endif() endif() if(WITH_ONLINE_DOCS) - add_qtc_documentation("qtcreator/qtcreator-online.qdocconf") + add_qtc_documentation(${IDE_DOC_FILE_ONLINE}) if (BUILD_DEVELOPER_DOCS) _find_all_includes(_all_includes _framework_paths) add_qtc_documentation("qtcreatordev/qtcreator-dev-online.qdocconf" From 80d25cdebd26b4a99d43a7b23ee6c6d070723bbf Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 27 Oct 2020 17:13:07 +0100 Subject: [PATCH 30/48] CppRefactoring: Disable failing tests Has to fixed later or removed completely. Change-Id: I3a62b4ecde60f6877164e994e664f7b015b9d3fc Reviewed-by: Christian Stenger --- tests/unit/unittest/pchcreator-test.cpp | 2 +- tests/unit/unittest/symbolscollector-test.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/unit/unittest/pchcreator-test.cpp b/tests/unit/unittest/pchcreator-test.cpp index c7268a51d8a..04561a230b1 100644 --- a/tests/unit/unittest/pchcreator-test.cpp +++ b/tests/unit/unittest/pchcreator-test.cpp @@ -362,7 +362,7 @@ TEST_F(PchCreatorVerySlowTest, ClangToolCleared) ASSERT_TRUE(creator.clangTool().isClean()); } -TEST_F(PchCreatorVerySlowTest, FaultyProjectPartPchForCreatesFaultyPchForPchTask) +TEST_F(PchCreatorVerySlowTest, DISABLED_FaultyProjectPartPchForCreatesFaultyPchForPchTask) { PchTask faultyPchTask{ 0, diff --git a/tests/unit/unittest/symbolscollector-test.cpp b/tests/unit/unittest/symbolscollector-test.cpp index 5954f8a9f5a..84fc26ca89b 100644 --- a/tests/unit/unittest/symbolscollector-test.cpp +++ b/tests/unit/unittest/symbolscollector-test.cpp @@ -190,7 +190,7 @@ TEST_F(SymbolsCollector, CollectSymbolName) Contains(HasSymbolName("function"))); } -TEST_F(SymbolsCollector, SymbolMatchesLocation) +TEST_F(SymbolsCollector, DISABLED_SymbolMatchesLocation) { collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/simple.cpp"), {"cc"}); @@ -202,7 +202,7 @@ TEST_F(SymbolsCollector, SymbolMatchesLocation) HasLineColumn(1, 6)))); } -TEST_F(SymbolsCollector, OtherSymboldMatchesLocation) +TEST_F(SymbolsCollector, DISABLED_OtherSymboldMatchesLocation) { collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/simple.cpp"), {"cc"}); @@ -250,7 +250,7 @@ TEST_F(SymbolsCollector, CollectReference) Field(&SourceLocationEntry::kind, SourceLocationKind::DeclarationReference)))); } -TEST_F(SymbolsCollector, ReferencedSymboldMatchesLocation) +TEST_F(SymbolsCollector, DISABLED_ReferencedSymboldMatchesLocation) { collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/simple.cpp"), {"cc"}); From 7becdf9a93b01fce6bdd85b3b15b510dc2073ef4 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 28 Oct 2020 11:37:06 +0100 Subject: [PATCH 31/48] More change log for 4.14 Change-Id: I64bf5e2ea9de35180689bce078a892f93ff3d7c1 Reviewed-by: Leena Miettinen --- dist/changes-4.14.0.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dist/changes-4.14.0.md b/dist/changes-4.14.0.md index 3cc8c567eca..4da0dab84ae 100644 --- a/dist/changes-4.14.0.md +++ b/dist/changes-4.14.0.md @@ -37,6 +37,7 @@ Editing (QTCREATORBUG-10066) * Added action for showing function arguments hint (QTCREATORBUG-19394) * Added option for after how many characters auto-completion may trigger (QTCREATORBUG-19920) +* Added highlighting for structured bindings (QTCREATORBUG-24769) * Restricted completion for second argument of `connect` calls to signals (QTCREATORBUG-13558) * Fixed crash of backend with multiline `Q_PROPERTY` declarations (QTCREATORBUG-24746) * Fixed duplicate items appearing in include completion (QTCREATORBUG-24515) @@ -50,9 +51,11 @@ Editing implemented operators (QTCREATORBUG-12218) * Fixed that `Complete switch statement` indents unrelated code (QTCREATORBUG-12445) * Fixed `Complete switch statement` with templates (QTCREATORBUG-24752) +* Fixed `Complete switch statement` for enum classes (QTCREATORBUG-20475) * Fixed that `Apply function signature change` removed return values from `std::function` arguments (QTCREATORBUG-13698) * Fixed handling of multiple inheritance in `Insert Virtual Functions` (QTCREATORBUG-12223) +* Fixed issue with `Convert to Camel Case` (QTCREATORBUG-16560) * Fixed auto-indentation for lambdas with trailing return type (QTCREATORBUG-18497) * Fixed indentation when starting new line in documentation comments (QTCREATORBUG-11749) * Fixed that auto-indentation was applied within multiline string literals @@ -85,6 +88,7 @@ Projects ### qmake * Added option to not execute `system` directives (QTCREATORBUG-24551) +* Fixed deployment with wildcards (QTCREATORBUG-24695) ### Wizards @@ -135,6 +139,7 @@ Test Integration ---------------- * Made it easier to re-run failed tests +* Added support for `QTest::addRow()` (QTCREATORBUG-24777) Platforms --------- From b5e9dd006a25dd9fbfca78431bf9742cafe31dcc Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 27 Oct 2020 17:54:53 +0100 Subject: [PATCH 32/48] Marketplace: Implement a little optimization Should have been done in a previous commit. Amends: b77318cb746fff43b22d704f53688ff5ce6591f2 Change-Id: Ic3800ca6b6a4e799a5545aa9c68d9f7f7ccfcb20 Reviewed-by: Christian Stenger --- src/plugins/marketplace/productlistmodel.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/marketplace/productlistmodel.cpp b/src/plugins/marketplace/productlistmodel.cpp index 13aabe176b8..476b7f1a92a 100644 --- a/src/plugins/marketplace/productlistmodel.cpp +++ b/src/plugins/marketplace/productlistmodel.cpp @@ -381,9 +381,10 @@ void SectionedProducts::onImageDownloadFinished(QNetworkReply *reply) if (reply->error() == QNetworkReply::NoError) { const QByteArray data = reply->readAll(); QPixmap pixmap; - const QString imageFormat = QFileInfo(reply->request().url().fileName()).suffix(); + const QUrl imageUrl = reply->request().url(); + const QString imageFormat = QFileInfo(imageUrl.fileName()).suffix(); if (pixmap.loadFromData(data, imageFormat.toLatin1())) { - const QString url = reply->request().url().toString(); + const QString url = imageUrl.toString(); QPixmapCache::insert(url, pixmap.scaled(ProductListModel::defaultImageSize, Qt::KeepAspectRatio, Qt::SmoothTransformation)); for (ProductListModel *model : m_productModels.values()) From d2ebc16b92cfe10eff6b379b32cb0e07329f29df Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 26 Oct 2020 15:07:55 +0100 Subject: [PATCH 33/48] CppEditor: Fix "move definition" quickfix for template member functions There are a lot more problems in this area (e.g. with nested classes), but let's tackle them one by one. Fixes: QTCREATORBUG-24801 Change-Id: I4b3805ea6f8b28373925693650150bbd89508096 Reviewed-by: Christian Stenger --- src/libs/cplusplus/TypePrettyPrinter.cpp | 30 +++++++++++++++++++++- src/plugins/cppeditor/cppeditorplugin.h | 1 + src/plugins/cppeditor/cppquickfix_test.cpp | 19 +++++++++++++- src/plugins/cppeditor/cppquickfixes.cpp | 1 + 4 files changed, 49 insertions(+), 2 deletions(-) diff --git a/src/libs/cplusplus/TypePrettyPrinter.cpp b/src/libs/cplusplus/TypePrettyPrinter.cpp index 193a00803c4..c85444a2287 100644 --- a/src/libs/cplusplus/TypePrettyPrinter.cpp +++ b/src/libs/cplusplus/TypePrettyPrinter.cpp @@ -383,6 +383,31 @@ static bool endsWithPtrOrRef(const QString &type) void TypePrettyPrinter::visit(Function *type) { + if (_overview->showTemplateParameters) { + QStringList nameParts = _name.split("::"); + int i = nameParts.length() - 1; + for (Scope *s = type->enclosingScope(); s && i >= 0; s = s->enclosingScope()) { + if (Template *templ = s->asTemplate()) { + QString &n = nameParts[i]; + n += '<'; + for (int index = 0; index < templ->templateParameterCount(); ++index) { + if (index) + n += QLatin1String(", "); + QString arg = _overview->prettyName(templ->templateParameterAt(index)->name()); + if (arg.isEmpty()) { + arg += 'T'; + arg += QString::number(index + 1); + } + n += arg; + } + n += '>'; + } + if (s->identifier()) + --i; + } + _name = nameParts.join("::"); + } + if (_needsParens) { _text.prepend(QLatin1Char('(')); if (! _name.isEmpty()) { @@ -417,7 +442,10 @@ void TypePrettyPrinter::visit(Function *type) if (TypenameArgument *typenameArg = param->asTypenameArgument()) { templateScope.append(QLatin1String(typenameArg->isClassDeclarator() ? "class " : "typename ")); - templateScope.append(_overview->prettyName(typenameArg->name())); + QString name = _overview->prettyName(typenameArg->name()); + if (name.isEmpty()) + name.append('T').append(QString::number(i + 1)); + templateScope.append(name); } else if (Argument *arg = param->asArgument()) { templateScope.append(operator()(arg->type(), _overview->prettyName(arg->name()))); diff --git a/src/plugins/cppeditor/cppeditorplugin.h b/src/plugins/cppeditor/cppeditorplugin.h index 869bc68bb5f..5d13949563c 100644 --- a/src/plugins/cppeditor/cppeditorplugin.h +++ b/src/plugins/cppeditor/cppeditorplugin.h @@ -177,6 +177,7 @@ private slots: void test_quickfix_MoveFuncDefOutside_respectWsInOperatorNames2(); void test_quickfix_MoveFuncDefOutside_macroUses(); void test_quickfix_MoveFuncDefOutside_template(); + void test_quickfix_MoveFuncDefOutside_unnamedTemplate(); void test_quickfix_MoveAllFuncDefOutside_MemberFuncToCpp(); void test_quickfix_MoveAllFuncDefOutside_MemberFuncOutside(); diff --git a/src/plugins/cppeditor/cppquickfix_test.cpp b/src/plugins/cppeditor/cppquickfix_test.cpp index b45fe7e911e..793f3113a89 100644 --- a/src/plugins/cppeditor/cppquickfix_test.cpp +++ b/src/plugins/cppeditor/cppquickfix_test.cpp @@ -5573,7 +5573,24 @@ void CppEditorPlugin::test_quickfix_MoveFuncDefOutside_template() "class Foo { void fu@nc(); };\n" "\n" "template\n" - "void Foo::func() {}\n"; // Should be Foo::func + "void Foo::func() {}\n"; + ; + + MoveFuncDefOutside factory; + QuickFixOperationTest(singleDocument(original, expected), &factory); +} + +void CppEditorPlugin::test_quickfix_MoveFuncDefOutside_unnamedTemplate() +{ + QByteArray original = + "template\n" + "class Foo { void fu@nc() {} };\n"; + QByteArray expected = + "template\n" + "class Foo { void fu@nc(); };\n" + "\n" + "template\n" + "void Foo::func() {}\n"; ; MoveFuncDefOutside factory; diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp index a59f2c18f2d..9d1fa2e03e4 100644 --- a/src/plugins/cppeditor/cppquickfixes.cpp +++ b/src/plugins/cppeditor/cppquickfixes.cpp @@ -5952,6 +5952,7 @@ QString definitionSignature(const CppQuickFixInterface *assist, oo.showReturnTypes = true; oo.showArgumentNames = true; oo.showEnclosingTemplate = true; + oo.showTemplateParameters = true; const Name *name = func->name(); if (name && nameIncludesOperatorName(name)) { CoreDeclaratorAST *coreDeclarator = functionDefinitionAST->declarator->core_declarator; From 7b6ab79f3ecaea8e1c3796efe2cbfbf37e09a0a1 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 28 Oct 2020 12:10:55 +0100 Subject: [PATCH 34/48] ClangTools: Do not include our wrapped Qt headers These are only necessary for the code model and can prevent clazy from finding certain issues. Fixes: QTCREATORBUG-24845 Change-Id: I04ba6703812918c39ebbde1dbac5af85fe18622d Reviewed-by: David Schulz --- src/plugins/clangtools/clangtoolruncontrol.cpp | 2 +- src/plugins/cpptools/compileroptionsbuilder.cpp | 3 ++- src/plugins/cpptools/compileroptionsbuilder.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/clangtools/clangtoolruncontrol.cpp b/src/plugins/clangtools/clangtoolruncontrol.cpp index 738e98fa6ca..fda0b596ee2 100644 --- a/src/plugins/clangtools/clangtoolruncontrol.cpp +++ b/src/plugins/clangtools/clangtoolruncontrol.cpp @@ -121,7 +121,7 @@ AnalyzeUnit::AnalyzeUnit(const FileInfo &fileInfo, { CompilerOptionsBuilder optionsBuilder(*fileInfo.projectPart, UseSystemHeader::No, - UseTweakedHeaderPaths::Yes, + UseTweakedHeaderPaths::Tools, UseLanguageDefines::No, UseBuildSystemWarnings::No, clangVersion, diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index ff51c43504f..246298d98c1 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -298,7 +298,8 @@ void CompilerOptionsBuilder::enableExceptions() void CompilerOptionsBuilder::insertWrappedQtHeaders() { - insertWrappedHeaders(wrappedQtHeadersIncludePath()); + if (m_useTweakedHeaderPaths == UseTweakedHeaderPaths::Yes) + insertWrappedHeaders(wrappedQtHeadersIncludePath()); } void CompilerOptionsBuilder::insertWrappedMingwHeaders() diff --git a/src/plugins/cpptools/compileroptionsbuilder.h b/src/plugins/cpptools/compileroptionsbuilder.h index a83aba74666..af4663930f4 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.h +++ b/src/plugins/cpptools/compileroptionsbuilder.h @@ -33,7 +33,7 @@ namespace CppTools { enum class UsePrecompiledHeaders : char { Yes, No }; enum class UseSystemHeader : char { Yes, No }; -enum class UseTweakedHeaderPaths : char { Yes, No }; +enum class UseTweakedHeaderPaths : char { Yes, Tools, No }; enum class UseToolchainMacros : char { Yes, No }; enum class UseLanguageDefines : char { Yes, No }; enum class UseBuildSystemWarnings : char { Yes, No }; From 985f6073dabb8a2823be7e3c6180ddecbaa9369a Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Wed, 28 Oct 2020 09:59:01 +0100 Subject: [PATCH 35/48] QmlDesigner: Fix ColorEditor dragging Fix ColorEditor dragging by preventing that the mouse event gets stolen from the Flickable underneath. Task-number: QDS-2955 Change-Id: I3950d8fce3d3b59980a01f1c96bdb55aab56f263 Reviewed-by: Thomas Hartmann --- .../imports/HelperWidgets/ColorButton.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorButton.qml index e609297149d..afba6def0c7 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorButton.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorButton.qml @@ -201,6 +201,7 @@ Item { MouseArea { id: mapMouseArea anchors.fill: parent + preventStealing: true onPositionChanged: { if (pressed && mouse.buttons === Qt.LeftButton) { var xx = Math.max(0, Math.min(mouse.x, parent.width)) From 2c910805020622caadb25a34bdbf1c253a4caf62 Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Wed, 28 Oct 2020 10:39:17 +0100 Subject: [PATCH 36/48] QmlDesigner: Fix navigator root icons clickable * Fix root item icon columns clickable * Hide tooltip for root item icons Task-number: QDS-3006 Change-Id: Icd6177bfce30724bb4806aeec4768232760b35e9 Reviewed-by: Thomas Hartmann --- .../components/navigator/navigatortreemodel.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index f02e41fc863..16cb7e50ea7 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -247,19 +247,19 @@ QVariant NavigatorTreeModel::data(const QModelIndex &index, int role) const } else if (index.column() == ColumnType::Alias) { // export if (role == Qt::CheckStateRole) return currentQmlObjectNode.isAliasExported() ? Qt::Checked : Qt::Unchecked; - else if (role == Qt::ToolTipRole) + else if (role == Qt::ToolTipRole && !modelNodeForIndex(index).isRootNode()) return tr("Toggles whether this item is exported as an " "alias property of the root item."); } else if (index.column() == ColumnType::Visibility) { // visible if (role == Qt::CheckStateRole) return m_view->isNodeInvisible(modelNode) ? Qt::Unchecked : Qt::Checked; - else if (role == Qt::ToolTipRole) + else if (role == Qt::ToolTipRole && !modelNodeForIndex(index).isRootNode()) return tr("Toggles the visibility of this item in the form editor.\n" "This is independent of the visibility property in QML."); } else if (index.column() == ColumnType::Lock) { // lock if (role == Qt::CheckStateRole) return modelNode.locked() ? Qt::Checked : Qt::Unchecked; - else if (role == Qt::ToolTipRole) + else if (role == Qt::ToolTipRole && !modelNodeForIndex(index).isRootNode()) return tr("Toggles whether this item is locked.\n" "Locked items can't be modified or selected."); } @@ -269,6 +269,14 @@ QVariant NavigatorTreeModel::data(const QModelIndex &index, int role) const Qt::ItemFlags NavigatorTreeModel::flags(const QModelIndex &index) const { + if (modelNodeForIndex(index).isRootNode()) { + Qt::ItemFlags flags = Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDropEnabled; + if (index.column() == ColumnType::Name) + return flags | Qt::ItemIsEditable; + else + return flags; + } + if (index.column() == ColumnType::Alias || index.column() == ColumnType::Visibility || index.column() == ColumnType::Lock) From 7f44ef76f1867c779048d1f75a1c413982bd9a3d Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Wed, 28 Oct 2020 09:27:26 +0100 Subject: [PATCH 37/48] QmlDesigner: Fix view menu constants and comments Change-Id: If48b80fc2d928d177d59693371ba9d8f9d66bfca Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/designmodewidget.cpp | 8 ++++---- src/plugins/qmldesigner/qmldesignerconstants.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index 2bb61467a91..e45d4ef2bd7 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/src/plugins/qmldesigner/designmodewidget.cpp @@ -273,11 +273,11 @@ void DesignModeWidget::setup() // Setup Actions and Menus Core::ActionContainer *mview = Core::ActionManager::actionContainer(Core::Constants::M_VIEW); - // Window > Views + // View > Views Core::ActionContainer *mviews = Core::ActionManager::createMenu(Core::Constants::M_VIEW_VIEWS); mviews->menu()->addSeparator(); - // Window > Workspaces - Core::ActionContainer *mworkspaces = Core::ActionManager::createMenu(QmlDesigner::Constants::M_WINDOW_WORKSPACES); + // View > Workspaces + Core::ActionContainer *mworkspaces = Core::ActionManager::createMenu(QmlDesigner::Constants::M_VIEW_WORKSPACES); mview->addMenu(mworkspaces, Core::Constants::G_VIEW_VIEWS); mworkspaces->menu()->setTitle(tr("&Workspaces")); mworkspaces->setOnAllDisabledBehavior(Core::ActionContainer::Show); @@ -488,7 +488,7 @@ void DesignModeWidget::setup() void DesignModeWidget::aboutToShowWorkspaces() { - Core::ActionContainer *aci = Core::ActionManager::actionContainer(QmlDesigner::Constants::M_WINDOW_WORKSPACES); + Core::ActionContainer *aci = Core::ActionManager::actionContainer(QmlDesigner::Constants::M_VIEW_WORKSPACES); QMenu *menu = aci->menu(); menu->clear(); diff --git a/src/plugins/qmldesigner/qmldesignerconstants.h b/src/plugins/qmldesigner/qmldesignerconstants.h index 950cfa43122..c32f5b62ecf 100644 --- a/src/plugins/qmldesigner/qmldesignerconstants.h +++ b/src/plugins/qmldesigner/qmldesignerconstants.h @@ -73,7 +73,7 @@ const char DEFAULT_ASSET_IMPORT_FOLDER[] = "/asset_imports"; const char QT_QUICK_3D_MODULE_NAME[] = "QtQuick3D"; // Menus -const char M_WINDOW_WORKSPACES[] = "QmlDesigner.Menu.Window.Workspaces"; +const char M_VIEW_WORKSPACES[] = "QmlDesigner.Menu.View.Workspaces"; const int MODELNODE_PREVIEW_IMAGE_DIMENSIONS = 150; From ce413d81d0976317dbccfb172f66b9897c128fde Mon Sep 17 00:00:00 2001 From: Vikas Pachdha Date: Fri, 23 Oct 2020 13:01:04 +0200 Subject: [PATCH 38/48] AssetExport: Export line height value in pixels Task-number: QDS-2597 Change-Id: I96db25b08db55c3107931ab31e4b9342be92e644 Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/CMakeLists.txt | 2 +- .../assetexporterplugin/assetexporterplugin.pri | 1 + .../assetexporterplugin/assetexporterplugin.qbs | 6 ++++++ .../assetexporterplugin/parsers/textnodeparser.cpp | 12 ++++++++++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index 21b1c9cf647..48c1f2cc874 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -42,7 +42,7 @@ add_qtc_plugin(QmlDesigner add_qtc_plugin(assetexporterplugin CONDITION TARGET QmlDesigner - DEPENDS Core ProjectExplorer QmlDesigner Utils Qt5::Qml + DEPENDS Core ProjectExplorer QmlDesigner Utils Qt5::Qml Qt5::QuickPrivate PUBLIC_INCLUDES assetexporterplugin SOURCES assetexporterplugin/assetexportdialog.h assetexporterplugin/assetexportdialog.cpp assetexporterplugin/assetexportdialog.ui diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.pri b/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.pri index 713ab1184fb..41b144f6853 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.pri +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.pri @@ -1,4 +1,5 @@ QT *= qml quick core widgets +QT += quick-private VPATH += $$PWD diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.qbs b/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.qbs index e847525324d..39b1b2909cd 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.qbs +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.qbs @@ -10,6 +10,12 @@ QtcProduct { Depends { name: "ProjectExplorer" } Depends { name: "QmlDesigner" } Depends { name: "Utils" } + Depends { + name: "Qt" + submodules: [ + "quick-private" + ] + } cpp.includePaths: base.concat([ "./", diff --git a/src/plugins/qmldesigner/assetexporterplugin/parsers/textnodeparser.cpp b/src/plugins/qmldesigner/assetexporterplugin/parsers/textnodeparser.cpp index dfbc78a75d9..1a0c938a6ad 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/parsers/textnodeparser.cpp +++ b/src/plugins/qmldesigner/assetexporterplugin/parsers/textnodeparser.cpp @@ -28,7 +28,11 @@ #include #include +#include #include +#include + +#include namespace { const QHash AlignMapping{ @@ -86,6 +90,14 @@ QJsonObject TextNodeParser::json(Component &component) const textDetails.insert(IsMultilineTag, propertyValue("wrapMode").toString().compare("NoWrap") != 0); + // Calculate line height in pixels + QFontMetricsF fm(font); + auto lineHeightMode = propertyValue("lineHeightMode").value(); + double lineHeight = propertyValue("lineHeight").toDouble(); + qreal lineHeightPx = (lineHeightMode == QQuickText::FixedHeight) ? + lineHeight : qCeil(fm.height()) * lineHeight; + textDetails.insert(LineHeightTag, lineHeightPx); + QJsonObject metadata = jsonObject.value(MetadataTag).toObject(); metadata.insert(TextDetailsTag, textDetails); jsonObject.insert(MetadataTag, metadata); From 050f6b083c4404d57914c9eb9ccc1d3e284e4e2a Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 28 Oct 2020 08:47:17 +0100 Subject: [PATCH 39/48] Qbs: Fix linking tests when building release with tests Change-Id: I5df34f06b5ca107b5e85cf6319d6d08aba244e5b Reviewed-by: Christian Kandeler --- src/libs/tracing/tracing.qbs | 3 ++- src/plugins/cpptools/cpptools.qbs | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/libs/tracing/tracing.qbs b/src/libs/tracing/tracing.qbs index 4705d9adc79..e037abb8281 100644 --- a/src/libs/tracing/tracing.qbs +++ b/src/libs/tracing/tracing.qbs @@ -9,6 +9,7 @@ Project { QtcLibrary { Depends { name: "Qt"; submodules: ["qml", "quick", "gui"] } + Depends { name: "Qt.testlib"; condition: project.withAutotests } Depends { name: "Utils" } Group { @@ -48,7 +49,7 @@ Project { Group { name: "Unit test utilities" - condition: qtc.testsEnabled + condition: project.withAutotests files: [ "runscenegraphtest.cpp", "runscenegraphtest.h" ] diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs index 161ea3fd1d5..8740eddb360 100644 --- a/src/plugins/cpptools/cpptools.qbs +++ b/src/plugins/cpptools/cpptools.qbs @@ -8,6 +8,7 @@ Project { QtcPlugin { Depends { name: "Qt.widgets" } + Depends { name: "Qt.testlib"; condition: project.withAutotests } Depends { name: "CPlusPlus" } Depends { name: "Utils" } @@ -216,6 +217,15 @@ Project { "usages.h", ] + Group { + name: "TestCase" + condition: qtc.testsEnabled || project.withAutotests + files: [ + "cpptoolstestcase.cpp", + "cpptoolstestcase.h", + ] + } + Group { name: "Tests" condition: qtc.testsEnabled @@ -230,8 +240,6 @@ Project { "cppsourceprocessertesthelper.cpp", "cppsourceprocessertesthelper.h", "cppsourceprocessor_test.cpp", - "cpptoolstestcase.cpp", - "cpptoolstestcase.h", "modelmanagertesthelper.cpp", "modelmanagertesthelper.h", "symbolsearcher_test.cpp", From ed678000a18a0a733ce30c12149d596a6af8cdfc Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 27 Oct 2020 15:08:09 +0100 Subject: [PATCH 40/48] Scripts: Fix deploying assetimporters on macOS Change-Id: If990ab8f5dcf482c671d8f39655f5372f8896fd3 Reviewed-by: Eike Ziller --- scripts/deployqtHelper_mac.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index f91423accb9..b4b283289de 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -64,9 +64,7 @@ if [ -d "$assetimporterSrcDir" ]; then if [ ! -d "$assetimporterDestDir" ]; then echo "- Copying 3d assetimporter plugins" mkdir -p "$assetimporterDestDir" - for plugin in "$assetimporterSrcDir"/*.dylib; do - cp "$plugin" "$assetimporterDestDir"/ || exit 1 - done + find "$assetimporterSrcDir" -iname "*.dylib" -maxdepth 1 -exec cp {} "$assetimporterDestDir"/ \; fi fi From 8ca3b557da71419fdb88f8ea8d33763fb0ac52df Mon Sep 17 00:00:00 2001 From: Knud Dollereder Date: Mon, 26 Oct 2020 15:26:17 +0100 Subject: [PATCH 41/48] Update locking state from external views and cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Improve treeview styling related to locking/pinning Use font icons. Show implicitly locked nodes by darkening text and icon. Show implicitly locked curves by darkening the text. Show unlocked/unpined icons only when hovering the mouse above the item. It is now possible to lock/pin multiple curves by locking/pinning the node items. Load unselected curves into the graphicsview when pinning them. Rename namespace DesignTools to QmlDesigner. Remove unused function from the timeline module. Get rid of a memory leak. Change-Id: I2c9c0a9e1ffe79520c4869178a11cc5825d04bbe Reviewed-by: Henning Gründl Reviewed-by: Thomas Hartmann --- .../components/curveeditor/animationcurve.cpp | 4 +- .../components/curveeditor/animationcurve.h | 4 +- .../components/curveeditor/curveeditor.cpp | 9 +- .../components/curveeditor/curveeditor.h | 4 +- .../curveeditor/curveeditormodel.cpp | 111 +++++++++---- .../components/curveeditor/curveeditormodel.h | 20 ++- .../components/curveeditor/curveeditorstyle.h | 35 ++-- .../curveeditor/curveeditorview.cpp | 151 ++++++++++-------- .../components/curveeditor/curveeditorview.h | 10 +- .../components/curveeditor/curvesegment.cpp | 4 +- .../components/curveeditor/curvesegment.h | 4 +- .../components/curveeditor/detail/axis.cpp | 4 +- .../components/curveeditor/detail/axis.h | 4 +- .../curveeditor/detail/colorcontrol.cpp | 8 +- .../curveeditor/detail/colorcontrol.h | 8 +- .../detail/curveeditorstyledialog.cpp | 56 +++---- .../detail/curveeditorstyledialog.h | 32 ++-- .../curveeditor/detail/curveitem.cpp | 12 +- .../components/curveeditor/detail/curveitem.h | 10 +- .../curveeditor/detail/graphicsscene.cpp | 33 +++- .../curveeditor/detail/graphicsscene.h | 6 +- .../curveeditor/detail/graphicsview.cpp | 125 ++++++++++----- .../curveeditor/detail/graphicsview.h | 14 +- .../curveeditor/detail/handleitem.cpp | 4 +- .../curveeditor/detail/handleitem.h | 4 +- .../curveeditor/detail/keyframeitem.cpp | 8 +- .../curveeditor/detail/keyframeitem.h | 4 +- .../curveeditor/detail/playhead.cpp | 5 +- .../components/curveeditor/detail/playhead.h | 4 +- .../curveeditor/detail/selectableitem.cpp | 4 +- .../curveeditor/detail/selectableitem.h | 7 +- .../curveeditor/detail/selectionmodel.cpp | 28 ++-- .../curveeditor/detail/selectionmodel.h | 11 +- .../curveeditor/detail/selector.cpp | 26 +-- .../components/curveeditor/detail/selector.h | 14 +- .../curveeditor/detail/shortcut.cpp | 4 +- .../components/curveeditor/detail/shortcut.h | 4 +- .../curveeditor/detail/treeitemdelegate.cpp | 91 ++++++----- .../curveeditor/detail/treeitemdelegate.h | 4 +- .../curveeditor/detail/treemodel.cpp | 63 +++++++- .../components/curveeditor/detail/treemodel.h | 24 ++- .../curveeditor/detail/treeview.cpp | 18 +-- .../components/curveeditor/detail/treeview.h | 8 +- .../components/curveeditor/detail/utils.cpp | 4 +- .../components/curveeditor/detail/utils.h | 13 +- .../components/curveeditor/keyframe.cpp | 4 +- .../components/curveeditor/keyframe.h | 4 +- .../components/curveeditor/treeitem.cpp | 124 +++++++++++--- .../components/curveeditor/treeitem.h | 46 ++++-- .../timelineeditor/timelinewidget.cpp | 35 ---- 50 files changed, 777 insertions(+), 456 deletions(-) diff --git a/src/plugins/qmldesigner/components/curveeditor/animationcurve.cpp b/src/plugins/qmldesigner/components/curveeditor/animationcurve.cpp index 237d89dcb20..9a88b332407 100644 --- a/src/plugins/qmldesigner/components/curveeditor/animationcurve.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/animationcurve.cpp @@ -33,7 +33,7 @@ #include -namespace DesignTools { +namespace QmlDesigner { AnimationCurve::AnimationCurve() : m_fromData(false) @@ -395,4 +395,4 @@ void AnimationCurve::analyze() } } -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/animationcurve.h b/src/plugins/qmldesigner/components/curveeditor/animationcurve.h index d8ea0d628f4..d364fd247c9 100644 --- a/src/plugins/qmldesigner/components/curveeditor/animationcurve.h +++ b/src/plugins/qmldesigner/components/curveeditor/animationcurve.h @@ -33,7 +33,7 @@ QT_FORWARD_DECLARE_CLASS(QEasingCurve); QT_FORWARD_DECLARE_CLASS(QPainterPath); -namespace DesignTools { +namespace QmlDesigner { class CurveSegment; @@ -100,4 +100,4 @@ private: std::vector m_frames; }; -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/curveeditor.cpp b/src/plugins/qmldesigner/components/curveeditor/curveeditor.cpp index 2db3509b184..1d238a265cc 100644 --- a/src/plugins/qmldesigner/components/curveeditor/curveeditor.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/curveeditor.cpp @@ -35,7 +35,7 @@ #include #include -namespace DesignTools { +namespace QmlDesigner { CurveEditor::CurveEditor(CurveEditorModel *model, QWidget *parent) : QWidget(parent) @@ -52,10 +52,9 @@ CurveEditor::CurveEditor(CurveEditorModel *model, QWidget *parent) box->addWidget(splitter); setLayout(box); - connect(m_tree, &TreeView::treeItemLocked, model, &CurveEditorModel::curveChanged); - connect(m_tree, &TreeView::treeItemPinned, model, &CurveEditorModel::curveChanged); + connect(m_tree, &TreeView::treeItemLocked, model, &CurveEditorModel::setLocked); + connect(m_tree, &TreeView::treeItemPinned, model, &CurveEditorModel::setPinned); - connect(m_tree, &TreeView::treeItemLocked, m_view, &GraphicsView::setLocked); connect(m_tree->selectionModel(), &SelectionModel::curvesSelected, m_view, @@ -180,4 +179,4 @@ QToolBar *CurveEditor::createToolBar(CurveEditorModel *model) return bar; } -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/curveeditor.h b/src/plugins/qmldesigner/components/curveeditor/curveeditor.h index 86f6c592578..f248a0ed080 100644 --- a/src/plugins/qmldesigner/components/curveeditor/curveeditor.h +++ b/src/plugins/qmldesigner/components/curveeditor/curveeditor.h @@ -28,7 +28,7 @@ #include #include -namespace DesignTools { +namespace QmlDesigner { class CurveEditorModel; class GraphicsView; @@ -57,4 +57,4 @@ private: GraphicsView *m_view; }; -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/curveeditormodel.cpp b/src/plugins/qmldesigner/components/curveeditor/curveeditormodel.cpp index 56b91d0af65..7827cf03c0f 100644 --- a/src/plugins/qmldesigner/components/curveeditor/curveeditormodel.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/curveeditormodel.cpp @@ -25,6 +25,7 @@ #include "curveeditormodel.h" #include "curveeditorstyle.h" +#include "detail/treeview.h" #include "treeitem.h" #include "detail/graphicsview.h" @@ -34,10 +35,11 @@ #include "qmltimeline.h" #include +#include #include #include -namespace DesignTools { +namespace QmlDesigner { CurveEditorModel::CurveEditorModel(QObject *parent) : TreeModel(parent) @@ -57,10 +59,10 @@ double CurveEditorModel::maximumTime() const return m_maxTime; } -DesignTools::CurveEditorStyle CurveEditorModel::style() const +CurveEditorStyle CurveEditorModel::style() const { // Pseudo auto generated. See: CurveEditorStyleDialog - DesignTools::CurveEditorStyle out; + CurveEditorStyle out; out.backgroundBrush = QBrush(QColor(21, 21, 21)); out.backgroundAlternateBrush = QBrush(QColor(32, 32, 32)); out.fontColor = QColor(255, 255, 255); @@ -98,9 +100,9 @@ void CurveEditorModel::setTimeline(const QmlDesigner::QmlTimeline &timeline) { m_minTime = timeline.startKeyframe(); m_maxTime = timeline.endKeyframe(); - std::vector items; + std::vector items; for (auto &&target : timeline.allTargets()) { - if (DesignTools::TreeItem *item = createTopLevelItem(timeline, target)) + if (TreeItem *item = createTopLevelItem(timeline, target)) items.push_back(item); } @@ -135,6 +137,32 @@ void CurveEditorModel::setCurve(unsigned int id, const AnimationCurve &curve) } } +void CurveEditorModel::setLocked(TreeItem *item, bool val) +{ + item->setLocked(val); + + if (auto *gview = graphicsView()) + gview->setLocked(item); + + if (auto *tview = treeView()) + tview->viewport()->update(); + + emit curveChanged(item); +} + +void CurveEditorModel::setPinned(TreeItem *item, bool val) +{ + item->setPinned(val); + + if (auto *gview = graphicsView()) + gview->setPinned(item); + + if (auto *tview = treeView()) + tview->viewport()->update(); + + emit curveChanged(item); +} + bool contains(const std::vector &selection, const TreeItem::Path &path) { for (auto &&sel : selection) @@ -176,38 +204,57 @@ void CurveEditorModel::reset(const std::vector &items) sm->selectPaths(sel); } -DesignTools::ValueType typeFrom(const QmlDesigner::QmlTimelineKeyframeGroup &group) +PropertyTreeItem::ValueType typeFrom(const QmlDesigner::QmlTimelineKeyframeGroup &group) { if (group.valueType() == QmlDesigner::TypeName("double") || group.valueType() == QmlDesigner::TypeName("real") || group.valueType() == QmlDesigner::TypeName("float")) - return DesignTools::ValueType::Double; + return PropertyTreeItem::ValueType::Double; if (group.valueType() == QmlDesigner::TypeName("boolean") || group.valueType() == QmlDesigner::TypeName("bool")) - return DesignTools::ValueType::Bool; + return PropertyTreeItem::ValueType::Bool; if (group.valueType() == QmlDesigner::TypeName("integer") || group.valueType() == QmlDesigner::TypeName("int")) - return DesignTools::ValueType::Integer; + return PropertyTreeItem::ValueType::Integer; // Ignoring: QColor / HAlignment / VAlignment - return DesignTools::ValueType::Undefined; + return PropertyTreeItem::ValueType::Undefined; } -DesignTools::TreeItem *CurveEditorModel::createTopLevelItem(const QmlDesigner::QmlTimeline &timeline, - const QmlDesigner::ModelNode &node) +std::vector parentIds(const QmlDesigner::ModelNode &node) +{ + std::vector out; + + QmlDesigner::ModelNode parent = node.parentProperty().parentModelNode(); + while (parent.isValid()) { + out.push_back(parent.id()); + + if (parent.hasParentProperty()) + parent = parent.parentProperty().parentModelNode(); + else + break; + } + return out; +} + +TreeItem *CurveEditorModel::createTopLevelItem(const QmlDesigner::QmlTimeline &timeline, + const QmlDesigner::ModelNode &node) { if (!node.isValid()) return nullptr; - auto *nodeItem = new DesignTools::NodeTreeItem(node.id(), QIcon(":/ICON_INSTANCE")); + auto *nodeItem = new NodeTreeItem(node.id(), node.typeIcon(), parentIds(node)); + if (node.hasAuxiliaryData("locked")) + nodeItem->setLocked(true); + for (auto &&grp : timeline.keyframeGroupsForTarget(node)) { if (grp.isValid()) { - DesignTools::AnimationCurve curve = createAnimationCurve(grp); + AnimationCurve curve = createAnimationCurve(grp); if (curve.isValid()) { QString name = QString::fromUtf8(grp.propertyName()); - auto propertyItem = new DesignTools::PropertyTreeItem(name, curve, typeFrom(grp)); + auto propertyItem = new PropertyTreeItem(name, curve, typeFrom(grp)); QmlDesigner::ModelNode target = grp.modelNode(); if (target.hasAuxiliaryData("locked")) @@ -229,25 +276,24 @@ DesignTools::TreeItem *CurveEditorModel::createTopLevelItem(const QmlDesigner::Q return nodeItem; } -DesignTools::AnimationCurve CurveEditorModel::createAnimationCurve( - const QmlDesigner::QmlTimelineKeyframeGroup &group) +AnimationCurve CurveEditorModel::createAnimationCurve(const QmlDesigner::QmlTimelineKeyframeGroup &group) { switch (typeFrom(group)) { - case DesignTools::ValueType::Bool: + case PropertyTreeItem::ValueType::Bool: return createDoubleCurve(group); - case DesignTools::ValueType::Integer: + case PropertyTreeItem::ValueType::Integer: return createDoubleCurve(group); - case DesignTools::ValueType::Double: + case PropertyTreeItem::ValueType::Double: return createDoubleCurve(group); default: - return DesignTools::AnimationCurve(); + return AnimationCurve(); } } -std::vector createKeyframes(QList nodes) +std::vector createKeyframes(QList nodes) { auto byTime = [](const auto &a, const auto &b) { return a.variantProperty("frame").value().toDouble() @@ -255,7 +301,7 @@ std::vector createKeyframes(QList }; std::sort(nodes.begin(), nodes.end(), byTime); - std::vector frames; + std::vector frames; for (auto &&node : nodes) { QVariant timeVariant = node.variantProperty("frame").value(); QVariant valueVariant = node.variantProperty("value").value(); @@ -264,7 +310,7 @@ std::vector createKeyframes(QList QPointF position(timeVariant.toDouble(), valueVariant.toDouble()); - auto keyframe = DesignTools::Keyframe(position); + auto keyframe = Keyframe(position); if (node.hasBindingProperty("easing.bezierCurve")) { QmlDesigner::EasingCurve ecurve; @@ -276,15 +322,15 @@ std::vector createKeyframes(QList return frames; } -std::vector resolveSmallCurves(const std::vector &frames) +std::vector resolveSmallCurves(const std::vector &frames) { - std::vector out; + std::vector out; for (auto &&frame : frames) { if (frame.hasData() && !out.empty()) { QEasingCurve curve = frame.data().toEasingCurve(); // One-segment-curve: Since (0,0) is implicit => 3 if (curve.toCubicSpline().count() == 3) { - DesignTools::Keyframe &previous = out.back(); + Keyframe &previous = out.back(); #if 0 // Do not resolve when two adjacent keyframes have the same value. if (qFuzzyCompare(previous.position().y(), frame.position().y())) { @@ -292,7 +338,7 @@ std::vector resolveSmallCurves(const std::vector resolveSmallCurves(const std::vector keyframes = createKeyframes(group.keyframePositions()); + std::vector keyframes = createKeyframes(group.keyframePositions()); keyframes = resolveSmallCurves(keyframes); QString str; @@ -321,7 +366,7 @@ DesignTools::AnimationCurve CurveEditorModel::createDoubleCurve( } } - return DesignTools::AnimationCurve(keyframes); + return AnimationCurve(keyframes); } -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/curveeditormodel.h b/src/plugins/qmldesigner/components/curveeditor/curveeditormodel.h index cf7575ca5c1..71fca7de039 100644 --- a/src/plugins/qmldesigner/components/curveeditor/curveeditormodel.h +++ b/src/plugins/qmldesigner/components/curveeditor/curveeditormodel.h @@ -35,7 +35,7 @@ QT_BEGIN_NAMESPACE class QPointF; QT_END_NAMESPACE -namespace DesignTools { +namespace QmlDesigner { struct CurveEditorStyle; @@ -54,7 +54,7 @@ signals: void commitEndFrame(int frame); - void curveChanged(PropertyTreeItem *item); + void curveChanged(TreeItem *item); public: CurveEditorModel(QObject *parent = nullptr); @@ -65,7 +65,7 @@ public: double maximumTime() const; - DesignTools::CurveEditorStyle style() const; + CurveEditorStyle style() const; public: void setTimeline(const QmlDesigner::QmlTimeline &timeline); @@ -78,19 +78,23 @@ public: void setCurve(unsigned int id, const AnimationCurve &curve); + void setLocked(TreeItem *item, bool val); + + void setPinned(TreeItem *item, bool val); + void reset(const std::vector &items); private: - DesignTools::TreeItem *createTopLevelItem(const QmlDesigner::QmlTimeline &timeline, - const QmlDesigner::ModelNode &node); + TreeItem *createTopLevelItem(const QmlDesigner::QmlTimeline &timeline, + const QmlDesigner::ModelNode &node); - DesignTools::AnimationCurve createAnimationCurve(const QmlDesigner::QmlTimelineKeyframeGroup &group); + AnimationCurve createAnimationCurve(const QmlDesigner::QmlTimelineKeyframeGroup &group); - DesignTools::AnimationCurve createDoubleCurve(const QmlDesigner::QmlTimelineKeyframeGroup &group); + AnimationCurve createDoubleCurve(const QmlDesigner::QmlTimelineKeyframeGroup &group); double m_minTime = 0.; double m_maxTime = 0.; }; -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/curveeditorstyle.h b/src/plugins/qmldesigner/components/curveeditor/curveeditorstyle.h index f6c6c378c59..eb5ef7ee71f 100644 --- a/src/plugins/qmldesigner/components/curveeditor/curveeditorstyle.h +++ b/src/plugins/qmldesigner/components/curveeditor/curveeditorstyle.h @@ -27,7 +27,9 @@ #include "detail/shortcut.h" +#include #include +#include #include #include @@ -38,15 +40,30 @@ #include -namespace DesignTools { +namespace QmlDesigner { struct TreeItemStyleOption { double margins; - QIcon pinnedIcon = QIcon(":/curveeditor/images/treeview_pin.png"); - QIcon unpinnedIcon = QIcon(":/curveeditor/images/treeview_unpin.png"); - QIcon lockedIcon = QIcon(":/curveeditor/images/treeview_lock.png"); - QIcon unlockedIcon = QIcon(":/curveeditor/images/treeview_unlock.png"); + + QIcon pinnedIcon = iconFromFont(QmlDesigner::Theme::Icon::pin); + QIcon unpinnedIcon = iconFromFont(QmlDesigner::Theme::Icon::unpin); + QIcon implicitlyPinnedIcon = iconFromFont(QmlDesigner::Theme::Icon::pin, Qt::gray); + QIcon lockedIcon = iconFromFont(QmlDesigner::Theme::Icon::lockOn); + QIcon unlockedIcon = iconFromFont(QmlDesigner::Theme::Icon::lockOff); + QIcon implicitlyLockedIcon = iconFromFont(QmlDesigner::Theme::Icon::lockOn, Qt::gray); + + static QIcon iconFromFont(QmlDesigner::Theme::Icon type, const QColor &color = Qt::white) + { + const QString fontName = "qtds_propertyIconFont.ttf"; + static const int fontSize = 28; + static const int iconSize = 28; + return Utils::StyleHelper::getIconFromIconFont(fontName, + QmlDesigner::Theme::getIconUnicode(type), + fontSize, + iconSize, + color); + } }; struct HandleItemStyleOption @@ -122,15 +139,15 @@ struct CurveEditorStyle QColor iconColor = QColor(128, 128, 128); QColor iconHoverColor = QColor(170, 170, 170); QColor gridColor = QColor(128, 128, 128); - double canvasMargin = 5.0; + int canvasMargin = 5; int zoomInWidth = 100; int zoomInHeight = 100; - double timeAxisHeight = 40.0; + int timeAxisHeight = 40; double timeOffsetLeft = 10.0; double timeOffsetRight = 10.0; QColor rangeBarColor = QColor(128, 128, 128); QColor rangeBarCapsColor = QColor(50, 50, 255); - double valueAxisWidth = 60.0; + int valueAxisWidth = 60; double valueOffsetTop = 10.0; double valueOffsetBottom = 10.0; double labelDensityY = 2.0; @@ -151,4 +168,4 @@ inline QPixmap pixmapFromIcon(const QIcon &icon, const QSize &size, const QColor return mask; } -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp b/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp index b84d386f8e3..51fc7c31a32 100644 --- a/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp @@ -27,6 +27,7 @@ #include "curveeditor.h" #include "curveeditormodel.h" #include "curvesegment.h" +#include "treeitem.h" #include #include @@ -42,29 +43,14 @@ namespace QmlDesigner { CurveEditorView::CurveEditorView(QObject *parent) : AbstractView(parent) , m_block(false) - , m_model(new DesignTools::CurveEditorModel()) - , m_editor(new DesignTools::CurveEditor(m_model)) + , m_model(new CurveEditorModel()) + , m_editor(new CurveEditor(m_model)) { Q_UNUSED(parent); - connect(m_model, - &DesignTools::CurveEditorModel::commitCurrentFrame, - this, - &CurveEditorView::commitCurrentFrame); - - connect(m_model, - &DesignTools::CurveEditorModel::commitStartFrame, - this, - &CurveEditorView::commitStartFrame); - - connect(m_model, - &DesignTools::CurveEditorModel::commitEndFrame, - this, - &CurveEditorView::commitEndFrame); - - connect(m_model, - &DesignTools::CurveEditorModel::curveChanged, - this, - &CurveEditorView::commitKeyframes); + connect(m_model, &CurveEditorModel::commitCurrentFrame, this, &CurveEditorView::commitCurrentFrame); + connect(m_model, &CurveEditorModel::commitStartFrame, this, &CurveEditorView::commitStartFrame); + connect(m_model, &CurveEditorModel::commitEndFrame, this, &CurveEditorView::commitEndFrame); + connect(m_model, &CurveEditorModel::curveChanged, this, &CurveEditorView::commitKeyframes); } CurveEditorView::~CurveEditorView() {} @@ -134,6 +120,18 @@ void CurveEditorView::nodeReparented(const ModelNode &node, updateKeyframes(); } +void CurveEditorView::auxiliaryDataChanged(const ModelNode &node, + const PropertyName &name, + const QVariant &data) +{ + if (name == "locked") { + if (auto *item = m_model->find(node.id())) { + QSignalBlocker blocker(m_model); + m_model->setLocked(item, data.toBool()); + } + } +} + void CurveEditorView::instancePropertyChanged(const QList> &propertyList) { Q_UNUSED(propertyList); @@ -261,9 +259,9 @@ void CurveEditorView::updateEndFrame(const ModelNode &node) m_model->setMaximumTime(static_cast(std::round(timeline.endKeyframe()))); } -ModelNode getTargetNode1(DesignTools::PropertyTreeItem *item, const QmlTimeline &timeline) +ModelNode getTargetNode(PropertyTreeItem *item, const QmlTimeline &timeline) { - if (const DesignTools::NodeTreeItem *nodeItem = item->parentNodeTreeItem()) { + if (const NodeTreeItem *nodeItem = item->parentNodeTreeItem()) { QString targetId = nodeItem->name(); if (timeline.isValid()) { for (auto &&target : timeline.allTargets()) { @@ -275,17 +273,16 @@ ModelNode getTargetNode1(DesignTools::PropertyTreeItem *item, const QmlTimeline return ModelNode(); } -QmlTimelineKeyframeGroup timelineKeyframeGroup1(QmlTimeline &timeline, - DesignTools::PropertyTreeItem *item) +QmlTimelineKeyframeGroup timelineKeyframeGroup(QmlTimeline &timeline, PropertyTreeItem *item) { - ModelNode node = getTargetNode1(item, timeline); + ModelNode node = getTargetNode(item, timeline); if (node.isValid()) return timeline.keyframeGroup(node, item->name().toLatin1()); return QmlTimelineKeyframeGroup(); } -void attachEasingCurve1(double frame, const QEasingCurve &curve, const QmlTimelineKeyframeGroup &group) +void attachEasingCurve(const QmlTimelineKeyframeGroup &group, double frame, const QEasingCurve &curve) { ModelNode frameNode = group.keyframe(frame); if (frameNode.isValid()) { @@ -294,61 +291,73 @@ void attachEasingCurve1(double frame, const QEasingCurve &curve, const QmlTimeli } } -void CurveEditorView::commitKeyframes(DesignTools::PropertyTreeItem *item) +void commitAuxiliaryData(ModelNode &node, TreeItem *item) { - QmlTimeline currentTimeline = activeTimeline(); - QmlTimelineKeyframeGroup group = timelineKeyframeGroup1(currentTimeline, item); + if (node.isValid()) { + if (item->locked()) + node.setAuxiliaryData("locked", true); + else + node.removeAuxiliaryData("locked"); - if (group.isValid()) { - ModelNode groupNode = group.modelNode(); + if (item->pinned()) + node.setAuxiliaryData("pinned", true); + else + node.removeAuxiliaryData("pinned"); - if (groupNode.isValid()) { - if (item->locked()) - groupNode.setAuxiliaryData("locked", true); + if (auto *pitem = item->asPropertyItem()) { + if (pitem->hasUnified()) + node.setAuxiliaryData("unified", pitem->unifyString()); else - groupNode.removeAuxiliaryData("locked"); - - if (item->pinned()) - groupNode.setAuxiliaryData("pinned", true); - else - groupNode.removeAuxiliaryData("pinned"); - - if (item->hasUnified()) - groupNode.setAuxiliaryData("unified", item->unifyString()); - else - groupNode.removeAuxiliaryData("unified"); + node.removeAuxiliaryData("unified"); } + } +} - auto replaceKeyframes = [&group, item, this]() { - m_block = true; - for (auto frame : group.keyframes()) - frame.destroy(); +void CurveEditorView::commitKeyframes(TreeItem *item) +{ + if (auto *nitem = item->asNodeItem()) { + ModelNode node = modelNodeForId(nitem->name()); + commitAuxiliaryData(node, item); - DesignTools::Keyframe previous; - for (auto &&frame : item->curve().keyframes()) { - QPointF pos = frame.position(); - group.setValue(QVariant(pos.y()), pos.x()); + } else if (auto *pitem = item->asPropertyItem()) { + QmlTimeline currentTimeline = activeTimeline(); + QmlTimelineKeyframeGroup group = timelineKeyframeGroup(currentTimeline, pitem); - if (previous.isValid()) { - if (frame.interpolation() == DesignTools::Keyframe::Interpolation::Bezier) { - DesignTools::CurveSegment segment(previous, frame); - if (segment.isValid()) - attachEasingCurve1(pos.x(), segment.easingCurve(), group); - } else if (frame.interpolation() == DesignTools::Keyframe::Interpolation::Easing) { - QVariant data = frame.data(); - if (data.type() == static_cast(QMetaType::QEasingCurve)) - attachEasingCurve1(pos.x(), data.value(), group); - } else if (frame.interpolation() == DesignTools::Keyframe::Interpolation::Step) { - // Warning: Keyframe::Interpolation::Step not yet implemented + if (group.isValid()) { + ModelNode groupNode = group.modelNode(); + commitAuxiliaryData(groupNode, item); + + auto replaceKeyframes = [&group, pitem, this]() { + m_block = true; + for (auto frame : group.keyframes()) + frame.destroy(); + + Keyframe previous; + for (auto &&frame : pitem->curve().keyframes()) { + QPointF pos = frame.position(); + group.setValue(QVariant(pos.y()), pos.x()); + + if (previous.isValid()) { + if (frame.interpolation() == Keyframe::Interpolation::Bezier) { + CurveSegment segment(previous, frame); + if (segment.isValid()) + attachEasingCurve(group, pos.x(), segment.easingCurve()); + } else if (frame.interpolation() == Keyframe::Interpolation::Easing) { + QVariant data = frame.data(); + if (data.type() == static_cast(QMetaType::QEasingCurve)) + attachEasingCurve(group, pos.x(), data.value()); + } else if (frame.interpolation() == Keyframe::Interpolation::Step) { + // Warning: Keyframe::Interpolation::Step not yet implemented + } } + + previous = frame; } + m_block = false; + }; - previous = frame; - } - m_block = false; - }; - - executeInTransaction("CurveEditor::commitKeyframes", replaceKeyframes); + executeInTransaction("CurveEditor::commitKeyframes", replaceKeyframes); + } } } diff --git a/src/plugins/qmldesigner/components/curveeditor/curveeditorview.h b/src/plugins/qmldesigner/components/curveeditor/curveeditorview.h index 5da7c4514b9..e774d2bc434 100644 --- a/src/plugins/qmldesigner/components/curveeditor/curveeditorview.h +++ b/src/plugins/qmldesigner/components/curveeditor/curveeditorview.h @@ -59,6 +59,10 @@ public: const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) override; + void auxiliaryDataChanged(const ModelNode &node, + const PropertyName &name, + const QVariant &data) override; + void instancePropertyChanged(const QList> &propertyList) override; void variantPropertiesChanged(const QList &propertyList, @@ -77,15 +81,15 @@ private: void updateStartFrame(const ModelNode &node); void updateEndFrame(const ModelNode &node); - void commitKeyframes(DesignTools::PropertyTreeItem *item); + void commitKeyframes(TreeItem *item); void commitCurrentFrame(int frame); void commitStartFrame(int frame); void commitEndFrame(int frame); private: bool m_block; - DesignTools::CurveEditorModel *m_model; - DesignTools::CurveEditor *m_editor; + CurveEditorModel *m_model; + CurveEditor *m_editor; }; } // namespace QmlDesigner diff --git a/src/plugins/qmldesigner/components/curveeditor/curvesegment.cpp b/src/plugins/qmldesigner/components/curveeditor/curvesegment.cpp index 578edf8fea1..75d956c666c 100644 --- a/src/plugins/qmldesigner/components/curveeditor/curvesegment.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/curvesegment.cpp @@ -33,7 +33,7 @@ #include -namespace DesignTools { +namespace QmlDesigner { class CubicPolynomial { @@ -566,4 +566,4 @@ void CurveSegment::setInterpolation(const Keyframe::Interpolation &interpol) } } -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/curvesegment.h b/src/plugins/qmldesigner/components/curveeditor/curvesegment.h index 9d496b613ec..11257b93639 100644 --- a/src/plugins/qmldesigner/components/curveeditor/curvesegment.h +++ b/src/plugins/qmldesigner/components/curveeditor/curvesegment.h @@ -36,7 +36,7 @@ class QEasingCurve; class QPainterPath; QT_END_NAMESPACE -namespace DesignTools { +namespace QmlDesigner { class CurveSegment { @@ -97,4 +97,4 @@ private: Keyframe m_right; }; -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/axis.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/axis.cpp index 6e18e49a269..7087a5d7efd 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/axis.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/detail/axis.cpp @@ -29,7 +29,7 @@ #include #include -namespace DesignTools { +namespace QmlDesigner { // The following is based on: "An Extension of Wilkinson's Algorithm for Positioning Tick Labels on Axes" // by Justin Talbot, Sharon Lin and Pat Hanrahan. @@ -210,4 +210,4 @@ Axis Axis::compute(double dmin, double dmax, double height, double pt) return result; } -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/axis.h b/src/plugins/qmldesigner/components/curveeditor/detail/axis.h index ee8c197748d..fcb90beb5ef 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/axis.h +++ b/src/plugins/qmldesigner/components/curveeditor/detail/axis.h @@ -28,7 +28,7 @@ #include #include -namespace DesignTools { +namespace QmlDesigner { struct Axis { @@ -39,4 +39,4 @@ struct Axis double lstep; }; -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/colorcontrol.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/colorcontrol.cpp index a833a4c6ff3..f8587df06fe 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/colorcontrol.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/detail/colorcontrol.cpp @@ -30,7 +30,9 @@ #include #include -namespace DesignTools { +namespace QmlDesigner { + +namespace StyleEditor { ColorControl::ColorControl() : QWidget(nullptr) @@ -98,4 +100,6 @@ void ColorControl::mousePressEvent(QMouseEvent *event) event->accept(); } -} // End namespace DesignTools. +} // End namespace StyleEditor. + +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/colorcontrol.h b/src/plugins/qmldesigner/components/curveeditor/detail/colorcontrol.h index 54dfe194f88..cb687370f56 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/colorcontrol.h +++ b/src/plugins/qmldesigner/components/curveeditor/detail/colorcontrol.h @@ -27,7 +27,9 @@ #include -namespace DesignTools { +namespace QmlDesigner { + +namespace StyleEditor { class ColorControl : public QWidget { @@ -60,4 +62,6 @@ private: QColor m_color; }; -} // End namespace DesignTools. +} // End namespace StyleEditor. + +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/curveeditorstyledialog.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/curveeditorstyledialog.cpp index 32df0a8230f..90ca8f91fba 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/curveeditorstyledialog.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/detail/curveeditorstyledialog.cpp @@ -33,7 +33,7 @@ #include #include -namespace DesignTools { +namespace QmlDesigner { QHBoxLayout *createRow(const QString &title, QWidget *widget) { @@ -50,35 +50,35 @@ QHBoxLayout *createRow(const QString &title, QWidget *widget) CurveEditorStyleDialog::CurveEditorStyleDialog(CurveEditorStyle &style, QWidget *parent) : QDialog(parent) , m_printButton(new QPushButton("Print")) - , m_background(new ColorControl(style.backgroundBrush.color())) - , m_backgroundAlternate(new ColorControl(style.backgroundAlternateBrush.color())) - , m_fontColor(new ColorControl(style.fontColor)) - , m_gridColor(new ColorControl(style.gridColor)) + , m_background(new StyleEditor::ColorControl(style.backgroundBrush.color())) + , m_backgroundAlternate(new StyleEditor::ColorControl(style.backgroundAlternateBrush.color())) + , m_fontColor(new StyleEditor::ColorControl(style.fontColor)) + , m_gridColor(new StyleEditor::ColorControl(style.gridColor)) , m_canvasMargin(new QDoubleSpinBox()) , m_zoomInWidth(new QSpinBox()) , m_zoomInHeight(new QSpinBox()) , m_timeAxisHeight(new QDoubleSpinBox()) , m_timeOffsetLeft(new QDoubleSpinBox()) , m_timeOffsetRight(new QDoubleSpinBox()) - , m_rangeBarColor(new ColorControl(style.rangeBarCapsColor)) - , m_rangeBarCapsColor(new ColorControl(style.rangeBarCapsColor)) + , m_rangeBarColor(new StyleEditor::ColorControl(style.rangeBarCapsColor)) + , m_rangeBarCapsColor(new StyleEditor::ColorControl(style.rangeBarCapsColor)) , m_valueAxisWidth(new QDoubleSpinBox()) , m_valueOffsetTop(new QDoubleSpinBox()) , m_valueOffsetBottom(new QDoubleSpinBox()) , m_handleSize(new QDoubleSpinBox()) , m_handleLineWidth(new QDoubleSpinBox()) - , m_handleColor(new ColorControl(style.handleStyle.color)) - , m_handleSelectionColor(new ColorControl(style.handleStyle.selectionColor)) + , m_handleColor(new StyleEditor::ColorControl(style.handleStyle.color)) + , m_handleSelectionColor(new StyleEditor::ColorControl(style.handleStyle.selectionColor)) , m_keyframeSize(new QDoubleSpinBox()) - , m_keyframeColor(new ColorControl(style.keyframeStyle.color)) - , m_keyframeSelectionColor(new ColorControl(style.keyframeStyle.selectionColor)) + , m_keyframeColor(new StyleEditor::ColorControl(style.keyframeStyle.color)) + , m_keyframeSelectionColor(new StyleEditor::ColorControl(style.keyframeStyle.selectionColor)) , m_curveWidth(new QDoubleSpinBox()) - , m_curveColor(new ColorControl(style.curveStyle.color)) - , m_curveSelectionColor(new ColorControl(style.curveStyle.selectionColor)) + , m_curveColor(new StyleEditor::ColorControl(style.curveStyle.color)) + , m_curveSelectionColor(new StyleEditor::ColorControl(style.curveStyle.selectionColor)) , m_treeMargins(new QDoubleSpinBox()) , m_playheadWidth(new QDoubleSpinBox()) , m_playheadRadius(new QDoubleSpinBox()) - , m_playheadColor(new ColorControl(style.playhead.color)) + , m_playheadColor(new StyleEditor::ColorControl(style.playhead.color)) { setWindowFlag(Qt::Tool, true); @@ -111,35 +111,35 @@ CurveEditorStyleDialog::CurveEditorStyleDialog(CurveEditorStyle &style, QWidget auto intSignal = static_cast(&QSpinBox::valueChanged); auto doubleSignal = static_cast(&QDoubleSpinBox::valueChanged); - connect(m_background, &ColorControl::valueChanged, colorChanged); - connect(m_backgroundAlternate, &ColorControl::valueChanged, colorChanged); - connect(m_fontColor, &ColorControl::valueChanged, colorChanged); - connect(m_gridColor, &ColorControl::valueChanged, colorChanged); + connect(m_background, &StyleEditor::ColorControl::valueChanged, colorChanged); + connect(m_backgroundAlternate, &StyleEditor::ColorControl::valueChanged, colorChanged); + connect(m_fontColor, &StyleEditor::ColorControl::valueChanged, colorChanged); + connect(m_gridColor, &StyleEditor::ColorControl::valueChanged, colorChanged); connect(m_canvasMargin, doubleSignal, doubleChanged); connect(m_zoomInWidth, intSignal, intChanged); connect(m_zoomInHeight, intSignal, intChanged); connect(m_timeAxisHeight, doubleSignal, doubleChanged); connect(m_timeOffsetLeft, doubleSignal, doubleChanged); connect(m_timeOffsetRight, doubleSignal, doubleChanged); - connect(m_rangeBarColor, &ColorControl::valueChanged, colorChanged); - connect(m_rangeBarCapsColor, &ColorControl::valueChanged, colorChanged); + connect(m_rangeBarColor, &StyleEditor::ColorControl::valueChanged, colorChanged); + connect(m_rangeBarCapsColor, &StyleEditor::ColorControl::valueChanged, colorChanged); connect(m_valueAxisWidth, doubleSignal, doubleChanged); connect(m_valueOffsetTop, doubleSignal, doubleChanged); connect(m_valueOffsetBottom, doubleSignal, doubleChanged); connect(m_handleSize, doubleSignal, doubleChanged); connect(m_handleLineWidth, doubleSignal, doubleChanged); - connect(m_handleColor, &ColorControl::valueChanged, colorChanged); - connect(m_handleSelectionColor, &ColorControl::valueChanged, colorChanged); + connect(m_handleColor, &StyleEditor::ColorControl::valueChanged, colorChanged); + connect(m_handleSelectionColor, &StyleEditor::ColorControl::valueChanged, colorChanged); connect(m_keyframeSize, doubleSignal, doubleChanged); - connect(m_keyframeColor, &ColorControl::valueChanged, colorChanged); - connect(m_keyframeSelectionColor, &ColorControl::valueChanged, colorChanged); + connect(m_keyframeColor, &StyleEditor::ColorControl::valueChanged, colorChanged); + connect(m_keyframeSelectionColor, &StyleEditor::ColorControl::valueChanged, colorChanged); connect(m_curveWidth, doubleSignal, doubleChanged); - connect(m_curveColor, &ColorControl::valueChanged, colorChanged); - connect(m_curveSelectionColor, &ColorControl::valueChanged, colorChanged); + connect(m_curveColor, &StyleEditor::ColorControl::valueChanged, colorChanged); + connect(m_curveSelectionColor, &StyleEditor::ColorControl::valueChanged, colorChanged); connect(m_treeMargins, doubleSignal, doubleChanged); connect(m_playheadWidth, doubleSignal, doubleChanged); connect(m_playheadRadius, doubleSignal, doubleChanged); - connect(m_playheadColor, &ColorControl::valueChanged, colorChanged); + connect(m_playheadColor, &StyleEditor::ColorControl::valueChanged, colorChanged); auto *box = new QVBoxLayout; box->addLayout(createRow("Background Color", m_background)); @@ -266,4 +266,4 @@ void CurveEditorStyleDialog::printStyle() qDebug() << ""; } -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/curveeditorstyledialog.h b/src/plugins/qmldesigner/components/curveeditor/detail/curveeditorstyledialog.h index f1dc3bc3728..8b876aca961 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/curveeditorstyledialog.h +++ b/src/plugins/qmldesigner/components/curveeditor/detail/curveeditorstyledialog.h @@ -34,9 +34,11 @@ class QSpinBox; class QDoubleSpinBox; QT_END_NAMESPACE -namespace DesignTools { +namespace QmlDesigner { +namespace StyleEditor { class ColorControl; +} struct CurveEditorStyle; @@ -60,13 +62,13 @@ private: private: QPushButton *m_printButton; - ColorControl *m_background; + StyleEditor::ColorControl *m_background; - ColorControl *m_backgroundAlternate; + StyleEditor::ColorControl *m_backgroundAlternate; - ColorControl *m_fontColor; + StyleEditor::ColorControl *m_fontColor; - ColorControl *m_gridColor; + StyleEditor::ColorControl *m_gridColor; QDoubleSpinBox *m_canvasMargin; @@ -80,9 +82,9 @@ private: QDoubleSpinBox *m_timeOffsetRight; - ColorControl *m_rangeBarColor; + StyleEditor::ColorControl *m_rangeBarColor; - ColorControl *m_rangeBarCapsColor; + StyleEditor::ColorControl *m_rangeBarCapsColor; QDoubleSpinBox *m_valueAxisWidth; @@ -95,23 +97,23 @@ private: QDoubleSpinBox *m_handleLineWidth; - ColorControl *m_handleColor; + StyleEditor::ColorControl *m_handleColor; - ColorControl *m_handleSelectionColor; + StyleEditor::ColorControl *m_handleSelectionColor; // KeyframeItem QDoubleSpinBox *m_keyframeSize; - ColorControl *m_keyframeColor; + StyleEditor::ColorControl *m_keyframeColor; - ColorControl *m_keyframeSelectionColor; + StyleEditor::ColorControl *m_keyframeSelectionColor; // CurveItem QDoubleSpinBox *m_curveWidth; - ColorControl *m_curveColor; + StyleEditor::ColorControl *m_curveColor; - ColorControl *m_curveSelectionColor; + StyleEditor::ColorControl *m_curveSelectionColor; // TreeItem QDoubleSpinBox *m_treeMargins; @@ -121,7 +123,7 @@ private: QDoubleSpinBox *m_playheadRadius; - ColorControl *m_playheadColor; + StyleEditor::ColorControl *m_playheadColor; }; -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/curveitem.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/curveitem.cpp index 90818be74bd..0e9d11a9741 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/curveitem.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/detail/curveitem.cpp @@ -35,13 +35,13 @@ #include #include -namespace DesignTools { +namespace QmlDesigner { CurveItem::CurveItem(QGraphicsItem *parent) : CurveEditorItem(parent) , m_id(0) , m_style() - , m_type(ValueType::Undefined) + , m_type(PropertyTreeItem::ValueType::Undefined) , m_component(PropertyTreeItem::Component::Generic) , m_transform() , m_keyframes() @@ -52,7 +52,7 @@ CurveItem::CurveItem(unsigned int id, const AnimationCurve &curve, QGraphicsItem : CurveEditorItem(parent) , m_id(id) , m_style() - , m_type(ValueType::Undefined) + , m_type(PropertyTreeItem::ValueType::Undefined) , m_component(PropertyTreeItem::Component::Generic) , m_transform() , m_keyframes() @@ -225,7 +225,7 @@ unsigned int CurveItem::id() const return m_id; } -ValueType CurveItem::valueType() const +PropertyTreeItem::ValueType CurveItem::valueType() const { return m_type; } @@ -385,7 +385,7 @@ void CurveItem::setHandleVisibility(bool visible) frame->setHandleVisibility(visible); } -void CurveItem::setValueType(ValueType type) +void CurveItem::setValueType(PropertyTreeItem::ValueType type) { m_type = type; } @@ -508,4 +508,4 @@ void CurveItem::emitCurveChanged() update(); } -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/curveitem.h b/src/plugins/qmldesigner/components/curveeditor/detail/curveitem.h index 20708d66c80..00a3a9c3604 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/curveitem.h +++ b/src/plugins/qmldesigner/components/curveeditor/detail/curveitem.h @@ -35,7 +35,7 @@ #include #include -namespace DesignTools { +namespace QmlDesigner { class AnimationCurve; class KeyframeItem; @@ -89,7 +89,7 @@ public: unsigned int id() const; - ValueType valueType() const; + PropertyTreeItem::ValueType valueType() const; PropertyTreeItem::Component component() const; @@ -113,7 +113,7 @@ public: void setHandleVisibility(bool visible); - void setValueType(ValueType type); + void setValueType(PropertyTreeItem::ValueType type); void setComponent(PropertyTreeItem::Component comp); @@ -140,7 +140,7 @@ private: CurveItemStyleOption m_style; - ValueType m_type; + PropertyTreeItem::ValueType m_type; PropertyTreeItem::Component m_component; @@ -151,4 +151,4 @@ private: bool m_itemDirty; }; -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/graphicsscene.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/graphicsscene.cpp index e9f9050f625..d6db50fee73 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/graphicsscene.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/detail/graphicsscene.cpp @@ -33,7 +33,7 @@ #include -namespace DesignTools { +namespace QmlDesigner { GraphicsScene::GraphicsScene(QObject *parent) : QGraphicsScene(parent) @@ -236,9 +236,34 @@ void GraphicsScene::doNotMoveItems(bool val) m_doNotMoveItems = val; } +void GraphicsScene::removeCurveItem(unsigned int id) +{ + CurveItem *tmp = nullptr; + for (auto *curve : m_curves) { + if (curve->id() == id) { + removeItem(curve); + tmp = curve; + break; + } + } + + if (tmp) { + Q_UNUSED(m_curves.removeOne(tmp)); + delete tmp; + } + + m_dirty = true; +} + void GraphicsScene::addCurveItem(CurveItem *item) { - m_dirty = true; + for (auto *curve : m_curves) { + if (curve->id() == item->id()) { + delete item; + return; + } + } + item->setDirty(false); item->connect(this); addItem(item); @@ -249,6 +274,8 @@ void GraphicsScene::addCurveItem(CurveItem *item) m_curves.push_back(item); resetZValues(); + + m_dirty = true; } void GraphicsScene::moveToBottom(CurveItem *item) @@ -449,4 +476,4 @@ void GraphicsScene::resetZValues() } } -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/graphicsscene.h b/src/plugins/qmldesigner/components/curveeditor/detail/graphicsscene.h index c19f72b1309..2e5da41bc66 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/graphicsscene.h +++ b/src/plugins/qmldesigner/components/curveeditor/detail/graphicsscene.h @@ -29,7 +29,7 @@ #include -namespace DesignTools { +namespace QmlDesigner { class AnimationCurve; class CurveItem; @@ -95,6 +95,8 @@ public: void doNotMoveItems(bool tmp); + void removeCurveItem(unsigned int id); + void addCurveItem(CurveItem *item); void moveToBottom(CurveItem *item); @@ -140,4 +142,4 @@ private: bool m_doNotMoveItems; }; -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.cpp index c162b5fd906..b27015aa97f 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.cpp @@ -40,7 +40,7 @@ #include #include -namespace DesignTools { +namespace QmlDesigner { GraphicsView::GraphicsView(CurveEditorModel *model, QWidget *parent) : QGraphicsView(parent) @@ -75,18 +75,15 @@ GraphicsView::GraphicsView(CurveEditorModel *model, QWidget *parent) connect(m_scene, &GraphicsScene::curveChanged, itemSlot); - auto pinSlot = [this](PropertyTreeItem *pti) { m_scene->setPinned(pti->id(), pti->pinned()); }; - connect(m_model, &CurveEditorModel::curveChanged, pinSlot); - - applyZoom(m_zoomX, m_zoomY); - update(); - QmlDesigner::Navigation2dFilter *filter = new QmlDesigner::Navigation2dFilter(this); auto zoomChanged = &QmlDesigner::Navigation2dFilter::zoomChanged; connect(filter, zoomChanged, [this](double scale, const QPointF &pos) { applyZoom(m_zoomX + scale, m_zoomY, mapToGlobal(pos.toPoint())); }); installEventFilter(filter); + + applyZoom(m_zoomX, m_zoomY); + update(); } GraphicsView::~GraphicsView() @@ -189,19 +186,62 @@ void GraphicsView::setStyle(const CurveEditorStyle &style) viewport()->update(); } -void GraphicsView::setLocked(PropertyTreeItem *item) +void GraphicsView::setLocked(TreeItem *item) { - if (CurveItem *curve = m_scene->findCurve(item->id())) { - if (item->locked()) { - curve->setLocked(true); - m_scene->moveToBottom(curve); - } else { - curve->setLocked(false); - m_scene->moveToTop(curve); + if (item->asNodeItem()) { + for (auto *ci : item->children()) + setLocked(ci); + } else if (item->asPropertyItem()) { + if (CurveItem *curve = m_scene->findCurve(item->id())) { + if (item->locked() || item->implicitlyLocked()) { + curve->setLocked(true); + m_scene->moveToBottom(curve); + } else { + curve->setLocked(false); + m_scene->moveToTop(curve); + } } } } +void GraphicsView::setPinned(TreeItem *item) +{ + auto pin = [this](PropertyTreeItem *pitem, bool pinned) { + if (pinned) { + if (CurveItem *curve = m_scene->findCurve(pitem->id())) + curve->setPinned(pinned); + else if (CurveItem *citem = TreeModel::curveItem(pitem)) + m_scene->addCurveItem(citem); + } else if (!pinned) { + if (!m_model->isSelected(pitem) && !pitem->pinned()) + m_scene->removeCurveItem(pitem->id()); + else if (CurveItem *curve = m_scene->findCurve(pitem->id())) + curve->setPinned(pinned); + } + }; + + if (auto *pitem = item->asPropertyItem()) { + pin(pitem, pitem->pinned() || pitem->implicitlyPinned()); + } else if (auto *nitem = item->asNodeItem()) { + bool pinned = nitem->pinned(); + if (!pinned && m_model->isSelected(nitem)) { + for (auto *i : nitem->children()) { + if (CurveItem *curve = m_scene->findCurve(i->id())) + curve->setPinned(pinned); + } + return; + } + + for (auto *i : nitem->children()) { + if (auto *pitem = i->asPropertyItem()) + pin(pitem, pinned); + } + } + + applyZoom(m_zoomX, m_zoomY); + viewport()->update(); +} + void GraphicsView::setZoomX(double zoom, const QPoint &pivot) { applyZoom(zoom, m_zoomY, pivot); @@ -228,8 +268,8 @@ void GraphicsView::scrollContent(double x, double y) { QScrollBar *hs = horizontalScrollBar(); QScrollBar *vs = verticalScrollBar(); - hs->setValue(hs->value() + x); - vs->setValue(vs->value() + y); + hs->setValue(hs->value() + static_cast(x)); + vs->setValue(vs->value() + static_cast(y)); } void GraphicsView::reset(const std::vector &items) @@ -242,15 +282,19 @@ void GraphicsView::reset(const std::vector &items) viewport()->update(); } -void GraphicsView::updateSelection(const std::vector &items) +void GraphicsView::updateSelection() { std::vector preservedItems = m_scene->takePinnedItems(); - for (auto *curve : items) { + std::vector deleteItems; + for (auto *curve : m_model->selectedCurves()) { auto finder = [curve](CurveItem *item) { return curve->id() == item->id(); }; auto iter = std::find_if(preservedItems.begin(), preservedItems.end(), finder); if (iter == preservedItems.end()) preservedItems.push_back(curve); + else + deleteItems.push_back(curve); } + freeClear(deleteItems); reset(preservedItems); } @@ -304,7 +348,8 @@ void GraphicsView::mousePressEvent(QMouseEvent *event) QPointF pos = mapToScene(event->pos()); if (timeScaleRect().contains(pos)) { m_dragging = true; - setCurrentFrame(std::round(mapXtoTime(pos.x()))); + double t = mapXtoTime(static_cast(pos.x())); + setCurrentFrame(roundToInt(t)); m_playhead.setMoving(true); event->accept(); return; @@ -398,19 +443,18 @@ void GraphicsView::drawForeground(QPainter *painter, const QRectF &rect) void GraphicsView::drawBackground(QPainter *painter, const QRectF &rect) { painter->fillRect(rect, m_style.backgroundBrush); - painter->fillRect(scene()->sceneRect(), m_style.backgroundAlternateBrush); - drawGrid(painter, rect); + drawGrid(painter); } int GraphicsView::mapTimeToX(double time) const { - return std::round(time * scaleX(m_transform)); + return roundToInt(time * scaleX(m_transform)); } int GraphicsView::mapValueToY(double y) const { - return std::round(y * scaleY(m_transform)); + return roundToInt(y * scaleY(m_transform)); } double GraphicsView::mapXtoTime(int x) const @@ -430,7 +474,7 @@ QPointF GraphicsView::globalToScene(const QPoint &point) const QPointF GraphicsView::globalToRaster(const QPoint &point) const { - QPointF scene = globalToScene(point); + QPoint scene = globalToScene(point).toPoint(); return QPointF(mapXtoTime(scene.x()), mapYtoValue(scene.y())); } @@ -480,7 +524,7 @@ void GraphicsView::applyZoom(double x, double y, const QPoint &pivot) m_scene->doNotMoveItems(false); } -void GraphicsView::drawGrid(QPainter *painter, const QRectF &rect) +void GraphicsView::drawGrid(QPainter *painter) { QRectF gridRect = scene()->sceneRect(); @@ -488,12 +532,16 @@ void GraphicsView::drawGrid(QPainter *painter, const QRectF &rect) return; auto drawVerticalLine = [painter, gridRect](double position) { - painter->drawLine(position, gridRect.top(), position, gridRect.bottom()); + QPointF p1(position, gridRect.top()); + QPointF p2(position, gridRect.bottom()); + painter->drawLine(p1, p2); }; painter->save(); painter->setPen(m_style.gridColor); + painter->fillRect(gridRect, m_style.backgroundAlternateBrush); + double timeIncrement = timeLabelInterval(painter, m_model->maximumTime()); for (double i = minimumTime(); i <= maximumTime(); i += timeIncrement) drawVerticalLine(mapTimeToX(i)); @@ -635,7 +683,7 @@ double GraphicsView::timeLabelInterval(QPainter *painter, double maxTime) double tickDistance = mapTimeToX(deltaTime); while (true) { - if (tickDistance == 0 && deltaTime >= maxTime) + if (qFuzzyCompare(tickDistance, 0.) && deltaTime >= maxTime) return maxTime; if (tickDistance > minTextSpacing) @@ -658,12 +706,12 @@ QRectF GraphicsView::rangeMinHandle(const QRectF &rect) QRectF labelRect = fontMetrics().boundingRect(QString("0")); labelRect.moveCenter(rect.center()); - qreal top = rect.bottom() - 2; - qreal bottom = labelRect.bottom() + 2; - QSize size(10, top - bottom); + qreal top = rect.bottom() - 2.; + qreal bottom = labelRect.bottom() + 2.; + QSize size(10, roundToInt(top - bottom)); - int leftHandleLeft = mapTimeToX(m_model->minimumTime()) - size.width(); - return QRectF(QPointF(leftHandleLeft, bottom), size); + int handle = mapTimeToX(m_model->minimumTime()) - size.width(); + return QRectF(QPointF(handle, bottom), size); } QRectF GraphicsView::rangeMaxHandle(const QRectF &rect) @@ -671,10 +719,13 @@ QRectF GraphicsView::rangeMaxHandle(const QRectF &rect) QRectF labelRect = fontMetrics().boundingRect(QString("0")); labelRect.moveCenter(rect.center()); - qreal bottom = rect.bottom() - 2; - qreal top = labelRect.bottom() + 2; + qreal bottom = rect.bottom() - 2.; + qreal top = labelRect.bottom() + 2.; - return QRectF(QPointF(mapTimeToX(m_model->maximumTime()), bottom), QSize(10, top - bottom)); + QSize size(10, roundToInt(top - bottom)); + int handle = mapTimeToX(m_model->maximumTime()); + + return QRectF(QPointF(handle, bottom), size); } -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.h b/src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.h index 374109feb94..c2d2b0c714a 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.h +++ b/src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.h @@ -33,12 +33,12 @@ #include -namespace DesignTools { +namespace QmlDesigner { class CurveItem; class CurveEditorModel; class Playhead; -class PropertyTreeItem; +class TreeItem; class GraphicsView : public QGraphicsView { @@ -92,7 +92,9 @@ public: QRectF defaultRasterRect() const; - void setLocked(PropertyTreeItem *item); + void setLocked(TreeItem *item); + + void setPinned(TreeItem *item); void setStyle(const CurveEditorStyle &style); @@ -106,7 +108,7 @@ public: void reset(const std::vector &items); - void updateSelection(const std::vector &items); + void updateSelection(); void setInterpolation(Keyframe::Interpolation interpol); @@ -134,7 +136,7 @@ protected: private: void applyZoom(double x, double y, const QPoint &pivot = QPoint()); - void drawGrid(QPainter *painter, const QRectF &rect); + void drawGrid(QPainter *painter); #if 0 void drawExtremaX(QPainter *painter, const QRectF &rect); @@ -176,4 +178,4 @@ private: CurveEditorStyleDialog m_dialog; }; -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/handleitem.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/handleitem.cpp index 0fdb00ff1b0..6d9dbe85d5d 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/handleitem.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/detail/handleitem.cpp @@ -31,7 +31,7 @@ #include -namespace DesignTools { +namespace QmlDesigner { struct HandleGeometry { @@ -196,4 +196,4 @@ QVariant HandleItem::itemChange(QGraphicsItem::GraphicsItemChange change, const return QGraphicsItem::itemChange(change, value); } -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/handleitem.h b/src/plugins/qmldesigner/components/curveeditor/detail/handleitem.h index 62d48d8ffc2..efa55f8abf2 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/handleitem.h +++ b/src/plugins/qmldesigner/components/curveeditor/detail/handleitem.h @@ -28,7 +28,7 @@ #include "curveeditorstyle.h" #include "selectableitem.h" -namespace DesignTools { +namespace QmlDesigner { class KeyframeItem; class CurveSegment; @@ -77,4 +77,4 @@ private: QPointF m_validPos; }; -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/keyframeitem.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/keyframeitem.cpp index aba8648f7df..025f5eb6eda 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/keyframeitem.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/detail/keyframeitem.cpp @@ -31,7 +31,7 @@ #include -namespace DesignTools { +namespace QmlDesigner { KeyframeItem::KeyframeItem(QGraphicsItem *parent) : SelectableItem(parent) @@ -408,9 +408,9 @@ QVariant KeyframeItem::itemChange(QGraphicsItem::GraphicsItemChange change, cons if (ok) { position.setX(std::round(position.x())); - if (curveItem->valueType() == ValueType::Integer) + if (curveItem->valueType() == PropertyTreeItem::ValueType::Integer) position.setY(std::round(position.y())); - else if (curveItem->valueType() == ValueType::Bool) + else if (curveItem->valueType() == PropertyTreeItem::ValueType::Bool) position.setY(position.y() > 0.5 ? 1.0 : 0.0); if (!legalLeft() || !legalRight()) { @@ -463,4 +463,4 @@ void KeyframeItem::selectionCallback() m_right->setSelected(selected()); } -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/keyframeitem.h b/src/plugins/qmldesigner/components/curveeditor/detail/keyframeitem.h index 73e008aa2a8..c0d33640278 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/keyframeitem.h +++ b/src/plugins/qmldesigner/components/curveeditor/detail/keyframeitem.h @@ -32,7 +32,7 @@ #include -namespace DesignTools { +namespace QmlDesigner { class HandleItem; @@ -134,4 +134,4 @@ private: bool m_visibleOverride = true; }; -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/playhead.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/playhead.cpp index e59c9f012e8..481370eb61e 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/playhead.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/detail/playhead.cpp @@ -34,7 +34,7 @@ #include -namespace DesignTools { +namespace QmlDesigner { constexpr double g_playheadMargin = 5.0; @@ -149,6 +149,7 @@ void Playhead::mouseMoveOutOfBounds(GraphicsView *view) void Playhead::mouseRelease(GraphicsView *view) { + Q_UNUSED(view); m_moving = false; } @@ -188,4 +189,4 @@ void Playhead::paint(QPainter *painter, GraphicsView *view) const painter->restore(); } -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/playhead.h b/src/plugins/qmldesigner/components/curveeditor/detail/playhead.h index 9f6295c34a7..b45ecfea706 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/playhead.h +++ b/src/plugins/qmldesigner/components/curveeditor/detail/playhead.h @@ -32,7 +32,7 @@ QT_BEGIN_NAMESPACE class QPainter; QT_END_NAMESPACE -namespace DesignTools { +namespace QmlDesigner { class GraphicsView; @@ -69,4 +69,4 @@ private: QTimer m_timer; }; -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/selectableitem.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/selectableitem.cpp index 5db5d0c14b0..d6b9c4c4a16 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/selectableitem.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/detail/selectableitem.cpp @@ -26,7 +26,7 @@ #include "selectableitem.h" #include "keyframeitem.h" -namespace DesignTools { +namespace QmlDesigner { CurveEditorItem::CurveEditorItem(QGraphicsItem *parent) : QGraphicsObject(parent) @@ -193,4 +193,4 @@ void SelectableItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) activationCallback(); } -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/selectableitem.h b/src/plugins/qmldesigner/components/curveeditor/detail/selectableitem.h index 920c13a9388..f985094608b 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/selectableitem.h +++ b/src/plugins/qmldesigner/components/curveeditor/detail/selectableitem.h @@ -27,7 +27,7 @@ #include -namespace DesignTools { +namespace QmlDesigner { class CurveEditorItem : public QGraphicsObject { @@ -58,13 +58,14 @@ enum ItemType { ItemTypeCurve = QGraphicsItem::UserType + 3 }; -enum class SelectionMode : unsigned int { Undefined, Clear, New, Add, Remove, Toggle }; class SelectableItem : public CurveEditorItem { Q_OBJECT public: + enum class SelectionMode : unsigned int { Undefined, Clear, New, Add, Remove, Toggle }; + SelectableItem(QGraphicsItem *parent = nullptr); ~SelectableItem() override; @@ -102,4 +103,4 @@ private: SelectionMode m_preSelected; }; -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/selectionmodel.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/selectionmodel.cpp index d35b0c31422..8b2e650b9d8 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/selectionmodel.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/detail/selectionmodel.cpp @@ -27,7 +27,7 @@ #include "curveitem.h" #include "treemodel.h" -namespace DesignTools { +namespace QmlDesigner { SelectionModel::SelectionModel(QAbstractItemModel *model) : QItemSelectionModel(model) @@ -46,10 +46,19 @@ void SelectionModel::select(const QItemSelection &selection, } } +bool SelectionModel::isSelected(TreeItem *item) const +{ + for (auto *i : selectedTreeItems()) + if (i->id() == item->id()) + return true; + + return false; +} + std::vector SelectionModel::selectedPaths() const { std::vector out; - for (auto &&item : selectedTreeItems()) + for (auto *item : selectedTreeItems()) out.push_back(item->path()); return out; } @@ -112,20 +121,11 @@ void SelectionModel::selectPaths(const std::vector &selection) } } -void SelectionModel::changeSelection(const QItemSelection &selected, - const QItemSelection &deselected) +void SelectionModel::changeSelection(const QItemSelection &selected, const QItemSelection &deselected) { Q_UNUSED(selected) Q_UNUSED(deselected) - - std::vector curves; - const auto ids = selectedIndexes(); - for (auto &&index : ids) { - if (auto *curveItem = TreeModel::curveItem(index)) - curves.push_back(curveItem); - } - - emit curvesSelected(curves); + emit curvesSelected(); } -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/selectionmodel.h b/src/plugins/qmldesigner/components/curveeditor/detail/selectionmodel.h index ff4a0bbf2fa..d0cfe4e0de2 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/selectionmodel.h +++ b/src/plugins/qmldesigner/components/curveeditor/detail/selectionmodel.h @@ -30,7 +30,7 @@ #include -namespace DesignTools { +namespace QmlDesigner { class TreeItem; class NodeTreeItem; @@ -41,13 +41,14 @@ class SelectionModel : public QItemSelectionModel Q_OBJECT signals: - void curvesSelected(const std::vector &curves); + void curvesSelected(); public: SelectionModel(QAbstractItemModel *model = nullptr); - void select(const QItemSelection &selection, - QItemSelectionModel::SelectionFlags command) override; + void select(const QItemSelection &selection, QItemSelectionModel::SelectionFlags command) override; + + bool isSelected(TreeItem *item) const; std::vector selectedPaths() const; @@ -65,4 +66,4 @@ private: void changeSelection(const QItemSelection &selected, const QItemSelection &deselected); }; -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/selector.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/selector.cpp index dd948a6ac28..a1bc1d268cf 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/selector.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/detail/selector.cpp @@ -36,7 +36,7 @@ #include -namespace DesignTools { +namespace QmlDesigner { Selector::Selector() {} @@ -139,7 +139,7 @@ void Selector::mouseRelease(QMouseEvent *event, GraphicsScene *scene) bool Selector::select(const SelectionTool &tool, const QPointF &pos, GraphicsScene *scene) { auto selectWidthTool = [this, - tool](SelectionMode mode, const QPointF &pos, GraphicsScene *scene) { + tool](SelectableItem::SelectionMode mode, const QPointF &pos, GraphicsScene *scene) { switch (tool) { case SelectionTool::Lasso: return lassoSelection(mode, pos, scene); @@ -152,19 +152,19 @@ bool Selector::select(const SelectionTool &tool, const QPointF &pos, GraphicsSce if (m_shortcut == m_shortcuts.newSelection) { clearSelection(scene); - return selectWidthTool(SelectionMode::New, pos, scene); + return selectWidthTool(SelectableItem::SelectionMode::New, pos, scene); } else if (m_shortcut == m_shortcuts.addToSelection) { - return selectWidthTool(SelectionMode::Add, pos, scene); + return selectWidthTool(SelectableItem::SelectionMode::Add, pos, scene); } else if (m_shortcut == m_shortcuts.removeFromSelection) { - return selectWidthTool(SelectionMode::Remove, pos, scene); + return selectWidthTool(SelectableItem::SelectionMode::Remove, pos, scene); } else if (m_shortcut == m_shortcuts.toggleSelection) { - return selectWidthTool(SelectionMode::Toggle, pos, scene); + return selectWidthTool(SelectableItem::SelectionMode::Toggle, pos, scene); } return false; } -bool Selector::pressSelection(SelectionMode mode, const QPointF &pos, GraphicsScene *scene) +bool Selector::pressSelection(SelectableItem::SelectionMode mode, const QPointF &pos, GraphicsScene *scene) { bool out = false; const auto itemList = scene->items(); @@ -190,7 +190,7 @@ bool Selector::pressSelection(SelectionMode mode, const QPointF &pos, GraphicsSc return out; } -bool Selector::rectangleSelection(SelectionMode mode, const QPointF &pos, GraphicsScene *scene) +bool Selector::rectangleSelection(SelectableItem::SelectionMode mode, const QPointF &pos, GraphicsScene *scene) { bool out = false; m_rect.setBottomRight(pos); @@ -201,14 +201,14 @@ bool Selector::rectangleSelection(SelectionMode mode, const QPointF &pos, Graphi keyframeItem->setPreselected(mode); out = true; } else { - keyframeItem->setPreselected(SelectionMode::Undefined); + keyframeItem->setPreselected(SelectableItem::SelectionMode::Undefined); } } } return out; } -bool Selector::lassoSelection(SelectionMode mode, const QPointF &pos, GraphicsScene *scene) +bool Selector::lassoSelection(SelectableItem::SelectionMode mode, const QPointF &pos, GraphicsScene *scene) { bool out = false; m_lasso.lineTo(pos); @@ -219,7 +219,7 @@ bool Selector::lassoSelection(SelectionMode mode, const QPointF &pos, GraphicsSc keyframeItem->setPreselected(mode); out = true; } else { - keyframeItem->setPreselected(SelectionMode::Undefined); + keyframeItem->setPreselected(SelectableItem::SelectionMode::Undefined); } } } @@ -231,7 +231,7 @@ void Selector::clearSelection(GraphicsScene *scene) const auto itemList = scene->items(); for (auto *item : itemList) { if (auto *frameItem = qgraphicsitem_cast(item)) { - frameItem->setPreselected(SelectionMode::Clear); + frameItem->setPreselected(SelectableItem::SelectionMode::Clear); frameItem->applyPreselection(); frameItem->setActivated(false, HandleItem::Slot::Left); frameItem->setActivated(false, HandleItem::Slot::Right); @@ -248,4 +248,4 @@ void Selector::applyPreSelection(GraphicsScene *scene) } } -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/selector.h b/src/plugins/qmldesigner/components/curveeditor/detail/selector.h index 68674c838de..bd3562f28c2 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/selector.h +++ b/src/plugins/qmldesigner/components/curveeditor/detail/selector.h @@ -28,14 +28,12 @@ #include "curveeditorstyle.h" #include "selectableitem.h" -namespace DesignTools { +namespace QmlDesigner { class GraphicsView; class GraphicsScene; class Playhead; -enum class SelectionTool { Undefined, Lasso, Rectangle }; - class Selector { public: @@ -50,13 +48,15 @@ public: void mouseRelease(QMouseEvent *event, GraphicsScene *scene); private: + enum class SelectionTool { Undefined, Lasso, Rectangle }; + bool select(const SelectionTool &tool, const QPointF &pos, GraphicsScene *scene); - bool pressSelection(SelectionMode mode, const QPointF &pos, GraphicsScene *scene); + bool pressSelection(SelectableItem::SelectionMode mode, const QPointF &pos, GraphicsScene *scene); - bool rectangleSelection(SelectionMode mode, const QPointF &pos, GraphicsScene *scene); + bool rectangleSelection(SelectableItem::SelectionMode mode, const QPointF &pos, GraphicsScene *scene); - bool lassoSelection(SelectionMode mode, const QPointF &pos, GraphicsScene *scene); + bool lassoSelection(SelectableItem::SelectionMode mode, const QPointF &pos, GraphicsScene *scene); void clearSelection(GraphicsScene *scene); @@ -77,4 +77,4 @@ private: QRectF m_rect; }; -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/shortcut.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/shortcut.cpp index d6d04dbbae8..93007f494c6 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/shortcut.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/detail/shortcut.cpp @@ -24,7 +24,7 @@ ****************************************************************************/ #include "shortcut.h" -namespace DesignTools { +namespace QmlDesigner { Shortcut::Shortcut() : m_key() @@ -78,4 +78,4 @@ bool Shortcut::operator==(const Shortcut &other) const return m_key == other.m_key && m_buttons == other.m_buttons && m_modifiers == other.m_modifiers; } -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/shortcut.h b/src/plugins/qmldesigner/components/curveeditor/detail/shortcut.h index a9e075bd8b7..904c153de3c 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/shortcut.h +++ b/src/plugins/qmldesigner/components/curveeditor/detail/shortcut.h @@ -27,7 +27,7 @@ #include -namespace DesignTools { +namespace QmlDesigner { class Shortcut { @@ -58,4 +58,4 @@ private: Qt::KeyboardModifiers m_modifiers; }; -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/treeitemdelegate.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/treeitemdelegate.cpp index 2f6a941a204..bd57eeaaf89 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/treeitemdelegate.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/detail/treeitemdelegate.cpp @@ -24,13 +24,14 @@ ****************************************************************************/ #include "treeitemdelegate.h" #include "treeitem.h" +#include "treemodel.h" #include #include #include #include -namespace DesignTools { +namespace QmlDesigner { TreeItemDelegate::TreeItemDelegate(const CurveEditorStyle &style, QObject *parent) : QStyledItemDelegate(parent) @@ -50,56 +51,66 @@ QRect makeSquare(const QRect &rect) return r; } -QPixmap pixmapFromStyle(int column, const CurveEditorStyle &style, const QRect &rect, TreeItem *item, bool underMouse) -{ - QColor color = underMouse ? style.iconHoverColor : style.iconColor; - if (column == 1) { - bool locked = item->locked(); - if (underMouse) - locked = !locked; - - if (locked) - return pixmapFromIcon(style.treeItemStyle.lockedIcon, rect.size(), color); - else - return pixmapFromIcon(style.treeItemStyle.unlockedIcon, rect.size(), color); - } - - bool pinned = item->pinned(); - if (underMouse) - pinned = !pinned; - - if (pinned) - return pixmapFromIcon(style.treeItemStyle.pinnedIcon, rect.size(), color); - else - return pixmapFromIcon(style.treeItemStyle.unpinnedIcon, rect.size(), color); -} - void TreeItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const { - if (index.column() == 1 || index.column() == 2) { - QStyleOptionViewItem opt = option; - initStyleOption(&opt, index); + QStyleOptionViewItem opt = option; + initStyleOption(&opt, index); - auto *treeItem = static_cast(index.internalPointer()); + QColor high = Theme::getColor(Theme::Color::QmlDesigner_HighlightColor); + opt.palette.setColor(QPalette::Active, QPalette::Highlight, high); + opt.palette.setColor(QPalette::Inactive, QPalette::Highlight, high); - QPoint mousePos = QCursor::pos(); - mousePos = option.widget->mapFromGlobal(mousePos); + QStyle *style = opt.widget ? opt.widget->style() : QApplication::style(); + style->drawPrimitive(QStyle::PE_PanelItemViewItem, &opt, painter, opt.widget); - QRect iconRect = makeSquare(option.rect); - bool underMouse = option.rect.contains(m_mousePos) - && option.state & QStyle::State_MouseOver; + auto *treeItem = static_cast(index.internalPointer()); - QStyle *style = opt.widget ? opt.widget->style() : QApplication::style(); - style->drawPrimitive(QStyle::PE_PanelItemViewItem, &opt, painter, opt.widget); + bool textColumn = TreeModel::isTextColumn(index); + bool lockedColumn = TreeModel::isLockedColumn(index); + bool pinnedColumn = TreeModel::isPinnedColumn(index); - QPixmap pixmap = pixmapFromStyle(index.column(), m_style, iconRect, treeItem, underMouse); - painter->drawPixmap(iconRect, pixmap); + QPixmap pixmap; + QRect iconRect = makeSquare(option.rect); + + if (lockedColumn) { + if (treeItem->locked()) { + pixmap = m_style.treeItemStyle.lockedIcon.pixmap(iconRect.size()); + } else if (treeItem->asNodeItem() != nullptr && treeItem->implicitlyLocked()) { + pixmap = m_style.treeItemStyle.implicitlyLockedIcon.pixmap(iconRect.size()); + } else if (option.state.testFlag(QStyle::State_MouseOver)) { + if (treeItem->implicitlyLocked()) { + pixmap = m_style.treeItemStyle.implicitlyLockedIcon.pixmap(iconRect.size()); + } else { + pixmap = m_style.treeItemStyle.unlockedIcon.pixmap(iconRect.size()); + } + } + + } else if (pinnedColumn) { + if (treeItem->pinned()) { + pixmap = m_style.treeItemStyle.pinnedIcon.pixmap(iconRect.size()); + } else if (treeItem->asNodeItem() != nullptr && treeItem->implicitlyPinned()) { + pixmap = m_style.treeItemStyle.implicitlyPinnedIcon.pixmap(iconRect.size()); + } else if (option.state.testFlag(QStyle::State_MouseOver)) { + if (treeItem->implicitlyPinned()) { + pixmap = m_style.treeItemStyle.implicitlyPinnedIcon.pixmap(iconRect.size()); + } else { + pixmap = m_style.treeItemStyle.unpinnedIcon.pixmap(iconRect.size()); + } + } } else { - QStyledItemDelegate::paint(painter, option, index); + if (textColumn && (treeItem->locked() || treeItem->implicitlyLocked())) { + QColor col = opt.palette.color(QPalette::Disabled, QPalette::Text).darker(); + opt.palette.setColor(QPalette::Active, QPalette::Text, col); + opt.palette.setColor(QPalette::Inactive, QPalette::Text, col); + } + QStyledItemDelegate::paint(painter, opt, index); } + + if (!pixmap.isNull()) + painter->drawPixmap(iconRect, pixmap); } void TreeItemDelegate::setStyle(const CurveEditorStyle &style) @@ -118,4 +129,4 @@ bool TreeItemDelegate::editorEvent(QEvent *event, return QStyledItemDelegate::editorEvent(event, model, option, index); } -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/treeitemdelegate.h b/src/plugins/qmldesigner/components/curveeditor/detail/treeitemdelegate.h index 6479f48942b..f265061c2d0 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/treeitemdelegate.h +++ b/src/plugins/qmldesigner/components/curveeditor/detail/treeitemdelegate.h @@ -29,7 +29,7 @@ #include -namespace DesignTools { +namespace QmlDesigner { class TreeItemDelegate : public QStyledItemDelegate { @@ -60,4 +60,4 @@ private: QPoint m_mousePos; }; -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/treemodel.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/treemodel.cpp index 075934a3ef9..c4b6845f51f 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/treemodel.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/detail/treemodel.cpp @@ -31,7 +31,22 @@ #include -namespace DesignTools { +namespace QmlDesigner { + +bool TreeModel::isTextColumn(const QModelIndex &index) +{ + return index.column() == 0; +} + +bool TreeModel::isLockedColumn(const QModelIndex &index) +{ + return index.column() == 1; +} + +bool TreeModel::isPinnedColumn(const QModelIndex &index) +{ + return index.column() == 2; +} TreeItem *TreeModel::treeItem(const QModelIndex &index) { @@ -71,8 +86,8 @@ CurveItem *TreeModel::curveItem(TreeItem *item) auto *citem = new CurveItem(pti->id(), pti->curve()); citem->setValueType(pti->valueType()); citem->setComponent(pti->component()); - citem->setLocked(pti->locked()); - citem->setPinned(pti->pinned()); + citem->setLocked(pti->locked() || item->implicitlyLocked()); + citem->setPinned(pti->pinned() || item->implicitlyPinned()); return citem; } @@ -183,6 +198,11 @@ void TreeModel::setGraphicsView(GraphicsView *view) m_view = view; } +TreeView *TreeModel::treeView() const +{ + return m_tree; +} + GraphicsView *TreeModel::graphicsView() const { return m_view; @@ -208,6 +228,36 @@ QModelIndex TreeModel::findIdx(const QString &name, const QModelIndex &parent) c return QModelIndex(); } +bool TreeModel::isSelected(TreeItem *item) const +{ + if (auto *sm = selectionModel()) + return sm->isSelected(item); + + return false; +} + +void addCurvesFromItem(TreeItem *item, std::vector &curves) +{ + if (auto *pitem = item->asPropertyItem()) { + if (auto *curveItem = TreeModel::curveItem(pitem)) + curves.push_back(curveItem); + } else if (auto *nitem = item->asNodeItem()) { + for (auto *child : nitem->children()) + addCurvesFromItem(child, curves); + } +} + +std::vector TreeModel::selectedCurves() const +{ + std::vector curves; + const auto ids = selectionModel()->selectedIndexes(); + for (auto &&index : ids) { + if (auto *treeItem = TreeModel::treeItem(index)) + addCurvesFromItem(treeItem, curves); + } + return curves; +} + QModelIndex TreeModel::indexOf(const TreeItem::Path &path) const { QModelIndex parent; @@ -238,4 +288,9 @@ TreeItem *TreeModel::find(unsigned int id) return m_root->find(id); } -} // End namespace DesignTools. +TreeItem *TreeModel::find(const QString &id) +{ + return m_root->find(id); +} + +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/treemodel.h b/src/plugins/qmldesigner/components/curveeditor/detail/treemodel.h index e8cf12f74fb..0f86a0f5de8 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/treemodel.h +++ b/src/plugins/qmldesigner/components/curveeditor/detail/treemodel.h @@ -31,13 +31,11 @@ #include -namespace DesignTools { +namespace QmlDesigner { class GraphicsView; class TreeView; -class TreeItem; class CurveItem; -class PropertyTreeItem; class SelectionModel; class TreeModel : public QAbstractItemModel @@ -45,6 +43,12 @@ class TreeModel : public QAbstractItemModel Q_OBJECT public: + static bool isTextColumn(const QModelIndex &index); + + static bool isLockedColumn(const QModelIndex &index); + + static bool isPinnedColumn(const QModelIndex &index); + static TreeItem *treeItem(const QModelIndex &index); static NodeTreeItem *nodeItem(const QModelIndex &index); @@ -73,13 +77,23 @@ public: int columnCount(const QModelIndex &parent = QModelIndex()) const override; + bool isSelected(TreeItem *item) const; + + std::vector selectedCurves() const; + QModelIndex indexOf(const TreeItem::Path &path) const; + TreeItem *find(unsigned int id); + + TreeItem *find(const QString &id); + void setTreeView(TreeView *view); void setGraphicsView(GraphicsView *view); protected: + TreeView *treeView() const; + GraphicsView *graphicsView() const; SelectionModel *selectionModel() const; @@ -88,8 +102,6 @@ protected: TreeItem *root(); - TreeItem *find(unsigned int id); - QModelIndex findIdx(const QString &name, const QModelIndex &parent) const; private: @@ -100,4 +112,4 @@ private: TreeItem *m_root; }; -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/treeview.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/treeview.cpp index 6db2afab754..5b8df0e5701 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/treeview.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/detail/treeview.cpp @@ -28,11 +28,12 @@ #include "selectionmodel.h" #include "treeitem.h" #include "treeitemdelegate.h" +#include "treemodel.h" #include #include -namespace DesignTools { +namespace QmlDesigner { TreeView::TreeView(CurveEditorModel *model, QWidget *parent) : QTreeView(parent) @@ -105,17 +106,12 @@ void TreeView::mousePressEvent(QMouseEvent *event) QModelIndex index = indexAt(event->pos()); if (index.isValid()) { auto *treeItem = static_cast(index.internalPointer()); - if (index.column() == 1) { - treeItem->setLocked(!treeItem->locked()); - if (auto *propertyItem = treeItem->asPropertyItem()) - emit treeItemLocked(propertyItem); - } else if (index.column() == 2) { - treeItem->setPinned(!treeItem->pinned()); - if (auto *propertyItem = treeItem->asPropertyItem()) - emit treeItemPinned(propertyItem); - } + if (TreeModel::isLockedColumn(index)) + emit treeItemLocked(treeItem, !treeItem->locked()); + else if (TreeModel::isPinnedColumn(index)) + emit treeItemPinned(treeItem, !treeItem->pinned()); } QTreeView::mousePressEvent(event); } -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/treeview.h b/src/plugins/qmldesigner/components/curveeditor/detail/treeview.h index 338ab6f052b..31886d5b74c 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/treeview.h +++ b/src/plugins/qmldesigner/components/curveeditor/detail/treeview.h @@ -30,7 +30,7 @@ #include -namespace DesignTools { +namespace QmlDesigner { class AnimationCurve; class CurveEditorModel; @@ -44,9 +44,9 @@ class TreeView : public QTreeView signals: void curvesSelected(const std::vector &curves); - void treeItemLocked(PropertyTreeItem *item); + void treeItemLocked(TreeItem *item, bool val); - void treeItemPinned(PropertyTreeItem *item); + void treeItemPinned(TreeItem *item, bool val); public: TreeView(CurveEditorModel *model, QWidget *parent = nullptr); @@ -63,4 +63,4 @@ protected: void mousePressEvent(QMouseEvent *event) override; }; -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/utils.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/utils.cpp index f255cfd29e8..6cc6fce31d8 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/utils.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/detail/utils.cpp @@ -29,7 +29,7 @@ #include #include -namespace DesignTools { +namespace QmlDesigner { double scaleX(const QTransform &transform) { @@ -92,4 +92,4 @@ QPalette singleColorPalette(const QColor &color) return palette; } -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/utils.h b/src/plugins/qmldesigner/components/curveeditor/detail/utils.h index 4a236c76b96..2200cda8587 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/utils.h +++ b/src/plugins/qmldesigner/components/curveeditor/detail/utils.h @@ -26,6 +26,7 @@ #pragma once #include +#include QT_BEGIN_NAMESPACE class QColor; @@ -37,7 +38,7 @@ QT_END_NAMESPACE #include -namespace DesignTools { +namespace QmlDesigner { double scaleX(const QTransform &transform); @@ -58,7 +59,7 @@ inline void freeClear(T &vec) } template -inline double clamp(const TV &val, const TC &lo, const TC &hi) +inline TV clamp(const TV &val, const TC &lo, const TC &hi) { return val < lo ? lo : (val > hi ? hi : val); } @@ -75,4 +76,10 @@ inline T reverseLerp(double blend, const T &a, const T &b) return (blend - b) / (a - b); } -} // End namespace DesignTools. +template +inline int roundToInt(const T &val) +{ + return static_cast(std::round(val)); +} + +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/keyframe.cpp b/src/plugins/qmldesigner/components/curveeditor/keyframe.cpp index d0a411e849c..02b2adc6366 100644 --- a/src/plugins/qmldesigner/components/curveeditor/keyframe.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/keyframe.cpp @@ -27,7 +27,7 @@ #include -namespace DesignTools { +namespace QmlDesigner { Keyframe::Keyframe() : m_interpolation(Interpolation::Undefined) @@ -193,4 +193,4 @@ std::string toString(Keyframe::Interpolation interpol) } } -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/keyframe.h b/src/plugins/qmldesigner/components/curveeditor/keyframe.h index 3aef8ed085a..d16e7d7a011 100644 --- a/src/plugins/qmldesigner/components/curveeditor/keyframe.h +++ b/src/plugins/qmldesigner/components/curveeditor/keyframe.h @@ -28,7 +28,7 @@ #include #include -namespace DesignTools { +namespace QmlDesigner { class Keyframe { @@ -93,4 +93,4 @@ private: std::string toString(Keyframe::Interpolation interpol); -} // End namespace DesignTools. +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/treeitem.cpp b/src/plugins/qmldesigner/components/curveeditor/treeitem.cpp index cd8b113c4b3..0b90d7d83b0 100644 --- a/src/plugins/qmldesigner/components/curveeditor/treeitem.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/treeitem.cpp @@ -28,7 +28,7 @@ #include #include -namespace DesignTools { +namespace QmlDesigner { TreeItem::TreeItem(const QString &name) : m_name(name) @@ -123,9 +123,9 @@ bool TreeItem::compare(const std::vector &path) const int TreeItem::row() const { if (m_parent) { - for (int i = 0, total = int(m_parent->m_children.size()); i < total; ++i) { + for (size_t i = 0, total = m_parent->m_children.size(); i < total; ++i) { if (m_parent->m_children[i] == this) - return i; + return static_cast(i); } } @@ -147,6 +147,17 @@ int TreeItem::columnCount() const return 3; } +TreeItem *TreeItem::root() const +{ + TreeItem *p = parent(); + while (p) { + if (!p->parent()) + return p; + p = p->parent(); + } + return p; +} + TreeItem *TreeItem::parent() const { return m_parent; @@ -154,10 +165,10 @@ TreeItem *TreeItem::parent() const TreeItem *TreeItem::child(int row) const { - if (row < 0 || row >= static_cast(m_children.size())) + if (row < 0 || row >= rowCount()) return nullptr; - return m_children.at(row); + return m_children.at(static_cast(row)); } TreeItem *TreeItem::find(unsigned int id) const @@ -173,6 +184,24 @@ TreeItem *TreeItem::find(unsigned int id) const return nullptr; } +TreeItem *TreeItem::find(const QString &id) const +{ + for (auto *child : m_children) { + if (child->name() == id) + return child; + + if (auto *childsChild = child->find(id)) + return childsChild; + } + + return nullptr; +} + +std::vector TreeItem::children() const +{ + return m_children; +} + QVariant TreeItem::data(int column) const { switch (column) { @@ -205,6 +234,11 @@ QVariant TreeItem::headerData(int column) const } } +bool TreeItem::operator==(unsigned int id) const +{ + return m_id == id; +} + void TreeItem::setId(unsigned int &id) { m_id = id; @@ -229,9 +263,10 @@ void TreeItem::setPinned(bool pinned) m_pinned = pinned; } -NodeTreeItem::NodeTreeItem(const QString &name, const QIcon &icon) +NodeTreeItem::NodeTreeItem(const QString &name, const QIcon &icon, const std::vector &parentIds) : TreeItem(name) , m_icon(icon) + , m_parentIds(parentIds) { Q_UNUSED(icon) } @@ -241,6 +276,35 @@ NodeTreeItem *NodeTreeItem::asNodeItem() return this; } +bool NodeTreeItem::implicitlyLocked() const +{ + TreeItem *r = root(); + if (!r) + return false; + + for (auto &&id : m_parentIds) { + if (TreeItem *item = r->find(id)) + if (item->locked()) + return true; + } + + return false; +} + +bool NodeTreeItem::implicitlyPinned() const +{ + TreeItem *r = root(); + if (!r) + return false; + + for (auto &&id : m_parentIds) { + if (TreeItem *item = r->find(id)) + if (item->pinned()) + return true; + } + return false; +} + QIcon NodeTreeItem::icon() const { return m_icon; @@ -257,20 +321,6 @@ std::vector NodeTreeItem::properties() const return out; } -std::string toString(ValueType type) -{ - switch (type) { - case ValueType::Bool: - return "Bool"; - case ValueType::Integer: - return "Integer"; - case ValueType::Double: - return "Double"; - default: - return "Undefined"; - } -} - PropertyTreeItem::PropertyTreeItem(const QString &name, const AnimationCurve &curve, const ValueType &type) @@ -280,6 +330,22 @@ PropertyTreeItem::PropertyTreeItem(const QString &name, , m_curve(curve) {} +bool PropertyTreeItem::implicitlyLocked() const +{ + if (auto *parentNode = parentNodeTreeItem()) + return parentNode->locked() || parentNode->implicitlyLocked(); + + return false; +} + +bool PropertyTreeItem::implicitlyPinned() const +{ + if (auto *parentNode = parentNodeTreeItem()) + return parentNode->pinned() || parentNode->implicitlyPinned(); + + return false; +} + PropertyTreeItem *PropertyTreeItem::asPropertyItem() { return this; @@ -296,7 +362,7 @@ const NodeTreeItem *PropertyTreeItem::parentNodeTreeItem() const return nullptr; } -ValueType PropertyTreeItem::valueType() const +PropertyTreeItem::ValueType PropertyTreeItem::valueType() const { return m_type; } @@ -331,4 +397,18 @@ void PropertyTreeItem::setComponent(const Component &comp) m_component = comp; } -} // End namespace DesignTools. +std::string toString(PropertyTreeItem::ValueType type) +{ + switch (type) { + case PropertyTreeItem::ValueType::Bool: + return "Bool"; + case PropertyTreeItem::ValueType::Integer: + return "Integer"; + case PropertyTreeItem::ValueType::Double: + return "Double"; + default: + return "Undefined"; + } +} + +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/curveeditor/treeitem.h b/src/plugins/qmldesigner/components/curveeditor/treeitem.h index 64448af9e5a..60538778092 100644 --- a/src/plugins/qmldesigner/components/curveeditor/treeitem.h +++ b/src/plugins/qmldesigner/components/curveeditor/treeitem.h @@ -38,7 +38,7 @@ class QIcon; class QVariant; QT_END_NAMESPACE -namespace DesignTools { +namespace QmlDesigner { class NodeTreeItem; class PropertyTreeItem; @@ -48,6 +48,10 @@ class TreeItem public: using Path = std::vector; + virtual bool implicitlyLocked() const { return false; } + + virtual bool implicitlyPinned() const { return false; } + public: TreeItem(const QString &name); @@ -81,16 +85,24 @@ public: int columnCount() const; + TreeItem *root() const; + TreeItem *parent() const; TreeItem *child(int row) const; - TreeItem *find(unsigned int row) const; + TreeItem *find(unsigned int id) const; + + TreeItem *find(const QString &id) const; + + std::vector children() const; QVariant data(int column) const; QVariant headerData(int column) const; + bool operator==(unsigned int id) const; + void setId(unsigned int &id); void addChild(TreeItem *child); @@ -116,37 +128,45 @@ protected: class NodeTreeItem : public TreeItem { public: - NodeTreeItem(const QString &name, const QIcon &icon); + NodeTreeItem(const QString &name, const QIcon &icon, const std::vector &parentIds); NodeTreeItem *asNodeItem() override; + bool implicitlyLocked() const override; + + bool implicitlyPinned() const override; + QIcon icon() const override; std::vector properties() const; private: QIcon m_icon; -}; -enum class ValueType { - Undefined, - Bool, - Integer, - Double, + std::vector m_parentIds; }; -std::string toString(ValueType type); - class PropertyTreeItem : public TreeItem { public: enum class Component { Generic, R, G, B, A, X, Y, Z, W }; + enum class ValueType { + Undefined, + Bool, + Integer, + Double, + }; + public: PropertyTreeItem(const QString &name, const AnimationCurve &curve, const ValueType &type); PropertyTreeItem *asPropertyItem() override; + bool implicitlyLocked() const override; + + bool implicitlyPinned() const override; + const NodeTreeItem *parentNodeTreeItem() const; ValueType valueType() const; @@ -173,4 +193,6 @@ private: AnimationCurve m_curve; }; -} // End namespace DesignTools. +std::string toString(PropertyTreeItem::ValueType type); + +} // End namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinewidget.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinewidget.cpp index 6c7c15451de..9e125bceb4d 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinewidget.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelinewidget.cpp @@ -347,41 +347,6 @@ void TimelineWidget::scroll(const TimelineUtils::Side &side) m_scrollbar->setValue(m_scrollbar->value() + m_scrollbar->singleStep()); } -ModelNode getTargetNode(DesignTools::PropertyTreeItem *item, const QmlTimeline &timeline) -{ - if (const DesignTools::NodeTreeItem *nodeItem = item->parentNodeTreeItem()) { - QString targetId = nodeItem->name(); - if (timeline.isValid()) { - for (auto &&target : timeline.allTargets()) { - if (target.displayName() == targetId) - return target; - } - } - } - return ModelNode(); -} - -QmlTimelineKeyframeGroup timelineKeyframeGroup(QmlTimeline &timeline, - DesignTools::PropertyTreeItem *item) -{ - ModelNode node = getTargetNode(item, timeline); - if (node.isValid()) - return timeline.keyframeGroup(node, item->name().toLatin1()); - - return QmlTimelineKeyframeGroup(); -} - -void attachEasingCurve(double frame, - const QEasingCurve &curve, - const QmlTimelineKeyframeGroup &group) -{ - ModelNode frameNode = group.keyframe(frame); - if (frameNode.isValid()) { - auto expression = EasingCurve(curve).toString(); - frameNode.bindingProperty("easing.bezierCurve").setExpression(expression); - } -} - void TimelineWidget::selectionChanged() { if (graphicsScene()->hasSelection()) From bf2276ebde083f0e6daf7f9e5ef620b0aa13c3db Mon Sep 17 00:00:00 2001 From: David Schulz Date: Wed, 28 Oct 2020 11:43:20 +0100 Subject: [PATCH 42/48] LanguageClient: do not generate diagnostics twice Change-Id: Ib15f67fb362440fa901ae4118cb176b2bf073fdc Reviewed-by: Christian Stenger --- src/plugins/languageclient/client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/languageclient/client.cpp b/src/plugins/languageclient/client.cpp index 9f237ea8072..77462e1833f 100644 --- a/src/plugins/languageclient/client.cpp +++ b/src/plugins/languageclient/client.cpp @@ -1169,7 +1169,7 @@ void Client::handleDiagnostics(const PublishDiagnosticsParams ¶ms) const DocumentUri &uri = params.uri(); const QList &diagnostics = params.diagnostics(); - m_diagnosticManager.setDiagnostics(uri, params.diagnostics()); + m_diagnosticManager.setDiagnostics(uri, diagnostics); if (LanguageClientManager::clientForUri(uri) == this) { m_diagnosticManager.showDiagnostics(uri); requestCodeActions(uri, diagnostics); From 3476b8aa67b5c03a41e6a6bd3823f8e07581bf0d Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 27 Oct 2020 11:52:24 +0100 Subject: [PATCH 43/48] Consolidate some options for build.py and build_plugin.py Change-Id: Ic745231ed68296f8052e3b0897893ee8fce53b16 Reviewed-by: Eike Ziller --- scripts/build.py | 4 +++- scripts/build_plugin.py | 11 ++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/scripts/build.py b/scripts/build.py index 6fd8d976b28..2ffb35dda15 100755 --- a/scripts/build.py +++ b/scripts/build.py @@ -91,6 +91,8 @@ def get_arguments(): action='store_true', default=False) parser.add_argument('--with-tests', help='Enable building of tests', action='store_true', default=False) + parser.add_argument('--add-path', help='Prepends a CMAKE_PREFIX_PATH to the build', + action='append', dest='prefix_paths', default=[]) parser.add_argument('--add-make-arg', help='Passes the argument to the make tool.', action='append', dest='make_args', default=[]) parser.add_argument('--add-config', help=('Adds the argument to the CMake configuration call. ' @@ -103,7 +105,7 @@ def get_arguments(): def build_qtcreator(args, paths): if not os.path.exists(paths.build): os.makedirs(paths.build) - prefix_paths = [paths.qt] + prefix_paths = [os.path.abspath(fp) for fp in args.prefix_paths] + [paths.qt] if paths.llvm: prefix_paths += [paths.llvm] if paths.elfutils: diff --git a/scripts/build_plugin.py b/scripts/build_plugin.py index 9df8c64f747..811713a969d 100755 --- a/scripts/build_plugin.py +++ b/scripts/build_plugin.py @@ -46,8 +46,10 @@ def get_arguments(): help='Path to Qt Creator installation including development package', required=True) parser.add_argument('--output-path', help='Output path for resulting 7zip files') - parser.add_argument('--add-path', help='Adds a CMAKE_PREFIX_PATH to the build', + parser.add_argument('--add-path', help='Prepends a CMAKE_PREFIX_PATH to the build', action='append', dest='prefix_paths', default=[]) + parser.add_argument('--add-make-arg', help='Passes the argument to the make tool.', + action='append', dest='make_args', default=[]) parser.add_argument('--add-config', help=('Adds the argument to the CMake configuration call. ' 'Use "--add-config=-DSOMEVAR=SOMEVALUE" if the argument begins with a dash.'), action='append', dest='config_args', default=[]) @@ -63,7 +65,7 @@ def build(args, paths): os.makedirs(paths.build) if not os.path.exists(paths.result): os.makedirs(paths.result) - prefix_paths = [paths.qt, paths.qt_creator] + [os.path.abspath(fp) for fp in args.prefix_paths] + prefix_paths = [os.path.abspath(fp) for fp in args.prefix_paths] + [paths.qt_creator, paths.qt] build_type = 'Debug' if args.debug else 'Release' cmake_args = ['cmake', '-DCMAKE_PREFIX_PATH=' + ';'.join(prefix_paths), @@ -92,7 +94,10 @@ def build(args, paths): cmake_args += args.config_args common.check_print_call(cmake_args + [paths.src], paths.build) - common.check_print_call(['cmake', '--build', '.'], paths.build) + build_args = ['cmake', '--build', '.'] + if args.make_args: + build_args += ['--'] + args.make_args + common.check_print_call(build_args, paths.build) if args.with_docs: common.check_print_call(['cmake', '--build', '.', '--target', 'docs'], paths.build) common.check_print_call(['cmake', '--install', '.', '--prefix', paths.install, '--strip'], From 30017685e7307c6246cc1ac6ef926da4352f6393 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 27 Oct 2020 12:53:07 +0100 Subject: [PATCH 44/48] build.py: add --add-module-path Which prepends a path to CMAKE_MODULE_PATH which is required for branding. Task-number: QTCREATORBUG-22488 Change-Id: I6b0015778d8ceec7183740e5b70eaafd220a3bdf Reviewed-by: Eike Ziller --- scripts/build.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/build.py b/scripts/build.py index 2ffb35dda15..50247030fdf 100755 --- a/scripts/build.py +++ b/scripts/build.py @@ -93,6 +93,8 @@ def get_arguments(): action='store_true', default=False) parser.add_argument('--add-path', help='Prepends a CMAKE_PREFIX_PATH to the build', action='append', dest='prefix_paths', default=[]) + parser.add_argument('--add-module-path', help='Prepends a CMAKE_MODULE_PATH to the build', + action='append', dest='module_paths', default=[]) parser.add_argument('--add-make-arg', help='Passes the argument to the make tool.', action='append', dest='make_args', default=[]) parser.add_argument('--add-config', help=('Adds the argument to the CMake configuration call. ' @@ -128,6 +130,10 @@ def build_qtcreator(args, paths): if args.python3: cmake_args += ['-DPYTHON_EXECUTABLE=' + args.python3] + if args.module_paths: + module_paths = [os.path.abspath(fp) for fp in args.module_paths] + cmake_args += ['-DCMAKE_MODULE_PATH=' + ';'.join(module_paths)] + # force MSVC on Windows, because it looks for GCC in the PATH first, # even if MSVC is first mentioned in the PATH... # TODO would be nicer if we only did this if cl.exe is indeed first in the PATH From ee1e6ca50821ace4323a0838452dda59b1a352a2 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 23 Oct 2020 13:02:09 +0200 Subject: [PATCH 45/48] EditorManager: Avoid changing the editor in between when closing editors Do not call setCurrentEditor(nullptr) since this sends a currentEditorChanged signal which claims that no editor is active, which can lead to unnecessary updates. In the specific case, the git branch view was updating with the project directory as a new repository, and then, after the actual new current editor was set updated again with the repository of the editor. This can be needlessly expensive if the previous and new editor are in the same repository, but the project repository is something else, like when having the Qt Creator super-repository open, or when editing files unrelated to the project. Change-Id: I515c3c40a86bfa2713ff13460ddfda974bc08c59 Reviewed-by: David Schulz --- .../editormanager/editormanager.cpp | 111 +++++++++++------- 1 file changed, 70 insertions(+), 41 deletions(-) diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index 12ae70bf033..36c1ae3634d 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -1650,62 +1650,91 @@ bool EditorManagerPrivate::closeEditors(const QList &editors, CloseFla if (acceptedEditors.isEmpty()) return false; - QList closedViews; - EditorView *focusView = nullptr; - - // remove the editors - foreach (IEditor *editor, acceptedEditors) { - emit m_instance->editorAboutToClose(editor); - if (!editor->document()->filePath().isEmpty() - && !editor->document()->isTemporary()) { + // save editor states + for (IEditor *editor : qAsConst(acceptedEditors)) { + if (!editor->document()->filePath().isEmpty() && !editor->document()->isTemporary()) { QByteArray state = editor->saveState(); if (!state.isEmpty()) d->m_editorStates.insert(editor->document()->filePath().toString(), QVariant(state)); } + } + EditorView *focusView = nullptr; + + // Remove accepted editors from document model/manager and context list, + // and sort them per view, so we can remove them from views in an orderly + // manner. + QMultiHash editorsPerView; + for (IEditor *editor : qAsConst(acceptedEditors)) { + emit m_instance->editorAboutToClose(editor); removeEditor(editor, flag != CloseFlag::Suspend); if (EditorView *view = viewForEditor(editor)) { - if (QApplication::focusWidget() && QApplication::focusWidget() == editor->widget()->focusWidget()) + editorsPerView.insert(view, editor); + if (QApplication::focusWidget() + && QApplication::focusWidget() == editor->widget()->focusWidget()) { focusView = view; - if (editor == view->currentEditor()) - closedViews += view; - if (d->m_currentEditor == editor) { - // avoid having a current editor without view - setCurrentView(view); - setCurrentEditor(nullptr); } - view->removeEditor(editor); } } + QTC_CHECK(!focusView || focusView == currentView); - // TODO doesn't work as expected with multiple areas in main window and some other cases - // instead each view should have its own file history and handle solely themselves - // which editor is shown if their current editor closes - EditorView *forceViewToShowEditor = nullptr; - if (!closedViews.isEmpty() && EditorManager::visibleEditors().isEmpty()) { - if (closedViews.contains(currentView)) - forceViewToShowEditor = currentView; - else - forceViewToShowEditor = closedViews.first(); - } - foreach (EditorView *view, closedViews) { - IEditor *newCurrent = view->currentEditor(); - if (!newCurrent && forceViewToShowEditor == view) - newCurrent = pickUnusedEditor(); - if (newCurrent) { - activateEditor(view, newCurrent, EditorManager::DoNotChangeCurrentEditor); - } else if (forceViewToShowEditor == view) { - DocumentModel::Entry *entry = DocumentModelPrivate::firstSuspendedEntry(); - if (entry) { - activateEditorForEntry(view, entry, EditorManager::DoNotChangeCurrentEditor); - } else { // no "suspended" ones, so any entry left should have a document - const QList documents = DocumentModel::entries(); - if (!documents.isEmpty()) { - if (IDocument *document = documents.last()->document) { - activateEditorForDocument(view, document, EditorManager::DoNotChangeCurrentEditor); + // Go through views, remove the editors from them. + // Sort such that views for which the current editor is closed come last, + // and if the global current view is one of them, that comes very last. + // When handling the last view in the list we handle the case where all + // visible editors are closed, and we need to e.g. revive an invisible or + // a suspended editor + QList views = editorsPerView.keys(); + Utils::sort(views, [editorsPerView, currentView](EditorView *a, EditorView *b) { + if (a == b) + return false; + const bool aHasCurrent = editorsPerView.values(a).contains(a->currentEditor()); + const bool bHasCurrent = editorsPerView.values(b).contains(b->currentEditor()); + const bool aHasGlobalCurrent = (a == currentView && aHasCurrent); + const bool bHasGlobalCurrent = (b == currentView && bHasCurrent); + if (bHasGlobalCurrent && !aHasGlobalCurrent) + return true; + if (bHasCurrent && !aHasCurrent) + return true; + return false; + }); + for (EditorView *view : qAsConst(views)) { + QList editors = editorsPerView.values(view); + // handle current editor in view last + IEditor *viewCurrentEditor = view->currentEditor(); + if (editors.contains(viewCurrentEditor) && editors.last() != viewCurrentEditor) { + editors.removeAll(viewCurrentEditor); + editors.append(viewCurrentEditor); + } + for (IEditor *editor : qAsConst(editors)) { + if (editor == viewCurrentEditor && view == views.last()) { + // Avoid removing the globally current editor from its view, + // set a new current editor before. + const EditorManager::OpenEditorFlags flags = view != currentView + ? EditorManager::DoNotChangeCurrentEditor + : EditorManager::NoFlags; + const QList viewEditors = view->editors(); + IEditor *newCurrent = viewEditors.size() > 1 ? viewEditors.at(viewEditors.size() - 2) + : nullptr; + if (!newCurrent) + newCurrent = pickUnusedEditor(); + if (newCurrent) { + activateEditor(view, newCurrent, flags); + } else { + DocumentModel::Entry *entry = DocumentModelPrivate::firstSuspendedEntry(); + if (entry) { + activateEditorForEntry(view, entry, flags); + } else { // no "suspended" ones, so any entry left should have a document + const QList documents = DocumentModel::entries(); + if (!documents.isEmpty()) { + if (IDocument *document = documents.last()->document) { + activateEditorForDocument(view, document, flags); + } + } } } } + view->removeEditor(editor); } } From 652feacd5f47f1715cc162e861b1504ae9dcac4f Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 2 Oct 2020 12:07:15 +0200 Subject: [PATCH 46/48] Doc: Describe Positioner and Layout type properties Move positioning to a separate topic. The information in this topic is related not only to the Library view, but also to the Properties and Form Editor views. Describe the properties of the Positioner and Layout types. Change-Id: I9d00bc9498499f52ecf49463df7f651aaecf8f0e Reviewed-by: Alessandro Portale Reviewed-by: Thomas Hartmann --- .../config/qtcreator-project.qdocconf | 1 + doc/qtcreator/images/icons/frame-icon16.png | Bin 0 -> 117 bytes .../images/icons/groupbox-icon16.png | Bin 0 -> 125 bytes doc/qtcreator/images/icons/label-icon16.png | Bin 0 -> 182 bytes doc/qtcreator/images/icons/page-icon16.png | Bin 0 -> 148 bytes .../images/icons/pageindicator-icon16.png | Bin 0 -> 158 bytes doc/qtcreator/images/icons/pane-icon16.png | Bin 0 -> 92 bytes .../images/qtquick-layout-grid-properties.png | Bin 0 -> 26375 bytes .../qtquick-positioner-column-properties.png | Bin 0 -> 23035 bytes .../qtquick-positioner-flow-properties.png | Bin 0 -> 28213 bytes .../qtquick-positioner-grid-properties.png | Bin 0 -> 41210 bytes doc/qtcreator/src/qtcreator-toc.qdoc | 1 + .../src/qtquick/qtquick-buttons.qdoc | 2 +- .../src/qtquick/qtquick-components.qdoc | 273 ---------- doc/qtcreator/src/qtquick/qtquick-fonts.qdoc | 2 +- .../src/qtquick/qtquick-positioning.qdoc | 466 ++++++++++++++++++ .../src/qtquick/qtquick-properties.qdoc | 6 +- .../config/qtdesignstudio.qdocconf | 1 + doc/qtdesignstudio/examples/doc/loginui2.qdoc | 2 +- .../src/qtdesignstudio-toc.qdoc | 1 + doc/qtdesignstudio/src/qtdesignstudio.qdoc | 2 +- 21 files changed, 478 insertions(+), 279 deletions(-) create mode 100644 doc/qtcreator/images/icons/frame-icon16.png create mode 100644 doc/qtcreator/images/icons/groupbox-icon16.png create mode 100644 doc/qtcreator/images/icons/label-icon16.png create mode 100644 doc/qtcreator/images/icons/page-icon16.png create mode 100644 doc/qtcreator/images/icons/pageindicator-icon16.png create mode 100644 doc/qtcreator/images/icons/pane-icon16.png create mode 100644 doc/qtcreator/images/qtquick-layout-grid-properties.png create mode 100644 doc/qtcreator/images/qtquick-positioner-column-properties.png create mode 100644 doc/qtcreator/images/qtquick-positioner-flow-properties.png create mode 100644 doc/qtcreator/images/qtquick-positioner-grid-properties.png create mode 100644 doc/qtcreator/src/qtquick/qtquick-positioning.qdoc diff --git a/doc/qtcreator/config/qtcreator-project.qdocconf b/doc/qtcreator/config/qtcreator-project.qdocconf index e2f5c9b5278..cff09e5c3bc 100644 --- a/doc/qtcreator/config/qtcreator-project.qdocconf +++ b/doc/qtcreator/config/qtcreator-project.qdocconf @@ -32,6 +32,7 @@ imagedirs = ../images \ ../../../src/plugins/qmldesigner/components/formeditor \ ../../../src/plugins/qmldesigner/components/navigator \ ../../../src/plugins/qmldesigner/components/timelineeditor/images \ + ../../../src/plugins/qmldesigner/componentsplugin/images \ ../../../src/plugins/qmldesigner/qmlpreviewplugin/images \ ../../../src/plugins/qmldesigner/qtquickplugin/images \ ../../../src/plugins/scxmleditor/common/images \ diff --git a/doc/qtcreator/images/icons/frame-icon16.png b/doc/qtcreator/images/icons/frame-icon16.png new file mode 100644 index 0000000000000000000000000000000000000000..e5b65ad53bb792c1c2c20d782e8481330a701eeb GIT binary patch literal 117 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7Y&=~YLo9leV>Tuot!Lw6 z5LTTfDIp;dG2up&%B$M`BnKClBkVyX>mxQcH8wVK#YvbZTwz!xalqoiPCTuot!HCW zP*Q3VoGv4*c(z&IKuDPF2Ltz%u!Mw!A0BQ0z8f&xxw*L1D1?6R64ln|Zw+K_Yh@Hs bPi0VT6nOjM$oJC>3=9mOu6{1-oD!Md(Ny zz*7?B7tFvXAR(_4-PL#S`JbucQ?wWu7>qn!978ywlM@u!Hk`9$X5#6&o37Ba#yGuC yLsN5ZqD62Fv!G>iLbDoEIP-N@b9QqE2E~4@eD{ot8yFZE7(8A5T-G@yGywn?hdtT= literal 0 HcmV?d00001 diff --git a/doc/qtcreator/images/icons/page-icon16.png b/doc/qtcreator/images/icons/page-icon16.png new file mode 100644 index 0000000000000000000000000000000000000000..bc6810b6053c29e358e0e7fe7717b695f07c29c8 GIT binary patch literal 148 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdnK1d_r6q7#LQpSh08a?!yNT z96osP=%GU^R;;*q_N?RL)|U(n3~VJqe!&ckOy@3K6|LX5gn@xU)zif>gd;jR!Nc3z zJ2ZiTNkQ3`i9KQ*%p4~YM2sJ#EYM(Mm?)?@>kE598v_FagQu&X J%Q~loCID3rGE4vf literal 0 HcmV?d00001 diff --git a/doc/qtcreator/images/icons/pane-icon16.png b/doc/qtcreator/images/icons/pane-icon16.png new file mode 100644 index 0000000000000000000000000000000000000000..2b8048441c3f5ba946a2b52ccbeab9ea4efd82f3 GIT binary patch literal 92 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRdMrH;E236Z!B?bltwg8_H*A**PTs(WWKdb!* u0|SGgr;B3KB&) literal 0 HcmV?d00001 diff --git a/doc/qtcreator/images/qtquick-layout-grid-properties.png b/doc/qtcreator/images/qtquick-layout-grid-properties.png new file mode 100644 index 0000000000000000000000000000000000000000..d7f51216b7e9d9088fe383600b896a940ea0ca97 GIT binary patch literal 26375 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 literal 0 HcmV?d00001 diff --git a/doc/qtcreator/images/qtquick-positioner-column-properties.png b/doc/qtcreator/images/qtquick-positioner-column-properties.png new file mode 100644 index 0000000000000000000000000000000000000000..0783872c513a583eb999aef228b8d51d55ad3370 GIT binary patch literal 23035 zcmeAS@N?(olHy`uVBq!ia0y~yU^Zl6U^L@kVqjpnm)Gsazz})J)5S5Q;?|qFbCc)Op)U~Ed;zDSkVfTs-#-lAsd=l3>6cnDV>0Z|* zDSCZ_Hk(fho4}c-b$UrI3HRdtjSn+0^EuA=@Ym*RkL}&7S8Zc+uePsx^{Sr3RLLNL8W_}@Co3wfs3>^*Zd+mUhjX8DxHt_>joZOWLsrabgfJ|=ytr9>yiayp**DQ^ zd2wfx>ZVWoLT2zu+3Z*~rJYxv4{VxAie+%`% zt(5X_t?bE@C)xRAR%E?i7rQ&_Rf;q7_G!u&Ha?s6L}RwwgMi~)v)fMn;Z}EcSdqD4 zf3U2~T&?xrKS;c=uWkF1o$@4X=WhL|Efu#+{-1h%eNCiw-k%?{EF%AG$@W~BV^MuS z<;X@ za`c>c(zSOTjg5`j*Ve4uQ+H{J=fj5&P4m=?QzWD$HkYobc=t4dQ9f6tqI zmw)f~4d2gI2y+GUpTAd~5%gc{n2gh`oVS@O6|gg6O?71C!X0b8PKXp5 ztyKTIZ<jBu?nkhzI|tl#aFv_d7NQn*FXjHhhaVmup2}Vv5*!w^ zad-axeX8EmHznTw_V%j$+%E6`FE6ha+yqWW)oUi(ibPM@pj<-aPuUo$FwAV+;d~5Bz)ya!BFGPKdRcxNDxL{7^hN5Lr>X$c76A%cD zyW}N)dY8=UQu}FZb)T2|G(B~jJT=!g{^rSZ;a-mC99O?R60@`DX?g3KG(WQtt9PsS zEI)e03|jlX2Jev?Mu)VXIi20e~?nY8nmm4#$e6`K|>zl?>4YI5t;kXI*l zomXpW-`wAsdB5&2dq9(#&E@xUf4{uEJlnke>bITV$F?kUz5Cv`@rcJNuS)%-wq?`WrP+%nIW1liroM5@rov>STgTU}7nxsZK2>j1asrhTmX{Nr z`taU5nG)Oar7LpX%E_TK6Q=roo7)`LJ$drw7Z(@5{�-Nc)jrp_vEv?_l-r^9j9J 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 GLK6TToBw?P literal 0 HcmV?d00001 diff --git a/doc/qtcreator/images/qtquick-positioner-grid-properties.png b/doc/qtcreator/images/qtquick-positioner-grid-properties.png new file mode 100644 index 0000000000000000000000000000000000000000..cd93830d36521de585daa442002017381d742691 GIT binary patch literal 41210 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 A+5i9m literal 0 HcmV?d00001 diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc index 0715d02a063..3df326a6ef9 100644 --- a/doc/qtcreator/src/qtcreator-toc.qdoc +++ b/doc/qtcreator/src/qtcreator-toc.qdoc @@ -103,6 +103,7 @@ \endlist \li \l{Managing Item Hierarchy} \li \l{Specifying Item Properties} + \li \l{Positioning Items} \li \l{Using Custom Fonts} \li \l{Annotating Designs} \li \l{Loading Placeholder Data} diff --git a/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc b/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc index 578f5dfb841..4b6d73a4e44 100644 --- a/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc @@ -274,7 +274,7 @@ and set the button text for each button instance, for example. For more information about positioning buttons on screens, see - \l{Positioning Items in UIs}. + \l{Positioning Items}. \image qmldesigner-borderimage.png "Button preview as part of a screen" */ diff --git a/doc/qtcreator/src/qtquick/qtquick-components.qdoc b/doc/qtcreator/src/qtquick/qtquick-components.qdoc index ce288751d88..67c2001ed76 100644 --- a/doc/qtcreator/src/qtquick/qtquick-components.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-components.qdoc @@ -180,279 +180,6 @@ \l{SwipeDelegate}{Swipe Delegate} delegate components are also available in \uicontrol Library. - \section1 Positioning Items in UIs - - The position of an item in the UI can be either absolute or - relative to other items. If you are designing a static UI, - \l{Important Concepts In Qt Quick - Positioning#manual-positioning} - {manual positioning} provides the most efficient form of positioning - items. For a dynamic UI, you can employ the following positioning - methods provided by Qt Quick: - - \list - \li \l{Setting Bindings} - \li \l{Setting Anchors and Margins} - \li \l{Aligning and Distributing Items} - \li \l{Using Positioners} - \li \l{Using Layouts} - \li \l{Organizing Items} - \endlist - - \section2 Setting Bindings - - \l{Positioning with Bindings} {Property binding} is a declarative way of - specifying the value of a property. Binding allows a property value to be - expressed as a JavaScript expression that defines the value relative to - other property values or data accessible in the application. The property - value is automatically kept up to date if the other properties or data - values change. - - Property bindings are created implicitly in QML whenever a property is - assigned a JavaScript expression. To set JavaScript expressions as values - of properties in the Design mode, select the - \inlineimage icons/action-icon.png - (\uicontrol Actions) menu next to a property, and then select - \uicontrol {Set Binding}. - - \image qmldesigner-set-expression.png "Type properties context menu" - - In \uicontrol {Binding Editor}, select an item and a property from - lists of available items and their properties. - - \image qmldesigner-binding-editor.png "Binding Editor" - - Alternatively, start typing a - string and press \key Ctrl+Space to display a list of properties, IDs, and - code snippets. When you enter a period (.) after a property name, a list of - available values is displayed. Press \key Enter to accept the first - suggestion in the list and to complete the code. - - When a binding is set, the \uicontrol Actions menu icon changes to - \inlineimage icons/action-icon-binding - . To remove bindings, select \uicontrol Actions > \uicontrol Reset. - - You can set bindings also in the \uicontrol Connections view. For more - information, see \l {Adding Bindings Between Properties}. - - For more information on the JavaScript environment provided by QML, see - \l{Integrating QML and JavaScript}. - - Bindings are a black box for the Design mode and using them might have a - negative impact on performance, so consider setting anchors and margins for - items, instead. For example, instead of setting \c {parent.width} for an - item, you could anchor the item to its sibling items on the left and the - right. - - \section2 Setting Anchors and Margins - - In an \l{Important Concepts In Qt Quick - Positioning#anchors} - {anchor-based} layout, each QML type can be thought of as having a set of - invisible \e anchor lines: top, bottom, left, right, fill, horizontal - center, vertical center, and baseline. - - In the \uicontrol Layout tab you can set anchors and margins for items. To - set the anchors of an item, click the anchor buttons. You can combine the - top/bottom, left/right, and horizontal/vertical anchors to anchor items in - the corners of the parent item or center them horizontally or vertically - within the parent item. - - \image qmldesigner-anchor-buttons.png "Anchor buttons" - - For convenience, you can click the \inlineimage anchor-fill.png - (\uicontrol {Fill to Parent}) toolbar button to apply fill anchors to an - item and the \inlineimage qtcreator-anchors-reset-icon.png - (\uicontrol {Reset Anchors}) button to reset the anchors to their saved - state. - - You can specify the baseline anchor in \uicontrol {Text Editor} in the - Design mode. - - For performance reasons, you can only anchor an item to its siblings - and direct parent. By default, an item is anchored to its parent when - you use the anchor buttons. Select a sibling of the item in the - \uicontrol Target field to anchor to it, instead. - - Arbitrary anchoring is not supported. For example, you cannot specify: - \c {anchor.left: parent.right}. You have to specify: - \c {anchor.left: parent.left}. When you use the anchor buttons, anchors to - the parent item are always specified to the same side. However, anchors to - sibling items are specified to the opposite side: - \c {anchor.left: sibling.right}. This allows you to keep sibling items - together. - - In the following image, \uicontrol{Rectangle 2} is anchored to - \uicontrol {Rectangle 1} on its left and to the bottom of its parent. - - \image qmldesigner-anchors.png "Anchoring sibling items" - - The anchors for \uicontrol{Rectangle 2} are specified as follows in code: - - \qml - Rectangle { - id: rectangle2 - anchors.left: rectangle1.right - anchors.leftMargin: 10 - anchors.bottom: parent.bottom - anchors.bottomMargin: 10 - // - } - \endqml - - Margins specify the amount of empty space to leave to the outside of an - item. Margins only have meaning for anchors. They do not take any effect - when using layouts or absolute positioning. - - \section2 Aligning and Distributing Items - - When you're working with a group of items, you can select them to align - and distribute them evenly. As the positions of the items are fixed, you - cannot apply these functions to anchored items. For scalability, you can - anchor the aligned and distributed items when your design is ready. - - \image qmldesigner-alignment.png "Aligning sibling items" - - Select the buttons in the \uicontrol Align group to align the top/bottom - or left/right edges of the items in the group to the one farthest away from - the center of the group. For example, when left-aligning, the items are - aligned to the leftmost item. You can also align the horizontal/vertical - centers of items, or both, as in the image above. - - In the \uicontrol {Align to} field, select whether to align the items in - respect to the selection, the root item, or a \e {key object} that you - select in the \uicontrol {Key object} field. The key object must be a part - of the selection. - - You can distribute either \e objects or the \e spacing between them. If the - objects or spacing cannot be distributed to equal pixel values without - ending up with half pixels, you receive a notification. You can either allow - \QDS to distribute objects or spacing using the closest values possible or - tweak your design so that the objects and spacing can be distributed - perfectly. - - When distributing objects, you can select whether the distance between - them is calculated from their top/bottom or left/right edges or their - horizontal/vertical center. - - \image qmldesigner-distribute-objects.png "Distribute objects buttons" - - You can distribute spacing either evenly within a target area or at - specified distances, calculated from a starting point. - - You can select the orientation in which the objects are distributed evenly - within the target area: horizontally along the x axis or vertically along - the y axis. - - \image qmldesigner-distribute-spacing-evenly.png "Distribute spacing evenly" - - Alternatively, you can distribute spacing in pixels by selecting one of the - starting point buttons: left/right or top/bottom edge of the target area, - or its horizontal/vertical center. Note that some items might end up outside - the target area. - - \image qmldesigner-distribute-spacing-pixels.png "Distribute spacing in pixels" - - You can set the space between objects in pixels. You can - disable the distribution of spacing in pixels by clicking - the \inlineimage qmldesigner-distribute-spacing-x.png - button. - - \section2 Using Positioners - - \l{Important Concepts In Qt Quick - Positioning#positioners} - {Positioner items} are container items that manage the positions of items - in a declarative user interface. Positioners behave in a similar way to - the layout managers used with standard Qt widgets, except that they are - also containers in their own right. - - You can use the following positioners to arrange items in UIs: - - \list - \li \l[QtQuick] {Column} arranges its child items vertically. - \li \l[QtQuick] {Row} arranges its child items horizontally. - \li \l[QtQuick] {Grid} - arranges its child items so that they are aligned in a grid and - are not overlapping. - \li \l[QtQuick] {Flow} - arranges its child items side by side, wrapping as necessary. - \endlist - - To position several items in a \uicontrol Column, \uicontrol Row, - \uicontrol Grid, or \uicontrol Flow, select the items in - \uicontrol {Form Editor}, and then select \uicontrol Position in - the context menu. - - \section2 Using Layouts - - Since Qt 5.1, you can use QML types in the \l{qtquicklayouts-index.html} - {Qt Quick Layouts} module to arrange Qt Quick items in UIs. Unlike - positioners, they manage both the positions and sizes of items in a - declarative interface. They are well suited for resizable UIs. - - You can use the following layout types to arrange items in UIs: - - \list - \li \l{ColumnLayout}{Column Layout} provides a grid layout with only - one column. - \li \l{RowLayout}{Row Layout} provides a grid layout with only one row. - \li \l{GridLayout}{Grid Layout} provides a way of dynamically arranging - items in a grid. - \li \l{StackLayout}{Stack Layout} provides a stack of items where only - one item is visible at a time. - \endlist - - To lay out several items in a column, row, grid, or - \uicontrol {Stack Layout}, select the items in \uicontrol {Form Editor}, - and then select \uicontrol Layout in the context menu. - - You can also click the \inlineimage column.png - (\uicontrol {Column Layout}), \inlineimage row.png - (\uicontrol {Row Layout}), and \inlineimage grid.png - (\uicontrol {Grid Layout}) toolbar buttons to apply - layouts to the selected items. - - To make an item within a layout as wide as possible while respecting the - given constraints, select the item in \uicontrol {Form Editor}, and then - select \uicontrol Layout > \uicontrol {Fill Width} in the context menu. To - make the item as high as possible, select \uicontrol {Fill Height}. - - \section2 Editing Stack Layouts - - \image qtquick-designer-stacked-view.png - - To add items to a \uicontrol {Stack Layout}, select the - \inlineimage plus.png - button next to the type name in \uicontrol {Form Editor}. To move - between items, select the \inlineimage prev.png - (\uicontrol Previous) and \inlineimage next.png - (\uicontrol Next) buttons. - - To add a tab bar to a stack layout, select \uicontrol {Stacked Container} > - \uicontrol {Add Tab Bar}. - - To raise or lower the stacking order of an item, select - \uicontrol {Stacked Container} > \uicontrol {Increase Index} or - \uicontrol {Decrease Index}. - - \section2 Organizing Items - - Since Qt 5.7, you can use the following \l{Qt Quick Controls} types to - organize items in UIs: - - \list - \li \l [QtQuickControls]{Frame} places a logical group of controls - within a visual frame. - \li \l [QtQuickControls]{GroupBox}{Group Box} is used to lay out a - logical group of controls together, within a titled visual frame. - \li \l [QtQuickControls]{Label} is a text label with inherited styling - and font. - \li \l [QtQuickControls]{Page} provides a styled page control with - support for a header and footer. - \li \l [QtQuickControls]{PageIndicator}{Page Indicator} indicates the - currently active page. - \li \l [QtQuickControls]{Pane} provides a background matching with the - application style and theme. - \endlist - \section1 User Interaction Methods You can use the following QML types to add basic interaction methods to diff --git a/doc/qtcreator/src/qtquick/qtquick-fonts.qdoc b/doc/qtcreator/src/qtquick/qtquick-fonts.qdoc index ccaef797f2c..cbfaa2a9ece 100644 --- a/doc/qtcreator/src/qtquick/qtquick-fonts.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-fonts.qdoc @@ -24,7 +24,7 @@ ****************************************************************************/ /*! - \previouspage qtquick-properties.html + \previouspage qtquick-positioning.html \page qtquick-fonts.html \nextpage qtquick-annotations.html diff --git a/doc/qtcreator/src/qtquick/qtquick-positioning.qdoc b/doc/qtcreator/src/qtquick/qtquick-positioning.qdoc new file mode 100644 index 00000000000..7c1f07537e5 --- /dev/null +++ b/doc/qtcreator/src/qtquick/qtquick-positioning.qdoc @@ -0,0 +1,466 @@ +/**************************************************************************** +** +** Copyright (C) 2020 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Creator documentation. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** +****************************************************************************/ + +/*! + \page qtquick-positioning.html + \previouspage qtquick-properties.html + \nextpage qtquick-fonts.html + + \title Positioning Items + + The position of an item in a UI can be either absolute or relative to + other items. The visual types exist at a particular location in the screen + coordinate system at any instant in time. The x and y coordinates of a + visual item are relative to those of its visual parent, with the top-left + corner having the coordinate (0, 0). + + If you are designing a static UI, + \l{Important Concepts In Qt Quick - Positioning#manual-positioning} + {manual positioning} provides the most efficient form of positioning + items. For a dynamic UI, you can employ the following positioning + methods: + + \list + \li \l{Setting Bindings} + \li \l{Setting Anchors and Margins} + \li \l{Aligning and Distributing Items} + \li \l{Using Positioners} + \li \l{Using Layouts} + \li \l{Organizing Items} + \endlist + + \section2 Setting Bindings + + \l{Positioning with Bindings} {Property binding} is a declarative way of + specifying the value of a property. Binding allows a property value to be + expressed as a JavaScript expression that defines the value relative to + other property values or data accessible in the application. The property + value is automatically kept up to date if the other properties or data + values change. + + Property bindings are created implicitly in QML whenever a property is + assigned a JavaScript expression. To set JavaScript expressions as values + of properties in the \uicontrol Properties view, select the + \inlineimage icons/action-icon.png + (\uicontrol Actions) menu next to a property, and then select + \uicontrol {Set Binding}. + + \image qmldesigner-set-expression.png "Type properties context menu" + + In \uicontrol {Binding Editor}, select an item and a property from + lists of available items and their properties. + + \image qmldesigner-binding-editor.png "Binding Editor" + + Alternatively, start typing a + string and press \key Ctrl+Space to display a list of properties, IDs, and + code snippets. When you enter a period (.) after a property name, a list of + available values is displayed. Press \key Enter to accept the first + suggestion in the list and to complete the code. + + When a binding is set, the \uicontrol Actions menu icon changes to + \inlineimage icons/action-icon-binding + . To remove bindings, select \uicontrol Actions > \uicontrol Reset. + + You can set bindings also in the \uicontrol Connections view. For more + information, see \l {Adding Bindings Between Properties}. + + For more information on the JavaScript environment provided by QML, see + \l{Integrating QML and JavaScript}. + + Bindings are a black box for \QC and using them might have a + negative impact on performance, so consider setting anchors and margins for + items, instead. For example, instead of setting \c {parent.width} for an + item, you could anchor the item to its sibling items on the left and the + right. + + \section2 Setting Anchors and Margins + + In an \l{Important Concepts In Qt Quick - Positioning#anchors} + {anchor-based} layout, each QML type can be thought of as having a set of + invisible \e anchor lines: top, bottom, left, right, fill, horizontal + center, vertical center, and baseline. + + In the \uicontrol Layout tab you can set anchors and margins for items. To + set the anchors of an item, click the anchor buttons. You can combine the + top/bottom, left/right, and horizontal/vertical anchors to anchor items in + the corners of the parent item or center them horizontally or vertically + within the parent item. + + \image qmldesigner-anchor-buttons.png "Anchor buttons" + + For convenience, you can click the \inlineimage anchor-fill.png + (\uicontrol {Fill to Parent}) toolbar button to apply fill anchors to an + item and the \inlineimage qtcreator-anchors-reset-icon.png + (\uicontrol {Reset Anchors}) button to reset the anchors to their saved + state. + + You can specify the baseline anchor in \uicontrol {Text Editor}. + + For performance reasons, you can only anchor an item to its siblings + and direct parent. By default, an item is anchored to its parent when + you use the anchor buttons. Select a sibling of the item in the + \uicontrol Target field to anchor to it, instead. + + Arbitrary anchoring is not supported. For example, you cannot specify: + \c {anchor.left: parent.right}. You have to specify: + \c {anchor.left: parent.left}. When you use the anchor buttons, anchors to + the parent item are always specified to the same side. However, anchors to + sibling items are specified to the opposite side: + \c {anchor.left: sibling.right}. This allows you to keep sibling items + together. + + In the following image, \uicontrol{Rectangle 2} is anchored to + \uicontrol {Rectangle 1} on its left and to the bottom of its parent. + + \image qmldesigner-anchors.png "Anchoring sibling items" + + The anchors for \uicontrol{Rectangle 2} are specified as follows in code: + + \qml + Rectangle { + id: rectangle2 + anchors.left: rectangle1.right + anchors.leftMargin: 10 + anchors.bottom: parent.bottom + anchors.bottomMargin: 10 + // + } + \endqml + + Margins specify the amount of empty space to leave to the outside of an + item. Margins only have meaning for anchors. They do not take any effect + when using layouts or absolute positioning. + + \section2 Aligning and Distributing Items + + When you're working with a group of items, you can select them to align + and distribute them evenly. As the positions of the items are fixed, you + cannot apply these functions to anchored items. For scalability, you can + anchor the aligned and distributed items when your design is ready. + + \image qmldesigner-alignment.png "Aligning sibling items" + + Select the buttons in the \uicontrol Align group to align the top/bottom + or left/right edges of the items in the group to the one farthest away from + the center of the group. For example, when left-aligning, the items are + aligned to the leftmost item. You can also align the horizontal/vertical + centers of items, or both, as in the image above. + + In the \uicontrol {Align to} field, select whether to align the items in + respect to the selection, the root item, or a \e {key object} that you + select in the \uicontrol {Key object} field. The key object must be a part + of the selection. + + You can distribute either \e objects or the \e spacing between them. If the + objects or spacing cannot be distributed to equal pixel values without + ending up with half pixels, you receive a notification. You can either allow + \QDS to distribute objects or spacing using the closest values possible or + tweak your design so that the objects and spacing can be distributed + perfectly. + + When distributing objects, you can select whether the distance between + them is calculated from their top/bottom or left/right edges or their + horizontal/vertical center. + + \image qmldesigner-distribute-objects.png "Distribute objects buttons" + + You can distribute spacing either evenly within a target area or at + specified distances, calculated from a starting point. + + You can select the orientation in which the objects are distributed evenly + within the target area: horizontally along the x axis or vertically along + the y axis. + + \image qmldesigner-distribute-spacing-evenly.png "Distribute spacing evenly" + + Alternatively, you can distribute spacing in pixels by selecting one of the + starting point buttons: left/right or top/bottom edge of the target area, + or its horizontal/vertical center. Note that some items might end up outside + the target area. + + \image qmldesigner-distribute-spacing-pixels.png "Distribute spacing in pixels" + + You can set the space between objects in pixels. You can + disable the distribution of spacing in pixels by clicking + the \inlineimage qmldesigner-distribute-spacing-x.png + button. + + \section2 Using Positioners + + Positioner items are container items that manage the positions of + items. For many use cases, the best positioner to use is a simple + column, row, flow, or grid. You can use the QML types available in + the \uicontrol {Qt Quick - Positioner} section of \uicontrol Library + to position the children of an item in these formations in the most + efficient manner possible. + + To position several items in a \uicontrol Column, \uicontrol Row, + \uicontrol Flow, or \uicontrol Grid, select the items in + \uicontrol {Form Editor}, and then select \uicontrol Position in + the context menu. + + \section3 Column Positioner + + A \uicontrol Column positions its child items along a single column. + It can be used as a convenient way to vertically position a series of + items without using anchors. + + \image qtquick-positioner-column-properties.png "Column properties" + + For all positioners, you can specify the spacing between the child + items that they contain in the \uicontrol Spacing field. + + In addition, you can specify the vertical and horizontal padding between + content and the left, right, top, and bottom edges of items as values of + the fields in the \uicontrol Padding group. + + \section3 Row and Flow Positioners + + A \uicontrol Row positions its child items along a single row. It can be + used as a convenient way to horizontally position a series of items without + using anchors. + + The \uicontrol Flow type positions its child items like words on a page, + wrapping them to create rows or columns of items. + + \image qtquick-positioner-flow-properties.png "Flow properties" + + For flow and row positioners, you can also set the direction of a flow to + either left-to-right or top-to-bottom in the \uicontrol Flow field. + Items are positioned next to to each other according to the value you set + in the \uicontrol {Layout direction} field until the width or height of the + Flow item is exceeded, then wrapped to the next row or column. + + You can set the layout direction to either \uicontrol LeftToRight or + \uicontrol RightToLeft in the \uicontrol {Layout direction} field. If + the width of the row is explicitly set, the left anchor remains to the + left of the row and the right anchor remains to the right of it. + + \section3 Grid Positioner + + A \uicontrol Grid creates a grid of cells that is large enough to hold all + of its child items, and places these items in the cells from left to right + and top to bottom. Each item is positioned at the top-left corner of its + cell with position (0, 0). + + \QC generates the grid based on the positions of the child items in + \uicontrol {Form Editor}. You can modify the number of rows and columns + in the \uicontrol Rows and \uicontrol Columns fields. + + \image qtquick-positioner-grid-properties.png "Grid properties" + + In addition to the flow and layout direction, you can set the horizontal + and vertical alignment of grid items. By default, grid items are vertically + aligned to the top. Horizontal alignment follows the value of the + \uicontrol {Layout direction} field. For example, when layout direction is + set to \uicontrol LeftToRight, the items are aligned on the left. + + To mirror the layout, set the layout direction to \uicontrol RightToLeft. + To also mirror the horizontal alignment of items, select + \uicontrol AlignRight in the \uicontrol {Horizontal item alignment} field. + + \section3 Summary of Positioners + + The following table lists the positioners that you can use to arrange items + in UIs. They are available in the \uicontrol {Qt Quick - Positioner} section + of \uicontrol Library. + + \table + \header + \li Icon + \li Name + \li Purpose + \row + \li \inlineimage column-positioner-icon-16px.png + \li \l[QtQuick] {Column} + \li Arranges its child items vertically. + \row + \li \inlineimage row-positioner-icon-16px.png + \li \l[QtQuick] {Row} + \li Arranges its child items horizontally. + \row + \li \inlineimage grid-positioner-icon-16px.png + \li \l[QtQuick] {Grid} + \li Arranges its child items so that they are aligned in a grid and + are not overlapping. + \row + \li \inlineimage flow-positioner-icon-16px.png + \li \l[QtQuick] {Flow} + \li Arranges its child items side by side, wrapping as necessary. + \endtable + + \section2 Using Layouts + + \if defined(qtcreator) + Since Qt 5.1, you can use QML types in the \l{qtquicklayouts-index.html} + {Qt Quick Layouts} module to arrange items in UIs. + \else + You can use the QML types available in the \uicontrol {Qt Quick - Layouts} + section of \uicontrol Library to arrange items in UIs. + \endif + Unlike positioners, layouts manage both the positions and sizes of their + child items, and are therefore well suited for dynamic and resizable UIs. + However, this means that you should not specify fixed positions and sizes + for the child items in the \uicontrol Geometry group in their properties, + unless their implicit sizes are not satisfactory. + + You can use anchors or the width and height properties of the layout itself + to specify its size in respect to its non-layout parent item. However, do + not anchor the child items within layouts. + + To arrange several items in a column, row, grid, or + \uicontrol {Stack Layout}, select the items in \uicontrol {Form Editor}, + and then select \uicontrol Layout in the context menu. + + You can also click the \inlineimage column.png + (\uicontrol {Column Layout}), \inlineimage row.png + (\uicontrol {Row Layout}), and \inlineimage grid.png + (\uicontrol {Grid Layout}) toolbar buttons to apply + layouts to the selected items. + + To make an item within a layout as wide as possible while respecting the + given constraints, select the item in \uicontrol {Form Editor}, and then + select \uicontrol Layout > \uicontrol {Fill Width} in the context menu. To + make the item as high as possible, select \uicontrol {Fill Height}. + + \section3 Layout Properties + + A \uicontrol {Grid Layout} type provides a way of dynamically arranging + items in a grid. If the grid layout is resized, all its child items are + rearranged. If you want a layout with just one row or one column, use the + \uicontrol {Row Layout} or \uicontrol {Column Layout} type. + + The child items of row and column layout items are automatically positioned + either horizontally from left to right as rows or vertically from + top to bottom as columns. The number of the child items determines the width + of the row or the height of the column. You can specify the spacing between + the child items in the \uicontrol Spacing field. + + The child items of grid layout items are arranged according to the + \uicontrol Flow property. When the direction of a flow is set to + \uicontrol LeftToRight, child items are positioned next to to each + other until the the number of \uicontrol Columns is reached. Then, + the auto-positioning wraps back to the beginning of the next row. + + \image qtquick-layout-grid-properties.png "Grid Layout properties" + + If you set the direction of the flow to \uicontrol TopToBottom, child + items are auto-positioned vertically using the value of the \uicontrol Rows + field to determine the maximum number of rows. + + You can set the layout direction to either \uicontrol LeftToRight or + \uicontrol RightToLeft in the \uicontrol {Layout direction} field. + When you select \uicontrol RightToLeft, the alignment of the items + will be mirrored. + + You can specify the spacing between rows and columns in the + \uicontrol {Row spacing} and \uicontrol {Column spacing} fields. + + \section3 Stack Layout + + \image qtquick-designer-stacked-view.png + + To add items to a \uicontrol {Stack Layout}, select the + \inlineimage plus.png + button next to the type name in \uicontrol {Form Editor}. To move + between items, select the \inlineimage prev.png + (\uicontrol Previous) and \inlineimage next.png + (\uicontrol Next) buttons. + + To add a tab bar to a stack layout, select \uicontrol {Stacked Container} > + \uicontrol {Add Tab Bar}. + + To raise or lower the stacking order of an item, select + \uicontrol {Stacked Container} > \uicontrol {Increase Index} or + \uicontrol {Decrease Index}. + + \section3 Summary of Layouts + + The following table lists the layout types that you can use to arrange items + in UIs. They are available in the \uicontrol {Qt Quick - Layouts} section + of \uicontrol Library. + + \table + \header + \li Icon + \li Name + \li Purpose + \row + \li \inlineimage column-layouts-icon-16px.png + \li \l{ColumnLayout}{Column Layout} + \li Provides a grid layout with only one column. + \row + \li\inlineimage row-layouts-icon-16px.png + \li \l{RowLayout}{Row Layout} + \li Provides a grid layout with only one row. + \row + \li \inlineimage grid-layouts-icon-16px.png + \li \l{GridLayout}{Grid Layout} + \li Provides a way of dynamically arranging items in a grid. + \row + \li \inlineimage stack-layouts-icon-16px.png + \li \l{StackLayout}{Stack Layout} + \li Provides a stack of items where only one item is visible at a time. + \endtable + + + \section2 Organizing Items + + The following table lists the UI controls that you can use to + organize items in UIs (since Qt 5.7). They are available in the + \uicontrol {Qt Quick - Controls 2} section of \uicontrol Library. + + \table + \header + \li Icon + \li Name + \li Purpose + \row + \li \inlineimage icons/frame-icon16.png + \li \l [QtQuickControls]{Frame} + \li A visual frame around a group of controls. + \row + \li \inlineimage icons/groupbox-icon16.png + \li \l [QtQuickControls]{GroupBox}{Group Box} + \li A titled visual frame around a group of controls. + \row + \li \inlineimage icons/label-icon16.png + \li \l [QtQuickControls]{Label} + \li A text label with inherited styling and font. + \row + \li \inlineimage icons/page-icon16.png + \li \l [QtQuickControls]{Page} + \li A styled page control with support for a header and footer. + \row + \li \inlineimage icons/pageindicator-icon16.png + \li \l [QtQuickControls]{PageIndicator}{Page Indicator} + \li An indicator for the currently active page. + \row + \li \inlineimage icons/pane-icon16.png + \li \l [QtQuickControls]{Pane} + \li A background that matches the application style and theme. + \endtable +*/ diff --git a/doc/qtcreator/src/qtquick/qtquick-properties.qdoc b/doc/qtcreator/src/qtquick/qtquick-properties.qdoc index 02bb87582a5..dd7f3cb2a0d 100644 --- a/doc/qtcreator/src/qtquick/qtquick-properties.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-properties.qdoc @@ -26,7 +26,7 @@ /*! \page qtquick-properties.html \previouspage qtquick-navigator.html - \nextpage qtquick-fonts.html + \nextpage qtquick-positioning.html \title Specifying Item Properties @@ -235,7 +235,9 @@ \section2 Geometry In the \uicontrol Position group, you can set the position of an item on - the x and y axis. + the x and y axis. The position of an item in the UI can be either absolute + or relative to other items. For more information, see + \l{Positioning Items}. The z position of an item determines its position in relation to its sibling items in the type hierarchy. You can set it in the \uicontrol Z diff --git a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf index 5bb27d9496e..dec1878602a 100644 --- a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf +++ b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf @@ -34,6 +34,7 @@ imagedirs = ../images \ ../../../src/plugins/qmldesigner/components/formeditor \ ../../../src/plugins/qmldesigner/components/navigator \ ../../../src/plugins/qmldesigner/components/timelineeditor/images \ + ../../../src/plugins/qmldesigner/componentsplugin/images \ ../../../src/plugins/qmldesigner/qmlpreviewplugin/images \ ../../../src/plugins/qmldesigner/qtquickplugin/images \ ../../../src/plugins/texteditor/images diff --git a/doc/qtdesignstudio/examples/doc/loginui2.qdoc b/doc/qtdesignstudio/examples/doc/loginui2.qdoc index 10c43839d2e..042f82c0e26 100644 --- a/doc/qtdesignstudio/examples/doc/loginui2.qdoc +++ b/doc/qtdesignstudio/examples/doc/loginui2.qdoc @@ -200,7 +200,7 @@ \section1 Next Steps To learn more about positioning items in \QDS, see - \l{Positioning Items in UIs}. + \l{Positioning Items}. To learn how to add a second page and move to it from the main page, see the next example in the series, \l {Log In UI - Part 3}. diff --git a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc index 966e2f3f3d6..5e46c894fae 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc @@ -83,6 +83,7 @@ \endlist \li \l{Managing Item Hierarchy} \li \l{Specifying Item Properties} + \li \l{Positioning Items} \li \l{Using Custom Fonts} \li \l{Annotating Designs} \li \l{Qt Quick UI Forms} diff --git a/doc/qtdesignstudio/src/qtdesignstudio.qdoc b/doc/qtdesignstudio/src/qtdesignstudio.qdoc index 3c2eba8e2c6..abf1ba7b7de 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio.qdoc @@ -62,7 +62,7 @@ \li \l{Creating Components} \li \l{Managing Item Hierarchy} \li \l{Specifying Item Properties} - \li \l{Using Custom Fonts} + \li \l{Positioning Items} \li \l{Annotating Designs} \endlist \li \b {\l{Adding Dynamics}} From b30b2f481c5671f2d89a91b0869c09060260b28d Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 28 Oct 2020 13:54:10 +0100 Subject: [PATCH 47/48] ClangTools: Make "go to next/previous diagnostic" open an editor It's very likely that the user will want to have the respective location displayed in the editor. Fixes: QTCREATORBUG-20658 Change-Id: I34128c6444208571df566725e2ad1675d4456853 Reviewed-by: David Schulz --- src/plugins/clangtools/clangtoolsdiagnosticview.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/clangtools/clangtoolsdiagnosticview.cpp b/src/plugins/clangtools/clangtoolsdiagnosticview.cpp index ca421e5c825..689886d3f26 100644 --- a/src/plugins/clangtools/clangtoolsdiagnosticview.cpp +++ b/src/plugins/clangtools/clangtoolsdiagnosticview.cpp @@ -232,12 +232,14 @@ void DiagnosticView::goNext() { const QModelIndex currentIndex = selectionModel()->currentIndex(); selectIndex(getIndex(currentIndex, Next)); + openEditorForCurrentIndex(); } void DiagnosticView::goBack() { const QModelIndex currentIndex = selectionModel()->currentIndex(); selectIndex(getIndex(currentIndex, Previous)); + openEditorForCurrentIndex(); } QModelIndex DiagnosticView::getIndex(const QModelIndex &index, Direction direction) const From c019860809ea6de728c88c9e6aef65c2320e06bc Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Wed, 28 Oct 2020 09:32:44 +0100 Subject: [PATCH 48/48] QmlDesigner: Update the Stack (z) context menu * Rename arrange menu and items * Remove the "Reset z property" item * Add reverse item and functionality * Fix some related typos and formatting Task-number: QDS-2938 Change-Id: I0e706aefdaed99b28faae4b307146847a54a24ed Reviewed-by: Thomas Hartmann --- .../componentcore/componentcore_constants.h | 15 +++-- .../componentcore/designeractionmanager.cpp | 56 ++++++++++--------- .../componentcore/modelnodeoperations.cpp | 23 +++++--- .../componentcore/modelnodeoperations.h | 1 + .../designercore/include/nodelistproperty.h | 3 + .../designercore/model/nodelistproperty.cpp | 42 +++++++++++++- 6 files changed, 99 insertions(+), 41 deletions(-) diff --git a/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h b/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h index 6186575e43c..7de6c4fe64a 100644 --- a/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h +++ b/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h @@ -34,7 +34,7 @@ namespace ComponentCoreConstants { const char rootCategory[] = ""; const char selectionCategory[] = "Selection"; -const char stackCategory[] = "Stack (z)"; +const char arrangeCategory[] = "Arrange"; const char qmlPreviewCategory[] = "QmlPreview"; const char editCategory[] = "Edit"; const char anchorsCategory[] = "Anchors"; @@ -52,6 +52,7 @@ const char toBackCommandId[] = "ToBack"; const char raiseCommandId[] = "Raise"; const char lowerCommandId[] = "Lower"; const char resetZCommandId[] = "ResetZ"; +const char reverseCommandId[] = "Reverse"; const char resetSizeCommandId[] = "ResetSize"; const char resetPositionCommandId[] = "ResetPosition"; const char visiblityCommandId[] = "ToggleVisiblity"; @@ -90,7 +91,7 @@ const char fitSelectionToScreenCommandId[] = "FitSelectionToScreen"; const char selectionCategoryDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Selection"); const char flowConnectionCategoryDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Connect"); const char selectEffectDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Select Effect"); -const char stackCategoryDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Stack (z)"); +const char arrangeCategoryDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Arrange"); const char editCategoryDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Edit"); const char anchorsCategoryDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Anchors"); const char positionCategoryDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Position"); @@ -105,11 +106,11 @@ const char copySelectionDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMen const char pasteSelectionDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Paste"); const char deleteSelectionDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Delete Selection"); -const char toFrontDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "To Front"); -const char toBackDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "To Back"); +const char toFrontDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Bring to Front"); +const char toBackDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Send to Back"); -const char raiseDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Raise"); -const char lowerDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Lower"); +const char raiseDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Bring Forward"); +const char lowerDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Send Backward"); const char undoDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Undo"); const char redoDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Redo"); @@ -129,6 +130,8 @@ const char setIdDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Set const char resetZDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Reset z Property"); +const char reverseDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Reverse"); + const char anchorsFillDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Fill"); const char anchorsResetDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Reset"); diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp index ea34b091cd4..f7953e2fbe6 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp @@ -594,6 +594,11 @@ bool selectionHasSameParentAndInBaseState(const SelectionContext &context) return selectionHasSameParent(context) && inBaseState(context); } +bool multiSelectionAndHasSameParent(const SelectionContext &context) +{ + return multiSelection(context) && selectionHasSameParent(context); +} + bool isNotInLayout(const SelectionContext &context) { if (selectionNotEmpty(context)) { @@ -914,8 +919,8 @@ void DesignerActionManager::createDefaultDesignerActions() prioritySelectionCategory)); addDesignerAction(new ActionGroup( - stackCategoryDisplayName, - stackCategory, + arrangeCategoryDisplayName, + arrangeCategory, priorityStackCategory, &selectionNotEmpty)); @@ -923,28 +928,19 @@ void DesignerActionManager::createDefaultDesignerActions() toFrontCommandId, toFrontDisplayName, {}, - stackCategory, + arrangeCategory, QKeySequence(), 200, &toFront, &singleSelection)); addDesignerAction(new ModelNodeContextMenuAction( - toBackCommandId, - toBackDisplayName, - {}, - stackCategory, + raiseCommandId, + raiseDisplayName, + Utils::Icon({{":/qmldesigner/icon/designeractions/images/raise.png", Utils::Theme::IconsBaseColor}}).icon(), + arrangeCategory, QKeySequence(), 180, - &toBack, - &singleSelection)); - - addDesignerAction(new ModelNodeContextMenuAction( - raiseCommandId, raiseDisplayName, - Utils::Icon({{":/qmldesigner/icon/designeractions/images/raise.png", Utils::Theme::IconsBaseColor}}).icon(), - stackCategory, - QKeySequence(), - 160, &raise, &raiseAvailable)); @@ -952,23 +948,31 @@ void DesignerActionManager::createDefaultDesignerActions() lowerCommandId, lowerDisplayName, Utils::Icon({{":/qmldesigner/icon/designeractions/images/lower.png", Utils::Theme::IconsBaseColor}}).icon(), - stackCategory, + arrangeCategory, QKeySequence(), - 140, + 160, &lower, &lowerAvailable)); - addDesignerAction(new SeperatorDesignerAction(stackCategory, 120)); + addDesignerAction(new ModelNodeContextMenuAction( + toBackCommandId, + toBackDisplayName, + {}, + arrangeCategory, + QKeySequence(), + 140, + &toBack, + &singleSelection)); addDesignerAction(new ModelNodeContextMenuAction( - resetZCommandId, - resetZDisplayName, + reverseCommandId, + reverseDisplayName, {}, - stackCategory, + arrangeCategory, QKeySequence(), 100, - &resetZ, - &selectionNotEmptyAndHasZProperty)); + &reverse, + &multiSelectionAndHasSameParent)); addDesignerAction(new ActionGroup(editCategoryDisplayName, editCategory, priorityEditCategory, &selectionNotEmpty)); @@ -979,7 +983,9 @@ void DesignerActionManager::createDefaultDesignerActions() resetPositionDisplayName, Utils::Icon({{":/utils/images/pan.png", Utils::Theme::IconsBaseColor}, {":/utils/images/iconoverlay_reset.png", Utils::Theme::IconsStopToolBarColor}}).icon(), - resetPositionTooltip, editCategory, QKeySequence("Ctrl+d"), + resetPositionTooltip, + editCategory, + QKeySequence("Ctrl+d"), 200, &resetPosition, &selectionNotEmptyAndHasXorYProperty)); diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp index f76542d3789..7bda65bf1aa 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp @@ -206,9 +206,9 @@ void toBack(const SelectionContext &selectionState) } } -enum OderAction {RaiseItem, LowerItem}; +enum OrderAction {RaiseItem, LowerItem}; -void changeOrder(const SelectionContext &selectionState, OderAction orderAction) +void changeOrder(const SelectionContext &selectionState, OrderAction orderAction) { if (!selectionState.view()) return; @@ -221,13 +221,12 @@ void changeOrder(const SelectionContext &selectionState, OderAction orderAction) if (!modelNode.parentProperty().isNodeListProperty()) return; - selectionState.view()->executeInTransaction("DesignerActionManager|raise",[orderAction, selectionState, modelNode](){ + selectionState.view()->executeInTransaction("DesignerActionManager|changeOrder", [orderAction, selectionState, modelNode]() { ModelNode modelNode = selectionState.currentSingleSelectedNode(); NodeListProperty parentProperty = modelNode.parentProperty().toNodeListProperty(); const int index = parentProperty.indexOf(modelNode); if (orderAction == RaiseItem) { - if (index < parentProperty.count() - 1) parentProperty.slide(index, index + 1); } else if (orderAction == LowerItem) { @@ -244,7 +243,6 @@ void raise(const SelectionContext &selectionState) void lower(const SelectionContext &selectionState) { - changeOrder(selectionState, LowerItem); } @@ -344,8 +342,8 @@ void resetZ(const SelectionContext &selectionState) if (!selectionState.view()) return; - selectionState.view()->executeInTransaction("DesignerActionManager|resetZ",[selectionState](){ - foreach (ModelNode node, selectionState.selectedModelNodes()) { + selectionState.view()->executeInTransaction("DesignerActionManager|resetZ", [selectionState](){ + for (ModelNode node : selectionState.selectedModelNodes()) { QmlItemNode itemNode(node); if (itemNode.isValid()) itemNode.removeProperty("z"); @@ -353,6 +351,16 @@ void resetZ(const SelectionContext &selectionState) }); } +void reverse(const SelectionContext &selectionState) +{ + if (!selectionState.view()) + return; + + selectionState.view()->executeInTransaction("DesignerActionManager|reverse", [selectionState](){ + NodeListProperty::reverseModelNodes(selectionState.selectedModelNodes()); + }); +} + static inline void backupPropertyAndRemove(const ModelNode &node, const PropertyName &propertyName) { if (node.hasVariantProperty(propertyName)) { @@ -366,7 +374,6 @@ static inline void backupPropertyAndRemove(const ModelNode &node, const Property } } - static inline void restoreProperty(const ModelNode &node, const PropertyName &propertyName) { if (node.hasAuxiliaryData(auxDataString + propertyName)) diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.h b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.h index d22e673c801..aa43933224d 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.h +++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.h @@ -52,6 +52,7 @@ void resetPosition(const SelectionContext &selectionState); void goIntoComponentOperation(const SelectionContext &selectionState); void setId(const SelectionContext &selectionState); void resetZ(const SelectionContext &selectionState); +void reverse(const SelectionContext &selectionState); void anchorsFill(const SelectionContext &selectionState); void anchorsReset(const SelectionContext &selectionState); void layoutRowPositioner(const SelectionContext &selectionState); diff --git a/src/plugins/qmldesigner/designercore/include/nodelistproperty.h b/src/plugins/qmldesigner/designercore/include/nodelistproperty.h index dc1967efec0..b10a5a45fd9 100644 --- a/src/plugins/qmldesigner/designercore/include/nodelistproperty.h +++ b/src/plugins/qmldesigner/designercore/include/nodelistproperty.h @@ -51,9 +51,12 @@ public: const QList toModelNodeList() const; const QList toQmlObjectNodeList() const; void slide(int, int) const; + void swap(int, int) const; void reparentHere(const ModelNode &modelNode); ModelNode at(int index) const; + static void reverseModelNodes(const QList &nodes); + protected: NodeListProperty(const PropertyName &propertyName, const Internal::InternalNodePointer &internalNode, Model* model, AbstractView *view); NodeListProperty(const Internal::InternalNodeListPropertyPointer &internalNodeListProperty, Model* model, AbstractView *view); diff --git a/src/plugins/qmldesigner/designercore/model/nodelistproperty.cpp b/src/plugins/qmldesigner/designercore/model/nodelistproperty.cpp index 84864e5e518..8271bad362b 100644 --- a/src/plugins/qmldesigner/designercore/model/nodelistproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/nodelistproperty.cpp @@ -32,7 +32,7 @@ #include "model_p.h" #include - +#include namespace QmlDesigner { @@ -95,12 +95,30 @@ void NodeListProperty::slide(int from, int to) const Internal::WriteLocker locker(model()); if (!isValid()) throw InvalidPropertyException(__LINE__, __FUNCTION__, __FILE__, ""); - if (to > count() - 1) + if (to < 0 || to > count() - 1 || from < 0 || from > count() - 1) throw InvalidPropertyException(__LINE__, __FUNCTION__, __FILE__, ""); privateModel()->changeNodeOrder(internalNode(), name(), from, to); } +void NodeListProperty::swap(int from, int to) const +{ + if (from == to) + return; + + // Prerequisite a < b + int a = from; + int b = to; + + if (a > b) { + a = to; + b = from; + } + + slide(b, a); + slide(a + 1, b); +} + void NodeListProperty::reparentHere(const ModelNode &modelNode) { NodeAbstractProperty::reparentHere(modelNode, true); @@ -119,4 +137,24 @@ ModelNode NodeListProperty::at(int index) const return ModelNode(); } +void NodeListProperty::reverseModelNodes(const QList &nodes) +{ + ModelNode firstNode = nodes.first(); + if (!firstNode.isValid()) + return; + + NodeListProperty parentProperty = firstNode.parentProperty().toNodeListProperty(); + std::vector selectedNodeIndices; + + for (ModelNode modelNode : nodes) + selectedNodeIndices.push_back(parentProperty.indexOf(modelNode)); + + std::sort(selectedNodeIndices.begin(), selectedNodeIndices.end()); + + int mid = std::ceil(selectedNodeIndices.size() / 2); + + for (int i = 0; i != mid; ++i) + parentProperty.swap(selectedNodeIndices[i], selectedNodeIndices[selectedNodeIndices.size() - 1 - i]); +} + } // namespace QmlDesigner