mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #9588 from electron/poiru/dialog-default-file-name

Browse source 
Use last selected directory when using default file name in dialog.showSaveDialog()
This commit is contained in:
Kevin Sawicki 2017-06-14 14:41:45 -07:00 • committed by GitHub
commit dae27de504
4 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/ui/file_dialog_gtk.cc
View file

@ -72,8 +72,12 @@ class FileChooserDialog {
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog_), gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog_),
settings.default_path.value().c_str()); settings.default_path.value().c_str());
} else { } else {
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog_), if (settings.default_path.IsAbsolute()) {
settings.default_path.DirName().value().c_str()); gtk_file_chooser_set_current_folder(
GTK_FILE_CHOOSER(dialog_),
settings.default_path.DirName().value().c_str());
}
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog_), gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog_),
settings.default_path.BaseName().value().c_str()); settings.default_path.BaseName().value().c_str());
} }

7
atom/browser/ui/file_dialog_mac.mm
View file

@ -65,8 +65,11 @@ void SetupDialog(NSSavePanel* dialog,
if (base::DirectoryExists(settings.default_path)) { if (base::DirectoryExists(settings.default_path)) {
default_dir = base::SysUTF8ToNSString(settings.default_path.value()); default_dir = base::SysUTF8ToNSString(settings.default_path.value());
} else { } else {
default_dir = if (settings.default_path.IsAbsolute()) {
base::SysUTF8ToNSString(settings.default_path.DirName().value()); default_dir =
base::SysUTF8ToNSString(settings.default_path.DirName().value());
}
default_filename = default_filename =
base::SysUTF8ToNSString(settings.default_path.BaseName().value()); base::SysUTF8ToNSString(settings.default_path.BaseName().value());
} }

4
atom/browser/ui/file_dialog_win.cc
View file

@ -105,7 +105,9 @@ class FileDialog {
} }
} }
SetDefaultFolder(settings.default_path); if (settings.default_path.IsAbsolute()) {
SetDefaultFolder(settings.default_path);
}
} }
bool Show(atom::NativeWindow* parent_window) { bool Show(atom::NativeWindow* parent_window) {

3
docs/api/dialog.md
View file

@ -87,7 +87,8 @@ shown.
* `browserWindow` BrowserWindow (optional) * `browserWindow` BrowserWindow (optional)
* `options` Object * `options` Object
* `title` String (optional) * `title` String (optional)
* `defaultPath` String (optional) * `defaultPath` String (optional) - Absolute directory path, absolute file
path, or file name to use by default.
* `buttonLabel` String (optional) - Custom label for the confirmation button, when * `buttonLabel` String (optional) - Custom label for the confirmation button, when
left empty the default label will be used. left empty the default label will be used.
* `filters` [FileFilter[]](structures/file-filter.md) (optional) * `filters` [FileFilter[]](structures/file-filter.md) (optional)