feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Change category order in Component Library

Browse Source 
Added prefix for Qt Quick categories so "Basic" is sorted on top.
Rest of the categories are sorted alphabetically.

Task-number: QDS-4721
Change-Id: Ibdb1a77b121e2af729b9ec6b2acf5349a361b05b
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Miina Puuronen
2021-07-16 23:12:06 +03:00
parent 1b1e18a869
commit 2935f79efc
4 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmldesigner/components/itemlibrary/itemlibrarycategory.cpp
View File

@@ -48,6 +48,9 @@ bool ItemLibraryCategory::categoryExpanded() const
QString ItemLibraryCategory::sortingName() const QString ItemLibraryCategory::sortingName() const
{ {
if (ItemLibraryModel::categorySortingHash.contains(categoryName()))
return ItemLibraryModel::categorySortingHash.value(categoryName());
return categoryName(); return categoryName();
} }

7
src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
View File

@@ -350,8 +350,11 @@ void ItemLibraryModel::update(ItemLibraryInfo *itemLibraryInfo, Model *model)
} else if (catName == ItemLibraryImport::quick3DAssetsTitle()) { } else if (catName == ItemLibraryImport::quick3DAssetsTitle()) {
importSection = importHash[ItemLibraryImport::quick3DAssetsTitle()]; importSection = importHash[ItemLibraryImport::quick3DAssetsTitle()];
} else { } else {
if (catName.startsWith("Qt Quick - ")) if (catName.contains("Qt Quick - ")) {
catName = catName.mid(11); // remove "Qt Quick - " QString sortingName = catName;
catName = catName.mid(11 + catName.indexOf("Qt Quick - ")); // remove "Qt Quick - " or "x.Qt Quick - "
categorySortingHash.insert(catName, sortingName);
}
importSection = importHash[entry.requiredImport().isEmpty() ? "QtQuick" importSection = importHash[entry.requiredImport().isEmpty() ? "QtQuick"
: entry.requiredImport()]; : entry.requiredImport()];

2
src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
View File

@@ -80,6 +80,8 @@ public:
Import entryToImport(const ItemLibraryEntry &entry); Import entryToImport(const ItemLibraryEntry &entry);
inline static QHash<QString, QString> categorySortingHash;
signals: signals:
void isAnyCategoryHiddenChanged(); void isAnyCategoryHiddenChanged();

52
src/plugins/qmldesigner/qtquickplugin/quick.metainfo
View File

@@ -10,7 +10,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "Item" name: "Item"
category: "Qt Quick - Basic" category: "a.Qt Quick - Basic"
libraryIcon: ":/qtquickplugin/images/item-icon.png" libraryIcon: ":/qtquickplugin/images/item-icon.png"
version: "2.0" version: "2.0"
@@ -25,7 +25,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "Rectangle" name: "Rectangle"
category: "Qt Quick - Basic" category: "a.Qt Quick - Basic"
libraryIcon: ":/qtquickplugin/images/rect-icon.png" libraryIcon: ":/qtquickplugin/images/rect-icon.png"
version: "2.0" version: "2.0"
@@ -41,7 +41,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "Text" name: "Text"
category: "Qt Quick - Basic" category: "a.Qt Quick - Basic"
libraryIcon: ":/qtquickplugin/images/text-icon.png" libraryIcon: ":/qtquickplugin/images/text-icon.png"
version: "2.0" version: "2.0"
@@ -56,7 +56,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "Text Edit" name: "Text Edit"
category: "Qt Quick - Basic" category: "a.Qt Quick - Basic"
libraryIcon: ":/qtquickplugin/images/text-edit-icon.png" libraryIcon: ":/qtquickplugin/images/text-edit-icon.png"
version: "2.0" version: "2.0"
@@ -73,7 +73,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "Text Input" name: "Text Input"
category: "Qt Quick - Basic" category: "a.Qt Quick - Basic"
libraryIcon: ":/qtquickplugin/images/text-input-icon.png" libraryIcon: ":/qtquickplugin/images/text-input-icon.png"
version: "2.0" version: "2.0"
@@ -90,7 +90,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "Mouse Area" name: "Mouse Area"
category: "Qt Quick - Basic" category: "a.Qt Quick - Basic"
libraryIcon: ":/qtquickplugin/images/mouse-area-icon.png" libraryIcon: ":/qtquickplugin/images/mouse-area-icon.png"
version: "2.0" version: "2.0"
@@ -105,7 +105,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "Image" name: "Image"
category: "Qt Quick - Basic" category: "a.Qt Quick - Basic"
libraryIcon: ":/qtquickplugin/images/image-icon.png" libraryIcon: ":/qtquickplugin/images/image-icon.png"
version: "2.0" version: "2.0"
@@ -122,7 +122,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "Animated Image" name: "Animated Image"
category: "Qt Quick - Basic" category: "a.Qt Quick - Basic"
libraryIcon: ":/qtquickplugin/images/animated-image-icon.png" libraryIcon: ":/qtquickplugin/images/animated-image-icon.png"
version: "2.0" version: "2.0"
@@ -138,7 +138,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "Border Image" name: "Border Image"
category: "Qt Quick - Basic" category: "a.Qt Quick - Basic"
libraryIcon: ":/qtquickplugin/images/border-image-icon.png" libraryIcon: ":/qtquickplugin/images/border-image-icon.png"
version: "2.0" version: "2.0"
@@ -154,7 +154,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "Flickable" name: "Flickable"
category: "Qt Quick - Basic" category: "a.Qt Quick - Basic"
libraryIcon: ":/qtquickplugin/images/flickable-icon.png" libraryIcon: ":/qtquickplugin/images/flickable-icon.png"
version: "2.0" version: "2.0"
@@ -169,7 +169,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "Grid View" name: "Grid View"
category: "Qt Quick - Views" category: "b.Qt Quick - Views"
libraryIcon: ":/qtquickplugin/images/gridview-icon.png" libraryIcon: ":/qtquickplugin/images/gridview-icon.png"
version: "2.0" version: "2.0"
@@ -183,7 +183,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "List View" name: "List View"
category: "Qt Quick - Views" category: "b.Qt Quick - Views"
libraryIcon: ":/qtquickplugin/images/listview-icon.png" libraryIcon: ":/qtquickplugin/images/listview-icon.png"
version: "2.0" version: "2.0"
@@ -197,7 +197,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "Path View" name: "Path View"
category: "Qt Quick - Views" category: "b.Qt Quick - Views"
libraryIcon: ":/qtquickplugin/images/pathview-icon.png" libraryIcon: ":/qtquickplugin/images/pathview-icon.png"
version: "2.0" version: "2.0"
@@ -211,7 +211,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "Focus Scope" name: "Focus Scope"
category: "Qt Quick - Basic" category: "a.Qt Quick - Basic"
libraryIcon: ":/qtquickplugin/images/focusscope-icon.png" libraryIcon: ":/qtquickplugin/images/focusscope-icon.png"
version: "2.0" version: "2.0"
@@ -226,7 +226,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "Column" name: "Column"
category: "Qt Quick - Positioner" category: "c.Qt Quick - Positioner"
libraryIcon: ":/qtquickplugin/images/column-positioner-icon.png" libraryIcon: ":/qtquickplugin/images/column-positioner-icon.png"
version: "2.0" version: "2.0"
@@ -241,7 +241,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "Row" name: "Row"
category: "Qt Quick - Positioner" category: "c.Qt Quick - Positioner"
libraryIcon: ":/qtquickplugin/images/row-positioner-icon.png" libraryIcon: ":/qtquickplugin/images/row-positioner-icon.png"
version: "2.0" version: "2.0"
@@ -256,7 +256,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "Grid" name: "Grid"
category: "Qt Quick - Positioner" category: "c.Qt Quick - Positioner"
libraryIcon: ":/qtquickplugin/images/grid-positioner-icon.png" libraryIcon: ":/qtquickplugin/images/grid-positioner-icon.png"
version: "2.0" version: "2.0"
@@ -271,7 +271,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "Flow" name: "Flow"
category: "Qt Quick - Positioner" category: "c.Qt Quick - Positioner"
libraryIcon: ":/qtquickplugin/images/flow-positioner-icon.png" libraryIcon: ":/qtquickplugin/images/flow-positioner-icon.png"
version: "2.0" version: "2.0"
@@ -293,7 +293,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "Property Animation" name: "Property Animation"
category: "Qt Quick - Animation" category: "d.Qt Quick - Animation"
libraryIcon: ":/qtquickplugin/images/item-icon.png" libraryIcon: ":/qtquickplugin/images/item-icon.png"
version: "2.0" version: "2.0"
} }
@@ -312,7 +312,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "Pause Animation" name: "Pause Animation"
category: "Qt Quick - Animation" category: "d.Qt Quick - Animation"
libraryIcon: ":/qtquickplugin/images/item-icon.png" libraryIcon: ":/qtquickplugin/images/item-icon.png"
version: "2.0" version: "2.0"
} }
@@ -330,7 +330,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "Sequential Animation" name: "Sequential Animation"
category: "Qt Quick - Animation" category: "d.Qt Quick - Animation"
libraryIcon: ":/qtquickplugin/images/item-icon.png" libraryIcon: ":/qtquickplugin/images/item-icon.png"
version: "2.0" version: "2.0"
} }
@@ -348,7 +348,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "Parallel Animation" name: "Parallel Animation"
category: "Qt Quick - Animation" category: "d.Qt Quick - Animation"
libraryIcon: ":/qtquickplugin/images/item-icon.png" libraryIcon: ":/qtquickplugin/images/item-icon.png"
version: "2.0" version: "2.0"
} }
@@ -367,7 +367,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "Property Action" name: "Property Action"
category: "Qt Quick - Animation" category: "d.Qt Quick - Animation"
libraryIcon: ":/qtquickplugin/images/item-icon.png" libraryIcon: ":/qtquickplugin/images/item-icon.png"
version: "2.0" version: "2.0"
} }
@@ -386,7 +386,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "Script Action" name: "Script Action"
category: "Qt Quick - Animation" category: "d.Qt Quick - Animation"
libraryIcon: ":/qtquickplugin/images/item-icon.png" libraryIcon: ":/qtquickplugin/images/item-icon.png"
version: "2.0" version: "2.0"
} }
@@ -405,7 +405,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "ColorAnimation" name: "ColorAnimation"
category: "Qt Quick - Animation" category: "d.Qt Quick - Animation"
libraryIcon: ":/qtquickplugin/images/item-icon.png" libraryIcon: ":/qtquickplugin/images/item-icon.png"
version: "2.0" version: "2.0"
} }
@@ -424,7 +424,7 @@ MetaInfo {
ItemLibraryEntry { ItemLibraryEntry {
name: "Number Animation" name: "Number Animation"
category: "Qt Quick - Animation" category: "d.Qt Quick - Animation"
libraryIcon: ":/qtquickplugin/images/item-icon.png" libraryIcon: ":/qtquickplugin/images/item-icon.png"
version: "2.0" version: "2.0"
Property { name: "to"; type: "int"; value: 0; } Property { name: "to"; type: "int"; value: 0; }