Lipu Fei
580244a546
Split material models into separate files
2018-03-01 11:50:55 +01:00
Lipu Fei
4a202d6728
Use getMultiBuildPlateModel()
2018-02-28 11:42:26 +01:00
Lipu Fei
75573da9dd
Fix merge conflicts with master
2018-02-27 13:08:29 +01:00
Ghostkeeper
c47045a42e
Revert "CuraApplication/UM.MeshBuilder: Removing _reloadMeshFinished"
...
This reverts commit 269b52487e
. It was crashing Cura when pressing F5.
The completion of this job should not be moved to Uranium because the job exists only in Cura.
Contributes to issue CURA-4912.
2018-02-27 11:47:17 +01:00
Jack Ha
22cf5abec2
Merge branch 'master' into refactoring_machine_manager
2018-02-27 10:24:56 +01:00
Lipu Fei
0b8678d2ae
Explicitly create MachineManager
2018-02-26 19:33:16 +01:00
Ian Paschal
f98b60f549
Merge pull request #2827 from Ultimaker/thopiekar-UM-watch-files-for-modification
...
CuraApplication/UM.MeshBuilder: Removing _reloadMeshFinished
2018-02-26 16:58:55 +01:00
Lipu Fei
8dfa52f15c
Fix material menu model extruder binding and initial update
2018-02-22 20:58:54 +01:00
Lipu Fei
d2ffd59431
Switch to the new quality profile when it is created
2018-02-22 16:53:13 +01:00
Lipu Fei
392f729731
Reduce number of QML singletons
2018-02-22 14:21:10 +01:00
Lipu Fei
b415a36110
WIP: Remove delayed update in MachineManager
2018-02-22 13:58:35 +01:00
Lipu Fei
9a354efd19
Merge remote-tracking branch 'origin/master' into refactoring_machine_manager
2018-02-21 14:05:19 +01:00
Jack Ha
b96d49c010
CURA-4606 ensure startup order for machine manager before build volume to prevent errors there
2018-02-20 16:04:41 +01:00
Lipu Fei
6cc65e97f2
WIP: Cleanup MaterialsModel
2018-02-20 09:13:11 +01:00
Lipu Fei
251fe8a3a6
WIP: Remove ContainerSettingModel
2018-02-19 17:03:30 +01:00
Jack Ha
3ff9cb6b1e
CURA-4606 added first Profile management page
2018-02-19 15:07:50 +01:00
Aleksei S
1afe2668f7
Fix: Extreme small model was not automatically scaled.
2018-02-19 15:04:08 +01:00
Lipu Fei
495fc8bbd7
WIP: Refactor BuildPlateModel and split MultiBuildPlateModel
2018-02-17 22:24:05 +01:00
Lipu Fei
236bd09d08
WIP: Refactor quality model files
2018-02-17 14:58:56 +01:00
Lipu Fei
2cfdbc1b16
WIP: Remove old quality models
2018-02-17 14:10:01 +01:00
Lipu Fei
96f1264364
WIP: Rework profile management page
2018-02-16 16:40:09 +01:00
Lipu Fei
7fa218e9cd
WIP: Remove old Settings/MaterialManager
2018-02-16 14:23:11 +01:00
Lipu Fei
1e0a078af8
WIP: Refactor Materials management page to use new Managers
2018-02-16 14:23:11 +01:00
Lipu Fei
13d745f07d
WIP: Move NozzleModel.py
2018-02-16 14:23:11 +01:00
Lipu Fei
730cbb25bf
WIP: Simplify machine creation
2018-02-16 14:23:11 +01:00
Lipu Fei
bf2317a74d
WIP: use new QualityChangesGroups
2018-02-16 14:23:11 +01:00
Lipu Fei
cd53ae0639
WIP: Refactor ProfileMenu.qml
2018-02-16 14:20:03 +01:00
Lipu Fei
8ac9811b41
WIP: Create QualityManager
2018-02-16 14:20:02 +01:00
Lipu Fei
f0d9fba2f5
WIP: Create MaterialManager
2018-02-16 14:20:02 +01:00
Lipu Fei
55bdc0c853
WIP: Create VariantManager
2018-02-16 14:20:02 +01:00
fieldOfView
85aed830a6
Merge branch 'master' into feature_setting_visibility_profiles
2018-02-15 11:56:36 +01:00
fieldOfView
a17160f52d
Merge branch 'master' into feature_setting_visibility_profiles
...
# Conflicts:
# resources/qml/Settings/SettingView.qml
2018-02-15 11:54:45 +01:00
Ian Paschal
bc47c6e623
Fix for CURA-4963
...
Exclude buildplate and nozzle meshes from being reloaded on F5 press.
2018-02-15 11:20:46 +01:00
Ghostkeeper
6eeaab3c12
Add plug-in locations with different lib suffixes
...
Or suffices if you want to go the Latin way.
Fixes #3195 .
2018-02-13 11:45:49 +01:00
fieldOfView
74fe281e1d
Sync currently selected preset between visibility-page and -menu
2018-02-09 18:54:04 +01:00
fieldOfView
4c1002bf47
Move setting visibility resource type from Uranium to Cura
2018-02-09 09:31:13 +01:00
fieldOfView
f79e787f2c
Refactor SettingVisibilityProfiles to SettingVisibilityPresets
...
This is closer to the current Cura intend
2018-02-09 09:01:39 +01:00
fieldOfView
080979caeb
Move setting visibility presets into a model
...
Handling of "Custom" is still under consideration
2018-02-08 23:07:45 +01:00
Lipu Fei
ffa4df6a06
Merge 3.2 into master
2018-02-07 13:20:24 +01:00
Ghostkeeper
399a63912e
Improve error message with the trigger early crash option
...
This way our logs are a bit more clear.
2018-02-06 16:10:58 +01:00
Lipu Fei
b59eadce1c
Fix AutoSave crashing the early crash dialog
...
CURA-4895
2018-02-05 11:28:16 +01:00
Lipu Fei
c2aa5fc2a2
Only initialise AutoSave after Application finishes its start up
...
CURA-4895
2018-02-05 11:27:38 +01:00
Lipu Fei
aefe24222f
Add a CLI flag to test early crash
...
CURA-4895
2018-02-05 11:26:38 +01:00
Lipu Fei
6bbc18d51e
Make an extra early crash dialog
...
CURA-4895
An early crash dialog showing options to backup the current user data
and reset the configuration files.
2018-02-05 11:26:37 +01:00
Lipu Fei
1d946085d3
Make crash dialog available before Application starts
...
CURA-4895
2018-02-05 11:26:34 +01:00
Lipu Fei
367e50669d
Refactor code
...
CURA-3710
2018-02-01 13:56:49 +01:00
Lipu Fei
0e5c67a38f
Merge remote-tracking branch 'origin/master' into CURA-3710_setting_visibility_preset
2018-02-01 11:00:13 +01:00
Aleksei S
f065a08c82
Added visible settings
...
CURA-3710
2018-01-30 15:26:15 +01:00
Aleksei S
54dc63a596
Add missing changes
...
CURA-3710
2018-01-23 11:24:27 +01:00
Lipu Fei
b14fdb1d0d
Merge remote-tracking branch 'origin/3.2'
2018-01-23 11:20:49 +01:00