Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Electron16かつLinuxだとshowOpenDialogSync、showSaveDialogSyncが動作しないので非同期版に置き換え #512

Merged
merged 108 commits into from Nov 26, 2021
Merged
Changes from all commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
baba0c7
add detectNvidia function
madosuki Aug 6, 2021
7a67678
merge
madosuki Aug 8, 2021
fd38506
Merge branch 'Hiroshiba-main'
madosuki Aug 8, 2021
057293d
follow to menu bar
madosuki Aug 8, 2021
f6e7867
remove no longer a variable
madosuki Aug 8, 2021
1e39494
run fmt
madosuki Aug 8, 2021
d687501
fix typo
madosuki Aug 8, 2021
ffaa9ef
Merge branch 'Hiroshiba:main' into main
madosuki Aug 8, 2021
6e16f77
Merge branch 'Hiroshiba:main' into main
madosuki Aug 9, 2021
d674253
remove utils.ts and some changes in background.ts
madosuki Aug 10, 2021
c2aeb68
change message box type and detail, and change behaviour of setOnLaun…
madosuki Aug 10, 2021
308f996
Merge branch 'Hiroshiba:main' into main
madosuki Aug 10, 2021
60383f3
recreate package-lock.json using node 12.18.2
madosuki Aug 10, 2021
9fe7c67
solve conflict
madosuki Aug 10, 2021
0af16ac
re recreate package-lock.json using node 12.18.2 and npm 7.20.5
madosuki Aug 10, 2021
0db9f8e
recreate package-lock.json using node 12.18.2 and npm 6.14.5
madosuki Aug 10, 2021
16cc4be
recreate package-lock.json using node 12.18.2 and npm 7.20.3
madosuki Aug 11, 2021
39b18b1
manual merge
madosuki Aug 13, 2021
494efbe
Merge branch 'Hiroshiba-main'
madosuki Aug 13, 2021
1613b3f
Merge branch 'Hiroshiba:main' into main
madosuki Aug 16, 2021
c1bf8bd
Merge branch 'Hiroshiba:main' into main
madosuki Aug 16, 2021
d94cc77
Merge branch 'Hiroshiba:main' into main
madosuki Aug 16, 2021
23b8539
Merge branch 'Hiroshiba:main' into main
madosuki Aug 17, 2021
13b74b6
fix conflict
madosuki Aug 17, 2021
fa7a2dd
Merge branch 'Hiroshiba:main' into main
madosuki Aug 17, 2021
d2a65c8
Merge branch 'Hiroshiba:main' into main
madosuki Aug 19, 2021
5ce3a56
Merge branch 'Hiroshiba:main' into main
madosuki Aug 20, 2021
4626d72
Merge branch 'Hiroshiba:main' into main
madosuki Aug 22, 2021
85b9332
Merge branch 'Hiroshiba:main' into main
madosuki Aug 23, 2021
ef2c6e5
Merge branch 'Hiroshiba:main' into main
madosuki Aug 23, 2021
82712d9
Merge branch 'Hiroshiba:main' into main
madosuki Aug 25, 2021
04e2dbe
Merge branch 'Hiroshiba:main' into main
madosuki Aug 26, 2021
4e44de5
Merge branch 'Hiroshiba:main' into main
madosuki Aug 27, 2021
891cc1a
Merge branch 'Hiroshiba:main' into main
madosuki Aug 28, 2021
5962f50
Merge branch 'Hiroshiba:main' into main
madosuki Aug 29, 2021
b7f2a05
Merge branch 'Hiroshiba:main' into main
madosuki Aug 30, 2021
9d085aa
Merge branch 'Hiroshiba:main' into main
madosuki Aug 31, 2021
f4f7e79
Merge branch 'Hiroshiba:main' into main
madosuki Sep 1, 2021
c86ebf0
Merge branch 'Hiroshiba:main' into main
madosuki Sep 2, 2021
53f7418
Merge branch 'Hiroshiba:main' into main
madosuki Sep 3, 2021
28997ab
Merge branch 'Hiroshiba:main' into main
madosuki Sep 5, 2021
f2e0126
Merge branch 'Hiroshiba:main' into main
madosuki Sep 5, 2021
6425339
Merge branch 'Hiroshiba:main' into main
madosuki Sep 8, 2021
9c358fd
Merge branch 'Hiroshiba:main' into main
madosuki Sep 9, 2021
69cca92
Merge branch 'Hiroshiba:main' into main
madosuki Sep 10, 2021
9ba5f69
Merge branch 'Hiroshiba:main' into main
madosuki Sep 14, 2021
c0929b1
Merge branch 'Hiroshiba:main' into main
madosuki Sep 15, 2021
30499ca
Merge branch 'Hiroshiba:main' into main
madosuki Sep 17, 2021
60094ea
Merge branch 'Hiroshiba:main' into main
madosuki Sep 18, 2021
52a9f1e
Merge branch 'Hiroshiba:main' into main
madosuki Sep 19, 2021
29419f2
Merge branch 'Hiroshiba:main' into main
madosuki Sep 20, 2021
7cb8643
Merge branch 'Hiroshiba:main' into main
madosuki Sep 21, 2021
ab81765
Merge branch 'Hiroshiba:main' into main
madosuki Sep 21, 2021
91b1b27
Merge branch 'Hiroshiba:main' into main
madosuki Sep 22, 2021
04e76e8
Merge branch 'Hiroshiba:main' into main
madosuki Sep 23, 2021
0541f21
Merge branch 'Hiroshiba:main' into main
madosuki Sep 24, 2021
880266f
Merge branch 'Hiroshiba:main' into main
madosuki Sep 25, 2021
6fc7e68
Merge branch 'Hiroshiba:main' into main
madosuki Sep 25, 2021
a93c89c
Merge branch 'Hiroshiba:main' into main
madosuki Sep 27, 2021
3c59e58
Merge branch 'Hiroshiba:main' into main
madosuki Sep 28, 2021
f9c823d
Merge branch 'Hiroshiba:main' into main
madosuki Sep 29, 2021
8ccf5d1
Merge branch 'Hiroshiba:main' into main
madosuki Sep 29, 2021
2339880
Merge branch 'Hiroshiba:main' into main
madosuki Sep 29, 2021
40c7180
Merge branch 'Hiroshiba:main' into main
madosuki Sep 30, 2021
5d3b54d
Merge branch 'Hiroshiba:main' into main
madosuki Sep 30, 2021
b848dd1
Merge branch 'Hiroshiba:main' into main
madosuki Oct 1, 2021
a5f5248
Merge branch 'Hiroshiba:main' into main
madosuki Oct 2, 2021
ae88964
Merge branch 'Hiroshiba:main' into main
madosuki Oct 3, 2021
ef10c56
Merge branch 'Hiroshiba:main' into main
madosuki Oct 3, 2021
9216c5d
Merge branch 'Hiroshiba:main' into main
madosuki Oct 6, 2021
4e00013
Merge branch 'Hiroshiba:main' into main
madosuki Oct 6, 2021
3eda556
Merge branch 'Hiroshiba:main' into main
madosuki Oct 9, 2021
18d6964
Merge branch 'Hiroshiba:main' into main
madosuki Oct 9, 2021
c1f6e86
Merge branch 'Hiroshiba:main' into main
madosuki Oct 10, 2021
c6e9b02
Merge branch 'Hiroshiba:main' into main
madosuki Oct 10, 2021
fca5ed2
Merge branch 'Hiroshiba:main' into main
madosuki Oct 11, 2021
40fbd2f
Merge branch 'Hiroshiba:main' into main
madosuki Oct 11, 2021
4c6f6c3
Merge branch 'Hiroshiba:main' into main
madosuki Oct 11, 2021
960faff
Merge branch 'Hiroshiba:main' into main
madosuki Oct 12, 2021
ad4871a
Merge branch 'Hiroshiba:main' into main
madosuki Oct 12, 2021
99feb8e
Merge branch 'Hiroshiba:main' into main
madosuki Oct 15, 2021
dbaa743
Merge branch 'Hiroshiba:main' into main
madosuki Oct 18, 2021
1400e11
Merge branch 'Hiroshiba:main' into main
madosuki Oct 19, 2021
558551a
Merge branch 'Hiroshiba:main' into main
madosuki Oct 19, 2021
36e69ad
Merge branch 'Hiroshiba:main' into main
madosuki Oct 20, 2021
ef036d4
Merge branch 'Hiroshiba:main' into main
madosuki Oct 22, 2021
64dd2ca
Merge branch 'Hiroshiba:main' into main
madosuki Oct 24, 2021
e92871d
Merge branch 'Hiroshiba:main' into main
madosuki Oct 25, 2021
3302242
Merge branch 'Hiroshiba:main' into main
madosuki Oct 26, 2021
a12c761
Merge branch 'Hiroshiba:main' into main
madosuki Oct 28, 2021
2f55a6c
Merge branch 'Hiroshiba:main' into main
madosuki Oct 29, 2021
366404c
Merge branch 'Hiroshiba:main' into main
madosuki Oct 30, 2021
5ffd332
Merge branch 'Hiroshiba:main' into main
madosuki Nov 1, 2021
cec1e20
Merge branch 'Hiroshiba:main' into main
madosuki Nov 1, 2021
5e39568
Merge branch 'Hiroshiba:main' into main
madosuki Nov 4, 2021
715842c
Merge branch 'Hiroshiba:main' into main
madosuki Nov 7, 2021
0b07c03
Merge branch 'Hiroshiba:main' into main
madosuki Nov 8, 2021
8209bc4
Merge branch 'Hiroshiba:main' into main
madosuki Nov 10, 2021
e829587
Merge branch 'Hiroshiba:main' into main
madosuki Nov 12, 2021
9f5d308
Merge branch 'Hiroshiba:main' into main
madosuki Nov 12, 2021
7df6fc3
Merge branch 'Hiroshiba:main' into main
madosuki Nov 14, 2021
80f2610
Merge branch 'Hiroshiba:main' into main
madosuki Nov 15, 2021
3553fa6
Merge branch 'Hiroshiba:main' into main
madosuki Nov 18, 2021
993dcff
Merge branch 'Hiroshiba:main' into main
madosuki Nov 21, 2021
573f771
Merge branch 'Hiroshiba:main' into main
madosuki Nov 23, 2021
99b1def
fix
madosuki Nov 26, 2021
795e763
Revert "fix"
madosuki Nov 26, 2021
11e1888
fix
madosuki Nov 26, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 22 additions & 9 deletions src/background.ts
Expand Up @@ -455,36 +455,49 @@ ipcMainHandle("GET_OSS_COMMUNITY_INFOS", () => {
return ossCommunityInfos;
});

ipcMainHandle("SHOW_AUDIO_SAVE_DIALOG", (_, { title, defaultPath }) => {
return dialog.showSaveDialogSync(win, {
ipcMainHandle("SHOW_AUDIO_SAVE_DIALOG", async (_, { title, defaultPath }) => {
const result = await dialog.showSaveDialog(win, {
title,
defaultPath,
filters: [{ name: "Wave File", extensions: ["wav"] }],
properties: ["createDirectory"],
});
return result.filePath;
});

ipcMainHandle("SHOW_OPEN_DIRECTORY_DIALOG", (_, { title }) => {
return dialog.showOpenDialogSync(win, {
ipcMainHandle("SHOW_OPEN_DIRECTORY_DIALOG", async (_, { title }) => {
const result = await dialog.showOpenDialog(win, {
title,
properties: ["openDirectory", "createDirectory"],
})?.[0];
});
if (result.canceled) {
return undefined;
}
return result.filePaths[0];
});

ipcMainHandle("SHOW_PROJECT_SAVE_DIALOG", (_, { title }) => {
return dialog.showSaveDialogSync(win, {
ipcMainHandle("SHOW_PROJECT_SAVE_DIALOG", async (_, { title }) => {
const result = await dialog.showSaveDialog(win, {
title,
filters: [{ name: "VOICEVOX Project file", extensions: ["vvproj"] }],
properties: ["showOverwriteConfirmation"],
});
if (result.canceled) {
return undefined;
}
return result.filePath;
});

ipcMainHandle("SHOW_PROJECT_LOAD_DIALOG", (_, { title }) => {
return dialog.showOpenDialogSync(win, {
ipcMainHandle("SHOW_PROJECT_LOAD_DIALOG", async (_, { title }) => {
const result = await dialog.showOpenDialog(win, {
title,
filters: [{ name: "VOICEVOX Project file", extensions: ["vvproj"] }],
properties: ["openFile"],
});
if (result.canceled) {
return undefined;
}
return result.filePaths;
});

ipcMainHandle("SHOW_INFO_DIALOG", (_, { title, message, buttons }) => {
Expand Down