+
Still having issues? See our
-
-
-
+ {props.open && (
+ <>
+
- Your selection contains protected units, are you sure you want to continue?
-
-
- Pressing "Continue" will cause all DCS controlled units in the current selection to abort their mission and start following Olympus commands only.
-
-
- If you are trying to delete a human player unit, they will be killed and de-slotted. Be careful!
-
-
- To disable this warning, press on the{" "}
-
-
- {" "}
- button
-
-
-
-
-
-
-
+
+
+ Your selection contains protected units, are you sure you want to continue?
+
+
+ Pressing "Continue" will cause all DCS controlled units in the current selection to abort their mission and start following Olympus commands
+ only.
+
+
+ If you are trying to delete a human player unit, they will be killed and de-slotted. Be careful!
+
+
+ To disable this warning, press on the{" "}
+
+
+ {" "}
+ button
+
+
+
+
+
+
+
{commandModeOptions.commandMode === BLUE_COMMANDER && (
BLUE Commander ({commandModeOptions.spawnPoints.blue} points)
diff --git a/frontend/react/src/ui/panels/optionsmenu.tsx b/frontend/react/src/ui/panels/optionsmenu.tsx
index 9dd9c6c8..30c8f9e2 100644
--- a/frontend/react/src/ui/panels/optionsmenu.tsx
+++ b/frontend/react/src/ui/panels/optionsmenu.tsx
@@ -4,14 +4,28 @@ import { OlCheckbox } from "../components/olcheckbox";
import { OlRangeSlider } from "../components/olrangeslider";
import { OlNumberInput } from "../components/olnumberinput";
import { getApp } from "../../olympusapp";
-import { MAP_OPTIONS_DEFAULTS } from "../../constants/constants";
-import { MapOptionsChangedEvent } from "../../events";
+import { MAP_OPTIONS_DEFAULTS, OlympusState, OptionsSubstate } from "../../constants/constants";
+import { BindShortcutRequestEvent, MapOptionsChangedEvent, ShortcutsChangedEvent } from "../../events";
+import { OlAccordion } from "../components/olaccordion";
+import { Shortcut } from "../../shortcut/shortcut";
+import { OlSearchBar } from "../components/olsearchbar";
+
+const enum Accordion {
+ NONE,
+ BINDINGS,
+ MAP_OPTIONS,
+ CAMERA_PLUGIN,
+}
export function OptionsMenu(props: { open: boolean; onClose: () => void; children?: JSX.Element | JSX.Element[] }) {
const [mapOptions, setMapOptions] = useState(MAP_OPTIONS_DEFAULTS);
+ const [shortcuts, setShortcuts] = useState({} as { [key: string]: Shortcut });
+ const [openAccordion, setOpenAccordion] = useState(Accordion.NONE);
+ const [filterString, setFilterString] = useState("");
useEffect(() => {
MapOptionsChangedEvent.on((mapOptions) => setMapOptions({ ...mapOptions }));
+ ShortcutsChangedEvent.on((shortcuts) => setShortcuts({ ...shortcuts }));
}, []);
return (
@@ -22,226 +36,201 @@ export function OptionsMenu(props: { open: boolean; onClose: () => void; childre
dark:text-white
`}
>
-
{
- getApp().getMap().setOption("showUnitLabels", !mapOptions.showUnitLabels);
- }}
+
+ setOpenAccordion(openAccordion === Accordion.NONE ? Accordion.BINDINGS: Accordion.NONE )
+ }
+ open={openAccordion === Accordion.BINDINGS}
+ title="Key bindings"
>
- {}}>
- Show Unit Labels
- setFilterString(value)} text={filterString} />
+
- L
-
-
- {
- getApp().getMap().setOption("showUnitsEngagementRings", !mapOptions.showUnitsEngagementRings);
- }}
- >
-
{}}>
-
Show Threat Rings
-
- Q
-
-
{
- getApp().getMap().setOption("showUnitsAcquisitionRings", !mapOptions.showUnitsAcquisitionRings);
- }}
- >
-
{}}>
-
Show Detection rings
-
- E
-
-
{
- getApp().getMap().setOption("showUnitTargets", !mapOptions.showUnitTargets);
- }}
- >
-
{}}>
-
Show Detection lines
-
- F
-
-
{
- getApp().getMap().setOption("hideUnitsShortRangeRings", !mapOptions.hideUnitsShortRangeRings);
- }}
- >
-
{}}>
-
Hide Short range Rings
-
- R
-
-
{
- getApp().getMap().setOption("keepRelativePositions", !mapOptions.keepRelativePositions);
- }}
- >
-
{}}>
-
Keep units relative positions
-
- P
-
-
{
- getApp().getMap().setOption("hideGroupMembers", !mapOptions.hideGroupMembers);
- }}
- >
-
{}}>
-
Hide Group members
-
- G
-
-
{
- getApp().getMap().setOption("showMinimap", !mapOptions.showMinimap);
- }}
- >
-
{}}>
-
Show minimap
-
- ?
-
-
{
+ getApp().setState(OlympusState.OPTIONS, OptionsSubstate.KEYBIND);
+ BindShortcutRequestEvent.dispatch(shortcut);
+ }}
+ >
+ {shortcut.getOptions().label}
+
+ {shortcut.getOptions().altKey ? "Alt + " : ""}
+ {shortcut.getOptions().ctrlKey ? "Ctrl + " : ""}
+ {shortcut.getOptions().shiftKey ? "Shift + " : ""}
+ {shortcut.getOptions().code}
+
+
+ );
+ })}
+
+
-
-
setOpenAccordion(openAccordion === Accordion.NONE ? Accordion.MAP_OPTIONS: Accordion.NONE )} open={openAccordion === Accordion.MAP_OPTIONS} title="Map options">
+
getApp().getMap().setOption("showUnitLabels", !mapOptions.showUnitLabels)}
+ >
+
{}}>
+
Show Unit Labels
+
+
getApp().getMap().setOption("showUnitsEngagementRings", !mapOptions.showUnitsEngagementRings)}
+ >
+
{}}>
+
Show Threat Rings
+
+
getApp().getMap().setOption("showUnitsAcquisitionRings", !mapOptions.showUnitsAcquisitionRings)}
+ >
+
{}}>
+
Show Detection rings
+
+
getApp().getMap().setOption("showUnitTargets", !mapOptions.showUnitTargets)}
+ >
+
{}}>
+
Show Detection lines
+
+
getApp().getMap().setOption("hideUnitsShortRangeRings", !mapOptions.hideUnitsShortRangeRings)}
+ >
+
{}}>
+
Hide Short range Rings
+
+
getApp().getMap().setOption("keepRelativePositions", !mapOptions.keepRelativePositions)}
+ >
+
{}}>
+
Keep units relative positions
+
+
getApp().getMap().setOption("hideGroupMembers", !mapOptions.hideGroupMembers)}
+ >
+
{}}>
+
Hide Group members
+
+
getApp().getMap().setOption("showMinimap", !mapOptions.showMinimap)}
+ >
+
{}}>
+
Show minimap
+
+
+
+
setOpenAccordion(openAccordion === Accordion.NONE ? Accordion.CAMERA_PLUGIN: Accordion.NONE )} open={openAccordion === Accordion.CAMERA_PLUGIN} title="Camera plugin options">
+
-
+
-
- DCS Camera Zoom Scaling
-
-
-
{
- getApp().getMap().setOption("cameraPluginRatio", parseInt(ev.target.value))
- }}
- value={mapOptions.cameraPluginRatio}
- min={0}
- max={100}
- step={1}
- />
-
-
-
+
+
DCS Camera Port
-
-
{ getApp().getMap().setOption("cameraPluginPort", mapOptions.cameraPluginPort - 1) }}
- onIncrease={() => { getApp().getMap().setOption("cameraPluginPort", mapOptions.cameraPluginPort + 1) }}
- onChange={(ev) => { getApp().getMap().setOption("cameraPluginPort", ev.target.value)}}
- />
-
-
+
+
getApp().getMap().setOption("cameraPluginRatio", parseInt(ev.target.value))}
+ value={mapOptions.cameraPluginRatio}
+ min={0}
+ max={100}
+ step={1}
+ />
+
+
+ DCS Camera Port
+
+
+
+ getApp()
+ .getMap()
+ .setOption("cameraPluginPort", mapOptions.cameraPluginPort - 1)
+ }
+ onIncrease={() =>
+ getApp()
+ .getMap()
+ .setOption("cameraPluginPort", mapOptions.cameraPluginPort + 1)
+ }
+ onChange={(ev) => getApp().getMap().setOption("cameraPluginPort", ev.target.value)}
+ />
+
+