Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v1' into v1-into-v2-again
Browse files Browse the repository at this point in the history
  • Loading branch information
FabianLars committed Nov 23, 2023
2 parents 5106b9d + 8c9ff2a commit 058d5dd
Show file tree
Hide file tree
Showing 36 changed files with 1,050 additions and 328 deletions.
31 changes: 31 additions & 0 deletions .github/sponsors/crabnebula.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 10 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,19 @@
| [window-state](plugins/window-state) | Persist window sizes and positions. |||| ? | ? |

_This repo and all plugins require a Rust version of at least **1.70**_

## Partners

<table>
<tbody>
<tr>
<td align="center" valign="middle">
<a href="https://crabnebula.dev" target="_blank">
<img src=".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).
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@
"@rollup/plugin-node-resolve": "15.2.3",
"@rollup/plugin-terser": "0.4.4",
"@rollup/plugin-typescript": "11.1.5",
"@typescript-eslint/eslint-plugin": "6.9.1",
"@typescript-eslint/parser": "6.9.1",
"@typescript-eslint/eslint-plugin": "6.12.0",
"@typescript-eslint/parser": "6.12.0",
"covector": "^0.10.2",
"eslint": "8.53.0",
"eslint": "8.54.0",
"eslint-config-prettier": "9.0.0",
"eslint-config-standard-with-typescript": "39.1.1",
"eslint-config-standard-with-typescript": "40.0.0",
"eslint-plugin-import": "2.29.0",
"eslint-plugin-n": "16.2.0",
"eslint-plugin-n": "16.3.1",
"eslint-plugin-promise": "6.1.1",
"eslint-plugin-security": "1.7.1",
"prettier": "3.0.3",
"rollup": "4.3.0",
"typescript": "5.2.2"
"prettier": "3.1.0",
"rollup": "4.5.1",
"typescript": "5.3.2"
},
"resolutions": {
"semver": ">=7.5.2",
Expand Down
16 changes: 16 additions & 0 deletions plugins/authenticator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,22 @@ if (counter && counter > 0) {

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.
Expand Down
16 changes: 16 additions & 0 deletions plugins/autostart/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,22 @@ disable();

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.
Expand Down
18 changes: 17 additions & 1 deletion plugins/barcode-scanner/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![Barcode Scanner](banner.png)
![Barcode Scanner](https://github.com/tauri-apps/plugins-workspace/raw/v2/plugins/scanner/banner.png)

Allows your mobile application to use the camera to scan QR codes, EAN-13 and other kinds of barcodes.

Expand Down Expand Up @@ -91,6 +91,22 @@ PRs accepted. Please make sure to read the Contributing Guide before making a pu
</tbody>
</table>

## 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.
Expand Down
16 changes: 16 additions & 0 deletions plugins/cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,22 @@ if (matches.subcommand?.name === "run") {
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.
Expand Down
16 changes: 16 additions & 0 deletions plugins/clipboard-manager/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,22 @@ assert(await readText(), "Tauri is awesome!");

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.
Expand Down
18 changes: 17 additions & 1 deletion plugins/deep-link/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![plugin-deep-link](banner.png)
![plugin-deep-link](https://github.com/tauri-apps/plugins-workspace/raw/v2/plugins/deep-link/banner.png)

Set your Tauri application as the default handler for an URL.

Expand Down Expand Up @@ -155,6 +155,22 @@ PRs accepted. Please make sure to read the Contributing Guide before making a pu
</tbody>
</table>

## 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.
Expand Down
16 changes: 16 additions & 0 deletions plugins/dialog/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions plugins/dialog/src/commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions plugins/dialog/src/desktop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Loading

0 comments on commit 058d5dd

Please sign in to comment.