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

🍎 Add additional options for Mac's save dialog

Browse source 
Support additional attributes available in macOS's NSSavePanel: message,
nameFieldLabel and showsTagField
This commit is contained in:
Tan Wang Leng 2017-02-01 23:34:21 +08:00
parent 9163b601a4
commit 1d612a12a1
9 changed files with 72 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -58,6 +58,9 @@ bool ShowSaveDialog(atom::NativeWindow* parent_window,
const std::string& button_label,
const base::FilePath& default_path,
const Filters& filters,
const std::string& message,
const std::string& name_field_label,
const bool& shows_tag_field,
base::FilePath* path);
void ShowSaveDialog(atom::NativeWindow* parent_window,
@ -65,6 +68,9 @@ void ShowSaveDialog(atom::NativeWindow* parent_window,
const std::string& button_label,
const base::FilePath& default_path,
const Filters& filters,
const std::string& message,
const std::string& name_field_label,
const bool& shows_tag_field,
const SaveDialogCallback& callback);
} // namespace file_dialog

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

@ -275,6 +275,9 @@ bool ShowSaveDialog(atom::NativeWindow* parent_window,
const std::string& button_label,
const base::FilePath& default_path,
const Filters& filters,
const std::string& message,
const std::string& name_field_label,
const bool& shows_tag_field,
base::FilePath* path) {
FileChooserDialog save_dialog(GTK_FILE_CHOOSER_ACTION_SAVE, parent_window,
title, button_label, default_path, filters);

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

@ -47,13 +47,24 @@ void SetupDialog(NSSavePanel* dialog,
const std::string& title,
const std::string& button_label,
const base::FilePath& default_path,
const Filters& filters) {
const Filters& filters,
const std::string& message,
const std::string& name_field_label,
const bool& shows_tag_field) {
if (!title.empty())
[dialog setTitle:base::SysUTF8ToNSString(title)];
if (!button_label.empty())
[dialog setPrompt:base::SysUTF8ToNSString(button_label)];
if (!message.empty())
[dialog setMessage:base::SysUTF8ToNSString(message)];
if (!name_field_label.empty())
[dialog setNameFieldLabel:base::SysUTF8ToNSString(name_field_label)];
[dialog setShowsTagField:shows_tag_field];
NSString* default_dir = nil;
NSString* default_filename = nil;
if (!default_path.empty()) {
@ -127,7 +138,8 @@ bool ShowOpenDialog(atom::NativeWindow* parent_window,
DCHECK(paths);
NSOpenPanel* dialog = [NSOpenPanel openPanel];
SetupDialog(dialog, title, button_label, default_path, filters);
// TODO yamgent: Fix this
SetupDialog(dialog, title, button_label, default_path, filters, "", "", false);
SetupDialogForProperties(dialog, properties);
int chosen = RunModalDialog(dialog, parent_window);
@ -147,7 +159,8 @@ void ShowOpenDialog(atom::NativeWindow* parent_window,
const OpenDialogCallback& c) {
NSOpenPanel* dialog = [NSOpenPanel openPanel];
SetupDialog(dialog, title, button_label, default_path, filters);
// TODO yamgent: Fix this
SetupDialog(dialog, title, button_label, default_path, filters, "", "", false);
SetupDialogForProperties(dialog, properties);
// Duplicate the callback object here since c is a reference and gcd would
@ -172,11 +185,15 @@ bool ShowSaveDialog(atom::NativeWindow* parent_window,
const std::string& button_label,
const base::FilePath& default_path,
const Filters& filters,
const std::string& message,
const std::string& name_field_label,
const bool& shows_tag_field,
base::FilePath* path) {
DCHECK(path);
NSSavePanel* dialog = [NSSavePanel savePanel];
SetupDialog(dialog, title, button_label, default_path, filters);
SetupDialog(dialog, title, button_label, default_path, filters, message,
name_field_label, shows_tag_field);
int chosen = RunModalDialog(dialog, parent_window);
if (chosen == NSFileHandlingPanelCancelButton || ![[dialog URL] isFileURL])
@ -191,10 +208,14 @@ void ShowSaveDialog(atom::NativeWindow* parent_window,
const std::string& button_label,
const base::FilePath& default_path,
const Filters& filters,
const std::string& message,
const std::string& name_field_label,
const bool& shows_tag_field,
const SaveDialogCallback& c) {
NSSavePanel* dialog = [NSSavePanel savePanel];
SetupDialog(dialog, title, button_label, default_path, filters);
SetupDialog(dialog, title, button_label, default_path, filters, message,
name_field_label, shows_tag_field);
[dialog setCanSelectHiddenExtension:YES];
__block SaveDialogCallback callback = c;

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

@ -268,6 +268,9 @@ bool ShowSaveDialog(atom::NativeWindow* parent_window,
const std::string& button_label,
const base::FilePath& default_path,
const Filters& filters,
const std::string& message,
const std::string& name_field_label,
const bool& shows_tag_field,
base::FilePath* path) {
FileDialog<CShellFileSaveDialog> save_dialog(
default_path, title, button_label, filters,
@ -289,6 +292,9 @@ void ShowSaveDialog(atom::NativeWindow* parent,
const std::string& button_label,
const base::FilePath& default_path,
const Filters& filters,
const std::string& message,
const std::string& name_field_label,
const bool& shows_tag_field,
const SaveDialogCallback& callback) {
RunState run_state;
if (!CreateDialogThread(&run_state)) {