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

win: Append extension to save dialog's result according to the selected filter.

Browse source
This commit is contained in:
Cheng Zhao 2013-09-18 22:09:07 +08:00
parent 6cb2ece285
commit 575fe06f29
1 changed files with 33 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
browser/ui/file_dialog_win.cc
View file

@ -64,17 +64,17 @@ static bool GetRegistryDescriptionFromExtension(const std::wstring& file_ext,
// from the registry. If the file extension does not exist in the registry, it // from the registry. If the file extension does not exist in the registry, it
// will be omitted from the filter, as it is likely a bogus extension. // will be omitted from the filter, as it is likely a bogus extension.
void FormatFilterForExtensions( void FormatFilterForExtensions(
const std::vector<std::wstring>& file_ext, std::vector<std::wstring>* file_ext,
bool include_all_files,
std::vector<std::wstring>* ext_desc, std::vector<std::wstring>* ext_desc,
bool include_all_files,
std::vector<COMDLG_FILTERSPEC>* file_types) { std::vector<COMDLG_FILTERSPEC>* file_types) {
DCHECK(file_ext.size() >= ext_desc->size()); DCHECK(file_ext->size() >= ext_desc->size());
if (file_ext.empty()) if (file_ext->empty())
include_all_files = true; include_all_files = true;
for (size_t i = 0; i < file_ext.size(); ++i) { for (size_t i = 0; i < file_ext->size(); ++i) {
std::wstring ext = file_ext[i]; std::wstring ext = (*file_ext)[i];
std::wstring desc; std::wstring desc;
if (i < ext_desc->size()) if (i < ext_desc->size())
desc = (*ext_desc)[i]; desc = (*ext_desc)[i];
@ -113,13 +113,19 @@ void FormatFilterForExtensions(
ext_desc->push_back(desc); ext_desc->push_back(desc);
} }
COMDLG_FILTERSPEC spec = { (*ext_desc)[i].c_str(), file_ext[i].c_str() }; COMDLG_FILTERSPEC spec = { (*ext_desc)[i].c_str(), (*file_ext)[i].c_str() };
file_types->push_back(spec); file_types->push_back(spec);
} }
if (include_all_files) { if (include_all_files) {
// TODO(zcbenz): Should be localized. // TODO(zcbenz): Should be localized.
COMDLG_FILTERSPEC spec = { L"All Files (*.*)", L"*.*" }; ext_desc->push_back(L"All Files (*.*)");
file_ext->push_back(L"*.*");
COMDLG_FILTERSPEC spec = {
(*ext_desc)[ext_desc->size() - 1].c_str(),
(*file_ext)[file_ext->size() - 1].c_str(),
};
file_types->push_back(spec); file_types->push_back(spec);
} }
} }
@ -136,7 +142,7 @@ class FileDialog {
: file_ext_(file_ext), : file_ext_(file_ext),
desc_ext_(desc_ext) { desc_ext_(desc_ext) {
std::vector<COMDLG_FILTERSPEC> filters; std::vector<COMDLG_FILTERSPEC> filters;
FormatFilterForExtensions(file_ext_, true, &desc_ext_, &filters); FormatFilterForExtensions(&file_ext_, &desc_ext_, true, &filters);
std::wstring file_part; std::wstring file_part;
if (!IsDirectory(default_path)) if (!IsDirectory(default_path))
@ -163,6 +169,8 @@ class FileDialog {
IFileDialog* GetPtr() const { return dialog_->GetPtr(); } IFileDialog* GetPtr() const { return dialog_->GetPtr(); }
const std::vector<std::wstring> file_ext() const { return file_ext_; }
private: private:
// Set up the initial directory for the dialog. // Set up the initial directory for the dialog.
void SetDefaultFolder(const base::FilePath file_path) { void SetDefaultFolder(const base::FilePath file_path) {
@ -219,6 +227,22 @@ bool ShowSaveDialog(atom::NativeWindow* window,
if (FAILED(hr)) if (FAILED(hr))
return false; return false;
// Append extension according to selected filter.
UINT filter_index = 1;
save_dialog.GetPtr()->GetFileTypeIndex(&filter_index);
std::wstring selected_filter = save_dialog.file_ext()[filter_index - 1];
if (selected_filter != L"*.*") {
std::wstring result = file_name;
std::wstring extension = selected_filter.substr(2);
if (!EndsWith(result, extension, false)) {
if (result[result.length() - 1] != L'.')
result.push_back(L'.');
result.append(extension);
*path = base::FilePath(result);
return true;
}
}
*path = base::FilePath(file_name); *path = base::FilePath(file_name);
return true; return true;
} }