55 Commits

Author SHA1 Message Date
Joey de l'Arago
1e6184448c
Apply suggestions from code review
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
2022-12-12 11:44:21 +01:00
Jelle Spijker
91170e0aef
Apply suggestions from code review 2022-12-08 07:43:57 +01:00
Joey de l'Arago
bcdfa808a8 Switch to checking enabled extruder count for showing print with Component. This is because we want the SingleSettingExtruderBar to be hidden when there are 1 or less extruders, but also when there are 1 or less enabled extruders.
CURA-9793
2022-12-07 17:33:13 +01:00
Joey de l'Arago
362877dee1 Add new recommended mode tooltips and remove extra margin at the bottom of tooltips.
CURA-9793
2022-12-06 10:50:04 +01:00
Joey de l'Arago
c495f0de3f Hide extruder selector when there is only one extruder.
CURA-9793
2022-12-05 17:11:05 +01:00
Joey de l'Arago
ce5691c12d
Apply suggestions from code review
Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
2022-12-05 14:42:35 +01:00
Joey de l'Arago
62bae7df19 Collapse the setting section when the switch for the section is disabled.
Add collapse animation for setting items and setting section.

Swap out ColumnLayout for Layout. Animating the Layouts does not seem to be possible.

I had to put spacer back into the Column but it is the lesser of two evils.

CURA-9793
2022-12-01 14:03:11 +01:00
Joey de l'Arago
574b1000f6 Add tooltips
CURA-9793
2022-11-30 17:44:58 +01:00
Joey de l'Arago
dbf2ae4f60 Fix spacing vertical between Recommended sections and setting items.
CURA-9793
2022-11-30 15:09:05 +01:00
Joey de l'Arago
dbf27a432f Change confusing naming of section enable switch.
CURA-9793
2022-11-30 12:12:41 +01:00
Joey de l'Arago
c356b9d46f Rename ExtruderSelectorBar -> SingleSettingExtruderSelectorBar to be inline with new single setting widgets.
Move common functionality into SingleSettingExtruderSelectorBar

Add adhesion settings

CURA-9793
2022-11-29 17:00:55 +01:00
Joey de l'Arago
c240833868 Add Support type settings
CURA-9793
2022-11-29 16:23:49 +01:00
Joey de l'Arago
b53c8aac54 Add single setting update ComboBox
CURA-9793
2022-11-29 16:16:50 +01:00
Joey de l'Arago
d9a2a3f5b7 cleanup
CURA-9793
2022-11-29 09:19:56 +01:00
Joey de l'Arago
5d5915e49e Make support selector functional
CURA-9793
2022-11-29 09:19:56 +01:00
Joey de l'Arago
631d6a15b0 Add extruder button bar that shows icons for each extruder in a horizontal row 💪
Make ExtruderButton more generic by moving functionality out.

Remove background color from ToolbarButton and add that background color to the Toolbar.qml.

Fix Toolbar border being created by overlapping rectangles instead of using border

Add scaling options for ToolBarButtons icon

CURA-9793
2022-11-28 15:55:55 +01:00
Joey de l'Arago
4a59607d05 Switch to ColumnLayout
Update part of Support selector to new layout.

CURA-9793
2022-11-28 10:49:53 +01:00
j.delarago
8761a476a6 Fix height binding loops
CURA-8849
2022-06-28 16:33:35 +02:00
j.delarago
cde897ff1e Instead of having a seperate tooltip for the checkbox and the text area, the two have been combined into one tooltip.
The reason for this is that hovering the mouse between the checkbox and text was causing some strange behaviour where sometimes the tooltip would not appear.

The effect of the changes in RecommendedSupportSelector.qml are the same as RecommendedAdhesionSelector.qml. It just required a bit of refactoring to have the checkbox and the textlabel in the same component.

CURA-8849
2022-06-21 11:59:03 +02:00
j.delarago
c6bc3a5cd7 Add tooltip to IconWithText.qml,
Use this to display tooltips for Infill, Support and Adhesion in recommended settings.

CURA-8849
2022-06-20 10:52:31 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage
CURA-8640
2022-04-08 15:55:34 +02:00
Ghostkeeper
ee81326d6a
Fix remaining merge conflicts
- When both branches added Controls1 as OldControls, it's not marked as a merge conflict. But the merge removed the need for OldControls, so the import can be removed.
- There was one instance where I had removed the OldControls for a checkbox but there it should remain since the checkboxes are updated in a separate ticket.

Contributes to issue CURA-8684.
2022-01-31 17:08:56 +01:00
Ghostkeeper
4f82137035
Customise scrollbar for extruder selectors
Contributes to issue CURA-8686.
2022-01-20 17:26:49 +01:00
Jaime van Kessel
2aa931cbca Remove unneded styles import 2022-01-04 09:48:02 +01:00
Jaime van Kessel
83be495414 Replace usage of controls label with our custom label
This prevents copy pasting a bunch of parameters that we set by default
2021-11-10 16:37:26 +01:00
Jaime van Kessel
0bb09a4783 Replace all old controls 1 comboboxes with UM.Combobox 2021-11-10 14:57:01 +01:00
Konstantinos Karmas
a6cd2fe970 Change the extruder icon in the settings dropdown to be a filled circle
This makes it much more distinguishable.

CURA-8011
2021-07-02 12:15:26 +02:00
Konstantinos Karmas
0904324dde Use medium_button instead of toolbar_button
Since it is less specific and can be used in other places too.

CURA-8202
2021-07-01 10:02:09 +02:00
Konstantinos Karmas
6cf25aa540 Make the icons in the recommended window same size as the toolbar icons
CURA-8202
2021-06-30 12:28:46 +02:00
Ghostkeeper
0a75c772ed
Unrevert new icon set for all of Cura's interface
We created a new set of icons for Cura. These icons had to be reverted though because they weren't working out in the interface for the last release yet.
This unreverts them, basically adding them back hoping that we'll get them fixed in time for the next release.

Contributes to issue CURA-8342.

Revert "Revert "Fix merge conflict""

This reverts commit bb20e3307f43edc1ff53cb154d2351ddfe39e158.

Revert "Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons""

This reverts commit 70e4e9640e561e18a12870f30c905203ce8ccee7.

Revert "Revert "Fix typo in icon name""

This reverts commit 38ce22ba7c3f40b971bc6e1e0a8e776ca9d51512.

Revert "Revert "Add list for deprecated icons""

This reverts commit 119a957e7f978dbf1ddbcb3b0005bf38e8fed943.

Revert "Revert "Add Function icon""

This reverts commit 760726cf0bb953bb1b0fc277b448f419d4bd2544.

Revert "Revert "Switch out inherit icon""

This reverts commit 26afff609381e2004d194c280f504b6226859bd3.

Revert "Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura""

This reverts commit 6483db3d47ee052c1a966cdee3af7190577a5769.

Revert "Fix incorrect icons"

This reverts commit 02a4ade2a50a943ff36fd4895bdc9261cf2133eb.
2021-06-28 17:16:56 +02:00
Jaime van Kessel
70e4e9640e
Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"
This reverts commit 6120d8a054b8c04bf90b8b3d3cb219d691bece2f, reversing
changes made to 95652556fef90f70adbf25bfa9bd3b8af7220d4a.
2021-05-27 16:06:20 +02:00
Kostas Karmas
f887db23f6 Use detail_level to describe the icons (instead of size)
Previously the icons were organized according to "size" which could prove to be confusing.
This commit fixes that by organizing them according to "detail_level".

CURA-8010
2021-04-28 18:53:32 +02:00
jelle Spijker
9ea97f7561
SVG are not correlated to pixel size.
Although this deviates from the UX practices. It tended to confuse the
programmers ;-) The variances in level of detail for the icons are now
placed in the sub-directories. small, default and big.

CURA-8010_new_icons
2021-04-28 15:45:20 +02:00
jelle Spijker
2bd6f28f3a
Update Icons
Subdivided the new icons in 3 size categories. As requested by UX
Used the company naming scheme for uniformity and easy recognition.

Known issues:
- Top/Bottom category wasn't taken into account by UX at the time. Since
 this is a recent addition. Both the Walls and Top/Bottom will be updated.
- Cloud/Network connection icons 12px don't render correctly. Due to the
 theme-ing.
- Extruder Icons do not render correctly.

CURA-8010_new_icons
2021-04-26 19:42:17 +02:00
Konstantinos Karmas
504f6dbe70
Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
Konstantinos Karmas
180732788b
Merge pull request #9472 from Ultimaker/CURA-7813_QML_warnings
Cura 7813 qml modules version bump
2021-03-30 09:42:59 +02:00
Kostas Karmas
7827b36ab7 Fix QML warnings due to depricated on<signal> calls in Connections
As of 5.12, the signals used in connections should not be declared as on<signal>, but as
function on<signal>(arguments).
2021-03-30 09:02:48 +02:00
jelle Spijker
2986d50745
Update QtQuick and QtQuick.Controls
CURA-7813
2021-03-29 17:55:19 +02:00
Kostas Karmas
5c898b8c57 Allow the machine manager to set an empty active machine
Gracefully handle the case where the machine manager is requested to
delete the last machine in Cura. In this case, instead of deleting
everything of this machine and still keep it as an active machine,
the machine manager will set the active machine to None.

The QML files which depend on the active machine were changed to
properly handle themselves when there is no active machine.

CURA-7454
2020-06-09 15:33:22 +02:00
Ghostkeeper
5cfe71e516
Fix binding loop in action panel widget
This widget can't set its width to the width of its children, since its children anchor to its right-hand side which depends on the width.
This fixes the following warning in the log:
2020-03-20 14:25:20,351 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [406]: file:///home/trin/Gedeeld/Projects/Cura/plugins/PrepareStage/PrepareMain.qml:16:5: QML ActionPanelWidget: Binding loop detected for property width

Done during Turbo Testing and Tooling.
2020-03-20 14:52:33 +01:00
Ghostkeeper
3af91bfca7
Fix QML warning assigning undefined to an integer field
Fixes the following QML warning in the logs:
2020-03-20 14:02:13,482 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [406]: file:///home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:125:13: Unable to assign [undefined] to int

Instead it now assigns the first extruder before a printer has been created. The first extruder also doesn't exist yet at this point, but this doesn't really matter because there is no interface to show yet at this point.

Done during Turbo Testing and Tooling.
2020-03-20 14:17:24 +01:00
Remco Burema
db71a40acc Handle undefined extruder-color on start in RecommendedSupportSelector. 2019-04-11 16:23:36 +02:00
Lipu Fei
c237222d3c Minor change to QML
CURA-6144
2019-02-13 11:28:28 +01:00
Jaime van Kessel
43b81c70db Ensure that color for support extruder selector gets updated in all cases
CURA-6144
2019-02-08 10:32:54 +01:00
Lipu Fei
44f986d661 Fix combox style for support extruder in recommended
CURA-6144
2019-02-01 13:31:23 +01:00
Ghostkeeper
44f21b37ac
Make labels on left side of recommended mode larger
Contributes to issue CURA-6025.
2018-12-31 13:49:03 +01:00
Lipu Fei
620790ae3d Reduce the creations of ExtrudersModels
CURA-6015
2018-12-13 14:12:23 +01:00
Lipu Fei
f7f3c96f81 Fix typo
CURA-5941
2018-12-06 10:53:43 +01:00
Diego Prado Gesto
d3b5b2717d Add rounded corners to the settings
Contributes to CURA-5941
2018-12-03 15:56:21 +01:00
Diego Prado Gesto
4c468831f0 Add tabs for select the extruder in the custom print setup.
Align some elements beneath the tabs.

Contributes to CURA-5941.
2018-12-03 13:58:13 +01:00