Commit graph

1832 commits

Author SHA1 Message Date
Ghostkeeper
a65bb14329
Capitalise setting label
This is in line with the rest of the setting labels.
2016-07-06 12:56:05 +02:00
Thomas Karl Pietrowski
be4cf00835 BQ Hephestos2: Heat up nozzle while leveling
Saves time and preheats the nozzle to the correct temperature (set by Cura).
Btw. the BQ support explained me the reason why they are assuming 210°C needs to set here. The reason is that the printer is just meant to be used with PLA, so they are only expecting to use exactly 210°C. Just explained them why this is incorrect when think about the possibility that Cura can set the temperature on it's own.
2016-07-05 18:22:56 +02:00
Arjen Hiemstra
aba60b0105 Remove "Rename" button from Materials page and make the other ones work
Since the name is generated from the metadata

Contributes to CURA-341
2016-07-05 16:48:43 +02:00
fieldOfView
8c002877c3 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-04 18:36:28 +02:00
fieldOfView
7b4137ce20 Tweak color and icon logic (add "pre_print" state)
CURA-1036
2016-07-04 18:35:47 +02:00
Jaime van Kessel
b3adf8a271 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-04 17:11:50 +02:00
Jaime van Kessel
318182495a We now recieve material estimation per extruder
CURA-1687
2016-07-04 17:11:03 +02:00
fieldOfView
bff23598c6 Fix simple mode infill to work with multiple extruders
CURA-1778
2016-07-04 16:23:07 +02:00
fieldOfView
6933430185 Flow MachineActions on the manage Printes page.
CURA-1385
2016-07-04 12:47:16 +02:00
Tim Kuipers
f679b1ef68 JSON fix: merge went wrong: forgotten comma 2016-07-04 12:24:26 +02:00
Tim Kuipers
43f220278a Merge branch 'feature_retraction_settings_per_extruder' 2016-07-04 12:09:04 +02:00
fieldOfView
8e58e88511 Update GUIDs to match the GUIDs in the official repository
CURA-491
2016-07-04 11:50:15 +02:00
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