From 3a8de56f662d38196fe8efb70326d1580a6c95e8 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 19 Nov 2015 17:57:20 +0100 Subject: [PATCH] Fix cursorShape for sidebar controls --- resources/qml/ProfileSetup.qml | 6 ++++++ resources/qml/SaveButton.qml | 12 ++++++++++++ resources/qml/Sidebar.qml | 7 +++++++ resources/qml/SidebarHeader.qml | 6 ++++++ resources/qml/SidebarSimple.qml | 13 ++++++++++++- 5 files changed, 43 insertions(+), 1 deletion(-) diff --git a/resources/qml/ProfileSetup.qml b/resources/qml/ProfileSetup.qml index 5f54f04228..2e22b06a24 100644 --- a/resources/qml/ProfileSetup.qml +++ b/resources/qml/ProfileSetup.qml @@ -96,6 +96,12 @@ Item{ tooltip: UM.MachineManager.activeProfile style: UM.Theme.styles.sidebar_header_button + MouseArea { + anchors.fill: parent + cursorShape: Qt.PointingHandCursor + acceptedButtons: Qt.NoButton + } + menu: Menu { id: profileSelectionMenu diff --git a/resources/qml/SaveButton.qml b/resources/qml/SaveButton.qml index e3f5f44224..b0f5943e67 100644 --- a/resources/qml/SaveButton.qml +++ b/resources/qml/SaveButton.qml @@ -61,6 +61,12 @@ Rectangle { UM.OutputDeviceManager.requestWriteToDevice(UM.OutputDeviceManager.activeDevice, Printer.jobName) } + MouseArea { + anchors.fill: parent + cursorShape: Qt.PointingHandCursor + acceptedButtons: Qt.NoButton + } + style: ButtonStyle { background: Rectangle { //opacity: control.enabled ? 1.0 : 0.5 @@ -102,6 +108,12 @@ Rectangle { enabled: base.progress > 0.99 && base.activity == true //iconSource: UM.Theme.icons[UM.OutputDeviceManager.activeDeviceIconName]; + MouseArea { + anchors.fill: parent + cursorShape: Qt.PointingHandCursor + acceptedButtons: Qt.NoButton + } + style: ButtonStyle { background: Rectangle { id: deviceSelectionIcon diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml index 17037cacc3..3428996bf4 100644 --- a/resources/qml/Sidebar.qml +++ b/resources/qml/Sidebar.qml @@ -117,6 +117,13 @@ Rectangle checkable: true; checked: base.currentModeIndex == index onClicked: base.currentModeIndex = index + + MouseArea { + anchors.fill: parent + cursorShape: checked ? Qt.ArrowCursor : Qt.PointingHandCursor + acceptedButtons: Qt.NoButton + } + style: ButtonStyle { background: Rectangle { border.color: control.checked ? UM.Theme.colors.toggle_checked_border : diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml index 046e74a7bf..4209cc11c5 100644 --- a/resources/qml/SidebarHeader.qml +++ b/resources/qml/SidebarHeader.qml @@ -66,6 +66,12 @@ Item anchors.verticalCenter: parent.verticalCenter style: UM.Theme.styles.sidebar_header_button + MouseArea { + anchors.fill: parent + cursorShape: Qt.PointingHandCursor + acceptedButtons: Qt.NoButton + } + menu: Menu { id: machineSelectionMenu diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml index ea3a41c09d..d35610bed6 100644 --- a/resources/qml/SidebarSimple.qml +++ b/resources/qml/SidebarSimple.qml @@ -192,6 +192,12 @@ Item text: catalog.i18nc("@option:check","Enable Skirt Adhesion"); style: UM.Theme.styles.checkbox; + MouseArea { + anchors.fill: parent + cursorShape: Qt.PointingHandCursor + acceptedButtons: Qt.NoButton + } + checked: UM.ActiveProfile.valid ? UM.ActiveProfile.settingValues.adhesion_type == "brim" : false; onClicked: { @@ -205,9 +211,14 @@ Item //: Setting enable support checkbox text: catalog.i18nc("@option:check","Enable Support"); - style: UM.Theme.styles.checkbox; + MouseArea { + anchors.fill: parent + cursorShape: Qt.PointingHandCursor + acceptedButtons: Qt.NoButton + } + checked: UM.ActiveProfile.valid ? UM.ActiveProfile.settingValues.support_enable : false; onClicked: {