From b2b98ac83affa9dc68f0e3239c23dcbfcb70558f Mon Sep 17 00:00:00 2001 From: crueter Date: Thu, 29 Jan 2026 17:17:28 +0100 Subject: [PATCH] [desktop] refactor profile management and fix some misc bugs with it (#3415) Adding and editing users is now done in a single dialog rather than all those other individual buttons and dialogs like before. Fixed some bugs with profile management too, and made edit/delete a right-click menu. Signed-off-by: crueter Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3415 --- .ci/license-header.sh | 3 +- src/core/hle/service/acc/profile_manager.cpp | 3 +- src/frontend_common/data_manager.cpp | 7 +- src/yuzu/CMakeLists.txt | 3 + .../configure_profile_manager.cpp | 501 +++++------------- .../configuration/configure_profile_manager.h | 34 +- .../configure_profile_manager.ui | 70 +-- .../configuration/system/new_user_dialog.cpp | 372 +++++++++++++ .../configuration/system/new_user_dialog.h | 71 +++ .../configuration/system/new_user_dialog.ui | 192 +++++++ .../system/profile_avatar_dialog.cpp | 136 +++++ .../system/profile_avatar_dialog.h | 28 + 12 files changed, 955 insertions(+), 465 deletions(-) create mode 100644 src/yuzu/configuration/system/new_user_dialog.cpp create mode 100644 src/yuzu/configuration/system/new_user_dialog.h create mode 100644 src/yuzu/configuration/system/new_user_dialog.ui create mode 100644 src/yuzu/configuration/system/profile_avatar_dialog.cpp create mode 100644 src/yuzu/configuration/system/profile_avatar_dialog.h diff --git a/.ci/license-header.sh b/.ci/license-header.sh index 565a4a6093..70a842e01d 100755 --- a/.ci/license-header.sh +++ b/.ci/license-header.sh @@ -41,9 +41,8 @@ EOF while true; do case "$1" in - (-uc) UPDATE=true; COMMIT=true ;; (-u|--update) UPDATE=true ;; - (-c|--commit) COMMIT=true ;; + (-c|--commit) UPDATE=true; COMMIT=true ;; ("$0") break ;; ("") break ;; (*) usage ;; diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp index b610792271..b32ea5c597 100644 --- a/src/core/hle/service/acc/profile_manager.cpp +++ b/src/core/hle/service/acc/profile_manager.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project @@ -98,6 +98,7 @@ bool ProfileManager::RemoveProfileAtIndex(std::size_t index) { void ProfileManager::RemoveAllProfiles() { + user_count = 0; profiles = {}; } diff --git a/src/frontend_common/data_manager.cpp b/src/frontend_common/data_manager.cpp index 1dfbbb0808..280cbba4ab 100644 --- a/src/frontend_common/data_manager.cpp +++ b/src/frontend_common/data_manager.cpp @@ -1,6 +1,7 @@ -// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later +#include #include "data_manager.h" #include "common/assert.h" #include "common/fs/path_util.h" @@ -37,7 +38,9 @@ const fs::path GetDataDir(DataDir dir, const std::string &user_id) const std::string GetDataDirString(DataDir dir, const std::string &user_id) { - return GetDataDir(dir, user_id).string(); + auto dirString = GetDataDir(dir, user_id).string(); + std::filesystem::create_directories(dirString); + return dirString; } u64 ClearDir(DataDir dir, const std::string &user_id) diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index 35c6f80e40..27911d2ac8 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -235,6 +235,9 @@ add_executable(yuzu data_widget.ui ryujinx_dialog.h ryujinx_dialog.cpp ryujinx_dialog.ui main_window.h main_window.cpp + + configuration/system/new_user_dialog.h configuration/system/new_user_dialog.cpp configuration/system/new_user_dialog.ui + configuration/system/profile_avatar_dialog.h configuration/system/profile_avatar_dialog.cpp ) set_target_properties(yuzu PROPERTIES OUTPUT_NAME "eden") diff --git a/src/yuzu/configuration/configure_profile_manager.cpp b/src/yuzu/configuration/configure_profile_manager.cpp index 2b546e1964..1a9152c41d 100644 --- a/src/yuzu/configuration/configure_profile_manager.cpp +++ b/src/yuzu/configuration/configure_profile_manager.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include @@ -14,27 +14,25 @@ #include #include #include +#include #include #include #include +#include +#include #include "common/assert.h" #include "common/fs/path_util.h" #include "common/settings.h" #include "common/string_util.h" -#include "common/swap.h" +#include "configuration/system/new_user_dialog.h" #include "core/constants.h" #include "core/core.h" -#include "core/file_sys/content_archive.h" -#include "core/file_sys/nca_metadata.h" -#include "core/file_sys/registered_cache.h" -#include "core/file_sys/romfs.h" -#include "core/file_sys/vfs/vfs.h" #include "core/hle/service/acc/profile_manager.h" #include "core/hle/service/filesystem/filesystem.h" #include "ui_configure_profile_manager.h" -#include "yuzu/util/limitable_input_dialog.h" #include "yuzu/configuration/configure_profile_manager.h" +#include "yuzu/util/limitable_input_dialog.h" namespace { @@ -75,9 +73,6 @@ QPixmap GetIcon(const Common::UUID& uuid) { return icon.scaled(64, 64, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); } -QString GetProfileUsernameFromUser(QWidget* parent, const QString& title, const QString& text) { - return LimitableInputDialog::GetText(parent, title, text, 1, int(Service::Account::profile_username_size)); -} } // Anonymous namespace ConfigureProfileManager::ConfigureProfileManager(Core::System& system_, QWidget* parent) @@ -98,7 +93,7 @@ ConfigureProfileManager::ConfigureProfileManager(Core::System& system_, QWidget* tree_view->setEditTriggers(QHeaderView::NoEditTriggers); tree_view->setUniformRowHeights(true); tree_view->setIconSize({64, 64}); - tree_view->setContextMenuPolicy(Qt::NoContextMenu); + tree_view->setContextMenuPolicy(Qt::CustomContextMenu); // We must register all custom types with the Qt Automoc system so that we are able to use it // with signals/slots. In this case, QList falls under the umbrells of custom types. @@ -111,18 +106,12 @@ ConfigureProfileManager::ConfigureProfileManager(Core::System& system_, QWidget* ui->scrollArea->setLayout(layout); + connect(tree_view, &QTreeView::customContextMenuRequested, this, &ConfigureProfileManager::showContextMenu); + connect(tree_view, &QTreeView::clicked, this, &ConfigureProfileManager::SelectUser); connect(ui->pm_add, &QPushButton::clicked, this, &ConfigureProfileManager::AddUser); - connect(ui->pm_rename, &QPushButton::clicked, this, &ConfigureProfileManager::RenameUser); - connect(ui->pm_remove, &QPushButton::clicked, this, - &ConfigureProfileManager::ConfirmDeleteUser); - connect(ui->pm_set_image, &QPushButton::clicked, this, - &ConfigureProfileManager::SelectImageFile); - connect(ui->pm_select_avatar, &QPushButton::clicked, this, - &ConfigureProfileManager::SelectFirmwareAvatar); - - avatar_dialog = new ConfigureProfileManagerAvatarDialog(this); + confirm_dialog = new ConfigureProfileManagerDeleteDialog(this); scene = new QGraphicsScene; @@ -160,8 +149,9 @@ void ConfigureProfileManager::PopulateUserList() { const auto& profiles = profile_manager.GetAllUsers(); for (const auto& user : profiles) { Service::Account::ProfileBase profile{}; - if (!profile_manager.GetProfileBase(user, profile)) + if (!profile_manager.GetProfileBase(user, profile)) { continue; + } const auto username = Common::StringFromFixedZeroTerminatedBuffer( reinterpret_cast(profile.username.data()), profile.username.size()); @@ -183,7 +173,7 @@ void ConfigureProfileManager::UpdateCurrentUser() { scene->clear(); scene->addPixmap( - GetIcon(*current_user).scaled(48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation)); + GetIcon(*current_user).scaled(64, 64, Qt::IgnoreAspectRatio, Qt::SmoothTransformation)); ui->current_user_username->setText(username); } @@ -193,100 +183,8 @@ void ConfigureProfileManager::ApplyConfiguration() { } } -void ConfigureProfileManager::SelectUser(const QModelIndex& index) { - Settings::values.current_user = - std::clamp(index.row(), 0, static_cast(profile_manager.GetUserCount() - 1)); - - UpdateCurrentUser(); - - ui->pm_remove->setEnabled(profile_manager.GetUserCount() >= 2); - ui->pm_rename->setEnabled(true); - ui->pm_set_image->setEnabled(true); - ui->pm_select_avatar->setEnabled(true); -} - -void ConfigureProfileManager::AddUser() { - auto const username = GetProfileUsernameFromUser(this, tr("New Username"), tr("Enter a username:")); - if (username.isEmpty()) - return; - - auto const uuid_str = GetProfileUsernameFromUser(this, tr("New User UUID"), tr("Enter a UUID (leave empty to autogenerate):")); - auto uuid = Common::UUID::MakeRandom(); - if (uuid_str.length() > 0) { - if (size_t(uuid_str.length()) != uuid.uuid.size()) - return; - for (size_t i = 0; i < size_t(uuid_str.length()); ++i) - uuid.uuid[i] = u8(uuid_str[i].toLatin1()); - } - - profile_manager.CreateNewUser(uuid, username.toStdString()); - profile_manager.WriteUserSaveFile(); - item_model->appendRow(new QStandardItem{GetIcon(uuid), FormatUserEntryText(username, uuid)}); -} - -void ConfigureProfileManager::RenameUser() { - const auto user = tree_view->currentIndex().row(); - const auto uuid = profile_manager.GetUser(user); - ASSERT(uuid); - - Service::Account::ProfileBase profile{}; - if (!profile_manager.GetProfileBase(*uuid, profile)) - return; - - const auto new_username = GetProfileUsernameFromUser(this, tr("New Username"), tr("Enter a new username:")); - if (new_username.isEmpty()) { - return; - } - - const auto username_std = new_username.toStdString(); - std::fill(profile.username.begin(), profile.username.end(), '\0'); - std::copy(username_std.begin(), username_std.end(), profile.username.begin()); - - profile_manager.SetProfileBase(*uuid, profile); - profile_manager.WriteUserSaveFile(); - - item_model->setItem( - user, 0, - new QStandardItem{GetIcon(*uuid), - FormatUserEntryText(QString::fromStdString(username_std), *uuid)}); - UpdateCurrentUser(); -} - -void ConfigureProfileManager::ConfirmDeleteUser() { - const auto index = tree_view->currentIndex().row(); - const auto uuid = profile_manager.GetUser(index); - ASSERT(uuid); - const auto username = GetAccountUsername(profile_manager, *uuid); - - confirm_dialog->SetInfo(username, *uuid, [this, uuid]() { DeleteUser(*uuid); }); - confirm_dialog->show(); -} - -void ConfigureProfileManager::DeleteUser(const Common::UUID& uuid) { - if (Settings::values.current_user.GetValue() == tree_view->currentIndex().row()) { - Settings::values.current_user = 0; - } - UpdateCurrentUser(); - - if (!profile_manager.RemoveUser(uuid)) { - return; - } - - profile_manager.WriteUserSaveFile(); - - item_model->removeRows(tree_view->currentIndex().row(), 1); - tree_view->clearSelection(); - - ui->pm_remove->setEnabled(false); - ui->pm_rename->setEnabled(false); -} - -void ConfigureProfileManager::SetUserImage(const QImage& image) { - const auto index = tree_view->currentIndex().row(); - const auto uuid = profile_manager.GetUser(index); - ASSERT(uuid); - - const auto image_path = GetImagePath(*uuid); +void ConfigureProfileManager::saveImage(QPixmap pixmap, Common::UUID uuid) { + const auto image_path = GetImagePath(uuid); if (QFile::exists(image_path) && !QFile::remove(image_path)) { QMessageBox::warning( this, tr("Error deleting image"), @@ -311,227 +209,140 @@ void ConfigureProfileManager::SetUserImage(const QImage& image) { return; } - if (!image.save(image_path, "JPEG", 100)) { + if (!pixmap.save(image_path, "JPEG", 100)) { QMessageBox::warning(this, tr("Error saving user image"), tr("Unable to save image to file")); return; } - - const auto username = GetAccountUsername(profile_manager, *uuid); - item_model->setItem(index, 0, - new QStandardItem{GetIcon(*uuid), FormatUserEntryText(username, *uuid)}); - UpdateCurrentUser(); } -void ConfigureProfileManager::SelectImageFile() { - const auto file = QFileDialog::getOpenFileName(this, tr("Select User Image"), QString(), - tr("Image Formats (*.jpg *.jpeg *.png *.bmp)")); - if (file.isEmpty()) { +void ConfigureProfileManager::showContextMenu(const QPoint& pos) { + const QModelIndex index = tree_view->indexAt(pos); + if (!index.isValid()) return; - } - // Profile image must be 256x256 - QImage image(file); - if (image.width() != 256 || image.height() != 256) { - image = image.scaled(256, 256, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); - } - SetUserImage(image); -} + QMenu menu(this); -void ConfigureProfileManager::SelectFirmwareAvatar() { - if (!avatar_dialog->AreImagesLoaded()) { - if (!LoadAvatarData()) { - return; - } - } - if (avatar_dialog->exec() == QDialog::Accepted) { - SetUserImage(avatar_dialog->GetSelectedAvatar().toImage()); + QAction* edit = menu.addAction(tr("&Edit")); + QAction* remove = menu.addAction(tr("&Delete")); + + QAction* chosen = + menu.exec(tree_view->viewport()->mapToGlobal(pos)); + + if (!chosen) + return; + + if (chosen == edit) { + EditUser(); + } else if (chosen == remove) { + ConfirmDeleteUser(); } } -bool ConfigureProfileManager::LoadAvatarData() { - constexpr u64 AvatarImageDataId = 0x010000000000080AULL; +void ConfigureProfileManager::SelectUser(const QModelIndex& index) { + Settings::values.current_user = + std::clamp(index.row(), 0, static_cast(profile_manager.GetUserCount() - 1)); - // Attempt to load avatar data archive from installed firmware - auto* bis_system = system.GetFileSystemController().GetSystemNANDContents(); - if (!bis_system) { - QMessageBox::warning(this, tr("No firmware available"), - tr("Please install the firmware to use firmware avatars.")); - return false; - } - const auto nca = bis_system->GetEntry(AvatarImageDataId, FileSys::ContentRecordType::Data); - if (!nca) { - QMessageBox::warning(this, tr("Error loading archive"), - tr("Archive is not available. Please install/reinstall firmware.")); - return false; - } - const auto romfs = nca->GetRomFS(); - if (!romfs) { - QMessageBox::warning(this, tr("Error loading archive"), - tr("Could not locate RomFS. Your file or decryption keys may be corrupted.")); - return false; - } - const auto extracted = FileSys::ExtractRomFS(romfs); - if (!extracted) { - QMessageBox::warning(this, tr("Error extracting archive"), - tr("Could not extract RomFS. Your file or decryption keys may be corrupted.")); - return false; - } - const auto chara_dir = extracted->GetSubdirectory("chara"); - if (!chara_dir) { - QMessageBox::warning(this, tr("Error finding image directory"), - tr("Failed to find image directory in the archive.")); - return false; - } + UpdateCurrentUser(); +} - QVector images; - for (const auto& item : chara_dir->GetFiles()) { - if (item->GetExtension() != "szs") { - continue; - } +void ConfigureProfileManager::AddUser() { + NewUserDialog *dialog = new NewUserDialog(this); - auto image_data = DecompressYaz0(item); - if (image_data.empty()) { - continue; - } - QImage image(reinterpret_cast(image_data.data()), 256, 256, - QImage::Format_RGBA8888); - images.append(QPixmap::fromImage(image)); - } + connect(dialog, &NewUserDialog::userAdded, this, [dialog, this](User user) { + auto uuid = user.uuid; + auto username = user.username; + auto pixmap = user.pixmap; - if (images.isEmpty()) { - QMessageBox::warning(this, tr("No images found"), - tr("No avatar images were found in the archive.")); - return false; - } + profile_manager.CreateNewUser(uuid, username.toStdString()); + profile_manager.WriteUserSaveFile(); + item_model->appendRow(new QStandardItem{pixmap, FormatUserEntryText(username, uuid)}); - // Load the image data into the dialog - avatar_dialog->LoadImages(images); - return true; -} + saveImage(pixmap, uuid); + UpdateCurrentUser(); -ConfigureProfileManagerAvatarDialog::ConfigureProfileManagerAvatarDialog(QWidget* parent) - : QDialog{parent}, avatar_list{new QListWidget(this)}, bg_color_button{new QPushButton(this)} { - auto* main_layout = new QVBoxLayout(this); - auto* button_layout = new QHBoxLayout(); - auto* select_button = new QPushButton(tr("Select"), this); - auto* cancel_button = new QPushButton(tr("Cancel"), this); - auto* bg_color_label = new QLabel(tr("Background Color"), this); - - SetBackgroundColor(Qt::white); - - avatar_list->setViewMode(QListView::IconMode); - avatar_list->setIconSize(QSize(64, 64)); - avatar_list->setSpacing(4); - avatar_list->setResizeMode(QListView::Adjust); - avatar_list->setSelectionMode(QAbstractItemView::SingleSelection); - avatar_list->setEditTriggers(QAbstractItemView::NoEditTriggers); - avatar_list->setDragDropMode(QAbstractItemView::NoDragDrop); - avatar_list->setDragEnabled(false); - avatar_list->setDropIndicatorShown(false); - avatar_list->setAcceptDrops(false); - - button_layout->addWidget(bg_color_button); - button_layout->addWidget(bg_color_label); - button_layout->addStretch(); - button_layout->addWidget(select_button); - button_layout->addWidget(cancel_button); - - this->setWindowTitle(tr("Select Firmware Avatar")); - main_layout->addWidget(avatar_list); - main_layout->addLayout(button_layout); - - connect(bg_color_button, &QPushButton::clicked, this, [this]() { - const auto new_color = QColorDialog::getColor(avatar_bg_color); - if (new_color.isValid()) { - SetBackgroundColor(new_color); - RefreshAvatars(); - } + dialog->deleteLater(); }); - connect(select_button, &QPushButton::clicked, this, [this]() { accept(); }); - connect(cancel_button, &QPushButton::clicked, this, [this]() { reject(); }); + + connect(dialog, &QDialog::rejected, dialog, &QObject::deleteLater); + + dialog->show(); } -ConfigureProfileManagerAvatarDialog::~ConfigureProfileManagerAvatarDialog() = default; +void ConfigureProfileManager::EditUser() { + const auto user_data = tree_view->currentIndex(); + const auto user_idx = user_data.row(); + const auto uuid = profile_manager.GetUser(user_idx); + ASSERT(uuid); + + Service::Account::ProfileBase profile{}; + if (!profile_manager.GetProfileBase(*uuid, profile)) + return; + + std::string username; + username.reserve(32); -void ConfigureProfileManagerAvatarDialog::SetBackgroundColor(const QColor& color) { - avatar_bg_color = color; + std::ranges::copy_if(profile.username, std::back_inserter(username), [](u8 byte) { return byte != 0; }); - bg_color_button->setStyleSheet( - QStringLiteral("background-color: %1; min-width: 60px;").arg(avatar_bg_color.name())); -} + NewUserDialog *dialog = new NewUserDialog(uuid.value(), username, tr("Edit User"), this); + + connect(dialog, &NewUserDialog::userAdded, this, [dialog, profile, user_idx, uuid, this](User user) mutable { + // TODO: MOVE UUID + // auto new_uuid = user.uuid; + auto new_username = user.username; + auto pixmap = user.pixmap; + + auto const uuid_val = uuid.value(); -QPixmap ConfigureProfileManagerAvatarDialog::CreateAvatar(const QPixmap& avatar) { - QPixmap output(avatar.size()); - output.fill(avatar_bg_color); - - // Scale the image and fill it black to become our shadow - QPixmap shadow_pixmap = avatar.transformed(QTransform::fromScale(1.04, 1.04)); - QPainter shadow_painter(&shadow_pixmap); - shadow_painter.setCompositionMode(QPainter::CompositionMode_SourceIn); - shadow_painter.fillRect(shadow_pixmap.rect(), Qt::black); - shadow_painter.end(); - - QPainter painter(&output); - painter.setOpacity(0.10); - painter.drawPixmap(0, 0, shadow_pixmap); - painter.setOpacity(1.0); - painter.drawPixmap(0, 0, avatar); - painter.end(); - - return output; + const auto username_std = new_username.toStdString(); + std::fill(profile.username.begin(), profile.username.end(), '\0'); + std::copy(username_std.begin(), username_std.end(), profile.username.begin()); + + profile_manager.SetProfileBase(uuid_val, profile); + profile_manager.WriteUserSaveFile(); + + item_model->setItem( + user_idx, 0, + new QStandardItem{pixmap, + FormatUserEntryText(QString::fromStdString(username_std), uuid_val)}); + + saveImage(pixmap, uuid_val); + UpdateCurrentUser(); + + dialog->deleteLater(); + }); + + connect(dialog, &QDialog::rejected, dialog, &QObject::deleteLater); + + dialog->show(); } -void ConfigureProfileManagerAvatarDialog::RefreshAvatars() { - if (avatar_list->count() != avatar_image_store.size()) { - return; - } - for (int i = 0; i < avatar_image_store.size(); ++i) { - const auto icon = - QIcon(CreateAvatar(avatar_image_store[i]) - .scaled(64, 64, Qt::IgnoreAspectRatio, Qt::SmoothTransformation)); - avatar_list->item(i)->setIcon(icon); - } +void ConfigureProfileManager::ConfirmDeleteUser() { + const auto index = tree_view->currentIndex().row(); + const auto uuid = profile_manager.GetUser(index); + ASSERT(uuid); + const auto username = GetAccountUsername(profile_manager, *uuid); + + confirm_dialog->SetInfo(username, *uuid, [this, uuid]() { DeleteUser(*uuid); }); + confirm_dialog->show(); } -void ConfigureProfileManagerAvatarDialog::LoadImages(const QVector& avatar_images) { - avatar_image_store = avatar_images; - avatar_list->clear(); +void ConfigureProfileManager::DeleteUser(const Common::UUID& uuid) { + if (Settings::values.current_user.GetValue() == tree_view->currentIndex().row()) { + Settings::values.current_user = 0; + } - for (int i = 0; i < avatar_image_store.size(); ++i) { - avatar_list->addItem(new QListWidgetItem); + if (!profile_manager.RemoveUser(uuid)) { + return; } - RefreshAvatars(); - - // Determine window size now that avatars are loaded into the grid - // There is probably a better way to handle this that I'm unaware of - const auto* style = avatar_list->style(); - - const int icon_size = avatar_list->iconSize().width(); - const int icon_spacing = avatar_list->spacing() * 2; - const int icon_margin = style->pixelMetric(QStyle::PM_FocusFrameHMargin); - const int icon_full_size = icon_size + icon_spacing + icon_margin; - - const int horizontal_margin = style->pixelMetric(QStyle::PM_LayoutLeftMargin) + - style->pixelMetric(QStyle::PM_LayoutRightMargin) + - style->pixelMetric(QStyle::PM_ScrollBarExtent); - const int vertical_margin = style->pixelMetric(QStyle::PM_LayoutTopMargin) + - style->pixelMetric(QStyle::PM_LayoutBottomMargin); - - // Set default list size so that it is 6 icons wide and 4.5 tall - const int columns = 6; - const double rows = 4.5; - const int total_width = icon_full_size * columns + horizontal_margin; - const int total_height = icon_full_size * rows + vertical_margin; - avatar_list->setMinimumSize(total_width, total_height); -} -bool ConfigureProfileManagerAvatarDialog::AreImagesLoaded() const { - return !avatar_image_store.isEmpty(); -} + profile_manager.WriteUserSaveFile(); + profile_manager.ResetUserSaveFile(); -QPixmap ConfigureProfileManagerAvatarDialog::GetSelectedAvatar() { - return CreateAvatar(avatar_image_store[avatar_list->currentRow()]); + UpdateCurrentUser(); + + item_model->removeRows(tree_view->currentIndex().row(), 1); + tree_view->clearSelection(); } ConfigureProfileManagerDeleteDialog::ConfigureProfileManagerDeleteDialog(QWidget* parent) @@ -548,18 +359,24 @@ ConfigureProfileManagerDeleteDialog::ConfigureProfileManagerDeleteDialog(QWidget auto icon_view = new QGraphicsView(icon_scene, this); dialog_hbox_layout_widget->setLayout(dialog_hbox_layout); + icon_view->setMinimumSize(64, 64); icon_view->setMaximumSize(64, 64); icon_view->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); icon_view->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + icon_view->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + this->setLayout(dialog_vbox_layout); this->setWindowTitle(tr("Confirm Delete")); this->setSizeGripEnabled(false); + dialog_vbox_layout->addWidget(label_message); dialog_vbox_layout->addWidget(dialog_hbox_layout_widget); dialog_vbox_layout->addWidget(dialog_button_box); dialog_hbox_layout->addWidget(icon_view); dialog_hbox_layout->addWidget(label_info); + setMinimumSize(380, 160); + connect(dialog_button_box, &QDialogButtonBox::rejected, this, [this]() { close(); }); } @@ -577,75 +394,3 @@ void ConfigureProfileManagerDeleteDialog::SetInfo(const QString& username, const accept_callback(); }); } - -std::vector ConfigureProfileManager::DecompressYaz0(const FileSys::VirtualFile& file) { - if (!file) { - throw std::invalid_argument("Null file pointer passed to DecompressYaz0"); - } - - uint32_t magic{}; - file->ReadObject(&magic, 0); - if (magic != Common::MakeMagic('Y', 'a', 'z', '0')) { - return std::vector(); - } - - uint32_t decoded_length{}; - file->ReadObject(&decoded_length, 4); - decoded_length = Common::swap32(decoded_length); - - std::size_t input_size = file->GetSize() - 16; - std::vector input(input_size); - file->ReadBytes(input.data(), input_size, 16); - - uint32_t input_offset{}; - uint32_t output_offset{}; - std::vector output(decoded_length); - - uint16_t mask{}; - uint8_t header{}; - - while (output_offset < decoded_length) { - if ((mask >>= 1) == 0) { - header = input[input_offset++]; - mask = 0x80; - } - - if ((header & mask) != 0) { - if (output_offset == output.size()) { - break; - } - output[output_offset++] = input[input_offset++]; - } else { - uint8_t byte1 = input[input_offset++]; - uint8_t byte2 = input[input_offset++]; - - uint32_t dist = ((byte1 & 0xF) << 8) | byte2; - uint32_t position = output_offset - (dist + 1); - - uint32_t length = byte1 >> 4; - if (length == 0) { - length = static_cast(input[input_offset++]) + 0x12; - } else { - length += 2; - } - - uint32_t gap = output_offset - position; - uint32_t non_overlapping_length = length; - - if (non_overlapping_length > gap) { - non_overlapping_length = gap; - } - - std::memcpy(&output[output_offset], &output[position], non_overlapping_length); - output_offset += non_overlapping_length; - position += non_overlapping_length; - length -= non_overlapping_length; - - while (length-- > 0) { - output[output_offset++] = output[position++]; - } - } - } - - return output; -} diff --git a/src/yuzu/configuration/configure_profile_manager.h b/src/yuzu/configuration/configure_profile_manager.h index 8b80a04a0d..cdc0bd7fff 100644 --- a/src/yuzu/configuration/configure_profile_manager.h +++ b/src/yuzu/configuration/configure_profile_manager.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: 2016 Citra Emulator Project @@ -14,6 +14,7 @@ #include #include "core/file_sys/vfs/vfs_types.h" +class ProfileAvatarDialog; namespace Common { struct UUID; } @@ -39,26 +40,6 @@ namespace Ui { class ConfigureProfileManager; } -class ConfigureProfileManagerAvatarDialog : public QDialog { -public: - explicit ConfigureProfileManagerAvatarDialog(QWidget* parent); - ~ConfigureProfileManagerAvatarDialog(); - - void LoadImages(const QVector& avatar_images); - bool AreImagesLoaded() const; - QPixmap GetSelectedAvatar(); - -private: - void SetBackgroundColor(const QColor& color); - QPixmap CreateAvatar(const QPixmap& avatar); - void RefreshAvatars(); - - QVector avatar_image_store; - QListWidget* avatar_list; - QColor avatar_bg_color; - QPushButton* bg_color_button; -}; - class ConfigureProfileManagerDeleteDialog : public QDialog { public: explicit ConfigureProfileManagerDeleteDialog(QWidget* parent); @@ -82,6 +63,10 @@ public: void ApplyConfiguration(); +private slots: + void saveImage(QPixmap pixmap, Common::UUID uuid); + void showContextMenu(const QPoint &pos); + private: void changeEvent(QEvent* event) override; void RetranslateUI(); @@ -93,12 +78,9 @@ private: void SelectUser(const QModelIndex& index); void AddUser(); - void RenameUser(); + void EditUser(); void ConfirmDeleteUser(); void DeleteUser(const Common::UUID& uuid); - void SetUserImage(const QImage& image); - void SelectImageFile(); - void SelectFirmwareAvatar(); bool LoadAvatarData(); std::vector DecompressYaz0(const FileSys::VirtualFile& file); @@ -106,8 +88,6 @@ private: QTreeView* tree_view; QStandardItemModel* item_model; QGraphicsScene* scene; - - ConfigureProfileManagerAvatarDialog* avatar_dialog; ConfigureProfileManagerDeleteDialog* confirm_dialog; std::vector> list_items; diff --git a/src/yuzu/configuration/configure_profile_manager.ui b/src/yuzu/configuration/configure_profile_manager.ui index d84931de02..f359ad5286 100644 --- a/src/yuzu/configuration/configure_profile_manager.ui +++ b/src/yuzu/configuration/configure_profile_manager.ui @@ -6,7 +6,7 @@ 0 0 - 390 + 483 483 @@ -26,7 +26,7 @@ - QLayout::SetNoConstraint + QLayout::SizeConstraint::SetNoConstraint @@ -47,27 +47,27 @@ - 48 - 48 + 64 + 64 - 48 - 48 + 64 + 64 - QFrame::NoFrame + QFrame::Shape::NoFrame - QFrame::Plain + QFrame::Shadow::Plain - Qt::ScrollBarAlwaysOff + Qt::ScrollBarPolicy::ScrollBarAlwaysOff - Qt::ScrollBarAlwaysOff + Qt::ScrollBarPolicy::ScrollBarAlwaysOff false @@ -98,7 +98,7 @@ - QFrame::StyledPanel + QFrame::Shape::StyledPanel false @@ -107,30 +107,10 @@ - - - - false - - - Set Image - - - - - - - false - - - Select Avatar - - - - Qt::Horizontal + Qt::Orientation::Horizontal @@ -147,26 +127,6 @@ - - - - false - - - Rename - - - - - - - false - - - Remove - - - @@ -186,6 +146,6 @@ - - - \ No newline at end of file + + + diff --git a/src/yuzu/configuration/system/new_user_dialog.cpp b/src/yuzu/configuration/system/new_user_dialog.cpp new file mode 100644 index 0000000000..f745de6e96 --- /dev/null +++ b/src/yuzu/configuration/system/new_user_dialog.cpp @@ -0,0 +1,372 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + +#include +#include "common/common_types.h" +#include "common/fs/path_util.h" +#include "common/uuid.h" +#include "configuration/system/profile_avatar_dialog.h" +#include "core/constants.h" +#include "core/file_sys/content_archive.h" +#include "core/file_sys/nca_metadata.h" +#include "core/file_sys/romfs.h" +#include "core/hle/service/filesystem/filesystem.h" +#include "new_user_dialog.h" +#include "qt_common/qt_common.h" +#include "ui_new_user_dialog.h" + +#include +#include +#include +#include +#include +#include +#include + +QPixmap NewUserDialog::DefaultAvatar() { + QPixmap icon; + + icon.fill(Qt::black); + icon.loadFromData(Core::Constants::ACCOUNT_BACKUP_JPEG.data(), + static_cast(Core::Constants::ACCOUNT_BACKUP_JPEG.size())); + + return icon.scaled(64, 64, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); +} + +QString NewUserDialog::GetImagePath(const Common::UUID& uuid) { + const auto path = + Common::FS::GetEdenPath(Common::FS::EdenPath::NANDDir) / + fmt::format("system/save/8000000000000010/su/avators/{}.jpg", uuid.FormattedString()); + return QString::fromStdString(Common::FS::PathToUTF8String(path)); +} + +QPixmap NewUserDialog::GetIcon(const Common::UUID& uuid) { + QPixmap icon{GetImagePath(uuid)}; + + if (!icon) { + return DefaultAvatar(); + } + + return icon.scaled(64, 64, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); +} + +NewUserDialog::NewUserDialog(Common::UUID uuid, const std::string& username, const QString& title, + QWidget* parent) + : QDialog(parent) { + m_editing = true; + setup(uuid, username, title); +} + +NewUserDialog::NewUserDialog(QWidget* parent) : QDialog(parent) { + setup(Common::UUID::MakeRandom(), "Eden", tr("New User")); +} + +void NewUserDialog::setup(Common::UUID uuid, const std::string& username, const QString& title) { + ui = new Ui::NewUserDialog; + ui->setupUi(this); + + setWindowTitle(title); + + m_scene = new QGraphicsScene; + ui->image->setScene(m_scene); + + // setup + + // Byte reversing here is incredibly wack, but basically the way I've implemented it + // is such that when you view it, it will match the folder name always. + // TODO: Add UUID changing + if (!m_editing) { + ui->uuid->setText(QString::fromStdString(uuid.RawString()).toUpper()); + } else { + QByteArray bytes = QByteArray::fromHex(QString::fromStdString(uuid.RawString()).toLatin1()); + std::reverse(bytes.begin(), bytes.end()); + QString txt = QString::fromLatin1(bytes.toHex().toUpper()); + + ui->uuid->setText(txt); + ui->uuid->setReadOnly(true); + } + + ui->username->setText(QString::fromStdString(username)); + verifyUser(); + + setImage(GetIcon(uuid)); + updateRevertButton(); + + // Validators + QRegularExpressionValidator* username_validator = + new QRegularExpressionValidator(QRegularExpression(QStringLiteral(".{1,32}")), this); + ui->username->setValidator(username_validator); + + QRegularExpressionValidator* uuid_validator = new QRegularExpressionValidator( + QRegularExpression(QStringLiteral("[0-9a-fA-F]{32}")), this); + ui->uuid->setValidator(uuid_validator); + + // Connections + connect(ui->uuid, &QLineEdit::textEdited, this, &::NewUserDialog::verifyUser); + connect(ui->username, &QLineEdit::textEdited, this, &::NewUserDialog::verifyUser); + + connect(ui->revert, &QAbstractButton::clicked, this, &NewUserDialog::revertImage); + connect(ui->selectImage, &QAbstractButton::clicked, this, &NewUserDialog::selectImage); + connect(ui->setAvatar, &QAbstractButton::clicked, this, &NewUserDialog::setAvatar); + connect(ui->generate, &QAbstractButton::clicked, this, &NewUserDialog::generateUUID); + + connect(this, &NewUserDialog::isDefaultAvatarChanged, this, &NewUserDialog::updateRevertButton); + connect(this, &QDialog::accepted, this, &NewUserDialog::dispatchUser); + + // dialog + avatar_dialog = new ProfileAvatarDialog(this); +} + +NewUserDialog::~NewUserDialog() { + delete ui; +} + +bool NewUserDialog::isDefaultAvatar() const { + return m_isDefaultAvatar; +} + +void NewUserDialog::setIsDefaultAvatar(bool newIsDefaultAvatar) { + if (m_isDefaultAvatar == newIsDefaultAvatar) + return; + m_isDefaultAvatar = newIsDefaultAvatar; + emit isDefaultAvatarChanged(m_isDefaultAvatar); +} + +void NewUserDialog::selectImage() { + const auto file = QFileDialog::getOpenFileName(this, tr("Select User Image"), QString(), + tr("Image Formats (*.jpg *.jpeg *.png *.bmp)")); + if (file.isEmpty()) { + return; + } + + // Profile image must be 256x256 + QPixmap image(file); + if (image.width() != 256 || image.height() != 256) { + image = image.scaled(256, 256, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); + } + + setImage(image.scaled(64, 64, Qt::IgnoreAspectRatio)); + setIsDefaultAvatar(false); +} + +void NewUserDialog::setAvatar() { + if (!avatar_dialog->AreImagesLoaded()) { + if (!LoadAvatarData()) { + return; + } + } + if (avatar_dialog->exec() == QDialog::Accepted) { + setImage(avatar_dialog->GetSelectedAvatar().scaled(64, 64, Qt::IgnoreAspectRatio)); + } +} + +bool NewUserDialog::LoadAvatarData() { + constexpr u64 AvatarImageDataId = 0x010000000000080AULL; + + // Attempt to load avatar data archive from installed firmware + auto* bis_system = QtCommon::system->GetFileSystemController().GetSystemNANDContents(); + if (!bis_system) { + QMessageBox::warning(this, tr("No firmware available"), + tr("Please install the firmware to use firmware avatars.")); + return false; + } + const auto nca = bis_system->GetEntry(AvatarImageDataId, FileSys::ContentRecordType::Data); + if (!nca) { + QMessageBox::warning(this, tr("Error loading archive"), + tr("Archive is not available. Please install/reinstall firmware.")); + return false; + } + const auto romfs = nca->GetRomFS(); + if (!romfs) { + QMessageBox::warning( + this, tr("Error loading archive"), + tr("Could not locate RomFS. Your file or decryption keys may be corrupted.")); + return false; + } + const auto extracted = FileSys::ExtractRomFS(romfs); + if (!extracted) { + QMessageBox::warning( + this, tr("Error extracting archive"), + tr("Could not extract RomFS. Your file or decryption keys may be corrupted.")); + return false; + } + const auto chara_dir = extracted->GetSubdirectory("chara"); + if (!chara_dir) { + QMessageBox::warning(this, tr("Error finding image directory"), + tr("Failed to find image directory in the archive.")); + return false; + } + + QVector images; + for (const auto& item : chara_dir->GetFiles()) { + if (item->GetExtension() != "szs") { + continue; + } + + auto image_data = DecompressYaz0(item); + if (image_data.empty()) { + continue; + } + QImage image(reinterpret_cast(image_data.data()), 256, 256, + QImage::Format_RGBA8888); + images.append(QPixmap::fromImage(image)); + } + + if (images.isEmpty()) { + QMessageBox::warning(this, tr("No images found"), + tr("No avatar images were found in the archive.")); + return false; + } + + // Load the image data into the dialog + avatar_dialog->LoadImages(images); + return true; +} + +std::vector NewUserDialog::DecompressYaz0(const FileSys::VirtualFile& file) { + if (!file) { + throw std::invalid_argument("Null file pointer passed to DecompressYaz0"); + } + + uint32_t magic{}; + file->ReadObject(&magic, 0); + if (magic != Common::MakeMagic('Y', 'a', 'z', '0')) { + return std::vector(); + } + + uint32_t decoded_length{}; + file->ReadObject(&decoded_length, 4); + decoded_length = Common::swap32(decoded_length); + + std::size_t input_size = file->GetSize() - 16; + std::vector input(input_size); + file->ReadBytes(input.data(), input_size, 16); + + uint32_t input_offset{}; + uint32_t output_offset{}; + std::vector output(decoded_length); + + uint16_t mask{}; + uint8_t header{}; + + while (output_offset < decoded_length) { + if ((mask >>= 1) == 0) { + header = input[input_offset++]; + mask = 0x80; + } + + if ((header & mask) != 0) { + if (output_offset == output.size()) { + break; + } + output[output_offset++] = input[input_offset++]; + } else { + uint8_t byte1 = input[input_offset++]; + uint8_t byte2 = input[input_offset++]; + + uint32_t dist = ((byte1 & 0xF) << 8) | byte2; + uint32_t position = output_offset - (dist + 1); + + uint32_t length = byte1 >> 4; + if (length == 0) { + length = static_cast(input[input_offset++]) + 0x12; + } else { + length += 2; + } + + uint32_t gap = output_offset - position; + uint32_t non_overlapping_length = length; + + if (non_overlapping_length > gap) { + non_overlapping_length = gap; + } + + std::memcpy(&output[output_offset], &output[position], non_overlapping_length); + output_offset += non_overlapping_length; + position += non_overlapping_length; + length -= non_overlapping_length; + + while (length-- > 0) { + output[output_offset++] = output[position++]; + } + } + } + + return output; +} + +void NewUserDialog::setImage(const QPixmap& pixmap) { + m_pixmap = pixmap; + m_scene->clear(); + m_scene->addPixmap(m_pixmap); +} + +void NewUserDialog::revertImage() { + setImage(DefaultAvatar()); + setIsDefaultAvatar(true); +} + +void NewUserDialog::updateRevertButton() { + if (isDefaultAvatar()) { + ui->revert->setIcon(QIcon{}); + } else { + QStyle* style = parentWidget()->style(); + QIcon icon(style->standardIcon(QStyle::SP_LineEditClearButton)); + ui->revert->setIcon(icon); + } +} + +void NewUserDialog::generateUUID() { + Common::UUID uuid = Common::UUID::MakeRandom(); + ui->uuid->setText(QString::fromStdString(uuid.RawString()).toUpper()); +} + +void NewUserDialog::verifyUser() { + const QPixmap checked = QIcon::fromTheme(QStringLiteral("checked")).pixmap(16); + const QPixmap failed = QIcon::fromTheme(QStringLiteral("failed")).pixmap(16); + + const bool uuid_good = ui->uuid->hasAcceptableInput(); + const bool username_good = ui->username->hasAcceptableInput(); + + auto ok_button = ui->buttonBox->button(QDialogButtonBox::Ok); + ok_button->setEnabled(username_good && uuid_good); + + if (uuid_good) { + ui->uuidVerified->setPixmap(checked); + ui->uuidVerified->setToolTip(tr("All Good", "Tooltip")); + } else { + ui->uuidVerified->setPixmap(failed); + ui->uuidVerified->setToolTip(tr("Must be 32 hex characters (0-9, a-f)", "Tooltip")); + } + + if (username_good) { + ui->usernameVerified->setPixmap(checked); + ui->usernameVerified->setToolTip(tr("All Good", "Tooltip")); + } else { + ui->usernameVerified->setPixmap(failed); + ui->usernameVerified->setToolTip(tr("Must be between 1 and 32 characters", "Tooltip")); + } +} + +// TODO: Move UUID +void NewUserDialog::dispatchUser() { + QByteArray bytes = QByteArray::fromHex(ui->uuid->text().toLatin1()); + + // convert to 16 u8's + std::array uuid_arr; + std::copy_n(reinterpret_cast(bytes.constData()), 16, uuid_arr.begin()); + + if (!m_editing) { + std::ranges::reverse(uuid_arr); + } + + Common::UUID uuid(uuid_arr); + + User user{ + .username = ui->username->text(), + .uuid = uuid, + .pixmap = m_pixmap, + }; + + emit userAdded(user); +} diff --git a/src/yuzu/configuration/system/new_user_dialog.h b/src/yuzu/configuration/system/new_user_dialog.h new file mode 100644 index 0000000000..656d8d7290 --- /dev/null +++ b/src/yuzu/configuration/system/new_user_dialog.h @@ -0,0 +1,71 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#include +#include "common/uuid.h" +#include "core/file_sys/vfs/vfs_types.h" + +class QGraphicsScene; +class ProfileAvatarDialog; + +namespace Ui { +class NewUserDialog; +} + +struct User { + QString username; + Common::UUID uuid; + QPixmap pixmap; +}; + +class NewUserDialog : public QDialog +{ + Q_OBJECT + Q_PROPERTY(bool isDefaultAvatar READ isDefaultAvatar WRITE setIsDefaultAvatar NOTIFY + isDefaultAvatarChanged FINAL) + +public: + explicit NewUserDialog(QWidget *parent = nullptr); + explicit NewUserDialog(Common::UUID uuid, const std::string &username, const QString &title, QWidget *parent = nullptr); + ~NewUserDialog(); + + bool isDefaultAvatar() const; + void setIsDefaultAvatar(bool newIsDefaultAvatar); + + static QString GetImagePath(const Common::UUID& uuid); + static QPixmap GetIcon(const Common::UUID& uuid); + static QPixmap DefaultAvatar(); + +private: + Ui::NewUserDialog *ui; + QGraphicsScene *m_scene; + QPixmap m_pixmap; + + ProfileAvatarDialog* avatar_dialog; + + bool m_isDefaultAvatar = true; + bool m_editing = false; + + void setup(Common::UUID uuid, const std::string &username, const QString &title); + bool LoadAvatarData(); + std::vector DecompressYaz0(const FileSys::VirtualFile& file); + +public slots: + void setImage(const QPixmap &pixmap); + void selectImage(); + void setAvatar(); + + void revertImage(); + void updateRevertButton(); + + void generateUUID(); + void verifyUser(); + + void dispatchUser(); + +signals: + void isDefaultAvatarChanged(bool isDefaultAvatar); + void userAdded(User user); +}; diff --git a/src/yuzu/configuration/system/new_user_dialog.ui b/src/yuzu/configuration/system/new_user_dialog.ui new file mode 100644 index 0000000000..fee8c436c2 --- /dev/null +++ b/src/yuzu/configuration/system/new_user_dialog.ui @@ -0,0 +1,192 @@ + + + NewUserDialog + + + + 0 + 0 + 448 + 220 + + + + New User + + + + + + Qt::Orientation::Horizontal + + + QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok + + + + + + + Change Avatar + + + + + + + Set Image + + + + + + + + + + + + + + + + UUID + + + + + + + Eden + + + + + + + + + + Username + + + + + + + + true + + + + UUID must be 32 hex characters (0-9, A-F) + + + + + + + Generate + + + + + + + + 0 + 0 + + + + + 24 + 0 + + + + + + + + + + + + + + + + + + 0 + 0 + + + + + 64 + 64 + + + + + 64 + 64 + + + + QFrame::Shape::NoFrame + + + QFrame::Shadow::Plain + + + Qt::ScrollBarPolicy::ScrollBarAlwaysOff + + + Qt::ScrollBarPolicy::ScrollBarAlwaysOff + + + false + + + + + + + + + buttonBox + accepted() + NewUserDialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + NewUserDialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/src/yuzu/configuration/system/profile_avatar_dialog.cpp b/src/yuzu/configuration/system/profile_avatar_dialog.cpp new file mode 100644 index 0000000000..38edc1f0bd --- /dev/null +++ b/src/yuzu/configuration/system/profile_avatar_dialog.cpp @@ -0,0 +1,136 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + +#include "profile_avatar_dialog.h" + +#include +#include +#include +#include +#include +#include + +// TODO: Move this to a .ui def +ProfileAvatarDialog::ProfileAvatarDialog(QWidget* parent) + : QDialog{parent}, avatar_list{new QListWidget(this)}, bg_color_button{new QPushButton(this)} { + auto* main_layout = new QVBoxLayout(this); + auto* button_layout = new QHBoxLayout(); + auto* select_button = new QPushButton(tr("Select"), this); + auto* cancel_button = new QPushButton(tr("Cancel"), this); + auto* bg_color_label = new QLabel(tr("Background Color"), this); + + SetBackgroundColor(Qt::white); + + avatar_list->setViewMode(QListView::IconMode); + avatar_list->setIconSize(QSize(64, 64)); + avatar_list->setSpacing(4); + avatar_list->setResizeMode(QListView::Adjust); + avatar_list->setSelectionMode(QAbstractItemView::SingleSelection); + avatar_list->setEditTriggers(QAbstractItemView::NoEditTriggers); + avatar_list->setDragDropMode(QAbstractItemView::NoDragDrop); + avatar_list->setDragEnabled(false); + avatar_list->setDropIndicatorShown(false); + avatar_list->setAcceptDrops(false); + + button_layout->addWidget(bg_color_button); + button_layout->addWidget(bg_color_label); + button_layout->addStretch(); + button_layout->addWidget(select_button); + button_layout->addWidget(cancel_button); + + this->setWindowTitle(tr("Select Firmware Avatar")); + main_layout->addWidget(avatar_list); + main_layout->addLayout(button_layout); + + connect(bg_color_button, &QPushButton::clicked, this, [this]() { + const auto new_color = QColorDialog::getColor(avatar_bg_color); + if (new_color.isValid()) { + SetBackgroundColor(new_color); + RefreshAvatars(); + } + }); + connect(select_button, &QPushButton::clicked, this, [this]() { accept(); }); + connect(cancel_button, &QPushButton::clicked, this, [this]() { reject(); }); +} + +ProfileAvatarDialog::~ProfileAvatarDialog() = default; + +void ProfileAvatarDialog::SetBackgroundColor(const QColor& color) { + avatar_bg_color = color; + + bg_color_button->setStyleSheet( + QStringLiteral("background-color: %1; min-width: 60px;").arg(avatar_bg_color.name())); +} + +QPixmap ProfileAvatarDialog::CreateAvatar(const QPixmap& avatar) { + QPixmap output(avatar.size()); + output.fill(avatar_bg_color); + + // Scale the image and fill it black to become our shadow + QPixmap shadow_pixmap = avatar.transformed(QTransform::fromScale(1.04, 1.04)); + QPainter shadow_painter(&shadow_pixmap); + shadow_painter.setCompositionMode(QPainter::CompositionMode_SourceIn); + shadow_painter.fillRect(shadow_pixmap.rect(), Qt::black); + shadow_painter.end(); + + QPainter painter(&output); + painter.setOpacity(0.10); + painter.drawPixmap(0, 0, shadow_pixmap); + painter.setOpacity(1.0); + painter.drawPixmap(0, 0, avatar); + painter.end(); + + return output; +} + +void ProfileAvatarDialog::RefreshAvatars() { + if (avatar_list->count() != avatar_image_store.size()) { + return; + } + for (int i = 0; i < avatar_image_store.size(); ++i) { + const auto icon = + QIcon(CreateAvatar(avatar_image_store[i]) + .scaled(64, 64, Qt::IgnoreAspectRatio, Qt::SmoothTransformation)); + avatar_list->item(i)->setIcon(icon); + } +} + +void ProfileAvatarDialog::LoadImages(const QVector& avatar_images) { + avatar_image_store = avatar_images; + avatar_list->clear(); + + for (int i = 0; i < avatar_image_store.size(); ++i) { + avatar_list->addItem(new QListWidgetItem); + } + RefreshAvatars(); + + // Determine window size now that avatars are loaded into the grid + // There is probably a better way to handle this that I'm unaware of + const auto* style = avatar_list->style(); + + const int icon_size = avatar_list->iconSize().width(); + const int icon_spacing = avatar_list->spacing() * 2; + const int icon_margin = style->pixelMetric(QStyle::PM_FocusFrameHMargin); + const int icon_full_size = icon_size + icon_spacing + icon_margin; + + const int horizontal_margin = style->pixelMetric(QStyle::PM_LayoutLeftMargin) + + style->pixelMetric(QStyle::PM_LayoutRightMargin) + + style->pixelMetric(QStyle::PM_ScrollBarExtent); + const int vertical_margin = style->pixelMetric(QStyle::PM_LayoutTopMargin) + + style->pixelMetric(QStyle::PM_LayoutBottomMargin); + + // Set default list size so that it is 6 icons wide and 4.5 tall + const int columns = 6; + const double rows = 4.5; + const int total_width = icon_full_size * columns + horizontal_margin; + const int total_height = icon_full_size * rows + vertical_margin; + avatar_list->setMinimumSize(total_width, total_height); +} + +bool ProfileAvatarDialog::AreImagesLoaded() const { + return !avatar_image_store.isEmpty(); +} + +QPixmap ProfileAvatarDialog::GetSelectedAvatar() { + return CreateAvatar(avatar_image_store[avatar_list->currentRow()]); +} diff --git a/src/yuzu/configuration/system/profile_avatar_dialog.h b/src/yuzu/configuration/system/profile_avatar_dialog.h new file mode 100644 index 0000000000..26b64b37c5 --- /dev/null +++ b/src/yuzu/configuration/system/profile_avatar_dialog.h @@ -0,0 +1,28 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#include + +class QListWidget; + +class ProfileAvatarDialog : public QDialog { +public: + explicit ProfileAvatarDialog(QWidget* parent); + ~ProfileAvatarDialog(); + + void LoadImages(const QVector& avatar_images); + bool AreImagesLoaded() const; + QPixmap GetSelectedAvatar(); + +private: + void SetBackgroundColor(const QColor& color); + QPixmap CreateAvatar(const QPixmap& avatar); + void RefreshAvatars(); + + QVector avatar_image_store; + QListWidget* avatar_list; + QColor avatar_bg_color; + QPushButton* bg_color_button; +};