ChrisTerBeke
ab85e4794b
Merge pull request #4994 from Ultimaker/STAR-322_cloud-connection-multipart-upload
...
STAR-322: Cloud connection resumable upload
2018-12-17 15:29:56 +01:00
Daniel Schiavini
c5f438819a
STAR-322: Improving documentation
2018-12-17 15:11:01 +01:00
Daniel Schiavini
d28ac5e120
STAR-322: Improving documentation
2018-12-17 14:57:57 +01:00
Daniel Schiavini
da974d9868
STAR-322: Improving documentation
2018-12-17 14:51:57 +01:00
Daniel Schiavini
42ae9faeb4
STAR-322: Reverting change to run mypy
2018-12-17 14:42:16 +01:00
Daniel Schiavini
75d7d49349
STAR-322: Mocking the CuraApp
2018-12-17 14:41:28 +01:00
Daniel Schiavini
3b367938de
STAR-322: Removing TestSendMaterialJob temporarily
2018-12-17 13:53:31 +01:00
Daniel Schiavini
b6f90f1ab2
STAR-322: Using cura constants
2018-12-17 13:29:20 +01:00
Daniel Schiavini
a1cb09f73f
STAR-322: Sorting clusters
2018-12-17 13:24:07 +01:00
Daniel Schiavini
34f56b046a
STAR-322: Review comments
2018-12-17 13:13:44 +01:00
Daniel Schiavini
99d52692e3
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection-multipart-upload
2018-12-17 12:34:38 +01:00
ChrisTerBeke
02a2585ad1
Merge branch '4.0' into STAR-322_cloud-connection
2018-12-17 12:33:15 +01:00
Diego Prado Gesto
9814deaeab
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2018-12-17 12:21:01 +01:00
Diego Prado Gesto
ab83af3a03
Fix code-style
2018-12-17 12:20:30 +01:00
Daniel Schiavini
87c1392173
STAR-322: Fixing tests
2018-12-17 12:05:25 +01:00
Daniel Schiavini
9eb743bcb8
STAR-322: Making mypy happy
2018-12-17 12:01:10 +01:00
Simon Edwards
81c0d7efc0
Merge pull request #5006 from Ultimaker/fix_um3_info_component_warnings
...
Fix UM3InfoComponents warnings
2018-12-17 11:59:25 +01:00
Ian Paschal
6178f9ddf6
Improve code style and line lengths
2018-12-17 11:49:09 +01:00
Daniel Schiavini
9f4b7bd703
STAR-322: Improving logging and cluster connection
2018-12-17 11:28:16 +01:00
Diego Prado Gesto
ed4d339dee
Change the margin in the view orientation buttons to aling the pixels correctly
2018-12-17 11:00:49 +01:00
Diego Prado Gesto
ddf3c13b2a
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2018-12-17 10:43:53 +01:00
Diego Prado Gesto
cbd8e72bd5
Add fixed width to the preview button
...
Doing that, the elide will work. Also increase the size of the panel a bit so it will fit better in other languages. Adding also the tooltip in case the text is too long in other languages.
2018-12-17 10:42:52 +01:00
Ian Paschal
ff1a0e30f6
Code style & comments
2018-12-17 10:42:41 +01:00
Daniel Schiavini
9086105204
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection-multipart-upload
2018-12-17 10:38:29 +01:00
Ian Paschal
77deabf6d4
Code style
2018-12-17 09:43:24 +01:00
ChrisTerBeke
d900648f99
Merge branch '4.0' into STAR-322_cloud-connection
2018-12-17 09:28:22 +01:00
Lipu Fei
4ab123eb87
Merge remote-tracking branch 'origin/CURA-6028_stage_button_fixes' into 4.0
2018-12-17 08:48:31 +01:00
Lipu Fei
efb832702b
Merge pull request #4976 from Ultimaker/CURA-6013-rate-packages
...
Cura 6013 rate packages
2018-12-17 08:32:18 +01:00
ChrisTerBeke
08ab28a23a
Merge branch '4.0' into STAR-322_cloud-connection
2018-12-14 16:41:52 +01:00
Jaime van Kessel
ef6f666c3e
Remove duplicate alias definition
...
Yay. Merges.
2018-12-14 16:41:07 +01:00
ChrisTerBeke
0bbd77e0f0
Merge branch '4.0' into STAR-322_cloud-connection
2018-12-14 16:34:52 +01:00
Ian Paschal
38ca23a22f
Merge pull request #4997 from Ultimaker/prevent_monitor_stage_overlap
...
Quick fix to prevent monitor stage from overlapping header
2018-12-14 16:29:39 +01:00
Ghostkeeper
78a5f95c43
Merge branch 'CURA-5876_fixes' into 4.0
2018-12-14 16:28:04 +01:00
Ian Paschal
74af11d609
Anchor loader to stage menu vertical center
2018-12-14 16:20:08 +01:00
Daniel Schiavini
3194a6d0bb
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection-multipart-upload
2018-12-14 16:17:36 +01:00
Aleksei S
9146a775a4
After resetting the custom settings the quality slider did not update selected value
...
CURA-6028
2018-12-14 16:17:05 +01:00
Ian Paschal
ffccbcea2f
Anchor to bottom of header background
2018-12-14 16:13:49 +01:00
Ian Paschal
2789a0fdc4
Revert "Quick fix to prevent monitor stage from overlapping header"
...
This reverts commit 3766effa81
2018-12-14 16:13:35 +01:00
ChrisTerBeke
2772b3bcbd
Merge branch '4.0' into STAR-322_cloud-connection
2018-12-14 16:10:20 +01:00
Ian Paschal
3766effa81
Quick fix to prevent monitor stage from overlapping header
2018-12-14 16:04:31 +01:00
Daniel Schiavini
e815d5da8f
STAR-322: Avoiding lambdas and direct callbacks to avoid gc
2018-12-14 16:02:28 +01:00
Lipu Fei
ae695b77e6
Add native rendering for QML Label
...
CURA-6013
2018-12-14 15:23:59 +01:00
Ghostkeeper
2e835bf48d
Merge branch '4.0'
2018-12-14 15:02:30 +01:00
Ghostkeeper
3a74511d23
Remove padding from views selector
...
This padding made it break the height of the item for some reason. I guess that is a Qt bug.
In any case, the padding shouldn't be there either since the lining is on the inside of the child buttons so the padding only causes a gap to appear on the left and right sides, which looks weird.
Contributes to issue CURA-6029.
2018-12-14 15:02:14 +01:00
Daniel Schiavini
2f08854097
STAR-322: Using QNetworkReply.finished signal instead of QNetworkAccessManager.finished
2018-12-14 14:50:15 +01:00
Jaime van Kessel
b70a4ae0a2
Merge branch 'CURA-6015_fix_osx_crash' of github.com:Ultimaker/Cura into 4.0
2018-12-14 13:35:37 +01:00
Ghostkeeper
64e436f814
Merge branch '4.0'
2018-12-14 13:27:54 +01:00
Ghostkeeper
475b008310
Reduce minimum window size slightly
...
This way it just fits on the screen of a 13 inch MacBook Air.
2018-12-14 13:27:36 +01:00
Jaime van Kessel
c4a0f19d56
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2018-12-14 13:23:43 +01:00
Jaime van Kessel
d379f94775
Make the dark theme a bit more readable
2018-12-14 13:23:28 +01:00
