Lipu Fei a85f2ce156 Fix merge conflicts

2019-03-26 09:01:01 +01:00

..

Account

Don't allow translating 'Ultimaker Cloud'

2019-03-13 14:29:07 +01:00

ActionPanel

Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action

2019-03-21 15:00:15 +01:00

Dialogs

Switch the order of name & id in addMachine call

2019-02-26 10:45:18 +01:00

MachineSettings

WIP: Cleanup and unify MachineAction styles

2019-03-19 15:40:44 +01:00

MainWindow

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

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

Menus

WIP: Fix null warning in SettingsMenu.qml

2019-03-20 08:59:45 +01:00

Preferences

Fix merge conflicts with master

2019-03-21 14:59:53 +01:00

PrinterOutput

Merge branch '4.0' into unify_font_types

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

PrinterSelector

WIP: Disable unknown printer type buttons

2019-03-14 11:18:39 +01:00

PrintSetupSelector

Show the slider in the middle when there is only one quality profile available.

2019-03-21 14:18:07 +01:00

Settings

WIP: Cleanup and unify MachineAction styles

2019-03-19 15:40:44 +01:00

WelcomePages

Fix merge conflicts

2019-03-26 09:01:01 +01:00

Widgets

WIP: Cleanup and unify MachineAction styles

2019-03-19 15:40:44 +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

Remove debugging shortcut

2019-03-20 11:11:30 +01:00

BorderGroup.qml

…

CheckBoxWithTooltip.qml

Rename CheckBox.qml to CheckBoxWithTooltip.qml

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

Cura.qml

Merge pull request #5460 from Ultimaker/WIP_onboarding_by_ip

2019-03-21 09:52:39 +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

…

ExtruderButton.qml

…

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

…

MonitorButton.qml

…

ObjectsList.qml

…

PrimaryButton.qml

…

PrinterTypeLabel.qml

WIP: Show full name of network printer types

2019-03-13 13:03:41 +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

WIP: Cleanup and unify MachineAction styles

2019-03-19 15:40:44 +01:00

RoundedRectangle.qml

…

SecondaryButton.qml

…

Toolbar.qml

…

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

…

ViewsSelector.qml

Change text to singular mode

2019-03-08 15:27:17 +01:00