666 Commits

Author SHA1 Message Date
fieldOfView
74fe281e1d Sync currently selected preset between visibility-page and -menu 2018-02-09 18:54:04 +01:00
fieldOfView
f79e787f2c Refactor SettingVisibilityProfiles to SettingVisibilityPresets
This is closer to the current Cura intend
2018-02-09 09:01:39 +01:00
fieldOfView
080979caeb Move setting visibility presets into a model
Handling of "Custom" is still under consideration
2018-02-08 23:07:45 +01:00
fieldOfView
872efd16b2 Fix selecting presets from menu
Switching back to Custom is not yet implemented, and the menu selection does not yet change if the preset is changed in the preferences
2018-02-08 17:13:59 +01:00
fieldOfView
69d7bf4130 Merge branch 'master' into feature_setting_visibility_profiles 2018-02-08 16:06:48 +01:00
Diego Prado Gesto
81488e0bbc Merge branch '3.2' 2018-01-31 09:13:29 +01:00
Diego Prado Gesto
3981b717a8 CURA-4881 Remove the automatic option for buildplates 2018-01-30 13:31:14 +01:00
Diego Prado Gesto
e227ab5a23 CURA-4881 Remove the automatic option for buildplates if there is no information about them 2018-01-30 13:29:28 +01:00
Diego Prado Gesto
b7093e8b57 Make the menu separator only show if there are quality changes profiles 2018-01-30 11:26:01 +01:00
fieldOfView
259b1091f6 Fix QML errors building the material and nozzle menus
Since the network rewrite, outputdevices no longer have hotends and materials. This functionality may return, but until that time this does a better job at checking if the properties exist, preventing QML errors.
2018-01-17 19:36:20 +01:00
Diego Prado Gesto
de98a62dc8 CURA-4461 Read buildplate id from the printer and set the automatic
option
2018-01-11 13:03:35 +01:00
Diego Prado Gesto
10320b7f2e CURA-4461 Remove debug outputs 2018-01-10 17:05:22 +01:00
Diego Prado Gesto
cea9f359cd CURA-4461 Set active buildplate in the global container stack when is
changed in the UI.

Add a new setting for distinguish between types of build plates.
2018-01-10 14:05:38 +01:00
Diego Prado Gesto
fd46f6968b CURA-4461 Show nozzles and buildplates separately depending on the
hardware_type metadata in variants
2018-01-10 11:42:43 +01:00
Diego Prado Gesto
2613b4d1a3 CURA-4461 Add menu item for build plates 2018-01-09 16:08:30 +01:00
Diego Prado Gesto
becb0cf7b9 CURA-4461 Add dropdown menu in the UI for selecting the buildplate if
the printer has different buildplates.
2018-01-09 15:42:10 +01:00
Jack Ha
164e5fdc8e CURA-4525 change active build plate if that build plate does not exist anymore; disable context menu items for build plates when no selection 2018-01-08 13:55:42 +01:00
Jack Ha
4f224a4311 CURA-4525 do not show build plate view item when disabled 2018-01-04 16:12:39 +01:00
fieldOfView
9730c25ec6 Fix showing the normal set 2018-01-04 14:29:40 +01:00
fieldOfView
503c612509 Add (non-functional) items for changed settings (user-changes) and current profile settings 2018-01-04 11:21:44 +01:00
fieldOfView
3f11b8a756 Merge branch 'master' into feature_setting_visibility_profiles 2018-01-04 11:06:51 +01:00
Jack Ha
a5d9aac91b CURA-4525 placed view menu items in Build Plate submenu 2018-01-04 10:32:54 +01:00
Jack Ha
8854a28d56 CURA-4525 solved merge conflict 2018-01-04 10:24:30 +01:00
Aleksei S
49ae078396 Adjust 3d view and add Camera View to the menu bar
CURA-4642
2018-01-03 16:45:26 +01:00
Jack Ha
62487e8ea2 CURA-4525 cleanups and change comment and added new-lines 2018-01-03 15:41:08 +01:00
Jack Ha
bfa33c721c CURA-4525 solved merge conflicts 2018-01-03 13:52:55 +01:00
Lipu Fei
f6168c07f0 Fix material_diameter bindings for metarial menu and page
CURA-4708
2018-01-03 11:27:30 +01:00
Jack Ha
fda4badab1 Checked build plates in context menu now actually match the selected item's build plates; changed collapse arrow. CURA-4525 2017-12-21 15:08:46 +01:00
Jack Ha
5152b2ae65 Solved merge conflicts. CURA-4525 2017-12-21 10:52:51 +01:00
Jack Ha
f28846acb9 Merge branch 'master' into CURA-4234_expand_collapse 2017-12-12 15:43:32 +01:00
Aleksei S
300f29e11b Add expand button to menu
CURA-4234
2017-12-11 15:30:13 +01:00
Ghostkeeper
1029d4509c
Merge branch 'master' into feature_local_container_server 2017-12-08 16:03:05 +01:00
ChrisTerBeke
9b4b6b2eae Remove sidebar views from views menu 2017-12-06 09:44:59 +01:00
ChrisTerBeke
e8f1073af8 Add menu seperator 2017-12-04 12:48:07 +01:00
ChrisTerBeke
4ef39ca313 Add sidebar views menu item and expose model to QML 2017-12-04 12:47:08 +01:00
Ghostkeeper
dad99f5292
Merge branch 'master' into feature_local_container_server
Contributes to issue CURA-4243.
2017-11-29 13:06:08 +01:00
Ghostkeeper
e0f0e098ff
Use MaterialsModel for materialsModel
This specialized InstanceContainersModel has an override that makes the model a bit more efficient when non-materials get their metadata updated.

Contributes to issue CURA-4243.
2017-11-27 09:54:40 +01:00
Jack Ha
e2a663992c CURA-4525 Added an option to turn on the UI elements of multi build plate 2017-11-15 17:00:19 +01:00
Jack Ha
bd8aa8d989 CURA-4525 automatic build plate menu items using BuildPlateModel 2017-11-14 14:27:46 +01:00
Jack Ha
5b368fbfd5 CURA-4104 added first sucky build plate selection options 2017-11-06 14:03:03 +01:00
ChrisTerBeke
e7f1900f71 Remove layer height from custom profiles in dropdown as it might have changed - CURA-4482 2017-10-31 14:01:15 +01:00
Chris ter Beke
9806ec7374 Resolve merge conflicts with master - CURA-4482 2017-10-31 09:22:03 +01:00
ChrisTerBeke
d718e6e36c Create extruder stack for single extruder machines on start - CURA-4482 2017-10-31 09:08:20 +01:00
Diego Prado Gesto
92ac7c5a15 Merge branch 'CURA-4451_not_support_container' 2017-10-26 16:55:17 +02:00
ChrisTerBeke
b1a4c3488f Merge branch 'master' into CURA-4451_not_support_container 2017-10-26 09:48:52 +02:00
Chris ter Beke
b95ba24530 Remove some changes, debugging - CURA-4451
WIP - CURA-4451

correctly show not supported when any of the extruders has a not supported profile - CURA-4451

Clean up and add comments - CURA-4451
2017-10-26 09:23:27 +02:00
fieldOfView
078fd074e5 Add initial menu stub 2017-10-26 00:00:07 +02:00
Diego Prado Gesto
87ba4056ee CURA-4485 Minor changes 2017-10-25 13:55:30 +02:00
fieldOfView
ff847aa329 Fix qml error when there is no connected printer
Also fixes code style
2017-10-25 11:52:43 +02:00
Diego Prado Gesto
0eedfa5c18 CURA-4485 Disabling automatic material and variant when connecting to a
printer within a cluster of more than 1 printer.
2017-10-24 15:45:20 +02:00