natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wip

This commit is contained in:
syuilo 2018-09-28 21:48:53 +09:00
parent 0c63ec8157
commit 1fa4d0d3f8
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
4 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
locales/ja-JP.yml
View File

@ -792,7 +792,6 @@ desktop/views/components/settings.vue:
show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する" show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する" show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
show-maps: "マップの自動展開" show-maps: "マップの自動展開"
show-maps-desc: "位置情報が添付された投稿のマップを自動的に展開します。"
sound: "サウンド" sound: "サウンド"
enable-sounds: "サウンドを有効にする" enable-sounds: "サウンドを有効にする"

2
src/client/app/common/views/components/games/reversi/reversi.room.vue
View File

@ -60,7 +60,7 @@
<div> <div>
<template v-for="item in form"> <template v-for="item in form">
<mk-switch v-if="item.type == 'switch'" v-model="item.value" :key="item.id" :text="item.label" @change="onChangeForm(item)">{{ item.desc || '' }}</mk-switch> <ui-switch v-if="item.type == 'switch'" v-model="item.value" :key="item.id" :text="item.label" @change="onChangeForm(item)">{{ item.desc || '' }}</ui-switch>
<div class="card" v-if="item.type == 'radio'" :key="item.id"> <div class="card" v-if="item.type == 'radio'" :key="item.id">
<header> <header>

2
src/client/app/common/views/components/ui/switch.vue
View File

@ -19,7 +19,7 @@
<span class="label"> <span class="label">
<span :aria-hidden="!checked"><slot></slot></span> <span :aria-hidden="!checked"><slot></slot></span>
<p :aria-hidden="!checked"> <p :aria-hidden="!checked">
<slot name="text"></slot> <slot name="desc"></slot>
</p> </p>
</span> </span>
</div> </div>

60
src/client/app/desktop/views/components/settings.vue
View File

@ -21,12 +21,14 @@
<section class="web" v-show="page == 'web'"> <section class="web" v-show="page == 'web'">
<h1>%i18n:@behaviour%</h1> <h1>%i18n:@behaviour%</h1>
<mk-switch v-model="fetchOnScroll" text="%i18n:@fetch-on-scroll%"> <ui-switch v-model="fetchOnScroll">
<span>%i18n:@fetch-on-scroll-desc%</span> %i18n:@fetch-on-scroll%
</mk-switch> <span slot="desc">%i18n:@fetch-on-scroll-desc%</span>
<mk-switch v-model="autoPopout" text="%i18n:@auto-popout%"> </ui-switch>
<span>%i18n:@auto-popout-desc%</span> <ui-switch v-model="autoPopout">
</mk-switch> %i18n:@auto-popout%
<span slot="desc">%i18n:@auto-popout-desc%</span>
</ui-switch>
<section> <section>
<header>%i18n:@note-visibility%</header> <header>%i18n:@note-visibility%</header>
@ -45,9 +47,10 @@
<details> <details>
<summary>%i18n:@advanced%</summary> <summary>%i18n:@advanced%</summary>
<mk-switch v-model="apiViaStream" text="%i18n:@api-via-stream%"> <ui-switch v-model="apiViaStream">
<span>%i18n:@api-via-stream-desc%</span> %i18n:@api-via-stream%
</mk-switch> <span slot="desc">%i18n:@api-via-stream-desc%</span>
</ui-switch>
</details> </details>
</section> </section>
@ -76,9 +79,7 @@
<ui-switch v-model="showMyRenotes">%i18n:@show-my-renotes%</ui-switch> <ui-switch v-model="showMyRenotes">%i18n:@show-my-renotes%</ui-switch>
<ui-switch v-model="showRenotedMyNotes">%i18n:@show-renoted-my-notes%</ui-switch> <ui-switch v-model="showRenotedMyNotes">%i18n:@show-renoted-my-notes%</ui-switch>
<ui-switch v-model="showLocalRenotes">%i18n:@show-local-renotes%</ui-switch> <ui-switch v-model="showLocalRenotes">%i18n:@show-local-renotes%</ui-switch>
<mk-switch v-model="showMaps" text="%i18n:@show-maps%"> <ui-switch v-model="showMaps">%i18n:@show-maps%</ui-switch>
<span>%i18n:@show-maps-desc%</span>
</mk-switch>
<ui-switch v-model="disableAnimatedMfm">%i18n:common.disable-animated-mfm%</ui-switch> <ui-switch v-model="disableAnimatedMfm">%i18n:common.disable-animated-mfm%</ui-switch>
<ui-switch v-model="games_reversi_showBoardLabels">%i18n:common.show-reversi-board-labels%</ui-switch> <ui-switch v-model="games_reversi_showBoardLabels">%i18n:common.show-reversi-board-labels%</ui-switch>
<ui-switch v-model="games_reversi_useContrastStones">%i18n:common.use-contrast-reversi-stones%</ui-switch> <ui-switch v-model="games_reversi_useContrastStones">%i18n:common.use-contrast-reversi-stones%</ui-switch>
@ -86,9 +87,10 @@
<section class="web" v-show="page == 'web'"> <section class="web" v-show="page == 'web'">
<h1>%i18n:@sound%</h1> <h1>%i18n:@sound%</h1>
<mk-switch v-model="enableSounds" text="%i18n:@enable-sounds%"> <ui-switch v-model="enableSounds">
<span>%i18n:@enable-sounds-desc%</span> %i18n:@enable-sounds%
</mk-switch> <span slot="desc">%i18n:@enable-sounds-desc%</span>
</ui-switch>
<label>%i18n:@volume%</label> <label>%i18n:@volume%</label>
<input type="range" <input type="range"
v-model="soundVolume" v-model="soundVolume"
@ -130,9 +132,10 @@
<section class="notification" v-show="page == 'notification'"> <section class="notification" v-show="page == 'notification'">
<h1>%i18n:@notification%</h1> <h1>%i18n:@notification%</h1>
<mk-switch v-model="$store.state.i.settings.autoWatch" @change="onChangeAutoWatch" text="%i18n:@auto-watch%"> <ui-switch v-model="$store.state.i.settings.autoWatch" @change="onChangeAutoWatch">
<span>%i18n:@auto-watch-desc%</span> %i18n:@auto-watch%
</mk-switch> <span slot="desc">%i18n:@auto-watch-desc%</span>
</ui-switch>
</section> </section>
<section class="drive" v-show="page == 'drive'"> <section class="drive" v-show="page == 'drive'">
@ -200,20 +203,23 @@
</button> </button>
<details> <details>
<summary>%i18n:@update-settings%</summary> <summary>%i18n:@update-settings%</summary>
<mk-switch v-model="preventUpdate" text="%i18n:@prevent-update%"> <ui-switch v-model="preventUpdate">
<span>%i18n:@prevent-update-desc%</span> %i18n:@prevent-update%
</mk-switch> <span slot="desc">%i18n:@prevent-update-desc%</span>
</ui-switch>
</details> </details>
</section> </section>
<section class="other" v-show="page == 'other'"> <section class="other" v-show="page == 'other'">
<h1>%i18n:@advanced-settings%</h1> <h1>%i18n:@advanced-settings%</h1>
<mk-switch v-model="debug" text="%i18n:@debug-mode%"> <ui-switch v-model="debug">
<span>%i18n:@debug-mode-desc%</span> %i18n:@debug-mode%
</mk-switch> <span slot="desc">%i18n:@debug-mode-desc%</span>
<mk-switch v-model="enableExperimentalFeatures" text="%i18n:@experimental%"> </ui-switch>
<span>%i18n:@experimental-desc%</span> <ui-switch v-model="enableExperimentalFeatures">
</mk-switch> %i18n:@experimental%
<span slot="desc">%i18n:@experimental-desc%</span>
</ui-switch>
</section> </section>
</div> </div>
</div> </div>