Lipu Fei 71e32d94f7 Resolve merge conflicts ...

CURA-6483

2019-05-02 07:45:43 +02:00

..

AddLocalPrinterScrollView.qml

Workaround for ListView-cache-bug in Qt. [CURA-6435]

2019-04-17 16:40:05 +02:00

AddNetworkOrLocalPrinterContent.qml

Resolve merge conflicts

2019-05-02 07:45:43 +02:00

AddNetworkPrinterScrollView.qml

Modify small UI things in the Add Printer dialog

2019-05-01 15:50:43 +02:00

AddPrinterByIpContent.qml

Fix manual printer device not up-to-date

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

CloudContent.qml

Change the copy of the account benefits

2019-04-26 14:04:46 +02:00

DataCollectionsContent.qml

Modify text in the Send Slice data dialog, according to the experts.

2019-05-01 15:53:54 +02:00

DropDownHeader.qml

Fix theming

2019-04-17 09:18:08 +02:00

DropDownWidget.qml

Modify small UI things in the Add Printer dialog

2019-05-01 15:50:43 +02:00

FirstStartMachineActionsContent.qml

Add margins between label and content

2019-04-24 08:28:32 +02:00

ImageTile.qml

Add a grid with images

2019-04-29 14:50:14 +02:00

UserAgreementContent.qml

Fix theming

2019-04-17 09:18:08 +02:00

WelcomeContent.qml

Add two labels instead of one

2019-04-29 13:45:55 +02:00

WelcomeDialogItem.qml

Reuse welcome dialog item to show whats new upon start

2019-04-17 09:58:07 +02:00

WhatsNewContent.qml

Remove hack in WelcomePagesModel and add WhatsNewPagesModel

2019-04-12 12:11:09 +02:00

WizardDialog.qml

Modify small UI things in the Add Printer dialog

2019-05-01 15:50:43 +02:00

WizardPanel.qml

Make progressBar optional in Wizard

2019-04-05 09:09:00 +02:00