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

Remove sourceSize.width: width from all RecolorImages

Browse source 
It is now the default in Uranium.

Contributes to issue CURA-5876.
This commit is contained in:
Ghostkeeper 2018-12-04 15:04:51 +01:00
parent 2fdfdaa00b
commit 4d87c46423
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
27 changed files with 20 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/ModelChecker/ModelChecker.qml
View file

@ -33,7 +33,6 @@ Button
{ {
width: UM.Theme.getSize("save_button_specs_icons").width; width: UM.Theme.getSize("save_button_specs_icons").width;
height: UM.Theme.getSize("save_button_specs_icons").height; height: UM.Theme.getSize("save_button_specs_icons").height;
sourceSize.width: width;
sourceSize.height: width; sourceSize.height: width;
color: control.hovered ? UM.Theme.getColor("text_scene_hover") : UM.Theme.getColor("text_scene"); color: control.hovered ? UM.Theme.getColor("text_scene_hover") : UM.Theme.getColor("text_scene");
source: "model_checker.svg" source: "model_checker.svg"

1
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View file

@ -265,7 +265,6 @@ Item {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
width: parent.width width: parent.width
height: width height: width
sourceSize.width: width
sourceSize.height: width sourceSize.height: width
color: control.hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button") color: control.hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button")
source: UM.Theme.getIcon("minus") source: UM.Theme.getIcon("minus")

4
plugins/PostProcessingPlugin/PostProcessingPlugin.qml
View file

@ -141,7 +141,6 @@ UM.Dialog
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: Math.round(control.width / 2.7) width: Math.round(control.width / 2.7)
height: Math.round(control.height / 2.7) height: Math.round(control.height / 2.7)
sourceSize.width: width
sourceSize.height: width sourceSize.height: width
color: palette.text color: palette.text
source: UM.Theme.getIcon("cross1") source: UM.Theme.getIcon("cross1")
@ -176,7 +175,6 @@ UM.Dialog
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: Math.round(control.width / 2.5) width: Math.round(control.width / 2.5)
height: Math.round(control.height / 2.5) height: Math.round(control.height / 2.5)
sourceSize.width: width
sourceSize.height: width sourceSize.height: width
color: control.enabled ? palette.text : disabledPalette.text color: control.enabled ? palette.text : disabledPalette.text
source: UM.Theme.getIcon("arrow_bottom") source: UM.Theme.getIcon("arrow_bottom")
@ -211,7 +209,6 @@ UM.Dialog
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: Math.round(control.width / 2.5) width: Math.round(control.width / 2.5)
height: Math.round(control.height / 2.5) height: Math.round(control.height / 2.5)
sourceSize.width: width
sourceSize.height: width sourceSize.height: width
color: control.enabled ? palette.text : disabledPalette.text color: control.enabled ? palette.text : disabledPalette.text
source: UM.Theme.getIcon("arrow_top") source: UM.Theme.getIcon("arrow_top")
@ -498,7 +495,6 @@ UM.Dialog
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: Math.round(parent.width / 2) width: Math.round(parent.width / 2)
height: Math.round(parent.height / 2) height: Math.round(parent.height / 2)
sourceSize.width: width
sourceSize.height: height sourceSize.height: height
color: !control.enabled ? UM.Theme.getColor("action_button_disabled_text") : color: !control.enabled ? UM.Theme.getColor("action_button_disabled_text") :
control.pressed ? UM.Theme.getColor("action_button_active_text") : control.pressed ? UM.Theme.getColor("action_button_active_text") :

1
plugins/PrepareStage/PrepareMenu.qml
View file

@ -107,7 +107,6 @@ Item
height: UM.Theme.getSize("button_icon").height height: UM.Theme.getSize("button_icon").height
color: UM.Theme.getColor("toolbar_button_text") color: UM.Theme.getColor("toolbar_button_text")
sourceSize.width: width
sourceSize.height: height sourceSize.height: height
} }
} }

1
plugins/Toolbox/resources/qml/ToolboxDownloadsGridTile.qml
View file

@ -52,7 +52,6 @@ Item
bottom: parent.bottom bottom: parent.bottom
right: parent.right right: parent.right
} }
sourceSize.width: width
sourceSize.height: height sourceSize.height: height
visible: installedPackages != 0 visible: installedPackages != 0
color: (installedPackages == packageCount) ? UM.Theme.getColor("primary") : UM.Theme.getColor("border") color: (installedPackages == packageCount) ? UM.Theme.getColor("primary") : UM.Theme.getColor("border")

2
plugins/Toolbox/resources/qml/ToolboxDownloadsShowcaseTile.qml
View file

@ -48,8 +48,6 @@ Rectangle
right: parent.right right: parent.right
bottomMargin: UM.Theme.getSize("default_lining").width bottomMargin: UM.Theme.getSize("default_lining").width
} }
sourceSize.width: width
sourceSize.height: height
visible: installedPackages != 0 visible: installedPackages != 0
color: (installedPackages == packageCount) ? UM.Theme.getColor("primary") : UM.Theme.getColor("border") color: (installedPackages == packageCount) ? UM.Theme.getColor("primary") : UM.Theme.getColor("border")
source: "../images/installed_check.svg" source: "../images/installed_check.svg"

4
resources/qml/ActionButton.qml
View file

@ -50,8 +50,6 @@ Button
source: "" source: ""
height: buttonText.height height: buttonText.height
width: visible ? height : 0 width: visible ? height : 0
sourceSize.width: width
sourceSize.height: height
color: button.hovered ? button.textHoverColor : button.textColor color: button.hovered ? button.textHoverColor : button.textColor
visible: source != "" && !button.isIconOnRightSide visible: source != "" && !button.isIconOnRightSide
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -78,8 +76,6 @@ Button
source: buttonIconLeft.source source: buttonIconLeft.source
height: buttonText.height height: buttonText.height
width: visible ? height : 0 width: visible ? height : 0
sourceSize.width: width
sourceSize.height: height
color: buttonIconLeft.color color: buttonIconLeft.color
visible: source != "" && button.isIconOnRightSide visible: source != "" && button.isIconOnRightSide
anchors.verticalCenter: buttonIconLeft.verticalCenter anchors.verticalCenter: buttonIconLeft.verticalCenter

3
resources/qml/ActionPanel/PrintInformationWidget.qml
View file

@ -18,9 +18,6 @@ UM.RecolorImage
width: UM.Theme.getSize("section_icon").width width: UM.Theme.getSize("section_icon").width
height: UM.Theme.getSize("section_icon").height height: UM.Theme.getSize("section_icon").height
sourceSize.width: width
sourceSize.height: height
color: popup.opened ? UM.Theme.getColor("primary") : UM.Theme.getColor("text_medium") color: popup.opened ? UM.Theme.getColor("primary") : UM.Theme.getColor("text_medium")
MouseArea MouseArea

2
resources/qml/Dialogs/AboutDialog.qml
View file

@ -39,8 +39,6 @@ UM.Dialog
source: UM.Theme.getImage("logo") source: UM.Theme.getImage("logo")
sourceSize.width: width
sourceSize.height: height
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: ((base.minimumWidth - width) / 2) | 0 anchors.topMargin: ((base.minimumWidth - width) / 2) | 0
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter

3
resources/qml/Dialogs/AddMachineDialog.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2017 Ultimaker B.V. // Copyright (c) 2018 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.2 import QtQuick 2.2
@ -156,7 +156,6 @@ UM.Dialog
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width
width: UM.Theme.getSize("standard_arrow").width width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width
sourceSize.height: width sourceSize.height: width
color: palette.windowText color: palette.windowText
source: base.activeCategory == section ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_right") source: base.activeCategory == section ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_right")

2
resources/qml/ExpandableComponent.qml
View file

@ -139,8 +139,6 @@ Item
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
margins: background.padding margins: background.padding
} }
sourceSize.width: width
sourceSize.height: height
visible: source != "" visible: source != ""
width: height width: height
height: Math.round(0.2 * base.height) height: Math.round(0.2 * base.height)

3
resources/qml/ExtruderIcon.qml
View file

@ -22,8 +22,6 @@ Item
id: mainIcon id: mainIcon
anchors.fill: parent anchors.fill: parent
sourceSize.width: parent.width
sourceSize.height: parent.height
source: UM.Theme.getIcon("extruder_button") source: UM.Theme.getIcon("extruder_button")
color: extruderEnabled ? materialColor: "gray" color: extruderEnabled ? materialColor: "gray"
} }
@ -64,7 +62,6 @@ Item
id: disabledIcon id: disabledIcon
anchors.fill: parent anchors.fill: parent
anchors.margins: UM.Theme.getSize("thick_lining").width anchors.margins: UM.Theme.getSize("thick_lining").width
sourceSize.width: width
sourceSize.height: width sourceSize.height: width
source: UM.Theme.getIcon("cross1") source: UM.Theme.getIcon("cross1")
visible: !extruderEnabled visible: !extruderEnabled

3
resources/qml/IconLabel.qml
View file

@ -31,9 +31,6 @@ Item
width: UM.Theme.getSize("section_icon").width width: UM.Theme.getSize("section_icon").width
height: width height: width
sourceSize.width: width
sourceSize.height: height
color: label.color color: label.color
visible: source != "" visible: source != ""
} }

2
resources/qml/IconWithText.qml
View file

@ -37,8 +37,6 @@ Item
width: UM.Theme.getSize("section_icon").width width: UM.Theme.getSize("section_icon").width
height: UM.Theme.getSize("section_icon").height height: UM.Theme.getSize("section_icon").height
sourceSize.width: width
sourceSize.height: height
color: "black" color: "black"
anchors anchors

1
resources/qml/JobSpecs.qml
View file

@ -60,7 +60,6 @@ Item {
{ {
width: UM.Theme.getSize("save_button_specs_icons").width; width: UM.Theme.getSize("save_button_specs_icons").width;
height: UM.Theme.getSize("save_button_specs_icons").height; height: UM.Theme.getSize("save_button_specs_icons").height;
sourceSize.width: width;
sourceSize.height: width; sourceSize.height: width;
color: control.hovered ? UM.Theme.getColor("text_scene_hover") : UM.Theme.getColor("text_scene"); color: control.hovered ? UM.Theme.getColor("text_scene_hover") : UM.Theme.getColor("text_scene");
source: UM.Theme.getIcon("pencil"); source: UM.Theme.getIcon("pencil");

3
resources/qml/MainWindow/MainWindowHeader.qml
View file

@ -54,9 +54,6 @@ Rectangle
source: UM.Theme.getImage("logo") source: UM.Theme.getImage("logo")
width: UM.Theme.getSize("logo").width width: UM.Theme.getSize("logo").width
height: UM.Theme.getSize("logo").height height: UM.Theme.getSize("logo").height
sourceSize.width: width
sourceSize.height: height
} }
Row Row

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

@ -95,8 +95,6 @@ Button
anchors.left: parent.left anchors.left: parent.left
width: UM.Theme.getSize("main_window_header_button_icon").width width: UM.Theme.getSize("main_window_header_button_icon").width
height: UM.Theme.getSize("main_window_header_button_icon").height height: UM.Theme.getSize("main_window_header_button_icon").height
sourceSize.width: width
sourceSize.height: height
source: UM.Theme.getIcon("buildplate") source: UM.Theme.getIcon("buildplate")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
} }

3
resources/qml/ObjectsList.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2017 Ultimaker B.V. // Copyright (c) 2018 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.2 import QtQuick 2.2
@ -55,7 +55,6 @@ Rectangle
{ {
width: control.width width: control.width
height: control.height height: control.height
sourceSize.width: width
sourceSize.height: width sourceSize.height: width
color: UM.Theme.getColor("setting_control_text") color: UM.Theme.getColor("setting_control_text")
source: collapsed ? UM.Theme.getIcon("arrow_left") : UM.Theme.getIcon("arrow_bottom") source: collapsed ? UM.Theme.getIcon("arrow_left") : UM.Theme.getIcon("arrow_bottom")

5
resources/qml/Preferences/Materials/MaterialsBrandSection.qml
View file

@ -55,7 +55,8 @@ Rectangle
text: "" text: ""
implicitWidth: UM.Theme.getSize("favorites_button").width implicitWidth: UM.Theme.getSize("favorites_button").width
implicitHeight: UM.Theme.getSize("favorites_button").height implicitHeight: UM.Theme.getSize("favorites_button").height
UM.RecolorImage { UM.RecolorImage
{
anchors anchors
{ {
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
@ -63,8 +64,6 @@ Rectangle
} }
width: UM.Theme.getSize("standard_arrow").width width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width
sourceSize.height: height
color: "black" color: "black"
source: brand_section.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left") source: brand_section.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left")
} }

2
resources/qml/Preferences/Materials/MaterialsSlot.qml
View file

@ -95,8 +95,6 @@ Rectangle
} }
width: UM.Theme.getSize("favorites_button_icon").width width: UM.Theme.getSize("favorites_button_icon").width
height: UM.Theme.getSize("favorites_button_icon").height height: UM.Theme.getSize("favorites_button_icon").height
sourceSize.width: width
sourceSize.height: height
color: color:
{ {
if (favorite_button.hovered) if (favorite_button.hovered)

2
resources/qml/Preferences/Materials/MaterialsTypeSection.qml
View file

@ -74,8 +74,6 @@ Rectangle
} }
width: UM.Theme.getSize("standard_arrow").width width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width
sourceSize.height: height
color: "black" color: "black"
source: material_type_section.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left") source: material_type_section.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left")
} }

3
resources/qml/PrinterSelector/MachineSelector.qml
View file

@ -59,9 +59,6 @@ Cura.ExpandableComponent
width: UM.Theme.getSize("printer_status_icon").width width: UM.Theme.getSize("printer_status_icon").width
height: UM.Theme.getSize("printer_status_icon").height height: UM.Theme.getSize("printer_status_icon").height
sourceSize.width: width
sourceSize.height: height
color: UM.Theme.getColor("primary") color: UM.Theme.getColor("primary")
visible: isNetworkPrinter && isPrinterConnected visible: isNetworkPrinter && isPrinterConnected

13
resources/qml/Settings/SettingCategory.qml
View file

@ -129,23 +129,26 @@ Button
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width
width: UM.Theme.getSize("standard_arrow").width width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width
sourceSize.height: width sourceSize.height: width
color: color:
{ {
if (!base.enabled) if (!base.enabled)
{ {
return UM.Theme.getColor("setting_category_disabled_text") return UM.Theme.getColor("setting_category_disabled_text")
} else if ((base.hovered || base.activeFocus) && base.checkable && base.checked) }
else if ((base.hovered || base.activeFocus) && base.checkable && base.checked)
{ {
return UM.Theme.getColor("setting_category_active_hover_text") return UM.Theme.getColor("setting_category_active_hover_text")
} else if (base.pressed || (base.checkable && base.checked)) }
else if (base.pressed || (base.checkable && base.checked))
{ {
return UM.Theme.getColor("setting_category_active_text") return UM.Theme.getColor("setting_category_active_text")
} else if (base.hovered || base.activeFocus) }
else if (base.hovered || base.activeFocus)
{ {
return UM.Theme.getColor("setting_category_hover_text") return UM.Theme.getColor("setting_category_hover_text")
} else }
else
{ {
return UM.Theme.getColor("setting_category_text") return UM.Theme.getColor("setting_category_text")
} }

4
resources/qml/Settings/SettingCheckBox.qml
View file

@ -115,12 +115,12 @@ SettingItem
return UM.Theme.getColor("setting_control_border") return UM.Theme.getColor("setting_control_border")
} }
UM.RecolorImage { UM.RecolorImage
{
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: Math.round(parent.width / 2.5) width: Math.round(parent.width / 2.5)
height: Math.round(parent.height / 2.5) height: Math.round(parent.height / 2.5)
sourceSize.width: width
sourceSize.height: width sourceSize.height: width
color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text"); color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text");
source: UM.Theme.getIcon("check") source: UM.Theme.getIcon("check")

11
resources/qml/Settings/SettingView.qml
View file

@ -1,5 +1,5 @@
// Copyright (c) 2017 Ultimaker B.V. // Copyright (c) 2018 Ultimaker B.V.
// Uranium 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.1 import QtQuick.Controls 1.1
@ -129,13 +129,14 @@ Item
} }
style: ButtonStyle style: ButtonStyle
{ {
background: Item { background: Item
UM.RecolorImage { {
UM.RecolorImage
{
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: UM.Theme.getSize("standard_arrow").width width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width
sourceSize.height: width sourceSize.height: width
color: control.enabled ? UM.Theme.getColor("setting_category_text") : UM.Theme.getColor("setting_category_disabled_text") color: control.enabled ? UM.Theme.getColor("setting_category_text") : UM.Theme.getColor("setting_category_disabled_text")
source: UM.Theme.getIcon("menu") source: UM.Theme.getIcon("menu")

1
resources/qml/SidebarSimple.qml
View file

@ -731,7 +731,6 @@ Item
{ {
anchors.fill: parent anchors.fill: parent
anchors.margins: 2 * screenScaleFactor anchors.margins: 2 * screenScaleFactor
sourceSize.width: width
sourceSize.height: width sourceSize.height: width
source: UM.Theme.getIcon(model.icon) source: UM.Theme.getIcon(model.icon)
color: UM.Theme.getColor("quality_slider_unavailable") color: UM.Theme.getColor("quality_slider_unavailable")

5
resources/themes/cura-light/styles.qml
View file

@ -73,7 +73,6 @@ QtObject
anchors.rightMargin: Theme.getSize("default_margin").width anchors.rightMargin: Theme.getSize("default_margin").width
width: Theme.getSize("standard_arrow").width width: Theme.getSize("standard_arrow").width
height: Theme.getSize("standard_arrow").height height: Theme.getSize("standard_arrow").height
sourceSize.width: width
sourceSize.height: width sourceSize.height: width
color: control.enabled ? Theme.getColor("setting_category_text") : Theme.getColor("setting_category_disabled_text") color: control.enabled ? Theme.getColor("setting_category_text") : Theme.getColor("setting_category_disabled_text")
source: Theme.getIcon("arrow_bottom") source: Theme.getIcon("arrow_bottom")
@ -257,7 +256,6 @@ QtObject
anchors.bottomMargin: Theme.getSize("button").height - Math.round(Theme.getSize("button_icon").height / 4) anchors.bottomMargin: Theme.getSize("button").height - Math.round(Theme.getSize("button_icon").height / 4)
width: Theme.getSize("standard_arrow").width width: Theme.getSize("standard_arrow").width
height: Theme.getSize("standard_arrow").height height: Theme.getSize("standard_arrow").height
sourceSize.width: width
sourceSize.height: width sourceSize.height: width
visible: control.menu != null; visible: control.menu != null;
color: color:
@ -543,7 +541,6 @@ QtObject
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: Math.round(parent.width / 2.5) width: Math.round(parent.width / 2.5)
height: Math.round(parent.height / 2.5) height: Math.round(parent.height / 2.5)
sourceSize.width: width
sourceSize.height: width sourceSize.height: width
color: Theme.getColor("checkbox_mark") color: Theme.getColor("checkbox_mark")
source: control.exclusiveGroup ? Theme.getIcon("dot") : Theme.getIcon("check") source: control.exclusiveGroup ? Theme.getIcon("dot") : Theme.getIcon("check")
@ -585,7 +582,6 @@ QtObject
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: Math.round(parent.width / 2.5) width: Math.round(parent.width / 2.5)
height: Math.round(parent.height / 2.5) height: Math.round(parent.height / 2.5)
sourceSize.width: width
sourceSize.height: width sourceSize.height: width
color: Theme.getColor("checkbox_mark") color: Theme.getColor("checkbox_mark")
source: source:
@ -836,7 +832,6 @@ QtObject
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: Math.floor(control.width / 2) width: Math.floor(control.width / 2)
height: Math.floor(control.height / 2) height: Math.floor(control.height / 2)
sourceSize.width: width
sourceSize.height: width sourceSize.height: width
color: color:
{ {