296 Commits

Author SHA1 Message Date
j.delarago
a49aa6502c Set material and nozzle selection menus to appear at bottom of button like drop downs.
CURA-9004
2022-03-07 16:56:26 +01:00
j.delarago
3c7498feed Move ToolbarButton and ToolTip from Cura into Uranium. This makes it possible to use new styled ToolbarButton in plugins/Tools for the rotate tool.
Removed the ContentAlignment enum in ToolTip in favour of using the Text.ContentAlignment enum. For some reason references to this enum fail everywhere when ToolTip is moved into Uranium. There is some evil time-wasting magic cast on this component!

CURA-8943
2022-03-03 15:53:30 +01:00
j.delarago
e2fe50baf1 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup
# Conflicts:
#	resources/qml/Widgets/Menu.qml
#	resources/qml/Widgets/MenuItem.qml
#	resources/themes/cura-dark/theme.json
#	resources/themes/cura-light/theme.json
2022-02-28 08:51:42 +01:00
Jaime van Kessel
8cf9fe7941 Add noWrap to all labels in configurationMenu
CURA-8941
2022-02-22 10:55:22 +01:00
j.delarago
104a34d05a Vertically center aligns "Material", "PrintCore" and dropdowns in extruder configuration menu.
CURA-8688
2022-02-21 10:46:39 +01:00
Jaime van Kessel
5615ec82a3 Prevent text in configuration menu from spilling out of the menu 2022-02-10 10:45:51 +01:00
Ghostkeeper
6db4a55f6e
Merge branch 'replace_controls_1_for_controls_2' into CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity'
Conflicts:
	plugins/ImageReader/ConfigUI.qml
	plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
	plugins/PerObjectSettingsTool/SettingPickDialog.qml
	resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
	resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
	resources/qml/Preferences/GeneralPage.qml
	resources/qml/Preferences/Materials/MaterialsPage.qml
	resources/qml/Preferences/Materials/MaterialsView.qml
	resources/qml/Preferences/ProfilesPage.qml

These conflicts are all arising from headers/includes being updated at the same time, or from the two branches marking the other one's components as needing OldControls.
This introduced more OldControls markers which don't get marked as merge conflicts by Git. This happens when an element could just be left as the original name but from the new import (e.g. a Button stays a Button in Controls 2, but should be marked as from OldControls on the branch that doesn't update the Button).
2022-01-31 16:53:45 +01:00
casper
8979632457 Resolve Qt warning
CURA-8684
2022-01-30 23:30:39 +01:00
casper
29fc98fea4 Add documentation to PrintSetupHeaderButton
CURA-8684
2022-01-28 10:33:01 +01:00
Ghostkeeper
5f101e8233
Set checked tab for TabRowButton
We're changing this so that the button doesn't set this by itself. This is necessary so that I can use this TabRowButton also when it's not in a repeater (for the global stack in the profile manager).

Contributes to issue CURA-8686.
2022-01-25 11:58:44 +01:00
casper
07095a5802 Update Material selection and variant selection buttons to QtControls 2
CURA-8684
2022-01-20 22:38:00 +01:00
Ghostkeeper
7a1578cbc4
Re-use component scrollbar from Uranium
It's a new component so that we don't have to re-implement it everywhere. In this case we do have to anchor it correctly though because ScrollView doesn't do that by itself.

Contributes to issue CURA-8686.
2022-01-18 18:22:49 +01:00
Jaime van Kessel
6644bff2be Fix some QML warnings on closing Cura
CURA-8683
2022-01-11 11:52:43 +01:00
Jaime van Kessel
3d0e71fe7e Remove unused import 2022-01-11 11:44:59 +01:00
Jaime van Kessel
f8906597e5 Update menu for PrinterType button
CURA-8683
2022-01-11 11:43:01 +01:00
Jaime van Kessel
f11d728c6b Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-01-03 15:32:58 +01:00
fieldOfView
e537fa562e Hide badge for disabled extruders
A configuration error or warning in a disabled extruder does not affect slicing or the available profiles for other extruder
2021-11-19 14:11:37 +01:00
fieldOfView
c805aac3cc Deactivate tooltip hover if there is no tooltip to show 2021-11-19 13:43:34 +01:00
fieldOfView
9ebd8524ad Use badge icons 2021-11-18 10:53:35 +01:00
fieldOfView
452aa4cc1c Add a tooltip explaining the status of the extruder 2021-11-16 16:05:02 +01:00
fieldOfView
d1f21ec7c4 Adjust size and position of extruder warning "badges" 2021-11-16 15:34:10 +01:00
fieldOfView
19dbd1f168 Merge branch 'master' into feature_extruder_warning_icon 2021-11-16 14:56:43 +01:00
Jaime van Kessel
a68584cda1 Replace more instances of label with UM.Label 2021-11-10 17:42:23 +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
Jaime van Kessel
2baada8a70 Use the material name instead of brand + type + color
CURA-8514
Fixes #10421
2021-10-19 11:23:21 +02:00
luz paz
d68f375e38 Fix various typos
Found via `codespell -q 3 -S *.po,*.pot -L childs,initialy,lod,ned,te,slicable,sur,tutoriels,wont`
2021-09-07 11:33:54 -04:00
Konstantinos Karmas
3e0b395c72 Add the Buildplate.svg to the Cura icons
The icon existed only in the UM3NetworkPrinting plugin but it was also used in the ConfigurationItem.qml in Cura, so it had to be moved to the Cura icons.

CURA-8520
2021-08-30 10:45:45 +02:00
Konstantinos Karmas
8de5e1e5b9 Account for the width of the arrow in the Extruders row
Although the ExpandablePopup already sets the anchors of the `headerItem` to account for the arrow icon on the right side, the ConfigurationMenu's extruder row was ignoring it, thus making the elided text of the last extruder to overlap with the arrow icon a bit.

This commit fixes that by explicitly accounting for the width of the arrow in the extruders row.

**Note:** if the Cura window gets resized way too much, the extruder icons will still overlap with the arrow, since there is no space to fit everything.

CURA-8496
2021-08-26 13:31:27 +02:00
fieldOfView
660cc12382 Use UM.StatusIcon instead of our own 2021-08-24 17:58:50 +02:00
fieldOfView
96a1019f1e Merge branch 'master' into feature_extruder_warning_icon 2021-08-24 17:39:28 +02:00
Konstantinos Karmas
2718d6a69a Change the ColumnLayout to Column in the ConfigurationMenu
When the labels were getting truncated and invisible after reducing the width of Cura's window, their visibility wasn't being restored back and, as a result, the `materialTypeLabel` was the only one that was remaining visible, even if there was enough space for the full `materialBrandColorTypeLabel`.

Changing the ColumnLayout to a Column, where the width is inherited from the parent, fixes that issue.

CURA-8496
2021-08-24 10:35:33 +02:00
Jaime van Kessel
b887398da6 Remove unneeded width from labels
CURA-8496
2021-08-23 10:56:43 +02:00
Konstantinos Karmas
0bcea3f4cd Fix long material names overlapping with extruder icons
Both the `preferredWidth` AND the `width` need to be set for the labels to be properly elided if there is no more room  in the ColumnLayout. In addition, the ColumnLayout that contains the variants and material names needs to be visible only if width>0, otherwise when the width is negative, for some reason the `materialTypeLabel` appears again.

CURA-8496
2021-08-20 09:49:21 +02:00
Konstantinos Karmas
83fe65b8eb Use the StatusIcon qml component for the warning icons
CURA-8349
2021-07-28 18:17:54 +02:00
Konstantinos Karmas
01c4a0f72d Change warning icon background to the CircleSolid.svg
CURA-8439
2021-07-28 16:55:36 +02:00
Jaime van Kessel
4470fa198e
Swap out warning icon
CURA-8439
2021-07-27 15:26:51 +02:00
fieldOfView
14cf23c65f Update to new icon names 2021-07-26 14:17:58 +02:00
fieldOfView
9c05d990ea Merge branch 'master' into feature_extruder_warning_icon
# Conflicts:
#	resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
2021-07-26 14:12:30 +02:00
Ghostkeeper
52018a6048
Adjust size and margin of guide book icon
The icon was rendered at a too small size, such that it would get a different line width or look-and-feel than the rest. However making it bigger doesn't properly centre it either.
To centre it we also reduced the margin.

Contributes to issue CURA-8202.
2021-07-07 11:36:11 +02:00
Konstantinos Karmas
5ae4ad5429 Center the material label if no variant in the ConfigurationMenu header
CURA-8011
2021-07-05 17:33:03 +02:00
Konstantinos Karmas
0319fdcc41 Get the opacity of the extruder from the theme
CURA-8011
2021-07-05 12:27:29 +02:00
Konstantinos Karmas
cc30510058 Let ExtruderIcon decide its size in the ConfigurationMenu
CURA-8011
2021-07-02 12:12:18 +02:00
Konstantinos Karmas
7c02e1b5e5 Merge branch 'CURA-8202_Resize_new_icons' into CURA-8011_Replace_extruder_icons 2021-07-02 10:35:35 +02:00
Konstantinos Karmas
327acfd49c Align the material and variant labels in the center of the header
CURA-8013
2021-06-30 11:10:25 +02:00
Jaime van Kessel
53fd47e8db
Set opacity of disabled extruder text
CURA-8011
2021-06-29 16:26:59 +02:00
Konstantinos Karmas
8a22eaa5cc Merge branch 'master' into CURA-8013_Adjust_sizes_of_header_and_toolbar 2021-06-29 11:04:51 +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
Konstantinos Karmas
fae5e2cffd Adjust the text of the material according to the size of the window
Now, when the size of the Cura window changes and the configurationSelector gets resized, instead of eliding the material text it will now change as follows:

* If it fits, display "Brand, Color, and Type" of material (e.g. Ultimaker Black PLA)
* If "Brand, Color, and Type" doesn't fit, change it to "Color and Type" of material (e.g. Black PLA)
* If "Color Type" doesn't fit either, display only the type (e.g. PLA)
* If "Type" doesn't fit, elide it

CURA-8013
2021-06-28 14:53:50 +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