3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 06:03:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 21
18299 commits 305 branches 272 tags 787 MiB
Commit graph

18299 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
9a3d9dd2c1 Ensure that writeStarted is called when attempting to print via USB 2019-01-31 17:42:20 +01:00
Jaime van Kessel
eae8e80923 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-01-31 17:14:28 +01:00
Jaime van Kessel
e6f722b29c Move additional component loader into ActionPanelWidget 2019-01-31 17:13:32 +01:00
Simon Edwards
eeb23c4ba4
Merge pull request #5255 from Ultimaker/CL-1154_monitor_empty_states 
CL-1154 Monitor empty states
 2019-01-31 16:44:25 +01:00
Remco Burema
6cd3a5fe3d Show correct printer name in selector-header on disconnect. [CURA-6153] 2019-01-31 15:05:27 +01:00
Ian Paschal
1cd9ffefcc Improve no connection message 
Contributes to CL-1154
 2019-01-31 14:51:58 +01:00
Jaime van Kessel
1a037bdb82 Prevent UFP writer from crashing if the base file of a material can not be found 
Another issue found in the crash reports
 2019-01-31 14:48:40 +01:00
Jaime van Kessel
d5e34cc9c9 Prevent crash when activePrinter doesn't have a controller 
Got the crash from the automatic crash reports
 2019-01-31 12:59:29 +01:00
Jaime van Kessel
9885ce2817 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-01-31 11:32:16 +01:00
Jaime van Kessel
3734b980d8 When disabling an extruder due to sync, always show a message. 
Originally it would only show a message if the extruder was actually used,
but this didn't take the flow into account when you would first sync and then load a model.
In that case, the user never got a message and never got any notification that (and why) any of the extruders
got disabled.

CURA-5693
 2019-01-31 11:30:37 +01:00
Jaime van Kessel
e40b730457 Merge branch 'CURA-5693_handle_empty_variant_and_material' of github.com:Ultimaker/Cura into 4.0 2019-01-31 11:22:00 +01:00
Ian Paschal
7189daec80 Finalize monitor stage empty states 
Contributes to CL-1154
 2019-01-31 10:50:30 +01:00
Ian Paschal
389bdeb0c7 Expose configurations the same way as connectivity 
Contributes to CL-1154
 2019-01-31 10:50:14 +01:00
Ian Paschal
858e2f6b42 Add some theme dependencies 
Contributes to CL-1154
 2019-01-31 10:49:33 +01:00
Jaime van Kessel
b680e92da6
Merge pull request #5252 from Ultimaker/cloud-connection-type-stored 
[4.0] Ensure Cura stores the cloud connection type in the metadata
 2019-01-31 10:29:13 +01:00
Lipu Fei
f0d9aa77c2 Make account button non-fixed-width 
CURA-6132
 2019-01-31 09:43:33 +01:00
Lipu Fei
4f6d53b009 Do not disable all extruders when syncing 
CURA-5693

When syncing with a machine with no material/nozzle, do not disable all
extruders. leave the first one enabled.
 2019-01-31 08:30:41 +01:00
ChrisTerBeke
b884e46187
Ensure Cura stores the cloud connection type in the stack file 2019-01-30 22:02:13 +01:00
Remco Burema
dcf9ce56e4
Merge pull request #5244 from Ultimaker/CURA-6115-improve-message-options 
Cura 6115 improve message options
 2019-01-30 17:54:47 +01:00
Remco Burema
156e7a2bee
Merge pull request #5246 from Ultimaker/CURA-6132_improve_account_widget 
CURA-6132 improve account widget
 2019-01-30 17:46:32 +01:00
Jaime van Kessel
87070aefce Fixed typing issues for configuredConnectionTypes 
CURA-6159
 2019-01-30 17:17:46 +01:00
Lipu Fei
8dd0f8d329 Remake: show initial if no avatar 
CURA-6132
 2019-01-30 15:37:41 +01:00
Lipu Fei
de4db19234 Remake: account panel 
CURA-6132
 2019-01-30 15:37:34 +01:00
Lipu Fei
784598d4a2 Remake: sign in page 
CURA-6132
 2019-01-30 15:37:25 +01:00
Lipu Fei
6aebdade73 Remake: Change to "sign in" button 
CURA-6132
 2019-01-30 15:37:20 +01:00
Jaime van Kessel
949a687a07 Add the logo again that I accidently deleted. 
Derp
 2019-01-30 14:51:47 +01:00
Jaime van Kessel
969ed6409c Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-01-30 13:37:34 +01:00
Jaime van Kessel
9ae08b4aec Moved the old logo back again 
It looks way better, so lets hope it's here to stay!
 2019-01-30 13:36:55 +01:00
Ghostkeeper
430be551d3
Fix link to properties of row 
This fixes a QML warning and probably fixes the visibility of these elements.
 2019-01-30 12:59:27 +01:00
Ghostkeeper
14300e745f
Use Doxygen-style comments for documentation 
According to our style. Not just single line comments without anything else.

Contributes to issue CURA-6159.
 2019-01-30 12:52:58 +01:00
Remco Burema
dbec607d36
Merge pull request #5234 from Ultimaker/CURA-6070_add_adhesion_warning 
CURA-6070 Add adhesion warning message back
 2019-01-29 16:12:53 +01:00
Jaime van Kessel
805b4dbe4c Fixed height for action message buttons 
CURA-6115
 2019-01-29 13:28:32 +01:00
Lipu Fei
b70e9c9080 Handle empty hotend and material in config syncing 
CURA-5693

 - Disable an extruder if the config states no material or nozzle for
   it.
 - Show a warning message if an used extruder gets disabled.
 2019-01-29 13:06:38 +01:00
Jaime van Kessel
4151050127 Setting the height of an action button now actually changes it's size 
CURA-6115
 2019-01-29 12:57:05 +01:00
Ian Paschal
d495e80959 Merge remote-tracking branch 'origin/4.0' into CL-1154_monitor_empty_states 2019-01-28 16:54:21 +01:00
Ghostkeeper
9d8cf5ddde
Apply division by zero prevention to the denominator 
Rather than the numerator, which could not cause a division by zero exception.
 2019-01-28 16:40:45 +01:00
Ian Paschal
3dcb6b9c37
Merge pull request #5235 from Ultimaker/fix_configured_connection_types 
Fix configured connection types
 2019-01-28 15:46:39 +01:00
Jaime van Kessel
bc8a08bb44 Add documentation to the configuredConnectionTypes 2019-01-28 14:57:24 +01:00
Jaime van Kessel
f723cdc8a3 Fix typing issues 2019-01-28 14:47:03 +01:00
Lipu Fei
e2e856a5cd Add adhesion warning message back 
CURA-6070
 2019-01-28 14:41:57 +01:00
Jaime van Kessel
3774fdbd02 Refactored the "connection_type" metadata entry so it can support multiple types. 
After a lot of discussion and finding out what the hell was going on,
we figured out we made a pretty big derp by only setting a single connection_type
in the metadata of the machine. What it's actually doing is describing what connection types
have been configured (and not just randomly displaying whatever output device set the value last)
 2019-01-28 14:29:41 +01:00
Simon Edwards
72b98285b1
Merge pull request #5216 from Ultimaker/CL-1188_hide_print_job_on_unavailable_printer 
CL-1188 hide print job on unavailable printer
 2019-01-28 11:08:21 +01:00
Lipu Fei
d7434ed14c
Merge pull request #5224 from Ultimaker/CURA-6141_info_long_material_name_line_split 
Cura 6141 info long material name line split
 2019-01-28 09:13:17 +01:00
Lipu Fei
1f21eed14f Add Text.NativeRendering for Labels 
CURA-6141
 2019-01-28 09:05:43 +01:00
Lipu Fei
c6ff8149f6 Remove colon according to design 
CURA-6141
 2019-01-28 09:04:08 +01:00
Lipu Fei
71b2787d0d Use Label 
CURA-6141
 2019-01-28 08:48:02 +01:00
Remco Burema
3d413ceb2c MaterialInfo: Tweak text-alignment/layout. [CURA-6141] 2019-01-26 11:43:15 +01:00
Remco Burema
e7ff70870f MaterialInfo: Also replace HTML-text with QML-elements for 'by line-type'. [CURA-6141] 2019-01-26 11:25:38 +01:00
Jaime van Kessel
13b2b33900 Remove unused theme option 2019-01-25 13:02:39 +01:00
Ian Paschal
b9584b05ee More documentation 
Contributes to CL-1154
 2019-01-25 12:41:36 +01:00