frontend: Main dialog update

src/frontend/main.cpp

@@ -2,11 +2,13 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <regex>
 #include <string>
 #include <QApplication>
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QStorageInfo>
+#include <QTreeWidgetItem>
 #include <qdevicewatcher.h>
 #include "common/file_util.h"
 #include "frontend/import_dialog.h"
@@ -36,18 +38,11 @@ bool IsConfigGood(const Core::Config& config) {
 MainDialog::MainDialog(QWidget* parent) : QDialog(parent), ui(std::make_unique<Ui::MainDialog>()) {
     ui->setupUi(this);
 
-    setFixedWidth(width());
+    ui->buttonBox->button(QDialogButtonBox::StandardButton::Ok)->setEnabled(false);
     ui->buttonBox->button(QDialogButtonBox::StandardButton::Reset)->setText(tr("Refresh"));
 
     LoadPresetConfig();
 
-    connect(ui->advancedButton, &QPushButton::clicked, [this] {
-        if (ui->customGroupBox->isVisible()) {
-            HideAdvanced();
-        } else {
-            ShowAdvanced();
-        }
-    });
     connect(ui->utilitiesButton, &QPushButton::clicked, [this] {
         UtilitiesDialog dialog(this);
         dialog.exec();
@@ -61,34 +56,19 @@ MainDialog::MainDialog(QWidget* parent) : QDialog(parent), ui(std::make_unique<U
         }
     });
 
-    // Field 3: Is file
+    connect(ui->main, &QTreeWidget::itemSelectionChanged, [this] {
-    const std::array<std::tuple<QLineEdit*, QToolButton*, int>, 9> fields{{
+        ui->buttonBox->button(QDialogButtonBox::StandardButton::Ok)
-        {ui->sdmcPath, ui->sdmcPathExplore, 0},
+            ->setEnabled(!ui->main->selectedItems().empty());
-        {ui->userPath, ui->userPathExplore, 0},
+    });
-        {ui->movableSedPath, ui->movableSedExplore, 1},
+    connect(ui->main, &QTreeWidget::itemDoubleClicked, [this] {
-        {ui->bootrom9Path, ui->bootrom9Explore, 1},
+        if (!ui->main->selectedItems().empty())
-        {ui->safeModeFirmPath, ui->safeModeFirmExplore, 0},
+            LaunchImportDialog();
-        {ui->seeddbPath, ui->seeddbExplore, 1},
+    });
-        {ui->secretSectorPath, ui->secretSectorExplore, 1},
-        {ui->configSavegamePath, ui->configSavegameExplore, 1},
-        {ui->systemArchivesPath, ui->systemArchivesExplore, 0},
-    }};
 
-    // TODO: better handling (filter)
+    ui->main->setIndentation(4);
-    for (auto [field, button, isFile] : fields) {
+    ui->main->setColumnWidth(0, 0.3 * width());
-        connect(button, &QToolButton::clicked, [this, field, isFile] {
+    ui->main->setColumnWidth(1, 0.4 * width());
-            QString path;
+    ui->main->setColumnWidth(2, 0.2 * width());
-            if (isFile) {
-                path = QFileDialog::getOpenFileName(this, tr("Select File"));
-            } else {
-                path = QFileDialog::getExistingDirectory(this, tr("Select Directory"));
-            }
-
-            if (!path.isEmpty()) {
-                field->setText(path);
-            }
-        });
-    }
 
     // Set up device watcher
     auto* device_watcher = new QDeviceWatcher(this);
@@ -100,8 +80,10 @@ MainDialog::MainDialog(QWidget* parent) : QDialog(parent), ui(std::make_unique<U
 
 MainDialog::~MainDialog() = default;
 
+static const std::regex sdmc_path_regex{"(.+)([/\\\\])Nintendo 3DS/([0-9a-f]{32})/([0-9a-f]{32})/"};
+
 void MainDialog::LoadPresetConfig() {
-    ui->configSelect->clear();
+    ui->main->clear();
     preset_config_list.clear();
 
     for (const auto& storage : QStorageInfo::mountedVolumes()) {
@@ -111,103 +93,95 @@ void MainDialog::LoadPresetConfig() {
 
         auto list = Core::LoadPresetConfig(storage.rootPath().toStdString());
         for (std::size_t i = 0; i < list.size(); ++i) {
+            if (!IsConfigGood(list[i])) {
+                return;
+            }
             preset_config_list.emplace_back(list[i]);
-            ui->configSelect->addItem(QString::fromStdString(list[i].sdmc_path));
+
+            QString path = storage.rootPath();
+            if (path.endsWith(QLatin1Char{'/'}) || path.endsWith(QLatin1Char{'\\'})) {
+                path.remove(path.size() - 1, 1);
+            }
+
+            // Get ID0
+            QString id0 = tr("Unknown");
+            std::smatch match;
+            if (std::regex_match(list[i].sdmc_path, match, sdmc_path_regex)) {
+                if (match.size() >= 5) {
+                    id0 = QString::fromStdString(match[3].str());
+                }
+            }
+
+            // Get status
+            QString status = tr("Good");
+            if (list[i].safe_mode_firm_path.empty() || list[i].config_savegame_path.empty() ||
+                list[i].system_archives_path.empty()) {
+
+                status = tr("Missing System Files");
+            } else if (list[i].seed_db_path.empty()) {
+                status = tr("Good, Missing Seeds");
+            }
+
+            auto* item = new QTreeWidgetItem{{path, id0, status}};
+            ui->main->invisibleRootItem()->addChild(item);
         }
     }
 
-    if (preset_config_list.empty()) {
+    auto* item = new QTreeWidgetItem{{tr("Browse SD Card Root...")}};
-        // Clear the text
+    item->setFirstColumnSpanned(true);
-        ui->sdmcPath->setText(QString{});
+    ui->main->invisibleRootItem()->addChild(item);
-        ui->userPath->setText(
-            QString::fromStdString(FileUtil::GetUserPath(FileUtil::UserPath::UserDir)));
-        ui->movableSedPath->setText(QString{});
-        ui->bootrom9Path->setText(QString{});
-        ui->safeModeFirmPath->setText(QString{});
-        ui->seeddbPath->setText(QString{});
-        ui->secretSectorPath->setText(QString{});
-        ui->configSavegamePath->setText(QString{});
-        ui->systemArchivesPath->setText(QString{});
-
-        ui->advancedButton->setVisible(false);
-        ShowAdvanced();
-        ui->configSelect->addItem(tr("None"));
-        ui->configSelect->setCurrentText(tr("None"));
-    } else {
-        ui->advancedButton->setVisible(true);
-        if (ui->customGroupBox->isVisible()) {
-            HideAdvanced();
-        }
-    }
-}
-
-void MainDialog::ShowAdvanced() {
-    ui->configSelect->setEnabled(false);
-    ui->advancedButton->setText(tr("Hide Custom Config"));
-    ui->customGroupBox->setVisible(true);
-
-    setMaximumHeight(1000000);
-    adjustSize();
-
-    const int index = ui->configSelect->currentIndex();
-    ui->configSelect->addItem(tr("Custom"));
-    ui->configSelect->setCurrentText(tr("Custom"));
-
-    if (index == -1) {
-        return;
-    }
-
-    // Load preset data
-    const auto config = preset_config_list[static_cast<u32>(index)];
-    ui->sdmcPath->setText(QString::fromStdString(config.sdmc_path));
-    ui->userPath->setText(QString::fromStdString(config.user_path));
-    ui->movableSedPath->setText(QString::fromStdString(config.movable_sed_path));
-    ui->bootrom9Path->setText(QString::fromStdString(config.bootrom_path));
-    ui->safeModeFirmPath->setText(QString::fromStdString(config.safe_mode_firm_path));
-    ui->seeddbPath->setText(QString::fromStdString(config.seed_db_path));
-    ui->secretSectorPath->setText(QString::fromStdString(config.secret_sector_path));
-    ui->configSavegamePath->setText(QString::fromStdString(config.config_savegame_path));
-    ui->systemArchivesPath->setText(QString::fromStdString(config.system_archives_path));
-}
-
-void MainDialog::HideAdvanced() {
-    ui->configSelect->setEnabled(true);
-    ui->advancedButton->setText(tr("Customize..."));
-    ui->customGroupBox->setVisible(false);
-
-    LoadPresetConfig();
-
-    setMaximumHeight(130);
-    adjustSize();
-}
-
-Core::Config MainDialog::GetCurrentConfig() {
-    if (ui->customGroupBox->isVisible()) {
-        Core::Config config{
-            /*sdmc_path*/ ui->sdmcPath->text().toStdString(),
-            /*user_path*/ ui->userPath->text().toStdString(),
-            /*movable_sed_path*/ ui->movableSedPath->text().toStdString(),
-            /*bootrom_path*/ ui->bootrom9Path->text().toStdString(),
-            /*safe_mode_firm_path*/ ui->safeModeFirmPath->text().toStdString(),
-            /*seed_db_path*/ ui->seeddbPath->text().toStdString(),
-            /*secret_sector_path*/ ui->secretSectorPath->text().toStdString(),
-            /*config_savegame_path*/ ui->configSavegamePath->text().toStdString(),
-            /*system_archives_path*/ ui->systemArchivesPath->text().toStdString(),
-        };
-        return config;
-    } else {
-        return preset_config_list[ui->configSelect->currentIndex()];
-    }
 }
 
 void MainDialog::LaunchImportDialog() {
-    const auto& config = GetCurrentConfig();
+    auto* item = ui->main->currentItem();
-    if (!IsConfigGood(config)) {
+    if (!item) {
-        QMessageBox::critical(this, tr("Incomplete Config"),
-                              tr("Your config is missing some of the required fields."));
         return;
     }
 
+    Core::Config config;
+    const auto index = ui->main->invisibleRootItem()->indexOfChild(item);
+    if (index == ui->main->invisibleRootItem()->childCount() - 1) {
+        const QString path = QFileDialog::getExistingDirectory(this, tr("Select SD Card Root"));
+        if (path.isEmpty()) {
+            return;
+        }
+
+        const auto& list = Core::LoadPresetConfig(path.toStdString());
+        if (list.size() > 1) {
+            QMessageBox::information(
+                this, tr("threeSD"),
+                tr("You have more than one 3DS data on your SD Card.\nthreeSD will "
+                   "select the first one for you."));
+        } else if (list.empty() || !IsConfigGood(list[0])) {
+            QMessageBox::critical(
+                this, tr("Error"),
+                tr("Could not load configuration.<br>Please check if you have followed the <a "
+                   "href='https://github.com/zhaowenlan1779/threeSD/wiki/Quickstart-Guide'>"
+                   "guide</a> correctly."));
+            return;
+        }
+
+        config = list[0];
+    } else {
+        config = preset_config_list.at(index);
+    }
+
+    // Check config integrity
+    if (config.safe_mode_firm_path.empty() || config.config_savegame_path.empty() ||
+        config.system_archives_path.empty()) {
+        QMessageBox::warning(
+            this, tr("Warning"),
+            tr("Certain system files are missing from your configuration.<br>Some contents "
+               "may not be importable, or may not run.<br>Please check if you have followed the <a "
+               "href='https://github.com/zhaowenlan1779/threeSD/wiki/Quickstart-Guide'>guide</a> "
+               "correctly."));
+    } else if (config.seed_db_path.empty()) {
+        QMessageBox::warning(this, tr("Warning"),
+                             tr("Seed database is missing from your configuration.<br>Your system "
+                                "likely does not have any seeds.<br>However, if it does have any, "
+                                "imported games using seed encryption may not work."));
+    }
+
     ImportDialog dialog(this, config);
     dialog.exec();
 }

src/frontend/main.h

@@ -21,9 +21,6 @@ public:
 
 private:
     void LoadPresetConfig();
-    void ShowAdvanced();
-    void HideAdvanced();
-    Core::Config GetCurrentConfig();
     void LaunchImportDialog();
 
     std::vector<Core::Config> preset_config_list;

src/frontend/main.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>800</width>
-    <height>130</height>
+    <height>300</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -19,28 +19,7 @@
      <item>
       <widget class="QLabel">
        <property name="text">
-        <string>Auto-detected Configuration:</string>
+        <string>Select your SD card root, or manually browse when not detected.</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="configSelect">
-       <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout">
-     <item>
-      <widget class="QPushButton" name="advancedButton">
-       <property name="text">
-        <string>Customize...</string>
        </property>
       </widget>
      </item>
@@ -61,195 +40,22 @@
     </layout>
    </item>
    <item>
-    <widget class="QGroupBox" name="customGroupBox">
+    <widget class="QTreeWidget" name="main">
-     <property name="title">
+     <column>
-      <string>Custom</string>
+      <property name="text">
-     </property>
+       <string>Path</string>
-     <property name="visible">
+      </property>
-      <bool>false</bool>
+     </column>
-     </property>
+     <column>
-     <layout class="QGridLayout">
+      <property name="text">
-      <item row="0" column="0">
+       <string>ID</string>
-        <widget class="QLabel">
+      </property>
-         <property name="text">
+     </column>
-          <string>SDMC (Required)</string>
+     <column>
-         </property>
+      <property name="text">
-         <property name="toolTip">
+       <string>Status</string>
-          <string>Path to the Nintendo 3DS/&lt;ID0>/&lt;ID1> folder.</string>
+      </property>
-         </property>
+     </column>
-        </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QLineEdit" name="sdmcPath">
-        <property name="toolTip">
-          <string>Path to the Nintendo 3DS/&lt;ID0>/&lt;ID1> folder.</string>
-         </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QToolButton" name="sdmcPathExplore">
-        <property name="text">
-         <string>...</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel">
-        <property name="text">
-         <string>Citra User Directory (Required)</string>
-        </property>
-        <property name="toolTip">
-         <string>Path to the User Directory of Citra to put imported content into.</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QLineEdit" name="userPath">
-        <property name="toolTip">
-         <string>Path to the User Directory of Citra to put imported content into.</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QToolButton" name="userPathExplore">
-        <property name="text">
-         <string>...</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel">
-        <property name="text">
-         <string>movable.sed (Required)</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QLineEdit" name="movableSedPath"/>
-      </item>
-      <item row="2" column="2">
-       <widget class="QToolButton" name="movableSedExplore">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>...</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel">
-        <property name="text">
-         <string>boot9.bin (Required)</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="QLineEdit" name="bootrom9Path"/>
-      </item>
-      <item row="3" column="2">
-       <widget class="QToolButton" name="bootrom9Explore">
-        <property name="text">
-         <string>...</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel">
-        <property name="text">
-         <string>Safe mode firm</string>
-        </property>
-        <property name="toolTip">
-         <string>Path to the safe mode firm.&lt;br>This is a folder, and needs to contain another folder named 'new' or 'old' corresponding to the system's type.&lt;br>The 'new' or 'old' folder should hold files from the 'content' folder of the firm title in NAND. (i.e. tmd and app)</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1">
-       <widget class="QLineEdit" name="safeModeFirmPath">
-        <property name="toolTip">
-         <string>Path to the safe mode firm.&lt;br>This is a folder, and needs to contain another folder named 'new' or 'old' corresponding to the system's type.&lt;br>The 'new' or 'old' folder should hold files from the 'content' folder of the firm title in NAND. (i.e. tmd and app)</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="2">
-       <widget class="QToolButton" name="safeModeFirmExplore">
-        <property name="text">
-         <string>...</string>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="0">
-       <widget class="QLabel">
-        <property name="text">
-         <string>seeddb.bin</string>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="1">
-       <widget class="QLineEdit" name="seeddbPath"/>
-      </item>
-      <item row="5" column="2">
-       <widget class="QToolButton" name="seeddbExplore">
-        <property name="text">
-         <string>...</string>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="0">
-       <widget class="QLabel">
-        <property name="text">
-         <string>sector0x96.bin</string>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="1">
-       <widget class="QLineEdit" name="secretSectorPath"/>
-      </item>
-      <item row="6" column="2">
-       <widget class="QToolButton" name="secretSectorExplore">
-        <property name="text">
-         <string>...</string>
-        </property>
-       </widget>
-      </item>
-      <item row="7" column="0">
-       <widget class="QLabel">
-        <property name="text">
-         <string>Config savegame</string>
-        </property>
-       </widget>
-      </item>
-      <item row="7" column="1">
-       <widget class="QLineEdit" name="configSavegamePath"/>
-      </item>
-      <item row="7" column="2">
-       <widget class="QToolButton" name="configSavegameExplore">
-        <property name="text">
-         <string>...</string>
-        </property>
-       </widget>
-      </item>
-      <item row="8" column="0">
-       <widget class="QLabel">
-        <property name="text">
-         <string>System archives</string>
-        </property>
-       </widget>
-      </item>
-      <item row="8" column="1">
-       <widget class="QLineEdit" name="systemArchivesPath"/>
-      </item>
-      <item row="8" column="2">
-       <widget class="QToolButton" name="systemArchivesExplore">
-        <property name="text">
-         <string>...</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
     </widget>
    </item>
    <item>