5638 Commits

Author SHA1 Message Date
alekseisasin
ae63060d75 Merge branch 'mb-z-offset' of https://github.com/smartavionics/Cura 2017-08-28 10:43:53 +02:00
Mark Burton
8c599c4869 The seam corner setting is now available for all seam types except random. 2017-08-25 17:09:47 +01:00
Mark Burton
ea93105079 Added sharpest_corner option to z_seam_type. 2017-08-25 15:26:24 +01:00
Mark Burton
438ea142c9 Tweak z_seam_corner strings. 2017-08-25 14:10:32 +01:00
Ghostkeeper
0aa1f04b1d
Correct width of monitor icon
Because the overlay is wider this one needs to be just as wide.

Contributes to issue CURA-4148.
2017-08-25 14:56:39 +02:00
Ghostkeeper
3db799c661
Remove unnecessary crap from monitor icon
All the metadata and empty tags and no-op groups and such.

Contributes to issue CURA-4148.
2017-08-25 14:55:13 +02:00
Ghostkeeper
aa9347d7be
New icon for monitor tab
Fresh from the press.

Contributes to issue CURA-4148.
2017-08-25 14:53:07 +02:00
Mark Burton
d40a317681 Revert the z_seam_type options back to how they originally were and add z_seam_corner. 2017-08-25 13:47:48 +01:00
Ghostkeeper
585c04dfaa
Also show warning icon when the set-up on other extruders is unsupported
So I added a function that checks the support on all extruders and the global stack.

Contributes to issue CURA-4148.
2017-08-25 14:27:45 +02:00
Ghostkeeper
165665247f
Remove unused property valueWarning
It is unused here. There is such a property being used by the profile selection drop-down but that one uses the valueWarning property in SidebarHeader.qml which is exactly the same.

Contributes to issue CURA-4148.
2017-08-25 14:03:54 +02:00
Ghostkeeper
0c7fd82e22
Give icons in the top bar a different size
Because one of the icons now needs to be rectangular. All icons in there have the same style so they all have to be resized.

Contributes to issue CURA-4148.
2017-08-25 13:57:24 +02:00
Ghostkeeper
5be0d664f4
Remove unused colour from tab_settings icon
This icon is recoloured so the colour doesn't matter. When there is no colour, the icon preview shows up better in my browser and my file explorer...

Contributes to issue CURA-4148.
2017-08-25 13:51:40 +02:00
Ghostkeeper
78dbe8c56a
Remove offline icon
We don't show an icon in that case any more.

Contributes to issue CURA-4148.
2017-08-25 13:03:50 +02:00
Ghostkeeper
c25b94ce31
Move status icons to the middle-right side of monitor icon
They are actually moved inside the image, rather than in code. This way the theme can still adjust the icon.

Contributes to issue CURA-4148.
2017-08-25 13:02:51 +02:00
Mark Burton
0cc0fe93b8 Add further options to z_seam_type.
Can now specify that the z-seam should be located in either the most concave region of the
outline, the most convex region or the most curved (concave or convex) region.
2017-08-25 09:25:53 +01:00
Ghostkeeper
9cea356a18
Replace tabs with spaces
As per our code style standard.
2017-08-25 09:22:47 +02:00
Ghostkeeper
90583bd56d
Replace tabs with spaces
And fix the alignment while we're at it.
2017-08-25 09:22:07 +02:00
Ghostkeeper
4b4f971222
Make 'other' the default category
This should make it a bit easier for others to create a new definition since there is less for them to 'have to know'. Previously they would be required to fill in as category Other, but now they can just leave the category out.
2017-08-25 09:17:55 +02:00
Ghostkeeper
4835ffa403
Don't recolor printer status buttons
Just leave it to the actual icons to provide colour. It may be a bit harder to modify the colours in a different theme then, but now we can have multi-colour icons (as per the new theme requires).

Contributes to issue CURA-4148.
2017-08-24 21:22:13 +02:00
Lipu Fei
f85a76b4bd Fix per-object settings qml 2017-08-24 17:38:16 +02:00
Ghostkeeper
26033e3454
Optimised connected icon
Changed rects with rounded corners into circles. Merged two circles that depicted a circle-with-outline into one circle with an outline. Changed the outline path to a polyline with a stroke.

Contributes to issue CURA-4148.
2017-08-24 17:22:34 +02:00
Ghostkeeper
457472ee61
Fix connected icon
It was rendered wrong by the export of Sketch.

Contributes to issue CURA-4148.
2017-08-24 17:11:59 +02:00
Ghostkeeper
f0c446cb28
Optimise status icons
Removed unnecessary transforms. Changed square rects which had their corner radius set to half their width into actual circles. Merged some glyphs that were a stroke and a background into one glyph with an actual stroke and background. Applied necessary transforms to actual coordinates. Dereferenced xlink symbols that were used only once.

Contributes to issue CURA-4148.
2017-08-24 17:10:20 +02:00
Ghostkeeper
974bf9de4d
New printer status icons
These are the new icons from the UX guys for the printer status.

Contributes to issue CURA-4148.
2017-08-24 16:29:11 +02:00
Mark Burton
2db96f02f4 Revised minimum_value and minimum_value_warning values.
Now just constrains z_offset_taper_layers to be >= 0 as that needs to be positive.
2017-08-24 15:24:10 +01:00
Ghostkeeper
1f29501836
Remove more useless code
These are all unused.

Contributes to issue CURA-4148.
2017-08-24 16:15:19 +02:00
Ghostkeeper
b7261306ec
Remove useless transformations
They ended up in the same place as the original glyph...

Contributes to issue CURA-4148.
2017-08-24 16:12:25 +02:00
Ghostkeeper
36f9ca0efb
New Cura logo image
This one has white letters but should otherwise be more or less the same.

Contributes to issue CURA-4148.
2017-08-24 16:10:18 +02:00
Ghostkeeper
557173e799
Merge branch '2.7' 2017-08-24 15:33:01 +02:00
Ghostkeeper
a1fdcd0e48
Update prime tower settings for PVA
This reduces the jerk considerably and makes use of the new prime tower purge settings.
2017-08-24 15:32:41 +02:00
Ghostkeeper
4caad8f3b9
Add Creality CR10S4 and S5 definitions
They use the same settings as the normal one but they are larger printers.
2017-08-24 14:53:15 +02:00
Ghostkeeper
c43b7f6f1b
Update Creality CR10 Beta definition
The printer was also renamed to a more specific name. These are updates I'm getting from Michael.
2017-08-24 14:42:39 +02:00
Ghostkeeper
ccf6d12283
Merge branch 'patch-9' of https://github.com/kemiq3d/Cura into kemiq3d-patch-9 2017-08-24 09:17:18 +02:00
Ghostkeeper
548d17390e
Merge branch 'patch-8' of https://github.com/kemiq3d/Cura into kemiq3d-patch-8 2017-08-24 09:15:20 +02:00
Ghostkeeper
6a40264f9a
Merge branch 'patch-7' of https://github.com/kemiq3d/Cura into kemiq3d-patch-7 2017-08-24 09:13:55 +02:00
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
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
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
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
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
Mark Burton
2e60a4a589 Tweak relative_extrusion label and blurb. 2017-08-23 13:57:46 +01: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