Fix building on Windows
authorCheng Zhao <zcbenz@gmail.com>
Mon, 16 May 2016 01:09:41 +0000 (10:09 +0900)
committerCheng Zhao <zcbenz@gmail.com>
Mon, 16 May 2016 01:09:41 +0000 (10:09 +0900)
atom/browser/ui/file_dialog_win.cc
docs/api/dialog.md

index e99dcee35c50bb41dd59496fabb399fd782262dc..af699a103937496e436211fca477ea4918e5863f 100644 (file)
@@ -203,7 +203,7 @@ bool ShowOpenDialog(atom::NativeWindow* parent_window,
     options |= FOS_ALLOWMULTISELECT;
 
   FileDialog<CShellFileOpenDialog> open_dialog(
-      default_path, title, filters, options);
+      default_path, title, button_label, filters, options);
   if (!open_dialog.Show(parent_window))
     return false;
 
@@ -253,7 +253,7 @@ void ShowOpenDialog(atom::NativeWindow* parent,
   run_state.dialog_thread->message_loop()->PostTask(
       FROM_HERE,
       base::Bind(&RunOpenDialogInNewThread, run_state, parent, title,
-                 default_path, filters, properties, callback));
+                 button_label, default_path, filters, properties, callback));
 }
 
 bool ShowSaveDialog(atom::NativeWindow* parent_window,
@@ -263,7 +263,7 @@ bool ShowSaveDialog(atom::NativeWindow* parent_window,
                     const Filters& filters,
                     base::FilePath* path) {
   FileDialog<CShellFileSaveDialog> save_dialog(
-      default_path, title, filters,
+      default_path, title, button_label, filters,
       FOS_FORCEFILESYSTEM | FOS_PATHMUSTEXIST | FOS_OVERWRITEPROMPT);
   if (!save_dialog.Show(parent_window))
     return false;
@@ -292,7 +292,7 @@ void ShowSaveDialog(atom::NativeWindow* parent,
   run_state.dialog_thread->message_loop()->PostTask(
       FROM_HERE,
       base::Bind(&RunSaveDialogInNewThread, run_state, parent, title,
-                 default_path, filters, callback));
+                 button_label, default_path, filters, callback));
 }
 
 }  // namespace file_dialog
index bb76056d1372ef41b46c08c0167c6ccaaf687c7f..3681a66d7bf6ceb5a32e2bf53fda4ba0b252d932 100644 (file)
@@ -28,7 +28,8 @@ The `dialog` module has the following methods:
 * `options` Object
   * `title` String
   * `defaultPath` String
-  * `buttonLabel` String
+  * `buttonLabel` String - Custom label for the confirmation button, when
+    left empty the default label will be used.
   * `filters` Array
   * `properties` Array - Contains which features the dialog should use, can
     contain `openFile`, `openDirectory`, `multiSelections` and
@@ -70,6 +71,8 @@ shown.
 * `options` Object
   * `title` String
   * `defaultPath` String
+  * `buttonLabel` String - Custom label for the confirmation button, when
+    left empty the default label will be used.
   * `filters` Array
 * `callback` Function (optional)