GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-21 21:29:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reorder code for readability

Browse Source
This commit is contained in:
fieldOfView 2020-04-12 09:23:54 +02:00
parent a9ecec0d5c
commit 4f0c24fecb
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/UI/ObjectsModel.py
View File

@ -1,4 +1,4 @@
# Copyright (c) 2019 Ultimaker B.V. # Copyright (c) 2020 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
from UM.Logger import Logger from UM.Logger import Logger
import re import re

23
resources/qml/ObjectItemButton.qml
View File

@ -1,4 +1,4 @@
// Copyright (c) 2018 Ultimaker B.V. // Copyright (c) 2020 Ultimaker B.V.
// 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.10 import QtQuick 2.10
@ -18,6 +18,17 @@ Button
checkable: true checkable: true
hoverEnabled: true hoverEnabled: true
onClicked: Cura.SceneController.changeSelection(index)
background: Rectangle
{
id: backgroundRect
color: objectItemButton.hovered ? UM.Theme.getColor("action_button_hovered") : "transparent"
radius: UM.Theme.getSize("action_button_radius").width
border.width: UM.Theme.getSize("default_lining").width
border.color: objectItemButton.checked ? UM.Theme.getColor("primary") : "transparent"
}
contentItem: Item contentItem: Item
{ {
width: objectItemButton.width - objectItemButton.leftPadding width: objectItemButton.width - objectItemButton.leftPadding
@ -126,15 +137,6 @@ Button
} }
} }
background: Rectangle
{
id: backgroundRect
color: objectItemButton.hovered ? UM.Theme.getColor("action_button_hovered") : "transparent"
radius: UM.Theme.getSize("action_button_radius").width
border.width: UM.Theme.getSize("default_lining").width
border.color: objectItemButton.checked ? UM.Theme.getColor("primary") : "transparent"
}
TextMetrics TextMetrics
{ {
id: buttonTextMetrics id: buttonTextMetrics
@ -151,5 +153,4 @@ Button
visible: objectItemButton.hovered && buttonTextMetrics.elidedText != buttonText.text visible: objectItemButton.hovered && buttonTextMetrics.elidedText != buttonText.text
} }
onClicked: Cura.SceneController.changeSelection(index)
} }

2
resources/qml/ObjectSelector.qml
View File

@ -1,4 +1,4 @@
// Copyright (c) 2019 Ultimaker B.V. // Copyright (c) 2020 Ultimaker B.V.
// 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.10 import QtQuick 2.10