diff --git a/DoorParameters/PartPageV.xaml b/DoorParameters/PartPageV.xaml index 32f8d72..5e98d49 100644 --- a/DoorParameters/PartPageV.xaml +++ b/DoorParameters/PartPageV.xaml @@ -12,16 +12,16 @@ - + - - + + - + @@ -893,7 +893,7 @@ - + diff --git a/DoorParameters/PartPageV.xaml.vb b/DoorParameters/PartPageV.xaml.vb index 17f516d..e5a7472 100644 --- a/DoorParameters/PartPageV.xaml.vb +++ b/DoorParameters/PartPageV.xaml.vb @@ -1,8 +1,8 @@ Public Class PartPageV Public Sub ItemsControl_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) - Dim ListControl As ListBox=DirectCast(sender,listbox) - If Not IsNothing( ListControl.SelectedItem) Then + Dim ListControl As ListBox = DirectCast(sender, ListBox) + If Not IsNothing(ListControl.SelectedItem) Then Dim SelectedItemIndex As Integer = ListControl.Items.IndexOf(ListControl.SelectedItem) If SelectedItemIndex < 0 Then Return ListControl.Dispatcher.BeginInvoke(DirectCast(Sub() @@ -30,4 +30,5 @@ Private Sub UserControl_IsEnabledChanged(sender As Object, e As DependencyPropertyChangedEventArgs) End Sub + End Class diff --git a/DoorParameters/PartPageVM.vb b/DoorParameters/PartPageVM.vb index 42b918e..0d6c51f 100644 --- a/DoorParameters/PartPageVM.vb +++ b/DoorParameters/PartPageVM.vb @@ -73,6 +73,50 @@ Public Class PartPageVM End Get End Property +#Region "DISPOSITION SCREEN" + + Public ReadOnly Property WidthColumn1 As String + Get + If OptionModule.m_nDispostionScreen = 0 Or OptionModule.m_nDispostionScreen = 1 Then + Return "1*" + Else + Return "5*" + End If + End Get + End Property + + Public ReadOnly Property WidthColumn2 As String + Get + If OptionModule.m_nDispostionScreen = 0 Or OptionModule.m_nDispostionScreen = 1 Then + Return "5*" + Else + Return "1*" + End If + End Get + End Property + + Public ReadOnly Property GridGeneralDiposition As String + Get + If OptionModule.m_nDispostionScreen = 0 Or OptionModule.m_nDispostionScreen = 1 Then + Return "1" + Else + Return "0" + End If + End Get + End Property + + Public ReadOnly Property CompoPanelDiposition As String + Get + If OptionModule.m_nDispostionScreen = 0 Or OptionModule.m_nDispostionScreen = 1 Then + Return "0" + Else + Return "1" + End If + End Get + End Property + +#End Region ' Disposition Screen + #Region "CONSTUCTOR" Sub New() diff --git a/HardwareManager/HardwarePageV.xaml b/HardwareManager/HardwarePageV.xaml index d443541..fed4d18 100644 --- a/HardwareManager/HardwarePageV.xaml +++ b/HardwareManager/HardwarePageV.xaml @@ -15,8 +15,8 @@ - - + + @@ -28,7 +28,7 @@ - + @@ -859,9 +859,9 @@ - + - + diff --git a/HardwareManager/HardwarePageVM.vb b/HardwareManager/HardwarePageVM.vb index 72d5c8a..375aceb 100644 --- a/HardwareManager/HardwarePageVM.vb +++ b/HardwareManager/HardwarePageVM.vb @@ -93,6 +93,50 @@ Public Class HardwarePageVM End Get End Property +#Region "DISPOSITION SCREEN" + + Public ReadOnly Property WidthColumn1 As String + Get + If OptionModule.m_nDispostionScreen = 0 Or OptionModule.m_nDispostionScreen = 1 Then + Return "1*" + Else + Return "5*" + End If + End Get + End Property + + Public ReadOnly Property WidthColumn2 As String + Get + If OptionModule.m_nDispostionScreen = 0 Or OptionModule.m_nDispostionScreen = 1 Then + Return "5*" + Else + Return "1*" + End If + End Get + End Property + + Public ReadOnly Property GridGeneralDiposition As String + Get + If OptionModule.m_nDispostionScreen = 0 Or OptionModule.m_nDispostionScreen = 1 Then + Return "1" + Else + Return "0" + End If + End Get + End Property + + Public ReadOnly Property CompoPanelDiposition As String + Get + If OptionModule.m_nDispostionScreen = 0 Or OptionModule.m_nDispostionScreen = 1 Then + Return "0" + Else + Return "1" + End If + End Get + End Property + +#End Region ' Disposition Screen + #Region "MESSAGES" Public ReadOnly Property GeneralMsg As String diff --git a/MainWindow/MainWindowV.xaml b/MainWindow/MainWindowV.xaml index 6d1d7fa..235a3b8 100644 --- a/MainWindow/MainWindowV.xaml +++ b/MainWindow/MainWindowV.xaml @@ -23,8 +23,8 @@ - - + + @@ -32,10 +32,11 @@ - - - - + + + + + diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb index 8dbc5c1..83225d5 100644 --- a/MainWindow/MainWindowVM.vb +++ b/MainWindow/MainWindowVM.vb @@ -77,6 +77,7 @@ Public Class MainWindowVM Private m_PartPage As PartPageV Private m_AssemblyPage As AssemblyPageV Private m_HardwarePage As HardwarePageV + Private m_SceneManager As SceneManagerV Private Watcher As FileSystemWatcher = New FileSystemWatcher(IniFile.m_CompoDir, "*" & LUA_EXTENSION) @@ -128,6 +129,12 @@ Public Class MainWindowVM End Get End Property + Public ReadOnly Property SceneManagerControl As ContentControl + Get + Return m_SceneManager + End Get + End Property + Public ReadOnly Property ProjectManagerControl As ContentControl Get If m_SelectedPage <> ListPageEnum.nHardwarePage then @@ -159,10 +166,67 @@ Public Class MainWindowVM m_HardwarePage.DataContext = New HardwarePageVM m_AssemblyManager = New AssemblyManagerV m_AssemblyManager.DataContext = New AssemblyManagerVM + ' inserisco la scena + m_SceneManager = New SceneManagerV + m_SceneManager.DataContext = New SceneManagerVM Dim OptionsPage As OptionsVM = OptionPage InitWatcher() End Sub +#Region "DISPOSITION SCREEN" + + Public ReadOnly Property WidthColumn1 As String + Get + If OptionModule.m_nDispostionScreen = 1 Or OptionModule.m_nDispostionScreen = 2 Then + Return "5*" + Else + Return "6*" + End If + End Get + End Property + + Public ReadOnly Property WidthColumn2 As String + Get + If OptionModule.m_nDispostionScreen = 1 Or OptionModule.m_nDispostionScreen = 2 Then + Return "6*" + Else + Return "5*" + End If + End Get + End Property + + Public ReadOnly Property AssemblyManagerDisposition As String + Get + If OptionModule.m_nDispostionScreen = 1 Or OptionModule.m_nDispostionScreen = 2 Then + Return "1" + Else + Return "0" + End If + End Get + End Property + + Public ReadOnly Property PageControlDisposition As String + Get + If OptionModule.m_nDispostionScreen = 1 Or OptionModule.m_nDispostionScreen = 2 Then + Return "1" + Else + Return "0" + End If + End Get + End Property + + Public ReadOnly Property SceneManagerDiposition As String + Get + If OptionModule.m_nDispostionScreen = 1 Or OptionModule.m_nDispostionScreen = 2 Then + Return "0" + Else + Return "1" + End If + End Get + End Property + +#End Region ' Disposition Screen + #Region "Methods" Public Sub ShowErrorCompoLoad() diff --git a/OptionsWindow/OptionModule.vb b/OptionsWindow/OptionModule.vb index 401713a..7251786 100644 --- a/OptionsWindow/OptionModule.vb +++ b/OptionsWindow/OptionModule.vb @@ -58,6 +58,8 @@ Friend Module OptionModule Friend m_EnableBrowse As Boolean = False + Friend m_nDispostionScreen As Integer = 0 + Friend Enum LauncherOpt As Integer Open_window = 0 Open_last_project = 1 @@ -259,6 +261,14 @@ Friend Module OptionModule EgtSetUiUnits(m_bIsMmUnit) m_SelectedMeasureUnit = m_MeasureUnitList(If(m_bIsMmUnit, 0, 1)) + ' leggo come deve essere visualizzato il programma + Dim nDispositionScreen As Integer = GetMainPrivateProfileInt(S_GENERAL, "DispositionScreen", 0) + If nDispositionScreen < 0 Or nDispositionScreen > 2 Then + m_nDispostionScreen = 0 + Else + m_nDispostionScreen = nDispositionScreen + End If + ' imposto tipo di avvio Dim nLauncher As Integer = GetMainPrivateProfileInt(S_LAUNCHERWINDOW, K_LAUNCHER, 0) m_SelectedOptionLauncher = (nLauncher Mod LoOpenOnce)