summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAya Morisawa <AyaMorisawa4869@gmail.com>2018-08-25 22:24:58 +0900
committerAya Morisawa <AyaMorisawa4869@gmail.com>2018-08-25 22:24:58 +0900
commit483a61d90d2ea6fed3bfd58568bec4b60b0948d6 (patch)
tree5b1c0ac6fb369480981ecd444d6148ab8e6160c2
parentMerge branch 'develop' of https://github.com/syuilo/misskey into develop (diff)
downloadmisskey-483a61d90d2ea6fed3bfd58568bec4b60b0948d6.tar.gz
misskey-483a61d90d2ea6fed3bfd58568bec4b60b0948d6.tar.bz2
misskey-483a61d90d2ea6fed3bfd58568bec4b60b0948d6.zip
Make clock on header optional
-rw-r--r--locales/ja-JP.yml1
-rw-r--r--src/client/app/desktop/views/components/settings.vue7
-rw-r--r--src/client/app/desktop/views/components/ui.header.vue2
-rw-r--r--src/client/app/store.ts1
4 files changed, 10 insertions, 1 deletions
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 238f1fbecb..55f08d1fcf 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -732,6 +732,7 @@ desktop/views/components/settings.vue:
gradient-window-header: "ウィンドウのタイトルバーにグラデーションを使用"
post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
+ show-clock-on-header: "右上に時計を表示する"
show-reply-target: "リプライ先を表示する"
show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue
index df131a1a65..7d6f1d55fb 100644
--- a/src/client/app/desktop/views/components/settings.vue
+++ b/src/client/app/desktop/views/components/settings.vue
@@ -49,6 +49,7 @@
</div>
<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.showClockOnHeader" @change="onChangeShowClockOnHeader" text="%i18n:@show-clock-on-header%"/>
<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.showRenotedMyNotes" @change="onChangeShowRenotedMyNotes" text="%i18n:@show-renoted-my-notes%"/>
@@ -333,6 +334,12 @@ export default Vue.extend({
value: v
});
},
+ onChangeShowClockOnHeader(v) {
+ this.$store.dispatch('settings/set', {
+ key: 'showClockOnHeader',
+ value: v
+ });
+ },
onChangeShowReplyTarget(v) {
this.$store.dispatch('settings/set', {
key: 'showReplyTarget',
diff --git a/src/client/app/desktop/views/components/ui.header.vue b/src/client/app/desktop/views/components/ui.header.vue
index edd9829c1c..6de4eaf744 100644
--- a/src/client/app/desktop/views/components/ui.header.vue
+++ b/src/client/app/desktop/views/components/ui.header.vue
@@ -17,7 +17,7 @@
<x-account v-if="$store.getters.isSignedIn"/>
<x-notifications v-if="$store.getters.isSignedIn"/>
<x-post v-if="$store.getters.isSignedIn"/>
- <x-clock/>
+ <x-clock v-if="$store.state.settings.showClockOnHeader"/>
</div>
</div>
</div>
diff --git a/src/client/app/store.ts b/src/client/app/store.ts
index ba91a11f25..0f3ff4a380 100644
--- a/src/client/app/store.ts
+++ b/src/client/app/store.ts
@@ -13,6 +13,7 @@ const defaultSettings = {
showMaps: true,
showPostFormOnTopOfTl: false,
suggestRecentHashtags: true,
+ showClockOnHeader: false,
circleIcons: true,
gradientWindowHeader: false,
showReplyTarget: true,