Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions apps/desktop/src/lib/trpc/routers/settings/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ export const createSettingsRouter = () => {
description: z.string().optional(),
cwd: z.string(),
commands: z.array(z.string()),
pinnedToBar: z.boolean().optional(),
executionMode: z.enum(EXECUTION_MODES).optional(),
}),
)
Expand Down Expand Up @@ -179,6 +180,7 @@ export const createSettingsRouter = () => {
description: z.string().optional(),
cwd: z.string().optional(),
commands: z.array(z.string()).optional(),
pinnedToBar: z.boolean().optional(),
executionMode: z.enum(EXECUTION_MODES).optional(),
}),
}),
Expand All @@ -200,6 +202,8 @@ export const createSettingsRouter = () => {
if (input.patch.cwd !== undefined) preset.cwd = input.patch.cwd;
if (input.patch.commands !== undefined)
preset.commands = input.patch.commands;
if (input.patch.pinnedToBar !== undefined)
preset.pinnedToBar = input.patch.pinnedToBar;
if (input.patch.executionMode !== undefined)
preset.executionMode = input.patch.executionMode;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { DropdownMenuShortcut } from "@superset/ui/dropdown-menu";
import { useHotkeyText } from "renderer/stores/hotkeys";
import type { HotkeyId } from "shared/hotkeys";

interface HotkeyMenuShortcutProps {
hotkeyId: HotkeyId;
}

export function HotkeyMenuShortcut({ hotkeyId }: HotkeyMenuShortcutProps) {
const hotkeyText = useHotkeyText(hotkeyId);
if (hotkeyText === "Unassigned") {
return null;
}
return <DropdownMenuShortcut>{hotkeyText}</DropdownMenuShortcut>;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { HotkeyMenuShortcut } from "./HotkeyMenuShortcut";
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export function TopBar() {
const isMac = platform === undefined || platform === "darwin";

return (
<div className="drag gap-2 h-12 w-full flex items-center justify-between bg-background border-b border-border relative">
<div className="drag gap-2 h-12 w-full flex items-center justify-between bg-muted/45 border-b border-border relative dark:bg-muted/35">
<div
className="flex items-center gap-1.5 h-full"
style={{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,15 +175,17 @@ function WorkspacePage() {
workspaceId,
addTab,
]);
useAppHotkey("NEW_CHAT", () => addChatTab(workspaceId), undefined, [
workspaceId,
addChatTab,
]);
useAppHotkey(
"REOPEN_TAB",
() => {
if (!reopenClosedTab(workspaceId)) {
addChatTab(workspaceId);
}
reopenClosedTab(workspaceId);
},
undefined,
[workspaceId, reopenClosedTab, addChatTab],
[workspaceId, reopenClosedTab],
);
useAppHotkey("NEW_BROWSER", () => addBrowserTab(workspaceId), undefined, [
workspaceId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export function WorkspaceSidebar({
);

return (
<SidebarDropZone className="flex flex-col h-full bg-background">
<SidebarDropZone className="flex flex-col h-full bg-muted/45 dark:bg-muted/35">
<WorkspaceSidebarHeader isCollapsed={isCollapsed} />

<div className="flex-1 overflow-y-auto hide-scrollbar">
Expand Down
Loading
Loading