diff --git a/.gitignore b/.gitignore
index 9c9d57f175..03ae94a87f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ resources/i18n/en_7S
resources/i18n/x-test
resources/firmware
resources/materials
+CuraEngine.exe
LC_MESSAGES
.cache
*.qmlc
diff --git a/plugins/LayerView/LayerView.qml b/plugins/LayerView/LayerView.qml
index 8927d59017..26087b8b65 100755
--- a/plugins/LayerView/LayerView.qml
+++ b/plugins/LayerView/LayerView.qml
@@ -519,8 +519,8 @@ Item
anchors.horizontalCenter: parent.horizontalCenter
radius: parent.handleRadius
color: parent.lowerHandleColor
- border.width: UM.Theme.getSize("default_lining").width
- border.color: UM.Theme.getColor("slider_handle_border")
+// border.width: UM.Theme.getSize("default_lining").width
+// border.color: UM.Theme.getColor("slider_handle_border")
visible: slider.layersVisible
diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml
index 4c6172c558..ccaff1cd9a 100755
--- a/resources/qml/Sidebar.qml
+++ b/resources/qml/Sidebar.qml
@@ -125,7 +125,6 @@ Rectangle
font: UM.Theme.getFont("large")
color: UM.Theme.getColor("text")
visible: !monitoringPrint
- elide: Text.ElideRight
}
Rectangle {
@@ -135,7 +134,17 @@ Rectangle
height: UM.Theme.getSize("sidebar_header_mode_toggle").height
anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
- anchors.top: headerSeparator.bottom
+ anchors.top:
+ {
+ if (settingsModeLabel.contentWidth >= parent.width - width - UM.Theme.getSize("sidebar_margin").width)
+ {
+ return settingsModeLabel.bottom;
+ }
+ else
+ {
+ return headerSeparator.bottom;
+ }
+ }
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
visible: !monitoringPrint && !hideSettings
Component{
diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml
index cd93a7c546..276eacef29 100644
--- a/resources/qml/SidebarSimple.qml
+++ b/resources/qml/SidebarSimple.qml
@@ -35,6 +35,7 @@ Item
{
width: childrenRect.width
height: childrenRect.height
+ color: UM.Theme.getColor("sidebar")
//
// Quality profile
@@ -854,7 +855,7 @@ Item
anchors.top: parent.top
wrapMode: Text.WordWrap
//: Tips label
- text: catalog.i18nc("@label", "Need help improving your prints?
Read the Ultimaker Troubleshooting Guides").arg("https://ultimaker.com/en/troubleshooting") + "
".arg(UM.Theme.getIcon("play"))
+ text: catalog.i18nc("@label", "Need help improving your prints?
Read the Ultimaker Troubleshooting Guides").arg("https://ultimaker.com/en/troubleshooting")
font: UM.Theme.getFont("default");
color: UM.Theme.getColor("text");
linkColor: UM.Theme.getColor("text_link")
diff --git a/resources/themes/cura-dark/images/logo.svg b/resources/themes/cura-dark/images/logo.svg
new file mode 100644
index 0000000000..236b413b66
--- /dev/null
+++ b/resources/themes/cura-dark/images/logo.svg
@@ -0,0 +1,72 @@
+
+
diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json
index dbe19bd298..586db9761f 100644
--- a/resources/themes/cura-dark/theme.json
+++ b/resources/themes/cura-dark/theme.json
@@ -121,14 +121,13 @@
"progressbar_background": [255, 255, 255, 48],
"progressbar_control": [255, 255, 255, 197],
- "slider_groove": [39, 44, 48, 75],
- "slider_groove_border": [39, 44, 48, 0],
- "slider_groove_fill": [39, 44, 48, 182],
+ "slider_groove": [245, 245, 245, 255],
+ "slider_groove_border": [127, 127, 127, 255],
+ "slider_groove_fill": [127, 127, 127, 255],
"slider_handle": [255, 255, 255, 255],
+ "slider_handle_hover": [77, 182, 226, 255],
"slider_handle_border": [39, 44, 48, 255],
- "slider_handle_hover": [255, 255, 255, 255],
- "slider_handle_hover_border": [39, 44, 48, 255],
- "slider_text_background": [39, 44, 48, 255],
+ "slider_text_background": [255, 255, 255, 255],
"checkbox": [43, 48, 52, 255],
"checkbox_hover": [43, 48, 52, 255],
@@ -140,18 +139,6 @@
"tooltip": [39, 44, 48, 255],
"tooltip_text": [255, 255, 255, 204],
- "message_background": [255, 255, 255, 200],
- "message_text": [0, 0, 0, 255],
- "message_border": [191, 191, 191, 200],
- "message_button": [255, 255, 255, 255],
- "message_button_hover": [12, 169, 227, 255],
- "message_button_active": [32, 166, 219, 255],
- "message_button_text": [24, 41, 77, 255],
- "message_button_text_hover": [255, 255, 255, 255],
- "message_button_text_active": [255, 255, 255, 255],
- "message_progressbar_background": [255, 255, 255, 255],
- "message_progressbar_control": [12, 169, 227, 255],
-
"tool_panel_background": [39, 44, 48, 255],
"status_offline": [0, 0, 0, 255],
@@ -198,6 +185,13 @@
"layerview_support_infill": [0, 255, 255, 255],
"layerview_move_combing": [0, 0, 255, 255],
"layerview_move_retraction": [128, 128, 255, 255],
- "layerview_support_interface": [64, 192, 255, 255]
+ "layerview_support_interface": [64, 192, 255, 255],
+
+ "material_compatibility_warning": [255, 255, 255, 255],
+
+ "topbar_button_text_inactive": [255, 255, 255, 255],
+ "topbar_button_text_active": [255, 255, 255, 255],
+ "topbar_button_text_hovered": [255, 255, 255, 255],
+ "topbar_background_color_monitoring": [39, 44, 48, 255]
}
}