From 1dac26b012229c75eb567c6e40b5edc327dab1b9 Mon Sep 17 00:00:00 2001 From: crueter Date: Sat, 15 Nov 2025 20:07:33 -0500 Subject: [PATCH] fixup data manager name stuff Signed-off-by: crueter --- src/qt_common/qt_string_lookup.h | 20 ++++++++++---------- src/yuzu/data_dialog.cpp | 32 +++++++++++++++----------------- 2 files changed, 25 insertions(+), 27 deletions(-) diff --git a/src/qt_common/qt_string_lookup.h b/src/qt_common/qt_string_lookup.h index 94048e8d94..5a19fb00d3 100644 --- a/src/qt_common/qt_string_lookup.h +++ b/src/qt_common/qt_string_lookup.h @@ -20,11 +20,11 @@ Q_NAMESPACE // TODO(crueter): QML interface enum StringKey { - SavesTooltip, - ShadersTooltip, - UserNandTooltip, - SysNandTooltip, - ModsTooltip, + DataManagerSavesTooltip, + DataManagerShadersTooltip, + DataManagerUserNandTooltip, + DataManagerSysNandTooltip, + DataManagerModsTooltip, // Key install results KeyInstallSuccess, @@ -65,13 +65,13 @@ enum StringKey { // always triple-check the size arg static const constexpr frozen::map strings = { // 0-4 - {SavesTooltip, + {DataManagerSavesTooltip, QT_TR_NOOP("Contains game save data. DO NOT REMOVE UNLESS YOU KNOW WHAT YOU'RE DOING!")}, - {ShadersTooltip, + {DataManagerShadersTooltip, QT_TR_NOOP("Contains Vulkan and OpenGL pipeline caches. Generally safe to remove.")}, - {UserNandTooltip, QT_TR_NOOP("Contains updates and DLC for games.")}, - {SysNandTooltip, QT_TR_NOOP("Contains firmware and applet data.")}, - {ModsTooltip, QT_TR_NOOP("Contains game mods, patches, and cheats.")}, + {DataManagerUserNandTooltip, QT_TR_NOOP("Contains updates and DLC for games.")}, + {DataManagerSysNandTooltip, QT_TR_NOOP("Contains firmware and applet data.")}, + {DataManagerModsTooltip, QT_TR_NOOP("Contains game mods, patches, and cheats.")}, // Key install // 5-9 diff --git a/src/yuzu/data_dialog.cpp b/src/yuzu/data_dialog.cpp index 4aaa12ce41..8caa362bdf 100644 --- a/src/yuzu/data_dialog.cpp +++ b/src/yuzu/data_dialog.cpp @@ -27,7 +27,7 @@ DataDialog::DataDialog(QWidget *parent) // TODO: Should we make this a single widget that pulls data from a model? #define WIDGET(label, name) \ ui->page->addWidget(new DataWidget(FrontendCommon::DataManager::DataDir::name, \ - QtCommon::StringLookup::name##Tooltip, \ + QtCommon::StringLookup::DataManager##name##Tooltip, \ QStringLiteral(#name), \ this)); \ ui->labels->addItem(label); @@ -80,39 +80,27 @@ DataWidget::DataWidget(FrontendCommon::DataManager::DataDir data_dir, void DataWidget::clear() { - std::string user_id{}; - if (m_dir == FrontendCommon::DataManager::DataDir::Saves) { - user_id = GetProfileIDString(); - } + std::string user_id = selectProfile(); QtCommon::Content::ClearDataDir(m_dir, user_id); scan(); } void DataWidget::open() { - std::string user_id{}; - if (m_dir == FrontendCommon::DataManager::DataDir::Saves) { - user_id = GetProfileIDString(); - } + std::string user_id = selectProfile(); QDesktopServices::openUrl(QUrl::fromLocalFile( QString::fromStdString(FrontendCommon::DataManager::GetDataDirString(m_dir, user_id)))); } void DataWidget::upload() { - std::string user_id{}; - if (m_dir == FrontendCommon::DataManager::DataDir::Saves) { - user_id = GetProfileIDString(); - } + std::string user_id = selectProfile(); QtCommon::Content::ExportDataDir(m_dir, user_id, m_exportName); } void DataWidget::download() { - std::string user_id{}; - if (m_dir == FrontendCommon::DataManager::DataDir::Saves) { - user_id = GetProfileIDString(); - } + std::string user_id = selectProfile(); QtCommon::Content::ImportDataDir(m_dir, user_id, std::bind(&DataWidget::scan, this)); } @@ -131,3 +119,13 @@ void DataWidget::scan() { watcher->setFuture( QtConcurrent::run([this]() { return FrontendCommon::DataManager::DataDirSize(m_dir); })); } + +std::string DataWidget::selectProfile() +{ + std::string user_id{}; + if (m_dir == FrontendCommon::DataManager::DataDir::Saves) { + user_id = GetProfileIDString(); + } + + return user_id; +}