GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 07:14:24 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,636 Commits 288 Branches 260 Tags
Commit Graph

219 Commits

Author SHA1 Message Date
Jaime van Kessel
a0c705e900 Remove usage of some deprecated functions 2019-05-16 14:49:53 +02:00
Jaime van Kessel
c786770a44 Remove usage of deprecated functions 2019-05-03 13:52:45 +02:00
Jaime van Kessel
d42f446d70 Remove usages of deprecated function 2019-05-03 13:17:10 +02:00
Remco Burema
55dcf31e3c Fix QML binding loop warnings for CustomConfiguration. 2019-04-11 16:24:51 +02:00
Diego Prado Gesto
9594545f2c Remove the link to show the compatibility chart 
Actually it only made sense for ultimaker materials. Now that we can include instruction link in every materials, a specific link for every material can be used instead.

Contributes to CURA-6423.
 2019-04-04 14:46:20 +02:00
Lipu Fei
4d3211e651 Merge remote-tracking branch 'origin/4.0' 2019-02-22 13:38:29 +01:00
Lipu Fei
2694ef98e0
Merge pull request #5338 from Ultimaker/CURA-6232_config_menu_tab_fix 
Fix tab-bar of config.-menu always on idex 0 on reshow. [CURA-6232]
 2019-02-22 13:37:10 +01:00
Jaime van Kessel
dd59b9167b Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-22 11:37:58 +01:00
Jaime van Kessel
7221b23457 Add a property to temporarily disable the material models from updating. 
This allows the QMl to stop the updating when it's not even visible
 2019-02-21 20:50:44 +01:00
Jaime van Kessel
41f2a0e222 Add a property to temporarily disable the material models from updating. 
This allows the QMl to stop the updating when it's not even visible
 2019-02-21 20:47:38 +01:00
Jaime van Kessel
dee739db8b Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-21 20:19:30 +01:00
Jaime van Kessel
d9c4edf093 Prevent a few expensive conversions from happening in the QML 2019-02-21 16:36:14 +01:00
Remco Burema
b4e4b7125d Fix tab-bar of config.-menu always on idex 0 on reshow. [CURA-6232] 2019-02-20 13:27:05 +01:00
Remco Burema
a392f50a67 Small fix for glue-warning height in Ext.-config. 2019-02-14 11:21:01 +01:00
Jaime van Kessel
5c94a8223d Added button that is shown when instruction_link is set in the profile 
CURA-5916
 2019-02-07 16:08:50 +01:00
Jaime van Kessel
c15089cd59 Some minor cleanup of the QML 
CURA-5916
 2019-02-07 14:13:00 +01:00
Jaime van Kessel
575f323ea1 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-06 13:07:09 +01:00
Jaime van Kessel
b6f5dd8f94 Fix display of long names in sync configuration menu 2019-02-05 13:31:50 +01:00
Ghostkeeper
ae5d548f02
Merge branch '4.0' 2019-02-04 16:19:14 +01:00
Ghostkeeper
185e9cc726
Fix font size of buildplate warning 
This was most likely copied from an old release but the font in question was deleted.
 2019-02-04 15:24:59 +01:00
Ghostkeeper
61475a79cf
Fix font size of buildplate warning 
This was most likely copied from an old release but the font in question was deleted.
 2019-02-04 15:23:57 +01:00
Ghostkeeper
430be551d3
Fix link to properties of row 
This fixes a QML warning and probably fixes the visibility of these elements.
 2019-01-30 12:59:27 +01:00
Lipu Fei
e2e856a5cd Add adhesion warning message back 
CURA-6070
 2019-01-28 14:41:57 +01:00
Diego Prado Gesto
551111bd60 Close the configuration panel when the user syncs with a configuration 2019-01-23 11:24:28 +01:00
Lipu Fei
9bc748ffa1 Fix scrolling with configurations 
CURA-6125
 2019-01-22 11:48:41 +01:00
Jaime van Kessel
12a120f044 Slightly modify the variant label to match more with the monitor tab 
CURA-6100
 2019-01-17 14:21:11 +01:00
Jaime van Kessel
0ce0228f76 Merge branch 'feature_configuration_menu_variant' of https://github.com/fieldOfView/Cura into 4.0 2019-01-17 14:03:43 +01:00
fieldOfView
f8bfca6079 Don't show auto configuration selection when there are no configurations 2019-01-11 18:27:44 +01:00
Diego Prado Gesto
e706020639 Improve the text when there is no configuration available 
It can happen that the list is empty because the data is still coming or because the connection has been lost.

There are also some improvements in the link to the compatibility chart. Now the two external links in Cura have the same behaviour.

Contributes to CURA-6011.
 2019-01-11 14:44:49 +01:00
Jaime van Kessel
614b1000fd Added missing material compatibility chart link 
CURA-6090
 2019-01-10 15:36:36 +01:00
fieldOfView
f1d01e733d Add variant to the configuration menu headerItem 2019-01-03 16:34:05 +01:00
Lipu Fei
d97b812ccd
Merge branch '4.0' into unify_font_types 2019-01-03 10:46:49 +01:00
Ghostkeeper
9e0a423f28
Disable visibility of glass buildplate configuration in sync menu 
Because the build plate swapping is not implemented yet.
 2019-01-02 13:30:29 +01:00
Jaime van Kessel
df23097a99 Changed the label for when no remote configurations are loaded yet 2019-01-02 11:36:07 +01:00
Ghostkeeper
60a5438db6
Make expandable component header fonts larger 
As per the design.

Contributes to issue CURA-6025.
 2018-12-31 13:43:31 +01:00
Ghostkeeper
8d8133d521
Make synced material name larger than the rest 
In accordance with the designs.

Contributes to issue CURA-6025.
 2018-12-31 13:34:57 +01:00
Ghostkeeper
c6fb0d70af
Use medium font size for everything in stage menu 
Except the material manufacturer, which should remain default.

Contributes to issue CURA-6025.
 2018-12-31 13:22:53 +01:00
Jaime van Kessel
a16e406507 Properly display the full type + brand of unknown material 
CURA-6033
 2018-12-31 11:01:30 +01:00
Ghostkeeper
2277a3d316
Prevent syncing with invalid configurations 
Contributes to issue CURA-6033.
 2018-12-21 16:43:45 +01:00
Ghostkeeper
a720cca5b6
Fix background colour for dark theme 
The default colour for Rectangle is white. So this Rectangle, not defining a colour, became white. Instead we should use an Item, which cannot have a background colour and thus becomes transparent, making the background colour the same as the button below, which was intended. It's also slightly faster to render.

Contributes to issue CURA-6033.
 2018-12-21 16:40:24 +01:00
Ghostkeeper
5e98544541
Don't change the model depending on isValidMaterial 
That would cause a circular dependency in a way.

Contributes to issue CURA-6033.
 2018-12-21 16:33:16 +01:00
Ghostkeeper
e8ea742cf6
Retain binding with isValidMaterial on hover 
So that if a material becomes valid, it updates this property.

Contributes to issue CURA-6033.
 2018-12-21 16:27:38 +01:00
Aleksei S
c8994102da Use short for each javascript function 
CURA-6033
 2018-12-21 14:44:25 +01:00
Aleksei S
01783e7f68 Check material name instead of material brand 
CURA-6033
 2018-12-21 13:54:01 +01:00
Aleksei S
9430c421eb Code refactor 
CURA-6033
 2018-12-20 18:19:59 +01:00
Aleksei S
7cfb29e337 If a connected printer has a selected material which is unknown 
for Cura then show a message for  downloading it from Marketplace
CURA-6033
 2018-12-20 18:12:40 +01:00
Diego Prado Gesto
ef2fb53790 Merge branch '4.0' into unify_font_types 2018-12-19 11:56:22 +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
Diego Prado Gesto
b5d8db6a77 Merge branch '4.0' into CURA-6011_connection_types 2018-12-17 15:44:02 +01:00
Jaime van Kessel
938287095f Use connection type instead of um_network_key to see if a printer has a network connection 
CURA-6011
 2018-12-17 10:47:14 +01:00