Merge pull request #10280 from iwubcode/wfs_root_configurable

Core / DolphinQt: make WFS directory configurable
dolphin-emu · Dec 19, 2021 · 2d1c735 · 2d1c735
2 parents d8e347c + 5ecd5f0
commit 2d1c735
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 0 deletions.
diff --git a/Source/Core/Core/Config/MainSettings.cpp b/Source/Core/Core/Config/MainSettings.cpp
@@ -157,6 +157,7 @@ const Info<std::string> MAIN_LOAD_PATH{{System::Main, "General", "LoadPath"}, ""
 const Info<std::string> MAIN_RESOURCEPACK_PATH{{System::Main, "General", "ResourcePackPath"}, ""};
 const Info<std::string> MAIN_FS_PATH{{System::Main, "General", "NANDRootPath"}, ""};
 const Info<std::string> MAIN_SD_PATH{{System::Main, "General", "WiiSDCardPath"}, ""};
+const Info<std::string> MAIN_WFS_PATH{{System::Main, "General", "WFSPath"}, ""};
 
 // Main.GBA
 

diff --git a/Source/Core/Core/Config/MainSettings.h b/Source/Core/Core/Config/MainSettings.h
@@ -138,6 +138,7 @@ extern const Info<std::string> MAIN_LOAD_PATH;
 extern const Info<std::string> MAIN_RESOURCEPACK_PATH;
 extern const Info<std::string> MAIN_FS_PATH;
 extern const Info<std::string> MAIN_SD_PATH;
+extern const Info<std::string> MAIN_WFS_PATH;
 
 // Main.GBA
 

diff --git a/Source/Core/DolphinQt/Settings/PathPane.cpp b/Source/Core/DolphinQt/Settings/PathPane.cpp
@@ -111,6 +111,17 @@ void PathPane::BrowseSDCard()
   }
 }
 
+void PathPane::BrowseWFS()
+{
+  const QString dir = QDir::toNativeSeparators(DolphinFileDialog::getExistingDirectory(
+      this, tr("Select WFS Path"), QString::fromStdString(Config::Get(Config::MAIN_WFS_PATH))));
+  if (!dir.isEmpty())
+  {
+    m_wfs_edit->setText(dir);
+    Config::SetBase(Config::MAIN_WFS_PATH, dir.toStdString());
+  }
+}
+
 void PathPane::OnSDCardPathChanged()
 {
   Config::SetBase(Config::MAIN_SD_PATH, m_sdcard_edit->text().toStdString());
@@ -237,6 +248,15 @@ QGridLayout* PathPane::MakePathsLayout()
   layout->addWidget(m_sdcard_edit, 5, 1);
   layout->addWidget(sdcard_open, 5, 2);
 
+  m_wfs_edit = new QLineEdit(QString::fromStdString(File::GetUserPath(D_WFSROOT_IDX)));
+  connect(m_load_edit, &QLineEdit::editingFinished,
+          [=] { Config::SetBase(Config::MAIN_WFS_PATH, m_wfs_edit->text().toStdString()); });
+  QPushButton* wfs_open = new QPushButton(QStringLiteral("..."));
+  connect(wfs_open, &QPushButton::clicked, this, &PathPane::BrowseWFS);
+  layout->addWidget(new QLabel(tr("WFS Path:")), 6, 0);
+  layout->addWidget(m_wfs_edit, 6, 1);
+  layout->addWidget(wfs_open, 6, 2);
+
   return layout;
 }
 

diff --git a/Source/Core/DolphinQt/Settings/PathPane.h b/Source/Core/DolphinQt/Settings/PathPane.h
@@ -25,6 +25,7 @@ class PathPane final : public QWidget
   void BrowseLoad();
   void BrowseResourcePack();
   void BrowseSDCard();
+  void BrowseWFS();
   QGroupBox* MakeGameFolderBox();
   QGridLayout* MakePathsLayout();
   void RemovePath();
@@ -39,6 +40,7 @@ class PathPane final : public QWidget
   QLineEdit* m_load_edit;
   QLineEdit* m_resource_pack_edit;
   QLineEdit* m_sdcard_edit;
+  QLineEdit* m_wfs_edit;
 
   QPushButton* m_remove_path;
 };
diff --git a/Source/Core/UICommon/UICommon.cpp b/Source/Core/UICommon/UICommon.cpp
@@ -77,12 +77,19 @@ static void CreateResourcePackPath(const std::string& path)
     File::SetUserPath(D_RESOURCEPACK_IDX, path + '/');
 }
 
+static void CreateWFSPath(const std::string& path)
+{
+  if (!path.empty())
+    File::SetUserPath(D_WFSROOT_IDX, path + '/');
+}
+
 static void InitCustomPaths()
 {
   File::SetUserPath(D_WIIROOT_IDX, Config::Get(Config::MAIN_FS_PATH));
   CreateLoadPath(Config::Get(Config::MAIN_LOAD_PATH));
   CreateDumpPath(Config::Get(Config::MAIN_DUMP_PATH));
   CreateResourcePackPath(Config::Get(Config::MAIN_RESOURCEPACK_PATH));
+  CreateWFSPath(Config::Get(Config::MAIN_WFS_PATH));
   File::SetUserPath(F_WIISDCARD_IDX, Config::Get(Config::MAIN_SD_PATH));
   File::SetUserPath(F_GBABIOS_IDX, Config::Get(Config::MAIN_GBA_BIOS_PATH));
   File::SetUserPath(D_GBASAVES_IDX, Config::Get(Config::MAIN_GBA_SAVES_PATH));