Confirict 0.6.0 (VOICEVOX#251)

* To 0.6.0 (VOICEVOX#242) * update openapi * update updateInfos.json * update htu * update design * update version * [HOTFIX(for developer)]add publish option (fixed owner and repo, remove version's "v") (VOICEVOX#245) * add publish option (fixed owner and repo, remove version's "v") * Apply suggestions from code review Co-authored-by: Hiroshiba <[email protected]> Co-authored-by: Yuto Ashida <[email protected]>
cm-ayf · Sep 21, 2021 · 7f00036 · 7f00036
1 parent 68a0482
commit 7f00036
Show file tree

Hide file tree

Showing 22 changed files with 233 additions and 171 deletions.
diff --git a/openapi.json b/openapi.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "voicevox",
-  "version": "0.5.3",
+  "version": "0.6.0",
   "author": "Hiroshiba Kazuyuki",
   "private": true,
   "engines": {

diff --git a/public/updateInfos.json b/public/updateInfos.json
@@ -1,4 +1,35 @@
 [
+  {
+    "version": "0.6.0",
+    "descriptions": [
+      "音声書き出し先を固定する機能を追加",
+      "前後の無音の長さ調整機能を追加",
+      "アクセント変更時に影響のないイントネーションを固定",
+      "読みを修正できる機能を追加",
+      "インストーラのUX向上",
+      "音声合成時のメモリ使用量の削減",
+      "コアライブラリの機能追加",
+      "音声合成エンジンの機能追加",
+      "開発環境の向上"
+    ],
+    "contributors": [
+      "aoirint",
+      "buckw6eat",
+      "eggplants",
+      "Hiroshiba",
+      "HyodaKazuaki",
+      "isnot",
+      "k-kuroguro",
+      "MT224244",
+      "oov",
+      "Patchethium",
+      "Segu-g",
+      "takana-v",
+      "tantan-tanuki",
+      "y-chan",
+      "Yosshi999"
+    ]
+  },
   {
     "version": "0.5.3",
     "descriptions": [

diff --git a/src/components/AudioAccent.vue b/src/components/AudioAccent.vue
@@ -62,7 +62,7 @@
 
 <script lang="ts">
 import { PreviewableValue } from "@/helpers/previewableValue";
-import { defineComponent, computed, ref, onMounted, onUnmounted } from "vue";
+import { defineComponent, computed, onMounted, onUnmounted } from "vue";
 
 export default defineComponent({
   name: "AudioAccent",

diff --git a/src/components/AudioDetail.vue b/src/components/AudioDetail.vue
@@ -93,6 +93,8 @@
                 v-if="selectedDetail == 'accent' && !uiLocked"
                 :model-value="pronunciationByPhrase[accentPhraseIndex]"
                 auto-save
+                transition-show="none"
+                transition-hide="none"
                 v-slot="scope"
                 @save="handleChangePronounce($event, accentPhraseIndex)"
               >
@@ -460,15 +462,15 @@ $pitch-label-height: 24px;
           grid-row-start: 3;
           text-align: center;
           color: global.$secondary;
-          transition: color 0.5s;
         }
         &.text-cell-hovered {
           min-width: 30px;
           max-width: 30px;
           grid-row-start: 3;
           text-align: center;
-          color: $teal;
-          transition: color 0.5s;
+          color: global.$secondary;
+          font-weight: bold;
+          cursor: pointer;
         }
         &.splitter-cell {
           min-width: 10px;

diff --git a/src/components/AudioInfo.vue b/src/components/AudioInfo.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="root full-height q-py-sm" v-show="activeAudioKey" v-if="query">
+  <div class="root full-height q-py-md" v-show="activeAudioKey" v-if="query">
     <div class="q-px-md">
       <span class="text-body1 q-mb-xs"
         >話速 {{ previewAudioSpeedScale.currentValue.value.toFixed(1) }}</span
@@ -79,15 +79,15 @@
     </div>
     <div class="q-px-md">
       <span class="text-body1 q-mb-xs"
-        >無音時間（前）
+        >開始無音
         {{ previewAudioPrePhonemeLength.currentValue.value.toFixed(2) }}</span
       >
       <q-slider
         dense
         snap
         :min="0"
-        :max="2"
-        :step="0.05"
+        :max="1.5"
+        :step="0.1"
         :disable="uiLocked"
         :model-value="previewAudioPrePhonemeLength.currentValue.value"
         @update:model-value="
@@ -102,15 +102,15 @@
     </div>
     <div class="q-px-md">
       <span class="text-body1 q-mb-xs"
-        >無音時間（後）
+        >終了無音
         {{ previewAudioPostPhonemeLength.currentValue.value.toFixed(2) }}</span
       >
       <q-slider
         dense
         snap
         :min="0"
-        :max="2"
-        :step="0.05"
+        :max="1.5"
+        :step="0.1"
         :disable="uiLocked"
         :model-value="previewAudioPostPhonemeLength.currentValue.value"
         @update:model-value="
@@ -295,18 +295,18 @@ export default defineComponent({
         }
         case "prePhoneme": {
           let curPrePhoneme =
-            query.prePhonemeLength - (delta_y > 0 ? 0.05 : -0.05);
+            query.prePhonemeLength - (delta_y > 0 ? 0.1 : -0.1);
           curPrePhoneme = Math.round(curPrePhoneme * 1e2) / 1e2;
-          if (2 >= curPrePhoneme && curPrePhoneme >= 0) {
+          if (1.5 >= curPrePhoneme && curPrePhoneme >= 0) {
             setAudioPrePhonemeLength(curPrePhoneme);
           }
           break;
         }
         case "postPhoneme": {
           let curPostPhoneme =
-            query.postPhonemeLength - (delta_y > 0 ? 0.05 : -0.05);
+            query.postPhonemeLength - (delta_y > 0 ? 0.1 : -0.1);
           curPostPhoneme = Math.round(curPostPhoneme * 1e2) / 1e2;
-          if (2 >= curPostPhoneme && curPostPhoneme >= 0) {
+          if (1.5 >= curPostPhoneme && curPostPhoneme >= 0) {
             setAudioPostPhonemeLength(curPostPhoneme);
           }
           break;
@@ -348,9 +348,8 @@ export default defineComponent({
   display: flex;
   flex-direction: column;
   align-items: stretch;
-  justify-content: flex-end;
+  justify-content: flex-start;
   gap: 15px 0;
-  overflow: hidden;
-  bottom: 0;
+  overflow-y: scroll;
 }
 </style>
diff --git a/src/components/HelpDialog.vue b/src/components/HelpDialog.vue
@@ -1,5 +1,12 @@
 <template>
-  <q-dialog maximized class="help-dialog" v-model="modelValueComputed">
+  <q-dialog
+    maximized
+    seamless
+    transition-show="none"
+    transition-hide="none"
+    class="help-dialog"
+    v-model="modelValueComputed"
+  >
     <q-layout container view="lHh Lpr lff" class="bg-white">
       <q-drawer
         bordered

diff --git a/src/components/HowToUse.vue b/src/components/HowToUse.vue
@@ -11,7 +11,7 @@
           <p>ソフトウェアの使い方は以下をご参照ください。</p>
           <p>
             <a
-              href="https://docs.google.com/document/d/1WvhABjWP-z9mZjDjkTMAw81x-U2DNFrT1GPsOPLYQcA/edit?usp=sharing"
+              href="https://docs.google.com/document/d/1fWAvkehrmEoBAVV5IK6-zG-RKI-Y6lez1pCJl4_AWdo/edit?usp=sharing"
               target="_blank"
               >使い方</a
             >

diff --git a/src/components/SettingDialog.vue b/src/components/SettingDialog.vue
@@ -1,16 +1,16 @@
 <template>
   <q-dialog
     maximized
-    persistent
+    seamless
+    transition-show="none"
+    transition-hide="none"
     class="setting-dialog"
     v-model="settingDialogOpenedComputed"
-    transition-show="slide-up"
-    transition-hide="slide-down"
   >
     <q-layout container view="hHh Lpr fFf" class="bg-white">
       <q-header class="q-pa-sm" elevated>
         <q-toolbar>
-          <q-toolbar-title class="text-secondary">オプション</q-toolbar-title>
+          <q-toolbar-title class="text-secondary">設定</q-toolbar-title>
           <q-space />
           <!-- close button -->
           <q-btn
@@ -25,35 +25,32 @@
         <q-page ref="scroller" class="relative-absolute-wrapper scroller">
           <div class="q-pa-md row items-start q-gutter-md">
             <!-- Engine Mode Card -->
-            <q-card class="setting-card">
-              <q-card-section class="bg-nvidia">
+            <q-card flat bordered class="setting-card">
+              <q-card-section>
                 <div class="text-h5">エンジン</div>
                 <div class="text-subtitle2">
-                  GPUモードには <b>NVIDIA&trade;</b> GPUが必要です
+                  GPUモードの利用には NVIDIA&trade; GPU が必要です
                 </div>
               </q-card-section>
-
               <q-separator />
               <q-card-actions class="q-px-md">
-                <q-radio
-                  v-model="engineMode"
-                  color="green"
-                  val="switchCPU"
-                  label="CPU"
-                />
-                <q-radio
+                <q-option-group
                   v-model="engineMode"
-                  color="green"
-                  val="switchGPU"
-                  label="GPU"
+                  :options="[
+                    { label: 'CPUモード', value: 'switchCPU' },
+                    { label: 'GPUモード', value: 'switchGPU' },
+                  ]"
+                  type="radio"
                 />
               </q-card-actions>
             </q-card>
+
             <!-- Saving Card -->
-            <q-card class="setting-card">
-              <q-card-section class="bg-blue">
+            <q-card flat bordered class="setting-card">
+              <q-card-section>
                 <div class="text-h5">保存</div>
               </q-card-section>
+              <q-separator />
               <q-list>
                 <q-expansion-item
                   dense
@@ -64,19 +61,19 @@
                   expand-icon-class="text-black"
                 >
                   <q-card>
-                    <q-card-section>
-                      <q-btn-toggle
-                        :model-value="savingSetting.fileEncoding"
-                        toggle-color="blue"
+                    <q-card-actions class="q-px-md">
+                      <q-option-group
+                        type="radio"
                         :options="[
                           { label: 'UTF-8', value: 'UTF-8' },
                           { label: 'Shift_JIS', value: 'Shift_JIS' },
                         ]"
+                        :model-value="savingSetting.fileEncoding"
                         @update:model-value="
                           handleSavingSettingChange('fileEncoding', $event)
                         "
                       />
-                    </q-card-section>
+                    </q-card-actions>
                   </q-card>
                 </q-expansion-item>
 
@@ -93,14 +90,8 @@
                       <q-toggle
                         name="enabled"
                         align="left"
-                        dense
-                        color="blue"
+                        label="書き出し先を固定"
                         :model-value="savingSetting.fixedExportEnabled"
-                        :label="
-                          savingSetting.fixedExportEnabled
-                            ? '固定する'
-                            : '固定しない'
-                        "
                         @update:model-value="
                           handleSavingSettingChange(
                             'fixedExportEnabled',
@@ -110,7 +101,6 @@
                       />
                       <q-input
                         unelevated
-                        dense
                         no-error-icon
                         v-model="savingSetting.fixedExportDir"
                         label="書き出し先のフォルダ"
@@ -119,22 +109,17 @@
                         @update:model-value="
                           handleSavingSettingChange('fixedExportDir', $event)
                         "
-                        color="blue"
                       >
                         <template v-slot:after>
                           <q-btn
                             square
                             dense
                             flat
-                            color="blue"
+                            color="primary"
                             icon="folder_open"
                             @click="openFileExplore"
                           >
-                            <q-tooltip
-                              :delay="500"
-                              class="bg-blue text-body2"
-                              anchor="bottom right"
-                            >
+                            <q-tooltip :delay="500" anchor="bottom right">
                               フォルダ選択
                             </q-tooltip>
                           </q-btn>
@@ -157,16 +142,14 @@
                     <q-card-section>
                       <q-checkbox
                         class="q-pl-md q-pb-sm"
-                        dense
-                        color="blue"
+                        label="上書き防止"
                         :model-value="savingSetting.avoidOverwrite"
                         @update:model-value="
                           handleSavingSettingChange('avoidOverwrite', $event)
                         "
                       />
-                      <q-separator color="black" />
                       <div class="q-pt-sm">
-                        上書きせずにファイルを連番にします
+                        上書きせずにファイルを連番で保存します
                       </div>
                     </q-card-section>
                   </q-card>
@@ -340,31 +323,7 @@ export default defineComponent({
 
 .setting-card {
   width: 100%;
-  max-width: 265px;
-}
-
-.text-nvidia {
-  color: #76b900;
-}
-
-.bg-nvidia {
-  background: #76b900;
-}
-
-.q-expansion-item {
-  background-color: white;
-  color: black;
-}
-
-.q-expansion-item--expanded {
-  border: 1px solid #000000;
-  border-color: $blue;
-  background-color: white;
-  color: $blue;
-}
-
-.q-expansion-item * {
-  background-color: white;
-  color: black;
+  max-width: 350px;
+  border-color: #aaa;
 }
 </style>