From b2a8209c5be07f045ad6823eb6a0246a9a537a34 Mon Sep 17 00:00:00 2001
From: Zach Hilman <zachhilman@gmail.com>
Date: Tue, 9 Oct 2018 21:53:04 -0400
Subject: qt: Add Profile Manager UI to system settings

---
 src/yuzu/configuration/configure_system.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'src/yuzu/configuration/configure_system.h')

diff --git a/src/yuzu/configuration/configure_system.h b/src/yuzu/configuration/configure_system.h
index f13de17d4..aa20a3c30 100644
--- a/src/yuzu/configuration/configure_system.h
+++ b/src/yuzu/configuration/configure_system.h
@@ -5,6 +5,11 @@
 #pragma once
 
 #include <memory>
+#include <QGraphicsScene>
+#include <QList>
+#include <QStandardItemModel>
+#include <QTreeView>
+#include <QVBoxLayout>
 #include <QWidget>
 
 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<QList<QStandardItem*>> list_items;
+
     std::unique_ptr<Ui::ConfigureSystem> ui;
     bool enabled;
 
-- 
cgit v1.2.3


From 702622b8f1eaa1b297a27a305ac56faeadf542d7 Mon Sep 17 00:00:00 2001
From: Zach Hilman <zachhilman@gmail.com>
Date: Wed, 10 Oct 2018 21:49:20 -0400
Subject: profile_manager: Load user icons, names, and UUIDs from system save

---
 src/yuzu/configuration/configure_system.h | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'src/yuzu/configuration/configure_system.h')

diff --git a/src/yuzu/configuration/configure_system.h b/src/yuzu/configuration/configure_system.h
index aa20a3c30..868bb8bdf 100644
--- a/src/yuzu/configuration/configure_system.h
+++ b/src/yuzu/configuration/configure_system.h
@@ -5,12 +5,16 @@
 #pragma once
 
 #include <memory>
-#include <QGraphicsScene>
+
 #include <QList>
-#include <QStandardItemModel>
-#include <QTreeView>
-#include <QVBoxLayout>
 #include <QWidget>
+#include "core/hle/service/acc/profile_manager.h"
+
+class QVBoxLayout;
+class QTreeView;
+class QStandardItemModel;
+class QGraphicsScene;
+class QStandardItem;
 
 namespace Ui {
 class ConfigureSystem;
@@ -26,6 +30,7 @@ public:
     void applyConfiguration();
     void setConfiguration();
 
+    void PopulateUserList();
     void UpdateCurrentUser();
 
 public slots:
@@ -36,9 +41,11 @@ public slots:
     void AddUser();
     void RenameUser();
     void DeleteUser();
+    void SetUserImage();
 
 private:
     void ReadSystemSettings();
+    std::string GetAccountUsername(Service::Account::UUID uuid);
 
     QVBoxLayout* layout;
     QTreeView* tree_view;
@@ -50,8 +57,9 @@ private:
     std::unique_ptr<Ui::ConfigureSystem> ui;
     bool enabled;
 
-    std::u16string username;
     int birthmonth, birthday;
     int language_index;
     int sound_index;
+
+    std::unique_ptr<Service::Account::ProfileManager> profile_manager;
 };
-- 
cgit v1.2.3


From bfad41b0c12a308b0a5a10e3162d74140e3c121a Mon Sep 17 00:00:00 2001
From: Zach Hilman <zachhilman@gmail.com>
Date: Sun, 14 Oct 2018 14:49:32 -0400
Subject: profile_manager: Create save data if it doesn't exist on use

---
 src/yuzu/configuration/configure_system.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/yuzu/configuration/configure_system.h')

diff --git a/src/yuzu/configuration/configure_system.h b/src/yuzu/configuration/configure_system.h
index 868bb8bdf..6adadfccf 100644
--- a/src/yuzu/configuration/configure_system.h
+++ b/src/yuzu/configuration/configure_system.h
@@ -10,11 +10,11 @@
 #include <QWidget>
 #include "core/hle/service/acc/profile_manager.h"
 
-class QVBoxLayout;
-class QTreeView;
-class QStandardItemModel;
 class QGraphicsScene;
 class QStandardItem;
+class QStandardItemModel;
+class QTreeView;
+class QVBoxLayout;
 
 namespace Ui {
 class ConfigureSystem;
@@ -45,7 +45,7 @@ public slots:
 
 private:
     void ReadSystemSettings();
-    std::string GetAccountUsername(Service::Account::UUID uuid);
+    std::string GetAccountUsername(Service::Account::UUID uuid) const;
 
     QVBoxLayout* layout;
     QTreeView* tree_view;
-- 
cgit v1.2.3


From e7ac42677be6c13e5286fb42004aa94b0da45391 Mon Sep 17 00:00:00 2001
From: Zach Hilman <zachhilman@gmail.com>
Date: Wed, 24 Oct 2018 09:25:13 -0400
Subject: configure_system: Clear current username before overwriting

Prevents bug where old username would remain if the new username was shorter in length.
---
 src/yuzu/configuration/configure_system.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/yuzu/configuration/configure_system.h')

diff --git a/src/yuzu/configuration/configure_system.h b/src/yuzu/configuration/configure_system.h
index 6adadfccf..b73e0719c 100644
--- a/src/yuzu/configuration/configure_system.h
+++ b/src/yuzu/configuration/configure_system.h
@@ -8,7 +8,11 @@
 
 #include <QList>
 #include <QWidget>
-#include "core/hle/service/acc/profile_manager.h"
+
+namespace Service::Account {
+class ProfileManager;
+struct UUID;
+} // namespace Service::Account
 
 class QGraphicsScene;
 class QStandardItem;
-- 
cgit v1.2.3