feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
85ea2758ac063174c8d62b51dbfbfee9291d65c4
qt-creator/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml

485 lines
23 KiB
QML
Raw Normal View History

QMlDesigner: Add toolbar to component view Change-Id: Ief79152813e6afec70208633b38bce20254e7105 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-09 09:18:15 +01:00
// Copyright (C) 2023 The Qt Company Ltd.
Replace GPL-3.0 with GPL-3.0-only GPL-3.0 is deprecated by SPDX. Change done by find . -type f -exec perl -pi -e 's/LicenseRef-Qt-Commercial OR GPL-3.0(?!-)/LicenseRef-Qt-Commercial OR GPL-3.0-only/g' {} \; Change-Id: If316a498e3f27d2030b86d4e7743b3237ce09939 Reviewed-by: Lucie Gerard <lucie.gerard@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-04 08:52:22 +01:00
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
QMlDesigner: Add toolbar to component view Change-Id: Ief79152813e6afec70208633b38bce20254e7105 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-09 09:18:15 +01:00
import QtQuick
import QtQuick.Layouts
QmlDesigner: introduce a real Theme class - rename Theming -> Theme - made derived colors as Q_INVOKABLE methods available - rename registerIconProvider -> setupTheme - inside *.qml files use a singleton import instead of a context Before this change, every request for a theme value copied the map into the Qml context including the convert of values QVariant -> QJSString Change-Id: I1c483fb591336b519d5adab8ad37b42bc5a06720 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-03-07 16:06:02 +01:00
import QtQuickDesignerTheme 1.0
QMlDesigner: Add toolbar to component view Change-Id: Ief79152813e6afec70208633b38bce20254e7105 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-09 09:18:15 +01:00
import HelperWidgets 2.0 as HelperWidgets
Implement new item library UI - Create a new header qml widget. - Move tabs and filtering search to the header widget. - Add imports/assets using a new "+" button on the tabs. - Remove import flow tag view (still some remainings to be removed in another commit). - Change layout from grid to vbox. - Rename some classes and variables to make them clearer. - New "Add Library" view that replaces the QML imports view (older QML imports classes removed). - Enable Search in the "add import" view. - Hide category header if only 1 category is under an import. - Assorted relevant fixes, tweaks, and clean ups. Task-number: QDS-3589 Change-Id: I710aed50858b32e024200911c6a21fd963e1b692 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-02-04 16:18:45 +02:00
import StudioControls 1.0 as StudioControls
QmlDesigner: Controls 1 cleanup * Replace ScrollView Controls 1 with ScrollView Controls 2 * Replace TabView with TabBar and StackLayout * Remove unused styles * Replace Controls 1 imports * Remove print statement in FontSection * Fix layout width by correcting CheckBox width * Remove TabView from QtObjectPane Task-number: QDS-2454 Task-number: QDS-2455 Task-number: QDS-2456 Change-Id: I913d326afb012375dd5b804171cb8cd67681514c Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-03 16:17:54 +02:00
import StudioTheme 1.0 as StudioTheme
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
import ItemLibraryBackend
QmlDesigner.ItemLibrary: various updates - clearing search input focus when clicking clear icon - re-set updated sections' models - using GridView-based item selection - C++ code cleanup - Manhattan-length used for drag & drop initiation - integrated QtCreator's filter text input - replaced QToolButtons with a QTabBar - fix: eliding text & corrected selector offset - styled resources view - updated Qml syntax
2010-03-10 12:45:49 +02:00
/* The view displaying the item grid.
QmlDesigner.ItemLibrary: fixed eliding text - also removed tabs from Qml files
2010-03-18 13:17:24 +02:00
The following Qml context properties have to be set:
Add components library expand/collapse all context menu options also change import name from "library" to "module" and relevant tweaks. Task-number: QDS-3589 Change-Id: Ib467dda61b6720cebe843e34cb807aee6221f5cb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-02-13 01:27:20 +02:00
- ItemLibraryModel itemLibraryModel
- int itemLibraryIconWidth
- int itemLibraryIconHeight
- ItemLibraryWidget rootView
- QColor highlightColor
Implement new item library UI - Create a new header qml widget. - Move tabs and filtering search to the header widget. - Add imports/assets using a new "+" button on the tabs. - Remove import flow tag view (still some remainings to be removed in another commit). - Change layout from grid to vbox. - Rename some classes and variables to make them clearer. - New "Add Library" view that replaces the QML imports view (older QML imports classes removed). - Enable Search in the "add import" view. - Hide category header if only 1 category is under an import. - Assorted relevant fixes, tweaks, and clean ups. Task-number: QDS-3589 Change-Id: I710aed50858b32e024200911c6a21fd963e1b692 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-02-04 16:18:45 +02:00
itemLibraryModel structure:
itemLibraryModel [
ItemLibraryImport {
string importName
string importUrl
bool importVisible
bool importUsed
bool importExpanded
list categoryModel [
ItemLibraryCategory {
string categoryName
bool categoryVisible
bool categoryExpanded
list itemModel [
ItemLibraryItem {
string itemName
string itemLibraryIconPath
bool itemVisible
string componentPath
var itemLibraryEntry
},
... more items
]
},
... more categories
]
},
... more imports
QmlDesigner.ItemLibrary: fixed eliding text - also removed tabs from Qml files
2010-03-18 13:17:24 +02:00
]
QmlDesigner.ItemLibrary: various updates - clearing search input focus when clicking clear icon - re-set updated sections' models - using GridView-based item selection - C++ code cleanup - Manhattan-length used for drag & drop initiation - integrated QtCreator's filter text input - replaced QToolButtons with a QTabBar - fix: eliding text & corrected selector offset - styled resources view - updated Qml syntax
2010-03-10 12:45:49 +02:00
*/
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
Item {
QmlDesigner: rewrite itemlibrary Change-Id: I31344f7cfa56ae5dd6662bef4e449007b7ec3ec4 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-19 17:53:25 +02:00
id: itemsView
QmlDesigner: Fix transient scroll bar disappearing Task-number: QDS-10689 Task-number: QDS-10690 Change-Id: Ib74e27f06ca24ff13f3000297c88306a7a9bb579 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-21 13:55:26 +02:00
property bool adsFocus: false
// objectName is used by the dock widget to find this particular ScrollView
// and set the ads focus on it.
objectName: "__mainSrollView"
QmlDesigner: Allow going into component from item library Added "Go into Component" to item library context menu for items that have customComponentSource available. Doubleclicking on the item also does the same. Fixes: QDS-5786 Change-Id: I954bfb4864d74fa04b5da5b961f9aa2035132022 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-11 13:41:22 +02:00
property string importToRemove
property string importToAdd
property string componentSource
QmlDesigner: Implement hiding component library categories Task-number: QDS-3822 Change-Id: I4e22385497c4e58725b7f7a62a4e4351d0b78661 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-31 13:48:52 +03:00
property var currentCategory: null
property var currentImport: null
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
property bool isHorizontalView: false
QmlDesigner: Split components and assets libraries Fixes: QDS-6151 Change-Id: Id6f79a2d1fcff5fb55d3ba3f1b1394f1f55ca36b Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-03 19:49:27 +02:00
property bool isAddModuleView: false
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
property var tooltipBackend: ItemLibraryBackend.tooltipBackend
QmlDesigner: Close component library's context menus when layout change Fixes: QDS-5351 Change-Id: I06e02b7c137d2398528e6d4120d9ffbc7632c7a7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-11-01 12:23:48 +02:00
// Called also from C++ to close context menu on focus out
Implement new item library UI - Create a new header qml widget. - Move tabs and filtering search to the header widget. - Add imports/assets using a new "+" button on the tabs. - Remove import flow tag view (still some remainings to be removed in another commit). - Change layout from grid to vbox. - Rename some classes and variables to make them clearer. - New "Add Library" view that replaces the QML imports view (older QML imports classes removed). - Enable Search in the "add import" view. - Hide category header if only 1 category is under an import. - Assorted relevant fixes, tweaks, and clean ups. Task-number: QDS-3589 Change-Id: I710aed50858b32e024200911c6a21fd963e1b692 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-02-04 16:18:45 +02:00
function closeContextMenu()
{
QmlDesigner: Implement hiding component library categories Task-number: QDS-3822 Change-Id: I4e22385497c4e58725b7f7a62a4e4351d0b78661 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-31 13:48:52 +03:00
moduleContextMenu.close()
QmlDesigner: Search also possible imports in item library Possible imports are now also parsed for items in item library. They are only shown in case the search string is not empty. Starting a drag of unimported item will automatically add the import. Added a small manhattanlength check to the start of the drag to avoid unwanted import additions on clicks. Also fixed the item sorting to alphabetical order within categories. Task-number: QDS-3825 Change-Id: I93366182af3fd7eda38bf94d53807393ecf92a08 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-03-02 17:15:59 +02:00
itemContextMenu.close()
Implement new item library UI - Create a new header qml widget. - Move tabs and filtering search to the header widget. - Add imports/assets using a new "+" button on the tabs. - Remove import flow tag view (still some remainings to be removed in another commit). - Change layout from grid to vbox. - Rename some classes and variables to make them clearer. - New "Add Library" view that replaces the QML imports view (older QML imports classes removed). - Enable Search in the "add import" view. - Hide category header if only 1 category is under an import. - Assorted relevant fixes, tweaks, and clean ups. Task-number: QDS-3589 Change-Id: I710aed50858b32e024200911c6a21fd963e1b692 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-02-04 16:18:45 +02:00
}
QmlDesigner: Clear components view search box upon load i.e. upon changing from edit mode to QDS mode. This also removed a warning. Change-Id: Ibd3ee3bd30febfcee9a05cb87047e79b8ed1bf61 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-05-23 20:32:43 +03:00
// Called from C++
function clearSearchFilter()
{
searchBox.clear();
}
QmlDesigner: Split components and assets libraries Fixes: QDS-6151 Change-Id: Id6f79a2d1fcff5fb55d3ba3f1b1394f1f55ca36b Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-03 19:49:27 +02:00
// Called also from C++
function switchToComponentsView()
{
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
ItemLibraryBackend.isAddModuleView = false
QmlDesigner: Split components and assets libraries Fixes: QDS-6151 Change-Id: Id6f79a2d1fcff5fb55d3ba3f1b1394f1f55ca36b Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-03 19:49:27 +02:00
}
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
onWidthChanged: {
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
itemsView.isHorizontalView = itemsView.width > ItemLibraryBackend.widthLimit
QmlDesigner: Ensure item library content is visible Make sure the ScrollView content area is visible after content size changes. Fixes: QDS-3795 Change-Id: I1f7408db9ad318a5c54b5186569dd04235a3d952 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-03-08 13:31:42 +02:00
}
QmlDesigner: Close component library's context menus when layout change Fixes: QDS-5351 Change-Id: I06e02b7c137d2398528e6d4120d9ffbc7632c7a7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-11-01 12:23:48 +02:00
onIsHorizontalViewChanged: closeContextMenu()
QmlDesigner: rewrite itemlibrary Change-Id: I31344f7cfa56ae5dd6662bef4e449007b7ec3ec4 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-19 17:53:25 +02:00
Item {
id: styleConstants
QmlDesigner: Use smaller font in item library This allows to show more items in the library. While we get more and more components it is important that we can show the increasing amount of items properly. Change-Id: Ifc5db011b65b7accf96af5192ce2702b6f112da6 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-01 14:35:40 +02:00
property int textWidth: 58
QmlDesigner: Adjust font pixel size if pixel density is high We define some fonts in pixel size and those have to be increased if the pixel density is high. Change-Id: I88e932d967aaa9d8757e733048d457e9e7c17f5b Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-09 16:26:25 +02:00
property int textHeight: Theme.smallFontPixelSize() * 2
QmlDesigner: Use smaller font in item library This allows to show more items in the library. While we get more and more components it is important that we can show the increasing amount of items properly. Change-Id: Ifc5db011b65b7accf96af5192ce2702b6f112da6 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-01 14:35:40 +02:00
property int cellHorizontalMargin: 1
property int cellVerticalSpacing: 2
property int cellVerticalMargin: 4
QmlDesigner: rewrite itemlibrary Change-Id: I31344f7cfa56ae5dd6662bef4e449007b7ec3ec4 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-19 17:53:25 +02:00
// the following depend on the actual shape of the item delegate
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
property int cellWidth: styleConstants.textWidth + 2 * styleConstants.cellHorizontalMargin
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
property int cellHeight: ItemLibraryBackend.itemLibraryIconHeight + styleConstants.textHeight +
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
2 * styleConstants.cellVerticalMargin + styleConstants.cellVerticalSpacing
Implement new item library UI - Create a new header qml widget. - Move tabs and filtering search to the header widget. - Add imports/assets using a new "+" button on the tabs. - Remove import flow tag view (still some remainings to be removed in another commit). - Change layout from grid to vbox. - Rename some classes and variables to make them clearer. - New "Add Library" view that replaces the QML imports view (older QML imports classes removed). - Enable Search in the "add import" view. - Hide category header if only 1 category is under an import. - Assorted relevant fixes, tweaks, and clean ups. Task-number: QDS-3589 Change-Id: I710aed50858b32e024200911c6a21fd963e1b692 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-02-04 16:18:45 +02:00
StudioControls.Menu {
QmlDesigner: Implement hiding component library categories Task-number: QDS-3822 Change-Id: I4e22385497c4e58725b7f7a62a4e4351d0b78661 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-31 13:48:52 +03:00
id: moduleContextMenu
Implement new item library UI - Create a new header qml widget. - Move tabs and filtering search to the header widget. - Add imports/assets using a new "+" button on the tabs. - Remove import flow tag view (still some remainings to be removed in another commit). - Change layout from grid to vbox. - Rename some classes and variables to make them clearer. - New "Add Library" view that replaces the QML imports view (older QML imports classes removed). - Enable Search in the "add import" view. - Hide category header if only 1 category is under an import. - Assorted relevant fixes, tweaks, and clean ups. Task-number: QDS-3589 Change-Id: I710aed50858b32e024200911c6a21fd963e1b692 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-02-04 16:18:45 +02:00
StudioControls.MenuItem {
Add components library expand/collapse all context menu options also change import name from "library" to "module" and relevant tweaks. Task-number: QDS-3589 Change-Id: Ib467dda61b6720cebe843e34cb807aee6221f5cb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-02-13 01:27:20 +02:00
text: qsTr("Remove Module")
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
visible: itemsView.currentCategory === null
QmlDesigner: Implement hiding component library categories Task-number: QDS-3822 Change-Id: I4e22385497c4e58725b7f7a62a4e4351d0b78661 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-31 13:48:52 +03:00
height: visible ? implicitHeight : 0
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
enabled: itemsView.importToRemove && !ItemLibraryBackend.rootView.subCompEditMode
onTriggered: ItemLibraryBackend.rootView.removeImport(itemsView.importToRemove)
Implement new item library UI - Create a new header qml widget. - Move tabs and filtering search to the header widget. - Add imports/assets using a new "+" button on the tabs. - Remove import flow tag view (still some remainings to be removed in another commit). - Change layout from grid to vbox. - Rename some classes and variables to make them clearer. - New "Add Library" view that replaces the QML imports view (older QML imports classes removed). - Enable Search in the "add import" view. - Hide category header if only 1 category is under an import. - Assorted relevant fixes, tweaks, and clean ups. Task-number: QDS-3589 Change-Id: I710aed50858b32e024200911c6a21fd963e1b692 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-02-04 16:18:45 +02:00
}
QmlDesigner: Implement hiding component library categories Task-number: QDS-3822 Change-Id: I4e22385497c4e58725b7f7a62a4e4351d0b78661 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-31 13:48:52 +03:00
StudioControls.MenuSeparator {
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
visible: itemsView.currentCategory === null && !ItemLibraryBackend.rootView.searchActive
QmlDesigner: Enable component library context menu while searching The only item visible in the menu is remove module, as hiding categories during search is not supported. Fixes: QDS-5687 Change-Id: I8f5bb3f1b27eb37ae32d72b93c6ce2156dfa8eb7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-12-13 15:46:58 +02:00
height: visible ? StudioTheme.Values.border : 0
QmlDesigner: Implement hiding component library categories Task-number: QDS-3822 Change-Id: I4e22385497c4e58725b7f7a62a4e4351d0b78661 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-31 13:48:52 +03:00
}
Add components library expand/collapse all context menu options also change import name from "library" to "module" and relevant tweaks. Task-number: QDS-3589 Change-Id: Ib467dda61b6720cebe843e34cb807aee6221f5cb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-02-13 01:27:20 +02:00
StudioControls.MenuItem {
text: qsTr("Expand All")
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
visible: itemsView.currentCategory === null && !ItemLibraryBackend.rootView.searchActive
QmlDesigner: Implement hiding component library categories Task-number: QDS-3822 Change-Id: I4e22385497c4e58725b7f7a62a4e4351d0b78661 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-31 13:48:52 +03:00
height: visible ? implicitHeight : 0
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
onTriggered: ItemLibraryBackend.itemLibraryModel.expandAll()
Add components library expand/collapse all context menu options also change import name from "library" to "module" and relevant tweaks. Task-number: QDS-3589 Change-Id: Ib467dda61b6720cebe843e34cb807aee6221f5cb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-02-13 01:27:20 +02:00
}
StudioControls.MenuItem {
text: qsTr("Collapse All")
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
visible: itemsView.currentCategory === null && !ItemLibraryBackend.rootView.searchActive
QmlDesigner: Implement hiding component library categories Task-number: QDS-3822 Change-Id: I4e22385497c4e58725b7f7a62a4e4351d0b78661 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-31 13:48:52 +03:00
height: visible ? implicitHeight : 0
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
onTriggered: ItemLibraryBackend.itemLibraryModel.collapseAll()
Add components library expand/collapse all context menu options also change import name from "library" to "module" and relevant tweaks. Task-number: QDS-3589 Change-Id: Ib467dda61b6720cebe843e34cb807aee6221f5cb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-02-13 01:27:20 +02:00
}
QmlDesigner: Implement hiding component library categories Task-number: QDS-3822 Change-Id: I4e22385497c4e58725b7f7a62a4e4351d0b78661 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-31 13:48:52 +03:00
StudioControls.MenuSeparator {
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
visible: itemsView.currentCategory === null && !ItemLibraryBackend.rootView.searchActive
QmlDesigner: Enable component library context menu while searching The only item visible in the menu is remove module, as hiding categories during search is not supported. Fixes: QDS-5687 Change-Id: I8f5bb3f1b27eb37ae32d72b93c6ce2156dfa8eb7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-12-13 15:46:58 +02:00
height: visible ? StudioTheme.Values.border : 0
QmlDesigner: Implement hiding component library categories Task-number: QDS-3822 Change-Id: I4e22385497c4e58725b7f7a62a4e4351d0b78661 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-31 13:48:52 +03:00
}
StudioControls.MenuItem {
text: qsTr("Hide Category")
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
visible: itemsView.currentCategory
QmlDesigner: Implement hiding component library categories Task-number: QDS-3822 Change-Id: I4e22385497c4e58725b7f7a62a4e4351d0b78661 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-31 13:48:52 +03:00
height: visible ? implicitHeight : 0
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
onTriggered: ItemLibraryBackend.itemLibraryModel.hideCategory(itemsView.currentImport.importUrl,
QmlDesigner: Persist horizontal component library's selected category Moved showing and hiding categories logic to Cpp side so that: - Currently selected category is persisted when the component library model is reset. - QML side is clean of the mix of logic and UI. Also reworked some logic/variables that are making the logic complex. Task-number: QDS-5215 Change-Id: I8e9f5893f37a982283f1b1be9fee022f0b8afa32 Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-10-15 00:30:59 +03:00
itemsView.currentCategory.categoryName)
QmlDesigner: Implement hiding component library categories Task-number: QDS-3822 Change-Id: I4e22385497c4e58725b7f7a62a4e4351d0b78661 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-31 13:48:52 +03:00
}
StudioControls.MenuSeparator {
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
visible: itemsView.currentCategory
QmlDesigner: Enable component library context menu while searching The only item visible in the menu is remove module, as hiding categories during search is not supported. Fixes: QDS-5687 Change-Id: I8f5bb3f1b27eb37ae32d72b93c6ce2156dfa8eb7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-12-13 15:46:58 +02:00
height: visible ? StudioTheme.Values.border : 0
QmlDesigner: Implement hiding component library categories Task-number: QDS-3822 Change-Id: I4e22385497c4e58725b7f7a62a4e4351d0b78661 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-31 13:48:52 +03:00
}
StudioControls.MenuItem {
text: qsTr("Show Module Hidden Categories")
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
visible: !ItemLibraryBackend.rootView.searchActive
QmlDesigner: Persist horizontal component library's selected category Moved showing and hiding categories logic to Cpp side so that: - Currently selected category is persisted when the component library model is reset. - QML side is clean of the mix of logic and UI. Also reworked some logic/variables that are making the logic complex. Task-number: QDS-5215 Change-Id: I8e9f5893f37a982283f1b1be9fee022f0b8afa32 Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-10-15 00:30:59 +03:00
enabled: itemsView.currentImport && !itemsView.currentImport.allCategoriesVisible
QmlDesigner: Enable component library context menu while searching The only item visible in the menu is remove module, as hiding categories during search is not supported. Fixes: QDS-5687 Change-Id: I8f5bb3f1b27eb37ae32d72b93c6ce2156dfa8eb7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-12-13 15:46:58 +02:00
height: visible ? implicitHeight : 0
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
onTriggered: ItemLibraryBackend.itemLibraryModel.showImportHiddenCategories(itemsView.currentImport.importUrl)
QmlDesigner: Implement hiding component library categories Task-number: QDS-3822 Change-Id: I4e22385497c4e58725b7f7a62a4e4351d0b78661 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-31 13:48:52 +03:00
}
StudioControls.MenuItem {
text: qsTr("Show All Hidden Categories")
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
visible: !ItemLibraryBackend.rootView.searchActive
enabled: ItemLibraryBackend.itemLibraryModel.isAnyCategoryHidden
QmlDesigner: Enable component library context menu while searching The only item visible in the menu is remove module, as hiding categories during search is not supported. Fixes: QDS-5687 Change-Id: I8f5bb3f1b27eb37ae32d72b93c6ce2156dfa8eb7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-12-13 15:46:58 +02:00
height: visible ? implicitHeight : 0
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
onTriggered: ItemLibraryBackend.itemLibraryModel.showAllHiddenCategories()
QmlDesigner: Implement hiding component library categories Task-number: QDS-3822 Change-Id: I4e22385497c4e58725b7f7a62a4e4351d0b78661 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-31 13:48:52 +03:00
}
Implement new item library UI - Create a new header qml widget. - Move tabs and filtering search to the header widget. - Add imports/assets using a new "+" button on the tabs. - Remove import flow tag view (still some remainings to be removed in another commit). - Change layout from grid to vbox. - Rename some classes and variables to make them clearer. - New "Add Library" view that replaces the QML imports view (older QML imports classes removed). - Enable Search in the "add import" view. - Hide category header if only 1 category is under an import. - Assorted relevant fixes, tweaks, and clean ups. Task-number: QDS-3589 Change-Id: I710aed50858b32e024200911c6a21fd963e1b692 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-02-04 16:18:45 +02:00
}
QmlDesigner: Search also possible imports in item library Possible imports are now also parsed for items in item library. They are only shown in case the search string is not empty. Starting a drag of unimported item will automatically add the import. Added a small manhattanlength check to the start of the drag to avoid unwanted import additions on clicks. Also fixed the item sorting to alphabetical order within categories. Task-number: QDS-3825 Change-Id: I93366182af3fd7eda38bf94d53807393ecf92a08 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-03-02 17:15:59 +02:00
StudioControls.Menu {
id: itemContextMenu
// Workaround for menu item implicit width not properly propagating to menu
QmlDesigner: Allow going into component from item library Added "Go into Component" to item library context menu for items that have customComponentSource available. Doubleclicking on the item also does the same. Fixes: QDS-5786 Change-Id: I954bfb4864d74fa04b5da5b961f9aa2035132022 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-11 13:41:22 +02:00
width: Math.max(importMenuItem.implicitWidth, openSourceItem.implicitWidth)
QmlDesigner: Search also possible imports in item library Possible imports are now also parsed for items in item library. They are only shown in case the search string is not empty. Starting a drag of unimported item will automatically add the import. Added a small manhattanlength check to the start of the drag to avoid unwanted import additions on clicks. Also fixed the item sorting to alphabetical order within categories. Task-number: QDS-3825 Change-Id: I93366182af3fd7eda38bf94d53807393ecf92a08 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-03-02 17:15:59 +02:00
StudioControls.MenuItem {
id: importMenuItem
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
text: qsTr("Add Module: ") + itemsView.importToAdd
QmlDesigner: Allow going into component from item library Added "Go into Component" to item library context menu for items that have customComponentSource available. Doubleclicking on the item also does the same. Fixes: QDS-5786 Change-Id: I954bfb4864d74fa04b5da5b961f9aa2035132022 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-11 13:41:22 +02:00
visible: itemsView.importToAdd
height: visible ? implicitHeight : 0
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
onTriggered: ItemLibraryBackend.rootView.addImportForItem(itemsView.importToAdd)
QmlDesigner: Search also possible imports in item library Possible imports are now also parsed for items in item library. They are only shown in case the search string is not empty. Starting a drag of unimported item will automatically add the import. Added a small manhattanlength check to the start of the drag to avoid unwanted import additions on clicks. Also fixed the item sorting to alphabetical order within categories. Task-number: QDS-3825 Change-Id: I93366182af3fd7eda38bf94d53807393ecf92a08 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-03-02 17:15:59 +02:00
}
QmlDesigner: Allow going into component from item library Added "Go into Component" to item library context menu for items that have customComponentSource available. Doubleclicking on the item also does the same. Fixes: QDS-5786 Change-Id: I954bfb4864d74fa04b5da5b961f9aa2035132022 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-11 13:41:22 +02:00
StudioControls.MenuItem {
id: openSourceItem
QmlDesigner: Rename component editing actions Go into Component -> Edit Component Make Component -> Create Component Fixes: QDS-8848 Change-Id: I3dfd6536fc5e27c66e1cef4006ab2687a75066e9 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-16 16:21:45 +02:00
text: qsTr("Edit Component")
QmlDesigner: Allow going into component from item library Added "Go into Component" to item library context menu for items that have customComponentSource available. Doubleclicking on the item also does the same. Fixes: QDS-5786 Change-Id: I954bfb4864d74fa04b5da5b961f9aa2035132022 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-11 13:41:22 +02:00
visible: itemsView.componentSource
height: visible ? implicitHeight : 0
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
onTriggered: ItemLibraryBackend.rootView.goIntoComponent(itemsView.componentSource)
QmlDesigner: Allow going into component from item library Added "Go into Component" to item library context menu for items that have customComponentSource available. Doubleclicking on the item also does the same. Fixes: QDS-5786 Change-Id: I954bfb4864d74fa04b5da5b961f9aa2035132022 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-11 13:41:22 +02:00
}
QmlDesigner: Search also possible imports in item library Possible imports are now also parsed for items in item library. They are only shown in case the search string is not empty. Starting a drag of unimported item will automatically add the import. Added a small manhattanlength check to the start of the drag to avoid unwanted import additions on clicks. Also fixed the item sorting to alphabetical order within categories. Task-number: QDS-3825 Change-Id: I93366182af3fd7eda38bf94d53807393ecf92a08 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-03-02 17:15:59 +02:00
}
QmlDesigner.ItemLibrary: remove declarative private dependecy We derived from QDeclarativeListModel which is private. This patch uses QAbstractListModel instead. Change-Id: Ib567433f5fbb38780b32e5a9291d2cb87730e624 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-06 16:45:59 +02:00
}
QmlDesigner: Split components and assets libraries Fixes: QDS-6151 Change-Id: Id6f79a2d1fcff5fb55d3ba3f1b1394f1f55ca36b Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-03 19:49:27 +02:00
Column {
id: col
width: parent.width
height: parent.height
spacing: 5
QmlDesigner: Fix SearchBox related QML toolbars Change-Id: I88962fe48acd4345c29233cb00f72ec2ac6b6ca9 Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-13 11:20:27 +01:00
QMlDesigner: Add toolbar to component view Change-Id: Ief79152813e6afec70208633b38bce20254e7105 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-09 09:18:15 +01:00
Rectangle {
QmlDesigner: Split components and assets libraries Fixes: QDS-6151 Change-Id: Id6f79a2d1fcff5fb55d3ba3f1b1394f1f55ca36b Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-03 19:49:27 +02:00
width: parent.width
QMlDesigner: Add toolbar to component view Change-Id: Ief79152813e6afec70208633b38bce20254e7105 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-09 09:18:15 +01:00
height: StudioTheme.Values.doubleToolbarHeight
color: StudioTheme.Values.themeToolbarBackground
QmlDesigner: Split components and assets libraries Fixes: QDS-6151 Change-Id: Id6f79a2d1fcff5fb55d3ba3f1b1394f1f55ca36b Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-03 19:49:27 +02:00
QMlDesigner: Add toolbar to component view Change-Id: Ief79152813e6afec70208633b38bce20254e7105 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-09 09:18:15 +01:00
Column {
anchors.fill: parent
QmlDesigner: Fix SearchBox related QML toolbars Change-Id: I88962fe48acd4345c29233cb00f72ec2ac6b6ca9 Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-13 11:20:27 +01:00
anchors.topMargin: 6
anchors.bottomMargin: 6
anchors.leftMargin: 10
anchors.rightMargin: 10
QMlDesigner: Add toolbar to component view Change-Id: Ief79152813e6afec70208633b38bce20254e7105 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-09 09:18:15 +01:00
spacing: 12
QmlDesigner: Fix SearchBox related QML toolbars Change-Id: I88962fe48acd4345c29233cb00f72ec2ac6b6ca9 Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-13 11:20:27 +01:00
StudioControls.SearchBox {
id: searchBox
width: parent.width
style: StudioTheme.Values.searchControlStyle
QmlDesigner: Fix components view search Fixes: QDS-9161 Change-Id: Id36b7e2ba56735438ce15c303f692ac2035020f7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-02-16 11:01:44 +02:00
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
onSearchChanged: (searchText) => ItemLibraryBackend.rootView.handleSearchFilterChanged(searchText)
QmlDesigner: Fix SearchBox related QML toolbars Change-Id: I88962fe48acd4345c29233cb00f72ec2ac6b6ca9 Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-13 11:20:27 +01:00
}
QmlDesigner: Split components and assets libraries Fixes: QDS-6151 Change-Id: Id6f79a2d1fcff5fb55d3ba3f1b1394f1f55ca36b Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-03 19:49:27 +02:00
QMlDesigner: Add toolbar to component view Change-Id: Ief79152813e6afec70208633b38bce20254e7105 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-09 09:18:15 +01:00
Row {
QmlDesigner: Fix SearchBox related QML toolbars Change-Id: I88962fe48acd4345c29233cb00f72ec2ac6b6ca9 Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-13 11:20:27 +01:00
width: parent.width
QMlDesigner: Add toolbar to component view Change-Id: Ief79152813e6afec70208633b38bce20254e7105 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-09 09:18:15 +01:00
height: StudioTheme.Values.toolbarHeight
spacing: 6
QmlDesigner: Fix SearchBox related QML toolbars Change-Id: I88962fe48acd4345c29233cb00f72ec2ac6b6ca9 Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-13 11:20:27 +01:00
QMlDesigner: Add toolbar to component view Change-Id: Ief79152813e6afec70208633b38bce20254e7105 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-09 09:18:15 +01:00
HelperWidgets.AbstractButton {
id: addModuleButton
style: StudioTheme.Values.viewBarButtonStyle
buttonIcon: StudioTheme.Constants.add_medium
tooltip: qsTr("Add a module.")
onClicked: isAddModuleView = true
}
}
QmlDesigner: Split components and assets libraries Fixes: QDS-6151 Change-Id: Id6f79a2d1fcff5fb55d3ba3f1b1394f1f55ca36b Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-03 19:49:27 +02:00
}
}
QmlDesigner: Fix SearchBox related QML toolbars Change-Id: I88962fe48acd4345c29233cb00f72ec2ac6b6ca9 Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-13 11:20:27 +01:00
QmlDesigner: Split components and assets libraries Fixes: QDS-6151 Change-Id: Id6f79a2d1fcff5fb55d3ba3f1b1394f1f55ca36b Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-03 19:49:27 +02:00
Loader {
id: loader
width: col.width
height: col.height - y - 5
sourceComponent: isAddModuleView ? addModuleView
: itemsView.isHorizontalView ? horizontalView : verticalView
}
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
}
Component {
id: verticalView
QMlDesigner: Add toolbar to component view Change-Id: Ief79152813e6afec70208633b38bce20254e7105 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-09 09:18:15 +01:00
HelperWidgets.ScrollView {
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
id: verticalScrollView
QmlDesigner: Fix transient scroll bar disappearing Task-number: QDS-10689 Task-number: QDS-10690 Change-Id: Ib74e27f06ca24ff13f3000297c88306a7a9bb579 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-21 13:55:26 +02:00
adsFocus: itemsView.adsFocus
QmlDesigner: Split components and assets libraries Fixes: QDS-6151 Change-Id: Id6f79a2d1fcff5fb55d3ba3f1b1394f1f55ca36b Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-03 19:49:27 +02:00
anchors.fill: parent
clip: true
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
interactive: !itemContextMenu.opened && !moduleContextMenu.opened && !ItemLibraryBackend.rootView.isDragging
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
onContentHeightChanged: {
var maxPosition = Math.max(contentHeight - verticalScrollView.height, 0)
if (contentY > maxPosition)
contentY = maxPosition
}
Column {
spacing: 2
Repeater {
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
model: ItemLibraryBackend.itemLibraryModel // to be set in Qml context
QMlDesigner: Add toolbar to component view Change-Id: Ief79152813e6afec70208633b38bce20254e7105 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-09 09:18:15 +01:00
delegate: HelperWidgets.Section {
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
width: itemsView.width -
(verticalScrollView.verticalScrollBarVisible
? verticalScrollView.verticalThickness : 0)
caption: importName
visible: importVisible
sectionHeight: 30
sectionFontSize: 15
showArrow: categoryModel.rowCount() > 0
labelColor: importUnimported ? StudioTheme.Values.themeUnimportedModuleColor
: StudioTheme.Values.themeTextColor
leftPadding: 0
rightPadding: 0
expanded: importExpanded
expandOnClick: false
useDefaulContextMenu: false
QmlDesigner: Allow setting Section category Section collapse all and expand all functionalities are controlled via a singleton instance. Since multiple views are now sharing QML engine, they also share this controller singleton. Therefore it is necessary to allow user of the Section to specify which category the section belongs to, so that invoking expand all from one view doesn't expand sections in another view, but only sections in the same category. This also allows fine tuning which sections are grouped within a view, which was not possible previously. Fixes: QDS-9248 Change-Id: I0a1c870e6746580255a02f91d590eb80ce6ebcbe Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-03-09 15:46:42 +02:00
category: "ItemsView"
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
onToggleExpand: {
if (categoryModel.rowCount() > 0)
importExpanded = !importExpanded
}
onShowContextMenu: {
itemsView.importToRemove = importRemovable ? importUrl : ""
itemsView.currentImport = model
itemsView.currentCategory = null
QmlDesigner: Enable component library context menu while searching The only item visible in the menu is remove module, as hiding categories during search is not supported. Fixes: QDS-5687 Change-Id: I8f5bb3f1b27eb37ae32d72b93c6ce2156dfa8eb7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-12-13 15:46:58 +02:00
moduleContextMenu.popup()
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
}
Column {
spacing: 2
property var currentImportModel: model // allows accessing the import model from inside the category section
Repeater {
model: categoryModel
QMlDesigner: Add toolbar to component view Change-Id: Ief79152813e6afec70208633b38bce20254e7105 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-09 09:18:15 +01:00
delegate: HelperWidgets.Section {
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
width: itemsView.width -
(verticalScrollView.verticalScrollBarVisible
? verticalScrollView.verticalThickness : 0)
sectionBackgroundColor: "transparent"
showTopSeparator: index > 0
hideHeader: categoryModel.rowCount() <= 1
leftPadding: 0
rightPadding: 0
addTopPadding: categoryModel.rowCount() > 1
addBottomPadding: index !== categoryModel.rowCount() - 1
caption: categoryName + " (" + itemModel.rowCount() + ")"
visible: categoryVisible
expanded: categoryExpanded
expandOnClick: false
onToggleExpand: categoryExpanded = !categoryExpanded
useDefaulContextMenu: false
QmlDesigner: Allow setting Section category Section collapse all and expand all functionalities are controlled via a singleton instance. Since multiple views are now sharing QML engine, they also share this controller singleton. Therefore it is necessary to allow user of the Section to specify which category the section belongs to, so that invoking expand all from one view doesn't expand sections in another view, but only sections in the same category. This also allows fine tuning which sections are grouped within a view, which was not possible previously. Fixes: QDS-9248 Change-Id: I0a1c870e6746580255a02f91d590eb80ce6ebcbe Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-03-09 15:46:42 +02:00
category: "ItemsView"
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
onShowContextMenu: {
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
if (!ItemLibraryBackend.rootView.searchActive) {
QmlDesigner: Enable component library context menu while searching The only item visible in the menu is remove module, as hiding categories during search is not supported. Fixes: QDS-5687 Change-Id: I8f5bb3f1b27eb37ae32d72b93c6ce2156dfa8eb7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-12-13 15:46:58 +02:00
itemsView.currentCategory = model
itemsView.currentImport = parent.currentImportModel
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
moduleContextMenu.popup()
QmlDesigner: Enable component library context menu while searching The only item visible in the menu is remove module, as hiding categories during search is not supported. Fixes: QDS-5687 Change-Id: I8f5bb3f1b27eb37ae32d72b93c6ce2156dfa8eb7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-12-13 15:46:58 +02:00
}
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
}
Grid {
id: itemGrid
QmlDesigner: Remove flexible width from Component Library items ...so that resizing the view doesn't cause sluggish animation to the items. Also removed an unnecessary top padding from the horizontal lib to avoid a slight vertical jump when switching between the 2 layouts. Change-Id: I0af75db885398dc93fc234d760156a55042f59d0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2021-12-08 14:29:51 +02:00
property real actualWidth: parent.width - itemGrid.leftPadding - itemGrid.rightPadding
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
leftPadding: 6
rightPadding: 6
columns: itemGrid.actualWidth / styleConstants.cellWidth
rowSpacing: 7
Repeater {
model: itemModel
delegate: ItemDelegate {
visible: itemVisible
textColor: importUnimported ? StudioTheme.Values.themeUnimportedModuleColor
: StudioTheme.Values.themeTextColor
QmlDesigner: Remove flexible width from Component Library items ...so that resizing the view doesn't cause sluggish animation to the items. Also removed an unnecessary top padding from the horizontal lib to avoid a slight vertical jump when switching between the 2 layouts. Change-Id: I0af75db885398dc93fc234d760156a55042f59d0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2021-12-08 14:29:51 +02:00
width: styleConstants.cellWidth
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
height: styleConstants.cellHeight
onShowContextMenu: {
QmlDesigner: Allow going into component from item library Added "Go into Component" to item library context menu for items that have customComponentSource available. Doubleclicking on the item also does the same. Fixes: QDS-5786 Change-Id: I954bfb4864d74fa04b5da5b961f9aa2035132022 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-11 13:41:22 +02:00
if (!itemUsable || itemComponentSource) {
itemsView.importToAdd = !itemUsable ? itemRequiredImport : ""
itemsView.componentSource = itemComponentSource
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
itemContextMenu.popup()
}
}
}
}
}
}
}
}
}
QmlDesigner: Expand collapsed component categories when searching - Expand collapsed categories in the following 2 cases: - When searching. - When choosing "Expand all" from the context menu. - Update only changed data when expand state changes rather than resetting the whole model. - Update search after adding a new QML import and switching to the components view. Task-number: QDS-3781 Task-number: QDS-3784 Task-number: QDS-3789 Change-Id: I09e6f1f97171cd9172cadf4202dd8d02cbb78513 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-02-18 21:14:23 +02:00
}
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
}
}
}
Component {
id: horizontalView
Row {
QmlDesigner: Remove flexible width from Component Library items ...so that resizing the view doesn't cause sluggish animation to the items. Also removed an unnecessary top padding from the horizontal lib to avoid a slight vertical jump when switching between the 2 layouts. Change-Id: I0af75db885398dc93fc234d760156a55042f59d0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2021-12-08 14:29:51 +02:00
leftPadding: 5
QMlDesigner: Add toolbar to component view Change-Id: Ief79152813e6afec70208633b38bce20254e7105 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-09 09:18:15 +01:00
HelperWidgets.ScrollView {
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
id: horizontalScrollView
QmlDesigner: Fix transient scroll bar disappearing Task-number: QDS-10689 Task-number: QDS-10690 Change-Id: Ib74e27f06ca24ff13f3000297c88306a7a9bb579 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-21 13:55:26 +02:00
adsFocus: itemsView.adsFocus
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
width: 270
QmlDesigner: Split components and assets libraries Fixes: QDS-6151 Change-Id: Id6f79a2d1fcff5fb55d3ba3f1b1394f1f55ca36b Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-03 19:49:27 +02:00
height: parent.height
clip: true
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
interactive: !itemContextMenu.opened && !moduleContextMenu.opened && !ItemLibraryBackend.rootView.isDragging
QmlDesigner: Split components and assets libraries Fixes: QDS-6151 Change-Id: Id6f79a2d1fcff5fb55d3ba3f1b1394f1f55ca36b Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-03 19:49:27 +02:00
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
onContentHeightChanged: {
var maxPosition = Math.max(contentHeight - horizontalScrollView.height, 0)
if (contentY > maxPosition)
contentY = maxPosition
Implement new item library UI - Create a new header qml widget. - Move tabs and filtering search to the header widget. - Add imports/assets using a new "+" button on the tabs. - Remove import flow tag view (still some remainings to be removed in another commit). - Change layout from grid to vbox. - Rename some classes and variables to make them clearer. - New "Add Library" view that replaces the QML imports view (older QML imports classes removed). - Enable Search in the "add import" view. - Hide category header if only 1 category is under an import. - Assorted relevant fixes, tweaks, and clean ups. Task-number: QDS-3589 Change-Id: I710aed50858b32e024200911c6a21fd963e1b692 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-02-04 16:18:45 +02:00
}
Column {
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
width: parent.width
Implement new item library UI - Create a new header qml widget. - Move tabs and filtering search to the header widget. - Add imports/assets using a new "+" button on the tabs. - Remove import flow tag view (still some remainings to be removed in another commit). - Change layout from grid to vbox. - Rename some classes and variables to make them clearer. - New "Add Library" view that replaces the QML imports view (older QML imports classes removed). - Enable Search in the "add import" view. - Hide category header if only 1 category is under an import. - Assorted relevant fixes, tweaks, and clean ups. Task-number: QDS-3589 Change-Id: I710aed50858b32e024200911c6a21fd963e1b692 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-02-04 16:18:45 +02:00
spacing: 2
QmlDesigner: Controls 1 cleanup * Replace ScrollView Controls 1 with ScrollView Controls 2 * Replace TabView with TabBar and StackLayout * Remove unused styles * Replace Controls 1 imports * Remove print statement in FontSection * Fix layout width by correcting CheckBox width * Remove TabView from QtObjectPane Task-number: QDS-2454 Task-number: QDS-2455 Task-number: QDS-2456 Change-Id: I913d326afb012375dd5b804171cb8cd67681514c Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-03 16:17:54 +02:00
Repeater {
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
model: ItemLibraryBackend.itemLibraryModel // to be set in Qml context
QMlDesigner: Add toolbar to component view Change-Id: Ief79152813e6afec70208633b38bce20254e7105 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-09 09:18:15 +01:00
delegate: HelperWidgets.Section {
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
width: 265 -
(horizontalScrollView.verticalScrollBarVisible
? horizontalScrollView.verticalThickness : 0)
caption: importName
visible: importVisible
sectionHeight: 30
sectionFontSize: 15
showArrow: categoryModel.rowCount() > 0
labelColor: importUnimported ? StudioTheme.Values.themeUnimportedModuleColor
: StudioTheme.Values.themeTextColor
Implement new item library UI - Create a new header qml widget. - Move tabs and filtering search to the header widget. - Add imports/assets using a new "+" button on the tabs. - Remove import flow tag view (still some remainings to be removed in another commit). - Change layout from grid to vbox. - Rename some classes and variables to make them clearer. - New "Add Library" view that replaces the QML imports view (older QML imports classes removed). - Enable Search in the "add import" view. - Hide category header if only 1 category is under an import. - Assorted relevant fixes, tweaks, and clean ups. Task-number: QDS-3589 Change-Id: I710aed50858b32e024200911c6a21fd963e1b692 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-02-04 16:18:45 +02:00
leftPadding: 0
rightPadding: 0
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
expanded: importExpanded
Fix property editor expand not working regression Regression caused by 43eaa09b114355aa344c02cbccb70201e75dd05f Change-Id: Ia749672464790b235f292efe09b6cc48e1df6b6e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-02-22 16:53:30 +02:00
expandOnClick: false
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
useDefaulContextMenu: false
QmlDesigner: Allow setting Section category Section collapse all and expand all functionalities are controlled via a singleton instance. Since multiple views are now sharing QML engine, they also share this controller singleton. Therefore it is necessary to allow user of the Section to specify which category the section belongs to, so that invoking expand all from one view doesn't expand sections in another view, but only sections in the same category. This also allows fine tuning which sections are grouped within a view, which was not possible previously. Fixes: QDS-9248 Change-Id: I0a1c870e6746580255a02f91d590eb80ce6ebcbe Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-03-09 15:46:42 +02:00
category: "ItemsView"
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
onToggleExpand: {
if (categoryModel.rowCount() > 0)
importExpanded = !importExpanded
}
QmlDesigner: Implement hiding component library categories Task-number: QDS-3822 Change-Id: I4e22385497c4e58725b7f7a62a4e4351d0b78661 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-31 13:48:52 +03:00
onShowContextMenu: {
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
itemsView.importToRemove = importRemovable ? importUrl : ""
itemsView.currentImport = model
itemsView.currentCategory = null
QmlDesigner: Enable component library context menu while searching The only item visible in the menu is remove module, as hiding categories during search is not supported. Fixes: QDS-5687 Change-Id: I8f5bb3f1b27eb37ae32d72b93c6ce2156dfa8eb7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-12-13 15:46:58 +02:00
moduleContextMenu.popup()
QmlDesigner: Implement hiding component library categories Task-number: QDS-3822 Change-Id: I4e22385497c4e58725b7f7a62a4e4351d0b78661 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-31 13:48:52 +03:00
}
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
Column {
spacing: 2
property var currentImportModel: model // allows accessing the import model from inside the category section
Implement new item library UI - Create a new header qml widget. - Move tabs and filtering search to the header widget. - Add imports/assets using a new "+" button on the tabs. - Remove import flow tag view (still some remainings to be removed in another commit). - Change layout from grid to vbox. - Rename some classes and variables to make them clearer. - New "Add Library" view that replaces the QML imports view (older QML imports classes removed). - Enable Search in the "add import" view. - Hide category header if only 1 category is under an import. - Assorted relevant fixes, tweaks, and clean ups. Task-number: QDS-3589 Change-Id: I710aed50858b32e024200911c6a21fd963e1b692 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-02-04 16:18:45 +02:00
Repeater {
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
model: categoryModel
delegate: Rectangle {
width: 265 -
(horizontalScrollView.verticalScrollBarVisible
? horizontalScrollView.verticalThickness : 0)
height: 25
visible: categoryVisible
border.width: StudioTheme.Values.border
border.color: StudioTheme.Values.themeControlOutline
color: categorySelected
? StudioTheme.Values.themeControlBackgroundHover
: categoryMouseArea.containsMouse ? Qt.darker(StudioTheme.Values.themeControlBackgroundHover, 1.5)
: StudioTheme.Values.themeControlBackground
Text {
anchors.fill: parent
text: categoryName
color: StudioTheme.Values.themeTextColor
font.pixelSize: 13
font.capitalization: Font.AllUppercase
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
MouseArea {
id: categoryMouseArea
anchors.fill: parent
hoverEnabled: true
acceptedButtons: Qt.LeftButton | Qt.RightButton
onClicked: (mouse) => {
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
ItemLibraryBackend.itemLibraryModel.selectImportCategory(parent.parent.currentImportModel.importUrl, model.index)
QmlDesigner: Enable component library context menu while searching The only item visible in the menu is remove module, as hiding categories during search is not supported. Fixes: QDS-5687 Change-Id: I8f5bb3f1b27eb37ae32d72b93c6ce2156dfa8eb7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-12-13 15:46:58 +02:00
if (mouse.button === Qt.RightButton
&& categoryModel.rowCount() !== 1
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
&& !ItemLibraryBackend.rootView.searchActive) {
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
itemsView.currentCategory = model
itemsView.currentImport = parent.parent.currentImportModel
moduleContextMenu.popup()
}
}
QmlDesigner: Search also possible imports in item library Possible imports are now also parsed for items in item library. They are only shown in case the search string is not empty. Starting a drag of unimported item will automatically add the import. Added a small manhattanlength check to the start of the drag to avoid unwanted import additions on clicks. Also fixed the item sorting to alphabetical order within categories. Task-number: QDS-3825 Change-Id: I93366182af3fd7eda38bf94d53807393ecf92a08 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-03-02 17:15:59 +02:00
}
Implement new item library UI - Create a new header qml widget. - Move tabs and filtering search to the header widget. - Add imports/assets using a new "+" button on the tabs. - Remove import flow tag view (still some remainings to be removed in another commit). - Change layout from grid to vbox. - Rename some classes and variables to make them clearer. - New "Add Library" view that replaces the QML imports view (older QML imports classes removed). - Enable Search in the "add import" view. - Hide category header if only 1 category is under an import. - Assorted relevant fixes, tweaks, and clean ups. Task-number: QDS-3589 Change-Id: I710aed50858b32e024200911c6a21fd963e1b692 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-02-04 16:18:45 +02:00
}
}
}
QmlDesigner: rewrite itemlibrary Change-Id: I31344f7cfa56ae5dd6662bef4e449007b7ec3ec4 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-19 17:53:25 +02:00
}
}
QmlDesigner.ItemLibrary: Use ScrollView instead of custom solution With ScrollView the mouse wheel does work. Task-number: QTCREATORBUG-10708 Change-Id: I6f9a85421049f1d2e56608340533af5b28d5c7ab Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-14 11:15:44 +01:00
}
}
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
Rectangle { // separator between import/category column and item grid
id: separatingLine
height: itemsView.height - 10
width: 1
color: StudioTheme.Values.themeControlOutline
}
QMlDesigner: Add toolbar to component view Change-Id: Ief79152813e6afec70208633b38bce20254e7105 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-09 09:18:15 +01:00
HelperWidgets.ScrollView {
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
id: itemScrollView
QmlDesigner: Fix transient scroll bar disappearing Task-number: QDS-10689 Task-number: QDS-10690 Change-Id: Ib74e27f06ca24ff13f3000297c88306a7a9bb579 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-21 13:55:26 +02:00
adsFocus: itemsView.adsFocus
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
width: itemsView.width - 275
height: itemsView.height
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
interactive: !itemContextMenu.opened && !moduleContextMenu.opened && !ItemLibraryBackend.rootView.isDragging
QmlDesigner: Fix Components lib wrong scrolling after drag-n-drop Change-Id: Ibd3f3c155496443eac0accf468280a15cad51351 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-02-07 14:47:14 +02:00
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
onContentHeightChanged: {
var maxPosition = Math.max(contentHeight - itemScrollView.height, 0)
if (contentY > maxPosition)
contentY = maxPosition
}
Grid {
id: hItemGrid
property real actualWidth: itemsView.width - 294
leftPadding: 9
rightPadding: 9
bottomPadding: 15
columns: hItemGrid.actualWidth / styleConstants.cellWidth
rowSpacing: 7
Repeater {
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
model: ItemLibraryBackend.itemLibraryModel.itemsModel
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
delegate: ItemDelegate {
visible: itemVisible
QmlDesigner: Use StudioQuickWidget in item library The event filter has to be installed on the actual QQuickWidget. Using registerPropertyMap instead of global context properties. Task-number: QDS-9124 Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-02 13:10:47 +01:00
textColor: ItemLibraryBackend.itemLibraryModel.importUnimportedSelected
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
? StudioTheme.Values.themeUnimportedModuleColor : StudioTheme.Values.themeTextColor
QmlDesigner: Remove flexible width from Component Library items ...so that resizing the view doesn't cause sluggish animation to the items. Also removed an unnecessary top padding from the horizontal lib to avoid a slight vertical jump when switching between the 2 layouts. Change-Id: I0af75db885398dc93fc234d760156a55042f59d0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2021-12-08 14:29:51 +02:00
width: styleConstants.cellWidth
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
height: styleConstants.cellHeight
onShowContextMenu: {
QmlDesigner: Allow going into component from item library Added "Go into Component" to item library context menu for items that have customComponentSource available. Doubleclicking on the item also does the same. Fixes: QDS-5786 Change-Id: I954bfb4864d74fa04b5da5b961f9aa2035132022 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-11 13:41:22 +02:00
if (!itemUsable || itemComponentSource) {
itemsView.importToAdd = !itemUsable ? itemRequiredImport : ""
itemsView.componentSource = itemComponentSource
QmlDesigner: Implement a horizontal layout for Component Library The view from vertical to horizontal is changed with Loader, depending on Library's width. Vertical layout (old) is mostly the same as before. Added new property categorySelected for categories. Items are also now hoverable. Task-number: QDS-4764 Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-24 12:43:51 +03:00
itemContextMenu.popup()
}
}
}
}
}
}
QmlDesigner.ItemLibrary: remove declarative private dependecy We derived from QDeclarativeListModel which is private. This patch uses QAbstractListModel instead. Change-Id: Ib567433f5fbb38780b32e5a9291d2cb87730e624 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-06 16:45:59 +02:00
}
}
QmlDesigner: Split components and assets libraries Fixes: QDS-6151 Change-Id: Id6f79a2d1fcff5fb55d3ba3f1b1394f1f55ca36b Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-03 19:49:27 +02:00
Component {
id: addModuleView
AddModuleView {
QmlDesigner: Fix transient scroll bar disappearing Task-number: QDS-10689 Task-number: QDS-10690 Change-Id: Ib74e27f06ca24ff13f3000297c88306a7a9bb579 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-21 13:55:26 +02:00
adsFocus: itemsView.adsFocus
QmlDesigner: Split components and assets libraries Fixes: QDS-6151 Change-Id: Id6f79a2d1fcff5fb55d3ba3f1b1394f1f55ca36b Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-03 19:49:27 +02:00
onBack: isAddModuleView = false
}
}
QmlDesigner.ItemLibrary: remove declarative private dependecy We derived from QDeclarativeListModel which is private. This patch uses QAbstractListModel instead. Change-Id: Ib567433f5fbb38780b32e5a9291d2cb87730e624 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-06 16:45:59 +02:00
}
Copy Permalink