Resolve #2276
This commit is contained in:
		
							parent
							
								
									431383ab54
								
							
						
					
					
						commit
						48dc1678c3
					
				
					 5 changed files with 11 additions and 2 deletions
				
			
		| 
						 | 
					@ -707,6 +707,7 @@ desktop/views/components/settings.vue:
 | 
				
			||||||
  circle-icons: "円形のアイコンを使用"
 | 
					  circle-icons: "円形のアイコンを使用"
 | 
				
			||||||
  gradient-window-header: "ウィンドウのタイトルバーにグラデーションを使用"
 | 
					  gradient-window-header: "ウィンドウのタイトルバーにグラデーションを使用"
 | 
				
			||||||
  post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
 | 
					  post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
 | 
				
			||||||
 | 
					  suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
 | 
				
			||||||
  show-reply-target: "リプライ先を表示する"
 | 
					  show-reply-target: "リプライ先を表示する"
 | 
				
			||||||
  show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
 | 
					  show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
 | 
				
			||||||
  show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
 | 
					  show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -10,7 +10,7 @@
 | 
				
			||||||
			<span v-for="u in visibleUsers">{{ u | userName }}<a @click="removeVisibleUser(u)">[x]</a></span>
 | 
								<span v-for="u in visibleUsers">{{ u | userName }}<a @click="removeVisibleUser(u)">[x]</a></span>
 | 
				
			||||||
			<a @click="addVisibleUser">%i18n:@add-visible-user%</a>
 | 
								<a @click="addVisibleUser">%i18n:@add-visible-user%</a>
 | 
				
			||||||
		</div>
 | 
							</div>
 | 
				
			||||||
		<div class="hashtags" v-if="recentHashtags.length > 0">
 | 
							<div class="hashtags" v-if="recentHashtags.length > 0 && $store.state.settings.suggestRecentHashtags">
 | 
				
			||||||
			<b>%i18n:@recent-tags%:</b>
 | 
								<b>%i18n:@recent-tags%:</b>
 | 
				
			||||||
			<a v-for="tag in recentHashtags.slice(0, 5)" @click="addTag(tag)" title="%@click-to-tagging%">#{{ tag }}</a>
 | 
								<a v-for="tag in recentHashtags.slice(0, 5)" @click="addTag(tag)" title="%@click-to-tagging%">#{{ tag }}</a>
 | 
				
			||||||
		</div>
 | 
							</div>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -48,6 +48,7 @@
 | 
				
			||||||
				<mk-switch v-model="$store.state.settings.iLikeSushi" @change="onChangeILikeSushi" text="%i18n:common.i-like-sushi%"/>
 | 
									<mk-switch v-model="$store.state.settings.iLikeSushi" @change="onChangeILikeSushi" text="%i18n:common.i-like-sushi%"/>
 | 
				
			||||||
			</div>
 | 
								</div>
 | 
				
			||||||
			<mk-switch v-model="$store.state.settings.showPostFormOnTopOfTl" @change="onChangeShowPostFormOnTopOfTl" text="%i18n:@post-form-on-timeline%"/>
 | 
								<mk-switch v-model="$store.state.settings.showPostFormOnTopOfTl" @change="onChangeShowPostFormOnTopOfTl" text="%i18n:@post-form-on-timeline%"/>
 | 
				
			||||||
 | 
								<mk-switch v-model="$store.state.settings.suggestRecentHashtags" @change="onChangeSuggestRecentHashtags" text="%i18n:@suggest-recent-hashtags%"/>
 | 
				
			||||||
			<mk-switch v-model="$store.state.settings.showReplyTarget" @change="onChangeShowReplyTarget" text="%i18n:@show-reply-target%"/>
 | 
								<mk-switch v-model="$store.state.settings.showReplyTarget" @change="onChangeShowReplyTarget" text="%i18n:@show-reply-target%"/>
 | 
				
			||||||
			<mk-switch v-model="$store.state.settings.showMyRenotes" @change="onChangeShowMyRenotes" text="%i18n:@show-my-renotes%"/>
 | 
								<mk-switch v-model="$store.state.settings.showMyRenotes" @change="onChangeShowMyRenotes" text="%i18n:@show-my-renotes%"/>
 | 
				
			||||||
			<mk-switch v-model="$store.state.settings.showRenotedMyNotes" @change="onChangeShowRenotedMyNotes" text="%i18n:@show-renoted-my-notes%"/>
 | 
								<mk-switch v-model="$store.state.settings.showRenotedMyNotes" @change="onChangeShowRenotedMyNotes" text="%i18n:@show-renoted-my-notes%"/>
 | 
				
			||||||
| 
						 | 
					@ -336,6 +337,12 @@ export default Vue.extend({
 | 
				
			||||||
				value: v
 | 
									value: v
 | 
				
			||||||
			});
 | 
								});
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
 | 
							onChangeSuggestRecentHashtags(v) {
 | 
				
			||||||
 | 
								this.$store.dispatch('settings/set', {
 | 
				
			||||||
 | 
									key: 'suggestRecentHashtags',
 | 
				
			||||||
 | 
									value: v
 | 
				
			||||||
 | 
								});
 | 
				
			||||||
 | 
							},
 | 
				
			||||||
		onChangeShowReplyTarget(v) {
 | 
							onChangeShowReplyTarget(v) {
 | 
				
			||||||
			this.$store.dispatch('settings/set', {
 | 
								this.$store.dispatch('settings/set', {
 | 
				
			||||||
				key: 'showReplyTarget',
 | 
									key: 'showReplyTarget',
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -45,7 +45,7 @@
 | 
				
			||||||
			<input ref="file" class="file" type="file" accept="image/*" multiple="multiple" @change="onChangeFile"/>
 | 
								<input ref="file" class="file" type="file" accept="image/*" multiple="multiple" @change="onChangeFile"/>
 | 
				
			||||||
		</div>
 | 
							</div>
 | 
				
			||||||
	</div>
 | 
						</div>
 | 
				
			||||||
	<div class="hashtags" v-if="recentHashtags.length > 0">
 | 
						<div class="hashtags" v-if="recentHashtags.length > 0 && $store.state.settings.suggestRecentHashtags">
 | 
				
			||||||
		<a v-for="tag in recentHashtags.slice(0, 5)" @click="addTag(tag)">#{{ tag }}</a>
 | 
							<a v-for="tag in recentHashtags.slice(0, 5)" @click="addTag(tag)">#{{ tag }}</a>
 | 
				
			||||||
	</div>
 | 
						</div>
 | 
				
			||||||
</div>
 | 
					</div>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -11,6 +11,7 @@ const defaultSettings = {
 | 
				
			||||||
	fetchOnScroll: true,
 | 
						fetchOnScroll: true,
 | 
				
			||||||
	showMaps: true,
 | 
						showMaps: true,
 | 
				
			||||||
	showPostFormOnTopOfTl: false,
 | 
						showPostFormOnTopOfTl: false,
 | 
				
			||||||
 | 
						suggestRecentHashtags: true,
 | 
				
			||||||
	circleIcons: true,
 | 
						circleIcons: true,
 | 
				
			||||||
	gradientWindowHeader: false,
 | 
						gradientWindowHeader: false,
 | 
				
			||||||
	showReplyTarget: true,
 | 
						showReplyTarget: true,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue