From 051366ec1bdb61f75a61daddad338a7e42e737e9 Mon Sep 17 00:00:00 2001 From: crueter Date: Tue, 14 Oct 2025 22:41:25 -0400 Subject: [PATCH] Default export names Signed-off-by: crueter --- src/qt_common/qt_content_util.cpp | 3 ++- src/qt_common/qt_content_util.h | 5 ++++- src/yuzu/data_dialog.cpp | 8 +++++--- src/yuzu/data_dialog.h | 2 ++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/qt_common/qt_content_util.cpp b/src/qt_common/qt_content_util.cpp index fd70e0d416..f0a6a3ad80 100644 --- a/src/qt_common/qt_content_util.cpp +++ b/src/qt_common/qt_content_util.cpp @@ -386,13 +386,14 @@ void ClearDataDir(FrontendCommon::DataManager::DataDir dir, const std::string& u void ExportDataDir(FrontendCommon::DataManager::DataDir data_dir, const std::string& user_id, + const QString& name, std::function callback) { using namespace QtCommon::Frontend; const std::string dir = FrontendCommon::DataManager::GetDataDir(data_dir, user_id); const QString zip_dump_location = GetSaveFileName(tr("Select Export Location"), - QStringLiteral("export.zip"), + tr("%1.zip").arg(name), tr("Zipped Archives (*.zip)")); if (zip_dump_location.isEmpty()) diff --git a/src/qt_common/qt_content_util.h b/src/qt_common/qt_content_util.h index aef7d8b41e..29d45d5766 100644 --- a/src/qt_common/qt_content_util.h +++ b/src/qt_common/qt_content_util.h @@ -48,7 +48,10 @@ void VerifyGameContents(const std::string &game_path); void VerifyInstalledContents(); void ClearDataDir(FrontendCommon::DataManager::DataDir dir, const std::string &user_id = ""); -void ExportDataDir(FrontendCommon::DataManager::DataDir dir, const std::string &user_id = "", std::function callback = {}); +void ExportDataDir(FrontendCommon::DataManager::DataDir dir, + const std::string &user_id = "", + const QString &name = QStringLiteral("export"), + std::function callback = {}); void ImportDataDir(FrontendCommon::DataManager::DataDir dir, const std::string &user_id = "", std::function callback = {}); // Profiles // diff --git a/src/yuzu/data_dialog.cpp b/src/yuzu/data_dialog.cpp index 38161be827..bae49ff351 100644 --- a/src/yuzu/data_dialog.cpp +++ b/src/yuzu/data_dialog.cpp @@ -4,9 +4,8 @@ #include "data_dialog.h" #include "core/hle/service/acc/profile_manager.h" #include "frontend_common/data_manager.h" +#include "qt_common/qt_common.h" #include "qt_common/qt_content_util.h" -#include "qt_common/qt_frontend_util.h" -#include "qt_common/qt_progress_dialog.h" #include "qt_common/qt_string_lookup.h" #include "ui_data_dialog.h" @@ -30,6 +29,7 @@ DataDialog::DataDialog(QWidget *parent) #define WIDGET(name) \ ui->page->addWidget(new DataWidget(FrontendCommon::DataManager::DataDir::name, \ QtCommon::StringLookup::name##Tooltip, \ + QStringLiteral(#name), \ this)); WIDGET(Saves) @@ -54,10 +54,12 @@ DataDialog::~DataDialog() = default; DataWidget::DataWidget(FrontendCommon::DataManager::DataDir data_dir, QtCommon::StringLookup::StringKey tooltip, + const QString &exportName, QWidget *parent) : QWidget(parent) , ui(std::make_unique()) , m_dir(data_dir) + , m_exportName(exportName) { ui->setupUi(this); @@ -102,7 +104,7 @@ void DataWidget::upload() if (m_dir == FrontendCommon::DataManager::DataDir::Saves) { user_id = selectProfile(); } - QtCommon::Content::ExportDataDir(m_dir, user_id); + QtCommon::Content::ExportDataDir(m_dir, user_id, m_exportName); } void DataWidget::download() diff --git a/src/yuzu/data_dialog.h b/src/yuzu/data_dialog.h index e8ae5c425e..70714be7cb 100644 --- a/src/yuzu/data_dialog.h +++ b/src/yuzu/data_dialog.h @@ -32,6 +32,7 @@ class DataWidget : public QWidget public: explicit DataWidget(FrontendCommon::DataManager::DataDir data_dir, QtCommon::StringLookup::StringKey tooltip, + const QString &exportName, QWidget *parent = nullptr); public slots: @@ -45,6 +46,7 @@ public slots: private: std::unique_ptr ui; FrontendCommon::DataManager::DataDir m_dir; + const QString m_exportName; std::string selectProfile(); };