Ghostkeeper
133f6f43fe
Merge branch '3.3'
2018-04-13 16:14:23 +02:00
Diego Prado Gesto
f23491377f
CURA-5197 Add Cura booting time to the logs.
2018-04-12 16:52:09 +02:00
Lipu Fei
0f966115e6
WIP: Make CuraPackageManager aggregate PluginRegistry data
...
CURA-4644
2018-04-12 15:46:53 +02:00
Lipu Fei
596e0be7b6
CuraPackageManager handles packages and plugins
...
CURA-4644
2018-04-12 12:57:58 +02:00
Ian Paschal
94b15b0498
Merge branch 'CURA-4644-package-reader' into feature_material_marketplace
2018-04-11 11:08:18 +02:00
Lipu Fei
40eedbcf70
Add more info dialog
...
CURA-5204
2018-04-10 15:33:32 +02:00
Lipu Fei
56e80bb518
Merge branch '3.3'
2018-04-10 13:25:45 +02:00
Lipu Fei
4e625da168
Increase delay time for open file with double-clicking
...
CURA-5203
2018-04-10 13:23:23 +02:00
Lipu Fei
107c10b860
Merge branch '3.3'
2018-04-10 11:41:13 +02:00
Lipu Fei
95f4515e93
Make it possible to skip project file check in readLocalFile()
...
CURA-5203
2018-04-10 11:40:47 +02:00
Aleksei S
c7b6bb8188
Merge branch '3.3'
2018-04-09 12:53:53 +02:00
Lipu Fei
cadb2c62b7
Fix open file with Cura
...
CURA-5203
When open a file that's associated with Cura, dialogs that need to
pop up may not work because QML is still in the middle of initialization,
so we need to wait for QML to finish before doing anything else such
as opening files.
2018-04-06 11:55:07 +02:00
Diego Prado Gesto
8c0d58c227
CURA-5197 Add Cura booting time to the logs.
2018-04-05 15:28:44 +02:00
Lipu Fei
e36ef583b7
Minor changes and cleanup
2018-04-05 15:14:15 +02:00
Lipu Fei
6ae9694998
Add CuraPackageManager
2018-04-05 15:14:15 +02:00
Lipu Fei
19bc2b78f4
Add Version upgrade 3.3 to 3.4
...
Need to distinguish between quality and quality_changes in the cura directory,
so we need to move all custom quality profiles into the quality_changes directory.
2018-04-05 15:14:15 +02:00
Diego Prado Gesto
322fe7d61f
CURA-5137 Rename Plugin Browser into Toolbox
2018-03-30 14:15:00 +02:00
Ghostkeeper
d244a37feb
Merge branch '3.3'
2018-03-29 16:57:55 +02:00
Jack Ha
2a3b25265b
CURA-5174 update camera zoom range
2018-03-29 16:57:36 +02:00
Diego Prado Gesto
a5e38bb486
CURA-5175 Add variants to the version upgrade.
...
Upgrade the version number in the variants and add the hardware_type
metadata.
2018-03-29 16:54:30 +02:00
Jack Ha
2bf3fa35ac
CURA-5174 update camera zoom range
2018-03-29 14:25:00 +02:00
Diego Prado Gesto
3fb14691a9
CURA-5160 Skip empty quality when load project file
2018-03-27 14:09:17 +02:00
Jack Ha
c2888529cb
CURA-5128 cleanup .gz and only leave .gcode.gz as Cura and Uranium now accept extensions with multiple periods
2018-03-22 14:35:21 +01:00
Lipu Fei
ce0e3f89b7
Fix code style and typo
...
CURA-4846
2018-03-22 09:42:14 +01:00
Aleksei S
47417c86a3
Rename method name
...
CURA-4846
2018-03-21 17:25:23 +01:00
Aleksei S
feb59f2531
Merge branch 'master' of github.com:Ultimaker/cura
2018-03-21 17:22:24 +01:00
Aleksei S
4fa195894d
Fix: After reloading merged models they do not update origin position
...
CURA-4846
2018-03-21 17:21:11 +01:00
Diego Prado Gesto
5e3cf92197
CURA-5134 Add funtionality to lazily remove plugins
2018-03-21 16:57:48 +01:00
fieldOfView
5a9bcf446e
Do not select parented nodes when selecting all
2018-03-19 17:52:40 +01:00
fieldOfView
91e1ae69ec
Don't reparent nodes that are children of a selected node when grouping selection
2018-03-19 14:35:08 +01:00
fieldOfView
af637d5acc
Don't explode all nested groups when ungrouping groups of groups
2018-03-19 11:33:17 +01:00
Lipu Fei
9de114c73a
Simplify discardOrKeepProfileChangesClosed()
2018-03-15 16:48:09 +01:00
Lipu Fei
83175b00c2
Change SettingVisibilityPresetsModel to non-singleton
...
CURA-5088
2018-03-15 14:41:34 +01:00
Lipu Fei
1f2602a2f4
Move SettingVisibilityPresetsModel to Machines.Models
...
CURA-5088
2018-03-15 14:41:34 +01:00
Jack Ha
98b0559c9a
Merge branch 'master' into speedup
2018-03-14 16:14:14 +01:00
Jack Ha
e3dd7a449d
CURA-5090 speedups by using qtimers on updating mostly visual elements
2018-03-14 16:09:59 +01:00
Lipu Fei
984e6ddd08
Merge pull request #3274 from fieldOfView/feature_setting_visibility_profiles
...
Setting Visibility Presets sidebar menu
2018-03-14 13:25:59 +01:00
Ian Paschal
4478989332
Merge pull request #3463 from Ultimaker/feature_sync_button
...
[Feature] Sync Button
2018-03-13 16:52:39 +01:00
Diego Prado Gesto
2bf6d071d1
Merge branch 'master' into feature_sync_button
2018-03-13 13:54:22 +01:00
Lipu Fei
934d297e6c
Split error checking into smaller sub-tasks
...
CURA-5059
Split stack error checking into smaller sub-tasks so running them on the Qt
thread will not block GUI updates from happening for too long.
2018-03-13 13:21:44 +01:00
Jack Ha
d70cc072e9
Merge branch 'master' into feature_enable_disable_extruder
2018-03-12 09:06:24 +01:00
Diego Prado Gesto
85d6919ce6
Merge branch 'master' into feature_sync_button
2018-03-09 16:59:18 +01:00
fieldOfView
e62ed62bdd
Remove duplicate import
2018-03-09 16:57:09 +01:00
Diego Prado Gesto
472ae8e044
CURA-4870 Create a custom model for the machines in order to show the
...
printers grouped by local or networked.
2018-03-09 16:35:23 +01:00
Ghostkeeper
d8a066c1e7
Increment instance container version number instead of just quality_changes
...
Otherwise when we load that quality_changes file we'll deny it because the instance container version number is wrong.
Contributes to issue CURA-5054.
2018-03-09 16:14:24 +01:00
fieldOfView
4c66c935af
Merge branch 'master' into feature_setting_visibility_profiles
2018-03-09 15:45:24 +01:00
Ghostkeeper
5caa92cf7a
Update current version for quality changes
...
We now need to upgrade up to version 3000004.
Contributes to issue CURA-5054.
2018-03-09 15:21:45 +01:00
Lipu Fei
d1beae4603
Better logging for checkIsValidProjectFile()
...
CURA-4966
2018-03-08 19:50:22 +01:00
fieldOfView
97d7354839
Merge branch 'master' into feature_setting_visibility_profiles
2018-03-05 23:09:51 +01:00
Jack Ha
bad637eb14
CURA-4400 fixed merge conflicts
2018-03-05 16:47:40 +01:00
