Skip to content

Commit

Permalink
Added default Settings and ToDos
Browse files Browse the repository at this point in the history
* Added all default settings for new Radio Panels
* Added H/V Switch ToDo's on MainWindow
  • Loading branch information
FPGSchiba committed Nov 26, 2023
1 parent 6fffc04 commit 6532953
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 4 deletions.
35 changes: 34 additions & 1 deletion DCS-SR-Client/Settings/GlobalSettingsStore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -500,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 @@ -531,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 @@ -563,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
11 changes: 8 additions & 3 deletions DCS-SR-Client/UI/ClientWindow/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1664,25 +1664,27 @@ private void ShowOverlayTenHorizontal_OnClick(object sender, RoutedEventArgs e)
{
ToggleOverlay(true, 7);
}

private void ShowOverlayOneVertical_OnClick(object sender, RoutedEventArgs e)
{
ToggleOverlay(true, 8);
}

private void ShowOverlayOneHorizontal_OnClick(object sender, RoutedEventArgs e)
{
ToggleOverlay(true, 9);
Logger.Info("1H Panel Button Clicked");
}

private void ShowOverlayTenVerticalLong_OnClick(object sender, RoutedEventArgs e)
{
ToggleOverlay(true, 10);
}

private void ShowOverlayTenHorizontalWide_OnClick(object sender, RoutedEventArgs e)
{
ToggleOverlay(true, 11);
}


private void ToggleOverlay(bool uiButton, int switchTo)
{
//debounce show hide (1 tick = 100ns, 6000000 ticks = 600ms debounce)
Expand Down Expand Up @@ -1741,16 +1743,19 @@ private void ToggleOverlay(bool uiButton, int switchTo)
windows[switchTo] = new RadioOverlayWindowTenHorizontal(ToggleOverlay);
break;
case 8:
// TODO: Add Toggle Overlay for Horizontal Swap
windows[switchTo] = new RadioOverlayWindowOneVertical();
break;
case 9:
// TODO: Add Toggle Overlay for Horizontal Swap
windows[switchTo] = new RadioOverlayWindowOneHorizontal();
Logger.Info($"Overlay switched to Case {switchTo}");
break;
case 10:
// TODO: Add Toggle Overlay for Horizontal Swap
windows[switchTo] = new RadioOverlayWindowTenVerticalLong();
break;
case 11:
// TODO: Add Toggle Overlay for Horizontal Swap
windows[switchTo] = new RadioOverlayWindowTenHorizontalWide();
break;
}
Expand Down

0 comments on commit 6532953

Please sign in to comment.