diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-06-27 20:45:51 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-06-27 20:45:51 +0300 |
| commit | 13b664b3d6cc5f527adffe4841ef05220d191dc9 (patch) | |
| tree | 943bcb67b15cd9a0568a5ffa6d31243d9c12bdab /Software/Visual_Studio | |
| parent | f2f0ed1ad0a6d80192b1f51e7e772612a71cf793 (diff) | |
| download | Tango-13b664b3d6cc5f527adffe4841ef05220d191dc9.tar.gz Tango-13b664b3d6cc5f527adffe4841ef05220d191dc9.zip | |
Reload fse remote log files and licenses.
Diffstat (limited to 'Software/Visual_Studio')
9 files changed, 81 insertions, 8 deletions
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/ViewModels/LogsViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/ViewModels/LogsViewVM.cs index 5f5bce3b9..2860f8c63 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/ViewModels/LogsViewVM.cs +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/ViewModels/LogsViewVM.cs @@ -41,7 +41,7 @@ namespace Tango.FSE.Firmware.ViewModels public RemoteLogFileModel<EmbeddedLogItem> SelectedLogFile { get { return _selectedLogFile; } - set { _selectedLogFile = value; RaisePropertyChangedAuto(); OnSelectedLogFileChanged(); } + set { _selectedLogFile = value; RaisePropertyChangedAuto(); OnSelectedLogFileChanged(); InvalidateRelayCommands(); } } private ObservableCollection<EmbeddedLogItem> _firmwareLogs; @@ -95,6 +95,11 @@ namespace Tango.FSE.Firmware.ViewModels public RelayCommand DownloadAllLogFilesCommand { get; set; } /// <summary> + /// Re-downloads the selected log file. + /// </summary> + public RelayCommand ReDownloadSelectedLogFileCommand { get; set; } + + /// <summary> /// Initializes a new instance of the <see cref="LogsViewVM"/> class. /// </summary> public LogsViewVM() @@ -120,9 +125,10 @@ namespace Tango.FSE.Firmware.ViewModels OpenFirmwareLogItemCommand = new RelayCommand<EmbeddedLogItem>(OpenFirmwareLogItem); - ExportLogFileCommand = new RelayCommand(ExportSelectedLogFile); + ExportLogFileCommand = new RelayCommand(ExportSelectedLogFile, () => SelectedLogFile != null); ExportAllDownloadedLogFilesCommand = new RelayCommand(ExportAllDownloadedLogFiles); DownloadAllLogFilesCommand = new RelayCommand(DownloadAllLogFiles); + ReDownloadSelectedLogFileCommand = new RelayCommand(ReDownloadSelectedLogFile, () => SelectedLogFile != null); } private void InitCollectionView() @@ -307,5 +313,14 @@ namespace Tango.FSE.Firmware.ViewModels } } } + + private void ReDownloadSelectedLogFile() + { + if (SelectedLogFile != null) + { + SelectedLogFile.Status = RemoteLogFileStatus.None; + SelectedLogFile.DownloadLogFile(); + } + } } } diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/Views/LogsView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/Views/LogsView.xaml index d2ca9ad3c..c24beef34 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/Views/LogsView.xaml +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/Views/LogsView.xaml @@ -93,7 +93,7 @@ </StackPanel> </Grid> - <DataGrid Margin="0 5 0 0" Style="{StaticResource FSE_LogsGridStyle}" ItemsSource="{Binding FirmwareLogs}" CellStyle="{StaticResource FSE_LogsGridCellStyle}" helpers:DataGridHelper.DoubleClickCommand="{Binding OpenFirmwareLogItemCommand}"> + <DataGrid Margin="0 5 0 0" Style="{StaticResource FSE_LogsGridStyle}" ItemsSource="{Binding FirmwareLogs}" CellStyle="{StaticResource FSE_LogsGridCellStyle}" helpers:DataGridHelper.DoubleClickCommand="{Binding OpenFirmwareLogItemCommand}" CanUserSortColumns="True"> <DataGrid.Resources> <components:BindingProxy x:Key="proxy" Data="{Binding}" /> </DataGrid.Resources> @@ -186,6 +186,9 @@ <Button ToolTip="Export selected log file" Command="{Binding ExportLogFileCommand}"> <material:PackIcon Kind="FileExportOutline" /> </Button> + <Button ToolTip="Reload selected log file" Command="{Binding ReDownloadSelectedLogFileCommand}"> + <material:PackIcon Kind="Download" /> + </Button> </StackPanel> </material:PopupBox> </StackPanel> diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/ViewModels/LogsViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/ViewModels/LogsViewVM.cs index 4fcfa53eb..30946ba0f 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/ViewModels/LogsViewVM.cs +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/ViewModels/LogsViewVM.cs @@ -43,7 +43,7 @@ namespace Tango.FSE.PPCConsole.ViewModels public RemoteLogFileModel<LogItemBase> SelectedLogFile { get { return _selectedLogFile; } - set { _selectedLogFile = value; RaisePropertyChangedAuto(); OnSelectedLogFileChanged(); } + set { _selectedLogFile = value; RaisePropertyChangedAuto(); OnSelectedLogFileChanged(); InvalidateRelayCommands(); } } private ObservableCollection<LogItemBase> _applicationLogs; @@ -97,6 +97,11 @@ namespace Tango.FSE.PPCConsole.ViewModels public RelayCommand DownloadAllLogFilesCommand { get; set; } /// <summary> + /// Re-downloads the selected log file. + /// </summary> + public RelayCommand ReDownloadSelectedLogFileCommand { get; set; } + + /// <summary> /// Initializes a new instance of the <see cref="LogsViewVM"/> class. /// </summary> public LogsViewVM() @@ -122,9 +127,10 @@ namespace Tango.FSE.PPCConsole.ViewModels OpenApplicationLogItemCommand = new RelayCommand<LogItemBase>(OpenApplicationLogItem); - ExportLogFileCommand = new RelayCommand(ExportSelectedLogFile); + ExportLogFileCommand = new RelayCommand(ExportSelectedLogFile, () => SelectedLogFile != null); ExportAllDownloadedLogFilesCommand = new RelayCommand(ExportAllDownloadedLogFiles); DownloadAllLogFilesCommand = new RelayCommand(DownloadAllLogFiles); + ReDownloadSelectedLogFileCommand = new RelayCommand(ReDownloadSelectedLogFile, () => SelectedLogFile != null); } private void InitCollectionView() @@ -309,5 +315,14 @@ namespace Tango.FSE.PPCConsole.ViewModels } } } + + private void ReDownloadSelectedLogFile() + { + if (SelectedLogFile != null) + { + SelectedLogFile.Status = RemoteLogFileStatus.None; + SelectedLogFile.DownloadLogFile(); + } + } } } diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/LogsView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/LogsView.xaml index 72fbfd45c..1fb4b79ed 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/LogsView.xaml +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/LogsView.xaml @@ -93,7 +93,7 @@ </StackPanel> </Grid> - <DataGrid Margin="0 5 0 0" Style="{StaticResource FSE_LogsGridStyle}" ItemsSource="{Binding ApplicationLogs}" CellStyle="{StaticResource FSE_LogsGridCellStyle}" helpers:DataGridHelper.DoubleClickCommand="{Binding OpenApplicationLogItemCommand}"> + <DataGrid Margin="0 5 0 0" Style="{StaticResource FSE_LogsGridStyle}" ItemsSource="{Binding ApplicationLogs}" CellStyle="{StaticResource FSE_LogsGridCellStyle}" helpers:DataGridHelper.DoubleClickCommand="{Binding OpenApplicationLogItemCommand}" CanUserSortColumns="True"> <DataGrid.Resources> <components:BindingProxy x:Key="proxy" Data="{Binding}" /> </DataGrid.Resources> @@ -186,6 +186,9 @@ <Button ToolTip="Export selected log file" Command="{Binding ExportLogFileCommand}"> <material:PackIcon Kind="FileExportOutline" /> </Button> + <Button ToolTip="Reload selected log file" Command="{Binding ReDownloadSelectedLogFileCommand}"> + <material:PackIcon Kind="Download" /> + </Button> </StackPanel> </material:PopupBox> </StackPanel> diff --git a/Software/Visual_Studio/Notes/Tango.Notes/EDrawMax/License.txt b/Software/Visual_Studio/Notes/Tango.Notes/EDrawMax/License.txt new file mode 100644 index 000000000..a6c086727 --- /dev/null +++ b/Software/Visual_Studio/Notes/Tango.Notes/EDrawMax/License.txt @@ -0,0 +1,12 @@ +Edraw Max Lifetime License +MX4J-BK1P-INVB-GPI8-GHR5 + +License Name: your full name or company name +License Code has been sent to Roy@twine-s.com. You can also retrieve license code here: +https://www.edrawsoft.com/retrievecode.php + +If you haven't downloaded Edraw Max Lifetime License , visit the link: +https://www.edrawsoft.com/download-edrawmax.php + + +Use this page to learn how to activate your Edraw full version. Follow these steps to convert your Edraw trial product to perpetual use with no uninstall or reinstall necessary.
\ No newline at end of file diff --git a/Software/Visual_Studio/Notes/Tango.Notes/SciChart/License.txt b/Software/Visual_Studio/Notes/Tango.Notes/SciChart/License.txt new file mode 100644 index 000000000..fd59b583d --- /dev/null +++ b/Software/Visual_Studio/Notes/Tango.Notes/SciChart/License.txt @@ -0,0 +1,2 @@ +// Set this code once in App.xaml.cs or application startup +SciChartSurface.SetRuntimeLicenseKey("27FuI+bWcfmLHSBlM4B8nUs23aeeXvft2+7Pxj0fOrcnruWXyOm/swjI2PpoBPOKS9dNVtw60E4Xdpq4Ts8UgMWQHU8qcJtPoAyNQqbVMQNOr/sv1QpSD2mRjogERcrGty+tvlCHMGhkw/TOiL5DPnw5rOPqGfymyRuJRNFTTYB/hCIAiCt7VIlyHhO+uo0DOfxIC+gNVKoWyGd0xdQ3xSUmfdNvUigW7ZkUKDkAIBpRcmOLx5wV4y77I/4MghTl3FAZlhhFoBdAUKLZWpbISU8xfAUkI1s/md0mAztMTbqzkRT94AsSI1/KPnH7fuuH82ABJcp0UnKWh8aIlkbjD2vVCKXn9omMBEBRmTx68IuHoP4iT5mTyd6R3OfnEM6Vc6AZ9SLytjoP7Iu2hPKR7uqGJW/2KZ0jIZ4Hn+bJfl23fBexgJl4jK33aeIIkw/Og67w/CRK4MgiHtSLp7x1I3Fsmw8EYbQ2nZe3lA4SH1DU");
\ No newline at end of file diff --git a/Software/Visual_Studio/Notes/Tango.Notes/Tango.Notes.csproj b/Software/Visual_Studio/Notes/Tango.Notes/Tango.Notes.csproj index 023a4bc69..26dd13553 100644 --- a/Software/Visual_Studio/Notes/Tango.Notes/Tango.Notes.csproj +++ b/Software/Visual_Studio/Notes/Tango.Notes/Tango.Notes.csproj @@ -49,6 +49,7 @@ <Content Include="Azure\SQL Database.txt" /> <Content Include="DB\DB Schema Change Log.txt" /> <Content Include="DB\SQL Dependency.txt" /> + <Content Include="EDrawMax\License.txt" /> <Content Include="Nswag\Pre-Build Example.txt" /> <Content Include="PPC\Remote Debugging.txt" /> <Content Include="PPC\Virtual Flash Drive.txt" /> @@ -57,11 +58,14 @@ <Content Include="TCC\Play Console.txt" /> <Content Include="TeamViewer\License.txt" /> <Content Include="VMWare\License Key.txt" /> + <Content Include="SciChart\License.txt" /> + <Content Include="ZZZ\License.txt" /> </ItemGroup> + <ItemGroup /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Notes/Tango.Notes/ZZZ/License.txt b/Software/Visual_Studio/Notes/Tango.Notes/ZZZ/License.txt new file mode 100644 index 000000000..ce9ddc47f --- /dev/null +++ b/Software/Visual_Studio/Notes/Tango.Notes/ZZZ/License.txt @@ -0,0 +1,19 @@ +Thank you, Twine Solutions LTD, for purchasing Entity Framework Extensions – SQL Server (1 seat) + + + +We are proud to have you joining our ZZZ Projects family. We make it a priority to offer responsive, competent and outstanding customer support. + + + +License Information + +License Name: 4578;101-twine-s.com + +License Key: 9d23b66f-1101-b253-7f8a-59ae011b2ee8 + +Support & Updates period: 2021-06-25 + + + +License Setup: https://entityframework-extensions.net/licensingion.
\ No newline at end of file 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> |
