7 Commits

Author SHA1 Message Date
Lipu Fei
904a8ab26c Fix theming
CURA-6435
2019-04-17 09:18:08 +02:00
Lipu Fei
0665076018 Fix merge conflicts 2019-04-10 10:42:51 +02:00
Lipu Fei
0e49d3dc12
Merge branch 'master' into CURA-6435_new_style_add_machine 2019-04-10 09:06:55 +02:00
Jaime van Kessel
f5ef6aed8d Make textfield use states
CURA-6435
2019-04-08 17:10:36 +02:00
Lipu Fei
b1fe110f9f Add Cura.TextField
CURA-6435
CURA-6057
2019-04-08 12:27:32 +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
76947df6c1 Add Cura.TextField
CURA-6435
2019-04-05 09:09:00 +02:00