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

Remove all the entries in the theme that make reference to the sidebar,

Browse source 
because there is no sidebar anymore.

Several different margins and linings were created depending on the
side, not depending on where it belongs.

Contributes to CURA-5784.
This commit is contained in:
Diego Prado Gesto 2018-10-26 17:51:28 +02:00
parent c8bdf7321c
commit 90e8a05aab
25 changed files with 174 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/PostProcessingPlugin/PostProcessingPlugin.qml
View file

@ -260,7 +260,7 @@ UM.Dialog
Rectangle
{
color: UM.Theme.getColor("sidebar")
color: UM.Theme.getColor("main_background")
anchors.left: activeScripts.right
anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.right: parent.right

6
plugins/PrepareStage/PrepareMenu.qml
View file

@ -43,15 +43,15 @@ Item
Cura.MachineSelector
{
id: machineSelection
width: Math.round(0.8 * UM.Theme.getSize("sidebar").width) - configSelection.width
width: UM.Theme.getSize("machine_selector_widget").width - configSelection.width
height: prepareMenu.height
}
Cura.QuickConfigurationSelector
{
id: configSelection
width: visible ? Math.round(UM.Theme.getSize("sidebar").width * 0.15) : 0
panelWidth: Math.round(0.8 * UM.Theme.getSize("sidebar").width)
width: visible ? UM.Theme.getSize("machine_selector_widget").width * 0.2 : 0
panelWidth: UM.Theme.getSize("machine_selector_widget").width
height: prepareMenu.height
}

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

@ -20,7 +20,7 @@ Window
maximumWidth: minimumWidth
minimumHeight: height
maximumHeight: minimumHeight
color: UM.Theme.getColor("sidebar")
color: UM.Theme.getColor("main_background")
UM.I18nCatalog
{
id: catalog

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

@ -54,7 +54,7 @@ Item
model: packageData.supported_configs
headerDelegate: Rectangle
{
color: UM.Theme.getColor("sidebar")
color: UM.Theme.getColor("main_background")
height: UM.Theme.getSize("toolbox_chart_row").height
Label
{

4
plugins/Toolbox/resources/qml/ToolboxTabButton.qml
View file

@ -19,10 +19,10 @@ Button
Rectangle
{
visible: control.active
color: UM.Theme.getColor("sidebar_header_highlight_hover")
color: UM.Theme.getColor("toolbox_header_highlight_hover")
anchors.bottom: parent.bottom
width: parent.width
height: UM.Theme.getSize("sidebar_header_highlight").height
height: UM.Theme.getSize("toolbox_header_highlight").height
}
}
label: Label

14
resources/qml/ActionPanelWidget.qml
View file

@ -19,16 +19,16 @@ Rectangle
signal showTooltip(Item item, point location, string text)
signal hideTooltip()
color: UM.Theme.getColor("sidebar")
color: UM.Theme.getColor("main_background")
// Also add an extra margin, as we want some breathing room around the edges.
height: saveButton.height + UM.Theme.getSize("sidebar_margin").height
height: saveButton.height + UM.Theme.getSize("thick_margin").height
Label
{
id: timeDetails
anchors.left: parent.left
anchors.bottom: costSpec.top
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
anchors.leftMargin: UM.Theme.getSize("thick_margin").width
font: UM.Theme.getFont("large")
color: UM.Theme.getColor("text_subtext")
@ -62,7 +62,7 @@ Rectangle
}
}
tooltip_html += "</table>";
base.showTooltip(parent, Qt.point(-UM.Theme.getSize("sidebar_margin").width, 0), tooltip_html);
base.showTooltip(parent, Qt.point(-UM.Theme.getSize("thick_margin").width, 0), tooltip_html);
}
}
onExited:
@ -160,8 +160,8 @@ Rectangle
anchors.left: parent.left
anchors.bottom: parent.bottom
anchors.bottomMargin: UM.Theme.getSize("sidebar_margin").height
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
anchors.bottomMargin: UM.Theme.getSize("thick_margin").height
anchors.leftMargin: UM.Theme.getSize("thick_margin").width
font: UM.Theme.getFont("very_small")
renderType: Text.NativeRendering
@ -219,7 +219,7 @@ Rectangle
{
var show_data = costSpec.getSpecsData()
base.showTooltip(parent, Qt.point(-UM.Theme.getSize("sidebar_margin").width, 0), show_data);
base.showTooltip(parent, Qt.point(-UM.Theme.getSize("thick_margin").width, 0), show_data);
}
}
onExited:

7
resources/qml/Cura.qml
View file

@ -312,9 +312,9 @@ UM.MainWindow
{
anchors.right: parent.right
anchors.bottom: parent.bottom
width: UM.Theme.getSize("sidebar").width
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
anchors.bottomMargin: UM.Theme.getSize("sidebar_margin").height
width: UM.Theme.getSize("action_panel_widget").width
anchors.rightMargin: UM.Theme.getSize("thick_margin").width
anchors.bottomMargin: UM.Theme.getSize("thick_margin").height
onShowTooltip:
{
base.showTooltip(item, location, text)
@ -348,7 +348,6 @@ UM.MainWindow
anchors
{
horizontalCenter: parent.horizontalCenter
horizontalCenterOffset: -(Math.round(UM.Theme.getSize("sidebar").width / 2))
top: parent.verticalCenter
bottom: parent.bottom
bottomMargin: UM.Theme.getSize("default_margin").height

22
resources/qml/CustomConfigurationSelector.qml
View file

@ -14,7 +14,7 @@ Rectangle
implicitHeight: parent.height
id: base
color: UM.Theme.getColor("sidebar")
color: UM.Theme.getColor("main_background")
// Height has an extra 2x margin for the top & bottom margin.
height: childrenRect.height + 2 * UM.Theme.getSize("default_margin").width
@ -28,7 +28,7 @@ Rectangle
visible: extrudersModel.items.length > 1
property var index: 0
height: UM.Theme.getSize("sidebar_header_mode_tabs").height
height: UM.Theme.getSize("configuration_selector_mode_tabs").height
boundsBehavior: Flickable.StopAtBounds
anchors
@ -36,7 +36,7 @@ Rectangle
left: parent.left
right: parent.right
top: parent.top
margins: UM.Theme.getSize("sidebar_margin").width
margins: UM.Theme.getSize("thick_margin").width
}
ExclusiveGroup { id: extruderMenuGroup }
@ -209,7 +209,7 @@ Rectangle
Item
{
id: materialRow
height: UM.Theme.getSize("sidebar_setup").height
height: UM.Theme.getSize("print_setup_item").height
visible: Cura.MachineManager.hasMaterials
anchors
@ -217,7 +217,7 @@ Rectangle
left: parent.left
right: parent.right
top: extrudersList.bottom
margins: UM.Theme.getSize("sidebar_margin").width
margins: UM.Theme.getSize("thick_margin").width
}
Label
@ -246,7 +246,7 @@ Rectangle
enabled: !extrudersList.visible || Cura.ExtruderManager.activeExtruderIndex > -1
height: UM.Theme.getSize("setting_control").height
width: Math.round(parent.width * 0.7) + UM.Theme.getSize("sidebar_margin").width
width: Math.round(parent.width * 0.7) + UM.Theme.getSize("thick_margin").width
anchors.right: parent.right
style: UM.Theme.styles.sidebar_header_button
activeFocusOnPress: true;
@ -263,7 +263,7 @@ Rectangle
Item
{
id: variantRow
height: UM.Theme.getSize("sidebar_setup").height
height: UM.Theme.getSize("print_setup_item").height
visible: Cura.MachineManager.hasVariants
anchors
@ -271,7 +271,7 @@ Rectangle
left: parent.left
right: parent.right
top: materialRow.bottom
margins: UM.Theme.getSize("sidebar_margin").width
margins: UM.Theme.getSize("thick_margin").width
}
Label
@ -293,7 +293,7 @@ Rectangle
visible: Cura.MachineManager.hasVariants
height: UM.Theme.getSize("setting_control").height
width: Math.round(parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width)
width: Math.round(parent.width * 0.7 + UM.Theme.getSize("thick_margin").width)
anchors.right: parent.right
style: UM.Theme.styles.sidebar_header_button
activeFocusOnPress: true;
@ -305,11 +305,11 @@ Rectangle
Item
{
id: materialCompatibilityLink
height: UM.Theme.getSize("sidebar_setup").height
height: UM.Theme.getSize("print_setup_item").height
anchors.right: parent.right
anchors.top: variantRow.bottom
anchors.margins: UM.Theme.getSize("sidebar_margin").width
anchors.margins: UM.Theme.getSize("thick_margin").width
UM.RecolorImage
{
id: warningImage

12
resources/qml/MachineSelector.qml
View file

@ -27,13 +27,13 @@ ToolButton
color:
{
if (control.pressed) {
return UM.Theme.getColor("sidebar_header_active");
return UM.Theme.getColor("machine_selector_active");
}
else if (control.hovered) {
return UM.Theme.getColor("sidebar_header_hover");
return UM.Theme.getColor("machine_selector_hover");
}
else {
return UM.Theme.getColor("sidebar_header_bar");
return UM.Theme.getColor("machine_selector_bar");
}
}
Behavior on color { ColorAnimation { duration: 50; } }
@ -61,18 +61,18 @@ ToolButton
{
verticalCenter: parent.verticalCenter
left: parent.left
leftMargin: UM.Theme.getSize("sidebar_margin").width
leftMargin: UM.Theme.getSize("thick_margin").width
}
}
Label
{
id: sidebarComboBoxLabel
color: UM.Theme.getColor("sidebar_header_text_active")
color: UM.Theme.getColor("machine_selector_text_active")
text: control.text;
elide: Text.ElideRight;
anchors.left: printerStatusIcon.visible ? printerStatusIcon.right : parent.left;
anchors.leftMargin: printerStatusIcon.visible ? UM.Theme.getSize("sidebar_lining").width : UM.Theme.getSize("sidebar_margin").width
anchors.leftMargin: printerStatusIcon.visible ? UM.Theme.getSize("narrow_margin").width : UM.Theme.getSize("thick_margin").width
anchors.right: downArrow.left;
anchors.rightMargin: control.rightMargin;
anchors.verticalCenter: parent.verticalCenter;

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

@ -63,7 +63,7 @@ Rectangle
visible: buildplateInformation.visible
width: parent.width - 2 * parent.padding
height: visible ? Math.round(UM.Theme.getSize("sidebar_lining_thin").height / 2) : 0
height: visible ? Math.round(UM.Theme.getSize("thick_lining").height / 2) : 0
color: textColor
}
@ -110,7 +110,7 @@ Rectangle
parent.border.color = UM.Theme.getColor("configuration_item_border_hover")
if (configurationItem.selected == false)
{
configurationItem.color = UM.Theme.getColor("sidebar_lining")
configurationItem.color = UM.Theme.getColor("wide_lining")
}
}
onExited:

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

@ -42,15 +42,15 @@ Button
{
if(control.pressed)
{
return UM.Theme.getColor("sidebar_header_active");
return UM.Theme.getColor("machine_selector_active");
}
else if(control.hovered)
{
return UM.Theme.getColor("sidebar_header_hover");
return UM.Theme.getColor("machine_selector_hover");
}
else
{
return UM.Theme.getColor("sidebar_header_bar");
return UM.Theme.getColor("machine_selector_bar");
}
}
Behavior on color { ColorAnimation { duration: 50; } }

16
resources/qml/MonitorButton.qml
View file

@ -15,7 +15,7 @@ Item
id: base;
UM.I18nCatalog { id: catalog; name: "cura"}
height: childrenRect.height + UM.Theme.getSize("sidebar_margin").height
height: childrenRect.height + UM.Theme.getSize("thick_margin").height
property bool printerConnected: Cura.MachineManager.printerConnected
property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands
@ -162,10 +162,10 @@ Item
Label
{
id: statusLabel
width: parent.width - 2 * UM.Theme.getSize("sidebar_margin").width
width: parent.width - 2 * UM.Theme.getSize("thick_margin").width
anchors.top: parent.top
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
anchors.leftMargin: UM.Theme.getSize("thick_margin").width
color: base.statusColor
font: UM.Theme.getFont("large")
@ -224,12 +224,12 @@ Item
property string backgroundColor: UM.Theme.getColor("progressbar_background");
property string controlColor: base.statusColor;
width: parent.width - 2 * UM.Theme.getSize("sidebar_margin").width;
width: parent.width - 2 * UM.Theme.getSize("thick_margin").width;
height: UM.Theme.getSize("progressbar").height;
anchors.top: statusLabel.bottom;
anchors.topMargin: Math.round(UM.Theme.getSize("sidebar_margin").height / 4);
anchors.topMargin: Math.round(UM.Theme.getSize("thick_margin").height / 4);
anchors.left: parent.left;
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width;
anchors.leftMargin: UM.Theme.getSize("thick_margin").width;
}
Row
@ -237,9 +237,9 @@ Item
id: buttonsRow
height: abortButton.height
anchors.top: progressBar.bottom
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
anchors.topMargin: UM.Theme.getSize("thick_margin").height
anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
anchors.rightMargin: UM.Theme.getSize("thick_margin").width
spacing: UM.Theme.getSize("default_margin").width
Row

18
resources/qml/MonitorSidebar.qml
View file

@ -30,7 +30,7 @@ Rectangle
property variant printMaterialCosts: PrintInformation.materialCosts
property variant printMaterialNames: PrintInformation.materialNames
color: UM.Theme.getColor("sidebar")
color: UM.Theme.getColor("main_background")
UM.I18nCatalog { id: catalog; name: "cura"}
Timer {
@ -89,7 +89,7 @@ Rectangle
{
id: machineSelection
width: base.width - configSelection.width - separator.width
height: UM.Theme.getSize("sidebar_header").height
height: UM.Theme.getSize("stage_menu").height
anchors.top: base.top
anchors.left: parent.left
}
@ -98,9 +98,9 @@ Rectangle
{
id: separator
visible: configSelection.visible
width: visible ? Math.round(UM.Theme.getSize("sidebar_lining_thin").height / 2) : 0
height: UM.Theme.getSize("sidebar_header").height
color: UM.Theme.getColor("sidebar_lining_thin")
width: visible ? Math.round(UM.Theme.getSize("thick_lining").height / 2) : 0
height: UM.Theme.getSize("stage_menu").height
color: UM.Theme.getColor("thick_lining")
anchors.left: machineSelection.right
}
@ -109,7 +109,7 @@ Rectangle
id: configSelection
visible: isNetworkPrinter && printerConnected
width: visible ? Math.round(base.width * 0.15) : 0
height: UM.Theme.getSize("sidebar_header").height
height: UM.Theme.getSize("stage_menu").height
anchors.top: base.top
anchors.right: parent.right
panelWidth: base.width
@ -158,10 +158,10 @@ Rectangle
{
id: footerSeparator
width: parent.width
height: UM.Theme.getSize("sidebar_lining").height
color: UM.Theme.getColor("sidebar_lining")
height: UM.Theme.getSize("wide_lining").height
color: UM.Theme.getColor("wide_lining")
anchors.bottom: monitorButton.top
anchors.bottomMargin: UM.Theme.getSize("sidebar_margin").height
anchors.bottomMargin: UM.Theme.getSize("thick_margin").height
}
// MonitorButton is actually the bottom footer panel.

12
resources/qml/PrintMonitor.qml
View file

@ -31,14 +31,14 @@ Column
Rectangle
{
color: UM.Theme.getColor("sidebar_lining")
color: UM.Theme.getColor("wide_lining")
width: parent.width
height: childrenRect.height
Flow
{
id: extrudersGrid
spacing: UM.Theme.getSize("sidebar_lining_thin").width
spacing: UM.Theme.getSize("thick_lining").width
width: parent.width
Repeater
@ -48,8 +48,8 @@ Column
ExtruderBox
{
color: UM.Theme.getColor("sidebar")
width: index == machineExtruderCount.properties.value - 1 && index % 2 == 0 ? extrudersGrid.width : Math.round(extrudersGrid.width / 2 - UM.Theme.getSize("sidebar_lining_thin").width / 2)
color: UM.Theme.getColor("main_background")
width: index == machineExtruderCount.properties.value - 1 && index % 2 == 0 ? extrudersGrid.width : Math.round(extrudersGrid.width / 2 - UM.Theme.getSize("thick_lining").width / 2)
extruderModel: modelData
}
}
@ -58,9 +58,9 @@ Column
Rectangle
{
color: UM.Theme.getColor("sidebar_lining")
color: UM.Theme.getColor("wide_lining")
width: parent.width
height: UM.Theme.getSize("sidebar_lining_thin").width
height: UM.Theme.getSize("thick_lining").width
}
HeatedBedBox

10
resources/qml/PrintSetupSelector.qml
View file

@ -25,7 +25,7 @@ Rectangle
property variant printMaterialCosts: PrintInformation.materialCosts
property variant printMaterialNames: PrintInformation.materialNames
color: UM.Theme.getColor("sidebar")
color: UM.Theme.getColor("main_background")
UM.I18nCatalog { id: catalog; name: "cura"}
// This widget doesn't show tooltips by itself. Instead it emits signals so others can do something with it.
@ -89,7 +89,7 @@ Rectangle
{
left: parent.left
top: parent.top
margins: UM.Theme.getSize("sidebar_margin").width
margins: UM.Theme.getSize("thick_margin").width
}
width: Math.round(parent.width * 0.45)
@ -105,10 +105,10 @@ Rectangle
id: settingsModeSelection
model: modesListModel
width: Math.round(parent.width * 0.55)
height: UM.Theme.getSize("sidebar_header_mode_toggle").height
height: UM.Theme.getSize("print_setup_mode_toggle").height
anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
anchors.rightMargin: UM.Theme.getSize("thick_margin").width
anchors.top: settingsModeLabel.top
@ -186,7 +186,7 @@ Rectangle
{
id: sidebarContents
anchors.top: settingsModeSelection.bottom
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
anchors.topMargin: UM.Theme.getSize("thick_margin").height
anchors.left: parent.left
anchors.right: parent.right
height: UM.Theme.getSize("print_setup_widget").height

2
resources/qml/PrinterOutput/ExtruderBox.qml
View file

@ -13,7 +13,7 @@ Item
property var extruderModel
property var position: index
implicitWidth: parent.width
implicitHeight: UM.Theme.getSize("sidebar_extruder_box").height
implicitHeight: UM.Theme.getSize("print_setup_extruder_box").height
UM.SettingPropertyProvider
{

4
resources/qml/PrinterOutput/HeatedBedBox.qml
View file

@ -12,12 +12,12 @@ import Cura 1.0 as Cura
Item
{
implicitWidth: parent.width
height: visible ? UM.Theme.getSize("sidebar_extruder_box").height : 0
height: visible ? UM.Theme.getSize("print_setup_extruder_box").height : 0
property var printerModel
Rectangle
{
color: UM.Theme.getColor("sidebar")
color: UM.Theme.getColor("main_background")
anchors.fill: parent
Label //Build plate label.

24
resources/qml/SaveButton.qml
View file

@ -68,10 +68,10 @@ Item
Label
{
id: statusLabel
width: parent.width - 2 * UM.Theme.getSize("sidebar_margin").width
width: parent.width - 2 * UM.Theme.getSize("thick_margin").width
anchors.top: parent.top
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
anchors.leftMargin: UM.Theme.getSize("thick_margin").width
color: UM.Theme.getColor("text")
font: UM.Theme.getFont("default_bold")
@ -81,12 +81,12 @@ Item
Rectangle
{
id: progressBar
width: parent.width - 2 * UM.Theme.getSize("sidebar_margin").width
width: parent.width - 2 * UM.Theme.getSize("thick_margin").width
height: UM.Theme.getSize("progressbar").height
anchors.top: statusLabel.bottom
anchors.topMargin: Math.round(UM.Theme.getSize("sidebar_margin").height / 4)
anchors.topMargin: Math.round(UM.Theme.getSize("thick_margin").height / 4)
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
anchors.leftMargin: UM.Theme.getSize("thick_margin").width
radius: UM.Theme.getSize("progressbar_radius").width
color: UM.Theme.getColor("progressbar_background")
@ -133,11 +133,11 @@ Item
children_width += child.width + child.anchors.rightMargin;
}
}
return Math.min(children_width, base.width - UM.Theme.getSize("sidebar_margin").width);
return Math.min(children_width, base.width - UM.Theme.getSize("thick_margin").width);
}
height: saveToButton.height
anchors.bottom: parent.bottom
anchors.bottomMargin: UM.Theme.getSize("sidebar_margin").height
anchors.bottomMargin: UM.Theme.getSize("thick_margin").height
anchors.right: parent.right
clip: true
@ -198,7 +198,7 @@ Item
anchors.top: parent.top
anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
anchors.rightMargin: UM.Theme.getSize("thick_margin").width
// 1 = not started, 4 = error, 5 = disabled
text: [1, 4, 5].indexOf(base.backendState) != -1 ? catalog.i18nc("@label:Printjob", "Prepare") : catalog.i18nc("@label:Printjob", "Cancel")
@ -253,7 +253,7 @@ Item
Behavior on color { ColorAnimation { duration: 50; } }
implicitWidth: actualLabel.contentWidth + (UM.Theme.getSize("sidebar_margin").width * 2)
implicitWidth: actualLabel.contentWidth + (UM.Theme.getSize("thick_margin").width * 2)
Label
{
@ -299,7 +299,7 @@ Item
anchors.top: parent.top
anchors.right: deviceSelectionMenu.visible ? deviceSelectionMenu.left : parent.right
anchors.rightMargin: deviceSelectionMenu.visible ? -3 * UM.Theme.getSize("default_lining").width : UM.Theme.getSize("sidebar_margin").width
anchors.rightMargin: deviceSelectionMenu.visible ? -3 * UM.Theme.getSize("default_lining").width : UM.Theme.getSize("thick_margin").width
text: UM.OutputDeviceManager.activeDeviceShortDescription
onClicked:
@ -355,7 +355,7 @@ Item
Behavior on color { ColorAnimation { duration: 50; } }
implicitWidth: actualLabel.contentWidth + (UM.Theme.getSize("sidebar_margin").width * 2)
implicitWidth: actualLabel.contentWidth + (UM.Theme.getSize("thick_margin").width * 2)
Label
{
@ -377,7 +377,7 @@ Item
anchors.top: parent.top
anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
anchors.rightMargin: UM.Theme.getSize("thick_margin").width
width: UM.Theme.getSize("save_button_save_to_button").height
height: UM.Theme.getSize("save_button_save_to_button").height

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

@ -12,8 +12,8 @@ Button
id: base
anchors.left: parent.left
anchors.right: parent.right
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
anchors.leftMargin: UM.Theme.getSize("thick_margin").width
anchors.rightMargin: UM.Theme.getSize("thick_margin").width
background: Rectangle
{
id: backgroundRectangle

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

@ -128,11 +128,11 @@ Item {
id: settingControls
height: Math.round(parent.height / 2)
spacing: Math.round(UM.Theme.getSize("sidebar_margin").height / 2)
spacing: Math.round(UM.Theme.getSize("thick_margin").height / 2)
anchors {
right: controlContainer.left
rightMargin: Math.round(UM.Theme.getSize("sidebar_margin").width / 2)
rightMargin: Math.round(UM.Theme.getSize("thick_margin").width / 2)
verticalCenter: parent.verticalCenter
}
@ -290,7 +290,7 @@ Item {
enabled: propertyProvider.isValueUsed
anchors.right: parent.right;
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
anchors.rightMargin: UM.Theme.getSize("thick_margin").width
anchors.verticalCenter: parent.verticalCenter;
width: UM.Theme.getSize("setting_control").width;
height: UM.Theme.getSize("setting_control").height

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

@ -24,15 +24,15 @@ Item
Item
{
id: globalProfileRow
height: UM.Theme.getSize("sidebar_setup").height
height: UM.Theme.getSize("print_setup_item").height
anchors
{
top: parent.top
left: parent.left
leftMargin: Math.round(UM.Theme.getSize("sidebar_margin").width)
leftMargin: Math.round(UM.Theme.getSize("thick_margin").width)
right: parent.right
rightMargin: Math.round(UM.Theme.getSize("sidebar_margin").width)
rightMargin: Math.round(UM.Theme.getSize("thick_margin").width)
}
Label
@ -40,7 +40,7 @@ Item
id: globalProfileLabel
text: catalog.i18nc("@label","Profile:")
textFormat: Text.PlainText
width: Math.round(parent.width * 0.45 - UM.Theme.getSize("sidebar_margin").width - 2)
width: Math.round(parent.width * 0.45 - UM.Theme.getSize("thick_margin").width - 2)
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
verticalAlignment: Text.AlignVCenter
@ -87,7 +87,7 @@ Item
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right
anchors.rightMargin: Math.round(UM.Theme.getSize("setting_preferences_button_margin").width - UM.Theme.getSize("sidebar_margin").width)
anchors.rightMargin: Math.round(UM.Theme.getSize("setting_preferences_button_margin").width - UM.Theme.getSize("thick_margin").width)
color: hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button");
iconSource: UM.Theme.getIcon("star");
@ -100,7 +100,7 @@ Item
onEntered:
{
var content = catalog.i18nc("@tooltip","Some setting/override values are different from the values stored in the profile.\n\nClick to open the profile manager.")
base.showTooltip(globalProfileRow, Qt.point(-UM.Theme.getSize("sidebar_margin").width, 0), content)
base.showTooltip(globalProfileRow, Qt.point(-UM.Theme.getSize("thick_margin").width, 0), content)
}
onExited: base.hideTooltip()
}
@ -116,9 +116,9 @@ Item
anchors
{
top: globalProfileRow.bottom
topMargin: UM.Theme.getSize("sidebar_margin").height
topMargin: UM.Theme.getSize("thick_margin").height
right: parent.right
rightMargin: UM.Theme.getSize("sidebar_margin").width
rightMargin: UM.Theme.getSize("thick_margin").width
}
style: ButtonStyle
{
@ -169,9 +169,9 @@ Item
anchors
{
top: globalProfileRow.bottom
topMargin: UM.Theme.getSize("sidebar_margin").height
topMargin: UM.Theme.getSize("thick_margin").height
left: parent.left
leftMargin: UM.Theme.getSize("sidebar_margin").width
leftMargin: UM.Theme.getSize("thick_margin").width
right: settingVisibilityMenu.left
rightMargin: Math.floor(UM.Theme.getSize("default_margin").width / 2)
}
@ -191,7 +191,7 @@ Item
height: parent.height
anchors.left: parent.left
anchors.right: clearFilterButton.left
anchors.rightMargin: Math.round(UM.Theme.getSize("sidebar_margin").width)
anchors.rightMargin: Math.round(UM.Theme.getSize("thick_margin").width)
placeholderText: catalog.i18nc("@label:textbox", "Search...")
@ -288,7 +288,7 @@ Item
anchors.bottom: parent.bottom;
anchors.right: parent.right;
anchors.left: parent.left;
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
anchors.topMargin: UM.Theme.getSize("thick_margin").height
style: UM.Theme.styles.scrollview;
flickableItem.flickableDirection: Flickable.VerticalFlick;
@ -325,7 +325,7 @@ Item
{
id: delegate
width: Math.round(UM.Theme.getSize("sidebar").width);
width: Math.round(UM.Theme.getSize("print_setup_widget").width);
height: provider.properties.enabled == "True" ? UM.Theme.getSize("section").height : - contents.spacing
Behavior on height { NumberAnimation { duration: 100 } }
opacity: provider.properties.enabled == "True" ? 1 : 0

78
resources/qml/SidebarSimple.qml
View file

@ -35,7 +35,7 @@ Item
{
width: childrenRect.width
height: childrenRect.height
color: UM.Theme.getColor("sidebar")
color: UM.Theme.getColor("main_background")
//
// Quality profile
@ -44,10 +44,10 @@ Item
{
id: qualityRow
height: UM.Theme.getSize("sidebar_margin").height
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
height: UM.Theme.getSize("thick_margin").height
anchors.topMargin: UM.Theme.getSize("thick_margin").height
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
anchors.leftMargin: UM.Theme.getSize("thick_margin").width
anchors.right: parent.right
Timer
@ -207,7 +207,7 @@ Item
{
anchors.verticalCenter: parent.verticalCenter
anchors.top: parent.top
anchors.topMargin: Math.round(UM.Theme.getSize("sidebar_margin").height / 2)
anchors.topMargin: Math.round(UM.Theme.getSize("thick_margin").height / 2)
color: (Cura.MachineManager.activeMachine != null && Cura.QualityProfilesDropDownMenuModel.getItem(index).available) ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable")
text:
{
@ -262,10 +262,10 @@ Item
{
id: speedSlider
width: Math.round(base.width * 0.55)
height: UM.Theme.getSize("sidebar_margin").height
height: UM.Theme.getSize("thick_margin").height
anchors.right: parent.right
anchors.top: parent.top
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
anchors.topMargin: UM.Theme.getSize("thick_margin").height
// This Item is used only for tooltip, for slider area which is unavailable
Item
@ -275,7 +275,7 @@ Item
if (showTooltip)
{
var content = catalog.i18nc("@tooltip", "This quality profile is not available for you current material and nozzle configuration. Please change these to enable this quality profile")
base.showTooltip(qualityRow, Qt.point(-UM.Theme.getSize("sidebar_margin").width, customisedSettings.height), content)
base.showTooltip(qualityRow, Qt.point(-UM.Theme.getSize("thick_margin").width, customisedSettings.height), content)
}
else
{
@ -380,7 +380,7 @@ Item
Slider
{
id: qualitySlider
height: UM.Theme.getSize("sidebar_margin").height
height: UM.Theme.getSize("thick_margin").height
anchors.bottom: speedSlider.bottom
enabled: qualityModel.totalTicks > 0 && !Cura.SimpleModeSettingsManager.isProfileCustomized
visible: qualityModel.availableTotalTicks > 0
@ -448,7 +448,7 @@ Item
onEntered:
{
var content = catalog.i18nc("@tooltip","A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab")
base.showTooltip(qualityRow, Qt.point(-UM.Theme.getSize("sidebar_margin").width, customisedSettings.height), content)
base.showTooltip(qualityRow, Qt.point(-UM.Theme.getSize("thick_margin").width, customisedSettings.height), content)
}
onExited:
{
@ -467,7 +467,7 @@ Item
text: catalog.i18nc("@label", "Print Speed")
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
width: Math.round(UM.Theme.getSize("sidebar").width * 0.35)
width: Math.round(UM.Theme.getSize("print_setup_widget").width * 0.35)
elide: Text.ElideRight
}
@ -503,7 +503,7 @@ Item
anchors.verticalCenter: speedSlider.verticalCenter
anchors.right: speedSlider.left
anchors.rightMargin: Math.round(UM.Theme.getSize("sidebar_margin").width / 2)
anchors.rightMargin: Math.round(UM.Theme.getSize("thick_margin").width / 2)
color: hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button");
iconSource: UM.Theme.getIcon("reset");
@ -516,7 +516,7 @@ Item
onEntered:
{
var content = catalog.i18nc("@tooltip","You have modified some profile settings. If you want to change these go to custom mode.")
base.showTooltip(qualityRow, Qt.point(-UM.Theme.getSize("sidebar_margin").width, customisedSettings.height), content)
base.showTooltip(qualityRow, Qt.point(-UM.Theme.getSize("thick_margin").width, customisedSettings.height), content)
}
onExited: base.hideTooltip()
}
@ -530,10 +530,10 @@ Item
id: infillCellLeft
anchors.top: qualityRow.bottom
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height * 2
anchors.topMargin: UM.Theme.getSize("thick_margin").height * 2
anchors.left: parent.left
width: Math.round(UM.Theme.getSize("sidebar").width * .45) - UM.Theme.getSize("sidebar_margin").width
width: Math.round(UM.Theme.getSize("print_setup_widget").width * .45) - UM.Theme.getSize("thick_margin").width
Label
{
@ -543,9 +543,9 @@ Item
color: UM.Theme.getColor("text")
anchors.top: parent.top
anchors.topMargin: Math.round(UM.Theme.getSize("sidebar_margin").height * 1.7)
anchors.topMargin: Math.round(UM.Theme.getSize("thick_margin").height * 1.7)
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
anchors.leftMargin: UM.Theme.getSize("thick_margin").width
}
}
@ -553,12 +553,12 @@ Item
{
id: infillCellRight
height: infillSlider.height + UM.Theme.getSize("sidebar_margin").height + enableGradualInfillCheckBox.visible * (enableGradualInfillCheckBox.height + UM.Theme.getSize("sidebar_margin").height)
width: Math.round(UM.Theme.getSize("sidebar").width * .55)
height: infillSlider.height + UM.Theme.getSize("thick_margin").height + enableGradualInfillCheckBox.visible * (enableGradualInfillCheckBox.height + UM.Theme.getSize("thick_margin").height)
width: Math.round(UM.Theme.getSize("print_setup_widget").width * .55)
anchors.left: infillCellLeft.right
anchors.top: infillCellLeft.top
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
anchors.topMargin: UM.Theme.getSize("thick_margin").height
Label {
id: selectedInfillRateText
@ -588,10 +588,10 @@ Item
anchors.top: selectedInfillRateText.bottom
anchors.left: parent.left
anchors.right: infillIcon.left
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
anchors.rightMargin: UM.Theme.getSize("thick_margin").width
height: UM.Theme.getSize("sidebar_margin").height
width: parseInt(infillCellRight.width - UM.Theme.getSize("sidebar_margin").width - style.handleWidth)
height: UM.Theme.getSize("thick_margin").height
width: parseInt(infillCellRight.width - UM.Theme.getSize("thick_margin").width - style.handleWidth)
minimumValue: 0
maximumValue: 100
@ -679,12 +679,12 @@ Item
{
id: infillIcon
width: Math.round((parent.width / 5) - (UM.Theme.getSize("sidebar_margin").width))
width: Math.round((parent.width / 5) - (UM.Theme.getSize("thick_margin").width))
height: width
anchors.right: parent.right
anchors.top: parent.top
anchors.topMargin: Math.round(UM.Theme.getSize("sidebar_margin").height / 2)
anchors.topMargin: Math.round(UM.Theme.getSize("thick_margin").height / 2)
// we loop over all density icons and only show the one that has the current density and steps
Repeater
@ -737,7 +737,7 @@ Item
property alias _hovered: enableGradualInfillMouseArea.containsMouse
anchors.top: infillSlider.bottom
anchors.topMargin: Math.round(UM.Theme.getSize("sidebar_margin").height / 2) // closer to slider since it belongs to the same category
anchors.topMargin: Math.round(UM.Theme.getSize("thick_margin").height / 2) // closer to slider since it belongs to the same category
anchors.left: infillCellRight.left
style: UM.Theme.styles.checkbox
@ -786,7 +786,7 @@ Item
id: gradualInfillLabel
height: parent.height
anchors.left: enableGradualInfillCheckBox.right
anchors.leftMargin: Math.round(UM.Theme.getSize("sidebar_margin").width / 2)
anchors.leftMargin: Math.round(UM.Theme.getSize("thick_margin").width / 2)
verticalAlignment: Text.AlignVCenter;
text: catalog.i18nc("@label", "Enable gradual")
font: UM.Theme.getFont("default")
@ -848,11 +848,11 @@ Item
visible: enableSupportCheckBox.visible
anchors.top: infillCellRight.bottom
anchors.topMargin: Math.round(UM.Theme.getSize("sidebar_margin").height * 1.5)
anchors.topMargin: Math.round(UM.Theme.getSize("thick_margin").height * 1.5)
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
anchors.leftMargin: UM.Theme.getSize("thick_margin").width
anchors.right: infillCellLeft.right
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
anchors.rightMargin: UM.Theme.getSize("thick_margin").width
anchors.verticalCenter: enableSupportCheckBox.verticalCenter
text: catalog.i18nc("@label", "Generate Support");
@ -916,11 +916,11 @@ Item
textRole: "text" // this solves that the combobox isn't populated in the first time Cura is started
anchors.top: enableSupportCheckBox.top
//anchors.topMargin: ((supportEnabled.properties.value === "True") && (machineExtruderCount.properties.value > 1)) ? UM.Theme.getSize("sidebar_margin").height : 0
//anchors.topMargin: ((supportEnabled.properties.value === "True") && (machineExtruderCount.properties.value > 1)) ? UM.Theme.getSize("thick_margin").height : 0
anchors.left: enableSupportCheckBox.right
anchors.leftMargin: Math.round(UM.Theme.getSize("sidebar_margin").width / 2)
anchors.leftMargin: Math.round(UM.Theme.getSize("thick_margin").width / 2)
width: Math.round(UM.Theme.getSize("sidebar").width * .55) - Math.round(UM.Theme.getSize("sidebar_margin").width / 2) - enableSupportCheckBox.width
width: Math.round(UM.Theme.getSize("print_setup_widget").width * .55) - Math.round(UM.Theme.getSize("thick_margin").width / 2) - enableSupportCheckBox.width
height: ((supportEnabled.properties.value == "True") && (machineExtruderCount.properties.value > 1)) ? UM.Theme.getSize("setting_control").height : 0
Behavior on height { NumberAnimation { duration: 100 } }
@ -991,9 +991,9 @@ Item
anchors {
left: parent.left
leftMargin: UM.Theme.getSize("sidebar_margin").width
leftMargin: UM.Theme.getSize("thick_margin").width
right: infillCellLeft.right
rightMargin: UM.Theme.getSize("sidebar_margin").width
rightMargin: UM.Theme.getSize("thick_margin").width
verticalCenter: adhesionCheckBox.verticalCenter
}
}
@ -1004,7 +1004,7 @@ Item
property alias _hovered: adhesionMouseArea.containsMouse
anchors.top: enableSupportCheckBox.bottom
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
anchors.topMargin: UM.Theme.getSize("thick_margin").height
anchors.left: infillCellRight.left
//: Setting enable printing build-plate adhesion helper checkbox
@ -1065,7 +1065,7 @@ Item
{
id: tipsCell
anchors.top: adhesionCheckBox.visible ? adhesionCheckBox.bottom : (enableSupportCheckBox.visible ? supportExtruderCombobox.bottom : infillCellRight.bottom)
anchors.topMargin: Math.round(UM.Theme.getSize("sidebar_margin").height * 2)
anchors.topMargin: Math.round(UM.Theme.getSize("thick_margin").height * 2)
anchors.left: parent.left
width: parent.width
height: tipsText.contentHeight * tipsText.lineCount
@ -1074,9 +1074,9 @@ Item
{
id: tipsText
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
anchors.leftMargin: UM.Theme.getSize("thick_margin").width
anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
anchors.rightMargin: UM.Theme.getSize("thick_margin").width
anchors.top: parent.top
wrapMode: Text.WordWrap
text: catalog.i18nc("@label", "Need help improving your prints?<br>Read the <a href='%1'>Ultimaker Troubleshooting Guides</a>").arg("https://ultimaker.com/en/troubleshooting")

17
resources/themes/cura-dark/theme.json
View file

@ -5,7 +5,9 @@
},
"colors": {
"sidebar": [39, 44, 48, 255],
"main_background": [39, 44, 48, 255],
"wide_lining": [31, 36, 39, 255],
"thick_lining": [255, 255, 255, 30],
"lining": [64, 69, 72, 255],
"viewport_overlay": [0, 6, 9, 222],
@ -18,6 +20,9 @@
"main_window_header_button_text_inactive": [128, 128, 128, 255],
"main_window_header_button_text_hovered": [255, 255, 255, 255],
"machine_selector_bar": [39, 44, 48, 255],
"machine_selector_active": [39, 44, 48, 255],
"text": [255, 255, 255, 204],
"text_detail": [255, 255, 255, 172],
"text_link": [255, 255, 255, 127],
@ -30,16 +35,6 @@
"text_scene_hover": [255, 255, 255, 204],
"error": [212, 31, 53, 255],
"sidebar_header_bar": [39, 44, 48, 255],
"sidebar_header_active": [39, 44, 48, 255],
"sidebar_header_hover": [68, 72, 75, 255],
"sidebar_header_highlight": [68, 192, 255, 255],
"sidebar_header_highlight_hover": [68, 192, 255, 255],
"sidebar_header_text_active": [255, 255, 255, 255],
"sidebar_header_text_hover": [255, 255, 255, 255],
"sidebar_header_text_inactive": [255, 255, 255, 127],
"sidebar_lining": [31, 36, 39, 255],
"sidebar_lining_thin": [255, 255, 255, 30],
"button": [39, 44, 48, 255],
"button_hover": [39, 44, 48, 255],

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

@ -491,9 +491,9 @@ QtObject
{
anchors.fill: parent
anchors.left: parent.left
anchors.leftMargin: Theme.getSize("sidebar_margin").width
anchors.leftMargin: Theme.getSize("thick_margin").width
anchors.right: parent.right
anchors.rightMargin: Theme.getSize("sidebar_margin").width
anchors.rightMargin: Theme.getSize("thick_margin").width
implicitHeight: Theme.getSize("section").height
color:
{
@ -567,7 +567,7 @@ QtObject
{
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.leftMargin: Theme.getSize("sidebar_margin").width
anchors.leftMargin: Theme.getSize("thick_margin").width
color:
{
if(!control.enabled)
@ -1037,7 +1037,7 @@ QtObject
}
Behavior on color { ColorAnimation { duration: 50 } }
implicitWidth: actualLabel.contentWidth + (UM.Theme.getSize("sidebar_margin").width * 2)
implicitWidth: actualLabel.contentWidth + (UM.Theme.getSize("thick_margin").width * 2)
Label
{

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

@ -69,7 +69,9 @@
"colors": {
"sidebar": [255, 255, 255, 255],
"main_background": [255, 255, 255, 255],
"wide_lining": [245, 245, 245, 255],
"thick_lining": [127, 127, 127, 255],
"lining": [192, 193, 194, 255],
"viewport_overlay": [0, 0, 0, 192],
@ -97,6 +99,11 @@
"account_widget_outline_active": [70, 66, 126, 255],
"account_widget_outline_inactive": [229, 229, 229, 255],
"machine_selector_bar": [31, 36, 39, 255],
"machine_selector_active": [68, 72, 75, 255],
"machine_selector_hover": [68, 72, 75, 255],
"machine_selector_text_active": [255, 255, 255, 255],
"text": [0, 0, 0, 255],
"text_detail": [174, 174, 174, 128],
"text_link": [12, 169, 227, 255],
@ -110,16 +117,6 @@
"text_scene_hover": [70, 84, 113, 255],
"error": [255, 140, 0, 255],
"sidebar_header_bar": [31, 36, 39, 255],
"sidebar_header_active": [68, 72, 75, 255],
"sidebar_header_hover": [68, 72, 75, 255],
"sidebar_header_highlight": [68, 192, 255, 255],
"sidebar_header_highlight_hover": [68, 192, 255, 255],
"sidebar_header_text_inactive": [255, 255, 255, 255],
"sidebar_header_text_active": [255, 255, 255, 255],
"sidebar_header_text_hover": [255, 255, 255, 255],
"sidebar_lining": [245, 245, 245, 255],
"sidebar_lining_thin": [127, 127, 127, 255],
"button": [31, 36, 39, 255],
"button_hover": [68, 72, 75, 255],
@ -356,35 +353,34 @@
"account_button": [12, 3],
"print_setup_widget": [35.0, 42.0],
"configuration_selector_widget": [35.0, 0.0],
"print_setup_mode_toggle": [0.0, 2.0],
"print_setup_item": [0.0, 2.0],
"print_setup_extruder_box": [0.0, 6.0],
"configuration_selector_widget": [35.0, 4.5],
"configuration_selector_mode_tabs": [0.0, 3.0],
"action_panel_widget": [35.0, 0.0],
"machine_selector_widget": [28.0, 4.5],
"views_selector": [0.0, 4.0],
"wide_lining": [0.5, 0.5],
"thick_lining": [0.2, 0.2],
"default_lining": [0.08, 0.08],
"default_arrow": [0.8, 0.8],
"logo": [8, 2.4],
"default_margin": [1.0, 1.0],
"wide_margin": [2.0, 2.0],
"thick_margin": [1.71, 1.43],
"default_margin": [1.0, 1.0],
"thin_margin": [0.71, 0.71],
"narrow_margin": [0.5, 0.5],
"window_margin": [1.0, 1.0],
"extruder_button_material_margin": [0.70, 0.9],
"extruder_button_material": [0.75, 0.75],
"sidebar": [35.0, 10.0],
"sidebar_margin": [1.71, 1.43],
"sidebar_margin_thin": [0.71, 0.71],
"sidebar_header": [0.0, 4.0],
"sidebar_header_highlight": [0.25, 0.25],
"sidebar_header_mode_toggle": [0.0, 2.0],
"sidebar_header_mode_tabs": [0.0, 3.0],
"sidebar_lining": [0.5, 0.5],
"sidebar_lining_thin": [0.2, 0.2],
"sidebar_setup": [0.0, 2.0],
"sidebar_tabs": [0.0, 3.5],
"sidebar_inputfields": [0.0, 2.0],
"sidebar_extruder_box": [0.0, 6.0],
"simple_mode_infill_caption": [0.0, 5.0],
"simple_mode_infill_height": [0.0, 8.0],
@ -495,6 +491,7 @@
"toolbox_property_label": [1.0, 2.0],
"toolbox_heading_label": [1.0, 4.0],
"toolbox_header": [1.0, 4.0],
"toolbox_header_highlight": [0.25, 0.25],
"toolbox_progress_bar": [8.0, 0.5],
"toolbox_chart_row": [1.0, 2.0],
"toolbox_action_button": [8.0, 2.5],