GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 22:58:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,745 Commits 295 Branches 268 Tags
Commit Graph

17745 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
5bf260f524
Don't break binding of is_favorite upon clicking star 
We shouldn't override it here because doing that causes the binding to break. Just remove the favourite and let the model update itself, thus removing the star.

Contributes to issue CURA-6032.
 2018-12-20 14:40:37 +01:00
Ghostkeeper
f3a0b44d5e
Simplify is_favorite condition 
No stupid ternary operators necessary.

Contributes to issue CURA-6032.
 2018-12-20 14:40:29 +01:00
Lipu Fei
346d8d884e Remove unnecessary patches in TestSendMaterialJob 
CURA-6035
 2018-12-20 14:23:39 +01:00
Lipu Fei
e79f312fa0 Fix unit tests for SendMaterialJob 
CURA-6035
 2018-12-20 14:20:34 +01:00
Jaime van Kessel
9ffc039254 Fix logo aliasing 
CURA-6044
 2018-12-20 14:01:12 +01:00
Jaime van Kessel
36efa171c6 Add a bit more logging to the authorization service 2018-12-20 11:31:01 +01:00
Jaime van Kessel
881e98c642 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-20 11:09:32 +01:00
Jaime van Kessel
dc473dc78d Add missing typing for setting visibility preset model 2018-12-20 11:09:02 +01:00
Lipu Fei
68372aff60 Use MaterialManager in SendMaterialJob 
CURA-6035
 2018-12-20 10:45:40 +01:00
Lipu Fei
d93e19d530 Add getAllMaterialGroups() 
CURA-6035
 2018-12-20 10:45:05 +01:00
Remco Burema
481438d419 Merge branch '4.0' of https://github.com/Ultimaker/Cura into 4.0 2018-12-20 09:54:21 +01:00
Remco Burema
a9f4b70b5c Emit 'number of extruders changed' signal after add machine. [CURA-6045] 2018-12-20 09:53:58 +01:00
Jaime van Kessel
8bff0d17e8 Prevent the backend attempting to reslice everytime a preference changed 2018-12-20 09:43:01 +01:00
Remco Burema
9dbc642967 SendMaterials: Make sure the base-material is compared to and make case insensitive. [CURA-6035] 2018-12-19 17:34:31 +01:00
Aleksei S
d891d30ab8 The Cura logo in left top corner is not displayed properly. 
CURA-6044
 2018-12-19 15:51:32 +01:00
Aleksei S
3953c7bb3a Added Tooltip alignment 
CURA-6004
 2018-12-19 14:24:02 +01:00
Jaime van Kessel
d33cb6dfe9 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-19 14:09:32 +01:00
Jaime van Kessel
f2719ef582 Fix identation for postProcessing plugin settings 
CURA-6043
 2018-12-19 14:09:07 +01:00
Ghostkeeper
c0835f3a2f
Code style 
Just something I boyscouted while working on something else.
 2018-12-19 14:02:17 +01:00
Ghostkeeper
a5134001e9
Sort unique printer types 
So that they appear in a consistent order everywhere.
 2018-12-19 14:02:08 +01:00
Jaime van Kessel
9e867f8077 Fix the codestyle and cleanup the QML a bit 
CURA-6043
 2018-12-19 13:53:34 +01:00
Jaime van Kessel
08c736f770 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-19 13:31:06 +01:00
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
Diego Prado Gesto
773190bee1 Fix code style 
Add space between binary operator.

Contributes to CURA-6005.
 2018-12-19 12:53:41 +01:00
Diego Prado Gesto
acabd06542 Change the large_nonbold to large in one remaining component 
Contributes to CURA-6025.
 2018-12-19 12:32:18 +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
Diego Prado Gesto
ef2fb53790 Merge branch '4.0' into unify_font_types 2018-12-19 11:56:22 +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
Diego Prado Gesto
382286509f Change the buildplate information to use a reusable component 
Boy scouting.

Contributes to CURA-6025.
 2018-12-19 09:49:12 +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
Diego Prado Gesto
8206fde223 Remove the non-load-only-when-testing check 
Contributes to CURA-6005.
 2018-12-18 16:24:13 +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
Diego Prado Gesto
8e78582b61 Add correct copyright and license header to all the files in the plugin 
Contributes to CURA-6005.
 2018-12-18 16:17:37 +01:00
Diego Prado Gesto
da69c16e09 Split the constants in to files, indicating which constants each file 
stores.

Contributes to CURA-6005.
 2018-12-18 16:14:13 +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