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

666 Commits

Author SHA1 Message Date
Remco Burema
a8570920bd Make it work in dark-mode again. 
part of CURA-9522
 2022-12-27 12:32:23 +01:00
Remco Burema
d351458b10 Make identifier unique and call the correct one. 
Wouldn't start for me without (from source, on Windows).

part of CURA-9522
 2022-12-27 12:11:21 +01:00
Remco Burema
634288a37c Fix spelling mistakes. 
part of CURA-9522
 2022-12-27 12:09:47 +01:00
c.lamboo
e490250d9d Clean up code 
Create separate re-usable component for `MaterialBrandSubMenu`

CURA-9522
 2022-12-23 19:40:27 +01:00
c.lamboo
20fdf22e35 Show bottom border of material brands 
CURA-9522
 2022-12-23 16:18:55 +01:00
c.lamboo
ab49dcceb5 Show bottom border of material brands 
CURA-9522
 2022-12-23 16:18:54 +01:00
c.lamboo
0ecfdd063d Show bottom border of material brands 
CURA-9522
 2022-12-23 16:12:25 +01:00
c.lamboo
5a8bf7f37b Fix material colors not showing up 
CURA-9522
 2022-12-23 16:11:06 +01:00
c.lamboo
92e6d5007f Remove unused property 
CURA-9793
 2022-12-23 14:21:12 +01:00
Casper Lamboo
15761b6c59
Code style 
CURA-9522
 2022-12-23 13:51:32 +01:00
Joey de l'Arago
e0a091e768 Add scrollview to nested material list 
CURA-6867
 2022-12-20 18:06:40 +01:00
Joey de l'Arago
d4679515b6 Add scrollview to material list 
CURA-6867
 2022-12-20 17:45:28 +01:00
Joey de l'Arago
7174861bba Move popups back on screen after opening them. 
CURA-6867
 2022-12-20 15:26:46 +01:00
Joey de l'Arago
4f4d2431fa The third nested popup will now always try to stay withen the vertical space of the root materials popup. 
See CURA-9522 for diagrams and more information.

CURA-9522
 2022-12-08 16:18:58 +01:00
Joey de l'Arago
4e8e5c2bf0 Merge remote-tracking branch 'origin/CURA-9622_unable_to_scroll_long_materials_list' into CURA-9622_unable_to_scroll_long_materials_list 2022-12-06 15:37:21 +01:00
Joey de l'Arago
3dff780215 Adjust location of popups so they align with their parent popup. 
CURA-9793
 2022-12-06 15:36:55 +01:00
Joey de l'Arago
e5baa6e2bf
Update resources/qml/Menus/MaterialBrandMenu.qml 
Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
 2022-12-06 15:18:32 +01:00
Joey de l'Arago
d2ff62485d Fix popups not maxing height at top of parent 
CURA-9793
 2022-12-05 16:18:03 +01:00
Joey de l'Arago
7185b898a3 remove comments 
CURA-9793
 2022-12-05 15:44:27 +01:00
Joey de l'Arago
bfb2b044bb nested popups will always try to take up the same vertical area as it's parent. If the popup is small than it's parent it won't go below or above the parent. If it is longer than the parent, the bottom will extend past the parent. 
CURA-9793
 2022-12-05 15:43:05 +01:00
c.lamboo
2440730e23 Fix bug in monitor page 
In commit b7fd75b2dd202f2516f9188e342eccc8a15ae6ab the component with id `printerTypeSelectorRow` was removed. As the `tabBar` element was anchored to this component the monitor page was broken. Fixed by anchoring to the component that was previously above `printerTypeSelectorRow`.

CURA-9665
 2022-09-21 11:23:05 +02:00
Jaime van Kessel
b7fd75b2dd
Remove broken UI element 
Seems to have been broken since the move to 5.x...
 2022-09-16 13:54:56 +02:00
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