30 Commits

Author SHA1 Message Date
fieldOfView
cb73cfb0f3 Make add printer dialog resize-aware 2020-05-29 17:22:46 +02:00
Kostas Karmas
e3e767f4b9 Simplify the link in AddNetworkOrLocalPrinterContent
CURA-7427
2020-05-12 12:23:42 +02:00
Kostas Karmas
e4a6fe954d Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer 2020-04-28 17:45:55 +02:00
Kostas Karmas
889ed90adb End the wizard if we have found a network printer
CURA-7019
2020-04-23 17:27:30 +02:00
Kostas Karmas
e7d12745e1 Fix redirecting to "cloud" page when finding a network printer
CURA-7019
2020-04-23 17:18:19 +02:00
Kostas Karmas
1d7c327b36 Redirect to "Add cloud printer" page when button clicked
CURA-7022
2020-04-22 16:15:24 +02:00
Jaime van Kessel
670a106957
Be a bit more gracefull when adding a machine failed
This seems to happen for people that manually add machines to cura
but mess something up when copying the files.

CURA-3X
2020-02-28 17:03:38 +01:00
Lipu Fei
71e32d94f7 Resolve merge conflicts
CURA-6483
2019-05-02 07:45:43 +02:00
Diego Prado Gesto
32c8bbfb3c Modify small UI things in the Add Printer dialog 2019-05-01 15:50:43 +02:00
Lipu Fei
0e2815a748 Fix back button on add printer page
CURA-6483
2019-04-30 15:27:11 +02:00
Lipu Fei
bb1442a04e Update comments
CURA-6483
2019-04-30 07:40:35 +02:00
Lipu Fei
defcba6927 Fix that you can only cancel in WizardDialog
CURA-6483
2019-04-29 15:53:08 +02:00
Lipu Fei
f04b0c3fcc Increase the size of network printer list
The local printer list utilizes the whole space, but the network printer
list is only use half of the space.
2019-04-25 08:18:41 +02:00
Lipu Fei
b0fd6628a5 Make sure that printer name is not empty
CURA-6435
2019-04-05 09:35:02 +02:00
Lipu Fei
3fefb47426 Add printer name textfield into AddLocalPrinter
CURA-6435
2019-04-05 09:10:58 +02:00
Lipu Fei
8f755f8818 Use next_page_button_text in AddNetworkOrLocalPrinterContent
CURA-6435
2019-04-05 09:09:00 +02:00
Jaime van Kessel
52589ffcad Fix incorrect margin
CURA-6057
2019-04-01 14:29:11 +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
839d8c2227 Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action 2019-03-26 12:07:25 +01:00
Lipu Fei
e564687722 Use themed margins 2019-03-26 12:06:46 +01:00
Lipu Fei
92d95a1c00 Move page index logic into WelcomePagesModel 2019-03-26 10:34:38 +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
03155d24da Remove unneeded property assignment 2019-03-22 10:43:01 +01:00
Lipu Fei
e632b508eb Rename to AddNetworkOrLocalPrinterContent 2019-03-22 10:43:01 +01:00
Lipu Fei
639c4ba9f6 Remove unneeded property assignment 2019-03-22 10:35:41 +01:00
Lipu Fei
ab06264950 Rename to AddNetworkOrLocalPrinterContent 2019-03-22 10:28:17 +01:00