3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'CURA-8011_Replace_extruder_icons' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2021-07-07 14:15:05 +02:00
commit 0a487c804a
No known key found for this signature in database
GPG key ID: 3710727397403C91
43 changed files with 304 additions and 298 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/Machines/Models/ExtrudersModel.py
View file

@ -215,7 +215,7 @@ class ExtrudersModel(ListModel):
"id": "",
"name": catalog.i18nc("@menuitem", "Not overridden"),
"enabled": True,
"color": "#ffffff",
"color": "transparent",
"index": -1,
"definition": "",
"material": "",

16
plugins/PrepareStage/PrepareMenu.qml
View file

@ -23,16 +23,14 @@ Item
{
left: parent.left
right: parent.right
leftMargin: UM.Theme.getSize("wide_margin").width
rightMargin: UM.Theme.getSize("wide_margin").width
leftMargin: UM.Theme.getSize("wide_margin").width * 2
rightMargin: UM.Theme.getSize("wide_margin").width * 2
}
// Item to ensure that all of the buttons are nicely centered.
Item
{
anchors.horizontalCenter: parent.horizontalCenter
width: parent.width - 2 * UM.Theme.getSize("wide_margin").width
height: parent.height
anchors.fill: parent
RowLayout
{
@ -52,9 +50,6 @@ Item
{
id: machineSelection
headerCornerSide: Cura.RoundedRectangle.Direction.Left
headerBackgroundBorder.width: UM.Theme.getSize("default_lining").width
headerBackgroundBorder.color: UM.Theme.getColor("lining")
enableHeaderShadow: false
Layout.preferredWidth: parent.machineSelectorWidth
Layout.fillWidth: true
Layout.fillHeight: true
@ -63,9 +58,6 @@ Item
Cura.ConfigurationMenu
{
id: printerSetup
enableHeaderShadow: false
headerBackgroundBorder.width: UM.Theme.getSize("default_lining").width
headerBackgroundBorder.color: UM.Theme.getColor("lining")
Layout.fillHeight: true
Layout.fillWidth: true
Layout.preferredWidth: parent.machineSelectorWidth * 2
@ -97,7 +89,7 @@ Item
{
id: buttonIcon
anchors.centerIn: parent
source: UM.Theme.getIcon("Folder")
source: UM.Theme.getIcon("Folder", "medium")
width: UM.Theme.getSize("button_icon").width
height: UM.Theme.getSize("button_icon").height
color: UM.Theme.getColor("icon")

34
plugins/PreviewStage/PreviewMenu.qml
View file

@ -24,54 +24,36 @@ Item
{
left: parent.left
right: parent.right
leftMargin: UM.Theme.getSize("wide_margin").width
rightMargin: UM.Theme.getSize("wide_margin").width
leftMargin: UM.Theme.getSize("wide_margin").width * 2
rightMargin: UM.Theme.getSize("wide_margin").width * 2
}
Row
{
id: stageMenuRow
anchors.horizontalCenter: parent.horizontalCenter
width: parent.width - 2 * UM.Theme.getSize("wide_margin").width
height: parent.height
anchors.fill: parent
// This is a trick to make sure that the borders of the two adjacent buttons' borders overlap. Otherwise
// there will be double border (one from each button)
spacing: -UM.Theme.getSize("default_lining").width
Cura.ViewsSelector
{
id: viewsSelector
height: parent.height
width: UM.Theme.getSize("views_selector").width
width: Math.max(Math.round((parent.width - printSetupSelectorItem.width) / 3), UM.Theme.getSize("views_selector").width)
headerCornerSide: Cura.RoundedRectangle.Direction.Left
}
// Separator line
Rectangle
{
height: parent.height
// If there is no viewPanel, we only need a single spacer, so hide this one.
visible: viewPanel.source != ""
width: visible ? UM.Theme.getSize("default_lining").width : 0
color: UM.Theme.getColor("lining")
}
// This component will grow freely up to complete the width of the row.
Loader
{
id: viewPanel
height: parent.height
width: source != "" ? (previewMenu.width - viewsSelector.width - printSetupSelectorItem.width - 2 * (UM.Theme.getSize("wide_margin").width + UM.Theme.getSize("default_lining").width)) : 0
width: source != "" ? (parent.width - viewsSelector.width - printSetupSelectorItem.width) : 0
source: UM.Controller.activeView != null && UM.Controller.activeView.stageMenuComponent != null ? UM.Controller.activeView.stageMenuComponent : ""
}
// Separator line
Rectangle
{
height: parent.height
width: UM.Theme.getSize("default_lining").width
color: UM.Theme.getColor("lining")
}
Item
{
id: printSetupSelectorItem

50
plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml
View file

@ -1,23 +1,26 @@
// Copyright (c) 2019 Ultimaker B.V.
// Copyright (c) 2021 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.3
import QtQuick.Controls 1.4
import QtQuick.Controls 2.4
import QtQuick.Controls.Styles 1.3
import UM 1.3 as UM
import Cura 1.0 as Cura
Rectangle
Button
{
id: base
property var enabled: true
property var iconSource: null
color: enabled ? UM.Theme.getColor("monitor_icon_primary") : UM.Theme.getColor("monitor_icon_disabled")
height: width
radius: Math.round(0.5 * width)
width: 24 * screenScaleFactor
width: UM.Theme.getSize("button").width * 0.75 //Matching the size of the content of tool buttons.
height: UM.Theme.getSize("button").height * 0.75
hoverEnabled: true
background: Rectangle
{
anchors.fill: parent
radius: 0.5 * width
color: parent.enabled ? (parent.hovered ? UM.Theme.getColor("monitor_secondary_button_hover") : "transparent") : UM.Theme.getColor("monitor_icon_disabled")
}
UM.RecolorImage
{
@ -27,30 +30,21 @@ Rectangle
horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter
}
color: UM.Theme.getColor("monitor_icon_accent")
color: UM.Theme.getColor("primary")
height: width
source: iconSource
width: Math.round(parent.width / 2)
}
MouseArea
onClicked:
{
id: clickArea
anchors.fill: parent
hoverEnabled: base.enabled
onClicked:
if (OutputDevice.activeCameraUrl != "")
{
if (base.enabled)
{
if (OutputDevice.activeCameraUrl != "")
{
OutputDevice.setActiveCameraUrl("")
}
else
{
OutputDevice.setActiveCameraUrl(modelData.cameraUrl)
}
}
OutputDevice.setActiveCameraUrl("")
}
else
{
OutputDevice.setActiveCameraUrl(modelData.cameraUrl)
}
}
}

2
plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml
View file

@ -50,7 +50,7 @@ Item
id: buildplateIcon
anchors.centerIn: parent
color: UM.Theme.getColor("monitor_icon_primary")
height: parent.height
height: UM.Theme.getSize("medium_button_icon").width
source: "../svg/icons/Buildplate.svg"
width: height
visible: buildplate

42
plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml
View file

@ -5,6 +5,8 @@ import QtQuick 2.2
import QtQuick.Controls 2.0
import UM 1.3 as UM
import Cura 1.6 as Cura
/**
* This component comprises a colored extruder icon, the material name, and the
* print core name. It is used by the MonitorPrinterConfiguration component with
@ -18,10 +20,10 @@ import UM 1.3 as UM
Item
{
// The material color
property alias color: extruderIcon.color
property alias color: extruderIcon.materialColor
// The extruder position; NOTE: Decent human beings count from 0
property alias position: extruderIcon.position
// The extruder position
property int position
// The material name
property alias material: materialLabel.text
@ -32,12 +34,13 @@ Item
// Height is 2 x 18px labels, plus 4px spacing between them
height: 40 * screenScaleFactor // TODO: Theme!
width: childrenRect.width
opacity: material != "" && material != "Empty" && position >= 0 ? 1 : 0.4
MonitorIconExtruder
Cura.ExtruderIcon
{
id: extruderIcon
color: UM.Theme.getColor("monitor_skeleton_loading")
position: 0
materialColor: UM.Theme.getColor("monitor_skeleton_loading")
anchors.verticalCenter: parent.verticalCenter
}
Rectangle
@ -46,16 +49,18 @@ Item
anchors
{
left: extruderIcon.right
leftMargin: 12 * screenScaleFactor // TODO: Theme!
leftMargin: UM.Theme.getSize("default_margin").width
verticalCenter: extruderIcon.verticalCenter
}
color: materialLabel.visible > 0 ? "transparent" : UM.Theme.getColor("monitor_skeleton_loading")
height: 18 * screenScaleFactor // TODO: Theme!
height: childrenRect.height
width: Math.max(materialLabel.contentWidth, 60 * screenScaleFactor) // TODO: Theme!
radius: 2 * screenScaleFactor // TODO: Theme!
Label
{
id: materialLabel
anchors.top: parent.top
color: UM.Theme.getColor("text")
elide: Text.ElideRight
@ -63,29 +68,13 @@ Item
text: ""
visible: text !== ""
// FIXED-LINE-HEIGHT:
height: parent.height
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
}
}
Rectangle
{
id: printCoreLabelWrapper
anchors
{
left: materialLabelWrapper.left
bottom: parent.bottom
}
color: printCoreLabel.visible > 0 ? "transparent" : UM.Theme.getColor("monitor_skeleton_loading")
height: 18 * screenScaleFactor // TODO: Theme!
width: Math.max(printCoreLabel.contentWidth, 36 * screenScaleFactor) // TODO: Theme!
radius: 2 * screenScaleFactor // TODO: Theme!
Label
{
id: printCoreLabel
anchors.top: materialLabel.bottom
color: UM.Theme.getColor("text")
elide: Text.ElideRight
@ -93,9 +82,6 @@ Item
text: ""
visible: text !== ""
// FIXED-LINE-HEIGHT:
height: parent.height
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
}
}

3
plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml
View file

@ -38,6 +38,7 @@ Item
Label
{
id: positionLabel
anchors.centerIn: icon
font: UM.Theme.getFont("small")
color: UM.Theme.getColor("text")
height: Math.round(size / 2)
@ -45,8 +46,6 @@ Item
text: position + 1
verticalAlignment: Text.AlignVCenter
width: Math.round(size / 2)
x: Math.round(size * 0.25)
y: Math.round(size * 0.15625)
visible: position >= 0
renderType: Text.NativeRendering
}

13
resources/qml/Account/AccountWidget.qml
View file

@ -54,9 +54,10 @@ Item
id: accountWidget
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: signInButton.horizontalCenter
implicitHeight: UM.Theme.getSize("main_window_header").height
implicitWidth: UM.Theme.getSize("main_window_header").height
implicitHeight: Math.round(0.5 * UM.Theme.getSize("main_window_header").height)
implicitWidth: Math.round(0.5 * UM.Theme.getSize("main_window_header").height)
hoverEnabled: true
@ -68,8 +69,8 @@ Item
{
id: avatar
width: Math.round(0.8 * accountWidget.width)
height: Math.round(0.8 * accountWidget.height)
width: accountWidget.width
height: accountWidget.height
anchors.verticalCenter: accountWidget.verticalCenter
anchors.horizontalCenter: accountWidget.horizontalCenter
@ -86,7 +87,7 @@ Item
{
id: initialCircle
anchors.centerIn: parent
width: Math.min(parent.width, parent.height)
width: Math.min(accountWidget.width, accountWidget.height)
height: width
radius: width
color: accountWidget.hovered ? UM.Theme.getColor("primary_text") : "transparent"
@ -141,7 +142,7 @@ Item
borderColor: UM.Theme.getColor("lining")
borderWidth: UM.Theme.getSize("default_lining").width
target: Qt.point(width - (accountWidget.width / 2), -10)
target: Qt.point(width - (signInButton.width / 2), -10)
arrowSize: UM.Theme.getSize("default_arrow").width
}

5
resources/qml/Account/UserOperations.qml
View file

@ -9,7 +9,7 @@ import Cura 1.1 as Cura
Column
{
spacing: UM.Theme.getSize("narrow_margin").height
spacing: UM.Theme.getSize("default_margin").height
topPadding: UM.Theme.getSize("default_margin").height
bottomPadding: UM.Theme.getSize("default_margin").height
width: childrenRect.width
@ -18,7 +18,7 @@ Column
{
id: accountInfo
width: childrenRect.width
height: childrenRect.height
height: accountSyncDetailsColumn.height
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width
AvatarImage
@ -56,6 +56,7 @@ Column
Column
{
id: accountSyncDetailsColumn
anchors.left: avatar.right
anchors.leftMargin: UM.Theme.getSize("default_margin").width
spacing: UM.Theme.getSize("narrow_margin").height

34
resources/qml/ExpandableComponent.qml
View file

@ -7,8 +7,6 @@ import QtQuick.Controls 2.3
import UM 1.2 as UM
import Cura 1.0 as Cura
import QtGraphicalEffects 1.0 // For the dropshadow
// The expandable component has 2 major sub components:
// * The headerItem; Always visible and should hold some info about what happens if the component is expanded
// * The contentItem; The content that needs to be shown if the component is expanded.
@ -58,6 +56,9 @@ Item
property alias headerBackgroundBorder: background.border
// Whether or not to show the background border
property bool enableHeaderBackgroundBorder: true
// What icon should be displayed on the right.
property alias iconSource: collapseButton.source
@ -75,11 +76,7 @@ Item
// On what side should the header corners be shown? 1 is down, 2 is left, 3 is up and 4 is right.
property alias headerCornerSide: background.cornerSide
property alias headerShadowColor: shadow.color
property alias enableHeaderShadow: shadow.visible
property int shadowOffset: 2
property int popupOffset: 2
// Prefix used for the dragged position preferences. Preferences not used if empty. Don't translate!
property string dragPreferencesNamePrefix: ""
@ -122,6 +119,9 @@ Item
id: background
property real padding: UM.Theme.getSize("default_margin").width
border.width: base.enableHeaderBackgroundBorder ? UM.Theme.getSize("default_lining").width : 0
border.color: UM.Theme.getColor("lining")
color: base.enabled ? (base.expanded ? headerActiveColor : headerBackgroundColor) : UM.Theme.getColor("disabled")
anchors.fill: parent
@ -167,7 +167,7 @@ Item
verticalCenter: parent.verticalCenter
margins: background.padding
}
source: UM.Theme.getIcon("Pen")
source: expanded ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft")
visible: source != ""
width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height
@ -186,20 +186,6 @@ Item
}
}
DropShadow
{
id: shadow
// Don't blur the shadow
radius: 0
anchors.fill: background
source: background
verticalOffset: base.shadowOffset
visible: true
color: UM.Theme.getColor("action_button_shadow")
// Should always be drawn behind the background.
z: background.z - 1
}
Cura.RoundedRectangle
{
id: contentContainer
@ -211,7 +197,7 @@ Item
height: childrenRect.height
// Ensure that the content is located directly below the headerItem
y: dragPreferencesNamePrefix === "" ? (background.height + base.shadowOffset + base.contentSpacingY) : UM.Preferences.getValue(dragPreferencesNamePrefix + dragPreferencesNameY)
y: dragPreferencesNamePrefix === "" ? (background.height + base.popupOffset + base.contentSpacingY) : UM.Preferences.getValue(dragPreferencesNamePrefix + dragPreferencesNameY)
// Make the content aligned with the rest, using the property contentAlignment to decide whether is right or left.
// In case of right alignment, the 3x padding is due to left, right and padding between the button & text.
@ -230,7 +216,7 @@ Item
var maxPt = base.mapFromItem(null,
CuraApplication.appWidth() - (contentContainer.width + margin.width),
CuraApplication.appHeight() - (contentContainer.height + margin.height));
var initialY = background.height + base.shadowOffset + margin.height;
var initialY = background.height + base.popupOffset + margin.height;
contentContainer.x = Math.max(minPt.x, Math.min(maxPt.x, posNewX));
contentContainer.y = Math.max(initialY, Math.min(maxPt.y, posNewY));

30
resources/qml/ExpandablePopup.qml
View file

@ -7,8 +7,6 @@ import QtQuick.Controls 2.3
import UM 1.2 as UM
import Cura 1.0 as Cura
import QtGraphicalEffects 1.0 // For the dropshadow
// The expandable component has 2 major sub components:
// * The headerItem; Always visible and should hold some info about what happens if the component is expanded
// * The contentItem; The content that needs to be shown if the component is expanded.
@ -52,6 +50,9 @@ Item
property alias headerBackgroundBorder: background.border
// Whether or not to show the background border
property bool enableHeaderBackgroundBorder: true
// What icon should be displayed on the right.
property alias iconSource: collapseButton.source
@ -74,11 +75,7 @@ Item
// Change the contentItem close behaviour
property alias contentClosePolicy : content.closePolicy
property alias headerShadowColor: shadow.color
property alias enableHeaderShadow: shadow.visible
property int shadowOffset: 2
property int popupOffset: 2
onEnabledChanged:
{
@ -116,6 +113,9 @@ Item
id: background
property real padding: UM.Theme.getSize("default_margin").width
border.width: base.enableHeaderBackgroundBorder ? UM.Theme.getSize("default_lining").width : 0
border.color: UM.Theme.getColor("lining")
color: base.enabled ? headerBackgroundColor : UM.Theme.getColor("disabled")
anchors.fill: parent
@ -190,26 +190,12 @@ Item
}
DropShadow
{
id: shadow
// Don't blur the shadow
radius: 0
anchors.fill: background
source: background
verticalOffset: base.shadowOffset
visible: true
color: UM.Theme.getColor("action_button_shadow")
// Should always be drawn behind the background.
z: background.z - 1
}
Popup
{
id: content
// Ensure that the content is located directly below the headerItem
y: background.height + base.shadowOffset
y: background.height + base.popupOffset
// Make the content aligned with the rest, using the property contentAlignment to decide whether is right or left.
// In case of right alignment, the 3x padding is due to left, right and padding between the button & text.

1
resources/qml/ExtruderButton.qml
View file

@ -22,6 +22,7 @@ Cura.ToolbarButton
{
materialColor: extruder.color
extruderEnabled: extruder.stack.isEnabled
iconVariant: "default"
property int index: extruder.index
}

56
resources/qml/ExtruderIcon.qml
View file

@ -1,7 +1,7 @@
// Copyright (c) 2018 Ultimaker B.V.
// Copyright (c) 2021 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7
import QtQuick 2.11
import QtQuick.Controls 1.1
import UM 1.2 as UM
@ -16,30 +16,30 @@ Item
property color materialColor
property alias textColor: extruderNumberText.color
property bool extruderEnabled: true
property alias iconSize: mainIcon.sourceSize
property string iconVariant: "medium"
UM.RecolorImage
Item
{
id: mainIcon
opacity: extruderEnabled ? 1 : UM.Theme.getColor("extruder_disabled").a
anchors.fill: parent
source: UM.Theme.getIcon("Extruder", "medium")
color: extruderEnabled ? materialColor: UM.Theme.getColor("disabled")
}
Rectangle
{
id: extruderNumberCircle
width: height
height: Math.round(parent.height / 2)
radius: Math.round(width)
color: UM.Theme.getColor("toolbar_background")
anchors
UM.RecolorImage
{
horizontalCenter: parent.horizontalCenter
top: parent.top
topMargin: (parent.height - height) / 2
anchors.fill: parent
sourceSize: mainIcon.sourceSize
source: UM.Theme.getIcon("ExtruderColor", iconVariant)
color: materialColor
}
UM.RecolorImage
{
id: mainIcon
anchors.fill: parent
sourceSize: UM.Theme.getSize("extruder_icon")
source: UM.Theme.getIcon("Extruder", iconVariant)
color: extruderNumberText.color
}
Label
@ -47,25 +47,13 @@ Item
id: extruderNumberText
anchors.centerIn: parent
text: index + 1
font: UM.Theme.getFont("small")
font: UM.Theme.getFont("small_emphasis")
color: UM.Theme.getColor("text")
width: contentWidth
height: contentHeight
visible: extruderEnabled
renderType: Text.NativeRendering
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
UM.RecolorImage
{
id: disabledIcon
anchors.fill: parent
anchors.margins: UM.Theme.getSize("thick_lining").width
sourceSize.height: width
source: UM.Theme.getIcon("Cancel")
visible: !extruderEnabled
color: UM.Theme.getColor("text")
}
}
}

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

@ -62,7 +62,7 @@ Item
anchors.verticalCenter: parent.verticalCenter
exclusiveGroup: mainWindowHeaderMenuGroup
style: UM.Theme.styles.main_window_header_tab
height: UM.Theme.getSize("main_window_header_button").height
height: Math.round(0.5 * UM.Theme.getSize("main_window_header").height)
iconSource: model.stage.iconSource
property color overlayColor: "transparent"

37
resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
View file

@ -56,13 +56,13 @@ Cura.ExpandablePopup
id: extruderIcon
materialColor: model.color
extruderEnabled: model.enabled
width: UM.Theme.getSize("button_icon").width
anchors.verticalCenter: parent.verticalCenter
}
Item
ColumnLayout
{
height: childrenRect.height
opacity: model.enabled ? 1 : UM.Theme.getColor("extruder_disabled").a
spacing: 0
anchors
{
left: extruderIcon.right
@ -81,13 +81,8 @@ Cura.ExpandablePopup
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
width: parent.width
anchors
{
top: parent.top
left: parent.left
right: parent.right
}
visible: !truncated
}
@ -100,13 +95,7 @@ Cura.ExpandablePopup
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
anchors
{
top: parent.top
left: parent.left
right: parent.right
}
width: parent.width
visible: !materialBrandColorTypeLabel.visible && !truncated
}
@ -120,13 +109,7 @@ Cura.ExpandablePopup
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
anchors
{
top: parent.top
left: parent.left
right: parent.right
}
width: parent.width
visible: !materialBrandColorTypeLabel.visible && !materialColorTypeLabel.visible
}
// Label that shows the name of the variant
@ -141,13 +124,7 @@ Cura.ExpandablePopup
font: UM.Theme.getFont("default_bold")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
anchors
{
left: parent.left
top: materialBrandColorTypeLabel.bottom
right: parent.right
}
width: parent.width
}
}
}

6
resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
View file

@ -302,15 +302,15 @@ Item
}
Item
{
width: instructionButton.width + 2 * UM.Theme.getSize("default_margin").width
width: instructionButton.width + 2 * UM.Theme.getSize("narrow_margin").width
height: instructionButton.visible ? materialSelection.height: 0
Button
{
id: instructionButton
hoverEnabled: true
contentItem: Item {}
height: 0.5 * materialSelection.height
width: height
height: UM.Theme.getSize("small_button").height
width: UM.Theme.getSize("small_button").width
anchors.centerIn: parent
background: UM.RecolorImage
{

10
resources/qml/ObjectItemButton.qml
View file

@ -13,8 +13,6 @@ Button
width: parent.width
height: UM.Theme.getSize("action_button").height
leftPadding: UM.Theme.getSize("thin_margin").width
rightPadding: perObjectSettingsInfo.visible ? UM.Theme.getSize("default_lining").width : UM.Theme.getSize("thin_margin").width
checkable: true
hoverEnabled: true
@ -46,14 +44,14 @@ Button
width: objectItemButton.width - objectItemButton.leftPadding
height: UM.Theme.getSize("action_button").height
UM.RecolorImage
Rectangle
{
id: swatch
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
width: height
height: parent.height - UM.Theme.getSize("narrow_margin").height
source: UM.Theme.getIcon("Extruder", "medium")
width: UM.Theme.getSize("standard_arrow").height
height: UM.Theme.getSize("standard_arrow").height
radius: Math.round(width / 2)
color: extruderColor
visible: showExtruderSwatches && extruderColor != ""
}

5
resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
View file

@ -226,9 +226,12 @@ Item
{
Cura.ExtruderIcon
{
anchors.horizontalCenter: parent.horizontalCenter
anchors.centerIn: parent
materialColor: model.color
extruderEnabled: model.enabled
iconVariant: "default"
height: parent.height
width: height
}
}
onClicked:

3
resources/qml/PrintSetupSelector/PrintSetupSelector.qml
View file

@ -17,9 +17,6 @@ Cura.ExpandableComponent
contentPadding: UM.Theme.getSize("default_lining").width
contentHeaderTitle: catalog.i18nc("@label", "Print settings")
enableHeaderShadow: false
headerBackgroundBorder.width: UM.Theme.getSize("default_lining").width
headerBackgroundBorder.color: UM.Theme.getColor("lining")
enabled: !preSlicedData
disabledText: catalog.i18nc("@label shown when we load a Gcode file", "Print setup disabled. G-code file can not be modified.")

6
resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
View file

@ -15,7 +15,8 @@ RowLayout
Cura.IconWithText
{
source: UM.Theme.getIcon("PrintQuality")
source: UM.Theme.getIcon("Sliders", "medium")
iconSize: UM.Theme.getSize("button_icon").width
text:
{
if (Cura.MachineManager.activeStack)
@ -53,6 +54,7 @@ RowLayout
source: UM.Theme.getIcon("Infill1")
text: Cura.MachineManager.activeStack ? parseInt(infillDensity.properties.value) + "%" : "0%"
font: UM.Theme.getFont("medium")
iconSize: UM.Theme.getSize("medium_button_icon").width
UM.SettingPropertyProvider
{
@ -68,6 +70,7 @@ RowLayout
source: UM.Theme.getIcon("Support")
text: supportEnabled.properties.value == "True" ? enabledText : disabledText
font: UM.Theme.getFont("medium")
iconSize: UM.Theme.getSize("medium_button_icon").width
UM.SettingPropertyProvider
{
@ -83,6 +86,7 @@ RowLayout
source: UM.Theme.getIcon("Adhesion")
text: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none" ? enabledText : disabledText
font: UM.Theme.getFont("medium")
iconSize: UM.Theme.getSize("medium_button_icon").width
UM.SettingPropertyProvider
{

1
resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml
View file

@ -29,6 +29,7 @@ Item
text: catalog.i18nc("@label", "Adhesion")
font: UM.Theme.getFont("medium")
width: labelColumnWidth
iconSize: UM.Theme.getSize("medium_button_icon").width
}
Item

5
resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml
View file

@ -43,7 +43,7 @@ Item
{
return UM.Theme.getIcon("Infill2")
}
return UM.Theme.getIcon("Solid")
return UM.Theme.getIcon("Infill100")
}
}
@ -65,6 +65,7 @@ Item
text: catalog.i18nc("@label", "Infill") + " (%)"
font: UM.Theme.getFont("medium")
width: labelColumnWidth
iconSize: UM.Theme.getSize("medium_button_icon").width
}
Item
@ -119,6 +120,8 @@ Item
implicitWidth: UM.Theme.getSize("print_setup_slider_handle").width
implicitHeight: implicitWidth
radius: Math.round(implicitWidth / 2)
border.color: UM.Theme.getColor("slider_groove_fill")
border.width: UM.Theme.getSize("default_lining").height
}
tickmarks: Repeater

2
resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
View file

@ -52,6 +52,7 @@ Item
text: catalog.i18nc("@label", "Profiles")
font: UM.Theme.getFont("medium")
width: labelColumnWidth
iconSize: UM.Theme.getSize("medium_button_icon").width
}
UM.SimpleButton
{
@ -91,6 +92,7 @@ Item
{
left: profileLabel.right
right: parent.right
verticalCenter: profileLabel.verticalCenter
}
model: Cura.QualityProfilesDropDownMenuModel

13
resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
View file

@ -30,6 +30,7 @@ Item
text: catalog.i18nc("@label", "Support")
font: UM.Theme.getFont("medium")
width: labelColumnWidth
iconSize: UM.Theme.getSize("medium_button_icon").width
}
Item
@ -218,18 +219,16 @@ Item
elide: Text.ElideLeft
verticalAlignment: Text.AlignVCenter
background: UM.RecolorImage
background: Rectangle
{
id: swatch
height: Math.round(parent.height / 2)
width: height
radius: Math.round(width / 2)
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.rightMargin: UM.Theme.getSize("thin_margin").width
sourceSize.width: width
sourceSize.height: height
source: UM.Theme.getIcon("Extruder", "medium")
color: supportExtruderCombobox.color
}
}
@ -288,18 +287,16 @@ Item
verticalAlignment: Text.AlignVCenter
rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width
background: UM.RecolorImage
background: Rectangle
{
id: swatch
height: Math.round(parent.height / 2)
width: height
radius: Math.round(width / 2)
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.rightMargin: UM.Theme.getSize("thin_margin").width
sourceSize.width: width
sourceSize.height: height
source: UM.Theme.getIcon("Extruder", "medium")
color: supportExtruderCombobox.model.getItem(index).color
}
}

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

@ -93,11 +93,11 @@ Cura.ExpandablePopup
{
if (isGroup)
{
return UM.Theme.getIcon("PrinterTriple")
return UM.Theme.getIcon("PrinterTriple", "medium")
}
else if (isNetworkPrinter || isCloudRegistered)
{
return UM.Theme.getIcon("Printer")
return UM.Theme.getIcon("Printer", "medium")
}
else
{
@ -114,8 +114,9 @@ Cura.ExpandablePopup
anchors
{
bottom: parent.bottom
bottomMargin: - height * 1 / 6
left: parent.left
leftMargin: UM.Theme.getSize("thick_margin").width
leftMargin: iconSize - width * 5 / 6
}
source:

1
resources/qml/RadioCheckbar.qml
View file

@ -146,6 +146,7 @@ Item
}
radius: Math.round(width / 2)
color: activeColor
border.color: defaultItemColor
visible: checkbox.checked
}
}

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

@ -16,10 +16,13 @@ Button
anchors.rightMargin: 2 * UM.Theme.getSize("thin_margin").width
hoverEnabled: true
height: UM.Theme.getSize("section_icon_column").height
background: Rectangle
{
id: backgroundRectangle
height: UM.Theme.getSize("section").height
anchors.verticalCenter: parent.verticalCenter
color:
{
if (!base.enabled)
@ -107,8 +110,8 @@ Button
source: UM.Theme.getIcon(definition.icon)
width: UM.Theme.getSize("section_icon").width
height: UM.Theme.getSize("section_icon").height
sourceSize.width: width + 15 * screenScaleFactor
sourceSize.height: width + 15 * screenScaleFactor
sourceSize.width: width
sourceSize.height: width
}
onClicked:
@ -141,8 +144,8 @@ Button
id: settingsButton
visible: base.hovered || settingsButton.hovered
height: Math.round(base.height * 0.6)
width: Math.round(base.height * 0.6)
height: UM.Theme.getSize("small_button_icon").height
width: height
anchors
{
@ -184,7 +187,7 @@ Button
return false
}
height: Math.round(parent.height / 2)
height: UM.Theme.getSize("small_button_icon").height
width: height
onClicked:

16
resources/qml/Settings/SettingExtruder.qml
View file

@ -77,7 +77,7 @@ SettingItem
currentIndex: propertyProvider.properties.value !== undefined ? propertyProvider.properties.value : 0
property string color: "#fff"
property string color: "transparent"
Binding
{
@ -85,7 +85,7 @@ SettingItem
// explicit binding here otherwise we do not handle value changes after the model changes.
target: control
property: "color"
value: control.currentText != "" ? control.model.getItem(control.currentIndex).color : ""
value: control.currentText != "" ? control.model.getItem(control.currentIndex).color : "transparent"
}
Binding
@ -160,18 +160,16 @@ SettingItem
elide: Text.ElideLeft
verticalAlignment: Text.AlignVCenter
background: UM.RecolorImage
background: Rectangle
{
id: swatch
height: Math.round(parent.height / 2)
width: height
radius: Math.round(width / 2)
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.rightMargin: UM.Theme.getSize("thin_margin").width
sourceSize.width: width
sourceSize.height: height
source: UM.Theme.getIcon("Extruder", "medium")
color: control.color
}
}
@ -229,18 +227,16 @@ SettingItem
verticalAlignment: Text.AlignVCenter
rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width
background: UM.RecolorImage
background: Rectangle
{
id: swatch
height: Math.round(parent.height / 2)
width: height
radius: Math.round(width / 2)
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.rightMargin: UM.Theme.getSize("thin_margin").width
sourceSize.width: width
sourceSize.height: height
source: UM.Theme.getIcon("Extruder", "medium")
color: control.model.getItem(index).color
}
}

5
resources/qml/Settings/SettingItem.qml
View file

@ -156,7 +156,7 @@ Item
{
id: settingControls
height: UM.Theme.getSize("section_control").height
height: UM.Theme.getSize("small_button_icon").height
spacing: Math.round(UM.Theme.getSize("thick_margin").height / 2)
anchors
@ -174,6 +174,7 @@ Item
anchors.top: parent.top
anchors.bottom: parent.bottom
height: UM.Theme.getSize("small_button_icon").height
width: height
color: UM.Theme.getColor("setting_control_button")
@ -203,6 +204,7 @@ Item
anchors.top: parent.top
anchors.bottom: parent.bottom
height: UM.Theme.getSize("small_button_icon").height
width: height
color: UM.Theme.getColor("setting_control_button")
@ -286,6 +288,7 @@ Item
anchors.top: parent.top
anchors.bottom: parent.bottom
height: UM.Theme.getSize("small_button_icon").height
width: height
onClicked:

16
resources/qml/Settings/SettingOptionalExtruder.qml
View file

@ -88,7 +88,7 @@ SettingItem
when: control.model.items.length > 0
}
property string color: "#fff"
property string color: "transparent"
Binding
{
@ -96,7 +96,7 @@ SettingItem
// explicit binding here otherwise we do not handle value changes after the model changes.
target: control
property: "color"
value: control.currentText != "" ? control.model.getItem(control.currentIndex).color : ""
value: control.currentText != "" ? control.model.getItem(control.currentIndex).color : "transparent"
}
indicator: UM.RecolorImage
@ -161,18 +161,16 @@ SettingItem
elide: Text.ElideRight
verticalAlignment: Text.AlignVCenter
background: UM.RecolorImage
background: Rectangle
{
id: swatch
height: Math.round(parent.height / 2)
width: height
radius: Math.round(width / 2)
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.rightMargin: UM.Theme.getSize("thin_margin").width
sourceSize.width: width
sourceSize.height: height
source: UM.Theme.getIcon("Extruder", "medium")
color: control.color
}
}
@ -226,18 +224,16 @@ SettingItem
verticalAlignment: Text.AlignVCenter
rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width
background: UM.RecolorImage
background: Rectangle
{
id: swatch
height: Math.round(parent.height / 2)
width: height
radius: Math.round(width / 2)
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.rightMargin: UM.Theme.getSize("thin_margin").width
sourceSize.width: width
sourceSize.height: height
source: UM.Theme.getIcon("Extruder", "medium")
color: control.model.getItem(index).color
}
}

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

@ -65,7 +65,13 @@ Item
anchors.right: clearFilterButton.left
anchors.rightMargin: Math.round(UM.Theme.getSize("thick_margin").width)
placeholderText: "<img align='middle' src='"+ UM.Theme.getIcon("Magnifier") +"'>" + "<div vertical-align=bottom>" + catalog.i18nc("@label:textbox", "Search settings")
placeholderText:
{
var imageSize = "width='" + UM.Theme.getSize("small_button_icon").width + "' height='" + UM.Theme.getSize("small_button_icon").height
var imageSource = "' src='"+ UM.Theme.getIcon("Magnifier")
var searchPlaceholder = catalog.i18nc("@label:textbox", "Search settings")
return "<img align='middle' " + imageSize + imageSource +"'>" + "<div vertical-align=bottom>" + searchPlaceholder
}
style: TextFieldStyle
{
@ -188,8 +194,8 @@ Item
{
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height
width: UM.Theme.getSize("medium_button_icon").width
height: UM.Theme.getSize("medium_button_icon").height
sourceSize.width: width
sourceSize.height: height
color: control.hovered ? UM.Theme.getColor("small_button_text_hover") : UM.Theme.getColor("small_button_text")

3
resources/qml/Toolbar.qml
View file

@ -68,7 +68,8 @@ Item
source: UM.Theme.getIcon(model.icon) != "" ? UM.Theme.getIcon(model.icon) : "file:///" + model.location + "/" + model.icon
color: UM.Theme.getColor("icon")
sourceSize: Math.round(UM.Theme.getSize("button") / 2)
sourceSize.height: Math.round(UM.Theme.getSize("button").height / 2)
sourceSize.width: Math.round(UM.Theme.getSize("button").width / 2)
}
onCheckedChanged:

1
resources/qml/ViewOrientationButton.qml
View file

@ -11,5 +11,4 @@ UM.SimpleButton
height: UM.Theme.getSize("small_button").height
hoverColor: UM.Theme.getColor("small_button_text_hover")
color: UM.Theme.getColor("small_button_text")
iconMargin: UM.Theme.getSize("thick_lining").width
}

13
resources/themes/cura-light/icons/default/Extruder.svg Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
<g id="Layer_1_1_">
<g>
<path d="M12,2C6.5,2,2,6.5,2,12v9h2v-3c1.8,2.4,4.7,4,8,4c5.5,0,10-4.5,10-10S17.5,2,12,2z M12,20c-4.4,0-8-3.6-8-8s3.6-8,8-8
s8,3.6,8,8S16.4,20,12,20z"/>
</g>
</g>
<g id="Comments">
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 568 B

14
resources/themes/cura-light/icons/default/ExtruderColor.svg Normal file
View file

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
<style type="text/css">
.st0{fill:#231F20;}
</style>
<g id="Layer_1_1_">
<path class="st0" d="M12,21c-5,0-9-4-9-9s4-9,9-9s9,4,9,9S17,21,12,21z M12,6c-3.3,0-6,2.7-6,6s2.7,6,6,6s6-2.7,6-6S15.3,6,12,6z"
/>
</g>
<g id="Comments">
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 587 B

3
resources/themes/cura-light/icons/default/Infill100.svg Normal file
View file

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
<rect x="3" y="3" width="18" height="18" rx="3" />
</svg>
Side by side

After

Width:  |  Height:  |  Size: 118 B

13
resources/themes/cura-light/icons/default/Solid.svg
View file

@ -1,10 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="-282 405.9 30 30">
<path d="M-280.4 407.1l-.4.4v1.8l2.2-2.2zm2.2 0l-2.6 2.6v1.8l4.4-4.4zm2.2 0l-4.8 4.8v1.8l6.6-6.6zm2.2 0l-7 6.9v1.8l8.8-8.7zm2.1 0l-9.1 9.1v1.8l10.9-10.9zm2.2 0l-11.3 11.3v1.8l13.1-13.1zm2.2 0l-13.5 13.5v1.8l15.3-15.3zm2.2 0l-15.7 15.7v1.8l17.5-17.5zm2.2 0l-17.9 17.9v1.8l19.7-19.7zm2.2 0l-20.1 20.1v1.8l21.9-21.9zm2.2 0l-22.3 22.3v1.8l24.1-24.1zm2.2 0l-24.5 24.5v1.8l26.3-26.3zM-282 435zm28.8-27.9h-.9l-26.7 26.7v.9h.9l26.7-26.7zm0 1.3l-26.3 26.3h1.8l24.5-24.5zm0 2.1l-24.1 24.2h1.8l22.3-22.4zm0 2.2l-22 22h1.8l20.2-20.2zm0 2.2l-19.8 19.8h1.8l18-18zm0 2.2l-17.6 17.6h1.8l15.8-15.8zm0 2.2l-15.4 15.4h1.8l13.6-13.6zm0 2.2l-13.2 13.2h1.8l11.4-11.4zm0 2.2l-11 11h1.8l9.2-9.2zm0 2.2l-8.8 8.8h1.8l7-7zm0 2.2l-6.6 6.6h1.8l4.8-4.8zm0 2.2l-4.4 4.4h1.8l2.6-2.6zm-2.2 4.4h1.8l.4-.4v-1.8zm-25.4-27.6h-1.2v1.6l1.2-1.2zm0 8.7l-1.2 1.2v.4l1.2-1.2zm0 6.6l-1.2 1.2v.4l1.2-1.2zm0-8.7l-1.2 1.2v.3l1.2-1.2zm0 4.3l-1.2 1.2v.4l1.2-1.2zm0-8.7l-1.2 1.2v.4l1.2-1.2zm0 2.2l-1.2 1.2v.4l1.2-1.2zm0 8.7l-1.2 1.2v.4l1.2-1.2zm0 13.6v-.4l-1.2 1.2v.1h.3zm0-4.8l-1.2 1.2v.4l1.2-1.2zm0 2.2l-1.2 1.2v.4l1.2-1.2zm0-6.6l-1.2 1.2v.4l1.2-1.2zm0 2.2l-1.2 1.2v.4l1.2-1.2z" />
<path d="M-280.8 407.5l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.1l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm-.9 3.1h.9v-.9zm28.5-19.8l1.2-1.2v-.4l-1.2 1.2zm0 4.4l1.2-1.2v-.4l-1.2 1.2zm0-11.3v.4l1.2-1.2v-.1h-.3zm0 15.7l1.2-1.2v-.4l-1.2 1.2zm0-6.6l1.2-1.2v-.4l-1.2 1.2zm0-6.6l1.2-1.2v-.3l-1.2 1.2zm0 2.2l1.2-1.2v-.4l-1.2 1.2zm0 8.8l1.2-1.2v-.4l-1.2 1.2zm0 12.8v.4h1.2v-1.6zm0-8.4l1.2-1.2v-.4l-1.2 1.2zm0 2.2l1.2-1.2v-.4l-1.2 1.2zm0 4.4l1.2-1.2v-.4l-1.2 1.2zm0-2.2l1.2-1.2v-.4l-1.2 1.2z" />
<path d="M-252.3 407.1h-.9v.9zm-.9 3.1l1.2-1.2v-1.8l-1.2 1.2zm0 2.1l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm-10.1-27.2h.4l1.2-1.2h-2.2l.9.9zm-2.2 0h.4l1.2-1.2h-2.2l.9.9zm-4.4 0h.4l1.2-1.2h-2.2l.9.9zm13.2 0h.4l1.2-1.2h-2.2l.9.9zm2.2 0h.4l.9-.9v-.3h-1.9l.9.9zm-4.4 0h.4l1.2-1.2h-2.2l.9.9zm-2.2 0h.4l1.2-1.2h-2.2l.9.9zm-19.3 0l1.2-1.2h-1.6v1.2zm4 0h.4l1.2-1.2h-2.2l.9.9z" />
<path d="M-278.6 407.1h.4l1.2-1.2h-2.2l.9.9zm4.4 0h.4l1.2-1.2h-2.2l.9.9zm2.2 0h.3l1.2-1.2h-2.1l.9.9zm4.3 0h.4l1.2-1.2h-2.2l.9.9z" />
<path d="M-278.6 407.1l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.1 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm1.3-.9l-.9.9h.9zm-28.8-.3h1.2v1.2h-1.2zm29.7 1.2h.3v-1.2h-.9l.9.9zm-.6-1.2h-.3v.3z" />
<path d="M-253.2 407.1h.9l.3-.3-.9-.9-.3.3zm-13.2 27.6h-.4l-1.2 1.2h2.2l-.9-.9zm2.2 0h-.4l-1.2 1.2h2.2l-.9-.9zm-6.6 0h-.4l-1.2 1.2h2.2l-.9-.9zm2.2 0h-.4l-1.2 1.2h2.2l-.9-.9zm15 0l-1.2 1.2h1.6v-1.2zm-4 0h-.4l-1.2 1.2h2.2l-.9-.9zm-2.2 0h-.4l-1.2 1.2h2.2l-.9-.9zm4.4 0h-.4l-1.2 1.2h2.2l-.9-.9zm-17.6 0h-.4l-1.2 1.2h2.2l-.9-.9zm11 0h-.4l-1.2 1.2h2.2l-.9-.9zm-15.3 0h-.4l-1.2 1.2h2.2l-.9-.9zm2.1 0h-.3l-1.2 1.2h2.1l-.9-.9zm-4.3 0h-.4l-.9.9v.3h1.9l-.9-.9z" />
<path d="M-280.8 435.6l.9-.9h-.9zm1.3-.9l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.1 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm-26.6 1.2h.9l-.9-.9zm0-1.2v.3l.3-.3zm.9 1.2h.3v-.3z" />
<path d="M-280.8 434.7h-.9l-.3.3.9.9.3-.3zm27.6 0h1.2v1.2h-1.2z" />
</svg>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
<rect x="0" y="0" width="24" height="24" />
</svg>
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4 KiB

After

Width:  |  Height:  |  Size: 111 B

Before After
Before After

14
resources/themes/cura-light/icons/medium/ExtruderColor.svg Normal file
View file

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
<style type="text/css">
.st0{fill:#231F20;}
</style>
<g id="Layer_1_1_">
<path class="st0" d="M15,26C8.9,26,4,21.1,4,15S8.9,4,15,4s11,4.9,11,11S21.1,26,15,26z M15,7c-4.4,0-8,3.6-8,8s3.6,8,8,8
s8-3.6,8-8S19.4,7,15,7z"/>
</g>
<g id="Comments">
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 603 B

11
resources/themes/cura-light/icons/medium/Folder.svg Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
<g id="Layer_1">
<path d="M24,9c0-1.65-1.35-3-3-3h-9l-1-1H6C4.34,5,3,6.34,3,8v14c0,1.66,1.34,3,3,3h18c1.66,0,3-1.34,3-3V12C27,10.34,25.66,9,24,9
z M25,23H5V7h5.17l4,4H25V23z"/>
</g>
<g id="Comments">
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 552 B

13
resources/themes/cura-light/icons/medium/Printer.svg Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
<g id="Layer_1">
<g>
<path d="M24,6v18h-2l-2-2H10l-2,2H6V6H24 M26,4H4v22h4.828l2-2h8.343l2,2H26V4L26,4z"/>
<rect x="10" y="18" width="10" height="2"/>
</g>
</g>
<g id="Comments">
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 534 B

17
resources/themes/cura-light/icons/medium/Sliders.svg Normal file
View file

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
<g id="Layer_1">
<g>
<path d="M18,5h-2c-1.1,0-2,0.9-2,2H3v2h11c0,1.1,0.9,2,2,2h2c1.1,0,2-0.9,2-2V7C20,5.9,19.1,5,18,5z M18,9h-2V7h2V9z"/>
<rect x="21" y="7" width="6" height="2"/>
<rect x="25" y="14" width="2" height="2"/>
<path d="M22,12h-2c-1.1,0-2,0.9-2,2H3v2h15c0,1.1,0.9,2,2,2h2c1.1,0,2-0.9,2-2v-2C24,12.9,23.1,12,22,12z M22,16h-2v-2h2V16z"/>
<path d="M12,19h-2c-1.1,0-2,0.9-2,2H3v2h5c0,1.1,0.9,2,2,2h2c1.1,0,2-0.9,2-2v-2C14,19.9,13.1,19,12,19z M12,23h-2v-2h2V23z"/>
<rect x="15" y="21" width="12" height="2"/>
</g>
</g>
<g id="Comments">
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 907 B

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

@ -252,11 +252,11 @@ QtObject
anchors.centerIn: parent
opacity: control.enabled ? 1.0 : 0.2
source: control.iconSource
width: UM.Theme.getSize("button_icon").width
height: UM.Theme.getSize("button_icon").height
width: UM.Theme.getSize("medium_button_icon").width
height: UM.Theme.getSize("medium_button_icon").height
color: UM.Theme.getColor("icon")
sourceSize: UM.Theme.getSize("button_icon")
sourceSize: UM.Theme.getSize("medium_button_icon")
}
}
}

46
resources/themes/cura-light/theme.json
View file

@ -129,24 +129,44 @@
"family": "Noto Sans"
},
"small": {
"size": 0.7,
"size": 0.9,
"weight": 40,
"family": "Noto Sans"
},
"small_ja_JP": {
"size": 0.7,
"size": 0.9,
"weight": 50,
"family": "Noto Sans"
},
"small_zh_CN": {
"size": 0.7,
"size": 0.9,
"weight": 50,
"family": "Noto Sans"
},
"small_zh_TW": {
"size": 0.7,
"size": 0.9,
"weight": 50,
"family": "Noto Sans"
},
"small_emphasis": {
"size": 0.9,
"weight": 100,
"family": "Noto Sans"
},
"small_emphasis_ja_JP": {
"size": 0.9,
"weight": 100,
"family": "Noto Sans"
},
"small_emphasis_zh_CN": {
"size": 0.9,
"weight": 100,
"family": "Noto Sans"
},
"small_emphasis_zh_TW": {
"size": 0.9,
"weight": 100,
"family": "Noto Sans"
}
},
@ -250,6 +270,7 @@
"button_tooltip_text": [192, 193, 194, 255],
"extruder_button_material_border": [255, 255, 255, 255],
"extruder_disabled": [255, 255, 255, 102],
"rating_star": [90, 90, 90, 255],
@ -329,7 +350,7 @@
"checkbox_hover": [255, 255, 255, 255],
"checkbox_border": [199, 199, 199, 255],
"checkbox_border_hover": [50, 130, 255, 255],
"checkbox_mark": [50, 130, 255, 255],
"checkbox_mark": [35, 35, 35, 255],
"checkbox_disabled": [223, 223, 223, 255],
"checkbox_text": [35, 35, 35, 255],
@ -416,7 +437,7 @@
"monitor_icon_accent": [255, 255, 255, 255],
"monitor_icon_disabled": [238, 238, 238, 255],
"monitor_secondary_button_hover": [228, 228, 228, 255],
"monitor_secondary_button_hover": [232, 242, 252, 255],
"monitor_secondary_button": [240, 240, 240, 255],
"monitor_secondary_button_text": [30, 102, 215, 255],
"monitor_secondary_button_shadow": [216, 216, 216, 255],
@ -482,9 +503,9 @@
"machine_selector_widget": [20.0, 4.0],
"machine_selector_widget_content": [25.0, 32.0],
"machine_selector_icon": [2.66, 2.66],
"machine_selector_icon": [2.5, 2.5],
"views_selector": [23.0, 4.0],
"views_selector": [16.0, 4.0],
"printer_type_label": [3.5, 1.5],
@ -503,12 +524,12 @@
"thin_margin": [0.71, 0.71],
"narrow_margin": [0.5, 0.5],
"extruder_icon": [2.33, 2.33],
"extruder_icon": [2.5, 2.5],
"section": [0.0, 2],
"section_control": [0, 1],
"section_icon": [1.6, 1.6],
"section_icon_column": [2.8, 0.0],
"section_icon": [2, 2],
"section_icon_column": [2.5, 2.5],
"rating_star": [1.0, 1.0],
"setting": [25.0, 1.8],
@ -537,6 +558,9 @@
"small_button": [2, 2],
"small_button_icon": [1.5, 1.5],
"medium_button": [2.5, 2.5],
"medium_button_icon": [2, 2],
"favorites_row": [2, 2],
"favorites_button": [2, 2],
"favorites_button_icon": [1.2, 1.2],