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

46 Commits

Author SHA1 Message Date
Ghostkeeper
c79ffab9fb
Merge branch '4.0' 2019-03-18 11:24:23 +01:00
Jaime van Kessel
8b3290fb1e Prevent the deletion of materials that are still active 2019-03-14 10:50:53 +01:00
Satish
c98a73f8fd Added id's to printer button, installed plugins, material fields and profile tab for integration tests 2019-03-01 12:47:29 +01:00
Jaime van Kessel
a51289d7ce Merge branch 'not_activate_when_no_materials' of github.com:Ultimaker/Cura 2019-01-18 11:19:28 +01:00
Remco Burema
f057c9a7df Prevent spurious updates to 'onPreferenceChanged's if the preference doesn't match. 2019-01-15 17:15:12 +01:00
Ghostkeeper
b54312fb9b
Merge branch '4.0' into unify_font_types 2018-12-28 15:51:54 +01:00
Ghostkeeper
abe684c1bd
Use Item instead of rectangle without defined colour 
Item should be faster to render.

Contributes to issue CURA-6056.
 2018-12-27 13:36:17 +01:00
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
Diego Prado Gesto
ef2fb53790 Merge branch '4.0' into unify_font_types 2018-12-19 11:56:22 +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
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
77ede1ae6b Unify the fonts to only have 8 instead of 13. 
Contributes to CURA-6025.
 2018-12-12 17:50:21 +01:00
Ghostkeeper
4d87c46423
Remove sourceSize.width: width from all RecolorImages 
It is now the default in Uranium.

Contributes to issue CURA-5876.
 2018-12-04 15:04:51 +01:00
Ghostkeeper
f3af5a72ad
Use ListModel.count instead of rowCount 
The .count property properly updates when the model is changed.

Contributes to issue CURA-5876.
 2018-12-03 11:13:26 +01:00
Diego Prado Gesto
fa39ba9132 Fix typo. Remove parenthesis. 2018-11-19 16:37:12 +01:00
Diego Prado Gesto
df38e7db85 Do not allow the user to activate a material if the printer is not 
defined to have materials.

Contributes to #4550.
 2018-11-19 16:31:15 +01:00
Jaime van Kessel
d1a51b26f7 Simplified QML expression 2018-10-08 17:22:04 +02:00
Aleksei S
51e7b6c388 Change font style for active material in preferences 
CURA-5747
 2018-10-03 10:30:48 +02:00
Lipu Fei
8837ffc06d Fix mateial management QML reference 
CURA-5682
 2018-09-25 11:52:53 +02:00
Aleksei S
b44fb7ca24 Select correct material according to the active extruder 
CURA-5682
 2018-09-21 17:35:46 +02:00
Aleksei S
86d8f8517d In material page was not defined the used extruder nr, for generic materials 
CURA-5682
 2018-09-21 13:48:46 +02:00
Diego Prado Gesto
6c9c68e004 Active the focus when the selected item changes. 
In this case, if the user was updating some information in one material
and then select other material, the new data is stored.

Contributes to CURA-5682.
 2018-09-17 14:41:45 +02:00
Diego Prado Gesto
bafc2b98c9 Reuse MaterialBrandSection component for Favorites, Generic and branded 
materials.

This component will show different children depending on the
hasMaterialTypes flag.

Adjust some small UI issues.

Contributes to CURA-5682.
 2018-09-17 12:08:41 +02:00
Diego Prado Gesto
f871a89825 Clean up the code by removing duplicate code. Also try to unify the 
MaterialsBrandSection to use the same component for favorites, generic
and branded materials.

Contributes to CURA-5682.
 2018-09-17 09:09:14 +02:00
Diego Prado Gesto
972f0bef43 WIP Fix an error in which the current selected material was not 
correctly selected when there is more than one brand (stupid mistake).
Also fix problems when the user changes some material information.

Contributes to CURA-5682.
 2018-09-14 10:54:07 +02:00
Diego Prado Gesto
6dc53cc60a Select the next selected material when it is activated or removed. 
Contributes to CURA-5682.
 2018-09-12 18:39:19 +02:00
Diego Prado Gesto
3368428dbb Fix text field alignment. 
The color text field was too short in many cases, when the color name is
long.

Contributes to CURA-5682.
 2018-09-12 16:57:43 +02:00
Diego Prado Gesto
e3f67f1147 Fix code style. 
Contributes to CURA-5682.
 2018-09-12 16:37:16 +02:00
Diego Prado Gesto
6183a07d76 Activate the material right after it was created or duplicated. 
Contributes to CURA-5682.
 2018-09-12 16:35:01 +02:00
Diego Prado Gesto
921b11974c Improve the way the categories are highlighted. 
When a material is selected, but the brand or the type is collapsed,
those components are also highlighted to indicate the path to the
material.

Reuse the MaterialBrandSection also for the generic materials, that
allow us to only mantain one component.

Contributes to CURA-5682.
 2018-09-12 15:42:02 +02:00
Diego Prado Gesto
56dcc2dded Highlight the material that is currently selected. 
Contributes to CURA-5682.
 2018-09-12 14:09:29 +02:00
Diego Prado Gesto
f298d37134 WIP: Moving current selected material to the material list instead of 
the page.

Change all the previous references to the currentItem in the page.
Automatically and correctly select the element that is selected in the
extruder.

Contributes to CURA-5682.
 2018-09-11 22:12:54 +02:00
Diego Prado Gesto
9ba4c723f7 Fix the linked materials button. 
Contributes to CURA-5682.
 2018-09-11 22:07:14 +02:00
Diego Prado Gesto
fe256b3562 Fix some issues in the material preference page. 
Now the generic section collapses and expands correctly. Some qml error
was also fixed.

Contributes to CURA-5682.
 2018-09-10 15:57:19 +02:00
Diego Prado Gesto
51b0497f84 Fix the collapsable panel of the Generic materials. 
Contributes to CURA-5682.
 2018-09-10 14:28:41 +02:00
Ghostkeeper
c1ef9abf1d
Fix code style 
These changed in the same pull request so I'll remove them here.

Contributes to issue CURA-5682.
 2018-09-06 17:23:16 +02:00
Ian Paschal
9e56d6d29f Improved expansion behavior 
Contributes to CURA-5682

- Active material is now expanded by default when opening the manager

- Expanded and collapsed sections are saved to preferences

- Sections are now highlighted when collapsed and having a selected material inside

- Bug with losing focus between fields is not yet fixed
 2018-09-05 17:16:06 +02:00
Ian Paschal
2304aeaceb Expanded states preserved when updating models 
Did this so that models can be updated more often fixing bugs where when a material is set as "not favorite" in the favorites section, its updated accordingly in its "normal" section.

It's also the ground work for saving material section expansion to preferences.

Contributes to CURA-5378
 2018-08-24 12:10:32 +02:00
Ian Paschal
13069a2f99 Some file renaming 
Contributes to CURA-5378
 2018-08-24 11:06:44 +02:00
Ian Paschal
93645e6bfe Reduce component sizes 
Contributes to CURA-5378
 2018-08-24 10:46:23 +02:00
Ian Paschal
f6b43bd9ab Merge branch 'master' into feature_favorite_materials 
Contributes to CURA-5162, CURA-5378
 2018-08-23 17:24:39 +02:00
Ian Paschal
56a5f59964 Cleaner code 
I was hoping to completely nix the generic materials model (since it's basically just a brand "Generic", but then in the QML it has to be have the same in terms of sub-menus or fold-outs and that looked stupid (Generic -> ABS -> ABS)). So we keep that one for now. It is cleaner though.

Contributes to CURA-5162, CURA-5378
 2018-08-23 16:39:40 +02:00
Ian Paschal
8da7773600 Remove unused code 
Contributes to CURA-5162, CURA-5378
 2018-08-23 16:04:51 +02:00
Ian Paschal
6225fff1f8 Re-added material detail view 
Contributes to CURA-5378
 2018-08-22 15:58:58 +02:00
Ian Paschal
00eb8e6788 Organize material preferences 
Contributes to CURA-5378
 2018-08-22 12:34:38 +02:00