ChrisTerBeke
5fdff17782
Add upload messages for UI feedback, needs some refactoring
2018-12-03 22:12:18 +01:00
ChrisTerBeke
24b75d781e
Fix merge conflict
2018-12-03 15:58:25 +01:00
Daniel Schiavini
fc26ccd6fa
STAR-332: Some improvements to get the job in connect
2018-12-03 14:41:36 +01:00
Daniel Schiavini
8066074a2f
STAR-332: Fixing warnings
2018-12-03 11:02:49 +01:00
Lipu Fei
5df7cdde48
Merge remote-tracking branch 'origin/master' into ui_rework_4_0
2018-11-29 08:54:22 +01:00
Jaime van Kessel
7d42fdf183
Add missing typing
2018-11-28 11:52:30 +01:00
Jaime van Kessel
0baa4d20b3
Gracefully handle the case where machine definition is no in the map
2018-11-28 11:42:54 +01:00
Jaime van Kessel
adf16310c7
Merge pull request #4883 from Ultimaker/CURA-5879_experimental_qualities
...
CURA-5879 experimental qualities
2018-11-28 11:34:21 +01:00
Jaime van Kessel
aeb2887796
Merge branch 'CURA-5979_gcode_loading_new_ui' of github.com:Ultimaker/Cura into ui_rework_4_0
2018-11-28 10:15:07 +01:00
Jaime van Kessel
94c4366194
Merge branch 'master' of github.com:Ultimaker/Cura into ui_rework_4_0
2018-11-27 17:55:13 +01:00
Jaime van Kessel
d8c430abf6
Fix typing
2018-11-27 17:54:53 +01:00
ChrisTerBeke
4e150fb4bf
Merge branch 'master' into cloud-output-device
2018-11-27 16:59:28 +01:00
Diego Prado Gesto
dad2031e4b
Switch to the preview stage before to switch to simulation view
...
... since now the list of views are in a different stage.
Contributes to CURA-5979.
2018-11-27 16:06:37 +01:00
Lipu Fei
2c8ed99281
Add is_experimental to Qt models and QMLs
...
CURA-5879
2018-11-27 15:50:03 +01:00
Jaime van Kessel
854755277c
Fix styling of comments
...
Because sentences should start with capitals
2018-11-27 14:37:01 +01:00
Jaime van Kessel
3ad1802ab6
Prevent a KeyError from messing
...
CURA-5978
2018-11-27 14:34:29 +01:00
Diego Prado Gesto
ea75a60dd8
Merge branch 'master' into ui_rework_4_0
2018-11-27 13:17:10 +01:00
Diego Prado Gesto
c56098d82c
Merge pull request #4816 from Ultimaker/tests-for-um3networkplugin
...
Tests for um3networkplugin
2018-11-27 12:59:44 +01:00
Diego Prado Gesto
a01ff9419d
Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector
2018-11-27 11:13:34 +01:00
Diego Prado Gesto
729d37cabb
Merge branch 'master' into ui_rework_4_0
2018-11-27 11:12:48 +01:00
Lipu Fei
2e81b97623
Use global_stack.extruders to find extruders
...
CURA-5978
2018-11-27 08:45:45 +01:00
ChrisTerBeke
a9fedb4f66
Restore NetworkedPrinterOutputDevice for now
2018-11-26 15:05:53 +01:00
Marijn Deé
579522857a
Fix the code-style test
2018-11-26 14:42:50 +01:00
Diego Prado Gesto
52b916d45c
Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector
2018-11-26 14:33:41 +01:00
ChrisTerBeke
014b1d6e4e
test
2018-11-26 13:45:37 +01:00
Mark
8bae9fa667
Merge branch 'master' into ui_rework_4_0
2018-11-26 13:41:25 +01:00
ChrisTerBeke
21c81603b4
Use application singleton instead of locally cached application
2018-11-26 13:33:14 +01:00
ChrisTerBeke
620ba8f21d
Merge branch 'master' into cloud-output-device
2018-11-26 11:17:39 +01:00
Jaime van Kessel
4990f20566
Use QStringList instead of QVariantList since the return value is a list of strings.
...
Co-Authored-By: diegopradogesto <d.pradogesto@ultimaker.com>
2018-11-26 10:55:32 +01:00
Ghostkeeper
5469613c17
Don't fail the samefile check if second file didn't exist
...
If the backup file didn't exist but the original did, then apparently they are not the same file so the copy should be allowed.
2018-11-26 09:40:14 +01:00
Ghostkeeper
c9eb57cead
Don't copy preference file to the same location
...
This crashes Cura on start-up for some people.
2018-11-26 09:32:59 +01:00
ChrisTerBeke
1adf1096a3
Merge branch 'master' into cloud-output-device
2018-11-23 14:17:26 +01:00
ChrisTerBeke
2fc5061c41
Fix some PR comments, cleanup imports
2018-11-23 14:11:43 +01:00
Diego Prado Gesto
692868a0b4
Create a function that given a printer type name, it will return and
...
abbreviated name.
Contributes to CURA-5942.
2018-11-22 15:45:38 +01:00
Diego Prado Gesto
9720512f50
Add a new printer selector button that is connected to the output
...
devices and shows labels containing the type of printers that are in the
same group.
Contributes to CURA-5942.
2018-11-22 13:54:10 +01:00
ChrisTerBeke
8453cd693e
Make QNetworkReply optional
2018-11-21 00:04:34 +01:00
ChrisTerBeke
8ad8489af0
Fix returning reply on postFormWithParts
2018-11-21 00:03:36 +01:00
ChrisTerBeke
c7bb6931f4
Refactor networked output device
...
All networking related stuff is moved to a separate class called NetworkClient for reusability.
As example it is now also used in the WIP CloudOutputDeviceManager to clean up network calling there.
2018-11-20 23:44:28 +01:00
ChrisTerBeke
4e8979334e
Switch Ultimaker Account OAuth2 client
...
The new client has access to more permissions and is labeled as "Ultimaker Cura" instead of "Cura Backups Plugin".
Also removes `self._cloud_api_root` as that's not used anymore now that `self._oauth_root` is used for the redirect URLs.
2018-11-20 19:18:48 +01:00
Diego Prado Gesto
20285f26d6
Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu
2018-11-20 11:20:26 +01:00
Diego Prado Gesto
1844a9bed2
Merge branch 'master' into ui_rework_4_0
2018-11-20 11:08:05 +01:00
ChrisTerBeke
228325eb89
Add CloudOutputDeviceManager, test implementation
2018-11-19 21:59:57 +01:00
ChrisTerBeke
951a21ead7
Merge branch 'master' into tests-for-um3networkplugin
2018-11-19 10:58:07 +01:00
ChrisTerBeke
23e957e1c5
Some more refactoring, splitting up methods
2018-11-19 10:44:24 +01:00
Jaime van Kessel
7f99ed1af3
ExtruderIcon will now display that it's disabled correctly
...
CURA-5785
2018-11-16 16:04:11 +01:00
Jaime van Kessel
93bd5fee53
Fix wrong push free shadow for one at a time.
...
It was applying the size twice. CURA-5822
2018-11-16 13:44:46 +01:00
Ghostkeeper
bee563f01b
Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu
2018-11-16 13:02:24 +01:00
Jaime van Kessel
401a6b5f8b
Merge pull request #4794 from fieldOfView/fix_adhesion_type_error
...
Fix adhesion type error during startup
2018-11-16 11:24:29 +01:00
Ghostkeeper
d732a2f953
Merge branch 'master' into ui_rework_4_0
2018-11-15 15:55:08 +01:00
fieldOfView
b671a3153a
Catch an error getting an extruder value before extruders are added to the global stack
2018-11-14 14:21:39 +01:00
