diff --git a/src/renderer/src/components/Modules/NethVoice/BaseModule/ProfileDialog/SettingsSettings/SettingsBox.tsx b/src/renderer/src/components/Modules/NethVoice/BaseModule/ProfileDialog/SettingsSettings/SettingsBox.tsx
index fb3b102a..330f8826 100644
--- a/src/renderer/src/components/Modules/NethVoice/BaseModule/ProfileDialog/SettingsSettings/SettingsBox.tsx
+++ b/src/renderer/src/components/Modules/NethVoice/BaseModule/ProfileDialog/SettingsSettings/SettingsBox.tsx
@@ -1,5 +1,6 @@
import { t } from 'i18next'
import {
+ faPhone as PhoneIcon,
faKeyboard as KeyboardIcon,
faHeadphones as DevicesIcon,
faPhoneVolume as IncomingCallsIcon,
@@ -9,6 +10,9 @@ import { OptionElement } from '../OptionElement'
export function SettingsBox({ onClose }: { onClose?: () => void }) {
const [, setIsShortcutDialogOpen] = useNethlinkData('isShortcutDialogOpen')
+ const [, setIsCommandBarShortcutDialogOpen] = useNethlinkData(
+ 'isCommandBarShortcutDialogOpen',
+ )
const [, setIsDeviceDialogOpen] = useNethlinkData('isDeviceDialogOpen')
const [, setIsIncomingCallsDialogOpen] = useNethlinkData('isIncomingCallsDialogOpen')
@@ -16,13 +20,22 @@ export function SettingsBox({ onClose }: { onClose?: () => void }) {
{
setIsShortcutDialogOpen(true)
if (onClose) onClose()
}}
/>
+ {
+ setIsCommandBarShortcutDialogOpen(true)
+ if (onClose) onClose()
+ }}
+ />
+ ['Control', 'Alt', 'Meta', 'AltGraph'].includes(key)
+
+ const normalizeKey = (key: string): string => {
+ switch (key) {
+ case 'Control':
+ return 'Ctrl'
+ case 'Meta':
+ return 'Cmd'
+ case 'AltGraph':
+ return 'AltGr'
+ case ' ':
+ return 'Space'
+ default:
+ return key.length === 1 ? key.toUpperCase() : key
+ }
+ }
+
+ useEffect(() => {
+ setFocus('combo')
+ }, [])
+
+ useEffect(() => {
+ // Use ?? to handle both undefined and empty string correctly
+ setCombo(account?.commandBarShortcut ?? '')
+ }, [account?.commandBarShortcut])
+
+ const schema: z.ZodType<{ combo: string }> = z.object({
+ combo: z.string().trim(),
+ })
+
+ const {
+ register,
+ handleSubmit,
+ setFocus,
+ formState: { errors },
+ } = useForm({
+ defaultValues: {
+ combo: '',
+ },
+ resolver: zodResolver(schema),
+ })
+
+ const allowedSoloModifiers = new Set(['Ctrl', 'Alt', 'AltGr', 'Cmd'])
+ const isValidCommandBarShortcut = (value: string) => {
+ const trimmed = value.trim()
+ if (!trimmed) return true // clear => allowed (restores default)
+
+ const parts = trimmed
+ .split('+')
+ .map((p) => p.trim())
+ .filter(Boolean)
+
+ if (parts.length === 0) return true
+
+ const nonModifiers = parts.filter((p) => !allowedSoloModifiers.has(p))
+ const modifiers = parts.filter((p) => allowedSoloModifiers.has(p))
+
+ if (nonModifiers.length === 0) {
+ // Only modifiers: allow exactly one (double-tap)
+ return modifiers.length === 1
+ }
+
+ return true
+ }
+
+ function handleCancel(e) {
+ e.preventDefault()
+ e.stopPropagation()
+ setIsCommandBarShortcutDialogOpen(false)
+ }
+
+ function handleClearShortcut() {
+ setCombo('')
+ }
+
+ async function submit(data) {
+ if (!isValidCommandBarShortcut(data.combo)) {
+ return
+ }
+
+ const updatedAccount = { ...account!, commandBarShortcut: data.combo }
+ setAccount(() => updatedAccount)
+ window.electron.send(IPC_EVENTS.CHANGE_COMMAND_BAR_SHORTCUT, data.combo)
+ setIsCommandBarShortcutDialogOpen(false)
+ }
+
+ const handleKeyDown = (e: React.KeyboardEvent) => {
+ e.preventDefault()
+
+ const rawKey = e.key
+ if (ignoredKeys.has(rawKey)) return
+
+ const newKeys = new Set(keysPressed)
+
+ // AltGr detection on Linux can be tricky:
+ // - sometimes e.key is "AltGraph"
+ // - sometimes it's "Alt" with code "AltRight"
+ // - sometimes modifier flags are not set
+ const code = (e as any).code as string | undefined
+ const hasGetModifierState = typeof (e as any).getModifierState === 'function'
+ const modifierStateAltGraph = hasGetModifierState
+ ? (e as any).getModifierState('AltGraph')
+ : false
+
+ const isAltGr =
+ rawKey === 'AltGraph' ||
+ modifierStateAltGraph ||
+ code === 'AltRight' ||
+ // common layout: AltGr reported as Ctrl+Alt (AltRight)
+ (code === 'AltRight' && e.ctrlKey)
+
+ if (isAltGr) {
+ newKeys.add('AltGr')
+ } else {
+ if (e.ctrlKey) newKeys.add('Ctrl')
+ if (e.altKey) newKeys.add('Alt')
+ }
+
+ if (e.metaKey) newKeys.add('Cmd')
+
+ if (!isModifierKey(rawKey)) {
+ newKeys.add(normalizeKey(rawKey))
+ }
+
+ setKeysPressed(newKeys)
+
+ const orderedModifiers = ['Ctrl', 'Alt', 'AltGr', 'Cmd']
+ const modifiers = orderedModifiers.filter((k) => newKeys.has(k))
+ const others = [...newKeys].filter((k) => !orderedModifiers.includes(k as any))
+ setCombo([...modifiers, ...others].join('+'))
+ }
+
+ const handleKeyUp = () => {
+ setKeysPressed(new Set())
+ }
+
+ return (
+ <>
+
+
+ setIsCommandBarShortcutDialogOpen(false)}
+ />
+
+
+
+
+
+
+ {t('TopBar.Keyboard shortcut for command bar')}
+
+
+
+ {t('TopBar.Command bar shortcut title description')}{' '}
+
+
+ {
+
+ {t('TopBar.Shortcut subtitle description')}
+
+ }
+
+
+
+
+
+
+
+ setPhoneNumber(e.target.value)}
+ onKeyDown={handleKeyPress}
+ placeholder={t('CommandBar.Placeholder') || ''}
+ className="flex-1 dark:text-titleDark text-titleLight [&_input]:focus:ring-0 [&_input]:focus:border-gray-300 dark:[&_input]:focus:border-gray-600"
+ autoFocus
+ />
+
+ {phoneNumber && (
+
+ )}
+
+
+
+