79 Commits

Author SHA1 Message Date
Jaime van Kessel
2b220c627f Disable wordwrap in combobox
CURA-8949
2022-02-18 11:06:33 +01:00
casper
5a2e26eff6 Merge branch 'replace_controls_1_for_controls_2' into CURA-8685-replace_text_and_progress_bars
# Conflicts:
#	plugins/PerObjectSettingsTool/PerObjectItem.qml
#	plugins/PerObjectSettingsTool/SettingPickDialog.qml
2022-02-18 09:07:25 +01:00
Jaime van Kessel
f682f56923 Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:02:03 +01:00
Jaime van Kessel
821581bc65 Remove ProgressBar style and use UM.ProgressBar instead
CURA-8685
2022-02-15 17:07:22 +01:00
Jaime van Kessel
13227249b5 Remove catalog from Textfield
The creation of the catalog is rather slow, so it's better not to create it for every component
2022-02-15 16:28:29 +01:00
Evangelos Trantos
d7c3495509
Merge pull request #11328 from Ultimaker/CURA-8378_improve_checkbox_visibility
Cura 8378 improve checkbox visibility
2022-02-02 19:54:34 +02:00
Ghostkeeper
92ed791f53
Simplify anchors of background rectangle
Contributes to issue CURA-8686.
2022-01-28 11:06:07 +01:00
j.delarago
7f81a2aa8c Rename low quality CheckMark.svg -> Check.svg
Rename low quality Check.svg -> CheckThin.svg
2022-01-25 11:32:41 +01:00
j.delarago
f6c48fdf07 Rename EmptyCheck -> CheckMark 2022-01-24 14:20:28 +01:00
j.delarago
5788ea8d00 The visibility settings in the preferences is defined in Uranium rather than Cura. The CheckBox has been moved to Uranium so that all parts of the project have access to this default styled component. 2022-01-24 14:03:47 +01:00
j.delarago
4c9c2ad131 "checkedState" is now "checkState" in newer CheckBox
Remove partiallyCheckedEnabled since Cura.CheckBox manages this itself.
2022-01-21 18:16:16 +01:00
j.delarago
171da643d5 I'm replacing all CheckBox in Cura with this CheckBox except ones that use the old "style" tag (Not in scope). This should make the design consistent everywhere and easier to update.
Moved set width and height from top level into "indicator" since this was causing the label to be cut off.

Swapped out setting_control_radius for checkbox_radius since these are different now.

Updated the UM.RecolorImage to work with tri state checkboxes so this can replace the Checkbox in SettingVisiblityPage.qml.
2022-01-21 18:06:31 +01:00
j.delarago
670872f8d1 Specify width and height in Cura.Checkbox
Update Dialogs to use Cura.CheckBox instead of QtQuick. This will make it easier to update the QtQuick checkbox version.
2022-01-20 17:31:00 +01:00
Ghostkeeper
643f6e7d27
Customise scrollbar for combobox widgets
Contributes to issue CURA-8686.
2022-01-20 17:28:31 +01:00
j.delarago
c54c375a7c Update check box icons name to new icon name
Change checkbox check icon to have set height and width in theme.json. Math.round(parent.width/2.5) would always evaluate to 1 since the width of the check icons parent is fixed.
2022-01-19 17:56:56 +01:00
Ghostkeeper
efc748cc99
Remove unused ScrollView widget
We were not using Cura.ScrollView anywhere.

Contributes to issue CURA-8686.
2022-01-19 17:16:39 +01:00
Ghostkeeper
d4381a6dd0
Get rid of double scrollbar due to flickable in scrollview
The tutorials say it should work, but it doesn't. Now we make the whole thing a flickable with an attached textarea property, which does seem to work.

Contributes to issue CURA-8686.
2022-01-17 19:21:14 +01:00
Ghostkeeper
7f0af55d1d
Fix top and bottom margins
These were undefined properties otherwise.

Contributes to issue CURA-8686.
2022-01-17 17:59:45 +01:00
Ghostkeeper
7bda1336da
Use new scrollbar with QtControls 2 scroll view
A bit confusing that you have to set the parent and position manually, but okay.

Contributes to issue CURA-8686.
2022-01-17 17:57:22 +01:00
Jaime van Kessel
d7d6918ab7 Use CuraMenu so that custom styling is used
CURA-8683
2022-01-14 15:01:48 +01:00
Jaime van Kessel
babf3043f8 Use Cura.Menu instead of UM.Menu
Same as the previous commit. Use the specialised variant provided by Cura instead
of the generic one of UM

CURA-8683
2022-01-14 13:50:44 +01:00
Jaime van Kessel
3130ea0f74 Use Cura.MenuItem instead of UM.MenuItem
I didn't realise that Cura already had a menu item. To prevent
Confusion, i've changed Cura.MenuItem to use UM.MenuItem and let all
other menus use Cura.MenuItem
2022-01-14 13:46:05 +01:00
Jaime van Kessel
f44d4d341f
Apply suggestions from code review
Minor codestyle issues

CURA-8683

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-01-12 15:57:20 +01:00
Jaime van Kessel
2bad5c5cd3 Update the settings menu to controls 2
CURA-8683
2022-01-11 10:31:39 +01:00
Remco Burema
b794ad6ed2
Delete old 'Toolbox' in favour of new Marketplace.
part of CURA-8588
2021-12-30 11:51:54 +01:00
Jaime van Kessel
83be495414 Replace usage of controls label with our custom label
This prevents copy pasting a bunch of parameters that we set by default
2021-11-10 16:37:26 +01:00
Jaime van Kessel
512b0a1dbe Remove unneeded catalog
The catalog was created over and over again even though it wasn't needed.
On my machine this took 0.25 seconds, so it does add up
2021-10-08 18:17:18 +02:00
Jaime van Kessel
d24b28c9b9
Fix two deprecated icons 2021-07-27 16:16:36 +02:00
Konstantinos Karmas
ca5d60fd3b Wrap the text in the license window
CURA-8437
2021-07-26 14:08:27 +02:00
Ghostkeeper
3d6601a37e
Fix margins
The margin around the icon didn't work if the icon source was none, because it was provided a QSize rather than a real.
The margin around the background didn't work at all because the background is automatically adjusted to fill the parent element, so it's best left out.

Contributes to issue CURA-8009.
2021-07-13 16:04:01 +02:00
Ghostkeeper
bec83920e4
Keep showing search icon while typing search query
This adds an option to the TextField element to show an icon on the left side in the text field. The icon remains visible when the user types in something (it's not part of the placeholder string).
Then we use that optional icon for the search bar in the Digital Library.

Contributes to issue CURA-8009.
2021-07-13 15:47:21 +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
6fc1088cdb
Merge branch 'fix_visibilitymenu_style' of https://github.com/fieldOfView/Cura 2021-06-01 16:33:10 +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
fieldOfView
6e803c41f4 Add Cura-styled Menu, MenuItem and MenuSeparator controls 2021-05-20 12:20:19 +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
Remco Burema
5083db8d44
On new install or update, have highlights not just changelog.
Place images in resources/images/whats_new/N.format and texts in resources/texts/whats_new/N.format where N is the ordinal and format the respective allowed formats.

CURA-8014
2021-03-24 12:00:05 +01:00
Ghostkeeper
63deea4721
Fix model to use for comboboxes to check if they are empty
This was checking against the wrong model, it seems.

Contributes to issue CURA-7865.
2021-01-22 13:52:27 +01:00
Kostas Karmas
fc718892d9 Add default text in the ComboBox
The Cura.ComboBox component can now display a default text when there are no items in its model
and another text when there is no item selected.

CURA-7865
2021-01-18 12:10:15 +01:00
Ghostkeeper
1cd5757029
Fix highlighting of item under tooltip area
The parent was no longer the original parent.
2020-11-17 19:41:22 +01:00
Ghostkeeper
29258aa5e2
Always display tooltip on combobox items if text gets elided
So if the text is too long to display, there is still a way to display it.
2020-11-17 10:52:25 +01:00
Ghostkeeper
5e383d4f42
Fix documentation
This is a checkbox, not a combobox.
2020-11-17 10:51:30 +01:00
fieldOfView
cb73cfb0f3 Make add printer dialog resize-aware 2020-05-29 17:22:46 +02:00
fieldOfView
8ce5593eec Add visible scrollbar to list of printer profiles 2020-05-29 13:49:03 +02:00
Nino van Hooff
8ea3004c73 Fix some dark theme styling (MoreInfoWindow, ToolboxLicenseDialog
CURA-7152
2020-01-30 12:51:13 +01:00
Jaime van Kessel
7d65951f43 Refactor ComboBox to use states
CURA-6598
2019-08-29 11:53:25 +02:00
Jaime van Kessel
867a881de9 Ensure bool and enum settings get control highlighted on hover 2019-08-27 13:38:55 +02:00
Lipu Fei
904a8ab26c Fix theming
CURA-6435
2019-04-17 09:18:08 +02:00