GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-08 09:19:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,324 Commits 290 Branches 260 Tags
Commit Graph

3315 Commits

Author SHA1 Message Date
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
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
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
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
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
Diego Prado Gesto
26be65e405 Fix some other merge conflicts 
Contributes to CURA-6008.
 2018-12-07 13:29:16 +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
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
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
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
Diego Prado Gesto
3b8b70bddf Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-06 16:35:07 +01:00
Ghostkeeper
c39674cd0c
Use upper camel case for enum options 
Contributes to issue CURA-5876.
 2018-12-06 16:23:24 +01:00
Diego Prado Gesto
9bce373520 Merge branch 'small_ui_fixes' into ui_rework_4_0 2018-12-06 16:08:33 +01:00
Diego Prado Gesto
4b9e6e7708 Add the linear gradient back, that I removed in a previous commit 
Contributes to CURA-6010.
 2018-12-06 16:06:22 +01:00
alekseisasin
e29baf0cec
Merge pull request #4943 from Ultimaker/small_ui_fixes 
Small ui fixes
 2018-12-06 15:23:35 +01:00
Diego Prado Gesto
b55ead8c89 Fix typo 
Contributes to CURA-6010.
 2018-12-06 15:18:32 +01:00
Diego Prado Gesto
46c209a993 Add one pixel margin to the view selector. 2018-12-06 14:45:24 +01:00
Aleksei S
3c517d3fcc The top bar background overlaps settings bar 2018-12-06 14:25:18 +01:00
Diego Prado Gesto
05075c44ee Add renderType to some labels in the Configuration panel 
Contributes to CURA-5876.
 2018-12-06 14:19:34 +01:00
Lipu Fei
85f2a7e8f6 Move visible to Rows for extruder configs 
CURA-5941

So the whole row, such as "material", will be shown/hiden based on
whether the machine has materials.
 2018-12-06 14:06:18 +01:00
Ghostkeeper
298c68c93b
Disable configuration menu if there are no configurations 
This then prevents you from dropping down into an empty menu.

Contributes to issue CURA-5876.
 2018-12-06 13:56:06 +01:00
Ghostkeeper
1e69960464
Make it possible to disable ExpandableComponent 
It won't show the drop-down icon then, won't do hovers and won't allow you to click on it. This will not remove the contents of the ExpandableComponent menu bar item though, so that has to be done in ConfigurationMenu.qml.

Contributes to issue CURA-5876.
 2018-12-06 13:52:57 +01:00
Diego Prado Gesto
4b79770d58 Align the buttons in the output process widget 
The menu in the output device selector has now a rounded corner.
 2018-12-06 13:42:29 +01:00
Ghostkeeper
f1fec2f280
Theme the scroll bar 
We need to make this a reusable component at some point, I think. This is the first time we're using the QtQuick2 version of ScrollView.

Contributes to issue CURA-5876.
 2018-12-06 12:07:03 +01:00
Diego Prado Gesto
47626f6033 Fix the color and proportions of the cura logo in the about panel 2018-12-06 11:57:55 +01:00
Diego Prado Gesto
1d877cbade Merge branch 'ui_rework_4_0' into small_ui_fixes 2018-12-06 11:47:29 +01:00
Diego Prado Gesto
26a41c3726 Adjust the color of the printer in the printer selector 
For that I needed to get rid of the IconLabel component, since in this case the color of the icon and the text is the same (and it makes sense)
 2018-12-06 11:45:14 +01:00
Diego Prado Gesto
f655e6c43e Add a pattern in the background of the header. 
Adjust some main colors to the ones in the designs.
 2018-12-06 11:30:59 +01:00
Ghostkeeper
48e15daf64
Fix height of scroll view and make scrollable 
Contributes to issue CURA-5876.
 2018-12-06 11:16:42 +01:00
Lipu Fei
109586f69c Merge remote-tracking branch 'origin/ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-06 11:09:26 +01:00
Lipu Fei
f7f3c96f81 Fix typo 
CURA-5941
 2018-12-06 10:53:43 +01:00
Diego Prado Gesto
b0c3a4e17a Align the additional components to the right of the job specs 
The model checker now shows centered
 2018-12-06 09:25:31 +01:00
Diego Prado Gesto
c757bf128e Adjust colors and alignments in the print info panel 2018-12-06 09:12:43 +01:00
Diego Prado Gesto
218fa3aded Align the print info to the left 2018-12-05 14:22:04 +01:00
Ghostkeeper
5ba8820f18
Remove unnecessary setting height to 0 when invisible 
Turns out that it doesn't count for the childrenRect.height anyway when the item is invisible.

Contributes to issue CURA-5876.
 2018-12-05 14:10:51 +01:00
Diego Prado Gesto
a2587aca59 Merge branch 'ui_rework_4_0' into place_print_info_back 2018-12-05 14:05:38 +01:00