Jaime van Kessel 5f9e916f29 Merge branch 'Ok_button_dialog' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2

2022-02-17 15:21:15 +01:00

..

Account

Merge branch 'replace_controls_1_for_controls_2' into CURA-8687_dialogs

2022-02-11 10:44:52 +01:00

ActionPanel

Update print action hotkey listener to QtControls 2

2022-01-24 10:31:17 +01:00

ApplicationSwitcher

Replace usage of controls label with our custom label

2021-11-10 16:37:26 +01:00

Dialogs

Fix merge conflics

2022-02-17 15:07:48 +01:00

MachineSettings

Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2

2022-02-17 15:02:03 +01:00

MainWindow

Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2

2022-02-17 15:02:03 +01:00

Menus

Fix merge conflics

2022-02-17 15:07:48 +01:00

Preferences

Merge branch 'Ok_button_dialog' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2

2022-02-17 15:21:15 +01:00

PrinterOutput

Fix size of USB manual control buttons

2022-02-02 10:23:00 +01:00

PrinterSelector

Use re-useable scrollbar and remove ScrollView

2022-01-19 14:32:12 +01:00

PrintSetupSelector

Fix remaining merge conflicts

2022-01-31 17:08:56 +01:00

Settings

Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2

2022-02-17 15:02:03 +01:00

WelcomePages

Remove horizontal scrollbar policies from Cura.ScrollableTextArea

2022-01-28 15:27:47 +01:00

Widgets

Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2

2022-02-17 15:02:03 +01:00

ActionButton.qml

Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2

2022-02-17 15:02:03 +01:00

Actions.qml

Fix merge conflics

2022-02-17 15:07:48 +01:00

BorderGroup.qml

Revert "Cura 7813 qml modules version bump"

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

ColorDialog.qml

Always prefix text in ColorDialog with a hashtag

2022-02-11 13:48:57 +01:00

Cura.qml

Remove superfluous semicolumn

2022-02-11 11:31:54 +01:00

EmptyViewMenuComponent.qml

Revert "Cura 7813 qml modules version bump"

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

ExpandableComponent.qml

Replace usage of controls label with our custom label

2021-11-10 16:37:26 +01:00

ExpandableComponentHeader.qml

Replace usage of controls label with our custom label

2021-11-10 16:37:26 +01:00

ExpandablePopup.qml

Replace usage of controls label with our custom label

2021-11-10 16:37:26 +01:00

ExtruderButton.qml

Fix ExtruderColor and Extruder icons bleeding into each other

2021-07-02 12:11:04 +02:00

ExtruderIcon.qml

Replace usage of controls label with our custom label

2021-11-10 16:37:26 +01:00

FPSItem.qml

Revert "Cura 7813 qml modules version bump"

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

IconWithText.qml

Replace usage of controls label with our custom label

2021-11-10 16:37:26 +01:00

JobSpecs.qml

Replace button with reusable simple button

2021-11-10 16:46:24 +01: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

Remove unused imports

2022-02-09 15:50:05 +01:00

ObjectItemButton.qml

Fix binding loop in objectItemButton

2022-01-31 17:32:10 +01:00

ObjectSelector.qml

Use custom scroll bar for object selector

2022-01-19 17:59:41 +01:00

PrimaryButton.qml

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

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

PrinterTypeLabel.qml

Revert "Cura 7813 qml modules version bump"

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

PrintMonitor.qml

Removed unused imports in print monitor

2021-11-16 15:07:33 +01:00

PrintSetupHeaderButton.qml

Add properties (with defaults) to the PrintSetupHeaderButton state-props

2022-01-31 09:00:30 +01:00

PrintSetupTooltip.qml

Replace usage of controls label with our custom label

2021-11-10 16:37:26 +01:00

ProfileOverview.qml

Fix remaining merge conflicts

2022-01-31 17:08:56 +01:00

qmldir

Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2

2022-02-17 15:02:03 +01:00

RadioCheckbar.qml

Fix various typos

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

RoundedRectangle.qml

Revert "Cura 7813 qml modules version bump"

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

SearchBar.qml

Use re-usable search-bar for Settings search as well.

2021-11-16 10:20:08 +01:00

SecondaryButton.qml

Adjust color-scheme for button restyle.

2021-07-02 09:39:33 +02:00

SpinBox.qml

Fix layout of multiply object dialog

2022-02-10 10:59:21 +01:00

TableView.qml

Enforce minimum column width through binding formula

2022-02-01 13:04:16 +01:00

TertiaryButton.qml

Make icons smaller for tertiary buttons

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

Toolbar.qml

Fix various typos

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

ToolbarButton.qml

Change the color of a circle around the toolbar button

2021-06-28 14:56:26 +02:00

ToolTip.qml

Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2

2022-02-17 15:02:03 +01:00

ViewOrientationButton.qml

Remove the margin from the ViewOrientation buttons

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

ViewOrientationControls.qml

Unrevert new icon set for all of Cura's interface

2021-06-28 17:16:56 +02:00

ViewsSelector.qml

Replace usage of controls label with our custom label

2021-11-10 16:37:26 +01:00