From ef5184cf1cddffbd5f10657e3e6bf7c957ddd628 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Tue, 15 Nov 2022 17:57:01 -0500
Subject: configure_profile_manager: Use a custom dialog for deletion

A hopefully more informative dialog that most importantly notifies the
user that their saves will be deleted with the user profile.

cpm: Only keep track of UI elements that we need

cpm: Remove unused forward declarations

cpm: Add missing include
---
 src/yuzu/configuration/configure_profile_manager.h | 25 +++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

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

diff --git a/src/yuzu/configuration/configure_profile_manager.h b/src/yuzu/configuration/configure_profile_manager.h
index fe9033779..6e5cb748d 100644
--- a/src/yuzu/configuration/configure_profile_manager.h
+++ b/src/yuzu/configuration/configure_profile_manager.h
@@ -3,16 +3,22 @@
 
 #pragma once
 
+#include <functional>
 #include <memory>
 
+#include <QDialog>
 #include <QList>
 #include <QWidget>
 
+#include "common/uuid.h"
+
 namespace Core {
 class System;
 }
 
 class QGraphicsScene;
+class QDialogButtonBox;
+class QLabel;
 class QStandardItem;
 class QStandardItemModel;
 class QTreeView;
@@ -26,6 +32,20 @@ namespace Ui {
 class ConfigureProfileManager;
 }
 
+class ConfigureProfileManagerDeleteDialog : public QDialog {
+public:
+    explicit ConfigureProfileManagerDeleteDialog(QWidget* parent);
+    ~ConfigureProfileManagerDeleteDialog();
+
+    void SetInfo(const QString username, const Common::UUID uuid,
+                 std::function<void()> accept_callback);
+
+private:
+    QDialogButtonBox* dialog_button_box;
+    QGraphicsScene* icon_scene;
+    QLabel* label_info;
+};
+
 class ConfigureProfileManager : public QWidget {
     Q_OBJECT
 
@@ -47,7 +67,8 @@ private:
     void SelectUser(const QModelIndex& index);
     void AddUser();
     void RenameUser();
-    void DeleteUser();
+    void ConfirmDeleteUser();
+    void DeleteUser(const Common::UUID uuid);
     void SetUserImage();
 
     QVBoxLayout* layout;
@@ -55,6 +76,8 @@ private:
     QStandardItemModel* item_model;
     QGraphicsScene* scene;
 
+    std::unique_ptr<ConfigureProfileManagerDeleteDialog> confirm_dialog;
+
     std::vector<QList<QStandardItem*>> list_items;
 
     std::unique_ptr<Ui::ConfigureProfileManager> ui;
-- 
cgit v1.2.3


From e94bcf03cb20d65b6bda65fccb3f259783c8ff86 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Tue, 15 Nov 2022 19:25:09 -0500
Subject: configure_profile_manager: Cleanup reference/pointer usage

Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com>
Co-authored-by: Mai M. <mathew1800@gmail.com>
---
 src/yuzu/configuration/configure_profile_manager.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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

diff --git a/src/yuzu/configuration/configure_profile_manager.h b/src/yuzu/configuration/configure_profile_manager.h
index 6e5cb748d..c4b1a334e 100644
--- a/src/yuzu/configuration/configure_profile_manager.h
+++ b/src/yuzu/configuration/configure_profile_manager.h
@@ -10,7 +10,9 @@
 #include <QList>
 #include <QWidget>
 
-#include "common/uuid.h"
+namespace Common {
+struct UUID;
+}
 
 namespace Core {
 class System;
@@ -37,7 +39,7 @@ public:
     explicit ConfigureProfileManagerDeleteDialog(QWidget* parent);
     ~ConfigureProfileManagerDeleteDialog();
 
-    void SetInfo(const QString username, const Common::UUID uuid,
+    void SetInfo(const QString& username, const Common::UUID& uuid,
                  std::function<void()> accept_callback);
 
 private:
@@ -68,7 +70,7 @@ private:
     void AddUser();
     void RenameUser();
     void ConfirmDeleteUser();
-    void DeleteUser(const Common::UUID uuid);
+    void DeleteUser(const Common::UUID& uuid);
     void SetUserImage();
 
     QVBoxLayout* layout;
@@ -76,7 +78,7 @@ private:
     QStandardItemModel* item_model;
     QGraphicsScene* scene;
 
-    std::unique_ptr<ConfigureProfileManagerDeleteDialog> confirm_dialog;
+    ConfigureProfileManagerDeleteDialog* confirm_dialog;
 
     std::vector<QList<QStandardItem*>> list_items;
 
-- 
cgit v1.2.3