指摘事項修正（全画面表示UI文言変更、最大化処理関数名称変更、セパレーター追加）（VOICEVOX#2251）

terapotan · Dec 2, 2024 · be26bf9 · be26bf9
1 parent 720674e
commit be26bf9
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/src/backend/browser/sandbox.ts b/src/backend/browser/sandbox.ts
@@ -186,8 +186,8 @@ export const api: Sandbox = {
   minimizeWindow() {
     throw new Error(`Not supported on Browser version: minimizeWindow`);
   },
-  maximizeWindow() {
-    throw new Error(`Not supported on Browser version: maximizeWindow`);
+  toggleMaximizeWindow() {
+    throw new Error(`Not supported on Browser version: toggleMaximizeWindow`);
   },
   toggleFullScreen() {
     throw new Error(`Not supported on Browser version: toggleFullScreen`);

diff --git a/src/backend/electron/main.ts b/src/backend/electron/main.ts
@@ -616,7 +616,7 @@ registerIpcMainHandle<IpcMainHandle>({
   MINIMIZE_WINDOW: () => {
     win.minimize();
   },
-  MAXIMIZE_WINDOW: () => {
+  TOGGLE_MAXIMIZE_WINDOW: () => {
     // 全画面表示中は、全画面表示解除のみを行い、最大化解除処理は実施しない
     if (win.isFullScreen()) {
       win.setFullScreen(false);

diff --git a/src/backend/electron/preload.ts b/src/backend/electron/preload.ts
@@ -105,8 +105,8 @@ const api: Sandbox = {
     void ipcRendererInvokeProxy.MINIMIZE_WINDOW();
   },
 
-  maximizeWindow: () => {
-    void ipcRendererInvokeProxy.MAXIMIZE_WINDOW();
+  toggleMaximizeWindow: () => {
+    void ipcRendererInvokeProxy.TOGGLE_MAXIMIZE_WINDOW();
   },
 
   toggleFullScreen: () => {

diff --git a/src/components/Menu/MenuBar/MenuBar.vue b/src/components/Menu/MenuBar/MenuBar.vue
@@ -406,9 +406,10 @@ const menudata = computed<MenuItemData[]>(() => [
     disableWhenUiLocked: false,
     subMenu: [
       ...props.viewSubMenuData,
+      { type: "separator" },
       {
         type: "button",
-        label: "全画面表示の切り替え",
+        label: "全画面表示を切り替え",
         onClick: toggleFullScreen,
         disableWhenUiLocked: false,
       },
@@ -545,7 +546,7 @@ function registerHotkeyForAllEditors(action: Omit<HotkeyAction, "editor">) {
 
 registerHotkeyForAllEditors({
   callback: toggleFullScreen,
-  name: "全画面表示の切り替え",
+  name: "全画面表示を切り替え",
 });
 registerHotkeyForAllEditors({
   callback: createNewProject,

diff --git a/src/components/Menu/MenuBar/MinMaxCloseButtons.vue b/src/components/Menu/MenuBar/MinMaxCloseButtons.vue
@@ -37,7 +37,7 @@
       color="green"
       class="title-bar-buttons"
       aria-label="最大化"
-      @click="maximizeWindow()"
+      @click="toggleMaximizeWindow()"
     ></QBtn>
   </QBadge>
   <QBadge
@@ -63,7 +63,7 @@
       :icon="mdiWindowRestore"
       class="title-bar-buttons"
       aria-label="最大化"
-      @click="maximizeWindow()"
+      @click="toggleMaximizeWindow()"
     >
     </QBtn>
 
@@ -74,7 +74,7 @@
       icon="crop_square"
       class="title-bar-buttons"
       aria-label="最大化"
-      @click="maximizeWindow()"
+      @click="toggleMaximizeWindow()"
     ></QBtn>
 
     <QBtn
@@ -101,7 +101,7 @@ const closeWindow = async () => {
   void store.actions.CHECK_EDITED_AND_NOT_SAVE({ closeOrReload: "close" });
 };
 const minimizeWindow = () => window.backend.minimizeWindow();
-const maximizeWindow = () => window.backend.maximizeWindow();
+const toggleMaximizeWindow = () => window.backend.toggleMaximizeWindow();
 
 const isMaximized = computed(() => store.state.isMaximized);
 const isFullscreen = computed(() => store.getters.IS_FULLSCREEN);

diff --git a/src/type/ipc.ts b/src/type/ipc.ts
@@ -118,7 +118,7 @@ export type IpcIHData = {
     return: void;
   };
 
-  MAXIMIZE_WINDOW: {
+  TOGGLE_MAXIMIZE_WINDOW: {
     args: [];
     return: void;
   };

diff --git a/src/type/preload.ts b/src/type/preload.ts
@@ -121,7 +121,7 @@ export const defaultHotkeySettings: HotkeySettingType[] = [
     combination: HotkeyCombination(!isMac ? "Ctrl N" : "Meta N"),
   },
   {
-    action: "全画面表示の切り替え",
+    action: "全画面表示を切り替え",
     combination: HotkeyCombination(!isMac ? "F11" : "Ctrl Meta F"),
   },
   {
@@ -241,7 +241,7 @@ export interface Sandbox {
   }): void;
   closeWindow(): void;
   minimizeWindow(): void;
-  maximizeWindow(): void;
+  toggleMaximizeWindow(): void;
   toggleFullScreen(): void;
   logError(...params: unknown[]): void;
   logWarn(...params: unknown[]): void;
@@ -439,7 +439,7 @@ export const hotkeyActionNameSchema = z.enum([
   "元に戻す",
   "やり直す",
   "新規プロジェクト",
-  "全画面表示の切り替え",
+  "全画面表示を切り替え",
   "プロジェクトを名前を付けて保存",
   "プロジェクトを上書き保存",
   "プロジェクトを読み込む",