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

🍎 Add additional options for Mac's open dialog

Browse source 
Support an additional attributes available in macOS's NSOpenPanel:
message.
This commit is contained in:
Tan Wang Leng 2017-02-02 00:01:01 +08:00
parent cc22149beb
commit 36209ddd90
8 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/api/atom_api_dialog.cc
View file

@ -71,6 +71,7 @@ void ShowOpenDialog(const std::string& title,
const base::FilePath& default_path,
const file_dialog::Filters& filters,
int properties,
const std::string& message,
atom::NativeWindow* window,
mate::Arguments* args) {
v8::Local<v8::Value> peek = args->PeekNext();
@ -79,11 +80,11 @@ void ShowOpenDialog(const std::string& title,
peek,
&callback)) {
file_dialog::ShowOpenDialog(window, title, button_label, default_path,
filters, properties, callback);
filters, properties, message, callback);
} else {
std::vector<base::FilePath> paths;
if (file_dialog::ShowOpenDialog(window, title, button_label, default_path,
filters, properties, &paths))
filters, properties, message, &paths))
args->Return(paths);
}
}

2
atom/browser/common_web_contents_delegate.cc
View file

@ -363,7 +363,7 @@ void CommonWebContentsDelegate::DevToolsAddFileSystem(
std::vector<base::FilePath> paths;
int flag = file_dialog::FILE_DIALOG_OPEN_DIRECTORY;
if (!file_dialog::ShowOpenDialog(owner_window(), "", "", default_path,
filters, flag, &paths))
filters, flag, "", &paths))
return;
path = paths[0];

2
atom/browser/ui/file_dialog.h
View file

@ -43,6 +43,7 @@ bool ShowOpenDialog(atom::NativeWindow* parent_window,
const base::FilePath& default_path,
const Filters& filters,
int properties,
const std::string& message,
std::vector<base::FilePath>* paths);
void ShowOpenDialog(atom::NativeWindow* parent_window,
@ -51,6 +52,7 @@ void ShowOpenDialog(atom::NativeWindow* parent_window,
const base::FilePath& default_path,
const Filters& filters,
int properties,
const std::string& message,
const OpenDialogCallback& callback);
bool ShowSaveDialog(atom::NativeWindow* parent_window,

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

@ -236,6 +236,7 @@ bool ShowOpenDialog(atom::NativeWindow* parent_window,
const base::FilePath& default_path,
const Filters& filters,
int properties,
const std::string& message,
std::vector<base::FilePath>* paths) {
GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_OPEN;
if (properties & FILE_DIALOG_OPEN_DIRECTORY)
@ -260,6 +261,7 @@ void ShowOpenDialog(atom::NativeWindow* parent_window,
const base::FilePath& default_path,
const Filters& filters,
int properties,
const std::string& message,
const OpenDialogCallback& callback) {
GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_OPEN;
if (properties & FILE_DIALOG_OPEN_DIRECTORY)

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

@ -134,12 +134,14 @@ bool ShowOpenDialog(atom::NativeWindow* parent_window,
const base::FilePath& default_path,
const Filters& filters,
int properties,
const std::string& message,
std::vector<base::FilePath>* paths) {
DCHECK(paths);
NSOpenPanel* dialog = [NSOpenPanel openPanel];
// TODO yamgent: Fix this
SetupDialog(dialog, title, button_label, default_path, filters, "", "", false);
SetupDialog(dialog, title, button_label, default_path, filters, message,
// NSOpenPanel does not support name_field_label and shows_tag_field
"", false);
SetupDialogForProperties(dialog, properties);
int chosen = RunModalDialog(dialog, parent_window);
@ -156,11 +158,13 @@ void ShowOpenDialog(atom::NativeWindow* parent_window,
const base::FilePath& default_path,
const Filters& filters,
int properties,
const std::string& message,
const OpenDialogCallback& c) {
NSOpenPanel* dialog = [NSOpenPanel openPanel];
// TODO yamgent: Fix this
SetupDialog(dialog, title, button_label, default_path, filters, "", "", false);
SetupDialog(dialog, title, button_label, default_path, filters, message,
// NSOpenPanel does not support name_field_label and shows_tag_field
"", false);
SetupDialogForProperties(dialog, properties);
// Duplicate the callback object here since c is a reference and gcd would

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

@ -198,6 +198,7 @@ bool ShowOpenDialog(atom::NativeWindow* parent_window,
const base::FilePath& default_path,
const Filters& filters,
int properties,
const std::string& message,
std::vector<base::FilePath>* paths) {
int options = FOS_FORCEFILESYSTEM | FOS_FILEMUSTEXIST;
if (properties & FILE_DIALOG_OPEN_DIRECTORY)
@ -250,6 +251,7 @@ void ShowOpenDialog(atom::NativeWindow* parent,
const base::FilePath& default_path,
const Filters& filters,
int properties,
const std::string& message,
const OpenDialogCallback& callback) {
RunState run_state;
if (!CreateDialogThread(&run_state)) {

1
atom/browser/web_dialog_helper.cc
View file

@ -125,6 +125,7 @@ void WebDialogHelper::RunFileChooser(
default_file_path,
filters,
flags,
"",
&paths)) {
for (auto& path : paths) {
content::FileChooserFileInfo info;

12
lib/browser/api/dialog.js
View file

@ -81,7 +81,8 @@ module.exports = {
}
}
let {buttonLabel, defaultPath, filters, properties, title} = options
let {buttonLabel, defaultPath, filters, properties, title,
message} = options
if (properties == null) {
properties = ['openFile']
@ -118,11 +119,18 @@ module.exports = {
filters = []
}
if (message == null) {
message = ''
} else if (typeof message !== 'string') {
throw new TypeError('Message must be a string')
}
const wrappedCallback = typeof callback === 'function' ? function (success, result) {
return callback(success ? result : void 0)
} : null
return binding.showOpenDialog(title, buttonLabel, defaultPath, filters,
dialogProperties, window, wrappedCallback)
dialogProperties, message, window,
wrappedCallback)
},
showSaveDialog: function (...args) {