Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0a7f872912 | |||
| 84b2edd17a | |||
| 7a8c883259 | |||
| 3a7152066b | |||
| 85591b39a7 |
@@ -70,6 +70,6 @@ Imports System.Windows
|
|||||||
' by using the '*' as shown below:
|
' by using the '*' as shown below:
|
||||||
' <Assembly: AssemblyVersion("1.0.*")>
|
' <Assembly: AssemblyVersion("1.0.*")>
|
||||||
|
|
||||||
<Assembly: AssemblyVersion("2.7.11.2")>
|
<Assembly: AssemblyVersion("2.7.11.3")>
|
||||||
<Assembly: AssemblyFileVersion("2.7.11.2")>
|
<Assembly: AssemblyFileVersion("2.7.11.3")>
|
||||||
|
|
||||||
|
|||||||
@@ -23,9 +23,9 @@
|
|||||||
<ColumnDefinition Width="1*"/>
|
<ColumnDefinition Width="1*"/>
|
||||||
<ColumnDefinition Width="Auto"/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<TextBox x:Name="Txt" Text="{Binding TextBox,UpdateSourceTrigger=PropertyChanged}"
|
<TextBox x:Name="Txt" Text="{Binding TextBox,UpdateSourceTrigger=PropertyChanged}"
|
||||||
PreviewKeyDown="TextBox_PreviewKeyDown" Height="Auto"
|
PreviewKeyDown="TextBox_PreviewKeyDown" IsVisibleChanged="Txt_IsVisibleChanged"
|
||||||
Visibility="{Binding TextVisibility}" Margin="5,0,5,5" >
|
Visibility="{Binding TextVisibility}" Height="Auto" Margin="5,0,5,5" >
|
||||||
<TextBox.InputBindings>
|
<TextBox.InputBindings>
|
||||||
<KeyBinding Key="Enter" Command="{Binding DoneCommand}"/>
|
<KeyBinding Key="Enter" Command="{Binding DoneCommand}"/>
|
||||||
<KeyBinding Key="S" Modifiers="Control" Command="{Binding ShowCommand}"/>
|
<KeyBinding Key="S" Modifiers="Control" Command="{Binding ShowCommand}"/>
|
||||||
|
|||||||
@@ -8,4 +8,10 @@
|
|||||||
End If
|
End If
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
Private Sub Txt_IsVisibleChanged(sender As Object, e As DependencyPropertyChangedEventArgs)
|
||||||
|
If Txt.IsVisible Then
|
||||||
|
Txt.Focus()
|
||||||
|
End If
|
||||||
|
End Sub
|
||||||
|
|
||||||
End Class
|
End Class
|
||||||
|
|||||||
@@ -468,16 +468,16 @@ Public Class SimulationExpanderVM
|
|||||||
Friend Sub SimulationExpander_Update_CncData( nFlag As Integer)
|
Friend Sub SimulationExpander_Update_CncData( nFlag As Integer)
|
||||||
If Simulation_IsExpanded Then
|
If Simulation_IsExpanded Then
|
||||||
ShowCncData()
|
ShowCncData()
|
||||||
' Se fermo per Collisione rilevata da script Lua
|
' Se fermo per Collisione rilevata da script Lua o per altra richiesta
|
||||||
If nFlag = 11 Then
|
If nFlag = 11 Or nFlag = 12 Then
|
||||||
' Imposto stato Pausa
|
' Imposto stato Pausa
|
||||||
SetSimulationStatus(MCH_SIM_ST.UI_PAUSE)
|
SetSimulationStatus(MCH_SIM_ST.UI_PAUSE)
|
||||||
StatusMsg = EgtMsg(MSG_SIMULATION + 11) ' PAUSA
|
StatusMsg = EgtMsg(MSG_SIMULATION + 11) ' PAUSA
|
||||||
' Aggiornamenti per bottone Play/Pause
|
' Aggiornamenti per bottone Play/Pause
|
||||||
SetShowPlay(True)
|
SetShowPlay(True)
|
||||||
NotifyPropertyChanged("PlayPauseImage")
|
NotifyPropertyChanged("PlayPauseImage")
|
||||||
' Dichiaro di non arrestarsi alla successiva notifica di collisione
|
' Se fermo per Collisione, dichiaro di non arrestarsi alla successiva notifica di collisione
|
||||||
m_bStopOnNextCollision = False
|
If nFlag = 11 Then m_bStopOnNextCollision = False
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
End Sub
|
End Sub
|
||||||
|
|||||||
Reference in New Issue
Block a user