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

EffectComposer: Fix qml warnings

Browse Source 
Change-Id: I40abc68800b95888edae0450625f20d51fd8ed74
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Miikka Heikkinen
2024-02-23 17:48:29 +02:00
parent 417fbc7861
commit 3f40da0978
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposer.qml
View File

@@ -185,7 +185,7 @@ ColumnLayout {
style: StudioTheme.Values.viewBarButtonStyle style: StudioTheme.Values.viewBarButtonStyle
buttonIcon: StudioTheme.Constants.clearList_medium buttonIcon: StudioTheme.Constants.clearList_medium
tooltip: qsTr("Remove all effect nodes.") tooltip: qsTr("Remove all effect nodes.")
enabled: !root.backendModel.isEmpty enabled: root.backendModel ? !root.backendModel.isEmpty : false
onClicked: { onClicked: {
if (root.backendModel.hasUnsavedChanges) if (root.backendModel.hasUnsavedChanges)
@@ -296,14 +296,16 @@ ColumnLayout {
} // ScrollView } // ScrollView
Text { Text {
text: root.backendModel.isEnabled ? qsTr("Add an effect node to start") text: root.backendModel ? root.backendModel.isEnabled
: qsTr("Effect Composer is disabled on MCU projects") ? qsTr("Add an effect node to start")
: qsTr("Effect Composer is disabled on MCU projects")
: ""
color: StudioTheme.Values.themeTextColor color: StudioTheme.Values.themeTextColor
font.pixelSize: StudioTheme.Values.baseFontSize font.pixelSize: StudioTheme.Values.baseFontSize
anchors.centerIn: parent anchors.centerIn: parent
visible: root.backendModel.isEmpty visible: root.backendModel ? root.backendModel.isEmpty : false
} }
} // Item } // Item
} // Column } // Column

18
share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerTopBar.qml
View File

@@ -28,7 +28,7 @@ Rectangle {
style: StudioTheme.Values.viewBarButtonStyle style: StudioTheme.Values.viewBarButtonStyle
buttonIcon: StudioTheme.Constants.add_medium buttonIcon: StudioTheme.Constants.add_medium
tooltip: qsTr("Add new composition") tooltip: qsTr("Add new composition")
enabled: root.backendModel.isEnabled enabled: root.backendModel ? root.backendModel.isEnabled : false
onClicked: root.addClicked() onClicked: root.addClicked()
} }
@@ -36,8 +36,10 @@ Rectangle {
style: StudioTheme.Values.viewBarButtonStyle style: StudioTheme.Values.viewBarButtonStyle
buttonIcon: StudioTheme.Constants.save_medium buttonIcon: StudioTheme.Constants.save_medium
tooltip: qsTr("Save current composition") tooltip: qsTr("Save current composition")
enabled: root.backendModel.isEnabled && (root.backendModel.hasUnsavedChanges enabled: root.backendModel ? root.backendModel.isEnabled
|| root.backendModel.currentComposition === "") && (root.backendModel.hasUnsavedChanges
|| root.backendModel.currentComposition === "")
: false
onClicked: root.saveClicked() onClicked: root.saveClicked()
} }
@@ -46,7 +48,8 @@ Rectangle {
style: StudioTheme.Values.viewBarButtonStyle style: StudioTheme.Values.viewBarButtonStyle
buttonIcon: StudioTheme.Constants.saveAs_medium buttonIcon: StudioTheme.Constants.saveAs_medium
tooltip: qsTr("Save current composition with a new name") tooltip: qsTr("Save current composition with a new name")
enabled: root.backendModel.isEnabled && !root.backendModel.isEmpty enabled: root.backendModel ? root.backendModel.isEnabled && !root.backendModel.isEmpty
: false
onClicked: root.saveAsClicked() onClicked: root.saveAsClicked()
} }
@@ -55,7 +58,9 @@ Rectangle {
style: StudioTheme.Values.viewBarButtonStyle style: StudioTheme.Values.viewBarButtonStyle
buttonIcon: StudioTheme.Constants.assignTo_medium buttonIcon: StudioTheme.Constants.assignTo_medium
tooltip: qsTr("Assign current composition to selected item") tooltip: qsTr("Assign current composition to selected item")
enabled: root.backendModel.isEnabled && root.backendModel.currentComposition !== "" enabled: root.backendModel ? root.backendModel.isEnabled
&& root.backendModel.currentComposition !== ""
: false
onClicked: root.assignToSelectedClicked() onClicked: root.assignToSelectedClicked()
} }
@@ -63,7 +68,8 @@ Rectangle {
Text { Text {
readonly property string compName: root.backendModel.currentComposition readonly property string compName: root.backendModel ? root.backendModel.currentComposition
: ""
text: compName !== "" ? compName : qsTr("Untitled") text: compName !== "" ? compName : qsTr("Untitled")
anchors.centerIn: parent anchors.centerIn: parent