diff options
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI')
4 files changed, 6 insertions, 210 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/MainWindow.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/MainWindow.xaml index e772a4b87..f74194222 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/MainWindow.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/MainWindow.xaml @@ -10,7 +10,7 @@ xmlns:web="clr-namespace:Tango.Web;assembly=Tango.Web" xmlns:local="clr-namespace:Tango.PPC.Publisher.UI" mc:Ignorable="d" - Title="Tango PPC Publisher" Height="1000" Width="500" d:DataContext="{d:DesignInstance Type=local:MainWindowVM, IsDesignTimeCreatable=False}" WindowStartupLocation="CenterScreen"> + Title="Tango PPC Publisher" Height="1100" Width="500" d:DataContext="{d:DesignInstance Type=local:MainWindowVM, IsDesignTimeCreatable=False}"> <Window.Resources> <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter" /> @@ -67,17 +67,15 @@ <TextBlock Margin="0 20 0 0"> <TextBlock> - <Run>Remote Versions:</Run> - <Run Text="{Binding RemoteVersion}"></Run>, - <Run Text="{Binding RemoteFirmwareVersion}"></Run> + <Run>Remote Version:</Run> + <Run Text="{Binding RemoteVersion}"></Run> </TextBlock> </TextBlock> <TextBlock Margin="0 20 0 0"> <TextBlock> - <Run>Local Versions:</Run> - <Run Text="{Binding LocalVersion}"></Run>, - <Run Text="{Binding LocalFirmwareVersion}"></Run> + <Run>Local Version:</Run> + <Run Text="{Binding LocalVersion}"></Run> </TextBlock> </TextBlock> @@ -131,13 +129,6 @@ <TextBlock Margin="0 10 0 0">Password</TextBlock> <TextBox Margin="0 5 0 0" Text="{Binding Options.Password}"></TextBox> </StackPanel> - - <StackPanel Margin="0 20 0 0"> - <CheckBox x:Name="chkCreateTag" IsChecked="{Binding Options.CreateTag}">Create Tag On Repository</CheckBox> - <CheckBox Margin="0 5 0 0" IsChecked="{Binding Options.AutoCommitAndPush}">Auto Commit & Push</CheckBox> - <TextBlock Margin="0 10 0 0">Personal Access Token</TextBlock> - <TextBox IsEnabled="{Binding ElementName=chkCreateTag,Path=IsChecked}" Margin="0 5 0 0" Text="{Binding Options.PersonalAccessToken}"></TextBox> - </StackPanel> </StackPanel> </ScrollViewer> </Grid> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/MainWindowVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/MainWindowVM.cs index bf4c7af30..98b35ed3f 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/MainWindowVM.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/MainWindowVM.cs @@ -6,7 +6,6 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel; -using System.Configuration; using System.Diagnostics; using System.IO; using System.Linq; @@ -68,13 +67,6 @@ namespace Tango.PPC.Publisher.UI set { _localVersion = value; RaisePropertyChangedAuto(); } } - private String _localFirmwareVersion; - public String LocalFirmwareVersion - { - get { return _localFirmwareVersion; } - set { _localFirmwareVersion = value; RaisePropertyChangedAuto(); } - } - private String _remoteVersion; public String RemoteVersion { @@ -82,13 +74,6 @@ namespace Tango.PPC.Publisher.UI set { _remoteVersion = value; RaisePropertyChangedAuto(); } } - private String _remoteFirmwareVersion; - public String RemoteFirmwareVersion - { - get { return _remoteFirmwareVersion; } - set { _remoteFirmwareVersion = value; RaisePropertyChangedAuto(); } - } - private ICollectionView _provisionSequenceItemsView; public ICollectionView ProvisionSequenceItemsView { @@ -142,7 +127,6 @@ namespace Tango.PPC.Publisher.UI Options.BasicInfoChanged += (_, __) => InvalidateRelayCommands(); Options.EnvironmentChanged += async (_, __) => await OnEnvironmentChanged(); Options.BuidConfigChanged += async (_, __) => await UpdateVersions(); - Options.TfpPathChanged += async (_, __) => await UpdateVersions(); Init(); } @@ -181,18 +165,9 @@ namespace Tango.PPC.Publisher.UI { IsFree = false; LocalVersion = _publisher.GetLocalVersion(); - - try - { - LocalFirmwareVersion = _publisher.GetLocalFirmwareVersion(Options.TfpPath); - } - catch {} - if (SelectedMachineVersion != null) { - var latestVersion = await _publisher.GetRemoteVersion(SelectedMachineVersion.Guid); - RemoteVersion = latestVersion.Version; - RemoteFirmwareVersion = latestVersion.FirmwareVersion; + RemoteVersion = await _publisher.GetRemoteVersion(SelectedMachineVersion.Guid); } InvalidateRelayCommands(); IsFree = true; diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/Tango.PPC.Publisher.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/Tango.PPC.Publisher.UI.csproj index 332554ffc..f40a4b338 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/Tango.PPC.Publisher.UI.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/Tango.PPC.Publisher.UI.csproj @@ -66,7 +66,6 @@ <Reference Include="Microsoft.WindowsAzure.Storage, Version=4.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.ComponentModel.DataAnnotations" /> - <Reference Include="System.Configuration" /> <Reference Include="System.Data" /> <Reference Include="System.Drawing" /> <Reference Include="System.IO.Compression" /> @@ -134,7 +133,6 @@ <Generator>SettingsSingleFileGenerator</Generator> <LastGenOutput>Settings.Designer.cs</LastGenOutput> </None> - <None Include="Tango.PPC.Publisher.UI.json" /> </ItemGroup> <ItemGroup> <None Include="App.config" /> @@ -148,10 +146,6 @@ <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project> <Name>Tango.Core</Name> </ProjectReference> - <ProjectReference Include="..\..\Tango.Git\Tango.Git.csproj"> - <Project>{99081c0e-065c-4d68-bf60-f82330cca02d}</Project> - <Name>Tango.Git</Name> - </ProjectReference> <ProjectReference Include="..\..\Tango.Settings\Tango.Settings.csproj"> <Project>{D8F1AD85-526A-4F50-B6DC-D437AF63D8D8}</Project> <Name>Tango.Settings</Name> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/Tango.PPC.Publisher.UI.json b/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/Tango.PPC.Publisher.UI.json deleted file mode 100644 index 19dea4781..000000000 --- a/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/Tango.PPC.Publisher.UI.json +++ /dev/null @@ -1,164 +0,0 @@ -{ - "$type": "System.Collections.Generic.List`1[[Tango.Settings.SettingsBase, Tango.Settings]], mscorlib", - "$values": [ - { - "$type": "Tango.PPC.Common.PPCSettings, Tango.PPC.Common", - "ApplicationState": "PreSetup", - "MachineScanningTimeoutSeconds": 20, - "AutoConnectWiFiName": null, - "AutoConnectWiFiPassword": null, - "EmbeddedComPort": null, - "EmbeddedDeviceHint": "Tango USB Serial Port", - "EnableExternalBridge": false, - "ExternalBridgePassword": "Aa123456", - "EnableHotSpot": false, - "HotSpotPassword": "Aa123456", - "EnableRemoteAssistance": false, - "DeploymentSlot": "DEV", - "EnableWatchDog": true, - "EnableTechnicianModeByDefault": false, - "JobUploadStrategy": "JobDescriptionFile", - "EnableGradientGeneration": true, - "GradientGenerationResolution": 20, - "EnableLockScreen": false, - "LockScreenTimeout": "00:10:00", - "LockScreenPassword": "1111", - "EnableEmergencyNotifications": true, - "EmergencyComPort": "COM1", - "EnableJobLiquidQuantityValidation": true, - "JobUnitsMethod": "Device", - "LoadedRmlGuid": null, - "DefaultRmlGuid": null, - "SupportedColorSpaces": { - "$type": "System.Collections.Generic.List`1[[Tango.BL.Enumerations.ColorSpaces, Tango.BL]], mscorlib", - "$values": [] - }, - "SupportedJobTypes": { - "$type": "System.Collections.Generic.List`1[[Tango.BL.Enumerations.JobTypes, Tango.BL]], mscorlib", - "$values": [] - }, - "DefaultSpoolTypeGuid": null, - "DefaultSegmentLength": 100, - "PreviousApplicationVersion": "1.0.0.0", - "SynchronizeJobs": true, - "SynchronizeDiagnostics": true, - "SynchronizationInterval": "01:00:00", - "FirmwareVersion": "1.0.0.0", - "DisplayPowerUpScreen": true, - "PowerUpScreenTimeout": "00:00:20", - "AutoCheckForUpdates": true, - "AutoUpdateCheckInterval": "00:30:00", - "EnableAutomaticThreadLoading": true, - "DisplayAutomaticThreadLoadingScreen": true, - "EnableEmbeddedDebugLogs": true, - "TcpTransportAdapterWriteMode": "Interval", - "EnableExternalBridgeSignalR": true, - "ExternalBridgeSignalRHub": "ExternalBridgeHub", - "EnableRemoteDesktop": true, - "RemoteDesktopFrameRate": 5 - }, - { - "$type": "Tango.Core.CoreSettings, Tango.Core", - "DataSource": { - "$type": "Tango.Core.DataSource, Tango.Core", - "Type": "SQLServer", - "Address": "localhost\\SQLEXPRESS", - "Catalog": "Tango", - "IntegratedSecurity": true, - "UserName": "", - "Password": "", - "AccessToken": null, - "AccessTokenExpiration": "0001-01-01T00:00:00" - } - }, - { - "$type": "Tango.PPC.Publisher.UI.PublisherSettings, Tango.PPC.Publisher.UI", - "Options": { - "$type": "Tango.PPC.Common.Publish.PublishOptions, Tango.PPC.Common", - "BasePath": "D:\\Development\\Tango\\Software\\Visual_Studio\\Build\\PPC\\Debug\\..\\", - "BuildConfig": "Release", - "Email": "roy@twine-s.com", - "Password": "1Creativity", - "Comments": "Several bug fixes.", - "Environment": "TEST", - "MachineVersionGuid": "997a53b0-e752-474e-9618-7262c02d0127", - "TfpPath": "P:\\Software\\FirmwareUpgrade\\Version 1.4.6.20\\firmware_package.tfp", - "InstallerProject": "D:\\Development\\Tango\\Software\\Visual_Studio\\Advanced Installer Projects\\PPC Installer.aip", - "InstallerOutputFolder": "D:\\Development\\Tango\\Software\\Visual_Studio\\Build\\Installers\\PPC", - "Synchronization": { - "$type": "Tango.PPC.Common.Publish.SynchronizationOptions, Tango.PPC.Common", - "ProvisionSequenceItems": { - "$type": "System.Collections.ObjectModel.ObservableCollection`1[[Tango.PPC.Common.Publish.SequenceItem, Tango.PPC.Common]], System", - "$values": [ - { - "$type": "Tango.PPC.Common.Publish.SequenceItem, Tango.PPC.Common", - "Type": "Schema", - "Direction": "SourceToTarget", - "Index": 0, - "Name": "Synchronizing schema", - "FilePath": "D:\\Development\\Tango\\Software\\Visual_Studio\\Tango.SQLExaminer\\SQLExaminer\\Configurations\\Schema.xml", - "RequiresSerialNumber": false, - "FileName": "Schema.xml" - }, - { - "$type": "Tango.PPC.Common.Publish.SequenceItem, Tango.PPC.Common", - "Type": "Data", - "Direction": "SourceToTarget", - "Index": 1, - "Name": "Synchronizing collections", - "FilePath": "D:\\Development\\Tango\\Software\\Visual_Studio\\Tango.SQLExaminer\\SQLExaminer\\Configurations\\OverrideData.xml", - "RequiresSerialNumber": false, - "FileName": "OverrideData.xml" - }, - { - "$type": "Tango.PPC.Common.Publish.SequenceItem, Tango.PPC.Common", - "Type": "Data", - "Direction": "SourceToTarget", - "Index": 2, - "Name": "Configuring machine", - "FilePath": "D:\\Development\\Tango\\Software\\Visual_Studio\\Tango.SQLExaminer\\SQLExaminer\\Configurations\\ProvisionMachine.xml", - "RequiresSerialNumber": true, - "FileName": "ProvisionMachine.xml" - } - ] - }, - "UpdateSequenceItems": { - "$type": "System.Collections.ObjectModel.ObservableCollection`1[[Tango.PPC.Common.Publish.SequenceItem, Tango.PPC.Common]], System", - "$values": [ - { - "$type": "Tango.PPC.Common.Publish.SequenceItem, Tango.PPC.Common", - "Type": "Schema", - "Direction": "SourceToTarget", - "Index": 0, - "Name": "Updating schema", - "FilePath": "D:\\Development\\Tango\\Software\\Visual_Studio\\Tango.SQLExaminer\\SQLExaminer\\Configurations\\Schema.xml", - "RequiresSerialNumber": false, - "FileName": "Schema.xml" - }, - { - "$type": "Tango.PPC.Common.Publish.SequenceItem, Tango.PPC.Common", - "Type": "Data", - "Direction": "SourceToTarget", - "Index": 1, - "Name": "Updating collections", - "FilePath": "D:\\Development\\Tango\\Software\\Visual_Studio\\Tango.SQLExaminer\\SQLExaminer\\Configurations\\OverrideData.xml", - "RequiresSerialNumber": false, - "FileName": "OverrideData.xml" - }, - { - "$type": "Tango.PPC.Common.Publish.SequenceItem, Tango.PPC.Common", - "Type": "Data", - "Direction": "SourceToTarget", - "Index": 2, - "Name": "Updating machine", - "FilePath": "D:\\Development\\Tango\\Software\\Visual_Studio\\Tango.SQLExaminer\\SQLExaminer\\Configurations\\UpdateMachine.xml", - "RequiresSerialNumber": true, - "FileName": "UpdateMachine.xml" - } - ] - } - } - } - } - ] -}
\ No newline at end of file |