From ff242c364521fee4543854ad5ed8494e17827d86 Mon Sep 17 00:00:00 2001
From: tsukumi <tsukumijima@users.noreply.github.com>
Date: Sun, 1 Dec 2024 16:10:54 +0900
Subject: [PATCH] =?UTF-8?q?Fix:=20=E3=83=80=E3=82=A4=E3=83=A4=E3=83=AD?=
 =?UTF-8?q?=E3=82=B0=E5=91=A8=E3=82=8A=E3=81=AE=E3=82=B9=E3=82=BF=E3=82=A4?=
 =?UTF-8?q?=E3=83=AB=E3=81=A8=E3=83=AA=E3=82=B0=E3=83=AC=E3=83=83=E3=82=B7?=
 =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/backend/electron/manager/engineInfoManager.ts |  3 +++
 src/components/Dialog/DictionaryManageDialog.vue  |  2 +-
 src/components/Dialog/EngineManageDialog.vue      |  2 +-
 src/components/Dialog/HotkeySettingDialog.vue     |  2 +-
 src/components/Dialog/ModelManageDialog.vue       |  2 +-
 .../Dialog/TextDialog/MessageDialog.vue           | 13 ++++++++++---
 .../Dialog/TextDialog/QuestionDialog.vue          | 15 ++++++++++++---
 src/components/Dialog/TextDialog/common.ts        |  1 +
 src/components/Dialog/ToolBarCustomDialog.vue     |  4 ++--
 src/components/EngineStartupOverlay.vue           |  2 +-
 src/components/Menu/MenuBar/MenuBar.vue           |  2 +-
 src/components/Talk/AudioInfo.vue                 |  2 +-
 src/components/Talk/menuBarData.ts                |  2 +-
 src/styles/_index.scss                            |  4 ++++
 14 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/src/backend/electron/manager/engineInfoManager.ts b/src/backend/electron/manager/engineInfoManager.ts
index 331a37eb..ce146649 100644
--- a/src/backend/electron/manager/engineInfoManager.ts
+++ b/src/backend/electron/manager/engineInfoManager.ts
@@ -105,6 +105,9 @@ export class EngineInfoManager {
     const engineInfos: EngineInfo[] = [];
     for (const dirName of fs.readdirSync(this.vvppEngineDir)) {
       const engineDir = path.join(this.vvppEngineDir, dirName);
+      if (dirName === ".DS_Store") {
+        continue;
+      }
       if (!fs.statSync(engineDir).isDirectory()) {
         log.log(`${engineDir} is not directory`);
         continue;
diff --git a/src/components/Dialog/DictionaryManageDialog.vue b/src/components/Dialog/DictionaryManageDialog.vue
index 07bd47b2..1e505291 100644
--- a/src/components/Dialog/DictionaryManageDialog.vue
+++ b/src/components/Dialog/DictionaryManageDialog.vue
@@ -36,7 +36,7 @@
           <div v-if="loadingDictState" class="loading-dict">
             <div>
               <QSpinner color="primary" size="2.5rem" />
-              <div class="q-mt-xs">
+              <div class="q-mt-sm">
                 <template v-if="loadingDictState === 'loading'"
                   >読み込み中...</template
                 >
diff --git a/src/components/Dialog/EngineManageDialog.vue b/src/components/Dialog/EngineManageDialog.vue
index e61301c9..ac0a660f 100644
--- a/src/components/Dialog/EngineManageDialog.vue
+++ b/src/components/Dialog/EngineManageDialog.vue
@@ -37,7 +37,7 @@
           <div v-if="uiLockedState" class="ui-lock-popup">
             <div class="q-pa-md">
               <QSpinner color="primary" size="2.5rem" />
-              <div class="q-mt-xs">
+              <div class="q-mt-sm">
                 <template v-if="uiLockedState === 'addingEngine'">
                   音声合成エンジンを追加しています...
                 </template>
diff --git a/src/components/Dialog/HotkeySettingDialog.vue b/src/components/Dialog/HotkeySettingDialog.vue
index f8f6df96..08f18878 100644
--- a/src/components/Dialog/HotkeySettingDialog.vue
+++ b/src/components/Dialog/HotkeySettingDialog.vue
@@ -31,7 +31,7 @@
             <template #append>
               <QIcon
                 v-if="hotkeyFilter !== ''"
-                name="close"
+                name="sym_r_close"
                 class="cursor-pointer"
                 @click="hotkeyFilter = ''"
               />
diff --git a/src/components/Dialog/ModelManageDialog.vue b/src/components/Dialog/ModelManageDialog.vue
index 9114d256..7ef43a2f 100644
--- a/src/components/Dialog/ModelManageDialog.vue
+++ b/src/components/Dialog/ModelManageDialog.vue
@@ -382,7 +382,7 @@ const unInstallAivmModel = async () => {
   }
   const result = await store.actions.SHOW_CONFIRM_DIALOG({
     title: "アンインストールの確認",
-    message: '本当に音声合成モデル「${activeAivmInfo.value?.manifest.name}」をアンインストールしますか？\n' +
+    message: `本当に音声合成モデル「${activeAivmInfo.value?.manifest.name}」をアンインストールしますか？\n` +
              'アンインストールすると、この音声合成モデル内の話者/スタイルは再度インストールするまで使えなくなります。',
     actionName: "アンインストール",
   });
diff --git a/src/components/Dialog/TextDialog/MessageDialog.vue b/src/components/Dialog/TextDialog/MessageDialog.vue
index bd4d6a8b..885fdbdc 100644
--- a/src/components/Dialog/TextDialog/MessageDialog.vue
+++ b/src/components/Dialog/TextDialog/MessageDialog.vue
@@ -11,10 +11,10 @@
     @hide="onDialogHide"
   >
     <QCard class="q-py-sm q-px-md dialog-card">
-      <QCardSection class="title">
+      <QCardSection class="message-dialog-title">
         <QIcon
           v-if="props.type !== 'none'"
-          :name="iconName"
+          :name="`sym_r_${iconName}`"
           class="text-h5 q-mr-sm"
           :color
         />
@@ -71,13 +71,20 @@ function onOk() {
 }
 </script>
 
+<style lang="scss">
+.message-dialog-title .material-symbols-rounded {
+  font-size: 1.9rem !important;
+}
+</style>
+
 <style scoped lang="scss">
-.title {
+.message-dialog-title {
   display: flex;
   align-items: center;
 }
 
 .message {
+  word-break: break-all;
   white-space: pre-wrap;
 }
 </style>
diff --git a/src/components/Dialog/TextDialog/QuestionDialog.vue b/src/components/Dialog/TextDialog/QuestionDialog.vue
index 9e422f26..5cbfeaa0 100644
--- a/src/components/Dialog/TextDialog/QuestionDialog.vue
+++ b/src/components/Dialog/TextDialog/QuestionDialog.vue
@@ -11,7 +11,7 @@
     @hide="onDialogHide"
   >
     <QCard class="q-py-sm q-px-md dialog-card">
-      <QCardSection class="title">
+      <QCardSection class="question-dialog-title">
         <QIcon
           v-if="props.type !== 'none'"
           :name="`sym_r_${iconName}`"
@@ -32,7 +32,8 @@
           :key="index"
           flat
           :label="button"
-          color="display"
+          :color="index === props.buttons.length - 1 ? 'toolbar-button' : 'display'"
+          :textColor="index === props.buttons.length - 1 ? 'toolbar-button-display' : undefined"
           class="text-no-wrap text-bold"
           @click="onClick(index)"
         />
@@ -86,13 +87,21 @@ const onClick = (index: number) => {
   onDialogOK({ index });
 };
 </script>
+
+<style lang="scss">
+.question-dialog-title .material-symbols-rounded {
+  font-size: 1.9rem !important;
+}
+</style>
+
 <style scoped lang="scss">
-.title {
+.question-dialog-title {
   display: flex;
   align-items: center;
 }
 
 .message {
+  word-break: break-all;
   white-space: pre-wrap;
 }
 </style>
diff --git a/src/components/Dialog/TextDialog/common.ts b/src/components/Dialog/TextDialog/common.ts
index a995cf2d..ab896547 100644
--- a/src/components/Dialog/TextDialog/common.ts
+++ b/src/components/Dialog/TextDialog/common.ts
@@ -25,6 +25,7 @@ export const getColor = (dialogType: DialogType) => {
       // TODO：warning用の色を用意する
       return "warning";
     case "question":
+      return "warning";
     case "info":
     case "none":
       return "display";
diff --git a/src/components/Dialog/ToolBarCustomDialog.vue b/src/components/Dialog/ToolBarCustomDialog.vue
index 4410664a..ff063611 100644
--- a/src/components/Dialog/ToolBarCustomDialog.vue
+++ b/src/components/Dialog/ToolBarCustomDialog.vue
@@ -224,8 +224,8 @@ watch(
 
 const applyDefaultSetting = async () => {
   const result = await store.actions.SHOW_CONFIRM_DIALOG({
-    title: "ツールバーをデフォルトに戻します",
-    message: "ツールバーをデフォルトに戻します。\nよろしいですか？",
+    title: "ツールバーの順序をリセット",
+    message: "ツールバーの順序をデフォルトに戻します。\nよろしいですか？",
     actionName: "はい",
     cancel: "いいえ",
   });
diff --git a/src/components/EngineStartupOverlay.vue b/src/components/EngineStartupOverlay.vue
index 599fbe9d..8c0ff9a9 100644
--- a/src/components/EngineStartupOverlay.vue
+++ b/src/components/EngineStartupOverlay.vue
@@ -14,7 +14,7 @@
   >
     <div>
       <QSpinner color="primary" size="2.5rem" />
-      <div class="q-mt-xs">
+      <div class="q-mt-sm">
         {{
           allEngineState === "STARTING"
             ? "音声合成エンジン起動中..."
diff --git a/src/components/Menu/MenuBar/MenuBar.vue b/src/components/Menu/MenuBar/MenuBar.vue
index d711c42d..29d0b057 100644
--- a/src/components/Menu/MenuBar/MenuBar.vue
+++ b/src/components/Menu/MenuBar/MenuBar.vue
@@ -296,7 +296,7 @@ const engineSubMenuData = computed<MenuItemData[]>(() => {
   }
   subMenu.push( {
     type: "button",
-    label: "話者リストを更新",
+    label: "話者リストを再読み込み",
     async onClick() {
       await store.actions.LOAD_CHARACTER({ engineId: store.getters.DEFAULT_ENGINE_ID });
       await store.actions.LOAD_DEFAULT_STYLE_IDS();
diff --git a/src/components/Talk/AudioInfo.vue b/src/components/Talk/AudioInfo.vue
index 4cec22ec..985f785b 100644
--- a/src/components/Talk/AudioInfo.vue
+++ b/src/components/Talk/AudioInfo.vue
@@ -128,7 +128,7 @@
       <!-- プリセット再登録ダイアログ -->
       <QDialog v-model="showsPresetRewriteDialog" @beforeHide="closeAllDialog">
         <QCard>
-          <QCardSection>
+          <QCardSection class="q-pb-none">
             <div class="text-h6">プリセットの再登録</div>
           </QCardSection>
           <QCardSection>
diff --git a/src/components/Talk/menuBarData.ts b/src/components/Talk/menuBarData.ts
index 95e74361..b7616c00 100644
--- a/src/components/Talk/menuBarData.ts
+++ b/src/components/Talk/menuBarData.ts
@@ -63,7 +63,7 @@ export const useMenuBarData = () => {
   const viewSubMenuData = computed<MenuItemData[]>(() => [
     {
       type: "button",
-      label: showTextLineNumber.value ? "行番号を非表示" : "行番号を表示",
+      label: showTextLineNumber.value ? "行番号を隠す" : "行番号を表示",
       onClick: () => {
         changeShowTextLineNumber(!showTextLineNumber.value);
       },
diff --git a/src/styles/_index.scss b/src/styles/_index.scss
index 2747eb9f..275180b6 100644
--- a/src/styles/_index.scss
+++ b/src/styles/_index.scss
@@ -297,6 +297,10 @@ img {
   background: colors.$warning;
 }
 
+.text-warning-light {
+  color: #f2be74;
+}
+
 .text-toolbar {
   color: colors.$toolbar;
 }