Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
dd1c268
DefaultStyleListDialogを削除
takusea Jan 25, 2025
c512518
Update CharacterTryListenCard.vue
takusea Jan 25, 2025
1014854
Update DefaultStyleSelectDialog.vue
takusea Jan 25, 2025
2095e65
Update CharacterOrderDialog.vue
takusea Jan 25, 2025
f503c21
スクロールバーの長さが変わらない不具合を修正
takusea Jan 25, 2025
d367087
[update snapshots]
takusea Jan 25, 2025
1d7efb0
e2eでキャラ管理ダイアログが閉じられないのを修正
takusea Jan 26, 2025
0c31596
キャラクター関連ダイアログのテストを更新
takusea Jan 26, 2025
40fad6e
メニューバーのダイアログの名称を更新
takusea Jan 26, 2025
10dd817
新キャラ追加時に並び順の初期状態を保存するように変更
takusea Jan 26, 2025
36f553f
テスト内のタイトルバーのソングボタンの取得方法を更新
takusea Jan 26, 2025
1691f8a
戻るボタンの位置を左に変更
takusea Feb 24, 2025
66a43cb
キャラカードのデザインを変更
takusea Feb 24, 2025
aeb185c
キャラカード間のgapを増やす
takusea Feb 24, 2025
8511528
キャラクター並び替えを元のレイアウトに戻す
takusea Feb 24, 2025
31deb64
ホバー時の詳細表示の案内を追加
takusea Feb 24, 2025
2d40b93
不要な記述を削除
takusea Feb 25, 2025
56d470d
キャラ名も詳細移動のクリック範囲に含めるよう変更
takusea Feb 25, 2025
c683586
サンプル音声ラベルの追加
takusea Mar 18, 2025
2d633f9
見出しをデフォルトスタイルに変更
takusea Mar 18, 2025
eb81057
ダイアログの名前を変更
takusea Mar 18, 2025
dd2019a
デザインを調整
takusea Mar 18, 2025
4e84989
ダイアログの閉じるボタンを以前のデザインに寄せる
takusea Mar 18, 2025
da35bb6
ボタンのラベルが折り返すように変更
takusea Mar 18, 2025
cee5af0
TODOコメントを追加
takusea Mar 21, 2025
9da9741
Revert "DefaultStyleListDialogを削除"
takusea Apr 5, 2025
061cab8
Merge branch 'main' into redesign-character-manage-dialog
takusea Apr 5, 2025
9cc6622
キャラクター・スタイルの管理のメニューを追加
takusea Apr 8, 2025
8e6c976
lintエラーを修正
takusea Apr 8, 2025
6c1d547
Update useCommonMenuBarData.ts
takusea Apr 10, 2025
511bc29
[update snapshots]
Hiroshiba Apr 12, 2025
485ecd0
Merge branch 'main' into redesign-character-manage-dialog
Hiroshiba Apr 18, 2025
7152b98
refactor(ui): スタイル選択ダイアログの状態管理を改善
Hiroshiba Apr 19, 2025
6bedf7c
refactor(ui): スタイル選択ダイアログの状態管理を改善
Hiroshiba Apr 19, 2025
6c19d7e
コメントを追加
takusea Apr 20, 2025
f5cf30f
Merge pull request #4 from Hiroshiba/hiho-counter-pr-7152b981
takusea Apr 20, 2025
121c103
Merge branch 'redesign-character-manage-dialog' of https://github.com…
takusea Apr 20, 2025
fcad854
NEWの表示位置を修正
takusea Apr 20, 2025
6cb77a1
不要な記述を削除
takusea Apr 20, 2025
c80546b
メニュー表示の条件を修正
takusea Apr 20, 2025
270557e
テストを修正
takusea Apr 20, 2025
73558c5
talkのみのstylesを変数として定義し移動
takusea Apr 20, 2025
f52a782
Delete DefaultStyleListDialog.vue
takusea Apr 22, 2025
df3aac7
Update src/components/Dialog/DefaultStyleSelectDialog.vue
takusea Apr 22, 2025
23b1563
Merge branch 'redesign-character-manage-dialog' of https://github.com…
takusea Apr 22, 2025
f7c4226
refactor: 新しいキャラクターを認識済みにする処理を分離
Hiroshiba May 2, 2025
be47ccf
Merge pull request #5 from Hiroshiba/hiho-counter-pr-f7c42261
takusea May 2, 2025
6aa9c4c
Merge branch 'main' into redesign-character-manage-dialog
Hiroshiba May 2, 2025
69f3f09
refactor(dialog): 不要なインポートを削除
Hiroshiba May 2, 2025
cb44371
Apply suggestions from code review
Hiroshiba May 2, 2025
71fed0f
Update src/components/Dialog/DefaultStyleSelectDialog.vue
Hiroshiba May 2, 2025
05947e7
不要な記述を削除
takusea May 3, 2025
e6c1827
Update src/components/Dialog/CharacterOrderDialog.vue
Hiroshiba May 7, 2025
1f604dc
Update src/components/Dialog/CharacterOrderDialog.vue
Hiroshiba May 7, 2025
cdbc88b
Merge branch 'main' into redesign-character-manage-dialog
Hiroshiba May 7, 2025
45d4234
ファイル名を変更
takusea May 8, 2025
3d31818
不要なコメントを削除
takusea May 8, 2025
bb49689
OldDefaultStyleSelectDialogを追加
takusea May 8, 2025
e8f9eb1
Update CharacterListDialog.vue
takusea May 8, 2025
9f2918f
OldDialog用の開閉フラグを追加
takusea May 8, 2025
f1136d8
CharacterOrderDialogの開閉フラグ名を変更
takusea May 8, 2025
83460ea
[update snapshots]
Hiroshiba May 8, 2025
64e3cc4
(スナップショットを更新)
github-actions[bot] May 8, 2025
8b87031
Apply suggestions from code review
Hiroshiba May 8, 2025
da4f1a4
[update snapshots]
Hiroshiba May 8, 2025
5e48fb2
(スナップショットを更新)
github-actions[bot] May 8, 2025
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
3 changes: 1 addition & 2 deletions src/components/Base/BaseButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ defineEmits<{
display: flex;
justify-content: center;
align-items: center;
text-wrap: nowrap;
height: vars.$size-control;
min-height: vars.$size-control;
border-radius: vars.$radius-1;
padding: 0 vars.$padding-2;
gap: vars.$gap-1;
Expand Down
41 changes: 28 additions & 13 deletions src/components/Dialog/AllDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,19 @@
<ToolBarCustomDialog
v-model:dialogOpened="isToolbarSettingDialogOpenComputed"
/>
<CharacterListDialog
v-if="orderedAllCharacterInfos.length > 0"
v-model:dialogOpened="isCharacterListDialogOpenComputed"
:characterInfos="orderedAllCharacterInfos"
/>
<CharacterOrderDialog
v-if="orderedAllCharacterInfos.length > 0"
v-model:dialogOpened="isCharacterOrderDialogOpenComputed"
v-model:dialogOpened="isOldCharacterOrderDialogOpenComputed"
:characterInfos="orderedAllCharacterInfos"
/>
<DefaultStyleListDialog
v-if="orderedTalkCharacterInfos.length > 0"
v-model:dialogOpened="isDefaultStyleSelectDialogOpenComputed"
v-model:dialogOpened="isOldDefaultStyleSelectDialogOpenComputed"
:characterInfos="orderedTalkCharacterInfos"
/>
<DictionaryManageDialog
Expand All @@ -39,6 +44,7 @@ import SettingDialog from "@/components/Dialog/SettingDialog/SettingDialog.vue";
import HotkeySettingDialog from "@/components/Dialog/HotkeySettingDialog.vue";
import ToolBarCustomDialog from "@/components/Dialog/ToolBarCustomDialog.vue";
import DefaultStyleListDialog from "@/components/Dialog/OldDefaultStyleListDialog.vue";
import CharacterListDialog from "@/components/Dialog/CharacterListDialog.vue";
import CharacterOrderDialog from "@/components/Dialog/OldCharacterOrderDialog.vue";
import AcceptRetrieveTelemetryDialog from "@/components/Dialog/AcceptDialog/AcceptRetrieveTelemetryDialog.vue";
import AcceptTermsDialog from "@/components/Dialog/AcceptDialog/AcceptTermsDialog.vue";
Expand Down Expand Up @@ -90,17 +96,26 @@ const isAcceptTermsDialogOpenComputed = computed({
}),
});

// キャラクター・スタイルの管理
const isCharacterListDialogOpenComputed = computed({
get: () => store.state.isCharacterListDialogOpen,
set: (val) =>
store.actions.SET_DIALOG_OPEN({
isCharacterListDialogOpen: val,
}),
});

// キャラクター並び替え
const orderedAllCharacterInfos = computed(
() => store.getters.GET_ORDERED_ALL_CHARACTER_INFOS,
);
const isCharacterOrderDialogOpenComputed = computed({
const isOldCharacterOrderDialogOpenComputed = computed({
get: () =>
!store.state.isAcceptTermsDialogOpen &&
store.state.isCharacterOrderDialogOpen,
store.state.isOldCharacterOrderDialogOpen,
set: (val) =>
store.actions.SET_DIALOG_OPEN({
isCharacterOrderDialogOpen: val,
isOldCharacterOrderDialogOpen: val,
}),
});

Expand All @@ -111,14 +126,14 @@ const orderedTalkCharacterInfos = computed(() => {
"talk",
);
});
const isDefaultStyleSelectDialogOpenComputed = computed({
const isOldDefaultStyleSelectDialogOpenComputed = computed({
get: () =>
!store.state.isAcceptTermsDialogOpen &&
!store.state.isCharacterOrderDialogOpen &&
store.state.isDefaultStyleSelectDialogOpen,
!store.state.isOldCharacterOrderDialogOpen &&
store.state.isOldDefaultStyleSelectDialogOpen,
set: (val) =>
store.actions.SET_DIALOG_OPEN({
isDefaultStyleSelectDialogOpen: val,
isOldDefaultStyleSelectDialogOpen: val,
}),
});

Expand All @@ -143,8 +158,8 @@ const isDictionaryManageDialogOpenComputed = computed({
const isAcceptRetrieveTelemetryDialogOpenComputed = computed({
get: () =>
!store.state.isAcceptTermsDialogOpen &&
!store.state.isCharacterOrderDialogOpen &&
!store.state.isDefaultStyleSelectDialogOpen &&
!store.state.isOldCharacterOrderDialogOpen &&
!store.state.isOldDefaultStyleSelectDialogOpen &&
store.state.isAcceptRetrieveTelemetryDialogOpen,
set: (val) =>
store.actions.SET_DIALOG_OPEN({
Expand All @@ -156,8 +171,8 @@ const isAcceptRetrieveTelemetryDialogOpenComputed = computed({
const canOpenNotificationDialog = computed(() => {
return (
!store.state.isAcceptTermsDialogOpen &&
!store.state.isCharacterOrderDialogOpen &&
!store.state.isDefaultStyleSelectDialogOpen &&
!store.state.isOldCharacterOrderDialogOpen &&
!store.state.isOldDefaultStyleSelectDialogOpen &&
!store.state.isAcceptRetrieveTelemetryDialogOpen &&
props.isEnginesReady
);
Expand Down
Loading