Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/74 add 1 radio panel vertical horizontal + add long 10 radio panel #75

Merged
merged 8 commits into from
Nov 26, 2023
Merged

Feature/74 add 1 radio panel vertical horizontal + add long 10 radio panel #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5c397a9
added 1 radio panel variants (horizontal and vertical)
Dabble1SC Nov 25, 2023
eeaba62
Added ultrawide radio panels variants for 10 radios
Dabble1SC Nov 25, 2023
4ff3ab4
updated min height to match panel height on 10H Wide panel
Dabble1SC Nov 25, 2023
c6d5172
Added logging functionality for all additional panels
Dabble1SC Nov 26, 2023
cb76e28
Added logger functions to 1H panel opening sequence
Dabble1SC Nov 26, 2023
f57d4af
Merge branch 'develop' into feature/74-add-1-radio-panel-vertical-hor…
FPGSchiba Nov 26, 2023
6fffc04
Fixed Client Project Compile Settings
FPGSchiba Nov 26, 2023
6532953
Added default Settings and ToDos
FPGSchiba Nov 26, 2023
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
28 changes: 28 additions & 0 deletions DCS-SR-Client/DCS-SR-Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,15 @@
<Compile Include="UI\ClientWindow\ClientList\ClientListWindow.xaml.cs">
<DependentUpon>ClientListWindow.xaml</DependentUpon>
</Compile>
<Compile Include="UI\RadioOverlayWindow\RadioOverlayOneHorizontal.xaml.cs">
<DependentUpon>RadioOverlayOneHorizontal.xaml</DependentUpon>
</Compile>
<Compile Include="UI\RadioOverlayWindow\RadioOverlayTenHorizontalWide.xaml.cs">
<DependentUpon>RadioOverlayTenHorizontalWide.xaml</DependentUpon>
</Compile>
<Compile Include="UI\RadioOverlayWindow\RadioOverlayTenVerticalLong.xaml.cs">
<DependentUpon>RadioOverlayTenVerticalLong.xaml</DependentUpon>
</Compile>
<Compile Include="UI\RadioOverlayWindow\RadioOverlayTwoHorizontal.xaml.cs">
<DependentUpon>RadioOverlayTwoHorizontal.xaml</DependentUpon>
</Compile>
Expand All @@ -338,6 +347,9 @@
<Compile Include="UI\RadioOverlayWindow\RadioOverlayThreeVertical.xaml.cs">
<DependentUpon>RadioOverlayThreeVertical.xaml</DependentUpon>
</Compile>
<Compile Include="UI\RadioOverlayWindow\RadioOverlayOneVertical.xaml.cs">
<DependentUpon>RadioOverlayOneVertical.xaml</DependentUpon>
</Compile>
<Compile Include="UI\RadioOverlayWindow\Utils\IntercomControlGroup2Horizontal.xaml.cs">
<DependentUpon>IntercomControlGroup2Horizontal.xaml</DependentUpon>
</Compile>
Expand Down Expand Up @@ -410,6 +422,18 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UI\RadioOverlayWindow\RadioOverlayOneHorizontal.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="UI\RadioOverlayWindow\RadioOverlayTenHorizontalWide.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="UI\RadioOverlayWindow\RadioOverlayTenVerticalLong.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="UI\RadioOverlayWindow\RadioOverlayTwoHorizontal.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
Expand All @@ -430,6 +454,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="UI\RadioOverlayWindow\RadioOverlayOneVertical.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="UI\RadioOverlayWindow\Utils\IntercomControlGroup2Horizontal.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
Expand Down
70 changes: 68 additions & 2 deletions DCS-SR-Client/Settings/GlobalSettingsStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@ public enum GlobalSettingsKeys

#region Radio panel settings

// --------- Vertical Panels --------------
// Radio 1V
RadioOneVerticalX,
RadioOneVerticalY,
RadioOneVerticalSize,
RadioOneVerticalOpacity,
RadioOneVerticalWidth,
RadioOneVerticalHeight,

// Radio 2V
RadioTwoVerticalX,
RadioTwoVerticalY,
Expand Down Expand Up @@ -63,6 +72,22 @@ public enum GlobalSettingsKeys
RadioTenVerticalWidth,
RadioTenVerticalHeight,

// Radio 10VL
RadioTenLongVerticalX,
RadioTenLongVerticalY,
RadioTenLongVerticalSize,
RadioTenLongVerticalOpacity,
RadioTenLongVerticalWidth,
RadioTenLongVerticalHeight,

// --------- Horizontal Panels --------------
// Radio 1H
RadioOneHorizontalX,
RadioOneHorizontalY,
RadioOneHorizontalSize,
RadioOneHorizontalOpacity,
RadioOneHorizontalWidth,
RadioOneHorizontalHeight,

// Radio 2H
RadioTwoHorizontalX,
Expand Down Expand Up @@ -95,7 +120,15 @@ public enum GlobalSettingsKeys
RadioTenHorizontalOpacity,
RadioTenHorizontalWidth,
RadioTenHorizontalHeight,


// Radio 10HW
RadioTenWideHorizontalX,
RadioTenWideHorizontalY,
RadioTenWideHorizontalSize,
RadioTenWideHorizontalOpacity,
RadioTenWideHorizontalWidth,
RadioTenWideHorizontalHeight,

// Client Window
ClientX,
ClientY,
Expand Down Expand Up @@ -467,6 +500,14 @@ public void SetClientSetting(GlobalSettingsKeys key, string[] strArray)

#region Radio Panel settings

// Raio 1V
{GlobalSettingsKeys.RadioOneVerticalX.ToString(), "300"},
{GlobalSettingsKeys.RadioOneVerticalY.ToString(), "300"},
{GlobalSettingsKeys.RadioOneVerticalSize.ToString(), "1.0"},
{GlobalSettingsKeys.RadioOneVerticalOpacity.ToString(), "1.0"},
{GlobalSettingsKeys.RadioOneVerticalWidth.ToString(), "122"},
{GlobalSettingsKeys.RadioOneVerticalHeight.ToString(), "270"},

// Radio 2V
{GlobalSettingsKeys.RadioTwoVerticalX.ToString(), "300"},
{GlobalSettingsKeys.RadioTwoVerticalY.ToString(), "300"},
Expand Down Expand Up @@ -498,6 +539,22 @@ public void SetClientSetting(GlobalSettingsKeys key, string[] strArray)
{GlobalSettingsKeys.RadioTenVerticalOpacity.ToString(), "1.0"},
{GlobalSettingsKeys.RadioTenVerticalWidth.ToString(), "122"},
{GlobalSettingsKeys.RadioTenVerticalHeight.ToString(), "270"},

// Radio 10VL
{GlobalSettingsKeys.RadioTenLongVerticalX.ToString(), "300"},
{GlobalSettingsKeys.RadioTenLongVerticalY.ToString(), "300"},
{GlobalSettingsKeys.RadioTenLongVerticalSize.ToString(), "1.0"},
{GlobalSettingsKeys.RadioTenLongVerticalOpacity.ToString(), "1.0"},
{GlobalSettingsKeys.RadioTenLongVerticalWidth.ToString(), "122"},
{GlobalSettingsKeys.RadioTenLongVerticalHeight.ToString(), "270"},

// Radio 1H
{GlobalSettingsKeys.RadioOneHorizontalX.ToString(), "300"},
{GlobalSettingsKeys.RadioOneHorizontalY.ToString(), "300"},
{GlobalSettingsKeys.RadioOneHorizontalSize.ToString(), "1.0"},
{GlobalSettingsKeys.RadioOneHorizontalOpacity.ToString(), "1.0"},
{GlobalSettingsKeys.RadioOneHorizontalWidth.ToString(), "122"},
{GlobalSettingsKeys.RadioOneHorizontalHeight.ToString(), "270"},

// Radio 2H
{GlobalSettingsKeys.RadioTwoHorizontalX.ToString(), "300"},
Expand Down Expand Up @@ -530,7 +587,16 @@ public void SetClientSetting(GlobalSettingsKeys key, string[] strArray)
{GlobalSettingsKeys.RadioTenHorizontalOpacity.ToString(), "1.0"},
{GlobalSettingsKeys.RadioTenHorizontalWidth.ToString(), "122"},
{GlobalSettingsKeys.RadioTenHorizontalHeight.ToString(), "270"},


// Radio 10HW
{GlobalSettingsKeys.RadioTenWideHorizontalX.ToString(), "300"},
{GlobalSettingsKeys.RadioTenWideHorizontalY.ToString(), "300"},
{GlobalSettingsKeys.RadioTenWideHorizontalSize.ToString(), "1.0"},
{GlobalSettingsKeys.RadioTenWideHorizontalOpacity.ToString(), "1.0"},
{GlobalSettingsKeys.RadioTenWideHorizontalWidth.ToString(), "122"},
{GlobalSettingsKeys.RadioTenWideHorizontalHeight.ToString(), "270"},

// Client Window
{GlobalSettingsKeys.ClientX.ToString(), "200"},
{GlobalSettingsKeys.ClientY.ToString(), "200"},

Expand Down
Loading
Loading