GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 15:54:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
30,685 Commits 290 Branches 260 Tags
Commit Graph

124 Commits

Author SHA1 Message Date
Joey de l'Arago
c356b9d46f Rename ExtruderSelectorBar -> SingleSettingExtruderSelectorBar to be inline with new single setting widgets. 
Move common functionality into SingleSettingExtruderSelectorBar

Add adhesion settings

CURA-9793
 2022-11-29 17:00:55 +01:00
Joey de l'Arago
b53c8aac54 Add single setting update ComboBox 
CURA-9793
 2022-11-29 16:16:50 +01:00
Joey de l'Arago
5d5915e49e Make support selector functional 
CURA-9793
 2022-11-29 09:19:56 +01:00
Joey de l'Arago
631d6a15b0 Add extruder button bar that shows icons for each extruder in a horizontal row 💪 
Make ExtruderButton more generic by moving functionality out.

Remove background color from ToolbarButton and add that background color to the Toolbar.qml.

Fix Toolbar border being created by overlapping rectangles instead of using border

Add scaling options for ToolBarButtons icon

CURA-9793
 2022-11-28 15:55:55 +01:00
Joey de l'Arago
da71983891 Make combobox font and padding customizable. 
Style WorkspaceDialog comboboxes similar to MachineSelector

CURA-9424
 2022-11-17 14:41:14 +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
Joey de l'Arago
dbba1c4110 patch checking for base parent component of Combobox to check if it exists first. This should be refactored out some time. 
CURA-9424
 2022-11-02 15:14:33 +01:00
j.delarago
4ee4a781f4 Change flashing yellow warning on resolution combobox to blue flashing lining. 
Removed alwaysRunToEnd on animation since we would like the previous animation to stop if a user clicks through multiple intents triggering multiple animations.

CURA-8849
 2022-06-20 11:33:28 +02:00
Ghostkeeper
e095d41f0b
Implement pulse animation option for ComboBox widget 
You can now call pulse() on it and it'll pulse in the warning colour.

Contributes to issue CURA-8849.
 2022-06-14 16:00:14 +02:00
Ghostkeeper
bd131257fe
Implement sending a signal when changing intent changes quality level 
For now it does nothing. But I'm adding a function that should cause the combobox to pulse. That'll be a new feature so I'm implementing it in a separate commit.

Contributes to issue CURA-8849.
 2022-06-14 16:00:13 +02:00
Ghostkeeper
28c1291feb
Allow configuring combobox with whether they allow styled text or not 
For some models we'd like to have the possibility to have rich text in the combobox. For some we'd like to prevent that, for instance to prevent the user from using colours in their profile names, or boldface, or even images.

Contributes to issue CURA-8849.
 2022-06-14 15:36:28 +02:00
Ghostkeeper
97e2d6a432
Use border only on active state 
Contributes to issue CURA-9217.
 2022-05-10 16:03:55 +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
j.delarago
ba3913395c Add catalog to files that weren't translating 
CURA-9141
 2022-05-05 16:42:01 +02:00
Ghostkeeper
eae5f4d57a
Set colour of placeholder text from theme 
Otherwise it defaults to black which is not readable in dark mode.

Done as a 5 minute fix.
 2022-05-04 15:44:42 +02:00
Jaime van Kessel
15d1ded365 Change selectedTextColor for textfield 
CURA-9199
 2022-04-26 15:11:19 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage 
CURA-8640
 2022-04-08 15:55:34 +02:00
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