Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keyboard shortcut modal #6306

Merged
merged 19 commits into from
Dec 27, 2024
Merged

Keyboard shortcut modal #6306

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift click to select a range
b248cac
Add keyboard shortcut modal
kommunarr Oct 23, 2024
6205134
Temp
kommunarr Oct 24, 2024
b2b37ba
Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fe…
kommunarr Dec 7, 2024
2045f25
Add keyboard shortcut modal shortcut entry, shift & enter labels Ma…
kommunarr Dec 7, 2024
c6da141
Use usei18n instead of i18n.t
kommunarr Dec 7, 2024
d04ee58
Improve keyboard shortcut button formatting
kommunarr Dec 7, 2024
956c376
Update prompt logic to focus ft-icon-buttons as well
kommunarr Dec 8, 2024
b66eda1
Improve mobile styling
kommunarr Dec 8, 2024
6297857
Adjust v-for key to reflect new template structure
kommunarr Dec 8, 2024
1f2df14
Apply suggestions from code review
kommunarr Dec 8, 2024
31f93ae
Implement review suggestions
kommunarr Dec 8, 2024
8476c4a
Merge branch 'feat/keyboard-shortcut-modal' of github.com:kommunarr/F…
kommunarr Dec 8, 2024
1118787
Change shortcut to YouTube's SHIFT ?
kommunarr Dec 8, 2024
5be2bec
Use keyboard icon for button, and check for usingElectron in showing it
kommunarr Dec 8, 2024
e88ad8c
Change ctrl R shortcuts to use new labelling
kommunarr Dec 8, 2024
f6ac654
Exit FS and/or FW when keyboard shortcut modal is opened
kommunarr Dec 9, 2024
241dfc0
Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fe…
kommunarr Dec 9, 2024
0126970
Add code comment clarifying where parallel change to shortcut documen…
kommunarr Dec 17, 2024
2e36a7c
Implement changes from review
kommunarr Dec 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use keyboard icon for button, and check for usingElectron in showing it
  • Loading branch information
@kommunarr
kommunarr committed Dec 8, 2024
commit 5be2becba96300ae8001bc097c966f120408cda1
2 changes: 2 additions & 0 deletions src/renderer/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 67,7 @@ import {
faImages,
faInfoCircle,
faKey,
faKeyboard,
faLanguage,
faLink,
faLinkSlash,
Expand Down Expand Up @@ -186,6 187,7 @@ library.add(
faImages,
faInfoCircle,
faKey,
faKeyboard,
faLanguage,
faLink,
faLinkSlash,
Expand Down
1 change: 1 addition & 0 deletions src/renderer/views/Settings/Settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 50,7 @@ export default defineComponent({
},
data: function () {
return {
usingElectron: process.env.IS_ELECTRON,
isInDesktopView: true,
settingsSectionTypeOpenInMobile: null,
unlocked: false
Expand Down
4 changes: 3 additions & 1 deletion src/renderer/views/Settings/Settings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 23,9 @@
>
<div class="switchRow">
<ft-button
:label="$t('Settings.Show Keyboard Shortcuts')"
v-if="usingElectron"
:label="$t('KeyboardShortcutPrompt.Show Keyboard Shortcuts')"
:icon="['fas', 'keyboard']"
@click="showKeyboardShortcutPrompt"
/>
<ft-toggle-switch
Expand Down
1 change: 0 additions & 1 deletion static/locales/en-US.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 274,6 @@ Settings:
# On Settings Page
Settings: Settings
Sort Settings Sections (A-Z): Sort Settings Sections (A-Z)
Show Keyboard Shortcuts: Show Keyboard Shortcuts
Return to Settings Menu: Return to Settings Menu
The app needs to restart for changes to take effect. Restart and apply change?: The
app needs to restart for changes to take effect. Restart and apply change?
Expand Down
Loading