Commit graph

5354 commits

Author SHA1 Message Date
Ghostkeeper
58dba9bcb3
Dynamically get unit of layer height
If the unit of layer height would become something else than mm eventually, it'll still be correct here.

Contributes to issue CURA-2737.
2016-10-21 14:03:28 +02:00
Ghostkeeper
19678c1126
Display layer height after profile name in drop-down
There is no styling in this drop-down, as it is provided by the OS. Just a dash and the layer height will do.

Contributes to issue CURA-2737.
2016-10-21 14:00:43 +02:00
Ghostkeeper
c92ccee1e4
Add layer height role to profiles model
This layer height computation is rather complex, but because the items are now computed in a separate function, we can safely overwrite that and the update is made only once in the UI.

Contributes to issue CURA-2737.
2016-10-21 13:59:23 +02:00
Ghostkeeper
e02284b1f0
Expose determineQualityAndQualityChangesForQualityType
It is needed to get the quality belonging to a certain quality changes ID that is not on the global stack. We already had this function that does just that.

Contributes to issue CURA-2737.
2016-10-21 13:11:08 +02:00
Ghostkeeper
afd3dd6eec
Make separate theme colour for detail text
I would use the normal font colour with a lower alpha value here, but it seems that rendering text with transparency doesn't work in Qt.

Contributes to issue CURA-2737.
2016-10-21 13:06:49 +02:00
Ghostkeeper
16491d8d23
Robustly get layer height even if quality has none
If the quality profile doesn't define a layer height (which it currently always has) then this should still get the proper layer height. It proceeds properly down the stack now.

Contributes to issue CURA-2737.
2016-10-21 11:51:10 +02:00
Ghostkeeper
57b0275384
Show layer height in profile selection menu
It's shown in the 'inactive' font colour, which isn't entirely semantically correct but has the behaviour we want regardless of how the theme changes in the future.

Contributes to issue CURA-2723.
2016-10-20 17:16:06 +02:00
Ghostkeeper
021023a932
Add property to get the current profile's layer height
This will then be displayed in the profile selection menu.

Contributes to issue CURA-2723.
2016-10-20 17:14:45 +02:00
Ghostkeeper
de45d25f0b
Update material profiles for ABS
This is a weekly update from Tom.
2016-10-20 14:01:30 +02:00
Simon Edwards
d228f6ce9f CURA-2751 Change settings label "Simple" to "Recommended" 2016-10-20 12:51:19 +02:00
Ghostkeeper
aa9516451d Merge branch '2.3.1' into 2.3 2016-10-20 11:04:28 +02:00
Ghostkeeper
f799f40fee
Ignore materials folder
We should not add any new materials here.

Contributes to issue CURA-2737.
2016-10-19 15:02:36 +02:00
Ghostkeeper
35430a5e9e
Add missing Ultimaker 3 platform mesh
Forgot to commit that one.

Contributes to issue CURA-2737.
2016-10-19 14:53:09 +02:00
Ghostkeeper
1eab172f7c
Remove duplicate materials from Cura
These should get installed from the fdm_materials repository now, so it shouldn't be complaining about any missing files... Let's see what the build server thinks of that.

Contributes to issue CURA-2737.
2016-10-19 14:50:41 +02:00
Ghostkeeper
06ff2a9da6
Publish Ultimaker 3 definitions and profiles
The Ultimaker 3 is now released, so we can make this data public. These are the Ultimaker 3 definition files (with their physical properties as Cura requires them, such as build volume) as well as its extruders, print cores, quality profiles and build plate mesh. And also for the Ultimaker 3 Extended. Modifications to the material profiles will be published in the fdm_materials repository.

Contributes to issue CURA-2737.
2016-10-19 13:35:00 +02:00
Ghostkeeper
d79a3add40 Update warning for material change on printer again
It's been changed 7 times since the last update in Cura. I hope that our new UX makes up his mind.

Contributes to issue CURA-2634.
2016-10-19 13:15:52 +02:00
Ghostkeeper
6b7ecfb4e0 Update warning for material change on printer
When the material changed on the printer, this dialogue is shown. It needed to have new text.

Contributes to issue CURA-2634.
2016-10-19 13:15:52 +02:00
Ghostkeeper
2dda58a951 Update terminology of PrintCore to print core
Contributes to issue CURA-2632.
2016-10-19 13:15:52 +02:00
Ghostkeeper
f277b24290 Fix typo in English translation
Can't fix the actual typo in code due to the string freeze though.

Contributes to issue CURA-570.
2016-10-19 13:15:52 +02:00
Ghostkeeper
6434948bfd Make Dutch translation consistent
Capitalisation issues abound. Also a few translations itself.

Contributes to issue CURA-570.
2016-10-19 13:15:52 +02:00
Ghostkeeper
cea0d5165f Missed a capital letter
As did the translation bureau...

Contributes to issue CURA-570.
2016-10-19 13:15:52 +02:00
Ghostkeeper
10347011f7 Improve Dutch translation
Many consistency issues, mainly with capital letters.

Contributes to issue CURA-570.
2016-10-19 13:15:52 +02:00
Ghostkeeper
9cb3fb8990 Fix inconsistencies in Dutch translation
Only the Cura translation was checked so far...

Contributes to issue CURA-570.
2016-10-19 13:15:52 +02:00
Ghostkeeper
af5216490e Remove duplicate strings
These were giving problems when you generate the .mo files.

Contributes to issue CURA-570.
2016-10-19 13:15:52 +02:00
Ghostkeeper
cc92d22e51 Add translation for UM3NetworkPrinting plug-in
These translations have not yet been checked. I'll get to that now.

Contributes to issue CURA-570.
2016-10-19 13:15:52 +02:00
Tim Kuipers
c7c3d24974 fix: adhesion_extruder_nr moved category also for default visibility (CURA-2707) 2016-10-19 13:14:22 +02:00
Tim Kuipers
8cebaedd0c JSOn refactor: moved support extruder settings to support catgegory (CURA-2707) 2016-10-19 13:14:06 +02:00
Tim Kuipers
9780895812 JSON fix: retraction_hop_after_extruder_switch only visible for dual extrusion (CURA-2727) 2016-10-19 13:05:10 +02:00
Tim Kuipers
aad3da85e9 JSON refactor: move retraction_hop_after_extruder_switch to Travel category (CURA-2727) 2016-10-19 12:59:28 +02:00
Simon Edwards
9e6f340943 Move z hop settings to Travel category
CURA-2727
2016-10-18 15:49:03 +02:00
fieldOfView
d3e3c0c659 Fix translation of machines page and some other references to Uranium
CURA-570
2016-10-18 15:34:52 +02:00
Jack Ha
9195961806 Fixed translation of 4 words in profilespage. remains of CURA-570 2016-10-18 15:05:18 +02:00
Simon Edwards
6d1f766ef3 Fixed for the inheritance icon and custom profiles.
CURA-2674 Inheritance icon not shown for saved profile.
2016-10-18 13:18:56 +02:00
Jaime van Kessel
cc549932c4 ConvexHull decorater no longer crashes if node has no MeshData
Fixes CURA-2706
2016-10-18 11:48:23 +02:00
Jack Ha
a030b5bfc3 Fix gcode profile. CURA-2718 2016-10-18 10:26:02 +02:00
Jack Ha
0511906263 Revert "Fix gcode profile. CURA-2718"
This reverts commit deb3606429.
2016-10-18 10:18:06 +02:00
Jack Ha
deb3606429 Fix gcode profile. CURA-2718 2016-10-18 09:55:45 +02:00
Jaime van Kessel
cda8fd5827 Revert buttons now work for single extrusion machines again 2016-10-16 16:14:05 +02:00
Jaime van Kessel
95f2b84fb5 Fixed importing profiles for machines with inheritance 2016-10-16 14:20:04 +02:00
Jaime van Kessel
3afd813e5e Profiles page is now correctly updated when single extrusion machine is used 2016-10-15 19:23:07 +02:00
Jaime van Kessel
a3df53c1e1 Quality_changes are now taken into account for UM3Extended
CURA-2690
2016-10-15 18:36:05 +02:00
Jaime van Kessel
d12219cab8 Right profile is now checked again in dropdown
CURA-2690
2016-10-15 17:10:26 +02:00
Jaime van Kessel
ff24def63c Use globalProfileId to check if we need to show changed settings
CURA-2690
2016-10-15 17:05:55 +02:00
Ghostkeeper
4769b22138
Sort profiles on extruder position before exporting
In the importer the extruders are sorted on extruder position. In the exporter they need to be in the same order.

Contributes to issue CURA-2655.
2016-10-14 11:46:39 +02:00
fieldOfView
a8ebdc8e39 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-10-13 21:23:11 +02:00
fieldOfView
a291131aca Fix qml warning when no printer is connected 2016-10-13 21:18:17 +02:00
Ghostkeeper
7d53b955c1 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-13 20:56:35 +02:00
Simon Edwards
2153ee8651 Merge pull request #1042 from Ultimaker/restore_to_default_not_per_extruder
Only reset the setting for the currently selected extruder.
2016-10-13 14:53:17 +02:00
Simon Edwards
8b487130d2 Take 'linked' settings into account when reverting.
CURA-2640 Restore to default not per extruder
2016-10-13 14:33:29 +02:00
Simon Edwards
79a62ec45f Only reset the setting for the currently selected extruder.
CURA-2640 Restore to default not per extruder
2016-10-13 13:48:15 +02:00