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

436 Commits

Author SHA1 Message Date
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
Diego Prado Gesto
f99c788eb6 Change some colors for the arrows in some setting selectors 
Contributes to CURA-5876.
 2018-12-11 16:35:59 +01:00
Diego Prado Gesto
b993a7b0d9 Change the header color and font in the configuration popup 
Also fix some alignments with the printer type selector.

Contributes to CURA-5876.
 2018-12-11 16:05:24 +01:00
Jaime van Kessel
909f36d28e Let the settingsMenu use the extruders of the active machine instead of the extruderModel 
The extruder model gets updated way to much (for all material changes) but we only need the
number and names of the extruders, since the other menu's do this by themselves
 2018-12-11 09:24:22 +01:00
Diego Prado Gesto
1cd0d26db4 Change margins 
Instead of using multiplications and divisions, just use the corresponding margins.

Contributes to CURA-5876.
 2018-12-10 15:34:48 +01:00
Ghostkeeper
6a7bbe5bdb
Fix hiding materials if material is empty 
Because the loaded material profile has the name 'Empty' then.

Contributes to issue CURA-5876.
 2018-12-07 15:31:12 +01:00
Ghostkeeper
ffcac04f9e
Add printer type selector if connected to cluster 
If there are 2 or more printer types in your connected cluster, you can switch the printer type here.

Contributes to issue CURA-5876.
 2018-12-07 15:21:53 +01:00
Ghostkeeper
8e2c130416
Use default lining style as separator for buildplate 
Normal colour, normal thickness.

Contributes to issue CURA-5876.
 2018-12-07 14:31:06 +01:00
Ghostkeeper
43a06fdc3d
Add more margin above printer type labels 
A bit of Gestalt.

Contributes to issue CURA-5876.
 2018-12-07 13:49:32 +01:00
Ghostkeeper
e74258c26b
Don't show materials if printer has no materials 
But if the printer does have other configurations to change, do show a placeholder text to indicate that the configuration can be selected here.
This also simplifies a bit of code where it would need to call an updateEnabled() function, since it turns out that these properties in Cura.MachineManager have proper signals (contrary to what was previously used, the metadata entry stuff).

Contributes to issue UCRA-5876.
 2018-12-07 13:40:10 +01:00
Ghostkeeper
2593849798
Merge branch 'ui_rework_4_0' of ssh://github.com/Ultimaker/Cura into ui_rework_4_0 2018-12-07 13:04:13 +01:00
Ghostkeeper
dfe55b8f23
Fix height of expandable component adapting to contents 
Since the children don't adjust their height based on if they are visible (which would cause a binding loop) we just need to adjust the height of the total menu based on which children are visible. Easy enough.

Contributes to issue CURA-5876.
 2018-12-07 12:59:51 +01:00
Diego Prado Gesto
1d33fe081f Clean up the code 
Remove all the references to the sidebar and use the term print_setup instead.

Contributes to CURA-5941.
 2018-12-07 12:07:41 +01:00
Lipu Fei
677edd51ee Remove unnecessary visibles 
CURA-5941

Because the parent Rows already have it set.
 2018-12-07 10:55:22 +01:00
Diego Prado Gesto
3b8b70bddf Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-06 16:35:07 +01:00
Ghostkeeper
c39674cd0c
Use upper camel case for enum options 
Contributes to issue CURA-5876.
 2018-12-06 16:23:24 +01:00
Diego Prado Gesto
05075c44ee Add renderType to some labels in the Configuration panel 
Contributes to CURA-5876.
 2018-12-06 14:19:34 +01:00
Lipu Fei
85f2a7e8f6 Move visible to Rows for extruder configs 
CURA-5941

So the whole row, such as "material", will be shown/hiden based on
whether the machine has materials.
 2018-12-06 14:06:18 +01:00
Ghostkeeper
298c68c93b
Disable configuration menu if there are no configurations 
This then prevents you from dropping down into an empty menu.

Contributes to issue CURA-5876.
 2018-12-06 13:56:06 +01:00
Ghostkeeper
1e69960464
Make it possible to disable ExpandableComponent 
It won't show the drop-down icon then, won't do hovers and won't allow you to click on it. This will not remove the contents of the ExpandableComponent menu bar item though, so that has to be done in ConfigurationMenu.qml.

Contributes to issue CURA-5876.
 2018-12-06 13:52:57 +01:00
Ghostkeeper
f1fec2f280
Theme the scroll bar 
We need to make this a reusable component at some point, I think. This is the first time we're using the QtQuick2 version of ScrollView.

Contributes to issue CURA-5876.
 2018-12-06 12:07:03 +01:00
Ghostkeeper
48e15daf64
Fix height of scroll view and make scrollable 
Contributes to issue CURA-5876.
 2018-12-06 11:16:42 +01:00
Lipu Fei
109586f69c Merge remote-tracking branch 'origin/ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-06 11:09:26 +01:00
Ghostkeeper
5ba8820f18
Remove unnecessary setting height to 0 when invisible 
Turns out that it doesn't count for the childrenRect.height anyway when the item is invisible.

Contributes to issue CURA-5876.
 2018-12-05 14:10:51 +01:00
Diego Prado Gesto
07d58c3aef Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:56:21 +01:00