Daniel Schiavini bfe04a55f9 Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into STAR-322_cloud-connection

2018-12-10 10:45:37 +01:00

..

Account

Fix some leftover renamings

2018-12-04 13:21:26 +01:00

ActionPanel

Remove the component IconLabel since we have a similar one in IconWithText

2018-12-07 11:43:41 +01:00

Dialogs

Fix the color and proportions of the cura logo in the about panel

2018-12-06 11:57:55 +01:00

MainWindow

Add a pattern in the background of the header.

2018-12-06 11:30:59 +01:00

Menus

Fix hiding materials if material is empty

2018-12-07 15:31:12 +01:00

Preferences

Merge branch 'CURA-5876-Configuration_dropdown' into ui_rework_4_0

2018-12-05 13:29:06 +01:00

PrinterOutput

Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown

2018-12-03 11:45:05 +01:00

PrinterSelector

Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into STAR-322_cloud-connection

2018-12-10 10:45:37 +01:00

PrintSetupSelector

Fix typo

2018-12-07 17:37:10 +01:00

Settings

Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown

2018-12-05 13:56:21 +01:00

ActionButton.qml

Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown

2018-12-06 16:35:07 +01:00

Actions.qml

Merge branch 'ui_rework_4_0' into cura4.0_header

2018-11-02 13:36:47 +01:00

BorderGroup.qml

Add copyright header.

2018-11-26 15:39:34 +01:00

Cura.qml

Merge branch 'ui_rework_4_0' into place_print_info_back

2018-12-07 13:19:19 +01:00

ExpandableComponent.qml

Fix some other merge conflicts

2018-12-07 13:29:16 +01:00

ExpandablePopup.qml

Fix some other merge conflicts

2018-12-07 13:29:16 +01:00

ExtruderButton.qml

Add a new ToolbarButton

2018-11-27 17:16:52 +01:00

ExtruderIcon.qml

Adjust disabled extruder colour

2018-12-07 15:38:08 +01:00

IconWithText.qml

Remove the component IconLabel since we have a similar one in IconWithText

2018-12-07 11:43:41 +01:00

JobSpecs.qml

Fix some other merge conflicts

2018-12-07 13:29:16 +01:00

MachineAction.qml

T466: Revert the previous commit since it messed up the file rights.

2016-12-23 15:53:15 -05:00

MonitorButton.qml

Clean up the code

2018-12-07 12:07:41 +01:00

MonitorSidebar.qml

Clean up the code

2018-12-07 12:07:41 +01:00

ObjectsList.qml

Clean up the code

2018-12-07 12:07:41 +01:00

PrimaryButton.qml

Add header in new files. Remove unused imports.

2018-11-26 14:06:34 +01:00

PrinterTypeLabel.qml

Use normal font size for shorthand label

2018-11-27 15:12:44 +01:00

PrintMonitor.qml

Clean up the code

2018-12-07 12:07:41 +01:00

PrintSetupTooltip.qml

Clean up the code

2018-12-07 12:07:41 +01:00

qmldir

Remove the component IconLabel since we have a similar one in IconWithText

2018-12-07 11:43:41 +01:00

RoundedRectangle.qml

Add border to rounded rectangle.

2018-11-26 15:14:32 +01:00

SecondaryButton.qml

Add header in new files. Remove unused imports.

2018-11-26 14:06:34 +01:00

Toolbar.qml

Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown

2018-12-04 15:21:36 +01:00

ToolbarButton.qml

Invert visibility of bottom & topsquare

2018-11-28 10:46:07 +01:00

ViewOrientationButton.qml

Simplify the viewOrientation controls

2018-11-26 17:35:23 +01:00

ViewOrientationControls.qml

Simplify the viewOrientation controls

2018-11-26 17:35:23 +01:00

ViewsSelector.qml

Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown

2018-12-06 16:35:07 +01:00