GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 07:44:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
34,378 Commits 289 Branches 260 Tags
Commit Graph

157 Commits

Author SHA1 Message Date
Ghostkeeper
11b557b3d9
Replace material sub-menus with custom Popup 
The sub-menus were giving segfaults for some reason. We couldn't figure out how to circumvent that. So now we're at a last resort: Implement the whole thing ourselves, but with Popup instead of Menu.

Contributes to issue CURA-8640.
 2022-04-08 11:57:19 +02:00
Jaime van Kessel
2c09943bd6 Remove opacity from menuItem 2022-04-01 16:05:54 +02:00
Remco Burema
d2ab7d3d4d
Merge pull request #11633 from Ultimaker/CURA-9012_application_menu_fixes 
Application menu fixes
 2022-03-10 12:55:54 +01:00
Jaime van Kessel
84a0c732c1 Fix warnings caused by combobox 
Parent wasn't always set, which caused ocasional warnings
 2022-03-10 11:34:11 +01:00
Jaime van Kessel
dab67d9b38 Ensure that invisible menu seperators have a height of 0 
CURA-9012
 2022-03-09 13:26:16 +01:00
j.delarago
fb42679d08 Update TextField to match designs when disabled. 
CURA-8991
 2022-03-04 13:39:50 +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
b3e8c7190e Align radio buttons with new designs. 
Fix radiobutton looking the same checked and unchecked when disabled

CURA-8991
 2022-03-04 13:18:00 +01:00
j.delarago
2e92a986db adjust dropdown background hover color 
CURA-8688
 2022-03-01 13:13:54 +01:00
j.delarago
97f1b75870 Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-28 14:56:27 +01:00
j.delarago
ce86e025d9 New style highlighting on borders 
CURA-8688
 2022-02-28 14:56:07 +01:00
Jaime van Kessel
cc29e2398b Set correct text highlight color for TextField 
CURA-8688
 2022-02-28 13:35:56 +01:00
j.delarago
7da5903ce3 Update RadioButton to new style 
CURA-8688
 2022-02-28 11:43:59 +01:00
j.delarago
440d6fa525 Update style of TextFIeld and ComboxBox to match new designs. Remove borders and radius on corners. 
Update Prefereces title to be bold and centered with button

Make prefereces pages selection buttons correct height.

CURA-8688
 2022-02-28 11:20:31 +01:00
j.delarago
b4edb89eb8 Align menubar colors with new designs. 
CURA-8688
 2022-02-28 10:21:16 +01:00
j.delarago
e2fe50baf1 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup 
# Conflicts:
#	resources/qml/Widgets/Menu.qml
#	resources/qml/Widgets/MenuItem.qml
#	resources/themes/cura-dark/theme.json
#	resources/themes/cura-light/theme.json
 2022-02-28 08:51:42 +01:00
j.delarago
7ea0167486 Remove border highlight on hover over menu items, as per new designs 
CURA-8688
 2022-02-25 15:54:51 +01:00
Evangelos Trantos
a2ce010ec1
Merge pull request #11521 from Ultimaker/CURA-8928_menu_visual_fixes 
Menu visual fixes
 2022-02-24 13:22:56 +01:00
j.delarago
e75993e7f3 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup 
# Conflicts:
#	resources/qml/Preferences/MachinesPage.qml
 2022-02-22 10:41:25 +01:00
Jaime van Kessel
85926c6f7a Add padding to menu 
CURA-8928
 2022-02-21 13:25:00 +01:00
Jaime van Kessel
b79c77cb33 Add left & right padding for MenuSeperator 
CURA-8928
 2022-02-21 13:20:04 +01:00
Jaime van Kessel
390d12495e Update highlight color of menu 
CURA-8928
 2022-02-21 13:08:53 +01:00
Jaime van Kessel
beae4f28f7 Change default sizes of menu 
CURA-8928
 2022-02-21 11:58:21 +01:00
Jaime van Kessel
2b220c627f Disable wordwrap in combobox 
CURA-8949
 2022-02-18 11:06:33 +01:00
j.delarago
e60b8ac30c Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-18 10:32:21 +01:00
j.delarago
9b05dbdb85 MenuItem height has to be set to 0 when visible: false otherwise there is white space in place of the MenuItem. 
This functionality is included in UM and was being overwritten in Cura.MenuItem.

CURA-8688
 2022-02-18 10:29:55 +01:00
casper
ab17df15b5 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup 2022-02-18 10:08:12 +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
j.delarago
b2811b1125 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup 2022-02-17 15:21:19 +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
Ghostkeeper
52ff67c1eb
Use separate context menu size for menus 
Instead of re-using the setting controls. It's not a setting.

Contributes to issue CURA-8688.
 2022-02-15 16:09:18 +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