Ghostkeeper
96896088c3
Add spaces around equals operators
...
As per our code style regulations.
2018-07-05 16:27:52 +02:00
Diego Prado Gesto
87261b2754
Merge pull request #4020 from Ultimaker/add_test_versionupgrade_version
...
Add test for the version number being incremented
2018-07-05 15:36:15 +02:00
Diego Prado Gesto
c0985bec2a
Add the data to the tests.
2018-07-05 15:32:43 +02:00
Ghostkeeper
7b284355fb
Revert "Fix code-style in CuraEngineBackend"
...
This reverts commit 7d7a51d772
2018-07-05 15:24:55 +02:00
Lipu Fei
b0f1a6d859
Use Label delegate to avoid overlapping texts
...
CURA-5544
2018-07-05 14:36:41 +02:00
Diego Prado Gesto
ab339e7784
Merge pull request #4024 from Ultimaker/fix_use_engine_ready
...
Use _engine_ready to detect if there is a QML engine
2018-07-05 13:57:53 +02:00
Mark
4157cffdbd
Merge branch 'master' into fix_use_engine_ready
2018-07-05 13:18:12 +02:00
Andreea Scorojitu
87fd4c9e70
Add color to text in toolboxFooter, CURA-5544
...
"You will need to restart Cura before changes in packages have effect." wasn't visible in Ultimaker darktheme, color has been added to the label, CURA-5544.
2018-07-05 12:44:11 +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
Diego Prado Gesto
20a9d8568f
Merge branch 'master' of github.com:Ultimaker/Cura
2018-07-05 12:09:32 +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
Mark
20180e3804
Merge pull request #4022 from Ultimaker/remove_id_raise3d
...
Remove ID from Raise3D definition
2018-07-05 09:44:42 +02:00
Diego Prado Gesto
7d7a51d772
Fix code-style in CuraEngineBackend
2018-07-05 08:04:19 +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
9e18bb8b4c
Remove ID from Raise3D definition
...
These IDs are not used and should never be added again.
2018-07-04 17:31:58 +02:00
Ghostkeeper
c9480f2f2b
Add types for backup metadata
2018-07-04 17:30:01 +02:00
Diego Prado Gesto
efb9fcb645
Merge branch '3.4'
2018-07-04 17:28:08 +02:00
Diego Prado Gesto
ed882b917e
Merge branch 'check_before_install_packages' into 3.4
2018-07-04 17:20:03 +02:00
Ghostkeeper
b149ef57fd
Add test for the version number being incremented
2018-07-04 17:18:01 +02:00
Diego Prado Gesto
d7c1767a23
Merge branch '3.4' into check_before_install_packages
2018-07-04 17:12:46 +02:00
Diego Prado Gesto
8e9ded98e4
Merge branch '3.4'
2018-07-04 14:57:43 +02:00
Lipu Fei
2b5700e4e1
Check the package file before installing it
...
Make sure that the package file is there before we remove the existing
installed files.
2018-07-04 14:50:32 +02:00
Diego Prado Gesto
4fd4043706
CURA-5528 Make the variable remove_failures a set.
2018-07-04 14:39:01 +02:00
Diego Prado Gesto
3b406b5467
Merge branch 'master' of github.com:Ultimaker/Cura
2018-07-04 14:32:05 +02:00
Diego Prado Gesto
4722b5387b
CURA-5334 Add extruder definition for Wanhao printers, Uni Print 3d and
...
Tevo Tornado. Those definitions were added without extruder definitions.
2018-07-04 14:22:22 +02:00
Ian Paschal
d4aaec7355
CURA-5537 Style improvements
2018-07-04 12:51:01 +02:00
Diego Prado Gesto
5b251fc6dc
CURA-5334 Remove machine nozzle size from machine definitions and move
...
it to extruder definitions.
2018-07-04 12:00:38 +02:00
Ian Paschal
7d30cee205
Revert "Add dummy details for when there is no selection"
...
This reverts commit 2e3528d9b2
2018-07-04 11:36:56 +02:00
Diego Prado Gesto
715eda4f59
Merge branch 'master' of github.com:Ultimaker/Cura
2018-07-03 17:57:45 +02:00
Diego Prado Gesto
f91b6faecc
Fix code-styling
2018-07-03 17:57:30 +02:00
Lipu Fei
5f2cbd4440
Merge pull request #4015 from Ultimaker/CURA-5537_toolbox_style_improvements
...
CURA-5537 improve styling of toolbox
2018-07-03 16:05:51 +02:00
Lipu Fei
2e3528d9b2
Add dummy details for when there is no selection
...
CURA-5521
2018-07-03 15:58:54 +02:00
Ian Paschal
bc05839940
CURA-5537 improve styling of toolbox
2018-07-03 15:54:20 +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
ae7875a756
Revert changes in run_mypy script by mistake
2018-07-03 12:09:01 +02:00
Diego Prado Gesto
7714515204
Merge branch 'master' of github.com:Ultimaker/Cura
2018-07-03 12:06:23 +02:00
Diego Prado Gesto
762a1b1bfd
Fix code-style
2018-07-03 12:06:06 +02:00
Lipu Fei
293b803dd3
Fix preferences upgrade in 3.4 to 4.0
2018-07-03 10:40:57 +02:00
Diego Prado Gesto
e983a9a9e7
Merge branch 'master' of github.com:Ultimaker/Cura
2018-07-03 10:40:00 +02:00
Diego Prado Gesto
3c57068cf4
CURA-5034 Fix a typo in the method call.
2018-07-03 10:38:44 +02:00
Aleksei S
47300eabe7
Merge branch 'master' of github.com:Ultimaker/Cura
2018-07-03 10:24:17 +02:00
Aleksei S
7b63dc7b10
Changed machine and extruder_train version in VersionUpgrade 34to40
2018-07-03 10:17:42 +02:00
Mark
1f51d83fa7
Merge pull request #3982 from fieldOfView/fix_dark_theme_artefact
...
Fix a bright line/gap between the viewport and sidebar due to rounding
2018-07-02 16:50:56 +02:00
Mark
f3d92ecdbf
Merge pull request #3986 from fieldOfView/fix_always_ask
...
Clarify Profile Override preference options
2018-07-02 16:43:20 +02:00
Mark
c0e97b9529
Merge branch '3.4'
2018-07-02 16:37:04 +02:00
