1660 Commits

Author SHA1 Message Date
Jaime van Kessel
91a3e90dfe Merge branch 'feature_ux_dialogs' of github.com:Ultimaker/Cura 2016-07-08 13:23:44 +02:00
Ghostkeeper
21ae73fca0
Capitalise Euclidean dimension names
X, Y and Z.

Contributes to issue CURA-1816.
2016-07-08 11:53:58 +02:00
fieldOfView
6eb502730c Add reusable messagebox based on QML MessageDialog
Contributes to CURA-1730 and CURA-1850
2016-07-08 11:24:37 +02:00
fieldOfView
2f3ffe2a18 Fix tabs when automatically switching to the monitor tab (on print start)
CURA-1036
2016-07-08 11:22:07 +02:00
Tim Kuipers
802e0b14b2 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-08 00:01:20 +02:00
Tim Kuipers
6cdab33eb6 JSON fix: negative angles for conical overhang are possible (CURA-1412) 2016-07-07 23:59:19 +02:00
fieldOfView
08f2143790 Simplify showing each material length individually
CURA-1687
2016-07-07 23:58:14 +02:00
fieldOfView
c4a2e659e3 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-07 22:17:55 +02:00
fieldOfView
9c492342cb Show each material length individually
CURA-1687
2016-07-07 22:17:35 +02:00
Tim Kuipers
df780023ed JSON feat: infill_mesh_order (CURA-833) 2016-07-07 21:22:44 +02:00
Tim Kuipers
91082404be JSON feat: infill_mesh_order (CURA-833) 2016-07-07 21:18:46 +02:00
Tim Kuipers
d6c25fcd10 JSON feat: infill mesh (CURA-833) 2016-07-07 21:04:23 +02:00
awhiemstra
90af9e3986 Merge pull request #846 from Ultimaker/feature_material_editing
Material Editing Support
2016-07-07 17:34:57 +02:00
Arjen Hiemstra
6b9689c2c7 Use clearer styling of disabled entry fields on the materials page
Contributes to CURA-342
2016-07-07 17:32:49 +02:00
Arjen Hiemstra
7df5008d3c Disable spool weight etc. fields since they are not yet functional
Contributes to CURA-342
2016-07-07 17:32:11 +02:00
Arjen Hiemstra
975106b90e Also update description and adhesion info when they change
Contributes to CURA-342
2016-07-07 17:31:12 +02:00
Jaime van Kessel
bea9f7590c Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 17:02:59 +02:00
Jaime van Kessel
0477955974 Sidebar stuff is now properly done in a loader (and in seperate files)
CURA-1036
2016-07-07 17:02:29 +02:00
Jack Ha
3e869048fd Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 16:23:53 +02:00
Jack Ha
342d4f1b82 Changed tooltip extremely small.
CURA-1671
2016-07-07 16:23:27 +02:00
Tim Kuipers
7fc37e7a74 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 15:18:57 +02:00
Tim Kuipers
101b22528b JSOn feat: nozzle startup prime location (CURA-1816) 2016-07-07 15:15:22 +02:00
Arjen Hiemstra
d8555fe57d Merge branch 'master' of github.com:ultimaker/Cura into feature_material_editing
* 'master' of github.com:ultimaker/Cura: (38 commits)
  Fixed profile file case-sensitivity.
  Fix UMO Checkup button size
  Remove debug statement and commented-out code CURA-1385
  Show "ready" state when a printer is connected but jobstate is not yet set
  Added deepcopy function
  Made exception handling of slice info plugin way more robust
  Restart timer after slicing is performed when not enabled.
  Update GUID for PLA to match the GUID in the official repository
  Set default extruder index to -1 (so global is default)
  Ensure that the display matches with the backend active extruder data
  Update UM2 Extended build volume height to value published in marketing materials
  Fixed firmware upgrade for um2+
  Capitalise setting label
  CHeckup action now correctly resets every time you start it
  Remove unused name/id when importing a profile from a gcode file
  Just a little typo
  BQ Hephestos2: Heat up nozzle while leveling
  Saving g-code no longer crashes
  Removed update firmware from extensions; This is now handled by machine actions
  Changing active extruder no longer trigger re-slice
  ...
2016-07-07 11:29:18 +02:00
fieldOfView
35efea3d11 Show "ready" state when a printer is connected but jobstate is not yet set
CURA-1036
2016-07-07 09:52:53 +02:00
Arjen Hiemstra
17ff92bdc9 Add support for import/export to the Materials page
Contributes to CURA-341
2016-07-07 01:43:44 +02:00
Arjen Hiemstra
0da07b55ce Display brand and color name in the material menu if they are different than "generic"
Contributes to CURA-341
2016-07-07 01:43:18 +02:00
fieldOfView
d5d09f32b7 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-06 14:32:49 +02:00
fieldOfView
bdd3ecbc1a Update GUID for PLA to match the GUID in the official repository
CURA-491
2016-07-06 14:32:37 +02:00
Jaime van Kessel
a28a9ea86a Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-06 14:09:30 +02:00
Jaime van Kessel
a5ba68bae3 Ensure that the display matches with the backend active extruder data 2016-07-06 14:09:08 +02:00
fieldOfView
0e6754c0e2 Update UM2 Extended build volume height to value published in marketing materials 2016-07-06 14:06:14 +02:00
Jaime van Kessel
bf53baccee Merge branch 'feature_material_hotend_change' of github.com:Ultimaker/Cura 2016-07-06 13:39:07 +02:00
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