GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-01 00:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
31,861 Commits 291 Branches 260 Tags
Commit Graph

542 Commits

Author SHA1 Message Date
Jaime van Kessel
aec8a9ad49
Fix the hover for SettingItem 
This was broken due to the switch to Qt6

Fixes CURA-10375 and fixes #14790
 2023-03-08 16:23:56 +01:00
Joey de l'Arago
8780a2c4a0 Move validators to top of file. 
CURA-9793
 2022-12-12 14:12:32 +01:00
Joey de l'Arago
c6cc9ee6ec Update validators for SettingTextField to use strings from our validators. You can't access the components directly from javascript without instantiating them so they are instantiated here first. 
CURA-9793
 2022-12-12 14:06:45 +01:00
Joey de l'Arago
e4ad9cb48c Move base hovered logic out of ComboBox.qml since base is undefined in most places the component is used. 
CURA-9424
 2022-11-15 14:08:47 +01:00
Remco Burema
5b851e4630 Click on checkbox only for checkbox-setting. 
People accidentally set (checkbox) settings when mis-clicking slightly when scrolling through the settings.

CURA-9530
 2022-08-05 13:33:50 +02:00
Ghostkeeper
d27ed71518
Increase maximum integer length to 12 characters 
This may cause overflows if the integer type is 32-bit, but we tend to use 64-bit anyway. And 9,999,999 was already an overflow too.

Fixes #12859.
 2022-07-29 10:30:25 +02:00
Casper Lamboo
f4ee4ad05d
Merge pull request #12573 from Ultimaker/CURA-8849_more_intent_fixes 
[CURA-8849] more intent fixes
 2022-06-29 13:01:09 +02:00
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
j.delarago
9c16e200e0 Update reset settings icon in print settings to match new color used in recommeded settings 
CURA-8849
 2022-06-20 10:56:00 +02:00
Jaime van Kessel
f05e067f39 Merge branch '9145_fonts_look_ticker' of github.com:Ultimaker/Cura into 5.0 2022-05-10 16:24:40 +02:00
Ghostkeeper
97e2d6a432
Use border only on active state 
Contributes to issue CURA-9217.
 2022-05-10 16:03:55 +02:00
c.lamboo
d5c0fde7f2 Render labels using Text.QtRendering on OSX 
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
 2022-05-10 15:40:09 +02:00
c.lamboo
35f5c3f959 Revert "Render labels using Text.QtRendering on OSX" 
This reverts commit f0e3c19a34d1fde3b7ec4fd95677fbefa2028b26.
 2022-05-10 15:39:02 +02:00
c.lamboo
f0e3c19a34 Render labels using Text.QtRendering on OSX 
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
 2022-05-10 15:36:50 +02:00
Ghostkeeper
7fda81b678
Show a border around text fields and drop-downs when hovering 
And when they are focused.
This applies to the setting text fields, extruder selectors and drop-downs as well as to the machine settings.

Contributes to issue CURA-9217.
 2022-05-09 17:48:38 +02:00
Remco Burema
76d5f92975 Align colors disabled settings textfield (5 min fix). 
CURA-9252
 2022-05-05 17:54:06 +02:00
Jaime van Kessel
f1761a17d0 Fix size of setting extruder swatch 2022-05-02 14:59:28 +02:00
Jaime van Kessel
2ecec1fa37 Prevent last line of popup to be cut off 
We didn't take the y offset into account

CURA-9112
 2022-04-28 13:23:41 +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
Jaime van Kessel
b2eec5f0d9 Fix height for swatch in extruder settings 2022-04-06 11:19:20 +02:00
j.delarago
2ffcfafc77 Some place RegularExpressionValidator can't be found in QtQuick 2.10 but can be in 2.15 so all files using RegularExpressionValidator have been bumped to latest QtQuick 
CURA-8640
 2022-04-05 16:10:39 +02:00
j.delarago
e593322b43 When getting active focus textinput value was being cleared. However if text was inputted then this would stay between active focus states. 
This commit forces the value to be assigned the value in the textInput when active focus is given.

CURA-8640
 2022-04-04 10:38:09 +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
Jaime van Kessel
a92a9dd4c0 Fix context menu settings 2022-04-01 13:22:53 +02:00
c.lamboo
3c9e2a1b08 Update RegExpValidator to RegularExpressionValidator 
Due to Qt6 API change

CURA-8640
 2022-03-30 15:10:37 +02:00
Jelle Spijker
3f8907d02a
Merge branch 'master' into CURA-8640_PyQt6 
# Conflicts:
#	cura/CuraApplication.py
#	resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
#	resources/qml/Preferences/Materials/MaterialsView.qml
 2022-03-24 11:53:44 +01: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
Jaime van Kessel
22f9b2a0ec Increase the indentation margin for settings 
CURA-8921
 2022-03-11 15:38:34 +01:00
Casper Lamboo
60f7b2dccb
Merge branch 'master' into CURA-9005_restyle_print_setting_category 2022-03-11 13:43:33 +01:00
casper
1b976693dc Remove dangling comment 
CURA-9005
 2022-03-11 13:13:25 +01:00
casper
5701f42d63 Move CategoryButton to cura repo 
CURA-9005
 2022-03-11 13:11:36 +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
4f2e7116b7 minor fix to align setting visibility with settings 2022-03-07 16:25:14 +01:00
10r3n20
5499a4cc4c tiny improvements 2022-03-07 16:11:33 +01:00
j.delarago
016cc4e48f Merge branch 'master' into CURA-9005_restyle_print_setting_category 2022-03-07 13:37:58 +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