Arjen Hiemstra
7008e047f6
Merge branch 'master' of github.com:ultimaker/Cura into feature_material_editing
...
* 'master' of github.com:ultimaker/Cura: (76 commits)
Added UMO upgrade selection
Added stubs for UMO upgrade selection
Machine action labels are now translatable
Code style CURA-1676
Using the correct placeholder
SplashScreen: Using system-default fontfamily
USBPrinting: Let's "Print via USB"
BQ Hephestos2 - Preheating temperature fix When starting a print with the "custom" GCode by BQ, the printer resets the nozzle temperature to 210°C when printing via SD card (no matter what you set on Cura) and only preheats the nozzle to 180°C when printing via USB. So currently the printer begins to print via USB at 180°C and reaches the correct temperature eg.g while printing the brim.
Fix warning about missing color in theme
Automatically show the Print Monitor when starting a print
Fix USBPrinterOutputDevice to work with the Print Monitor
Properly prevent warning when no printer is connected.
ZOffset decorator is now correctly copied
Force focus instead of requesting it.
Fix two "critical errors" on startup
Minor check machine action GUI improvements
Prevent warning when no printer is connected.
Fix empty material/quality profiles when switching variants
Disable monitor buttons when there is no job running
Move message stack "above" the viewport overlay
...
2016-07-04 11:45:59 +02:00
Arjen Hiemstra
df3275a10a
Update Machine and Profile pages with the changes made to ManagementPage
...
Since all the individual properties are removed and we now just need to
handle the buttons ourself.
Contributes to CURA-342
2016-07-04 11:43:27 +02:00
Jaime van Kessel
1242d6bf52
Added UMO upgrade selection
...
CURA-1385
2016-07-04 11:24:31 +02:00
Thomas Karl Pietrowski
cd14a15040
Using the correct placeholder
...
Thanks to Ruben!
2016-07-03 15:17:40 +02:00
Ghostkeeper
afe0104dc7
Merge pull request #838 from thopiekar/master-bq-hephestos2-preheat-workaround
...
BQ Hephestos2 - Preheating temperature fix
2016-07-03 12:41:17 +02:00
Thomas Karl Pietrowski
19a718205d
BQ Hephestos2 - Preheating temperature fix
...
When starting a print with the "custom" GCode by BQ, the printer resets
the nozzle temperature to 210°C when printing via SD card (no matter
what you set on Cura) and only preheats the nozzle to 180°C when
printing via USB.
So currently the printer begins to print via USB at 180°C and reaches
the correct temperature eg.g while printing the brim.
2016-07-01 21:27:36 +02:00
fieldOfView
b7906c9ce7
Fix warning about missing color in theme
...
CURA-1036
2016-07-01 15:26:24 +02:00
fieldOfView
087ebc0768
Automatically show the Print Monitor when starting a print
...
CURA-1036
2016-07-01 15:06:49 +02:00
fieldOfView
c9b2a1d938
Properly prevent warning when no printer is connected.
...
CURA-1036
2016-07-01 11:51:46 +02:00
Jaime van Kessel
095dbaaa8d
Merge branch 'master' of github.com:Ultimaker/Cura
2016-07-01 11:04:54 +02:00
Jaime van Kessel
91bfd2de27
Force focus instead of requesting it.
...
Fixes CURA-1778
2016-07-01 11:04:23 +02:00
Tim Kuipers
c8e61a3267
JSON feat: cubic isometric infill (CURA-1723)
2016-07-01 00:56:48 +02:00
Tim Kuipers
bcffa3f09a
JSON fix: support roof extruder could be chosen even when roofs weren't enabled (CURA-1723)
...
just putting this commit under that issue so that it will be reviewed...
2016-07-01 00:39:04 +02:00
fieldOfView
58ae1e923c
Prevent warning when no printer is connected.
...
CURA-1036
2016-06-30 19:13:46 +02:00
Arjen Hiemstra
eb48a4e768
Set the new metadata when editing a material
...
Contributes to CURA-342
2016-06-30 17:32:43 +02:00
Arjen Hiemstra
343280103f
Fix GUID of materials
...
Contributes to CURA-342
2016-06-30 15:07:17 +02:00
fieldOfView
dc2384c92d
Disable monitor buttons when there is no job running
...
CURA-1036
2016-06-30 11:15:32 +02:00
fieldOfView
3ea4983a23
Move message stack "above" the viewport overlay
...
CURA-1036
2016-06-30 11:02:15 +02:00
fieldOfView
7ec605579e
Introduce printing/busy status and make monitor i18n-aware
...
CURA-1036
2016-06-30 10:20:19 +02:00
fieldOfView
7d962e97c4
Change monitor progress to percentages
...
CURA-1036
2016-06-30 10:18:10 +02:00
Arjen Hiemstra
419326132f
Use ContainerPropertyProvider to provide properties for the materials page
...
Contributes to CURA-342
2016-06-30 01:54:58 +02:00
Arjen Hiemstra
3798a6e26a
Update MaterialsPage with the new way of handling buttons
...
Contributes to CURA-342
2016-06-30 01:54:25 +02:00
Tim Kuipers
4885238103
JSON feat: machine_min_cool_heat_time_window (CURA-1783)
2016-06-29 14:53:13 +02:00
Tim Kuipers
911f80f237
JSON refactor: OCD told me to mode the 'label' property to the top of each machine setting
2016-06-29 14:52:39 +02:00
Arjen Hiemstra
f7e4b91569
Update styling of Material management page
...
Contributes to CURA-342
2016-06-28 17:44:19 +02:00
Arjen Hiemstra
47079dc2dd
Start enabling some material management things
2016-06-28 17:43:52 +02:00
Arjen Hiemstra
0270aecdc3
Replace separate machine/profile menus in menubar with a single "Settings" menu
...
Contributes to CURA-342
2016-06-28 17:43:28 +02:00
Arjen Hiemstra
1a56da464c
Introduce a "Manage Materials" action
...
Contributes to CURA-342
2016-06-28 17:42:47 +02:00
Arjen Hiemstra
842015ea10
Move all the menus to individual QML files to make it easier to reuse them
...
Contributes to CURA-342
2016-06-28 17:32:50 +02:00
Ghostkeeper
ac0f743855
Clarify descriptions of jerk settings
...
This description was established after discussion with several mechanics guys as well as BagelOrb, FieldOfView and RobinMDH.
2016-06-28 17:28:44 +02:00
fieldOfView
9ac5b0ecf7
Fix warning about property id of null in Cura.qml
...
CURA-1585
2016-06-28 17:04:28 +02:00
fieldOfView
540cc55b65
Fix warning about unknown property "index" in SidebarHeader
...
CURA-333
2016-06-28 16:59:00 +02:00
fieldOfView
e6bc28c30c
Replace "Shell" category icon
2016-06-28 16:08:38 +02:00
Jaime van Kessel
1543e4a6e0
Merge branch 'feature_zhop_over_other_material' of github.com:Ultimaker/Cura
2016-06-28 11:34:25 +02:00
fieldOfView
05ff256af4
Add an icon for the experimental category
...
CURA-1284
2016-06-28 08:56:55 +02:00
Aldo Hoeben
605354272d
Merge pull request #830 from thopiekar/master-CURA-1284-new
...
CURA-1284: Changing icon for experimental category
2016-06-28 08:47:34 +02:00
Aldo Hoeben
d1b1741d67
Merge pull request #822 from Ultimaker/feature_print_monitoring
...
Print monitor
2016-06-28 08:13:50 +02:00
Thomas Karl Pietrowski
fa36197574
CURA-1284: Changing icon for experimental category
...
Needs an icon in resources/themes/cura/icons
2016-06-27 23:21:07 +02:00
Tim Kuipers
214ffbb0bd
JSON fix: all retraction settings now only retrievable per extruder (CURA-303)
2016-06-27 15:22:45 +02:00
Arjen Hiemstra
68a8bcb009
Fix width of materials properties tab
2016-06-27 13:33:38 +02:00
Ghostkeeper
0e053838b8
Add definition for Mankati Fullscale XT+
...
Provided by Tinkerman on http://www.thingiverse.com/thing:1643782 and translated for use in Cura 2.2.
2016-06-27 10:38:30 +02:00
fieldOfView
612888c9fb
Remove remnant code
...
CURA-1036
2016-06-27 10:25:02 +02:00
Tobias Zanke
11cb37bd11
support prints up to 15cm width
...
NEO Firmware moves head 1cm to the right after Y endstop is pressed. This shrinks build volume to 14cm width. With this extra commands, the head moves back to the endstop. Now 15cm width builds are possible.
2016-06-26 17:05:53 +02:00
Tim Kuipers
4eaf09e982
JSON fix: the height of the extruder switch z hop is now equal to the zhop height (CURA-1506 CURA-1061)
...
making the height configurable is quite difficult with how retraction currently works and there is not a lot of added value
2016-06-24 15:25:18 +02:00
fieldOfView
55af0af755
Merge branch 'master' into feature_print_monitoring
...
# Conflicts:
# resources/qml/Cura.qml
2016-06-24 14:55:12 +02:00
fieldOfView
8bc2c6e042
Tweak styling
...
CURA-1036
2016-06-24 14:41:52 +02:00
fieldOfView
f6e31cd97a
Fix updating monitored values
...
Though the PrintMonitorModel was a nicer solution, it broke the binding of values coming from the PrinterOutputDevices
CURA-1036
2016-06-24 14:35:31 +02:00
fieldOfView
00ad7b23ff
Prevent QML warnings when there is no connected printer
...
CURA-1036
2016-06-24 13:39:24 +02:00
Tim Kuipers
3e67291e41
Merge branch 'master' into feature_zhop_over_other_material
2016-06-24 13:30:59 +02:00
Tim Kuipers
ccd97f1994
JSON feat: (bool) retraction_hop_after_extruder_switch (CURA-1506 CURA-1061)
2016-06-24 13:29:40 +02:00