mirror of
https://git.ryujinx.app/ryubing/ryujinx.git
synced 2025-12-12 22:36:59 +00:00
More Adjustments
This commit is contained in:
_Neo_
parent
7c8b28ead3
commit
a849d17906
11 changed files with 14 additions and 771 deletions
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 67 KiB |
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 23 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 65 KiB |
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 54 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 74 KiB |
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 32 KiB |
85
src/Ryujinx/Assets/Icons/Controller_ProCon.svg
Normal file → Executable file
85
src/Ryujinx/Assets/Icons/Controller_ProCon.svg
Normal file → Executable file
|
|
@ -1,84 +1 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 996.25 690.92">
|
||||
<defs>
|
||||
<style>
|
||||
.cls-1 {
|
||||
stroke: #fff;
|
||||
stroke-miterlimit: 10;
|
||||
stroke-width: 2px;
|
||||
}
|
||||
|
||||
.cls-1, .cls-2 {
|
||||
fill: #444542;
|
||||
}
|
||||
|
||||
.cls-3 {
|
||||
fill: #3b3b3b;
|
||||
}
|
||||
|
||||
.cls-3, .cls-4, .cls-2, .cls-5, .cls-6, .cls-7 {
|
||||
stroke-width: 0px;
|
||||
}
|
||||
|
||||
.cls-4 {
|
||||
fill: #3b3c3a;
|
||||
}
|
||||
|
||||
.cls-5 {
|
||||
fill: #454644;
|
||||
}
|
||||
|
||||
.cls-6 {
|
||||
fill: #20221f;
|
||||
}
|
||||
|
||||
.cls-7 {
|
||||
fill: #121212;
|
||||
}
|
||||
</style>
|
||||
</defs>
|
||||
<g id="Front">
|
||||
<path id="Right_Grip" data-name="Right Grip" class="cls-6" d="m739.17,492.09c34,28.2,27.6,35.9,68.5,108.5,36.7,74.7,64.4,104.4,125.1,84.1h0c95.3-57.9,59.3-145.3,43.6-275.2-10-60.6-35.6-190.3-35.6-190.3l-201.6,272.9Z"/>
|
||||
<path id="Left_Grip" data-name="Left Grip" class="cls-6" d="m55.47,219.19s-25.6,129.7-35.6,190.3c-15.7,129.9-51.7,217.2,43.6,275.1h0c60.8,20.3,88.4-9.4,125.1-84.1,40.9-72.7,34.5-80.3,68.5-108.5L55.47,219.19Z"/>
|
||||
<path id="Right_Bumper" data-name="Right Bumper" class="cls-3" d="m649.47,19.99c10.1-4.3,39.7-22.5,58.7-19.7,59.5.9,166.7,17.7,172.6,81.2"/>
|
||||
<path id="Left_Bumper" data-name="Left Bumper" class="cls-3" d="m115.57,81.49C121.47,18.09,228.57,1.29,288.17.29c19-2.8,48.6,15.4,58.7,19.7"/>
|
||||
<path id="Background" class="cls-7" d="m739.17,492.09c35.5-30.8,68.5-74.7,96-113.5,26.9-36.3,94.7-136.7,105.6-159.3,0-2.4-6.3-30.1-12.8-56.2C892.27,3.49,675.37,19.69,498.17,19.69S104.07,3.49,68.27,162.99c-6.5,26-12.8,53.8-12.8,56.2,10.9,22.6,78.8,123,105.6,159.3,27.5,38.8,60.5,82.8,96,113.5"/>
|
||||
<g id="Directional_Pad" data-name="Directional Pad">
|
||||
<path id="Background-2" data-name="Background" class="cls-2" d="m439.37,325.09h-40c-2.8,0-5-2.2-5-5v-40c0-2.8-2.2-5-5-5h-30c-2.8,0-5,2.2-5,5v40c0,2.8-2.2,5-5,5h-40c-2.8,0-5,2.2-5,5v30c0,2.8,2.2,5,5,5h40c2.8,0,5,2.2,5,5v40c0,2.8,2.2,5,5,5h30c2.8,0,5-2.2,5-5v-40c0-2.8,2.2-5,5-5h40c2.8,0,5-2.2,5-5v-30c0-2.7-2.2-5-5-5Z"/>
|
||||
</g>
|
||||
<g id="R_Thumbstick" data-name="R Thumbstick">
|
||||
<circle id="Background-3" data-name="Background" class="cls-6" cx="623.77" cy="345.09" r="55"/>
|
||||
<circle id="Stick" class="cls-1" cx="623.77" cy="345.09" r="45"/>
|
||||
</g>
|
||||
<g id="L_Thumbstick" data-name="L Thumbstick">
|
||||
<circle id="Background-4" data-name="Background" class="cls-6" cx="213.37" cy="206.39" r="55"/>
|
||||
<circle id="Stick-2" data-name="Stick" class="cls-1" cx="213.37" cy="206.39" r="45" transform="translate(-24.53 383.95) rotate(-80.78)"/>
|
||||
</g>
|
||||
<g id="Minus_Button" data-name="Minus Button">
|
||||
<circle id="_Background" data-name=" Background" class="cls-5" cx="374.17" cy="130.89" r="22.5"/>
|
||||
</g>
|
||||
<g id="Plus_Button" data-name="Plus Button">
|
||||
<circle id="_Background-2" data-name=" Background" class="cls-5" cx="623.57" cy="131.19" r="22.5"/>
|
||||
</g>
|
||||
<g id="Home_Button" data-name="Home Button">
|
||||
<circle id="_Background-3" data-name=" Background" class="cls-5" cx="578.57" cy="206.39" r="22.5"/>
|
||||
</g>
|
||||
<g id="Capture_Button" data-name="Capture Button">
|
||||
<path class="cls-5" d="m441.77,228.09h-30c-2.8,0-5-2.2-5-5v-29.5c0-2.8,2.2-5,5-5h30c2.8,0,5,2.2,5,5v29.5c0,2.7-2.2,5-5,5Z"/>
|
||||
</g>
|
||||
<g id="Buttons">
|
||||
<g id="A_Button" data-name="A Button">
|
||||
<circle id="Background-5" data-name="Background" class="cls-4" cx="837.07" cy="206.39" r="35"/>
|
||||
</g>
|
||||
<g id="X_Button" data-name="X Button">
|
||||
<circle id="Background-6" data-name="Background" class="cls-4" cx="767.07" cy="136.39" r="35"/>
|
||||
</g>
|
||||
<g id="Y_Button" data-name="Y Button">
|
||||
<circle id="Background-7" data-name="Background" class="cls-4" cx="697.07" cy="206.39" r="35"/>
|
||||
</g>
|
||||
<g id="B_Button" data-name="B Button">
|
||||
<circle id="Background-8" data-name="Background" class="cls-4" cx="767.07" cy="276.39" r="35"/>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
<svg enable-background="new 0 0 1050 1050.5" viewBox="0 0 1050 1050.5" xmlns="http://www.w3.org/2000/svg"><path d="m766 850.5c34 28.2 27.6 35.9 68.5 108.5 36.7 74.7 64.4 104.4 125.1 84.1 95.3-57.9 59.3-145.3 43.6-275.2-10-60.6-35.6-190.3-35.6-190.3z" fill="#20221f"/><path d="m82.3 577.6s-25.6 129.7-35.6 190.3c-15.7 129.9-51.7 217.2 43.6 275.1 60.8 20.3 88.4-9.4 125.1-84.1 40.9-72.7 34.5-80.3 68.5-108.5z" fill="#20221f"/><path d="m676.3 378.4c10.1-4.3 39.7-22.5 58.7-19.7 59.5.9 166.7 17.7 172.6 81.2" fill="#3b3b3b"/><path d="m142.4 439.9c5.9-63.4 113-80.2 172.6-81.2 19-2.8 48.6 15.4 58.7 19.7" fill="#3b3b3b"/><path d="m766 850.5c35.5-30.8 68.5-74.7 96-113.5 26.9-36.3 94.7-136.7 105.6-159.3 0-2.4-6.3-30.1-12.8-56.2-35.7-159.6-252.6-143.4-429.8-143.4-177.4 0-394.1-16.2-429.9 143.3-6.5 26-12.8 53.8-12.8 56.2 10.9 22.6 78.8 123 105.6 159.3 27.5 38.8 60.5 82.8 96 113.5" fill="#121212"/><path d="m466.2 683.5h-40c-2.8 0-5-2.2-5-5v-40c0-2.8-2.2-5-5-5h-30c-2.8 0-5 2.2-5 5v40c0 2.8-2.2 5-5 5h-40c-2.8 0-5 2.2-5 5v30c0 2.8 2.2 5 5 5h40c2.8 0 5 2.2 5 5v40c0 2.8 2.2 5 5 5h30c2.8 0 5-2.2 5-5v-40c0-2.8 2.2-5 5-5h40c2.8 0 5-2.2 5-5v-30c0-2.7-2.2-5-5-5z" fill="#444542"/><g fill="#fff"><path d="m393.7 746h15l-7.5 15z"/><path d="m358.7 696v15l-15-7.5z"/><path d="m408.7 661h-15l7.5-15z"/><path d="m443.7 711v-15l15 7.5z"/></g><circle cx="650.6" cy="703.5" fill="#20221f" r="55"/><circle cx="650.6" cy="703.5" fill="#444542" r="45" stroke="#fff" stroke-miterlimit="10" stroke-width="2"/><circle cx="240.2" cy="564.8" fill="#20221f" r="55"/><circle cx="240.2" cy="564.8" fill="#444542" r="45" stroke="#fff" stroke-miterlimit="10" stroke-width="2"/><circle cx="401" cy="489.3" fill="#454644" r="22.5"/><path d="m386.2 491.8v-5h30v5" fill="#fff"/><circle cx="650.4" cy="489.6" fill="#454644" r="22.5"/><path d="m665.6 487.1h-12.5v-12.7h-5v12.7h-12.5v5h12.5v12.3h5v-12.3h12.5z" fill="#fff"/><circle cx="605.4" cy="564.8" fill="#454644" r="22.5"/><path d="m605.4 549.8-15 15h5v15h20v-15h5zm5 25h-10v-10h10z" fill="#fff"/><path d="m468.6 586.5h-30c-2.8 0-5-2.2-5-5v-29.5c0-2.8 2.2-5 5-5h30c2.8 0 5 2.2 5 5v29.5c0 2.7-2.2 5-5 5z" fill="#454644"/><circle cx="453.6" cy="566.7" fill="#454644" r="15" stroke="#fff" stroke-miterlimit="10" stroke-width="2"/><circle cx="863.9" cy="564.8" fill="#3b3c3a" r="35"/><text fill="#fff" font-family="'Helvetica-Bold'" font-size="40" transform="translate(849.4224 578.6607)">A</text><circle cx="793.9" cy="494.8" fill="#3b3c3a" r="35"/><text fill="#fff" font-family="'Helvetica-Bold'" font-size="40" transform="translate(780.5266 508.6604)">X</text><circle cx="723.9" cy="564.8" fill="#3b3c3a" r="35"/><text fill="#fff" font-family="'Helvetica-Bold'" font-size="40" transform="translate(710.5263 578.661)">Y</text><circle cx="793.9" cy="634.8" fill="#3b3c3a" r="35"/><text fill="#fff" font-family="'Helvetica-Bold'" font-size="40" transform="translate(780.9706 648.6605)">B</text><path d="m219.2 78.5c-12.5-17.6-25.9-42.3-45.6-58.6-20.1-16.6-61.5-24.6-86.5-14.1-13.9 5.8-33.4 33.1-42.7 52.8-10.5 22.3-14 51.3-12.4 82.8 1.2 25.1 5.3 51.7 14.2 78.6 0 0 14.3 53.8 42.8 80.8 11.2 10.6 35 26.6 35 26.6l116-217.5s-15.4-23.7-20.8-31.4z" fill="#20221f"/><path d="m828.6 78.5c12.5-17.6 25.9-42.3 45.6-58.6 20.1-16.6 61.4-24.5 86.5-14.1 13.9 5.8 33.4 33.1 42.7 52.8 10.5 22.3 13.9 51.3 12.4 82.8-1.2 25.1-5.3 51.7-14.2 78.6 0 0-14.3 53.8-42.8 80.8-11.2 10.6-35 26.6-35 26.6l-116-217.5s15.4-23.7 20.8-31.4z" fill="#20221f"/><path d="m866 122.2c66.3 18.7 85.1 128.8 69 186-2.5 54.2-148.9 15.3-265.1 31.2-41.1 1.7-91.8 2.4-145.9 2.3-54.1 0-104.8-.6-145.9-2.3-116.2-15.9-262.6 23.1-265.1-31.2-16.1-57.1 2.6-167.3 69-186l60.5-18.8 38.9-1.9c40.2.1 142.8 0 242.7 0s202.4.1 242.7 0l38.9 1.9z" fill="#0d0d0a"/><path d="m145.9 239.2c15.2-97.4 38.1-147.2 141.7-137 8.2 16.4 43.3 83 50.6 105.7-57.6 19.3-133.5 17.7-192.3 31.3z" fill="#3b3b3b"/><text fill="#fff" font-family="'Helvetica-Bold'" font-size="40" transform="matrix(1.0139 0 0 1 218.3906 179.3992)">ZL</text><path d="m716.2 207.9c7.4-22.7 42.5-89.3 50.6-105.7 103.7-10.2 126.5 39.6 141.7 137-58.7-13.6-134.7-12-192.3-31.3z" fill="#3b3b3b"/><text fill="#fff" font-family="'Helvetica-Bold'" font-size="40" transform="matrix(1.0139 0 0 1 784.2356 179.3992)">ZR</text><path d="m664 318.5c7-10.1 27.8-78.4 45.4-78.7 331.4 3.9 187.7 94.2-45.4 78.7z" fill="#3b3b3b"/><text fill="#fff" font-family="'Helvetica-Bold'" font-size="40" transform="translate(769.6461 292.8947)">R</text><path d="m340.6 238.6c17.6.3 38.4 68.6 45.4 78.7-233.1 15.5-376.8-74.7-45.4-78.7z" fill="#3b3b3b"/><text fill="#fff" font-family="'Helvetica-Bold'" font-size="40" transform="translate(253.7327 291.7279)">L</text></svg>
|
||||
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 4.5 KiB |
|
|
@ -0,0 +1 @@
|
|||
<svg height="1000" viewBox="0 0 1000 1000" width="1000" xmlns="http://www.w3.org/2000/svg"><path d="m741 647c34 28.200012 27.599976 35.900024 68.5 108.5 36.700012 74.699951 64.400024 104.400024 125.099976 84.099976 95.300048-57.899964 59.300048-145.299988 43.600036-275.199952-10-60.600036-35.600036-190.300048-35.600036-190.300048z" fill="#20221f"/><path d="m57.300003 374.099976s-25.600002 129.700012-35.600002 190.300048c-15.700001 129.899964-51.700001 217.199952 43.600002 275.099976 60.800003 20.300049 88.399994-9.400024 125.099991-84.099976 40.899994-72.700012 34.5-80.300048 68.5-108.5z" fill="#20221f"/><path d="m651.299988 174.900024c10.100036-4.300048 39.700012-22.5 58.700012-19.700012 59.5.899964 166.700012 17.700012 172.599976 81.200012" fill="#3b3b3b"/><path d="m117.399994 236.400024c5.900009-63.400024 113-80.200012 172.600006-81.200012 19-2.799988 48.600006 15.399964 58.700012 19.700012" fill="#3b3b3b"/><path d="m741 647c35.5-30.799988 68.5-74.700012 96-113.5 26.900024-36.299988 94.700012-136.700012 105.599976-159.299988 0-2.400024-6.299988-30.100036-12.799988-56.200012-35.700012-159.599976-252.599976-143.400024-429.799988-143.400024-177.399994 0-394.100006-16.199952-429.900002 143.300048-6.5 26-12.799995 53.799988-12.799995 56.199952 10.899994 22.600036 78.800003 123 105.599991 159.300048 27.5 38.799988 60.5 82.799988 96 113.5" fill="#121212"/><path d="m441.200012 480h-40c-2.800018 0-5-2.200012-5-5v-40c0-2.799988-2.200012-5-5-5h-30c-2.800018 0-5 2.200012-5 5v40c0 2.799988-2.200012 5-5 5h-40c-2.800018 0-5 2.200012-5 5v30c0 2.799988 2.199982 5 5 5h40c2.799988 0 5 2.200012 5 5v40c0 2.799988 2.199982 5 5 5h30c2.799988 0 5-2.200012 5-5v-40c0-2.799988 2.199982-5 5-5h40c2.799988 0 5-2.200012 5-5v-30c0-2.700012-2.200012-5-5-5z" fill="#444542"/><g fill="#fff"><path d="m368.700012 542.5h15l-7.5 15z"/><path d="m333.700012 492.5v15l-15-7.5z"/><path d="m383.700012 457.5h-15l7.5-15z"/><path d="m418.700012 507.5v-15l15 7.5z"/></g><path d="m680.599976 500c0 30.375671-24.624329 55-55 55-30.375611 0-55-24.624329-55-55s24.624389-55 55-55c30.375671 0 55 24.624329 55 55z" fill="#20221f"/><path d="m670.599976 500c0 24.852844-20.147156 45-45 45-24.852784 0-45-20.147156-45-45s20.147216-45 45-45c24.852844 0 45 20.147156 45 45z" fill="#444542" stroke="#fff" stroke-width="2"/><path d="m270.200012 361.299988c0 30.375671-24.624359 55-55.000015 55s-55-24.624329-55-55c0-30.375672 24.624344-55 55-55s55.000015 24.624328 55.000015 55z" fill="#20221f"/><path d="m260.200012 361.299988c0 24.852844-20.147186 45-45.000015 45-24.852814 0-45-20.147156-45-45 0-24.852783 20.147186-45 45-45 24.852829 0 45.000015 20.147217 45.000015 45z" fill="#444542" stroke="#fff" stroke-width="2"/><path d="m398.5 285.799988c0 12.426452-10.073578 22.5-22.5 22.5s-22.5-10.073548-22.5-22.5c0-12.426392 10.073578-22.5 22.5-22.5s22.5 10.073608 22.5 22.5z" fill="#454644"/><path d="m361.200012 288.299988v-5h30v5" fill="#fff"/><path d="m647.900024 286.099976c0 12.426391-10.073608 22.5-22.5 22.5-12.426452 0-22.5-10.073609-22.5-22.5 0-12.426392 10.073548-22.5 22.5-22.5 12.426392 0 22.5 10.073608 22.5 22.5z" fill="#454644"/><path d="m640.599976 283.599976h-12.5v-12.699952h-5v12.699952h-12.5v5h12.5v12.300048h5v-12.300048h12.5z" fill="#fff"/><path d="m602.900024 361.299988c0 12.426391-10.073608 22.5-22.5 22.5-12.426452 0-22.5-10.073609-22.5-22.5 0-12.426392 10.073548-22.5 22.5-22.5 12.426392 0 22.5 10.073608 22.5 22.5z" fill="#454644"/><path d="m580.400024 346.299988-15 15h5v15h20v-15h5zm5 25h-10v-10h10z" fill="#fff"/><path d="m443.600006 383h-30c-2.800018 0-5-2.200012-5-5v-29.5c0-2.799988 2.199982-5 5-5h30c2.799988 0 5 2.200012 5 5v29.5c0 2.700012-2.200012 5-5 5z" fill="#454644"/><path d="m443.600006 363.200012c0 8.284241-6.715729 15-15 15s-15-6.715759-15-15c0-8.284302 6.715729-15 15-15s15 6.715698 15 15z" fill="#454644" stroke="#fff" stroke-width="2"/><path d="m873.900024 361.299988c0 19.329956-15.670044 35-35 35-19.330017 0-35-15.670044-35-35s15.669983-35 35-35c19.329956 0 35 15.670044 35 35z" fill="#3b3c3a"/><text fill="#fff" font-family="Helvetica" font-size="40" font-weight="700" x="823" y="377">A</text><path d="m803.900024 291.299988c0 19.329956-15.670044 35-35 35-19.330017 0-35-15.670044-35-35s15.669983-35 35-35c19.329956 0 35 15.670044 35 35z" fill="#3b3c3a"/><text fill="#fff" font-family="Helvetica" font-size="40" font-weight="700" x="755" y="307">X</text><path d="m733.900024 361.299988c0 19.329956-15.670044 35-35 35-19.330017 0-35-15.670044-35-35s15.669983-35 35-35c19.329956 0 35 15.670044 35 35z" fill="#3b3c3a"/><text fill="#fff" font-family="Helvetica" font-size="40" font-weight="700" x="685" y="377">Y</text><path d="m803.900024 431.299988c0 19.329956-15.670044 35-35 35-19.330017 0-35-15.670044-35-35s15.669983-35 35-35c19.329956 0 35 15.670044 35 35z" fill="#3b3c3a"/><text fill="#fff" font-family="Helvetica" font-size="40" font-weight="700" x="755" y="447">B</text></svg>
|
||||
|
After Width: | Height: | Size: 4.8 KiB |
|
|
@ -78,7 +78,7 @@ namespace Ryujinx.Ava.UI.Applet
|
|||
title,
|
||||
message,
|
||||
string.Empty,
|
||||
LocaleManager.Instance[LocaleKeys.DialogOpenSettingsWindowLabel],
|
||||
LocaleManager.Instance[LocaleKeys.Settings],
|
||||
string.Empty,
|
||||
LocaleManager.Instance[LocaleKeys.SettingsButtonClose],
|
||||
(int)Symbol.Important,
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@
|
|||
Name="SaveButton"
|
||||
MinWidth="90"
|
||||
Command="{Binding OpenSettingsWindow}">
|
||||
<TextBlock Text="{ext:Locale DialogOpenSettingsWindowLabel}" />
|
||||
<TextBlock Text="{ext:Locale Settings}" />
|
||||
</Button>
|
||||
<Button
|
||||
Name="CancelButton"
|
||||
|
|
|
|||
|
|
@ -16,10 +16,10 @@ namespace Ryujinx.Ava.UI.Applet
|
|||
{
|
||||
internal partial class ControllerAppletDialog : UserControl
|
||||
{
|
||||
private const string ProControllerResource = "Ryujinx/Assets/Icons/Controller_ProCon.svg";
|
||||
private const string JoyConPairResource = "Ryujinx/Assets/Icons/Controller_JoyConPair.svg";
|
||||
private const string JoyConLeftResource = "Ryujinx/Assets/Icons/Controller_JoyConLeft.svg";
|
||||
private const string JoyConRightResource = "Ryujinx/Assets/Icons/Controller_JoyConRight.svg";
|
||||
private const string ProControllerResource = "Ryujinx/Assets/Icons/Controller_ProCon_Simplified.svg";
|
||||
private const string JoyConPairResource = "Ryujinx/Assets/Icons/Controller_JoyConPair_Simplified.svg";
|
||||
private const string JoyConLeftResource = "Ryujinx/Assets/Icons/Controller_JoyConLeft_Simplified.svg";
|
||||
private const string JoyConRightResource = "Ryujinx/Assets/Icons/Controller_JoyConRight_Simplified.svg";
|
||||
|
||||
public static SvgImage ProControllerImage => GetResource(ProControllerResource);
|
||||
public static SvgImage JoyconPairImage => GetResource(JoyConPairResource);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue