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
Diego Prado Gesto
14b409a895
Exclude gff and cff materials for all ultimaker printers except UMS5
...
Contributes to CURA-6089.
2019-03-25 12:59:05 +01:00
Diego Prado Gesto
7958f99152
Update the list of check urls for UM3 Extended
2019-03-25 11:59:28 +01:00
TinkerGnome
5bcb4e9554
add Mark2 definition files
2019-03-23 19:50:23 +01:00
Thomas Karl Pietrowski
8b0e1e9f5d
PrintSetupSelector: "G code" -> "G-code"
...
Noticed that "g-code" is written at some places with and without a hyphen.
Since it think it should be written with, I'm correcting it at this point.
2019-03-22 19:42:01 +01:00
Diego Prado Gesto
ac5428a2e4
Merge branch 'master' of github.com:Ultimaker/Cura
2019-03-22 18:03:32 +01:00
Diego Prado Gesto
74ffee7810
Fix typo in a previous commit
2019-03-22 18:03:01 +01:00
Diego Prado Gesto
a793a06b60
Add a maximumWidth to the ActionButton
...
In case the text is too long, it can exceed the limits of the container. This is an optional flag that will work only in case it's set up.
Contributes to CURA-6412.
2019-03-22 17:10:42 +01:00
Ian Paschal
fc650865d6
Improved cloud pop-up
...
Contributes to CL-1287
2019-03-22 15:24:12 +01:00
Ian Paschal
2233543780
Only set "do not show cloud message" metadata if active machine is the added cloud cluster
...
Contributes to CL-1267
2019-03-22 14:53:55 +01:00
Ian Paschal
9aef692082
Emit added or removed clusters
...
Useful to whomever is listening in on those signals to know _what_ was added or removed.
Contributes to CL-1267
2019-03-22 14:52:11 +01:00
Lipu Fei
85b28a0c90
Use themed values for margins
2019-03-22 14:34:02 +01:00
Lipu Fei
6f911f9924
Use rounding for width
2019-03-22 14:29:32 +01:00
Lipu Fei
ec0b197b6e
Fix merge conflicts
2019-03-22 14:28:23 +01:00
Lipu Fei
a9431b270f
Rearrange items in WelcomeContent.qml
2019-03-22 14:19:26 +01:00
Lipu Fei
f8c4cee2de
Simplify user agreement page layout
2019-03-22 13:50:02 +01:00
Remco Burema
b25df557d3
Merge branch 'WIP_onboarding' of https://github.com/Ultimaker/Cura into WIP_onboarding
2019-03-22 13:20:43 +01:00
Remco Burema
8de055dd33
Adjust add-by-ip to latest review comments. [CURA-6294]
2019-03-22 13:19:19 +01:00
Lipu Fei
eb02b302f5
Rearrange items in DataCollectionsContent.qml
2019-03-22 13:18:33 +01:00
Remco Burema
1f75d00cd3
Adapt add-by-ip-qml to handle unresponsive address. [CURA-6294]
2019-03-22 13:10:31 +01:00
Lipu Fei
457eb93758
Remove debug code
2019-03-22 13:08:51 +01:00
Lipu Fei
2074bf9133
Use theme
2019-03-22 13:06:57 +01:00
Lipu Fei
26acad3dbc
Cleanup unnecessary hard-coded numbers in styling
2019-03-22 12:55:45 +01:00
Lipu Fei
67428aee53
Cleanup unnecessary hard-coded numbers in styling
2019-03-22 12:55:25 +01:00
Lipu Fei
a2c2424d69
Use Label for SignIn button
2019-03-22 12:24:11 +01:00
Lipu Fei
9e7c687853
Fix merge conflicts
2019-03-22 12:07:59 +01:00