From eaacbb417c64fd5c1a21cfc3db7902fa3b61358c Mon Sep 17 00:00:00 2001 From: Pax1601 Date: Fri, 24 Mar 2023 10:41:11 +0100 Subject: [PATCH] Sliders hidden when required --- client/src/panels/unitcontrolpanel.ts | 13 +++++++++++-- client/views/unitcontrolpanel.ejs | 1 + installer/olympus.iss | 2 +- scripts/OlympusCommand.lua | 2 +- src/shared/include/defines.h | 4 +--- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/client/src/panels/unitcontrolpanel.ts b/client/src/panels/unitcontrolpanel.ts index ed835b67..d0309244 100644 --- a/client/src/panels/unitcontrolpanel.ts +++ b/client/src/panels/unitcontrolpanel.ts @@ -126,8 +126,17 @@ export class UnitControlPanel extends Panel { #showFlightControlSliders(units: Unit[]) { - this.#airspeedSlider.show(); - this.#altitudeSlider.show(); + if (getUnitsManager().getSelectedUnitsType() !== undefined) + this.#airspeedSlider.show() + else + this.#airspeedSlider.hide(); + + if (getUnitsManager().getSelectedUnitsType() === "Aircraft" || getUnitsManager().getSelectedUnitsType() === "Helicopter") + this.#altitudeSlider.show() + else + this.#altitudeSlider.hide(); + + this.getElement().querySelector(`#categories-tooltip`)?.classList.toggle("hide", getUnitsManager().getSelectedUnitsType() !== undefined); var unitsType = getUnitsManager().getSelectedUnitsType(); var targetAltitude = getUnitsManager().getSelectedUnitsTargetAltitude(); diff --git a/client/views/unitcontrolpanel.ejs b/client/views/unitcontrolpanel.ejs index 573dabed..20a0b2ee 100644 --- a/client/views/unitcontrolpanel.ejs +++ b/client/views/unitcontrolpanel.ejs @@ -36,6 +36,7 @@ +
Multiple categories selected
diff --git a/installer/olympus.iss b/installer/olympus.iss index 25d344e2..ae99f160 100644 --- a/installer/olympus.iss +++ b/installer/olympus.iss @@ -2,7 +2,7 @@ [Setup] AppName=DCS Olympus -AppVerName=DCS Olympus Alpha v0.1.0 +AppVerName=DCS Olympus Alpha v0.1.1 DefaultDirName={usersavedgames}\DCS.openbeta DefaultGroupName=DCSOlympus OutputBaseFilename=DCSOlympus diff --git a/scripts/OlympusCommand.lua b/scripts/OlympusCommand.lua index a174955d..579d26f6 100644 --- a/scripts/OlympusCommand.lua +++ b/scripts/OlympusCommand.lua @@ -1,4 +1,4 @@ -local version = "v0.1.0-alpha" +local version = "v0.1.1-alpha" local debug = false diff --git a/src/shared/include/defines.h b/src/shared/include/defines.h index 6a75f828..bb868841 100644 --- a/src/shared/include/defines.h +++ b/src/shared/include/defines.h @@ -1,12 +1,10 @@ #pragma once -#define VERSION "v0.0.1" +#define VERSION "v0.1.1" #define LOG_NAME "Olympus_log.txt" #define REST_ADDRESS L"http://localhost:30000" #define REST_URI L"olympus" #define UNITS_URI L"units" -#define UPDATE_URI L"update" -#define REFRESH_URI L"refresh" #define LOGS_URI L"logs" #define AIRBASES_URI L"airbases" #define BULLSEYE_URI L"bullseyes"