diff --git a/Base/TreeView/TreeViewItemBase.vb b/Base/TreeView/TreeViewItemBase.vb index 8ace23e..b6b7741 100644 --- a/Base/TreeView/TreeViewItemBase.vb +++ b/Base/TreeView/TreeViewItemBase.vb @@ -51,8 +51,8 @@ Public Class TreeViewItemBase If m_onldObjTreeOldId = LayerItem.Id Then Map.refProjectVM.SetLastInteger(LayerItem.Id) Map.refProjectVM.ExecuteCommand(Controller.CMD.DESELECTPARTLAYEROBJ) - Else - Map.refManageLayerExpanderVM.SelectIdInObjTree(LayerItem.Id) + 'Else + 'Map.refManageLayerExpanderVM.SelectIdInObjTree(LayerItem.Id) 'Map.refProjectVM.ExecuteCommand(Controller.CMD.SETCURRPARTLAYER) End If End If diff --git a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml index 66842fe..082da56 100644 --- a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml +++ b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml @@ -21,7 +21,7 @@ - diff --git a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml.vb b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml.vb index 21b1a47..8c9f989 100644 --- a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml.vb +++ b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml.vb @@ -11,7 +11,7 @@ End Sub Friend Sub FocusOnText() - Me.TextBoxFocus.Focus() + Me.Txt.Focus() End Sub Private Sub TextBox_PreviewKeyDown(sender As Object, e As KeyEventArgs) diff --git a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb index bde6a30..a2c2146 100644 --- a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb +++ b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb @@ -174,20 +174,6 @@ Public Class InputExpanderVM End Set End Property - Private m_InfoList As New ObservableCollection(Of InfoItem) - ''' - ''' Lista delle info modificate - ''' - Public Property InfoList As ObservableCollection(Of InfoItem) - Get - Return m_InfoList - End Get - Set(value As ObservableCollection(Of InfoItem)) - m_InfoList = value - OnPropertyChanged("InfoList") - End Set - End Property - Private m_ComboSelectedIndex As Integer Public Property ComboSelectedIndex As Integer Get @@ -275,38 +261,6 @@ Public Class InputExpanderVM End Set End Property - Private m_ShowInfoItemVisibility As Visibility - ''' - ''' Propietà visibilità bottone + - ''' - Public Property ShowInfoItemVisibility As Visibility - Get - Return m_ShowInfoItemVisibility - End Get - Set(value As Visibility) - If value <> m_ShowInfoItemVisibility Then - m_ShowInfoItemVisibility = value - OnPropertyChanged("ShowInfoItemVisibility") - End If - End Set - End Property - - Private m_InfoVisibility As Visibility - ''' - ''' Propietà visibilità lista info modificate - ''' - Public Property InfoVisibility As Visibility - Get - Return m_InfoVisibility - End Get - Set(value As Visibility) - If value <> m_InfoVisibility Then - m_InfoVisibility = value - OnPropertyChanged("InfoVisibility") - End If - End Set - End Property - ' Commands definition Private m_cmdShow As ICommand Private m_cmdDone As ICommand diff --git a/OptionsWindow/OptionWindowVM.vb b/OptionsWindow/OptionWindowVM.vb index 8559514..38390ae 100644 --- a/OptionsWindow/OptionWindowVM.vb +++ b/OptionsWindow/OptionWindowVM.vb @@ -4,7 +4,6 @@ Imports System.IO Imports EgtUILib Imports System.Globalization Imports EgtWPFLib5 -Imports System.Globalization Public Class OptionWindowVM Inherits VMBase @@ -81,20 +80,6 @@ Public Class OptionWindowVM End Get End Property - Private m_ScaleOffList As List(Of String) = New List(Of String)({"mm", "inch", EgtMsg(6546)}) ' Altra - Public ReadOnly Property ScaleOffList As List(Of String) - Get - Return m_ScaleOffList - End Get - End Property - - Private m_ScalePlyList As List(Of String) = New List(Of String)({"mm", "inch", EgtMsg(6546)}) ' Altra - Public ReadOnly Property ScalePlyList As List(Of String) - Get - Return m_ScalePlyList - End Get - End Property - Private m_ScaleImageList As List(Of String) = New List(Of String)({"mm", "inch", EgtMsg(6546)}) ' Altra Public ReadOnly Property ScaleImageList As List(Of String) Get @@ -1404,22 +1389,22 @@ Public Class OptionWindowVM ''' Public Sub UpdateLicenceCmd() ' Apro dialogo per richiesta file licenza - 'Dim LicDlg As New Microsoft.Win32.OpenFileDialog() With { - ' .DefaultExt = ".lic", - ' .Filter = "Licences (.lic)|*.lic", - ' .CheckFileExists = True, - ' .ValidateNames = True - '} - Dim LicDlg As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With { - .Title = "Apri", - .InitialDirectory = Path.GetFullPath(IniFile.m_sConfigDir), + Dim LicDlg As New Microsoft.Win32.OpenFileDialog() With { + .DefaultExt = ".lic", .Filter = "Licences (.lic)|*.lic", .CheckFileExists = True, - .ValidateNames = True, - .FileName = String.Empty + .ValidateNames = True } - 'If LicDlg.ShowDialog() = True Then - If LicDlg.ShowDialog() = Windows.Forms.DialogResult.OK Then + 'Dim LicDlg As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With { + ' .Title = "Apri", + ' .InitialDirectory = Path.GetFullPath(IniFile.m_sConfigDir), + ' .Filter = "Licences (.lic)|*.lic", + ' .CheckFileExists = True, + ' .ValidateNames = True, + ' .FileName = String.Empty + '} + If LicDlg.ShowDialog() = True Then + 'If LicDlg.ShowDialog() = Windows.Forms.DialogResult.OK Then ' Recupero il direttorio del file 'Dim sDir As String = Path.GetDirectoryName(LicDlg.FileName) Dim sDir As String = LicDlg.FileName @@ -1457,22 +1442,22 @@ Public Class OptionWindowVM ''' Public Sub AddMachineCmd() 'Apro dialogo per richiesta file zip di macchina - 'Dim MachDlg As New Microsoft.Win32.OpenFileDialog() With { - ' .DefaultExt = ".zip", - ' .Filter = "Machines (.zip)|*.zip", - ' .CheckFileExists = True, - ' .ValidateNames = True - '} - Dim MachDlg As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With { - .Title = "Apri", - .InitialDirectory = Path.GetFullPath(IniFile.m_sConfigDir), + Dim MachDlg As New Microsoft.Win32.OpenFileDialog() With { + .DefaultExt = ".zip", .Filter = "Machines (.zip)|*.zip", .CheckFileExists = True, - .ValidateNames = True, - .FileName = String.Empty + .ValidateNames = True } - 'If MachDlg.ShowDialog() <> True Then Return - If MachDlg.ShowDialog() <> Windows.Forms.DialogResult.OK Then Return + 'Dim MachDlg As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With { + ' .Title = "Apri", + ' .InitialDirectory = Path.GetFullPath(IniFile.m_sConfigDir), + ' .Filter = "Machines (.zip)|*.zip", + ' .CheckFileExists = True, + ' .ValidateNames = True, + ' .FileName = String.Empty + '} + If MachDlg.ShowDialog() <> True Then Return + 'If MachDlg.ShowDialog() <> Windows.Forms.DialogResult.OK Then Return Dim sMachZip As String = MachDlg.FileName Dim sMachName As String = Path.GetFileNameWithoutExtension(Path.GetFileNameWithoutExtension(sMachZip)) Dim sMachDir As String = Path.Combine(IniFile.m_sMachinesRoot, sMachName) @@ -1703,22 +1688,22 @@ Public Class OptionWindowVM Return End If ' Apro dialogo per richiesta file zip del Beam - 'Dim BeamDlg As New Microsoft.Win32.OpenFileDialog() With { - ' .DefaultExt = ".zip", - ' .Filter = "Beam (.zip)|*.zip", - ' .CheckFileExists = True, - ' .ValidateNames = True - '} - Dim BeamDlg As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With { - .Title = "Apri", - .InitialDirectory = Path.GetFullPath(IniFile.m_sConfigDir), + Dim BeamDlg As New Microsoft.Win32.OpenFileDialog() With { + .DefaultExt = ".zip", .Filter = "Beam (.zip)|*.zip", .CheckFileExists = True, - .ValidateNames = True, - .FileName = String.Empty + .ValidateNames = True } - 'If BeamDlg.ShowDialog() <> True Then Return - If BeamDlg.ShowDialog() <> Windows.Forms.DialogResult.OK Then Return + 'Dim BeamDlg As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With { + ' .Title = "Apri", + ' .InitialDirectory = Path.GetFullPath(IniFile.m_sConfigDir), + ' .Filter = "Beam (.zip)|*.zip", + ' .CheckFileExists = True, + ' .ValidateNames = True, + ' .FileName = String.Empty + '} + If BeamDlg.ShowDialog() <> True Then Return + 'If BeamDlg.ShowDialog() <> Windows.Forms.DialogResult.OK Then Return Dim sBeamZip As String = BeamDlg.FileName ' Preparo direttorio temporaneo Dim sTempDir As String = Path.Combine(IniFile.m_sTempDir, "Beam") @@ -1815,22 +1800,22 @@ Public Class OptionWindowVM Return End If ' Apro dialogo per richiesta file zip del Wall - 'Dim WallDlg As New Microsoft.Win32.OpenFileDialog() With { - ' .DefaultExt = ".zip", - ' .Filter = "Wall (.zip)|*.zip", - ' .CheckFileExists = True, - ' .ValidateNames = True - '} - Dim WallDlg As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With { - .Title = "Apri", - .InitialDirectory = Path.GetFullPath(IniFile.m_sConfigDir), + Dim WallDlg As New Microsoft.Win32.OpenFileDialog() With { + .DefaultExt = ".zip", .Filter = "Wall (.zip)|*.zip", .CheckFileExists = True, - .ValidateNames = True, - .FileName = String.Empty + .ValidateNames = True } - 'If WallDlg.ShowDialog() <> True Then Return - If WallDlg.ShowDialog() <> Windows.Forms.DialogResult.OK Then Return + 'Dim WallDlg As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With { + ' .Title = "Apri", + ' .InitialDirectory = Path.GetFullPath(IniFile.m_sConfigDir), + ' .Filter = "Wall (.zip)|*.zip", + ' .CheckFileExists = True, + ' .ValidateNames = True, + ' .FileName = String.Empty + '} + If WallDlg.ShowDialog() <> True Then Return + 'If WallDlg.ShowDialog() <> Windows.Forms.DialogResult.OK Then Return Dim sWallZip As String = WallDlg.FileName ' Preparo direttorio temporaneo Dim sTempDir As String = Path.Combine(IniFile.m_sTempDir, "Wall") @@ -1972,14 +1957,14 @@ Public Class OptionWindowVM End If Next ' Creo dialogo colori - 'Dim ColorDlg As New System.Windows.Forms.ColorDialog - 'ColorDlg.FullOpen = True - 'ColorDlg.CustomColors = nCustomColors.ToArray() - 'ColorDlg.Color = Col.ToColor() - Dim ColorDlg As New EgtColorPickerV(Application.Current.MainWindow, New EgtColorPickerVM()) With { - .CustomColors = nCustomColors.ToArray(), - .Color = Col.ToColor() - } + Dim ColorDlg As New System.Windows.Forms.ColorDialog + ColorDlg.FullOpen = True + ColorDlg.CustomColors = nCustomColors.ToArray() + ColorDlg.Color = Col.ToColor() + 'Dim ColorDlg As New EgtColorPickerV(Application.Current.MainWindow, New EgtColorPickerVM()) With { + ' .CustomColors = nCustomColors.ToArray(), + ' .Color = Col.ToColor() + '} ' Visualizzo dialogo If ColorDlg.ShowDialog() <> Windows.Forms.DialogResult.OK Then Return False ' Recupero colore scelto diff --git a/Project/ProjectVM.vb b/Project/ProjectVM.vb index e267e5f..3941a94 100644 --- a/Project/ProjectVM.vb +++ b/Project/ProjectVM.vb @@ -261,22 +261,22 @@ Public Class ProjectVM 'If MessageBox.Show(sText, sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.OK Then If EgtMessageBoxV.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.OK Then ' Apro dialogo per richiesta file licenza - 'Dim LicDlg As New Microsoft.Win32.OpenFileDialog() With { - ' .DefaultExt = ".lic", - ' .Filter = "Licences (.lic)|*.lic", - ' .CheckFileExists = True, - ' .ValidateNames = True - '} - Dim LicDlg As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With { - .Title = "Apri", - .InitialDirectory = Path.GetFullPath(IniFile.m_sConfigDir), + Dim LicDlg As New Microsoft.Win32.OpenFileDialog() With { + .DefaultExt = ".lic", .Filter = "Licences (.lic)|*.lic", .CheckFileExists = True, - .ValidateNames = True, - .FileName = String.Empty + .ValidateNames = True } - 'If LicDlg.ShowDialog() = True Then - If LicDlg.ShowDialog() = Windows.Forms.DialogResult.OK Then + 'Dim LicDlg As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With { + ' .Title = "Apri", + ' .InitialDirectory = Path.GetFullPath(IniFile.m_sConfigDir), + ' .Filter = "Licences (.lic)|*.lic", + ' .CheckFileExists = True, + ' .ValidateNames = True, + ' .FileName = String.Empty + '} + If LicDlg.ShowDialog() = True Then + 'If LicDlg.ShowDialog() = Windows.Forms.DialogResult.OK Then ' Recupero il direttorio del file Dim sDir As String = Path.GetDirectoryName(LicDlg.FileName) ' Se il file non è già nel direttorio di configurazione lo copio diff --git a/Special-Doors/MTableDbV.xaml b/Special-Doors/MTableDbV.xaml index de295de..3de9ccd 100644 --- a/Special-Doors/MTableDbV.xaml +++ b/Special-Doors/MTableDbV.xaml @@ -211,187 +211,188 @@ - - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + - - - - - + + + + - - - + + + - - - - - - - - + + + + + + + - - - - - + + + + - - - + + + - - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + - - - - - + + + + - - - + + + - - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + - - - - - + + + + - - - + + + - - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + - - - - - + + + + - - - - + + + + - + +