GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 09:38:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,863 Commits 294 Branches 267 Tags
Commit Graph

5896 Commits

Author SHA1 Message Date
Diego Prado Gesto
d6212d5a39 Add elide in the showcase title and reduce the height a bit so there are 
only 2 lines for the title.
 2018-12-17 17:29:24 +01:00
Ian Paschal
aed0bb27f2
Merge pull request #4995 from Ultimaker/CL-1151_add_monitor_carousel 
CL-1152 Add monitor carousel
 2018-12-17 17:05:50 +01:00
Ian Paschal
5c697ab5be Make hints clickable 
Contributes to CL-1151
 2018-12-17 16:58:51 +01:00
ChrisTerBeke
70421e5ac5
Merge branch '4.0' into STAR-322_cloud-connection 2018-12-17 15:46:28 +01:00
Diego Prado Gesto
b5d8db6a77 Merge branch '4.0' into CURA-6011_connection_types 2018-12-17 15:44:02 +01:00
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
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
75d7d49349 STAR-322: Mocking the CuraApp 2018-12-17 14:41:28 +01:00
Ian Paschal
cb6e4ff2d1 Organize MonitorStage.qml better 2018-12-17 14:05:28 +01:00
Daniel Schiavini
3b367938de STAR-322: Removing TestSendMaterialJob temporarily 2018-12-17 13:53:31 +01:00
Diego Prado Gesto
02825a062f Change the remove and the info buttons 
Contributes to CURA-6005.
 2018-12-17 13:38:41 +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
Diego Prado Gesto
b7904d6e05 Unify the CuraDrive plugin with the rest of the items in Cura 
For instance, the buttons were converted to either primary buttons or secondary buttons. A new CheckBox component was created in Cura in order to reuse it in the future.

Contributes to CURA-6005.
 2018-12-17 13:04:23 +01:00
Lipu Fei
6992fd2991 Update plugin versions to match package versions 
CURA-6019
 2018-12-17 13:03:21 +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
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
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
e62a570210 Merge branch '4.0' into CURA-6005_cura_drive_plugin 2018-12-17 11:25:19 +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
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
6747fe3550 Merge remote-tracking branch 'origin/4.0' into CL-1151_add_monitor_carousel 2018-12-14 16:31:47 +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
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
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
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