Commit graph

3694 commits

Author SHA1 Message Date
Jaime van Kessel
8b46dd197f Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-01 09:52:52 +02:00
Jaime van Kessel
aaae2aa3d5 Minor check machine action GUI improvements
CURA-1385
2016-07-01 09:51:54 +02:00
fieldOfView
58ae1e923c Prevent warning when no printer is connected.
CURA-1036
2016-06-30 19:13:46 +02:00
fieldOfView
a7939c6f3d Fix empty material/quality profiles when switching variants
CURA-1278
2016-06-30 18:53:50 +02:00
Arjen Hiemstra
eb48a4e768 Set the new metadata when editing a material
Contributes to CURA-342
2016-06-30 17:32:43 +02:00
Arjen Hiemstra
ded4c89cb5 Ensure metadata changes are propagated to the related containers
Now we properly serialize the new metadata

Contributes to CURA-342
2016-06-30 17:32:10 +02:00
Arjen Hiemstra
92d3bea229 Add a setContainerMetaDataEntry to ContainerManager
So that we can set metadata from QML

Contributes to CURA-342
2016-06-30 17:31:19 +02:00
Arjen Hiemstra
8badb061da Check for definition_id, not variant name
Since the dict is supposed to be per definition

Contributes to CURA-342
2016-06-30 15:08:00 +02:00
Arjen Hiemstra
343280103f Fix GUID of materials
Contributes to CURA-342
2016-06-30 15:07:17 +02:00
fieldOfView
dc2384c92d Disable monitor buttons when there is no job running
CURA-1036
2016-06-30 11:15:32 +02:00
fieldOfView
43a3ea853a Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-30 11:03:17 +02:00
fieldOfView
3ea4983a23 Move message stack "above" the viewport overlay
CURA-1036
2016-06-30 11:02:15 +02:00
fieldOfView
7ec605579e Introduce printing/busy status and make monitor i18n-aware
CURA-1036
2016-06-30 10:20:19 +02:00
fieldOfView
7d962e97c4 Change monitor progress to percentages
CURA-1036
2016-06-30 10:18:10 +02:00
Simon Edwards
551dc7d757 Fixes for the problem where duplicated objects were broken, missing hull 'shadows' or would fly off the build plate.
Contributes to CURA-1504 Improve performance/simplicity by using Convex Hulls in Scene Graph
2016-06-30 09:35:41 +02:00
Arjen Hiemstra
26f7ba0a74 Fix up XmlMaterialProfile::serialize so we can properly serialize duplicated materials
We now use GUID to look up all containers belonging to a material. In
addition, we handle the multiple containers better

Contributes to CURA-342
2016-06-30 01:57:58 +02:00
Arjen Hiemstra
ee0160075e Override InstanceContainer::duplicate in XmlMAterialProfile
So that we can set a new GUID for the material on duplicate

Contributes to CURA-342
2016-06-30 01:55:53 +02:00
Arjen Hiemstra
419326132f Use ContainerPropertyProvider to provide properties for the materials page
Contributes to CURA-342
2016-06-30 01:54:58 +02:00
Arjen Hiemstra
3798a6e26a Update MaterialsPage with the new way of handling buttons
Contributes to CURA-342
2016-06-30 01:54:25 +02:00
Arjen Hiemstra
cd8bc3b60d Introduce a ContainerManager class to handle container actions like duplicate
Because MachineManager is getting rather large

Contributes to CURA-342
2016-06-30 01:53:48 +02:00
Tim Kuipers
4885238103 JSON feat: machine_min_cool_heat_time_window (CURA-1783) 2016-06-29 14:53:13 +02:00
Tim Kuipers
911f80f237 JSON refactor: OCD told me to mode the 'label' property to the top of each machine setting 2016-06-29 14:52:39 +02:00
Arjen Hiemstra
f7e4b91569 Update styling of Material management page
Contributes to CURA-342
2016-06-28 17:44:19 +02:00
Arjen Hiemstra
47079dc2dd Start enabling some material management things 2016-06-28 17:43:52 +02:00
Arjen Hiemstra
0270aecdc3 Replace separate machine/profile menus in menubar with a single "Settings" menu
Contributes to CURA-342
2016-06-28 17:43:28 +02:00
Arjen Hiemstra
1a56da464c Introduce a "Manage Materials" action
Contributes to CURA-342
2016-06-28 17:42:47 +02:00
Arjen Hiemstra
842015ea10 Move all the menus to individual QML files to make it easier to reuse them
Contributes to CURA-342
2016-06-28 17:32:50 +02:00
Arjen Hiemstra
a746710e26 Introduce a MaterialSettingsVisibilityHandler that will only show those settings relevant for materials
Contriubtes to CURA-342
2016-06-28 17:30:46 +02:00
Ghostkeeper
ac0f743855
Clarify descriptions of jerk settings
This description was established after discussion with several mechanics guys as well as BagelOrb, FieldOfView and RobinMDH.
2016-06-28 17:28:44 +02:00
fieldOfView
9ac5b0ecf7 Fix warning about property id of null in Cura.qml
CURA-1585
2016-06-28 17:04:28 +02:00
fieldOfView
540cc55b65 Fix warning about unknown property "index" in SidebarHeader
CURA-333
2016-06-28 16:59:00 +02:00
fieldOfView
e6bc28c30c Replace "Shell" category icon 2016-06-28 16:08:38 +02:00
Simon Edwards
47de254f97 Fixed up the 3MF reader to use the changed MeshBuilder and MeshData.
CURA-1633 OverflowError: cannot convert float infinity to integer (loading larger models)
2016-06-28 11:43:02 +02:00
Jaime van Kessel
1543e4a6e0 Merge branch 'feature_zhop_over_other_material' of github.com:Ultimaker/Cura 2016-06-28 11:34:25 +02:00
Ghostkeeper
ae9c84c4fb Merge pull request #828 from Ultimaker/thopiekar-print-via-usb-text
Better call it "Print via USB"
2016-06-28 11:21:54 +02:00
Jaime van Kessel
0a3f64ef51 Switching stack now removes focus from all elements
Fixes CURA-1778
2016-06-28 10:55:20 +02:00
fieldOfView
05ff256af4 Add an icon for the experimental category
CURA-1284
2016-06-28 08:56:55 +02:00
Aldo Hoeben
605354272d Merge pull request #830 from thopiekar/master-CURA-1284-new
CURA-1284: Changing icon for experimental category
2016-06-28 08:47:34 +02:00
Aldo Hoeben
d1b1741d67 Merge pull request #822 from Ultimaker/feature_print_monitoring
Print monitor
2016-06-28 08:13:50 +02:00
Thomas Karl Pietrowski
fa36197574 CURA-1284: Changing icon for experimental category
Needs an icon in resources/themes/cura/icons
2016-06-27 23:21:07 +02:00
Tim Kuipers
214ffbb0bd JSON fix: all retraction settings now only retrievable per extruder (CURA-303) 2016-06-27 15:22:45 +02:00
Arjen Hiemstra
68a8bcb009 Fix width of materials properties tab 2016-06-27 13:33:38 +02:00
Ghostkeeper
0e053838b8
Add definition for Mankati Fullscale XT+
Provided by Tinkerman on http://www.thingiverse.com/thing:1643782 and translated for use in Cura 2.2.
2016-06-27 10:38:30 +02:00
fieldOfView
612888c9fb Remove remnant code
CURA-1036
2016-06-27 10:25:02 +02:00
Thomas Karl Pietrowski
d376719500 Better call it "Print via USB"
I think this sounds better, because I understand "USB" as an technology. So you wouldn't say "Print with USB", but would fit if you say "Print with USB cable". So "Print via USB" should be more correct here.
2016-06-27 09:48:16 +02:00
Ghostkeeper
e8f3619c1b Merge pull request #825 from TZanke/patch-1
support prints up to 15cm width with GRR NEO Printer
2016-06-27 01:12:15 +02:00
Tobias Zanke
11cb37bd11 support prints up to 15cm width
NEO Firmware moves head 1cm to the right after Y endstop is pressed. This shrinks build volume to 14cm width. With this extra commands, the head moves back to the endstop. Now 15cm width builds are possible.
2016-06-26 17:05:53 +02:00
fieldOfView
629feec3d3 Remove hack
i18nCatalog was being abused to do text replacement on HTML
2016-06-25 09:45:27 +02:00
fieldOfView
d0f100c03c Show relevant message on splash screen during startup 2016-06-25 09:45:11 +02:00
fieldOfView
2ee745e1f9 Remove hack
i18nCatalog was being abused to do text replacement on HTML
2016-06-25 09:40:22 +02:00