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

Merge pull request #638 from Ultimaker/performance_fixes

Browse source 
Performance fixes
This commit is contained in:
Ghostkeeper 2016-02-23 12:31:16 +01:00
commit 3e4f728281
25 changed files with 479 additions and 488 deletions
Download patch file Download diff file Expand all files Collapse all files

44
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View file

@ -22,13 +22,13 @@ Item {
anchors.top: parent.top;
anchors.left: parent.left;
spacing: UM.Theme.sizes.default_margin.height;
spacing: UM.Theme.getSize("default_margin").height;
UM.SettingItem {
id: profileSelection
width: UM.Theme.sizes.setting.width;
height: UM.Theme.sizes.setting.height;
width: UM.Theme.getSize("setting").width;
height: UM.Theme.getSize("setting").height;
name: catalog.i18nc("@label", "Object profile")
type: "enum"
@ -48,8 +48,8 @@ Item {
Column {
id: customisedSettings
spacing: UM.Theme.sizes.default_lining.height;
width: UM.Theme.sizes.setting.width + UM.Theme.sizes.setting.height/2;
spacing: UM.Theme.getSize("default_lining").height;
width: UM.Theme.getSize("setting").width + UM.Theme.getSize("setting").height/2;
Repeater {
id: settings;
@ -57,8 +57,8 @@ Item {
model: UM.ActiveTool.properties.getValue("Model").getItem(base.currentIndex).settings
UM.SettingItem {
width: UM.Theme.sizes.setting.width;
height: UM.Theme.sizes.setting.height;
width: UM.Theme.getSize("setting").width;
height: UM.Theme.getSize("setting").height;
name: model.label;
type: model.type;
@ -80,8 +80,8 @@ Item {
{
anchors.left: parent.right;
width: UM.Theme.sizes.setting.height;
height: UM.Theme.sizes.setting.height;
width: UM.Theme.getSize("setting").height;
height: UM.Theme.getSize("setting").height;
onClicked: UM.ActiveTool.properties.getValue("Model").removeSettingOverride(UM.ActiveTool.properties.getValue("Model").getItem(base.currentIndex).id, model.key)
@ -98,8 +98,8 @@ Item {
height: parent.height/2
sourceSize.width: width
sourceSize.height: width
color: control.hovered ? UM.Theme.colors.setting_control_button_hover : UM.Theme.colors.setting_control_button
source: UM.Theme.icons.cross1
color: control.hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button")
source: UM.Theme.getIcon("cross1")
}
}
}
@ -112,7 +112,7 @@ Item {
{
id: customise_settings_button;
anchors.right: profileSelection.right;
height: UM.Theme.sizes.setting.height;
height: UM.Theme.getSize("setting").height;
visible: parseInt(UM.Preferences.getValue("cura/active_mode")) == 1
text: catalog.i18nc("@action:button", "Add Setting");
@ -123,16 +123,16 @@ Item {
{
width: control.width;
height: control.height;
border.width: UM.Theme.sizes.default_lining.width;
border.color: control.pressed ? UM.Theme.colors.action_button_active_border :
control.hovered ? UM.Theme.colors.action_button_hovered_border : UM.Theme.colors.action_button_border
color: control.pressed ? UM.Theme.colors.action_button_active :
control.hovered ? UM.Theme.colors.action_button_hovered : UM.Theme.colors.action_button
border.width: UM.Theme.getSize("default_lining").width;
border.color: control.pressed ? UM.Theme.getColor("action_button_active_border") :
control.hovered ? UM.Theme.getColor("action_button_hovered_border") : UM.Theme.getColor("action_button_border")
color: control.pressed ? UM.Theme.getColor("action_button_active") :
control.hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("action_button")
}
label: Label
{
text: control.text;
color: UM.Theme.colors.setting_control_text;
color: UM.Theme.getColor("setting_control_text");
anchors.centerIn: parent
}
}
@ -181,7 +181,7 @@ Item {
}
Column {
width: view.width - UM.Theme.sizes.default_margin.width * 2;
width: view.width - UM.Theme.getSize("default_margin").width * 2;
height: childrenRect.height;
Repeater {
@ -212,11 +212,11 @@ Item {
}
label: Row
{
spacing: UM.Theme.sizes.default_margin.width;
spacing: UM.Theme.getSize("default_margin").width;
Image
{
anchors.verticalCenter: parent.verticalCenter;
source: control.checked ? UM.Theme.icons.arrow_right : UM.Theme.icons.arrow_bottom;
source: control.checked ? UM.Theme.getIcon("arrow_right") : UM.Theme.getIcon("arrow_bottom");
}
Label
{
@ -260,7 +260,7 @@ Item {
delegate: ToolButton {
id: button;
x: model.depth * UM.Theme.sizes.default_margin.width;
x: model.depth * UM.Theme.getSize("default_margin").width;
text: model.name;
tooltip: model.description;
visible: !model.global_only