GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-08 11:19:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,299 Commits 290 Branches 260 Tags
Commit Graph

410 Commits

Author SHA1 Message Date
Jaime van Kessel
c7c57c167c Fix call to non-existing function 2019-02-06 12:37:30 +01:00
Jaime van Kessel
b6f5dd8f94 Fix display of long names in sync configuration menu 2019-02-05 13:31:50 +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
Remco Burema
954fdb20ad Rename 'connect_group_name' to 'group_name'. [CURA-6153] 2019-01-31 20:21:42 +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
fieldOfView
c81689d233 Prevent a recurring qml warning 
Note that the connect_group metadata is also queried for non-connected printers; the model is not filtered, but non-connected printers are set to be invisible.
 2019-01-11 17:40:36 +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
fd9b29fee2 Rename printersModel to GlobalStacksModel 
This is a better description for the model anyway.

CURA-6011
 2018-12-31 11:09:39 +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
Jaime van Kessel
c08339e191 Merge branch 'CURA-6033_unknown_material' of github.com:Ultimaker/Cura into 4.0 2018-12-31 10:33:01 +01:00
Ghostkeeper
b54312fb9b
Merge branch '4.0' into unify_font_types 2018-12-28 15:51:54 +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
Jaime van Kessel
81e356ea1b Switch out the containersModel for the more specific printersModel 2018-12-21 11:20:09 +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
Ghostkeeper
c0835f3a2f
Code style 
Just something I boyscouted while working on something else.
 2018-12-19 14:02:17 +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
Ghostkeeper
78a5f95c43
Merge branch 'CURA-5876_fixes' into 4.0 2018-12-14 16:28:04 +01:00
Jaime van Kessel
8091b2810c
Apply suggestions from code review 
Change some margins for the corresponding absolute values instead of adding formulas.

Contributes to CURA-5876.

Co-Authored-By: diegopradogesto <d.pradogesto@ultimaker.com>
 2018-12-13 14:36:58 +01:00
Lipu Fei
620790ae3d Reduce the creations of ExtrudersModels 
CURA-6015
 2018-12-13 14:12:23 +01:00
Diego Prado Gesto
77ede1ae6b Unify the fonts to only have 8 instead of 13. 
Contributes to CURA-6025.
 2018-12-12 17:50:21 +01:00
Diego Prado Gesto
f38f140430 Merge branch '4.0' into CURA-5876_fixes 2018-12-12 17:06:59 +01:00
Diego Prado Gesto
17173aba06 Add a component to show when no configurations are available because lack of connection. 
Contributes to CURA-5876.
 2018-12-12 17:04:17 +01:00
Diego Prado Gesto
1d3da3244f Remember the previous selected method in the configuration 
The current behavior now is to open the configuration panel in the previous state, in case it was manually selected. That means that after selecting a printer, the manual state is reset so it will open the auto configuration if it is a connected printer. It will open the custom state in case it's not connected or the printer has no connection.

Contributes to CURA-5876.
 2018-12-12 14:09:15 +01:00
Diego Prado Gesto
4ba448077e Add an empty state, when there are no configurations, showing a label indicating that the list is empty 
Contributes to CURA-5876.
 2018-12-12 13:33:46 +01:00
Diego Prado Gesto
a6a16a682d Fix some alignments 
Also modify a bit the code in the ConfigurationItem, trying to get rid of a binding loop, but I couldn't (so weird)

Contributes to CURA-5876.
 2018-12-12 11:17:44 +01:00
Remco Burema
1b2ef91c13 Merge branch 'CURA-6016_Improve_UI_Speed' into 4.0 2018-12-12 10:54:36 +01:00
Diego Prado Gesto
ed8292c472 Adjust size and margins of the icon in the action button 
Contributes to CURA-5876.
 2018-12-11 17:00:02 +01:00