GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-01 00:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,175 Commits 291 Branches 260 Tags
Commit Graph

1342 Commits

Author SHA1 Message Date
Lipu Fei
961f6403ad Change preference key to cura/show_list_of_objects 2019-05-16 15:49:08 +02:00
Jaime van Kessel
186eef0b68 Fix backup causing a crash in specific situations 2019-05-16 15:38:44 +02:00
Diego Prado Gesto
9e5e57e6c5 Merge branch 'master' into feature_model_list 2019-05-07 11:57:31 +02:00
Lipu Fei
40d26bbb6e NetworkingUtil is included in Cura 1.5 QML 
CURA-6483
 2019-04-30 12:49:26 +02:00
Lipu Fei
ed8127777c Make a single NetworkingUtil 
CURA-6483
 2019-04-30 09:43:50 +02:00
Lipu Fei
c8872cb4a1 Use a separate function to validate IP address 
CURA-6483
 2019-04-29 15:53:08 +02:00
Ghostkeeper
1fb336ed3d
Merge branch 'CURA-6483_fix_manual_printer_discovery' into 4.1 2019-04-26 14:15:07 +02:00
Remco Burema
ad9fc62ff5 Fix typing. [CURA-6478] 2019-04-25 23:05:52 +02:00
Remco Burema
194f01f840 Add preferences for draggable/expandable-component. [CURA-6478] 2019-04-25 14:50:29 +02:00
Lipu Fei
372e9026e4 Move add by ip device discovery into DiscoveredPrintersModel 
CURA-6483
 2019-04-25 08:44:55 +02:00
Remco Burema
37fddaee5c Limit draggable component to the main window. 2019-04-25 08:43:36 +02:00
Lipu Fei
4876d5af00 Fix data saving before making a backup 
CURA-6471
 2019-04-24 08:21:11 +02:00
Lipu Fei
f5668df127 Add parent to models so QML dont take ownership 2019-04-18 15:54:23 +02:00
Lipu Fei
46fa45768a Simplify shouldShowWelcomeDialog() 
CURA-6447
 2019-04-17 09:35:01 +02:00
Lipu Fei
0fe6555881 Remove debug code 
CURA-6447
 2019-04-15 13:09:44 +02:00
Lipu Fei
9494173f43 Remove hack in WelcomePagesModel and add WhatsNewPagesModel 
CURA-6447
 2019-04-12 12:11:09 +02:00
Lipu Fei
61ee2ec85c Simplify code 
CURA-6447
 2019-04-09 11:45:30 +02:00
Lipu Fei
a18bb9d953 Add AddPrinterPagesModel 
CURA-6435
 2019-04-05 09:09:00 +02:00
Lipu Fei
56a3b2dfa7 Fix merge conflicts 2019-03-26 16:33:13 +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
Lipu Fei
a85f2ce156 Fix merge conflicts 2019-03-26 09:01:01 +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
Lipu Fei
f2d7f93101 Merge remote-tracking branch 'origin/WIP_onboarding_by_ip' into WIP_onboarding_machine_action 2019-03-21 08:35:06 +01:00
Remco Burema
1f2fea14ce Little refactors (apply review comments). [CURA-6294] 2019-03-20 16:08:50 +01:00
Remco Burema
ad6603bab8 Merge branch 'WIP_onboarding' into WIP_onboarding_by_ip 2019-03-20 13:33:19 +01:00
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
Diego Prado Gesto
2ac2299c09 Merge branch 'master' into feature_model_list 2019-03-03 21:22:06 +01:00