Lipu Fei
c3c9c53f13
Merge WIP_onboarding
2019-03-20 11:28:30 +01:00
Lipu Fei
a97410656f
Fix WelcomePagesModel qml type registering typo
2019-03-20 10:00:14 +01:00
Lipu Fei
4078719c58
Move cura.Machine.Models to cura.UI.MachineModels
2019-03-20 09:56:11 +01:00
Lipu Fei
2b39d6422c
Move PrinterOutputDevice into cura.PrinterOutput module
2019-03-20 09:43:09 +01:00
Lipu Fei
1f5cf62a7c
Move UserChangesModel into cura.UI module
2019-03-20 09:22:42 +01:00
Lipu Fei
e1d26da528
Move ExtrudersModel into cura.UI module
2019-03-20 09:19:30 +01:00
Lipu Fei
5848174ad4
Move PrintInformation into cura.UI module
2019-03-20 09:13:38 +01:00
Lipu Fei
228270d9d5
Move ObjectModel into cura.UI module
2019-03-20 09:12:21 +01:00
Lipu Fei
dfc53d3604
Move MachineActionManager into cura.UI module
2019-03-20 09:10:48 +01:00
Lipu Fei
8c0cb2b7b8
Move GlobalStackModel into cura.UI module
2019-03-20 09:09:48 +01:00
Lipu Fei
b6216bf4a3
Move CuraSplashScreen into cura.UI module
2019-03-20 09:08:14 +01:00
Lipu Fei
a92971d80e
Merge WIP_boarding_by_ip
2019-03-19 15:51:47 +01:00
Lipu Fei
8d68db9ff0
WIP: Add first-start machine actions
2019-03-19 14:24:57 +01:00
Lipu Fei
d4c0104bc2
WIP: Add FirstStartMachineActionsModel
2019-03-19 12:07:52 +01:00
Lipu Fei
58062cb4de
WIP: Remove unused MachineManagementModel
2019-03-19 11:06:42 +01:00
Lipu Fei
987ebba33b
WIP: Make MachineSetting panel work
2019-03-19 09:51:10 +01:00
Remco Burema
5b31feebba
Remove UserAgreement-plugin in favour of Welcome-Pages. [CURA-6057]
2019-03-15 13:58:36 +01:00
Remco Burema
4a95564277
Only show Welcome-Pages when needed. [CURA-6057]
2019-03-15 11:30:07 +01:00
Remco Burema
0f116fa3f4
Replace old User-Agreement-page with new Welcome-Pages. [CURA-6057]
2019-03-14 14:59:04 +01:00
Lipu Fei
2b0e9ea439
WIP: Fix refresh and naming
2019-03-14 08:56:31 +01:00
Lipu Fei
940a833e73
WIP: Add printers via network
2019-03-08 13:43:58 +01:00
Lipu Fei
ffb8aed4c3
Merge CURA-6179
2019-03-06 11:32:52 +01:00
Lipu Fei
ac012e8f09
WIP: Add Welcome Page and use CTRL+Alt+D to trigger
2019-02-27 12:45:28 +01:00
Jaime van Kessel
21c6bba1ce
Add the discovered printer functionality
...
This can be used in the add machine wizard to short circuit the creation of a printer.
So instead of first selecting a printer and then connecting it, it will be possible to have
a list that contains all network discovered printers (from all plugins that can do this).
This means we can select one of those printers and directly add it (thus no longer needing that step)
CURA-6179
2019-02-27 11:05:54 +01:00
Jaime van Kessel
efeba48ffb
Move initializeSettingDefinitions and setting functions to their own function
...
This means we don't have to instantiate CuraApplication in the tests anymore
2019-02-18 09:45:30 +01:00
Jaime van Kessel
c0d75b38b7
Added test to check if a key in the profile is defined in the definition
2019-02-15 14:06:46 +01:00
Ghostkeeper
5b9fb20b9a
Remove unused imports
2019-02-12 11:48:23 +01:00
fieldOfView
056655e584
Merge branch 'master' into feature_curaversion_appname
...
# Conflicts:
# cura/CuraApplication.py
2019-01-18 12:12:36 +01:00
Jaime van Kessel
15563a756f
Merge branch '4.0' of github.com:Ultimaker/Cura
2019-01-17 13:42:58 +01:00
Jaime van Kessel
a41cc9efbe
Merge branch 'CURA-6113_fix_master_version_upgrade' of github.com:Ultimaker/Cura
2019-01-17 13:12:41 +01:00
Lipu Fei
3b3baeac03
Remove hard-coded account URLs in QMLs
...
CURA-6117
2019-01-17 11:20:21 +01:00
Jaime van Kessel
24fbb1007d
Merge branch '4.0' of github.com:Ultimaker/Cura
2019-01-16 17:39:43 +01:00
Lipu Fei
b2dace2d48
Fix version upgrade
...
CURA-6113
2019-01-14 11:25:02 +01:00
Diego Prado Gesto
c6da824203
Merge branch '4.0'
2019-01-14 08:56:33 +01:00
ChrisTerBeke
56f0a341bc
Fix merge conflicts
2019-01-10 15:17:53 +01:00
Remco Burema
980953b00c
Merge pull request #4960 from Ultimaker/CURA-6005_cura_drive_plugin
...
[4.0] CURA-6005 Added CuraDrive plugin to Cura build
2019-01-10 14:58:00 +01:00
ChrisTerBeke
764769f4bb
Merge branch '4.0' into STAR-322_cloud-connection
2019-01-10 09:48:48 +01:00
Remco Burema
8f5309c5a5
Merge pull request #5128 from Ultimaker/4.0-Add_version_upgrade
...
Add version upgrade for 4.0
2019-01-09 17:42:17 +01:00
ChrisTerBeke
a6114d39e4
Fix merge conflicts with 4.0
2019-01-08 11:49:36 +01:00
Lipu Fei
059fede06e
Mkae default custom settings panel height smaller
...
CURA-6054
2019-01-07 10:53:21 +01:00
Jaime van Kessel
d21bf53230
Add version upgrade for 4.0
...
Contributes to CURA-6011 and CURA-5995
2019-01-07 10:34:22 +01:00
Lipu Fei
f7fb04d4ae
Fix merge conflicts with 4.0
2019-01-03 15:25:40 +01:00
Lipu Fei
08dc035f6e
Merge remote-tracking branch 'origin/4.0'
2019-01-03 08:30:27 +01:00
Ghostkeeper
96a6b7559e
Remember opened state of settings panel
...
So if you restart Cura while the settings panel was open, it'll stay open when Cura is started back up.
Contributes to issue CURA-6069.
2019-01-02 14:05:17 +01:00
Jaime van Kessel
e02fcd664c
Merge branch '4.0' of github.com:Ultimaker/Cura
2018-12-31 14:34:53 +01:00
Jaime van Kessel
4be228a4e2
Fix merging & grouping
...
I made a boo-boo while adding typing.
CURA-6058
2018-12-31 13:43:47 +01:00
Jaime van Kessel
fd9b29fee2
Rename printersModel to GlobalStacksModel
...
This is a better description for the model anyway.
CURA-6011
2018-12-31 11:09:39 +01:00
Jaime van Kessel
37af42aa93
Merge branch '4.0' of github.com:Ultimaker/Cura
2018-12-31 10:28:53 +01:00
Ghostkeeper
139ab2e0bb
Increment setting_version to 6
...
Because Cura 4.1 is going to have a version upgrade to change the stack files.
Contributes to issue CURA-5848.
2018-12-27 16:39:05 +01:00
Ghostkeeper
c6f4cb4927
Make the settings panel resizable
...
You can now drag the bottom side of the panel to make it bigger or smaller.
Contributes to issue CURA-6054.
2018-12-24 15:31:47 +01:00
