Lipu Fei
40d3e09d90
Merge remote-tracking branch 'origin/master' into CURA-5059_reset_icon_visibility
2018-03-13 10:25:01 +01:00
Ghostkeeper
b4a40915bb
Code style: Brackets on new line
...
Contributes to issue CURA-4606.
2018-03-13 09:28:01 +01:00
Ghostkeeper
d904f677bc
Store extruder position of quality groups as int
...
Instead of as a string with a number in it.
For the actual global stack's extruders we still need to convert to string, sadly. I could go refactor that too, but then I won't be going home until 23 o'clock or something.
Contributes to issue CURA-4606.
2018-03-12 17:08:13 +01:00
Mark
981c47ed87
Put the support extruder dropdown behind the checkbox to prevent scrolling
2018-03-12 17:03:10 +01:00
Aleksei S
7574ab0883
Connect infill Lines checkbox did not work
2018-03-12 15:52:16 +01:00
Aleksei S
c3b659c5d4
Fix: reset icon dissapears for default values
...
CURA-5059
2018-03-12 15:15:19 +01:00
Diego Prado Gesto
96fcfd9e2f
Merge branch 'feature_sync_button' of github.com:Ultimaker/Cura into feature_sync_button
2018-03-12 15:11:11 +01:00
Ian Paschal
a5ba4799f0
CURA-4870 Final icon changes from Luke
2018-03-12 14:48:39 +01:00
Diego Prado Gesto
cc009a94ee
CURA-4870 Remove "check compatibility" message.
...
Move the buildplate information to the bottom, below the extruders.
2018-03-12 14:19:06 +01:00
Diego Prado Gesto
ec2201b57c
CURA-4870 Move the printer type and the buildplate selector to the top
...
of the sidebar and set them separate from the extruder related
selectors.
2018-03-12 11:57:53 +01:00
Jack Ha
552618fcd4
CURA-4400 added function to find model index by extruder position in SettingExtruder
2018-03-12 09:56:08 +01:00
Jack Ha
d70cc072e9
Merge branch 'master' into feature_enable_disable_extruder
2018-03-12 09:06:24 +01:00
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
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
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
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
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
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
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
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
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
