3984 Commits

Author SHA1 Message Date
Lipu Fei
0555cbae4e Fix add machine dialog state 2019-05-17 15:01:18 +02:00
Lipu Fei
361636af29 Allow WizardDialog to resize 2019-05-17 14:30:18 +02:00
Diego Prado Gesto
a28ca19647 Change the font size
To make it consistent with the size of texts in the other Welcome pages.
2019-05-17 11:54:40 +02:00
Lipu Fei
d1805d34be Move background to ScrollView for GcodeTextArea 2019-05-14 11:44:14 +02:00
Diego Prado Gesto
cac4b8b7f1 Remove useless comment line 2019-05-13 13:34:13 +02:00
Diego Prado Gesto
233013c946 Cache a lot of items in the list so there are no glitches 2019-05-13 13:23:10 +02:00
Diego Prado Gesto
111430c9c2 Catch scroll events and not propagate them to the main view 2019-05-09 11:37:59 +02:00
Ghostkeeper
5b8d2243f7
Change time/material 'specification' into 'estimation'
Because that's what it is and how you should use it.
2019-05-08 10:24:21 +02:00
Lipu Fei
53d595f698 Use loader for machine actions in dialog
CURA-6495
2019-05-06 13:06:23 +02:00
Jaime van Kessel
6bbdfbb31d Merge branch 'CURA-6483_fix_add_by_ip' of github.com:Ultimaker/Cura into 4.1 2019-05-03 09:25:30 +02:00
Lipu Fei
7d4c821551 Prevent auto selecting an invalid printer
CURA-6483
2019-05-03 08:49:39 +02:00
Diego Prado Gesto
be3f194aaa Use a disabled rectangle instead of an empty space in the XRay view
To keep consistency with what happens in the prepare page when a printer doesn't have material or variants.

Contributes to CURA-6469.
2019-05-02 16:00:17 +02:00
Diego Prado Gesto
5b9c4e402e Change the Back button to be a secondary button
Change also some texts in the More information dialog and the font type of one of the titles in the first use flow

Contributes to CURA-6483.
2019-05-02 15:38:19 +02:00
Lipu Fei
85822d6e73 Fix add by IP validator regex
CURA-6483
2019-05-02 15:30:11 +02:00
Lipu Fei
1e89ce3673 Merge remote-tracking branch 'origin/4.1' into CURA-6483_fix_add_by_ip 2019-05-02 14:06:07 +02:00
Lipu Fei
d0cc2dc8fa Remove unneeded TODO
CURA-6495
2019-05-02 12:47:48 +02:00
Ghostkeeper
038a5b5942
Fix background of g-code text boxes having zero size 2019-05-02 08:46:46 +02:00
Lipu Fei
71e32d94f7 Resolve merge conflicts
CURA-6483
2019-05-02 07:45:43 +02:00
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
5b06efdd19 Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1 2019-05-01 15:51:12 +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
0575fd283e Fix manual printer device not up-to-date
CURA-6483
2019-05-01 15:12:08 +02:00
Lipu Fei
2b5d78a01a Do not add unknown or non-host printers in add-by-ip
CURA-6483
2019-05-01 14:25:01 +02:00
Ghostkeeper
e750315708
Merge branch 'restyle_send_data' into 4.1 2019-05-01 14:13:25 +02:00
Lipu Fei
383b474bd7 Fix typo
CURA-6483
2019-04-30 15:27:29 +02:00
Lipu Fei
0e2815a748 Fix back button on add printer page
CURA-6483
2019-04-30 15:27:11 +02:00
Lipu Fei
40d26bbb6e NetworkingUtil is included in Cura 1.5 QML
CURA-6483
2019-04-30 12:49:26 +02:00
Lipu Fei
e1766b72ec Only highlight the currently active machine
CURA-6483
2019-04-30 12:47:19 +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
Lipu Fei
ed8127777c Make a single NetworkingUtil
CURA-6483
2019-04-30 09:43:50 +02:00
Lipu Fei
bb1442a04e Update comments
CURA-6483
2019-04-30 07:40:35 +02:00
Lipu Fei
c8872cb4a1 Use a separate function to validate IP address
CURA-6483
2019-04-29 15:53:08 +02:00
Lipu Fei
defcba6927 Fix that you can only cancel in WizardDialog
CURA-6483
2019-04-29 15:53:08 +02:00
Jaime van Kessel
56c0cae71f DoubleClick and drag no longer contradict eachother for expandable component
CURA-6478
2019-04-29 15:13:01 +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
Jaime van Kessel
e5d7387fed Updated the documentation of the contentAlignment property 2019-04-29 11:54:33 +02:00
Jaime van Kessel
79fbe12e92 Add an extra check to enforce min height of printSetupSelector
CURA-6478
2019-04-29 10:49:33 +02:00
Jaime van Kessel
db1a5ec8c0 Add mousearea to prevent clicking through the printSetupSelector
CURA-6478
2019-04-29 10:38:05 +02:00
Jaime van Kessel
8d0a31dcfb Show tooltip on the right side if the setting area is to far to the left
CURA-6478
2019-04-29 10:33:02 +02:00
Ghostkeeper
1fb336ed3d
Merge branch 'CURA-6483_fix_manual_printer_discovery' into 4.1 2019-04-26 14:15:07 +02:00
Diego Prado Gesto
17c06f200f Change the copy of the account benefits
As per @mahtDFR request
2019-04-26 14:04:46 +02:00
Diego Prado Gesto
c7bee73af6 Add cross cursor to the draggable expandable component.
Contributes to CURA-6478.
2019-04-26 13:49:55 +02:00
Lipu Fei
278d8ee587 Fix button enabled flags
CURA-6483
2019-04-26 13:30:26 +02:00
Lipu Fei
dbd8d4e74c Use IPv4 and IPv6 regex to validate IP input
CURA-6483
2019-04-26 12:48:30 +02:00
Jaime van Kessel
ac8cca31d1
Merge pull request #5667 from Ultimaker/CURA-6478_drag_expandable_component
Make Expandable Components Draggable [CURA-6478]
2019-04-26 11:03:52 +02:00
Remco Burema
77d8095208 Home/dock expandable-draggable on double-click. [CURA-6478] 2019-04-25 22:26:51 +02:00
Remco Burema
ac67e1a3a9 Make expandable component preferences load again. [CURA-6478] 2019-04-25 22:08:25 +02:00
Remco Burema
c4265c1f67 Scale instead of center for preview/prepare-menus. [CURA-6478] 2019-04-25 21:50:24 +02:00
Remco Burema
bd262ca6c4 Set min.-height and 'stage-awareness' for print-setup-UI. [CURA-6478] 2019-04-25 15:37:52 +02:00