GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 09:09:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,257 Commits 292 Branches 265 Tags
Commit Graph

5329 Commits

Author SHA1 Message Date
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
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
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
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
Jaime van Kessel
2bad5c5cd3 Update the settings menu to controls 2 
CURA-8683
 2022-01-11 10:31:39 +01:00
Jaime van Kessel
770f6f94c9 Remove exclusive group comments 
CURA-8683
 2022-01-10 17:00:26 +01:00
Jaime van Kessel
052898ce21 Switch out the file, view and edit menu for controls 2 
CURA-8683
 2022-01-10 16:55:28 +01:00
Ghostkeeper
3e7b74954d
Indicate that Marketplace shouldn't get translated 2022-01-10 15:14:40 +01:00
Ghostkeeper
d966fe4811
Re-enable Czech translations 
These translations are complete again.

Contributes to issue CURA-8753.
 2022-01-10 15:07:23 +01:00
Jaime van Kessel
58a3aef8d4 Remove styles 2022-01-04 10:36:55 +01:00
Jaime van Kessel
722f928d12 Remove style from settingview 2022-01-04 10:30:07 +01:00
Jaime van Kessel
2aa931cbca Remove unneded styles import 2022-01-04 09:48:02 +01:00
Jaime van Kessel
f11d728c6b Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-01-03 15:32:58 +01:00
Jaime van Kessel
7deeb26e13 Merge branch 'marketplace_redesign' of github.com:Ultimaker/Cura into CURA-8588_replace_toolbox_with_marketplace 2022-01-03 11:32:06 +01:00
Jaime van Kessel
7692a6db78
Merge pull request #11165 from Ultimaker/8658_Implement_Notifications_for_the_new_marketplace 
8658 implement notifications for the new marketplace
 2022-01-03 10:18:20 +01:00
Jaime van Kessel
c92fcc8e03 Simplify the notifaction icon logic 
CURA-8658
 2022-01-03 10:14:22 +01:00
Ghostkeeper
a878cfae7a
Merge branch 'master' into marketplace_redesign 2021-12-31 14:07:51 +01:00
Ghostkeeper
05bbebf2f7
Remove traces of Shapely 
It's been replaced by Pyclipper. We were only importing Shapely here, not actually using it.

Contributes to issue CURA-8592.
 2021-12-31 14:06:31 +01:00
Remco Burema
1cdeaffab7
Make new Marktetplace react to 'get more materials'. 
part of CURA-8588
 2021-12-30 11:53:42 +01:00
Remco Burema
b794ad6ed2
Delete old 'Toolbox' in favour of new Marketplace. 
part of CURA-8588
 2021-12-30 11:51:54 +01:00
fvrmr
6962ecdf01 Update material sync link 
Changed link how to load material profiles via usb
 2021-12-17 10:24:18 +01:00