From 6ed91fc6944f8af36bceb8d2e9d2c59406661a54 Mon Sep 17 00:00:00 2001 From: Alan Smith Date: Sat, 28 Jun 2025 16:45:26 -0400 Subject: [PATCH 1/2] Make Menu open WPI toolbox --- src/App.tsx | 1 + src/reactComponents/Menu.tsx | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/App.tsx b/src/App.tsx index ae37d09b..3e4f2638 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -379,6 +379,7 @@ const App: React.FC = (): React.JSX.Element => { gotoTab={setActiveTab} project={project} setProject={setProject} + openToolbox= {() => setToolboxSettingsModalIsOpen(true)} /> diff --git a/src/reactComponents/Menu.tsx b/src/reactComponents/Menu.tsx index 5c348d41..eb9d5ac1 100644 --- a/src/reactComponents/Menu.tsx +++ b/src/reactComponents/Menu.tsx @@ -48,6 +48,7 @@ export interface MenuProps { storage: commonStorage.Storage | null; gotoTab: (tabKey: string) => void; project: commonStorage.Project | null; + openToolbox: () => void; setProject: (project: commonStorage.Project | null) => void; } @@ -248,6 +249,8 @@ export function Component(props: MenuProps): React.JSX.Element { setProjectModalOpen(true); } else if (key === 'about') { setAboutDialogVisible(true); + } else if (key === 'wpi_toolbox'){ + props.openToolbox(); } else { // TODO: Handle other menu actions console.log(`Selected key that wasn't module: ${key}`); From 9bfbfa05de8e6321bd839544240bc3eea337d635 Mon Sep 17 00:00:00 2001 From: Alan Smith Date: Sat, 28 Jun 2025 21:27:58 -0400 Subject: [PATCH 2/2] Change openToolbox to be openWPIToolboxSettings --- src/App.tsx | 2 +- src/reactComponents/Menu.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 3e4f2638..1813d73c 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -379,7 +379,7 @@ const App: React.FC = (): React.JSX.Element => { gotoTab={setActiveTab} project={project} setProject={setProject} - openToolbox= {() => setToolboxSettingsModalIsOpen(true)} + openWPIToolboxSettings={() => setToolboxSettingsModalIsOpen(true)} /> diff --git a/src/reactComponents/Menu.tsx b/src/reactComponents/Menu.tsx index eb9d5ac1..25bc82b8 100644 --- a/src/reactComponents/Menu.tsx +++ b/src/reactComponents/Menu.tsx @@ -48,7 +48,7 @@ export interface MenuProps { storage: commonStorage.Storage | null; gotoTab: (tabKey: string) => void; project: commonStorage.Project | null; - openToolbox: () => void; + openWPIToolboxSettings: () => void; setProject: (project: commonStorage.Project | null) => void; } @@ -250,7 +250,7 @@ export function Component(props: MenuProps): React.JSX.Element { } else if (key === 'about') { setAboutDialogVisible(true); } else if (key === 'wpi_toolbox'){ - props.openToolbox(); + props.openWPIToolboxSettings(); } else { // TODO: Handle other menu actions console.log(`Selected key that wasn't module: ${key}`);