From 0006e0689b2ab33a1f4d5da5b9ca9f0da626b5b8 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Mon, 12 Apr 2010 15:11:36 +0200
Subject: [PATCH] QmlDesigner.propertyEditor: hide reset property button if not
applicable
See Bauhaus-233
---
.../propertyeditor/Qt/ExtendedFunctionButton.qml | 3 ++-
.../qmldesigner/propertyeditor/Qt/propertyEditor.css | 6 +++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml
index 70bfbd22275..4f234d3b8ef 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml
@@ -62,8 +62,9 @@ QToolButton {
actions: [
QAction {
text: qsTr("Reset")
+ visible: backendValue.isInSubState || backendValue.isInModel
onTriggered: {
- backendValue.resetValue();
+ backendValue.resetValue();
}
},
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css
index e228fecf998..6c70d8a1ec5 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css
@@ -375,7 +375,7 @@ QMenu {
background-color: #494949;
border: 1px solid black;
margin: 0px;
- color: #cacaca;
+ color: #dadada;
}
QMenu::item {
@@ -390,6 +390,10 @@ QMenu {
border-radius: 4px;
padding: 2px 25px 2px 20px;
}
+
+ QMenu::item:disabled {
+ color: #aaaaaa;
+ }
QMenu::separator {
height: 1px;
background: #404040;
--
GitLab