9613 Commits

Author SHA1 Message Date
Jaime van Kessel
121fc17064 Multiply objects dialog is now application modal
CURA-3768
2017-07-20 15:15:03 +02:00
Jaime van Kessel
6e55bf2d8f If output device has a contorl item, that one is used.
If a printerOutput device does not define anything, the fallback is used.

CURA-4057
2017-07-20 13:30:57 +02:00
Tim Kuipers
d25e227707 Merge branch 'master' into top_most_skin_feature 2017-07-20 12:37:48 +02:00
Arjen Hiemstra
b839cb74f4 Do not only check if activeMaterialId is None, also check for empty
Fixes CURA-4065
2017-07-20 12:01:21 +02:00
Jaime van Kessel
216b1a7a14 Added control item to printOutputDevice
CURA-4057
2017-07-20 11:39:12 +02:00
Lipu Fei
22c1a118a8 Fix conflict detection when there is no definition_changes
CURA-4053

An old project file doesn't have the definition_changes container in the
stacks. When this is the case, Cura should also check if the definition
changes container in an existing stack is empty or not for project file
loading conflict detection.
2017-07-20 10:28:09 +02:00
Ghostkeeper
d4824a8ff1
Make time estimates tooltip also appear on clock icon
Perhaps that reduces the complaints we have about that thing not appearing.
2017-07-20 09:43:31 +02:00
Ghostkeeper
007b529f00
Make capitalisation use more consistent
At least with the Polish translation itself.

Contributes to issue CURA-3998.
2017-07-20 09:00:38 +02:00
Lipu Fei
356b3cf0ca Remove unnecessary code
CURA-4053
2017-07-19 16:44:04 +02:00
Lipu Fei
9288f408e5 Correctly detect old project files for conflicts
CURA-4053

- In Cura 2.5, there is no definition_changes in the stack. This is now
  taken into account when doing conflicts detection.
- In Cura 2.5, we have empty containers named as "empty_variant" and
  such. Those are now properly handled in conflict detection.
2017-07-19 16:39:04 +02:00
Lipu Fei
7148c71877 Change extruder stacks for conflicts only if the global stack is found
CURA-4053

If the global stack is not found, we assume the machine is not there and
default to create a new one. If the machine is found and there is not
conflicts, then we check the extruders associated for conflicts.
2017-07-19 16:35:52 +02:00
Lipu Fei
3474bb0738 Fix project conflict resolving for global stack and extruder stacks
CURA-4053

- Fix that if the resolve strategy is new for machine, Cura should
  always create new global and extruder stacks
- Fix possible duplicated IDs when "Create New" machine is selected
2017-07-19 15:20:29 +02:00
Lipu Fei
834fd055b6 Fix conflict resolve strategies in project loading
CURA-4053

When loading a project file:

- Only check if the global stack exists to detect conflicts instead
  of checking the global stack and the extruder stacks. It can happen
  that the global stack exists while the extruder stacks not or the
  other way around.

- Always assign a resolve strategy to container(s). There can be
  "None" strategies and those were not handled correctly.
2017-07-19 14:48:11 +02:00
Jaime van Kessel
e45d045880 Merge branch 'mb-fix-gcodeArea' of https://github.com/smartavionics/Cura 2017-07-19 09:50:49 +02:00
Ghostkeeper
d595e76a88
Add instructions for creating translations
Contributes to issue CURA-3998.
2017-07-18 15:56:28 +02:00
Ghostkeeper
54ef959cfc
Fix translation of 'Polish'
Yeah, Wikipedia wasn't very clear on that.

Contributes to issue CURA-3998.
2017-07-18 14:06:44 +02:00
Ghostkeeper
515ec0d2d9
Add missing space
Contributes to issue CURA-3998.
2017-07-18 13:57:40 +02:00
Ghostkeeper
b2853ef139
Add Polish language to drop-down
The translation is complete for 2.6 (albeit apparently wrong in several places). It is not yet complete for master, but that will come during the translation update for the 2.7 beta.

Contributes to issue CURA-3998.
2017-07-18 13:46:10 +02:00
Ghostkeeper
188b45791b
Small consistency fixes for Polish translation
I hope I wasn't overzealeous.

Contributes to issue CURA-3998.
2017-07-18 13:10:17 +02:00
Ghostkeeper
c1a68379f5
Clarify context of automatic nozzle detection translation string
Otherwise a translator will only see 'Automatic: %1', '%1 is the value from the printer', without knowing what kind of value that is then.

Found while working on CURA-3998.
2017-07-18 13:10:17 +02:00
Ghostkeeper
390981bbb5
Fix superfluous space in translated text
Found while working on CURA-3998.
2017-07-18 13:10:17 +02:00
Ghostkeeper
dbcf50162f
Fix spelling of combined English words
Contributes to issue CURA-3998.
2017-07-18 13:10:17 +02:00
Ghostkeeper
3c545ba7c9
Clarify context of print info bounding box size translation
Lots of translators did this wrong.

Contributes to issue CURA-3998.
2017-07-18 13:10:16 +02:00
Ghostkeeper
de8a700bd4
Fix spelling of statistics sending message
Found while working on CURA-3998.
2017-07-18 13:10:16 +02:00
Ghostkeeper
500211941a
Fix spelling of 'Volumatric'
Contributes to issue CURA-3998.
2017-07-18 13:10:16 +02:00
Arjen Hiemstra
573d25982e Minor cleanup of SettingOverrideDecorator
We never use the _instance variable except in deepcopy, so no need to
store that.

Contributes to CURA-3719
2017-07-18 11:23:43 +02:00
Ghostkeeper
8fb21b39ad
Correct metadata of Polish translations
The correct author, etc.

Contributes to issue CURA-3998.
2017-07-18 10:47:24 +02:00
Ghostkeeper
794a0e806c
Add Polish translations
Courtsey of @jagus85 and the guys over at reprapy.pl. These files are either directly copied from the e-mail (cura.po) or first converted from .mo to .po files and then copied (.def.json.po files). They have not been finalised yet. In particular their metadata is quite wrong, so I'll do that next.

Contributes to issue CURA-3998.
2017-07-18 10:38:12 +02:00
Lipu Fei
18fddf50c7 Add type hinting for container_id in ExtruderStack
CURA-4049
2017-07-18 09:22:45 +02:00
Lipu Fei
024f2384e0 Fix mutable arg problem and rename arg
CURA-4049
2017-07-18 08:32:22 +02:00
Mark Burton
f66bbf0dac Fix recently broken setting of gcode area value property setting on focus loss. 2017-07-17 22:01:43 +01:00
Tim Kuipers
83f6dec28d rename roofing settings: topmost_skin => roofing (CURA-3940) 2017-07-17 15:51:36 +02:00
Tim Kuipers
141543d7ca don't enable roofing by default (CURA-3940) 2017-07-17 15:32:57 +02:00
Tim Kuipers
26ac70d2bd feat: topmost_skin_angles (CURA-3940) 2017-07-17 15:16:11 +02:00
Tim Kuipers
9dcb2c918e fix: disable topmost skin settings if there is no top skin (CURA-3940) 2017-07-17 14:46:24 +02:00
Tim Kuipers
7b56ba41b1 fix: topmost_skin_extruder_nr enabled function (CURA-3940) 2017-07-17 14:46:24 +02:00
Tim Kuipers
89cafc867e cleanup: remove superfluous value equal to default_value (CURA-3940) 2017-07-17 14:46:24 +02:00
Tim Kuipers
c91d11fde3 fix: make ironing inherit from topmost_skin rather than top_bottom (CURA-3940) 2017-07-17 14:46:24 +02:00
Tim Kuipers
4754fd51ad feat: topmost skin: Roofing settings (CURA-3940) 2017-07-17 14:46:24 +02:00
Tim Kuipers
6fc824abd5 fix: make line width factor layer 0 an extruder setting (CURA-4027) 2017-07-17 14:46:00 +02:00
Lipu Fei
3c663d576c Do not save setting_version when serializing an XML material
CURA-4053

setting_version is derived from the "version" tag in the XML material
schema.
2017-07-17 13:54:22 +02:00
Lipu Fei
ecdf0bbe33 Fix setting_version in metadata for XMLMaterial
CURA-4053
2017-07-17 13:40:12 +02:00
Lipu Fei
63b71b8661 Fix typo in comments 2017-07-17 13:39:03 +02:00
Lipu Fei
e6ce98b36d Make machine_nozzle_offset is not None before using it
CURA-4053
2017-07-17 13:01:15 +02:00
Jaime van Kessel
afe5f56862 If a default color is used, the layer view now correctly uses it. 2017-07-17 11:44:54 +02:00
Jaime van Kessel
53cec3bea4 Merge branch 'master' of github.com:Ultimaker/Cura 2017-07-17 11:10:42 +02:00
Jaime van Kessel
99b236c8d4 Removed "fix" that caused project files to create new instances if there was no conflict.
The overriding doesn't make any sense. The original commit mentions that it should fix something, but it doesn't acutally fix it. It seems
the original issue was fixed in the proper place, leaving this code to mess everything up.

CURA-3756
2017-07-17 11:08:31 +02:00
Lipu Fei
68989f2871 Use optional arg in serialize() to exclude network auth keys
CURA-4049
2017-07-17 11:04:08 +02:00
Ghostkeeper
7f1dfcf433
Move prime tower more left
Otherwise it intersects with one of the clips on some profiles.
2017-07-14 15:57:08 +02:00
Ghostkeeper
19d9f37bc5
Also subtract support horizontal expansion from prime tower Y position
*&@#
2017-07-14 13:43:05 +02:00