diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2023-05-04 21:28:54 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2023-05-04 21:28:54 +0300 |
| commit | a78e489a56f09eb6a0a3ffa557e602ee8c7e67a2 (patch) | |
| tree | 60e56ad07660e911c69daef3fa93a53417e131ab /Software/Visual_Studio/PPC/Tango.PPC.UI | |
| parent | 525cb05b5ab2c7168599d01d298d187a763d6b3c (diff) | |
| parent | a42e9713125bc9675b2978031244918c11c6e956 (diff) | |
| download | Tango-a78e489a56f09eb6a0a3ffa557e602ee8c7e67a2.tar.gz Tango-a78e489a56f09eb6a0a3ffa557e602ee8c7e67a2.zip | |
Merge
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI')
3 files changed, 17 insertions, 23 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs index 56e42453f..1a7c11764 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs @@ -8,4 +8,4 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango PPC Application")] -[assembly: AssemblyVersion("2.0.0.0")] +[assembly: AssemblyVersion("2.0.1.0")] diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainEurekaView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainEurekaView.xaml index 9bd5df3e8..1646cf6dd 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainEurekaView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainEurekaView.xaml @@ -29,29 +29,23 @@ </i:Interaction.Triggers> <Grid> + <touch:TouchPanelEurekaNoKeyboard> - <controls:NavigationControl TransitionAlwaysFades="True" KeepElementsAttached="False" UseDefferedRendering="True" TransitionType="Zoom" x:Name="NavigationControl" x:FieldModifier="public"> - <local:LoadingView></local:LoadingView> - <local:LoadingErrorView></local:LoadingErrorView> - <local:NoPermissionsView></local:NoPermissionsView> - <local:LoginView></local:LoginView> - <local:LayoutEurekaView controls:NavigationControl.NavigationName="LayoutView"></local:LayoutEurekaView> - <local:ExternalBridgeView></local:ExternalBridgeView> - <local:MachineSetupView></local:MachineSetupView> - <local:MachineUpdateView></local:MachineUpdateView> - <local:RestartingSystemView></local:RestartingSystemView> - <local:EmergencyView></local:EmergencyView> - <local:RestartingView></local:RestartingView> - </controls:NavigationControl> + <controls:NavigationControl TransitionAlwaysFades="True" KeepElementsAttached="False" UseDefferedRendering="True" TransitionType="Zoom" x:Name="NavigationControl" x:FieldModifier="public"> + <local:LoadingView></local:LoadingView> + <local:LoadingErrorView></local:LoadingErrorView> + <local:NoPermissionsView></local:NoPermissionsView> + <local:LoginView></local:LoginView> + <local:LayoutEurekaView controls:NavigationControl.NavigationName="LayoutView"></local:LayoutEurekaView> + <local:ExternalBridgeView></local:ExternalBridgeView> + <local:MachineSetupView></local:MachineSetupView> + <local:MachineUpdateView></local:MachineUpdateView> + <local:RestartingSystemView></local:RestartingSystemView> + <local:EmergencyView></local:EmergencyView> + <local:RestartingView></local:RestartingView> + </controls:NavigationControl> - </Grid> - - <Grid Visibility="{Binding IsScreenSaverOn,Converter={StaticResource BooleanToVisibilityConverter}}" Background="Black"> - <i:Interaction.Triggers> - <i:EventTrigger EventName="PreviewMouseUp"> - <i:InvokeCommandAction Command="{Binding ScreenSaverExitCommand}" /> - </i:EventTrigger> - </i:Interaction.Triggers> + </touch:TouchPanelEurekaNoKeyboard> </Grid> </Grid> </UserControl> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index d72e75011..efc5f8179 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest @@ -16,7 +16,7 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - <requestedExecutionLevel level="requireAdministrator" uiAccess="false" /> + <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />--> </requestedPrivileges> </security> </trustInfo> |