From 93c80c98e6bf02f91e4b853d8ab6540627a1c8e3 Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Mon, 22 Jul 2024 10:28:30 +0200
Subject: [PATCH] -test da provare

---
 MainWindow/MainWindowVM.vb                         |  1 -
 .../InputExpander/InputExpanderV.xaml              |  6 +++---
 .../InputExpander/InputExpanderV.xaml.vb           | 14 ++++++++++++++
 .../InputExpander/InputExpanderVM.vb               |  8 ++++++++
 .../ManageLayerExpander/ManageLayerExpanderV.xaml  |  5 ++---
 .../ManageLayerExpanderV.xaml.vb                   |  1 -
 .../ManageLayerExpander/ManageLayerExpanderVM.vb   |  2 +-
 OptionPanel/DrawOptionPanelVM.vb                   |  8 +++++++-
 .../OperationListBoxItem/MachiningOpListBoxItem.vb | 14 --------------
 .../OperationsListExpanderV.xaml                   |  3 +--
 Project/ProjectVM.vb                               |  2 +-
 Special-GunStock/GunStock.vb                       | 11 ++++++-----
 12 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb
index 37469de..e17059a 100644
--- a/MainWindow/MainWindowVM.vb
+++ b/MainWindow/MainWindowVM.vb
@@ -613,7 +613,6 @@ Public Class MainWindowVM
    ''' </summary>
    Private m_allowWindowToClose As Boolean = False
 
-
 #End Region
 
 #Region "MEF Plugin"
diff --git a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml
index 5c4c400..38f4691 100644
--- a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml
+++ b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml
@@ -5,7 +5,7 @@
    <Expander Header="{Binding Title}" IsExpanded="{Binding IsExpanded}" IsEnabled="{Binding IsEnabled}"
              Style="{StaticResource ExpanderStyle}">
       <StackPanel>
-         <StackPanel.Style>
+         <!--<StackPanel.Style>
             <Style TargetType="{x:Type StackPanel}">
                <Style.Triggers>
                   <DataTrigger Binding="{Binding FocusTextBox}" Value="True">
@@ -13,10 +13,10 @@
                   </DataTrigger>
                </Style.Triggers>
             </Style>
-         </StackPanel.Style>
+         </StackPanel.Style>-->
          <TextBlock Text="{Binding TextBlock}"
                     Visibility="{Binding TextVisibility}" Margin="5,5,0,5"/>
-         <TextBox Text="{Binding TextBox,UpdateSourceTrigger=PropertyChanged}"
+         <TextBox x:Name="TextBoxFocus" Text="{Binding TextBox,UpdateSourceTrigger=PropertyChanged}"
                   Visibility="{Binding TextVisibility}" Margin="5,0,5,5">
             <TextBox.InputBindings>
                <KeyBinding Key="Enter" Command="{Binding DoneCommand}"/>
diff --git a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml.vb b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml.vb
index 007e511..9440c4f 100644
--- a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml.vb
+++ b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml.vb
@@ -1,3 +1,17 @@
 Public Class InputExpanderV
 
+   Sub New()
+
+      ' La chiamata è richiesta dalla finestra di progettazione.
+      InitializeComponent()
+
+      ' Aggiungere le eventuali istruzioni di inizializzazione dopo la chiamata a InitializeComponent().
+      'TextBoxFocus.Focus()
+      AddHandler Map.refInputExpanderVM.m_FocusOnTextBox, AddressOf FocusOnText
+   End Sub
+
+   Friend Sub FocusOnText()
+      Me.TextBoxFocus.Focus()
+   End Sub
+
 End Class
diff --git a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb
index 20778ba..7211c36 100644
--- a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb
+++ b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb
@@ -6,6 +6,8 @@ Public Class InputExpanderVM
 
 #Region "FIELDS & PROPERTIES"
 
+   Friend Event m_FocusOnTextBox()
+
    ' Expander fields
    Private m_IsExpanded As Boolean
    Public Property IsExpanded As Boolean
@@ -273,6 +275,10 @@ Public Class InputExpanderVM
 
 #Region "METHODS"
 
+   Friend Sub FocusText()
+      RaiseEvent m_FocusOnTextBox()
+   End Sub
+
    Friend Sub PrepareInputBox(PrepareInputBoxParam As PrepareInputBoxParam)
       Title = PrepareInputBoxParam.sTitle
       If PrepareInputBoxParam.sLabel <> "" Then
@@ -294,6 +300,7 @@ Public Class InputExpanderVM
       IsEnabled = True
       IsExpanded = True
       FocusTextBox = True
+      FocusText()
    End Sub
 
    Friend Sub ResetInputBox()
@@ -309,6 +316,7 @@ Public Class InputExpanderVM
    Friend Function SetInputBoxText(ByVal sVal As String) As Boolean
       TextBox = sVal
       FocusTextBox = True
+      FocusText()
       Return True
    End Function
 
diff --git a/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderV.xaml b/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderV.xaml
index f954b7c..9e631b9 100644
--- a/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderV.xaml
+++ b/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderV.xaml
@@ -22,7 +22,7 @@
          </UniformGrid>
 
          <TreeView Name="LayerTreeView" MinHeight="150" MaxHeight="250" 
-                   ItemsSource="{Binding Path=LayerList}"
+                   ItemsSource="{Binding Path=LayerList}"  
                    VirtualizingStackPanel.IsVirtualizing = "True"
                    VirtualizingStackPanel.VirtualizationMode = "Recycling">
             <interactivity:Interaction.Triggers>
@@ -53,9 +53,8 @@
                      <ToggleButton Style="{StaticResource EgtCAM5_LampToggleButton}" Grid.Column="0"
                                    IsChecked="{Binding OnOff}" Visibility="{Binding IsHidden}" Focusable="False" Height="15" Width="15" Margin="0,0,5,0"/>
                      <Image Grid.Column="1" Source="{Binding PictureString}" Height="15" Margin="0,0,5,0"/>
-                     <TextBlock Grid.Column="2" Text="{Binding Name}" Margin="0,0,5,0"/>
+                     <TextBlock Grid.Column="2" Text="{Binding Name}" Margin="0,0,5,0" Name="Pippo"/>
                      <Ellipse Grid.Column="3" Height="10" Width="10" Fill="{Binding LayerColor}" />
-
                   </Grid>
                </HierarchicalDataTemplate>
             </TreeView.Resources>
diff --git a/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderV.xaml.vb b/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderV.xaml.vb
index 81570f7..e3dd9b0 100644
--- a/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderV.xaml.vb
+++ b/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderV.xaml.vb
@@ -1,3 +1,2 @@
 Public Class ManageLayerExpanderV
-
 End Class
diff --git a/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderVM.vb b/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderVM.vb
index ca1b04a..98c9be0 100644
--- a/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderVM.vb
+++ b/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderVM.vb
@@ -807,7 +807,7 @@ Public Class ManageLayerExpanderVM
       If Not IsNothing(tNode) Then
          If Not bMark Then LayerTreeViewItem.m_MarkOnSel = False
          tNode.IsSelected = True
-         tNode.NotifyPropertyChanged("IsSelected")
+         tNode.NotifyPropertyChanged(NameOf(tNode.IsSelected))
          If Not bMark Then LayerTreeViewItem.m_MarkOnSel = True
          tNode.IsExpanded = True
          m_nObjTreeOldId = nId
diff --git a/OptionPanel/DrawOptionPanelVM.vb b/OptionPanel/DrawOptionPanelVM.vb
index d5a0c01..7d3e47e 100644
--- a/OptionPanel/DrawOptionPanelVM.vb
+++ b/OptionPanel/DrawOptionPanelVM.vb
@@ -1,6 +1,8 @@
 Public Class DrawOptionPanelVM
    Inherits ViewModelBase
 
+   Private m_InputExpanderVM As InputExpanderVM
+
    ' GRAPHICAL ELEMENTS
    Private m_ManageLayerExpander As ManageLayerExpanderV
    Public ReadOnly Property ManageLayerExpander As ContentControl
@@ -30,8 +32,12 @@
    Public ReadOnly Property InputExpander As ContentControl
       Get
          If IsNothing(m_InputExpander) Then
+            'm_InputExpander = New InputExpanderV With {
+            '   .DataContext = New InputExpanderVM
+            '}
+            m_InputExpanderVM = New InputExpanderVM()
             m_InputExpander = New InputExpanderV With {
-               .DataContext = New InputExpanderVM
+               .DataContext = m_InputExpanderVM
             }
          End If
          Return m_InputExpander
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/MachiningOpListBoxItem.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/MachiningOpListBoxItem.vb
index 41ce467..00ca556 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/MachiningOpListBoxItem.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/MachiningOpListBoxItem.vb
@@ -73,24 +73,12 @@ Public Class MachiningOpListBoxItem
       End Get
    End Property
 
-   Private m_FocusTextBox As Boolean = False
-   Public Property FocusTextBox As Boolean
-      Get
-         Return m_FocusTextBox
-      End Get
-      Set(value As Boolean)
-         m_FocusTextBox = value
-         NotifyPropertyChanged(NameOf(FocusTextBox))
-      End Set
-   End Property
-
    Private m_ModifiedName As String
    Public Property ModifiedName As String
       Get
          Return m_ModifiedName
       End Get
       Set(value As String)
-         m_FocusTextBox = True
          m_ModifiedName = value
       End Set
    End Property
@@ -109,7 +97,6 @@ Public Class MachiningOpListBoxItem
             m_ModifiedName = Name
             ' do il focus al nome
             'RaiseEvent m_ModifyNameGetFocus()
-            m_FocusTextBox = True
             ' se esco da modifica
          End If
          NotifyPropertyChanged(NameOf(ModifiedName))
@@ -209,7 +196,6 @@ Public Class MachiningOpListBoxItem
    ''' </summary>
    Public Sub ModifyNameEnter()
       m_ModifyNameOk = True
-      m_FocusTextBox = True
       ' verifico che il nome non inizi con disp
       If m_ModifiedName.StartsWith("disp", StringComparison.InvariantCultureIgnoreCase) Then
          m_CloseModifyLostFocus = False
diff --git a/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderV.xaml
index 46b4bb5..54926bb 100644
--- a/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderV.xaml
@@ -41,8 +41,7 @@
                            <CheckBox IsChecked="{Binding Status}" Margin="0,0,5,0"/>
                            <Image Source="{Binding Image}" Height="15" Margin="0,0,5,0"/>
                            <TextBlock Grid.Column="1" Text="{Binding Name}"  
-                                      Visibility="{Binding Name_Visibility}" Margin="0,0,5,0"
-                                      FocusManager.FocusedElement="{Binding ElementName=Box}"/>
+                                      Visibility="{Binding Name_Visibility}" Margin="0,0,5,0"/>
                            <TextBox Grid.Column="1" Text="{Binding ModifiedName, UpdateSourceTrigger=PropertyChanged}"
                                     Width="150"
                                     x:Name="Box" x:Uid="Box"
diff --git a/Project/ProjectVM.vb b/Project/ProjectVM.vb
index cbc3303..c87e58a 100644
--- a/Project/ProjectVM.vb
+++ b/Project/ProjectVM.vb
@@ -1314,8 +1314,8 @@ Public Class ProjectVM
          m_Controller.MouseSelectedObj(nId, bLast)
          ' Selezione layer in albero
          Map.refManageLayerExpanderVM.UpdateObjInObjTree(nId)
-         Map.refManageLayerExpanderVM.UpdateObjTree()
          Map.refManageLayerExpanderVM.SelectIdInObjTree(nId)
+         Map.refManageLayerExpanderVM.UpdateObjTree()
          ' Cancello geometria e info di eventuale precedente analisi
          Analyze.ClearAnalyzeGroup()
          Map.refStatusBarVM.NotifyStatusOutput("")
diff --git a/Special-GunStock/GunStock.vb b/Special-GunStock/GunStock.vb
index 308c780..c6bcc73 100644
--- a/Special-GunStock/GunStock.vb
+++ b/Special-GunStock/GunStock.vb
@@ -40,11 +40,12 @@ Module GunStock
          Dim sDir As String = String.Empty
          GetPrivateProfileString(S_GUNSTOCK, K_MODDIR, "", sDir)
          ' Apertura dialogo di scelta file MOD
-         Dim OpenFileDialog As New System.Windows.Forms.OpenFileDialog
-         OpenFileDialog.Title = "Open MOD file"
-         OpenFileDialog.Filter = "Model file (*.mod)|*.mod"
-         OpenFileDialog.FilterIndex = 1
-         OpenFileDialog.InitialDirectory = sDir
+         Dim OpenFileDialog As New System.Windows.Forms.OpenFileDialog With {
+            .Title = "Open MOD file",
+            .Filter = "Model file (*.mod)|*.mod",
+            .FilterIndex = 1,
+            .InitialDirectory = sDir
+         }
          If OpenFileDialog.ShowDialog <> Windows.Forms.DialogResult.OK Then
             Return True
          End If