Skip to content

Commit

Permalink
* Update app menu to add item for history
Browse files Browse the repository at this point in the history
  • Loading branch information
PikachuEXE committed Nov 16, 2022
1 parent 2cc5c2e commit 5722ddb
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module.exports = {

rules: {
'space-before-function-paren': 'off',
'comma-dangle': ['error', 'never'],
'comma-dangle': ['error', 'only-multiline'],
'vue/no-v-html': 'off',
'no-console': ['error', { allow: ['warn', 'error'] }],
'no-unused-vars': 'warn',
Expand Down
16 changes: 15 additions & 1 deletion src/main/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -997,7 +997,21 @@ function runApp() {
{ role: 'zoomout' },
{ role: 'zoomout', accelerator: 'CmdOrCtrl+numsub', visible: false },
{ type: 'separator' },
{ role: 'togglefullscreen' }
{ role: 'togglefullscreen' },
{ type: 'separator' },
{
label: 'History',
accelerator: 'CmdOrCtrl+U',
click: (_menuItem, browserWindow, _event) => {
if (browserWindow == null) { return }

browserWindow.webContents.send(
'change-view',
{ route: '/history' }
)
},
type: 'normal'
},
]
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
:class="applyNavIconExpand"
/>
<p class="navLabel">
{{ $t("History.History") }}
{{ $t("History Page.History") }}
</p>
</div>
<hr>
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/components/side-nav/side-nav.vue
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
class="navOption mobileShow"
role="button"
tabindex="0"
:title="$t('History.History')"
:title="$t('History Page.History')"
@click="navigate('history')"
@keydown.enter.prevent="navigate('history')"
>
Expand All @@ -160,7 +160,7 @@
v-if="!hideText"
class="navLabel"
>
{{ $t("History.History") }}
{{ $t("History Page.History") }}
</p>
</div>
<hr>
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/router/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ const router = new CustomRouter({
path: '/history',
name: 'history',
meta: {
title: 'History.History',
title: 'History Page.History',
icon: 'fa-home'
},
component: History
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/views/History/History.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
v-show="!isLoading"
class="card"
>
<h3>{{ $t("History.History") }}</h3>
<h3>{{ $t("History Page.History") }}</h3>
<ft-input
v-show="fullData.length > 0"
ref="searchBar"
:placeholder="$t('History.Search bar placeholder')"
:placeholder="$t('History Page.Search bar placeholder')"
:show-clear-text-button="true"
:show-action-button="false"
@input="(input) => query = input"
Expand Down
3 changes: 2 additions & 1 deletion static/locales/en-US.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Actual size: Actual size
Zoom in: Zoom in
Zoom out: Zoom out
Toggle fullscreen: Toggle fullscreen
History: History
Window: Window
Minimize: Minimize
Close: Close
Expand Down Expand Up @@ -119,7 +120,7 @@ User Playlists:
it listed here
Empty Search Message: There are no videos in this playlist that matches your search
Search bar placeholder: Search in Playlist
History:
History Page:
# On History Page
History: History
Watch History: Watch History
Expand Down

0 comments on commit 5722ddb

Please sign in to comment.