Skip to content

Commit

Permalink
Fix: ダイヤログ周りのスタイルとリグレッションを修正
Browse files Browse the repository at this point in the history
  • Loading branch information
tsukumijima committed Dec 1, 2024
1 parent be788e2 commit ff242c3
Show file tree
Hide file tree
Showing 14 changed files with 40 additions and 16 deletions.
3 changes: 3 additions & 0 deletions src/backend/electron/manager/engineInfoManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Dialog/DictionaryManageDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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
>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Dialog/EngineManageDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Dialog/HotkeySettingDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<template #append>
<QIcon
v-if="hotkeyFilter !== ''"
name="close"
name="sym_r_close"
class="cursor-pointer"
@click="hotkeyFilter = ''"
/>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Dialog/ModelManageDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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: "アンインストール",
});
Expand Down
13 changes: 10 additions & 3 deletions src/components/Dialog/TextDialog/MessageDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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
/>
Expand Down Expand Up @@ -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>
15 changes: 12 additions & 3 deletions src/components/Dialog/TextDialog/QuestionDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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}`"
Expand All @@ -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)"
/>
Expand Down Expand Up @@ -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>
1 change: 1 addition & 0 deletions src/components/Dialog/TextDialog/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export const getColor = (dialogType: DialogType) => {
// TODO:warning用の色を用意する
return "warning";
case "question":
return "warning";
case "info":
case "none":
return "display";
Expand Down
4 changes: 2 additions & 2 deletions src/components/Dialog/ToolBarCustomDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,8 @@ watch(
const applyDefaultSetting = async () => {
const result = await store.actions.SHOW_CONFIRM_DIALOG({
title: "ツールバーをデフォルトに戻します",
message: "ツールバーをデフォルトに戻します\nよろしいですか?",
title: "ツールバーの順序をリセット",
message: "ツールバーの順序をデフォルトに戻します\nよろしいですか?",
actionName: "はい",
cancel: "いいえ",
});
Expand Down
2 changes: 1 addition & 1 deletion src/components/EngineStartupOverlay.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
>
<div>
<QSpinner color="primary" size="2.5rem" />
<div class="q-mt-xs">
<div class="q-mt-sm">
{{
allEngineState === "STARTING"
? "音声合成エンジン起動中..."
Expand Down
2 changes: 1 addition & 1 deletion src/components/Menu/MenuBar/MenuBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/components/Talk/AudioInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
<!-- プリセット再登録ダイアログ -->
<QDialog v-model="showsPresetRewriteDialog" @beforeHide="closeAllDialog">
<QCard>
<QCardSection>
<QCardSection class="q-pb-none">
<div class="text-h6">プリセットの再登録</div>
</QCardSection>
<QCardSection>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Talk/menuBarData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export const useMenuBarData = () => {
const viewSubMenuData = computed<MenuItemData[]>(() => [
{
type: "button",
label: showTextLineNumber.value ? "行番号を非表示" : "行番号を表示",
label: showTextLineNumber.value ? "行番号を隠す" : "行番号を表示",
onClick: () => {
changeShowTextLineNumber(!showTextLineNumber.value);
},
Expand Down
4 changes: 4 additions & 0 deletions src/styles/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,10 @@ img {
background: colors.$warning;
}

.text-warning-light {
color: #f2be74;
}

.text-toolbar {
color: colors.$toolbar;
}
Expand Down

0 comments on commit ff242c3

Please sign in to comment.