CMakeLists: Ensure proper numerusform tags are generated for pluralized translations

If we don't set an explicit source and target language for the base
english translation, then we'll generate an incorrect number of
<numerusform> tags (which Transifex doesn't like).

CMakeLists.txt

@@ -496,7 +496,7 @@ endif()
 # Ensure libusb is properly configured (based on dolphin libusb include)
 if(NOT APPLE AND NOT YUZU_USE_BUNDLED_LIBUSB)
     include(FindPkgConfig)
-    if (PKG_CONFIG_FOUND AND NOT CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD")
+    if (PKG_CONFIG_FOUND)
         pkg_check_modules(LIBUSB QUIET libusb-1.0>=1.0.24)
     else()
         find_package(LibUSB)

src/common/fs/fs_util.cpp

@@ -20,10 +20,6 @@ std::string ToUTF8String(std::u8string_view u8_string) {
     return std::string{u8_string.begin(), u8_string.end()};
 }
 
-std::string BufferToUTF8String(std::span<const u8> buffer) {
-    return std::string{buffer.begin(), std::ranges::find(buffer, u8{0})};
-}
-
 std::string PathToUTF8String(const std::filesystem::path& path) {
     return ToUTF8String(path.u8string());
 }

src/common/fs/fs_util.h

@@ -46,17 +46,6 @@ concept IsChar = std::same_as<T, char>;
  */
 [[nodiscard]] std::string ToUTF8String(std::u8string_view u8_string);
 
-/**
- * Converts a buffer of bytes to a UTF8-encoded std::string.
- * This converts from the start of the buffer until the first encountered null-terminator.
- * If no null-terminator is found, this converts the entire buffer instead.
- *
- * @param buffer Buffer of bytes
- *
- * @returns UTF-8 encoded std::string.
- */
-[[nodiscard]] std::string BufferToUTF8String(std::span<const u8> buffer);
-
 /**
  * Converts a filesystem path to a UTF-8 encoded std::string.
  *

src/video_core/texture_cache/render_targets.h

@@ -24,10 +24,10 @@ struct RenderTargets {
         return std::ranges::any_of(color_buffer_ids, contains) || contains(depth_buffer_id);
     }
 
-    std::array<ImageViewId, NUM_RT> color_buffer_ids{};
-    ImageViewId depth_buffer_id{};
+    std::array<ImageViewId, NUM_RT> color_buffer_ids;
+    ImageViewId depth_buffer_id;
     std::array<u8, NUM_RT> draw_buffers{};
-    Extent2D size{};
+    Extent2D size;
 };
 
 } // namespace VideoCommon

src/yuzu/CMakeLists.txt

@@ -182,7 +182,14 @@ if (ENABLE_QT_TRANSLATION)
     # Update source TS file if enabled
     if (GENERATE_QT_TRANSLATION)
         get_target_property(SRCS yuzu SOURCES)
-        qt5_create_translation(QM_FILES ${SRCS} ${UIS} ${YUZU_QT_LANGUAGES}/en.ts)
+        qt5_create_translation(QM_FILES
+            ${SRCS}
+            ${UIS}
+            ${YUZU_QT_LANGUAGES}/en.ts
+        OPTIONS
+            -source-language en_US
+            -target-language en_US
+        )
         add_custom_target(translation ALL DEPENDS ${YUZU_QT_LANGUAGES}/en.ts)
     endif()
 

src/yuzu/applets/qt_web_browser.cpp

@@ -107,7 +107,6 @@ void QtNXWebEngineView::LoadLocalWebPage(const std::string& main_url,
     is_local = true;
 
     LoadExtractedFonts();
-    FocusFirstLinkElement();
     SetUserAgent(UserAgent::WebApplet);
     SetFinished(false);
     SetExitReason(Service::AM::Applets::WebExitReason::EndButtonPressed);
@@ -122,7 +121,6 @@ void QtNXWebEngineView::LoadExternalWebPage(const std::string& main_url,
                                             const std::string& additional_args) {
     is_local = false;
 
-    FocusFirstLinkElement();
     SetUserAgent(UserAgent::WebApplet);
     SetFinished(false);
     SetExitReason(Service::AM::Applets::WebExitReason::EndButtonPressed);
@@ -210,7 +208,7 @@ void QtNXWebEngineView::HandleWindowFooterButtonPressedOnce() {
         if (input_interpreter->IsButtonPressedOnce(button)) {
             page()->runJavaScript(
                 QStringLiteral("yuzu_key_callbacks[%1] == null;").arg(static_cast<u8>(button)),
-                [this, button](const QVariant& variant) {
+                [&](const QVariant& variant) {
                     if (variant.toBool()) {
                         switch (button) {
                         case HIDButton::A:
@@ -366,17 +364,6 @@ void QtNXWebEngineView::LoadExtractedFonts() {
         Qt::QueuedConnection);
 }
 
-void QtNXWebEngineView::FocusFirstLinkElement() {
-    QWebEngineScript focus_link_element;
-
-    focus_link_element.setName(QStringLiteral("focus_link_element.js"));
-    focus_link_element.setSourceCode(QString::fromStdString(FOCUS_LINK_ELEMENT_SCRIPT));
-    focus_link_element.setWorldId(QWebEngineScript::MainWorld);
-    focus_link_element.setInjectionPoint(QWebEngineScript::Deferred);
-    focus_link_element.setRunsOnSubFrames(true);
-    default_profile->scripts()->insert(focus_link_element);
-}
-
 #endif
 
 QtWebBrowser::QtWebBrowser(GMainWindow& main_window) {

src/yuzu/applets/qt_web_browser.h

@@ -161,9 +161,6 @@ private:
     /// Loads the extracted fonts using JavaScript.
     void LoadExtractedFonts();
 
-    /// Brings focus to the first available link element.
-    void FocusFirstLinkElement();
-
     InputCommon::InputSubsystem* input_subsystem;
 
     std::unique_ptr<UrlRequestInterceptor> url_interceptor;

src/yuzu/applets/qt_web_browser_scripts.h

@@ -73,12 +73,6 @@ constexpr char LOAD_NX_FONT[] = R"(
 })();
 )";
 
-constexpr char FOCUS_LINK_ELEMENT_SCRIPT[] = R"(
-if (document.getElementsByTagName("a").length > 0) {
-    document.getElementsByTagName("a")[0].focus();
-}
-)";
-
 constexpr char GAMEPAD_SCRIPT[] = R"(
 window.addEventListener("gamepadconnected", function(e) {
     console.log("Gamepad connected at index %d: %s. %d buttons, %d axes.",

src/yuzu/configuration/config.cpp

@@ -945,8 +945,7 @@ void Config::ReadUIGamelistValues() {
     qt_config->beginGroup(QStringLiteral("UIGameList"));
 
     ReadBasicSetting(UISettings::values.show_add_ons);
-    ReadBasicSetting(UISettings::values.game_icon_size);
-    ReadBasicSetting(UISettings::values.folder_icon_size);
+    ReadBasicSetting(UISettings::values.icon_size);
     ReadBasicSetting(UISettings::values.row_1_text_id);
     ReadBasicSetting(UISettings::values.row_2_text_id);
     ReadBasicSetting(UISettings::values.cache_game_list);
@@ -1459,8 +1458,7 @@ void Config::SaveUIGamelistValues() {
     qt_config->beginGroup(QStringLiteral("UIGameList"));
 
     WriteBasicSetting(UISettings::values.show_add_ons);
-    WriteBasicSetting(UISettings::values.game_icon_size);
-    WriteBasicSetting(UISettings::values.folder_icon_size);
+    WriteBasicSetting(UISettings::values.icon_size);
     WriteBasicSetting(UISettings::values.row_1_text_id);
     WriteBasicSetting(UISettings::values.row_2_text_id);
     WriteBasicSetting(UISettings::values.cache_game_list);

src/yuzu/configuration/configure_ui.cpp

@@ -16,7 +16,7 @@
 #include "yuzu/uisettings.h"
 
 namespace {
-constexpr std::array default_game_icon_sizes{
+constexpr std::array default_icon_sizes{
     std::make_pair(0, QT_TRANSLATE_NOOP("ConfigureUI", "None")),
     std::make_pair(32, QT_TRANSLATE_NOOP("ConfigureUI", "Small (32x32)")),
     std::make_pair(64, QT_TRANSLATE_NOOP("ConfigureUI", "Standard (64x64)")),
@@ -24,13 +24,6 @@ constexpr std::array default_game_icon_sizes{
     std::make_pair(256, QT_TRANSLATE_NOOP("ConfigureUI", "Full Size (256x256)")),
 };
 
-constexpr std::array default_folder_icon_sizes{
-    std::make_pair(0, QT_TRANSLATE_NOOP("ConfigureUI", "None")),
-    std::make_pair(24, QT_TRANSLATE_NOOP("ConfigureUI", "Small (24x24)")),
-    std::make_pair(48, QT_TRANSLATE_NOOP("ConfigureUI", "Standard (48x48)")),
-    std::make_pair(72, QT_TRANSLATE_NOOP("ConfigureUI", "Large (72x72)")),
-};
-
 // clang-format off
 constexpr std::array row_text_names{
     QT_TRANSLATE_NOOP("ConfigureUI", "Filename"),
@@ -41,12 +34,8 @@ constexpr std::array row_text_names{
 };
 // clang-format on
 
-QString GetTranslatedGameIconSize(size_t index) {
-    return QCoreApplication::translate("ConfigureUI", default_game_icon_sizes[index].second);
-}
-
-QString GetTranslatedFolderIconSize(size_t index) {
-    return QCoreApplication::translate("ConfigureUI", default_folder_icon_sizes[index].second);
+QString GetTranslatedIconSize(size_t index) {
+    return QCoreApplication::translate("ConfigureUI", default_icon_sizes[index].second);
 }
 
 QString GetTranslatedRowTextName(size_t index) {
@@ -71,10 +60,8 @@ ConfigureUi::ConfigureUi(QWidget* parent) : QWidget(parent), ui(new Ui::Configur
 
     // Force game list reload if any of the relevant settings are changed.
     connect(ui->show_add_ons, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate);
-    connect(ui->game_icon_size_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+    connect(ui->icon_size_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
             &ConfigureUi::RequestGameListUpdate);
-    connect(ui->folder_icon_size_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged),
-            this, &ConfigureUi::RequestGameListUpdate);
     connect(ui->row_1_text_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
             &ConfigureUi::RequestGameListUpdate);
     connect(ui->row_2_text_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
@@ -108,8 +95,7 @@ void ConfigureUi::ApplyConfiguration() {
     UISettings::values.theme =
         ui->theme_combobox->itemData(ui->theme_combobox->currentIndex()).toString();
     UISettings::values.show_add_ons = ui->show_add_ons->isChecked();
-    UISettings::values.game_icon_size = ui->game_icon_size_combobox->currentData().toUInt();
-    UISettings::values.folder_icon_size = ui->folder_icon_size_combobox->currentData().toUInt();
+    UISettings::values.icon_size = ui->icon_size_combobox->currentData().toUInt();
     UISettings::values.row_1_text_id = ui->row_1_text_combobox->currentData().toUInt();
     UISettings::values.row_2_text_id = ui->row_2_text_combobox->currentData().toUInt();
 
@@ -128,10 +114,8 @@ void ConfigureUi::SetConfiguration() {
     ui->language_combobox->setCurrentIndex(
         ui->language_combobox->findData(UISettings::values.language));
     ui->show_add_ons->setChecked(UISettings::values.show_add_ons.GetValue());
-    ui->game_icon_size_combobox->setCurrentIndex(
-        ui->game_icon_size_combobox->findData(UISettings::values.game_icon_size.GetValue()));
-    ui->folder_icon_size_combobox->setCurrentIndex(
-        ui->folder_icon_size_combobox->findData(UISettings::values.folder_icon_size.GetValue()));
+    ui->icon_size_combobox->setCurrentIndex(
+        ui->icon_size_combobox->findData(UISettings::values.icon_size.GetValue()));
 
     ui->enable_screenshot_save_as->setChecked(
         UISettings::values.enable_screenshot_save_as.GetValue());
@@ -150,14 +134,8 @@ void ConfigureUi::changeEvent(QEvent* event) {
 void ConfigureUi::RetranslateUI() {
     ui->retranslateUi(this);
 
-    for (int i = 0; i < ui->game_icon_size_combobox->count(); i++) {
-        ui->game_icon_size_combobox->setItemText(i,
-                                                 GetTranslatedGameIconSize(static_cast<size_t>(i)));
-    }
-
-    for (int i = 0; i < ui->folder_icon_size_combobox->count(); i++) {
-        ui->folder_icon_size_combobox->setItemText(
-            i, GetTranslatedFolderIconSize(static_cast<size_t>(i)));
+    for (int i = 0; i < ui->icon_size_combobox->count(); i++) {
+        ui->icon_size_combobox->setItemText(i, GetTranslatedIconSize(static_cast<size_t>(i)));
     }
 
     for (int i = 0; i < ui->row_1_text_combobox->count(); i++) {
@@ -188,13 +166,9 @@ void ConfigureUi::InitializeLanguageComboBox() {
 }
 
 void ConfigureUi::InitializeIconSizeComboBox() {
-    for (size_t i = 0; i < default_game_icon_sizes.size(); i++) {
-        const auto size = default_game_icon_sizes[i].first;
-        ui->game_icon_size_combobox->addItem(GetTranslatedGameIconSize(i), size);
-    }
-    for (size_t i = 0; i < default_folder_icon_sizes.size(); i++) {
-        const auto size = default_folder_icon_sizes[i].first;
-        ui->folder_icon_size_combobox->addItem(GetTranslatedFolderIconSize(i), size);
+    for (size_t i = 0; i < default_icon_sizes.size(); i++) {
+        const auto size = default_icon_sizes[i].first;
+        ui->icon_size_combobox->addItem(GetTranslatedIconSize(i), size);
     }
 }
 

src/yuzu/configuration/configure_ui.ui

@@ -81,30 +81,16 @@
          </widget>
         </item>
         <item>
-         <layout class="QHBoxLayout" name="game_icon_size_qhbox_layout_2">
+         <layout class="QHBoxLayout" name="icon_size_qhbox_layout_2">
           <item>
-           <widget class="QLabel" name="game_icon_size_label">
+           <widget class="QLabel" name="icon_size_label">
             <property name="text">
-             <string>Game Icon Size:</string>
+             <string>Icon Size:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QComboBox" name="game_icon_size_combobox"/>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <layout class="QHBoxLayout" name="folder_icon_size_qhbox_layout_2">
-          <item>
-           <widget class="QLabel" name="folder_icon_size_label">
-            <property name="text">
-             <string>Folder Icon Size:</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="folder_icon_size_combobox"/>
+           <widget class="QComboBox" name="icon_size_combobox"/>
           </item>
          </layout>
         </item>

src/yuzu/game_list.cpp

@@ -244,8 +244,8 @@ void GameList::OnUpdateThemedIcons() {
     for (int i = 0; i < item_model->invisibleRootItem()->rowCount(); i++) {
         QStandardItem* child = item_model->invisibleRootItem()->child(i);
 
-        const int icon_size = UISettings::values.folder_icon_size.GetValue();
-
+        const int icon_size =
+            std::min(static_cast<int>(UISettings::values.icon_size.GetValue()), 64);
         switch (child->data(GameListItem::TypeRole).value<GameListItemType>()) {
         case GameListItemType::SdmcDir:
             child->setData(

src/yuzu/game_list_p.h

@@ -80,7 +80,7 @@ public:
         setData(qulonglong(program_id), ProgramIdRole);
         setData(game_type, FileTypeRole);
 
-        const u32 size = UISettings::values.game_icon_size.GetValue();
+        const u32 size = UISettings::values.icon_size.GetValue();
 
         QPixmap picture;
         if (!picture.loadFromData(picture_data.data(), static_cast<u32>(picture_data.size()))) {
@@ -233,7 +233,8 @@ public:
         UISettings::GameDir* game_dir = &directory;
         setData(QVariant(UISettings::values.game_dirs.indexOf(directory)), GameDirRole);
 
-        const int icon_size = UISettings::values.folder_icon_size.GetValue();
+        const int icon_size =
+            std::min(static_cast<int>(UISettings::values.icon_size.GetValue()), 64);
         switch (dir_type) {
         case GameListItemType::SdmcDir:
             setData(
@@ -294,8 +295,8 @@ public:
     explicit GameListAddDir() {
         setData(type(), TypeRole);
 
-        const int icon_size = UISettings::values.folder_icon_size.GetValue();
-
+        const int icon_size =
+            std::min(static_cast<int>(UISettings::values.icon_size.GetValue()), 64);
         setData(QIcon::fromTheme(QStringLiteral("plus"))
                     .pixmap(icon_size)
                     .scaled(icon_size, icon_size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation),
@@ -317,8 +318,8 @@ public:
     explicit GameListFavorites() {
         setData(type(), TypeRole);
 
-        const int icon_size = UISettings::values.folder_icon_size.GetValue();
-
+        const int icon_size =
+            std::min(static_cast<int>(UISettings::values.icon_size.GetValue()), 64);
         setData(QIcon::fromTheme(QStringLiteral("star"))
                     .pixmap(icon_size)
                     .scaled(icon_size, icon_size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation),

src/yuzu/uisettings.h

@@ -91,8 +91,7 @@ struct Values {
 
     // Game List
     Settings::BasicSetting<bool> show_add_ons{true, "show_add_ons"};
-    Settings::BasicSetting<uint32_t> game_icon_size{64, "game_icon_size"};
-    Settings::BasicSetting<uint32_t> folder_icon_size{48, "folder_icon_size"};
+    Settings::BasicSetting<uint32_t> icon_size{64, "icon_size"};
     Settings::BasicSetting<uint8_t> row_1_text_id{3, "row_1_text_id"};
     Settings::BasicSetting<uint8_t> row_2_text_id{2, "row_2_text_id"};
     std::atomic_bool is_game_list_reload_pending{false};