Ghostkeeper d42ba9dda0

Merge branch '4.0' ...

Conflicts:
	resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg -> Weights being changed while a whole slew of fixes were being done on 4.0
	resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg -> Ditto

2019-02-15 13:58:47 +01:00

..

Account

Remove unused image

2019-02-15 13:39:40 +01:00

ActionPanel

Ensure the layout gets the right width & height for the output devices popup

2019-02-14 17:21:54 +01:00

Dialogs

Change header color in about window

2019-02-14 10:42:25 +01:00

MainWindow

CURA-6201 - Added an id to stage buttons for the integration tests

2019-02-15 12:08:42 +01:00

Menus

Small fix for glue-warning height in Ext.-config.

2019-02-14 11:21:01 +01:00

Preferences

Merge branch '4.0'

2019-02-04 13:06:32 +01:00

PrinterOutput

Merge branch '4.0' into unify_font_types

2018-12-19 11:56:22 +01:00

PrinterSelector

Merge pull request #5293 from Ultimaker/CL-1165_missing_cloud_info

2019-02-13 14:23:05 +01:00

PrintSetupSelector

Minor change to QML

2019-02-13 11:28:28 +01:00

Settings

Add settingKey property for Squish to find things easier

2019-02-15 11:52:16 +01:00

ActionButton.qml

Setting the height of an action button now actually changes it's size

2019-01-29 12:57:05 +01:00

Actions.qml

Move troubleshoot link to help menu

2019-01-22 16:19:29 +01:00

BorderGroup.qml

Add copyright header.

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

CheckBoxWithTooltip.qml

Rename CheckBox.qml to CheckBoxWithTooltip.qml

2019-01-03 11:53:19 +01:00

Cura.qml

Merge remote-tracking branch 'origin/4.0'

2019-02-05 11:40:50 +01:00

ExpandableComponent.qml

Remember opened state of settings panel

2019-01-02 14:05:17 +01:00

ExpandableComponentHeader.qml

Make expandable component header fonts larger

2018-12-31 13:43:31 +01:00

ExpandablePopup.qml

Close the expandable panel when it becomes disabled

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

ExtruderButton.qml

Add a new ToolbarButton

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

ExtruderIcon.qml

Merge branch '4.0' into unify_font_types

2018-12-19 11:56:22 +01:00

IconWithText.qml

Remove duplicate alias definition

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

JobSpecs.qml

Make job specs not bold

2019-01-03 11:06:43 +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

Unify the fonts to only have 8 instead of 13.

2018-12-12 17:50:21 +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

Make text in printer type label bigger

2019-01-02 16:37:19 +01:00

PrintMonitor.qml

Fix (USB) print monitor in dark theme

2018-12-17 17:37:21 +01:00

PrintSetupTooltip.qml

Fix fonts of plug-in tiles

2018-12-31 15:14:23 +01:00

qmldir

Fix merge conflicts with 4.0

2019-01-03 15:25:40 +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 'CURA-6015_fix_osx_crash' of github.com:Ultimaker/Cura into 4.0

2018-12-14 13:35:37 +01:00

ToolbarButton.qml

Remove the show property from the tooltip

2018-12-20 16:41:26 +01:00

ToolTip.qml

Fix fonts of plug-in tiles

2018-12-31 15:14:23 +01:00

ViewOrientationButton.qml

Change the margin in the view orientation buttons to aling the pixels correctly

2018-12-17 11:00:49 +01:00

ViewOrientationControls.qml

Simplify the viewOrientation controls

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

ViewsSelector.qml

Make expandable component header fonts larger

2018-12-31 13:43:31 +01:00