From 999e651ed53d28658ac01610a38b0fc04905691e Mon Sep 17 00:00:00 2001 From: Ryan Meredith Date: Mon, 30 Mar 2020 06:06:38 -0400 Subject: [PATCH] Qt: Display default Paths --- Source/Core/DolphinQt/Settings/PathPane.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Source/Core/DolphinQt/Settings/PathPane.cpp b/Source/Core/DolphinQt/Settings/PathPane.cpp index 5d67de2c56..ab59f185cc 100644 --- a/Source/Core/DolphinQt/Settings/PathPane.cpp +++ b/Source/Core/DolphinQt/Settings/PathPane.cpp @@ -13,6 +13,7 @@ #include #include "Common/Config/Config.h" +#include "Common/FileUtil.h" #include "Core/Config/MainSettings.h" #include "Core/ConfigManager.h" @@ -189,7 +190,7 @@ QGridLayout* PathPane::MakePathsLayout() layout->addWidget(m_game_edit, 0, 1); layout->addWidget(game_open, 0, 2); - m_nand_edit = new QLineEdit(QString::fromStdString(Config::Get(Config::MAIN_FS_PATH))); + m_nand_edit = new QLineEdit(QString::fromStdString(File::GetUserPath(D_WIIROOT_IDX))); connect(m_nand_edit, &QLineEdit::editingFinished, this, &PathPane::OnNANDPathChanged); QPushButton* nand_open = new QPushButton(QStringLiteral("...")); connect(nand_open, &QPushButton::clicked, this, &PathPane::BrowseWiiNAND); @@ -197,7 +198,7 @@ QGridLayout* PathPane::MakePathsLayout() layout->addWidget(m_nand_edit, 1, 1); layout->addWidget(nand_open, 1, 2); - m_dump_edit = new QLineEdit(QString::fromStdString(Config::Get(Config::MAIN_DUMP_PATH))); + m_dump_edit = new QLineEdit(QString::fromStdString(File::GetUserPath(D_DUMP_IDX))); connect(m_dump_edit, &QLineEdit::editingFinished, [=] { Config::SetBase(Config::MAIN_DUMP_PATH, m_dump_edit->text().toStdString()); }); QPushButton* dump_open = new QPushButton(QStringLiteral("...")); @@ -206,7 +207,7 @@ QGridLayout* PathPane::MakePathsLayout() layout->addWidget(m_dump_edit, 2, 1); layout->addWidget(dump_open, 2, 2); - m_load_edit = new QLineEdit(QString::fromStdString(Config::Get(Config::MAIN_LOAD_PATH))); + m_load_edit = new QLineEdit(QString::fromStdString(File::GetUserPath(D_LOAD_IDX))); connect(m_load_edit, &QLineEdit::editingFinished, [=] { Config::SetBase(Config::MAIN_LOAD_PATH, m_load_edit->text().toStdString()); }); QPushButton* load_open = new QPushButton(QStringLiteral("...")); @@ -216,7 +217,7 @@ QGridLayout* PathPane::MakePathsLayout() layout->addWidget(load_open, 3, 2); m_resource_pack_edit = - new QLineEdit(QString::fromStdString(Config::Get(Config::MAIN_RESOURCEPACK_PATH))); + new QLineEdit(QString::fromStdString(File::GetUserPath(D_RESOURCEPACK_IDX))); connect(m_resource_pack_edit, &QLineEdit::editingFinished, [=] { Config::SetBase(Config::MAIN_RESOURCEPACK_PATH, m_resource_pack_edit->text().toStdString()); }); @@ -226,7 +227,7 @@ QGridLayout* PathPane::MakePathsLayout() layout->addWidget(m_resource_pack_edit, 4, 1); layout->addWidget(resource_pack_open, 4, 2); - m_sdcard_edit = new QLineEdit(QString::fromStdString(Config::Get(Config::MAIN_SD_PATH))); + m_sdcard_edit = new QLineEdit(QString::fromStdString(File::GetUserPath(F_WIISDCARD_IDX))); connect(m_sdcard_edit, &QLineEdit::editingFinished, this, &PathPane::OnSDCardPathChanged); QPushButton* sdcard_open = new QPushButton(QStringLiteral("...")); connect(sdcard_open, &QPushButton::clicked, this, &PathPane::BrowseSDCard);