Merge pull request #3598 from h3poteto/iss-3573

refs #3573 Temporary disable reload shortcut key

src/main/index.ts

@@ -14,7 +14,8 @@ import {
   Notification,
   NotificationConstructorOptions,
   nativeTheme,
-  IpcMainInvokeEvent
+  IpcMainInvokeEvent,
+  globalShortcut
 } from 'electron'
 import Datastore from 'nedb'
 import { isEmpty } from 'lodash'
@@ -451,6 +452,13 @@ app.on('activate', () => {
   }
 })
 
+app.on('browser-window-focus', () => {
+  // Disable reload
+  globalShortcut.register('CommandOrControl+R', () => {
+    console.log('CommandOrControl+R is pressed: Shortcut Disabled')
+  })
+})
+
 const auth = new Authentication(accountRepo)
 
 type AuthRequest = {

src/renderer/components/TimelineSpace/Contents/Bookmarks.vue

@@ -53,7 +53,7 @@ export default defineComponent({
     const focusedId = ref<string | null>(null)
     const heading = ref<boolean>(true)
     const scroller = ref<any>()
-    const { j, k, r } = useMagicKeys()
+    const { j, k, Ctrl_r } = useMagicKeys()
 
     const bookmarks = computed(() => store.state.TimelineSpace.Contents.Bookmarks.bookmarks)
     const lazyLoading = computed(() => store.state.TimelineSpace.Contents.Bookmarks.lazyLoading)
@@ -97,7 +97,7 @@ export default defineComponent({
     whenever(and(k, shortcutEnabled), () => {
       focusPrev()
     })
-    whenever(and(r, shortcutEnabled), () => {
+    whenever(and(Ctrl_r, shortcutEnabled), () => {
       reload()
     })
 

src/renderer/components/TimelineSpace/Contents/DirectMessages.vue

@@ -55,7 +55,7 @@ export default defineComponent({
     const route = useRoute()
     const i18n = useI18next()
     const { reloadable } = useReloadable(store, route, i18n)
-    const { j, k, r } = useMagicKeys()
+    const { j, k, Ctrl_r } = useMagicKeys()
 
     const focusedId = ref<string | null>(null)
     const scrollPosition = ref<ScrollPosition | null>(null)
@@ -143,7 +143,7 @@ export default defineComponent({
     whenever(and(k, shortcutEnabled), () => {
       focusPrev()
     })
-    whenever(and(r, shortcutEnabled), () => {
+    whenever(and(Ctrl_r, shortcutEnabled), () => {
       reload()
     })
 

src/renderer/components/TimelineSpace/Contents/Favourites.vue

@@ -51,7 +51,7 @@ export default defineComponent({
     const heading = ref<boolean>(false)
     const focusedId = ref<string | null>(null)
     const scroller = ref<any>()
-    const { j, k, r } = useMagicKeys()
+    const { j, k, Ctrl_r } = useMagicKeys()
 
     const openSideBar = computed(() => store.state.TimelineSpace.Contents.SideBar.openSideBar)
     const startReload = computed(() => store.state.TimelineSpace.HeaderMenu.reload)
@@ -105,7 +105,7 @@ export default defineComponent({
     whenever(and(k, shortcutEnabled), () => {
       focusPrev()
     })
-    whenever(and(r, shortcutEnabled), () => {
+    whenever(and(Ctrl_r, shortcutEnabled), () => {
       reload()
     })
 

src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue

@@ -55,7 +55,7 @@ export default defineComponent({
     const route = useRoute()
     const i18n = useI18next()
     const { reloadable } = useReloadable(store, route, i18n)
-    const { j, k, r } = useMagicKeys()
+    const { j, k, Ctrl_r } = useMagicKeys()
 
     const { tag } = toRefs(props)
     const focusedId = ref<string | null>(null)
@@ -134,7 +134,7 @@ export default defineComponent({
     whenever(and(k, shortcutEnabled), () => {
       focusPrev()
     })
-    whenever(and(r, shortcutEnabled), () => {
+    whenever(and(Ctrl_r, shortcutEnabled), () => {
       reload()
     })
 

src/renderer/components/TimelineSpace/Contents/Home.vue

@@ -63,7 +63,7 @@ export default defineComponent({
     const route = useRoute()
     const i18n = useI18next()
     const { reloadable } = useReloadable(store, route, i18n)
-    const { j, k, r } = useMagicKeys()
+    const { j, k, Ctrl_r } = useMagicKeys()
 
     const focusedId = ref<string | null>(null)
     const scrollPosition = ref<ScrollPosition | null>(null)
@@ -175,7 +175,7 @@ export default defineComponent({
     whenever(and(k, shortcutEnabled), () => {
       focusPrev()
     })
-    whenever(and(r, shortcutEnabled), () => {
+    whenever(and(Ctrl_r, shortcutEnabled), () => {
       reload()
     })
 

src/renderer/components/TimelineSpace/Contents/Lists/Show.vue

@@ -51,7 +51,7 @@ export default defineComponent({
     const space = 'TimelineSpace/Contents/Lists/Show'
     const store = useStore()
     const i18n = useI18next()
-    const { j, k, r } = useMagicKeys()
+    const { j, k, Ctrl_r } = useMagicKeys()
 
     const { list_id } = toRefs(props)
     const focusedId = ref<string | null>(null)
@@ -129,7 +129,7 @@ export default defineComponent({
     whenever(and(k, shortcutEnabled), () => {
       focusPrev()
     })
-    whenever(and(r, shortcutEnabled), () => {
+    whenever(and(Ctrl_r, shortcutEnabled), () => {
       reload()
     })
 

src/renderer/components/TimelineSpace/Contents/Local.vue

@@ -55,7 +55,7 @@ export default defineComponent({
     const route = useRoute()
     const i18n = useI18next()
     const { reloadable } = useReloadable(store, route, i18n)
-    const { j, k, r } = useMagicKeys()
+    const { j, k, Ctrl_r } = useMagicKeys()
 
     const focusedId = ref<string | null>(null)
     const scrollPosition = ref<ScrollPosition | null>(null)
@@ -154,7 +154,7 @@ export default defineComponent({
     whenever(and(k, shortcutEnabled), () => {
       focusPrev()
     })
-    whenever(and(r, shortcutEnabled), () => {
+    whenever(and(Ctrl_r, shortcutEnabled), () => {
       reload()
     })
 

src/renderer/components/TimelineSpace/Contents/Mentions.vue

@@ -62,7 +62,7 @@ export default defineComponent({
     const route = useRoute()
     const i18n = useI18next()
     const { reloadable } = useReloadable(store, route, i18n)
-    const { j, k, r } = useMagicKeys()
+    const { j, k, Ctrl_r } = useMagicKeys()
 
     const focusedId = ref<string | null>(null)
     const scrollPosition = ref<ScrollPosition | null>(null)
@@ -156,7 +156,7 @@ export default defineComponent({
     whenever(and(k, shortcutEnabled), () => {
       focusPrev()
     })
-    whenever(and(r, shortcutEnabled), () => {
+    whenever(and(Ctrl_r, shortcutEnabled), () => {
       reload()
     })
 

src/renderer/components/TimelineSpace/Contents/Notifications.vue

@@ -61,7 +61,7 @@ export default defineComponent({
     const route = useRoute()
     const i18n = useI18next()
     const { reloadable } = useReloadable(store, route, i18n)
-    const { j, k, r } = useMagicKeys()
+    const { j, k, Ctrl_r } = useMagicKeys()
 
     const focusedId = ref<string | null>(null)
     const scrollPosition = ref<ScrollPosition | null>(null)
@@ -161,7 +161,7 @@ export default defineComponent({
     whenever(and(k, shortcutEnabled), () => {
       focusPrev()
     })
-    whenever(and(r, shortcutEnabled), () => {
+    whenever(and(Ctrl_r, shortcutEnabled), () => {
       reload()
     })
 

src/renderer/components/TimelineSpace/Contents/Public.vue

@@ -55,7 +55,7 @@ export default defineComponent({
     const route = useRoute()
     const i18n = useI18next()
     const { reloadable } = useReloadable(store, route, i18n)
-    const { j, k, r } = useMagicKeys()
+    const { j, k, Ctrl_r } = useMagicKeys()
 
     const focusedId = ref<string | null>(null)
     const scrollPosition = ref<ScrollPosition | null>(null)
@@ -155,7 +155,7 @@ export default defineComponent({
     whenever(and(k, shortcutEnabled), () => {
       focusPrev()
     })
-    whenever(and(r, shortcutEnabled), () => {
+    whenever(and(Ctrl_r, shortcutEnabled), () => {
       reload()
     })