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

💄 Pick duplicate code together.

Browse source
This commit is contained in:
Cheng Zhao 2013-09-23 19:42:07 +08:00
parent 43b492c641
commit e824b6c910
1 changed files with 22 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

54
browser/ui/file_dialog_mac.mm
View file

@ -38,6 +38,7 @@ void SetupDialog(NSSavePanel* dialog,
if (default_filename) if (default_filename)
[dialog setNameFieldStringValue:default_filename]; [dialog setNameFieldStringValue:default_filename];
[dialog setCanSelectHiddenExtension:YES];
[dialog setAllowsOtherFileTypes:YES]; [dialog setAllowsOtherFileTypes:YES];
} }
@ -51,6 +52,25 @@ void SetupDialogForProperties(NSOpenPanel* dialog, int properties) {
[dialog setAllowsMultipleSelection:YES]; [dialog setAllowsMultipleSelection:YES];
} }
// Run modal dialog with parent window and return user's choice.
int RunModalDialog(NSSavePanel* dialog, atom::NativeWindow* parent_window) {
__block int chosen = NSFileHandlingPanelCancelButton;
if (parent_window == NULL) {
chosen = [dialog runModal];
} else {
NSWindow* window = parent_window->GetNativeWindow();
[dialog beginSheetModalForWindow:window
completionHandler:^(NSInteger c) {
chosen = c;
[NSApp stopModal];
}];
[NSApp runModalForWindow:window];
}
return chosen;
}
void ReadDialogPaths(NSOpenPanel* dialog, std::vector<base::FilePath>* paths) { void ReadDialogPaths(NSOpenPanel* dialog, std::vector<base::FilePath>* paths) {
NSArray* urls = [dialog URLs]; NSArray* urls = [dialog URLs];
for (NSURL* url in urls) for (NSURL* url in urls)
@ -71,21 +91,7 @@ bool ShowOpenDialog(atom::NativeWindow* parent_window,
SetupDialog(dialog, title, default_path); SetupDialog(dialog, title, default_path);
SetupDialogForProperties(dialog, properties); SetupDialogForProperties(dialog, properties);
__block int chosen = -1; int chosen = RunModalDialog(dialog, parent_window);
if (parent_window == NULL) {
chosen = [dialog runModal];
} else {
NSWindow* window = parent_window->GetNativeWindow();
[dialog beginSheetModalForWindow:window
completionHandler:^(NSInteger c) {
chosen = c;
[NSApp stopModal];
}];
[NSApp runModalForWindow:window];
}
if (chosen == NSFileHandlingPanelCancelButton) if (chosen == NSFileHandlingPanelCancelButton)
return false; return false;
@ -129,23 +135,7 @@ bool ShowSaveDialog(atom::NativeWindow* parent_window,
SetupDialog(dialog, title, default_path); SetupDialog(dialog, title, default_path);
[dialog setCanSelectHiddenExtension:YES]; int chosen = RunModalDialog(dialog, parent_window);
__block int chosen = -1;
if (parent_window == NULL) {
chosen = [dialog runModal];
} else {
NSWindow* window = parent_window->GetNativeWindow();
[dialog beginSheetModalForWindow:window
completionHandler:^(NSInteger c) {
chosen = c;
[NSApp stopModal];
}];
[NSApp runModalForWindow:window];
}
if (chosen == NSFileHandlingPanelCancelButton || ![[dialog URL] isFileURL]) if (chosen == NSFileHandlingPanelCancelButton || ![[dialog URL] isFileURL])
return false; return false;