Commit graph

21759 commits

Author SHA1 Message Date
Jaime van Kessel
0a136b58f0 Also add the right metadata to the AMF plugin.
This ensures that the filetype shows up in the supported types of the open window
2019-04-30 11:38:55 +02:00
Jaime van Kessel
0bd516da4c Add mimetype to amf plugin 2019-04-30 11:34:30 +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
c394ce74c3 Merge branch 'feature_amf_reader' of https://github.com/fieldOfView/Cura 2019-04-30 11:23:19 +02:00
Jaime van Kessel
4d1f5cc556 Merge branch 'master' of github.com:Ultimaker/Cura 2019-04-30 10:51:42 +02:00
Jaime van Kessel
6fbbed9c06 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-04-30 10:51:33 +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
Ghostkeeper
73f1b3fb50
Merge branch 'stereotech-master' 2019-04-30 09:40:43 +02:00
Ghostkeeper
7f3cedc12f
Merge branch 'master' of https://github.com/stereotech/Cura into stereotech-master 2019-04-30 09:29:19 +02:00
frylock34
0b364e8daf reduce platform size 2019-04-30 10:39:05 +04: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
Jaime van Kessel
a14b331cb7 Merge branch 'master' of github.com:Ultimaker/Cura 2019-04-29 13:47:34 +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
5359293d7a Merge branch 'CURA-6156_build_volume_temperature' of github.com:Ultimaker/Cura 2019-04-29 13:29:35 +02:00
Lipu Fei
19cd8f4edc Better naming for hasMachineTypeName()
CURA-6449
2019-04-29 13:28:18 +02:00
Ghostkeeper
ccc24a2e5f
Merge branch '4.1' 2019-04-29 12:07:09 +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
9e0d047815 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-04-29 10:51:25 +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
53d0dd282b
Merge branch 'master' of https://github.com/stereotech/Cura into stereotech-master 2019-04-29 08:54:05 +02:00
Lipu Fei
d21c0a4ca9 Merge remote-tracking branch 'origin/4.1' 2019-04-26 15:52:37 +02:00
Ghostkeeper
b3b59d5a5c
Add typing 2019-04-26 15:42:22 +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
9aa11ed091
Merge branch '4.1' 2019-04-26 14:15:21 +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
c32c642ba5 Fixed highlighting matching configuration if a material is empty 2019-04-26 11:59:16 +02:00
Aldo Hoeben
b3bc3243d1
Update copyright 2019-04-26 11:54:44 +02:00