diff --git a/AMSExplorer/AMSExplorer.csproj b/AMSExplorer/AMSExplorer.csproj index 5a44f558..b693a5af 100644 --- a/AMSExplorer/AMSExplorer.csproj +++ b/AMSExplorer/AMSExplorer.csproj @@ -104,10 +104,10 @@ ..\packages\TransientFaultHandling.Core.5.1.1209.1\lib\NET4\Microsoft.Practices.TransientFaultHandling.Core.dll - ..\packages\Microsoft.Rest.ClientRuntime.2.3.15\lib\net452\Microsoft.Rest.ClientRuntime.dll + ..\packages\Microsoft.Rest.ClientRuntime.2.3.18\lib\net452\Microsoft.Rest.ClientRuntime.dll - ..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.16\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll + ..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.18\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll ..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.3.2\lib\net452\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll @@ -848,9 +848,9 @@ PreserveNewest - + PreserveNewest - + diff --git a/AMSExplorer/AMSLogin.Designer.cs b/AMSExplorer/AMSLogin.Designer.cs index aa517c68..c0c8203b 100644 --- a/AMSExplorer/AMSLogin.Designer.cs +++ b/AMSExplorer/AMSLogin.Designer.cs @@ -96,6 +96,7 @@ private void InitializeComponent() this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.errorProvider1 = new System.Windows.Forms.ErrorProvider(this.components); this.listViewAccounts = new System.Windows.Forms.ListView(); + this.linkLabelPDFDocumentation = new System.Windows.Forms.LinkLabel(); this.tabControlAMS.SuspendLayout(); this.tabPageCredentials.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -576,6 +577,13 @@ private void InitializeComponent() this.listViewAccounts.SelectedIndexChanged += new System.EventHandler(this.listViewAccounts_SelectedIndexChanged); this.listViewAccounts.DoubleClick += new System.EventHandler(this.listBoxAcounts_DoubleClick); // + // linkLabelPDFDocumentation + // + resources.ApplyResources(this.linkLabelPDFDocumentation, "linkLabelPDFDocumentation"); + this.linkLabelPDFDocumentation.Name = "linkLabelPDFDocumentation"; + this.linkLabelPDFDocumentation.TabStop = true; + this.linkLabelPDFDocumentation.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabelPDFDocumentation_LinkClicked); + // // AMSLogin // this.AcceptButton = this.buttonLogin; @@ -583,6 +591,7 @@ private void InitializeComponent() this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; this.CancelButton = this.buttonCancel; + this.Controls.Add(this.linkLabelPDFDocumentation); this.Controls.Add(this.listViewAccounts); this.Controls.Add(this.panel1); this.Controls.Add(this.pictureBoxJob); @@ -687,5 +696,6 @@ private void InitializeComponent() private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.LinkLabel linkLabelAADAut; private System.Windows.Forms.ListView listViewAccounts; + private System.Windows.Forms.LinkLabel linkLabelPDFDocumentation; } } \ No newline at end of file diff --git a/AMSExplorer/AMSLogin.cs b/AMSExplorer/AMSLogin.cs index da37922a..e83c71c5 100644 --- a/AMSExplorer/AMSLogin.cs +++ b/AMSExplorer/AMSLogin.cs @@ -888,5 +888,10 @@ private void radioButtonACSAut_CheckedChanged(object sender, EventArgs e) { buttonLogin.Visible = radioButtonAADAut.Checked; } + + private void linkLabelPDFDocumentation_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + Process.Start(Application.StartupPath +@"\HelpFiles\" + @"0917d328eed74498bf9ed9dea98ef737.pdf"); + } } } diff --git a/AMSExplorer/AMSLogin.resx b/AMSExplorer/AMSLogin.resx index 1d4a7d5a..15a94e40 100644 --- a/AMSExplorer/AMSLogin.resx +++ b/AMSExplorer/AMSLogin.resx @@ -211,7 +211,7 @@ $this - 10 + 11 Bottom, Left @@ -244,7 +244,7 @@ $this - 9 + 10 Segoe UI, 9pt @@ -271,7 +271,7 @@ $this - 8 + 9 Top, Left, Right @@ -334,7 +334,7 @@ $this - 7 + 8 linkLabelAADAut @@ -2224,7 +2224,7 @@ $this - 6 + 7 Bottom, Left @@ -2254,7 +2254,7 @@ $this - 5 + 6 Bottom, Left @@ -2284,7 +2284,7 @@ $this - 4 + 5 17, 17 @@ -2305,7 +2305,7 @@ Segoe UI, 9pt - 412, 19 + 412, 9 147, 15 @@ -2326,7 +2326,7 @@ $this - 3 + 4 Top, Right @@ -2353,26 +2353,11 @@ $this - 2 + 3 Bottom, Left, Right - - True - - - 15, 21 - - - 176, 15 - - - 6 - - - Version {0} for Media Services v2 - labelVersion @@ -2404,7 +2389,34 @@ $this - 1 + 2 + + + True + + + 15, 21 + + + 176, 15 + + + 6 + + + Version {0} for Media Services v2 + + + labelVersion + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 0 293, 17 @@ -2421,6 +2433,39 @@ 784, 523 + + True + + + Segoe UI, 9pt + + + NoControl + + + 396, 24 + + + 163, 15 + + + 54 + + + AMS Documentation (offline) + + + linkLabelPDFDocumentation + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + 18, 50 @@ -2440,7 +2485,7 @@ $this - 0 + 1 Segoe UI, 9pt diff --git a/AMSExplorer/HelpFiles/0917d328eed74498bf9ed9dea98ef737.pdf b/AMSExplorer/HelpFiles/0917d328eed74498bf9ed9dea98ef737.pdf index 02ae905d..0a4f07cd 100644 Binary files a/AMSExplorer/HelpFiles/0917d328eed74498bf9ed9dea98ef737.pdf and b/AMSExplorer/HelpFiles/0917d328eed74498bf9ed9dea98ef737.pdf differ diff --git a/AMSExplorer/Mainform.Designer.cs b/AMSExplorer/Mainform.Designer.cs index 6e4c4ac1..7801556f 100644 --- a/AMSExplorer/Mainform.Designer.cs +++ b/AMSExplorer/Mainform.Designer.cs @@ -30,11 +30,11 @@ 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(); AMSExplorer.SearchObject searchObject1 = new AMSExplorer.SearchObject(); AMSExplorer.SearchObject searchObject2 = new AMSExplorer.SearchObject(); AMSExplorer.SearchObject searchObject3 = new AMSExplorer.SearchObject(); - 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(); this.splitContainerMain = new System.Windows.Forms.SplitContainer(); this.tabControlMain = new System.Windows.Forms.TabControl(); this.tabPageAssets = new System.Windows.Forms.TabPage(); @@ -46,7 +46,6 @@ private void InitializeComponent() this.buttonAssetSearch = new System.Windows.Forms.Button(); this.textBoxAssetSearch = new System.Windows.Forms.TextBox(); this.butPrevPageAsset = new System.Windows.Forms.Button(); - this.dataGridViewAssetsV = new AMSExplorer.DataGridViewAssets(); this.contextMenuStripAssets = new System.Windows.Forms.ContextMenuStrip(this.components); this.refreshToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); @@ -158,7 +157,6 @@ private void InitializeComponent() this.displayErrorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.cancelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.dataGridViewIngestManifestsV = new AMSExplorer.DataGridViewIngestManifest(); this.contextMenuStripIngestManifests = new System.Windows.Forms.ContextMenuStrip(this.components); this.toolStripMenuItem33Refresh = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator42 = new System.Windows.Forms.ToolStripSeparator(); @@ -187,7 +185,6 @@ private void InitializeComponent() this.label4 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.comboBoxOrderJobs = new System.Windows.Forms.ComboBox(); - this.dataGridViewJobsV = new AMSExplorer.DataGridViewJobs(); this.contextMenuStripJobs = new System.Windows.Forms.ContextMenuStrip(this.components); this.refreshToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator18 = new System.Windows.Forms.ToolStripSeparator(); @@ -211,7 +208,6 @@ private void InitializeComponent() this.allJobsToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.tabPageLive = new System.Windows.Forms.TabPage(); this.panelPrograms = new System.Windows.Forms.Panel(); - 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(); @@ -252,7 +248,6 @@ private void InitializeComponent() this.label15 = new System.Windows.Forms.Label(); this.comboBoxFilterTimeProgram = new System.Windows.Forms.ComboBox(); this.panelChannels = new System.Windows.Forms.Panel(); - 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(); @@ -289,7 +284,6 @@ private void InitializeComponent() this.contextMenuStripProcessors = new System.Windows.Forms.ContextMenuStrip(this.components); this.refreshToolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem(); this.tabPageOrigins = new System.Windows.Forms.TabPage(); - 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(); @@ -502,7 +496,6 @@ private void InitializeComponent() this.azureMediaServicesPlayerPageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dASHIFHTML5ReferencePlayerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.hTML5VideoElementToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.iVXHLSPlayerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.jwPlayerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tHEOPlayerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator29 = new System.Windows.Forms.ToolStripSeparator(); @@ -528,13 +521,18 @@ private void InitializeComponent() this.linkLabelFeedbackAMS = new System.Windows.Forms.LinkLabel(); this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components); this.buttonRefreshTab = new System.Windows.Forms.Button(); + this.dataGridViewAssetsV = new AMSExplorer.DataGridViewAssets(); + this.dataGridViewIngestManifestsV = new AMSExplorer.DataGridViewIngestManifest(); + this.dataGridViewJobsV = new AMSExplorer.DataGridViewJobs(); + this.dataGridViewProgramsV = new AMSExplorer.DataGridViewLiveProgram(); + this.dataGridViewChannelsV = new AMSExplorer.DataGridViewLiveChannel(); + this.dataGridViewStreamingEndpointsV = new AMSExplorer.DataGridViewStreamingEndpoints(); ((System.ComponentModel.ISupportInitialize)(this.splitContainerMain)).BeginInit(); this.splitContainerMain.Panel1.SuspendLayout(); this.splitContainerMain.Panel2.SuspendLayout(); this.splitContainerMain.SuspendLayout(); this.tabControlMain.SuspendLayout(); this.tabPageAssets.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewAssetsV)).BeginInit(); this.contextMenuStripAssets.SuspendLayout(); this.tabPageFilters.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewFilters)).BeginInit(); @@ -543,24 +541,19 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.trackBarConcurrentTransfers)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewTransfer)).BeginInit(); this.contextMenuStripTransfers.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewIngestManifestsV)).BeginInit(); this.contextMenuStripIngestManifests.SuspendLayout(); this.tabPageJobs.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.trackBarEncodingRU)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewJobsV)).BeginInit(); this.contextMenuStripJobs.SuspendLayout(); this.tabPageLive.SuspendLayout(); this.panelPrograms.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewProgramsV)).BeginInit(); this.contextMenuStripPrograms.SuspendLayout(); this.panelChannels.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewChannelsV)).BeginInit(); this.contextMenuStripChannels.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.tabPageStorage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewStorage)).BeginInit(); @@ -570,6 +563,12 @@ private void InitializeComponent() this.contextMenuStripLog.SuspendLayout(); this.menuStripMain.SuspendLayout(); this.statusStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewAssetsV)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewIngestManifestsV)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewJobsV)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewProgramsV)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewChannelsV)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewStreamingEndpointsV)).BeginInit(); this.SuspendLayout(); // // splitContainerMain @@ -678,34 +677,6 @@ private void InitializeComponent() this.butPrevPageAsset.UseVisualStyleBackColor = true; this.butPrevPageAsset.Click += new System.EventHandler(this.butPrevPageAsset_Click); // - // dataGridViewAssetsV - // - this.dataGridViewAssetsV.AllowDrop = true; - this.dataGridViewAssetsV.AllowUserToAddRows = false; - this.dataGridViewAssetsV.AllowUserToDeleteRows = false; - this.dataGridViewAssetsV.AllowUserToResizeRows = false; - resources.ApplyResources(this.dataGridViewAssetsV, "dataGridViewAssetsV"); - this.dataGridViewAssetsV.AssetsPerPage = 50; - this.dataGridViewAssetsV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewAssetsV.ContextMenuStrip = this.contextMenuStripAssets; - this.dataGridViewAssetsV.Name = "dataGridViewAssetsV"; - this.dataGridViewAssetsV.OrderAssetsInGrid = "Last modified"; - this.dataGridViewAssetsV.ReadOnly = true; - this.dataGridViewAssetsV.RowHeadersVisible = false; - searchObject1.SearchType = AMSExplorer.SearchIn.AssetName; - searchObject1.Text = ""; - this.dataGridViewAssetsV.SearchInName = searchObject1; - this.dataGridViewAssetsV.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridViewAssetsV.StateFilter = ""; - 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.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridViewV_RowPostPaint); - this.dataGridViewAssetsV.VisibleChanged += new System.EventHandler(this.dataGridViewV_VisibleChanged); - this.dataGridViewAssetsV.DragDrop += new System.Windows.Forms.DragEventHandler(this.dataGridViewAssetsV_DragDrop); - this.dataGridViewAssetsV.DragEnter += new System.Windows.Forms.DragEventHandler(this.dataGridViewAssetsV_DragEnter); - this.dataGridViewAssetsV.Resize += new System.EventHandler(this.dataGridViewV_Resize); - // // contextMenuStripAssets // this.contextMenuStripAssets.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1534,22 +1505,6 @@ private void InitializeComponent() resources.ApplyResources(this.clearToolStripMenuItem, "clearToolStripMenuItem"); this.clearToolStripMenuItem.Click += new System.EventHandler(this.clearToolStripMenuItem_Click); // - // dataGridViewIngestManifestsV - // - this.dataGridViewIngestManifestsV.AllowUserToAddRows = false; - this.dataGridViewIngestManifestsV.AllowUserToDeleteRows = false; - this.dataGridViewIngestManifestsV.AllowUserToResizeRows = false; - resources.ApplyResources(this.dataGridViewIngestManifestsV, "dataGridViewIngestManifestsV"); - this.dataGridViewIngestManifestsV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewIngestManifestsV.ContextMenuStrip = this.contextMenuStripIngestManifests; - this.dataGridViewIngestManifestsV.Name = "dataGridViewIngestManifestsV"; - this.dataGridViewIngestManifestsV.ReadOnly = true; - this.dataGridViewIngestManifestsV.RowHeadersVisible = false; - this.dataGridViewIngestManifestsV.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridViewIngestManifestsV.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewIngestManifestsV_CellDoubleClick); - this.dataGridViewIngestManifestsV.VisibleChanged += new System.EventHandler(this.dataGridViewV_VisibleChanged); - this.dataGridViewIngestManifestsV.Resize += new System.EventHandler(this.dataGridViewIngestManifestsV_Resize); - // // contextMenuStripIngestManifests // this.contextMenuStripIngestManifests.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1763,29 +1718,6 @@ private void InitializeComponent() this.comboBoxOrderJobs.Name = "comboBoxOrderJobs"; this.comboBoxOrderJobs.SelectedIndexChanged += new System.EventHandler(this.comboBoxOrderJobs_SelectedIndexChanged); // - // dataGridViewJobsV - // - this.dataGridViewJobsV.AllowUserToAddRows = false; - this.dataGridViewJobsV.AllowUserToDeleteRows = false; - this.dataGridViewJobsV.AllowUserToResizeRows = false; - resources.ApplyResources(this.dataGridViewJobsV, "dataGridViewJobsV"); - this.dataGridViewJobsV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewJobsV.ContextMenuStrip = this.contextMenuStripJobs; - this.dataGridViewJobsV.FilterJobsState = "All"; - this.dataGridViewJobsV.JobssPerPage = 50; - 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.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); - this.dataGridViewJobsV.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridViewV_RowPostPaint); - this.dataGridViewJobsV.VisibleChanged += new System.EventHandler(this.dataGridViewV_VisibleChanged); - this.dataGridViewJobsV.Resize += new System.EventHandler(this.dataGridViewV_Resize); - // // contextMenuStripJobs // this.contextMenuStripJobs.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1961,33 +1893,6 @@ private void InitializeComponent() resources.ApplyResources(this.panelPrograms, "panelPrograms"); this.panelPrograms.Name = "panelPrograms"; // - // dataGridViewProgramsV - // - this.dataGridViewProgramsV.AllowUserToAddRows = false; - this.dataGridViewProgramsV.AllowUserToDeleteRows = false; - this.dataGridViewProgramsV.AllowUserToResizeRows = false; - resources.ApplyResources(this.dataGridViewProgramsV, "dataGridViewProgramsV"); - 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.DisplayChannel = AMSExplorer.enumDisplayProgram.Selected; - this.dataGridViewProgramsV.FilterState = "All"; - this.dataGridViewProgramsV.ItemsPerPage = 50; - this.dataGridViewProgramsV.Name = "dataGridViewProgramsV"; - this.dataGridViewProgramsV.ReadOnly = true; - this.dataGridViewProgramsV.RowHeadersVisible = false; - searchObject2.SearchType = AMSExplorer.SearchIn.ProgramName; - searchObject2.Text = ""; - this.dataGridViewProgramsV.SearchInName = searchObject2; - this.dataGridViewProgramsV.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - 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); - this.dataGridViewProgramsV.ColumnSortModeChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.dataGridViewV_ColumnSortModeChanged); - this.dataGridViewProgramsV.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridViewV_RowPostPaint); - this.dataGridViewProgramsV.VisibleChanged += new System.EventHandler(this.dataGridViewV_VisibleChanged); - this.dataGridViewProgramsV.Resize += new System.EventHandler(this.dataGridViewV_Resize); - // // contextMenuStripPrograms // this.contextMenuStripPrograms.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -2281,32 +2186,6 @@ private void InitializeComponent() resources.ApplyResources(this.panelChannels, "panelChannels"); this.panelChannels.Name = "panelChannels"; // - // dataGridViewChannelsV - // - this.dataGridViewChannelsV.AllowUserToAddRows = false; - this.dataGridViewChannelsV.AllowUserToDeleteRows = false; - this.dataGridViewChannelsV.AllowUserToResizeRows = false; - resources.ApplyResources(this.dataGridViewChannelsV, "dataGridViewChannelsV"); - this.dataGridViewChannelsV.ChannelsPerPage = 50; - this.dataGridViewChannelsV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewChannelsV.ContextMenuStrip = this.contextMenuStripChannels; - this.dataGridViewChannelsV.FilterState = "All"; - this.dataGridViewChannelsV.Name = "dataGridViewChannelsV"; - this.dataGridViewChannelsV.ReadOnly = true; - this.dataGridViewChannelsV.RowHeadersVisible = false; - searchObject3.SearchType = AMSExplorer.SearchIn.ChannelName; - searchObject3.Text = ""; - this.dataGridViewChannelsV.SearchInName = searchObject3; - this.dataGridViewChannelsV.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - 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.ColumnSortModeChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.dataGridViewV_ColumnSortModeChanged); - this.dataGridViewChannelsV.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridViewV_RowPostPaint); - this.dataGridViewChannelsV.SelectionChanged += new System.EventHandler(this.dataGridViewLiveV_SelectionChanged); - this.dataGridViewChannelsV.VisibleChanged += new System.EventHandler(this.dataGridViewV_VisibleChanged); - this.dataGridViewChannelsV.Resize += new System.EventHandler(this.dataGridViewV_Resize); - // // contextMenuStripChannels // this.contextMenuStripChannels.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -2564,28 +2443,6 @@ private void InitializeComponent() this.tabPageOrigins.Name = "tabPageOrigins"; this.tabPageOrigins.UseVisualStyleBackColor = true; // - // dataGridViewStreamingEndpointsV - // - this.dataGridViewStreamingEndpointsV.AllowUserToAddRows = false; - this.dataGridViewStreamingEndpointsV.AllowUserToDeleteRows = false; - this.dataGridViewStreamingEndpointsV.AllowUserToResizeRows = false; - resources.ApplyResources(this.dataGridViewStreamingEndpointsV, "dataGridViewStreamingEndpointsV"); - this.dataGridViewStreamingEndpointsV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewStreamingEndpointsV.ContextMenuStrip = this.contextMenuStripStreaminEndpoints; - this.dataGridViewStreamingEndpointsV.FilterStreamingEndpointsState = "All"; - this.dataGridViewStreamingEndpointsV.Name = "dataGridViewStreamingEndpointsV"; - this.dataGridViewStreamingEndpointsV.ReadOnly = true; - this.dataGridViewStreamingEndpointsV.RowHeadersVisible = false; - this.dataGridViewStreamingEndpointsV.SearchInName = ""; - this.dataGridViewStreamingEndpointsV.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - 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); - this.dataGridViewStreamingEndpointsV.ColumnSortModeChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.dataGridViewV_ColumnSortModeChanged); - this.dataGridViewStreamingEndpointsV.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridViewV_RowPostPaint); - this.dataGridViewStreamingEndpointsV.VisibleChanged += new System.EventHandler(this.dataGridViewV_VisibleChanged); - this.dataGridViewStreamingEndpointsV.Resize += new System.EventHandler(this.dataGridViewV_Resize); - // // contextMenuStripStreaminEndpoints // this.contextMenuStripStreaminEndpoints.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -4082,7 +3939,6 @@ private void InitializeComponent() this.azureMediaServicesPlayerPageToolStripMenuItem, this.dASHIFHTML5ReferencePlayerToolStripMenuItem, this.hTML5VideoElementToolStripMenuItem, - this.iVXHLSPlayerToolStripMenuItem, this.jwPlayerToolStripMenuItem, this.tHEOPlayerToolStripMenuItem, this.toolStripSeparator29, @@ -4119,12 +3975,6 @@ private void InitializeComponent() this.hTML5VideoElementToolStripMenuItem.Name = "hTML5VideoElementToolStripMenuItem"; this.hTML5VideoElementToolStripMenuItem.Click += new System.EventHandler(this.hTML5VideoElementToolStripMenuItem_Click); // - // iVXHLSPlayerToolStripMenuItem - // - resources.ApplyResources(this.iVXHLSPlayerToolStripMenuItem, "iVXHLSPlayerToolStripMenuItem"); - this.iVXHLSPlayerToolStripMenuItem.Name = "iVXHLSPlayerToolStripMenuItem"; - this.iVXHLSPlayerToolStripMenuItem.Click += new System.EventHandler(this.iVXHLSPlayerToolStripMenuItem_Click); - // // jwPlayerToolStripMenuItem // this.jwPlayerToolStripMenuItem.Image = global::AMSExplorer.Bitmaps.external_link; @@ -4293,6 +4143,148 @@ private void InitializeComponent() this.buttonRefreshTab.UseVisualStyleBackColor = true; this.buttonRefreshTab.Click += new System.EventHandler(this.buttonRefreshTab_Click); // + // dataGridViewAssetsV + // + this.dataGridViewAssetsV.AllowDrop = true; + this.dataGridViewAssetsV.AllowUserToAddRows = false; + this.dataGridViewAssetsV.AllowUserToDeleteRows = false; + this.dataGridViewAssetsV.AllowUserToResizeRows = false; + resources.ApplyResources(this.dataGridViewAssetsV, "dataGridViewAssetsV"); + this.dataGridViewAssetsV.AssetsPerPage = 50; + this.dataGridViewAssetsV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewAssetsV.ContextMenuStrip = this.contextMenuStripAssets; + this.dataGridViewAssetsV.Name = "dataGridViewAssetsV"; + this.dataGridViewAssetsV.OrderAssetsInGrid = "Last modified"; + this.dataGridViewAssetsV.ReadOnly = true; + this.dataGridViewAssetsV.RowHeadersVisible = false; + searchObject1.SearchType = AMSExplorer.SearchIn.AssetName; + searchObject1.Text = ""; + this.dataGridViewAssetsV.SearchInName = searchObject1; + this.dataGridViewAssetsV.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridViewAssetsV.StateFilter = ""; + 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.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridViewV_RowPostPaint); + this.dataGridViewAssetsV.VisibleChanged += new System.EventHandler(this.dataGridViewV_VisibleChanged); + this.dataGridViewAssetsV.DragDrop += new System.Windows.Forms.DragEventHandler(this.dataGridViewAssetsV_DragDrop); + this.dataGridViewAssetsV.DragEnter += new System.Windows.Forms.DragEventHandler(this.dataGridViewAssetsV_DragEnter); + this.dataGridViewAssetsV.Resize += new System.EventHandler(this.dataGridViewV_Resize); + // + // dataGridViewIngestManifestsV + // + this.dataGridViewIngestManifestsV.AllowUserToAddRows = false; + this.dataGridViewIngestManifestsV.AllowUserToDeleteRows = false; + this.dataGridViewIngestManifestsV.AllowUserToResizeRows = false; + resources.ApplyResources(this.dataGridViewIngestManifestsV, "dataGridViewIngestManifestsV"); + this.dataGridViewIngestManifestsV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewIngestManifestsV.ContextMenuStrip = this.contextMenuStripIngestManifests; + this.dataGridViewIngestManifestsV.Name = "dataGridViewIngestManifestsV"; + this.dataGridViewIngestManifestsV.ReadOnly = true; + this.dataGridViewIngestManifestsV.RowHeadersVisible = false; + this.dataGridViewIngestManifestsV.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridViewIngestManifestsV.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewIngestManifestsV_CellDoubleClick); + this.dataGridViewIngestManifestsV.VisibleChanged += new System.EventHandler(this.dataGridViewV_VisibleChanged); + this.dataGridViewIngestManifestsV.Resize += new System.EventHandler(this.dataGridViewIngestManifestsV_Resize); + // + // dataGridViewJobsV + // + this.dataGridViewJobsV.AllowUserToAddRows = false; + this.dataGridViewJobsV.AllowUserToDeleteRows = false; + this.dataGridViewJobsV.AllowUserToResizeRows = false; + resources.ApplyResources(this.dataGridViewJobsV, "dataGridViewJobsV"); + this.dataGridViewJobsV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewJobsV.ContextMenuStrip = this.contextMenuStripJobs; + this.dataGridViewJobsV.FilterJobsState = "All"; + this.dataGridViewJobsV.JobssPerPage = 50; + 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.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); + this.dataGridViewJobsV.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridViewV_RowPostPaint); + this.dataGridViewJobsV.VisibleChanged += new System.EventHandler(this.dataGridViewV_VisibleChanged); + this.dataGridViewJobsV.Resize += new System.EventHandler(this.dataGridViewV_Resize); + // + // dataGridViewProgramsV + // + this.dataGridViewProgramsV.AllowUserToAddRows = false; + this.dataGridViewProgramsV.AllowUserToDeleteRows = false; + this.dataGridViewProgramsV.AllowUserToResizeRows = false; + resources.ApplyResources(this.dataGridViewProgramsV, "dataGridViewProgramsV"); + 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.DisplayChannel = AMSExplorer.enumDisplayProgram.Selected; + this.dataGridViewProgramsV.FilterState = "All"; + this.dataGridViewProgramsV.ItemsPerPage = 50; + this.dataGridViewProgramsV.Name = "dataGridViewProgramsV"; + this.dataGridViewProgramsV.ReadOnly = true; + this.dataGridViewProgramsV.RowHeadersVisible = false; + searchObject2.SearchType = AMSExplorer.SearchIn.ProgramName; + searchObject2.Text = ""; + this.dataGridViewProgramsV.SearchInName = searchObject2; + this.dataGridViewProgramsV.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + 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); + this.dataGridViewProgramsV.ColumnSortModeChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.dataGridViewV_ColumnSortModeChanged); + this.dataGridViewProgramsV.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridViewV_RowPostPaint); + this.dataGridViewProgramsV.VisibleChanged += new System.EventHandler(this.dataGridViewV_VisibleChanged); + this.dataGridViewProgramsV.Resize += new System.EventHandler(this.dataGridViewV_Resize); + // + // dataGridViewChannelsV + // + this.dataGridViewChannelsV.AllowUserToAddRows = false; + this.dataGridViewChannelsV.AllowUserToDeleteRows = false; + this.dataGridViewChannelsV.AllowUserToResizeRows = false; + resources.ApplyResources(this.dataGridViewChannelsV, "dataGridViewChannelsV"); + this.dataGridViewChannelsV.ChannelsPerPage = 50; + this.dataGridViewChannelsV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewChannelsV.ContextMenuStrip = this.contextMenuStripChannels; + this.dataGridViewChannelsV.FilterState = "All"; + this.dataGridViewChannelsV.Name = "dataGridViewChannelsV"; + this.dataGridViewChannelsV.ReadOnly = true; + this.dataGridViewChannelsV.RowHeadersVisible = false; + searchObject3.SearchType = AMSExplorer.SearchIn.ChannelName; + searchObject3.Text = ""; + this.dataGridViewChannelsV.SearchInName = searchObject3; + this.dataGridViewChannelsV.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + 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.ColumnSortModeChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.dataGridViewV_ColumnSortModeChanged); + this.dataGridViewChannelsV.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridViewV_RowPostPaint); + this.dataGridViewChannelsV.SelectionChanged += new System.EventHandler(this.dataGridViewLiveV_SelectionChanged); + this.dataGridViewChannelsV.VisibleChanged += new System.EventHandler(this.dataGridViewV_VisibleChanged); + this.dataGridViewChannelsV.Resize += new System.EventHandler(this.dataGridViewV_Resize); + // + // dataGridViewStreamingEndpointsV + // + this.dataGridViewStreamingEndpointsV.AllowUserToAddRows = false; + this.dataGridViewStreamingEndpointsV.AllowUserToDeleteRows = false; + this.dataGridViewStreamingEndpointsV.AllowUserToResizeRows = false; + resources.ApplyResources(this.dataGridViewStreamingEndpointsV, "dataGridViewStreamingEndpointsV"); + this.dataGridViewStreamingEndpointsV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewStreamingEndpointsV.ContextMenuStrip = this.contextMenuStripStreaminEndpoints; + this.dataGridViewStreamingEndpointsV.FilterStreamingEndpointsState = "All"; + this.dataGridViewStreamingEndpointsV.Name = "dataGridViewStreamingEndpointsV"; + this.dataGridViewStreamingEndpointsV.ReadOnly = true; + this.dataGridViewStreamingEndpointsV.RowHeadersVisible = false; + this.dataGridViewStreamingEndpointsV.SearchInName = ""; + this.dataGridViewStreamingEndpointsV.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + 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); + this.dataGridViewStreamingEndpointsV.ColumnSortModeChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.dataGridViewV_ColumnSortModeChanged); + this.dataGridViewStreamingEndpointsV.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridViewV_RowPostPaint); + this.dataGridViewStreamingEndpointsV.VisibleChanged += new System.EventHandler(this.dataGridViewV_VisibleChanged); + this.dataGridViewStreamingEndpointsV.Resize += new System.EventHandler(this.dataGridViewV_Resize); + // // Mainform // resources.ApplyResources(this, "$this"); @@ -4318,7 +4310,6 @@ private void InitializeComponent() this.tabControlMain.ResumeLayout(false); this.tabPageAssets.ResumeLayout(false); this.tabPageAssets.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewAssetsV)).EndInit(); this.contextMenuStripAssets.ResumeLayout(false); this.tabPageFilters.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewFilters)).EndInit(); @@ -4328,27 +4319,22 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.trackBarConcurrentTransfers)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewTransfer)).EndInit(); this.contextMenuStripTransfers.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewIngestManifestsV)).EndInit(); this.contextMenuStripIngestManifests.ResumeLayout(false); this.tabPageJobs.ResumeLayout(false); this.tabPageJobs.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.trackBarEncodingRU)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewJobsV)).EndInit(); this.contextMenuStripJobs.ResumeLayout(false); this.tabPageLive.ResumeLayout(false); this.panelPrograms.ResumeLayout(false); this.panelPrograms.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewProgramsV)).EndInit(); this.contextMenuStripPrograms.ResumeLayout(false); this.panelChannels.ResumeLayout(false); this.panelChannels.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewChannelsV)).EndInit(); this.contextMenuStripChannels.ResumeLayout(false); this.tabPageProcessors.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewProcessors)).EndInit(); this.contextMenuStripProcessors.ResumeLayout(false); this.tabPageOrigins.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewStreamingEndpointsV)).EndInit(); this.contextMenuStripStreaminEndpoints.ResumeLayout(false); this.tabPageStorage.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewStorage)).EndInit(); @@ -4361,6 +4347,12 @@ private void InitializeComponent() this.menuStripMain.PerformLayout(); this.statusStrip1.ResumeLayout(false); this.statusStrip1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewAssetsV)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewIngestManifestsV)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewJobsV)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewProgramsV)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewChannelsV)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewStreamingEndpointsV)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -4387,7 +4379,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem selectedJobToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem samplePlayersToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem dASHIFHTML5ReferencePlayerToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem iVXHLSPlayerToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripMenuItem processToolStripMenuItem; private System.Windows.Forms.StatusStrip statusStrip1; diff --git a/AMSExplorer/Mainform.cs b/AMSExplorer/Mainform.cs index 91197cb7..8fede132 100644 --- a/AMSExplorer/Mainform.cs +++ b/AMSExplorer/Mainform.cs @@ -4716,13 +4716,7 @@ private void dASHIFHTML5ReferencePlayerToolStripMenuItem_Click(object sender, Ev Process.Start(Constants.PlayerDASHIFList); } - private void iVXHLSPlayerToolStripMenuItem_Click(object sender, EventArgs e) - { - Process.Start(Constants.Player3IVXHLS); - } - - - + private void encodeAssetWithDigitalRapidsKayakCloudEngineToolStripMenuItem_Click(object sender, EventArgs e) { DoMenuEncodeWithPremiumWorkflow(); diff --git a/AMSExplorer/Mainform.resx b/AMSExplorer/Mainform.resx index 52a398ae..a36ad049 100644 --- a/AMSExplorer/Mainform.resx +++ b/AMSExplorer/Mainform.resx @@ -1110,7 +1110,7 @@ Playback - 290, 474 + 290, 452 contextMenuStripAssets @@ -1131,7 +1131,7 @@ dataGridViewAssetsV - AMSExplorer.DataGridViewAssets, AMSExplorer, Version=4.3.3.0, Culture=neutral, PublicKeyToken=null + AMSExplorer.DataGridViewAssets, AMSExplorer, Version=4.3.4.0, Culture=neutral, PublicKeyToken=null tabPageAssets @@ -1688,7 +1688,7 @@ dataGridViewIngestManifestsV - AMSExplorer.DataGridViewIngestManifest, AMSExplorer, Version=4.3.3.0, Culture=neutral, PublicKeyToken=null + AMSExplorer.DataGridViewIngestManifest, AMSExplorer, Version=4.3.4.0, Culture=neutral, PublicKeyToken=null tabPageTransfers @@ -2574,7 +2574,7 @@ dataGridViewJobsV - AMSExplorer.DataGridViewJobs, AMSExplorer, Version=4.3.3.0, Culture=neutral, PublicKeyToken=null + AMSExplorer.DataGridViewJobs, AMSExplorer, Version=4.3.4.0, Culture=neutral, PublicKeyToken=null tabPageJobs @@ -2890,7 +2890,7 @@ dataGridViewProgramsV - AMSExplorer.DataGridViewLiveProgram, AMSExplorer, Version=4.3.3.0, Culture=neutral, PublicKeyToken=null + AMSExplorer.DataGridViewLiveProgram, AMSExplorer, Version=4.3.4.0, Culture=neutral, PublicKeyToken=null panelPrograms @@ -3537,7 +3537,7 @@ dataGridViewChannelsV - AMSExplorer.DataGridViewLiveChannel, AMSExplorer, Version=4.3.3.0, Culture=neutral, PublicKeyToken=null + AMSExplorer.DataGridViewLiveChannel, AMSExplorer, Version=4.3.4.0, Culture=neutral, PublicKeyToken=null panelChannels @@ -4059,7 +4059,7 @@ dataGridViewStreamingEndpointsV - AMSExplorer.DataGridViewStreamingEndpoints, AMSExplorer, Version=4.3.3.0, Culture=neutral, PublicKeyToken=null + AMSExplorer.DataGridViewStreamingEndpoints, AMSExplorer, Version=4.3.4.0, Culture=neutral, PublicKeyToken=null tabPageOrigins @@ -6188,20 +6188,6 @@ HTML5 Video Element - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAB/SURBVDhPzZBLDoAgDEThCrryhi48kS70RK69TZ1G - SJVvNSyc5BGSMo+AISJTiQUL4IMxThAPBA5LZhDPlQIOS1bwnAeCUjqwAykzSsG9fIDN7VWCsDwA+ZOK - IFX2uSQFQQ9yZR9bEowgV5bzlSdMIHWzWpDLjwVvwdpC8B0yJ5DUzNnliX0KAAAAAElFTkSuQmCC - - - - 251, 22 - - - 3iVX HLS Player - 251, 22 @@ -8902,6 +8888,9 @@ 1020, 639 + + NoControl + {0} - Azure Media Services Explorer @@ -11113,12 +11102,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - iVXHLSPlayerToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - jwPlayerToolStripMenuItem diff --git a/AMSExplorer/Program.cs b/AMSExplorer/Program.cs index a356e14b..ce3f84f4 100644 --- a/AMSExplorer/Program.cs +++ b/AMSExplorer/Program.cs @@ -907,7 +907,6 @@ public class Constants public const string PlayerMP4AzurePage = @"https://ampdemo.azureedge.net/azuremediaplayer.html?player=html5&format=mp4&url={0}&mp4url={0}"; - public const string Player3IVXHLS = @"http://apps.microsoft.com/windows/en-us/app/3ivx-hls-player/f79ce7d0-2993-4658-bc4e-83dc182a0614"; public const string PlayerOSMFRCst = @"http://wamsclient.cloudapp.net/release/setup.html"; public const string PlayerInfoHTML5Video = @"http://www.w3schools.com/html/html5_video.asp"; public const string PlayerJWPlayerPartnership = @"https://www.jwplayer.com/"; diff --git a/AMSExplorer/Properties/AssemblyInfo.cs b/AMSExplorer/Properties/AssemblyInfo.cs index 511fb9e7..665451a1 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("4.3.3.0")] -[assembly: AssemblyFileVersion("4.3.3.0")] +[assembly: AssemblyVersion("4.3.4.0")] +[assembly: AssemblyFileVersion("4.3.4.0")] diff --git a/AMSExplorer/packages.config b/AMSExplorer/packages.config index 3ffd04aa..3e0371b0 100644 --- a/AMSExplorer/packages.config +++ b/AMSExplorer/packages.config @@ -15,8 +15,8 @@ - - + + diff --git a/AllReleaseNotes.html b/AllReleaseNotes.html index ffe6f9ec..26c02340 100644 --- a/AllReleaseNotes.html +++ b/AllReleaseNotes.html @@ -1,4 +1,11 @@ Untitled Document.md +

Version 4.3.4.0 (December 20, 2018) brings the following features and improvements :

+
    +
  • Multiple transfers bug fix
    • +
  • Updated offline documentation
    • +
  • Fix to “264 Multiple Bitrate 16x9 for iOS” preset
    • +
  • Azure Media Hyperlapse was removed from the UI as announced here
    • +

Version 4.3.3.0 (October 20, 2018) brings the following features and improvements :

  • Bug fixes
    • diff --git a/AllReleaseNotes.md b/AllReleaseNotes.md index cf7f71fe..1d4c4adf 100644 --- a/AllReleaseNotes.md +++ b/AllReleaseNotes.md @@ -1,3 +1,11 @@ +Version 4.3.4.0 (December 20, 2018) brings the following features and improvements : + +* Multiple transfers bug fix +* Updated offline documentation +* [Fix](https://github.com/Azure/Azure-Media-Services-Explorer/pull/104) to "264 Multiple Bitrate 16x9 for iOS" preset +* Azure Media Hyperlapse was removed from the UI [as announced here](https://azure.microsoft.com/en-us/updates/retirement-of-media-hyperlapse-in-preview-on-march-29-2019/) + + Version 4.3.3.0 (October 20, 2018) brings the following features and improvements : * Bug fixes diff --git a/ReleaseNotes.html b/ReleaseNotes.html index 99965095..0a32d85b 100644 --- a/ReleaseNotes.html +++ b/ReleaseNotes.html @@ -1,8 +1,10 @@ Untitled Document.md -

    Version 4.3.3.0 (October 20, 2018) brings the following features and improvements :

    +

    Version 4.3.4.0 (December 20, 2018) brings the following features and improvements :

      -
    • Bug fixes
      • -
    • Update to AMS 4.2.0 SDKs (for v2 API)
      • +
    • Multiple transfers bug fix
      • +
    • Updated offline documentation
      • +
    • Fix to “264 Multiple Bitrate 16x9 for iOS” preset
      • +
    • Azure Media Hyperlapse was removed from the UI as announced here
    \ No newline at end of file diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 1aec060e..b1bc87f9 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,4 +1,6 @@ -Version 4.3.3.0 (October 20, 2018) brings the following features and improvements : +Version 4.3.4.0 (December 20, 2018) brings the following features and improvements : -* Bug fixes -* Update to AMS 4.2.0 SDKs (for v2 API) \ No newline at end of file +* Multiple transfers bug fix +* Updated offline documentation +* [Fix](https://github.com/Azure/Azure-Media-Services-Explorer/pull/104) to "264 Multiple Bitrate 16x9 for iOS" preset +* Azure Media Hyperlapse was removed from the UI [as announced here](https://azure.microsoft.com/en-us/updates/retirement-of-media-hyperlapse-in-preview-on-march-29-2019/) \ No newline at end of file diff --git a/SetupAMSExplorer/SetupAMSExplorer.isl b/SetupAMSExplorer/SetupAMSExplorer.isl index 5c519071..69864cf5 100644 --- a/SetupAMSExplorer/SetupAMSExplorer.isl +++ b/SetupAMSExplorer/SetupAMSExplorer.isl @@ -4533,9 +4533,9 @@ UwBpAG4AZwBsAGUASQBtAGEAZwBlAAEARQB4AHAAcgBlAHMAcwA= PROGMSG_IIS_ROLLBACKVROOTS##IDS_PROGMSG_IIS_ROLLBACKVROOTS## PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS## PROGRAMFILETOLAUNCHATEND[INSTALLDIR]AMSExplorer.Primary output - ProductCode{8AC72046-1AA0-4C09-B40A-C1DA8620E989} + ProductCode{B8CDD6F6-45AC-4D85-9EE8-008DCDA87E43} ProductNameAzure Media Services Explorer - ProductVersion4.3.3.0 + ProductVersion4.3.4.0 ProgressType0install ProgressType1Installing ProgressType2installed diff --git a/version.xml b/version.xml index 29c65c07..1e6a27b2 100644 --- a/version.xml +++ b/version.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file