GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-11 04:09:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,120 Commits 290 Branches 260 Tags
Commit Graph

10120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lipu Fei
3fbdb27e8e Merge branch 'master' into feature_dark_colours_icons 
CURA-4148

Resolve merge conflicts.
 2017-08-28 11:13:38 +02:00
alekseisasin
ae63060d75 Merge branch 'mb-z-offset' of https://github.com/smartavionics/Cura 2017-08-28 10:43:53 +02:00
fieldOfView
61442e512f Fix setting the Gantry height setting in Machine Settings 2017-08-28 10:13:06 +02:00
fieldOfView
2ac67a7d34 Fix setting the Gantry height setting in Machine Settings 2017-08-27 22:04:46 +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
Lipu Fei
141aad5513 Trigger to re-evaluate default settings in per-object settings when the active stack gets changed. 
CURA-4186

Trigger signals to re-evaluate default settings in pre-object settings
when the active stack gets changed. Otherwise the values won't be
updated directly.
 2017-08-25 12:48:47 +02:00
Lipu Fei
a320784a6d For a per-object setting, use the user-defined value first 
CURA-4186

In a per-object setting, if there is user defined value, use that first.
If the value is default, then evaluate it with the normal routine.
 2017-08-25 12:19:05 +02:00
Lipu Fei
414901ae84 Force update the provider when the setting's limit_to_extruder gets changed 
CURA-4186

In the per-object settings, when a setting's limit_to_extruder gets
changed, its value should be updated too.
 2017-08-25 11:58:40 +02:00
Lipu Fei
c44e527305 Remove warning in /PerObjectContainerStack 
CURA-4186
 2017-08-25 11:57:52 +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
ff4fb0dea0
Merge branch 'patch-4' of https://github.com/probonopd/Cura into probonopd-patch-4 2017-08-25 09:41:59 +02: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
Lipu Fei
50a7e8146f Add a dedicated stack class for per-object settings 
CURA-4186

Add a dedicated stack class PerObjectContainerStack for per-object
settings to evaluate limit_to_extruder values correctly.
 2017-08-24 17:09:28 +02:00
Lipu Fei
365379f735 Add missing context in getProperty() in global and extruder stacks 
CURA-4186

All getProperty() calls should use the provided context.
 2017-08-24 17:01:03 +02:00
Lipu Fei
2ec7c14422 Fix PerObjectSettingsPanel.qml 
CURA-4186

- The UI shouldn't be bound to the limit_to_extruder stack, it should
  always be bound to the per-object stack.
- The ActiveTool.getValue() calls cannot be bound in QML, so use a
  Connections to update the values based on signals.
 2017-08-24 16:57:12 +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
bef1611e98
Merge branch 'kemiq3d-patch-9' 2017-08-24 09:17:25 +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
5c66beb082
Merge branch 'kemiq3d-patch-8' 2017-08-24 09:15:26 +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
df4cd98406
Merge branch 'kemiq3d-patch-7' 2017-08-24 09:14:06 +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
222c9b66d8
Merge branch 'kemiq3d-patch-6' 2017-08-24 09:12:16 +02:00