42 Commits

Author SHA1 Message Date
Diego Prado Gesto
9594545f2c Remove the link to show the compatibility chart
Actually it only made sense for ultimaker materials. Now that we can include instruction link in every materials, a specific link for every material can be used instead.

Contributes to CURA-6423.
2019-04-04 14:46:20 +02:00
Jaime van Kessel
12a120f044 Slightly modify the variant label to match more with the monitor tab
CURA-6100
2019-01-17 14:21:11 +01:00
Jaime van Kessel
0ce0228f76 Merge branch 'feature_configuration_menu_variant' of https://github.com/fieldOfView/Cura into 4.0 2019-01-17 14:03:43 +01:00
fieldOfView
f8bfca6079 Don't show auto configuration selection when there are no configurations 2019-01-11 18:27:44 +01:00
Diego Prado Gesto
e706020639 Improve the text when there is no configuration available
It can happen that the list is empty because the data is still coming or because the connection has been lost.

There are also some improvements in the link to the compatibility chart. Now the two external links in Cura have the same behaviour.

Contributes to CURA-6011.
2019-01-11 14:44:49 +01:00
Jaime van Kessel
614b1000fd Added missing material compatibility chart link
CURA-6090
2019-01-10 15:36:36 +01:00
fieldOfView
f1d01e733d Add variant to the configuration menu headerItem 2019-01-03 16:34:05 +01:00
Ghostkeeper
c6fb0d70af
Use medium font size for everything in stage menu
Except the material manufacturer, which should remain default.

Contributes to issue CURA-6025.
2018-12-31 13:22:53 +01:00
Diego Prado Gesto
b5d8db6a77 Merge branch '4.0' into CURA-6011_connection_types 2018-12-17 15:44:02 +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
Ghostkeeper
78a5f95c43
Merge branch 'CURA-5876_fixes' into 4.0 2018-12-14 16:28:04 +01:00
Lipu Fei
620790ae3d Reduce the creations of ExtrudersModels
CURA-6015
2018-12-13 14:12:23 +01:00
Diego Prado Gesto
1d3da3244f Remember the previous selected method in the configuration
The current behavior now is to open the configuration panel in the previous state, in case it was manually selected. That means that after selecting a printer, the manual state is reset so it will open the auto configuration if it is a connected printer. It will open the custom state in case it's not connected or the printer has no connection.

Contributes to CURA-5876.
2018-12-12 14:09:15 +01:00
Diego Prado Gesto
4ba448077e Add an empty state, when there are no configurations, showing a label indicating that the list is empty
Contributes to CURA-5876.
2018-12-12 13:33:46 +01:00
Diego Prado Gesto
a6a16a682d Fix some alignments
Also modify a bit the code in the ConfigurationItem, trying to get rid of a binding loop, but I couldn't (so weird)

Contributes to CURA-5876.
2018-12-12 11:17:44 +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
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
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
05075c44ee Add renderType to some labels in the Configuration panel
Contributes to CURA-5876.
2018-12-06 14:19:34 +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
07d58c3aef Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:56:21 +01:00
Ghostkeeper
2fdfdaa00b
Rename iconOnRightSide to isIconOnRightSide
More accurately represents the type of value that's in this property.

Contributes to issue CURA-5876.
2018-12-04 14:47:34 +01:00
Ghostkeeper
2dde2438b2
Remove unnecessary anchors
Contributes to issue CURA-5876.
2018-12-04 14:38:13 +01:00
Ghostkeeper
347240410a
Use enumeration to check and switch state of configuration menu
Instead of a string. This is a bit more restrictive.

Contributes to issue CURA-5876.
2018-12-04 14:35:28 +01:00
Jaime van Kessel
9b8b91b6a4
More specific variable type for is_connected
Contributes to issue CURA-5876.

Co-Authored-By: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
2018-12-03 17:34:08 +01:00
Ghostkeeper
c8cb3a094a
Re-use SecondaryButton instead of setting colours ourselves
It has a pre-defined theme.

Contributes to issue CURA-5876.
2018-12-03 11:52:10 +01:00
Ghostkeeper
6012ea0b9e
Don't use QtQuick imports from Qt 5.11
Our build system uses 5.10.

Contributes to issue CURA-5876.
2018-12-03 11:15:11 +01:00
Ghostkeeper
f3af5a72ad
Use ListModel.count instead of rowCount
The .count property properly updates when the model is changed.

Contributes to issue CURA-5876.
2018-12-03 11:13:26 +01:00
Ghostkeeper
1555a1ab17
Make manufacturer and extruder labels lighter
The proper colour would've been 'detail' but that seems to not be used much at all, and it's too light. In other places, 'inactive' is used in this place more often.

Contributes to issue CURA-5876.
2018-11-27 14:03:05 +01:00
Ghostkeeper
7f11142d50
Fix height and vertical layout of popup
Many things were made simpler. This took some time to fix...

Contributes to issue CURA-5876.
2018-11-22 14:57:55 +01:00
Ghostkeeper
a826dfb156
Fix binding loop in height of view selection bar
Since these were part of the childrenRect of the bar, and attached to the bottom of the bar, the childrenRect depended on the position of the children and that depends on the childrenRect again. So just attach it to the top, it's logical.

Contributes to issue CURA-5876.
2018-11-21 16:12:00 +01:00
Ghostkeeper
a052b8ec69
Use Theme.getIcon instead of Theme.icons
This is better for performance, according to the deprecation warning I got.

Contributes to issue CURA-5876.
2018-11-21 16:08:29 +01:00
Ghostkeeper
d42ddad606
Add icons on left and right side of text
For this I had to implement functionality in ActionButton to be able to display the icon on either side.

Contributes to issue CURA-5876.
2018-11-20 14:47:41 +01:00
Ghostkeeper
dca286cea5
Give action button a sane default height
We don't want to give it a default width since that should just adjust to its contents by default, which is fine.

Contributes to issue CURA-5876.
2018-11-20 14:34:06 +01:00
Ghostkeeper
a1068a3ef2
Rename action_panel_button theme entry to action_button
Because it's not just used in the save panel.

Contributes to issue CURA-5876.
2018-11-20 14:24:09 +01:00
Ghostkeeper
42d73836f4
Move default margin by default to Cura's action buttons
So we don't have to repeat that every time you create a new button.

Contributes to issue CURA-5876.
2018-11-20 14:19:55 +01:00
Ghostkeeper
cbd5238738
Don't show custom/auto toggle buttons when not connected
In order to prevent suddenly switching to the other side when the connection is lost or restored, we only evaluate this upon opening the popup. This way you might be surprised that closing and then opening it can show something else, but it will never surprise you while working on the popup itself as a user.

Contributes to issue CURA-5876.
2018-11-20 13:55:28 +01:00
Ghostkeeper
a04db164e6
Make it possible to swap between auto and custom configuration
We're going to need to make this disappear when the printer is not connected. But that is for later.

Contributes to issue CURA-5876.
2018-11-19 17:11:51 +01:00
Ghostkeeper
00a49fff26
Rename QuickConfigurationSelector to ConfigurationMenu
This is going to function as our main item for the configuration menu. It contains the part in the top bar and the glue item for the part in the popup.

Contributes to issue CURA-5876.
2018-11-19 14:39:19 +01:00