Merge branch 'main' into feature/VOICEVOX#2011

jdkfx · Dec 19, 2024 · 5f799d0 · 5f799d0
2 parents 8b09574 + 4233089
commit 5f799d0
Show file tree

Hide file tree

Showing 12 changed files with 568 additions and 459 deletions.
diff --git a/src/backend/browser/sandbox.ts b/src/backend/browser/sandbox.ts
@@ -9,7 +9,6 @@ import {
 import { getConfigManager } from "./browserConfig";
 import { IpcSOData } from "@/type/ipc";
 import {
-  defaultHotkeySettings,
   defaultToolbarButtonSetting,
   EngineId,
   EngineSettingType,
@@ -247,9 +246,6 @@ export const api: Sandbox = {
   changePinWindow() {
     throw new Error(`Not supported on Browser version: changePinWindow`);
   },
-  getDefaultHotkeySettings() {
-    return Promise.resolve(defaultHotkeySettings);
-  },
   getDefaultToolbarSetting() {
     return Promise.resolve(defaultToolbarButtonSetting);
   },

diff --git a/src/backend/electron/main.ts b/src/backend/electron/main.ts
@@ -40,7 +40,6 @@ import { AssetTextFileNames } from "@/type/staticResources";
 import {
   EngineInfo,
   SystemError,
-  defaultHotkeySettings,
   defaultToolbarButtonSetting,
   EngineId,
   TextAsset,
@@ -695,10 +694,6 @@ registerIpcMainHandle<IpcMainHandle>({
     }
   },
 
-  GET_DEFAULT_HOTKEY_SETTINGS: () => {
-    return defaultHotkeySettings;
-  },
-
   GET_DEFAULT_TOOLBAR_SETTING: () => {
     return defaultToolbarButtonSetting;
   },

diff --git a/src/backend/electron/preload.ts b/src/backend/electron/preload.ts
@@ -176,10 +176,6 @@ const api: Sandbox = {
     return ipcRendererInvokeProxy.HOTKEY_SETTINGS({ newData });
   },
 
-  getDefaultHotkeySettings: async () => {
-    return await ipcRendererInvokeProxy.GET_DEFAULT_HOTKEY_SETTINGS();
-  },
-
   getDefaultToolbarSetting: async () => {
     return await ipcRendererInvokeProxy.GET_DEFAULT_TOOLBAR_SETTING();
   },