alekseisasin
59f38c66a0
Merge pull request #4936 from Ultimaker/CURA-5867_scale_tool
...
CURA-5867 Fix: if load a model and scale it up to 0.1mm and then load another m…
2018-12-18 15:59:53 +01:00
Aleksei S
1ac5403c21
Remove extruder tabs from tabView
...
CURA-6036
2018-12-18 15:52:26 +01:00
Ghostkeeper
874646a80e
Merge branch '4.0' into add_comment_prime_tower
2018-12-18 15:44:27 +01:00
ChrisTerBeke
25caf1a087
Fix merge conflicts
2018-12-18 14:44:13 +01:00
Ghostkeeper
c526ca3900
Merge branch '4.0'
2018-12-18 13:58:58 +01:00
Ghostkeeper
279812e4ff
Round width of buttons
...
They were getting rendered a bit weird if your pixel scale was not an integer (for me it's 1.25).
2018-12-18 13:58:21 +01:00
Jaime van Kessel
a181ffe79d
Merge branch 'fix_print_monitor_dark_theme' of https://github.com/fieldOfView/Cura into 4.0
2018-12-18 13:54:45 +01:00
Lipu Fei
e885b52737
Add time prime tower into Cura.proto
2018-12-18 13:42:23 +01:00
Lipu Fei
71e71e0a4f
Merge pull request #4975 from Ultimaker/CURA-6011_connection_types
...
[4.0] Every output device should define its connection type
2018-12-18 13:23:02 +01:00
Ian Paschal
627c647fbc
Center navigation dots
...
Contributes to CL-1151
2018-12-18 13:17:25 +01:00
Jaime van Kessel
9b6e52a5be
Make monitor item background themable
2018-12-18 13:08:18 +01:00
Lipu Fei
bf5559167e
Merge pull request #5015 from Ultimaker/CURA-5994_umop_firmware_update
...
[4.0] CURA-5994 Cura used wrong firmware version for UMO+. The firmware was from UMO.
2018-12-18 11:33:40 +01:00
Lipu Fei
dff9a3dfb2
Fix None problem in project loading
2018-12-18 10:52:11 +01:00
Diego Prado Gesto
cc462ef3a6
Add a placeholder for a pattern in the header, if the theme wants to add one.
2018-12-18 10:29:44 +01:00
Jaime van Kessel
be9d35d45f
Fix some minor layout issues
...
CURA-6011
2018-12-18 09:47:51 +01:00
Jaime van Kessel
aa0c8c75ee
Add a sane default to connection type
...
CURA-6011
2018-12-18 09:45:26 +01:00
Jaime van Kessel
d4bb50886f
Merge branch 'CURA-6011_connection_types' of github.com:Ultimaker/Cura into CURA-6011_connection_types
2018-12-18 09:40:20 +01:00
Jaime van Kessel
84a7f2e5a2
Fix review comments
...
CURA-6011
2018-12-18 09:40:08 +01:00
Diego Prado Gesto
fa268184be
Merge pull request #5011 from Ultimaker/CURA-6028_fix_quality_slidebar
...
[4.0] CURA-6028 Fix quality slidebar
2018-12-18 09:37:09 +01:00
Lipu Fei
9f52a52ea3
Fix ExtruderModel reference in machine settings dialog
2018-12-18 09:32:26 +01:00
Lipu Fei
6017c2b4d2
Replace isProfileUserCreated with hasCustomQuality
...
CURA-6028
2018-12-18 08:56:56 +01:00
Diego Prado Gesto
3c99b69724
Merge branch '4.0' into CURA-6005_cura_drive_plugin
...
Remove unused file.
Contributes to CURA-6005.
2018-12-18 07:17:37 +01:00
ChrisTerBeke
b2f32f81e4
Merge branch '4.0' into STAR-322_cloud-connection
2018-12-17 18:23:55 +01:00
Diego Prado Gesto
08458df873
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2018-12-17 17:56:22 +01:00
Diego Prado Gesto
62d20ac773
Change the base color of the tooltips to align with the designs
...
Contributes to CURA-6004.
2018-12-17 17:55:40 +01:00
Jaime van Kessel
d395c38436
Removed collapse / expand all
...
I don't think it ever worked.
2018-12-17 17:47:33 +01:00
ChrisTerBeke
74bec96ce8
Fix a relative import
2018-12-17 17:41:02 +01:00
ChrisTerBeke
12866c107b
Fix again
2018-12-17 17:39:48 +01:00
ChrisTerBeke
c75fa5de3d
Fix merge conflict
2018-12-17 17:39:30 +01:00
fieldOfView
7d6e698f43
Fix (USB) print monitor in dark theme
2018-12-17 17:37:21 +01:00
Jaime van Kessel
3f7c922734
Add missing type for g-code reader
2018-12-17 17:37:12 +01:00
Jaime van Kessel
a7c1a45d44
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2018-12-17 17:32:31 +01:00
Jaime van Kessel
0e294481ff
Improve readability of printer_type_label for dark theme
2018-12-17 17:32:11 +01:00
Diego Prado Gesto
62ac10d112
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2018-12-17 17:30:20 +01:00
Diego Prado Gesto
d6212d5a39
Add elide in the showcase title and reduce the height a bit so there are
...
only 2 lines for the title.
2018-12-17 17:29:24 +01:00
Ian Paschal
aed0bb27f2
Merge pull request #4995 from Ultimaker/CL-1151_add_monitor_carousel
...
CL-1152 Add monitor carousel
2018-12-17 17:05:50 +01:00
Ian Paschal
5c697ab5be
Make hints clickable
...
Contributes to CL-1151
2018-12-17 16:58:51 +01:00
alekseisasin
4d135c13bb
Cura used wrong firmware version for UMO+. The firmware was from UMO.
...
The reason of this issue because it used a heated firmware from his
parent(UMO) printer. To avoid this case we need to define externally
the firmware_hbk_file property in umo+ defintion file
CURA-5994
2018-12-17 16:46:02 +01:00
ChrisTerBeke
70421e5ac5
Merge branch '4.0' into STAR-322_cloud-connection
2018-12-17 15:46:28 +01:00
Diego Prado Gesto
b5d8db6a77
Merge branch '4.0' into CURA-6011_connection_types
2018-12-17 15:44:02 +01:00
Lipu Fei
1440c7d996
Merge pull request #5005 from Ultimaker/sdk_version_6
...
Increment API version to 6
2018-12-17 15:43:09 +01:00
ChrisTerBeke
ab85e4794b
Merge pull request #4994 from Ultimaker/STAR-322_cloud-connection-multipart-upload
...
STAR-322: Cloud connection resumable upload
2018-12-17 15:29:56 +01:00
Jaime van Kessel
06d9fd9dbe
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2018-12-17 15:26:36 +01:00
Jaime van Kessel
1352193654
Ensure that the sourceSize is set correctly
2018-12-17 15:26:10 +01:00
Jaime van Kessel
53da111617
Change "Rating" to "Your rating"
2018-12-17 15:21:48 +01:00
Daniel Schiavini
c5f438819a
STAR-322: Improving documentation
2018-12-17 15:11:01 +01:00
Daniel Schiavini
d28ac5e120
STAR-322: Improving documentation
2018-12-17 14:57:57 +01:00
Daniel Schiavini
da974d9868
STAR-322: Improving documentation
2018-12-17 14:51:57 +01:00
Daniel Schiavini
42ae9faeb4
STAR-322: Reverting change to run mypy
2018-12-17 14:42:16 +01:00
Daniel Schiavini
75d7d49349
STAR-322: Mocking the CuraApp
2018-12-17 14:41:28 +01:00
