diff --git a/src/backend/electron/main.ts b/src/backend/electron/main.ts index 24a142f2..4e934323 100644 --- a/src/backend/electron/main.ts +++ b/src/backend/electron/main.ts @@ -867,7 +867,7 @@ app.on("ready", async () => { message: `設定ファイルの読み込みに失敗しました。${app.getPath( "userData", )} にある config.json の名前を変えることで解決することがあります(ただし設定がすべてリセットされます)。設定ファイルがあるフォルダを開きますか?`, - buttons: ["いいえ", "はい"], + buttons: ["キャンセル", "設定ファイルがあるフォルダを開く"], noLink: true, cancelId: 0, }) diff --git a/src/components/Dialog/Dialog.ts b/src/components/Dialog/Dialog.ts index 3e2b8715..a187479b 100644 --- a/src/components/Dialog/Dialog.ts +++ b/src/components/Dialog/Dialog.ts @@ -295,7 +295,7 @@ const showWriteErrorDialog = ({ if (mediaType === "text") { // テキスト書き出し時のエラーを出力 void actions.SHOW_ALERT_DIALOG({ - title: "テキストの書き出しに失敗しました。", + title: "テキストの書き出しに失敗しました", message: "書き込みエラーによって失敗しました。空き容量があることや、書き込み権限があることをご確認ください。", }); @@ -311,7 +311,7 @@ const showWriteErrorDialog = ({ // 音声書き出し時のエラーを出力 void actions.SHOW_ALERT_DIALOG({ - title: "書き出しに失敗しました。", + title: "書き出しに失敗しました", message: result.errorMessage ?? defaultErrorMessages[result.result] ?? "", }); } diff --git a/src/components/Dialog/DictionaryManageDialog.vue b/src/components/Dialog/DictionaryManageDialog.vue index 1e505291..e9ee0b39 100644 --- a/src/components/Dialog/DictionaryManageDialog.vue +++ b/src/components/Dialog/DictionaryManageDialog.vue @@ -36,7 +36,7 @@
-
+
@@ -771,7 +771,7 @@ const { color: colors.$display; background: colors.$background; border-radius: 6px; - padding: 14px; + padding: 16px 20px; } } diff --git a/src/components/Dialog/EngineManageDialog.vue b/src/components/Dialog/EngineManageDialog.vue index ac0a660f..0698cd54 100644 --- a/src/components/Dialog/EngineManageDialog.vue +++ b/src/components/Dialog/EngineManageDialog.vue @@ -35,9 +35,9 @@
-
+
-
+
@@ -775,6 +775,7 @@ function findDefaultEngineId() { color: colors.$display; background: colors.$background; border-radius: 6px; + padding: 16px 20px; } } diff --git a/src/components/Dialog/HotkeySettingDialog.vue b/src/components/Dialog/HotkeySettingDialog.vue index 08f18878..ea17151c 100644 --- a/src/components/Dialog/HotkeySettingDialog.vue +++ b/src/components/Dialog/HotkeySettingDialog.vue @@ -262,10 +262,10 @@ const setHotkeyDialogOpened = () => { const resetHotkey = async (action: string) => { const result = await store.actions.SHOW_CONFIRM_DIALOG({ - title: "ショートカットキーを初期値に戻します", - message: `${action}のショートカットキーを初期値に戻します。\n本当に戻しますか?`, - actionName: "初期値に戻す", - cancel: "初期値に戻さない", + title: "ショートカットキーをリセット", + message: `「${action}」のショートカットキーをデフォルトに戻します。\nよろしいですか?`, + actionName: "リセット", + cancel: "キャンセル", }); if (result === "OK") { void window.backend diff --git a/src/components/Dialog/PresetManageDialog.vue b/src/components/Dialog/PresetManageDialog.vue index cb3b81c9..281be57d 100644 --- a/src/components/Dialog/PresetManageDialog.vue +++ b/src/components/Dialog/PresetManageDialog.vue @@ -1,8 +1,8 @@
@@ -123,7 +123,7 @@ const openQa = () => { color: colors.$display; background: colors.$background; border-radius: 6px; - padding: 14px; + padding: 16px 20px; } } diff --git a/src/components/ProgressView.vue b/src/components/ProgressView.vue index 249e52e6..0d250973 100644 --- a/src/components/ProgressView.vue +++ b/src/components/ProgressView.vue @@ -11,7 +11,7 @@ font-size="12px" color="primary" size="xl" - :thickness="0.3" + :thickness="0.25" > {{ formattedProgress }}% @@ -20,8 +20,8 @@ indeterminate color="primary" rounded - :thickness="0.3" size="xl" + :thickness="0.25" />
音声合成中...
@@ -86,9 +86,8 @@ const formattedProgress = computed(() => > div { color: colors.$display; background: colors.$background; - width: 200px; border-radius: 6px; - padding: 14px 48px; + padding: 16px 32px; } } diff --git a/src/components/Talk/AudioInfo.vue b/src/components/Talk/AudioInfo.vue index 985f785b..0d62aee1 100644 --- a/src/components/Talk/AudioInfo.vue +++ b/src/components/Talk/AudioInfo.vue @@ -90,7 +90,7 @@ - +
プリセット登録
@@ -112,14 +112,22 @@ /> - + - +
@@ -127,13 +135,13 @@ - +
プリセットの再登録
- + @@ -141,7 +149,7 @@ プリセットを再登録し、このプリセットが設定されたテキスト欄全てに再適用する - + @@ -150,7 +158,7 @@ diff --git a/src/components/Talk/TalkEditor.vue b/src/components/Talk/TalkEditor.vue index 3a4b9d57..0650dd6a 100644 --- a/src/components/Talk/TalkEditor.vue +++ b/src/components/Talk/TalkEditor.vue @@ -161,19 +161,19 @@ const { registerHotkeyWithCleanup } = useHotkeyManager(); registerHotkeyWithCleanup({ editor: "talk", - name: "音声書き出し", + name: "選択音声を書き出し", callback: () => { if (!uiLocked.value) { - void store.actions.SHOW_GENERATE_AND_SAVE_ALL_AUDIO_DIALOG(); + void store.actions.SHOW_GENERATE_AND_SAVE_SELECTED_AUDIO_DIALOG(); } }, }); registerHotkeyWithCleanup({ editor: "talk", - name: "選択音声を書き出し", + name: "音声書き出し", callback: () => { if (!uiLocked.value) { - void store.actions.SHOW_GENERATE_AND_SAVE_SELECTED_AUDIO_DIALOG(); + void store.actions.SHOW_GENERATE_AND_SAVE_ALL_AUDIO_DIALOG(); } }, }); diff --git a/src/components/Talk/menuBarData.ts b/src/components/Talk/menuBarData.ts index b7616c00..d61706b7 100644 --- a/src/components/Talk/menuBarData.ts +++ b/src/components/Talk/menuBarData.ts @@ -11,17 +11,17 @@ export const useMenuBarData = () => { const fileSubMenuData = computed(() => [ { type: "button", - label: "音声書き出し", + label: "選択音声を書き出し", onClick: () => { - void store.actions.SHOW_GENERATE_AND_SAVE_ALL_AUDIO_DIALOG(); + void store.actions.SHOW_GENERATE_AND_SAVE_SELECTED_AUDIO_DIALOG(); }, disableWhenUiLocked: true, }, { type: "button", - label: "選択音声を書き出し", + label: "音声書き出し", onClick: () => { - void store.actions.SHOW_GENERATE_AND_SAVE_SELECTED_AUDIO_DIALOG(); + void store.actions.SHOW_GENERATE_AND_SAVE_ALL_AUDIO_DIALOG(); }, disableWhenUiLocked: true, }, diff --git a/src/store/project.ts b/src/store/project.ts index 1dece80e..c27353fc 100755 --- a/src/store/project.ts +++ b/src/store/project.ts @@ -355,7 +355,7 @@ export const projectStore = createPartialStore({ message += "\n変更を保存しますか?"; const result: number = await showQuestionDialog({ - type: "info", + type: "warning", title: "警告", message, buttons: ["キャンセル", "破棄", "保存"], diff --git a/src/styles/_index.scss b/src/styles/_index.scss index 275180b6..2f962402 100644 --- a/src/styles/_index.scss +++ b/src/styles/_index.scss @@ -120,6 +120,19 @@ img { .q-layout-container { box-shadow: none; } + + .q-loading__box { + padding: 16px 20px !important; + .q-spinner { + width: 2.5rem !important; + height: 2.5rem !important; + } + .q-loading__message { + margin-top: 12px !important; + margin-left: 0 !important; + margin-right: 0 !important; + } + } } .transparent-backdrop > .q-dialog__backdrop { diff --git a/src/type/preload.ts b/src/type/preload.ts index de9df0a3..9c27477a 100644 --- a/src/type/preload.ts +++ b/src/type/preload.ts @@ -56,14 +56,14 @@ export const actionPostfixSelectNthCharacter = "番目の話者を選択"; // ホットキーを追加したときは設定のマイグレーションが必要 export const defaultHotkeySettings: HotkeySettingType[] = [ - { - action: "音声書き出し", - combination: HotkeyCombination(!isMac ? "Ctrl E" : "Meta E"), - }, { action: "選択音声を書き出し", combination: HotkeyCombination("E"), }, + { + action: "音声書き出し", + combination: HotkeyCombination(!isMac ? "Ctrl E" : "Meta E"), + }, { action: "音声をつなげて書き出し", combination: HotkeyCombination(!isMac ? "Ctrl Shift E" : "Meta Shift E"), @@ -426,8 +426,8 @@ export type MorphableTargetInfoTable = Record< >; export const hotkeyActionNameSchema = z.enum([ - "音声書き出し", "選択音声を書き出し", + "音声書き出し", "音声をつなげて書き出し", "再生/停止", "連続再生/停止",