diff --git a/AMSExplorer/App.config b/AMSExplorer/App.config index adf6cbe2..941c86f7 100644 --- a/AMSExplorer/App.config +++ b/AMSExplorer/App.config @@ -116,6 +116,18 @@ + + 1.99 + + + 1.39 + + + 10 + + + $ + \ No newline at end of file diff --git a/AMSExplorer/AssetInformation.Designer.cs b/AMSExplorer/AssetInformation.Designer.cs index 923a897b..6c7cbb45 100644 --- a/AMSExplorer/AssetInformation.Designer.cs +++ b/AMSExplorer/AssetInformation.Designer.cs @@ -47,6 +47,7 @@ private void InitializeComponent() this.DGFiles = new System.Windows.Forms.DataGridView(); this.contextMenuStripFiles = new System.Windows.Forms.ContextMenuStrip(this.components); this.makeItPrimaryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.showMetadataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItemOpenFile = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItemDownloadFile = new System.Windows.Forms.ToolStripMenuItem(); this.deleteFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -100,7 +101,6 @@ private void InitializeComponent() this.buttonFlash = new System.Windows.Forms.Button(); this.labelAssetNameTitle = new System.Windows.Forms.Label(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.showMetadataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.panel1 = new System.Windows.Forms.Panel(); ((System.ComponentModel.ISupportInitialize)(this.DGAsset)).BeginInit(); this.contextMenuStripDG.SuspendLayout(); @@ -301,6 +301,13 @@ private void InitializeComponent() this.makeItPrimaryToolStripMenuItem.Text = "Set as Primary"; this.makeItPrimaryToolStripMenuItem.Click += new System.EventHandler(this.makeItPrimaryToolStripMenuItem_Click); // + // showMetadataToolStripMenuItem + // + this.showMetadataToolStripMenuItem.Name = "showMetadataToolStripMenuItem"; + this.showMetadataToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.showMetadataToolStripMenuItem.Text = "Show metadata"; + this.showMetadataToolStripMenuItem.Click += new System.EventHandler(this.showMetadataToolStripMenuItem_Click); + // // toolStripMenuItemOpenFile // this.toolStripMenuItemOpenFile.Name = "toolStripMenuItemOpenFile"; @@ -473,7 +480,7 @@ private void InitializeComponent() this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(752, 450); + this.tabPage1.Size = new System.Drawing.Size(752, 438); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "Asset information"; this.tabPage1.UseVisualStyleBackColor = true; @@ -570,7 +577,7 @@ private void InitializeComponent() this.tabPage5.Location = new System.Drawing.Point(4, 22); this.tabPage5.Name = "tabPage5"; this.tabPage5.Padding = new System.Windows.Forms.Padding(3); - this.tabPage5.Size = new System.Drawing.Size(752, 450); + this.tabPage5.Size = new System.Drawing.Size(752, 438); this.tabPage5.TabIndex = 4; this.tabPage5.Text = "Content keys"; this.tabPage5.UseVisualStyleBackColor = true; @@ -578,7 +585,8 @@ private void InitializeComponent() // buttonGetTestToken // this.buttonGetTestToken.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonGetTestToken.Location = new System.Drawing.Point(126, 421); + this.buttonGetTestToken.Enabled = false; + this.buttonGetTestToken.Location = new System.Drawing.Point(235, 409); this.buttonGetTestToken.Name = "buttonGetTestToken"; this.buttonGetTestToken.Size = new System.Drawing.Size(104, 23); this.buttonGetTestToken.TabIndex = 41; @@ -612,7 +620,7 @@ private void InitializeComponent() this.dataGridViewAutPol.Name = "dataGridViewAutPol"; this.dataGridViewAutPol.ReadOnly = true; this.dataGridViewAutPol.RowHeadersVisible = false; - this.dataGridViewAutPol.Size = new System.Drawing.Size(281, 192); + this.dataGridViewAutPol.Size = new System.Drawing.Size(281, 180); this.dataGridViewAutPol.TabIndex = 38; // // listViewAutPol @@ -626,7 +634,7 @@ private void InitializeComponent() this.listViewAutPol.Location = new System.Drawing.Point(236, 252); this.listViewAutPol.MultiSelect = false; this.listViewAutPol.Name = "listViewAutPol"; - this.listViewAutPol.Size = new System.Drawing.Size(219, 192); + this.listViewAutPol.Size = new System.Drawing.Size(219, 151); this.listViewAutPol.TabIndex = 39; this.listViewAutPol.UseCompatibleStateImageBehavior = false; this.listViewAutPol.View = System.Windows.Forms.View.Details; @@ -683,7 +691,7 @@ private void InitializeComponent() this.tabPage4.Controls.Add(this.listViewDelPol); this.tabPage4.Location = new System.Drawing.Point(4, 22); this.tabPage4.Name = "tabPage4"; - this.tabPage4.Size = new System.Drawing.Size(752, 450); + this.tabPage4.Size = new System.Drawing.Size(752, 438); this.tabPage4.TabIndex = 3; this.tabPage4.Text = "Delivery policies"; this.tabPage4.UseVisualStyleBackColor = true; @@ -762,7 +770,7 @@ private void InitializeComponent() this.tabPage3.Location = new System.Drawing.Point(4, 22); this.tabPage3.Name = "tabPage3"; this.tabPage3.Padding = new System.Windows.Forms.Padding(3); - this.tabPage3.Size = new System.Drawing.Size(752, 450); + this.tabPage3.Size = new System.Drawing.Size(752, 438); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "Locators"; this.tabPage3.UseVisualStyleBackColor = true; @@ -915,13 +923,6 @@ private void InitializeComponent() this.labelAssetNameTitle.TabIndex = 35; this.labelAssetNameTitle.Text = "Asset : "; // - // showMetadataToolStripMenuItem - // - this.showMetadataToolStripMenuItem.Name = "showMetadataToolStripMenuItem"; - this.showMetadataToolStripMenuItem.Size = new System.Drawing.Size(233, 22); - this.showMetadataToolStripMenuItem.Text = "Show metadata"; - this.showMetadataToolStripMenuItem.Click += new System.EventHandler(this.showMetadataToolStripMenuItem_Click); - // // panel1 // this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) diff --git a/AMSExplorer/AssetInformation.cs b/AMSExplorer/AssetInformation.cs index 95b4487f..4f8aafa3 100644 --- a/AMSExplorer/AssetInformation.cs +++ b/AMSExplorer/AssetInformation.cs @@ -47,11 +47,13 @@ public partial class AssetInformation : Form private ILocator TempLocator = null; private ILocator TempMetadaLocator = null; private List MyPolicies = null; + private Mainform MyMainForm; - public AssetInformation() + public AssetInformation(Mainform mainform) { InitializeComponent(); this.Icon = Bitmaps.Azure_Explorer_ico; + MyMainForm = mainform; } private void contextMenuStripDG_MouseClick(object sender, MouseEventArgs e) @@ -594,6 +596,8 @@ private void DoDisplayKeyProperties() { IContentKey key = MyAsset.ContentKeys.Skip(listViewKeys.SelectedIndices[0]).Take(1).FirstOrDefault(); dataGridViewKeys.Rows.Clear(); + dataGridViewKeys.Rows.Add("Name", key.Name != null ? key.Name : ""); + /* if (key.Name != null) { dataGridViewKeys.Rows.Add("Name", key.Name); @@ -602,6 +606,7 @@ private void DoDisplayKeyProperties() { dataGridViewKeys.Rows.Add("Name", ""); } + * */ dataGridViewKeys.Rows.Add("Id", key.Id); dataGridViewKeys.Rows.Add("Content key type", key.ContentKeyType); @@ -772,14 +777,12 @@ private void DoDownloadFile() IAssetFile AF = MyAsset.AssetFiles.Skip(listViewFiles.SelectedIndices[0]).Take(1).FirstOrDefault(); if (AF == null) return; - Mainform parent = (Mainform)this.Owner; - if (folderBrowserDialogDownload.ShowDialog() == DialogResult.OK) { - int index = parent.DoGridTransferAddItem(string.Format("Download of file '{0}' from asset '{1}'", AF.Name, MyAsset.Name), TransferType.DownloadToLocal, Properties.Settings.Default.useTransferQueue); + int index = MyMainForm.DoGridTransferAddItem(string.Format("Download of file '{0}' from asset '{1}'", AF.Name, MyAsset.Name), TransferType.DownloadToLocal, Properties.Settings.Default.useTransferQueue); // Start a worker thread that does downloading. - parent.DoDownloadFileFromAsset(MyAsset, AF, folderBrowserDialogDownload.SelectedPath, index); + MyMainForm.DoDownloadFileFromAsset(MyAsset, AF, folderBrowserDialogDownload.SelectedPath, index); } } } @@ -1280,7 +1283,6 @@ private void DoRemovePol() } catch (Exception e) { - Mainform parent = (Mainform)this.Owner; MessageBox.Show("Error when removing this policy." + Constants.endline + Program.GetErrorMessage(e)); ListAssetDeliveryPolicies(); } @@ -1304,26 +1306,17 @@ private void listViewAutPol_SelectedIndexChanged(object sender, EventArgs e) private void DoDisplayAuthorizationPolicyProperties() { + bool DisplayButGetToken = false; if (listViewAutPol.SelectedItems.Count > 0) { IContentKeyAuthorizationPolicy policy = MyPolicies.Skip(listViewAutPol.SelectedIndices[0]).Take(1).FirstOrDefault(); dataGridViewAutPol.Rows.Clear(); - if (policy.Name != null) - { - dataGridViewAutPol.Rows.Add("Name", policy.Name); - } - else - { - dataGridViewAutPol.Rows.Add("Name", ""); - } - + dataGridViewAutPol.Rows.Add("Name", policy.Name != null ? policy.Name : ""); dataGridViewAutPol.Rows.Add("Id", policy.Id); IList objIList_option = policy.Options; - - foreach (var option in objIList_option) { dataGridViewAutPol.Rows.Add("Option Name", option.Name); @@ -1333,11 +1326,13 @@ private void DoDisplayAuthorizationPolicyProperties() foreach (var restriction in objList_restriction) { dataGridViewAutPol.Rows.Add("Option restriction Name", restriction.Name); - dataGridViewAutPol.Rows.Add("Option restriction KeyRestrictionType", restriction.KeyRestrictionType); + dataGridViewAutPol.Rows.Add("Option restriction KeyRestrictionType", (ContentKeyRestrictionType)restriction.KeyRestrictionType); + if ((ContentKeyRestrictionType)restriction.KeyRestrictionType == ContentKeyRestrictionType.TokenRestricted) DisplayButGetToken = true; dataGridViewAutPol.Rows.Add("Option restriction Requirements", FormatXmlString(restriction.Requirements)); } } } + buttonGetTestToken.Enabled = DisplayButGetToken; } private void buttonGetTestToken_Click(object sender, EventArgs e) @@ -1347,8 +1342,6 @@ private void buttonGetTestToken_Click(object sender, EventArgs e) private void DoGetTestToken() { - Mainform parent = (Mainform)this.Owner; - if (listViewKeys.SelectedItems.Count > 0) { IContentKey key = MyAsset.ContentKeys.Skip(listViewKeys.SelectedIndices[0]).Take(1).FirstOrDefault(); @@ -1368,23 +1361,9 @@ private void DoGetTestToken() TokenRestrictionTemplate tokenTemplate = TokenRestrictionTemplateSerializer.Deserialize(tokenTemplateString); string testToken = TokenRestrictionTemplateSerializer.GenerateTestToken(tokenTemplate, null, rawkey); - switch (MessageBox.Show("Test token will be copied to log window and clipboard." + Constants.endline + "Do you want the URL encoded version ?", "Test token", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question)) - { - case DialogResult.Yes: - testToken = HttpUtility.UrlEncode(testToken); - parent.TextBoxLogWriteLine("The authorization test token is (URL encoded):\n{0}", testToken); - System.Windows.Forms.Clipboard.SetText(testToken); - break; - - case DialogResult.No: - parent.TextBoxLogWriteLine("The authorization test token is (URL encoded):\n{0}", testToken); - System.Windows.Forms.Clipboard.SetText(testToken); - break; - - default: - break; - - } + MyMainForm.TextBoxLogWriteLine("The authorization test token is :\n{0}", testToken); + System.Windows.Forms.Clipboard.SetText(testToken); + MessageBox.Show(string.Format("The test token below has been be copied to the log window and clipboard.\n\n{0}", testToken), "Test token copied"); } } } @@ -1530,7 +1509,7 @@ private ILocator GetTemporaryLocator() return TempLocator; } - + private void contextMenuStripDG_MouseClick_1(object sender, MouseEventArgs e) { ContextMenuStrip contextmenu = (ContextMenuStrip)sender; diff --git a/AMSExplorer/AssetInformation.resx b/AMSExplorer/AssetInformation.resx index d5d639ed..81d1bb2c 100644 --- a/AMSExplorer/AssetInformation.resx +++ b/AMSExplorer/AssetInformation.resx @@ -132,4 +132,7 @@ 551, 17 + + 551, 17 + \ No newline at end of file diff --git a/AMSExplorer/EncodingZenium.Designer.cs b/AMSExplorer/EncodingZenium.Designer.cs index ca6d813b..bb1e7a30 100644 --- a/AMSExplorer/EncodingZenium.Designer.cs +++ b/AMSExplorer/EncodingZenium.Designer.cs @@ -298,7 +298,6 @@ private void InitializeComponent() this.listViewWorkflows.TabIndex = 61; this.listViewWorkflows.UseCompatibleStateImageBehavior = false; this.listViewWorkflows.View = System.Windows.Forms.View.Details; - this.listViewWorkflows.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.listViewInputAssets_ColumnClick); this.listViewWorkflows.SelectedIndexChanged += new System.EventHandler(this.listbox_SelectedIndexChanged); // // columnHeaderFileName diff --git a/AMSExplorer/EncodingZenium.cs b/AMSExplorer/EncodingZenium.cs index 16e8b782..f9c6e8a4 100644 --- a/AMSExplorer/EncodingZenium.cs +++ b/AMSExplorer/EncodingZenium.cs @@ -221,6 +221,8 @@ private void EncodingPremiumWorkflow_Load(object sender, EventArgs e) } LoadWorkflows(); UpdateJobSummary(); + listViewWorkflows.Tag = -1; + listViewWorkflows.ColumnClick += ListViewItemComparer.ListView_ColumnClick; } @@ -251,9 +253,6 @@ private void LoadWorkflows() } listViewWorkflows.AutoResizeColumns(ColumnHeaderAutoResizeStyle.HeaderSize); listViewWorkflows.EndUpdate(); - - - } private void label1_Click(object sender, EventArgs e) @@ -270,33 +269,7 @@ private void outputassetname_TextChanged(object sender, EventArgs e) { } - - private void listViewInputAssets_ColumnClick(object sender, ColumnClickEventArgs e) - { - // Determine whether the column is the same as the last column clicked. - if (e.Column != sortColumn) - { - // Set the sort column to the new column. - sortColumn = e.Column; - // Set the sort order to ascending by default. - listViewWorkflows.Sorting = SortOrder.Ascending; - } - else - { - // Determine what the last sort order was and change it. - if (listViewWorkflows.Sorting == SortOrder.Ascending) - listViewWorkflows.Sorting = SortOrder.Descending; - else - listViewWorkflows.Sorting = SortOrder.Ascending; - } - - // Call the sort method to manually sort. - listViewWorkflows.Sort(); - // Set the ListViewItemSorter property to a new ListViewItemComparer - // object. - this.listViewWorkflows.ListViewItemSorter = new ListViewItemComparer(e.Column, - listViewWorkflows.Sorting); - } + private void buttonUpload_Click(object sender, EventArgs e) { diff --git a/AMSExplorer/ExportAssetToAzureStorage.cs b/AMSExplorer/ExportAssetToAzureStorage.cs index 2b3cf2d1..99dac09d 100644 --- a/AMSExplorer/ExportAssetToAzureStorage.cs +++ b/AMSExplorer/ExportAssetToAzureStorage.cs @@ -49,7 +49,7 @@ public partial class ExportAssetToAzureStorage : Form private CloudBlobClient cloudBlobClient; private List ListContainers = new List(); - public List listassetfiles = new List(); + private List listassetfiles = new List(); public string SelectedContainer = null; public List SelectedAssetFiles = new List(); public bool useDefaultStorage; @@ -141,12 +141,36 @@ public string BlobNewContainerName } - public ExportAssetToAzureStorage(CloudMediaContext contextUploadArg, string MediaServicesStorageAccountKeyArg) + public ExportAssetToAzureStorage(CloudMediaContext contextUploadArg, string MediaServicesStorageAccountKeyArg, IAsset sourceAsset) { InitializeComponent(); this.Icon = Bitmaps.Azure_Explorer_ico; MediaServicesStorageAccountKey = MediaServicesStorageAccountKeyArg; contextUpload = contextUploadArg; + + // list asset files /////////////////////// + bool bfileinasset = (sourceAsset.AssetFiles.Count() == 0) ? false : true; + listViewAssetFiles.Items.Clear(); + if (bfileinasset) + { + listViewAssetFiles.BeginUpdate(); + foreach (IAssetFile file in sourceAsset.AssetFiles) + { + ListViewItem item = new ListViewItem(file.Name, 0); + if (file.IsPrimary) item.ForeColor = Color.Blue; + item.SubItems.Add(file.LastModified.ToLocalTime().ToString()); + item.SubItems.Add(AssetInfo.FormatByteSize(file.ContentFileSize)); + (listViewAssetFiles.Items.Add(item)).Selected = true; + listassetfiles.Add(file); + } + + listViewAssetFiles.AutoResizeColumns(ColumnHeaderAutoResizeStyle.HeaderSize); + listViewAssetFiles.EndUpdate(); + + } + + + } private void UploadFromBlob_Load(object sender, EventArgs e) @@ -163,6 +187,12 @@ private void UploadFromBlob_Load(object sender, EventArgs e) DoListBlobs(true); if (ErrorConnect) this.Close(); } + listViewAssetFiles.Tag = -1; + listViewAssetFiles.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(ListViewItemComparer.ListView_ColumnClick); + + listViewBlobs.Tag = -1; + listViewBlobs.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(ListViewItemComparer.ListView_ColumnClick); + } private void ConnectToStorage() @@ -253,14 +283,14 @@ private void DisplayFilesOfContainer(string containerName) private void buttonCopy_Click(object sender, EventArgs e) { - if (radioButtonSelectedContainer.Checked) SelectedContainer = ListContainers[listViewBlobs.SelectedIndices[0]].Name; - + if (radioButtonSelectedContainer.Checked) SelectedContainer = listViewBlobs.SelectedItems[0].Text; this.SelectedAssetFiles.Clear(); - foreach (int index in listViewAssetFiles.SelectedIndices) + foreach (ListViewItem item in listViewAssetFiles.SelectedItems) { - this.SelectedAssetFiles.Add(listassetfiles[index]); + // let's find the file as control has perhaps been sorted + IAssetFile fitem = listassetfiles.Where(l => l.Name == item.Text).FirstOrDefault(); + this.SelectedAssetFiles.Add(fitem); } - } private void radioButtonStorageDefault_CheckedChanged(object sender, EventArgs e) diff --git a/AMSExplorer/ImportFromAzureStorage.cs b/AMSExplorer/ImportFromAzureStorage.cs index 35b6811e..d3f32015 100644 --- a/AMSExplorer/ImportFromAzureStorage.cs +++ b/AMSExplorer/ImportFromAzureStorage.cs @@ -168,6 +168,10 @@ private void UploadFromBlob_Load(object sender, EventArgs e) DoListBlobs(true); if (ErrorConnect) this.Close(); } + listViewBlobs.Tag = -1; + listViewBlobs.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(ListViewItemComparer.ListView_ColumnClick); + listViewFiles.Tag = -1; + listViewFiles.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(ListViewItemComparer.ListView_ColumnClick); } private void ConnectToStorage() @@ -248,7 +252,7 @@ private void DisplayFilesOfContainer(string containerName) { CloudBlockBlob cloudBlockBlob = b as CloudBlockBlob; string lastModified = ""; - ListViewItem item = new ListViewItem(Path.GetFileName(b.Uri.ToString()), 0); + ListViewItem item = new ListViewItem(Path.GetFileName(b.Uri.LocalPath), 0); lastModified = cloudBlockBlob.Properties.LastModified.Value.UtcDateTime.ToLocalTime().ToString(); item.SubItems.Add(lastModified); item.SubItems.Add(AssetInfo.FormatByteSize(cloudBlockBlob.Properties.Length)); @@ -276,10 +280,12 @@ private void buttonClose_Click(object sender, EventArgs e) { this.SelectedBlobs.Clear(); - foreach (int index in listViewFiles.SelectedIndices) + + foreach (ListViewItem item in listViewFiles.SelectedItems) { - this.SelectedBlobs.Add(ListBlobs[index]); - + // let's find the file as control has perhaps been sorted + IListBlobItem bitem = ListBlobs.Where(l => Path.GetFileName(l.Uri.LocalPath) == item.Text).FirstOrDefault(); + this.SelectedBlobs.Add(bitem); } } @@ -328,7 +334,6 @@ private void UploadFromBlob_SizeChanged(object sender, EventArgs e) private void listViewFiles_SelectedIndexChanged(object sender, EventArgs e) { buttonUpload.Enabled = !(listViewFiles.SelectedItems.Count == 0); - } private void listViewBlobs_SelectedIndexChanged(object sender, EventArgs e) @@ -348,5 +353,6 @@ private void textBoxSearch_TextChanged(object sender, EventArgs e) { DoListBlobs(false); } + } } diff --git a/AMSExplorer/ListViewTemplates.cs b/AMSExplorer/ListViewTemplates.cs index 66dc2854..8408aeb6 100644 --- a/AMSExplorer/ListViewTemplates.cs +++ b/AMSExplorer/ListViewTemplates.cs @@ -11,9 +11,7 @@ namespace AMSExplorer { class ListViewTemplates : ListView { - private int sortColumn = -1; private CloudMediaContext _context; - private System.Windows.Forms.ColumnHeader columnHeaderType; private System.Windows.Forms.ColumnHeader columnHeaderTemplateName; private System.Windows.Forms.ColumnHeader columnHeaderTemplateDate; @@ -60,7 +58,8 @@ public ListViewTemplates() this.TabIndex = 61; this.UseCompatibleStateImageBehavior = false; this.View = System.Windows.Forms.View.Details; - this.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.listViewInputAssets_ColumnClick); + this.Tag = -1; + this.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(ListViewItemComparer.ListView_ColumnClick); // // columnHeaderTemplateName // @@ -120,33 +119,5 @@ public void DeleteSelectedTemplate() } } } - - private void listViewInputAssets_ColumnClick(object sender, ColumnClickEventArgs e) - { - // Determine whether the column is the same as the last column clicked. - if (e.Column != sortColumn) - { - // Set the sort column to the new column. - sortColumn = e.Column; - // Set the sort order to ascending by default. - this.Sorting = SortOrder.Ascending; - } - else - { - // Determine what the last sort order was and change it. - if (this.Sorting == SortOrder.Ascending) - this.Sorting = SortOrder.Descending; - else - this.Sorting = SortOrder.Ascending; - } - - // Call the sort method to manually sort. - this.Sort(); - // Set the ListViewItemSorter property to a new ListViewItemComparer - // object. - this.ListViewItemSorter = new ListViewItemComparer(e.Column, - this.Sorting); - - } } } diff --git a/AMSExplorer/Mainform.Designer.cs b/AMSExplorer/Mainform.Designer.cs index 4ea97c5a..45f2360b 100644 --- a/AMSExplorer/Mainform.Designer.cs +++ b/AMSExplorer/Mainform.Designer.cs @@ -30,8 +30,8 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Mainform)); - System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); - System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend(); + System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); + System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend(); this.butPrevPageAsset = new System.Windows.Forms.Button(); this.label3 = new System.Windows.Forms.Label(); this.butNextPageAsset = new System.Windows.Forms.Button(); @@ -75,7 +75,9 @@ private void InitializeComponent() this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); this.ContextMenuItemAssetPlayback = new System.Windows.Forms.ToolStripMenuItem(); this.ContextMenuItemPlaybackWithFlashOSMFAzure = new System.Windows.Forms.ToolStripMenuItem(); + this.withFlashTokenPlayerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ContextMenuItemPlaybackWithSilverlightMonitoring = new System.Windows.Forms.ToolStripMenuItem(); + this.withSilverlightPlayReadyTokenPlayerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ContextMenuItemPlaybackWithMPEGDASHIFReference = new System.Windows.Forms.ToolStripMenuItem(); this.ContextMenuItemPlaybackWithMPEGDASHAzure = new System.Windows.Forms.ToolStripMenuItem(); this.withCustomPlayerToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); @@ -149,7 +151,9 @@ private void InitializeComponent() this.toolStripSeparator23 = new System.Windows.Forms.ToolStripSeparator(); this.playbackToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.withFlashOSMFToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.withFlashAESTokenPlayerToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.withSilverlightMMPPFToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.withSilverlightPlayReadyTokenPlayerToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.withMPEGDASHIFRefPlayerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.withMPEGDASHAzurePlayerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.withDASHLiveAzurePlayerToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); @@ -195,6 +199,7 @@ private void InitializeComponent() this.azureMediaServicesPlayerPageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.silverlightMonitoringPlayerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.silverlightSmoothStreamingPlayReadyTokenPlayerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.flashSmoothStreamingAESTokenPlayerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dASHIFHTML5ReferencePlayerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dASHLivePlayerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.hTML5VideoElementToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -236,8 +241,6 @@ private void InitializeComponent() this.ContextMenuItemTransferOpenDest = new System.Windows.Forms.ToolStripMenuItem(); this.displayErrorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tabControlMain = new System.Windows.Forms.TabControl(); - this.contextMenuStripProcessors = new System.Windows.Forms.ContextMenuStrip(this.components); - this.refreshToolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem(); this.tabPageAssets = new System.Windows.Forms.TabPage(); this.label10 = new System.Windows.Forms.Label(); this.comboBoxFilterAssetsTime = new System.Windows.Forms.ComboBox(); @@ -246,7 +249,6 @@ private void InitializeComponent() this.buttonAssetSearch = new System.Windows.Forms.Button(); this.label8 = new System.Windows.Forms.Label(); this.textBoxAssetSearch = new System.Windows.Forms.TextBox(); - this.dataGridViewAssetsV = new AMSExplorer.DataGridViewAssets(); this.tabPageTransfers = new System.Windows.Forms.TabPage(); this.tabPageJobs = new System.Windows.Forms.TabPage(); this.label11 = new System.Windows.Forms.Label(); @@ -256,11 +258,9 @@ private void InitializeComponent() this.textBoxJobSearch = new System.Windows.Forms.TextBox(); this.label6 = new System.Windows.Forms.Label(); this.comboBoxStateJobs = new System.Windows.Forms.ComboBox(); - this.dataGridViewJobsV = new AMSExplorer.DataGridViewJobs(); this.tabPageLive = new System.Windows.Forms.TabPage(); this.splitContainerLive = new System.Windows.Forms.SplitContainer(); this.label13 = new System.Windows.Forms.Label(); - this.dataGridViewChannelsV = new AMSExplorer.DataGridViewLiveChannel(); this.contextMenuStripChannels = new System.Windows.Forms.ContextMenuStrip(this.components); this.refreshToolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator20 = new System.Windows.Forms.ToolStripSeparator(); @@ -288,7 +288,6 @@ private void InitializeComponent() this.label18 = new System.Windows.Forms.Label(); this.comboBoxOrderProgram = new System.Windows.Forms.ComboBox(); this.label14 = new System.Windows.Forms.Label(); - this.dataGridViewProgramsV = new AMSExplorer.DataGridViewLiveProgram(); this.contextMenuStripPrograms = new System.Windows.Forms.ContextMenuStrip(this.components); this.refreshToolStripMenuItem4 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator21 = new System.Windows.Forms.ToolStripSeparator(); @@ -312,12 +311,15 @@ private void InitializeComponent() this.ContextMenuItemProgramPlaybackWithSilverlightMontoring = new System.Windows.Forms.ToolStripMenuItem(); this.withDASHLiveAzurePlayerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.withCustomPlayerToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); + this.withFlashAESTokenPlayerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.withSilverlightPlayReadyTokenPlayerToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.tabPageProcessors = new System.Windows.Forms.TabPage(); this.dataGridViewProcessors = new System.Windows.Forms.DataGridView(); + this.contextMenuStripProcessors = new System.Windows.Forms.ContextMenuStrip(this.components); + this.refreshToolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem(); this.tabPageOrigins = new System.Windows.Forms.TabPage(); this.label19 = new System.Windows.Forms.Label(); this.comboBoxOrderStreamingEndpoints = new System.Windows.Forms.ComboBox(); - this.dataGridViewStreamingEndpointsV = new AMSExplorer.DataGridViewStreamingEndpoints(); this.contextMenuStripStreaminEndpoints = new System.Windows.Forms.ContextMenuStrip(this.components); this.refreshToolStripMenuItem5 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator25 = new System.Windows.Forms.ToolStripSeparator(); @@ -331,7 +333,6 @@ private void InitializeComponent() this.dateTimePickerEndDate = new System.Windows.Forms.DateTimePicker(); this.label20 = new System.Windows.Forms.Label(); this.dateTimePickerStartDate = new System.Windows.Forms.DateTimePicker(); - this.progressBarChart = new System.Windows.Forms.ProgressBar(); this.chart = new System.Windows.Forms.DataVisualization.Charting.Chart(); this.buttonbuildchart = new System.Windows.Forms.Button(); this.label12 = new System.Windows.Forms.Label(); @@ -341,6 +342,11 @@ private void InitializeComponent() this.copyToClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.clearTextToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.buttonRefresh = new System.Windows.Forms.Button(); + this.dataGridViewAssetsV = new AMSExplorer.DataGridViewAssets(); + this.dataGridViewJobsV = new AMSExplorer.DataGridViewJobs(); + this.dataGridViewChannelsV = new AMSExplorer.DataGridViewLiveChannel(); + this.dataGridViewProgramsV = new AMSExplorer.DataGridViewLiveProgram(); + this.dataGridViewStreamingEndpointsV = new AMSExplorer.DataGridViewStreamingEndpoints(); this.contextMenuStripAssets.SuspendLayout(); this.menuStripMain.SuspendLayout(); this.contextMenuStripJobs.SuspendLayout(); @@ -348,25 +354,20 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.dataGridViewTransfer)).BeginInit(); this.contextMenuStripTransfers.SuspendLayout(); this.tabControlMain.SuspendLayout(); - this.contextMenuStripProcessors.SuspendLayout(); this.tabPageAssets.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewAssetsV)).BeginInit(); this.tabPageTransfers.SuspendLayout(); this.tabPageJobs.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewJobsV)).BeginInit(); this.tabPageLive.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainerLive)).BeginInit(); this.splitContainerLive.Panel1.SuspendLayout(); this.splitContainerLive.Panel2.SuspendLayout(); this.splitContainerLive.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewChannelsV)).BeginInit(); this.contextMenuStripChannels.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewProgramsV)).BeginInit(); this.contextMenuStripPrograms.SuspendLayout(); this.tabPageProcessors.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewProcessors)).BeginInit(); + this.contextMenuStripProcessors.SuspendLayout(); this.tabPageOrigins.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewStreamingEndpointsV)).BeginInit(); this.contextMenuStripStreaminEndpoints.SuspendLayout(); this.tabPageChart.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.chart)).BeginInit(); @@ -375,6 +376,11 @@ private void InitializeComponent() this.splitContainerMain.Panel2.SuspendLayout(); this.splitContainerMain.SuspendLayout(); this.contextMenuStripLog.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewAssetsV)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewJobsV)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewChannelsV)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewProgramsV)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewStreamingEndpointsV)).BeginInit(); this.SuspendLayout(); // // butPrevPageAsset @@ -593,10 +599,10 @@ private void InitializeComponent() this.encodeAssetsWithAzureMediaEncoderadvancedModeWithCustomPresetToolStripMenuItem.Text = "Encode asset(s) with Media Encoder (advanced mode with custom preset)..."; this.encodeAssetsWithAzureMediaEncoderadvancedModeWithCustomPresetToolStripMenuItem.Click += new System.EventHandler(this.encodeAssetsWithAzureMediaEncoderadvancedModeWithCustomPresetToolStripMenuItem_Click); // - // ContextMenuItemAMEPremiumWorkflow + // ContextMenuItemZenium // this.ContextMenuItemZenium.Image = global::AMSExplorer.Bitmaps.encoding; - this.ContextMenuItemZenium.Name = "ContextMenuItemAMEPremiumWorkflow"; + this.ContextMenuItemZenium.Name = "ContextMenuItemZenium"; this.ContextMenuItemZenium.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.K))); this.ContextMenuItemZenium.Size = new System.Drawing.Size(544, 22); this.ContextMenuItemZenium.Text = "Encode asset(s) with Imagine Communications Zenium..."; @@ -768,7 +774,9 @@ private void InitializeComponent() // this.ContextMenuItemAssetPlayback.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ContextMenuItemPlaybackWithFlashOSMFAzure, + this.withFlashTokenPlayerToolStripMenuItem, this.ContextMenuItemPlaybackWithSilverlightMonitoring, + this.withSilverlightPlayReadyTokenPlayerToolStripMenuItem, this.ContextMenuItemPlaybackWithMPEGDASHIFReference, this.ContextMenuItemPlaybackWithMPEGDASHAzure, this.withCustomPlayerToolStripMenuItem1}); @@ -782,23 +790,41 @@ private void InitializeComponent() // this.ContextMenuItemPlaybackWithFlashOSMFAzure.Name = "ContextMenuItemPlaybackWithFlashOSMFAzure"; this.ContextMenuItemPlaybackWithFlashOSMFAzure.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F))); - this.ContextMenuItemPlaybackWithFlashOSMFAzure.Size = new System.Drawing.Size(308, 22); + this.ContextMenuItemPlaybackWithFlashOSMFAzure.Size = new System.Drawing.Size(360, 22); this.ContextMenuItemPlaybackWithFlashOSMFAzure.Text = "with Flash OSMF Azure Player"; this.ContextMenuItemPlaybackWithFlashOSMFAzure.Click += new System.EventHandler(this.withFlashOSMFAzurePlayerToolStripMenuItem_Click); // + // withFlashTokenPlayerToolStripMenuItem + // + this.withFlashTokenPlayerToolStripMenuItem.Name = "withFlashTokenPlayerToolStripMenuItem"; + this.withFlashTokenPlayerToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.F))); + this.withFlashTokenPlayerToolStripMenuItem.Size = new System.Drawing.Size(356, 22); + this.withFlashTokenPlayerToolStripMenuItem.Text = "with Flash AES (Token) Player"; + this.withFlashTokenPlayerToolStripMenuItem.Click += new System.EventHandler(this.withFlashTokenPlayerToolStripMenuItem_Click); + // // ContextMenuItemPlaybackWithSilverlightMonitoring // this.ContextMenuItemPlaybackWithSilverlightMonitoring.Name = "ContextMenuItemPlaybackWithSilverlightMonitoring"; this.ContextMenuItemPlaybackWithSilverlightMonitoring.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.S))); - this.ContextMenuItemPlaybackWithSilverlightMonitoring.Size = new System.Drawing.Size(308, 22); + this.ContextMenuItemPlaybackWithSilverlightMonitoring.Size = new System.Drawing.Size(360, 22); this.ContextMenuItemPlaybackWithSilverlightMonitoring.Text = "with Silverlight Monitoring Player"; this.ContextMenuItemPlaybackWithSilverlightMonitoring.Click += new System.EventHandler(this.withSilverlightMontoringPlayerToolStripMenuItem_Click); // + // withSilverlightPlayReadyTokenPlayerToolStripMenuItem + // + this.withSilverlightPlayReadyTokenPlayerToolStripMenuItem.Name = "withSilverlightPlayReadyTokenPlayerToolStripMenuItem"; + this.withSilverlightPlayReadyTokenPlayerToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.S))); + this.withSilverlightPlayReadyTokenPlayerToolStripMenuItem.Size = new System.Drawing.Size(356, 22); + this.withSilverlightPlayReadyTokenPlayerToolStripMenuItem.Text = "with Silverlight PlayReady (Token) Player"; + this.withSilverlightPlayReadyTokenPlayerToolStripMenuItem.Click += new System.EventHandler(this.withSilverlightPlayReadyTokenPlayerToolStripMenuItem_Click); + // // ContextMenuItemPlaybackWithMPEGDASHIFReference // this.ContextMenuItemPlaybackWithMPEGDASHIFReference.Name = "ContextMenuItemPlaybackWithMPEGDASHIFReference"; this.ContextMenuItemPlaybackWithMPEGDASHIFReference.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.D))); - this.ContextMenuItemPlaybackWithMPEGDASHIFReference.Size = new System.Drawing.Size(308, 22); + this.ContextMenuItemPlaybackWithMPEGDASHIFReference.Size = new System.Drawing.Size(360, 22); this.ContextMenuItemPlaybackWithMPEGDASHIFReference.Text = "with MPEG-DASH IF Reference Player"; this.ContextMenuItemPlaybackWithMPEGDASHIFReference.Click += new System.EventHandler(this.withMPEGDASHIFReferencePlayerToolStripMenuItem_Click); // @@ -806,7 +832,7 @@ private void InitializeComponent() // this.ContextMenuItemPlaybackWithMPEGDASHAzure.Name = "ContextMenuItemPlaybackWithMPEGDASHAzure"; this.ContextMenuItemPlaybackWithMPEGDASHAzure.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.A))); - this.ContextMenuItemPlaybackWithMPEGDASHAzure.Size = new System.Drawing.Size(308, 22); + this.ContextMenuItemPlaybackWithMPEGDASHAzure.Size = new System.Drawing.Size(360, 22); this.ContextMenuItemPlaybackWithMPEGDASHAzure.Text = "with MPEG-DASH Azure Player"; this.ContextMenuItemPlaybackWithMPEGDASHAzure.Click += new System.EventHandler(this.withMPEGDASHAzurePlayerToolStripMenuItem1_Click); // @@ -814,7 +840,7 @@ private void InitializeComponent() // this.withCustomPlayerToolStripMenuItem1.Name = "withCustomPlayerToolStripMenuItem1"; this.withCustomPlayerToolStripMenuItem1.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.C))); - this.withCustomPlayerToolStripMenuItem1.Size = new System.Drawing.Size(308, 22); + this.withCustomPlayerToolStripMenuItem1.Size = new System.Drawing.Size(360, 22); this.withCustomPlayerToolStripMenuItem1.Text = "with Custom Player"; this.withCustomPlayerToolStripMenuItem1.Click += new System.EventHandler(this.withCustomPlayerToolStripMenuItem1_Click); // @@ -1110,10 +1136,10 @@ private void InitializeComponent() this.encodeAssetsWithAzureMediaEncoderToolStripMenuItem2.Text = "Encode asset(s) with Media Encoder (advanced mode with custom preset)..."; this.encodeAssetsWithAzureMediaEncoderToolStripMenuItem2.Click += new System.EventHandler(this.encodeAssetsWithAzureMediaEncoderToolStripMenuItem2_Click); // - // encodeAssetWithAMEPremiumWorkflowToolStripMenuItem + // encodeAssetWithZeniumToolStripMenuItem // - this.encodeAssetWithZeniumToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("encodeAssetWithAMEPremiumWorkflowToolStripMenuItem.Image"))); - this.encodeAssetWithZeniumToolStripMenuItem.Name = "encodeAssetWithAMEPremiumWorkflowToolStripMenuItem"; + this.encodeAssetWithZeniumToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("encodeAssetWithZeniumToolStripMenuItem.Image"))); + this.encodeAssetWithZeniumToolStripMenuItem.Name = "encodeAssetWithZeniumToolStripMenuItem"; this.encodeAssetWithZeniumToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.K))); this.encodeAssetWithZeniumToolStripMenuItem.Size = new System.Drawing.Size(544, 22); this.encodeAssetWithZeniumToolStripMenuItem.Text = "Encode asset(s) with Imagine Communications Zenium..."; @@ -1449,7 +1475,9 @@ private void InitializeComponent() // this.playbackToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.withFlashOSMFToolStripMenuItem, + this.withFlashAESTokenPlayerToolStripMenuItem1, this.withSilverlightMMPPFToolStripMenuItem, + this.withSilverlightPlayReadyTokenPlayerToolStripMenuItem2, this.withMPEGDASHIFRefPlayerToolStripMenuItem, this.withMPEGDASHAzurePlayerToolStripMenuItem, this.withDASHLiveAzurePlayerToolStripMenuItem1, @@ -1464,24 +1492,42 @@ private void InitializeComponent() // this.withFlashOSMFToolStripMenuItem.Name = "withFlashOSMFToolStripMenuItem"; this.withFlashOSMFToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F))); - this.withFlashOSMFToolStripMenuItem.Size = new System.Drawing.Size(308, 22); + this.withFlashOSMFToolStripMenuItem.Size = new System.Drawing.Size(348, 22); this.withFlashOSMFToolStripMenuItem.Text = "with Flash OSMF Azure Player"; this.withFlashOSMFToolStripMenuItem.DropDownOpening += new System.EventHandler(this.withFlashOSMFToolStripMenuItem_DropDownOpening); this.withFlashOSMFToolStripMenuItem.Click += new System.EventHandler(this.withFlashOSMFToolStripMenuItem_Click); // + // withFlashAESTokenPlayerToolStripMenuItem1 + // + this.withFlashAESTokenPlayerToolStripMenuItem1.Name = "withFlashAESTokenPlayerToolStripMenuItem1"; + this.withFlashAESTokenPlayerToolStripMenuItem1.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.F))); + this.withFlashAESTokenPlayerToolStripMenuItem1.Size = new System.Drawing.Size(348, 22); + this.withFlashAESTokenPlayerToolStripMenuItem1.Text = "with Flash AES Token Player"; + this.withFlashAESTokenPlayerToolStripMenuItem1.Click += new System.EventHandler(this.withFlashAESTokenPlayerToolStripMenuItem1_Click); + // // withSilverlightMMPPFToolStripMenuItem // this.withSilverlightMMPPFToolStripMenuItem.Name = "withSilverlightMMPPFToolStripMenuItem"; this.withSilverlightMMPPFToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.S))); - this.withSilverlightMMPPFToolStripMenuItem.Size = new System.Drawing.Size(308, 22); + this.withSilverlightMMPPFToolStripMenuItem.Size = new System.Drawing.Size(348, 22); this.withSilverlightMMPPFToolStripMenuItem.Text = "with Silverlight Monitoring Player"; this.withSilverlightMMPPFToolStripMenuItem.Click += new System.EventHandler(this.withSilverlightMMPPFToolStripMenuItem_Click); // + // withSilverlightPlayReadyTokenPlayerToolStripMenuItem2 + // + this.withSilverlightPlayReadyTokenPlayerToolStripMenuItem2.Name = "withSilverlightPlayReadyTokenPlayerToolStripMenuItem2"; + this.withSilverlightPlayReadyTokenPlayerToolStripMenuItem2.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.S))); + this.withSilverlightPlayReadyTokenPlayerToolStripMenuItem2.Size = new System.Drawing.Size(348, 22); + this.withSilverlightPlayReadyTokenPlayerToolStripMenuItem2.Text = "with Silverlight PlayReady Token Player"; + this.withSilverlightPlayReadyTokenPlayerToolStripMenuItem2.Click += new System.EventHandler(this.withSilverlightPlayReadyTokenPlayerToolStripMenuItem2_Click); + // // withMPEGDASHIFRefPlayerToolStripMenuItem // this.withMPEGDASHIFRefPlayerToolStripMenuItem.Name = "withMPEGDASHIFRefPlayerToolStripMenuItem"; this.withMPEGDASHIFRefPlayerToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.D))); - this.withMPEGDASHIFRefPlayerToolStripMenuItem.Size = new System.Drawing.Size(308, 22); + this.withMPEGDASHIFRefPlayerToolStripMenuItem.Size = new System.Drawing.Size(348, 22); this.withMPEGDASHIFRefPlayerToolStripMenuItem.Text = "with MPEG-DASH IF Reference Player"; this.withMPEGDASHIFRefPlayerToolStripMenuItem.Click += new System.EventHandler(this.withMPEGDASHIFRefPlayerToolStripMenuItem_Click); // @@ -1489,7 +1535,7 @@ private void InitializeComponent() // this.withMPEGDASHAzurePlayerToolStripMenuItem.Name = "withMPEGDASHAzurePlayerToolStripMenuItem"; this.withMPEGDASHAzurePlayerToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.A))); - this.withMPEGDASHAzurePlayerToolStripMenuItem.Size = new System.Drawing.Size(308, 22); + this.withMPEGDASHAzurePlayerToolStripMenuItem.Size = new System.Drawing.Size(348, 22); this.withMPEGDASHAzurePlayerToolStripMenuItem.Text = "with MPEG-DASH Azure Player"; this.withMPEGDASHAzurePlayerToolStripMenuItem.Click += new System.EventHandler(this.withMPEGDASHAzurePlayerToolStripMenuItem_Click); // @@ -1497,7 +1543,7 @@ private void InitializeComponent() // this.withDASHLiveAzurePlayerToolStripMenuItem1.Name = "withDASHLiveAzurePlayerToolStripMenuItem1"; this.withDASHLiveAzurePlayerToolStripMenuItem1.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.L))); - this.withDASHLiveAzurePlayerToolStripMenuItem1.Size = new System.Drawing.Size(308, 22); + this.withDASHLiveAzurePlayerToolStripMenuItem1.Size = new System.Drawing.Size(348, 22); this.withDASHLiveAzurePlayerToolStripMenuItem1.Text = "with DASH Live Azure Player"; this.withDASHLiveAzurePlayerToolStripMenuItem1.Click += new System.EventHandler(this.withDASHLiveAzurePlayerToolStripMenuItem1_Click_1); // @@ -1505,7 +1551,7 @@ private void InitializeComponent() // this.withCustomPlayerToolStripMenuItem.Name = "withCustomPlayerToolStripMenuItem"; this.withCustomPlayerToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.C))); - this.withCustomPlayerToolStripMenuItem.Size = new System.Drawing.Size(308, 22); + this.withCustomPlayerToolStripMenuItem.Size = new System.Drawing.Size(348, 22); this.withCustomPlayerToolStripMenuItem.Text = "with Custom Player"; this.withCustomPlayerToolStripMenuItem.Click += new System.EventHandler(this.withCustomPlayerToolStripMenuItem_Click); // @@ -1830,6 +1876,7 @@ private void InitializeComponent() this.azureMediaServicesPlayerPageToolStripMenuItem, this.silverlightMonitoringPlayerToolStripMenuItem, this.silverlightSmoothStreamingPlayReadyTokenPlayerToolStripMenuItem, + this.flashSmoothStreamingAESTokenPlayerToolStripMenuItem, this.dASHIFHTML5ReferencePlayerToolStripMenuItem, this.dASHLivePlayerToolStripMenuItem, this.hTML5VideoElementToolStripMenuItem, @@ -1877,6 +1924,14 @@ private void InitializeComponent() this.silverlightSmoothStreamingPlayReadyTokenPlayerToolStripMenuItem.Text = "Silverlight Smooth Streaming PlayReady Token Player"; this.silverlightSmoothStreamingPlayReadyTokenPlayerToolStripMenuItem.Click += new System.EventHandler(this.silverlightSmoothStreamingPlayReadyTokenPlayerToolStripMenuItem_Click); // + // flashSmoothStreamingAESTokenPlayerToolStripMenuItem + // + this.flashSmoothStreamingAESTokenPlayerToolStripMenuItem.Image = global::AMSExplorer.Bitmaps.external_link; + this.flashSmoothStreamingAESTokenPlayerToolStripMenuItem.Name = "flashSmoothStreamingAESTokenPlayerToolStripMenuItem"; + this.flashSmoothStreamingAESTokenPlayerToolStripMenuItem.Size = new System.Drawing.Size(360, 22); + this.flashSmoothStreamingAESTokenPlayerToolStripMenuItem.Text = "Flash Smooth Streaming AES Token Player"; + this.flashSmoothStreamingAESTokenPlayerToolStripMenuItem.Click += new System.EventHandler(this.flashSmoothStreamingAESTokenPlayerToolStripMenuItem_Click); + // // dASHIFHTML5ReferencePlayerToolStripMenuItem // this.dASHIFHTML5ReferencePlayerToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("dASHIFHTML5ReferencePlayerToolStripMenuItem.Image"))); @@ -2258,7 +2313,6 @@ private void InitializeComponent() this.tabControlMain.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.tabControlMain.ContextMenuStrip = this.contextMenuStripProcessors; this.tabControlMain.Controls.Add(this.tabPageAssets); this.tabControlMain.Controls.Add(this.tabPageTransfers); this.tabControlMain.Controls.Add(this.tabPageJobs); @@ -2273,21 +2327,6 @@ private void InitializeComponent() this.tabControlMain.TabIndex = 28; this.tabControlMain.Selected += new System.Windows.Forms.TabControlEventHandler(this.tabControlMain_Selected); // - // contextMenuStripProcessors - // - this.contextMenuStripProcessors.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.refreshToolStripMenuItem6}); - this.contextMenuStripProcessors.Name = "contextMenuStripStreamingEndpoints"; - this.contextMenuStripProcessors.Size = new System.Drawing.Size(114, 26); - // - // refreshToolStripMenuItem6 - // - this.refreshToolStripMenuItem6.Image = global::AMSExplorer.Bitmaps.refresh; - this.refreshToolStripMenuItem6.Name = "refreshToolStripMenuItem6"; - this.refreshToolStripMenuItem6.Size = new System.Drawing.Size(113, 22); - this.refreshToolStripMenuItem6.Text = "Refresh"; - this.refreshToolStripMenuItem6.Click += new System.EventHandler(this.refreshToolStripMenuItem6_Click); - // // tabPageAssets // this.tabPageAssets.BackColor = System.Drawing.SystemColors.Window; @@ -2384,32 +2423,6 @@ private void InitializeComponent() this.textBoxAssetSearch.Size = new System.Drawing.Size(115, 20); this.textBoxAssetSearch.TabIndex = 37; // - // dataGridViewAssetsV - // - this.dataGridViewAssetsV.AllowUserToAddRows = false; - this.dataGridViewAssetsV.AllowUserToDeleteRows = false; - this.dataGridViewAssetsV.AllowUserToResizeRows = false; - this.dataGridViewAssetsV.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.dataGridViewAssetsV.AssetsPerPage = 50; - this.dataGridViewAssetsV.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dataGridViewAssetsV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewAssetsV.ContextMenuStrip = this.contextMenuStripAssets; - this.dataGridViewAssetsV.Location = new System.Drawing.Point(6, 6); - this.dataGridViewAssetsV.Name = "dataGridViewAssetsV"; - this.dataGridViewAssetsV.OrderAssetsInGrid = "Last modified"; - this.dataGridViewAssetsV.ReadOnly = true; - this.dataGridViewAssetsV.RowHeadersVisible = false; - this.dataGridViewAssetsV.SearchInName = ""; - this.dataGridViewAssetsV.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridViewAssetsV.Size = new System.Drawing.Size(994, 403); - this.dataGridViewAssetsV.StateFilter = ""; - this.dataGridViewAssetsV.TabIndex = 30; - this.dataGridViewAssetsV.TimeFilter = "Last week"; - this.dataGridViewAssetsV.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewAssetsV_CellDoubleClick_1); - this.dataGridViewAssetsV.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dataGridViewAssetsV_CellFormatting_1); - // // tabPageTransfers // this.tabPageTransfers.BackColor = System.Drawing.SystemColors.Window; @@ -2517,32 +2530,6 @@ private void InitializeComponent() this.comboBoxStateJobs.TabIndex = 32; this.comboBoxStateJobs.SelectedIndexChanged += new System.EventHandler(this.comboBoxStateJobs_SelectedIndexChanged); // - // dataGridViewJobsV - // - this.dataGridViewJobsV.AllowUserToAddRows = false; - this.dataGridViewJobsV.AllowUserToDeleteRows = false; - this.dataGridViewJobsV.AllowUserToResizeRows = false; - this.dataGridViewJobsV.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.dataGridViewJobsV.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dataGridViewJobsV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewJobsV.ContextMenuStrip = this.contextMenuStripJobs; - this.dataGridViewJobsV.FilterJobsState = "All"; - this.dataGridViewJobsV.JobssPerPage = 50; - this.dataGridViewJobsV.Location = new System.Drawing.Point(6, 6); - this.dataGridViewJobsV.Name = "dataGridViewJobsV"; - this.dataGridViewJobsV.OrderJobsInGrid = "Last modified"; - this.dataGridViewJobsV.ReadOnly = true; - this.dataGridViewJobsV.RowHeadersVisible = false; - this.dataGridViewJobsV.SearchInName = null; - this.dataGridViewJobsV.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridViewJobsV.Size = new System.Drawing.Size(994, 403); - this.dataGridViewJobsV.TabIndex = 31; - this.dataGridViewJobsV.TimeFilter = "Last week"; - this.dataGridViewJobsV.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewJobsV_CellDoubleClick); - this.dataGridViewJobsV.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dataGridViewJobsV_CellFormatting); - // // tabPageLive // this.tabPageLive.Controls.Add(this.splitContainerLive); @@ -2597,33 +2584,6 @@ private void InitializeComponent() this.label13.TabIndex = 31; this.label13.Text = "Channels"; // - // dataGridViewChannelsV - // - this.dataGridViewChannelsV.AllowUserToAddRows = false; - this.dataGridViewChannelsV.AllowUserToDeleteRows = false; - this.dataGridViewChannelsV.AllowUserToResizeRows = false; - this.dataGridViewChannelsV.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.dataGridViewChannelsV.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dataGridViewChannelsV.ChannelsPerPage = 50; - this.dataGridViewChannelsV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewChannelsV.ContextMenuStrip = this.contextMenuStripChannels; - this.dataGridViewChannelsV.FilterJobsState = "All"; - this.dataGridViewChannelsV.Location = new System.Drawing.Point(6, 28); - this.dataGridViewChannelsV.Name = "dataGridViewChannelsV"; - this.dataGridViewChannelsV.OrderJobsInGrid = "Last modified"; - this.dataGridViewChannelsV.ReadOnly = true; - this.dataGridViewChannelsV.RowHeadersVisible = false; - this.dataGridViewChannelsV.SearchInName = ""; - this.dataGridViewChannelsV.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridViewChannelsV.Size = new System.Drawing.Size(994, 207); - this.dataGridViewChannelsV.TabIndex = 30; - this.dataGridViewChannelsV.TimeFilter = "Last week"; - this.dataGridViewChannelsV.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewLiveV_CellDoubleClick); - this.dataGridViewChannelsV.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dataGridViewLiveV_CellFormatting); - this.dataGridViewChannelsV.SelectionChanged += new System.EventHandler(this.dataGridViewLiveV_SelectionChanged); - // // contextMenuStripChannels // this.contextMenuStripChannels.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -2868,33 +2828,6 @@ private void InitializeComponent() this.label14.TabIndex = 32; this.label14.Text = "Programs"; // - // dataGridViewProgramsV - // - this.dataGridViewProgramsV.AllowUserToAddRows = false; - this.dataGridViewProgramsV.AllowUserToDeleteRows = false; - this.dataGridViewProgramsV.AllowUserToResizeRows = false; - this.dataGridViewProgramsV.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.dataGridViewProgramsV.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dataGridViewProgramsV.ChannelSourceIDs = ((System.Collections.Generic.List)(resources.GetObject("dataGridViewProgramsV.ChannelSourceIDs"))); - this.dataGridViewProgramsV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewProgramsV.ContextMenuStrip = this.contextMenuStripPrograms; - this.dataGridViewProgramsV.FilterState = "All"; - this.dataGridViewProgramsV.ItemsPerPage = 50; - this.dataGridViewProgramsV.Location = new System.Drawing.Point(6, 25); - this.dataGridViewProgramsV.Name = "dataGridViewProgramsV"; - this.dataGridViewProgramsV.OrderItemsInGrid = "Last modified"; - this.dataGridViewProgramsV.ReadOnly = true; - this.dataGridViewProgramsV.RowHeadersVisible = false; - this.dataGridViewProgramsV.SearchInName = ""; - this.dataGridViewProgramsV.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridViewProgramsV.Size = new System.Drawing.Size(994, 143); - this.dataGridViewProgramsV.TabIndex = 31; - this.dataGridViewProgramsV.TimeFilter = "Last week"; - this.dataGridViewProgramsV.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewProgramV_CellDoubleClick); - this.dataGridViewProgramsV.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dataGridViewProgramV_CellFormatting); - // // contextMenuStripPrograms // this.contextMenuStripPrograms.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -3062,7 +2995,9 @@ private void InitializeComponent() this.ContextMenuItemProgramPlaybackWithFlashOSMFAzure, this.ContextMenuItemProgramPlaybackWithSilverlightMontoring, this.withDASHLiveAzurePlayerToolStripMenuItem, - this.withCustomPlayerToolStripMenuItem2}); + this.withCustomPlayerToolStripMenuItem2, + this.withFlashAESTokenPlayerToolStripMenuItem, + this.withSilverlightPlayReadyTokenPlayerToolStripMenuItem1}); this.ContextMenuItemProgramPlayback.Image = ((System.Drawing.Image)(resources.GetObject("ContextMenuItemProgramPlayback.Image"))); this.ContextMenuItemProgramPlayback.Name = "ContextMenuItemProgramPlayback"; this.ContextMenuItemProgramPlayback.Size = new System.Drawing.Size(262, 22); @@ -3071,31 +3006,45 @@ private void InitializeComponent() // ContextMenuItemProgramPlaybackWithFlashOSMFAzure // this.ContextMenuItemProgramPlaybackWithFlashOSMFAzure.Name = "ContextMenuItemProgramPlaybackWithFlashOSMFAzure"; - this.ContextMenuItemProgramPlaybackWithFlashOSMFAzure.Size = new System.Drawing.Size(250, 22); + this.ContextMenuItemProgramPlaybackWithFlashOSMFAzure.Size = new System.Drawing.Size(288, 22); this.ContextMenuItemProgramPlaybackWithFlashOSMFAzure.Text = "with Flash OSMF Azure Player"; this.ContextMenuItemProgramPlaybackWithFlashOSMFAzure.Click += new System.EventHandler(this.withFlashOSMFAzurePlayerToolStripMenuItem_Click_1); // // ContextMenuItemProgramPlaybackWithSilverlightMontoring // this.ContextMenuItemProgramPlaybackWithSilverlightMontoring.Name = "ContextMenuItemProgramPlaybackWithSilverlightMontoring"; - this.ContextMenuItemProgramPlaybackWithSilverlightMontoring.Size = new System.Drawing.Size(250, 22); + this.ContextMenuItemProgramPlaybackWithSilverlightMontoring.Size = new System.Drawing.Size(288, 22); this.ContextMenuItemProgramPlaybackWithSilverlightMontoring.Text = "with Silverlight Monitoring Player"; this.ContextMenuItemProgramPlaybackWithSilverlightMontoring.Click += new System.EventHandler(this.withSilverlightMontoringPlayerToolStripMenuItem_Click_1); // // withDASHLiveAzurePlayerToolStripMenuItem // this.withDASHLiveAzurePlayerToolStripMenuItem.Name = "withDASHLiveAzurePlayerToolStripMenuItem"; - this.withDASHLiveAzurePlayerToolStripMenuItem.Size = new System.Drawing.Size(250, 22); + this.withDASHLiveAzurePlayerToolStripMenuItem.Size = new System.Drawing.Size(288, 22); this.withDASHLiveAzurePlayerToolStripMenuItem.Text = "with DASH Live Azure Player"; this.withDASHLiveAzurePlayerToolStripMenuItem.Click += new System.EventHandler(this.withDASHLiveAzurePlayerToolStripMenuItem_Click); // // withCustomPlayerToolStripMenuItem2 // this.withCustomPlayerToolStripMenuItem2.Name = "withCustomPlayerToolStripMenuItem2"; - this.withCustomPlayerToolStripMenuItem2.Size = new System.Drawing.Size(250, 22); + this.withCustomPlayerToolStripMenuItem2.Size = new System.Drawing.Size(288, 22); this.withCustomPlayerToolStripMenuItem2.Text = "with Custom Player"; this.withCustomPlayerToolStripMenuItem2.Click += new System.EventHandler(this.withCustomPlayerToolStripMenuItem2_Click); // + // withFlashAESTokenPlayerToolStripMenuItem + // + this.withFlashAESTokenPlayerToolStripMenuItem.Name = "withFlashAESTokenPlayerToolStripMenuItem"; + this.withFlashAESTokenPlayerToolStripMenuItem.Size = new System.Drawing.Size(288, 22); + this.withFlashAESTokenPlayerToolStripMenuItem.Text = "with Flash AES (Token) Player"; + this.withFlashAESTokenPlayerToolStripMenuItem.Click += new System.EventHandler(this.withFlashAESTokenPlayerToolStripMenuItem_Click); + // + // withSilverlightPlayReadyTokenPlayerToolStripMenuItem1 + // + this.withSilverlightPlayReadyTokenPlayerToolStripMenuItem1.Name = "withSilverlightPlayReadyTokenPlayerToolStripMenuItem1"; + this.withSilverlightPlayReadyTokenPlayerToolStripMenuItem1.Size = new System.Drawing.Size(288, 22); + this.withSilverlightPlayReadyTokenPlayerToolStripMenuItem1.Text = "with Silverlight PlayReady (Token) Player"; + this.withSilverlightPlayReadyTokenPlayerToolStripMenuItem1.Click += new System.EventHandler(this.withSilverlightPlayReadyTokenPlayerToolStripMenuItem1_Click); + // // tabPageProcessors // this.tabPageProcessors.BackColor = System.Drawing.SystemColors.Window; @@ -3117,6 +3066,7 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.dataGridViewProcessors.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dataGridViewProcessors.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewProcessors.ContextMenuStrip = this.contextMenuStripProcessors; this.dataGridViewProcessors.Location = new System.Drawing.Point(5, 6); this.dataGridViewProcessors.Name = "dataGridViewProcessors"; this.dataGridViewProcessors.ReadOnly = true; @@ -3125,6 +3075,21 @@ private void InitializeComponent() this.dataGridViewProcessors.Size = new System.Drawing.Size(997, 431); this.dataGridViewProcessors.TabIndex = 33; // + // contextMenuStripProcessors + // + this.contextMenuStripProcessors.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.refreshToolStripMenuItem6}); + this.contextMenuStripProcessors.Name = "contextMenuStripStreamingEndpoints"; + this.contextMenuStripProcessors.Size = new System.Drawing.Size(114, 26); + // + // refreshToolStripMenuItem6 + // + this.refreshToolStripMenuItem6.Image = global::AMSExplorer.Bitmaps.refresh; + this.refreshToolStripMenuItem6.Name = "refreshToolStripMenuItem6"; + this.refreshToolStripMenuItem6.Size = new System.Drawing.Size(113, 22); + this.refreshToolStripMenuItem6.Text = "Refresh"; + this.refreshToolStripMenuItem6.Click += new System.EventHandler(this.refreshToolStripMenuItem6_Click); + // // tabPageOrigins // this.tabPageOrigins.Controls.Add(this.label19); @@ -3159,32 +3124,6 @@ private void InitializeComponent() this.comboBoxOrderStreamingEndpoints.TabIndex = 15; this.comboBoxOrderStreamingEndpoints.SelectedIndexChanged += new System.EventHandler(this.comboBoxOrderStreamingEndpoints_SelectedIndexChanged); // - // dataGridViewStreamingEndpointsV - // - this.dataGridViewStreamingEndpointsV.AllowUserToAddRows = false; - this.dataGridViewStreamingEndpointsV.AllowUserToDeleteRows = false; - this.dataGridViewStreamingEndpointsV.AllowUserToResizeRows = false; - this.dataGridViewStreamingEndpointsV.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.dataGridViewStreamingEndpointsV.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dataGridViewStreamingEndpointsV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewStreamingEndpointsV.ContextMenuStrip = this.contextMenuStripStreaminEndpoints; - this.dataGridViewStreamingEndpointsV.FilterStreamingEndpointsState = "All"; - this.dataGridViewStreamingEndpointsV.ItemsPerPage = 50; - this.dataGridViewStreamingEndpointsV.Location = new System.Drawing.Point(6, 6); - this.dataGridViewStreamingEndpointsV.Name = "dataGridViewStreamingEndpointsV"; - this.dataGridViewStreamingEndpointsV.OrderStreamingEndpointsInGrid = "Last modified"; - this.dataGridViewStreamingEndpointsV.ReadOnly = true; - this.dataGridViewStreamingEndpointsV.RowHeadersVisible = false; - this.dataGridViewStreamingEndpointsV.SearchInName = ""; - this.dataGridViewStreamingEndpointsV.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridViewStreamingEndpointsV.Size = new System.Drawing.Size(994, 403); - this.dataGridViewStreamingEndpointsV.TabIndex = 0; - this.dataGridViewStreamingEndpointsV.TimeFilter = "Last week"; - this.dataGridViewStreamingEndpointsV.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewOriginsV_CellDoubleClick); - this.dataGridViewStreamingEndpointsV.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dataGridViewOriginsV_CellFormatting); - // // contextMenuStripStreaminEndpoints // this.contextMenuStripStreaminEndpoints.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -3258,7 +3197,6 @@ private void InitializeComponent() this.tabPageChart.Controls.Add(this.dateTimePickerEndDate); this.tabPageChart.Controls.Add(this.label20); this.tabPageChart.Controls.Add(this.dateTimePickerStartDate); - this.tabPageChart.Controls.Add(this.progressBarChart); this.tabPageChart.Controls.Add(this.chart); this.tabPageChart.Controls.Add(this.buttonbuildchart); this.tabPageChart.Location = new System.Drawing.Point(4, 22); @@ -3301,22 +3239,15 @@ private void InitializeComponent() this.dateTimePickerStartDate.Size = new System.Drawing.Size(200, 20); this.dateTimePickerStartDate.TabIndex = 39; // - // progressBarChart - // - this.progressBarChart.Location = new System.Drawing.Point(623, 4); - this.progressBarChart.Name = "progressBarChart"; - this.progressBarChart.Size = new System.Drawing.Size(158, 23); - this.progressBarChart.TabIndex = 38; - // // chart // this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - chartArea1.Name = "ChartArea1"; - this.chart.ChartAreas.Add(chartArea1); - legend1.Name = "Legend1"; - this.chart.Legends.Add(legend1); + chartArea2.Name = "ChartArea1"; + this.chart.ChartAreas.Add(chartArea2); + legend2.Name = "Legend1"; + this.chart.Legends.Add(legend2); this.chart.Location = new System.Drawing.Point(5, 33); this.chart.Name = "chart"; this.chart.Size = new System.Drawing.Size(997, 404); @@ -3418,6 +3349,141 @@ private void InitializeComponent() this.buttonRefresh.UseVisualStyleBackColor = true; this.buttonRefresh.Click += new System.EventHandler(this.buttonRefresh_Click); // + // dataGridViewAssetsV + // + this.dataGridViewAssetsV.AllowDrop = true; + this.dataGridViewAssetsV.AllowUserToAddRows = false; + this.dataGridViewAssetsV.AllowUserToDeleteRows = false; + this.dataGridViewAssetsV.AllowUserToResizeRows = false; + this.dataGridViewAssetsV.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.dataGridViewAssetsV.AssetsPerPage = 50; + this.dataGridViewAssetsV.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewAssetsV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewAssetsV.ContextMenuStrip = this.contextMenuStripAssets; + this.dataGridViewAssetsV.Location = new System.Drawing.Point(6, 6); + this.dataGridViewAssetsV.Name = "dataGridViewAssetsV"; + this.dataGridViewAssetsV.OrderAssetsInGrid = "Last modified"; + this.dataGridViewAssetsV.ReadOnly = true; + this.dataGridViewAssetsV.RowHeadersVisible = false; + this.dataGridViewAssetsV.SearchInName = ""; + this.dataGridViewAssetsV.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridViewAssetsV.Size = new System.Drawing.Size(994, 403); + this.dataGridViewAssetsV.StateFilter = ""; + this.dataGridViewAssetsV.TabIndex = 30; + this.dataGridViewAssetsV.TimeFilter = "Last week"; + this.dataGridViewAssetsV.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewAssetsV_CellDoubleClick_1); + this.dataGridViewAssetsV.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dataGridViewAssetsV_CellFormatting_1); + this.dataGridViewAssetsV.DragDrop += new System.Windows.Forms.DragEventHandler(this.dataGridViewAssetsV_DragDrop); + this.dataGridViewAssetsV.DragEnter += new System.Windows.Forms.DragEventHandler(this.dataGridViewAssetsV_DragEnter); + // + // dataGridViewJobsV + // + this.dataGridViewJobsV.AllowUserToAddRows = false; + this.dataGridViewJobsV.AllowUserToDeleteRows = false; + this.dataGridViewJobsV.AllowUserToResizeRows = false; + this.dataGridViewJobsV.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.dataGridViewJobsV.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewJobsV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewJobsV.ContextMenuStrip = this.contextMenuStripJobs; + this.dataGridViewJobsV.FilterJobsState = "All"; + this.dataGridViewJobsV.JobssPerPage = 50; + this.dataGridViewJobsV.Location = new System.Drawing.Point(6, 6); + this.dataGridViewJobsV.Name = "dataGridViewJobsV"; + this.dataGridViewJobsV.OrderJobsInGrid = "Last modified"; + this.dataGridViewJobsV.ReadOnly = true; + this.dataGridViewJobsV.RowHeadersVisible = false; + this.dataGridViewJobsV.SearchInName = null; + this.dataGridViewJobsV.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridViewJobsV.Size = new System.Drawing.Size(994, 403); + this.dataGridViewJobsV.TabIndex = 31; + this.dataGridViewJobsV.TimeFilter = "Last week"; + this.dataGridViewJobsV.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewJobsV_CellDoubleClick); + this.dataGridViewJobsV.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dataGridViewJobsV_CellFormatting); + // + // dataGridViewChannelsV + // + this.dataGridViewChannelsV.AllowUserToAddRows = false; + this.dataGridViewChannelsV.AllowUserToDeleteRows = false; + this.dataGridViewChannelsV.AllowUserToResizeRows = false; + this.dataGridViewChannelsV.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.dataGridViewChannelsV.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewChannelsV.ChannelsPerPage = 50; + this.dataGridViewChannelsV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewChannelsV.ContextMenuStrip = this.contextMenuStripChannels; + this.dataGridViewChannelsV.FilterJobsState = "All"; + this.dataGridViewChannelsV.Location = new System.Drawing.Point(6, 28); + this.dataGridViewChannelsV.Name = "dataGridViewChannelsV"; + this.dataGridViewChannelsV.OrderJobsInGrid = "Last modified"; + this.dataGridViewChannelsV.ReadOnly = true; + this.dataGridViewChannelsV.RowHeadersVisible = false; + this.dataGridViewChannelsV.SearchInName = ""; + this.dataGridViewChannelsV.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridViewChannelsV.Size = new System.Drawing.Size(994, 207); + this.dataGridViewChannelsV.TabIndex = 30; + this.dataGridViewChannelsV.TimeFilter = "Last week"; + this.dataGridViewChannelsV.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewLiveV_CellDoubleClick); + this.dataGridViewChannelsV.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dataGridViewLiveV_CellFormatting); + this.dataGridViewChannelsV.SelectionChanged += new System.EventHandler(this.dataGridViewLiveV_SelectionChanged); + // + // dataGridViewProgramsV + // + this.dataGridViewProgramsV.AllowUserToAddRows = false; + this.dataGridViewProgramsV.AllowUserToDeleteRows = false; + this.dataGridViewProgramsV.AllowUserToResizeRows = false; + this.dataGridViewProgramsV.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.dataGridViewProgramsV.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewProgramsV.ChannelSourceIDs = ((System.Collections.Generic.List)(resources.GetObject("dataGridViewProgramsV.ChannelSourceIDs"))); + this.dataGridViewProgramsV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewProgramsV.ContextMenuStrip = this.contextMenuStripPrograms; + this.dataGridViewProgramsV.FilterState = "All"; + this.dataGridViewProgramsV.ItemsPerPage = 50; + this.dataGridViewProgramsV.Location = new System.Drawing.Point(6, 25); + this.dataGridViewProgramsV.Name = "dataGridViewProgramsV"; + this.dataGridViewProgramsV.OrderItemsInGrid = "Last modified"; + this.dataGridViewProgramsV.ReadOnly = true; + this.dataGridViewProgramsV.RowHeadersVisible = false; + this.dataGridViewProgramsV.SearchInName = ""; + this.dataGridViewProgramsV.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridViewProgramsV.Size = new System.Drawing.Size(994, 143); + this.dataGridViewProgramsV.TabIndex = 31; + this.dataGridViewProgramsV.TimeFilter = "Last week"; + this.dataGridViewProgramsV.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewProgramV_CellDoubleClick); + this.dataGridViewProgramsV.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dataGridViewProgramV_CellFormatting); + // + // dataGridViewStreamingEndpointsV + // + this.dataGridViewStreamingEndpointsV.AllowUserToAddRows = false; + this.dataGridViewStreamingEndpointsV.AllowUserToDeleteRows = false; + this.dataGridViewStreamingEndpointsV.AllowUserToResizeRows = false; + this.dataGridViewStreamingEndpointsV.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.dataGridViewStreamingEndpointsV.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewStreamingEndpointsV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewStreamingEndpointsV.ContextMenuStrip = this.contextMenuStripStreaminEndpoints; + this.dataGridViewStreamingEndpointsV.FilterStreamingEndpointsState = "All"; + this.dataGridViewStreamingEndpointsV.ItemsPerPage = 50; + this.dataGridViewStreamingEndpointsV.Location = new System.Drawing.Point(6, 6); + this.dataGridViewStreamingEndpointsV.Name = "dataGridViewStreamingEndpointsV"; + this.dataGridViewStreamingEndpointsV.OrderStreamingEndpointsInGrid = "Last modified"; + this.dataGridViewStreamingEndpointsV.ReadOnly = true; + this.dataGridViewStreamingEndpointsV.RowHeadersVisible = false; + this.dataGridViewStreamingEndpointsV.SearchInName = ""; + this.dataGridViewStreamingEndpointsV.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridViewStreamingEndpointsV.Size = new System.Drawing.Size(994, 403); + this.dataGridViewStreamingEndpointsV.TabIndex = 0; + this.dataGridViewStreamingEndpointsV.TimeFilter = "Last week"; + this.dataGridViewStreamingEndpointsV.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewOriginsV_CellDoubleClick); + this.dataGridViewStreamingEndpointsV.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dataGridViewOriginsV_CellFormatting); + // // Mainform // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -3445,14 +3511,11 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.dataGridViewTransfer)).EndInit(); this.contextMenuStripTransfers.ResumeLayout(false); this.tabControlMain.ResumeLayout(false); - this.contextMenuStripProcessors.ResumeLayout(false); this.tabPageAssets.ResumeLayout(false); this.tabPageAssets.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewAssetsV)).EndInit(); this.tabPageTransfers.ResumeLayout(false); this.tabPageJobs.ResumeLayout(false); this.tabPageJobs.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewJobsV)).EndInit(); this.tabPageLive.ResumeLayout(false); this.splitContainerLive.Panel1.ResumeLayout(false); this.splitContainerLive.Panel1.PerformLayout(); @@ -3460,15 +3523,13 @@ private void InitializeComponent() this.splitContainerLive.Panel2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainerLive)).EndInit(); this.splitContainerLive.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewChannelsV)).EndInit(); this.contextMenuStripChannels.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewProgramsV)).EndInit(); this.contextMenuStripPrograms.ResumeLayout(false); this.tabPageProcessors.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewProcessors)).EndInit(); + this.contextMenuStripProcessors.ResumeLayout(false); this.tabPageOrigins.ResumeLayout(false); this.tabPageOrigins.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewStreamingEndpointsV)).EndInit(); this.contextMenuStripStreaminEndpoints.ResumeLayout(false); this.tabPageChart.ResumeLayout(false); this.tabPageChart.PerformLayout(); @@ -3478,6 +3539,11 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.splitContainerMain)).EndInit(); this.splitContainerMain.ResumeLayout(false); this.contextMenuStripLog.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewAssetsV)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewJobsV)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewChannelsV)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewProgramsV)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewStreamingEndpointsV)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -3626,7 +3692,6 @@ private void InitializeComponent() private System.Windows.Forms.Label label12; private System.Windows.Forms.ToolStripMenuItem refreshToolStripMenuItem; private System.Windows.Forms.TabPage tabPageChart; - private System.Windows.Forms.ProgressBar progressBarChart; private System.Windows.Forms.DataVisualization.Charting.Chart chart; private System.Windows.Forms.Button buttonbuildchart; private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem; @@ -3794,6 +3859,13 @@ private void InitializeComponent() private System.Windows.Forms.DateTimePicker dateTimePickerStartDate; private System.Windows.Forms.ToolStripMenuItem copyInputURLSSLToClipboardToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem copyInputSSLURLToClipboardToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem withFlashTokenPlayerToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem withSilverlightPlayReadyTokenPlayerToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem withFlashAESTokenPlayerToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem withSilverlightPlayReadyTokenPlayerToolStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem flashSmoothStreamingAESTokenPlayerToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem withFlashAESTokenPlayerToolStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem withSilverlightPlayReadyTokenPlayerToolStripMenuItem2; } } diff --git a/AMSExplorer/Mainform.cs b/AMSExplorer/Mainform.cs index ac532871..272ecc85 100644 --- a/AMSExplorer/Mainform.cs +++ b/AMSExplorer/Mainform.cs @@ -685,7 +685,6 @@ public void TextBoxLogWriteLine(string text, bool Error = false) { richTextBoxLog.BeginInvoke(new Action(() => { - richTextBoxLog.SelectionStart = richTextBoxLog.TextLength; richTextBoxLog.SelectionLength = 0; @@ -702,7 +701,6 @@ public void TextBoxLogWriteLine(string text, bool Error = false) richTextBoxLog.SelectionColor = Error ? Color.Red : Color.Black; richTextBoxLog.AppendText(text); richTextBoxLog.SelectionColor = richTextBoxLog.ForeColor; - } } @@ -798,38 +796,43 @@ private void DoRefreshGridJobV(bool firstime) private void fromASingleFileToolStripMenuItem_Click(object sender, EventArgs e) { - DoMenuUploadFromSingleFile(); + DoMenuUploadFromSingleFile_Step1(); } - private void DoMenuUploadFromSingleFile() + private void DoMenuUploadFromSingleFile_Step1() { OpenFileDialog openFileDialog = new OpenFileDialog(); openFileDialog.Multiselect = true; if (openFileDialog.ShowDialog() == DialogResult.OK) { - if (openFileDialog.FileNames.Count() > 1) + DoMenuUploadFromSingleFile_Step2(openFileDialog.FileNames); + } + } + + private void DoMenuUploadFromSingleFile_Step2(string[] FileNames) + { + if (FileNames.Count() > 1) + { + if (System.Windows.Forms.MessageBox.Show("You selected multiple files. Each file will be uploaded as individual asset. If you want to create asset(s) that contain(s) several files, copy the files to folder(s) and upload or drag&drop the folder(s).", "Upload as invividual assets?", System.Windows.Forms.MessageBoxButtons.OKCancel) == System.Windows.Forms.DialogResult.Cancel) + return; + } + + // Each file goes in a individual asset + foreach (String file in FileNames) + { + try { - if (System.Windows.Forms.MessageBox.Show("You selected multiple files. They will be uploaded as individual assets. If you want to create one single asset with several files, use 'Upload from a local folder' command.", "Upload as invividual assets?", System.Windows.Forms.MessageBoxButtons.OKCancel) == System.Windows.Forms.DialogResult.Cancel) - return; + int index = DoGridTransferAddItem("Upload of file '" + Path.GetFileName(file) + "'", TransferType.UploadFromFile, Properties.Settings.Default.useTransferQueue); + // Start a worker thread that does uploading. + Task.Factory.StartNew(() => ProcessUploadFile(file, index, false, null)); + DotabControlMainSwitch(Constants.TabTransfers); + DoRefreshGridAssetV(false); } - - // Each file goes in a individual asset - foreach (String file in openFileDialog.FileNames) + catch (Exception ex) { - try - { - int index = DoGridTransferAddItem("Upload of file '" + Path.GetFileName(file) + "'", TransferType.UploadFromFile, Properties.Settings.Default.useTransferQueue); - // Start a worker thread that does uploading. - Task.Factory.StartNew(() => ProcessUploadFile(file, index, false, null)); - DotabControlMainSwitch(Constants.TabTransfers); - DoRefreshGridAssetV(false); - } - catch (Exception ex) - { - TextBoxLogWriteLine("Error: Could not read file from disk.", true); - TextBoxLogWriteLine(ex); - } + TextBoxLogWriteLine("Error: Could not read file from disk.", true); + TextBoxLogWriteLine(ex); } } } @@ -1071,10 +1074,10 @@ public void DoDownloadFileFromAsset(IAsset asset, IAssetFile File, object folder private void fromMultipleFilesToolStripMenuItem_Click(object sender, EventArgs e) // upload from multiple files { - DoMenuUploadFromFolder(); + DoMenuUploadFromFolder_Step1(); } - private void DoMenuUploadFromFolder() + private void DoMenuUploadFromFolder_Step1() { FolderBrowserDialog openFolderDialog1 = new FolderBrowserDialog(); @@ -1083,28 +1086,31 @@ private void DoMenuUploadFromFolder() if (openFolderDialog1.ShowDialog() == DialogResult.OK) { - try - { - if ((name = openFolderDialog1.SelectedPath) != null) - { - _backuprootfolderupload = name; - int index = DoGridTransferAddItem(string.Format("Upload of folder '{0}'", Path.GetFileName(name)), TransferType.UploadFromFolder, Properties.Settings.Default.useTransferQueue); - - // Start a worker thread that does uploading. - Task.Factory.StartNew(() => ProcessUploadFromFolder(name, index)); - DotabControlMainSwitch(Constants.TabTransfers); - DoRefreshGridAssetV(false); + DoMenuUploadFromFolder_Step2(openFolderDialog1.SelectedPath); + } + } - } - } - catch (Exception ex) + private void DoMenuUploadFromFolder_Step2(string SelectedPath) + { + try + { + if (SelectedPath != null) { - MessageBox.Show("Error: Could not read file from disk. Original error: " + Constants.endline + ex.Message); - TextBoxLogWriteLine("Error: Could not read file from disk.", true); - TextBoxLogWriteLine(ex); + _backuprootfolderupload = SelectedPath; + int index = DoGridTransferAddItem(string.Format("Upload of folder '{0}'", Path.GetFileName(SelectedPath)), TransferType.UploadFromFolder, Properties.Settings.Default.useTransferQueue); + + // Start a worker thread that does uploading. + Task.Factory.StartNew(() => ProcessUploadFromFolder(SelectedPath, index)); + DotabControlMainSwitch(Constants.TabTransfers); + DoRefreshGridAssetV(false); } } - + catch (Exception ex) + { + MessageBox.Show("Error: Could not read file from disk. Original error: " + Constants.endline + ex.Message); + TextBoxLogWriteLine("Error: Could not read file or folder '{0}' from disk.", SelectedPath, true); + TextBoxLogWriteLine(ex); + } } @@ -1421,7 +1427,7 @@ public static DialogResult InputBox(string title, string promptText, ref string public DialogResult DisplayInfo(IAsset asset) { - AssetInformation form = new AssetInformation() + AssetInformation form = new AssetInformation(this) { MyAsset = asset, MyContext = _context, @@ -1436,36 +1442,12 @@ public DialogResult DisplayInfo(IAsset asset) public static DialogResult CopyAssetToAzure(ref bool UseDefaultStorage, ref string containername, ref string otherstoragename, ref string otherstoragekey, ref List SelectedFiles, ref bool CreateNewContainer, IAsset sourceAsset) { - ExportAssetToAzureStorage form = new ExportAssetToAzureStorage(_context, _credentials.StorageKey); - TreeView TreeViewBlob = (TreeView)form.Controls.Find("TreeViewBlob", true).FirstOrDefault(); - ListBox ListBoxFiles = (ListBox)form.Controls.Find("ListBoxFiles", true).FirstOrDefault(); - ListView listViewAssetFiles = (ListView)form.Controls.Find("listViewAssetFiles", true).FirstOrDefault(); - - form.BlobStorageDefault = UseDefaultStorage; - form.BlobLabelDefaultStorage = _context.DefaultStorageAccount.Name; - - // list asset files /////////////////////// - bool bfileinasset = (sourceAsset.AssetFiles.Count() == 0) ? false : true; - listViewAssetFiles.Items.Clear(); - if (bfileinasset) + ExportAssetToAzureStorage form = new ExportAssetToAzureStorage(_context, _credentials.StorageKey, sourceAsset) { - listViewAssetFiles.BeginUpdate(); - foreach (IAssetFile file in sourceAsset.AssetFiles) - { - ListViewItem item = new ListViewItem(file.Name, 0); - if (file.IsPrimary) item.ForeColor = Color.Blue; - item.SubItems.Add(file.LastModified.ToLocalTime().ToString()); - item.SubItems.Add(AssetInfo.FormatByteSize(file.ContentFileSize)); - (listViewAssetFiles.Items.Add(item)).Selected = true; - form.listassetfiles.Add(file); - } - - listViewAssetFiles.AutoResizeColumns(ColumnHeaderAutoResizeStyle.HeaderSize); - listViewAssetFiles.EndUpdate(); - - } - form.BlobLabelWarning = sourceAsset.Options == AssetCreationOptions.StorageEncrypted ? "Note: asset is storage encrypted" : ""; - + BlobStorageDefault = UseDefaultStorage, + BlobLabelDefaultStorage = _context.DefaultStorageAccount.Name, + BlobLabelWarning = sourceAsset.Options == AssetCreationOptions.StorageEncrypted ? "Note: asset is storage encrypted" : "" + }; DialogResult dialogResult = form.ShowDialog(); UseDefaultStorage = form.BlobStorageDefault; @@ -4600,6 +4582,8 @@ private void playbackTheAssetToolStripMenuItem_DropDownOpening(object sender, Ev ContextMenuItemPlaybackWithMPEGDASHIFReference.Enabled = CanBePlay; ContextMenuItemPlaybackWithSilverlightMonitoring.Enabled = CanBePlay; ContextMenuItemPlaybackWithFlashOSMFAzure.Enabled = CanBePlay; + withFlashTokenPlayerToolStripMenuItem.Enabled = CanBePlay; + withSilverlightPlayReadyTokenPlayerToolStripMenuItem.Enabled = CanBePlay; withCustomPlayerToolStripMenuItem1.Enabled = CanBePlay; } @@ -5003,12 +4987,9 @@ private void buttonbuildchart_Click(object sender, EventArgs e) { chart.Series.Clear(); - progressBarChart.Value = 0; - var seriesJobTotal = new Series() { Name = "Jobs total", - XValueType = ChartValueType.DateTime, ChartType = SeriesChartType.Line, MarkerStyle = MarkerStyle.Square, @@ -5057,17 +5038,13 @@ private void buttonbuildchart_Click(object sender, EventArgs e) var querycancel = jobs.Where(j => j.State == JobState.Canceled).GroupBy(j => ((DateTime)j.Created).Date).Select(j => new { number = j.Count(), date = (DateTime)j.Key }).ToList(); var querysuccess = jobs.Where(j => j.State == JobState.Finished).GroupBy(j => ((DateTime)j.Created).Date).Select(j => new { number = j.Count(), date = (DateTime)j.Key }).ToList(); - int i = 0; - progressBarChart.Minimum = 0; - progressBarChart.Maximum = querytotal.Count + queryerror.Count + querycancel.Count + querysuccess.Count; - DateTime day = dateTimePickerStartDate.Value.Date; int val; while (day <= dateTimePickerEndDate.Value.Date) { if (querytotal.Where(d => d.date == day).FirstOrDefault() == null) val = 0; else val = querytotal.Where(d => d.date == day).FirstOrDefault().number; - DrawPoint(seriesJobTotal, "in error", day, val); + DrawPoint(seriesJobTotal, "(total)", day, val); if (queryerror.Where(d => d.date == day).FirstOrDefault() == null) val = 0; else val = queryerror.Where(d => d.date == day).FirstOrDefault().number; DrawPoint(seriesError, "in error", day, val); @@ -5081,43 +5058,8 @@ private void buttonbuildchart_Click(object sender, EventArgs e) day = day.AddDays(1); } - /* - - foreach (var j in querytotal) - { - i++; - progressBarChart.Value = i; - seriesJobTotal.Points.AddXY(j.date, j.number); - } - - - foreach (var j in queryerror) - { - i++; - progressBarChart.Value = i; - seriesError.Points.AddXY(j.date, j.number); - } - - foreach (var j in querycancel) - { - i++; - progressBarChart.Value = i; - seriesCancel.Points.AddXY(j.date, j.number); - } - - foreach (var j in querysuccess) - { - i++; - progressBarChart.Value = i; - seriesSucess.Points.AddXY(j.date, j.number); - } - */ - - - // draw! chart.Invalidate(); - } private static void DrawPoint(Series seriestoprocess, string word, DateTime day, int val) @@ -5645,11 +5587,38 @@ private void resetChannelsToolStripMenuItem_Click(object sender, EventArgs e) DoResetChannels(); } - private void DoResetChannels() + private async void DoResetChannels() { - foreach (IChannel myC in ReturnSelectedChannels()) + List channels = ReturnSelectedChannels(); + List ListChannelIDs = channels.Select(c => c.Id).ToList(); + var programquery = _context.Programs.AsEnumerable().Where(p => ListChannelIDs.Contains(p.ChannelId) && p.State != ProgramState.Stopped); + var programqueryrunning = programquery.Where(p => p.State == ProgramState.Running); + + if (programquery.Where(p => p.State == ProgramState.Starting || p.State == ProgramState.Stopping).Count() > 0) // programs are starting or stopping + MessageBox.Show("Some programs are starting or stopping. Channel(s) cannot be reset now.", "Channel(s) stop", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + else { - ResetChannel(myC); + if (programqueryrunning.Count() > 0) // some programs are running + { + if (MessageBox.Show("One or several programs are running which prevents the channel(s) reset. Do you want to stop the program(s) ?", "Channel reset", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + var yourForeachTask = Task.Run(() => + { + Parallel.ForEach(programqueryrunning, myP => + { + TextBoxLogWriteLine("Stopping program '{0}'...", myP.Name); + ProgramExecuteAsync(myP.StopAsync, myP, "stopped"); + }); + }); + await yourForeachTask; + } + } + + // let's stop the channels now that running programs are stopped + foreach (IChannel myC in channels) + { + ResetChannel(myC); + } } } @@ -6093,7 +6062,7 @@ private async void DoDisplayProgramInfo(IProgram program) { if (program != null) { - ProgramInformation form = new ProgramInformation() + ProgramInformation form = new ProgramInformation(this) { MyProgram = program, MyContext = _context, @@ -6514,21 +6483,23 @@ private void withFlashOSMFAzurePlayerToolStripMenuItem_Click_1(object sender, Ev DoPlaybackProgram(PlayerType.FlashAzurePage); } - private void DoPlaybackProgram(PlayerType ptype) + private void DoPlaybackProgram(PlayerType ptype, bool tokenplayer = false) { IProgram program = ReturnSelectedPrograms().FirstOrDefault(); - if (program != null) + if (program != null && program.Asset != null) { ProgramInfo PI = new ProgramInfo(program, _context); IEnumerable ValidURIs = PI.GetValidURIs(); if (ValidURIs.FirstOrDefault() != null) { - AssetInfo.DoPlayBack(ptype, ValidURIs.FirstOrDefault().ToString()); + AssetInfo.DoPlayBack(ptype, ValidURIs.FirstOrDefault().ToString(), _context, program.Asset); + //AssetInfo.DoPlayBack(ptype, ValidURIs.FirstOrDefault().ToString() ); } else { TextBoxLogWriteLine("No valid URL exists for this program. Check the streaming endpoints.", true); } + } } @@ -7153,7 +7124,6 @@ private void withDASHLiveAzurePlayerToolStripMenuItem_Click(object sender, Event private void jwPlayerToolStripMenuItem_Click(object sender, EventArgs e) { Process.Start(@"http://www.jwplayer.com/partners/azure/"); - } private void removeDynamicEncryptionForTheAssetsToolStripMenuItem1_Click(object sender, EventArgs e) @@ -7819,6 +7789,83 @@ private void copyInputSSLURLToClipboardToolStripMenuItem_Click(object sender, Ev { DoCopySSLIngestURLToClipboard(); } + + private void dataGridViewAssetsV_DragDrop(object sender, DragEventArgs e) + { + // Handle FileDrop data. + if (e.Data.GetDataPresent(DataFormats.FileDrop)) + { + // Assign the file names to a string array, in + // case the user has selected multiple files. + string[] objects = (string[])e.Data.GetData(DataFormats.FileDrop); + + List folders = objects.Where(f => Directory.Exists(f)).ToList(); + List files = objects.Where(f => !Directory.Exists(f)).ToList(); + + foreach (var fold in folders) + DoMenuUploadFromFolder_Step2(fold); // it's a folder + + if (files.Count > 0) + DoMenuUploadFromSingleFile_Step2(files.ToArray()); // let's upload the objects as files, each file as an individual asset + } + } + + private void dataGridViewAssetsV_DragEnter(object sender, DragEventArgs e) + { + // If the data is a file display the copy cursor. + if (e.Data.GetDataPresent(DataFormats.FileDrop)) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + + } + + private void withFlashAESTokenPlayerToolStripMenuItem_Click(object sender, EventArgs e) + { + DoPlaybackProgram(PlayerType.FlashAESToken); + + } + + private void withSilverlightPlayReadyTokenPlayerToolStripMenuItem1_Click(object sender, EventArgs e) + { + DoPlaybackProgram(PlayerType.SilverlightPlayReadyToken); + + } + + private void withFlashTokenPlayerToolStripMenuItem_Click(object sender, EventArgs e) + { + if (IsAssetCanBePlayed(ReturnSelectedAssets().FirstOrDefault(), ref PlayBackLocator)) + AssetInfo.DoPlayBackWithBestStreamingEndpoint(PlayerType.FlashAESToken, PlayBackLocator.GetSmoothStreamingUri(), _context, ReturnSelectedAssets().FirstOrDefault()); + + } + + private void withSilverlightPlayReadyTokenPlayerToolStripMenuItem_Click(object sender, EventArgs e) + { + if (IsAssetCanBePlayed(ReturnSelectedAssets().FirstOrDefault(), ref PlayBackLocator)) + AssetInfo.DoPlayBackWithBestStreamingEndpoint(PlayerType.SilverlightPlayReadyToken, PlayBackLocator.GetSmoothStreamingUri(), _context, ReturnSelectedAssets().FirstOrDefault()); + } + + private void flashSmoothStreamingAESTokenPlayerToolStripMenuItem_Click(object sender, EventArgs e) + { + Process.Start(@"http://aestoken.azurewebsites.net"); + } + + private void withFlashAESTokenPlayerToolStripMenuItem1_Click(object sender, EventArgs e) + { + if (IsAssetCanBePlayed(ReturnSelectedAssetsFromProgramsOrAssets().FirstOrDefault(), ref PlayBackLocator)) + AssetInfo.DoPlayBackWithBestStreamingEndpoint(PlayerType.FlashAESToken, PlayBackLocator.GetSmoothStreamingUri(), _context, ReturnSelectedAssetsFromProgramsOrAssets().FirstOrDefault()); + } + + private void withSilverlightPlayReadyTokenPlayerToolStripMenuItem2_Click(object sender, EventArgs e) + { + if (IsAssetCanBePlayed(ReturnSelectedAssetsFromProgramsOrAssets().FirstOrDefault(), ref PlayBackLocator)) + AssetInfo.DoPlayBackWithBestStreamingEndpoint(PlayerType.SilverlightPlayReadyToken, PlayBackLocator.GetSmoothStreamingUri(), _context, ReturnSelectedAssetsFromProgramsOrAssets().FirstOrDefault()); + } + } } @@ -9188,7 +9235,7 @@ public void DoJobProgress(IJob job) Debug.WriteLine(index.ToString() + JobRefreshed.State); StringBuilder sb = new StringBuilder(); // display percentage for each task for mouse hover (tooltiptext) - foreach (ITask task in JobRefreshed.Tasks) sb.AppendLine(Convert.ToInt32(task.Progress).ToString() + " %"); + foreach (ITask task in JobRefreshed.Tasks) sb.AppendLine(string.Format("{0} % ({1})", Convert.ToInt32(task.Progress).ToString(), task.Name)); // let's calculate the estipated time string ETAstr = "", Durationstr = ""; diff --git a/AMSExplorer/Mainform.resx b/AMSExplorer/Mainform.resx index fdc57001..bf3f5e00 100644 --- a/AMSExplorer/Mainform.resx +++ b/AMSExplorer/Mainform.resx @@ -234,15 +234,6 @@ InDGsEZgQfy95BE+wwQPGmvtKwnHJx54i0Kiggk2+yoPM8xGBQNc4QhrGMI9njHTw6iASGiBHaycnIfl aoEgz5yd2udlC4TWeUmqIAXzRS9I8U9BTqLti0VoF8Xb+Be1P+yswpcFxmzqmasJD/KjJgAAAABJRU5E rkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAACdSURBVDhPpdPBDYJAEIVhIMaYWICVeOBiLVysw4tU - oL1ZC1yW9yc7GwOTuCOTfDCZN7ucaFJKu1A81x5SXd4FqL7EOxzhDiPcYYQ7jHCHEaUZ5MzgR7HD7uYC - 6iVTflP3jFpnmwtaYYGe90Hm7JhnlrFr50pzEvvKW3qx7CbfGbuWlWaUi3RylY9YRs+MjJ2nWFaaf7nD - et4vWi81C6mTCPUmg+N4AAAAAElFTkSuQmCC @@ -252,6 +243,15 @@ SMJWW7hwSFeNvS1pNlJKU4Q/P4MOZPFwLehANoIOZCPoQHrOyqWMM+hAyEnxoeNFE+hAZtryJz7LoAMp HBXLq/7bOS9BBxIx+l55Koc6O54fdR7RgZQHd2VvEfZ8IXzmOz1dX3BTdh4q7QLjuys6kIjBn4blAjOg A+n5toAdSM/fL0jxBjUnXpEbH9NCAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAACdSURBVDhPpdPBDYJAEIVhIMaYWICVeOBiLVysw4tU + oL1ZC1yW9yc7GwOTuCOTfDCZN7ucaFJKu1A81x5SXd4FqL7EOxzhDiPcYYQ7jHCHEaUZ5MzgR7HD7uYC + 6iVTflP3jFpnmwtaYYGe90Hm7JhnlrFr50pzEvvKW3qx7CbfGbuWlWaUi3RylY9YRs+MjJ2nWFaaf7nD + et4vWi81C6mTCPUmg+N4AAAAAElFTkSuQmCC @@ -315,7 +315,7 @@ N49Q04/9++YPAAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAACXSURBVDhPpZKxDYNQDEQZAokZIjFTYITUaRmA4VJk @@ -754,12 +754,21 @@ CSbtWoBwnwkFjBXY/Ejg/QXECuyd7RRg6EfSATdSB94Xxzh1AAAAAElFTkSuQmCC - - 773, 56 - 17, 56 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAJoBbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1u + ZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0sIG1zY29ybGliLCBWZXJzaW9u + PTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OQUB + AAAAMFN5c3RlbS5Db2xsZWN0aW9ucy5HZW5lcmljLkxpc3RgMVtbU3lzdGVtLlN0cmluZwMAAAAGX2l0 + ZW1zBV9zaXplCF92ZXJzaW9uBgAACAgCAAAACQMAAAAAAAAAAAAAABEDAAAAAAAAAAs= + + + + 215, 56 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -819,18 +828,6 @@ o+4AAAAASUVORK5CYII= - - - AAEAAAD/////AQAAAAAAAAAMAgAAAJoBbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1u - ZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0sIG1zY29ybGliLCBWZXJzaW9u - PTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OQUB - AAAAMFN5c3RlbS5Db2xsZWN0aW9ucy5HZW5lcmljLkxpc3RgMVtbU3lzdGVtLlN0cmluZwMAAAAGX2l0 - ZW1zBV9zaXplCF92ZXJzaW9uBgAACAgCAAAACQMAAAAAAAAAAAAAABEDAAAAAAAAAAs= - - - - 215, 56 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -880,6 +877,9 @@ o+4AAAAASUVORK5CYII= + + 773, 56 + 416, 56 diff --git a/AMSExplorer/Program.cs b/AMSExplorer/Program.cs index c74b7698..d3de3de8 100644 --- a/AMSExplorer/Program.cs +++ b/AMSExplorer/Program.cs @@ -475,23 +475,32 @@ private StringBuilder GetStats() elapsedTime = String.Format("{0:00}:{1:00}:{2:00}:{3:00}.{4:00}", ts.Days, ts.Hours, ts.Minutes, ts.Seconds, ts.Milliseconds / 10); sb.AppendLine("Job Duration : " + elapsedTime); } + sb.AppendLine("Number of tasks : " + theJob.Tasks.Count); sb.AppendLine(""); sb.AppendLine("Media Account : " + theJob.GetMediaContext().Credentials.ClientId); sb.AppendLine(""); + double total_price = 0; + double total_dsizeinputprocessed = 0; + double total_dsizeoutputprocessed = 0; + bool total_pricecanbecalculated = true; + bool total_sizescanbecalculated = true; + foreach (ITask task in theJob.Tasks) { + bool pricecanbecalculated = false; + bool sizecanbecalculated = false; + sb.AppendLine(section); sb.AppendLine(""); sb.AppendLine("Task Name : " + task.Name); sb.AppendLine("Task ID : " + task.Id); sb.AppendLine("Task Priority : " + task.Priority); sb.AppendLine("Media Processor : " + task.MediaProcessorId); - IMediaProcessor processor = JobInfo.GetMediaProcessorFromId(task.MediaProcessorId, (CloudMediaContext) theJob.GetMediaContext()); + IMediaProcessor processor = JobInfo.GetMediaProcessorFromId(task.MediaProcessorId, (CloudMediaContext)theJob.GetMediaContext()); if (processor != null) sb.AppendLine("Media Processor Name: " + processor.Name); - if (task.StartTime != null) // If not in queued state sb.AppendLine("Task StartTime (UTC): " + task.StartTime.Value.ToLongDateString() + " " + task.StartTime.Value.ToLongTimeString()); if (task.EndTime != null) // If not completed yet @@ -529,7 +538,8 @@ private StringBuilder GetStats() //long lSize = 0; long lSizeinput = 0; long lSizeoutput = 0; - bool sizecanbecalculated = true; + sizecanbecalculated = true; + pricecanbecalculated = true; sb.AppendLine("Input Assets:"); foreach (IAsset asset in task.InputAssets) { @@ -537,8 +547,8 @@ private StringBuilder GetStats() { sb.AppendLine("Asset Deleted"); sizecanbecalculated = false; + pricecanbecalculated = false; } - lSizeinput += ListFilesInAsset(asset, ref sb); } sb.AppendLine(""); @@ -548,25 +558,87 @@ private StringBuilder GetStats() double lsizeinputprocessed = (double)lSizeinput / (1024 * 1024 * 1024); double lsizeoutputprocessed = (double)lSizeoutput / (1024 * 1024 * 1024); - double lsizeprocessed = (double)(lSizeinput + lSizeoutput) / (1024 * 1024 * 1024); if (sizecanbecalculated) { - sb.AppendLine("Input gigabytes processed by the task : " + lsizeinputprocessed.ToString()); - sb.AppendLine("Output gigabytes processed by the task : " + lsizeoutputprocessed.ToString()); - sb.AppendLine("Total gigabytes processed by the task : " + lsizeprocessed.ToString()); + if (theJob.Tasks.Count > 1) // only display for the task if there are several tasks + { + sb.AppendLine("Input gigabytes processed by the task : " + lsizeinputprocessed.ToString()); + sb.AppendLine("Output gigabytes processed by the task : " + lsizeoutputprocessed.ToString()); + sb.AppendLine("Total gigabytes processed by the task : " + (lsizeinputprocessed + lsizeoutputprocessed).ToString()); + } + total_dsizeinputprocessed += lsizeinputprocessed; + total_dsizeoutputprocessed += lsizeoutputprocessed; + if (processor != null) + { + double pricetask = -1; + switch (processor.Name) + { + case (Constants.AzureMediaEncoder): + // AME Encoding task + pricetask = lsizeoutputprocessed * (double)Properties.Settings.Default.AMEPrice; + break; + case (Constants.WindowsAzureMediaEncoder): + // WAME Encoding task + pricetask = (lsizeinputprocessed + lsizeoutputprocessed) * (double)Properties.Settings.Default.LegacyEncodingPrice; + break; + case (MediaProcessorNames.StorageDecryption): + case (MediaProcessorNames.WindowsAzureMediaEncryptor): + case (MediaProcessorNames.WindowsAzureMediaPackager): + // No cost + pricetask = 0; + break; + case (Constants.AzureMediaIndexer): + // Indexing task + // TO DO: GET DURATION OF CONTENT + //pricetask = lsizeprocessed * (double)Properties.Settings.Default.LegacyEncodingPrice; + break; + default: + break; + } + if (pricetask >= 0) + { + if (theJob.Tasks.Count > 1) sb.AppendLine(string.Format("Estimated cost of the task : {0} {1:0.00}", Properties.Settings.Default.Currency, pricetask)); + total_price += pricetask; + } + else + { + total_pricecanbecalculated = false; + } + } + } + else + { + sb.AppendLine("Gigabytes processed by the task : cannot be calculated, asset deleted?"); + total_pricecanbecalculated = false; + total_sizescanbecalculated = false; } - else sb.AppendLine("Gigabytes processed by the task : cannot be calculated, asset deleted?"); - } + if (!pricecanbecalculated) total_pricecanbecalculated = false; + if (!sizecanbecalculated) total_sizescanbecalculated = false; + sb.AppendLine(""); + sb.AppendLine(section); + } + sb.AppendLine(""); + + if (total_sizescanbecalculated) + { + sb.AppendLine("Input gigabytes processed by the job : " + total_dsizeinputprocessed.ToString()); + sb.AppendLine("Output gigabytes processed by the job : " + total_dsizeoutputprocessed.ToString()); + sb.AppendLine("Total gigabytes processed by the job : " + (total_dsizeinputprocessed + total_dsizeoutputprocessed).ToString()); + } + if (total_pricecanbecalculated) + { + sb.AppendLine(string.Format("Estimated cost of the job : {0} {1:0.00}", Properties.Settings.Default.Currency, total_price)); + } + sb.AppendLine(""); sb.AppendLine(section); sb.AppendLine(" END OF JOB REPORT"); sb.AppendLine(section); sb.AppendLine(""); } } - return sb; } } @@ -954,6 +1026,32 @@ public static String FormatByteSize(long? byteCountl) else return null; } + public static string GetTestToken(IAsset MyAsset, ContentKeyType keytype, CloudMediaContext _context) + { + string testToken = null; + IContentKey key = MyAsset.ContentKeys.Where(k => k.ContentKeyType == keytype).FirstOrDefault(); + if (key != null && key.AuthorizationPolicyId != null) + { + IContentKeyAuthorizationPolicy policy = _context.ContentKeyAuthorizationPolicies.Where(p => p.Id == key.AuthorizationPolicyId).FirstOrDefault(); + if (policy != null) + { + IContentKeyAuthorizationPolicyOption option = policy.Options.Where(o => (ContentKeyRestrictionType)o.Restrictions.FirstOrDefault().KeyRestrictionType == ContentKeyRestrictionType.TokenRestricted).FirstOrDefault(); + if (option != null) + { + string tokenTemplateString = option.Restrictions.FirstOrDefault().Requirements; + if (!string.IsNullOrEmpty(tokenTemplateString)) + { + Guid rawkey = EncryptionUtils.GetKeyIdAsGuid(key.Id); + TokenRestrictionTemplate tokenTemplate = TokenRestrictionTemplateSerializer.Deserialize(tokenTemplateString); + testToken = TokenRestrictionTemplateSerializer.GenerateTestToken(tokenTemplate, null, rawkey); + testToken = HttpUtility.UrlEncode(testToken); + } + } + } + } + return testToken; + } + private StringBuilder GetStats() { @@ -1110,23 +1208,50 @@ private StringBuilder GetStats() return sb; } - public static void DoPlayBackWithBestStreamingEndpoint(PlayerType typeplayer, Uri Url, CloudMediaContext context) + + + public static void DoPlayBackWithBestStreamingEndpoint(PlayerType typeplayer, Uri Url, CloudMediaContext context, IAsset myassetwithtoken = null) { - DoPlayBackWithBestStreamingEndpoint(typeplayer, Url.ToString(), context); + DoPlayBackWithBestStreamingEndpoint(typeplayer, Url.ToString(), context, myassetwithtoken); } - public static void DoPlayBackWithBestStreamingEndpoint(PlayerType typeplayer, string Url, CloudMediaContext context) + public static void DoPlayBackWithBestStreamingEndpoint(PlayerType typeplayer, string Url, CloudMediaContext context, IAsset myassetwithtoken = null) { Url = rw(Url, GetBestStreamingEndpoint(context)); - DoPlayBack(typeplayer, Url); + DoPlayBack(typeplayer, Url, context, myassetwithtoken); } - public static void DoPlayBack(PlayerType typeplayer, Uri Url) + + public static void DoPlayBack(PlayerType typeplayer, string Url, CloudMediaContext context, IAsset myassetwithtoken = null) + { + string token = null; + if (myassetwithtoken != null) + { + // user wants perhaps to play an asset with a token + switch (typeplayer) + { + case PlayerType.SilverlightPlayReadyToken: + token = AssetInfo.GetTestToken(myassetwithtoken, ContentKeyType.CommonEncryption, context); + break; + + case PlayerType.FlashAESToken: + token = AssetInfo.GetTestToken(myassetwithtoken, ContentKeyType.EnvelopeEncryption, context); + break; + + default: + // no token enable player + break; + } + } + DoPlayBack(typeplayer, Url, token); + + } + public static void DoPlayBack(PlayerType typeplayer, Uri Url, string urlencodedtoken = null) { if (Url != null) - DoPlayBack(typeplayer, Url.ToString()); + DoPlayBack(typeplayer, Url.ToString(), urlencodedtoken); } - public static void DoPlayBack(PlayerType typeplayer, string Url) + public static void DoPlayBack(PlayerType typeplayer, string Url, string urlencodedtoken = null) { switch (typeplayer) { @@ -1134,6 +1259,10 @@ public static void DoPlayBack(PlayerType typeplayer, string Url) Process.Start(@"http://smf.cloudapp.net/healthmonitor?Autoplay=true&url=" + Url); break; + case PlayerType.SilverlightPlayReadyToken: + Process.Start(string.Format(@"http://sltoken.azurewebsites.net/#/!?url={0}&token={1}", Url, urlencodedtoken)); + break; + case PlayerType.DASHIFRefPlayer: if (!Url.EndsWith(string.Format(AssetInfo.format_url, AssetInfo.format_dash))) Url += string.Format(AssetInfo.format_url, AssetInfo.format_dash); // if not DASH extension, let's add it Process.Start(@"http://dashif.org/reference/players/javascript/1.2.0/index.html?url=" + Url); @@ -1153,6 +1282,10 @@ public static void DoPlayBack(PlayerType typeplayer, string Url) Process.Start(@"http://amsplayer.azurewebsites.net/player.html?player=flash&format=smooth&url=" + Url); break; + case PlayerType.FlashAESToken: + Process.Start(string.Format(@"http://aestoken.azurewebsites.net/#/!?url={0}&token={1}", Url, urlencodedtoken)); + break; + case PlayerType.MP4AzurePage: Process.Start(string.Format(@"http://amsplayer.azurewebsites.net/player.html?player=html5&format=mp4&url={0}&mp4url={0}", Url)); break; @@ -1269,11 +1402,13 @@ public enum PlayerType FlashAzurePage = 0, SilverlightAzurePage = 1, SilverlightMonitoring = 2, - DASHAzurePage = 3, - DASHLiveAzure = 4, - DASHIFRefPlayer = 5, - MP4AzurePage = 6, - CustomPlayer = 7 + SilverlightPlayReadyToken = 3, + FlashAESToken = 4, + DASHAzurePage = 5, + DASHLiveAzure = 6, + DASHIFRefPlayer = 7, + MP4AzurePage = 8, + CustomPlayer = 9 } public enum TaskJobCreationMode @@ -1357,5 +1492,35 @@ public int Compare(object x, object y) return returnVal; } + static public void ListView_ColumnClick(object sender, ColumnClickEventArgs e) + { + ListView ThisListView = (ListView)sender; + // Determine whether the column is the same as the last column clicked. + if (e.Column != ((int)ThisListView.Tag)) + { + // Set the sort column to the new column. + ThisListView.Tag = e.Column; + // Set the sort order to ascending by default. + ThisListView.Sorting = SortOrder.Ascending; + } + else + { + // Determine what the last sort order was and change it. + if (ThisListView.Sorting == SortOrder.Ascending) + ThisListView.Sorting = SortOrder.Descending; + else + ThisListView.Sorting = SortOrder.Ascending; + } + + // Call the sort method to manually sort. + ThisListView.Sort(); + // Set the ListViewItemSorter property to a new ListViewItemComparer + // object. + ThisListView.ListViewItemSorter = new ListViewItemComparer(e.Column, + ThisListView.Sorting); + } + } + + } diff --git a/AMSExplorer/ProgramInformation.cs b/AMSExplorer/ProgramInformation.cs index 7b6bbafe..f21caac3 100644 --- a/AMSExplorer/ProgramInformation.cs +++ b/AMSExplorer/ProgramInformation.cs @@ -45,6 +45,7 @@ public partial class ProgramInformation : Form private IEnumerable ValidURIs; private IEnumerable NotValidURIs; public IEnumerable MyStreamingEndpoints; + private Mainform MyMainForm; public string ProgramDescription { @@ -61,10 +62,11 @@ public TimeSpan archiveWindowLength } - public ProgramInformation() + public ProgramInformation(Mainform mainform) { InitializeComponent(); this.Icon = Bitmaps.Azure_Explorer_ico; + MyMainForm = mainform; } private void contextMenuStripDG_MouseClick(object sender, MouseEventArgs e) @@ -99,8 +101,7 @@ private void buttonOpenAsset_Click(object sender, EventArgs e) IAsset AssetToDisplayP = MyProgram.Asset; if (AssetToDisplayP != null) { - Mainform parent = (Mainform)this.Owner; - AssetInformation form = new AssetInformation() + AssetInformation form = new AssetInformation(MyMainForm) { MyAsset = AssetToDisplayP, MyContext = MyContext, diff --git a/AMSExplorer/Properties/AssemblyInfo.cs b/AMSExplorer/Properties/AssemblyInfo.cs index 37fa6814..8d6b0f41 100644 --- a/AMSExplorer/Properties/AssemblyInfo.cs +++ b/AMSExplorer/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.0.3.0")] +[assembly: AssemblyVersion("3.0.3.3")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/AMSExplorer/Properties/Settings.Designer.cs b/AMSExplorer/Properties/Settings.Designer.cs index 91ea81e1..7c036cea 100644 --- a/AMSExplorer/Properties/Settings.Designer.cs +++ b/AMSExplorer/Properties/Settings.Designer.cs @@ -286,5 +286,53 @@ public string PremiumWorkflowPresetXMLFilesCurrentFolder { this["PremiumWorkflowPresetXMLFilesCurrentFolder"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("1.99")] + public decimal AMEPrice { + get { + return ((decimal)(this["AMEPrice"])); + } + set { + this["AMEPrice"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("1.39")] + public decimal LegacyEncodingPrice { + get { + return ((decimal)(this["LegacyEncodingPrice"])); + } + set { + this["LegacyEncodingPrice"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("10")] + public decimal IndexingPrice { + get { + return ((decimal)(this["IndexingPrice"])); + } + set { + this["IndexingPrice"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("$")] + public string Currency { + get { + return ((string)(this["Currency"])); + } + set { + this["Currency"] = value; + } + } } } diff --git a/AMSExplorer/Properties/Settings.settings b/AMSExplorer/Properties/Settings.settings index f47417f9..d22a26c0 100644 --- a/AMSExplorer/Properties/Settings.settings +++ b/AMSExplorer/Properties/Settings.settings @@ -68,5 +68,17 @@ + + 1.99 + + + 1.39 + + + 10 + + + $ + \ No newline at end of file diff --git a/AMSExplorer/live.cs b/AMSExplorer/live.cs index 1769713f..af6a2335 100644 --- a/AMSExplorer/live.cs +++ b/AMSExplorer/live.cs @@ -890,7 +890,7 @@ public IEnumerable GetNotValidURIs() _context .StreamingEndpoints .AsEnumerable() - .Where(o => (o.State != StreamingEndpointState.Running) || (o.ScaleUnits > 0)) + .Where(o => (o.State != StreamingEndpointState.Running) || (o.ScaleUnits == 0)) .Select( o => template.BindByPosition(new Uri("http://" + o.HostName), l.ContentAccessComponent, diff --git a/AMSExplorer/options.Designer.cs b/AMSExplorer/options.Designer.cs index 78bbb34c..b185a811 100644 --- a/AMSExplorer/options.Designer.cs +++ b/AMSExplorer/options.Designer.cs @@ -58,6 +58,16 @@ private void InitializeComponent() this.textBoxCustomPlayer = new System.Windows.Forms.TextBox(); this.checkBoxEnableCustomPlayer = new System.Windows.Forms.CheckBox(); this.panel1 = new System.Windows.Forms.Panel(); + this.label4 = new System.Windows.Forms.Label(); + this.numericUpDownAMEPrice = new System.Windows.Forms.NumericUpDown(); + this.numericUpDownLegacyEncodingPrice = new System.Windows.Forms.NumericUpDown(); + this.label5 = new System.Windows.Forms.Label(); + this.numericUpDownIndexingPrice = new System.Windows.Forms.NumericUpDown(); + this.label6 = new System.Windows.Forms.Label(); + this.textBoxCurrency = new System.Windows.Forms.TextBox(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.amspriceslink = new System.Windows.Forms.LinkLabel(); + this.label7 = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLocatorDuration)).BeginInit(); @@ -66,6 +76,10 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.groupBox3.SuspendLayout(); this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownAMEPrice)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLegacyEncodingPrice)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownIndexingPrice)).BeginInit(); + this.groupBox4.SuspendLayout(); this.SuspendLayout(); // // buttonOk @@ -267,7 +281,7 @@ private void InitializeComponent() this.groupBox2.Controls.Add(this.checkBoxOneUpDownload); this.groupBox2.Location = new System.Drawing.Point(12, 148); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(496, 148); + this.groupBox2.Size = new System.Drawing.Size(496, 155); this.groupBox2.TabIndex = 50; this.groupBox2.TabStop = false; this.groupBox2.Text = "Other settings"; @@ -348,7 +362,7 @@ private void InitializeComponent() // this.groupBox3.Controls.Add(this.textBoxCustomPlayer); this.groupBox3.Controls.Add(this.checkBoxEnableCustomPlayer); - this.groupBox3.Location = new System.Drawing.Point(12, 302); + this.groupBox3.Location = new System.Drawing.Point(12, 455); this.groupBox3.Name = "groupBox3"; this.groupBox3.Size = new System.Drawing.Size(496, 89); this.groupBox3.TabIndex = 51; @@ -381,17 +395,147 @@ private void InitializeComponent() this.panel1.Controls.Add(this.buttonCancel); this.panel1.Controls.Add(this.buttonOk); this.panel1.Controls.Add(this.buttonReset); - this.panel1.Location = new System.Drawing.Point(-2, 401); + this.panel1.Location = new System.Drawing.Point(-2, 558); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(523, 48); this.panel1.TabIndex = 63; // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(40, 51); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(153, 13); + this.label4.TabIndex = 54; + this.label4.Text = "Encoding price per output GB :"; + // + // numericUpDownAMEPrice + // + this.numericUpDownAMEPrice.DecimalPlaces = 2; + this.numericUpDownAMEPrice.Increment = new decimal(new int[] { + 1, + 0, + 0, + 131072}); + this.numericUpDownAMEPrice.Location = new System.Drawing.Point(260, 49); + this.numericUpDownAMEPrice.Name = "numericUpDownAMEPrice"; + this.numericUpDownAMEPrice.Size = new System.Drawing.Size(63, 20); + this.numericUpDownAMEPrice.TabIndex = 55; + this.numericUpDownAMEPrice.Value = new decimal(new int[] { + 199, + 0, + 0, + 131072}); + // + // numericUpDownLegacyEncodingPrice + // + this.numericUpDownLegacyEncodingPrice.DecimalPlaces = 2; + this.numericUpDownLegacyEncodingPrice.Increment = new decimal(new int[] { + 1, + 0, + 0, + 131072}); + this.numericUpDownLegacyEncodingPrice.Location = new System.Drawing.Point(260, 75); + this.numericUpDownLegacyEncodingPrice.Name = "numericUpDownLegacyEncodingPrice"; + this.numericUpDownLegacyEncodingPrice.Size = new System.Drawing.Size(63, 20); + this.numericUpDownLegacyEncodingPrice.TabIndex = 57; + this.numericUpDownLegacyEncodingPrice.Value = new decimal(new int[] { + 139, + 0, + 0, + 131072}); + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(40, 77); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(218, 13); + this.label5.TabIndex = 56; + this.label5.Text = "Legacy encoding price per input/output GB :"; + // + // numericUpDownIndexingPrice + // + this.numericUpDownIndexingPrice.DecimalPlaces = 2; + this.numericUpDownIndexingPrice.Enabled = false; + this.numericUpDownIndexingPrice.Increment = new decimal(new int[] { + 1, + 0, + 0, + 131072}); + this.numericUpDownIndexingPrice.Location = new System.Drawing.Point(260, 101); + this.numericUpDownIndexingPrice.Name = "numericUpDownIndexingPrice"; + this.numericUpDownIndexingPrice.Size = new System.Drawing.Size(63, 20); + this.numericUpDownIndexingPrice.TabIndex = 59; + this.numericUpDownIndexingPrice.Value = new decimal(new int[] { + 199, + 0, + 0, + 131072}); + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(39, 103); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(194, 13); + this.label6.TabIndex = 58; + this.label6.Text = "Content indexer price per content hour :"; + // + // textBoxCurrency + // + this.textBoxCurrency.Location = new System.Drawing.Point(260, 23); + this.textBoxCurrency.Name = "textBoxCurrency"; + this.textBoxCurrency.Size = new System.Drawing.Size(51, 20); + this.textBoxCurrency.TabIndex = 60; + this.textBoxCurrency.Text = "$"; + // + // groupBox4 + // + this.groupBox4.Controls.Add(this.amspriceslink); + this.groupBox4.Controls.Add(this.label7); + this.groupBox4.Controls.Add(this.textBoxCurrency); + this.groupBox4.Controls.Add(this.numericUpDownAMEPrice); + this.groupBox4.Controls.Add(this.numericUpDownLegacyEncodingPrice); + this.groupBox4.Controls.Add(this.label5); + this.groupBox4.Controls.Add(this.numericUpDownIndexingPrice); + this.groupBox4.Controls.Add(this.label6); + this.groupBox4.Controls.Add(this.label4); + this.groupBox4.Location = new System.Drawing.Point(12, 309); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Size = new System.Drawing.Size(496, 140); + this.groupBox4.TabIndex = 64; + this.groupBox4.TabStop = false; + this.groupBox4.Text = "Prices (for job cost estimation)"; + // + // amspriceslink + // + this.amspriceslink.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.amspriceslink.AutoSize = true; + this.amspriceslink.Location = new System.Drawing.Point(360, 26); + this.amspriceslink.Name = "amspriceslink"; + this.amspriceslink.Size = new System.Drawing.Size(115, 13); + this.amspriceslink.TabIndex = 62; + this.amspriceslink.TabStop = true; + this.amspriceslink.Text = "Media Services Pricing"; + this.amspriceslink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.amspriceslink_LinkClicked); + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(39, 26); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(90, 13); + this.label7.TabIndex = 61; + this.label7.Text = "Currency symbol :"; + // // Options // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; - this.ClientSize = new System.Drawing.Size(520, 449); + this.ClientSize = new System.Drawing.Size(520, 606); + this.Controls.Add(this.groupBox4); this.Controls.Add(this.panel1); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); @@ -410,6 +554,11 @@ private void InitializeComponent() this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); this.panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownAMEPrice)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLegacyEncodingPrice)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownIndexingPrice)).EndInit(); + this.groupBox4.ResumeLayout(false); + this.groupBox4.PerformLayout(); this.ResumeLayout(false); } @@ -445,5 +594,15 @@ private void InitializeComponent() private System.Windows.Forms.NumericUpDown numericUpDownLocatorDuration; private System.Windows.Forms.CheckBox checkBoxDisplayAssetStorage; private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.NumericUpDown numericUpDownAMEPrice; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.NumericUpDown numericUpDownLegacyEncodingPrice; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.NumericUpDown numericUpDownIndexingPrice; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.TextBox textBoxCurrency; + private System.Windows.Forms.GroupBox groupBox4; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.LinkLabel amspriceslink; } } \ No newline at end of file diff --git a/AMSExplorer/options.cs b/AMSExplorer/options.cs index c5536792..c0e53595 100644 --- a/AMSExplorer/options.cs +++ b/AMSExplorer/options.cs @@ -24,6 +24,8 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using System.Diagnostics; + namespace AMSExplorer { @@ -56,7 +58,10 @@ private void buttonOk_Click(object sender, EventArgs e) Properties.Settings.Default.DefaultJobPriority = (int)numericUpDownPriority.Value; Properties.Settings.Default.DefaultLocatorDurationDays = (int)numericUpDownLocatorDuration.Value; - + Properties.Settings.Default.AMEPrice = numericUpDownAMEPrice.Value; + Properties.Settings.Default.LegacyEncodingPrice = numericUpDownLegacyEncodingPrice.Value; + Properties.Settings.Default.IndexingPrice = numericUpDownIndexingPrice.Value; + Properties.Settings.Default.Currency = textBoxCurrency.Text; Properties.Settings.Default.Save(); } @@ -83,7 +88,11 @@ private void buttonReset_Click(object sender, EventArgs e) checkBoxEnableCustomPlayer.Checked = false; numericUpDownPriority.Value = 10; + textBoxCurrency.Text = "$"; numericUpDownLocatorDuration.Value = 365; + numericUpDownAMEPrice.Value = ((decimal)1.99); + numericUpDownLegacyEncodingPrice.Value = ((decimal)1.39); + numericUpDownIndexingPrice.Value = ((decimal)10); Properties.Settings.Default.WAMEPresetXMLFilesCurrentFolder = Application.StartupPath + Constants.PathAMEFiles; // we reset the XML files folders Properties.Settings.Default.PremiumWorkflowPresetXMLFilesCurrentFolder = Application.StartupPath + Constants.PathPremiumWorkflowFiles; @@ -116,11 +125,24 @@ private void options_Load(object sender, EventArgs e) numericUpDownPriority.Value = Properties.Settings.Default.DefaultJobPriority; numericUpDownLocatorDuration.Value = Properties.Settings.Default.DefaultLocatorDurationDays; + + textBoxCurrency.Text = Properties.Settings.Default.Currency; + numericUpDownAMEPrice.Value = Properties.Settings.Default.AMEPrice; + numericUpDownLegacyEncodingPrice.Value = Properties.Settings.Default.LegacyEncodingPrice; + numericUpDownIndexingPrice.Value = Properties.Settings.Default.IndexingPrice; + + amspriceslink.Links.Add(new LinkLabel.Link(0, amspriceslink.Text.Length, "http://azure.microsoft.com/en-us/pricing/details/media-services/")); + } private void checkBoxEnableCustomPlayer_CheckedChanged(object sender, EventArgs e) { textBoxCustomPlayer.Enabled = checkBoxEnableCustomPlayer.Checked; } + + private void amspriceslink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + Process.Start(e.Link.LinkData as string); + } } } diff --git a/AMSExplorer/options.resx b/AMSExplorer/options.resx index df8339b6..5f621e80 100644 --- a/AMSExplorer/options.resx +++ b/AMSExplorer/options.resx @@ -120,4 +120,10 @@ 17, 17 + + 17, 17 + + + 53 + \ No newline at end of file diff --git a/SetupAMSExplorer/SetupAMSExplorer.isl b/SetupAMSExplorer/SetupAMSExplorer.isl index a40795fc..b24ebe45 100644 --- a/SetupAMSExplorer/SetupAMSExplorer.isl +++ b/SetupAMSExplorer/SetupAMSExplorer.isl @@ -4389,7 +4389,7 @@ UwBpAG4AZwBsAGUASQBtAGEAZwBlAAEARQB4AHAAcgBlAHMAcwA= PROGMSG_IIS_ROLLBACKVROOTS##IDS_PROGMSG_IIS_ROLLBACKVROOTS## PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS## PROGRAMFILETOLAUNCHATEND[INSTALLDIR]AMSExplorer.Primary output - ProductCode{E6B4F2A0-B81D-4A81-B76A-DEA449477C93} + ProductCode{EECC0C7E-223D-403C-8D6D-1B21590C1A3E} ProductNameAzure Media Services Explorer ProductVersion3.03 ProgressType0install