Superminaren
/
kvm
mirror of https://github.com/jetkvm/kvm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

set default label for delay

This commit is contained in:
Andrew Davis 2025-04-09 23:43:58 +10:00
parent dc512181c1
commit 36d427ba56
No known key found for this signature in database
GPG Key ID: 30AB5B89A109D044
3 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/src/components/MacroStepCard.tsx
View File

@ -5,7 +5,7 @@ import { Combobox } from "@/components/Combobox";
import { SelectMenuBasic } from "@/components/SelectMenuBasic"; import { SelectMenuBasic } from "@/components/SelectMenuBasic";
import Card from "@/components/Card"; import Card from "@/components/Card";
import { keys, modifiers, keyDisplayMap } from "@/keyboardMappings"; import { keys, modifiers, keyDisplayMap } from "@/keyboardMappings";
import { MAX_KEYS_PER_STEP } from "@/constants/macros"; import { MAX_KEYS_PER_STEP, DEFAULT_DELAY } from "@/constants/macros";
import FieldLabel from "@/components/FieldLabel"; import FieldLabel from "@/components/FieldLabel";
// Filter out modifier keys since they're handled in the modifiers section // Filter out modifier keys since they're handled in the modifiers section
@ -30,7 +30,7 @@ const groupedModifiers: Record<string, typeof modifierOptions> = {
Meta: modifierOptions.filter(mod => mod.value.startsWith('Meta')), Meta: modifierOptions.filter(mod => mod.value.startsWith('Meta')),
}; };
const PRESET_DELAYS = [ const basePresetDelays = [
{ value: "50", label: "50ms" }, { value: "50", label: "50ms" },
{ value: "100", label: "100ms" }, { value: "100", label: "100ms" },
{ value: "200", label: "200ms" }, { value: "200", label: "200ms" },
@ -42,6 +42,13 @@ const PRESET_DELAYS = [
{ value: "2000", label: "2000ms" }, { value: "2000", label: "2000ms" },
]; ];
const PRESET_DELAYS = basePresetDelays.map(delay => {
if (parseInt(delay.value, 10) === DEFAULT_DELAY) {
return { ...delay, label: "Default" };
}
return delay;
});
interface MacroStep { interface MacroStep {
keys: string[]; keys: string[];
modifiers: string[]; modifiers: string[];

3
ui/src/routes/devices.$id.settings.macros.edit.tsx
View File

@ -100,8 +100,9 @@ export default function SettingsMacrosEditRoute() {
/> />
<Button <Button
size="SM" size="SM"
theme="danger" theme="light"
text="Delete Macro" text="Delete Macro"
className="text-red-500 dark:text-red-400"
LeadingIcon={LuTrash2} LeadingIcon={LuTrash2}
onClick={() => setShowDeleteConfirm(true)} onClick={() => setShowDeleteConfirm(true)}
disabled={isDeleting} disabled={isDeleting}

45
ui/src/routes/devices.$id.settings.macros.tsx
View File

@ -7,7 +7,7 @@ import { SettingsPageHeader } from "@/components/SettingsPageheader";
import { Button } from "@/components/Button"; import { Button } from "@/components/Button";
import EmptyCard from "@/components/EmptyCard"; import EmptyCard from "@/components/EmptyCard";
import Card from "@/components/Card"; import Card from "@/components/Card";
import { MAX_TOTAL_MACROS, COPY_SUFFIX } from "@/constants/macros"; import { MAX_TOTAL_MACROS, COPY_SUFFIX, DEFAULT_DELAY } from "@/constants/macros";
import { keyDisplayMap, modifierDisplayMap } from "@/keyboardMappings"; import { keyDisplayMap, modifierDisplayMap } from "@/keyboardMappings";
import notifications from "@/notifications"; import notifications from "@/notifications";
import { ConfirmDialog } from "@/components/ConfirmDialog"; import { ConfirmDialog } from "@/components/ConfirmDialog";
@ -190,7 +190,9 @@ export default function SettingsMacrosRoute() {
) : ( ) : (
<span className="font-medium text-slate-500 dark:text-slate-400">Delay only</span> <span className="font-medium text-slate-500 dark:text-slate-400">Delay only</span>
)} )}
<span className="ml-1 text-slate-400 dark:text-slate-500">({step.delay}ms)</span> {step.delay !== DEFAULT_DELAY && (
<span className="ml-1 text-slate-400 dark:text-slate-500">({step.delay}ms)</span>
)}
</span> </span>
</span> </span>
); );
@ -252,26 +254,24 @@ export default function SettingsMacrosRoute() {
return ( return (
<div className="space-y-4"> <div className="space-y-4">
{macros.length > 0 && ( <div className="flex items-center justify-between">
<div className="flex items-center justify-between"> <SettingsPageHeader
<SettingsPageHeader title="Keyboard Macros"
title="Keyboard Macros" description={`Combine keystrokes into a single action for faster workflows.`}
description={`Combine keystrokes into a single action for faster workflows.`} />
/> { macros.length > 0 && (
{ macros.length > 0 && ( <div className="flex items-center pl-2">
<div className="flex items-center pl-2"> <Button
<Button size="SM"
size="SM" theme="primary"
theme="primary" text={isMaxMacrosReached ? `Max Reached` : "Add New Macro"}
text={isMaxMacrosReached ? `Max Reached` : "Add New Macro"} onClick={() => navigate("add")}
onClick={() => navigate("add")} disabled={isMaxMacrosReached}
disabled={isMaxMacrosReached} aria-label="Add new macro"
aria-label="Add new macro" />
/> </div>
</div> )}
)} </div>
</div>
)}
<div className="space-y-4"> <div className="space-y-4">
{loading && macros.length === 0 ? ( {loading && macros.length === 0 ? (
@ -288,7 +288,6 @@ export default function SettingsMacrosRoute() {
<EmptyCard <EmptyCard
IconElm={LuCommand} IconElm={LuCommand}
headline="Create Your First Macro" headline="Create Your First Macro"
description="Combine keystrokes into a single action for faster workflows."
BtnElm={ BtnElm={
<Button <Button
size="SM" size="SM"