GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-31 18:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,329 Commits 295 Branches 267 Tags
Commit Graph

1296 Commits

Author SHA1 Message Date
ChrisTerBeke
96cf235d8c Get rid of any hardcoded references to machines 2019-07-25 14:56:46 +02:00
Jaime van Kessel
1e7875de48 Merge branch 'prevent_throwing_exception_when_not_connected' of github.com:Ultimaker/Cura 2019-07-23 13:57:31 +02:00
Ghostkeeper
f69eb05636
Merge branch '4.2' 2019-07-23 13:33:58 +02:00
ChrisTerBeke
7300f95a42
Hide incorrect tooltip 
The preffered solution was to change the copywriting, but since we are after stringfreeze we cannot do this. This is the next best solution to prevent user confusion.
 2019-07-22 21:21:18 +02:00
Lipu Fei
4b8a216771 Fix typing 2019-07-22 09:34:00 +02:00
ChrisTerBeke
25130b63e2 Fix logic 2019-07-12 09:19:30 +02:00
ChrisTerBeke
6210135b92 Send the correct action name when using local network 2019-07-12 08:14:28 +02:00
ChrisTerBeke
99e2939801 Add defense for when active printer is None 2019-07-10 12:55:12 +02:00
ChrisTerBeke
f1df7b93c4 Fix printer and print job ordering, add back 'move to top' 2019-07-10 12:42:01 +02:00
ChrisTerBeke
b6a00b9f7f Hide 'move to top' opion from actions 2019-07-09 08:26:44 +02:00
ChrisTerBeke
1d09cb5b9c
Fix typing for optional data argument 
Co-Authored-By: Jaime van Kessel <nallath@gmail.com>
 2019-06-24 13:18:27 +02:00
ChrisTerBeke
1ab109ade0 Fix 'resume' action 2019-06-20 13:46:20 +02:00
ChrisTerBeke
baf9dc041c Fix typing of Any 2019-06-20 12:56:45 +02:00
ChrisTerBeke
0513322f86 Fix expected controller options in test 2019-06-20 12:36:56 +02:00
ChrisTerBeke
93351ec9b9 Show context menu on printers with firmware 5.3 or later 2019-06-20 12:36:15 +02:00
ChrisTerBeke
eb8d353e11 Add basic support for print job actions via Cloud output device 2019-06-19 13:58:11 +02:00
Jaime van Kessel
14f96bd9b6 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-28 12:41:33 +02:00
Jaime van Kessel
63316fa4e9 Fix manual output devices not being added on boot 2019-05-28 11:59:17 +02:00
Cherubim
cdafdc8d5c
Break up translation in two pieces 
As a rule of thumb, translated text should not contain any layout. This particular text has gone wrong in the translations because the translators didn't translate the second part (or their application messed it up). I'm breaking it up into two pieces as to force them to translate both.

Contributes to issue CURA-6547.
 2019-05-28 11:23:42 +02:00
Ghostkeeper
4e361a068c
Revert "Merge pull request #5726 from Ultimaker/CL-1331_use_API_for_UM3NetworkPrinting" 
This reverts commit bec7b6546d3f7de457418a2e15f08c1e6dfa3148, reversing
changes made to 7094b222b10076af3a13f11b03dd3416eae12156.

The changes there were not accepted. Please see pull request https://github.com/Ultimaker/Cura/pull/5726 for the discussion about this.

Conflicts:
	plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py -> Just in one TODO comment.
 2019-05-23 13:40:11 +02:00
Lipu Fei
3ca272ff72 Merge remote-tracking branch 'origin/4.1' 2019-05-22 07:44:26 +02:00
Remco Burema
083564a184
Merge pull request #5763 from Ultimaker/CL-1329_fix_monitor_progress_bar_bug 
CL-1329 fix monitor progress bar bug
 2019-05-21 17:27:53 +02:00
Ian Paschal
5a8b70ad0c Simplify can_override conditional 
Contributes to CL-1259
 2019-05-20 15:48:57 +02:00
Ian Paschal
0dc49a66f1
Merge pull request #5762 from Ultimaker/CL-1259_hide_useless_override_button 
CL-1259 hide useless override button
 2019-05-20 15:47:26 +02:00
Ian Paschal
0c9f3a1842 Update MonitorConfigOverrideDialog.qml 
Contributes to CL-1259
 2019-05-20 15:47:19 +02:00
Ian Paschal
7be3863d51 Put override logic in Python instead of QML 
Contributes to CL-1259
 2019-05-20 15:46:07 +02:00
Ian Paschal
2a80a8d0db Simplify can_override conditional 
Contributes to CL-1259
 2019-05-20 15:12:08 +02:00
Ian Paschal
3b7b554f1a Update MonitorPrintJobProgressBar.qml 
Contributes to CL-1329
 2019-05-20 12:18:55 +02:00
Ian Paschal
c9588d173f Add monitor column to theme 
Contributes to CL-1329
 2019-05-20 12:18:38 +02:00
Ian Paschal
6dc43f9ed1 Hide override button if it can't be overridden 
Contributes to CL-1259
 2019-05-20 10:59:51 +02:00
Ian Paschal
3cf2e19692 Put override logic in Python instead of QML 
Contributes to CL-1259
 2019-05-20 10:59:34 +02:00
Ian Paschal
4078a23449 Fix typo 2019-05-17 10:44:53 +02:00
Jaime van Kessel
314a6495c4 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-16 16:40:10 +02:00
Simon Edwards
bec7b6546d
Merge pull request #5726 from Ultimaker/CL-1331_use_API_for_UM3NetworkPrinting 
CL-1331 Extending the Cura API for the Network Printing Plugin
 2019-05-15 11:11:49 +02:00
Ian Paschal
5774813704 Use class properties 
Contributes to CL-1331
 2019-05-15 10:09:50 +02:00
Ian Paschal
c7f6351903 Add typings 
Contributes to CL-1331
 2019-05-15 10:09:27 +02:00
ChrisTerBeke
913fac0094
Should be non-human readable string 2019-05-14 21:18:00 +02:00
ChrisTerBeke
b1920b05e9
Remove hacky code that is now not needed anymore 2019-05-14 21:13:29 +02:00
ChrisTerBeke
56c1da2580
printer_type has a default value so cannot be Optional 2019-05-14 21:01:34 +02:00
ChrisTerBeke
70c679859a
Use default value for printer type, allow printer_type field from cloud 2019-05-14 20:56:28 +02:00
Ian Paschal
c4ca133b40 Update UM3OutputDevicePlugin.py 
Contributes to CL-1331
 2019-05-13 15:39:29 +02:00
Ian Paschal
8b25816b1b Fix typo and white space 
Contributes to CL-1331
 2019-05-13 14:44:39 +02:00
Ian Paschal
d391ec4e6b Comments 
Contributes to CL-1331
 2019-05-09 16:41:01 +02:00
Ian Paschal
f7ef24819d Remove unused code 
I'm not sure why loadConfigurationFromPrinter is not used... but it's not.

Contributes to CL-1331
 2019-05-09 16:23:12 +02:00
Ian Paschal
b3276777b7 Expose machines API to QML 
Contributes to CL-1331
 2019-05-09 16:19:59 +02:00
Ian Paschal
26ab359a93 Add more endpoints to machines API 
- getCurrentMachine
- setCurrentMachineGroupName
- updateCurrentMachineConfiguration

Also shortened `global_container_stack` to `global_stack` since every stack is a container stack.

Contributes to CL-1331
 2019-05-09 16:01:44 +02:00
Ian Paschal
20a9b65ea5 Use API endpoint for machine association 
Contributes to CL-1331 and CL-1323
 2019-05-09 14:54:24 +02:00
Simon Edwards
d70acc793f Hide the Override button if it is not an option 
CL-1259
 2019-05-09 13:23:29 +02:00
Lipu Fei
1d4ab98ddc Fix binding loop 
CURA-6483
 2019-05-02 08:25:29 +02:00
Lipu Fei
71e32d94f7 Resolve merge conflicts 
CURA-6483
 2019-05-02 07:45:43 +02:00