12221 commits

Author	SHA1	Message	Date
Ghostkeeper	ae81b5e3e7	Fix flickable with custom scrollbar ... A bit of a hassle with the scrollbar overlapping the background here. Contributes to issue CURA-8686.	2022-01-18 18:13:13 +01:00
Ghostkeeper	1cc3aecd8c	Use correct scrollbar and clip contents ... We've not been clipping this for so long, but the text really does overlap with the label and the buttons if we don't (and the text is sufficiently large). Contributes to issue CURA-8686.	2022-01-18 17:56:31 +01:00
Ghostkeeper	c605b45b7c	Use styled scroll bar, and no ScrollView ... Make sure the text aligns next to the scrollbar instead of behind it, too. Contributes to issue CURA-8686.	2022-01-18 17:51:37 +01:00
Ghostkeeper	f808f5f545	Merge branch 'replace_controls_1_for_controls_2' into CURA-8686_views_controls2	2022-01-18 17:20:37 +01:00
Ghostkeeper	dbb2bce157	Fix icon name with Controls 2 action ... The text above this icon name got changed in master, which led to a minor merge conflict here that wasn't discovered.	2022-01-18 17:19:52 +01:00
Ghostkeeper	e0a6cb3383	Merge branch 'master' into replace_controls_1_for_controls_2 ... Conflicts: resources/qml/Actions.qml -> Translation fixes on master, while the QML elements were changed here for Controls2.	2022-01-18 17:17:10 +01:00
Jelle Spijker	74829f5642	Merge pull request #11196 from Ultimaker/CURA-8592_python_3.10 ... Upgrade to Python 3.10	2022-01-18 12:26:45 +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
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	288aeec2db	Disable menuItems if they aren't visible ... This prevents the shortcuts from breaking	2022-01-17 15:32:27 +01:00
Jaime van Kessel	901f6c4b63	Fix ctrl+shift+s shortcut	2022-01-17 15:06:32 +01:00
Jaime van Kessel	3e4c171603	Simplify the OpenFilesMenu ... CURA-8683	2022-01-17 11:09:42 +01:00
Ghostkeeper	348abad6eb	Fix maximumWidth properties on ActionButtons ... Turns out this wasn't really functional. We didn't use it. Now we use it for the MessageStack. Contributes to issue CURA-8682.	2022-01-14 19:43:44 +01:00
Ghostkeeper	b5e7a60a8a	Fix scaling of language and theme drop-downs with width ... The width was unknown because it's all in a scrollview that could have an infinite width. I now fixed it to scale with the viewport's width. Contributes to issue CURA-8682.	2022-01-14 19:43:43 +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	4db8878317	Fix ordering of material menu selection ... CURA-8683	2022-01-14 14:33:46 +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
Jaime van Kessel	bab9311284	Fix opening of marketplace button ... CURA-8684	2022-01-14 13:14:15 +01:00
Jaime van Kessel	38e20fd90b	Fix menuItem not hiding correctly ... CURA-8693	2022-01-14 13:09:59 +01:00
Casper Lamboo	404e02d585	Merge pull request #11251 from Ultimaker/CURA-8868_raft_interface_extruder ... Raft Extruders	2022-01-14 09:11:07 +01:00
Casper Lamboo	732aefedbb	Change label to "Raft Top Extruder" ... To be consistent with Cura's terminology	2022-01-14 09:05:18 +01:00
Ghostkeeper	69d3f0e6f6	Add missing default_value and settable_per_mesh ... Default_value is a required property. Maybe we should have a test for this. Done as a 5 minute fix. Fixes Ultimaker/CuraEngine#1549.	2022-01-13 12:02:59 +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	94c006009b	Remove debug code ... CURA-8683	2022-01-13 09:06:22 +01:00
Jaime van Kessel	bf65f77310	Merge branch 'CURA-8683_replace_controls_windows_and_menus' of github.com:Ultimaker/Cura into CURA-8683_replace_controls_windows_and_menus	2022-01-12 16:01:19 +01:00
Jaime van Kessel	94c71704db	Add clarifying comment about why something is added at index 5> ... CURA-8683	2022-01-12 16:00:32 +01:00
Jaime van Kessel	f44d4d341f	Apply suggestions from code review ... Minor codestyle issues CURA-8683 Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>	2022-01-12 15:57:20 +01:00
Ghostkeeper	a363bda25e	Add raft top extruder to expert settings ... You could want to change that if you're an expert. The skirt/brim extruder is really only relevant for the prime tower brim if you're using a raft. If not using a raft, setting the adhesion extruder is equivalent. Contributes to issue CURA-8868.	2022-01-12 14:12:06 +01:00
Ghostkeeper	262a005e54	Get extruder values from appropriate sub-adhesion-extruder ... The adhesion extruder is now split up into multiple sub-settings. Where applicable to the brim or skirt, get it from the skirt/brim extruder. Where applicable to a specific part of the raft, get it from that part's extruder. Where applicable to the whole raft, get it from the adhesion extruder. Contributes to issue CURA-8868.	2022-01-12 13:52:47 +01:00
Ghostkeeper	824c9fd837	Add new raft extruder settings ... We want to be able to print the layers of the raft with different extruders. To this end, we'll make sub-settings of the adhesion extruder that allow setting the extruder for each part of the raft differently from the rest. Contributes to issue CURA-8868.	2022-01-12 13:43:10 +01:00
Ghostkeeper	5eee9958a0	Case-insensitive visibility checking for printers ... In Qt's ListModel, the section headers collect items case-insensitively. However, when checking whether a printer should be visible (when the section header is expanded) was still checked case-sensitively. As a result, it was hiding all printers that did not use the same casing in its manufacturer name, e.g. FlashForge vs. Flashforge. Fixes #11125.	2022-01-11 16:29:40 +01:00
Ghostkeeper	66648ca611	Merge branch '4.13'	2022-01-11 14:12:04 +01:00
Ghostkeeper	020b8f7510	More consistent header for change log	2022-01-11 13:24:29 +01:00
Jaime van Kessel	59479ee223	Fix checked property for materials menu ... CURA-8683	2022-01-11 12:09:24 +01:00
Jaime van Kessel	6644bff2be	Fix some QML warnings on closing Cura ... CURA-8683	2022-01-11 11:52:43 +01:00
Jaime van Kessel	3d0e71fe7e	Remove unused import	2022-01-11 11:44:59 +01:00
Jaime van Kessel	f8906597e5	Update menu for PrinterType button ... CURA-8683	2022-01-11 11:43:01 +01:00
Jaime van Kessel	b30ad58f91	Update context menu to controls 2 ... CURA-8683	2022-01-11 11:36:34 +01:00
Jaime van Kessel	70209aa728	Use the regular menu for extensions ... It seems that the extra logic doesn't play well with a menu bar. Since we don't need to make this menu invisible ever, there is no need for the extra logic to hide it. As such we can just use the regular menu CURA-8683	2022-01-11 11:26:26 +01:00
Jaime van Kessel	0bd0f09437	Remove unused component ... CURA-8683	2022-01-11 11:26:05 +01:00
Jaime van Kessel	29c9322fc8	Add background to application menu ... CURA-8683	2022-01-11 11:16:40 +01:00
Jaime van Kessel	6cde2d028b	Convert preferences & help menu to controls 2 ... CURA-8683	2022-01-11 11:10:12 +01:00
Jaime van Kessel	d1461c5d7f	Add extension menu to application menu ... CURA-8683	2022-01-11 11:07:12 +01:00
Ghostkeeper	c328f3619d	Added bugfix for QT_PLUGIN_PATH	2022-01-11 10:43:44 +01:00
Jaime van Kessel	2bad5c5cd3	Update the settings menu to controls 2 ... CURA-8683	2022-01-11 10:31:39 +01:00
Ghostkeeper	f3c3f3187e	Merge branch '4.13'	2022-01-11 10:05:15 +01:00