yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0

qt: Add Profile Manager UI to system settings

This commit is contained in:
Zach Hilman 2018-10-09 21:53:04 -04:00
parent d3fbf45705
commit b2a8209c5b
3 changed files with 354 additions and 80 deletions

View File

@ -2,7 +2,12 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <QGraphicsItem>
#include <QList>
#include <QMessageBox> #include <QMessageBox>
#include <qinputdialog.h>
#include "common/common_paths.h"
#include "common/logging/backend.h"
#include "core/core.h" #include "core/core.h"
#include "core/settings.h" #include "core/settings.h"
#include "ui_configure_system.h" #include "ui_configure_system.h"
@ -24,6 +29,17 @@ static const std::array<int, 12> days_in_month = {{
31, 31,
}}; }};
// Same backup JPEG used by acc IProfile::GetImage if no jpeg found
static constexpr std::array<u8, 107> 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) { ConfigureSystem::ConfigureSystem(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureSystem) {
ui->setupUi(this); ui->setupUi(this);
connect(ui->combo_birthmonth, 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, connect(ui->button_regenerate_console_id, &QPushButton::clicked, this,
&ConfigureSystem::refreshConsoleID); &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<QStandardItem*>>("QList<QStandardItem*>");
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(); this->setConfiguration();
} }
@ -39,8 +93,51 @@ ConfigureSystem::~ConfigureSystem() = default;
void ConfigureSystem::setConfiguration() { void ConfigureSystem::setConfiguration() {
enabled = !Core::System::GetInstance().IsPoweredOn(); enabled = !Core::System::GetInstance().IsPoweredOn();
ui->edit_username->setText(QString::fromStdString(Settings::values.username));
ui->combo_language->setCurrentIndex(Settings::values.language_index); 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<std::string, Service::Account::UUID>& 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() {} void ConfigureSystem::ReadSystemSettings() {}
@ -48,7 +145,7 @@ void ConfigureSystem::ReadSystemSettings() {}
void ConfigureSystem::applyConfiguration() { void ConfigureSystem::applyConfiguration() {
if (!enabled) if (!enabled)
return; return;
Settings::values.username = ui->edit_username->text().toStdString();
Settings::values.language_index = ui->combo_language->currentIndex(); Settings::values.language_index = ui->combo_language->currentIndex();
Settings::Apply(); Settings::Apply();
} }
@ -92,3 +189,67 @@ void ConfigureSystem::refreshConsoleID() {
ui->label_console_id->setText( ui->label_console_id->setText(
tr("Console ID: 0x%1").arg(QString::number(console_id, 16).toUpper())); tr("Console ID: 0x%1").arg(QString::number(console_id, 16).toUpper()));
} }
void ConfigureSystem::SelectUser(const QModelIndex& index) {
Settings::values.current_user =
std::clamp<std::size_t>(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);
}

View File

@ -5,6 +5,11 @@
#pragma once #pragma once
#include <memory> #include <memory>
#include <QGraphicsScene>
#include <QList>
#include <QStandardItemModel>
#include <QTreeView>
#include <QVBoxLayout>
#include <QWidget> #include <QWidget>
namespace Ui { namespace Ui {
@ -21,13 +26,27 @@ public:
void applyConfiguration(); void applyConfiguration();
void setConfiguration(); void setConfiguration();
void UpdateCurrentUser();
public slots: public slots:
void updateBirthdayComboBox(int birthmonth_index); void updateBirthdayComboBox(int birthmonth_index);
void refreshConsoleID(); void refreshConsoleID();
void SelectUser(const QModelIndex& index);
void AddUser();
void RenameUser();
void DeleteUser();
private: private:
void ReadSystemSettings(); void ReadSystemSettings();
QVBoxLayout* layout;
QTreeView* tree_view;
QStandardItemModel* item_model;
QGraphicsScene* scene;
std::vector<QList<QStandardItem*>> list_items;
std::unique_ptr<Ui::ConfigureSystem> ui; std::unique_ptr<Ui::ConfigureSystem> ui;
bool enabled; bool enabled;

View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>360</width> <width>360</width>
<height>377</height> <height>483</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -22,34 +22,28 @@
<string>System Settings</string> <string>System Settings</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_username">
<property name="text">
<string>Username</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="edit_username">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maxLength">
<number>32</number>
</property>
</widget>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_language">
<property name="text">
<string>Language</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_birthday"> <widget class="QLabel" name="label_birthday">
<property name="text"> <property name="text">
<string>Birthday</string> <string>Birthday</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="3" column="0">
<widget class="QLabel" name="label_console_id">
<property name="text">
<string>Console ID:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_birthday2"> <layout class="QHBoxLayout" name="horizontalLayout_birthday2">
<item> <item>
<widget class="QComboBox" name="combo_birthmonth"> <widget class="QComboBox" name="combo_birthmonth">
@ -120,14 +114,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="2" column="0"> <item row="1" column="1">
<widget class="QLabel" name="label_language">
<property name="text">
<string>Language</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="combo_language"> <widget class="QComboBox" name="combo_language">
<property name="toolTip"> <property name="toolTip">
<string>Note: this can be overridden when region setting is auto-select</string> <string>Note: this can be overridden when region setting is auto-select</string>
@ -219,14 +206,14 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_sound"> <widget class="QLabel" name="label_sound">
<property name="text"> <property name="text">
<string>Sound output mode</string> <string>Sound output mode</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="2" column="1">
<widget class="QComboBox" name="combo_sound"> <widget class="QComboBox" name="combo_sound">
<item> <item>
<property name="text"> <property name="text">
@ -245,14 +232,7 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="3" column="1">
<widget class="QLabel" name="label_console_id">
<property name="text">
<string>Console ID:</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QPushButton" name="button_regenerate_console_id"> <widget class="QPushButton" name="button_regenerate_console_id">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -271,6 +251,133 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="QGroupBox" name="gridGroupBox">
<property name="title">
<string>Profile Manager</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<property name="sizeConstraint">
<enum>QLayout::SetNoConstraint</enum>
</property>
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Current User</string>
</property>
</widget>
</item>
<item>
<widget class="QGraphicsView" name="current_user_icon">
<property name="minimumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="interactive">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="current_user_username">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Username</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QScrollArea" name="scrollArea">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="widgetResizable">
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pm_add">
<property name="text">
<string>Add</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pm_rename">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Rename</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pm_remove">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QLabel" name="label_disable_info"> <widget class="QLabel" name="label_disable_info">
<property name="text"> <property name="text">
@ -281,19 +388,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>