From b9f2b1e7c6b4d1a37d8a9ec3e599d799c3f874be Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 4 Jul 2022 21:29:03 +0200 Subject: [PATCH] Qt: add UUID reset button --- rpcs3/rpcs3qt/settings_dialog.cpp | 16 ++++++++++++++++ rpcs3/rpcs3qt/settings_dialog.ui | 28 +++++++++++++++++++++++++++- rpcs3/rpcs3qt/tooltips.h | 1 + 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index 9585b31661..f3e62a9175 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -15,6 +15,7 @@ #include "gui_settings.h" #include "display_sleep_control.h" #include "qt_utils.h" +#include "uuid.h" #include "settings_dialog.h" #include "ui_settings_dialog.h" #include "tooltips.h" @@ -1853,6 +1854,7 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std SubscribeTooltip(ui->cb_show_obsolete_cfg_dialog, tooltips.settings.show_obsolete_cfg); SubscribeTooltip(ui->cb_show_same_buttons_dialog, tooltips.settings.show_same_buttons); SubscribeTooltip(ui->gb_updates, tooltips.settings.check_update_start); + SubscribeTooltip(ui->gb_uuid, tooltips.settings.uuid); // Discord: SubscribeTooltip(ui->useRichPresence, tooltips.settings.use_rich_presence); @@ -1874,6 +1876,20 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std m_discord_state = ui->discordState->text(); }); + connect(ui->pb_uuid, &QAbstractButton::clicked, [this]() + { + std::string uuid; + if (!gui::utils::create_new_uuid(uuid)) + { + QMessageBox::critical(this, tr("Error"), tr("Failed to create new installation ID!"), QMessageBox::Ok); + return; + } + + ui->label_uuid->setText(QString::fromStdString(uuid)); + gui::utils::log_uuid(); + }); + ui->label_uuid->setText(QString::fromStdString(gui::utils::load_uuid())); + // Log and TTY: SubscribeTooltip(ui->log_limit, tooltips.settings.log_limit); SubscribeTooltip(ui->tty_limit, tooltips.settings.tty_limit); diff --git a/rpcs3/rpcs3qt/settings_dialog.ui b/rpcs3/rpcs3qt/settings_dialog.ui index ff40ba7062..835b0ce998 100644 --- a/rpcs3/rpcs3qt/settings_dialog.ui +++ b/rpcs3/rpcs3qt/settings_dialog.ui @@ -54,7 +54,7 @@ - 2 + 0 @@ -3741,6 +3741,32 @@ + + + + Installation ID + + + + + + UUID-placeholder + + + Qt::AlignCenter + + + + + + + Create new ID + + + + + + diff --git a/rpcs3/rpcs3qt/tooltips.h b/rpcs3/rpcs3qt/tooltips.h index 179d21a3f2..2b38d70367 100644 --- a/rpcs3/rpcs3qt/tooltips.h +++ b/rpcs3/rpcs3qt/tooltips.h @@ -198,6 +198,7 @@ public: const QString use_rich_presence = tr("Enables use of Discord Rich Presence to show what game you are playing on Discord.\nRequires a restart of RPCS3 to completely close the connection."); const QString discord_state = tr("Tell your friends what you are doing."); const QString custom_colors = tr("Prioritize custom user interface colors over properties set in stylesheet."); + const QString uuid = tr("This is the ID used for hardware statistics.\nIt should only be reset if you change your hardware configuration or if you copied RPCS3 to another PC."); // input