Commit graph

12854 commits

Author SHA1 Message Date
Arjen Hiemstra
6847365e09 Indicate the UM2+ should use machine specific materials and qualities
Contributes to CURA-1612
2016-06-02 08:10:55 +02:00
Arjen Hiemstra
2b91e3639e Add basic ABS and CPE material profiles
Contributes to CURA-1612
2016-06-02 08:10:55 +02:00
Arjen Hiemstra
ceb21ce89b Filter material/quality by machine only when we should filter
Contributes to CURA-1612
2016-06-02 08:10:55 +02:00
Arjen Hiemstra
803dcdcec7 Stop the Item's hover timer when showing a different tooltip 2016-06-02 08:10:55 +02:00
Arjen Hiemstra
d5aa75f2cf Remove obsolete file 2016-06-02 08:10:55 +02:00
fieldOfView
ed3d01ed7b Add icon to Machine category to squelch some warnings
CURA-1278
2016-06-02 06:38:57 +02:00
fieldOfView
907de8b586 Improve performance of advanced sidebar
Prevent a delegate being loaded when the item is "filtered out" by the model.
CURA-1278
2016-06-02 00:01:08 +02:00
fieldOfView
7d65475bf9 Fix mouseover highlight of checkbox settings
CURA-1278
2016-06-01 23:59:09 +02:00
fieldOfView
c6dd9d2c8c Fix codestyle and change faux-"hovered" property mechanism
hovered_ex was a bool property that was set in onEntered and onExited, and has been replaced with an alias to the mouseArea.containsMouse that necessitated the clutch.

CURA-790
2016-06-01 22:21:12 +02:00
fieldOfView
ffa6a0376d Fix typo
Contributes to CURA-1540, CURA-1278
2016-06-01 21:44:56 +02:00
Jaime van Kessel
6164112bf2 Setting textfield now updates correctly, even when mouse is hovering another text field.
CURA-1278
2016-06-01 13:35:09 +02:00
fieldOfView
2a288cd7a2 Fix typo causing a minor error when opening MaterialsPage.qml
CURA-339
2016-06-01 11:51:42 +02:00
fieldOfView
38c9d9e4a1 Fix highlighting the currently active (printer|quality|material) on their management pages
CURA-1278
2016-06-01 10:47:04 +02:00
Tim Kuipers
3953da7a50 JSON fix: support roof speed was visible when roof enabled but support not (CURA-1498) 2016-05-31 18:13:47 +02:00
Arjen Hiemstra
3b51c3d339 Remove qmldir from qml resources and use proper Cura namespace for everything
Since we now properly expose all the qml files in the Cura namespace
we should also use it from there.
2016-05-31 18:07:33 +02:00
fieldOfView
21e8dd151e Prevent removing the last printer, disable Activate button for current active printer
Fixes CURA-1631
2016-05-31 15:48:08 +02:00
Jaime van Kessel
29ed8c2f5b Increased width of per-object settings panel
CURA-1278
2016-05-31 11:33:02 +02:00
Ghostkeeper
932eefeb0e Correct data type for extruder number setting
This caused a crash. Stupid mistake.
2016-05-30 17:05:15 +02:00
fieldOfView
0c7b417244 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-05-30 16:45:57 +02:00
fieldOfView
b1419d8028 Fix activating (quality)profiles on the profiles page
CURA-1278
2016-05-30 16:45:36 +02:00
Arjen Hiemstra
d616a72bb1 Display affects/affected by in the tooltip again
Contributes to CURA-1278
2016-05-30 16:25:20 +02:00
Tim Kuipers
2932558a90 Merge branch 'master' into feature_accelerations_and_jerk_per_feature_settigns_rework 2016-05-30 14:56:44 +02:00
Tim Kuipers
b8df3825f6 JSON fix: remove visible property (and add visibility defaults (CURA-1443)
for acceleration and jerk settings
2016-05-30 14:54:33 +02:00
Tim Kuipers
d67bd1015e JSON fix: visible wasn't inside metadata (CURA-1443) 2016-05-30 14:50:09 +02:00
Tim Kuipers
6b5e72de72 JSON refactor: inherit_function ==> default for acceleration and jerk (CURA-1443) 2016-05-30 14:42:01 +02:00
Tim Kuipers
4f793d2fc5 JSON fix: default ==> default_value for acceleration and jerk (CURA-1443) 2016-05-30 14:41:04 +02:00
Tim Kuipers
c80e3fa62a JSON fix: min_value ==> minimum_value (and for max) for acceleration and jerk settings (CURA-1443) 2016-05-30 14:37:57 +02:00
Tim Kuipers
7742073818 Removed old dual_extrusion_printer.json which wass reintroduced due to faulty merge. (CURA-1443) 2016-05-30 14:34:32 +02:00
Tim Kuipers
871d4087b0 JSON refactor: moved dual extrusion acceleration and jerk settings to new .def.json (CURA-1443) 2016-05-30 14:32:58 +02:00
Tim Kuipers
0e7c34c883 JSON refactor: moved dual category to above meshfix (CURA-1443) 2016-05-30 14:32:15 +02:00
Ghostkeeper
19695a93b5
Move extruder trains to metadata
Uranium doesn't know about extruder trains so it can't load that. Cura doesn't have access to anything outside of metadata or settings. So I'm putting it into metadata.

Contributes to issues CURA-1278 and CURA-351.
2016-05-30 14:27:04 +02:00
Arjen Hiemstra
8039184c18 Move setting error checking to StartSliceJob and allow the job to return a proper response
Now the job can determine if we can continue with slicing or not and if
not, why not.

This also means we can now show a message when we cannot find any
slicable objects.

Contributes to CURA-1278
2016-05-30 13:03:06 +02:00
Arjen Hiemstra
c63eb3871c Account for the changes to BackendState in Uranium
Contributes to CURA-1278
2016-05-30 12:22:12 +02:00
fieldOfView
472012a5b9 Fix debug code introduced in f5fce51238 2016-05-27 17:46:53 +02:00
fieldOfView
5927aa5578 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-05-27 17:21:32 +02:00
fieldOfView
6aa00a951f Fix triggering actions from the extensions menu
Contributes to CURA-1540, CURA-1278
2016-05-27 17:21:14 +02:00
Ghostkeeper
525f608b24 Remove reference to machine_extruder_count
This setting is not defined in this definition so it can't find the value of it here. I've re-introduced the maximum_value statically in the Jedi implementations of this setting.

Contributes to issue CURA-1278 and CURA-351.
2016-05-27 17:18:52 +02:00
fieldOfView
f5fce51238 Fix "Defaults" button on General page
CURA-1278
2016-05-27 17:11:54 +02:00
Tim Kuipers
aa2d09aa08 JSON lil fix: superflious comma (CURA-1616) 2016-05-27 12:44:49 +02:00
fieldOfView
64a613f407 Fix "Activate" button on the Manage Printers page
CURA-1278
2016-05-27 11:47:50 +02:00
Tim Kuipers
16450ec614 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-05-26 17:11:52 +02:00
Tim Kuipers
214d385dae fix: moved extruder definition settings to a new file fdmextruder.def.json (CURA-1616) 2016-05-26 17:11:41 +02:00
Jaime van Kessel
c2a25b131e Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-05-26 15:35:51 +02:00
Jaime van Kessel
c814e47b0e SettingView now works with PreferenceVisibility handler
CURA-1278
2016-05-26 15:35:28 +02:00
Arjen Hiemstra
4fc1407c00 Update variant profiles to use the right syntax for formulas
Contributes to CURA-1278
2016-05-26 15:32:08 +02:00
Arjen Hiemstra
43ec037c55 Do not load ComboBox items asynchronously
Since there is a bug with Qt 5.5 that will do strange reordering.

Contributes to CURA-1278
2016-05-26 15:29:56 +02:00
Arjen Hiemstra
8804c2837f Make reset and restore default buttons work properly again
Contributes to CURA-1278
2016-05-26 15:28:57 +02:00
Arjen Hiemstra
5975fa1b0d Fix enabled state of setting items
Contributes to CURA-1278
2016-05-26 13:29:56 +02:00
fieldOfView
f7f9dc036e Show correct page when opening profile manager
CURA-1278
2016-05-26 09:42:44 +02:00
fieldOfView
f0b956c3c6 Add selection "tab" for active extruder
Only visible for multi-extrusion printers. Doesn't do anything but setting a qml property, but is to be used to change the variant/material per extruder, and to apply a filter to the advanced mode settings.

CURA-340
2016-05-26 09:42:31 +02:00