Skip to content

Commit d0fcc10

Browse files
cm-ayfHiroshiba
andauthored
template内のコンポーネントの名称をPascalCaseに変更 (#1874)
* use vue/component-name-in-template-casing rule * change component name to PascalCase * 設定変更 * vuedraggableのimportエラーが出てた * SequencerPitch * Fix QLayout and QPageContainer casing in wrapQPage function --------- Co-authored-by: Hiroshiba <[email protected]>
1 parent aa1fdb6 commit d0fcc10

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1213
-1213
lines changed

.eslintrc.js

+8
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,14 @@ module.exports = {
5050
ignoreRestSiblings: true,
5151
},
5252
],
53+
"vue/component-name-in-template-casing": [
54+
"error",
55+
"PascalCase",
56+
{
57+
registeredComponentsOnly: false,
58+
ignores: [],
59+
},
60+
],
5361
"vue/component-tags-order": [
5462
"error",
5563
{

src/components/App.vue

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<template>
2-
<error-boundary>
2+
<ErrorBoundary>
33
<!-- TODO: メニューバーをEditorHomeから移動する -->
4-
<router-view v-slot="{ Component }">
5-
<keep-alive>
6-
<component
4+
<RouterView v-slot="{ Component }">
5+
<KeepAlive>
6+
<Component
77
:is="Component"
88
:is-engines-ready="isEnginesReady"
99
:project-file-path="projectFilePath"
1010
/>
11-
</keep-alive>
12-
</router-view>
13-
</error-boundary>
11+
</KeepAlive>
12+
</RouterView>
13+
</ErrorBoundary>
1414
</template>
1515

1616
<script setup lang="ts">

src/components/CharacterButton.vue

+45-45
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<q-btn
2+
<QBtn
33
ref="buttonRef"
44
flat
55
class="q-pa-none character-button"
@@ -15,39 +15,39 @@
1515
:src="selectedStyleInfo.iconPath"
1616
:alt="selectedVoiceInfoText"
1717
/>
18-
<q-avatar v-else-if="!emptiable" rounded size="2rem" color="primary"
19-
><span color="text-display-on-primary">?</span></q-avatar
18+
<QAvatar v-else-if="!emptiable" rounded size="2rem" color="primary"
19+
><span color="text-display-on-primary">?</span></QAvatar
2020
>
2121
</div>
2222
<div v-if="loading" class="loading">
23-
<q-spinner color="primary" size="1.6rem" :thickness="7" />
23+
<QSpinner color="primary" size="1.6rem" :thickness="7" />
2424
</div>
25-
<q-menu
25+
<QMenu
2626
class="character-menu"
2727
transition-show="none"
2828
transition-hide="none"
2929
:max-height="maxMenuHeight"
3030
@before-show="updateMenuHeight"
3131
>
32-
<q-list style="min-width: max-content" class="character-item-container">
33-
<q-item
32+
<QList style="min-width: max-content" class="character-item-container">
33+
<QItem
3434
v-if="selectedStyleInfo == undefined && !emptiable"
3535
class="warning-item row no-wrap items-center"
3636
>
3737
<span class="text-warning vertical-middle"
3838
>有効なスタイルが選択されていません</span
3939
>
40-
</q-item>
41-
<q-item
40+
</QItem>
41+
<QItem
4242
v-if="characterInfos.length === 0"
4343
class="warning-item row no-wrap items-center"
4444
>
4545
<span class="text-warning vertical-middle"
4646
>選択可能なスタイルがありません</span
4747
>
48-
</q-item>
49-
<q-item v-if="emptiable" class="to-unselect-item q-pa-none">
50-
<q-btn
48+
</QItem>
49+
<QItem v-if="emptiable" class="to-unselect-item q-pa-none">
50+
<QBtn
5151
v-close-popup
5252
flat
5353
no-caps
@@ -56,16 +56,16 @@
5656
@click="$emit('update:selectedVoice', undefined)"
5757
>
5858
<span>選択解除</span>
59-
</q-btn>
60-
</q-item>
61-
<q-item
59+
</QBtn>
60+
</QItem>
61+
<QItem
6262
v-for="(characterInfo, characterIndex) in characterInfos"
6363
:key="characterIndex"
6464
class="q-pa-none"
6565
:class="isSelectedItem(characterInfo) && 'selected-character-item'"
6666
>
67-
<q-btn-group flat class="col full-width">
68-
<q-btn
67+
<QBtnGroup flat class="col full-width">
68+
<QBtn
6969
v-close-popup
7070
flat
7171
no-caps
@@ -74,8 +74,8 @@
7474
@mouseover="reassignSubMenuOpen(-1)"
7575
@mouseleave="reassignSubMenuOpen.cancel()"
7676
>
77-
<q-avatar rounded size="2rem" class="q-mr-md">
78-
<q-img
77+
<QAvatar rounded size="2rem" class="q-mr-md">
78+
<QImg
7979
v-if="characterInfo"
8080
no-spinner
8181
no-transition
@@ -84,7 +84,7 @@
8484
getDefaultStyle(characterInfo.metas.speakerUuid).iconPath
8585
"
8686
/>
87-
<q-avatar
87+
<QAvatar
8888
v-if="showEngineInfo && characterInfo.metas.styles.length < 2"
8989
class="engine-icon"
9090
rounded
@@ -97,13 +97,13 @@
9797
]
9898
"
9999
/>
100-
</q-avatar>
101-
</q-avatar>
100+
</QAvatar>
101+
</QAvatar>
102102
<div>{{ characterInfo.metas.speakerName }}</div>
103-
</q-btn>
103+
</QBtn>
104104
<!-- スタイルが2つ以上あるものだけ、スタイル選択ボタンを表示する-->
105105
<template v-if="characterInfo.metas.styles.length >= 2">
106-
<q-separator vertical />
106+
<QSeparator vertical />
107107

108108
<div
109109
class="flex items-center q-px-sm q-py-none cursor-pointer"
@@ -117,8 +117,8 @@
117117
@mouseleave="reassignSubMenuOpen.cancel()"
118118
@keyup.right="reassignSubMenuOpen(characterIndex)"
119119
>
120-
<q-icon name="keyboard_arrow_right" color="grey-6" size="sm" />
121-
<q-menu
120+
<QIcon name="keyboard_arrow_right" color="grey-6" size="sm" />
121+
<QMenu
122122
v-model="subMenuOpenFlags[characterIndex]"
123123
no-parent-event
124124
anchor="top end"
@@ -127,8 +127,8 @@
127127
transition-hide="none"
128128
class="character-menu"
129129
>
130-
<q-list style="min-width: max-content">
131-
<q-item
130+
<QList style="min-width: max-content">
131+
<QItem
132132
v-for="(style, styleIndex) in characterInfo.metas.styles"
133133
:key="styleIndex"
134134
v-close-popup
@@ -151,14 +151,14 @@
151151
})
152152
"
153153
>
154-
<q-avatar rounded size="2rem" class="q-mr-md">
155-
<q-img
154+
<QAvatar rounded size="2rem" class="q-mr-md">
155+
<QImg
156156
no-spinner
157157
no-transition
158158
:ratio="1"
159159
:src="characterInfo.metas.styles[styleIndex].iconPath"
160160
/>
161-
<q-avatar
161+
<QAvatar
162162
v-if="showEngineInfo"
163163
rounded
164164
class="engine-icon"
@@ -170,26 +170,26 @@
170170
]
171171
"
172172
/>
173-
</q-avatar>
174-
</q-avatar>
175-
<q-item-section v-if="style.styleName"
173+
</QAvatar>
174+
</QAvatar>
175+
<QItemSection v-if="style.styleName"
176176
>{{ characterInfo.metas.speakerName }}({{
177177
style.styleName
178-
}})</q-item-section
178+
}})</QItemSection
179179
>
180-
<q-item-section v-else>{{
180+
<QItemSection v-else>{{
181181
characterInfo.metas.speakerName
182-
}}</q-item-section>
183-
</q-item>
184-
</q-list>
185-
</q-menu>
182+
}}</QItemSection>
183+
</QItem>
184+
</QList>
185+
</QMenu>
186186
</div>
187187
</template>
188-
</q-btn-group>
189-
</q-item>
190-
</q-list>
191-
</q-menu>
192-
</q-btn>
188+
</QBtnGroup>
189+
</QItem>
190+
</QList>
191+
</QMenu>
192+
</QBtn>
193193
</template>
194194

195195
<script setup lang="ts">

src/components/Dialog/AcceptRetrieveTelemetryDialog.vue

+23-23
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<template>
2-
<q-dialog
2+
<QDialog
33
v-model="modelValueComputed"
44
maximized
55
transition-show="jump-up"
66
transition-hide="jump-down"
77
class="accept-retrieve-telemetry-dialog transparent-backdrop"
88
>
9-
<q-layout container view="hHh Lpr lff" class="bg-background">
10-
<q-header class="q-py-sm">
11-
<q-toolbar>
9+
<QLayout container view="hHh Lpr lff" class="bg-background">
10+
<QHeader class="q-py-sm">
11+
<QToolbar>
1212
<div class="column">
13-
<q-toolbar-title class="text-display"
14-
>使いやすさ向上のためのお願い</q-toolbar-title
13+
<QToolbarTitle class="text-display"
14+
>使いやすさ向上のためのお願い</QToolbarTitle
1515
>
1616
</div>
1717

18-
<q-space />
18+
<QSpace />
1919

2020
<div class="row items-center no-wrap">
21-
<q-btn
21+
<QBtn
2222
unelevated
2323
label="拒否"
2424
color="toolbar-button"
@@ -27,7 +27,7 @@
2727
@click="handler(false)"
2828
/>
2929

30-
<q-btn
30+
<QBtn
3131
unelevated
3232
label="許可"
3333
color="toolbar-button"
@@ -36,32 +36,32 @@
3636
@click="handler(true)"
3737
/>
3838
</div>
39-
</q-toolbar>
40-
</q-header>
39+
</QToolbar>
40+
</QHeader>
4141

42-
<q-page-container>
43-
<q-page>
42+
<QPageContainer>
43+
<QPage>
4444
<p class="text-body1 q-mb-lg">
4545
VOICEVOXはより使いやすいソフトウェアを目指して開発されています。<br /><br />
4646
ボタンの配置換えなどの方針を決める際は、各UIの利用率などの情報が重要になります。<br />
4747
もしよろしければ、ソフトウェアの利用状況のデータ収集にご協力お願いします。<br />
4848
<br />
4949
(入力されたテキストデータや音声データの情報は収集しておりませんのでご安心ください。)
5050
</p>
51-
<q-card flat bordered>
52-
<q-card-section>
51+
<QCard flat bordered>
52+
<QCardSection>
5353
<div class="text-h5">プライバシーポリシー</div>
54-
</q-card-section>
54+
</QCardSection>
5555

56-
<q-card-section class="text-body1">
56+
<QCardSection class="text-body1">
5757
<!-- eslint-disable-next-line vue/no-v-html -->
5858
<div v-html="privacyPolicy"></div>
59-
</q-card-section>
60-
</q-card>
61-
</q-page>
62-
</q-page-container>
63-
</q-layout>
64-
</q-dialog>
59+
</QCardSection>
60+
</QCard>
61+
</QPage>
62+
</QPageContainer>
63+
</QLayout>
64+
</QDialog>
6565
</template>
6666

6767
<script setup lang="ts">

0 commit comments

Comments
 (0)