3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-02 11:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use QtQuick 2.0 and simplify ConfigurationItem

Browse source 
It now uses a ButtonGroup (from QtQuick2). Also, all the mess with when the border and background colours are updated and force-updated and such is now cleaned up.

Contributes to issue CURA-5876.
This commit is contained in:
Ghostkeeper 2018-11-27 11:04:41 +01:00
parent 4be8af7cb2
commit c489f911fb
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
2 changed files with 83 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

59
resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
View file

@ -7,24 +7,23 @@ import QtQuick.Controls 2.0
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura
Rectangle Button
{ {
id: configurationItem id: configurationItem
property var configuration: null property var configuration: null
property var selected: false
signal activateConfiguration() signal activateConfiguration()
height: childrenRect.height height: childrenRect.height
border.width: UM.Theme.getSize("default_lining").width
border.color: updateBorderColor()
color: selected ? UM.Theme.getColor("configuration_item_active") : UM.Theme.getColor("configuration_item")
property var textColor: selected ? UM.Theme.getColor("configuration_item_text_active") : UM.Theme.getColor("configuration_item_text")
function updateBorderColor() property var textColor: checked ? UM.Theme.getColor("configuration_item_text_active") : UM.Theme.getColor("configuration_item_text")
contentItem: Rectangle
{ {
border.color = selected ? UM.Theme.getColor("configuration_item_border_active") : UM.Theme.getColor("configuration_item_border") height: childrenRect.height
} color: parent.checked ? UM.Theme.getColor("configuration_item_active") : UM.Theme.getColor("configuration_item")
border.color: (parent.checked || parent.hovered) ? UM.Theme.getColor("primary") : UM.Theme.getColor("lining")
border.width: UM.Theme.getSize("default_lining").width
Column Column
{ {
@ -98,52 +97,18 @@ Rectangle
} }
} }
MouseArea
{
id: mouse
anchors.fill: parent
onClicked: activateConfiguration()
cursorShape: Qt.PointingHandCursor
hoverEnabled: true
onEntered:
{
parent.border.color = UM.Theme.getColor("configuration_item_border_hover")
if (configurationItem.selected == false)
{
configurationItem.color = UM.Theme.getColor("wide_lining")
}
}
onExited:
{
updateBorderColor()
if (configurationItem.selected == false)
{
configurationItem.color = UM.Theme.getColor("configuration_item")
}
}
}
Connections Connections
{ {
target: Cura.MachineManager target: Cura.MachineManager
onCurrentConfigurationChanged: { onCurrentConfigurationChanged:
configurationItem.selected = Cura.MachineManager.matchesConfiguration(configuration) {
updateBorderColor() configurationItem.checked = Cura.MachineManager.matchesConfiguration(configuration)
} }
} }
Component.onCompleted: Component.onCompleted:
{ {
configurationItem.selected = Cura.MachineManager.matchesConfiguration(configuration) configurationItem.checked = Cura.MachineManager.matchesConfiguration(configuration)
updateBorderColor()
}
onVisibleChanged:
{
if(visible)
{
// I cannot trigger function updateBorderColor() after visibility change
color = selected ? UM.Theme.getColor("configuration_item_active") : UM.Theme.getColor("configuration_item")
} }
} }
} }

10
resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
View file

@ -2,8 +2,7 @@
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 1.4 import QtQuick.Controls 2.4
import QtQuick.Controls.Styles 1.4
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura
@ -31,8 +30,10 @@ Column
width: parent.width - parent.padding width: parent.width - parent.padding
height: Math.min(configurationList.contentHeight, 350 * screenScaleFactor) height: Math.min(configurationList.contentHeight, 350 * screenScaleFactor)
style: UM.Theme.styles.scrollview ButtonGroup
__wheelAreaScrollSpeed: 75 // Scroll three lines in one scroll event {
buttons: configurationList.children
}
ListView ListView
{ {
@ -64,6 +65,7 @@ Column
} }
model: (outputDevice != null) ? outputDevice.uniqueConfigurations : [] model: (outputDevice != null) ? outputDevice.uniqueConfigurations : []
delegate: ConfigurationItem delegate: ConfigurationItem
{ {
width: parent.width - UM.Theme.getSize("default_margin").width width: parent.width - UM.Theme.getSize("default_margin").width