sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #428 from jpcima/file-dialog-initial-dir

Browse source 
Initialize the file chooser with the directory of the current file
This commit is contained in:
JP Cimalando 2020-09-20 22:02:17 +02:00 • committed by GitHub
commit 595b3fc6ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
editor/src/editor/Editor.cpp
View file

@ -11,6 +11,7 @@
#include "NativeHelpers.h" #include "NativeHelpers.h"
#include <absl/strings/string_view.h> #include <absl/strings/string_view.h>
#include <absl/strings/match.h> #include <absl/strings/match.h>
#include <ghc/fs_std.hpp>
#include <array> #include <array>
#include <cstdarg> #include <cstdarg>
#include <cstdio> #include <cstdio>
@ -30,6 +31,7 @@ struct Editor::Impl : EditorController::Receiver, IControlListener {
SharedPointer<CViewContainer> mainView_; SharedPointer<CViewContainer> mainView_;
std::string currentSfzFile_; std::string currentSfzFile_;
std::string currentScalaFile_;
enum { enum {
kPanelGeneral, kPanelGeneral,
@ -226,6 +228,7 @@ void Editor::Impl::uiReceiveValue(EditId id, const EditValue& v)
case EditId::ScalaFile: case EditId::ScalaFile:
{ {
const std::string& value = v.to_string(); const std::string& value = v.to_string();
currentScalaFile_ = value;
updateScalaFileLabel(value); updateScalaFileLabel(value);
} }
break; break;
@ -663,6 +666,10 @@ void Editor::Impl::chooseSfzFile()
fs->setTitle("Load SFZ file"); fs->setTitle("Load SFZ file");
fs->setDefaultExtension(CFileExtension("SFZ", "sfz")); fs->setDefaultExtension(CFileExtension("SFZ", "sfz"));
if (!currentSfzFile_.empty()) {
std::string initialDir = fs::path(currentSfzFile_).parent_path().u8string() + '/';
fs->setInitialDirectory(initialDir.c_str());
}
if (fs->runModal()) { if (fs->runModal()) {
UTF8StringPtr file = fs->getSelectedFile(0); UTF8StringPtr file = fs->getSelectedFile(0);
@ -684,6 +691,10 @@ void Editor::Impl::chooseScalaFile()
fs->setTitle("Load Scala file"); fs->setTitle("Load Scala file");
fs->setDefaultExtension(CFileExtension("SCL", "scl")); fs->setDefaultExtension(CFileExtension("SCL", "scl"));
if (!currentScalaFile_.empty()) {
std::string initialDir = fs::path(currentScalaFile_).parent_path().u8string() + '/';
fs->setInitialDirectory(initialDir.c_str());
}
if (fs->runModal()) { if (fs->runModal()) {
UTF8StringPtr file = fs->getSelectedFile(0); UTF8StringPtr file = fs->getSelectedFile(0);
@ -695,6 +706,7 @@ void Editor::Impl::chooseScalaFile()
void Editor::Impl::changeScalaFile(const std::string& filePath) void Editor::Impl::changeScalaFile(const std::string& filePath)
{ {
ctrl_->uiSendValue(EditId::ScalaFile, filePath); ctrl_->uiSendValue(EditId::ScalaFile, filePath);
currentScalaFile_ = filePath;
updateScalaFileLabel(filePath); updateScalaFileLabel(filePath);
} }