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

QmlDesigner: Use a different color for unimported items section

Browse Source 
Fixes: QDS-3873
Change-Id: Ic713353d8fe5c1bfb4ff11f1224294ecde182fa7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Mahmoud Badri
2021-03-16 00:08:36 +02:00
parent 23477f633b
commit f820164b1a
5 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml
View File

@@ -31,6 +31,9 @@ import StudioTheme 1.0 as StudioTheme
Item { Item {
id: delegateRoot id: delegateRoot
property alias textColor: text.color
signal showContextMenu() signal showContextMenu()
Rectangle { Rectangle {

4
share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml
View File

@@ -155,6 +155,8 @@ ScrollView {
sectionHeight: 30 sectionHeight: 30
sectionFontSize: 15 sectionFontSize: 15
showArrow: categoryModel.rowCount() > 0 showArrow: categoryModel.rowCount() > 0
labelColor: importUnimported ? StudioTheme.Values.themeUnimportedModuleColor
: StudioTheme.Values.themeTextColor
leftPadding: 0 leftPadding: 0
rightPadding: 0 rightPadding: 0
topPadding: 0 topPadding: 0
@@ -204,6 +206,8 @@ ScrollView {
model: itemModel model: itemModel
delegate: ItemDelegate { delegate: ItemDelegate {
visible: itemVisible visible: itemVisible
textColor: importUnimported ? StudioTheme.Values.themeUnimportedModuleColor
: StudioTheme.Values.themeTextColor
width: styleConstants.cellWidth + itemGrid.flexibleWidth width: styleConstants.cellWidth + itemGrid.flexibleWidth
height: styleConstants.cellHeight height: styleConstants.cellHeight
onShowContextMenu: { onShowContextMenu: {

1
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml
View File

@@ -32,6 +32,7 @@ import StudioTheme 1.0 as StudioTheme
Item { Item {
id: section id: section
property alias caption: label.text property alias caption: label.text
property alias labelColor: label.color
property alias sectionHeight: header.height property alias sectionHeight: header.height
property alias sectionBackgroundColor: header.color property alias sectionBackgroundColor: header.color
property alias sectionFontSize: label.font.pixelSize property alias sectionFontSize: label.font.pixelSize

2
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
View File

@@ -198,6 +198,8 @@ QtObject {
property string themeStateBackground: Theme.color(Theme.DSstateBackgroundColor) property string themeStateBackground: Theme.color(Theme.DSstateBackgroundColor)
property string themeStatePreviewOutline: Theme.color(Theme.DSstatePreviewOutline) property string themeStatePreviewOutline: Theme.color(Theme.DSstatePreviewOutline)
property string themeUnimportedModuleColor: "#e33c2e"
// Taken out of Constants.js // Taken out of Constants.js
property string themeChangedStateText: Theme.color(Theme.DSchangedStateText) property string themeChangedStateText: Theme.color(Theme.DSchangedStateText)

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

@@ -42,6 +42,7 @@ class ItemLibraryImport : public QObject
Q_PROPERTY(bool importUsed READ importUsed NOTIFY importUsedChanged FINAL) Q_PROPERTY(bool importUsed READ importUsed NOTIFY importUsedChanged FINAL)
Q_PROPERTY(bool importExpanded READ importExpanded WRITE setImportExpanded NOTIFY importExpandChanged FINAL) Q_PROPERTY(bool importExpanded READ importExpanded WRITE setImportExpanded NOTIFY importExpandChanged FINAL)
Q_PROPERTY(bool importRemovable READ importRemovable NOTIFY importRemovableChanged FINAL) Q_PROPERTY(bool importRemovable READ importRemovable NOTIFY importRemovableChanged FINAL)
Q_PROPERTY(bool importUnimported READ importUnimported FINAL)
Q_PROPERTY(QObject *categoryModel READ categoryModel NOTIFY categoryModelChanged FINAL) Q_PROPERTY(QObject *categoryModel READ categoryModel NOTIFY categoryModelChanged FINAL)
public: public:
@@ -90,6 +91,7 @@ signals:
private: private:
void updateRemovable(); void updateRemovable();
bool importUnimported() const { return m_sectionType == SectionType::Unimported; }
Import m_import; Import m_import;
bool m_importExpanded = true; bool m_importExpanded = true;