mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-09-28 07:43:12 +08:00
Merge branch '4.11'
This commit is contained in:
Ghostkeeper
commit
d4751c6bc9
@ -172,7 +172,7 @@ Item
|
||||
anchors.horizontalCenter: communityColumn.horizontalCenter
|
||||
fillMode: Image.PreserveAspectFit
|
||||
width: UM.Theme.getSize("welcome_wizard_cloud_content_image").width
|
||||
source: UM.Theme.getIcon("Group", "high")
|
||||
source: UM.Theme.getIcon("People", "high")
|
||||
sourceSize.width: width
|
||||
sourceSize.height: height
|
||||
}
|
||||
|
||||
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
@ -332,7 +332,7 @@
|
||||
"size": "default"
|
||||
},
|
||||
"group": {
|
||||
"new_icon": "Group",
|
||||
"new_icon": "People",
|
||||
"size": "default"
|
||||
},
|
||||
"link": {
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
<svg width="48" height="48" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M37.35 23.74C38.4535 22.9288 39.2725 21.7898 39.6903 20.4855C40.108 19.1812 40.1031 17.7783 39.6762 16.477C39.2494 15.1756 38.4224 14.0424 37.3132 13.2389C36.2041 12.4355 34.8696 12.0029 33.5 12.0029C32.1304 12.0029 30.7959 12.4355 29.6868 13.2389C28.5776 14.0424 27.7506 15.1756 27.3238 16.477C26.8969 17.7783 26.892 19.1812 27.3098 20.4855C27.7275 21.7898 28.5465 22.9288 29.65 23.74C27.6874 24.5098 26.0036 25.8554 24.82 27.6C24.5 25.8474 23.7377 24.2055 22.6055 22.83C21.4732 21.4545 20.0084 20.3909 18.35 19.74C19.4535 18.9288 20.2725 17.7898 20.6903 16.4855C21.108 15.1812 21.1031 13.7783 20.6762 12.477C20.2494 11.1756 19.4224 10.0424 18.3132 9.23891C17.2041 8.43546 15.8696 8.00287 14.5 8.00287C13.1304 8.00287 11.7959 8.43546 10.6868 9.23891C9.57765 10.0424 8.75065 11.1756 8.32379 12.477C7.89692 13.7783 7.89201 15.1812 8.30975 16.4855C8.72749 17.7898 9.54654 18.9288 10.65 19.74C8.68848 20.5092 7.00454 21.8521 5.81817 23.5933C4.6318 25.3345 3.99815 27.393 4 29.5V40H6V29.5C6 27.2457 6.89554 25.0836 8.4896 23.4896C10.0837 21.8955 12.2457 21 14.5 21C16.7543 21 18.9164 21.8955 20.5104 23.4896C22.1045 25.0836 23 27.2457 23 29.5V40H25V33.5C25 31.2457 25.8955 29.0836 27.4896 27.4896C29.0837 25.8955 31.2457 25 33.5 25C35.7543 25 37.9164 25.8955 39.5104 27.4896C41.1045 29.0836 42 31.2457 42 33.5V40H44V33.5C44.0019 31.393 43.3682 29.3345 42.1818 27.5933C40.9955 25.8521 39.3115 24.5092 37.35 23.74ZM14.5 19C13.61 19 12.74 18.7361 11.9999 18.2416C11.2599 17.7471 10.6831 17.0443 10.3425 16.2221C10.002 15.3998 9.91284 14.495 10.0865 13.6221C10.2601 12.7492 10.6887 11.9474 11.318 11.318C11.9474 10.6887 12.7492 10.2601 13.6221 10.0865C14.495 9.91283 15.3998 10.0019 16.2221 10.3425C17.0443 10.6831 17.7472 11.2599 18.2416 11.9999C18.7361 12.74 19 13.61 19 14.5C18.9982 15.6929 18.5235 16.8365 17.68 17.68C16.8365 18.5235 15.6929 18.9982 14.5 19ZM33.5 23C32.61 23 31.74 22.7361 30.9999 22.2416C30.2599 21.7471 29.6831 21.0443 29.3425 20.2221C29.002 19.3998 28.9128 18.495 29.0865 17.6221C29.2601 16.7492 29.6887 15.9474 30.318 15.318C30.9474 14.6887 31.7492 14.2601 32.6221 14.0865C33.495 13.9128 34.3998 14.0019 35.2221 14.3425C36.0443 14.6831 36.7472 15.2599 37.2416 15.9999C37.7361 16.74 38 17.61 38 18.5C37.9982 19.6929 37.5235 20.8365 36.68 21.68C35.8365 22.5235 34.6929 22.9982 33.5 23Z" />
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 2.3 KiB |
3
resources/themes/cura-light/icons/high/People.svg
Normal file
3
resources/themes/cura-light/icons/high/People.svg
Normal file
@ -0,0 +1,3 @@
|
||||
<svg width="48" height="48" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M40.2213 26.7917C41.0056 26.131 41.5678 25.2451 41.8316 24.2542C42.0955 23.2632 42.0482 22.2151 41.6963 21.2519C41.3444 20.2887 40.7048 19.457 39.8643 18.8695C39.0238 18.282 38.0229 17.9672 36.9975 17.9677C35.972 17.9682 34.9715 18.284 34.1315 18.8723C33.2916 19.4607 32.6528 20.293 32.3019 21.2566C31.9509 22.2201 31.9047 23.2683 32.1696 24.259C32.4344 25.2497 32.9975 26.135 33.7824 26.7949C33.2484 27.068 32.7517 27.4087 32.3046 27.8085C31.131 26.4541 29.645 25.406 27.9752 24.7549C29.204 23.9072 30.1296 22.6888 30.6169 21.2777C31.1041 19.8666 31.1275 18.3367 30.6835 16.9113C30.2396 15.486 29.3516 14.24 28.1492 13.3551C26.9468 12.4703 25.4931 11.993 24.0002 11.993C22.5073 11.993 21.0536 12.4703 19.8512 13.3551C18.6488 14.24 17.7608 15.486 17.3169 16.9113C16.8729 18.3367 16.8963 19.8666 17.3835 21.2777C17.8708 22.6888 18.7964 23.9072 20.0252 24.7549C18.3554 25.406 16.8694 26.4541 15.6958 27.8085C15.2487 27.4087 14.752 27.068 14.218 26.7949C15.0029 26.135 15.566 25.2497 15.8308 24.259C16.0957 23.2683 16.0495 22.2201 15.6985 21.2566C15.3476 20.293 14.7088 19.4607 13.8689 18.8723C13.0289 18.284 12.0284 17.9682 11.0029 17.9677C9.97745 17.9672 8.97661 18.282 8.13608 18.8695C7.29555 19.457 6.65598 20.2887 6.30407 21.2519C5.95216 22.2151 5.90494 23.2632 6.16879 24.2542C6.43264 25.2451 6.99481 26.131 7.7791 26.7917C6.64142 27.3817 5.68744 28.2725 5.02109 29.3672C4.35473 30.4619 4.00154 31.7184 4 33V38H6V33C5.99866 32.0128 6.28998 31.0474 6.83713 30.2257C7.38429 29.404 8.16273 28.763 9.07409 28.3836C9.98545 28.0041 10.9888 27.9034 11.9574 28.094C12.926 28.2847 13.8164 28.7581 14.516 29.4546C13.5243 31.1344 13.0008 33.0493 13 35V40H15V35C15 32.6131 15.9482 30.3239 17.636 28.636C19.3239 26.9482 21.6131 26 24 26C26.3869 26 28.6761 26.9482 30.364 28.636C32.0518 30.3239 33 32.6131 33 35V40H35V35C34.9992 33.0493 34.4757 31.1344 33.484 29.4546C34.1836 28.7581 35.074 28.2847 36.0426 28.094C37.0112 27.9034 38.0146 28.0041 38.9259 28.3836C39.8373 28.763 40.6157 29.404 41.1629 30.2257C41.71 31.0474 42.0013 32.0128 42 33V37H44V33C43.9985 31.7185 43.6454 30.462 42.9791 29.3673C42.3128 28.2726 41.3589 27.3817 40.2213 26.7917ZM8 23C8 22.4067 8.17595 21.8266 8.50559 21.3333C8.83524 20.8399 9.30377 20.4554 9.85195 20.2284C10.4001 20.0013 11.0033 19.9419 11.5853 20.0576C12.1672 20.1734 12.7018 20.4591 13.1213 20.8787C13.5409 21.2982 13.8266 21.8328 13.9424 22.4147C14.0581 22.9967 13.9987 23.5999 13.7716 24.1481C13.5446 24.6962 13.1601 25.1648 12.6667 25.4944C12.1734 25.8241 11.5933 26 11 26C10.2046 25.9991 9.44206 25.6828 8.87964 25.1204C8.31722 24.5579 8.00087 23.7954 8 23ZM19 19C19 18.0111 19.2932 17.0444 19.8427 16.2221C20.3921 15.3999 21.173 14.759 22.0866 14.3806C23.0002 14.0022 24.0055 13.9031 24.9755 14.0961C25.9454 14.289 26.8363 14.7652 27.5355 15.4645C28.2348 16.1637 28.711 17.0546 28.9039 18.0245C29.0969 18.9945 28.9978 19.9998 28.6194 20.9134C28.241 21.827 27.6001 22.6079 26.7779 23.1573C25.9556 23.7068 24.9889 24 24 24C22.6744 23.9984 21.4035 23.4712 20.4662 22.5338C19.5288 21.5965 19.0016 20.3256 19 19ZM34 23C34 22.4067 34.1759 21.8266 34.5056 21.3333C34.8352 20.8399 35.3038 20.4554 35.852 20.2284C36.4001 20.0013 37.0033 19.9419 37.5853 20.0576C38.1672 20.1734 38.7018 20.4591 39.1213 20.8787C39.5409 21.2982 39.8266 21.8328 39.9424 22.4147C40.0581 22.9967 39.9987 23.5999 39.7716 24.1481C39.5446 24.6962 39.1601 25.1648 38.6667 25.4944C38.1734 25.8241 37.5933 26 37 26C36.2046 25.9991 35.4421 25.6828 34.8796 25.1204C34.3172 24.5579 34.0009 23.7954 34 23Z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 3.5 KiB |
Loading…
x
Reference in New Issue
Block a user