Merge pull request #496 from MarcelGerber/linux-open-dialog

Support initialDirectory and title in Linux' showOpenDialog
adobe · Jan 8, 2015 · 89977a9 · 89977a9
2 parents d9b1cae + 2dc15d8
commit 89977a9
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/appshell/appshell_extensions_gtk.cpp b/appshell/appshell_extensions_gtk.cpp
@@ -164,15 +164,20 @@ int32 ShowOpenDialog(bool allowMultipleSelection,
                      CefRefPtr<CefListValue>& selectedFiles)
 {
     GtkWidget *dialog;
-    const char* dialog_title = chooseDirectory ? "Open Directory" : "Open File";
     GtkFileChooserAction file_or_directory = chooseDirectory ? GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER : GTK_FILE_CHOOSER_ACTION_OPEN ;
-    dialog = gtk_file_chooser_dialog_new (dialog_title,
+    dialog = gtk_file_chooser_dialog_new (title.c_str(),
                   NULL,
                   file_or_directory,
                   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                   GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
                   NULL);
 
+    if (!initialDirectory.empty())
+    {
+        ExtensionString folderURI = std::string("file:///") + initialDirectory;
+        gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog), folderURI.c_str());
+    }
+
     if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
     {
         char *filename;