19507 Commits

Author SHA1 Message Date
Jaime van Kessel
2f34bdc650 Fix shadow of the first run screen
CURA-6057
2019-03-29 11:51:57 +01:00
Diego Prado Gesto
0ffcfe041a Exclude HIPS and PETG for UM3 as it use to be in 4.0 2019-03-29 11:49:06 +01:00
Jaime van Kessel
69935115f3 Fix some layout issues with the addNetworkedOrLocalPrinter screen
CURA-6057
2019-03-29 11:44:09 +01:00
Jaime van Kessel
f92ed4cd02 Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura into WIP_onboarding 2019-03-29 11:35:42 +01:00
Jaime van Kessel
894a09b654 The welcome dialog is now a rectangle instead of a dialog
The whole window approach was just causing to much cross platform issues, so
I converted it into a rectangle and put a mouseArea that eats all the events in the
greyOut background

CURA-6057
2019-03-29 11:33:49 +01:00
Remco Burema
7ceaade26d Sort changelog correctly (newest on top). [CURA-6057] 2019-03-29 11:27:37 +01:00
Jaime van Kessel
28dc187731 Set the flag of the welcome dialog to Dialog
We want the dialog to be modal, but if it's a window (and not a dialog) the
modality can't be set (or well, it can be set, but it's just ignored at that point)

CURA-6057
2019-03-29 11:08:10 +01:00
Jaime van Kessel
b4134e6dbb Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura into WIP_onboarding 2019-03-29 10:44:29 +01:00
Jaime van Kessel
f8b67be487 Fix error spam when a printer of a cluster is unreachable
CURA-6057
2019-03-29 10:43:47 +01:00
Remco Burema
60920c89af Remove old send slice-info confirm: part of the new onboard. [CURA-6057] 2019-03-29 09:33:41 +01:00
Remco Burema
1cebf145f5 Make User-Agreement work with new 'WizadPanel'. [CURA-6057] 2019-03-29 09:23:10 +01:00
Ian Paschal
4581c1f138 Fix UM3NetworkPrinting test
Contributes to CL-1266
2019-03-28 16:20:01 +01:00
Lipu Fei
d34b3b8585 Move associate um network printer function into UM3OutputDevicePlugin 2019-03-28 15:24:42 +01:00
Lipu Fei
109631d023 Update doc for updateHasMaterialsMetadata() 2019-03-28 15:13:41 +01:00
Lipu Fei
e010220432 Fix merge conflicts 2019-03-28 14:46:19 +01:00
Lipu Fei
f4d0e39788 Pass application 2019-03-28 14:43:37 +01:00
Lipu Fei
3ad79a5888 Fix divided by 0 problem 2019-03-28 14:34:18 +01:00
Lipu Fei
82471a0e39 Add doc for MachineSettingsManager 2019-03-28 14:31:33 +01:00
Lipu Fei
397add861f Correct logging level 2019-03-28 14:29:37 +01:00
Lipu Fei
8780fce7a7 Move MaterialOutputModel back 2019-03-28 14:26:54 +01:00
Lipu Fei
b28fdc2b0b Use camelcase for pyqtProperty names 2019-03-28 14:22:27 +01:00
Jaime van Kessel
84de34341d
Merge pull request #5470 from Ultimaker/WIP_onboarding_machine_action
New onboarding flow - machine action
2019-03-28 13:43:48 +01:00
Jaime van Kessel
ffd7a001fb Add notification icon to the installed tab of the toolbox
CURA-6151
2019-03-28 13:31:51 +01:00
Jaime van Kessel
6c26dd38ec Clean up code for the toolbox tab button
Removed unused properies and made it use states for it's changing properties.
This makes it a lot easier to read and understand what it's actually doing

CURA-6151
2019-03-28 13:24:25 +01:00
Lipu Fei
4f5aee6298 Merge remote-tracking branch 'origin/fix_long_button_text' 2019-03-28 11:11:49 +01:00
Diego Prado Gesto
742329a170 Document where the magic numbers come from
For the maximumSize of a button.

Contributes to CURA-6412.
2019-03-28 09:29:31 +01:00
Jaime van Kessel
84aa7fd007 Fix mypy type errors
CURA-6057
2019-03-27 17:40:33 +01:00
Jaime van Kessel
9091eaa6f8 Re-added the imports to the conftest
These are really really needed, otherwise the tests wont run. I've added a few
more comments to further stress the importance of these.

CURA-6057
2019-03-27 17:32:34 +01:00
Jaime van Kessel
5c50ef41cc Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura into WIP_onboarding 2019-03-27 17:21:16 +01:00
Jaime van Kessel
804e2060ea Re-added the imports to the conftest
These are really really needed, otherwise the tests wont run. I've added a few
more comments to further stress the importance of these.

CURA-6057
2019-03-27 17:20:17 +01:00
Ian Paschal
49cb3de562 Merge remote-tracking branch 'origin/master' into CL-1266_cloud_association_for_manual_ips 2019-03-27 16:53:31 +01:00
Ian Paschal
637e18a841 Add default value for internal IP if not supplied
Contributes to CL-1266
2019-03-27 15:40:06 +01:00
Lipu Fei
58507303fa Duplicate qualities should have unique names
CURA-6426
2019-03-27 14:08:06 +01:00
Jaime van Kessel
56f3226ac1 Add the notification icon for the marketplace.
This adds an icon to the top right of the marketplace button to indicate that there
are plugins with pending updates.

CURA-6151
2019-03-27 13:21:56 +01:00
Lipu Fei
0a8a25860c Update network troubleshooting URL 2019-03-27 13:09:25 +01:00
Jaime van Kessel
1e02a20745 Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6151-Notify-updates-from-marketplace 2019-03-27 12:56:02 +01:00
Jaime van Kessel
e3f2c06542 Remove usage of canUpdate slot
This makes it a bit cleaner, since having it as a slot is a bit weird in the first place (and forced
all kinds of hacks to ensure it got re-evaluated)

CURA-6151
2019-03-27 12:54:20 +01:00
Jaime van Kessel
f4f94b10d2 Move "canUpdate" logic from toolbox to PackageManager
CURA-6151
2019-03-27 12:48:10 +01:00
Lipu Fei
79c13ce35c
Merge pull request #5511 from Ultimaker/fix_weird_home_directories_windows
Fix for weird home directories on Windows
2019-03-27 11:11:57 +01:00
maukcc
afb6810bac Add HMS434
Add HMS434 machine
2019-03-27 10:23:59 +01:00
Remco Burema
494c290cc4
Merge pull request #5505 from Ultimaker/CURA-6089_hide_materials
Exclude gff and cff materials for all ultimaker printers
2019-03-27 09:56:45 +01:00
Lipu Fei
6dbae6f088 Show machine actions page optionally 2019-03-27 09:34:48 +01:00
Lipu Fei
56a3b2dfa7 Fix merge conflicts 2019-03-26 16:33:13 +01:00
Lipu Fei
6c7ae309a1 Add network troubleshooting url 2019-03-26 16:27:06 +01:00
Lipu Fei
1dd48c5728 Show welcome page if no printer 2019-03-26 16:21:07 +01:00
Lipu Fei
1c39d0c015 Fix merge conflicts 2019-03-26 15:55:58 +01:00
Lipu Fei
6843fb1ffb Load change log from file for on-boarding page 2019-03-26 15:49:40 +01:00
Ghostkeeper
f6dd3f922d
Merge branch 'shorter_ops_logs' 2019-03-26 15:34:26 +01:00
Lipu Fei
98b7df790d Implement More-info button on Data Collection page 2019-03-26 15:20:18 +01:00
Lipu Fei
2511b7a26a Implement More-info button on Data Collection page 2019-03-26 15:18:54 +01:00