diff --git a/Icarus/FilledSolidPanel/FilledSolidPanelVM.vb b/Icarus/FilledSolidPanel/FilledSolidPanelVM.vb index 5c53a33..f9bb80e 100644 --- a/Icarus/FilledSolidPanel/FilledSolidPanelVM.vb +++ b/Icarus/FilledSolidPanel/FilledSolidPanelVM.vb @@ -840,6 +840,7 @@ Public Class FilledSolidPanelVM Map.refSliderManagerVM.SetLayerIndexIsEnabled(bValue) Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(bValue) Map.refSliceManagerVM.SetButtonsIsEnabled(bValue) + Map.refInstrumentPanelVM.SetInstrumentPanelIsEnabled(bValue) SetFilledSolidListIsEnabled(bValue) End Sub diff --git a/Icarus/InstrumentPanel/InstrumentPanelV.xaml b/Icarus/InstrumentPanel/InstrumentPanelV.xaml index eeaf3c3..b74099f 100644 --- a/Icarus/InstrumentPanel/InstrumentPanelV.xaml +++ b/Icarus/InstrumentPanel/InstrumentPanelV.xaml @@ -3,6 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:local="clr-namespace:Icarus" + IsEnabled="{Binding InstrumentPanel_IsEnabled}" Orientation="Horizontal"> - + + + @@ -27,12 +29,27 @@ DataContext="{StaticResource SliderManagerVM}" HorizontalAlignment="Stretch"/> - + + + + + + + + + + diff --git a/Icarus/Project/ProjectVM.vb b/Icarus/Project/ProjectVM.vb index 989c837..9d3f9a4 100644 --- a/Icarus/Project/ProjectVM.vb +++ b/Icarus/Project/ProjectVM.vb @@ -3,6 +3,7 @@ Imports EgtWPFLib5 Imports EgtUILib Imports System.Collections.ObjectModel Imports System.IO +Imports System.Globalization Public Class ProjectVM Inherits VMBase @@ -28,3 +29,15 @@ Public Class ProjectVM End Class +Public Class VisibilityToRowConverter + Implements IValueConverter + + Public Function Convert(ByVal value As Object, ByVal targetType As Type, ByVal parameter As Object, ByVal culture As CultureInfo) As Object Implements IValueConverter.Convert + If IsNothing(value) Then Return 2 + Return If(value = Visibility.Visible, 1, 2) + End Function + + Public Function ConvertBack(ByVal value As Object, ByVal targetType As Type, ByVal parameter As Object, ByVal culture As CultureInfo) As Object Implements IValueConverter.ConvertBack + Throw New System.NotImplementedException() + End Function +End Class diff --git a/Icarus/RibPanel/RibPanelVM.vb b/Icarus/RibPanel/RibPanelVM.vb index cf6896c..262b971 100644 --- a/Icarus/RibPanel/RibPanelVM.vb +++ b/Icarus/RibPanel/RibPanelVM.vb @@ -860,6 +860,7 @@ Public Class RibPanelVM Map.refSliderManagerVM.SetLayerIndexIsEnabled(bValue) Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(bValue) Map.refSliceManagerVM.SetButtonsIsEnabled(bValue) + Map.refInstrumentPanelVM.SetInstrumentPanelIsEnabled(bValue) SetRibListIsEnabled(bValue) End Sub diff --git a/Icarus/ShellNumberPanel/ShellNumberPanelVM.vb b/Icarus/ShellNumberPanel/ShellNumberPanelVM.vb index 05d22ba..5ea4e5a 100644 --- a/Icarus/ShellNumberPanel/ShellNumberPanelVM.vb +++ b/Icarus/ShellNumberPanel/ShellNumberPanelVM.vb @@ -845,6 +845,7 @@ Public Class ShellNumberPanelVM Map.refSliderManagerVM.SetLayerIndexIsEnabled(bValue) Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(bValue) Map.refSliceManagerVM.SetButtonsIsEnabled(bValue) + Map.refInstrumentPanelVM.SetInstrumentPanelIsEnabled(bValue) SetShellNumberListIsEnabled(bValue) End Sub diff --git a/Icarus/StartMachPanel/StartMachPanelVM.vb b/Icarus/StartMachPanel/StartMachPanelVM.vb index 7b97fb2..b8659e3 100644 --- a/Icarus/StartMachPanel/StartMachPanelVM.vb +++ b/Icarus/StartMachPanel/StartMachPanelVM.vb @@ -601,6 +601,7 @@ Public Class StartMachPanelVM Map.refSliderManagerVM.SetLayerIndexIsEnabled(bValue) Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(bValue) Map.refSliceManagerVM.SetButtonsIsEnabled(bValue) + Map.refInstrumentPanelVM.SetInstrumentPanelIsEnabled(bValue) SetStartListIsEnabled(bValue) End Sub