3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 05:23:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
17616 commits 312 branches 275 tags 718 MiB
Commit graph

3359 commits

Author SHA1 Message Date
ChrisTerBeke
53eae3ee92 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-14 12:04:31 +01:00
Jaime van Kessel
c3aca8907c Fix extruder number not being visible in dark theme 2018-12-14 12:02:52 +01:00
Jaime van Kessel
6a3ac99551 Ensure that all icons use the same color from theme. 
Also added some fixes for the dark theme
 2018-12-14 11:59:22 +01:00
Jaime van Kessel
15cd2a9269 Changed textColor of recommended infill slider text to be themed. 
This is required to make the dark theme work correctly
 2018-12-14 11:36:40 +01:00
ChrisTerBeke
e1f95c6ec1 Merge branch 'master' into STAR-322_cloud-connection 2018-12-14 09:24:56 +01:00
Aleksei S
8dc2a41fb7 Typo, wrong item type, "item" 
CURA-5941
 2018-12-13 17:27:16 +01:00
Jaime van Kessel
8f278fe938 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-13 17:21:35 +01:00
Jaime van Kessel
856c1dcb20 Also disconnect the signal for the old parent of printSetupSelector 2018-12-13 17:21:07 +01:00
Diego Prado Gesto
473160a102 Add a check for null to avoid warnings in the logs. 2018-12-13 17:02:13 +01:00
Diego Prado Gesto
d435f21193
Merge pull request #4986 from Ultimaker/CURA-6028_preview_stage_doesnt_switch 
Cura 6028 preview stage doesnt switch
 2018-12-13 16:47:22 +01:00
Diego Prado Gesto
012ee0c02a Use the MouseArea trick to assure that the binding still works for the 
checked property of the button.

Contributes to CURA-6028.
 2018-12-13 16:44:49 +01:00
Jaime van Kessel
bd565bf4cf Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-13 16:33:46 +01:00
Jaime van Kessel
d48e89e224 Prevent the parent of printSetupSelector from being set to null 
If it's parent gets set to null it will break the focus, which we need for the binding updates.

CURA-5941
 2018-12-13 16:32:48 +01:00
alekseisasin
70e60e5313
Merge pull request #4981 from Ultimaker/fix_output_device_selector 
Change the behaviour of the output device selector
 2018-12-13 16:21:49 +01:00
Jaime van Kessel
1b3cb32334 Fix the simulation view not being selected as default 
CURA-6028
 2018-12-13 15:59:15 +01:00
Jaime van Kessel
c4700b2752 Also update the model if the data changed 
CURA-6028
 2018-12-13 14:30:00 +01:00
Jaime van Kessel
a1a9b058f5 Let header listen to activeStageId instead of the model 
CURA-6028
 2018-12-13 14:28:32 +01:00
Diego Prado Gesto
635115a879
Merge pull request #4982 from Ultimaker/fix_preview_stage_menu 
Fix preview stage menu
 2018-12-13 09:32:01 +01:00
Diego Prado Gesto
e7fe7571aa Change the behaviour of the output device selector 
Now the behavior is the following:
- The active output device is the one that shows up in the button (same as before)
- The list of the output devices don't show the active device
- When clicking in one item of the list, it becomes the active output and automatically it performs the action.

Contributes to CURA-6026.
 2018-12-13 09:02:14 +01:00
ChrisTerBeke
6150bd665a Merge branch 'master' into STAR-322_cloud-connection 2018-12-12 14:04:59 +01:00
alekseisasin
64104e47c6
Merge pull request #4970 from Ultimaker/fix_preview_stage_menu 
Fix preview stage menu
 2018-12-12 11:22:08 +01:00
Remco Burema
1b2ef91c13 Merge branch 'CURA-6016_Improve_UI_Speed' into 4.0 2018-12-12 10:54:36 +01:00
Remco Burema
65f1c9a304
Merge pull request #4969 from Ultimaker/CURA-6016_Improve_UI_Speed 
Cura 6016 improve ui speed
 2018-12-11 17:26:15 +01:00
Diego Prado Gesto
faa3f42acc Modify the header in the simulation view menu component 
This is needed to align with the designs.
 2018-12-11 13:53:05 +01:00
Jaime van Kessel
6c70543d11 Only set the containerID when the dialog is visible 
This prevents unneeded updates

CURA-6016
 2018-12-11 12:46:11 +01:00
Daniel Schiavini
073e8cd6dc Merge branch 'master' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-11 12:39:02 +01:00
Diego Prado Gesto
4b6f4af44e Close the expandable panel when it becomes disabled 
It happens when it's open and the user loads a GCode.

Contributes to CURA-5941
 2018-12-11 11:10:45 +01:00
ChrisTerBeke
79430f9faf Merge branch 'ui_rework_4_0' into STAR-322_cloud-connection 2018-12-11 10:56:38 +01:00
Diego Prado Gesto
4dab33d41b Remove the fancy snowflakes pattern 2018-12-11 10:44:30 +01:00
Jaime van Kessel
909f36d28e Let the settingsMenu use the extruders of the active machine instead of the extruderModel 
The extruder model gets updated way to much (for all material changes) but we only need the
number and names of the extruders, since the other menu's do this by themselves
 2018-12-11 09:24:22 +01:00
Diego Prado Gesto
716fedc782 Use no text by default for the disabled state of the panels 
Contributes to CURA-5941.
 2018-12-10 17:06:51 +01:00
Diego Prado Gesto
4fc4aecf17 Avoid the overlapping of text when the name is too long 
Normally I happens in other languages other than English.
 2018-12-10 15:48:59 +01:00
Diego Prado Gesto
1cd0d26db4 Change margins 
Instead of using multiplications and divisions, just use the corresponding margins.

Contributes to CURA-5876.
 2018-12-10 15:34:48 +01:00
Diego Prado Gesto
aa376e60da Make the disabled text translatable 
Contributes to CURA-5941.
 2018-12-10 14:45:11 +01:00
Diego Prado Gesto
590e8f5eb1 Wrap the disabled text in case it's too long. 
Contributes to CURA-5941.
 2018-12-10 14:41:15 +01:00
Diego Prado Gesto
437ba3848d Fix typo. Missing parenthesis 
Contributes to CURA-5941.
 2018-12-10 14:26:20 +01:00
Diego Prado Gesto
3f97f83c47 Add a disabled state to the expandable components 
In this case, when the component is disabled, there is an optional message that will show. It works for instance when loading a gcode and the print setup panel has to be disabled.

Contributes to CURA-5941.
 2018-12-10 14:17:56 +01:00
Diego Prado Gesto
90f822f683 Add the component header that I miss in a previous commit 
Contributes to CURA-5941.
 2018-12-10 13:44:50 +01:00
Diego Prado Gesto
af37f51cf8 Make the expandable content header to be a common header for every expandable component. 
Contributes to CURA-5941.
 2018-12-10 13:36:06 +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
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
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
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
Ghostkeeper
9dc8450db0
Fix typo 2018-12-07 17:37:10 +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
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
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