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

Merge branch 'master' of https://github.com/Ultimaker/Cura

Browse source
This commit is contained in:
Tim Kuipers 2015-06-08 13:33:28 +02:00
commit f074760c7b
14 changed files with 196 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

34
resources/qml/Cura.qml
View file

@ -144,23 +144,6 @@ UM.MainWindow {
}
}
Sidebar {
id: sidebar;
anchors {
top: parent.top;
bottom: parent.bottom;
right: parent.right;
rightMargin: UM.Theme.sizes.window_margin.width;
}
width: UM.Theme.sizes.panel.width;
addMachineAction: actions.addMachine;
configureMachinesAction: actions.configureMachines;
saveAction: actions.save;
}
UM.MessageStack {
anchors {
left: toolbar.right;
@ -265,6 +248,23 @@ UM.MainWindow {
bottomMargin: UM.Theme.sizes.window_margin.height;
}
}
Sidebar {
id: sidebar;
anchors {
top: parent.top;
bottom: parent.bottom;
right: parent.right;
rightMargin: UM.Theme.sizes.window_margin.width;
}
width: UM.Theme.sizes.panel.width;
addMachineAction: actions.addMachine;
configureMachinesAction: actions.configureMachines;
saveAction: actions.save;
}
}
}

6
resources/qml/Sidebar.qml
View file

@ -16,10 +16,12 @@ UM.AngledCornerRectangle {
property alias saveAction: saveButton.saveAction;
cornerSize: UM.Theme.sizes.default_margin.width;
color: UM.Theme.colors.sidebar;
function showTooltip(item, position, text) {
tooltip.text = text;
position = item.mapToItem(base, position.x, position.y);
position = item.mapToItem(base, position.x, position.y / 2);
tooltip.show(position);
}

4
resources/qml/SidebarTooltip.qml
View file

@ -22,10 +22,10 @@ Rectangle {
function show(position) {
if(position.y + base.height > parent.height) {
x = position.x;
x = position.x - base.width;
y = parent.height - base.height;
} else {
x = position.x;
x = position.x - base.width;
y = position.y;
}
base.opacity = 1;

10
resources/settings/fdmprinter.json
View file

@ -41,8 +41,9 @@
"unit": "mm",
"type": "float",
"default": 0.1,
"min_value": 0.06,
"max_value": 2.0,
"min_value": 0.00001,
"min_value_warning": 0.04,
"max_value_warning": 2.0,
"always_visible": true,
"children": {
"layer_height_0": {
@ -51,8 +52,9 @@
"unit": "mm",
"type": "float",
"default": 0.3,
"min_value": 0.06,
"max_value": 2.0,
"min_value": 0.0,
"min_value_warning": 0.04,
"max_value_warning": 2.0,
"visible": false
}
}

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

@ -73,6 +73,7 @@ QtObject {
anchors.horizontalCenter: parent.horizontalCenter;
text: control.text;
font: UM.Theme.fonts.button_tooltip;
color: UM.Theme.colors.button_tooltip_text;
}
}
}
@ -121,6 +122,8 @@ QtObject {
Image {
anchors.verticalCenter: parent.verticalCenter;
source: control.iconSource;
width: UM.Theme.sizes.section_icon.width;
height: UM.Theme.sizes.section_icon.height;
}
Label {

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

@ -44,6 +44,8 @@
},
"colors": {
"sidebar": [255, 255, 255, 255],
"primary": [12, 169, 227, 255],
"primary_hover": [34, 150, 190, 255],
"primary_text": [255, 255, 255, 255],
@ -61,6 +63,7 @@
"button_active_hover": [34, 150, 190, 255],
"button_text": [255, 255, 255, 255],
"button_disabled": [245, 245, 245, 255],
"button_tooltip_text": [35, 35, 35, 255],
"scrollbar_background": [245, 245, 245, 255],
"scrollbar_handle": [205, 202, 201, 255],