Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[refactor] ダイアログ系のコンポーネントを移動 #1780

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions docs/UI名称とVueファイル名の対応早見表.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@
- メニューの項目リスト ・・・ [MenuItem](../src/components/MenuItem.vue)
- メニューのボタン ・・・ [MenuButton](../src/components/MenuButton.vue)
- エンジン
- エンジンの管理 ・・・ [EngineManageDialog](../src/components/EngineManageDialog.vue)
- エンジンの管理 ・・・ [EngineManageDialog](../src/components/Dialog/EngineManageDialog.vue)
- 設定
- キー割り当て ・・・ [HotkeySettingDialog](../src/components/HotkeySettingDialog.vue)
- ツールバーのカスタマイズ ・・・ [HeaderBarCustomDialog](../src/components/HeaderBarCustomDialog.vue)
- キャラクター並び替え・試聴 ・・・ [CharacterOrderDialog](../src/components/CharacterOrderDialog.vue)
- サンプルボイス一覧の各キャラクター ・・・ [CharacterTryListenCard](../src/components/CharacterTryListenCard.vue)
- デフォルトスタイル ・・・ [DefaultStyleListDialog](../src/components/DefaultStyleListDialog.vue)
- 個別選択 ・・・ [DefaultStyleSelectDialog](../src/components/DefaultStyleSelectDialog.vue)
- 読み方&アクセント辞書 ・・・ [DictionaryManageDialog](../src/components/DictionaryManageDialog.vue)
- オプション ・・・ [SettingDialog](../src/components/SettingDialog.vue)
- 書き出しファイル名パターン ・・・ [FileNamePatternDialog](../src/components/FileNamePatternDialog.vue)
- キー割り当て ・・・ [HotkeySettingDialog](../src/components/Dialog/HotkeySettingDialog.vue)
- ツールバーのカスタマイズ ・・・ [HeaderBarCustomDialog](../src/components/Dialog/HeaderBarCustomDialog.vue)
- キャラクター並び替え・試聴 ・・・ [CharacterOrderDialog](../src/components/Dialog/CharacterOrderDialog.vue)
- サンプルボイス一覧の各キャラクター ・・・ [CharacterTryListenCard](../src/components/Dialog/CharacterTryListenCard.vue)
- デフォルトスタイル ・・・ [DefaultStyleListDialog](../src/components/Dialog/DefaultStyleListDialog.vue)
- 個別選択 ・・・ [DefaultStyleSelectDialog](../src/components/Dialog/DefaultStyleSelectDialog.vue)
- 読み方&アクセント辞書 ・・・ [DictionaryManageDialog](../src/components/Dialog/DictionaryManageDialog.vue)
- オプション ・・・ [SettingDialog](../src/components/Dialog/SettingDialog.vue)
- 書き出しファイル名パターン ・・・ [FileNamePatternDialog](../src/components/Dialog/FileNamePatternDialog.vue)
- ヘルプ ・・・ `help`ディレクトリ
- [HelpDialog](../src/components/help/HelpDialog.vue) の`pagedata`の`components`をご参照ください。
- [HelpDialog](../src/components/Dialog/HelpDialog/HelpDialog.vue) の`pagedata`の`components`をご参照ください。
- ウィンドウ右上のボタン群(ピンボタン含む) ・・・ [TitleBarButtons](../src/components/TitleBarButtons.vue)
- ピンボタン以外のボタン ・・・ [MinMaxCloseButtons](../src/components/MinMaxCloseButtons.vue)
- ツールバー ・・・ [HeaderBar](../src/components/HeaderBar.vue)
Expand All @@ -43,17 +43,17 @@
- キャラクターアイコン ・・・ [CharacterButton](../src/components/CharacterButton.vue)
- コンテキスト(右クリック)メニュー ・・・ [ContextMenu](../src/components/ContextMenu.vue)
- パラメータ調整欄 ・・・ [AudioInfo](../src/components/Talk/AudioInfo.vue)
- プリセット管理 ・・・ [PresetManageDialog](../src/components/PresetManageDialog.vue)
- プリセット管理 ・・・ [PresetManageDialog](../src/components/Dialog/PresetManageDialog.vue)
- 詳細調整欄(各項目・再生ボタンを含む) ・・・ [AudioDetail](../src/components/Talk/AudioDetail.vue)
- アクセント項目のうち、文字以外の部分の UI ・・・ [AudioAccent](../src/components/Talk/AudioAccent.vue)
- イントネーション・長さ項目のスライダー [AudioParameter](../src/components/Talk/AudioParameter.vue)
- その他
- 初回起動時に表示される画面
- 利用規約 ・・・ [AcceptTermsDialog](../src/components/AcceptTermsDialog.vue)
- データ収集とプライバシーポリシー ・・・ [AcceptRetrieveTelemetryDialog](../src/components/AcceptRetrieveTelemetryDialog.vue)
- 利用規約 ・・・ [AcceptTermsDialog](../src/components/Dialog/AcceptTermsDialog.vue)
- データ収集とプライバシーポリシー ・・・ [AcceptRetrieveTelemetryDialog](../src/components/Dialog/AcceptRetrieveTelemetryDialog.vue)
- 起動時に表示される画面
- 追加キャラクターの紹介 ・・・ [CharacterOrderDialog](../src/components/CharacterOrderDialog.vue)(設定 / キャラクター並び替え・試聴 と共通)
- 「音声書き出し」時の成否の通知 ・・・ [SaveAllResultDialog](../src/components/SaveAllResultDialog.vue)
- 追加キャラクターの紹介 ・・・ [CharacterOrderDialog](../src/components/Dialog/CharacterOrderDialog.vue)(設定 / キャラクター並び替え・試聴 と共通)
- 「音声書き出し」時の成否の通知 ・・・ [SaveAllResultDialog](../src/components/Dialog/SaveAllResultDialog.vue)
- 一度のみ表示されるヒント ・・・ [ToolTip](../src/components/ToolTip.vue)
- 音声生成中の進捗表示 ・・・ [ProgressDialog](../src/components/ProgressDialog.vue)
- 音声生成中の進捗表示 ・・・ [ProgressView](../src/components/ProgressView.vue)
- エラー記録用(UI には影響なし) ・・・ [ErrorBoundary](../src/components/ErrorBoundary.vue)
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@

<script setup lang="ts">
import { computed, ref, watch } from "vue";
import DefaultStyleSelectDialog from "./DefaultStyleSelectDialog.vue";
import { useStore } from "@/store";
import { DEFAULT_STYLE_NAME } from "@/store/utility";
import { CharacterInfo, SpeakerId, StyleInfo } from "@/type/preload";
import DefaultStyleSelectDialog from "@/components/DefaultStyleSelectDialog.vue";
const props =
defineProps<{
modelValue: boolean;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { Dialog, DialogChainObject, Notify, Loading } from "quasar";
import SaveAllResultDialog from "./SaveAllResultDialog.vue";
import { AudioKey, ConfirmedTips } from "@/type/preload";
import {
AllActions,
SaveResultObject,
SaveResult,
ErrorTypeForSaveAllResultDialog,
} from "@/store/type";
import SaveAllResultDialog from "@/components/SaveAllResultDialog.vue";
import { Dispatch } from "@/store/vuex";
import { withProgress } from "@/store/ui";

Expand Down
2 changes: 1 addition & 1 deletion src/components/HeaderBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
generateAndConnectAndSaveAudioWithDialog,
multiGenerateAndSaveAudioWithDialog,
generateAndSaveOneAudioWithDialog,
} from "./Dialog";
} from "@/components/Dialog/Dialog";
import { useStore } from "@/store";
import { setHotkeyFunctions } from "@/store/setting";
import {
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/components/Talk/AudioInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@
import { computed, ref, watchEffect } from "vue";
import { QSelectProps } from "quasar";
import CharacterButton from "@/components/CharacterButton.vue";
import PresetManageDialog from "@/components/PresetManageDialog.vue";
import PresetManageDialog from "@/components/Dialog/PresetManageDialog.vue";
import { useStore } from "@/store";

import {
Expand Down
26 changes: 13 additions & 13 deletions src/components/Talk/EditorHome.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<q-page-container>
<q-page class="main-row-panes">
<progress-dialog />
<progress-view />

<!-- TODO: 複数エンジン対応 -->
<!-- TODO: allEngineStateが "ERROR" のときエラーになったエンジンを探してトーストで案内 -->
Expand Down Expand Up @@ -195,18 +195,18 @@ import CharacterPortrait from "./CharacterPortrait.vue";
import { useStore } from "@/store";
import HeaderBar from "@/components/HeaderBar.vue";
import MenuBar from "@/components/Talk/MenuBar.vue";
import HelpDialog from "@/components/help/HelpDialog.vue";
import SettingDialog from "@/components/SettingDialog.vue";
import HotkeySettingDialog from "@/components/HotkeySettingDialog.vue";
import HeaderBarCustomDialog from "@/components/HeaderBarCustomDialog.vue";
import DefaultStyleListDialog from "@/components/DefaultStyleListDialog.vue";
import CharacterOrderDialog from "@/components/CharacterOrderDialog.vue";
import AcceptRetrieveTelemetryDialog from "@/components/AcceptRetrieveTelemetryDialog.vue";
import AcceptTermsDialog from "@/components/AcceptTermsDialog.vue";
import DictionaryManageDialog from "@/components/DictionaryManageDialog.vue";
import EngineManageDialog from "@/components/EngineManageDialog.vue";
import ProgressDialog from "@/components/ProgressDialog.vue";
import UpdateNotificationDialogContainer from "@/components/UpdateNotificationDialog/Container.vue";
import HelpDialog from "@/components/Dialog/HelpDialog/HelpDialog.vue";
import SettingDialog from "@/components/Dialog/SettingDialog.vue";
import HotkeySettingDialog from "@/components/Dialog/HotkeySettingDialog.vue";
import HeaderBarCustomDialog from "@/components/Dialog/HeaderBarCustomDialog.vue";
import DefaultStyleListDialog from "@/components/Dialog/DefaultStyleListDialog.vue";
import CharacterOrderDialog from "@/components/Dialog/CharacterOrderDialog.vue";
import AcceptRetrieveTelemetryDialog from "@/components/Dialog/AcceptRetrieveTelemetryDialog.vue";
import AcceptTermsDialog from "@/components/Dialog/AcceptTermsDialog.vue";
import DictionaryManageDialog from "@/components/Dialog/DictionaryManageDialog.vue";
import EngineManageDialog from "@/components/Dialog/EngineManageDialog.vue";
import ProgressView from "@/components/ProgressView.vue";
import UpdateNotificationDialogContainer from "@/components/Dialog/UpdateNotificationDialog/Container.vue";
import { AudioItem, EngineState } from "@/store/type";
import {
AudioKey,
Expand Down
2 changes: 1 addition & 1 deletion src/components/Talk/MenuBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
multiGenerateAndSaveAudioWithDialog,
generateAndSaveOneAudioWithDialog,
connectAndExportTextWithDialog,
} from "@/components/Dialog";
} from "@/components/Dialog/Dialog";
import BaseMenuBar, { MenuItemData } from "@/components/BaseMenuBar.vue";

import { useStore } from "@/store";
Expand Down
2 changes: 1 addition & 1 deletion src/store/type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ import {
CommonDialogResult,
NotifyAndNotShowAgainButtonOption,
LoadingScreenOption,
} from "@/components/Dialog";
} from "@/components/Dialog/Dialog";

/**
* エディタ用のAudioQuery
Expand Down
2 changes: 1 addition & 1 deletion src/store/ui.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
showLoadingScreen,
showNotifyAndNotShowAgainButton,
showWarningDialog,
} from "@/components/Dialog";
} from "@/components/Dialog/Dialog";

export function createUILockAction<S, A extends ActionsBase, K extends keyof A>(
action: (
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/components/UpdateNotificationDialog.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
import { describe, it } from "vitest";
import { Quasar } from "quasar";

import UpdateNotificationDialogPresentation from "@/components/UpdateNotificationDialog/Presentation.vue";
import UpdateNotificationDialogPresentation from "@/components/Dialog/UpdateNotificationDialog/Presentation.vue";
import { assertNonNullable } from "@/type/utility";

const mountUpdateNotificationDialogPresentation = async (context?: {
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/components/help/HowToUse.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { createStore } from "vuex";
import { describe, it } from "vitest";
import { Quasar } from "quasar";
import { wrapQPage } from "../../utils";
import HowToUse from "@/components/help/HowToUse.vue";
import HowToUse from "@/components/Dialog/HelpDialog/HowToUse.vue";
import { markdownItPlugin } from "@/plugins/markdownItPlugin";
import { storeKey } from "@/store";

Expand Down
Loading