19596 Commits

Author SHA1 Message Date
Ghostkeeper
8d6136bcf3
Don't crash when materials are not registered
It can't update the nodes structure with the links between materials then.

Contributes to issue CURA-6444.
2019-05-01 13:14:40 +02:00
Lipu Fei
c26dbfd934 Improve example data HTML
CURA-6434
2019-05-01 10:27:16 +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
3578482ea5 Fix connect via network dialog
CURA-6483

 - Do not add printers that have already been discovered
 - Add IP address validation check
2019-04-30 15:26:04 +02:00
Lipu Fei
99ec1761e9 Merge remote-tracking branch 'origin/4.1' into CURA-6483_fix_add_by_ip 2019-04-30 14:31:20 +02:00
Jaime van Kessel
d1a29ca87d Merge branch 'fix_ufpreader_libcharon' of https://github.com/fieldOfView/Cura into 4.1 2019-04-30 14:09:22 +02:00
fieldOfView
b0b162c8d5 Fix error when libCharon is not available 2019-04-30 13:03:17 +02:00
Lipu Fei
0cc00efa79 Add doc for group_id
CURA-6483
2019-04-30 12:53:47 +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
Lipu Fei
d18c11a2c1 Fix filtering in switchPrinterType()
CURA-6483
2019-04-30 12:46:35 +02:00
Lipu Fei
d6f4ddc322 Simplify GlobalStacksModel
CURA-6483
2019-04-30 12:46:01 +02:00
Diego Prado Gesto
7249bd3c50 Remove two lines entered by mistake
Keep it the same as in the base branch.
2019-04-30 11:33:19 +02:00
Diego Prado Gesto
f62d19aa60 Fix rendering issues in macOS when connecting to secondary screen
It used to happen before, but just adding native rendering fixes the issue.
2019-04-30 11:24:01 +02:00
Jaime van Kessel
3f47ffeae7 Use only the active extruders when sending slice message
Fixes #5671
2019-04-30 10:50:57 +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
8c42ceb8e6 Use socket to validate IP addresses
CURA-6483
2019-04-30 07:40:18 +02:00
Diego Prado Gesto
9bf77e9302 Add icons for the send anonymous data welcome page
Contributes to CURA-6434.
2019-04-29 17:29:38 +02:00
Diego Prado Gesto
46f1f00cb9 Change example data to contain HTML instead of JSON format
Then it's easier for us to show a more readable information about the data we collect

Contributes to CURA-6434.
2019-04-29 17:24:51 +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
Lipu Fei
bed13bf42b Cleanup and make sure that group_name is set 2019-04-29 15:53:08 +02:00
Lipu Fei
d16da3da3a Add group_id and fix remove printer
CURA-6483

 - Added a unique group_id (a GUID) to all created GlobalStack.
 - Changed version upgrade to generate unique group_ids for
   GlobalStacks.
 - RemoveMachine() now uses group_ids to remove hidden GlobalStacks.
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
Lipu Fei
19cd8f4edc Better naming for hasMachineTypeName()
CURA-6449
2019-04-29 13:28:18 +02:00
Ghostkeeper
25bbc1e66e
Set default infill density for tree support to 0% in profiles
In profiles that overwrite the support infill density, also keep it 0% for tree support.
Except PVA profiles. Those are probably better off with their normal infill density.

Fixes #5297.
2019-04-29 12:06:54 +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
Lipu Fei
04c39824cb Fix typing 2019-04-26 15:39:28 +02:00
Jaime van Kessel
a86311fea3 Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1 2019-04-26 15:25:58 +02:00
Jaime van Kessel
0d8b625bf8 Properly cache slice values to speed up sending the slice 2019-04-26 15:25:31 +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
Lipu Fei
5ab2f9784d Fix unit test
CURA-6483
2019-04-26 13:55:12 +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
f48bc7a047 Fixed highlighting matching configuration if a material is empty 2019-04-26 12:00:57 +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
ad9fc62ff5 Fix typing. [CURA-6478] 2019-04-25 23:05:52 +02:00
Remco Burema
c3a9ceaa18 Remove a line of commented-out code. [CURA-6478] 2019-04-25 22:42: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