diff --git a/3rdparty/include/IconsPromptFont.h b/3rdparty/include/IconsPromptFont.h index 455d5131001de7..9017663c2f61b5 100644 --- a/3rdparty/include/IconsPromptFont.h +++ b/3rdparty/include/IconsPromptFont.h @@ -330,6 +330,7 @@ #define ICON_PF_ACHIEVEMENTS_PROGRESSION "\xE2\x8E\xB2" #define ICON_PF_ACHIEVEMENTS_MISSABLE "\xE2\x8E\xB3" #define ICON_PF_ACHIEVEMENTS_WIN "\xE2\x8E\xB4" +#define ICON_PF_DUMBELL "\xE2\x8E\xB5" #define ICON_PF_POPN_CONTROLLER "\xE2\x8A\xBF" #define ICON_PF_POPN_BLUE_LEFT "\xE2\x8B\x80" #define ICON_PF_POPN_BLUE_RIGHT "\xE2\x8B\x81" @@ -341,3 +342,24 @@ #define ICON_PF_POPN_WHITE_RIGHT "\xE2\x8B\x87" #define ICON_PF_POPN_RED "\xE2\x8B\x88" #define ICON_PF_SLOW_MOTION "\xE2\x8D\xBA" +#define ICON_PF_CONTROLLER_VIBRATION "\xE2\x88\x9A" +#define ICON_PF_MICROCHIP_ALT "\xE2\x8D\x9D" +#define ICON_PF_MICROCHIP "\xE2\x8D\x9E" +#define ICON_PF_INFINITY "\xE2\x8D\x9B" +#define ICON_PF_GAMEPAD_ALT "\xE2\x8D\xA0" +#define ICON_PF_KEYBOARD_ALT "\xE2\x8D\xA1" +#define ICON_PF_DOWNLOAD "\xE2\x8D\xA2" +#define ICON_PF_UPLOAD "\xE2\x8D\xA3" +#define ICON_PF_MEMORY_CARD "\xE2\x8D\xA4" +#define ICON_PF_SOUND "\xE2\x8D\xA5" +#define ICON_PF_PICTURE "\xE2\x8D\xA6" +#define ICON_PF_ISOMETRIC_CUBE "\xE2\xAC\x9B" +#define ICON_PF_SNOOZE "\xE2\x8D\xBB" +#define ICON_PF_HEARTBEAT_CIRCLE "\xE2\x8D\xBC" +#define ICON_PF_HEARTBEAT_ALT "\xE2\x8D\xBD" +#define ICON_PF_HEARTBEAT_MAG "\xE2\x8D\xBE" +#define ICON_PF_MONITOR_CODE "\xE2\x8D\xBF" +#define ICON_PF_SIXTY_CIRCLE "\xE2\x8E\x80" +#define ICON_PF_SPEAKER_ALT "\xE2\x8D\xA7" +#define ICON_PF_THUNDERBOLT "\xE2\x8D\x9C" +#define ICON_PF_BACKWARD "\xE2\x8F\x8C" diff --git a/3rdparty/promptfont/promptfont.sfd b/3rdparty/promptfont/promptfont.sfd index d5ae807089f11e..d8b1ca4855ec16 100644 --- a/3rdparty/promptfont/promptfont.sfd +++ b/3rdparty/promptfont/promptfont.sfd @@ -23,7 +23,7 @@ OS2Version: 0 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 0 CreationTime: 1544355305 -ModificationTime: 1707742149 +ModificationTime: 1708008455 PfmFamily: 33 TTFWeight: 400 TTFWidth: 5 @@ -77,7 +77,7 @@ StemSnapV 13 [140 180 200] ForceBold 4 true EndPrivate TeXData: 1 0 0 335544 167772 111848 513802 1048576 111848 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 1114112 723 +BeginChars: 1114112 729 StartChar: exclam Encoding: 33 33 0 @@ -34683,88 +34683,165 @@ EndChar StartChar: uni2380 Encoding: 9088 9088 721 Width: 1000 -Flags: W -HStem: -209.994 276.148<329.113 741.108> 124.319 174.19<281.95 376.772> 126.681 322.99<638.36 720.947> 354.604 98.0195<285.125 378.726> 354.604 29.2266<397.159 406.581> 509.011 280.983<336.101 667.445> -VStem: 0 168.448<160.582 405.71> 257.315 141.418<151.724 276.763> 477.56 50.7842<153.411 293.156> 609.533 140.24<154.299 422.742> 830.667 169.333<152.136 418.557> -LayerCount: 2 -Fore -SplineSet -500.005859375 789.994140625 m 0x87e0 - 776.139648438 789.994140625 1000 566.158203125 1000 289.98828125 c 0 - 1000 13.8662109375 776.139648438 -209.994140625 500.005859375 -209.994140625 c 0 - 223.860351562 -209.994140625 0 13.8662109375 0 289.98828125 c 0 - 0 566.158203125 223.860351562 789.994140625 500.005859375 789.994140625 c 0x87e0 -467.818359375 268.690429688 m 0 - 461.323242188 286.205078125 452.120117188 301.41015625 440.21484375 314.3046875 c 0 - 428.302734375 327.193359375 414.428710938 337.133789062 398.586914062 344.124023438 c 0 - 382.741210938 351.107421875 365.467773438 354.604492188 346.772460938 354.604492188 c 0 - 327.287109375 354.604492188 309.669921875 350.766601562 293.924804688 343.08984375 c 0 - 278.17578125 335.413085938 263.611328125 323.604492188 250.228515625 307.662109375 c 1 - 252.784179688 361.197265625 261.249023438 398.396484375 275.620117188 419.26171875 c 0 - 282.706054688 429.494140625 291.415039062 437.612304688 301.749023438 443.618164062 c 0 - 312.08203125 449.620117188 322.461914062 452.624023438 332.895507812 452.624023438 c 0x97e0 - 345.885742188 452.624023438 357.299804688 449.030273438 367.143554688 441.846679688 c 0 - 376.982421875 434.659179688 384.166015625 425.166992188 388.694335938 413.35546875 c 0 - 392.038085938 404.102539062 397.256835938 396.869140625 404.342773438 391.655273438 c 0 - 411.4296875 386.4375 419.104492188 383.831054688 427.372070312 383.831054688 c 0x8fe0 - 436.8203125 383.831054688 444.591796875 387.124023438 450.6953125 393.720703125 c 0 - 456.793945312 400.313476562 459.84765625 407.643554688 459.84765625 415.715820312 c 0 - 459.84765625 429.098632812 454.975585938 443.072265625 445.233398438 457.640625 c 0 - 435.490234375 472.204101562 421.0234375 484.40625 401.833984375 494.249023438 c 0 - 382.64453125 504.088867188 360.44921875 509.010742188 335.2578125 509.010742188 c 0 - 309.079101562 509.010742188 285.75390625 504.088867188 265.286132812 494.249023438 c 0 - 244.813476562 484.40625 227.395507812 469.841796875 213.029296875 450.553710938 c 0 - 198.658203125 431.26171875 187.637695312 406.955078125 179.962890625 377.62890625 c 0 - 172.286132812 348.299804688 168.448242188 315.038085938 168.448242188 277.838867188 c 0 - 168.448242188 232.173828125 174.794921875 193.548828125 187.490234375 161.958007812 c 0 - 200.186523438 130.3671875 218.537109375 106.5 242.551757812 90.3642578125 c 0 - 266.5625 74.2216796875 295.103515625 66.154296875 328.169921875 66.154296875 c 0 - 356.904296875 66.154296875 382.640625 72.5009765625 405.375 85.1962890625 c 0 - 428.109375 97.8916015625 445.821289062 115.555664062 458.517578125 138.19140625 c 0 - 471.212890625 160.823242188 477.559570312 186.018554688 477.559570312 213.772460938 c 0 - 477.561523438 232.865234375 474.314453125 251.169921875 467.818359375 268.690429688 c 0 -379.248046875 148.67578125 m 0 - 366.258789062 132.4375 349.8203125 124.319335938 329.943359375 124.319335938 c 0 - 309.077148438 124.319335938 291.755859375 133.176757812 277.982421875 150.890625 c 0 - 264.202148438 168.60546875 257.315429688 190.747070312 257.315429688 217.319335938 c 0 - 257.315429688 233.852539062 260.7109375 248.267578125 267.501953125 260.572265625 c 0 - 274.291992188 272.870117188 283.24609375 282.272460938 294.368164062 288.766601562 c 0 - 305.485351562 295.262695312 317.146484375 298.509765625 329.352539062 298.509765625 c 0xc7e0 - 342.145507812 298.509765625 353.857421875 295.11328125 364.486328125 288.323242188 c 0 - 375.116210938 281.533203125 383.478515625 271.689453125 389.58203125 258.799804688 c 0 - 395.680664062 245.907226562 398.733398438 230.502929688 398.733398438 212.595703125 c 0 - 398.733398438 186.21875 392.23828125 164.915039062 379.248046875 148.67578125 c 0 -808.228515625 423.69140625 m 0 - 799.565429688 442.38671875 788.986328125 458.0859375 776.490234375 470.78125 c 0 - 763.98828125 483.4765625 749.4765625 493.119140625 732.944335938 499.713867188 c 0 - 716.411132812 506.305664062 698.005859375 509.603515625 677.733398438 509.603515625 c 0 - 647.029296875 509.603515625 620.604492188 502.169921875 598.462890625 487.3125 c 0 - 576.3203125 472.448242188 559.440429688 450.849609375 547.829101562 422.5078125 c 0 - 541.135742188 405.384765625 536.213867188 384.911132812 533.068359375 361.098632812 c 0 - 529.91796875 337.28125 528.34375 310.51171875 528.34375 280.79296875 c 0 - 528.34375 257.764648438 529.768554688 236.359375 532.625 216.580078125 c 0 - 535.4765625 196.799804688 539.955078125 178.739257812 546.057617188 162.403320312 c 0 - 558.0625 132.483398438 575.923828125 109.061523438 599.643554688 92.1376953125 c 0 - 623.360351562 75.2080078125 650.17578125 66.74609375 680.095703125 66.74609375 c 0 - 706.077148438 66.74609375 729.6953125 73.046875 750.952148438 85.6416015625 c 0 - 772.209960938 98.236328125 789.526367188 116.1484375 802.9140625 139.375 c 0 - 813.541015625 158.26953125 820.821289062 179.327148438 824.76171875 202.555664062 c 0 - 828.6953125 225.778320312 830.666992188 253.532226562 830.666992188 285.813476562 c 0 - 830.666992188 345.254882812 823.18359375 391.213867188 808.228515625 423.69140625 c 0 -743.571289062 199.60546875 m 0 - 739.4375 176.1796875 732.250976562 158.170898438 722.01953125 145.576171875 c 0 - 711.783203125 132.977539062 697.612304688 126.680664062 679.504882812 126.680664062 c 0 - 661.984375 126.680664062 648.108398438 132.733398438 637.877929688 144.838867188 c 0 - 627.640625 156.943359375 620.356445312 174.8046875 616.029296875 198.424804688 c 0 - 611.698242188 222.043945312 609.533203125 252.350585938 609.533203125 289.357421875 c 0 - 609.533203125 343.874023438 614.598632812 384.223632812 624.73828125 410.405273438 c 0 - 634.872070312 436.580078125 652.93359375 449.670898438 678.915039062 449.670898438 c 0xa7e0 - 697.01953125 449.670898438 711.192382812 443.811523438 721.4296875 432.103515625 c 0 - 731.662109375 420.389648438 738.944335938 403.068359375 743.27734375 380.142578125 c 0 - 747.604492188 357.209960938 749.7734375 327.73828125 749.7734375 291.71875 c 0 - 749.771484375 253.729492188 747.703125 223.025390625 743.571289062 199.60546875 c 0 -EndSplineSet -Validated: 33 +HStem: -85 200.36<185.904 321.615 418.903 574.48> -53.7637 69.8945<200.358 547.785> 102.626 6.36719<238.439 300.717 420.853 545.812> 142.759 165.203<224.565 284.782> 149.126 6.36719<221.91 290.718 465.268 525.446> 295.228 6.36719<222.769 300.31> 335.516 99.502<229.073 289.396> 341.883 6.36719<233.56 295.705> 370.222 6.36621<318.024 360.5> 422.283 6.36719<236.218 291.764 462.466 530.226> 462.524 202.476<169.771 307.585 461.104 566.716> 468.892 6.36719<209.847 286.532 433.862 574.511> 575.29 69.8945<200.358 547.785> +VStem: 0 145.953<178.231 374.329> 24.5977 69.8945<121.997 469.424> 133.219 6.36719<237.521 359.086> 190.706 6.36719<182.06 244.088> 311.656 6.36816<376.588 396.619> 358.158 31.6758<169.734 294.927> 364.525 6.36719<184.569 269.553> 377.1 6.36719<235.206 369.141> 423.057 147.07<205.389 376.569> 429.424 6.36719<202.775 380.023> 557.393 6.36719<202.456 380.315> 603.35 146.65<186.414 410.385> 609.717 6.36719<186.564 411.562> 653.651 69.8945<121.997 469.424> +LayerCount: 2 +Fore +SplineSet +0 540 m 2x8024c080 + 0 40 l 2 + 0 -28.9453125 56.0546875 -85 125 -85 c 2 + 625 -85 l 2 + 693.9453125 -85 750 -28.9453125 750 40 c 2 + 750 540 l 2 + 750 608.9453125 693.9453125 665 625 665 c 2 + 125 665 l 2 + 56.0546875 665 0 608.9453125 0 540 c 2x8024c080 +1091.9921875 595.078125 m 0 + 1071.484375 606.015625 1046.875 604.6484375 1027.734375 591.953125 c 2 + 840.234375 466.953125 l 1 + 812.5 448.3984375 l 1 + 812.5 415 l 1 + 812.5 165 l 1 + 812.5 131.6015625 l 1 + 840.234375 113.046875 l 1 + 1027.734375 -11.953125 l 2 + 1047.0703125 -24.84375 1071.6796875 -26.015625 1091.9921875 -15.078125 c 0 + 1112.3046875 -4.140625 1125 16.953125 1125 40 c 2 + 1125 540 l 2 + 1125 563.046875 1112.3046875 584.140625 1091.9921875 595.078125 c 0 +256.978515625 295.227539062 m 0x0c00c0 + 312.724609375 295.227539062 325.388671875 213.3515625 297.666992188 174.194335938 c 0 + 289.049804688 161.989257812 275.799804688 155.493164062 256.474609375 155.493164062 c 0 + 220.870117188 155.493164062 197.073242188 181.095703125 197.073242188 223.5703125 c 0 + 197.073242188 255.884765625 211.693359375 295.227539062 256.978515625 295.227539062 c 0x0c00c0 +256.978515625 307.961914062 m 0x1000c0 + 206.662109375 307.961914062 184.338867188 266.407226562 184.338867188 223.5703125 c 0 + 184.338867188 200.012695312 190.697265625 180.331054688 203.948242188 165.291992188 c 0 + 217.211914062 150.454101562 235.032226562 142.758789062 256.474609375 142.758789062 c 0 + 278.83984375 142.758789062 296.739257812 150.803710938 308.067382812 166.84765625 c 0 + 341.447265625 213.998046875 324.069335938 307.961914062 256.978515625 307.961914062 c 0x1000c0 +259.944335938 422.283203125 m 0x21d1d0 + 290.099609375 422.283203125 311.65625 396.619140625 311.65625 376.588867188 c 2 + 311.65625 370.221679688 l 1 + 367.372070312 370.221679688 l 1 + 366.124023438 386.565429688 363.896484375 415.751953125 335.041015625 444.900390625 c 0 + 324.606445312 455.338867188 299.4375 475.258789062 259.303710938 475.258789062 c 0 + 178.66796875 475.258789062 133.21875 412.184570312 133.21875 269.985351562 c 0 + 133.21875 230.296875 141.279296875 147.379882812 205.27734375 114.5 c 0 + 220.788085938 106.42578125 238.001953125 102.625976562 256.666992188 102.625976562 c 0 + 328.115234375 102.625976562 370.892578125 159.999023438 370.892578125 224.911132812 c 0 + 370.892578125 297.325195312 320.196289062 348.25 256.188476562 348.25 c 0 + 234.524414062 348.25 214.400390625 340.0859375 196.005859375 324.55078125 c 1 + 198.971679688 366.013671875 207.4140625 396.056640625 228.924804688 413.09765625 c 0 + 236.493164062 419.044921875 246.52734375 422.283203125 259.944335938 422.283203125 c 0x21d1d0 +323.947265625 382.956054688 m 1 + 320.681640625 406.137695312 295.973632812 435.017578125 259.944335938 435.017578125 c 0 + 186.557617188 435.017578125 183.546875 341.663085938 182.349609375 304.54296875 c 1 + 193.38671875 304.54296875 l 1 + 202.913085938 314.299804688 223.891601562 335.515625 256.188476562 335.515625 c 0 + 313.353515625 335.515625 358.158203125 290.086914062 358.158203125 224.911132812 c 0 + 358.158203125 167.740234375 321.615234375 115.360351562 256.666992188 115.360351562 c 0 + 185.904296875 115.360351562 145.953125 178.231445312 145.953125 269.985351562 c 0 + 145.953125 374.329101562 169.770507812 462.524414062 259.303710938 462.524414062 c 0x8224e0 + 307.584960938 462.524414062 346.329101562 428.408203125 353.360351562 382.956054688 c 1 + 323.947265625 382.956054688 l 1 +318.024414062 376.588867188 m 2 + 318.024414062 382.783203125 316.618164062 388.956054688 313.388671875 395.12890625 c 0 + 310.357421875 401.368164062 306.161132812 406.903320312 301.174804688 411.912109375 c 0 + 296.188476562 416.875976562 290.014648438 420.875 282.833007812 423.94921875 c 0 + 275.650390625 427.068359375 268.048828125 428.650390625 259.944335938 428.650390625 c 0 + 245.490234375 428.650390625 233.913085938 425.11328125 224.99609375 418.106445312 c 0 + 216.122070312 411.077148438 209.00390625 401.895507812 203.775390625 390.516601562 c 0 + 198.590820312 379.137695312 194.857421875 366.44140625 192.705078125 352.3828125 c 0 + 190.573242188 338.368164062 189.366210938 324.573242188 188.92578125 310.91015625 c 1 + 190.706054688 310.91015625 l 1 + 210.826171875 331.514648438 232.595703125 341.8828125 256.1875 341.8828125 c 0 + 271.212890625 341.8828125 285.381835938 339.004882812 298.82421875 333.228515625 c 0 + 312.092773438 327.428710938 323.602539062 319.345703125 333.201171875 309 c 0 + 342.999023438 298.763671875 350.576171875 286.307617188 356.22265625 271.897460938 c 0 + 361.801757812 257.421875 364.525390625 241.78125 364.525390625 224.911132812 c 0 + 364.525390625 209.138671875 361.932617188 194.114257812 356.946289062 180.077148438 c 0 + 351.982421875 166.018554688 344.77734375 153.893554688 335.506835938 143.392578125 c 0 + 326.237304688 132.848632812 314.990234375 124.45703125 301.568359375 118.174804688 c 0 + 288.322265625 112.08984375 273.319335938 108.993164062 256.66796875 108.993164062 c 0 + 238.875976562 108.993164062 222.729492188 112.594726562 208.209960938 120.15234375 c 0 + 193.799804688 127.555664062 181.4765625 138.1640625 171.438476562 151.9375 c 0 + 161.35546875 165.88671875 153.580078125 182.712890625 147.977539062 202.482421875 c 0 + 142.354492188 222.23046875 139.5859375 244.745117188 139.5859375 269.985351562 c 0 + 139.5859375 305.98828125 142.354492188 336.610351562 147.977539062 362.046875 c 0 + 153.600585938 387.395507812 161.640625 407.935546875 172.096679688 423.684570312 c 0 + 182.596679688 439.34765625 195.161132812 450.791015625 209.87890625 458.018554688 c 0 + 224.639648438 465.223632812 241.026367188 468.891601562 259.302734375 468.891601562 c 0 + 273.625976562 468.891601562 286.981445312 466.298828125 299.171875 461.159179688 c 0 + 311.385742188 455.930664062 321.884765625 449.056640625 330.5390625 440.400390625 c 0 + 339.171875 431.6796875 346.2890625 421.795898438 351.560546875 410.6796875 c 0 + 356.61328125 399.499023438 359.622070312 388.098632812 360.5 376.587890625 c 1 + 318.024414062 376.587890625 l 1x21d1d0 + 318.024414062 376.588867188 l 2 +256.474609375 149.125976562 m 0x0c00c0 + 277.3203125 149.125976562 292.89453125 156.396484375 302.8671875 170.521484375 c 0 + 313.037109375 184.887695312 318.024414062 202.482421875 318.024414062 223.5703125 c 0 + 318.024414062 233.828125 316.75 243.647460938 314.311523438 253.005859375 c 0 + 311.741210938 262.25390625 307.80859375 270.512695312 302.559570312 277.717773438 c 0 + 297.485351562 284.9453125 291.004882812 290.721679688 283.404296875 295.092773438 c 0 + 275.826171875 299.486328125 267.061523438 301.594726562 256.978515625 301.594726562 c 0 + 244.611328125 301.594726562 234.08984375 299.134765625 225.655273438 294.213867188 c 0 + 217.087890625 289.25 210.190429688 282.9453125 204.918945312 275.2578125 c 0 + 199.779296875 267.678710938 196 259.2890625 193.891601562 250.237304688 c 0 + 191.826171875 241.122070312 190.706054688 232.291015625 190.706054688 223.5703125 c 0 + 190.706054688 201.142578125 196.658203125 183.1953125 208.696289062 169.532226562 c 0 + 220.734375 156.06640625 236.59375 149.125976562 256.474609375 149.125976562 c 0x0c00c0 +557.392578125 292.3671875 m 0x0000c3 + 557.392578125 167.862304688 523.04296875 155.515625 496.571289062 155.515625 c 0 + 469.037109375 155.515625 435.791015625 169.298828125 435.791015625 292.3671875 c 0 + 435.791015625 402.506835938 462.723632812 423.71484375 496.571289062 423.71484375 c 0 + 529.509765625 423.71484375 557.392578125 403.82421875 557.392578125 292.3671875 c 0x0000c3 +496.571289062 142.78125 m 0 + 555.090820312 142.78125 570.126953125 206.467773438 570.126953125 292.3671875 c 0 + 570.126953125 368.548828125 558.8515625 436.44921875 496.571289062 436.44921875 c 0 + 433.721679688 436.44921875 423.056640625 367.276367188 423.056640625 292.3671875 c 0x0000c4 + 423.056640625 208.869140625 436.99609375 142.78125 496.571289062 142.78125 c 0 +496.569335938 114.927734375 m 0 + 418.903320312 114.927734375 389.833984375 185.987304688 389.833984375 292.3671875 c 0 + 389.833984375 346.4765625 399.225585938 388.791015625 417.321289062 419.404296875 c 0 + 435.30859375 449.514648438 461.103515625 464.193359375 496.569335938 464.193359375 c 0 + 566.715820312 464.193359375 603.349609375 410.384765625 603.349609375 292.3671875 c 0x0000e080 + 603.349609375 186.4140625 574.48046875 114.927734375 496.569335938 114.927734375 c 0 +496.569335938 102.193359375 m 0 + 557.5390625 102.193359375 616.083984375 141.477539062 616.083984375 292.3671875 c 0 + 616.083984375 411.955078125 577.109375 476.927734375 496.569335938 476.927734375 c 0 + 408.650390625 476.927734375 377.099609375 391.098632812 377.099609375 292.3671875 c 0x0000c840 + 377.099609375 238.76171875 382.629882812 102.193359375 496.569335938 102.193359375 c 0 +496.569335938 470.560546875 m 0 + 571.913085938 470.560546875 609.716796875 411.169921875 609.716796875 292.366210938 c 0 + 609.716796875 231.650390625 600.23828125 185.958007812 581.302734375 154.9375 c 0 + 562.41015625 124.092773438 534.084960938 108.560546875 496.569335938 108.560546875 c 0 + 459.075195312 108.560546875 430.881835938 124.092773438 411.8359375 154.936523438 c 0 + 392.923828125 185.958007812 383.466796875 231.649414062 383.466796875 292.366210938 c 0 + 383.466796875 347.18359375 392.923828125 390.643554688 411.8359375 422.63671875 c 0 + 430.881835938 454.51953125 459.073242188 470.560546875 496.569335938 470.560546875 c 0 +547.807617188 183.903320312 m 0 + 558.479492188 207.213867188 563.759765625 243.31640625 563.759765625 292.366210938 c 0 + 563.759765625 340.99609375 558.479492188 376.016601562 547.807617188 397.69140625 c 0 + 537.268554688 419.27734375 520.079101562 430.08203125 496.5703125 430.08203125 c 0 + 472.97265625 430.08203125 455.981445312 419.278320312 445.288085938 397.69140625 c 0 + 434.66015625 376.016601562 429.423828125 340.997070312 429.423828125 292.366210938 c 0x0000c3 + 429.423828125 243.31640625 434.66015625 207.212890625 445.288085938 183.903320312 c 0 + 455.982421875 160.59375 472.97265625 149.1484375 496.5703125 149.1484375 c 0 + 520.079101562 149.1484375 537.268554688 160.59375 547.807617188 183.903320312 c 0 +653.651367188 295.7109375 m 0x400ac020 + 653.651367188 141.275390625 528.506835938 16.130859375 374.071289062 16.130859375 c 0 + 219.63671875 16.130859375 94.4921875 141.275390625 94.4921875 295.7109375 c 0 + 94.4921875 450.145507812 219.63671875 575.290039062 374.071289062 575.290039062 c 0 + 528.506835938 575.290039062 653.651367188 450.145507812 653.651367188 295.7109375 c 0x400ac020 +723.545898438 295.7109375 m 0 + 723.545898438 488.702148438 567.063476562 645.184570312 374.071289062 645.184570312 c 0 + 181.080078125 645.184570312 24.59765625 488.702148438 24.59765625 295.7109375 c 0 + 24.59765625 102.71875 181.080078125 -53.763671875 374.071289062 -53.763671875 c 0 + 567.063476562 -53.763671875 723.545898438 102.71875 723.545898438 295.7109375 c 0 +EndSplineSet +Validated: 524329 EndChar StartChar: uni237A @@ -34800,7 +34877,334 @@ SplineSet 219.8046875 84.5888671875 l 1 219.8046875 500.735351562 l 1025 EndSplineSet -Validated: 524331 +Validated: 43 +EndChar + +StartChar: uni2367 +Encoding: 9063 9063 723 +Width: 1000 +HStem: -126.667 83.334<255.346 341.675 658.325 726.81> 40 83.333<445.251 554.749> 290 83.333<445.251 554.749> 435.833 125<452.751 547.249> 623.333 83.334<273.19 341.675 658.325 744.654> +VStem: 166.667 83.333<-20.1443 48.3418 531.658 617.988> 333.333 83.334<151.917 261.416> 437.5 125<451.084 545.582> 583.333 83.334<151.917 261.416> 750 83.333<-37.9875 48.3418 531.658 600.144> +LayerCount: 2 +Fore +SplineSet +658.325195312 -43.3330078125 m 0 + 299.2578125 -43.3330078125 299.2578125 -43.3330078125 286.890625 -42.013671875 c 0 + 279.978515625 -41.2763671875 264.262695312 -39.6005859375 254.524414062 -20.5703125 c 0 + 250.02734375 -11.7373046875 250 13.50390625 250 48.341796875 c 0 + 250 574.075195312 250 574.075195312 251.319335938 586.442382812 c 0 + 252.056640625 593.354492188 253.733398438 609.071289062 272.763671875 618.80859375 c 0 + 281.596679688 623.305664062 306.836914062 623.333007812 341.674804688 623.333007812 c 0 + 700.7421875 623.333007812 700.7421875 623.333007812 713.109375 622.013671875 c 0 + 720.021484375 621.276367188 735.737304688 619.600585938 745.475585938 600.5703125 c 0 + 749.97265625 591.737304688 750 566.49609375 750 531.658203125 c 0 + 750 5.9248046875 750 5.9248046875 748.680664062 -6.4423828125 c 0 + 747.943359375 -13.3544921875 746.266601562 -29.0712890625 727.236328125 -38.80859375 c 0 + 718.403320312 -43.3056640625 693.163085938 -43.3330078125 658.325195312 -43.3330078125 c 0 +341.674804688 -126.666992188 m 2 + 658.325195312 -126.666992188 l 2 + 709.629882812 -126.666992188 738.356445312 -126.666992188 765.11328125 -113.043945312 c 0 + 788.551757812 -101.05078125 807.755859375 -81.810546875 819.749023438 -58.3720703125 c 0 + 833.333007812 -31.689453125 833.333007812 -5.3203125 833.333007812 48.341796875 c 2 + 833.333007812 531.658203125 l 2 + 833.333007812 582.963867188 833.333007812 611.689453125 819.709960938 638.447265625 c 0 + 807.716796875 661.885742188 788.4765625 681.088867188 765.038085938 693.08203125 c 0 + 738.356445312 706.666992188 711.987304688 706.666992188 658.325195312 706.666992188 c 2 + 341.674804688 706.666992188 l 2 + 290.370117188 706.666992188 261.643554688 706.666992188 234.88671875 693.043945312 c 0 + 211.448242188 681.05078125 192.244140625 661.810546875 180.250976562 638.372070312 c 0 + 166.666992188 611.689453125 166.666992188 585.3203125 166.666992188 531.658203125 c 2 + 166.666992188 48.341796875 l 2 + 166.666992188 -2.9638671875 166.666992188 -31.689453125 180.290039062 -58.447265625 c 0 + 192.283203125 -81.8857421875 211.5234375 -101.088867188 234.961914062 -113.08203125 c 0 + 261.643554688 -126.666992188 288.012695312 -126.666992188 341.674804688 -126.666992188 c 2 +583.333007812 206.666992188 m 0 + 583.333007812 160.59765625 546.069335938 123.333007812 500 123.333007812 c 0 + 453.930664062 123.333007812 416.666992188 160.59765625 416.666992188 206.666992188 c 0 + 416.666992188 252.736328125 453.930664062 290 500 290 c 0 + 546.069335938 290 583.333007812 252.736328125 583.333007812 206.666992188 c 0 +666.666992188 206.666992188 m 0 + 666.666992188 298.69921875 592.033203125 373.333007812 500 373.333007812 c 0 + 407.966796875 373.333007812 333.333007812 298.69921875 333.333007812 206.666992188 c 0 + 333.333007812 114.633789062 407.966796875 40 500 40 c 0 + 592.033203125 40 666.666992188 114.633789062 666.666992188 206.666992188 c 0 +562.5 498.333007812 m 0 + 562.5 532.821289062 534.487304688 560.833007812 500 560.833007812 c 0 + 465.512695312 560.833007812 437.5 532.821289062 437.5 498.333007812 c 0 + 437.5 463.845703125 465.512695312 435.833007812 500 435.833007812 c 0 + 534.487304688 435.833007812 562.5 463.845703125 562.5 498.333007812 c 0 +EndSplineSet +Validated: 9 +EndChar + +StartChar: vibration +Encoding: 8730 8730 724 +Width: 1000 +LayerCount: 2 +Fore +SplineSet +133.1953125 240.114257812 m 2 + 133.1953125 240.114257812 127.3046875 244.786132812 134.213867188 256.559570312 c 0 + 141.125 268.340820312 158.18359375 294.744140625 192.1015625 311.604492188 c 1 + 192.1015625 311.604492188 196.981445312 314.444335938 202.465820312 308.553710938 c 2 + 202.465820312 308.553710938 220.337890625 314.654296875 233.741210938 306.119140625 c 0 + 247.146484375 297.59375 264.205078125 287.03125 264.205078125 287.03125 c 1 + 501.689453125 524.560546875 l 1 + 501.689453125 524.560546875 491.137695312 541.6171875 482.602539062 555.022460938 c 0 + 474.079101562 568.42578125 480.166992188 586.297851562 480.166992188 586.297851562 c 2 + 474.286132812 591.782226562 477.127929688 596.65234375 477.127929688 596.65234375 c 1 + 493.987304688 630.5703125 520.392578125 647.62890625 532.173828125 654.540039062 c 0 + 543.955078125 661.451171875 548.62890625 655.559570312 548.62890625 655.559570312 c 2 + 564.467773438 660.032226562 573.002929688 653.123046875 573.002929688 653.123046875 c 1 + 612.405273438 629.966796875 l 1 + 668.865234375 640.115234375 710.297851562 614.115234375 731.01953125 598.276367188 c 0 + 751.739257812 582.42578125 887.829101562 478.029296875 903.263671875 465.030273438 c 0 + 918.697265625 452.03125 972.72265625 399.619140625 931.696289062 343.159179688 c 0 + 890.670898438 286.688476562 820.793945312 305.37890625 820.793945312 305.37890625 c 1 + 730.8125 329.545898438 l 1 + 714.357421875 198.952148438 601.831054688 241.602539062 601.831054688 241.602539062 c 1 + 547.140625 186.911132812 l 1 + 547.140625 186.911132812 589.7890625 74.3857421875 459.1875 57.931640625 c 1 + 483.362304688 -32.052734375 l 1 + 483.362304688 -32.052734375 502.044921875 -101.926757812 445.583984375 -142.953125 c 0 + 389.11328125 -183.991210938 336.711914062 -129.954101562 323.712890625 -114.51953125 c 0 + 310.713867188 -99.0751953125 206.305664062 37.0009765625 190.466796875 57.7236328125 c 0 + 174.627929688 78.4345703125 148.629882812 119.875976562 158.787109375 176.336914062 c 1 + 135.630859375 215.740234375 l 1 + 135.630859375 215.740234375 128.731445312 224.2734375 133.1953125 240.114257812 c 2 +829.455078125 781.645507812 m 0 + 861.592773438 769.926757812 896.052734375 746.729492188 926.47265625 716.319335938 c 0 + 995.288085938 647.485351562 1019.61816406 568.0234375 983.067382812 531.47265625 c 0 + 979 527.401367188 973.680664062 525.373046875 968.352539062 525.373046875 c 0 + 963.024414062 525.373046875 957.70703125 527.401367188 953.635742188 531.4609375 c 0 + 945.508789062 539.599609375 945.508789062 552.776367188 953.635742188 560.903320312 c 0 + 967.78125 575.046875 952.763671875 631.153320312 897.041015625 686.875976562 c 0 + 871.2109375 712.70703125 841.3828125 732.9921875 815.208007812 742.525390625 c 0 + 794.809570312 749.955078125 777.907226562 750.30859375 771.069335938 743.481445312 c 0 + 762.939453125 735.353515625 749.764648438 735.364257812 741.635742188 743.481445312 c 0 + 733.508789062 751.620117188 733.508789062 764.795898438 741.635742188 772.922851562 c 0 + 760.869140625 792.16796875 792.041015625 795.248046875 829.455078125 781.645507812 c 0 +748.963867188 663.739257812 m 0 + 740.825195312 655.62109375 727.661132812 655.600585938 719.528320312 663.743164062 c 0 + 711.401367188 671.879882812 711.401367188 685.056640625 719.528320312 693.184570312 c 0 + 748.888671875 722.555664062 808.888671875 705.224609375 862.123046875 651.959960938 c 0 + 915.375976562 598.71484375 932.716796875 538.74609375 903.356445312 509.3671875 c 0 + 899.2890625 505.297851562 893.958984375 503.268554688 888.631835938 503.268554688 c 0 + 883.303710938 503.268554688 877.984375 505.297851562 873.915039062 509.357421875 c 0 + 865.788085938 517.484375 865.788085938 530.669921875 873.904296875 538.798828125 c 0 + 880.076171875 544.970703125 873.270507812 581.947265625 832.69140625 622.526367188 c 0 + 792.102539062 663.115234375 755.135742188 669.900390625 748.963867188 663.739257812 c 0 +213.166015625 -210 m 0 + 173.2109375 -210.008789062 120.946289062 -183.729492188 73.6953125 -136.470703125 c 0 + 43.2763671875 -106.049804688 20.06640625 -71.5888671875 8.3583984375 -39.4521484375 c 0 + -5.2548828125 -2.056640625 -2.1630859375 29.1337890625 17.0888671875 48.3740234375 c 0 + 25.2177734375 56.5009765625 38.3935546875 56.5126953125 46.5205078125 48.3740234375 c 0 + 54.6494140625 40.2353515625 54.6494140625 27.0595703125 46.5205078125 18.931640625 c 0 + 39.6826171875 12.095703125 40.046875 -4.818359375 47.478515625 -25.2060546875 c 0 + 57.01171875 -51.380859375 77.3056640625 -81.208984375 103.127929688 -107.0390625 c 0 + 158.858398438 -162.770507812 214.9453125 -177.799804688 229.098632812 -163.635742188 c 0 + 237.227539062 -155.506835938 250.403320312 -155.497070312 258.532226562 -163.635742188 c 0 + 266.661132812 -171.772460938 266.661132812 -184.94921875 258.532226562 -193.078125 c 0 + 247.083984375 -204.524414062 231.399414062 -210 213.166015625 -210 c 0 +138.03515625 -72.1201171875 m 0 + 115.315429688 -49.400390625 97.9560546875 -23.5703125 89.1416015625 0.5966796875 c 0 + 74.6875 40.279296875 87.748046875 61.4169921875 96.8134765625 70.4833984375 c 0 + 104.940429688 78.6103515625 118.116210938 78.6220703125 126.245117188 70.4833984375 c 0 + 134.374023438 62.34375 134.374023438 49.16796875 126.245117188 41.041015625 c 0 + 124.02734375 38.8251953125 122.7265625 30.01953125 128.252929688 14.845703125 c 0 + 134.924804688 -3.458984375 149.212890625 -24.4306640625 167.458007812 -42.67578125 c 0 + 185.711914062 -60.921875 206.673828125 -75.2099609375 224.979492188 -81.880859375 c 0 + 240.174804688 -87.408203125 248.990234375 -86.1083984375 251.17578125 -83.890625 c 0 + 259.302734375 -75.7626953125 272.490234375 -75.7744140625 280.6171875 -83.890625 c 0 + 288.744140625 -92.017578125 288.744140625 -105.204101562 280.627929688 -113.333007812 c 0 + 274.487304688 -119.473632812 262.7890625 -127.456054688 243.53515625 -127.456054688 c 0 + 234.375976562 -127.456054688 223.53125 -125.655273438 210.741210938 -120.9921875 c 0 + 186.5859375 -112.198242188 160.764648438 -94.8388671875 138.03515625 -72.1201171875 c 0 +EndSplineSet +Validated: 33 +EndChar + +StartChar: uni235C +Encoding: 9052 9052 725 +Width: 1000 +HStem: 206.667 83.4785<291.006 409.88> 373.333 83.332<633.181 707.637> 623.396 83.3115<425.875 425.899 428.476 611.993> +LayerCount: 2 +Fore +SplineSet +772.342773438 320.841796875 m 2 + 816.377929688 375.038085938 777.432617188 455.549804688 708.333007812 456.666992188 c 1 + 708.698242188 456.666992188 669.721679688 456.665039062 633.180664062 456.665039062 c 1 + 689.65625 593.157226562 l 2 + 710.733398438 647.022460938 671.696289062 706.770507812 609.171875 706.666992188 c 0 + 605.659179688 706.514648438 441.431640625 706.655273438 426.9609375 706.70703125 c 0 + 391.609375 706.70703125 360.991210938 684.549804688 348.025390625 653.923828125 c 1 + 348.2890625 654.563476562 213.14453125 319.883789062 213.14453125 319.883789062 c 2 + 191.971679688 261.485351562 234.883789062 206.3125 293.7421875 206.666992188 c 0 + 296.002929688 206.666992188 360.850585938 206.708984375 409.879882812 206.708984375 c 1 + 334.743164062 -74.2216796875 l 2 + 327.693359375 -100.58203125 347.594726562 -126.666992188 375 -126.666992188 c 0 + 387.764648438 -126.666992188 399.196289062 -120.915039062 406.841796875 -111.86328125 c 2 + 772.342773438 320.841796875 l 2 +532.322265625 430.904296875 m 2 + 521.051757812 403.66796875 541.129882812 373.333007812 570.841796875 373.333007812 c 2 + 570.841796875 373.333007812 697.094726562 373.333984375 707.63671875 373.333984375 c 1 + 463.391601562 84.1962890625 l 1 + 504.408203125 237.5546875 l 2 + 511.458984375 263.915039062 491.557617188 290 464.15234375 290 c 2 + 464.15234375 290 293.7421875 290 291.005859375 290.145507812 c 1 + 291.005859375 290.145507812 425.06640625 622.1328125 428.344726562 623.333007812 c 2 + 428.344726562 623.333007812 609.171875 623.333007812 611.993164062 623.415039062 c 1 + 532.322265625 430.904296875 l 2 +425.875 623.395507812 m 1 + 426.114257812 623.395507812 426.40625 623.376953125 425.875 623.395507812 c 1 +EndSplineSet +Validated: 37 +EndChar + +StartChar: uni23B5 +Encoding: 9141 9141 726 +Width: 1000 +LayerCount: 2 +Fore +SplineSet +700.690429688 714.719726562 m 2 + 734.370117188 741.080078125 783.040039062 735.129882812 809.389648438 701.450195312 c 2 + 977 487.219726562 l 2 + 1003.36035156 453.540039062 997.41015625 404.870117188 963.73046875 378.51953125 c 2 + 951.549804688 368.990234375 l 2 + 933.73046875 355.049804688 911.709960938 350.150390625 891.01953125 353.620117188 c 1 + 898 344.700195312 l 2 + 924.360351562 311.01953125 918.41015625 262.349609375 884.73046875 236 c 2 + 872.549804688 226.469726562 l 2 + 838.870117188 200.110351562 790.200195312 206.059570312 763.849609375 239.740234375 c 2 + 671.48046875 357.809570312 l 1 + 399.16015625 144.75 l 1 + 490.9296875 27.4501953125 l 2 + 517.290039062 -6.23046875 511.33984375 -54.900390625 477.66015625 -81.25 c 2 + 465.48046875 -90.7802734375 l 2 + 431.799804688 -117.139648438 383.129882812 -111.190429688 356.780273438 -77.509765625 c 2 + 351 -70.1298828125 l 1 + 349.379882812 -91.0400390625 339.330078125 -111.240234375 321.509765625 -125.1796875 c 2 + 309.330078125 -134.709960938 l 2 + 275.650390625 -161.0703125 226.98046875 -155.120117188 200.629882812 -121.440429688 c 2 + 33.01953125 92.7900390625 l 2 + 6.66015625 126.469726562 12.6103515625 175.139648438 46.2900390625 201.490234375 c 2 + 58.4697265625 211.01953125 l 2 + 76.2900390625 224.959960938 98.3095703125 229.860351562 119 226.389648438 c 1 + 112.01953125 235.309570312 l 2 + 85.66015625 268.990234375 91.6103515625 317.66015625 125.290039062 344.009765625 c 2 + 137.469726562 353.540039062 l 2 + 171.150390625 379.900390625 219.8203125 373.950195312 246.169921875 340.26953125 c 2 + 337.940429688 222.969726562 l 1 + 610.259765625 436.030273438 l 1 + 519.08984375 552.559570312 l 2 + 492.73046875 586.240234375 498.6796875 634.91015625 532.360351562 661.259765625 c 2 + 544.540039062 670.790039062 l 2 + 578.219726562 697.150390625 626.889648438 691.200195312 653.240234375 657.51953125 c 2 + 659.01953125 650.139648438 l 1 + 660.639648438 671.049804688 670.690429688 691.25 688.509765625 705.190429688 c 2 + 700.690429688 714.719726562 l 2 +153.540039062 162.379882812 m 2 + 142.459960938 176.540039062 l 2 + 124.540039062 199.440429688 91.4501953125 203.48046875 68.5498046875 185.559570312 c 1 + 45.650390625 167.639648438 41.6103515625 134.549804688 59.5302734375 111.650390625 c 2 + 70.6103515625 97.490234375 l 2 + 88.5302734375 74.58984375 121.620117188 70.5498046875 144.51953125 88.4697265625 c 1 + 167.419921875 106.389648438 171.459960938 139.48046875 153.540039062 162.379882812 c 2 +249.740234375 197.48046875 m 1 + 272.639648438 215.400390625 276.6796875 248.490234375 258.759765625 271.389648438 c 2 + 224.379882812 315.33984375 l 2 + 206.459960938 338.240234375 173.370117188 342.280273438 150.469726562 324.360351562 c 1 + 127.5703125 306.440429688 123.530273438 273.349609375 141.450195312 250.450195312 c 2 + 175.830078125 206.5 l 2 + 193.75 183.599609375 226.83984375 179.559570312 249.740234375 197.48046875 c 1 +665.240234375 589.41015625 m 1 + 630.860351562 633.360351562 l 2 + 612.940429688 656.259765625 579.849609375 660.299804688 556.950195312 642.379882812 c 1 + 534.049804688 624.459960938 530.009765625 591.370117188 547.9296875 568.469726562 c 2 + 582.309570312 524.51953125 l 2 + 600.23046875 501.620117188 633.3203125 497.580078125 656.219726562 515.5 c 1 + 679.120117188 533.419921875 683.16015625 566.509765625 665.240234375 589.41015625 c 1 +796.360351562 665.3203125 m 0 + 785.280273438 679.48046875 l 2 + 767.360351562 702.379882812 734.26953125 706.419921875 711.370117188 688.5 c 1 + 688.469726562 670.580078125 684.4296875 637.490234375 702.349609375 614.58984375 c 2 + 713.4296875 600.4296875 l 2 + 731.349609375 577.530273438 764.440429688 573.490234375 787.33984375 591.41015625 c 1 + 810.240234375 609.330078125 814.280273438 642.419921875 796.360351562 665.3203125 c 0 +EndSplineSet +Validated: 524321 +EndChar + +StartChar: uni23CC +Encoding: 9164 9164 727 +Width: 1000 +LayerCount: 2 +Fore +SplineSet +969.034179688 119.170898438 m 0 + 990.407226562 47.1376953125 1000.82421875 -27.5634765625 999.94921875 -102.844726562 c 0 + 999.94921875 -121.592773438 987.366210938 -139.965820312 969.327148438 -144.924804688 c 0 + 965.119140625 -146.049804688 960.912109375 -146.633789062 956.704101562 -146.633789062 c 0 + 942.87109375 -146.633789062 929.790039062 -140.342773438 922.45703125 -127.969726562 c 0 + 757.474609375 149.333984375 539.204101562 157.625976562 458.295898438 149.41796875 c 1 + 458.295898438 -64.9736328125 l 2 + 458.295898438 -81.806640625 448.171875 -97.0546875 432.58984375 -103.469726562 c 0 + 417.009765625 -109.969726562 399.09375 -106.344726562 387.178710938 -94.4296875 c 2 + 12.2177734375 280.53125 l 2 + -4.072265625 296.8203125 -4.072265625 323.151367188 12.2177734375 339.44140625 c 2 + 387.178710938 714.40234375 l 2 + 399.09375 726.317382812 417.0078125 729.94140625 432.58984375 723.442382812 c 0 + 448.171875 716.984375 458.295898438 701.778320312 458.295898438 684.946289062 c 2 + 458.295898438 517.879882812 l 1 + 696.021484375 506.71484375 901.458984375 347.231445312 969.034179688 119.170898438 c 0 +EndSplineSet +Validated: 33 +EndChar + +StartChar: uni235B +Encoding: 9051 9051 728 +Width: 1000 +HStem: 55.6201 140.63<227.842 358.633 650.102 782.158> 383.75 140.63<227.164 360.063 648.663 782.374> +VStem: 47.2305 140.619<234.501 345.491> 822.15 140.619<233.964 345.499> +LayerCount: 2 +Fore +SplineSet +715.209960938 524.379882812 m 0 + 783.5703125 524.379882812 841.919921875 501.4296875 890.259765625 455.530273438 c 0 + 938.599609375 409.629882812 962.76953125 354.450195312 962.76953125 290 c 0 + 962.76953125 225.549804688 938.599609375 170.370117188 890.259765625 124.469726562 c 0 + 841.919921875 78.5703125 783.5703125 55.6201171875 715.209960938 55.6201171875 c 0 + 646.849609375 55.6201171875 574.08984375 94.2001953125 505.73046875 171.349609375 c 1 + 437.370117188 94.2001953125 367.049804688 55.6201171875 294.790039062 55.6201171875 c 0 + 226.4296875 55.6201171875 168.080078125 78.5703125 119.740234375 124.469726562 c 0 + 71.400390625 170.370117188 47.23046875 225.549804688 47.23046875 290 c 0 + 47.23046875 354.450195312 71.400390625 409.629882812 119.740234375 455.530273438 c 0 + 168.080078125 501.4296875 226.4296875 524.379882812 294.790039062 524.379882812 c 0 + 367.059570312 524.379882812 437.370117188 485.799804688 505.73046875 408.650390625 c 1 + 574.08984375 485.799804688 643.919921875 524.379882812 715.209960938 524.379882812 c 0 +294.790039062 196.25 m 2 + 340.690429688 196.25 386.58984375 227.5 432.490234375 290 c 1 + 386.58984375 352.5 340.690429688 383.75 294.790039062 383.75 c 0 + 275.259765625 383.75 257.440429688 379.599609375 241.3203125 371.299804688 c 0 + 225.209960938 363 212.26953125 351.51953125 202.5 336.879882812 c 0 + 192.73046875 322.23046875 187.849609375 306.610351562 187.849609375 290 c 0 + 187.849609375 264.610351562 198.349609375 242.639648438 219.33984375 224.080078125 c 0 + 240.33984375 205.51953125 265.48046875 196.25 294.780273438 196.25 c 2 + 294.790039062 196.25 l 2 +715.209960938 196.25 m 1 + 726.9296875 196.25 738.16015625 197.709960938 748.900390625 200.639648438 c 0 + 759.639648438 203.5703125 769.41015625 207.959960938 778.200195312 213.8203125 c 0 + 786.990234375 219.6796875 794.799804688 226.51953125 801.639648438 234.330078125 c 0 + 808.48046875 242.139648438 813.599609375 250.9296875 817.01953125 260.700195312 c 0 + 820.440429688 270.469726562 822.150390625 280.23046875 822.150390625 290 c 0 + 822.150390625 315.389648438 811.650390625 337.360351562 790.66015625 355.919921875 c 0 + 769.66015625 374.48046875 744.51953125 383.75 715.219726562 383.75 c 0 + 669.3203125 383.75 623.419921875 352.5 577.51953125 290 c 1 + 623.419921875 227.5 669.3203125 196.25 715.219726562 196.25 c 1 + 715.209960938 196.25 l 1 +EndSplineSet +Validated: 524293 EndChar EndChars EndSplineFont diff --git a/bin/resources/fonts/fa-solid-900.ttf b/bin/resources/fonts/fa-solid-900.ttf index c5a68d3dc3a28b..49133379e7f803 100644 Binary files a/bin/resources/fonts/fa-solid-900.ttf and b/bin/resources/fonts/fa-solid-900.ttf differ diff --git a/bin/resources/fonts/promptfont.otf b/bin/resources/fonts/promptfont.otf index ec778dc6fc7c64..7db4435ef0f324 100644 Binary files a/bin/resources/fonts/promptfont.otf and b/bin/resources/fonts/promptfont.otf differ diff --git a/pcsx2-qt/resources/icons/black/svg/pin-filled.svg b/pcsx2-qt/resources/icons/black/svg/pin-filled.svg index d965d9fd0bf6e7..608b6e7ce34022 100644 --- a/pcsx2-qt/resources/icons/black/svg/pin-filled.svg +++ b/pcsx2-qt/resources/icons/black/svg/pin-filled.svg @@ -1,8 +1,7 @@ - - - - - - - - \ No newline at end of file + + + + + + + \ No newline at end of file diff --git a/pcsx2-qt/resources/icons/white/svg/pin-filled.svg b/pcsx2-qt/resources/icons/white/svg/pin-filled.svg index 4dc73158f2a96e..1cf789707c8de2 100644 --- a/pcsx2-qt/resources/icons/white/svg/pin-filled.svg +++ b/pcsx2-qt/resources/icons/white/svg/pin-filled.svg @@ -1,8 +1,7 @@ - - - - - - - - \ No newline at end of file + + + + + + + \ No newline at end of file diff --git a/pcsx2/ImGui/FullscreenUI.cpp b/pcsx2/ImGui/FullscreenUI.cpp index 7a900b47088e0c..f7c762c2d01d26 100644 --- a/pcsx2/ImGui/FullscreenUI.cpp +++ b/pcsx2/ImGui/FullscreenUI.cpp @@ -39,6 +39,7 @@ #include "SIO/Sio.h" #include "IconsFontAwesome5.h" +#include "IconsPromptFont.h" #include "imgui.h" #include "imgui_internal.h" @@ -1075,12 +1076,12 @@ void FullscreenUI::DrawLandingWindow() SwitchToGameList(); } - if (MenuButton(FSUI_ICONSTR(ICON_FA_FOLDER_OPEN, "Start File"), FSUI_CSTR("Launch a game by selecting a file/disc image."))) + if (MenuButton(FSUI_ICONSTR(ICON_FA_FILE, "Start File"), FSUI_CSTR("Launch a game by selecting a file/disc image."))) { DoStartFile(); } - if (MenuButton(FSUI_ICONSTR(ICON_FA_TOOLBOX, "Start BIOS"), FSUI_CSTR("Start the console without any disc inserted."))) + if (MenuButton(FSUI_ICONSTR(ICON_PF_MICROCHIP, "Start BIOS"), FSUI_CSTR("Start the console without any disc inserted."))) { DoStartBIOS(); } @@ -1090,7 +1091,7 @@ void FullscreenUI::DrawLandingWindow() DoStartDisc(); } - if (MenuButton(FSUI_ICONSTR(ICON_FA_SLIDERS_H, "Settings"), FSUI_CSTR("Change settings for the emulator."))) + if (MenuButton(FSUI_ICONSTR(ICON_FA_TOOLBOX, "Settings"), FSUI_CSTR("Change settings for the emulator."))) SwitchToSettings(); if (MenuButton(FSUI_ICONSTR(ICON_FA_SIGN_OUT_ALT, "Exit"), FSUI_CSTR("Exits the program."))) @@ -1221,10 +1222,10 @@ void FullscreenUI::DrawInputBindingButton( title.fmt(ICON_FA_BULLSEYE " {}", display_name); break; case InputBindingInfo::Type::Motor: - title.fmt(ICON_FA_BELL " {}", display_name); + title.fmt(ICON_PF_CONTROLLER_VIBRATION " {}", display_name); break; case InputBindingInfo::Type::Macro: - title.fmt(ICON_FA_PIZZA_SLICE " {}", display_name); + title.fmt(ICON_PF_THUNDERBOLT " {}", display_name); break; default: title = display_name; @@ -2462,10 +2463,10 @@ void FullscreenUI::DrawSettingsWindow() { static constexpr float ITEM_WIDTH = 25.0f; - static constexpr const char* global_icons[] = {ICON_FA_WINDOW_MAXIMIZE, ICON_FA_MICROCHIP, ICON_FA_SLIDERS_H, ICON_FA_MAGIC, - ICON_FA_HEADPHONES, ICON_FA_SD_CARD, ICON_FA_GAMEPAD, ICON_FA_KEYBOARD, ICON_FA_TROPHY, ICON_FA_FOLDER_OPEN, ICON_FA_COGS}; - static constexpr const char* per_game_icons[] = {ICON_FA_PARAGRAPH, ICON_FA_SLIDERS_H, ICON_FA_MICROCHIP, ICON_FA_FROWN, - ICON_FA_MAGIC, ICON_FA_HEADPHONES, ICON_FA_SD_CARD, ICON_FA_GAMEPAD, ICON_FA_BAN}; + static constexpr const char* global_icons[] = {ICON_FA_TV, ICON_PF_MICROCHIP, ICON_PF_GEARS_OPTIONS_SETTINGS, ICON_PF_PICTURE, + ICON_PF_SOUND, ICON_PF_MEMORY_CARD, ICON_PF_GAMEPAD_ALT, ICON_PF_KEYBOARD_ALT, ICON_FA_TROPHY, ICON_FA_FOLDER_OPEN, ICON_FA_EXCLAMATION_TRIANGLE}; + static constexpr const char* per_game_icons[] = {ICON_FA_INFO, ICON_PF_GEARS_OPTIONS_SETTINGS, ICON_PF_MICROCHIP, ICON_PF_INFINITY, + ICON_PF_PICTURE, ICON_PF_SOUND, ICON_PF_MEMORY_CARD, ICON_FA_GAMEPAD, ICON_FA_RADIATION}; static constexpr SettingsPage global_pages[] = {SettingsPage::Interface, SettingsPage::BIOS, SettingsPage::Emulation, SettingsPage::Graphics, SettingsPage::Audio, SettingsPage::MemoryCard, SettingsPage::Controller, SettingsPage::Hotkey, SettingsPage::Achievements, SettingsPage::Folders, SettingsPage::Advanced}; @@ -2511,7 +2512,7 @@ void FullscreenUI::DrawSettingsWindow() } } - if (NavButton(ICON_FA_BACKWARD, true, true)) + if (NavButton(ICON_PF_BACKWARD, true, true)) ReturnToMainWindow(); if (s_game_settings_entry) @@ -2712,17 +2713,17 @@ void FullscreenUI::DrawInterfaceSettingsPage() MenuHeading(FSUI_CSTR("Behaviour")); - DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_MAGIC, "Inhibit Screensaver"), + DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_PF_SNOOZE, "Inhibit Screensaver"), FSUI_CSTR("Prevents the screen saver from activating and the host from sleeping while emulation is running."), "EmuCore", "InhibitScreensaver", true); - DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_CHARGING_STATION, "Enable Discord Presence"), + DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_USER_CIRCLE, "Enable Discord Presence"), FSUI_CSTR("Shows the game you are currently playing as part of your profile on Discord."), "UI", "DiscordPresence", false); DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_PAUSE, "Pause On Start"), FSUI_CSTR("Pauses the emulator when a game is started."), "UI", "StartPaused", false); - DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_VIDEO, "Pause On Focus Loss"), + DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_EYE, "Pause On Focus Loss"), FSUI_CSTR("Pauses the emulator when you minimize the window or switch to another application, and unpauses when you switch back."), "UI", "PauseOnFocusLoss", false); - DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_WINDOW_MAXIMIZE, "Pause On Menu"), + DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_LIST_ALT, "Pause On Menu"), FSUI_CSTR("Pauses the emulator when you open the quick menu, and unpauses when you close it."), "UI", "PauseOnMenu", true); DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_POWER_OFF, "Confirm Shutdown"), FSUI_CSTR("Determines whether a prompt will be displayed to confirm shutting down the emulator/game when the hotkey is pressed."), @@ -2731,7 +2732,7 @@ void FullscreenUI::DrawInterfaceSettingsPage() FSUI_CSTR("Automatically saves the emulator state when powering down or exiting. You can then resume directly from where you left " "off next time."), "EmuCore", "SaveStateOnShutdown", false); - if (DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_PAINT_BRUSH, "Use Light Theme"), + if (DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_LIGHTBULB, "Use Light Theme"), FSUI_CSTR("Uses a light coloured theme instead of the default dark theme."), "UI", "UseLightFullscreenUITheme", false)) { ImGuiFullscreen::SetTheme(bsi->GetBoolValue("UI", "UseLightFullscreenUITheme", false)); @@ -2747,27 +2748,27 @@ void FullscreenUI::DrawInterfaceSettingsPage() FSUI_CSTR("Hides the mouse pointer/cursor when the emulator is in fullscreen mode."), "UI", "HideMouseCursor", false); MenuHeading(FSUI_CSTR("On-Screen Display")); - DrawIntSpinBoxSetting(bsi, FSUI_ICONSTR(ICON_FA_SEARCH, "OSD Scale"), + DrawIntSpinBoxSetting(bsi, FSUI_ICONSTR(ICON_PF_HEARTBEAT_MAG, "OSD Scale"), FSUI_CSTR("Determines how large the on-screen messages and monitor are."), "EmuCore/GS", "OsdScale", 100, 25, 500, 1, FSUI_CSTR("%d%%")); DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_LIST, "Show Messages"), FSUI_CSTR( "Shows on-screen-display messages when events occur such as save states being created/loaded, screenshots being taken, etc."), "EmuCore/GS", "OsdShowMessages", true); - DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_CLOCK, "Show Speed"), + DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_TACHOMETER_ALT, "Show Speed"), FSUI_CSTR("Shows the current emulation speed of the system in the top-right corner of the display as a percentage."), "EmuCore/GS", "OsdShowSpeed", false); - DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_RULER, "Show FPS"), + DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_PF_SIXTY_CIRCLE, "Show FPS"), FSUI_CSTR( "Shows the number of video frames (or v-syncs) displayed per second by the system in the top-right corner of the display."), "EmuCore/GS", "OsdShowFPS", false); - DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_BATTERY_HALF, "Show CPU Usage"), + DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_PF_MICROCHIP_ALT, "Show CPU Usage"), FSUI_CSTR("Shows the CPU usage based on threads in the top-right corner of the display."), "EmuCore/GS", "OsdShowCPU", false); - DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_SPINNER, "Show GPU Usage"), + DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_IMAGE, "Show GPU Usage"), FSUI_CSTR("Shows the host's GPU usage in the top-right corner of the display."), "EmuCore/GS", "OsdShowGPU", false); - DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_RULER_VERTICAL, "Show Resolution"), + DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_PF_MONITOR_CODE, "Show Resolution"), FSUI_CSTR("Shows the resolution of the game in the top-right corner of the display."), "EmuCore/GS", "OsdShowResolution", false); - DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_BARS, "Show GS Statistics"), + DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_HEARTBEAT, "Show GS Statistics"), FSUI_CSTR("Shows statistics about GS (primitives, draw calls) in the top-right corner of the display."), "EmuCore/GS", "OsdShowGSStats", false); DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_PLAY, "Show Status Indicators"), @@ -2775,13 +2776,13 @@ void FullscreenUI::DrawInterfaceSettingsPage() "OsdShowIndicators", true); DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_SLIDERS_H, "Show Settings"), FSUI_CSTR("Shows the current configuration in the bottom-right corner of the display."), "EmuCore/GS", "OsdShowSettings", false); - DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_GAMEPAD, "Show Inputs"), + DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_PF_GAMEPAD_ALT, "Show Inputs"), FSUI_CSTR("Shows the current controller state of the system in the bottom-left corner of the display."), "EmuCore/GS", "OsdShowInputs", false); - DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_RULER_HORIZONTAL, "Show Frame Times"), + DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_PF_HEARTBEAT_ALT, "Show Frame Times"), FSUI_CSTR("Shows a visual history of frame times in the upper-left corner of the display."), "EmuCore/GS", "OsdShowFrameTimes", false); - DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_EXCLAMATION_CIRCLE, "Warn About Unsafe Settings"), + DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_EXCLAMATION, "Warn About Unsafe Settings"), FSUI_CSTR("Displays warnings when settings are enabled which may break games."), "EmuCore", "WarnAboutUnsafeSettings", true); MenuHeading(FSUI_CSTR("Operations")); @@ -2843,7 +2844,7 @@ void FullscreenUI::DrawBIOSSettingsPage() } MenuHeading(FSUI_CSTR("Options and Patches")); - DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_LIGHTBULB, "Fast Boot"), FSUI_CSTR("Skips the intro screen, and bypasses region checks."), + DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_FAST_FORWARD, "Fast Boot"), FSUI_CSTR("Skips the intro screen, and bypasses region checks."), "EmuCore", "EnableFastBoot", true); EndMenuButtons(); @@ -3605,11 +3606,11 @@ void FullscreenUI::DrawAudioSettingsPage() FSUI_CSTR("%d%%")); MenuHeading(FSUI_CSTR("Mixing Settings")); - DrawIntListSetting(bsi, FSUI_ICONSTR(ICON_FA_RULER, "Synchronization Mode"), + DrawIntListSetting(bsi, FSUI_ICONSTR(ICON_FA_SYNC_ALT, "Synchronization Mode"), FSUI_CSTR("Changes when SPU samples are generated relative to system emulation."), "SPU2/Output", "SynchMode", static_cast(Pcsx2Config::SPU2Options::SynchronizationMode::TimeStretch), synchronization_modes, std::size(synchronization_modes), true); - DrawIntListSetting(bsi, FSUI_ICONSTR(ICON_FA_PLUS, "Expansion Mode"), + DrawIntListSetting(bsi, FSUI_ICONSTR(ICON_PF_SPEAKER_ALT, "Expansion Mode"), FSUI_CSTR("Determines how the stereo output is transformed to greater speaker counts."), "SPU2/Output", "SpeakerConfiguration", 0, expansion_modes, std::size(expansion_modes), true); @@ -3657,7 +3658,7 @@ void FullscreenUI::DrawMemoryCardSettingsPage() std::string file_key(fmt::format("Slot{}_Filename", port + 1)); DrawToggleSetting(bsi, - SmallString::from_fmt(fmt::runtime(FSUI_ICONSTR_S(ICON_FA_SD_CARD, "Card Enabled", "##card_enabled_{}")), port), + SmallString::from_fmt(fmt::runtime(FSUI_ICONSTR_S(ICON_PF_MEMORY_CARD, "Card Enabled", "##card_enabled_{}")), port), FSUI_CSTR("If not set, this card will be considered unplugged."), "MemoryCards", enable_key.c_str(), true); const bool enabled = GetEffectiveBoolSetting(bsi, "MemoryCards", enable_key.c_str(), true); @@ -3960,7 +3961,7 @@ void FullscreenUI::DrawControllerSettingsPage() const char* section = sections[global_slot]; const Pad::ControllerInfo* ci = Pad::GetConfigControllerType(*bsi, section, global_slot); - if (MenuButton(FSUI_ICONSTR(ICON_FA_GAMEPAD, "Controller Type"), ci ? ci->GetLocalizedName() : FSUI_CSTR("Unknown"))) + if (MenuButton(FSUI_ICONSTR(ICON_PF_GAMEPAD_ALT, "Controller Type"), ci ? ci->GetLocalizedName() : FSUI_CSTR("Unknown"))) { const std::vector> raw_options = Pad::GetControllerTypeNames(); ImGuiFullscreen::ChoiceDialogOptions options; @@ -3997,11 +3998,11 @@ void FullscreenUI::DrawControllerSettingsPage() if (mtap_enabled[mtap_port]) { MenuHeading(SmallString::from_fmt( - fmt::runtime(FSUI_ICONSTR(ICON_FA_MICROCHIP, "Controller Port {}{} Macros")), mtap_port + 1, mtap_slot_names[mtap_slot])); + fmt::runtime(FSUI_ICONSTR(ICON_PF_EMPTY_KEYCAP, "Controller Port {}{} Macros")), mtap_port + 1, mtap_slot_names[mtap_slot])); } else { - MenuHeading(SmallString::from_fmt(fmt::runtime(FSUI_ICONSTR(ICON_FA_MICROCHIP, "Controller Port {} Macros")), mtap_port + 1)); + MenuHeading(SmallString::from_fmt(fmt::runtime(FSUI_ICONSTR(ICON_PF_EMPTY_KEYCAP, "Controller Port {} Macros")), mtap_port + 1)); } static bool macro_button_expanded[Pad::NUM_CONTROLLER_PORTS][Pad::NUM_MACRO_BUTTONS_PER_CONTROLLER] = {}; @@ -4010,7 +4011,7 @@ void FullscreenUI::DrawControllerSettingsPage() { bool& expanded = macro_button_expanded[global_slot][macro_index]; expanded ^= - MenuHeadingButton(SmallString::from_fmt(fmt::runtime(FSUI_ICONSTR(ICON_FA_MICROCHIP, "Macro Button {}")), macro_index + 1), + MenuHeadingButton(SmallString::from_fmt(fmt::runtime(FSUI_ICONSTR(ICON_PF_EMPTY_KEYCAP, "Macro Button {}")), macro_index + 1), macro_button_expanded[global_slot][macro_index] ? ICON_FA_CHEVRON_UP : ICON_FA_CHEVRON_DOWN); if (!expanded) continue; @@ -4114,7 +4115,7 @@ void FullscreenUI::DrawControllerSettingsPage() 1.0f, 0.01f, 100.0f, "%.0f%%"); const std::string deadzone_key(fmt::format("Macro{}Deadzone", macro_index + 1)); - DrawFloatSpinBoxSetting(bsi, FSUI_ICONSTR(ICON_FA_ARROW_DOWN, "Deadzone"), + DrawFloatSpinBoxSetting(bsi, FSUI_ICONSTR(ICON_FA_SKULL, "Deadzone"), FSUI_CSTR("Determines the pressure required to activate the macro."), section, deadzone_key.c_str(), 0.0f, 0.00f, 1.0f, 0.01f, 100.0f, "%.0f%%"); @@ -4299,16 +4300,16 @@ void FullscreenUI::DrawFoldersSettingsPage() MenuHeading(FSUI_CSTR("Data Save Locations")); - DrawFolderSetting(bsi, FSUI_ICONSTR(ICON_FA_CALENDAR, "Cache Directory"), "Folders", "Cache", EmuFolders::Cache); - DrawFolderSetting(bsi, FSUI_ICONSTR(ICON_FA_FOLDER, "Covers Directory"), "Folders", "Covers", EmuFolders::Covers); + DrawFolderSetting(bsi, FSUI_ICONSTR(ICON_FA_BOXES, "Cache Directory"), "Folders", "Cache", EmuFolders::Cache); + DrawFolderSetting(bsi, FSUI_ICONSTR(ICON_FA_IMAGES, "Covers Directory"), "Folders", "Covers", EmuFolders::Covers); DrawFolderSetting(bsi, FSUI_ICONSTR(ICON_FA_CAMERA, "Snapshots Directory"), "Folders", "Snapshots", EmuFolders::Snapshots); - DrawFolderSetting(bsi, FSUI_ICONSTR(ICON_FA_DOWNLOAD, "Save States Directory"), "Folders", "Savestates", EmuFolders::Savestates); + DrawFolderSetting(bsi, FSUI_ICONSTR(ICON_FA_SAVE, "Save States Directory"), "Folders", "Savestates", EmuFolders::Savestates); DrawFolderSetting(bsi, FSUI_ICONSTR(ICON_FA_WRENCH, "Game Settings Directory"), "Folders", "GameSettings", EmuFolders::GameSettings); - DrawFolderSetting(bsi, FSUI_ICONSTR(ICON_FA_GAMEPAD, "Input Profile Directory"), "Folders", "InputProfiles", EmuFolders::InputProfiles); - DrawFolderSetting(bsi, FSUI_ICONSTR(ICON_FA_FROWN, "Cheats Directory"), "Folders", "Cheats", EmuFolders::Cheats); - DrawFolderSetting(bsi, FSUI_ICONSTR(ICON_FA_MAGIC, "Patches Directory"), "Folders", "Patches", EmuFolders::Patches); - DrawFolderSetting(bsi, FSUI_ICONSTR(ICON_FA_SLIDERS_H, "Texture Replacements Directory"), "Folders", "Textures", EmuFolders::Textures); - DrawFolderSetting(bsi, FSUI_ICONSTR(ICON_FA_SLIDERS_H, "Video Dumping Directory"), "Folders", "Videos", EmuFolders::Videos); + DrawFolderSetting(bsi, FSUI_ICONSTR(ICON_PF_GAMEPAD_ALT, "Input Profile Directory"), "Folders", "InputProfiles", EmuFolders::InputProfiles); + DrawFolderSetting(bsi, FSUI_ICONSTR(ICON_PF_INFINITY, "Cheats Directory"), "Folders", "Cheats", EmuFolders::Cheats); + DrawFolderSetting(bsi, FSUI_ICONSTR(ICON_FA_BAND_AID, "Patches Directory"), "Folders", "Patches", EmuFolders::Patches); + DrawFolderSetting(bsi, FSUI_ICONSTR(ICON_FA_TSHIRT, "Texture Replacements Directory"), "Folders", "Textures", EmuFolders::Textures); + DrawFolderSetting(bsi, FSUI_ICONSTR(ICON_FA_VIDEO, "Video Dumping Directory"), "Folders", "Videos", EmuFolders::Videos); EndMenuButtons(); } @@ -4773,7 +4774,7 @@ void FullscreenUI::DrawPauseMenu(MainWindowType type) ImGui::SetFocusID(ImGui::GetID(FSUI_ICONSTR(ICON_FA_POWER_OFF, "Exit Without Saving")), ImGui::GetCurrentWindow()); } - if (ActiveButton(FSUI_ICONSTR(ICON_FA_BACKWARD, "Back To Pause Menu"), false) || WantsToCloseMenu()) + if (ActiveButton(FSUI_ICONSTR(ICON_PF_BACKWARD, "Back To Pause Menu"), false) || WantsToCloseMenu()) OpenPauseSubMenu(PauseSubMenu::None); if (ActiveButton(FSUI_ICONSTR(ICON_FA_SYNC, "Reset System"), false)) @@ -4792,9 +4793,9 @@ void FullscreenUI::DrawPauseMenu(MainWindowType type) case PauseSubMenu::Achievements: { if (just_focused) - ImGui::SetFocusID(ImGui::GetID(FSUI_ICONSTR(ICON_FA_BACKWARD, "Back To Pause Menu")), ImGui::GetCurrentWindow()); + ImGui::SetFocusID(ImGui::GetID(FSUI_ICONSTR(ICON_PF_BACKWARD, "Back To Pause Menu")), ImGui::GetCurrentWindow()); - if (ActiveButton(FSUI_ICONSTR(ICON_FA_BACKWARD, "Back To Pause Menu"), false) || WantsToCloseMenu()) + if (ActiveButton(FSUI_ICONSTR(ICON_PF_BACKWARD, "Back To Pause Menu"), false) || WantsToCloseMenu()) OpenPauseSubMenu(PauseSubMenu::None); if (ActiveButton(FSUI_ICONSTR(ICON_FA_TROPHY, "Achievements"), false)) @@ -4974,7 +4975,7 @@ void FullscreenUI::DrawSaveStateSelector(bool is_loading) if (ImGui::BeginChild("state_titlebar", heading_size, false, ImGuiWindowFlags_NavFlattened)) { BeginNavBar(); - if (NavButton(ICON_FA_BACKWARD, true, true)) + if (NavButton(ICON_PF_BACKWARD, true, true)) { CloseSaveStateSelector(); ReturnToPreviousWindow(); @@ -5286,13 +5287,13 @@ void FullscreenUI::DrawResumeStateSelector() is_open = false; } - if (ActiveButton(FSUI_ICONSTR(ICON_FA_LIGHTBULB, "Default Boot"), false)) + if (ActiveButton(FSUI_ICONSTR(ICON_FA_COMPACT_DISC, "Default Boot"), false)) { DoStartPath(s_save_state_selector_game_path); is_open = false; } - if (ActiveButton(FSUI_ICONSTR(ICON_FA_FOLDER_MINUS, "Delete State"), false)) + if (ActiveButton(FSUI_ICONSTR(ICON_FA_TRASH, "Delete State"), false)) { if (FileSystem::DeleteFilePath(entry.path.c_str())) { @@ -5469,7 +5470,7 @@ void FullscreenUI::DrawGameListWindow() } } - if (NavButton(ICON_FA_BACKWARD, true, true)) + if (NavButton(ICON_PF_BACKWARD, true, true)) ReturnToPreviousWindow(); NavTitle(Host::TranslateToCString(TR_CONTEXT, titles[static_cast(s_game_list_page)])); @@ -6270,11 +6271,11 @@ void FullscreenUI::DrawAchievementsSettingsPage(std::unique_lock& se const bool enabled = bsi->GetBoolValue("Achievements", "Enabled", false); - check_challenge_state |= DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_HARD_HAT, "Hardcore Mode"), + check_challenge_state |= DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_PF_DUMBELL, "Hardcore Mode"), FSUI_CSTR( "\"Challenge\" mode for achievements, including leaderboard tracking. Disables save state, cheats, and slowdown functions."), "Achievements", "ChallengeMode", false, enabled); - DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_INBOX, "Achievement Notifications"), + DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_BELL, "Achievement Notifications"), FSUI_CSTR("Displays popup messages on events such as achievement unlocks and leaderboard submissions."), "Achievements", "Notifications", true, enabled); DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_LIST_OL, "Leaderboard Notifications"), @@ -6283,13 +6284,13 @@ void FullscreenUI::DrawAchievementsSettingsPage(std::unique_lock& se DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_HEADPHONES, "Sound Effects"), FSUI_CSTR("Plays sound effects for events such as achievement unlocks and leaderboard submissions."), "Achievements", "SoundEffects", true, enabled); - DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_MAGIC, "Enable In-Game Overlays"), + DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_PF_HEARTBEAT_ALT, "Enable In-Game Overlays"), FSUI_CSTR("Shows icons in the lower-right corner of the screen when a challenge/primed achievement is active."), "Achievements", "Overlays", true, enabled); - DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_USER_FRIENDS, "Encore Mode"), + DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_LOCK, "Encore Mode"), FSUI_CSTR("When enabled, each session will behave as if no achievements have been unlocked."), "Achievements", "EncoreMode", false, enabled); - DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_STETHOSCOPE, "Spectator Mode"), + DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_EYE, "Spectator Mode"), FSUI_CSTR("When enabled, PCSX2 will assume all achievements are locked and not send any unlock notifications to the server."), "Achievements", "SpectatorMode", false, enabled); DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_MEDAL, "Test Unofficial Achievements"), diff --git a/pcsx2/ImGui/ImGuiManager.cpp b/pcsx2/ImGui/ImGuiManager.cpp index b27404435dd84b..d6bcb30bdf7202 100644 --- a/pcsx2/ImGui/ImGuiManager.cpp +++ b/pcsx2/ImGui/ImGuiManager.cpp @@ -482,8 +482,8 @@ ImFont* ImGuiManager::AddFixedFont(float size) bool ImGuiManager::AddIconFonts(float size) { // clang-format off - static constexpr ImWchar range_fa[] = { 0xf002,0xf002,0xf005,0xf005,0xf007,0xf007,0xf00c,0xf00e,0xf011,0xf011,0xf013,0xf013,0xf017,0xf017,0xf019,0xf019,0xf01c,0xf01c,0xf021,0xf021,0xf023,0xf023,0xf025,0xf025,0xf027,0xf028,0xf02e,0xf02e,0xf030,0xf030,0xf03a,0xf03a,0xf03d,0xf03d,0xf04a,0xf04c,0xf04e,0xf04e,0xf050,0xf050,0xf052,0xf052,0xf059,0xf059,0xf05e,0xf05e,0xf063,0xf063,0xf065,0xf065,0xf067,0xf067,0xf06a,0xf06a,0xf071,0xf071,0xf077,0xf078,0xf07b,0xf07c,0xf084,0xf085,0xf091,0xf091,0xf0ac,0xf0ad,0xf0b0,0xf0b0,0xf0c5,0xf0c5,0xf0c7,0xf0c9,0xf0cb,0xf0cb,0xf0d0,0xf0d0,0xf0dc,0xf0dc,0xf0e2,0xf0e2,0xf0eb,0xf0eb,0xf0f1,0xf0f1,0xf0f3,0xf0f3,0xf0fe,0xf0fe,0xf110,0xf110,0xf119,0xf119,0xf11b,0xf11c,0xf121,0xf121,0xf133,0xf133,0xf140,0xf140,0xf144,0xf144,0xf14a,0xf14a,0xf15b,0xf15b,0xf15d,0xf15d,0xf188,0xf188,0xf191,0xf192,0xf1c9,0xf1c9,0xf1dd,0xf1de,0xf1e6,0xf1e6,0xf1ea,0xf1eb,0xf1f8,0xf1f8,0xf1fc,0xf1fc,0xf242,0xf242,0xf245,0xf245,0xf26c,0xf26c,0xf279,0xf279,0xf2d0,0xf2d0,0xf2db,0xf2db,0xf2f2,0xf2f2,0xf2f5,0xf2f5,0xf302,0xf302,0xf3c1,0xf3c1,0xf3fd,0xf3fd,0xf410,0xf410,0xf466,0xf466,0xf500,0xf500,0xf517,0xf517,0xf51f,0xf51f,0xf543,0xf543,0xf545,0xf545,0xf547,0xf548,0xf552,0xf552,0xf56d,0xf56d,0xf5a2,0xf5a2,0xf5e7,0xf5e7,0xf65d,0xf65e,0xf6a9,0xf6a9,0xf756,0xf756,0xf794,0xf794,0xf7c2,0xf7c2,0xf807,0xf807,0xf815,0xf815,0xf818,0xf818,0xf84c,0xf84c,0xf8cc,0xf8cc,0xf8da,0xf8da,0x0,0x0 }; - static constexpr ImWchar range_pf[] = { 0x2198,0x2199,0x219e,0x21a1,0x21b0,0x21b3,0x21ba,0x21c3,0x21d0,0x21d4,0x21dc,0x21dd,0x21e0,0x21e3,0x21f3,0x21f3,0x21f7,0x21f8,0x21fa,0x21fb,0x227a,0x227d,0x22bf,0x22c8,0x237a,0x237a,0x23b2,0x23b4,0x23f4,0x23f7,0x2427,0x243a,0x243c,0x243c,0x2443,0x2443,0x2460,0x246b,0x24f5,0x24fd,0x24ff,0x24ff,0x278a,0x278e,0xe001,0xe001,0xff21,0xff3a,0x0,0x0 }; + static constexpr ImWchar range_fa[] = { 0xf002,0xf002,0xf005,0xf005,0xf007,0xf007,0xf00c,0xf00e,0xf011,0xf011,0xf013,0xf013,0xf017,0xf017,0xf019,0xf019,0xf021,0xf023,0xf025,0xf025,0xf027,0xf028,0xf02e,0xf02e,0xf030,0xf030,0xf03a,0xf03a,0xf03d,0xf03e,0xf04b,0xf04c,0xf04e,0xf04e,0xf050,0xf050,0xf052,0xf052,0xf059,0xf059,0xf05e,0xf05e,0xf063,0xf063,0xf065,0xf065,0xf067,0xf067,0xf06a,0xf06a,0xf06e,0xf06e,0xf071,0xf071,0xf077,0xf078,0xf07b,0xf07c,0xf084,0xf084,0xf091,0xf091,0xf0ac,0xf0ad,0xf0b0,0xf0b0,0xf0c5,0xf0c5,0xf0c7,0xf0c8,0xf0cb,0xf0cb,0xf0d0,0xf0d0,0xf0dc,0xf0dc,0xf0e2,0xf0e2,0xf0eb,0xf0eb,0xf0f3,0xf0f3,0xf0fe,0xf0fe,0xf11b,0xf11c,0xf121,0xf121,0xf129,0xf12a,0xf140,0xf140,0xf144,0xf144,0xf14a,0xf14a,0xf15b,0xf15b,0xf15d,0xf15d,0xf188,0xf188,0xf191,0xf192,0xf1c9,0xf1c9,0xf1de,0xf1de,0xf1e6,0xf1e6,0xf1ea,0xf1eb,0xf1f8,0xf1f8,0xf1fc,0xf1fc,0xf21e,0xf21e,0xf245,0xf245,0xf26c,0xf26c,0xf279,0xf279,0xf2bd,0xf2bd,0xf2d0,0xf2d0,0xf2db,0xf2db,0xf2f1,0xf2f2,0xf2f5,0xf2f5,0xf302,0xf302,0xf3c1,0xf3c1,0xf3fd,0xf3fd,0xf410,0xf410,0xf462,0xf462,0xf466,0xf466,0xf468,0xf468,0xf517,0xf517,0xf51f,0xf51f,0xf543,0xf543,0xf547,0xf547,0xf54c,0xf54c,0xf552,0xf553,0xf56d,0xf56d,0xf5a2,0xf5a2,0xf65d,0xf65e,0xf6a9,0xf6a9,0xf756,0xf756,0xf794,0xf794,0xf7b9,0xf7b9,0xf7c2,0xf7c2,0xf815,0xf815,0xf84c,0xf84c,0xf8cc,0xf8cc,0xf8da,0xf8da,0x0,0x0 }; + static constexpr ImWchar range_pf[] = { 0x2198,0x2199,0x219e,0x21a1,0x21b0,0x21b3,0x21ba,0x21c3,0x21d0,0x21d4,0x21dc,0x21dd,0x21e0,0x21e3,0x21f3,0x21f3,0x21f7,0x21f8,0x21fa,0x21fb,0x221a,0x221a,0x227a,0x227d,0x22bf,0x22c8,0x235b,0x235e,0x2360,0x2361,0x2364,0x2367,0x237a,0x237b,0x237d,0x2380,0x23b2,0x23b5,0x23cc,0x23cc,0x23f4,0x23f7,0x2427,0x243a,0x243c,0x243c,0x2443,0x2443,0x2460,0x246b,0x248f,0x248f,0x24f5,0x24fd,0x24ff,0x24ff,0x2699,0x2699,0x278a,0x278e,0xe001,0xe001,0xff21,0xff3a,0x0,0x0 }; // clang-format on {