66 Commits

Author SHA1 Message Date
casper
5701f42d63 Move CategoryButton to cura repo
CURA-9005
2022-03-11 13:11:36 +01:00
j.delarago
798e86646c Make CategoryButton generic, it is used in SettingCategory.qml, PerObjectCategory.qml and SettingVisibilityCategory.qml.
Remove left margin on categories

CURA-9005
2022-03-07 12:04:37 +01:00
j.delarago
06a30a702c Update Settings view category items to new style
Removed the fixed height from the SettingView list so that the SettingItems can have a larger height than the SettingCategory

CURA-9005
2022-03-04 17:23:36 +01:00
luz paz
d68f375e38 Fix various typos
Found via `codespell -q 3 -S *.po,*.pot -L childs,initialy,lod,ned,te,slicable,sur,tutoriels,wont`
2021-09-07 11:33:54 -04:00
Konstantinos Karmas
4ef7fcf6e4 Increase the size of the small buttons in the setting category
Also, fix the misalignment of the background rectangle, which made the category icons seem not-centered.

CURA-8202
2021-07-01 09:53:51 +02: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
2986d50745
Update QtQuick and QtQuick.Controls
CURA-7813
2021-03-29 17:55:19 +02:00
Jaime van Kessel
8b7b8b0118
Simplify the SettingCategory 2020-07-10 14:50:44 +02:00
Nino van Hooff
8dbd67f5bd Merge remote-tracking branch 'origin/master' into CURA-6959_collapse_categories
# Conflicts:
#	resources/qml/Menus/SettingVisibilityPresetsMenu.qml
#	resources/qml/Settings/SettingView.qml
2020-01-02 15:32:26 +01:00
Nino van Hooff
72497f48f7 Remove redundant brackets
CURA-6959
2020-01-02 13:55:01 +01:00
Jaime van Kessel
7cc74c97e3
Ensure setting category uses correct background size 2019-12-31 15:28:29 +01:00
Nino van Hooff
dfba1eb102 Refactor SettingCategory checkable by using expanded
More intuitive and less chance of overriding the expanded Binding

CURA-6959
2019-12-31 11:27:39 +01:00
Nino van Hooff
d780efd76c Add a settings menu option to collapse all categories
CURA-6959
2019-12-31 11:14:26 +01:00
Nino van Hooff
5c83ba0129 Rename SettingsDefinitionModel.collapse to -Recursive for consistency
CURA-6959
2019-12-30 15:05:52 +01:00
Jaime van Kessel
8409d7d645 Remove another unneeded catalog 2019-02-21 18:42:06 +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
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
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
07d58c3aef Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:56: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
Diego Prado Gesto
004405e5f9 Change the colors to match the designs.
Contributes to CURA-5941.
2018-12-03 17:25:07 +01:00
Diego Prado Gesto
4e9c595bdd Restyle the settings list
Be sure that the alignments and the margins are corrects according to the designs.

Contributes to CURA-5941.
2018-12-03 15:34:33 +01:00
Diego Prado Gesto
ce6a0676dd Add a rectangle surrounding the settings listview
Contributes to CURA-5941.
2018-12-03 14:43:35 +01:00
Aleksei S
706fc311bc Added margins to the setting list
CURA-5941
2018-11-29 00:47:25 +01:00
Jaime van Kessel
4fab546425 Fix codestyle issues
Boyscouting
2018-11-27 15:00:57 +01:00
Jaime van Kessel
82ea562dc3 Add missing hoverEnabled property 2018-11-27 14:54:49 +01:00
Diego Prado Gesto
90e8a05aab Remove all the entries in the theme that make reference to the sidebar,
because there is no sidebar anymore.

Several different margins and linings were created depending on the
side, not depending on where it belongs.

Contributes to CURA-5784.
2018-10-26 17:51:28 +02:00
Jaime van Kessel
2dbaa304a0 Set textFormat for the setting items to PlainText
Based on the Qt guide on making qml run much faster, it seems that the default of textFormatting (auto)
is quite expensive. As we make a *lot* of settingItems, which we don't want to format, it's better to set it to plain.
I haven't checked how much faster it actually is, but i didn't see visual changes, so it's at least a safe step.
2018-09-20 15:22:35 +02:00
Jaime van Kessel
a809575bc8 Add bunch of ID's to qml components so it's easier to test them.
CURA-5618
2018-09-11 16:05:53 +02:00
Ghostkeeper
60a217fc84
Rename expandAll to expandRecursive
Because it doesn't expand all settings, just a category.
2018-03-30 15:07:42 +02:00
fieldOfView
593dad7cca Fix categories too 2018-02-15 11:34:46 +01:00
Ghostkeeper
ee9de1f11b
Merge branch '3.2'
Lots of conflicts due to rounding vs. flooring of text element positions for weirdness with the font aliasing.
2018-02-14 10:53:51 +01:00
Mark
b531c0550d Change Math.floor to Math.round as a last try to fix garbled fonts
CURA-4941
2018-02-14 09:28:47 +01:00
Mark
12b2348309 Revert "Use QTQuick 2.2 to fix garbled fonts"
This reverts commit 0d5bb952efc468522b55cbf903349aaf7f979af9.
2018-02-13 14:37:05 +01:00
Mark
0d5bb952ef Use QTQuick 2.2 to fix garbled fonts
CURA-4941
2018-02-13 12:42:31 +01:00
Ghostkeeper
03b4213e92
Merge branch '3.2'
Conflicts in Cura.qml and SaveButton.qml from people fixing positioning rounding at the same time...
2018-02-12 13:10:24 +01:00
Mark
461da709ff Checked all divisions (again..) and multiplications on rounding errors
CURA-4941
2018-02-10 12:45:36 +01:00
Mark
b52bf6decf resolve conflict 2018-02-09 13:01:56 +01:00
Mark
8fca183a5e Fix rounding errors for garbled text
CURA-4941
2018-02-09 11:30:56 +01:00
Jaime van Kessel
ed9634ebe0 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2018-01-08 10:56:12 +01:00
Lipu Fei
d20895a055 Fix code style
CURA-4758
2018-01-04 13:51:47 +01:00
Lipu Fei
84adbc5f41 Use the 5.8 versions of QtQuick modules in QMLs
CURA-4758
2018-01-04 13:26:14 +01:00
ChrisTerBeke
3f7d8997a1 Fix icon positions - CURA-4758 2018-01-04 11:33:12 +01:00
ChrisTerBeke
27ca743e58 Merge branch 'master' into qtquick-controls-2.0 2018-01-03 11:03:17 +01:00
Ghostkeeper
8b504c8acc
Fix scroll position after collapsing category not in focus
When collapsing a category, the height of the category is briefly set to 0 and then animated there properly. If the setting list becomes so small then that the scroll bar disappears, the view should automatically get scrolled up. But because the focus changed at the same time it would move the scrollbar such that the category header was in view. This clashed, causing the scroll position to end up not completely at the top even though the scroll bar did disappear. Setting the focus after collapsing the scroll bar prevents this.

Contributes to issue CURA-4732 and fixes #2935.
2017-12-29 14:07:34 +01:00
Jaime van Kessel
799d1a5b0c Updated setting items & sidebar to qtQuick controls 2.0 2017-10-11 21:02:27 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00