11418 Commits

Author SHA1 Message Date
fieldOfView
4dea518c72 Add Upgraded Parts action for UM2 to add support for Olsson block
This adds a set of variants that just set the nozzle diameter and nozzle tip diameter. These variants are not used until the machine action sets the has_variants metadata entry.
2017-04-30 12:38:46 +02:00
fieldOfView
d12e323853 Add definition for Alya 3d printer
See https://github.com/Ultimaker/Cura/issues/1759
2017-04-30 10:53:23 +02:00
fieldOfView
577a8d0a3e Fix MaterialView layout issues
Make scrollview look more in line with the scrollview on the profiles page
2017-04-30 10:28:03 +02:00
fieldOfView
a1d9b1a37f Force update after unlinking material. 2017-04-29 21:19:54 +02:00
fieldOfView
67b8302d40 Add a notice to linked materials and allow "unlinking" a material. 2017-04-29 21:08:48 +02:00
fieldOfView
23cd6b1c2c Fix rendering of readonly description/adhesion info 2017-04-29 16:43:26 +02:00
Mark
b05954f99f Merge pull request #1740 from Ultimaker/feature_extruder_buttons
Add Extruder selection buttons to the Toolbar
2017-04-28 15:02:47 +02:00
Lipu Fei
37ec14c239 Merge pull request #1710 from alephobjects/theme-picker
Theme picker
2017-04-27 15:32:14 +02:00
Victor Larchenko
58a857403c Added resetting of theme 2017-04-27 16:37:01 +06:00
fieldOfView
02b978272f Add "Create" button to create a new, unique material.
The new custom material is still based on generic_pla, but it gets a new GUID and uses itself as base_file so it is not conjoined to another material.
2017-04-27 11:19:46 +02:00
Arjen Hiemstra
60339eb44b Minor codestyle fix 2017-04-26 16:18:23 +02:00
Arjen Hiemstra
80bf6988ca Remove unnecessary Catalog and SettingPropertyProvider 2017-04-26 16:18:14 +02:00
Arjen Hiemstra
b4f27f0af7 Remove checkable property and MouseArea in favor of onClicked on the button
It turns out, setting checkable: true causes binding breakage. Without
checkable, checked still works and we can use onClicked of the button
directly.
2017-04-26 16:17:54 +02:00
Mark
d0a95426cb Remove space.. 2017-04-26 13:19:01 +02:00
Mark
f573802e8d Fix to make the extruders line up below the label
CURA-3609
2017-04-26 13:01:14 +02:00
Lipu Fei
a5079bfcb3 Merge pull request #1726 from fieldOfView/fix_general_page_scrolling
Make the general settings page options draggable only vertically
2017-04-26 11:19:47 +02:00
Jaime van Kessel
1739abbca0 Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-26 09:56:28 +02:00
fieldOfView
0b9f451103 Apply color to layerview legend labels directly
The Label style property should not be confused with e TextField style property
2017-04-25 18:15:04 +02:00
fieldOfView
2493bd6fe6 Merge branch 'master' into themed-layer-view 2017-04-25 18:06:12 +02:00
Ghostkeeper
6e5f7ac28a
Merge branch 'feature_support_top_bottom_speed'
Contributes to issue CURA-3491.
2017-04-25 16:46:30 +02:00
Arjen Hiemstra
89e6313143 Add buttons to select the extruder for the selection to the toolbar
Contributes to CURA-3577
2017-04-25 16:11:31 +02:00
Arjen Hiemstra
48baf272b4 Fix the extruder icons to have a proper square aspect ratio
Contributes to CURA-3577
2017-04-25 16:10:44 +02:00
Arjen Hiemstra
c85f635125 Add support for overriding the background color of a Tool button
Contributes to CURA-3577
2017-04-25 16:09:51 +02:00
Lipu Fei
268a9c9bac Add priming_enabled option into fdm_printer
CURA-3634
2017-04-25 16:07:32 +02:00
Arjen Hiemstra
09f23f5f91 Styling fixes in Toolbar QML 2017-04-25 11:31:59 +02:00
Ghostkeeper
15593de404
Fix extruder number dependency of support roof pattern
It was depending on support bottom extruder.

Contributes to issue CURA-3491.
2017-04-24 17:31:07 +02:00
Jaime van Kessel
33d92f9596 Merge branch 'master' of github.com:Ultimaker/Cura into feature_extruder_buttons 2017-04-24 16:39:15 +02:00
Jaime van Kessel
01f33d3f28 Merge pull request #1732 from Ultimaker/feature_extruder_contextmenu
Add Extruders to Context Menu and Refactor
2017-04-24 14:55:57 +02:00
Ghostkeeper
2eae1cdf22
Move support roof settings above support bottom settings
This was deemed the most logical ordering.

Contributes to issue CURA-3491.
2017-04-24 14:28:10 +02:00
Arjen Hiemstra
bca27ad11f Document findItemIndex function in ContextMenu 2017-04-24 13:13:00 +02:00
Arjen Hiemstra
78603bed63 Rename setSelectionExtruder to setExtruderForSelection
This matches more closely with the naming of the other selection
actions.
2017-04-24 13:12:00 +02:00
MaukCC
dff23b0e82 Update cartesio_0.8.inst.cfg 2017-04-24 11:06:34 +02:00
fieldOfView
c1fa927118 Make the general settings page options draggable only in the vertical direction
... to match other scrollviews. Fixes #1723
2017-04-22 23:07:13 +02:00
fieldOfView
4d12ab1296 Merge branch 'master' into feature_multiextruder_machinesettings 2017-04-21 19:31:44 +02:00
Ghostkeeper
2fda85a6aa
Hide estimated time left if print is aborted or completed
In fact, only show it if a time estimate is meaningful. We keep showing the estimate while a print is paused though.

Contributes to issue TRI-1550.
2017-04-21 14:29:40 +02:00
MaukCC
36eb3579a9 Update cartesio_global_High_Quality.inst.cfg 2017-04-21 11:30:49 +02:00
MaukCC
ad4c696202 Update cartesio_global_Normal_Quality.inst.cfg 2017-04-21 11:30:39 +02:00
MaukCC
d2a948fb5c Update cartesio_global_Coarse_Quality.inst.cfg 2017-04-21 11:30:15 +02:00
MaukCC
39ac11df59 Update cartesio_global_Extra_Coarse_Quality.inst.cfg 2017-04-21 11:30:09 +02:00
MaukCC
d5190b7cf7 Update cartesio_global_Coarse_Quality.inst.cfg 2017-04-21 10:33:45 +02:00
MaukCC
2b31aab28c Update cartesio_global_Extra_Coarse_Quality.inst.cfg 2017-04-21 10:33:38 +02:00
MaukCC
25ff28041f Update cartesio_global_High_Quality.inst.cfg 2017-04-21 10:33:30 +02:00
MaukCC
d756ea5021 Update cartesio_global_Normal_Quality.inst.cfg 2017-04-21 10:33:21 +02:00
Victor Larchenko
e5eb0c9a14 Merge remote-tracking branch 'um/master' into theme-picker 2017-04-21 14:29:01 +06:00
MaukCC
319690baa6 Update cartesio_global_High_Quality.inst.cfg 2017-04-21 10:27:05 +02:00
MaukCC
7e426f96fb Update cartesio_global_Extra_Coarse_Quality.inst.cfg 2017-04-21 10:26:39 +02:00
MaukCC
c80b51ddc9 Update cartesio_global_Normal_Quality.inst.cfg 2017-04-21 10:26:28 +02:00
MaukCC
081505e967 Update cartesio_global_Coarse_Quality.inst.cfg 2017-04-21 10:26:02 +02:00
MaukCC
17408a299f Update cartesio_global_Coarse_Quality.inst.cfg 2017-04-21 10:19:44 +02:00
MaukCC
c160e4c5d6 Update cartesio_global_Extra_Coarse_Quality.inst.cfg 2017-04-21 10:19:38 +02:00