GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-03 09:14:24 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,989 Commits 289 Branches 260 Tags
Commit Graph

644 Commits

Author SHA1 Message Date
Jaime van Kessel
d842013a76
Simplify onCompleted call in qml 
CURA-8463
 2022-08-26 13:31:48 +02:00
Casper Lamboo
b4ccd690ea
Merge pull request #12161 from Ultimaker/CURA-9106_color_image_weird_scaling 
[CURA-9106] Make parent item of ExtruderIcons handle all scaling.
 2022-05-11 17:30:55 +02:00
Remco Burema
f0d3686ee7 Fix alignment. 
CURA-9106

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-05-11 15:36:44 +02:00
Remco Burema
16eb78a5a7 Properly align center. 
CURA-9106
 2022-05-10 19:12:52 +02:00
Remco Burema
5479479596 Make parent item of ExtruderIcons handle all scaling. 
CURA-9106
 2022-05-10 17:48:05 +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
Jaime van Kessel
76672528ee
Merge pull request #11977 from Ultimaker/CURA-9185_material_menu_cut_off 
[CURA-9185] Material menu cut off in menu
 2022-05-04 11:29:03 +02:00
fieldOfView
28f609cbe2 Remove "phantom menu" when there is only a single FileProvider 2022-05-02 12:17:56 +02:00
Joey de l'Arago
d12703289b
Merge pull request #11906 from fieldOfView/fix_single_copy_multiply 
[5.0b1] Fix creating a single copy of a model
 2022-04-29 08:14:03 +01:00
Jaime van Kessel
6b9cc3f1c7 Use the correct function parameters when removing objects in menu 
It turns out that the order of these functions matters. So when we created a
function with only one param, it would actually give it the index. Removing
with the index didn't work, so the object would still be there. The Qt objects
would already be deleted which caused segfaults

CURA-9222
 2022-04-28 17:03:41 +02:00
j.delarago
45642486fa Fix popup going off the bottom of the screen by having popup push up instead of down when they are below halfway down the list. 
CURA-9185
 2022-04-26 12:02:43 +02:00
fieldOfView
fcad2101f4 Fix creating a single copy of a model 
Fixes #11897
 2022-04-23 10:50:27 +02:00
c.lamboo
9a3d089bd9 Properly add and remove menu items 
Not really part of the ticket but logging was complaining

CURA-9146
 2022-04-21 11:34:16 +02:00
j.spijker@ultimaker.com
cb9b5961c3
Removed last remnants of RecolorImage 
This was still being used in the MaterialBrandsMenu and the SimpleButton
Probably why the X es were missing from the info messages. CURA-9110

Contributes to CURA-8640
 2022-04-13 12:40:54 +02:00
Ghostkeeper
90a3b4cde6
Use 250ms delay everywhere 
This looks like it's consistent with the normal menus. And it fixes the issue where multiple menus can be shown at once because it would hide slower than show the next one.

Contributes to issue CURA-8640.
 2022-04-08 17:02:52 +02:00
Ghostkeeper
af33073b29
Properly limit width of text in subsubmenu 
Getting rid of the layout makes a lot of things simpler here.

Contributes to issue CURA-8640.
 2022-04-08 17:02:52 +02:00
j.delarago
d46679c19f Fix popups closing on selecting a material bug 
CURA-8640
 2022-04-08 16:44:13 +02:00
Ghostkeeper
e7de7bb3cc
Add a checkmark to indicate the selected material 
As it used to have.

Contributes to issue CURA-8640.
 2022-04-08 16:35:54 +02:00
Ghostkeeper
5a76cd1615
Select material from menu when user clicks on it 
The main function of the menu, after all.

Contributes to issue CURA-8640.
 2022-04-08 16:35:54 +02:00
j.delarago
5df5d6c37d Fix popup alignment 
CURA-8640
 2022-04-08 16:34:59 +02:00
j.delarago
938ff691c4 Add arrows in submenus 
CURA-8640
 2022-04-08 16:29:24 +02:00
Ghostkeeper
7aafd95429
Implement sub-submenus for material selection 
Getting a bit complex with the timers there and which pop-ups need to stay open. But it seems to be working reliably now.

Contributes to issue CURA-8640.
 2022-04-08 15:57:42 +02:00
Ghostkeeper
b40900e146
Fix layout of subitems 
Contributes to issue CURA-8640.
 2022-04-08 15:57:42 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage 
CURA-8640
 2022-04-08 15:55:34 +02:00
Ghostkeeper
3de824e1a4
Show submenu with material types 
It's quite a hassle to get it to keep displaying...

Contributes to issue CURA-8640.
 2022-04-08 14:58:39 +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
3a1862f15f Fix deprecation warning on recentfilesmenu 2022-04-01 13:47:21 +02:00
j.delarago
cfad991120 Popup will now resize based on the implicitWidth/implicitHeight of it's children. 
This causes a binding loop when using layouts like Column.

To resolve this the height/width of the popup in ExpandablePopup can now be set explicitly with contentWidth and contentHeight

For ExpandablePopups with contentItems that are not Layouts the implicitWidth/implicitHeight can be set directly in the contentItem.

CURA-8640
 2022-04-01 09:31:27 +02:00
Jaime van Kessel
af712785c8 No longer inject parameters into function handling in qml 2022-03-31 14:16:57 +02:00
Jaime van Kessel
1532779d1b Remove Extruders property from global stack 
CURA-7810
 2022-03-24 14:26:03 +01:00
fieldOfView
09c3ae628e Fix "double"/non-functional scrollbars on ScrollViews 2022-03-22 14:46:14 +01:00
j.delarago
59158db34b Lining at the bottom of UnderlineBackground and at the top of the menu give a double width lining. 
Moved the menu up slightly so lining of UnderlineBackground is hidden.

CURA-9004
 2022-03-07 17:07:14 +01:00
j.delarago
a49aa6502c Set material and nozzle selection menus to appear at bottom of button like drop downs. 
CURA-9004
 2022-03-07 16:56:26 +01:00
j.delarago
3c7498feed Move ToolbarButton and ToolTip from Cura into Uranium. This makes it possible to use new styled ToolbarButton in plugins/Tools for the rotate tool. 
Removed the ContentAlignment enum in ToolTip in favour of using the Text.ContentAlignment enum. For some reason references to this enum fail everywhere when ToolTip is moved into Uranium. There is some evil time-wasting magic cast on this component!

CURA-8943
 2022-03-03 15:53:30 +01:00
Jaime van Kessel
38b947f0fb Fix width in multiply dialog 
CURA-8688
 2022-02-28 15:57:36 +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
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
Jaime van Kessel
8cf9fe7941 Add noWrap to all labels in configurationMenu 
CURA-8941
 2022-02-22 10:55:22 +01:00
Jaime van Kessel
6e8c708f35 Change genericMaterials menu to customized menu 
CURA-8928
 2022-02-21 13:26:14 +01:00
Jaime van Kessel
b0d944f92d Change all unstyled menuseperators to styled ones 
CURA-8928
 2022-02-21 13:21:51 +01:00
Jaime van Kessel
c3745b42b6 Switch contextMenu to Cura.Menu 
This fixes all the styling issues that it still had

CURA-8928
 2022-02-21 13:15:09 +01:00
Jaime van Kessel
58d04420ed Ensure that edit & help menu have the right styling 
They were still using the default Qt Menu instead of Cura.Menu

CURA-8928
 2022-02-21 13:13:27 +01:00
j.delarago
104a34d05a Vertically center aligns "Material", "PrintCore" and dropdowns in extruder configuration menu. 
CURA-8688
 2022-02-21 10:46:39 +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
b5136ba70c Fix merge conflics 2022-02-17 15:07:48 +01:00
Ghostkeeper
e552383863
Consistently use Cura.Menu and Cura.MenuItem 
Some of these were using the built-in Menu and MenuItem, causing the menus to appear in different sizes.

Contributes to issue CURA-8688.
 2022-02-15 16:19:39 +01:00
casper
1c711129e2 Merge branch 'replace_controls_1_for_controls_2' into CURA-8687_dialogs 
# Conflicts:
#	resources/qml/Account/SyncState.qml
#	resources/qml/Preferences/ReadOnlySpinBox.qml
 2022-02-11 10:44:52 +01:00
Jaime van Kessel
1b9c86603c Fix layout of multiply object dialog 2022-02-10 10:59:21 +01:00