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

Add extension to filename automatically for GTK+ save dialog

Browse source
This commit is contained in:
Cheng Zhao 2016-03-14 16:28:01 +09:00
parent 152e6af4b4
commit 81a16b424f
1 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,7 +39,8 @@ class FileChooserDialog {
const std::string& title, const std::string& title,
const base::FilePath& default_path, const base::FilePath& default_path,
const Filters& filters) const Filters& filters)
: dialog_scope_(parent_window) { : dialog_scope_(parent_window),
filters_(filters) {
const char* confirm_text = GTK_STOCK_OK; const char* confirm_text = GTK_STOCK_OK;
if (action == GTK_FILE_CHOOSER_ACTION_SAVE) if (action == GTK_FILE_CHOOSER_ACTION_SAVE)
confirm_text = GTK_STOCK_SAVE; confirm_text = GTK_STOCK_SAVE;
@ -111,7 +112,7 @@ class FileChooserDialog {
base::FilePath GetFileName() const { base::FilePath GetFileName() const {
gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog_)); gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog_));
base::FilePath path(filename); base::FilePath path = AddExtensionForFilename(filename);
g_free(filename); g_free(filename);
return path; return path;
} }
@ -121,7 +122,8 @@ class FileChooserDialog {
GSList* filenames = gtk_file_chooser_get_filenames( GSList* filenames = gtk_file_chooser_get_filenames(
GTK_FILE_CHOOSER(dialog_)); GTK_FILE_CHOOSER(dialog_));
for (GSList* iter = filenames; iter != NULL; iter = g_slist_next(iter)) { for (GSList* iter = filenames; iter != NULL; iter = g_slist_next(iter)) {
base::FilePath path(static_cast<char*>(iter->data)); base::FilePath path = AddExtensionForFilename(
static_cast<char*>(iter->data));
g_free(iter->data); g_free(iter->data);
paths.push_back(path); paths.push_back(path);
} }
@ -135,11 +137,13 @@ class FileChooserDialog {
private: private:
void AddFilters(const Filters& filters); void AddFilters(const Filters& filters);
base::FilePath AddExtensionForFilename(const gchar* filename) const;
atom::NativeWindow::DialogScope dialog_scope_; atom::NativeWindow::DialogScope dialog_scope_;
GtkWidget* dialog_; GtkWidget* dialog_;
Filters filters_;
SaveDialogCallback save_callback_; SaveDialogCallback save_callback_;
OpenDialogCallback open_callback_; OpenDialogCallback open_callback_;
@ -184,6 +188,30 @@ void FileChooserDialog::AddFilters(const Filters& filters) {
} }
} }
base::FilePath FileChooserDialog::AddExtensionForFilename(
const gchar* filename) const {
base::FilePath path(filename);
GtkFileFilter* selected_filter =
gtk_file_chooser_get_filter(GTK_FILE_CHOOSER(dialog_));
if (!selected_filter)
return path;
GSList* filters = gtk_file_chooser_list_filters(GTK_FILE_CHOOSER(dialog_));
int i = g_slist_index(filters, selected_filter);
g_slist_free(filters);
if (i >= filters_.size())
return path;
const auto& extensions = filters_[i].second;
for (const auto& extension : extensions) {
if (extension == "*" || path.MatchesExtension("." + extension))
return path;
}
return path.AddExtension(extensions[0]);
}
} // namespace } // namespace
bool ShowOpenDialog(atom::NativeWindow* parent_window, bool ShowOpenDialog(atom::NativeWindow* parent_window,