Jack Ha
56d5fc8a62
Merge branch 'master' into CURA-5408-material-profiles
2018-07-12 14:43:33 +02:00
jack
461b191648
Merge pull request #4044 from Ultimaker/remove-package-check
...
CURA-5389 Check and confirmation before Remove package
2018-07-12 14:15:13 +02:00
Jack Ha
2bd8350141
Added error checking, added typing, renamed function. CURA-5389
2018-07-12 14:06:34 +02:00
Aleksei S
596a7b7169
Added signal to prevent window closing if USB printer is printing
...
CURA-5384
2018-07-11 13:23:30 +02:00
Lipu Fei
af02dc2758
Only use setMetaDataEntry()
2018-07-11 11:14:57 +02:00
Lipu Fei
76417b7fb2
Hide materials belong to a to-be-removed package
2018-07-11 10:57:57 +02:00
Lipu Fei
328fd9081e
Merge remote-tracking branch 'origin/master' into remove-package-check
2018-07-10 14:57:46 +02:00
Lipu Fei
cc5f35dd91
Rename some functions and variables
2018-07-10 14:57:01 +02:00
Jack Ha
e7c1d31bee
Fixed change material diameter, changed signature of getContainerMetaDataEntry. CURA-5408
2018-07-10 13:14:11 +02:00
Lipu Fei
e5a11c1f7b
Fix getContainerMetaDataEntry()
...
CURA-5408
2018-07-09 15:12:53 +02:00
Ghostkeeper
588991660e
Merge branch 'CURA-5548_fix_sync_button_for_downloaded_materials'
2018-07-09 14:39:04 +02:00
Jack Ha
513bd4f84a
Renamed packageContainerIds to getPackageContainerIds. CURA-5389
2018-07-09 14:36:38 +02:00
Aleksei S
77bd6cf749
Read material weight from container
...
CURA-5408
2018-07-09 14:20:51 +02:00
Ian Paschal
881449d380
Do not sync only with read_only material groups
...
Fixes CURA-5548.
2018-07-09 14:12:54 +02:00
Jack Ha
111a3556d2
Fixed possible errors and typing error. CURA-5389
2018-07-09 11:42:30 +02:00
Jack Ha
bff9a3afb5
Merge branch 'master' into remove-package-check
2018-07-09 11:25:19 +02:00
Jack Ha
5af5aa9e35
Added reset profiles/materials and uninstall functionality and dialog. CURA-5389
2018-07-09 09:57:31 +02:00
Mark
4157cffdbd
Merge branch 'master' into fix_use_engine_ready
2018-07-05 13:18:12 +02:00
Diego Prado Gesto
a27ec30575
Merge pull request #4021 from Ultimaker/add_types_for_backup_metadata
...
Add types for backup metadata
2018-07-05 12:33:26 +02:00
Diego Prado Gesto
3d549d0fb0
Merge pull request #4023 from Ultimaker/add_types_volume_dimensions
...
Add types for width, height, depth and shape
2018-07-05 12:29:51 +02:00
Jack Ha
675c5064ed
Added checkPackageUsageAndUninstall and the package usage check. No confirmation dialog yet
2018-07-05 11:47:06 +02:00
Lipu Fei
e87f3d7ca9
Fix plugins import in CuraApplication
...
CURA-5543
Only import types for type checking when TYPE_CHECKING is true.
2018-07-05 10:23:20 +02:00
Ghostkeeper
4f1b2d51cc
Remove old commented code
...
This is not valid any more by a long shot.
2018-07-05 09:45:20 +02:00
Ghostkeeper
2023973e98
Use _engine_ready to detect if there is a QML engine
...
We already have this variable. Let's not use a private variable from another class.
2018-07-04 17:39:24 +02:00
Ghostkeeper
b812989f1c
Add types for width, height, depth and shape
2018-07-04 17:34:26 +02:00
Ghostkeeper
c9480f2f2b
Add types for backup metadata
2018-07-04 17:30:01 +02:00
Diego Prado Gesto
f91b6faecc
Fix code-styling
2018-07-03 17:57:30 +02:00
Diego Prado Gesto
9fa8498162
Fix code-style in MaterialManager
2018-07-03 13:25:39 +02:00
Diego Prado Gesto
8633d75751
Fix error introduced when fixing code-style
2018-07-03 13:14:40 +02:00
Diego Prado Gesto
ff6bc9de4e
Fix some more code-style
2018-07-03 13:09:05 +02:00
Diego Prado Gesto
762a1b1bfd
Fix code-style
2018-07-03 12:06:06 +02:00
alekseisasin
debe142c18
Merge pull request #3914 from Ultimaker/CURA-5334_extruder_def_for_all
...
CURA-5334 Add extruder definitions for all single-extrusion machines
2018-07-02 15:56:45 +02:00
Jack Ha
3761123513
Merge branch 'master' into CURA-5334_extruder_def_for_all
2018-07-02 14:11:24 +02:00
Ian Paschal
680e98fb28
Removed duplicate '.self'
2018-07-02 13:11:01 +02:00
Ian Paschal
8f7370db6c
Merge remote-tracking branch 'origin/master' into feature_send_material_profiles
2018-07-02 12:37:56 +02:00
Diego Prado Gesto
0692192d58
Merge branch '3.4'
2018-07-02 09:10:57 +02:00
Lipu Fei
dc8d9e0f96
Merge branch 'master' into mypy_fixes
2018-06-29 13:45:55 +02:00
Diego Prado Gesto
56c7c6f2b2
CURA-5518 Check whether the the findDefinitionContainers return any
...
element or not.
2018-06-29 10:41:54 +02:00
Ghostkeeper
2b83af2497
Move initialization into Uranium's run() function
...
This makes it possible to start a Uranium-based application without needing to know the magic incantation of starting the application.
2018-06-28 21:41:16 +02:00
Diego Prado Gesto
6737dfac47
Protect against crashes when the temporary file is still in use by
...
another process.
Contributes to CURA-5516.
2018-06-28 16:09:00 +02:00
Diego Prado Gesto
36c25a29a8
CURA-5508 Add protection before reading a file that may not exist.
2018-06-27 11:04:53 +02:00
Aleksei S
c4fa50a8fc
Added icon for custom Menu items
2018-06-25 16:51:40 +02:00
Aleksei S
f577789859
Added extra SettingsModel for a QML
2018-06-23 16:22:33 +02:00
Aleksei S
0906e3f1e7
Store custom Menu items in CuraApplication
2018-06-23 16:16:06 +02:00
Ghostkeeper
e717abf499
Fix typing related to Network Printing
...
Contributes to issue CURA-5330.
2018-06-15 16:53:45 +02:00
Ghostkeeper
a021820031
Fix call to getIdAtPosition
...
I fixed the typing in the wrong way here. Sorry.
Contributes to issue CURA-5330.
2018-06-15 13:34:39 +02:00
Ghostkeeper
7a33a8f212
Always import CuraVersion
...
I don't know why there was this check around it because it is always necessary to start the application.
Contributes to issue CURA-5330.
2018-06-15 13:28:55 +02:00
Ghostkeeper
1789a8f33e
Fix type of SelectionPass
...
Contributes to issue CURA-5330.
2018-06-15 13:20:20 +02:00
Ghostkeeper
fe43219e34
Fix minor type mistakes
...
Contributes to issue CURA-5330.
2018-06-15 13:14:56 +02:00
Ghostkeeper
75e5a185d9
Don't unnecessarily cast to a set
...
The InstanceContainer version of getAllKeys was first casting to a list but I removed that, because everywhere where we were using it we were casting it directly to a set.
Contributes to issue CURA-5330.
2018-06-15 13:07:55 +02:00
