Jaime van Kessel
9acaf9abd7
Disable dropping of files into cura when monitor stage is active.
...
CURA-6038
2018-12-19 13:30:25 +01:00
Simon Edwards
94ad0a81a2
Merge pull request #5018 from Ultimaker/add_keyboard_navigation_for_printer_carousel
...
Add keyboard navigation for printer carousel
2018-12-19 12:01:51 +01:00
Ghostkeeper
56d0a52fac
Documentation and code style
2018-12-19 11:51:46 +01:00
Ian Paschal
142ac56d78
Add keyboard navigation for printer carousel
2018-12-19 11:26:38 +01:00
Ghostkeeper
f1c28498a6
Display 0 if there are no measurements for minimum values
...
Don't display max float then.
2018-12-19 11:00:00 +01:00
Ghostkeeper
de8106eb95
Merge branch '4.0' of ssh://github.com/Ultimaker/Cura into 4.0
2018-12-19 09:41:52 +01:00
Ghostkeeper
75d1d563ba
Merge branch 'fix_machine_settings_dialog' into 4.0
2018-12-19 09:41:43 +01:00
Diego Prado Gesto
6987d5ff78
Add a radius to the printer type label
2018-12-19 09:33:46 +01:00
Diego Prado Gesto
17cddac024
Merge branch '4.0' into CURA-6004_missing_tooltips
2018-12-19 09:03:31 +01:00
Ghostkeeper
66ed9ed201
Remove optimisation that broke updates of models upon metadata change
...
If the metadata changed, such as whether a material was favourite or not, then the materials models were not updating any more because the actual list of available materials was still the same.
I've removed this optimisation and tested performance locally. It seems to be slightly slower (though that might be placebo or measurement error). However most of the performance boost of cura-6016 was resulting from different changes there so the interface still seems to be quite a lot faster than what it used to be.
Contributes to issue CURA-6032.
2018-12-18 16:52:04 +01:00
Ghostkeeper
c0c45519a0
Change another useless rectangle into an item
...
It's more efficient to render. Also changed some code style.
Contributes to issue CURA-6032.
2018-12-18 16:49:41 +01:00
Aleksei S
7cf1df7435
Remove back Cura.ExtrudersModel{}, because if retrieve the model from backend
...
the tabs cannot be removed after model update. The QML bug
CURA-6036
2018-12-18 16:19:21 +01:00
Ghostkeeper
c66257bf4d
Use item instead of transparent rectangle
...
This is faster to render.
Contributes to issue CURA-6032.
2018-12-18 16:18:01 +01:00
Ghostkeeper
1b11164340
Remove unused import and add documentation
2018-12-18 16:09:19 +01:00
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
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
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
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
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
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
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
Ian Paschal
cb6e4ff2d1
Organize MonitorStage.qml better
2018-12-17 14:05:28 +01:00
Jaime van Kessel
aad7540366
Fix situation where multiple connect configurations would cause issues
...
CURA-6011
2018-12-17 13:31:38 +01:00