19 Commits

Author SHA1 Message Date
Diego Prado Gesto
9500d2d6b8 Modify text in the Send Slice data dialog, according to the experts.
Contributes to CURA-6434.
2019-05-01 15:53:54 +02:00
Diego Prado Gesto
24d57f6168 Change text according to experts
Also make the bottom text a bit longer so the link goes completely in the second line.

Contributes to CURA-6434.
2019-04-30 09:51:21 +02:00
Diego Prado Gesto
534a035841 Add a grid with images
Those images indicate the type of data we are collecting anonymously.

Contributes to CURA-6434.
2019-04-29 14:50:14 +02:00
Diego Prado Gesto
9d48a90f8f Add two labels instead of one
Change the link to adhere to the color scheme

Contributes to CURA-6434.
2019-04-29 13:45:55 +02:00
Lipu Fei
904a8ab26c Fix theming
CURA-6435
2019-04-17 09:18:08 +02:00
Jaime van Kessel
7a3cd81e3f Fix font size for the titles in the welcome flow
CURA-6057
2019-04-01 14:10:09 +02:00
Jaime van Kessel
74903fe3e5 Cleaned up the QML
This moves all the "default" margins of the welcome pages into a single point (the WizardPanel)
in order to prevent having to re-define it every time.
I've also fixed some incorrect margins that we had

CURA-6057
2019-04-01 13:44:27 +02:00
Ghostkeeper
5028290e0d
Remove welcome_pages_default_margin theme entry
Use the wide margin instead. It's practically the same, nobody is going to notice. It still looks spacey and nice, and it's more consistent with the rest of the interface.
We had previously agreed that we will not make any new widget-specific theme entries any more.

Contributes to issue CURA-6057.
2019-03-29 13:41:45 +01:00
Ghostkeeper
129c1ab3d4
Fix welcome page buttons text not fitting
On some operating systems the text would not fit due to different font rendering. Also, after translation, it probably wouldn't fit either.
Usually we have the button size adjusting to the text inside it. The design didn't do this, either because it was too difficult to do in Zeplin, because the designer was lazy, or because the designer didn't know that this was the normal style in the rest of Cura. And the programmer took that over literally.

Contributes to issue CURA-6057.
2019-03-29 13:41:45 +01:00
Lipu Fei
2511b7a26a Implement More-info button on Data Collection page 2019-03-26 15:18:54 +01:00
Lipu Fei
ec0b197b6e Fix merge conflicts 2019-03-22 14:28:23 +01:00
Lipu Fei
f8c4cee2de Simplify user agreement page layout 2019-03-22 13:50:02 +01:00
Lipu Fei
eb02b302f5 Rearrange items in DataCollectionsContent.qml 2019-03-22 13:18:33 +01:00
Lipu Fei
9e7c687853 Fix merge conflicts 2019-03-22 12:07:59 +01:00
Lipu Fei
92dea8a52f Add welcome_pages_default_margin 2019-03-22 11:50:10 +01:00
Lipu Fei
c3175e5322 Theme welcome_pages_button 2019-03-21 16:01:50 +01:00
Lipu Fei
6ebfaff61e WIP: Fixes and add cloud page 2019-02-28 08:33:28 +01:00
Lipu Fei
9c66921538 WIP: dos2unix new files 2019-02-28 08:07:44 +01:00
Lipu Fei
92730a09a2 WIP: Add data collections page 2019-02-28 07:48:05 +01:00