From d7352c33789e06f1fb35f60e1d8a606bebea9836 Mon Sep 17 00:00:00 2001
From: k-chop <whelmaze@gmail.com>
Date: Tue, 6 Dec 2022 23:58:45 +0900
Subject: [PATCH 01/17] =?UTF-8?q?electron=E5=81=B4=E3=81=A7=E3=83=97?=
 =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=83=AC=E3=82=B9=E3=83=90=E3=83=BC=E3=82=92?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/background.ts       | 4 ++++
 src/electron/preload.ts | 4 ++++
 src/type/ipc.ts         | 5 +++++
 src/type/preload.ts     | 1 +
 4 files changed, 14 insertions(+)

diff --git a/src/background.ts b/src/background.ts
index d3c703e591..96f7a3d14b 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -1318,6 +1318,10 @@ ipcMainHandle("RESTART_APP", async (_, { isSafeMode }) => {
   win.close();
 });
 
+ipcMainHandle("SET_PROGRESS_BAR", (_, { progress }) => {
+  win.setProgressBar(progress);
+});
+
 // app callback
 app.on("web-contents-created", (e, contents) => {
   // リンククリック時はブラウザを開く
diff --git a/src/electron/preload.ts b/src/electron/preload.ts
index 747dfaa640..cf33ee636d 100644
--- a/src/electron/preload.ts
+++ b/src/electron/preload.ts
@@ -262,6 +262,10 @@ const api: Sandbox = {
   restartApp: ({ isSafeMode }: { isSafeMode: boolean }) => {
     ipcRendererInvoke("RESTART_APP", { isSafeMode });
   },
+
+  setProgressBar: ({ progress }: { progress: number }) => {
+    ipcRendererInvoke("SET_PROGRESS_BAR", { progress });
+  },
 };
 
 contextBridge.exposeInMainWorld("electron", api);
diff --git a/src/type/ipc.ts b/src/type/ipc.ts
index 000fe4b2fc..933ee7b34a 100644
--- a/src/type/ipc.ts
+++ b/src/type/ipc.ts
@@ -259,6 +259,11 @@ export type IpcIHData = {
     args: [obj: { isSafeMode: boolean }];
     return: void;
   };
+
+  SET_PROGRESS_BAR: {
+    args: [obj: { progress: number }];
+    return: void;
+  };
 };
 
 /**
diff --git a/src/type/preload.ts b/src/type/preload.ts
index aa72e3a79f..6d337d06d2 100644
--- a/src/type/preload.ts
+++ b/src/type/preload.ts
@@ -99,6 +99,7 @@ export interface Sandbox {
   ): Promise<ElectronStoreType[Key]>;
   validateEngineDir(engineDir: string): Promise<EngineDirValidationResult>;
   restartApp(obj: { isSafeMode: boolean }): void;
+  setProgressBar(obj: { progress: number }): void;
 }
 
 export type AppInfos = {

From c026c6e29fa677d1d8482273a50db84494812050 Mon Sep 17 00:00:00 2001
From: k-chop <whelmaze@gmail.com>
Date: Wed, 7 Dec 2022 15:08:47 +0900
Subject: [PATCH 02/17] =?UTF-8?q?uiStore=E3=81=AB=E3=83=97=E3=83=AD?=
 =?UTF-8?q?=E3=82=B0=E3=83=AC=E3=82=B9=E3=83=90=E3=83=BC=E3=82=92=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E3=81=99=E3=82=8B=E3=81=9F=E3=82=81=E3=81=AE=E3=82=A2?=
 =?UTF-8?q?=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/type.ts | 27 +++++++++++++++++++++++++++
 src/store/ui.ts   | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/src/store/type.ts b/src/store/type.ts
index c50453c21a..7ac974a28f 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -979,6 +979,8 @@ export type UiStoreState = {
   isMaximized: boolean;
   isPinned: boolean;
   isFullscreen: boolean;
+  progress: number;
+  progressCount: number;
 };
 
 export type UiStoreTypes = {
@@ -1109,6 +1111,31 @@ export type UiStoreTypes = {
   RESTART_APP: {
     action(obj: { isSafeMode?: boolean }): void;
   };
+
+  START_PROGRESS: {
+    action(payload: { count: number }): void;
+  };
+
+  START_AUDIO_ITEMS_PROGRESS: {
+    action(): void;
+  };
+
+  START_INDETERMINATE_PROGRESS: {
+    action(): void;
+  };
+
+  INCREMENT_PROGRESS: {
+    action(): void;
+  };
+
+  SET_PROGRESS: {
+    mutation: { progress: number; count?: number };
+    action(payload: { progress: number; count?: number }): void;
+  };
+
+  RESET_PROGRESS: {
+    action(): void;
+  };
 };
 
 /*
diff --git a/src/store/ui.ts b/src/store/ui.ts
index 3b685a8f1d..40c5fb8331 100644
--- a/src/store/ui.ts
+++ b/src/store/ui.ts
@@ -44,6 +44,8 @@ export const uiStoreState: UiStoreState = {
   isMaximized: false,
   isPinned: false,
   isFullscreen: false,
+  progress: -1,
+  progressCount: 0,
 };
 
 export const uiStore = createPartialStore<UiStoreTypes>({
@@ -322,4 +324,49 @@ export const uiStore = createPartialStore<UiStoreTypes>({
       window.electron.restartApp({ isSafeMode: !!isSafeMode });
     },
   },
+
+  START_PROGRESS: {
+    action({ dispatch }, { count }) {
+      dispatch("SET_PROGRESS", { progress: 0, count });
+    },
+  },
+
+  START_AUDIO_ITEMS_PROGRESS: {
+    action({ dispatch, state }) {
+      dispatch("START_PROGRESS", { count: state.audioKeys.length });
+    },
+  },
+
+  INCREMENT_PROGRESS: {
+    action({ dispatch, state }) {
+      const step = 1.0 / state.progressCount;
+      dispatch("SET_PROGRESS", { progress: state.progress + step });
+    },
+  },
+
+  START_INDETERMINATE_PROGRESS: {
+    action({ dispatch }) {
+      // electron.setProgressBarに1より大きい値を渡すとindeterminateなプログレスバーになる
+      dispatch("SET_PROGRESS", { progress: 1.1 });
+    },
+  },
+
+  SET_PROGRESS: {
+    mutation(state, { progress, count }) {
+      state.progress = progress;
+      if (count != null) {
+        state.progressCount = count;
+      }
+    },
+    action({ commit }, { progress, count }) {
+      window.electron.setProgressBar({ progress });
+      commit("SET_PROGRESS", { progress, count });
+    },
+  },
+
+  RESET_PROGRESS: {
+    action({ dispatch }) {
+      dispatch("SET_PROGRESS", { progress: -1 });
+    },
+  },
 });

From 63ec74c61fe3ebc8f1d7739c67b33ea0a89ee804 Mon Sep 17 00:00:00 2001
From: k-chop <whelmaze@gmail.com>
Date: Wed, 7 Dec 2022 15:09:22 +0900
Subject: [PATCH 03/17] =?UTF-8?q?=E5=AE=9F=E9=9A=9B=E3=81=AB=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=99=82=E3=81=AB=E3=83=97=E3=83=AD=E3=82=B0=E3=83=AC?=
 =?UTF-8?q?=E3=82=B9=E3=83=90=E3=83=BC=E3=82=92=E6=9B=B4=E6=96=B0=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialog.ts | 14 +++++++++++---
 src/store/audio.ts       | 21 ++++++++++++++++++---
 src/store/type.ts        |  2 ++
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/components/Dialog.ts b/src/components/Dialog.ts
index f002cac022..bb4b157873 100644
--- a/src/components/Dialog.ts
+++ b/src/components/Dialog.ts
@@ -23,11 +23,13 @@ export async function generateAndSaveOneAudioWithDialog({
   filePath?: string;
   encoding?: EncodingType;
 }): Promise<void> {
+  await dispatch("START_INDETERMINATE_PROGRESS");
   const result: SaveResultObject = await dispatch("GENERATE_AND_SAVE_AUDIO", {
     audioKey,
     filePath,
     encoding,
-  });
+  }).finally(() => dispatch("RESET_PROGRESS"));
+
   if (result.result === "SUCCESS" || result.result === "CANCELED") return;
   let msg = "";
   switch (result.result) {
@@ -65,13 +67,17 @@ export async function generateAndSaveAllAudioWithDialog({
   dirPath?: string;
   encoding?: EncodingType;
 }): Promise<void> {
+  await dispatch("START_AUDIO_ITEMS_PROGRESS");
   const result = await dispatch("GENERATE_AND_SAVE_ALL_AUDIO", {
     dirPath,
     encoding,
-  });
+    callback: () => dispatch("INCREMENT_PROGRESS"),
+  }).finally(() => dispatch("RESET_PROGRESS"));
+
   const successArray: Array<string | undefined> = [];
   const writeErrorArray: Array<WriteErrorTypeForSaveAllResultDialog> = [];
   const engineErrorArray: Array<string | undefined> = [];
+
   if (result) {
     for (const item of result) {
       let msg = "";
@@ -121,10 +127,12 @@ export async function generateAndConnectAndSaveAudioWithDialog({
   filePath?: string;
   encoding?: EncodingType;
 }): Promise<void> {
+  await dispatch("START_AUDIO_ITEMS_PROGRESS");
   const result = await dispatch("GENERATE_AND_CONNECT_AND_SAVE_AUDIO", {
     filePath,
     encoding,
-  });
+    callback: () => dispatch("INCREMENT_PROGRESS"),
+  }).finally(() => dispatch("RESET_PROGRESS"));
 
   if (
     result === undefined ||
diff --git a/src/store/audio.ts b/src/store/audio.ts
index 480abba69a..25072a6dce 100644
--- a/src/store/audio.ts
+++ b/src/store/audio.ts
@@ -1232,7 +1232,11 @@ export const audioStore = createPartialStore<AudioStoreTypes>({
     action: createUILockAction(
       async (
         { state, dispatch },
-        { dirPath, encoding }: { dirPath?: string; encoding?: EncodingType }
+        {
+          dirPath,
+          encoding,
+          callback,
+        }: { dirPath?: string; encoding?: EncodingType; callback?: () => void }
       ) => {
         if (state.savingSetting.fixedExportEnabled) {
           dirPath = state.savingSetting.fixedExportDir;
@@ -1249,6 +1253,9 @@ export const audioStore = createPartialStore<AudioStoreTypes>({
               audioKey,
               filePath: path.join(_dirPath, name),
               encoding,
+            }).then((value) => {
+              callback?.();
+              return value;
             });
           });
           return Promise.all(promises);
@@ -1261,7 +1268,11 @@ export const audioStore = createPartialStore<AudioStoreTypes>({
     action: createUILockAction(
       async (
         { state, dispatch },
-        { filePath, encoding }: { filePath?: string; encoding?: EncodingType }
+        {
+          filePath,
+          encoding,
+          callback,
+        }: { filePath?: string; encoding?: EncodingType; callback?: () => void }
       ): Promise<SaveResultObject> => {
         const defaultFileName = buildProjectFileName(state, "wav");
 
@@ -1317,6 +1328,7 @@ export const audioStore = createPartialStore<AudioStoreTypes>({
           let blob = await dispatch("GET_AUDIO_CACHE", { audioKey });
           if (!blob) {
             blob = await dispatch("GENERATE_AUDIO", { audioKey });
+            callback?.();
           }
           if (blob === null) {
             return { result: "ENGINE_ERROR", path: filePath };
@@ -1517,11 +1529,14 @@ export const audioStore = createPartialStore<AudioStoreTypes>({
         // 音声用意
         let blob = await dispatch("GET_AUDIO_CACHE", { audioKey });
         if (!blob) {
+          dispatch("START_INDETERMINATE_PROGRESS");
           commit("SET_AUDIO_NOW_GENERATING", {
             audioKey,
             nowGenerating: true,
           });
-          blob = await dispatch("GENERATE_AUDIO", { audioKey });
+          blob = await dispatch("GENERATE_AUDIO", { audioKey }).finally(() =>
+            dispatch("RESET_PROGRESS")
+          );
           commit("SET_AUDIO_NOW_GENERATING", {
             audioKey,
             nowGenerating: false,
diff --git a/src/store/type.ts b/src/store/type.ts
index 7ac974a28f..2e5864c162 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -365,6 +365,7 @@ export type AudioStoreTypes = {
     action(payload: {
       dirPath?: string;
       encoding?: EncodingType;
+      callback?: () => void;
     }): SaveResultObject[] | undefined;
   };
 
@@ -372,6 +373,7 @@ export type AudioStoreTypes = {
     action(payload: {
       filePath?: string;
       encoding?: EncodingType;
+      callback?: () => void;
     }): SaveResultObject | undefined;
   };
 

From 24f9a853ebf6707a0f2aa296f4006492c1e55e0a Mon Sep 17 00:00:00 2001
From: k-chop <whelmaze@gmail.com>
Date: Wed, 7 Dec 2022 15:22:40 +0900
Subject: [PATCH 04/17] =?UTF-8?q?1.1=E3=81=AF=E5=AE=9A=E6=95=B0=E3=81=AB?=
 =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=8A=E3=81=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/ui.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/store/ui.ts b/src/store/ui.ts
index 40c5fb8331..b86bf182a9 100644
--- a/src/store/ui.ts
+++ b/src/store/ui.ts
@@ -9,6 +9,9 @@ import {
 import { ActivePointScrollMode } from "@/type/preload";
 import { createPartialStore } from "./vuex";
 
+// electron.setProgressBarに1より大きい値を渡すとindeterminateなプログレスバーになる
+const INDETERMINATE_PROGRESS_NUMBER = 1.1;
+
 export function createUILockAction<S, A extends ActionsBase, K extends keyof A>(
   action: (
     context: ActionContext<S, S, AllGetters, AllActions, AllMutations>,
@@ -346,8 +349,7 @@ export const uiStore = createPartialStore<UiStoreTypes>({
 
   START_INDETERMINATE_PROGRESS: {
     action({ dispatch }) {
-      // electron.setProgressBarに1より大きい値を渡すとindeterminateなプログレスバーになる
-      dispatch("SET_PROGRESS", { progress: 1.1 });
+      dispatch("SET_PROGRESS", { progress: INDETERMINATE_PROGRESS_NUMBER });
     },
   },
 

From 0e6e4f56d407187658eea7a48d64432d7e0a9e97 Mon Sep 17 00:00:00 2001
From: k-chop <whelmaze@gmail.com>
Date: Wed, 7 Dec 2022 17:36:54 +0900
Subject: [PATCH 05/17] =?UTF-8?q?UI=E3=81=A7=E3=82=82=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProgressDialog.vue | 93 +++++++++++++++++++++++++++++++
 src/store/type.ts                 |  4 ++
 src/store/ui.ts                   |  6 ++
 src/views/EditorHome.vue          |  4 ++
 4 files changed, 107 insertions(+)
 create mode 100644 src/components/ProgressDialog.vue

diff --git a/src/components/ProgressDialog.vue b/src/components/ProgressDialog.vue
new file mode 100644
index 0000000000..d32676e249
--- /dev/null
+++ b/src/components/ProgressDialog.vue
@@ -0,0 +1,93 @@
+<template>
+  <div v-if="isShowProgress" class="progress">
+    <div v-if="isDeterminate">
+      <q-circular-progress
+        show-value
+        :value="progress"
+        :min="0"
+        :max="1"
+        font-size="12px"
+        rounded
+        color="primary"
+        size="xl"
+        :thickness="0.3"
+      >
+        {{ formattedProgress }}%
+      </q-circular-progress>
+      <div class="q-mt-md">生成中です...</div>
+    </div>
+    <div v-if="!isDeterminate">
+      <q-circular-progress
+        indeterminate
+        color="primary"
+        rounded
+        :thickness="0.3"
+        size="xl"
+      />
+      <div class="q-mt-md">生成中です...</div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { useStore } from "@/store";
+import { computed, defineComponent, ref, watch } from "vue";
+
+export default defineComponent({
+  name: "ProgressDialog",
+
+  setup() {
+    const store = useStore();
+
+    const progress = computed(() => store.getters.PROGRESS);
+    const isShowProgress = ref<boolean>(false);
+    const isDeterminate = ref<boolean>(false);
+
+    watch(progress, (newValue, oldValue) => {
+      if (newValue === -1) {
+        isShowProgress.value = false;
+      } else if (oldValue === -1 && newValue <= 1) {
+        isShowProgress.value = true;
+        isDeterminate.value = true;
+      } else if (newValue === 1.1) {
+        isShowProgress.value = true;
+        isDeterminate.value = false;
+      }
+    });
+
+    const formattedProgress = computed(() =>
+      (store.getters.PROGRESS * 100).toFixed()
+    );
+
+    return {
+      isShowProgress,
+      isDeterminate,
+      progress,
+      formattedProgress,
+    };
+  },
+});
+</script>
+
+<style lang="scss" scoped>
+@use '@/styles/colors' as colors;
+
+.progress {
+  background-color: rgba(colors.$display-rgb, 0.15);
+  position: absolute;
+  inset: 0;
+  z-index: 10;
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+
+  > div {
+    color: colors.$display;
+    background: colors.$surface;
+    width: 200px;
+    border-radius: 6px;
+    padding: 14px 48px;
+  }
+}
+</style>
diff --git a/src/store/type.ts b/src/store/type.ts
index 2e5864c162..f629142dfb 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -994,6 +994,10 @@ export type UiStoreTypes = {
     getter: boolean;
   };
 
+  PROGRESS: {
+    getter: number;
+  };
+
   ASYNC_UI_LOCK: {
     action(payload: { callback: () => Promise<void> }): void;
   };
diff --git a/src/store/ui.ts b/src/store/ui.ts
index b86bf182a9..7c4cceb862 100644
--- a/src/store/ui.ts
+++ b/src/store/ui.ts
@@ -64,6 +64,12 @@ export const uiStore = createPartialStore<UiStoreTypes>({
     },
   },
 
+  PROGRESS: {
+    getter(state) {
+      return state.progress;
+    },
+  },
+
   ASYNC_UI_LOCK: {
     action: createUILockAction(
       async (_, { callback }: { callback: () => Promise<void> }) => {
diff --git a/src/views/EditorHome.vue b/src/views/EditorHome.vue
index e15e4e6f89..1251651f8f 100644
--- a/src/views/EditorHome.vue
+++ b/src/views/EditorHome.vue
@@ -6,6 +6,8 @@
 
     <q-page-container>
       <q-page class="main-row-panes">
+        <progress-dialog />
+
         <!-- TODO: 複数エンジン対応 -->
         <div
           v-if="!isCompletedInitialStartup || allEngineState === 'STARTING'"
@@ -184,6 +186,7 @@ import AcceptRetrieveTelemetryDialog from "@/components/AcceptRetrieveTelemetryD
 import AcceptTermsDialog from "@/components/AcceptTermsDialog.vue";
 import DictionaryManageDialog from "@/components/DictionaryManageDialog.vue";
 import EngineManageDialog from "@/components/EngineManageDialog.vue";
+import ProgressDialog from "@/components/ProgressDialog.vue";
 import { AudioItem, EngineState } from "@/store/type";
 import { QResizeObserver, useQuasar } from "quasar";
 import path from "path";
@@ -215,6 +218,7 @@ export default defineComponent({
     AcceptTermsDialog,
     DictionaryManageDialog,
     EngineManageDialog,
+    ProgressDialog,
   },
 
   setup() {

From a27cb5c9f5e49cc11fb29fe5e9ce9804116d4198 Mon Sep 17 00:00:00 2001
From: k-chop <whelmaze@gmail.com>
Date: Wed, 7 Dec 2022 17:46:14 +0900
Subject: [PATCH 06/17] =?UTF-8?q?3=E7=A7=92=E5=BE=8C=E3=81=AB=E5=87=BA?=
 =?UTF-8?q?=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProgressDialog.vue | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/components/ProgressDialog.vue b/src/components/ProgressDialog.vue
index d32676e249..a1a4d72b05 100644
--- a/src/components/ProgressDialog.vue
+++ b/src/components/ProgressDialog.vue
@@ -31,7 +31,7 @@
 
 <script lang="ts">
 import { useStore } from "@/store";
-import { computed, defineComponent, ref, watch } from "vue";
+import { computed, defineComponent, onUnmounted, ref, watch } from "vue";
 
 export default defineComponent({
   name: "ProgressDialog",
@@ -43,18 +43,29 @@ export default defineComponent({
     const isShowProgress = ref<boolean>(false);
     const isDeterminate = ref<boolean>(false);
 
+    let timeoutId: ReturnType<typeof setTimeout>;
+
+    const deferredProgressStart = () => {
+      timeoutId = setTimeout(() => {
+        isShowProgress.value = true;
+      }, 3000);
+    };
+
     watch(progress, (newValue, oldValue) => {
       if (newValue === -1) {
+        clearTimeout(timeoutId);
         isShowProgress.value = false;
       } else if (oldValue === -1 && newValue <= 1) {
-        isShowProgress.value = true;
+        deferredProgressStart();
         isDeterminate.value = true;
       } else if (newValue === 1.1) {
-        isShowProgress.value = true;
+        deferredProgressStart();
         isDeterminate.value = false;
       }
     });
 
+    onUnmounted(() => clearTimeout(timeoutId));
+
     const formattedProgress = computed(() =>
       (store.getters.PROGRESS * 100).toFixed()
     );

From bcded25227e9c8ea8cb4374c780b340efbd85429 Mon Sep 17 00:00:00 2001
From: k-chop <whelmaze@gmail.com>
Date: Wed, 7 Dec 2022 18:14:59 +0900
Subject: [PATCH 07/17] =?UTF-8?q?Revert=20"electron=E5=81=B4=E3=81=A7?=
 =?UTF-8?q?=E3=83=97=E3=83=AD=E3=82=B0=E3=83=AC=E3=82=B9=E3=83=90=E3=83=BC?=
 =?UTF-8?q?=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d7352c33789e06f1fb35f60e1d8a606bebea9836.
---
 src/background.ts       | 4 ----
 src/electron/preload.ts | 4 ----
 src/type/ipc.ts         | 5 -----
 src/type/preload.ts     | 1 -
 4 files changed, 14 deletions(-)

diff --git a/src/background.ts b/src/background.ts
index 96f7a3d14b..d3c703e591 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -1318,10 +1318,6 @@ ipcMainHandle("RESTART_APP", async (_, { isSafeMode }) => {
   win.close();
 });
 
-ipcMainHandle("SET_PROGRESS_BAR", (_, { progress }) => {
-  win.setProgressBar(progress);
-});
-
 // app callback
 app.on("web-contents-created", (e, contents) => {
   // リンククリック時はブラウザを開く
diff --git a/src/electron/preload.ts b/src/electron/preload.ts
index cf33ee636d..747dfaa640 100644
--- a/src/electron/preload.ts
+++ b/src/electron/preload.ts
@@ -262,10 +262,6 @@ const api: Sandbox = {
   restartApp: ({ isSafeMode }: { isSafeMode: boolean }) => {
     ipcRendererInvoke("RESTART_APP", { isSafeMode });
   },
-
-  setProgressBar: ({ progress }: { progress: number }) => {
-    ipcRendererInvoke("SET_PROGRESS_BAR", { progress });
-  },
 };
 
 contextBridge.exposeInMainWorld("electron", api);
diff --git a/src/type/ipc.ts b/src/type/ipc.ts
index 933ee7b34a..000fe4b2fc 100644
--- a/src/type/ipc.ts
+++ b/src/type/ipc.ts
@@ -259,11 +259,6 @@ export type IpcIHData = {
     args: [obj: { isSafeMode: boolean }];
     return: void;
   };
-
-  SET_PROGRESS_BAR: {
-    args: [obj: { progress: number }];
-    return: void;
-  };
 };
 
 /**
diff --git a/src/type/preload.ts b/src/type/preload.ts
index 6d337d06d2..aa72e3a79f 100644
--- a/src/type/preload.ts
+++ b/src/type/preload.ts
@@ -99,7 +99,6 @@ export interface Sandbox {
   ): Promise<ElectronStoreType[Key]>;
   validateEngineDir(engineDir: string): Promise<EngineDirValidationResult>;
   restartApp(obj: { isSafeMode: boolean }): void;
-  setProgressBar(obj: { progress: number }): void;
 }
 
 export type AppInfos = {

From 47630f2f99c83027dcef57f73d7ae7a01003e95b Mon Sep 17 00:00:00 2001
From: k-chop <whelmaze@gmail.com>
Date: Wed, 7 Dec 2022 18:37:08 +0900
Subject: [PATCH 08/17] =?UTF-8?q?indeterminate=E3=81=AA=E5=80=A4=E3=82=921?=
 =?UTF-8?q?.1=E3=81=AB=E3=81=99=E3=82=8B=E5=BF=85=E8=A6=81=E3=81=8C?=
 =?UTF-8?q?=E3=81=AA=E3=81=8F=E3=81=AA=E3=81=A3=E3=81=9F=E3=81=AE=E3=81=A7?=
 =?UTF-8?q?=E4=BB=A3=E3=82=8F=E3=82=8A=E3=81=AB0=E3=81=AB=E3=81=99?=
 =?UTF-8?q?=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProgressDialog.vue | 13 +++++++++----
 src/store/ui.ts                   |  6 +-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/components/ProgressDialog.vue b/src/components/ProgressDialog.vue
index a1a4d72b05..b3bf1d9751 100644
--- a/src/components/ProgressDialog.vue
+++ b/src/components/ProgressDialog.vue
@@ -53,14 +53,19 @@ export default defineComponent({
 
     watch(progress, (newValue, oldValue) => {
       if (newValue === -1) {
+        // → 非表示
         clearTimeout(timeoutId);
         isShowProgress.value = false;
       } else if (oldValue === -1 && newValue <= 1) {
+        // 非表示 → 処理中
         deferredProgressStart();
-        isDeterminate.value = true;
-      } else if (newValue === 1.1) {
-        deferredProgressStart();
-        isDeterminate.value = false;
+
+        if (0 < newValue) {
+          // 0 < value <= 1の間のみ進捗を%で表示する
+          isDeterminate.value = true;
+        } else {
+          isDeterminate.value = false;
+        }
       }
     });
 
diff --git a/src/store/ui.ts b/src/store/ui.ts
index 7c4cceb862..df2d9e32de 100644
--- a/src/store/ui.ts
+++ b/src/store/ui.ts
@@ -9,9 +9,6 @@ import {
 import { ActivePointScrollMode } from "@/type/preload";
 import { createPartialStore } from "./vuex";
 
-// electron.setProgressBarに1より大きい値を渡すとindeterminateなプログレスバーになる
-const INDETERMINATE_PROGRESS_NUMBER = 1.1;
-
 export function createUILockAction<S, A extends ActionsBase, K extends keyof A>(
   action: (
     context: ActionContext<S, S, AllGetters, AllActions, AllMutations>,
@@ -355,7 +352,7 @@ export const uiStore = createPartialStore<UiStoreTypes>({
 
   START_INDETERMINATE_PROGRESS: {
     action({ dispatch }) {
-      dispatch("SET_PROGRESS", { progress: INDETERMINATE_PROGRESS_NUMBER });
+      dispatch("SET_PROGRESS", { progress: 0 });
     },
   },
 
@@ -367,7 +364,6 @@ export const uiStore = createPartialStore<UiStoreTypes>({
       }
     },
     action({ commit }, { progress, count }) {
-      window.electron.setProgressBar({ progress });
       commit("SET_PROGRESS", { progress, count });
     },
   },

From c5dc265779441a1af6b42ca0e07465ac21616c67 Mon Sep 17 00:00:00 2001
From: k-chop <whelmaze@gmail.com>
Date: Wed, 7 Dec 2022 18:59:40 +0900
Subject: [PATCH 09/17] =?UTF-8?q?0=20->=200=E4=BB=A5=E5=A4=96=E3=81=AB?=
 =?UTF-8?q?=E5=A4=89=E5=8C=96=E3=81=99=E3=82=8B=E3=81=A8=E3=81=8D=E7=8A=B6?=
 =?UTF-8?q?=E6=85=8B=E3=82=92=E6=9B=B4=E6=96=B0=E3=81=A7=E3=81=8D=E3=81=A6?=
 =?UTF-8?q?=E3=81=84=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=AE=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProgressDialog.vue | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/components/ProgressDialog.vue b/src/components/ProgressDialog.vue
index b3bf1d9751..026c7afa14 100644
--- a/src/components/ProgressDialog.vue
+++ b/src/components/ProgressDialog.vue
@@ -59,13 +59,11 @@ export default defineComponent({
       } else if (oldValue === -1 && newValue <= 1) {
         // 非表示 → 処理中
         deferredProgressStart();
-
-        if (0 < newValue) {
-          // 0 < value <= 1の間のみ進捗を%で表示する
-          isDeterminate.value = true;
-        } else {
-          isDeterminate.value = false;
-        }
+        isDeterminate.value = false;
+      } else if (oldValue !== -1 && 0 < newValue) {
+        // 処理中 → 処理中(0%より大きな値)
+        // 0 < value <= 1の間のみ進捗を%で表示する
+        isDeterminate.value = true;
       }
     });
 

From 760a1fdf0ba126051cd4133ee1033b153c621f55 Mon Sep 17 00:00:00 2001
From: k-chop <whelmaze@gmail.com>
Date: Wed, 7 Dec 2022 19:12:57 +0900
Subject: [PATCH 10/17] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProgressDialog.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/ProgressDialog.vue b/src/components/ProgressDialog.vue
index 026c7afa14..5b1e41a73d 100644
--- a/src/components/ProgressDialog.vue
+++ b/src/components/ProgressDialog.vue
@@ -46,6 +46,7 @@ export default defineComponent({
     let timeoutId: ReturnType<typeof setTimeout>;
 
     const deferredProgressStart = () => {
+      // 3秒待ってから表示する
       timeoutId = setTimeout(() => {
         isShowProgress.value = true;
       }, 3000);

From a04cb339fbd40bfd0df7f83de96fdcc5bf2a7f49 Mon Sep 17 00:00:00 2001
From: k-chop <whelmaze@gmail.com>
Date: Wed, 7 Dec 2022 19:20:00 +0900
Subject: [PATCH 11/17] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/unit/store/Vuex.spec.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/unit/store/Vuex.spec.ts b/tests/unit/store/Vuex.spec.ts
index 388e58f492..e472cf8023 100644
--- a/tests/unit/store/Vuex.spec.ts
+++ b/tests/unit/store/Vuex.spec.ts
@@ -122,6 +122,8 @@ describe("store/vuex.js test", () => {
         confirmedTips: {
           tweakableSliderByScroll: false,
         },
+        progress: -1,
+        progressCount: 0,
       },
       getters: {
         ...uiStore.getters,

From 2ccfcdab1b992273db18e83e09057fdb493bea10 Mon Sep 17 00:00:00 2001
From: k-chop <whelmaze@gmail.com>
Date: Wed, 7 Dec 2022 19:33:08 +0900
Subject: [PATCH 12/17] test

---
 src/components/ProgressDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ProgressDialog.vue b/src/components/ProgressDialog.vue
index 5b1e41a73d..80ccb8c068 100644
--- a/src/components/ProgressDialog.vue
+++ b/src/components/ProgressDialog.vue
@@ -6,8 +6,8 @@
         :value="progress"
         :min="0"
         :max="1"
-        font-size="12px"
         rounded
+        font-size="12px"
         color="primary"
         size="xl"
         :thickness="0.3"

From fe954f959e1b0ed856a2a1af488be535aa811737 Mon Sep 17 00:00:00 2001
From: k-chop <whelmaze@gmail.com>
Date: Thu, 8 Dec 2022 10:48:26 +0900
Subject: [PATCH 13/17] =?UTF-8?q?RESET=E5=BF=98=E3=82=8C=E3=81=8C=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E5=8C=85=E3=82=80=E9=96=A2?=
 =?UTF-8?q?=E6=95=B0=E3=82=92=E5=AE=9A=E7=BE=A9=E3=81=97=E3=81=A6=E3=81=9D?=
 =?UTF-8?q?=E3=81=A1=E3=82=89=E3=82=92=E4=BD=BF=E3=81=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialog.ts | 46 ++++++++++++++++++++++++----------------
 src/store/audio.ts       | 32 +++++++++++++++++++++-------
 src/store/type.ts        | 18 ++++++----------
 src/store/ui.ts          | 46 +++++++++++++++++++++-------------------
 4 files changed, 83 insertions(+), 59 deletions(-)

diff --git a/src/components/Dialog.ts b/src/components/Dialog.ts
index bb4b157873..5c648d0f56 100644
--- a/src/components/Dialog.ts
+++ b/src/components/Dialog.ts
@@ -7,6 +7,7 @@ import {
 import SaveAllResultDialog from "@/components/SaveAllResultDialog.vue";
 import { QVueGlobals } from "quasar";
 import { Dispatch } from "@/store/vuex";
+import { withProgress } from "@/store/ui";
 
 type QuasarDialog = QVueGlobals["dialog"];
 
@@ -23,12 +24,15 @@ export async function generateAndSaveOneAudioWithDialog({
   filePath?: string;
   encoding?: EncodingType;
 }): Promise<void> {
-  await dispatch("START_INDETERMINATE_PROGRESS");
-  const result: SaveResultObject = await dispatch("GENERATE_AND_SAVE_AUDIO", {
-    audioKey,
-    filePath,
-    encoding,
-  }).finally(() => dispatch("RESET_PROGRESS"));
+  const result: SaveResultObject = await withProgress(
+    dispatch("GENERATE_AND_SAVE_AUDIO", {
+      audioKey,
+      filePath,
+      encoding,
+    }),
+    dispatch,
+    "START_INDETERMINATE_PROGRESS"
+  );
 
   if (result.result === "SUCCESS" || result.result === "CANCELED") return;
   let msg = "";
@@ -67,12 +71,15 @@ export async function generateAndSaveAllAudioWithDialog({
   dirPath?: string;
   encoding?: EncodingType;
 }): Promise<void> {
-  await dispatch("START_AUDIO_ITEMS_PROGRESS");
-  const result = await dispatch("GENERATE_AND_SAVE_ALL_AUDIO", {
-    dirPath,
-    encoding,
-    callback: () => dispatch("INCREMENT_PROGRESS"),
-  }).finally(() => dispatch("RESET_PROGRESS"));
+  const result = await withProgress(
+    dispatch("GENERATE_AND_SAVE_ALL_AUDIO", {
+      dirPath,
+      encoding,
+      callback: (finishedCount, totalCount) =>
+        dispatch("SET_PROGRESS_FROM_COUNT", { finishedCount, totalCount }),
+    }),
+    dispatch
+  );
 
   const successArray: Array<string | undefined> = [];
   const writeErrorArray: Array<WriteErrorTypeForSaveAllResultDialog> = [];
@@ -127,12 +134,15 @@ export async function generateAndConnectAndSaveAudioWithDialog({
   filePath?: string;
   encoding?: EncodingType;
 }): Promise<void> {
-  await dispatch("START_AUDIO_ITEMS_PROGRESS");
-  const result = await dispatch("GENERATE_AND_CONNECT_AND_SAVE_AUDIO", {
-    filePath,
-    encoding,
-    callback: () => dispatch("INCREMENT_PROGRESS"),
-  }).finally(() => dispatch("RESET_PROGRESS"));
+  const result = await withProgress(
+    dispatch("GENERATE_AND_CONNECT_AND_SAVE_AUDIO", {
+      filePath,
+      encoding,
+      callback: (finishedCount, totalCount) =>
+        dispatch("SET_PROGRESS_FROM_COUNT", { finishedCount, totalCount }),
+    }),
+    dispatch
+  );
 
   if (
     result === undefined ||
diff --git a/src/store/audio.ts b/src/store/audio.ts
index 25072a6dce..68ed5899f4 100644
--- a/src/store/audio.ts
+++ b/src/store/audio.ts
@@ -12,7 +12,7 @@ import {
   AudioCommandStoreTypes,
   transformCommandStore,
 } from "./type";
-import { createUILockAction } from "./ui";
+import { createUILockAction, withProgress } from "./ui";
 import {
   CharacterInfo,
   DefaultStyleId,
@@ -1236,7 +1236,11 @@ export const audioStore = createPartialStore<AudioStoreTypes>({
           dirPath,
           encoding,
           callback,
-        }: { dirPath?: string; encoding?: EncodingType; callback?: () => void }
+        }: {
+          dirPath?: string;
+          encoding?: EncodingType;
+          callback?: (finishedCount: number, totalCount: number) => void;
+        }
       ) => {
         if (state.savingSetting.fixedExportEnabled) {
           dirPath = state.savingSetting.fixedExportDir;
@@ -1247,6 +1251,10 @@ export const audioStore = createPartialStore<AudioStoreTypes>({
         }
         if (dirPath) {
           const _dirPath = dirPath;
+
+          const totalCount = state.audioKeys.length;
+          let finishedCount = 0;
+
           const promises = state.audioKeys.map((audioKey) => {
             const name = buildFileName(state, audioKey);
             return dispatch("GENERATE_AND_SAVE_AUDIO", {
@@ -1254,7 +1262,7 @@ export const audioStore = createPartialStore<AudioStoreTypes>({
               filePath: path.join(_dirPath, name),
               encoding,
             }).then((value) => {
-              callback?.();
+              callback?.(++finishedCount, totalCount);
               return value;
             });
           });
@@ -1272,7 +1280,11 @@ export const audioStore = createPartialStore<AudioStoreTypes>({
           filePath,
           encoding,
           callback,
-        }: { filePath?: string; encoding?: EncodingType; callback?: () => void }
+        }: {
+          filePath?: string;
+          encoding?: EncodingType;
+          callback?: (finishedCount: number, totalCount: number) => void;
+        }
       ): Promise<SaveResultObject> => {
         const defaultFileName = buildProjectFileName(state, "wav");
 
@@ -1324,11 +1336,14 @@ export const audioStore = createPartialStore<AudioStoreTypes>({
           });
         };
 
+        const totalCount = state.audioKeys.length;
+        let finishedCount = 0;
+
         for (const audioKey of state.audioKeys) {
           let blob = await dispatch("GET_AUDIO_CACHE", { audioKey });
           if (!blob) {
             blob = await dispatch("GENERATE_AUDIO", { audioKey });
-            callback?.();
+            callback?.(++finishedCount, totalCount);
           }
           if (blob === null) {
             return { result: "ENGINE_ERROR", path: filePath };
@@ -1529,13 +1544,14 @@ export const audioStore = createPartialStore<AudioStoreTypes>({
         // 音声用意
         let blob = await dispatch("GET_AUDIO_CACHE", { audioKey });
         if (!blob) {
-          dispatch("START_INDETERMINATE_PROGRESS");
           commit("SET_AUDIO_NOW_GENERATING", {
             audioKey,
             nowGenerating: true,
           });
-          blob = await dispatch("GENERATE_AUDIO", { audioKey }).finally(() =>
-            dispatch("RESET_PROGRESS")
+          blob = await withProgress(
+            dispatch("GENERATE_AUDIO", { audioKey }),
+            dispatch,
+            "START_INDETERMINATE_PROGRESS"
           );
           commit("SET_AUDIO_NOW_GENERATING", {
             audioKey,
diff --git a/src/store/type.ts b/src/store/type.ts
index f629142dfb..bc29d00032 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -365,7 +365,7 @@ export type AudioStoreTypes = {
     action(payload: {
       dirPath?: string;
       encoding?: EncodingType;
-      callback?: () => void;
+      callback?: (finishedCount: number, totalCount: number) => void;
     }): SaveResultObject[] | undefined;
   };
 
@@ -373,7 +373,7 @@ export type AudioStoreTypes = {
     action(payload: {
       filePath?: string;
       encoding?: EncodingType;
-      callback?: () => void;
+      callback?: (finishedCount: number, totalCount: number) => void;
     }): SaveResultObject | undefined;
   };
 
@@ -1119,10 +1119,6 @@ export type UiStoreTypes = {
   };
 
   START_PROGRESS: {
-    action(payload: { count: number }): void;
-  };
-
-  START_AUDIO_ITEMS_PROGRESS: {
     action(): void;
   };
 
@@ -1130,13 +1126,13 @@ export type UiStoreTypes = {
     action(): void;
   };
 
-  INCREMENT_PROGRESS: {
-    action(): void;
+  SET_PROGRESS: {
+    mutation: { progress: number };
+    action(payload: { progress: number }): void;
   };
 
-  SET_PROGRESS: {
-    mutation: { progress: number; count?: number };
-    action(payload: { progress: number; count?: number }): void;
+  SET_PROGRESS_FROM_COUNT: {
+    action(payload: { finishedCount: number; totalCount: number }): void;
   };
 
   RESET_PROGRESS: {
diff --git a/src/store/ui.ts b/src/store/ui.ts
index df2d9e32de..e4cb256fee 100644
--- a/src/store/ui.ts
+++ b/src/store/ui.ts
@@ -1,4 +1,4 @@
-import { Action, ActionContext, ActionsBase } from "./vuex";
+import { Action, ActionContext, ActionsBase, Dispatch } from "./vuex";
 import {
   AllActions,
   AllGetters,
@@ -25,6 +25,17 @@ export function createUILockAction<S, A extends ActionsBase, K extends keyof A>(
   };
 }
 
+export function withProgress<T>(
+  action: Promise<T>,
+  dispatch: Dispatch<AllActions>,
+  startAction:
+    | "START_PROGRESS"
+    | "START_INDETERMINATE_PROGRESS" = "START_PROGRESS"
+): Promise<T> {
+  dispatch(startAction);
+  return action.finally(() => dispatch("RESET_PROGRESS"));
+}
+
 export const uiStoreState: UiStoreState = {
   uiLockCount: 0,
   dialogLockCount: 0,
@@ -332,21 +343,8 @@ export const uiStore = createPartialStore<UiStoreTypes>({
   },
 
   START_PROGRESS: {
-    action({ dispatch }, { count }) {
-      dispatch("SET_PROGRESS", { progress: 0, count });
-    },
-  },
-
-  START_AUDIO_ITEMS_PROGRESS: {
-    action({ dispatch, state }) {
-      dispatch("START_PROGRESS", { count: state.audioKeys.length });
-    },
-  },
-
-  INCREMENT_PROGRESS: {
-    action({ dispatch, state }) {
-      const step = 1.0 / state.progressCount;
-      dispatch("SET_PROGRESS", { progress: state.progress + step });
+    action({ dispatch }) {
+      dispatch("SET_PROGRESS", { progress: 0 });
     },
   },
 
@@ -357,19 +355,23 @@ export const uiStore = createPartialStore<UiStoreTypes>({
   },
 
   SET_PROGRESS: {
-    mutation(state, { progress, count }) {
+    mutation(state, { progress }) {
       state.progress = progress;
-      if (count != null) {
-        state.progressCount = count;
-      }
     },
-    action({ commit }, { progress, count }) {
-      commit("SET_PROGRESS", { progress, count });
+    action({ commit }, { progress }) {
+      commit("SET_PROGRESS", { progress });
+    },
+  },
+
+  SET_PROGRESS_FROM_COUNT: {
+    action({ commit }, { finishedCount, totalCount }) {
+      commit("SET_PROGRESS", { progress: finishedCount / totalCount });
     },
   },
 
   RESET_PROGRESS: {
     action({ dispatch }) {
+      // -1で非表示
       dispatch("SET_PROGRESS", { progress: -1 });
     },
   },

From ede4629ebfb555790e92a5b97d5a3f7d5a9923cb Mon Sep 17 00:00:00 2001
From: k-chop <whelmaze@gmail.com>
Date: Fri, 9 Dec 2022 08:20:08 +0900
Subject: [PATCH 14/17] =?UTF-8?q?=E7=B5=90=E6=9E=9C=E7=9A=84=E3=81=AB?=
 =?UTF-8?q?=E5=90=8C=E3=81=98=E5=AE=9F=E8=A3=85=E3=81=AB=E3=81=AA=E3=81=A3?=
 =?UTF-8?q?=E3=81=A6=E3=81=97=E3=81=BE=E3=81=A3=E3=81=9F=E3=81=AE=E3=81=A7?=
 =?UTF-8?q?START=5FINDETERMINATE=5FPROGRESS=E3=82=92=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将来OSのプログレスバーが完全対応されて（もしくはwindowsのみ対応で）導入されることになったら困るかもしれないがその時に対応する
---
 src/components/Dialog.ts |  4 ++--
 src/store/audio.ts       |  3 +--
 src/store/type.ts        |  4 ----
 src/store/ui.ts          | 13 ++-----------
 4 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/components/Dialog.ts b/src/components/Dialog.ts
index 5c648d0f56..9ac6fd05fa 100644
--- a/src/components/Dialog.ts
+++ b/src/components/Dialog.ts
@@ -30,12 +30,12 @@ export async function generateAndSaveOneAudioWithDialog({
       filePath,
       encoding,
     }),
-    dispatch,
-    "START_INDETERMINATE_PROGRESS"
+    dispatch
   );
 
   if (result.result === "SUCCESS" || result.result === "CANCELED") return;
   let msg = "";
+
   switch (result.result) {
     case "WRITE_ERROR":
       if (result.errorMessage) {
diff --git a/src/store/audio.ts b/src/store/audio.ts
index 68ed5899f4..494d833b7c 100644
--- a/src/store/audio.ts
+++ b/src/store/audio.ts
@@ -1550,8 +1550,7 @@ export const audioStore = createPartialStore<AudioStoreTypes>({
           });
           blob = await withProgress(
             dispatch("GENERATE_AUDIO", { audioKey }),
-            dispatch,
-            "START_INDETERMINATE_PROGRESS"
+            dispatch
           );
           commit("SET_AUDIO_NOW_GENERATING", {
             audioKey,
diff --git a/src/store/type.ts b/src/store/type.ts
index bc29d00032..0ac9dc9ab9 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -1122,10 +1122,6 @@ export type UiStoreTypes = {
     action(): void;
   };
 
-  START_INDETERMINATE_PROGRESS: {
-    action(): void;
-  };
-
   SET_PROGRESS: {
     mutation: { progress: number };
     action(payload: { progress: number }): void;
diff --git a/src/store/ui.ts b/src/store/ui.ts
index e4cb256fee..a1508c0a9b 100644
--- a/src/store/ui.ts
+++ b/src/store/ui.ts
@@ -27,12 +27,9 @@ export function createUILockAction<S, A extends ActionsBase, K extends keyof A>(
 
 export function withProgress<T>(
   action: Promise<T>,
-  dispatch: Dispatch<AllActions>,
-  startAction:
-    | "START_PROGRESS"
-    | "START_INDETERMINATE_PROGRESS" = "START_PROGRESS"
+  dispatch: Dispatch<AllActions>
 ): Promise<T> {
-  dispatch(startAction);
+  dispatch("START_PROGRESS");
   return action.finally(() => dispatch("RESET_PROGRESS"));
 }
 
@@ -348,12 +345,6 @@ export const uiStore = createPartialStore<UiStoreTypes>({
     },
   },
 
-  START_INDETERMINATE_PROGRESS: {
-    action({ dispatch }) {
-      dispatch("SET_PROGRESS", { progress: 0 });
-    },
-  },
-
   SET_PROGRESS: {
     mutation(state, { progress }) {
       state.progress = progress;

From 29221966fcf29094b64f085659edfeea9aa79496 Mon Sep 17 00:00:00 2001
From: k-chop <whelmaze@gmail.com>
Date: Fri, 9 Dec 2022 08:29:09 +0900
Subject: [PATCH 15/17] =?UTF-8?q?progress=E3=81=AE=E5=8F=96=E3=82=8A?=
 =?UTF-8?q?=E3=81=86=E3=82=8B=E7=AF=84=E5=9B=B2=E3=82=92=E6=98=8E=E7=A4=BA?=
 =?UTF-8?q?=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/ui.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/store/ui.ts b/src/store/ui.ts
index a1508c0a9b..a518277512 100644
--- a/src/store/ui.ts
+++ b/src/store/ui.ts
@@ -349,6 +349,7 @@ export const uiStore = createPartialStore<UiStoreTypes>({
     mutation(state, { progress }) {
       state.progress = progress;
     },
+    // progressは-1(非表示)と[0, 1]の範囲を取る
     action({ commit }, { progress }) {
       commit("SET_PROGRESS", { progress });
     },

From 5d84de4b1600638a978a74a478b7a0b5d1a2520e Mon Sep 17 00:00:00 2001
From: k-chop <whelmaze@gmail.com>
Date: Fri, 9 Dec 2022 08:33:29 +0900
Subject: [PATCH 16/17] =?UTF-8?q?=E9=87=8D=E8=A4=87=E3=81=97=E3=81=9F?=
 =?UTF-8?q?=E8=A8=98=E8=BF=B0=E3=82=92=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProgressDialog.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/ProgressDialog.vue b/src/components/ProgressDialog.vue
index 80ccb8c068..72d2c09f97 100644
--- a/src/components/ProgressDialog.vue
+++ b/src/components/ProgressDialog.vue
@@ -1,7 +1,8 @@
 <template>
   <div v-if="isShowProgress" class="progress">
-    <div v-if="isDeterminate">
+    <div>
       <q-circular-progress
+        v-if="isDeterminate"
         show-value
         :value="progress"
         :min="0"
@@ -14,10 +15,8 @@
       >
         {{ formattedProgress }}%
       </q-circular-progress>
-      <div class="q-mt-md">生成中です...</div>
-    </div>
-    <div v-if="!isDeterminate">
       <q-circular-progress
+        v-if="!isDeterminate"
         indeterminate
         color="primary"
         rounded

From 5cd951dd609169ce0d1838ded8ff41cbb7ae0e68 Mon Sep 17 00:00:00 2001
From: k-chop <whelmaze@gmail.com>
Date: Fri, 9 Dec 2022 19:59:37 +0900
Subject: [PATCH 17/17] =?UTF-8?q?=E4=BD=BF=E3=82=8F=E3=81=AA=E3=81=8F?=
 =?UTF-8?q?=E3=81=AA=E3=81=A3=E3=81=9Fstate=E3=81=AE=E6=B6=88=E3=81=97?=
 =?UTF-8?q?=E5=BF=98=E3=82=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/type.ts             | 1 -
 src/store/ui.ts               | 1 -
 tests/unit/store/Vuex.spec.ts | 1 -
 3 files changed, 3 deletions(-)

diff --git a/src/store/type.ts b/src/store/type.ts
index 0ac9dc9ab9..f4a1859105 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -982,7 +982,6 @@ export type UiStoreState = {
   isPinned: boolean;
   isFullscreen: boolean;
   progress: number;
-  progressCount: number;
 };
 
 export type UiStoreTypes = {
diff --git a/src/store/ui.ts b/src/store/ui.ts
index a518277512..d2697e5c77 100644
--- a/src/store/ui.ts
+++ b/src/store/ui.ts
@@ -53,7 +53,6 @@ export const uiStoreState: UiStoreState = {
   isPinned: false,
   isFullscreen: false,
   progress: -1,
-  progressCount: 0,
 };
 
 export const uiStore = createPartialStore<UiStoreTypes>({
diff --git a/tests/unit/store/Vuex.spec.ts b/tests/unit/store/Vuex.spec.ts
index e472cf8023..28e5c07677 100644
--- a/tests/unit/store/Vuex.spec.ts
+++ b/tests/unit/store/Vuex.spec.ts
@@ -123,7 +123,6 @@ describe("store/vuex.js test", () => {
           tweakableSliderByScroll: false,
         },
         progress: -1,
-        progressCount: 0,
       },
       getters: {
         ...uiStore.getters,