GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-16 06:16:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,576 Commits 295 Branches 268 Tags
Commit Graph

17576 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Schiavini
f432d7c858 STAR-322: Using a test setup to run tests with Cura app 2018-12-10 13:11:42 +01:00
Ian Paschal
df4e5c40df Rename ClusterMonitorItem 
Contributes to CL-1152
 2018-12-10 12:19:52 +01:00
Diego Prado Gesto
dff364ee30 Change the panel to have also rounded rectangle in the top part 
Contributes to CURA-5941.
 2018-12-10 12:03:29 +01:00
Diego Prado Gesto
99890e61df Merge branch 'ui_rework_4_0' into CURA-6018_fix_messages 2018-12-10 11:43:35 +01:00
Diego Prado Gesto
e479772f4d Merge branch 'master' into ui_rework_4_0 2018-12-10 11:43:24 +01:00
Ian Paschal
8a856f13d2 Re-add config changes in monitor tab 
Contributes to CL-1152
 2018-12-10 11:36:51 +01:00
Ian Paschal
ad7dcf6fc0 Delete ClusterControlItem.qml 
Contributes to CL-1152
 2018-12-10 11:36:12 +01:00
Diego Prado Gesto
0d55d023a1 Align the message colors with the ones in the designs. 
Contributes to CURA-6018.
 2018-12-10 11:36:03 +01:00
Ian Paschal
021c448627 Remove depreciated monitor tab stuff 
Contributes to CL-1152
 2018-12-10 11:31:18 +01:00
Daniel Schiavini
134f97d5f1 STAR-322: Finishing the output device manager tests 2018-12-10 11:30:02 +01:00
Diego Prado Gesto
12522c9293 Change hover colors of the small buttons. 
Contributes to CURA-5941
 2018-12-10 11:19:44 +01:00
Daniel Schiavini
bfe04a55f9 Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-10 10:45:37 +01:00
Daniel Schiavini
75c2e25a01 STAR-322: Testing more of the device manager 2018-12-10 10:43:22 +01:00
Diego Prado Gesto
8cfb9350bc Add a mouse area to gather the scroll events in the settings panel 
Contributes to CURA-5941.
 2018-12-10 10:36:55 +01:00
Ellecross
3db3203e0d
Merge pull request #4951 from Ultimaker/CURA-5939_crash_dialog 
Merging this Cura 5939 crash dialog together with Aleksei!
 2018-12-10 10:28:00 +01:00
Diego Prado Gesto
9e7a52e28b Update the background color for the expandable component when using the close button. 
Contributes to CURA-5941.
 2018-12-10 09:43:50 +01:00
Daniel Schiavini
c495ade2d3 STAR-322: Documenting the network manager mock 2018-12-10 09:42:26 +01:00
Daniel Schiavini
45f51c3588 STAR-322: First test cloud output device manager 2018-12-07 18:09:20 +01:00
Daniel Schiavini
e0b159e2ad STAR-322: Creating a network manager mock 2018-12-07 17:46:35 +01:00
Ghostkeeper
9dc8450db0
Fix typo 2018-12-07 17:37:10 +01:00
Daniel Schiavini
63c5b77959 STAR-322: Fixing finished jobs 2018-12-07 16:43:53 +01:00
Marijn Deé
74028c4fa1 Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-07 16:21:38 +01:00
Marijn Deé
07801b5394 First test for CloudDevices 2018-12-07 16:21:08 +01:00
Ghostkeeper
b565b111c8
Adjust disabled extruder colour 
This also introduces a more global 'disabled' colour as defined by the style guide. I hope that we can gradually transition to this one, but we'll have to adjust some colours here and there.

Contributes to issue CURA-5876.
 2018-12-07 15:38:08 +01:00
Ghostkeeper
6a7bbe5bdb
Fix hiding materials if material is empty 
Because the loaded material profile has the name 'Empty' then.

Contributes to issue CURA-5876.
 2018-12-07 15:31:12 +01:00
Ghostkeeper
ffcac04f9e
Add printer type selector if connected to cluster 
If there are 2 or more printer types in your connected cluster, you can switch the printer type here.

Contributes to issue CURA-5876.
 2018-12-07 15:21:53 +01:00
Ghostkeeper
78df27369f
Fill buildplate icon 
This is according to our newest designs.

Contributes to issue CURA-5876.
 2018-12-07 14:41:30 +01:00
Ghostkeeper
c663681e66
Simplify buildplate icon 
Removed all unnecessary crap added by Sketch.

Contributes to issue CURA-5876.
 2018-12-07 14:39:43 +01:00
Ghostkeeper
8e2c130416
Use default lining style as separator for buildplate 
Normal colour, normal thickness.

Contributes to issue CURA-5876.
 2018-12-07 14:31:06 +01:00
Ghostkeeper
c44b74454f
Revert "No longer make BuildVolume set max bounds." 
This reverts commit 1467e703ae121c3f2fa02ee7258bdeba63f80c5c.
This variable was actually used... In Uranium, by the scale tiny models feature.
 2018-12-07 14:22:39 +01:00
Ghostkeeper
43a06fdc3d
Add more margin above printer type labels 
A bit of Gestalt.

Contributes to issue CURA-5876.
 2018-12-07 13:49:32 +01:00
Diego Prado Gesto
15f81da95b Do not show the layer height in the header panel when the profile is not supported 2018-12-07 13:47:58 +01:00
Ghostkeeper
e74258c26b
Don't show materials if printer has no materials 
But if the printer does have other configurations to change, do show a placeholder text to indicate that the configuration can be selected here.
This also simplifies a bit of code where it would need to call an updateEnabled() function, since it turns out that these properties in Cura.MachineManager have proper signals (contrary to what was previously used, the metadata entry stuff).

Contributes to issue UCRA-5876.
 2018-12-07 13:40:10 +01:00
alekseisasin
c232107e95
Merge pull request #4942 from Ultimaker/place_print_info_back 
Place print info back
 2018-12-07 13:39:12 +01:00
Diego Prado Gesto
e93e3f36b0 Merge branch 'place_print_info_back' of github.com:Ultimaker/Cura into place_print_info_back 2018-12-07 13:30:21 +01:00
Diego Prado Gesto
26be65e405 Fix some other merge conflicts 
Contributes to CURA-6008.
 2018-12-07 13:29:16 +01:00
Daniel Schiavini
5b963de2ea STAR-322: Checking if response changed before updating cluster 2018-12-07 13:19:45 +01:00
Diego Prado Gesto
46fa33fda5 Merge branch 'ui_rework_4_0' into place_print_info_back 2018-12-07 13:19:19 +01:00
Diego Prado Gesto
9c873faace Merge branch 'ui_rework_4_0' into place_print_info_back 2018-12-07 13:11:15 +01:00
Ghostkeeper
2593849798
Merge branch 'ui_rework_4_0' of ssh://github.com/Ultimaker/Cura into ui_rework_4_0 2018-12-07 13:04:13 +01:00
Aleksei S
6a696a57f2 Removed unused property 2018-12-07 13:01:49 +01:00
Ghostkeeper
dfe55b8f23
Fix height of expandable component adapting to contents 
Since the children don't adjust their height based on if they are visible (which would cause a binding loop) we just need to adjust the height of the total menu based on which children are visible. Easy enough.

Contributes to issue CURA-5876.
 2018-12-07 12:59:51 +01:00
Lipu Fei
1c83a2f227
Merge pull request #4937 from Ultimaker/CURA-5941_restyle_setting_dropdown 
Restyle of the print setup panel
 2018-12-07 12:39:38 +01:00
Daniel Schiavini
2b8358fda8 STAR-322: Improvements to date calculation and signalling 2018-12-07 12:39:37 +01:00
Diego Prado Gesto
1d33fe081f Clean up the code 
Remove all the references to the sidebar and use the term print_setup instead.

Contributes to CURA-5941.
 2018-12-07 12:07:41 +01:00
Daniel Schiavini
4f82a2759a STAR-322: Improving configuration models interface 2018-12-07 12:04:02 +01:00
Diego Prado Gesto
898fd25ddb Remove the component IconLabel since we have a similar one in IconWithText 
Contributes to CURA-5941.
 2018-12-07 11:43:41 +01:00
Diego Prado Gesto
8f0d8c7d25 Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-07 11:28:09 +01:00
Diego Prado Gesto
da052fbe81 Not show a tooltip in the output device selector when the popup shows up 2018-12-07 11:21:25 +01:00
Lipu Fei
677edd51ee Remove unnecessary visibles 
CURA-5941

Because the parent Rows already have it set.
 2018-12-07 10:55:22 +01:00