Merge remote-tracking branch 'origin/v1' into v1-into-v2-again

This commit is contained in:
FabianLars
2023-11-23 17:50:47 +01:00
36 changed files with 1050 additions and 328 deletions
+16
View File
@@ -67,6 +67,22 @@ Afterwards all the plugin's APIs are available through the JavaScript guest bind
PRs accepted. Please make sure to read the Contributing Guide before making a pull request.
## Partners
<table>
<tbody>
<tr>
<td align="center" valign="middle">
<a href="https://crabnebula.dev" target="_blank">
<img src="https://github.com/tauri-apps/plugins-workspace/raw/v2/.github/sponsors/crabnebula.svg" alt="CrabNebula" width="283">
</a>
</td>
</tr>
</tbody>
</table>
For the complete list of sponsors please visit our [website](https://tauri.app#sponsors) and [Open Collective](https://opencollective.com/tauri).
## License
Code: (c) 2015 - Present - The Tauri Programme within The Commons Conservancy.
+2 -2
View File
@@ -98,7 +98,7 @@ pub(crate) async fn open<R: Runtime>(
dialog_builder = dialog_builder.set_parent(&window);
}
if let Some(title) = options.title {
dialog_builder = dialog_builder.set_title(&title);
dialog_builder = dialog_builder.set_title(title);
}
if let Some(default_path) = options.default_path {
dialog_builder = set_default_path(dialog_builder, default_path);
@@ -178,7 +178,7 @@ pub(crate) async fn save<R: Runtime>(
dialog_builder = dialog_builder.set_parent(&window);
}
if let Some(title) = options.title {
dialog_builder = dialog_builder.set_title(&title);
dialog_builder = dialog_builder.set_title(title);
}
if let Some(default_path) = options.default_path {
dialog_builder = set_default_path(dialog_builder, default_path);
+2 -2
View File
@@ -126,13 +126,13 @@ impl<R: Runtime> From<FileDialogBuilder<R>> for FileDialog {
let mut builder = FileDialog::new();
if let Some(title) = d.title {
builder = builder.set_title(&title);
builder = builder.set_title(title);
}
if let Some(starting_directory) = d.starting_directory {
builder = builder.set_directory(starting_directory);
}
if let Some(file_name) = d.file_name {
builder = builder.set_file_name(&file_name);
builder = builder.set_file_name(file_name);
}
for filter in d.filters {
let v: Vec<&str> = filter.extensions.iter().map(|x| &**x).collect();