Commit graph

9797 commits

Author SHA1 Message Date
Ghostkeeper
4b8152d6fe
Allow fallthrough of switch statement
Makes it easier to modify.

Contributes to issue CURA-4148.
2017-08-21 13:21:33 +02:00
Ghostkeeper
226bb7b070
Write out border colour as full-fledged function
This makes it easier to read and to modify this functionality rather than a string of ternary operators. It's about to become more complicated too.

Contributes to issue CURA-4148.
2017-08-21 11:55:47 +02:00
Ghostkeeper
42b8e87d00
Make opacity of print monitor themeable
The new dark design specifies a colour for the print monitor overlay that is darker than what would be attainable with the default 75% opacity. So I'm making it 100% opacity (but still with a fade, so we need the opacity) and let the theme specify what opacity it wants.

Contributes to issue CURA-4148.
2017-08-21 10:50:36 +02:00
Ghostkeeper
db640c6f3d
Merge branch '2.7' 2017-08-21 00:58:15 +02:00
Ghostkeeper
df88772071
Add input checking for incorrect responses from printers
We should not crash when getting invalid data. Just put a warning in the log there and ignore the message for the rest.
2017-08-21 00:57:25 +02:00
Ghostkeeper
d793dc68ea
Add Creality CR-10
This definition was provided to me via e-mail. The initial data was badly formatted, so I corrected it and verified back with Michael Wildermuth that the new profile worked. Apparently it works, so thank you Michael.
2017-08-21 00:23:36 +02:00
Ghostkeeper
b917511528
Merge branch '2.7' 2017-08-18 16:58:21 +02:00
Ghostkeeper
b7493ae1a8
Also pull limit_to_extruder settings into per-object setting stack
Only for settings that are limited by a setting on the stack.

Contributes to issue CURA-4186.
2017-08-18 16:57:13 +02:00
Ghostkeeper
3c36c3427c
Cache top of stack for efficiency
Otherwise you need to retrieve this container for every key again. Doesn't matter much, but a bit.

Contributes to issue CURA-4186.
2017-08-18 15:36:15 +02:00
Ghostkeeper
4a788dfbdd
Reduce indentation by inverting input check
Reads a bit easier.

Contributes to issue CURA-4186.
2017-08-18 15:02:49 +02:00
Lipu Fei
24d3f8aab1 Put remove some zags settings as child settings
CURA-3957
2017-08-18 14:23:09 +02:00
Ghostkeeper
9241cfa5c6
Make tooltip backgrounds dark as well
Looks very professional.

Contributes to issue CURA-3948.
2017-08-18 14:19:53 +02:00
Lipu Fei
f0d5187896 Merge remote-tracking branch '2.7' 2017-08-18 13:43:00 +02:00
Lipu Fei
662e3b9cd1 Fix coding style
CURA-4147
2017-08-18 13:38:16 +02:00
Lipu Fei
67cfb064e6 Fix upgrading custom FDM printers from 2.5
CURA-4188

Custom FDM printers in 2.5 don't have multi-extrusion support but they
do since 2.6. Upgrading from 2.5 to 2.6 will not create the missing
extruder stacks for the old custom FDM printers, which causes a crash.
This fix makes sure that all custom FDM printers will have 8 extruder
stacks during the upgrade so that Cura can still start normally and
those printers will still be usable.
2017-08-18 13:06:46 +02:00
Jaime van Kessel
bab61b7f47 Merge branch 'master' of github.com:Ultimaker/Cura 2017-08-18 11:09:28 +02:00
Jaime van Kessel
1d9ac09053 No longer attempt to create monitorView if none was set 2017-08-18 11:09:02 +02:00
Ghostkeeper
64753f8c8b
Merge branch '2.7' 2017-08-18 10:42:14 +02:00
Ghostkeeper
9a00c07c3d
Also upgrade variants
Variants can be customised as well, you know.
2017-08-18 09:59:51 +02:00
Jaime van Kessel
145b6825db Fixes #2284 2017-08-18 09:45:28 +02:00
alekseisasin
7978b0efe9 Move quality profile, material and print core to it's new location
CURA-4147
2017-08-18 09:15:17 +02:00
Ghostkeeper
a44eb0152d
Repair globalPropertyProvider for per-object settings panel
Otherwise we can't find the correct limit_to_extruder property.

Contributes to issue CURA-4186.
2017-08-17 20:17:32 +02:00
Lipu Fei
b20711ef7c Remove incorrect maximum extruder count check
CURA-4188
2017-08-17 16:36:57 +02:00
Lipu Fei
16cfb768d2 Move dont show again checkbox above the buttons
CURA-4113

The Don't show again checkbox is on the same row with the buttons. In
some translations, the text for the checkbox is very long, which
overlaps with the button.
2017-08-16 16:07:02 +02:00
Lipu Fei
b9397aaa57 Check the content of definition changes container in SliceInfo
CURA-4107

Now we always create a definition changes container for a stack,
checking if the definition changes is empty in SliceInfo doesn't work.
It should check the content too.
2017-08-16 12:50:09 +02:00
Lipu Fei
b74c09dec8 Merge branch '2.7' 2017-08-16 11:51:26 +02:00
Jaime van Kessel
d5daf9ff81 Merge branch 'CURA-4146' of github.com:Ultimaker/Cura 2017-08-16 11:37:09 +02:00
Ghostkeeper
abcec2157e
Use the lowest of the layer heights for initial layer height
This was discussed with the materials team. A layer height of 0.4mm for a 0.4mm nozzle could give problems. This would be even worse with a 0.25mm nozzle.
2017-08-16 11:29:13 +02:00
Jaime van Kessel
33f843b73a Added name of output device
CURA-4160
2017-08-16 10:52:13 +02:00
Lipu Fei
4ad62daf61 Generate new unique names for new machines from the project files
CURA-4144

Generate a new name for the machine loaded from a project file instead
of using new ID as the new name.
2017-08-16 08:30:13 +02:00
alekseisasin
6177c42f0d Merge branch 'master' of github.com:Ultimaker/cura 2017-08-15 23:52:28 +02:00
alekseisasin
dc629f7c91 Solved incorrect printer name after loading a project from file
CURA-4144
2017-08-15 23:48:35 +02:00
Ghostkeeper
19bab721ef
Change language metadata field to contain language codes
According to the standard specified by GNU: https://www.gnu.org/software/gettext/manual/html_node/Header-Entry.html

Contributes to issue CURA-4113.
2017-08-15 17:51:47 +02:00
Lipu Fei
3a22d1916f Go back to "Recommended/Custom" tabs
CURA-4146
2017-08-15 17:42:34 +02:00
Lipu Fei
1c747a962f Merge remote-tracking branch 'CURA-4032' 2017-08-15 16:11:44 +02:00
Ghostkeeper
ddf35826dc
Merge branch '2.7' 2017-08-15 15:32:39 +02:00
Ghostkeeper
17a615d30c
Don't translate HTML tags and variable names
It says so in the context of the build dimensions translation. Not yet in the context of the HTML tags with <filename> and such, but it will do that for the next translation round properly.

Contributes to issue CURA-4113.
2017-08-15 15:32:23 +02:00
Ghostkeeper
31757f4ce1
Merge branch '2.7' of https://github.com/Patola/Cura into Patola-2.7 2017-08-15 15:29:24 +02:00
alekseisasin
3116ff829c Merge pull request #2200 from fieldOfView/fix_monitoritem_size
Adapt camera image to available space
2017-08-15 15:04:18 +02:00
alekseisasin
7ad7fb0a3c Merge pull request #2200 from fieldOfView/fix_monitoritem_size
Adapt camera image to available space
2017-08-15 14:45:34 +02:00
Lipu Fei
9aa65eab44 Merge branch '2.7' 2017-08-15 14:43:36 +02:00
Lipu Fei
da8b55cf62 Make sure stacks will have non-empty definitionChanges in project loading
CURA-4107

In old Cura, there is no definitionChanges container, so loading a
project file from an old version will result in stacks with empty
defnitionChanges. This will cause an unnecessary auto-slice problem when
we switch between the extruder tabs for the first time. This action will
trigger a piece code in MachineAction which creates a definitionChanges
container for the active stack if it is empty. This eventually triggers
a propertyChanged signal and results in an unncessary auto-slicing.
2017-08-15 14:38:49 +02:00
Lipu Fei
3ebaacfa11 Use the extruder count in the global stack in project loading
CURA-4167

Custom FDM printers have multiple extruder stacks by default but not all
of them may be used. The actual number of extruders depends on what's
defined in the global stack. Because in the current architecture,
single-extrusion machines don't have extruder stacks, in project
loading, the extruder count in the global stack should be used so these
cases can be handled properly.
2017-08-15 14:19:23 +02:00
Lipu Fei
3a46a337ff In SliceInfo, use the global stack if it is a single-extrusion machine
CURA-4167

Single extrusion machines don't have extruder stacks in the current
architecture.
2017-08-15 14:19:23 +02:00
Lipu Fei
e67286c0d8 Do not add extruder stacks for single-extrusion machines
CURA-4167

In the current architecture, single-extrusion machines don't have
extruder stacks.
2017-08-15 14:19:23 +02:00
Ghostkeeper
72bf74e513
Merge branch '2.7' 2017-08-15 14:16:08 +02:00
Ghostkeeper
3110349f5e
Fix misunderstood translation
Literally it should've been 'weergavenaam', but I'm now opting for a less literal translation because weergavenaam sounds so weird.

Contributes to issue CURA-4113.
2017-08-15 14:15:51 +02:00
Cláudio Sampaio (Patola)
0449e4e63a Updated brazilian portuguese translation 2017-08-15 09:06:50 -03:00
Ghostkeeper
59058ad77f
Merge branch '2.7' 2017-08-15 11:24:00 +02:00
Ghostkeeper
1f778e8d2f
Fix translated replacement strings
Bad translators! Bad! It even says so in the context!

Contributes to issue CURA-4113.
2017-08-15 11:13:48 +02:00