3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 07:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
19125 commits 307 branches 272 tags 787 MiB
Commit graph

19125 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Remco Burema
794d13969a Shorter log messages for operations. 2019-03-22 12:06:04 +01:00
Lipu Fei
2f33beff36 Fix cloud image filename 2019-03-22 11:57:33 +01:00
Lipu Fei
92dea8a52f Add welcome_pages_default_margin 2019-03-22 11:50:10 +01:00
Tim Kuipers
32d79451cc fix color inversion and make variable naming descriptive 2019-03-22 11:42:31 +01:00
Tim Kuipers
bdf102ea64 make description of color invert explanatory, rather than purely descriptive. 2019-03-22 11:30:58 +01:00
Tim Kuipers
709321fc0c Change image import options for standard lithophanes 2019-03-22 11:22:30 +01:00
Lipu Fei
378c6da7ed Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action 2019-03-22 11:17:36 +01:00
Lipu Fei
090e176969 Arrange CloudContent.qml differently 2019-03-22 11:15:43 +01:00
Lipu Fei
1e3945810f Remove text_light_blue and use primary 2019-03-22 10:50:03 +01:00
Jaime van Kessel
9a5b7e7925 Set min value for adaptive_layer_height_variation_step 
This is to prevent using 0, since that crashes the engine
 2019-03-22 10:44:47 +01:00
Lipu Fei
03155d24da Remove unneeded property assignment 2019-03-22 10:43:01 +01:00
Lipu Fei
e632b508eb Rename to AddNetworkOrLocalPrinterContent 2019-03-22 10:43:01 +01:00
Lipu Fei
639c4ba9f6 Remove unneeded property assignment 2019-03-22 10:35:41 +01:00
Lipu Fei
ab06264950 Rename to AddNetworkOrLocalPrinterContent 2019-03-22 10:28:17 +01:00
Lipu Fei
77720c9039 Fix merge conflicts 2019-03-22 10:25:07 +01:00
Lipu Fei
4573733bb7 Remove unnecessary "visible: true" 2019-03-22 10:22:19 +01:00
Lipu Fei
2b0e2d84bb Rename gotoPage to goToPage 2019-03-22 10:21:17 +01:00
Lipu Fei
a8e2fcf5f5 Add comments for properties in AddPrinterByIpContent 2019-03-22 10:19:38 +01:00