312 Commits

Author SHA1 Message Date
c.lamboo
2440730e23 Fix bug in monitor page
In commit b7fd75b2dd202f2516f9188e342eccc8a15ae6ab the component with id `printerTypeSelectorRow` was removed. As the `tabBar` element was anchored to this component the monitor page was broken. Fixed by anchoring to the component that was previously above `printerTypeSelectorRow`.

CURA-9665
2022-09-21 11:23:05 +02:00
Jaime van Kessel
b7fd75b2dd
Remove broken UI element
Seems to have been broken since the move to 5.x...
2022-09-16 13:54:56 +02:00
Jaime van Kessel
d842013a76
Simplify onCompleted call in qml
CURA-8463
2022-08-26 13:31:48 +02:00
Casper Lamboo
b4ccd690ea
Merge pull request #12161 from Ultimaker/CURA-9106_color_image_weird_scaling
[CURA-9106] Make parent item of ExtruderIcons handle all scaling.
2022-05-11 17:30:55 +02:00
Remco Burema
f0d3686ee7 Fix alignment.
CURA-9106

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-05-11 15:36:44 +02:00
Remco Burema
16eb78a5a7 Properly align center.
CURA-9106
2022-05-10 19:12:52 +02:00
Remco Burema
5479479596 Make parent item of ExtruderIcons handle all scaling.
CURA-9106
2022-05-10 17:48:05 +02:00
c.lamboo
d5c0fde7f2 Render labels using Text.QtRendering on OSX
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
2022-05-10 15:40:09 +02:00
c.lamboo
35f5c3f959 Revert "Render labels using Text.QtRendering on OSX"
This reverts commit f0e3c19a34d1fde3b7ec4fd95677fbefa2028b26.
2022-05-10 15:39:02 +02:00
c.lamboo
f0e3c19a34 Render labels using Text.QtRendering on OSX
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
2022-05-10 15:36:50 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage
CURA-8640
2022-04-08 15:55:34 +02:00
j.delarago
cfad991120 Popup will now resize based on the implicitWidth/implicitHeight of it's children.
This causes a binding loop when using layouts like Column.

To resolve this the height/width of the popup in ExpandablePopup can now be set explicitly with contentWidth and contentHeight

For ExpandablePopups with contentItems that are not Layouts the implicitWidth/implicitHeight can be set directly in the contentItem.

CURA-8640
2022-04-01 09:31:27 +02:00
Jaime van Kessel
af712785c8 No longer inject parameters into function handling in qml 2022-03-31 14:16:57 +02:00
Jaime van Kessel
1532779d1b Remove Extruders property from global stack
CURA-7810
2022-03-24 14:26:03 +01:00
fieldOfView
09c3ae628e Fix "double"/non-functional scrollbars on ScrollViews 2022-03-22 14:46:14 +01:00
j.delarago
59158db34b Lining at the bottom of UnderlineBackground and at the top of the menu give a double width lining.
Moved the menu up slightly so lining of UnderlineBackground is hidden.

CURA-9004
2022-03-07 17:07:14 +01:00
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