17707 Commits

Author SHA1 Message Date
Lipu Fei
1440c7d996
Merge pull request #5005 from Ultimaker/sdk_version_6
Increment API version to 6
2018-12-17 15:43:09 +01:00
Jaime van Kessel
06d9fd9dbe Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-17 15:26:36 +01:00
Jaime van Kessel
1352193654 Ensure that the sourceSize is set correctly 2018-12-17 15:26:10 +01:00
Jaime van Kessel
53da111617 Change "Rating" to "Your rating" 2018-12-17 15:21:48 +01:00
Ian Paschal
cb6e4ff2d1 Organize MonitorStage.qml better 2018-12-17 14:05:28 +01:00
Jaime van Kessel
aad7540366 Fix situation where multiple connect configurations would cause issues
CURA-6011
2018-12-17 13:31:38 +01:00
Jaime van Kessel
ee74b9f89f Once the connectiontype is recovered, it's converted to a string
So we need to check if that's the case.
CURA-6011
2018-12-17 13:09:01 +01:00
Lipu Fei
6992fd2991 Update plugin versions to match package versions
CURA-6019
2018-12-17 13:03:21 +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
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
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
Jaime van Kessel
938287095f Use connection type instead of um_network_key to see if a printer has a network connection
CURA-6011
2018-12-17 10:47:14 +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
Ghostkeeper
8d6a281070
Increment SDK version in bundled packages file
And increment the version number of every package.

Contributes to issue CURA-6019.
2018-12-17 09:58:38 +01:00
Ian Paschal
77deabf6d4 Code style 2018-12-17 09:43:24 +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
Ghostkeeper
c235f339ae
Increment API version to 6
All plug-ins now have to re-check whether they are still compatible with the current version of Cura.

Contributes to issue CURA-6019.
2018-12-14 17:29:02 +01:00
Jaime van Kessel
b8a4d8e80d Remove the cluster connection type
CURA-6011
2018-12-14 17:14:56 +01:00
Jaime van Kessel
226d052468 Move the machines from machinelist into their own model
CURA-6011
2018-12-14 17:10:58 +01:00
Ian Paschal
331cd730f1 Improve visual hint that side cards are not in focus
Contributes to CL-1151
2018-12-14 16:56:20 +01:00
Ian Paschal
e877b47e22 Disable printer cards which are not in focus
Contributes to CL-1151
2018-12-14 16:55:48 +01:00
Ian Paschal
2112681217 Merge remote-tracking branch 'origin/4.0' into CL-1151_add_monitor_carousel 2018-12-14 16:46:05 +01:00
Jaime van Kessel
ef6f666c3e Remove duplicate alias definition
Yay. Merges.
2018-12-14 16:41:07 +01:00
Ian Paschal
6747fe3550 Merge remote-tracking branch 'origin/4.0' into CL-1151_add_monitor_carousel 2018-12-14 16:31:47 +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
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 3766effa81dc111d70c0d7ff4563936ec92fc5c4.
2018-12-14 16:13:35 +01:00
Ian Paschal
3766effa81 Quick fix to prevent monitor stage from overlapping header 2018-12-14 16:04:31 +01:00
Ian Paschal
30168103b7 Update MonitorStage.qml 2018-12-14 15:47:36 +01:00
Ian Paschal
3bd5d141ab Add easing and make animation less snappy and awesome
Contributes to CL-1151
2018-12-14 15:39:17 +01:00
Ian Paschal
2f6a274c0e Small style improvements
Contributes to CL-1151
2018-12-14 15:27:55 +01:00
Lipu Fei
ae695b77e6 Add native rendering for QML Label
CURA-6013
2018-12-14 15:23:59 +01:00
Ian Paschal
b2ea597543 Fix button color
Contributes to CL-1151
2018-12-14 15:10:34 +01:00
Ian Paschal
5d0da580b9 Fix border colors 2018-12-14 15:04:22 +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
Ian Paschal
7fc5742b7f Add monitor carousel
Contributes to CL-1151
2018-12-14 15:01:40 +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