diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2024-08-25 15:43:20 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2024-08-25 15:43:20 +0300 |
| commit | 1c3df64cd322870586afb7b0cff09e8460f07c56 (patch) | |
| tree | abbd6d541becc97d550f4670db59450f93b45961 /Software/Visual_Studio/PPC/Tango.PPC.UI | |
| parent | 9971689997750bec6ef6fa572d09d30dd02a72ec (diff) | |
| download | Tango-1c3df64cd322870586afb7b0cff09e8460f07c56.tar.gz Tango-1c3df64cd322870586afb7b0cff09e8460f07c56.zip | |
Disabled MachineStatus model from PPC.
Updated events table to rev15.
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs | 6 | ||||
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs index 24921a5ea..4d8a4d465 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs @@ -187,7 +187,11 @@ namespace Tango.PPC.UI TangoIOC.Default.Register<RestartingViewVM>(); TangoIOC.Default.Register<InternalModuleViewVM>(); TangoIOC.Default.Register<PowerOffViewVM>(); - TangoIOC.Default.Register<MachineStatusViewVM>(); + + if (buildProvider.IsEureka) + { + TangoIOC.Default.Register<MachineStatusViewVM>(); + } TangoIOC.Default.GetInstance<IPPCApplicationManager>().ContentRendered += (_, __) => 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> |