From b2a8209c5be07f045ad6823eb6a0246a9a537a34 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Tue, 9 Oct 2018 21:53:04 -0400 Subject: [PATCH] qt: Add Profile Manager UI to system settings --- src/yuzu/configuration/configure_system.cpp | 165 ++++++++++++- src/yuzu/configuration/configure_system.h | 19 ++ src/yuzu/configuration/configure_system.ui | 250 ++++++++++++++------ 3 files changed, 354 insertions(+), 80 deletions(-) diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp index e9ed9c38f7..9a41c1f6ce 100644 --- a/src/yuzu/configuration/configure_system.cpp +++ b/src/yuzu/configuration/configure_system.cpp @@ -2,7 +2,12 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include +#include #include +#include +#include "common/common_paths.h" +#include "common/logging/backend.h" #include "core/core.h" #include "core/settings.h" #include "ui_configure_system.h" @@ -24,6 +29,17 @@ static const std::array days_in_month = {{ 31, }}; +// Same backup JPEG used by acc IProfile::GetImage if no jpeg found +static constexpr std::array backup_jpeg{ + 0xff, 0xd8, 0xff, 0xdb, 0x00, 0x43, 0x00, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, + 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x06, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x06, 0x06, 0x05, + 0x06, 0x09, 0x08, 0x0a, 0x0a, 0x09, 0x08, 0x09, 0x09, 0x0a, 0x0c, 0x0f, 0x0c, 0x0a, 0x0b, 0x0e, + 0x0b, 0x09, 0x09, 0x0d, 0x11, 0x0d, 0x0e, 0x0f, 0x10, 0x10, 0x11, 0x10, 0x0a, 0x0c, 0x12, 0x13, + 0x12, 0x10, 0x13, 0x0f, 0x10, 0x10, 0x10, 0xff, 0xc9, 0x00, 0x0b, 0x08, 0x00, 0x01, 0x00, 0x01, + 0x01, 0x01, 0x11, 0x00, 0xff, 0xcc, 0x00, 0x06, 0x00, 0x10, 0x10, 0x05, 0xff, 0xda, 0x00, 0x08, + 0x01, 0x01, 0x00, 0x00, 0x3f, 0x00, 0xd2, 0xcf, 0x20, 0xff, 0xd9, +}; + ConfigureSystem::ConfigureSystem(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureSystem) { ui->setupUi(this); connect(ui->combo_birthmonth, @@ -32,6 +48,44 @@ ConfigureSystem::ConfigureSystem(QWidget* parent) : QWidget(parent), ui(new Ui:: connect(ui->button_regenerate_console_id, &QPushButton::clicked, this, &ConfigureSystem::refreshConsoleID); + layout = new QVBoxLayout; + tree_view = new QTreeView; + item_model = new QStandardItemModel(tree_view); + tree_view->setModel(item_model); + + tree_view->setAlternatingRowColors(true); + tree_view->setSelectionMode(QHeaderView::SingleSelection); + tree_view->setSelectionBehavior(QHeaderView::SelectRows); + tree_view->setVerticalScrollMode(QHeaderView::ScrollPerPixel); + tree_view->setHorizontalScrollMode(QHeaderView::ScrollPerPixel); + tree_view->setSortingEnabled(true); + tree_view->setEditTriggers(QHeaderView::NoEditTriggers); + tree_view->setUniformRowHeights(true); + tree_view->setIconSize({64, 64}); + tree_view->setContextMenuPolicy(Qt::NoContextMenu); + + item_model->insertColumns(0, 1); + item_model->setHeaderData(0, Qt::Horizontal, "Users"); + + // 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. + qRegisterMetaType>("QList"); + + layout->setContentsMargins(0, 0, 0, 0); + layout->setSpacing(0); + layout->addWidget(tree_view); + + ui->scrollArea->setLayout(layout); + + connect(tree_view, &QTreeView::clicked, this, &ConfigureSystem::SelectUser); + + connect(ui->pm_add, &QPushButton::pressed, this, &ConfigureSystem::AddUser); + connect(ui->pm_rename, &QPushButton::pressed, this, &ConfigureSystem::RenameUser); + connect(ui->pm_remove, &QPushButton::pressed, this, &ConfigureSystem::DeleteUser); + + scene = new QGraphicsScene; + ui->current_user_icon->setScene(scene); + this->setConfiguration(); } @@ -39,8 +93,51 @@ ConfigureSystem::~ConfigureSystem() = default; void ConfigureSystem::setConfiguration() { enabled = !Core::System::GetInstance().IsPoweredOn(); - ui->edit_username->setText(QString::fromStdString(Settings::values.username)); + ui->combo_language->setCurrentIndex(Settings::values.language_index); + + item_model->removeRows(0, item_model->rowCount()); + list_items.clear(); + + std::transform(Settings::values.users.begin(), Settings::values.users.end(), + std::back_inserter(list_items), + [](const std::pair& user) { + const auto icon_url = QString::fromStdString( + FileUtil::GetUserPath(FileUtil::UserPath::ConfigDir) + "users" + + DIR_SEP + user.first + ".jpg"); + QPixmap icon{icon_url}; + + if (!icon) { + icon.fill(QColor::fromRgb(0, 0, 0)); + icon.loadFromData(backup_jpeg.data(), backup_jpeg.size()); + } + + return QList{new QStandardItem{ + icon.scaled(64, 64, Qt::IgnoreAspectRatio, Qt::SmoothTransformation), + QString::fromStdString(user.first + "\n" + user.second.Format())}}; + }); + + for (const auto& item : list_items) + item_model->appendRow(item); + + UpdateCurrentUser(); +} + +void ConfigureSystem::UpdateCurrentUser() { + const auto& current_user = Settings::values.users[Settings::values.current_user]; + const auto icon_url = + QString::fromStdString(FileUtil::GetUserPath(FileUtil::UserPath::ConfigDir) + "users" + + DIR_SEP + current_user.first + ".jpg"); + QPixmap icon{icon_url}; + + if (!icon) { + icon.fill(QColor::fromRgb(0, 0, 0)); + icon.loadFromData(backup_jpeg.data(), backup_jpeg.size()); + } + + scene->clear(); + scene->addPixmap(icon.scaled(48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation)); + ui->current_user_username->setText(QString::fromStdString(current_user.first)); } void ConfigureSystem::ReadSystemSettings() {} @@ -48,7 +145,7 @@ void ConfigureSystem::ReadSystemSettings() {} void ConfigureSystem::applyConfiguration() { if (!enabled) return; - Settings::values.username = ui->edit_username->text().toStdString(); + Settings::values.language_index = ui->combo_language->currentIndex(); Settings::Apply(); } @@ -92,3 +189,67 @@ void ConfigureSystem::refreshConsoleID() { ui->label_console_id->setText( tr("Console ID: 0x%1").arg(QString::number(console_id, 16).toUpper())); } + +void ConfigureSystem::SelectUser(const QModelIndex& index) { + Settings::values.current_user = + std::clamp(index.row(), 0, Settings::values.users.size() - 1); + + UpdateCurrentUser(); + + if (Settings::values.users.size() >= 2) + ui->pm_remove->setEnabled(true); + else + ui->pm_remove->setEnabled(false); + + ui->pm_rename->setEnabled(true); +} + +void ConfigureSystem::AddUser() { + Service::Account::UUID uuid; + uuid.Generate(); + + bool ok = false; + const auto username = + QInputDialog::getText(this, tr("Enter Username"), tr("Enter a username for the new user:"), + QLineEdit::Normal, QString(), &ok); + + Settings::values.users.emplace_back(username.toStdString(), uuid); + + setConfiguration(); +} + +void ConfigureSystem::RenameUser() { + const auto user = tree_view->currentIndex().row(); + + bool ok = false; + const auto new_username = QInputDialog::getText( + this, tr("Enter Username"), tr("Enter a new username:"), QLineEdit::Normal, + QString::fromStdString(Settings::values.users[user].first), &ok); + + if (!ok) + return; + + Settings::values.users[user].first = new_username.toStdString(); + + setConfiguration(); +} + +void ConfigureSystem::DeleteUser() { + const auto user = Settings::values.users.begin() + tree_view->currentIndex().row(); + const auto confirm = QMessageBox::question( + this, tr("Confirm Delete"), + tr("You are about to delete user with name %1. Are you sure?").arg(user->first.c_str())); + + if (confirm == QMessageBox::No) + return; + + if (Settings::values.current_user == tree_view->currentIndex().row()) + Settings::values.current_user = 0; + + Settings::values.users.erase(user); + + setConfiguration(); + + ui->pm_remove->setEnabled(false); + ui->pm_rename->setEnabled(false); +} diff --git a/src/yuzu/configuration/configure_system.h b/src/yuzu/configuration/configure_system.h index f13de17d44..aa20a3c306 100644 --- a/src/yuzu/configuration/configure_system.h +++ b/src/yuzu/configuration/configure_system.h @@ -5,6 +5,11 @@ #pragma once #include +#include +#include +#include +#include +#include #include namespace Ui { @@ -21,13 +26,27 @@ public: void applyConfiguration(); void setConfiguration(); + void UpdateCurrentUser(); + public slots: void updateBirthdayComboBox(int birthmonth_index); void refreshConsoleID(); + void SelectUser(const QModelIndex& index); + void AddUser(); + void RenameUser(); + void DeleteUser(); + private: void ReadSystemSettings(); + QVBoxLayout* layout; + QTreeView* tree_view; + QStandardItemModel* item_model; + QGraphicsScene* scene; + + std::vector> list_items; + std::unique_ptr ui; bool enabled; diff --git a/src/yuzu/configuration/configure_system.ui b/src/yuzu/configuration/configure_system.ui index f3f8db038d..2a6dcdb24f 100644 --- a/src/yuzu/configuration/configure_system.ui +++ b/src/yuzu/configuration/configure_system.ui @@ -7,7 +7,7 @@ 0 0 360 - 377 + 483 @@ -22,34 +22,28 @@ System Settings - - - - Username - - - - - - - - 0 - 0 - - - - 32 - - - + + + Language + + + + Birthday - + + + + Console ID: + + + + @@ -120,14 +114,7 @@ - - - - Language - - - - + Note: this can be overridden when region setting is auto-select @@ -187,31 +174,31 @@ Russian (Русский) - - - Taiwanese - - - - - British English - - - - - Canadian French - - - - - Latin American Spanish - - - - - Simplified Chinese - - + + + Taiwanese + + + + + British English + + + + + Canadian French + + + + + Latin American Spanish + + + + + Simplified Chinese + + Traditional Chinese (正體中文) @@ -219,14 +206,14 @@ - + Sound output mode - + @@ -245,14 +232,7 @@ - - - - Console ID: - - - - + @@ -271,6 +251,133 @@ + + + + Profile Manager + + + + QLayout::SetNoConstraint + + + + + + + + 0 + 0 + + + + Current User + + + + + + + + 48 + 48 + + + + + 48 + 48 + + + + Qt::ScrollBarAlwaysOff + + + Qt::ScrollBarAlwaysOff + + + false + + + + + + + + 0 + 0 + + + + Username + + + + + + + + + + 0 + 0 + + + + QFrame::StyledPanel + + + false + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Add + + + + + + + false + + + Rename + + + + + + + false + + + Remove + + + + + + + + @@ -281,19 +388,6 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - -