From 751830946b0cecff4ad0ba8d1fac369d443bcff2 Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Tue, 21 Feb 2017 20:10:43 +0000
Subject: [PATCH] EgtCAM5 : - Migliorata gestione feedback. - Aggiunto shift +
 F3 per ricerca precedente in MTable.

---
 MTableDb/MTableDbView.xaml              | 11 +++---
 MTableDb/MTableDbViewModel.vb           | 45 +++++++++++++++++++++++++
 TopCommandBar/TopCommandBarViewModel.vb |  9 +++--
 3 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/MTableDb/MTableDbView.xaml b/MTableDb/MTableDbView.xaml
index 77a0f58..18b3064 100644
--- a/MTableDb/MTableDbView.xaml
+++ b/MTableDb/MTableDbView.xaml
@@ -144,6 +144,7 @@
                </Interactivity:Interaction.Behaviors>
                <DataGrid.InputBindings>
                   <KeyBinding Key="F3" Modifiers="Control" Command="{Binding SearchNextCommand}"/>
+                  <KeyBinding Key="F3" Modifiers="Shift" Command="{Binding SearchPreviousCommand}"/>
                </DataGrid.InputBindings>
                <DataGrid.RowStyle>
                   <Style TargetType="DataGridRow">
@@ -334,12 +335,13 @@
          
          <Grid Grid.Row="3">
             <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="2*"/>
+               <ColumnDefinition Width="2*"/>
+               <ColumnDefinition Width="2*"/>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="2*"/>
+               <ColumnDefinition Width="2*"/>
             </Grid.ColumnDefinitions>
             <Grid Grid.Column="0" Margin="5">
                <Grid.ColumnDefinitions>
@@ -357,6 +359,7 @@
                   IsExplicitFocused="{Binding Path=FocusSearchTextState,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
                   <TextBox.InputBindings>
                      <KeyBinding Key="F3" Modifiers="Control" Command="{Binding SearchNextCommand}"/>
+                     <KeyBinding Key="F3" Modifiers="Shift" Command="{Binding SearchPreviousCommand}"/>
                   </TextBox.InputBindings>
                </EgtWPFLib5:EgtTextBox>
                <Button Grid.Column="1" Grid.Row="1"
diff --git a/MTableDb/MTableDbViewModel.vb b/MTableDb/MTableDbViewModel.vb
index f2bba3d..77cce54 100644
--- a/MTableDb/MTableDbViewModel.vb
+++ b/MTableDb/MTableDbViewModel.vb
@@ -233,6 +233,7 @@ Namespace EgtCAM5
       Private m_cmdRemoveTable As ICommand
       Private m_cmdSetActiveTable As ICommand
       Private m_cmdResetSearch As ICommand
+      Private m_cmdSearchPrevious As ICommand
       Private m_cmdSearchNext As ICommand
       Private m_cmdFocusSearch As ICommand
       Private m_cmdAddMach As ICommand
@@ -604,6 +605,50 @@ Namespace EgtCAM5
 
 #End Region    ' ResetSearchCommand
 
+#Region "SearchPreviousCommand"
+
+      ''' <summary>
+      ''' Returns a command that do Exec.
+      ''' </summary>
+      Public ReadOnly Property SearchPreviousCommand As ICommand
+         Get
+            If m_cmdSearchPrevious Is Nothing Then
+               m_cmdSearchPrevious = New RelayCommand(AddressOf SearchPrevious)
+            End If
+            Return m_cmdSearchPrevious
+         End Get
+      End Property
+
+      ''' <summary>
+      ''' Execute the Exec.  This method is invoked by the ExecCommand.
+      ''' </summary>
+      Public Sub SearchPrevious()
+         If String.IsNullOrWhiteSpace(m_TextToSearch) Then
+            Return
+         End If
+         Dim bFound As Boolean = False
+         Dim LastSearchedRow As MTableAssociationGridBoxItem = Nothing
+         For TableIndex = 0 To m_TablesList.Count - 1
+            If m_TablesList(TableIndex).IsSelected Then
+               For AssociationIndex = 0 To m_TablesList(TableIndex).AssociationList.Count - 1
+                  Dim CurrAssociation As MTableAssociationGridBoxItem = m_TablesList(TableIndex).AssociationList(AssociationIndex)
+                  If CurrAssociation.IsSelected Then
+                     If Not IsNothing(LastSearchedRow) Then
+                        LastSearchedRow.IsSelected = True
+                     End If
+                     Return
+                  End If
+                  If CurrAssociation.IsValidForSearch Then
+                     LastSearchedRow = CurrAssociation
+                  End If
+               Next
+               Exit For
+            End If
+         Next
+      End Sub
+
+#End Region    ' SearchPreviousCommand
+
 #Region "SearchNextCommand"
 
       ''' <summary>
diff --git a/TopCommandBar/TopCommandBarViewModel.vb b/TopCommandBar/TopCommandBarViewModel.vb
index d259723..345c5f5 100644
--- a/TopCommandBar/TopCommandBarViewModel.vb
+++ b/TopCommandBar/TopCommandBarViewModel.vb
@@ -490,6 +490,7 @@ Namespace EgtCAM5
             EgtOutLog("Exception in zip: " & ex1.ToString())
          End Try
          ' preparo la mail per il supporto
+         Dim bEx As Boolean = False
          Try
             Dim SendFeedbackWindow As New EgtWPFLib5.MapiMailMessage("EgtCAM5 Feedback - " & sKey)
             SendFeedbackWindow.Recipients.Add(sSupportAddress)
@@ -497,11 +498,15 @@ Namespace EgtCAM5
                SendFeedbackWindow.Files.Add(IniFile.m_sTempDir & "\Feedback.zip")
             End If
             SendFeedbackWindow.ShowDialog()
-            Application.Msn.NotifyColleagues(Application.NOTIFYSTATUSOUTPUT, EgtMsg(MSG_TOPCOMMANDBAR + 14))
          Catch ex As Exception
             EgtOutLog("Feedback exception: " & ex.ToString)
-            MessageBox.Show(String.Format(EgtMsg(MSG_TOPCOMMANDBAR + 12), sSupportAddress, sZipToCreate), EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK, MessageBoxImage.Information)
+            bEx = True
          End Try
+         If bEx OrElse EgtWPFLib5.MapiMailMessage.m_ErrorCode <> 0 Then
+            MessageBox.Show(String.Format(EgtMsg(MSG_TOPCOMMANDBAR + 12), sSupportAddress, sZipToCreate), EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK, MessageBoxImage.Information)
+         Else
+            Application.Msn.NotifyColleagues(Application.NOTIFYSTATUSOUTPUT, EgtMsg(MSG_TOPCOMMANDBAR + 14))
+         End If
       End Sub
 
 #End Region ' SendFeedbackCommand