Commit graph

7341 commits

Author SHA1 Message Date
Diego Prado Gesto
4e65232364 Change the font size of settings in extruder tab
To make it consistent with the sizes in the Printer tab.
2019-05-17 11:58:30 +02:00
Ian Paschal
4078a23449 Fix typo 2019-05-17 10:44:53 +02:00
Ghostkeeper
abcac67cee
Improve wording of No. Layers setting
Fixes #5741.
2019-05-17 09:39:51 +02:00
Jaime van Kessel
314a6495c4 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-16 16:40:10 +02:00
Jaime van Kessel
ff0a18603b Remove a few more usages of deprecated functions 2019-05-16 15:20:38 +02:00
Lipu Fei
6a2980ab4f
Merge pull request #5655 from Ultimaker/shader_optimization
Shader optimization
2019-05-16 14:30:52 +02:00
Lipu Fei
dab0a43214 Merge remote-tracking branch 'origin/master' into shader_optimization 2019-05-16 14:22:05 +02:00
Jaime van Kessel
843bb6f5a3 Change some of the logging messages to info
CURA-6525
2019-05-15 17:25:31 +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
f81340c14a
Merge pull request #5717 from Ultimaker/CL-1259_hide_useless_override_button
CL-1259 Hide the Override button if it is not an option
2019-05-14 15:30:53 +02:00
Lipu Fei
7c1d589528 Merge remote-tracking branch 'origin/4.1' into CURA-6497_fix_empty_material_name 2019-05-14 09:42:57 +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
Diego Prado Gesto
a62f4eb1d2 Fix padding in the installed tab 2019-05-09 17:04:27 +02:00
Ghostkeeper
3629b955fe
Merge branch 'port-filter' of https://github.com/joba-1/Cura into joba-1-port-filter 2019-05-09 16:55:44 +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
Jaime van Kessel
4bc348ba49 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-09 15:11:37 +02:00
Jaime van Kessel
8f8a982be7 Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1 2019-05-09 15:05:18 +02:00
Jaime van Kessel
d5d37ccf0f Check if auto slicing needs to be done slightly more frequent
Otherwise it might get stuck in some cases if you loaded a object after loading a gcode

CURA-6422
2019-05-09 15:04:14 +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
2054413952 Add handling for ValidatorState.Invalid
CURA-6497

ValidatorState.Invalid is set if a string setting has allow_empty =
False and its value is empty.
2019-05-09 12:07:16 +02:00
Lipu Fei
ebbc950ac1
Add build volume temperature
CURA-6156
2019-05-08 14:07:49 +02:00
Diego Prado Gesto
6708d9da64 Merge branch '4.1' 2019-05-07 11:49:45 +02:00
Diego Prado Gesto
39aa5fedf5 Update some widgets to Qt Controls 2
The ScrollView generated some wobbling text (mainly in macOS)
2019-05-07 10:50:59 +02:00
Diego Prado Gesto
3390cca2d9 Clean up the ToolboxProgressButton 2019-05-07 09:31:56 +02:00
Diego Prado Gesto
5c3a608e1a Small changes in the qml code for the compatibility chart 2019-05-07 09:10:28 +02:00
Diego Prado Gesto
c3f3b8dd93 Change links and compatibility chart. 2019-05-07 08:58:45 +02:00
Diego Prado Gesto
1093a2d65f Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1 2019-05-06 14:34:40 +02:00
Diego Prado Gesto
11e86512cb Include the prime tower to the time calculations
Contributes to CURA-6509.
2019-05-06 14:33:24 +02:00
Lipu Fei
b09c6a4f12 Elide long website URLs
CURA-6504
2019-05-06 13:56:20 +02:00
Lipu Fei
53d595f698 Use loader for machine actions in dialog
CURA-6495
2019-05-06 13:06:23 +02:00
Ghostkeeper
fca21834dd
Merge branch '4.1' 2019-05-06 11:47:41 +02:00
Ghostkeeper
c9e7f3a245
Fix finding layer numbers
That seems to have been unreliable. Luckily the original g-code is already broken up in layers, so searching it is completely unnecessary.

Hopefully resolves issue #5630.
2019-05-06 11:47:13 +02:00
Ghostkeeper
1736a02d28
Merge branch '4.1' 2019-05-06 10:27:14 +02:00
Ghostkeeper
15706b7696
Fix colour of prime tower 2019-05-06 10:26:53 +02:00
Jaime van Kessel
979b29400a Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-03 14:12:07 +02:00
Jaime van Kessel
e363f1af94 Remove hardcoded references to Ultimaker machines in QML
We shouldn't hardocode machines in QML in any case. It also created issues
for other monitor / connection flows.
2019-05-03 14:10:21 +02:00
Lipu Fei
2601e485da Merge remote-tracking branch 'origin/4.1' 2019-05-03 10:47:16 +02:00
Satish
18630fa2f1 Added several ids to be used in integration tests:
-Marketplace, printer pref, add/manage printer from main mnu, print settings
2019-05-03 09:35:17 +02:00
Diego Prado Gesto
5b9c4e402e Change the Back button to be a secondary button
Change also some texts in the More information dialog and the font type of one of the titles in the first use flow

Contributes to CURA-6483.
2019-05-02 15:38:19 +02:00