From 8c889cf0aa6323c2d77112a8e340c772c23764a7 Mon Sep 17 00:00:00 2001 From: GenevensiS <66968533+G-e-n-e-v-e-n-s-i-S@users.noreply.github.com> Date: Sun, 4 Jan 2026 18:41:45 +0100 Subject: [PATCH] remember import directory --- src/data/settings.cpp | 1 + src/data/settings.hpp | 1 + src/gui/add_csv_window.cpp | 6 ++++-- src/gui/add_json_window.cpp | 6 ++++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/data/settings.cpp b/src/data/settings.cpp index 977eba9a..5aa7b43b 100644 --- a/src/data/settings.cpp +++ b/src/data/settings.cpp @@ -325,6 +325,7 @@ IMPLEMENT_REFLECTION_NO_SCRIPT(Settings) { REFLECT(default_image_dir); REFLECT(default_symbol_dir); REFLECT(default_export_dir); + REFLECT(default_import_dir); REFLECT(set_window_maximized); REFLECT(set_window_width); REFLECT(set_window_height); diff --git a/src/data/settings.hpp b/src/data/settings.hpp index 9be412f3..26d77ac8 100644 --- a/src/data/settings.hpp +++ b/src/data/settings.hpp @@ -157,6 +157,7 @@ public: String default_image_dir; ///< Where to look for images to import String default_symbol_dir; ///< Where to look for .mse-symbol files String default_export_dir; ///< Where to export to by default + String default_import_dir; ///< Where to import to by default // --------------------------------------------------- : Set window bool set_window_maximized; diff --git a/src/gui/add_csv_window.cpp b/src/gui/add_csv_window.cpp index 284853e4..7e7fb486 100644 --- a/src/gui/add_csv_window.cpp +++ b/src/gui/add_csv_window.cpp @@ -66,9 +66,11 @@ void AddCSVWindow::onSeparatorTypeChange(wxCommandEvent&) { } void AddCSVWindow::onBrowseFiles(wxCommandEvent&) { - wxFileDialog* dlg = new wxFileDialog(this, _TITLE_("add card csv file"), settings.default_set_dir, _(""), _("CSV files|*.csv;*.tsv|All files (*.*)|*"), wxFD_OPEN); + wxFileDialog* dlg = new wxFileDialog(this, _TITLE_("add card csv file"), settings.default_import_dir, _(""), _("CSV files|*.csv;*.tsv|All files (*.*)|*"), wxFD_OPEN); if (dlg->ShowModal() == wxID_OK) { - file_path->SetValue(dlg->GetPath()); + const String& path = dlg->GetPath(); + file_path->SetValue(path); + settings.default_import_dir = wxPathOnly(path); } } diff --git a/src/gui/add_json_window.cpp b/src/gui/add_json_window.cpp index 3466f923..544542c2 100644 --- a/src/gui/add_json_window.cpp +++ b/src/gui/add_json_window.cpp @@ -89,9 +89,11 @@ void AddJSONWindow::onJSONTypeChange(wxCommandEvent&) { } void AddJSONWindow::onBrowseFiles(wxCommandEvent&) { - wxFileDialog* dlg = new wxFileDialog(this, _TITLE_("add card json file"), settings.default_set_dir, _(""), _("JSON files|*.json|All files (*.*)|*"), wxFD_OPEN); + wxFileDialog* dlg = new wxFileDialog(this, _TITLE_("add card json file"), settings.default_import_dir, _(""), _("JSON files|*.json|All files (*.*)|*"), wxFD_OPEN); if (dlg->ShowModal() == wxID_OK) { - file_path->SetValue(dlg->GetPath()); + const String& path = dlg->GetPath(); + file_path->SetValue(path); + settings.default_import_dir = wxPathOnly(path); } }