GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-24 13:39:05 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,515 Commits 291 Branches 265 Tags
Commit Graph

511 Commits

Author SHA1 Message Date
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
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
c2cb837f4e update indentation 
CURA-9005
 2022-03-07 10:46:03 +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
j.delarago
719257bb63 Update validation colors to match new designs 
CURA-8991
 2022-03-04 15:05:30 +01:00
j.delarago
1eb16c0ec5 Update SettingTextField to match TextField 
CURA-8991
 2022-03-04 13:53:59 +01:00
j.delarago
1fc6b8ced6 New designs use dark mode border_main for dark theme. 
Remove uses of border_main_light. The only puprose of this color was to give dark mode access to the border_main of the light theme.

CURA-8991
 2022-03-04 13:22:55 +01:00
j.delarago
b86b1133df Remove enable:false assignment that was used for testing 
CURA-8991
 2022-03-04 13:02:21 +01:00
j.delarago
a26b54f6e2 Fix checkboxes not showing check marks when disabled. 
Update checkboxes to align with new designs.

Update SettingCheckBox to match checkbox styling.

Remove duplicated styling inside cura-dark/theme.json

CURA-8991
 2022-03-04 11:28:11 +01:00
j.delarago
2e92a986db adjust dropdown background hover color 
CURA-8688
 2022-03-01 13:13:54 +01:00
j.delarago
2fdd7b82d5 Update settings extruder comboboxes and material selection combobox to match new designs 
CURA-8688
 2022-03-01 11:48:41 +01:00
j.delarago
195278aa55 Make all text fields use updated background and lining style. 
CURA-8688
 2022-03-01 10:20:39 +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
c7d7dd11d1
Merge branch 'master' into PyQt6_upgrade 
Conflicts:
	cura/PlatformPhysics.py -> Removed shapely on master, while QTimer import got updated to Qt6.
	plugins/Toolbox -> Entire folder is deleted in master, but it was updated to Qt6 here. This can all be removed.
 2022-02-21 11:52:28 +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
c528616d12 Set selection color of textfields 
CURA-8947
 2022-02-17 14:39:11 +01:00
Jaime van Kessel
91b3d116bf Merge branch 'CURA-8378_improve_checkbox_visibility' of github.com:Ultimaker/Cura 2022-02-08 15:31:56 +01:00
Jaime van Kessel
930b3daf37
Merge pull request #11415 from Ultimaker/fix_show_hidden_settings 
Fix show hidden settings
 2022-02-08 11:49:04 +01:00
j.delarago
6888fafa96 Set correct styling for SettingCheckBox used in per model settings panel 2022-02-07 12:10:47 +01:00
casper
fc633b8769 Fix show hidden settings 2022-02-04 10:33:38 +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
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
Ghostkeeper
4f82137035
Customise scrollbar for extruder selectors 
Contributes to issue CURA-8686.
 2022-01-20 17:26:49 +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
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
Ghostkeeper
a878cfae7a
Merge branch 'master' into marketplace_redesign 2021-12-31 14:07:51 +01:00
Remco Burema
c8ed3634ed
Qt5->Qt6: Even more renaming stuff. 
part of CURA-8591
 2021-12-29 12:43:56 +01:00