diff --git a/bin/Icons/ui/home/256/usb-solid.png b/bin/Icons/ui/home/256/usb-solid.png new file mode 100644 index 0000000000..0409972e13 Binary files /dev/null and b/bin/Icons/ui/home/256/usb-solid.png differ diff --git a/bin/Icons/ui/home/32/usb-solid.png b/bin/Icons/ui/home/32/usb-solid.png new file mode 100644 index 0000000000..32f2c83225 Binary files /dev/null and b/bin/Icons/ui/home/32/usb-solid.png differ diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_icons.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_icons.cpp index 4ef9dbea9a..1a734bd974 100644 --- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_icons.cpp +++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_icons.cpp @@ -51,6 +51,8 @@ namespace rsx::overlays::home_menu return "sliders-solid.png"; case fa_icon::settings_gauge: return "gauge-solid.png"; + case fa_icon::usb: + return "usb-solid.png"; case fa_icon::bug: return "bug-solid.png"; } diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_icons.h b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_icons.h index 4b05b852e1..8e1717ca21 100644 --- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_icons.h +++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_icons.h @@ -25,6 +25,7 @@ namespace rsx::overlays::home_menu gamepad, settings_sliders, settings_gauge, + usb, bug, }; diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp index d8e60b7592..f6082a4206 100644 --- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp +++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp @@ -19,6 +19,7 @@ namespace rsx add_page(home_menu::fa_icon::settings, std::make_shared(x, y, width, height, use_separators, nullptr)); add_page(home_menu::fa_icon::settings_sliders, std::make_shared(x, y, width, height, use_separators, nullptr)); add_page(home_menu::fa_icon::settings_gauge, std::make_shared(x, y, width, height, use_separators, nullptr)); + add_page(home_menu::fa_icon::usb, std::make_shared(x, y, width, height, use_separators, nullptr)); add_page(home_menu::fa_icon::bug, std::make_shared(x, y, width, height, use_separators, nullptr)); // Select the first item @@ -263,6 +264,13 @@ namespace rsx apply_layout(); } + home_menu_settings_usb_devices::home_menu_settings_usb_devices(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent) + : home_menu_settings_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_USB_DEVICES)) + { + + apply_layout(); + } + home_menu_settings_debug::home_menu_settings_debug(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent) : home_menu_settings_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_DEBUG)) { diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h index ba8b730d44..15a2ba969e 100644 --- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h +++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h @@ -344,6 +344,11 @@ namespace rsx home_menu_settings_performance_overlay(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent); }; + struct home_menu_settings_usb_devices : public home_menu_settings_page + { + home_menu_settings_usb_devices(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent); + }; + struct home_menu_settings_debug : public home_menu_settings_page { home_menu_settings_debug(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent); diff --git a/rpcs3/Emu/localized_string_id.h b/rpcs3/Emu/localized_string_id.h index c411f6e480..791c00afef 100644 --- a/rpcs3/Emu/localized_string_id.h +++ b/rpcs3/Emu/localized_string_id.h @@ -275,6 +275,7 @@ enum class localized_string_id HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FONT_SIZE, HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_OPACITY, HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_USE_WINDOW_SPACE, + HOME_MENU_SETTINGS_USB_DEVICES, HOME_MENU_SETTINGS_DEBUG, HOME_MENU_SETTINGS_DEBUG_OVERLAY, HOME_MENU_SETTINGS_DEBUG_INPUT_OVERLAY, diff --git a/rpcs3/rpcs3qt/localized_emu.h b/rpcs3/rpcs3qt/localized_emu.h index ba4960aa73..3482d7b812 100644 --- a/rpcs3/rpcs3qt/localized_emu.h +++ b/rpcs3/rpcs3qt/localized_emu.h @@ -295,6 +295,7 @@ private: case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FONT_SIZE: return tr("Font Size", "Performance Overlay"); case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_OPACITY: return tr("Opacity", "Performance Overlay"); case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_USE_WINDOW_SPACE: return tr("Use Window Space", "Performance Overlay"); + case localized_string_id::HOME_MENU_SETTINGS_USB_DEVICES: return tr("USB Devices"); case localized_string_id::HOME_MENU_SETTINGS_DEBUG: return tr("Debug"); case localized_string_id::HOME_MENU_SETTINGS_DEBUG_OVERLAY: return tr("Debug Overlay", "Debug"); case localized_string_id::HOME_MENU_SETTINGS_DEBUG_INPUT_OVERLAY: return tr("Input Debug Overlay", "Debug");