3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 14:04:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
19482 commits 313 branches 275 tags 718 MiB
Commit graph

19482 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
ab0cef95e8
Sort secondarily by printer name 
Makes it a bit easier to find printers.

Implements a suggestion from Reddit: https://www.reddit.com/r/ultimaker/comments/bj0txe/any_way_to_have_the_printers_sorted_on/
 2019-05-01 14:38:55 +02:00
Ghostkeeper
e750315708
Merge branch 'restyle_send_data' into 4.1 2019-05-01 14:13:25 +02:00
Ghostkeeper
15fae58d9b
Use text wrapping so it's scrollable in Qt 5.12 
I don't know if it's really in Qt 5.12 or maybe it's the Ubuntu implementation or whatever. But this works for me now.

Contributes to issue CURA-6434.
 2019-05-01 14:13:10 +02:00
Ghostkeeper
7258ad8dc2
Fix nesting of ULs 
A <ul> tag is only allowed to have <li> tags inside it, so the nested <ul> tag needs to be inside the <li> tag.

Contributes to issue CURA-6434.
 2019-05-01 14:08:53 +02:00
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
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
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
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
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
Remco Burema
c4265c1f67 Scale instead of center for preview/prepare-menus. [CURA-6478] 2019-04-25 21:50:24 +02:00
Jaime van Kessel
5f76070f05 Fix situation where authtoken wasnt updated for the toolbox request headers 2019-04-25 16:16:44 +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
Remco Burema
194f01f840 Add preferences for draggable/expandable-component. [CURA-6478] 2019-04-25 14:50:29 +02:00
Jaime van Kessel
078707a726 Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1 2019-04-25 14:12:15 +02:00
Jaime van Kessel
da736cc4be Add import redirects with deprecation warning so we don't break plugin compatibility 2019-04-25 14:11:42 +02:00
Remco Burema
baac2d1a0f Fix various expandable/dragable/window interactions. [CURA-6478] 2019-04-25 13:33:31 +02:00
Lipu Fei
0501ae2fbc Handle case that printer type can be human readable string 
CURA-6449
 2019-04-25 13:14:28 +02:00
Lipu Fei
4f05ea578c Cancel the network request when cancel the manual ip request 
CURA-6483
 2019-04-25 11:55:49 +02:00
Lipu Fei
b22073e170 Add timeout for manual IP requests 
CURA-6483
 2019-04-25 11:54:32 +02:00
Remco Burema
9283c3d321 Add window-size handling to draggable component. [CURA-6478] 2019-04-25 11:08:13 +02:00
Ghostkeeper
cf9ab5a5cd
Don't serialize 'compatible' metadata key 
It is already serialised in the 'hardware compatible' settings.
 2019-04-25 10:55:17 +02:00
Ghostkeeper
0ad9d000ab
More consistent capital letter usage 2019-04-25 10:55:17 +02:00
Lipu Fei
9868dee474 Fix typing 
CURA-6483
 2019-04-25 08:57:57 +02:00