summaryrefslogtreecommitdiff
path: root/src/yuzu/main.h
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2020-07-05 09:29:39 -0400
committerMorph <39850852+Morph1984@users.noreply.github.com>2020-07-10 00:38:28 -0400
commit6d8d7ebc66d9deb5adb4edb246590481b1236bbc (patch)
tree0cd2ca0551ebff87285715c297fefbbc8e169679 /src/yuzu/main.h
parent7f4d96d87332824643d7a8d3ff0fab7ea771b798 (diff)
Update the install and progress dialogs
- Remove the overwrite files checkbox, it will always overwrite - The progressbar now reflects the progress in terms of data transferred.
Diffstat (limited to 'src/yuzu/main.h')
-rw-r--r--src/yuzu/main.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/yuzu/main.h b/src/yuzu/main.h
index deea8170d..adff65fb5 100644
--- a/src/yuzu/main.h
+++ b/src/yuzu/main.h
@@ -51,7 +51,6 @@ enum class EmulatedDirectoryTarget {
enum class InstallResult {
Success,
Overwrite,
- AlreadyExists,
Failure,
};
@@ -110,6 +109,8 @@ signals:
// Signal that tells widgets to update icons to use the current theme
void UpdateThemedIcons();
+ void UpdateInstallProgress();
+
void ErrorDisplayFinished();
void ProfileSelectorFinishedSelection(std::optional<Common::UUID> uuid);
@@ -206,6 +207,7 @@ private slots:
void OnGameListOpenPerGameProperties(const std::string& file);
void OnMenuLoadFile();
void OnMenuLoadFolder();
+ void IncrementInstallProgress();
void OnMenuInstallToNAND();
void OnMenuRecentFile();
void OnConfigure();
@@ -226,10 +228,8 @@ private slots:
private:
std::optional<u64> SelectRomFSDumpTarget(const FileSys::ContentProvider&, u64 program_id);
- InstallResult InstallNSPXCI(const QString& filename, bool overwrite_files,
- QProgressDialog& install_progress);
- InstallResult InstallNCA(const QString& filename, bool overwrite_files,
- QProgressDialog& install_progress);
+ InstallResult InstallNSPXCI(const QString& filename);
+ InstallResult InstallNCA(const QString& filename);
void UpdateWindowTitle(const std::string& title_name = {},
const std::string& title_version = {});
void UpdateStatusBar();
@@ -284,6 +284,9 @@ private:
HotkeyRegistry hotkey_registry;
+ // Install progress dialog
+ QProgressDialog* install_progress;
+
protected:
void dropEvent(QDropEvent* event) override;
void dragEnterEvent(QDragEnterEvent* event) override;