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

Initial theme rework:

Browse source 
* Move buttons around
* Resizing
* Colors
* Splash screen
This commit is contained in:
fieldOfView 2015-11-11 13:11:01 +01:00
parent 840bf5d504
commit 1ba1009b60
6 changed files with 32 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/LayerView/LayerView.qml
View file

@ -18,8 +18,8 @@ Item
id: slider id: slider
width: 10 width: 10
height: 250 height: 250
anchors.right : parent.right anchors.left: parent.left
anchors.rightMargin: UM.Theme.sizes.slider_layerview_margin.width/2 anchors.leftMargin: UM.Theme.sizes.slider_layerview_margin.width/2
orientation: Qt.Vertical orientation: Qt.Vertical
minimumValue: 0; minimumValue: 0;
maximumValue: UM.LayerView.numLayers; maximumValue: UM.LayerView.numLayers;
@ -31,7 +31,7 @@ Item
style: UM.Theme.styles.layerViewSlider style: UM.Theme.styles.layerViewSlider
} }
Rectangle { Rectangle {
anchors.right: parent.right anchors.left: parent.left
y: -UM.Theme.sizes.slider_layerview_background_extension.height y: -UM.Theme.sizes.slider_layerview_background_extension.height
z: slider.z - 1 z: slider.z - 1
width: UM.Theme.sizes.button.width width: UM.Theme.sizes.button.width
@ -39,7 +39,7 @@ Item
color: UM.Theme.colors.slider_text_background color: UM.Theme.colors.slider_text_background
} }
Rectangle { Rectangle {
anchors.right : parent.right anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
z: slider.z - 1 z: slider.z - 1
width: UM.Theme.sizes.slider_layerview_background.width width: UM.Theme.sizes.slider_layerview_background.width

BIN
resources/images/cura.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Before After
Before After

7
resources/qml/Cura.qml
View file

@ -330,8 +330,7 @@ UM.MainWindow
//anchors.bottom: parent.bottom //anchors.bottom: parent.bottom
anchors.top: viewModeButton.bottom anchors.top: viewModeButton.bottom
anchors.topMargin: UM.Theme.sizes.default_margin.height; anchors.topMargin: UM.Theme.sizes.default_margin.height;
anchors.right: sidebar.left; anchors.left: viewModeButton.left;
anchors.rightMargin: UM.Theme.sizes.window_margin.width;
//anchors.bottom: buttons.top; //anchors.bottom: buttons.top;
//anchors.bottomMargin: UM.Theme.sizes.default_margin.height; //anchors.bottomMargin: UM.Theme.sizes.default_margin.height;
@ -386,8 +385,8 @@ UM.MainWindow
anchors anchors
{ {
top: parent.top; top: parent.top;
right: sidebar.left; left: toolbar.right;
rightMargin: UM.Theme.sizes.window_margin.width; leftMargin: UM.Theme.sizes.window_margin.width;
} }
text: catalog.i18nc("@action:button","View Mode"); text: catalog.i18nc("@action:button","View Mode");
iconSource: UM.Theme.icons.viewmode; iconSource: UM.Theme.icons.viewmode;

2
resources/qml/Toolbar.qml
View file

@ -20,7 +20,7 @@ Item {
anchors.bottom: parent.bottom; anchors.bottom: parent.bottom;
anchors.left: parent.left; anchors.left: parent.left;
spacing: UM.Theme.sizes.default_lining.width spacing: UM.Theme.sizes.button_lining.width
Repeater { Repeater {
id: repeat id: repeat

2
resources/themes/cura/styles.qml
View file

@ -77,7 +77,7 @@ QtObject {
} }
Rectangle { Rectangle {
anchors.fill: parent; anchors.fill: parent;
color: control.hovered ? UM.Theme.colors.load_save_button_hover : UM.Theme.colors.load_save_button color: control.hovered ? UM.Theme.colors.button_hover : UM.Theme.colors.button
Behavior on color { ColorAnimation { duration: 50; } } Behavior on color { ColorAnimation { duration: 50; } }
} }
} }

44
resources/themes/cura/theme.json
View file

@ -3,49 +3,49 @@
"large": { "large": {
"size": 1.5, "size": 1.5,
"bold": true, "bold": true,
"family": "Roboto" "family": "Proxima Nova Rg"
}, },
"default": { "default": {
"size": 1, "size": 1,
"family": "Roboto" "family": "Proxima Nova Rg"
}, },
"default_allcaps": { "default_allcaps": {
"size": 1, "size": 1,
"capitalize": true, "capitalize": true,
"family": "Roboto" "family": "Proxima Nova Rg"
}, },
"small": { "small": {
"size": 0.75, "size": 0.75,
"family": "Roboto" "family": "Proxima Nova Rg"
}, },
"tiny": { "tiny": {
"size": 0.5, "size": 0.5,
"family": "Roboto" "family": "Proxima Nova Rg"
}, },
"caption": { "caption": {
"size": 0.75, "size": 0.75,
"italic": true, "italic": true,
"family": "Roboto" "family": "Proxima Nova Rg"
}, },
"sidebar_header": { "sidebar_header": {
"size": 0.75, "size": 0.75,
"capitalize": true, "capitalize": true,
"family": "Roboto" "family": "Proxima Nova Rg"
}, },
"default_header": { "default_header": {
"size": 1.0, "size": 1.0,
"bold": true, "bold": true,
"family": "Roboto", "family": "Proxima Nova Rg",
"letterSpacing": 2.0 "letterSpacing": 2.0
}, },
"button_tooltip": { "button_tooltip": {
"size": 0.75, "size": 0.75,
"capitalize": true, "capitalize": true,
"family": "Roboto" "family": "Proxima Nova Rg"
}, },
"setting_category": { "setting_category": {
"size": 1.0, "size": 1.0,
"family": "Roboto" "family": "Proxima Nova Rg"
} }
}, },
@ -69,12 +69,13 @@
"error": [255, 140, 0, 255], "error": [255, 140, 0, 255],
"sidebar_header_bar": [12, 169, 227, 255], "sidebar_header_bar": [12, 169, 227, 255],
"button": [139, 143, 153, 255], "button": [24, 41, 77, 255],
"button_hover": [77, 184, 226, 255], "button_hover": [70, 84, 113, 255],
"button_active": [32, 166, 219, 255], "button_active": [32, 166, 219, 255],
"button_active_hover": [77, 184, 226, 255], "button_active_hover": [12, 169, 227, 255],
"button_text": [255, 255, 255, 255], "button_text": [255, 255, 255, 255],
"button_disabled": [0, 0, 0, 255], "button_disabled": [24, 41, 77, 255],
"button_disabled_text": [70, 84, 113, 255],
"button_tooltip_text": [35, 35, 35, 255], "button_tooltip_text": [35, 35, 35, 255],
"toggle_active": [255, 255, 255, 255], "toggle_active": [255, 255, 255, 255],
@ -142,13 +143,13 @@
}, },
"sizes": { "sizes": {
"window_margin": [1.5, 1.5], "window_margin": [1.0, 1.0],
"default_margin": [1.0, 1.0], "default_margin": [1.0, 1.0],
"default_lining": [0.1, 0.1], "default_lining": [0.1, 0.1],
"logo": [9.5, 2.0], "logo": [9.5, 2.0],
"sidebar": [26.0, 10.0], "sidebar": [30.0, 10.0],
"sidebar_header": [0.0, 3.8], "sidebar_header": [0.0, 4.0],
"sidebar_header_mode_toggle": [0.0, 2.4], "sidebar_header_mode_toggle": [0.0, 2.4],
"sidebar_setup": [0.0, 2.6], "sidebar_setup": [0.0, 2.6],
"sidebar_subParts": [0.0, 2.4], "sidebar_subParts": [0.0, 2.4],
@ -161,8 +162,8 @@
"section_icon": [1.6, 1.6], "section_icon": [1.6, 1.6],
"section_icon_column": [2.8, 0.0], "section_icon_column": [2.8, 0.0],
"setting": [21.0, 1.8], "setting": [19.0, 1.8],
"setting_control": [7.0, 2.0], "setting_control": [10.0, 2.0],
"setting_control_depth_margin": [1.4, 0.0], "setting_control_depth_margin": [1.4, 0.0],
"setting_preferences_button_margin": [3.3, 0.0], "setting_preferences_button_margin": [3.3, 0.0],
"setting_control_margin": [0.0, 0.0], "setting_control_margin": [0.0, 0.0],
@ -173,8 +174,9 @@
"standard_list_input": [20.0, 25.0], "standard_list_input": [20.0, 25.0],
"standard_arrow": [0.6, 0.6], "standard_arrow": [0.6, 0.6],
"button": [3.8, 3.8], "button": [4, 4],
"button_icon": [2.6, 2.6], "button_icon": [3, 3],
"button_lining": [0, 0],
"progressbar": [26.0, 0.8], "progressbar": [26.0, 0.8],
"progressbar_control": [8.0, 0.8], "progressbar_control": [8.0, 0.8],