42 Commits

Author SHA1 Message Date
Ghostkeeper
eee3a06743
Allow text to be wider if favourite button is not shown
It can take the space of the favourite button then.
2022-05-19 09:52:25 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage
CURA-8640
2022-04-08 15:55:34 +02:00
casper
5d3b22f45a Don't check on type equality to check if material is set
As suggested by code review

CURA-9044
2022-03-22 13:46:31 +01:00
casper
1e15197d44 Show active material in italics
behaviour is not perfect; only one (of the possible multiple if you have
multiple materials) active material is shown in italics. However, this
behavior is similar as the behavior in cura v4.13

see
https://github.com/Ultimaker/Cura/pull/11668/files#diff-ba2e4797d4d21e847be25e2c272d6a7a45e3bab97def420bed7643d762be8cfaL54

CURA-9044
2022-03-22 12:00:56 +01:00
j.delarago
bd91078e6e Accept click events on materials items in materials list
CURA-8979
2022-03-18 14:08:20 +01:00
j.delarago
c6bd020dec Anchor material name to star icon so text doesn't display under star icon.
CURA-8979
2022-03-18 13:58:41 +01:00
j.delarago
c7bb97aa6c Add tooltip to materials list itmes.
CURA-8979
2022-03-18 13:56:19 +01:00
j.delarago
99f9918db5 Remove Italics
CURA-8979
2022-03-15 15:05:26 +01:00
j.delarago
bf784dbba0 show star on hover
CURA-8979
2022-03-15 15:03:49 +01:00
Jaime van Kessel
f760ca146d Fix sizing of materialBrandSelection
This also cleans up some stuff from the theme. Huzzah

CURA-8979
2022-03-15 10:25:56 +01:00
Jaime van Kessel
93405bdb93 Add identation for the materials preferences page
CURA-8979
2022-03-15 10:19:34 +01:00
casper
e2c9e0a461 Elide text in materials slot
CURA-8979
2022-03-11 16:29:37 +01:00
casper
c6b8abd53e Update materials slot
CURA-8979
2022-03-11 13:22:45 +01:00
casper
418f88a4da boy scouting
CURA-8975
2022-03-09 15:59:21 +01:00
casper
f9a5cb33fd Implement basic styling of material management page
CURA-8979
2022-03-09 15:26:55 +01:00
casper
84ecc8d168 Remove unused imports
CURA 8687
2022-02-09 15:50:05 +01:00
casper
c63b94375d Update materials slot preference menu to QtControls 2
CURA-8684
2022-01-24 23:34:38 +01:00
Jaime van Kessel
58a3aef8d4 Remove styles 2022-01-04 10:36:55 +01:00
Ghostkeeper
0a75c772ed
Unrevert new icon set for all of Cura's interface
We created a new set of icons for Cura. These icons had to be reverted though because they weren't working out in the interface for the last release yet.
This unreverts them, basically adding them back hoping that we'll get them fixed in time for the next release.

Contributes to issue CURA-8342.

Revert "Revert "Fix merge conflict""

This reverts commit bb20e3307f43edc1ff53cb154d2351ddfe39e158.

Revert "Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons""

This reverts commit 70e4e9640e561e18a12870f30c905203ce8ccee7.

Revert "Revert "Fix typo in icon name""

This reverts commit 38ce22ba7c3f40b971bc6e1e0a8e776ca9d51512.

Revert "Revert "Add list for deprecated icons""

This reverts commit 119a957e7f978dbf1ddbcb3b0005bf38e8fed943.

Revert "Revert "Add Function icon""

This reverts commit 760726cf0bb953bb1b0fc277b448f419d4bd2544.

Revert "Revert "Switch out inherit icon""

This reverts commit 26afff609381e2004d194c280f504b6226859bd3.

Revert "Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura""

This reverts commit 6483db3d47ee052c1a966cdee3af7190577a5769.

Revert "Fix incorrect icons"

This reverts commit 02a4ade2a50a943ff36fd4895bdc9261cf2133eb.
2021-06-28 17:16:56 +02:00
Jaime van Kessel
70e4e9640e
Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"
This reverts commit 6120d8a054b8c04bf90b8b3d3cb219d691bece2f, reversing
changes made to 95652556fef90f70adbf25bfa9bd3b8af7220d4a.
2021-05-27 16:06:20 +02:00
jelle Spijker
2bd6f28f3a
Update Icons
Subdivided the new icons in 3 size categories. As requested by UX
Used the company naming scheme for uniformity and easy recognition.

Known issues:
- Top/Bottom category wasn't taken into account by UX at the time. Since
 this is a recent addition. Both the Walls and Top/Bottom will be updated.
- Cloud/Network connection icons 12px don't render correctly. Due to the
 theme-ing.
- Extruder Icons do not render correctly.

CURA-8010_new_icons
2021-04-26 19:42:17 +02:00
Konstantinos Karmas
504f6dbe70
Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
jelle Spijker
9da321ffb9
Update Layouts, Control.Styles and Dialogs
CURA-7813
2021-03-29 18:04:47 +02:00
jelle Spijker
2986d50745
Update QtQuick and QtQuick.Controls
CURA-7813
2021-03-29 17:55:19 +02:00
Nino van Hooff
8322a36548 Fix some QML warnings in the MaterialsPage 2019-10-16 16:59:52 +02:00
Ghostkeeper
4a68e7ec95
Fix favorite materials without material manager
We just track it via the preference value itself rather than duplicating that in any other data structure. It's simple enough.

Contributes to issue CURA-6776.
2019-09-20 09:57:36 +02:00
Jaime van Kessel
914d2e98e9 Fix the disabling of the material setting fields.
This was caused by using 2 different modelsItems.
2019-07-30 11:29:49 +02:00
Ghostkeeper
be4e754984
Remove cache of material manager
It doesn't make the code much simpler because the cache is also not a local variable.

Contributes to issue CURA-6679.
2019-07-24 16:04:40 +02:00
Remco Burema
fea8262656 Listen to 'material-changed' since it doesn't update immediately.
part of CURA-6590
2019-07-03 16:14:08 +02:00
Jaime van Kessel
99e6ec9509 Fix the last material qml warnings 2019-05-16 14:29:05 +02: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
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
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
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
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
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
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
13069a2f99 Some file renaming
Contributes to CURA-5378
2018-08-24 11:06:44 +02:00