diff --git a/icons/application.svg b/icons/application.svg
new file mode 100644
index 0000000000..1dc777aa10
--- /dev/null
+++ b/icons/application.svg
@@ -0,0 +1,3377 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/icons/category_adhesion.svg b/icons/category_adhesion.svg
new file mode 100644
index 0000000000..e2636d51ad
--- /dev/null
+++ b/icons/category_adhesion.svg
@@ -0,0 +1,3384 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/icons/category_cool.svg b/icons/category_cool.svg
new file mode 100644
index 0000000000..a07dc8f95c
--- /dev/null
+++ b/icons/category_cool.svg
@@ -0,0 +1,3398 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/icons/category_fixes.svg b/icons/category_fixes.svg
new file mode 100644
index 0000000000..da83097fe6
--- /dev/null
+++ b/icons/category_fixes.svg
@@ -0,0 +1,3377 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/icons/category_infill.svg b/icons/category_infill.svg
new file mode 100644
index 0000000000..24c94dbc2e
--- /dev/null
+++ b/icons/category_infill.svg
@@ -0,0 +1,3386 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/icons/category_material.svg b/icons/category_material.svg
new file mode 100644
index 0000000000..db19effd51
--- /dev/null
+++ b/icons/category_material.svg
@@ -0,0 +1,3396 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/icons/category_quality.svg b/icons/category_quality.svg
new file mode 100644
index 0000000000..bb0731b72e
--- /dev/null
+++ b/icons/category_quality.svg
@@ -0,0 +1,3378 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/icons/category_speed.svg b/icons/category_speed.svg
new file mode 100644
index 0000000000..bae62fa841
--- /dev/null
+++ b/icons/category_speed.svg
@@ -0,0 +1,3405 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/icons/category_support.svg b/icons/category_support.svg
new file mode 100644
index 0000000000..877dff48cb
--- /dev/null
+++ b/icons/category_support.svg
@@ -0,0 +1,3382 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/icons/down_arrow.svg b/icons/down_arrow.svg
new file mode 100644
index 0000000000..b9b38a3d4b
--- /dev/null
+++ b/icons/down_arrow.svg
@@ -0,0 +1,67 @@
+
+
+
+
diff --git a/icons/mirror.svg b/icons/mirror.svg
new file mode 100644
index 0000000000..27b317a250
--- /dev/null
+++ b/icons/mirror.svg
@@ -0,0 +1,3376 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/icons/open.svg b/icons/open.svg
new file mode 100644
index 0000000000..32d52e48d4
--- /dev/null
+++ b/icons/open.svg
@@ -0,0 +1,3378 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/icons/plugin.svg b/icons/plugin.svg
new file mode 100644
index 0000000000..5019f2b62a
--- /dev/null
+++ b/icons/plugin.svg
@@ -0,0 +1,3374 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/icons/printsetup.svg b/icons/printsetup.svg
new file mode 100644
index 0000000000..3d47a262e4
--- /dev/null
+++ b/icons/printsetup.svg
@@ -0,0 +1,3390 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/icons/rotate.svg b/icons/rotate.svg
new file mode 100644
index 0000000000..d12bbf0988
--- /dev/null
+++ b/icons/rotate.svg
@@ -0,0 +1,3394 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/icons/rotate_layflat.svg b/icons/rotate_layflat.svg
new file mode 100644
index 0000000000..228c54218a
--- /dev/null
+++ b/icons/rotate_layflat.svg
@@ -0,0 +1,3374 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/icons/rotate_reset.svg b/icons/rotate_reset.svg
new file mode 100644
index 0000000000..9fac4c1f7d
--- /dev/null
+++ b/icons/rotate_reset.svg
@@ -0,0 +1,3388 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/icons/save.svg b/icons/save.svg
new file mode 100644
index 0000000000..9ba1035d75
--- /dev/null
+++ b/icons/save.svg
@@ -0,0 +1,3382 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/icons/save_sd.svg b/icons/save_sd.svg
new file mode 100644
index 0000000000..85b6edf42e
--- /dev/null
+++ b/icons/save_sd.svg
@@ -0,0 +1,3381 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/icons/scale.svg b/icons/scale.svg
new file mode 100644
index 0000000000..f00db38bf3
--- /dev/null
+++ b/icons/scale.svg
@@ -0,0 +1,3377 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/icons/scale_max.svg b/icons/scale_max.svg
new file mode 100644
index 0000000000..73ae8c078f
--- /dev/null
+++ b/icons/scale_max.svg
@@ -0,0 +1,3385 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/icons/scale_reset.svg b/icons/scale_reset.svg
new file mode 100644
index 0000000000..faa8af21d3
--- /dev/null
+++ b/icons/scale_reset.svg
@@ -0,0 +1,3387 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/icons/view_layer.svg b/icons/view_layer.svg
new file mode 100644
index 0000000000..71691b1725
--- /dev/null
+++ b/icons/view_layer.svg
@@ -0,0 +1,3378 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/icons/view_normal.svg b/icons/view_normal.svg
new file mode 100644
index 0000000000..daef253d4a
--- /dev/null
+++ b/icons/view_normal.svg
@@ -0,0 +1,3373 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/icons/view_xray.svg b/icons/view_xray.svg
new file mode 100644
index 0000000000..2fcfa03020
--- /dev/null
+++ b/icons/view_xray.svg
@@ -0,0 +1,3376 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/icons/viewmode.svg b/icons/viewmode.svg
new file mode 100644
index 0000000000..b015d87df7
--- /dev/null
+++ b/icons/viewmode.svg
@@ -0,0 +1,3384 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/styles.qml b/styles.qml
index 4968434068..d382efa7f4 100644
--- a/styles.qml
+++ b/styles.qml
@@ -2,6 +2,50 @@ import QtQuick 2.1
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
+import UM 1.0 as UM
+
QtObject {
-
+ property Component sidebar_header_button: Component {
+ ButtonStyle {
+ background: Item {
+ Image {
+ anchors.right: parent.right;
+ anchors.verticalCenter: parent.verticalCenter;
+
+ source: UM.Theme.icons.down_arrow;
+ }
+ }
+
+ label: Label {
+ property bool down: control.pressed || (control.checkable && control.checked);
+
+ font: UM.Theme.fonts.sidebar_header;
+ color: control.hovered ? UM.Theme.colors.text_hover : down ? UM.Theme.colors.text_pressed : UM.Theme.colors.text;
+
+ text: control.text;
+ }
+ }
+ }
+
+ property Component tool_button: Component {
+ ButtonStyle {
+ background: Rectangle {
+ implicitWidth: UM.Theme.sizes.button.width;
+ implicitHeight: UM.Theme.sizes.button.height;
+ color: UM.Theme.colors.primary;
+ }
+
+ label: Item {
+ Image {
+ anchors.centerIn: parent;
+
+ source: control.iconSource;
+ width: UM.Theme.sizes.button_icon.width;
+ height: UM.Theme.sizes.button_icon.height;
+
+ sourceSize: UM.Theme.sizes.button_icon;
+ }
+ }
+ }
+ }
}
diff --git a/theme.json b/theme.json
index 7b810ec2c5..ab5565cb84 100644
--- a/theme.json
+++ b/theme.json
@@ -7,24 +7,46 @@
"default": {
"size": 1
},
+ "default_allcaps": {
+ "size": 1,
+ "capitalize": true
+ },
"small": {
- "size": 0.8
+ "size": 0.75
},
"tiny": {
"size": 0.5
+ },
+ "sidebar_header": {
+ "size": 0.75,
+ "capitalize": true
}
},
"colors": {
- "primary": [1.0, 0.0, 0.0, 1.0],
- "border": [0.0, 1.0, 0.0, 1.0]
+ "primary": [12, 169, 227, 255],
+ "primary_text": [255, 255, 255, 255],
+ "border": [205, 202, 201, 255],
+
+ "text": [35, 35, 35, 255],
+ "text_inactive": [205, 202, 201, 255],
+ "text_hover": [12, 169, 227, 255],
+ "text_pressed": [12, 169, 227, 255],
+
+ "button_inactive": [205, 202, 201, 255],
+ "button_hover": [174, 174, 174, 255]
},
"sizes": {
"toolbar_button": [2.0, 2.0],
- "window_margin": [1.0, 1.0],
+ "window_margin": [2.0, 2.0],
"default_margin": [1.0, 1.0],
- "panel": [10.0, 10.0],
- "toolbar_spacing": [1.0, 1.0]
+ "panel": [22.0, 10.0],
+ "toolbar_spacing": [1.0, 1.0],
+ "section": [22.0, 3.0],
+ "section_icon": [2.14, 2.14],
+ "section_text_margin": [0.33, 0.33],
+ "button": [4.25, 4.25],
+ "button_icon": [3.57, 3.57]
}
}