10120 Commits

Author SHA1 Message Date
Ghostkeeper
a12c569281
Merge branch 'patch-6' of https://github.com/kemiq3d/Cura into kemiq3d-patch-6 2017-08-24 09:12:00 +02:00
Ghostkeeper
523635dfc4
Merge branch 'kemiq3d-patch-5' 2017-08-24 09:10:21 +02:00
Ghostkeeper
ef3377e6fe
Merge branch 'patch-5' of https://github.com/kemiq3d/Cura into kemiq3d-patch-5 2017-08-24 09:10:05 +02:00
Ghostkeeper
65247ae9d4
Merge branch 'patch-4' of https://github.com/kemiq3d/Cura into kemiq3d-patch-4 2017-08-24 09:08:36 +02:00
Ghostkeeper
2000ccd8da
Merge branch 'patch-3' of https://github.com/kemiq3d/Cura into kemiq3d-patch-3 2017-08-24 09:07:11 +02:00
Ghostkeeper
5bd575c1aa
Merge branch 'fix_readme_make_definition' of https://github.com/fieldOfView/Cura into fieldOfView-fix_readme_make_definition 2017-08-24 00:11:37 +02:00
Mark Burton
2c13f5dc75 Add minimum_value to z_offset_taper_layers.
It now constrains the value to be no less than 0 when z_offset_layer_0 is negative or
z_offset_taper_layers is 0, otherwise the value must be such that the gap between subsequent
layers is not less than 80% of the normal layer height.

If the print head was lowered for the first layer, the tapering will always cause the
subsequent layers to be at least the normal layer height above the previous layer so the
tapering can occur over any number of layers.

On the other hand, if the print head was raised for the first layer, we demand that either
tapering is not used (value is 0) or that the tapering occurs over sufficient layers so that
the inter-layer gaps are not too small.
2017-08-23 22:32:11 +01:00
Mark Burton
5cbead5128 Add some value constraints to z_offset_layer_0.
Now the offset cannot be such that the first layer would be less than 1/2 of its normal height.

Warnings shown when first layer is less than 80% or more than 200% of its normal height.
2017-08-23 21:52:21 +01:00
Ghostkeeper
cdf43ea6a4
Forgotten sidebar margins
The buttons need the sidebar margins too.

Contributes to issue CURA-4148.
2017-08-23 17:58:05 +02:00
Ghostkeeper
09a5cf1de2
Shift sidebar tooltips with the arrow outside of sidebar
Because now the arrow has the same colour as the sidebar so you won't see it otherwise.

Contributes to issue CURA-4148.
2017-08-23 17:53:00 +02:00
Lipu Fei
3d44d3c4ca Add logging and minor fix for project loading
CURA-4204
2017-08-23 17:42:40 +02:00
Lipu Fei
3805d2ff9e Add comments for HACK in project loading
CURA-4204
2017-08-23 17:37:59 +02:00
Lipu Fei
c37782d544 Stop slicing when a new slice is needed
CURA-4206
2017-08-23 17:19:48 +02:00
Ghostkeeper
fde4f44a1e
New dark theme
Also from the UX designers: A new dark theme that is exactly the same as the default theme except the background of the scene.

Contributes to issue CURA-4148.
2017-08-23 17:10:54 +02:00
Ghostkeeper
c2e4c14e59
Adjust vertical margins in sidebar
The section size adjusts the size of a setting item, and the actual control is centred within that space so in effect it controls the margins above and below each setting control.

Contributes to issue CURA-4148.
2017-08-23 17:02:07 +02:00
Ghostkeeper
11f8204644
Change margins in the side bar
These are more or less all margins in the side bar.

Contributes to issue CURA-4148.
2017-08-23 16:28:28 +02:00
Lipu Fei
d662770b22 Fix setting new material for stacks
CURA-4204

When a new material is created during project file loading, the material
for each stack is set according to the parent material ID, but actually
the child material should be used. This fix uses a hack to find the
corresponding child material for a stack so when a user chooses to
create a new material during project file loading, the material can be
correctly set.
2017-08-23 16:27:28 +02:00
Ghostkeeper
078b9e8b66
Fix placeholder text colour
It should use the same colour as the normal text, for now.

Contributes to issue CURA-4148.
2017-08-23 15:32:42 +02:00
Ghostkeeper
b52446ed99
Use text colour specific to text in scene for job specs
Because the scene may have a different background colour than the rest, we need to be able to have inverted colours for that part.

Contributes to issue CURA-4148.
2017-08-23 14:58:43 +02:00
Ghostkeeper
f5169f53f3
Remove text_reversed
This theme item is broken by nature since the theme itself allows you to change the colours such that these text elements don't get inversed colours at all. Instead I'm going to use text_emphasis for these which is currently the same. If ever they need to get different colours for these items than the normal colour, the theme item will have to be split up.

Contributes to issue CURA-4148.
2017-08-23 14:44:14 +02:00
Lipu Fei
759d44dbef Add stack context for function evaluation
CURA-4186
2017-08-23 14:39:08 +02:00
Ghostkeeper
d55b8b2957
Add icon after Troubleshooting Guide text
Sadly the colour of this icon is hard-coded into the image... I didn't find any other solution to append an inline image after a multi-line text.

Contributes to issue CURA-4148.
2017-08-23 14:38:35 +02:00
Jaime van Kessel
b1160c2c37 Labels in layerview now correctly use font
Fixes #2309
2017-08-23 14:02:02 +02:00
Ghostkeeper
85a1526912
Fix scaling of view mode button
Changed the size to 24x24 and moved the path 5 units down.

Contributes to issue CURA-4148.
2017-08-23 13:59:32 +02:00
Ghostkeeper
17e62ea6c1
Let theme decide upon coloured icons
We shouldn't colour the icons themselves, but rather let UM.RecolourImage choose the colours for just the outlines of the icons.

Contributes to issue CURA-4148.
2017-08-23 13:35:47 +02:00
Jaime van Kessel
d74d865ec8 Merge branch 'skin_preshrink' of github.com:Ultimaker/Cura 2017-08-23 13:34:21 +02:00
Ghostkeeper
adb2fa739b
Correct setting_validation_error/warning and background/border
I modified these but forgot to commit them.

Contributes to issue CURA-4148.
2017-08-23 13:33:49 +02:00
Ghostkeeper
c6d1ff0823
Don't colour Check Material Compatibility text red upon incompatibility
I would've liked it when it became yellow instead, but just keeping it white and displaying the warning icon is sufficient I suppose.

Contributes to issue CURA-4148.
2017-08-23 13:33:04 +02:00
Ghostkeeper
ab444943cb
Rename setting_validation_error/warning and border
In some places we want to use the bright error or warning colours to display that something is going on. In those places we'd like to refer to the colour setting_validation_error rather than setting_validation_error_border or something, so I'm renaming these four theme items.

Contributes to issue CURA-4148.
2017-08-23 13:30:25 +02:00
Ghostkeeper
876c6aeced
Replace warning.svg with material_compatibility.svg
The warning icon is only used for the material compatibility warning, so it should just have been mixed.

Contributes to issue CURA-4148.
2017-08-23 13:14:21 +02:00
Lipu Fei
5564d80950 Merge branch '2.7' 2017-08-23 13:02:05 +02:00
Ghostkeeper
2a1a41662a
Remove tab_monitor_with_status icon
It must always be the same as tab_monitor, but we'll just draw an additional icon on top of it.

Contributes to issue CURA-4148.
2017-08-23 12:53:07 +02:00
Jaime van Kessel
904682945a Decreased the value of the u_z_bias, so the plate quad is drawn again.
CURA-4150
2017-08-23 12:48:19 +02:00
Lipu Fei
7a2493dd2f Use per-object stack instead of the active extruder
CURA-4186
2017-08-23 12:32:20 +02:00
fieldOfView
32a863d9dc Find a material with the correct diameter when adding a printer 2017-08-23 11:13:36 +02:00
Jaime van Kessel
ca1f7430c1 Merge branch 'fix_add_machine_material_diameter' of https://github.com/fieldOfView/Cura 2017-08-23 11:11:45 +02:00
Mark
2d0a4d443d Switch material and print core
CURA-4147
2017-08-23 10:54:46 +02:00
Ghostkeeper
b58fb0d05d
Merge branch '2.7' 2017-08-23 09:23:29 +02:00
Ghostkeeper
90860c67c2
Minor tweaks suggested by fieldOfView
See the comments in this commit: c4d23437f2
2017-08-23 09:23:04 +02:00
alekseisasin
9363f93467 Merge pull request #2224 from fieldOfView/fix_multiextruder_menus
Fix multiextruder menus
2017-08-23 09:08:48 +02:00
Lipu Fei
16764f4750 Create user containers for newly created custom FDM printer extruders
CURA-4188

The newly created extruder stacks don't have user containers, so the
user changes cannot be saved. This fix makes sure that in the upgrade,
user containers will be created.
2017-08-22 17:37:25 +02:00
Ghostkeeper
07562e1745
Optimise new icons
Removed unnecessary groups. Removed unused IDs. Applied some transformations, including loads of transformations that did absolutely nothing. Truncated to 3 decimals. Removed unused imports. Removed empty defs. Removed generator markers.

Contributes to issue CURA-4148.
2017-08-22 17:36:21 +02:00
Ghostkeeper
054df31ee7
New icons
These are the raw icons as I got them from the UX designers.

Contributes to issue CURA-4148.
2017-08-22 17:00:27 +02:00
Ghostkeeper
03311132f0
Merge branch 'feature_grid_lines' 2017-08-22 16:41:45 +02:00
Ghostkeeper
18b88065f4
Render build plate slightly lower than grid to prevent Z fighting
Looks much better.

Contributes to issue CURA-4150.
2017-08-22 16:40:11 +02:00
Lipu Fei
28670edf8e Align profile dropdown box correctly
CURA-4147
2017-08-22 16:11:15 +02:00
Lipu Fei
e17a88fe11 Merge branch '2.7' 2017-08-22 16:06:36 +02:00
alekseisasin
10b50244e0 Merge branch 'master' of github.com:Ultimaker/cura 2017-08-22 14:00:41 +02:00
alekseisasin
a0b7a2d165 Merge branch 'feature_grid_lines'
CURA-4150
2017-08-22 13:59:19 +02:00
Mark
64f6cd237f Rename Print tab to Monitor
CURA-4106
2017-08-22 13:58:01 +02:00