GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-05 06:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,299 Commits 289 Branches 260 Tags
Commit Graph

5715 Commits

Author SHA1 Message Date
Remco Burema
435c8deded Add 'connect_group_name' to 'group_name' rename to version-upgrade. [CURA-6153] 2019-01-31 20:25:21 +01:00
Remco Burema
954fdb20ad Rename 'connect_group_name' to 'group_name'. [CURA-6153] 2019-01-31 20:21:42 +01:00
Jaime van Kessel
9a3d9dd2c1 Ensure that writeStarted is called when attempting to print via USB 2019-01-31 17:42:20 +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
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
Ian Paschal
7189daec80 Finalize monitor stage empty states 
Contributes to CL-1154
 2019-01-31 10:50:30 +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
Ian Paschal
d495e80959 Merge remote-tracking branch 'origin/4.0' into CL-1154_monitor_empty_states 2019-01-28 16:54:21 +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
f723cdc8a3 Fix typing issues 2019-01-28 14:47:03 +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
Ian Paschal
b9584b05ee More documentation 
Contributes to CL-1154
 2019-01-25 12:41:36 +01:00
Ian Paschal
3b8281dc5b Add some comments 
Contributes to CL-1154
 2019-01-25 12:39:27 +01:00
Ghostkeeper
91dc3713ae
Initialise idle count properly 
This is a field so it should always get initialised in the __init__ function.

Fixes #5218.
 2019-01-25 12:03:21 +01:00
Jaime van Kessel
cab0349a9c Change the alignent option to use the new style 
CURA-6115
 2019-01-24 18:30:52 +01:00
Ian Paschal
ee5c6ed3fb Unconnected empty state (DRAFT) 
Contributes to CL-1154
 2019-01-24 16:54:09 +01:00
Ian Paschal
f6b69f05a9 Add empty state for print job queue 
Contributes to CL-1154
 2019-01-24 15:14:16 +01:00
Ian Paschal
3d92bd0133 Prevent endless skeleton loading on Cloud 
Contributes to CL-1154

For you @christerbeke
 2019-01-24 14:46:00 +01:00
Ian Paschal
e7151390f7 Label printers without connection to "unreachable" 
Contributes to CL-1188
 2019-01-24 10:24:55 +01:00
Ian Paschal
673734ee12 Show print job context menu if state == "error" 
Contributes to CL-1175
 2019-01-24 09:52:56 +01:00
Ian Paschal
5d2a914180 Always show context menu for print jobs 
Contributes to CL-1175
 2019-01-23 15:54:11 +01:00
Ian Paschal
4438f0d9a3 Add dark mode to new context menu 
Contributes to CL-1212
 2019-01-23 15:34:28 +01:00
Ian Paschal
f5379dda55 Fix improperly removed method 2019-01-23 14:48:38 +01:00
Ian Paschal
e19323d38b Fix mising theme key 2019-01-23 14:47:59 +01:00
Ian Paschal
1097f16011 Add theme (and dark mode) 
Contributes to CL-1165
 2019-01-23 12:08:20 +01:00
Ian Paschal
32072e3bfe Merge remote-tracking branch 'origin/4.0' into CL-1165_missing_cloud_info 2019-01-23 12:05:06 +01:00
Ian Paschal
776410e5d9
Merge pull request #5208 from Ultimaker/CL-1212_monitor_dark_theme 
CL-1212 Monitor tab dark theme
 2019-01-23 11:37:19 +01:00
ChrisTerBeke
92eb361ba1 Make cloud API error a generic message to not scare the user 2019-01-23 09:37:32 +01:00
Ian Paschal
283de789c2 Remove comment 
Contributes to CL-1212
 2019-01-22 12:00:50 +01:00
Ian Paschal
76240bb458 Remove unused comment 
Contributes to CL-1212
 2019-01-22 11:13:27 +01:00
Ian Paschal
e212bbfb01 Add some translations which were forgotten 2019-01-21 17:13:34 +01:00
Ian Paschal
bc9831abd1 Add color theming to monitor tab 
Contributes to CL-1212
 2019-01-21 17:10:41 +01:00
Ian Paschal
406ef20802 Revert "Add theme colors" 
This reverts commit 2e5eb611442b992ca0da60dc22a9e16538c48fa9.
 2019-01-21 14:05:24 +01:00
Ian Paschal
2e5eb61144 Add theme colors 
Contributes to CL-1212
 2019-01-21 13:07:16 +01:00
Ian Paschal
1369c98ea6 Center extruder numbers on Ubuntu 
This one is for you @christerbeke
 2019-01-18 16:02:23 +01:00
Lipu Fei
c602c1cf15 Use MachineManager.activeMachine instead of Application.globalstack 
CURA-6117
 2019-01-18 14:08:53 +01:00
Remco Burema
98ce0caaef
Merge pull request #5158 from Ultimaker/marketplace_use_busy_indicator 
Remove loading gif
 2019-01-17 16:17:00 +01:00
Ian Paschal
f3d0010b87 Add cloud connection condition 
Contributes to CL-1165
 2019-01-17 15:44:37 +01:00
Ian Paschal
495115c9f7 Merge remote-tracking branch 'origin/4.0' into CL-1165_missing_cloud_info 2019-01-17 15:11:38 +01:00
Jaime van Kessel
894dbcf6f6 Revert "Added skip mark to failing cloud tests" 
This reverts commit 665c33156468270e53fb2702f7d60f0deab0618a.
 2019-01-17 14:43:43 +01:00
Jaime van Kessel
c6628560bb Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into 4.0 2019-01-17 14:42:56 +01:00
Jaime van Kessel
aff2ffc67a Merge branch 'preference_qml_early_out' of github.com:Ultimaker/Cura into 4.0 2019-01-17 14:23:06 +01:00
Jaime van Kessel
665c331564 Added skip mark to failing cloud tests 2019-01-17 13:04:04 +01:00
Daniel Schiavini
badb0b0ca9 Use patch.object to allow relative imports 
Issue STAR-322.
 2019-01-17 12:58:23 +01:00
ChrisTerBeke
b51317b4f3 Merge branch '4.0' of https://github.com/Ultimaker/Cura into 4.0 2019-01-17 10:23:38 +01:00
ChrisTerBeke
aab1fbc73f Try other patch values for relative imports 2019-01-17 10:22:37 +01:00