Commit graph

8170 commits

Author SHA1 Message Date
Diego Prado Gesto
85d6919ce6 Merge branch 'master' into feature_sync_button 2018-03-09 16:59:18 +01:00
fieldOfView
7123441db8 Fix keeping settings visible when showing all settings 2018-03-09 16:51:46 +01:00
fieldOfView
711d60e8c7 Allow switching back to the "Custom" set 2018-03-09 16:44:27 +01:00
Diego Prado Gesto
472ae8e044 CURA-4870 Create a custom model for the machines in order to show the
printers grouped by local or networked.
2018-03-09 16:35:23 +01:00
Ghostkeeper
2f1657f848
Update version numbers in variants
These didn't match on my initial search-and-replace so I missed them.

Contributes to issue CURA-5054.
2018-03-09 16:23:38 +01:00
Ghostkeeper
d8a066c1e7
Increment instance container version number instead of just quality_changes
Otherwise when we load that quality_changes file we'll deny it because the instance container version number is wrong.

Contributes to issue CURA-5054.
2018-03-09 16:14:24 +01:00
fieldOfView
4c66c935af Merge branch 'master' into feature_setting_visibility_profiles 2018-03-09 15:45:24 +01:00
Diego Prado Gesto
8a48503104 Merge branch 'feature_sync_button' of github.com:Ultimaker/Cura into feature_sync_button
Fix some conflicts
2018-03-09 15:16:21 +01:00
Diego Prado Gesto
16a5b652f4 CURA-4870 Make the machine selection toolbutton react to changes in the
output devices
2018-03-09 15:08:51 +01:00
Andreea Scorojitu
a40be0c64a Add default_build_plate to expert view, CURA-5032
The default build plate settings is now added in Expert view in SettingsVisibility
2018-03-09 14:25:35 +01:00
Ian Paschal
ae2a286e3f Improved Icons & Styling 2018-03-09 14:07:29 +01:00
Mark
af89209cde Changed rounding of prettyTime by accident 2018-03-09 14:02:04 +01:00
Diego Prado Gesto
260cad36cb CURA-4870 Add name of the group and hidden property to the network
printers. The printer menu shows the printers grouped by group and the
hidden printers are never listed.
2018-03-09 12:42:49 +01:00
Lipu Fei
3550ef80e0 Fix quality management page QML
CURA-5063
2018-03-09 11:00:39 +01:00
Diego Prado Gesto
4be4d08d97 CURA-4870 Add the ability in Cura to switch between different types of
printers. Create a new container stack if it doesn't exist with the same
network connection key.
2018-03-09 10:47:08 +01:00
Ian Paschal
c278942cec CURA-67 Don't enable by default
`value` is set to !support and !tree support, both of which are typically disabled by default, making this setting's default value effectively `true` even though the line above says the default should be `false`.
2018-03-09 10:26:48 +01:00
Ghostkeeper
a4f9c91d95
Add acceleration/jerk data for TEVO Tarantula
Thanks to @SuperBoppy in ticket #3323.
2018-03-09 09:30:32 +01:00
Diego Prado Gesto
b212781a19 Merge branch 'master' into feature_sync_button 2018-03-08 16:57:21 +01:00
Ian Paschal
a2773ca897 Animated popup 2018-03-08 16:30:05 +01:00
Jack Ha
53764a8274 CURA-4400 use extrudersEnabledCount for recommended mode's extruder number visibility 2018-03-08 15:39:23 +01:00
Jack Ha
5135a972a2 CURA-4400 code style 2018-03-08 14:32:10 +01:00
Diego Prado Gesto
1bde7a6228 CURA-4870 Set the correct version of the QtQuick.Controls to be
compliant with v5.8
2018-03-08 14:01:19 +01:00
Ian Paschal
1a57e9323b Improved status icon size 2018-03-08 12:54:59 +01:00
Ian Paschal
ffccdd99c0 Added status icon 2018-03-08 10:55:29 +01:00
Jack Ha
961b868424 CURA-4400 fix updating quality slider 2018-03-08 09:47:22 +01:00
Jack Ha
3b8d470323 Merge branch 'master' into feature_enable_disable_extruder 2018-03-08 09:35:49 +01:00
Diego Prado Gesto
4c7ec3920d CURA-4870 Reduce text size of the Machine selector menu 2018-03-08 09:25:14 +01:00
Diego Prado Gesto
86103b4a0f CURA-4870 Change text size of the selected printer 2018-03-07 22:54:03 +01:00
Diego Prado Gesto
ae5f1c3408 CURA-4870 Add line separator between machine selector and sync button 2018-03-07 22:49:27 +01:00
Diego Prado Gesto
3629c3959e CURA-4870 Match the printer type in the dropdown with one of the
available printer types in the group
2018-03-07 22:33:15 +01:00
Diego Prado Gesto
2818ff7f31 CURA-4870 Fix binding loop in some components with the height property by changing the vertical alignments 2018-03-07 19:40:44 +01:00
Ian Paschal
a02486e85a Added status icon 2018-03-07 17:15:56 +01:00
Ian Paschal
a704f59034
Merge pull request #3175 from smartavionics/mb-add-bridge-settings
Add bridge settings to experimental category.
2018-03-07 16:30:08 +01:00
Diego Prado Gesto
6abbe7381a CURA-4870 Adjust a little bit the maximum size so three printers of two
different types can fit
2018-03-07 11:26:50 +01:00
Diego Prado Gesto
bb3d706c92 CURA-4870 Adapt the size of the sync dropdown to the height of the
contents or a maximum size defined manually.
Create sections in the list view depending on the machine types that are
in the group.
2018-03-07 11:24:02 +01:00
Diego Prado Gesto
813f4e83e0 CURA-4870 Adjust colors for the selected configuration
Remove the printer icon since it doesn't look as expected
2018-03-07 09:56:38 +01:00
Jack Ha
32ce458516 CURA-4400 solved merge conflict 2018-03-06 17:05:39 +01:00
Ian Paschal
5b2ff705e7 CURA-4870 Add menu icons 2018-03-06 17:03:44 +01:00
Jack Ha
095d9fbdf6 CURA-4400 Bugfix do not handle layer scene nodes in solidview 2018-03-06 17:01:30 +01:00
Diego Prado Gesto
987794c515 CURA-4870 Update the Sync Button accordingly to changes both in the
output device or in the current configuration, in order to check wether
a configuration matches or not.
2018-03-06 16:59:51 +01:00
Jack Ha
63e679e4a0 CURA-4400 updated UM3 machine_head_with_fans_polygon 2018-03-06 16:28:00 +01:00
Diego Prado Gesto
5280d21c26 Merge branch 'master' into feature_sync_button 2018-03-06 16:10:44 +01:00
Diego Prado Gesto
f625fa8a90 CURA-4870 Add function to set the configuration from the printer back to
Cura.
Change the hash function to compare by GUID instead of type.
Show the material name instead of type in the list.
2018-03-06 16:08:50 +01:00
Lipu Fei
eb84e6aa3e Disable not supported custom profiles
CURA-5051
2018-03-06 15:47:49 +01:00
Lipu Fei
31b7374689 Fix material settings saving upon dialog close
CURA-4606

Force to trigger a lose focus on all editing fields so their
onEditingFinished callback will get triggered.
2018-03-06 13:40:32 +01:00
Lipu Fei
ff0d694e72 Select the activated material when material management page shows up
CURA-4606
2018-03-06 11:55:24 +01:00
Mark Burton
1ed5a00198 Added skin densities and layer 3 settings + tweaked various defaults. 2018-03-06 10:47:28 +00:00
Diego Prado Gesto
d11d850f7c CURA-4870 Add spacing to the list of configurations 2018-03-06 10:42:24 +01:00
Diego Prado Gesto
13e18c9d54 Merge branch 'master' into feature_sync_button 2018-03-06 10:24:11 +01:00
Diego Prado Gesto
731a1092c5 CURA-4870 Add callback function to apply remote configuration 2018-03-06 10:18:54 +01:00