Commit graph

8758 commits

Author SHA1 Message Date
Lipu Fei
e1766b72ec Only highlight the currently active machine
CURA-6483
2019-04-30 12:47:19 +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
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
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
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
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
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
Ghostkeeper
53d0dd282b
Merge branch 'master' of https://github.com/stereotech/Cura into stereotech-master 2019-04-29 08:54:05 +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
Aldo Hoeben
8276cf2352
Fix merge issue
Merge accidentally reverted a cosmetic change.
2019-04-26 11:53:50 +02:00
Aldo Hoeben
066b90bdea
Merge branch 'master' into feature_amf_reader 2019-04-26 11:51:55 +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
Lipu Fei
3e91f89ffe Add build volume temperature
CURA-6156
2019-04-26 07:43:03 +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
Remco Burema
194f01f840 Add preferences for draggable/expandable-component. [CURA-6478] 2019-04-25 14:50:29 +02:00
frylock34
67ccbc7677 add START and STE320 profiles 2019-04-25 15:42:59 +04:00
Remco Burema
baac2d1a0f Fix various expandable/dragable/window interactions. [CURA-6478] 2019-04-25 13:33:31 +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
0ad9d000ab
More consistent capital letter usage 2019-04-25 10:55:17 +02:00
Lipu Fei
372e9026e4 Move add by ip device discovery into DiscoveredPrintersModel
CURA-6483
2019-04-25 08:44:55 +02:00
Remco Burema
7382798b6a Move setting the dragged-to position to its own function. [CURA-6478] 2019-04-25 08:43:36 +02:00
Remco Burema
78f15d8fcb Margins to main window for draggable component. 2019-04-25 08:43:36 +02:00
Remco Burema
37fddaee5c Limit draggable component to the main window. 2019-04-25 08:43:36 +02:00
Remco Burema
28a14c0a3b Make expandable component dragable. 2019-04-25 08:43:36 +02:00
Lipu Fei
f04b0c3fcc Increase the size of network printer list
The local printer list utilizes the whole space, but the network printer
list is only use half of the space.
2019-04-25 08:18:41 +02:00
Lipu Fei
1b9bf6f0b9 Add optional empty placeholder for CuraView
CURA-6469
2019-04-24 09:10:21 +02:00