add ability to configure double click behavior
This commit is contained in:
parent
94edda1856
commit
88741a8616
4 changed files with 36 additions and 2 deletions
|
@ -472,6 +472,8 @@
|
||||||
"discordRichPresence_description": "enable playback status in {{discord}} rich presence. Image keys are: {{icon}}, {{playing}}, and {{paused}} ",
|
"discordRichPresence_description": "enable playback status in {{discord}} rich presence. Image keys are: {{icon}}, {{playing}}, and {{paused}} ",
|
||||||
"discordUpdateInterval": "{{discord}} rich presence update interval",
|
"discordUpdateInterval": "{{discord}} rich presence update interval",
|
||||||
"discordUpdateInterval_description": "the time in seconds between each update (minimum 15 seconds)",
|
"discordUpdateInterval_description": "the time in seconds between each update (minimum 15 seconds)",
|
||||||
|
"doubleClickBehavior": "queue all tracks when double clicking",
|
||||||
|
"doubleClickBehavior_description": "if true, all matching tracks (e.g. album, playlist, search) will be queued. otherwise, only queue the track clicked",
|
||||||
"enableRemote": "enable remote control server",
|
"enableRemote": "enable remote control server",
|
||||||
"enableRemote_description": "enables the remote control server to allow other devices to control the application",
|
"enableRemote_description": "enables the remote control server to allow other devices to control the application",
|
||||||
"externalLinks": "show external links",
|
"externalLinks": "show external links",
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import { useCallback, useRef } from 'react';
|
import { useCallback, useRef } from 'react';
|
||||||
import { useQueryClient } from '@tanstack/react-query';
|
import { useQueryClient } from '@tanstack/react-query';
|
||||||
import { useCurrentServer, usePlayerControls, usePlayerStore } from '/@/renderer/store';
|
import { useCurrentServer, usePlayerControls, usePlayerStore } from '/@/renderer/store';
|
||||||
import { usePlaybackType } from '/@/renderer/store/settings.store';
|
import { useGeneralSettings, usePlaybackType } from '/@/renderer/store/settings.store';
|
||||||
import { PlayQueueAddOptions, Play, PlaybackType } from '/@/renderer/types';
|
import { PlayQueueAddOptions, Play, PlaybackType } from '/@/renderer/types';
|
||||||
import { toast } from '/@/renderer/components/toast/index';
|
import { toast } from '/@/renderer/components/toast/index';
|
||||||
import isElectron from 'is-electron';
|
import isElectron from 'is-electron';
|
||||||
|
@ -65,6 +65,8 @@ export const useHandlePlayQueueAdd = () => {
|
||||||
const { play } = usePlayerControls();
|
const { play } = usePlayerControls();
|
||||||
const timeoutIds = useRef<Record<string, ReturnType<typeof setTimeout>> | null>({});
|
const timeoutIds = useRef<Record<string, ReturnType<typeof setTimeout>> | null>({});
|
||||||
|
|
||||||
|
const { doubleClickQueueAll } = useGeneralSettings();
|
||||||
|
|
||||||
const handlePlayQueueAdd = useCallback(
|
const handlePlayQueueAdd = useCallback(
|
||||||
async (options: PlayQueueAddOptions) => {
|
async (options: PlayQueueAddOptions) => {
|
||||||
if (!server) return toast.error({ message: 'No server selected', type: 'error' });
|
if (!server) return toast.error({ message: 'No server selected', type: 'error' });
|
||||||
|
@ -121,6 +123,12 @@ export const useHandlePlayQueueAdd = () => {
|
||||||
} else if (itemType === LibraryItem.SONG) {
|
} else if (itemType === LibraryItem.SONG) {
|
||||||
if (id?.length === 1) {
|
if (id?.length === 1) {
|
||||||
songList = await getSongById({ id: id?.[0], queryClient, server });
|
songList = await getSongById({ id: id?.[0], queryClient, server });
|
||||||
|
} else if (!doubleClickQueueAll && initialSongId) {
|
||||||
|
songList = await getSongById({
|
||||||
|
id: initialSongId,
|
||||||
|
queryClient,
|
||||||
|
server,
|
||||||
|
});
|
||||||
} else {
|
} else {
|
||||||
songList = await getSongsByQuery({ query, queryClient, server });
|
songList = await getSongsByQuery({ query, queryClient, server });
|
||||||
}
|
}
|
||||||
|
@ -195,7 +203,7 @@ export const useHandlePlayQueueAdd = () => {
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
},
|
},
|
||||||
[play, playbackType, queryClient, server, t],
|
[doubleClickQueueAll, play, playbackType, queryClient, server, t],
|
||||||
);
|
);
|
||||||
|
|
||||||
return handlePlayQueueAdd;
|
return handlePlayQueueAdd;
|
||||||
|
|
|
@ -233,6 +233,28 @@ export const ControlSettings = () => {
|
||||||
isHidden: false,
|
isHidden: false,
|
||||||
title: t('setting.playButtonBehavior', { postProcess: 'sentenceCase' }),
|
title: t('setting.playButtonBehavior', { postProcess: 'sentenceCase' }),
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
control: (
|
||||||
|
<Switch
|
||||||
|
aria-label="Whether double clicking a track should queue all matching songs"
|
||||||
|
defaultChecked={settings.doubleClickQueueAll}
|
||||||
|
onChange={(e) =>
|
||||||
|
setSettings({
|
||||||
|
general: {
|
||||||
|
...settings,
|
||||||
|
doubleClickQueueAll: e.currentTarget.checked,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
),
|
||||||
|
description: t('setting.doubleClickBehavior', {
|
||||||
|
context: 'description',
|
||||||
|
postProcess: 'sentenceCase',
|
||||||
|
}),
|
||||||
|
isHidden: false,
|
||||||
|
title: t('setting.doubleClickBehavior', { postProcess: 'sentenceCase' }),
|
||||||
|
},
|
||||||
{
|
{
|
||||||
control: (
|
control: (
|
||||||
<Select
|
<Select
|
||||||
|
|
|
@ -195,6 +195,7 @@ export interface SettingsState {
|
||||||
albumArtRes?: number | null;
|
albumArtRes?: number | null;
|
||||||
buttonSize: number;
|
buttonSize: number;
|
||||||
defaultFullPlaylist: boolean;
|
defaultFullPlaylist: boolean;
|
||||||
|
doubleClickQueueAll: boolean;
|
||||||
externalLinks: boolean;
|
externalLinks: boolean;
|
||||||
followSystemTheme: boolean;
|
followSystemTheme: boolean;
|
||||||
genreTarget: GenreTarget;
|
genreTarget: GenreTarget;
|
||||||
|
@ -318,6 +319,7 @@ const initialState: SettingsState = {
|
||||||
albumArtRes: undefined,
|
albumArtRes: undefined,
|
||||||
buttonSize: 20,
|
buttonSize: 20,
|
||||||
defaultFullPlaylist: true,
|
defaultFullPlaylist: true,
|
||||||
|
doubleClickQueueAll: true,
|
||||||
externalLinks: true,
|
externalLinks: true,
|
||||||
followSystemTheme: false,
|
followSystemTheme: false,
|
||||||
genreTarget: GenreTarget.TRACK,
|
genreTarget: GenreTarget.TRACK,
|
||||||
|
|
Reference in a new issue