設定に入れたペースト時の挙動を変える項目を「保存」から「操作」に移動 (#781)

* add detectNvidia function

* follow to menu bar

* remove no longer a variable

* run fmt

* fix typo

* remove utils.ts and some changes in background.ts

* change message box type and detail, and change behaviour of setOnLaunchModeItemClicked

* recreate package-lock.json using node 12.18.2

* re recreate package-lock.json using node 12.18.2 and npm 7.20.5

* recreate package-lock.json using node 12.18.2 and npm 6.14.5

* recreate package-lock.json using node 12.18.2 and npm 7.20.3

* fix conflict

* move splitTextWhenPaste from saving to 操作

* add restore from store feature

* change place of process of init splitTextWhenPaste

* move init process to Home.vue's onMounted

* move process of initial splitTextWhenPaste, at Home.vue to store/index.ts

* fix conflict

* Revert "fix conflict"

This reverts commit 7f6cd34.

* refix conflict

src/background.ts

@@ -35,6 +35,7 @@ import {
   ToolbarSetting,
   ActivePointScrollMode,
   EngineInfo,
+  SplitTextWhenPasteType,
   SplitterPosition,
 } from "./type/preload";
 
@@ -208,6 +209,7 @@ const store = new Store<{
   experimentalSetting: ExperimentalSetting;
   acceptRetrieveTelemetry: AcceptRetrieveTelemetryStatus;
   acceptTerms: AcceptTermsStatus;
+  splitTextWhenPaste: SplitTextWhenPasteType;
   splitterPosition: SplitterPosition;
 }>({
   schema: {
@@ -240,11 +242,6 @@ const store = new Store<{
         outputStereo: { type: "boolean", default: false },
         outputSamplingRate: { type: "number", default: 24000 },
         audioOutputDevice: { type: "string", default: "default" },
-        splitTextWhenPaste: {
-          type: "string",
-          enum: ["PERIOD_AND_NEW_LINE", "NEW_LINE", "OFF"],
-          default: "PERIOD_AND_NEW_LINE",
-        },
       },
       default: {
         fileEncoding: "UTF-8",
@@ -360,6 +357,11 @@ const store = new Store<{
       enum: ["Unconfirmed", "Accepted", "Rejected"],
       default: "Unconfirmed",
     },
+    splitTextWhenPaste: {
+      type: "string",
+      enum: ["PERIOD_AND_NEW_LINE", "NEW_LINE", "OFF"],
+      default: "PERIOD_AND_NEW_LINE",
+    },
     splitterPosition: {
       type: "object",
       properties: {
@@ -1183,6 +1185,14 @@ ipcMainHandle("SET_EXPERIMENTAL_SETTING", (_, experimentalSetting) => {
   store.set("experimentalSetting", experimentalSetting);
 });
 
+ipcMainHandle("GET_SPLIT_TEXT_WHEN_PASTE", () => {
+  return store.get("splitTextWhenPaste");
+});
+
+ipcMainHandle("SET_SPLIT_TEXT_WHEN_PASTE", (_, splitTextWhenPaste) => {
+  store.set("splitTextWhenPaste", splitTextWhenPaste);
+});
+
 ipcMainHandle("GET_SPLITTER_POSITION", () => {
   return store.get("splitterPosition");
 });

src/components/AudioCell.vue

@@ -278,9 +278,7 @@ export default defineComponent({
       store.dispatch("STOP_AUDIO", { audioKey: props.audioKey });
     };
 
-    const isEnableSplitText = computed(
-      () => store.state.savingSetting.splitTextWhenPaste
-    );
+    const isEnableSplitText = computed(() => store.state.splitTextWhenPaste);
     // コピペしたときに句点と改行で区切る
     const pasteOnAudioCell = async (event: ClipboardEvent) => {
       if (event.clipboardData && isEnableSplitText.value !== "OFF") {

src/components/SettingDialog.vue

@@ -155,6 +155,85 @@
                   </q-radio>
                 </div>
               </q-card-actions>
+              <q-card-actions class="q-px-md q-py-sm bg-setting-item">
+                <div>分割の挙動</div>
+                <div>
+                  <q-icon
+                    name="help_outline"
+                    color="grey-8"
+                    size="sm"
+                    class="help-hover-icon"
+                  >
+                    <q-tooltip
+                      :delay="500"
+                      anchor="center left"
+                      self="center right"
+                      transition-show="jump-left"
+                      transition-hide="jump-right"
+                    >
+                      テキストを貼り付け時に行われる分割の挙動を変えます
+                    </q-tooltip>
+                  </q-icon>
+                </div>
+                <q-space />
+                <q-btn-toggle
+                  padding="xs md"
+                  unelevated
+                  :model-value="splitTextWhenPaste"
+                  @update:model-value="changeSplitTextWhenPaste($event)"
+                  color="white"
+                  text-color="black"
+                  toggle-color="primary"
+                  toggle-text-color="display"
+                  :options="[
+                    {
+                      label: '句点と改行',
+                      value: 'PERIOD_AND_NEW_LINE',
+                      slot: 'splitTextPeriodAndNewLine',
+                    },
+                    {
+                      label: '改行',
+                      value: 'NEW_LINE',
+                      slot: 'splitTextNewLine',
+                    },
+                    { label: 'オフ', value: 'OFF', slot: 'splitTextOFF' },
+                  ]"
+                >
+                  <template v-slot:splitTextPeriodAndNewLine>
+                    <q-tooltip
+                      :delay="500"
+                      anchor="center left"
+                      self="center right"
+                      transition-show="jump-left"
+                      transition-hide="jump-right"
+                    >
+                      句点と改行を基にテキストを分割します。
+                    </q-tooltip>
+                  </template>
+                  <template v-slot:splitTextNewLine>
+                    <q-tooltip
+                      :delay="500"
+                      anchor="center left"
+                      self="center right"
+                      transition-show="jump-left"
+                      transition-hide="jump-right"
+                    >
+                      改行のみを基にテキストを分割します。
+                    </q-tooltip>
+                  </template>
+                  <template v-slot:splitTextOFF>
+                    <q-tooltip
+                      :delay="500"
+                      anchor="center left"
+                      self="center right"
+                      transition-show="jump-left"
+                      transition-hide="jump-right"
+                    >
+                      分割を行いません。
+                    </q-tooltip>
+                  </template>
+                </q-btn-toggle>
+              </q-card-actions>
             </q-card>
             <!-- Saving Card -->
             <q-card flat class="setting-card">
@@ -353,87 +432,6 @@
                 >
                 </q-toggle>
               </q-card-actions>
-              <q-card-actions class="q-px-md q-py-sm bg-setting-item">
-                <div>分割の挙動</div>
-                <div>
-                  <q-icon
-                    name="help_outline"
-                    color="grey-8"
-                    size="sm"
-                    class="help-hover-icon"
-                  >
-                    <q-tooltip
-                      :delay="500"
-                      anchor="center left"
-                      self="center right"
-                      transition-show="jump-left"
-                      transition-hide="jump-right"
-                    >
-                      テキストを貼り付け時に行われる分割の挙動を変えます
-                    </q-tooltip>
-                  </q-icon>
-                </div>
-                <q-space />
-                <q-btn-toggle
-                  padding="xs md"
-                  unelevated
-                  :model-value="savingSetting.splitTextWhenPaste"
-                  @update:model-value="
-                    handleSavingSettingChange('splitTextWhenPaste', $event)
-                  "
-                  color="white"
-                  text-color="black"
-                  toggle-color="primary"
-                  toggle-text-color="display"
-                  :options="[
-                    {
-                      label: '句点と改行',
-                      value: 'PERIOD_AND_NEW_LINE',
-                      slot: 'splitTextPeriodAndNewLine',
-                    },
-                    {
-                      label: '改行',
-                      value: 'NEW_LINE',
-                      slot: 'splitTextNewLine',
-                    },
-                    { label: 'オフ', value: 'OFF', slot: 'splitTextOFF' },
-                  ]"
-                >
-                  <template v-slot:splitTextPeriodAndNewLine>
-                    <q-tooltip
-                      :delay="500"
-                      anchor="center left"
-                      self="center right"
-                      transition-show="jump-left"
-                      transition-hide="jump-right"
-                    >
-                      句点と改行を基にテキストを分割します。
-                    </q-tooltip>
-                  </template>
-                  <template v-slot:splitTextNewLine>
-                    <q-tooltip
-                      :delay="500"
-                      anchor="center left"
-                      self="center right"
-                      transition-show="jump-left"
-                      transition-hide="jump-right"
-                    >
-                      改行のみを基にテキストを分割します。
-                    </q-tooltip>
-                  </template>
-                  <template v-slot:splitTextOFF>
-                    <q-tooltip
-                      :delay="500"
-                      anchor="center left"
-                      self="center right"
-                      transition-show="jump-left"
-                      transition-hide="jump-right"
-                    >
-                      分割を行いません。
-                    </q-tooltip>
-                  </template>
-                </q-btn-toggle>
-              </q-card-actions>
             </q-card>
             <!-- Experimental Card -->
             <q-card flat class="setting-card">
@@ -680,6 +678,7 @@ import {
   SavingSetting,
   ExperimentalSetting,
   ActivePointScrollMode,
+  SplitTextWhenPasteType,
 } from "@/type/preload";
 
 export default defineComponent({
@@ -943,6 +942,18 @@ export default defineComponent({
       }
     };
 
+    const splitTextWhenPaste = computed(() => store.state.splitTextWhenPaste);
+    const changeSplitTextWhenPaste = async (
+      splitTextWhenPaste: SplitTextWhenPasteType
+    ) => {
+      if (
+        splitTextWhenPaste === (await window.electron.getSplitTextWhenPaste())
+      )
+        return;
+
+      store.dispatch("SET_SPLIT_TEXT_WHEN_PASTE", { splitTextWhenPaste });
+    };
+
     return {
       settingDialogOpenedComputed,
       engineMode,
@@ -962,6 +973,8 @@ export default defineComponent({
       currentThemeComputed,
       availableThemeNameComputed,
       acceptRetrieveTelemetryComputed,
+      splitTextWhenPaste,
+      changeSplitTextWhenPaste,
     };
   },
 });

src/electron/preload.ts

@@ -286,6 +286,16 @@ const api: Sandbox = {
   vuexReady: () => {
     ipcRenderer.invoke("ON_VUEX_READY");
   },
+
+  getSplitTextWhenPaste: async () => {
+    return await ipcRendererInvoke("GET_SPLIT_TEXT_WHEN_PASTE");
+  },
+  setSplitTextWhenPaste: async (splitTextWhenPaste) => {
+    return await ipcRendererInvoke(
+      "SET_SPLIT_TEXT_WHEN_PASTE",
+      splitTextWhenPaste
+    );
+  },
 };
 
 contextBridge.exposeInMainWorld("electron", api);

src/store/index.ts

@@ -177,6 +177,7 @@ export const indexStore: VoiceVoxStoreOptions<
       promises.push(dispatch("GET_ACCEPT_RETRIEVE_TELEMETRY"));
       promises.push(dispatch("GET_ACCEPT_TERMS"));
       promises.push(dispatch("GET_EXPERIMENTAL_SETTING"));
+      promises.push(dispatch("INIT_SPLIT_TEXT_WHEN_PASTE"));
       promises.push(dispatch("GET_SPLITTER_POSITION"));
 
       await Promise.all(promises).then(() => {

src/store/setting.ts

@@ -32,7 +32,6 @@ export const settingStoreState: SettingStoreState = {
     outputStereo: false,
     outputSamplingRate: 24000,
     audioOutputDevice: "default",
-    splitTextWhenPaste: "PERIOD_AND_NEW_LINE",
   },
   hotkeySettings: [],
   toolbarSetting: [],
@@ -46,6 +45,7 @@ export const settingStoreState: SettingStoreState = {
     enablePreset: false,
     enableInterrogativeUpspeak: false,
   },
+  splitTextWhenPaste: "PERIOD_AND_NEW_LINE",
   splitterPosition: {
     audioDetailPaneHeight: undefined,
     audioInfoPaneWidth: undefined,
@@ -107,6 +107,9 @@ export const settingStore: VoiceVoxStoreOptions<
     SET_ACCEPT_TERMS(state, { acceptTerms }) {
       state.acceptTerms = acceptTerms;
     },
+    SET_SPLIT_TEXT_WHEN_PASTE(state, { splitTextWhenPaste }) {
+      state.splitTextWhenPaste = splitTextWhenPaste;
+    },
     SET_SPLITTER_POSITION(state, { splitterPosition }) {
       state.splitterPosition = splitterPosition;
     },
@@ -245,6 +248,15 @@ export const settingStore: VoiceVoxStoreOptions<
       window.electron.setExperimentalSetting(experimentalSetting);
       commit("SET_EXPERIMENTAL_SETTING", { experimentalSetting });
     },
+    INIT_SPLIT_TEXT_WHEN_PASTE({ dispatch }) {
+      window.electron.getSplitTextWhenPaste().then((v) => {
+        dispatch("SET_SPLIT_TEXT_WHEN_PASTE", { splitTextWhenPaste: v });
+      });
+    },
+    SET_SPLIT_TEXT_WHEN_PASTE({ commit }, { splitTextWhenPaste }) {
+      window.electron.setSplitTextWhenPaste(splitTextWhenPaste);
+      commit("SET_SPLIT_TEXT_WHEN_PASTE", { splitTextWhenPaste });
+    },
     GET_SPLITTER_POSITION({ dispatch }) {
       window.electron.getSplitterPosition().then((splitterPosition) => {
         dispatch("SET_SPLITTER_POSITION", { splitterPosition });

src/store/type.ts

@@ -25,6 +25,7 @@ import {
   Preset,
   ActivePointScrollMode,
   EngineInfo,
+  SplitTextWhenPasteType,
   SplitterPosition,
 } from "@/type/preload";
 import { IEngineConnectorFactory } from "@/infrastructures/EngineConnector";
@@ -768,6 +769,7 @@ export type SettingStoreState = {
   themeSetting: ThemeSetting;
   acceptRetrieveTelemetry: AcceptRetrieveTelemetryStatus;
   experimentalSetting: ExperimentalSetting;
+  splitTextWhenPaste: SplitTextWhenPasteType;
   splitterPosition: SplitterPosition;
 };
 
@@ -838,6 +840,14 @@ type SettingStoreTypes = {
     action(payload: { experimentalSetting: ExperimentalSetting }): void;
   };
 
+  INIT_SPLIT_TEXT_WHEN_PASTE: {
+    action(): void;
+  };
+  SET_SPLIT_TEXT_WHEN_PASTE: {
+    mutation: { splitTextWhenPaste: SplitTextWhenPasteType };
+    action(payload: { splitTextWhenPaste: SplitTextWhenPasteType }): void;
+  };
+
   GET_SPLITTER_POSITION: {
     action(): void;
   };

src/type/ipc.d.ts

@@ -1,4 +1,4 @@
-import { EngineInfo } from "@/type/preload";
+import { EngineInfo, SplitTextWhenPasteType } from "@/type/preload";
 
 /**
  * invoke, handle
@@ -281,6 +281,15 @@ type IpcIHData = {
     args: [];
     return: void;
   };
+
+  GET_SPLIT_TEXT_WHEN_PASTE: {
+    args: [];
+    return: SplitTextWhenPasteType;
+  };
+  SET_SPLIT_TEXT_WHEN_PASTE: {
+    args: [splitTextWhenPaste: SplitTextWhenPasteType];
+    return: void;
+  };
 };
 
 /**