19165 Commits

Author SHA1 Message Date
Jaime van Kessel
7a3cd81e3f Fix font size for the titles in the welcome flow
CURA-6057
2019-04-01 14:10:09 +02:00
Jaime van Kessel
1b8b5415f7 Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura into WIP_onboarding 2019-04-01 13:46:00 +02:00
Jaime van Kessel
74903fe3e5 Cleaned up the QML
This moves all the "default" margins of the welcome pages into a single point (the WizardPanel)
in order to prevent having to re-define it every time.
I've also fixed some incorrect margins that we had

CURA-6057
2019-04-01 13:44:27 +02:00
Lipu Fei
0c43b4a180 Merge remote-tracking branch 'origin/master' into WIP_onboarding 2019-04-01 13:33:41 +02:00
Lipu Fei
395dc269b0 Fix hms434 definition file 2019-04-01 13:33:25 +02:00
Lipu Fei
9575c6b3b3 Fix merge conflicts 2019-04-01 13:28:42 +02:00
Lipu Fei
b28e98f288
Merge pull request #5521 from Ultimaker/CURA-6151-Notify-updates-from-marketplace
Notify updates from marketplace
2019-04-01 13:19:37 +02:00
Ghostkeeper
add6c0b489
Default the gantry height to be equal to the printer height
You can't fit any objects higher than that anyway.

Fixes #5528.
2019-04-01 13:04:38 +02:00
Jaime van Kessel
1d6d3d729d Once the user logged in in the cloudContent page ensure that it moves to the next.
This fixes the weird situation that when logging in, the screen was still visible
and the user could still press the create / sign in button.

CURA-6057
2019-04-01 13:04:29 +02:00
Lipu Fei
9ae8d2f88c Use NotificationIcon and simplify code
CURA-6151
2019-04-01 11:52:35 +02:00
Lipu Fei
15f9844b85 Make reusable NotificationIcon
CURA-6151
2019-04-01 11:51:31 +02:00
Ghostkeeper
8c41a05183
Merge branch 'maukcc-master' 2019-04-01 11:09:07 +02:00
Jaime van Kessel
64523c7baf Add some extra info to the tooltip if a setting is not used due to the value of it's children
The behavior might make sense to us, but that's probably because we know what the behavior is. The
extra info in the tooltip should make it easier to understand

Fixes #5525
2019-04-01 10:41:35 +02:00
Lipu Fei
3f9b98bd0c Round size numbers
CURA-6151
2019-04-01 10:38:43 +02:00
Remco Burema
e14d836c4f Merge branch 'WIP_onboarding' of https://github.com/Ultimaker/Cura into WIP_onboarding 2019-03-29 16:23:32 +01:00
Remco Burema
dc8524b90d Fix 'DiscoverUM3Action' required attention from user in flow. [CURA-6057] 2019-03-29 16:23:16 +01:00
Diego Prado Gesto
3d86499069 Don't round the radius of the RadioButton
Otherwise it looks like a weird circle.

Contributes to CURA-6057.
2019-03-29 15:41:20 +01:00
maukcc
7f2fcb16a8 Adding platform to HMS434 2019-03-29 14:26:42 +01:00
Ghostkeeper
d8f89d8330
Fix sorting printers by name
Because DiscoveredPrinter.name contains the MAC addresses of the printers. NetworkedPrinterOutputDevice.name contains the discovered name as communicated by ZeroConf. We already use that property from QML to display in the list.

Contributes to issue CURA-6057.
2019-03-29 13:41:46 +01:00
Ghostkeeper
5028290e0d
Remove welcome_pages_default_margin theme entry
Use the wide margin instead. It's practically the same, nobody is going to notice. It still looks spacey and nice, and it's more consistent with the rest of the interface.
We had previously agreed that we will not make any new widget-specific theme entries any more.

Contributes to issue CURA-6057.
2019-03-29 13:41:45 +01:00
Ghostkeeper
129c1ab3d4
Fix welcome page buttons text not fitting
On some operating systems the text would not fit due to different font rendering. Also, after translation, it probably wouldn't fit either.
Usually we have the button size adjusting to the text inside it. The design didn't do this, either because it was too difficult to do in Zeplin, because the designer was lazy, or because the designer didn't know that this was the normal style in the rest of Cura. And the programmer took that over literally.

Contributes to issue CURA-6057.
2019-03-29 13:41:45 +01:00
Jaime van Kessel
83361405a4 Add test for num instances in machine manager 2019-03-29 13:34:41 +01:00
Remco Burema
3ca8ba421a Move CuraStage back to where plugins expect it. 2019-03-29 13:11:03 +01:00
Remco Burema
39f6eafe3c Remove wrong qml in WhatsNewContent. 2019-03-29 13:04:11 +01:00
Jaime van Kessel
91a886793b Hide welcome dialog instead of close cura if you complete it
CURA-6057
2019-03-29 12:04:00 +01:00
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
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