245 Commits

Author SHA1 Message Date
Jaime van Kessel
52ea80f6c9 Fix the font for searchbars being styled correctly
By setting the font.italic to true, we actually reset the entire font.

Fixes #12565
2022-06-21 10:58:53 +02:00
Jaime van Kessel
c4ec9142db Merge branch 'fix_missing_icons' of https://github.com/fieldOfView/Cura into 5.0 2022-04-26 15:55:10 +02:00
Jaime van Kessel
3ecad03aee Use screenscale factor for maximumFlickVelocity
Not sure if it fixes it for all OSes, but the documentation says that this
is a platform specific setting and it increases it by 1.25 for me. Since
the velocity is in pixels/s, it makes sense to have it depend on the screenscale
factor

CURA-9182
2022-04-26 13:21:36 +02:00
fieldOfView
b622738ae3 Fix missing icons since move to PyQt6 2022-04-22 22:33:14 +02:00
Jaime van Kessel
8383983ff4 Merge branch 'CURA-9070_dont_lose_focus_search_field' of github.com:Ultimaker/Cura into 5.0 2022-04-21 13:11:50 +02:00
Ghostkeeper
3f9c7c55dc
Fix search field losing focus when scrolling the setting list
When scrolling the setting list, it was clearing the focus in order to close the pop-ups in the setting list. If pop-ups like for the infill pattern or extruder selection settings are not closed, the pop-up part is still rendered even if the user scrolls those settings out of view, causing the pop-up to appear somewhere on top of completely unrelated interface elements. It scrolls all the way to the top of the screen, effectively.

I couldn't find a way to cause pop-ups to be clipped with the rest of the contents of the ListView. They are always rendered on top due to the nature of the pop-up. I could find a way to trigger pop-ups to close upon changing the scrolled position without changing the focus, but that method was fairly complex with a bunch of `Connection`s and an extra signal. This is by far the simplest solution.

Contributes to issue CURA-9070.
2022-04-21 11:17:13 +02:00
Remco Burema
c002a52b50 Remove animations from custom settings view.
They never properly worked anyway, and now they cause the items to overlap.

CURA-9160
2022-04-21 11:11:28 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage
CURA-8640
2022-04-08 15:55:34 +02:00
j.delarago
0f84fc3abe Merge remote-tracking branch 'origin/qt6_beyond_the_splash' into qt6_beyond_the_splash 2022-04-01 17:26:28 +02:00
j.delarago
bac9a0da87 Fix textField vertical alignment
CURA-8640
2022-04-01 17:26:18 +02:00
Jaime van Kessel
c9b9a41bb8 Fix injection of parameters in signals 2022-04-01 17:17:28 +02:00
Joey de l'Arago
fcfc47920f
Merge pull request #11674 from Ultimaker/CURA-9039_combobox_open_out_of_window
[CURA-9039] fix combobox scrolling out of view
2022-03-17 07:46:56 +00:00
Remco Burema
7dfcac7bbe
Merge pull request #11663 from Ultimaker/CURA-9007_burger_menu
[CURA-9007] Update Burger Menus
2022-03-16 15:59:32 +01:00
j.delarago
84d7443c18 Change OnYChanged out for OnPositionChanged inside scrollbar. Makes a bit more sense logically and this can be reused in ScrollViews as well.
Added OnPositionChanged to General Page
CURA-8979
2022-03-16 13:59:22 +01:00
Jaime van Kessel
7148ca5d06 Fix poup rescaling the burgermenu weirdly
CURA-9007
2022-03-15 14:42:53 +01:00
j.delarago
b04fabb27a Remove focus from SettingItems when scrolling.
This fixes the issue where you can scroll combobox dropdowns out of the settingView.

CURA-9039
2022-03-14 17:33:48 +01:00
j.delarago
ff824b718c Replace burger buttons with generic BurgerButton.qml component.
Move comment onto newline (Comments on the same line as component names break text folding)

Update burger menu margins in SettingView to match design

CURA-9007
2022-03-14 16:14:57 +01:00
Casper Lamboo
60f7b2dccb
Merge branch 'master' into CURA-9005_restyle_print_setting_category 2022-03-11 13:43:33 +01:00
Casper Lamboo
addc5e36a7
Apply suggestions from code review
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2022-03-11 09:59:20 +01:00
Jaime van Kessel
a5098f469b Lower the max flick velocity of settingview
On my system it was 2500, which made it almost impossible to work with
the trackpad

CURA-9025
2022-03-10 11:45:39 +01:00
10r3n20
5499a4cc4c tiny improvements 2022-03-07 16:11:33 +01:00
j.delarago
76d9cf6f4d Remove margins that keep listview items from being under the scrollbar. Instead set width of listView smaller so it doesn't overlap.
Update per object setting visibility dialog to have same category design as SettingVisibilityCategory.qml and SettingCategory.qml

CURA-9005
2022-03-07 13:20:05 +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
Jaime van Kessel
f7852e4f9d Use correct menu type for setting contet menu
CURA-8688
2022-02-28 13:22:19 +01:00
Ghostkeeper
70a79c9b5c
Use custom scroll bar for settings list
This is necessary to get the same design working in Controls 2.

Contributes to issue CURA-8686.
2022-01-17 17:14:31 +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
313c10801d Codestyle fixes 2022-01-13 09:23:13 +01:00
Jaime van Kessel
13af43b76c Fix context menu visibility for settingview
CURA-8683
2022-01-13 09:19:47 +01:00
Jaime van Kessel
722f928d12 Remove style from settingview 2022-01-04 10:30:07 +01:00
Jaime van Kessel
e1d6c89cf2 Replace toolbutton with simplebutton 2021-11-16 14:45:44 +01:00
Jaime van Kessel
9ca5a52659 Also speed up the expression for the value of a setting item 2021-10-08 18:35:02 +02: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
jelle Spijker
5ba1e8eda8 Settings search field uses italic style
Restored italic font style for the search field.
To not break look and feel with the old TextField
behaviour
2021-08-30 14:20:09 +02:00
Jaime van Kessel
a1378f9a06 Replace the textfield with cura.Textfield
This way we don't have to use the html in the setting item and we
dont have to re-do the whole hover logic in the search text field.

THis also makes the search magnifier themed, so it looks a lot better
in the dark theme

CURA-8498
2021-08-30 13:28:00 +02:00
Jaime van Kessel
f11079adcf
Fix width & height of setting visibility button
The widht & height were not set correctly, which made the mouse
area smaller than the icon of the button.

CURA-8438
2021-07-27 11:20:07 +02:00
Konstantinos Karmas
a996b631bb Increase the size of the hamburger menu
CURA-8202
2021-07-01 09:49:48 +02:00
Konstantinos Karmas
0a2407e6ed Reduce the size of the magnifier in the setting search
CURA-8202
2021-07-01 09:46:24 +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
63a2085379 Fix positioning of setting visibility preset menu popup 2021-05-20 12:24:51 +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
Remco Burema
e0e77327b5
Dropdown menu wasn't closing on MacOS.
CURA-8172
2021-04-13 13:38:58 +02:00
Kostas Karmas
2027309863 Fix tab button not switching to the next print setting field
The signal `setActiveFocusToNextSetting` has an argument which wasn't being passed in the
`onSetActiveFocusToNextSetting()` function, which was causing the broken behavior.

CURA-8166
2021-04-09 15:19:38 +02:00
Konstantinos Karmas
504f6dbe70
Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
Konstantinos Karmas
180732788b
Merge pull request #9472 from Ultimaker/CURA-7813_QML_warnings
Cura 7813 qml modules version bump
2021-03-30 09:42:59 +02:00
jelle Spijker
645dc181bc
Fixed not showing tooltip
CURA-7813
2021-03-30 09:26:36 +02:00
Kostas Karmas
7827b36ab7 Fix QML warnings due to depricated on<signal> calls in Connections
As of 5.12, the signals used in connections should not be declared as on<signal>, but as
function on<signal>(arguments).
2021-03-30 09:02:48 +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