Jelle Spijker 0f0d729549

Merge branch '5.4' ...

# Conflicts:
#	conanfile.py
#	resources/i18n/cs_CZ/fdmprinter.def.json.po
#	resources/i18n/de_DE/fdmprinter.def.json.po
#	resources/i18n/es_ES/fdmprinter.def.json.po
#	resources/i18n/fdmprinter.def.json.pot
#	resources/i18n/fi_FI/fdmprinter.def.json.po
#	resources/i18n/fr_FR/fdmprinter.def.json.po
#	resources/i18n/hu_HU/fdmprinter.def.json.po
#	resources/i18n/it_IT/fdmprinter.def.json.po
#	resources/i18n/ja_JP/fdmprinter.def.json.po
#	resources/i18n/ko_KR/fdmprinter.def.json.po
#	resources/i18n/nl_NL/fdmprinter.def.json.po
#	resources/i18n/pl_PL/fdmprinter.def.json.po
#	resources/i18n/pt_BR/fdmprinter.def.json.po
#	resources/i18n/pt_PT/fdmprinter.def.json.po
#	resources/i18n/ru_RU/fdmprinter.def.json.po
#	resources/i18n/tr_TR/fdmprinter.def.json.po
#	resources/i18n/zh_CN/fdmprinter.def.json.po
#	resources/i18n/zh_TW/fdmprinter.def.json.po

2023-06-08 12:36:46 +02:00

..

Account

Don't capitalise "M" in "Ultimaker Digital Library" and "Ultimaker Digital Factory"

2022-11-29 15:26:51 +01:00

ActionPanel

Render labels using Text.QtRendering on OSX

2022-05-10 15:40:09 +02:00

ApplicationSwitcher

Don't capitalise "M" in "Ultimaker Digital Library" and "Ultimaker Digital Factory"

2022-11-29 15:26:51 +01:00

Dialogs

Fix typos in translations

2023-03-07 10:29:37 +01:00

MachineSettings

Fix extruder number

2023-03-15 18:18:31 +01:00

MainWindow

Return account widget to it's former glory

2022-03-31 14:19:41 +02:00

Menus

Ensure that menu items for extruder are added to right spot in context menu

2023-06-02 13:51:43 +02:00

Preferences

Prefill material sync file name

2023-02-20 17:41:07 +01:00

PrinterOutput

Fix decimals on heated bed temperature monitor (HeatedBedBox.qml)

2023-02-04 01:26:00 +01:00

PrinterSelector

Resolve alignment issues

2023-05-05 10:43:26 +02:00

PrintSetupSelector

Merge branch '5.4'

2023-06-08 12:36:46 +02:00

Settings

Fix the hover for SettingItem

2023-03-08 16:23:56 +01:00

WelcomePages

Fix um s5 initially not showing up in printer list

2023-05-31 13:30:26 +02:00

Widgets

Set defaultExtruderIndex to activeExtruderIndex

2023-02-28 18:00:23 +01:00

ActionButton.qml

Disable the running property of the action button by default

2022-05-03 13:45:56 +02:00

Actions.qml

Conditionally add ctrl+, hotkey to open settings

2022-11-30 15:10:15 +01:00

BorderGroup.qml

Revert "Cura 7813 qml modules version bump"

2021-03-30 09:48:28 +02:00

CategoryButton.qml

Replace RecolorImage with ColorImage

2022-04-08 15:55:34 +02:00

ColorDialog.qml

Merge pull request #13972 from Ultimaker/CURA-9793_extend_recommended_print_settings

2022-12-12 14:38:46 +01:00

Cura.qml

Set FileMode ExistingFile in the open file dialog

2023-03-30 15:05:25 +02:00

EmptyViewMenuComponent.qml

Roughly strip out the GraphicalEffects

2022-03-28 16:11:28 +02:00

ExpandableComponent.qml

Fix size of print setup selector

2022-04-19 16:42:43 +02:00

ExpandableComponentHeader.qml

Replace RecolorImage with ColorImage

2022-04-08 15:55:34 +02:00

ExpandablePopup.qml

Replace RecolorImage with ColorImage

2022-04-08 15:55:34 +02:00

ExtruderButton.qml

This onclick is already passed in where it is needed. It is being triggered unnecessarily when switching support extruder in recommended mode.

2023-02-08 13:42:30 +01:00

ExtruderIcon.qml

Move width, height properties to top of component

2022-12-14 17:44:08 +01:00

FPSItem.qml

Revert "Cura 7813 qml modules version bump"

2021-03-30 09:48:28 +02:00

IconWithText.qml

Fix tooltip showing on hover when no tooltipText in provided.

2022-06-21 16:29:41 +02:00

JobSpecs.qml

Some place RegularExpressionValidator can't be found in QtQuick 2.10 but can be in 2.15 so all files using RegularExpressionValidator have been bumped to latest QtQuick

2022-04-05 16:10:39 +02:00

LabelBar.qml

Replace more instances of label with UM.Label

2021-11-10 17:42:23 +01:00

MachineAction.qml

Revert "Cura 7813 qml modules version bump"

2021-03-30 09:48:28 +02:00

MonitorButton.qml

Show Yes and No buttons in abort dialog

2022-03-21 10:23:05 +01:00

ObjectItemButton.qml

Replace RecolorImage with ColorImage

2022-04-08 15:55:34 +02:00

ObjectSelector.qml

Replace RecolorImage with ColorImage

2022-04-08 15:55:34 +02:00

PrimaryButton.qml

Remove 'roundedness' and 'shadow' from action-buttons.

2021-06-30 17:04:55 +02:00

PrinterTypeLabel.qml

Render labels using Text.QtRendering on OSX

2022-05-10 15:40:09 +02:00

PrintMonitor.qml

Fix "double"/non-functional scrollbars on ScrollViews

2022-03-22 14:46:14 +01:00

PrintSetupHeaderButton.qml

Replace RecolorImage with ColorImage

2022-04-08 15:55:34 +02:00

PrintSetupTooltip.qml

Add new recommended mode tooltips and remove extra margin at the bottom of tooltips.

2022-12-06 10:50:04 +01:00

ProfileOverview.qml

Remove unused import

2022-04-05 15:04:35 +02:00

qmldir

Move Validators to UM, so they can be used in UM components.

2022-12-07 16:27:42 +01:00

RadioCheckbar.qml

Fix various typos

2021-09-07 11:33:54 -04:00

RoundedRectangle.qml

Update resources/qml/RoundedRectangle.qml

2022-11-17 16:37:14 +01:00

SearchBar.qml

Fix the font for searchbars being styled correctly

2022-06-21 10:58:53 +02:00

SecondaryButton.qml

Apply right theme colors for secondary button

2022-03-10 11:54:58 +01:00

SpinBox.qml

Replace RecolorImage with ColorImage

2022-04-08 15:55:34 +02:00

TableView.qml

Fix for tooltip

2022-05-11 17:23:54 +02:00

TertiaryButton.qml

Make icons smaller for tertiary buttons

2021-11-30 14:56:09 +01:00

Toolbar.qml

Apply suggestions from code review

2022-12-12 11:44:21 +01:00

ToolTip.qml

Merge branch 'master' into CURA-8943_tool_panel_icon_size

2022-03-07 12:46:36 +01:00

ViewOrientationButton.qml

Remove the margin from the ViewOrientation buttons

2021-07-02 09:38:12 +02:00

ViewOrientationControls.qml

Remove unused imports

2022-02-22 11:39:00 +01:00

ViewsSelector.qml

Popup will now resize based on the implicitWidth/implicitHeight of it's children.

2022-04-01 09:31:27 +02:00