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
Ghostkeeper
ea48e6ded1
Merge branch 'master' of ssh://github.com/Ultimaker/Cura
2019-03-26 15:13:00 +01:00
Ghostkeeper
377c7f1438
Merge branch 'patch-4' of https://github.com/thopiekar/Cura into thopiekar-patch-4
2019-03-26 15:00:31 +01:00
Lipu Fei
f99affd4f5
Create Cura.RadioButton
2019-03-26 14:46:06 +01:00
Simon Edwards
eed810af35
Merge pull request #5479 from Ultimaker/CL-1287_improved_cloud_pop_up
...
CL-1287 Improved Cloud pop-up
2019-03-26 12:17:35 +01:00
Lipu Fei
839d8c2227
Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action
2019-03-26 12:07:25 +01:00
Lipu Fei
e564687722
Use themed margins
2019-03-26 12:06:46 +01:00
Ghostkeeper
a4924d2695
Fix for weird home directories on Windows
...
The expanduser function will expand to a combination of HOMEDRIVE and HOMEPATH which might not be the same as APPDATA if your configuration is very weird (e.g. you've changed your APPDATA location).
Contributes to CURA-6418.
2019-03-26 12:04:46 +01:00
Lipu Fei
f6d212dc88
Use screenScaleFactor for WelcomeDialog size
2019-03-26 11:59:44 +01:00
Lipu Fei
a6d05aa3bb
Fix misc issues
2019-03-26 11:47:09 +01:00
Lipu Fei
af9f9fc857
Fix merge conflicts
2019-03-26 11:46:35 +01:00
Lipu Fei
418ad73a63
Move page index logic into WelcomePagesModel
2019-03-26 11:34:44 +01:00
Lipu Fei
20bd9ea501
Fix binding loop in CloudContent
2019-03-26 11:08:35 +01:00
Lipu Fei
fd0a60f8dc
Rename StepPanel to WizardPanel
2019-03-26 11:06:43 +01:00
Lipu Fei
60be55802e
Refactor StepPanel and WelcomeDialog
2019-03-26 11:04:17 +01:00
Ghostkeeper
07ea8221c1
Merge branch 'thopiekar-patch-1'
2019-03-26 10:42:58 +01:00
Lipu Fei
92d95a1c00
Move page index logic into WelcomePagesModel
2019-03-26 10:34:38 +01:00
Ghostkeeper
ff99c4e45f
Don't include group nodes in AABB
...
In fact, don't include any node that would just have a position rather than actual data.
The rest of the code is robust anyway against there being no AABB.
Contributes to issue CURA-6416.
2019-03-26 10:00:10 +01:00
Ghostkeeper
f3d75fa1ef
Merge branch 'lithophane_defaults' of https://github.com/BagelOrb/Cura into BagelOrb-lithophane_defaults
2019-03-26 09:33:10 +01:00
Lipu Fei
d52f9600b1
Fix binding loop in CloudContent
2019-03-26 09:02:28 +01:00
Lipu Fei
a85f2ce156
Fix merge conflicts
2019-03-26 09:01:01 +01:00
Lipu Fei
705cdedf0b
Remove tiny lines in ultimaker_cloud svg
2019-03-26 08:49:25 +01:00
Lipu Fei
f4cef01c7d
Remove unnecessary IDs in SVGs
2019-03-26 08:41:34 +01:00
Lipu Fei
418daae58e
Remove unnecessary groups in SVG
2019-03-26 08:33:53 +01:00
Lipu Fei
4a171eebf6
Move models around again
...
- Move machine related models to cura.Machines.Models
- Move printer device related models to cura.PrinterOutput.Models
- Other UI/GUI related modules in cura.UI
2019-03-26 08:29:22 +01:00
Satish
85a7d814d8
Added id to machine selector for integration tests
2019-03-25 14:34:00 +01:00
