From 61a1a4b2dd538385de116a0158e5a0db37f2910a Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Tue, 17 Apr 2018 23:46:16 +0900
Subject: [PATCH 1/4] refs #186 Show account name in toot

---
 .../TimelineSpace/Contents/Cards/Toot.vue         | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue b/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue
index 1d04e3c2cd..9521529786 100644
--- a/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue
@@ -6,7 +6,8 @@
     <div class="detail" v-on:dblclick="openDetail(message)">
       <div class="toot-header">
         <div class="user" @click="openUser(originalMessage(message).account)">
-          {{ username(originalMessage(message).account) }}
+          <span class="display-name">{{ username(originalMessage(message).account) }}</span>
+          <span class="acct">@{{ originalMessage(message).account.username }}</span>
         </div>
         <div class="timestamp">
           {{ parseDatetime(message.created_at) }}
@@ -200,14 +201,22 @@ function findLink (target) {
     .toot-header {
       .user {
         float: left;
-        font-weight: 800;
-        color: var(--theme-primary-color);
         font-size: 14px;
         cursor: pointer;
         white-space: nowrap;
         max-width: 100%;
         overflow: hidden;
         text-overflow: ellipsis;
+
+        .display-name {
+          font-weight: 800;
+          color: var(--theme-primary-color);
+        }
+
+        .acct {
+          font-weight: normal;
+          color: var(--theme-secondary-color);
+        }
       }
 
       .timestamp {

From 3e75e18ffd9435ec5f1d6516f940370d96c1ef2f Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Wed, 18 Apr 2018 23:37:00 +0900
Subject: [PATCH 2/4] refs #186 Change username style according to setting

---
 src/main/preferences.js                       |  3 +-
 .../TimelineSpace/Contents/Cards/Toot.vue     | 37 ++++++++++++++++---
 src/renderer/store/App.js                     | 10 ++++-
 3 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/src/main/preferences.js b/src/main/preferences.js
index 43d93fab55..072c171b8e 100644
--- a/src/main/preferences.js
+++ b/src/main/preferences.js
@@ -7,7 +7,8 @@ const Base = {
       fav_rb: true,
       toot: true
     },
-    theme: 'white'
+    theme: 'white',
+    displayName: 0
   }
 }
 
diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue b/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue
index 9521529786..244f3cac8b 100644
--- a/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue
@@ -7,7 +7,7 @@
       <div class="toot-header">
         <div class="user" @click="openUser(originalMessage(message).account)">
           <span class="display-name">{{ username(originalMessage(message).account) }}</span>
-          <span class="acct">@{{ originalMessage(message).account.username }}</span>
+          <span class="acct">{{ accountName(originalMessage(message).account) }}</span>
         </div>
         <div class="timestamp">
           {{ parseDatetime(message.created_at) }}
@@ -65,10 +65,16 @@
 <script>
 import moment from 'moment'
 import { shell } from 'electron'
+import { mapState } from 'vuex'
 
 export default {
   name: 'toot',
   props: ['message'],
+  computed: {
+    ...mapState({
+      displayNameStyle: state => state.App.displayNameStyle
+    })
+  },
   methods: {
     originalMessage (message) {
       if (message.reblog !== null) {
@@ -78,10 +84,31 @@ export default {
       }
     },
     username (account) {
-      if (account.display_name !== '') {
-        return account.display_name
-      } else {
-        return account.username
+      switch (this.displayNameStyle) {
+        case 0:
+          if (account.display_name !== '') {
+            return account.display_name
+          } else {
+            return account.username
+          }
+        case 1:
+          if (account.display_name !== '') {
+            return account.display_name
+          } else {
+            return account.username
+          }
+        case 2:
+          return `@${account.username}`
+      }
+    },
+    accountName (account) {
+      switch (this.displayNameStyle) {
+        case 0:
+          return `@${account.username}`
+        case 1:
+          return ''
+        case 2:
+          return ''
       }
     },
     parseDatetime (datetime) {
diff --git a/src/renderer/store/App.js b/src/renderer/store/App.js
index 7faec350ea..6e0c8981ff 100644
--- a/src/renderer/store/App.js
+++ b/src/renderer/store/App.js
@@ -5,7 +5,11 @@ import { LightTheme, DarkTheme } from '../utils/theme'
 const App = {
   namespaced: true,
   state: {
-    theme: LightTheme
+    theme: LightTheme,
+    // 0: display name and username
+    // 1: display name
+    // 2: username
+    displayNameStyle: 0
   },
   mutations: {
     updateTheme (state, themeName) {
@@ -20,6 +24,9 @@ const App = {
           state.theme = LightTheme
           break
       }
+    },
+    updateDisplayNameStyle (state, value) {
+      state.displayNameStyle = value
     }
   },
   actions: {
@@ -39,6 +46,7 @@ const App = {
       ipcRenderer.once('response-get-preferences', (event, conf) => {
         ipcRenderer.removeAllListeners('error-get-preferences')
         commit('updateTheme', conf.general.theme)
+        commit('updateDisplayNameStyle', conf.general.displayName || 0)
       })
     }
   }

From d62a2bc24d63dd6a00d7ea5781e25ff545b55c3d Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Wed, 18 Apr 2018 23:35:35 +0900
Subject: [PATCH 3/4] refs #186 Save display name style setting

---
 package-lock.json                             |  5 ++
 package.json                                  |  1 +
 src/main/preferences.js                       |  7 +-
 .../components/Preferences/General.vue        | 84 +++++++++++++++++--
 src/renderer/store/App.js                     |  2 +-
 src/renderer/store/Preferences/General.js     | 20 ++++-
 6 files changed, 107 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 32007b26f3..671fee4fa1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11039,6 +11039,11 @@
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
+    "object-assign-deep": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/object-assign-deep/-/object-assign-deep-0.4.0.tgz",
+      "integrity": "sha512-54Uvn3s+4A/cMWx9tlRez1qtc7pN7pbQ+Yi7mjLjcBpWLlP+XbSHiHbQW6CElDiV4OvuzqnMrBdkgxI1mT8V/Q=="
+    },
     "object-component": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
diff --git a/package.json b/package.json
index c914c04753..5e9388e08f 100644
--- a/package.json
+++ b/package.json
@@ -92,6 +92,7 @@
     "mastodon-api": "^1.3.0",
     "moment": "^2.21.0",
     "nedb": "^1.8.0",
+    "object-assign-deep": "^0.4.0",
     "simplayer": "0.0.8",
     "vue": "^2.3.3",
     "vue-awesome": "^2.3.5",
diff --git a/src/main/preferences.js b/src/main/preferences.js
index 072c171b8e..69ea89db08 100644
--- a/src/main/preferences.js
+++ b/src/main/preferences.js
@@ -1,5 +1,5 @@
-import empty from 'is-empty'
 import storage from 'electron-json-storage'
+import objectAssignDeep from 'object-assign-deep'
 
 const Base = {
   general: {
@@ -8,7 +8,7 @@ const Base = {
       toot: true
     },
     theme: 'white',
-    displayName: 0
+    displayNameStyle: 0
   }
 }
 
@@ -21,8 +21,7 @@ export default class Preferences {
   async load () {
     try {
       const preferences = await this.get()
-      if (empty(preferences)) return Base
-      return preferences
+      return objectAssignDeep({}, Base, preferences)
     } catch (err) {
       return Base
     }
diff --git a/src/renderer/components/Preferences/General.vue b/src/renderer/components/Preferences/General.vue
index eda6ffafec..b56298a7de 100644
--- a/src/renderer/components/Preferences/General.vue
+++ b/src/renderer/components/Preferences/General.vue
@@ -1,14 +1,36 @@
 <template>
 <div id="general" v-loading="loading">
   <h2>General</h2>
-  <div class="theme">
-    <h3>Theme color</h3>
-    <el-radio v-model="theme" label="white">White</el-radio>
-    <el-radio v-model="theme" label="dark">Dark</el-radio>
+  <div class="appearance">
+    <h3>Appearance</h3>
+    <table class="theme">
+      <tbody>
+        <tr>
+          <td class="title">Theme color:</td>
+          <td class="status">
+            <el-radio v-model="theme" label="white">White</el-radio>
+            <el-radio v-model="theme" label="dark">Dark</el-radio>
+          </td>
+        </tr>
+        <tr>
+          <td class="title">Display name style:</td>
+          <td class="status">
+            <el-select v-model="displayNameStyle" placeholder="style">
+              <el-option
+                v-for="style in nameStyles"
+                :key="style.value"
+                :label="style.name"
+                :value="style.value">
+              </el-option>
+            </el-select>
+          </td>
+        </tr>
+      </tbody>
+    </table>
   </div>
   <div class="sounds">
     <h3>Sounds</h3>
-    <table class="sounds">
+    <table>
       <tbody>
         <tr>
           <td class="title">Favourite, Reblog action sound:</td>
@@ -39,6 +61,24 @@ import { mapState } from 'vuex'
 
 export default {
   name: 'general',
+  data () {
+    return {
+      nameStyles: [
+        {
+          name: 'DisplayName and username',
+          value: 0
+        },
+        {
+          name: 'DisplayName',
+          value: 1
+        },
+        {
+          name: 'username',
+          value: 2
+        }
+      ]
+    }
+  },
   computed: {
     ...mapState({
       loading: state => state.Preferences.General.loading
@@ -51,6 +91,14 @@ export default {
         this.$store.dispatch('Preferences/General/updateTheme', value)
       }
     },
+    displayNameStyle: {
+      get () {
+        return this.$store.state.Preferences.General.general.displayNameStyle
+      },
+      set (value) {
+        this.$store.dispatch('Preferences/General/updateDisplayNameStyle', value)
+      }
+    },
     sound_fav_rb: {
       get () {
         return this.$store.state.Preferences.General.general.sound.fav_rb
@@ -86,8 +134,28 @@ export default {
 
 <style lang="scss" scoped>
 #general {
-  .theme {
+  .appearance {
     color: var(--theme-secondary-color);
+    width: 100%;
+    box-sizing: border-box;
+
+    table {
+      width: 100%;
+    }
+
+    td {
+      padding: 16px 0;
+    }
+
+    .title {
+      text-align: right;
+      width: 50%;
+    }
+
+    .status {
+      width: 50%;
+      text-align: center;
+    }
   }
 
   .sounds {
@@ -95,6 +163,10 @@ export default {
     width: 100%;
     box-sizing: border-box;
 
+    table {
+      width: 100%;
+    }
+
     td {
       padding: 16px 0;
     }
diff --git a/src/renderer/store/App.js b/src/renderer/store/App.js
index 6e0c8981ff..f8187e87de 100644
--- a/src/renderer/store/App.js
+++ b/src/renderer/store/App.js
@@ -46,7 +46,7 @@ const App = {
       ipcRenderer.once('response-get-preferences', (event, conf) => {
         ipcRenderer.removeAllListeners('error-get-preferences')
         commit('updateTheme', conf.general.theme)
-        commit('updateDisplayNameStyle', conf.general.displayName || 0)
+        commit('updateDisplayNameStyle', conf.general.displayNameStyle)
       })
     }
   }
diff --git a/src/renderer/store/Preferences/General.js b/src/renderer/store/Preferences/General.js
index cc1689ee2e..5e4cc21810 100644
--- a/src/renderer/store/Preferences/General.js
+++ b/src/renderer/store/Preferences/General.js
@@ -8,7 +8,8 @@ const General = {
         fav_rb: true,
         toot: true
       },
-      theme: 'white'
+      theme: 'white',
+      displayNameStyle: 0
     },
     loading: false
   },
@@ -58,6 +59,23 @@ const General = {
         commit('changeLoading', false)
       })
     },
+    updateDisplayNameStyle ({ dispatch, commit, state }, value) {
+      const newGeneral = Object.assign({}, state.general, {
+        displayNameStyle: value
+      })
+      const config = {
+        general: newGeneral
+      }
+      ipcRenderer.send('save-preferences', config)
+      ipcRenderer.once('error-save-preferences', (event, err) => {
+        ipcRenderer.removeAllListeners('response-save-preferences')
+      })
+      ipcRenderer.once('response-save-preferences', (event, conf) => {
+        ipcRenderer.removeAllListeners('error-save-preferences')
+        dispatch('App/loadPreferences', null, { root: true })
+        commit('updateGeneral', conf.general)
+      })
+    },
     updateSound ({ commit, state }, sound) {
       commit('changeLoading', true)
       const newSound = Object.assign({}, state.general.sound, sound)

From 8975c16a8987e6352d3750128eb3455df26a12b9 Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Thu, 19 Apr 2018 00:37:05 +0900
Subject: [PATCH 4/4] fix: Change active menu before move route

---
 src/renderer/store/GlobalHeader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/store/GlobalHeader.js b/src/renderer/store/GlobalHeader.js
index fcd2ec3e97..87fedb82bc 100644
--- a/src/renderer/store/GlobalHeader.js
+++ b/src/renderer/store/GlobalHeader.js
@@ -32,8 +32,8 @@ const GlobalHeader = {
     },
     watchShortcutEvents ({ commit }) {
       ipcRenderer.on('change-account', (event, account) => {
-        router.push(`/${account._id}/home`)
         commit('changeDefaultActive', account.index.toString())
+        router.push(`/${account._id}/home`)
       })
     },
     async removeShortcutEvents () {