diff --git a/NHLGames/Controls/GameControl.Designer.vb b/NHLGames/Controls/GameControl.Designer.vb index 42a5e75..cc6381b 100644 --- a/NHLGames/Controls/GameControl.Designer.vb +++ b/NHLGames/Controls/GameControl.Designer.vb @@ -19,50 +19,52 @@ Namespace Controls 'Do not modify it using the code editor. Private Sub InitializeComponent() - Dim resources As ComponentResourceManager = New ComponentResourceManager(GetType(GameControl)) - Me.tt = New MetroToolTip() - Me.bpGameControl = New BorderPanel() - Me.btnLiveReplay = New Button() - Me.lblGameStatus = New MetroLabel() - Me.lblDivider = New MetroLabel() - Me.picAway = New PictureBox() - Me.lblHomeScore = New MetroLabel() - Me.lblAwayScore = New MetroLabel() - Me.lblAwayTeam = New MetroLabel() - Me.picHome = New PictureBox() - Me.lblHomeTeam = New MetroLabel() - Me.lblPeriod = New MetroLabel() - Me.flpStreams = New FlowLayoutPanel() - Me.lnkHome = New Button() - Me.lnkAway = New Button() - Me.lnkNational = New Button() - Me.lnkFrench = New Button() - Me.lnkThree = New Button() - Me.lnkSix = New Button() - Me.lnkEnd1 = New Button() - Me.lnkEnd2 = New Button() - Me.lnkRef = New Button() - Me.lnkStar = New Button() - Me.lblNotInSeason = New MetroLabel() - Me.lblStreamStatus = New MetroLabel() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(GameControl)) + Me.tt = New MetroFramework.Components.MetroToolTip() + Me.bpGameControl = New NHLGames.Controls.BorderPanel() + Me.btnRecap = New System.Windows.Forms.Button() + Me.btnLiveReplay = New System.Windows.Forms.Button() + Me.lblGameStatus = New MetroFramework.Controls.MetroLabel() + Me.lblDivider = New MetroFramework.Controls.MetroLabel() + Me.picAway = New System.Windows.Forms.PictureBox() + Me.lblHomeScore = New MetroFramework.Controls.MetroLabel() + Me.lblAwayScore = New MetroFramework.Controls.MetroLabel() + Me.lblAwayTeam = New MetroFramework.Controls.MetroLabel() + Me.picHome = New System.Windows.Forms.PictureBox() + Me.lblHomeTeam = New MetroFramework.Controls.MetroLabel() + Me.lblPeriod = New MetroFramework.Controls.MetroLabel() + Me.flpStreams = New System.Windows.Forms.FlowLayoutPanel() + Me.lnkHome = New System.Windows.Forms.Button() + Me.lnkAway = New System.Windows.Forms.Button() + Me.lnkNational = New System.Windows.Forms.Button() + Me.lnkFrench = New System.Windows.Forms.Button() + Me.lnkThree = New System.Windows.Forms.Button() + Me.lnkSix = New System.Windows.Forms.Button() + Me.lnkEnd1 = New System.Windows.Forms.Button() + Me.lnkEnd2 = New System.Windows.Forms.Button() + Me.lnkRef = New System.Windows.Forms.Button() + Me.lnkStar = New System.Windows.Forms.Button() + Me.lblNotInSeason = New MetroFramework.Controls.MetroLabel() + Me.lblStreamStatus = New MetroFramework.Controls.MetroLabel() Me.bpGameControl.SuspendLayout() - CType(Me.picAway, ISupportInitialize).BeginInit() - CType(Me.picHome, ISupportInitialize).BeginInit() + CType(Me.picAway, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.picHome, System.ComponentModel.ISupportInitialize).BeginInit() Me.flpStreams.SuspendLayout() Me.SuspendLayout() ' 'tt ' Me.tt.AutomaticDelay = 100 - Me.tt.Style = MetroColorStyle.[Default] + Me.tt.Style = MetroFramework.MetroColorStyle.[Default] Me.tt.StyleManager = Nothing - Me.tt.Theme = MetroThemeStyle.Light + Me.tt.Theme = MetroFramework.MetroThemeStyle.Light ' 'bpGameControl ' - Me.bpGameControl.BackgroundImageLayout = ImageLayout.None - Me.bpGameControl.BorderColour = Color.LightGray - Me.bpGameControl.BorderStyle = BorderStyle.FixedSingle + Me.bpGameControl.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.bpGameControl.BorderColour = System.Drawing.Color.LightGray + Me.bpGameControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.bpGameControl.Controls.Add(Me.btnRecap) Me.bpGameControl.Controls.Add(Me.btnLiveReplay) Me.bpGameControl.Controls.Add(Me.lblGameStatus) Me.bpGameControl.Controls.Add(Me.lblDivider) @@ -76,143 +78,161 @@ Namespace Controls Me.bpGameControl.Controls.Add(Me.flpStreams) Me.bpGameControl.Controls.Add(Me.lblNotInSeason) Me.bpGameControl.Controls.Add(Me.lblStreamStatus) - Me.bpGameControl.Dock = DockStyle.Fill - Me.bpGameControl.Location = New Point(0, 0) + Me.bpGameControl.Dock = System.Windows.Forms.DockStyle.Fill + Me.bpGameControl.Location = New System.Drawing.Point(0, 0) Me.bpGameControl.Name = "bpGameControl" - Me.bpGameControl.Size = New Size(312, 151) + Me.bpGameControl.Size = New System.Drawing.Size(312, 151) Me.bpGameControl.TabIndex = 9 ' + 'btnRecap + ' + Me.btnRecap.BackColor = System.Drawing.Color.Gray + Me.btnRecap.BackgroundImage = Global.NHLGames.My.Resources.Resources.recap_l + Me.btnRecap.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnRecap.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.btnRecap.FlatAppearance.BorderSize = 0 + Me.btnRecap.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Gray + Me.btnRecap.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(170, Byte), Integer), CType(CType(210, Byte), Integer)) + Me.btnRecap.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnRecap.ForeColor = System.Drawing.Color.Black + Me.btnRecap.Location = New System.Drawing.Point(286, 2) + Me.btnRecap.Name = "btnRecap" + Me.btnRecap.Size = New System.Drawing.Size(18, 18) + Me.btnRecap.TabIndex = 33 + Me.btnRecap.UseVisualStyleBackColor = False + Me.btnRecap.Visible = False + ' 'btnLiveReplay ' - Me.btnLiveReplay.BackColor = Color.Red - Me.btnLiveReplay.BackgroundImageLayout = ImageLayout.Zoom - Me.btnLiveReplay.FlatAppearance.BorderColor = Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(170, Byte), Integer), CType(CType(210, Byte), Integer)) + Me.btnLiveReplay.BackColor = System.Drawing.Color.Red + Me.btnLiveReplay.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnLiveReplay.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(170, Byte), Integer), CType(CType(210, Byte), Integer)) Me.btnLiveReplay.FlatAppearance.BorderSize = 0 - Me.btnLiveReplay.FlatAppearance.MouseDownBackColor = Color.White - Me.btnLiveReplay.FlatAppearance.MouseOverBackColor = Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) - Me.btnLiveReplay.FlatStyle = FlatStyle.Flat - Me.btnLiveReplay.ForeColor = Color.Black - Me.btnLiveReplay.Location = New Point(2, 1) + Me.btnLiveReplay.FlatAppearance.MouseDownBackColor = System.Drawing.Color.White + Me.btnLiveReplay.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.btnLiveReplay.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnLiveReplay.ForeColor = System.Drawing.Color.Black + Me.btnLiveReplay.Location = New System.Drawing.Point(2, 1) Me.btnLiveReplay.Name = "btnLiveReplay" - Me.btnLiveReplay.Size = New Size(18, 18) + Me.btnLiveReplay.Size = New System.Drawing.Size(18, 18) Me.btnLiveReplay.TabIndex = 32 Me.btnLiveReplay.UseVisualStyleBackColor = False Me.btnLiveReplay.Visible = False ' 'lblGameStatus ' - Me.lblGameStatus.BackColor = Color.Transparent - Me.lblGameStatus.FontWeight = MetroLabelWeight.Regular - Me.lblGameStatus.Location = New Point(97, 35) + Me.lblGameStatus.BackColor = System.Drawing.Color.Transparent + Me.lblGameStatus.FontWeight = MetroFramework.MetroLabelWeight.Regular + Me.lblGameStatus.Location = New System.Drawing.Point(97, 35) Me.lblGameStatus.Name = "lblGameStatus" - Me.lblGameStatus.Size = New Size(116, 50) + Me.lblGameStatus.Size = New System.Drawing.Size(116, 50) Me.lblGameStatus.TabIndex = 25 Me.lblGameStatus.Text = "GAME_STATUS" - Me.lblGameStatus.TextAlign = ContentAlignment.MiddleCenter + Me.lblGameStatus.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.lblGameStatus.UseCustomBackColor = True Me.lblGameStatus.Visible = False ' 'lblDivider ' - Me.lblDivider.BackColor = Color.Silver - Me.lblDivider.Location = New Point(155, 35) + Me.lblDivider.BackColor = System.Drawing.Color.Silver + Me.lblDivider.Location = New System.Drawing.Point(155, 35) Me.lblDivider.Name = "lblDivider" - Me.lblDivider.Size = New Size(1, 50) + Me.lblDivider.Size = New System.Drawing.Size(1, 50) Me.lblDivider.TabIndex = 29 Me.lblDivider.UseCustomBackColor = True ' 'picAway ' - Me.picAway.BackgroundImage = CType(resources.GetObject("picAway.BackgroundImage"), Image) - Me.picAway.BackgroundImageLayout = ImageLayout.Zoom - Me.picAway.Location = New Point(27, 35) + Me.picAway.BackgroundImage = CType(resources.GetObject("picAway.BackgroundImage"), System.Drawing.Image) + Me.picAway.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.picAway.Location = New System.Drawing.Point(27, 35) Me.picAway.Name = "picAway" - Me.picAway.Size = New Size(65, 50) + Me.picAway.Size = New System.Drawing.Size(65, 50) Me.picAway.TabIndex = 0 Me.picAway.TabStop = False ' 'lblHomeScore ' - Me.lblHomeScore.BackColor = Color.Transparent - Me.lblHomeScore.FontSize = MetroLabelSize.Tall - Me.lblHomeScore.FontWeight = MetroLabelWeight.Bold - Me.lblHomeScore.Location = New Point(160, 35) - Me.lblHomeScore.Margin = New Padding(0) + Me.lblHomeScore.BackColor = System.Drawing.Color.Transparent + Me.lblHomeScore.FontSize = MetroFramework.MetroLabelSize.Tall + Me.lblHomeScore.FontWeight = MetroFramework.MetroLabelWeight.Bold + Me.lblHomeScore.Location = New System.Drawing.Point(160, 35) + Me.lblHomeScore.Margin = New System.Windows.Forms.Padding(0) Me.lblHomeScore.Name = "lblHomeScore" - Me.lblHomeScore.Size = New Size(50, 50) + Me.lblHomeScore.Size = New System.Drawing.Size(50, 50) Me.lblHomeScore.TabIndex = 24 Me.lblHomeScore.Text = "0" - Me.lblHomeScore.TextAlign = ContentAlignment.MiddleCenter + Me.lblHomeScore.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.lblHomeScore.UseCustomBackColor = True Me.lblHomeScore.UseCustomForeColor = True ' 'lblAwayScore ' - Me.lblAwayScore.BackColor = Color.Transparent - Me.lblAwayScore.FontSize = MetroLabelSize.Tall - Me.lblAwayScore.FontWeight = MetroLabelWeight.Bold - Me.lblAwayScore.Location = New Point(100, 35) - Me.lblAwayScore.Margin = New Padding(0) + Me.lblAwayScore.BackColor = System.Drawing.Color.Transparent + Me.lblAwayScore.FontSize = MetroFramework.MetroLabelSize.Tall + Me.lblAwayScore.FontWeight = MetroFramework.MetroLabelWeight.Bold + Me.lblAwayScore.Location = New System.Drawing.Point(100, 35) + Me.lblAwayScore.Margin = New System.Windows.Forms.Padding(0) Me.lblAwayScore.Name = "lblAwayScore" - Me.lblAwayScore.Size = New Size(50, 50) + Me.lblAwayScore.Size = New System.Drawing.Size(50, 50) Me.lblAwayScore.TabIndex = 23 Me.lblAwayScore.Text = "0" - Me.lblAwayScore.TextAlign = ContentAlignment.MiddleCenter + Me.lblAwayScore.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.lblAwayScore.UseCustomBackColor = True Me.lblAwayScore.UseCustomForeColor = True ' 'lblAwayTeam ' - Me.lblAwayTeam.BackColor = Color.Transparent - Me.lblAwayTeam.Location = New Point(30, 88) + Me.lblAwayTeam.BackColor = System.Drawing.Color.Transparent + Me.lblAwayTeam.Location = New System.Drawing.Point(30, 88) Me.lblAwayTeam.Name = "lblAwayTeam" - Me.lblAwayTeam.Size = New Size(60, 20) + Me.lblAwayTeam.Size = New System.Drawing.Size(60, 20) Me.lblAwayTeam.TabIndex = 4 Me.lblAwayTeam.Text = "AWAY" - Me.lblAwayTeam.TextAlign = ContentAlignment.MiddleCenter + Me.lblAwayTeam.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.lblAwayTeam.UseCustomBackColor = True ' 'picHome ' - Me.picHome.BackgroundImage = CType(resources.GetObject("picHome.BackgroundImage"), Image) - Me.picHome.BackgroundImageLayout = ImageLayout.Zoom - Me.picHome.Location = New Point(218, 35) + Me.picHome.BackgroundImage = CType(resources.GetObject("picHome.BackgroundImage"), System.Drawing.Image) + Me.picHome.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.picHome.Location = New System.Drawing.Point(218, 35) Me.picHome.Name = "picHome" - Me.picHome.Size = New Size(65, 50) + Me.picHome.Size = New System.Drawing.Size(65, 50) Me.picHome.TabIndex = 1 Me.picHome.TabStop = False ' 'lblHomeTeam ' - Me.lblHomeTeam.BackColor = Color.Transparent - Me.lblHomeTeam.Location = New Point(222, 88) + Me.lblHomeTeam.BackColor = System.Drawing.Color.Transparent + Me.lblHomeTeam.Location = New System.Drawing.Point(222, 88) Me.lblHomeTeam.Name = "lblHomeTeam" - Me.lblHomeTeam.Size = New Size(60, 20) + Me.lblHomeTeam.Size = New System.Drawing.Size(60, 20) Me.lblHomeTeam.TabIndex = 4 Me.lblHomeTeam.Text = "HOME" - Me.lblHomeTeam.TextAlign = ContentAlignment.MiddleCenter + Me.lblHomeTeam.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.lblHomeTeam.UseCustomBackColor = True ' 'lblPeriod ' - Me.lblPeriod.BackColor = Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) - Me.lblPeriod.FontSize = MetroLabelSize.Small - Me.lblPeriod.FontWeight = MetroLabelWeight.Bold - Me.lblPeriod.ForeColor = Color.Black - Me.lblPeriod.Location = New Point(1, 1) + Me.lblPeriod.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.lblPeriod.FontSize = MetroFramework.MetroLabelSize.Small + Me.lblPeriod.FontWeight = MetroFramework.MetroLabelWeight.Bold + Me.lblPeriod.ForeColor = System.Drawing.Color.Black + Me.lblPeriod.Location = New System.Drawing.Point(1, 1) Me.lblPeriod.Name = "lblPeriod" - Me.lblPeriod.Size = New Size(307, 20) + Me.lblPeriod.Size = New System.Drawing.Size(307, 20) Me.lblPeriod.TabIndex = 11 Me.lblPeriod.Text = "PERIOD_STATUS" - Me.lblPeriod.TextAlign = ContentAlignment.MiddleCenter + Me.lblPeriod.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.lblPeriod.UseCustomBackColor = True Me.lblPeriod.UseCustomForeColor = True ' 'flpStreams ' - Me.flpStreams.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _ - Or AnchorStyles.Right), AnchorStyles) - Me.flpStreams.BackColor = Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.flpStreams.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.flpStreams.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.flpStreams.Controls.Add(Me.lnkHome) Me.flpStreams.Controls.Add(Me.lnkAway) Me.flpStreams.Controls.Add(Me.lnkNational) @@ -223,218 +243,217 @@ Namespace Controls Me.flpStreams.Controls.Add(Me.lnkEnd2) Me.flpStreams.Controls.Add(Me.lnkRef) Me.flpStreams.Controls.Add(Me.lnkStar) - Me.flpStreams.ForeColor = Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) - Me.flpStreams.ImeMode = ImeMode.NoControl - Me.flpStreams.Location = New Point(1, 109) + Me.flpStreams.ForeColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.flpStreams.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.flpStreams.Location = New System.Drawing.Point(1, 109) Me.flpStreams.Name = "flpStreams" - Me.flpStreams.Size = New Size(307, 38) + Me.flpStreams.Size = New System.Drawing.Size(307, 38) Me.flpStreams.TabIndex = 10 Me.flpStreams.WrapContents = False ' 'lnkHome ' - Me.lnkHome.BackgroundImage = CType(resources.GetObject("lnkHome.BackgroundImage"), Image) - Me.lnkHome.BackgroundImageLayout = ImageLayout.Zoom - Me.lnkHome.FlatAppearance.BorderColor = Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.lnkHome.BackgroundImage = CType(resources.GetObject("lnkHome.BackgroundImage"), System.Drawing.Image) + Me.lnkHome.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.lnkHome.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.lnkHome.FlatAppearance.BorderSize = 0 - Me.lnkHome.FlatAppearance.MouseOverBackColor = Color.White - Me.lnkHome.FlatStyle = FlatStyle.Flat - Me.lnkHome.ForeColor = Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) - Me.lnkHome.Location = New Point(4, 6) - Me.lnkHome.Margin = New Padding(4, 6, 4, 6) + Me.lnkHome.FlatAppearance.MouseOverBackColor = System.Drawing.Color.White + Me.lnkHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.lnkHome.ForeColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.lnkHome.Location = New System.Drawing.Point(4, 6) + Me.lnkHome.Margin = New System.Windows.Forms.Padding(4, 6, 4, 6) Me.lnkHome.Name = "lnkHome" - Me.lnkHome.Size = New Size(26, 26) + Me.lnkHome.Size = New System.Drawing.Size(26, 26) Me.lnkHome.TabIndex = 29 Me.lnkHome.UseVisualStyleBackColor = False Me.lnkHome.Visible = False ' 'lnkAway ' - Me.lnkAway.BackgroundImage = CType(resources.GetObject("lnkAway.BackgroundImage"), Image) - Me.lnkAway.BackgroundImageLayout = ImageLayout.Zoom - Me.lnkAway.FlatAppearance.BorderColor = Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.lnkAway.BackgroundImage = CType(resources.GetObject("lnkAway.BackgroundImage"), System.Drawing.Image) + Me.lnkAway.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.lnkAway.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.lnkAway.FlatAppearance.BorderSize = 0 - Me.lnkAway.FlatAppearance.MouseOverBackColor = Color.White - Me.lnkAway.FlatStyle = FlatStyle.Flat - Me.lnkAway.ForeColor = Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) - Me.lnkAway.Location = New Point(38, 6) - Me.lnkAway.Margin = New Padding(4, 6, 4, 6) + Me.lnkAway.FlatAppearance.MouseOverBackColor = System.Drawing.Color.White + Me.lnkAway.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.lnkAway.ForeColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.lnkAway.Location = New System.Drawing.Point(38, 6) + Me.lnkAway.Margin = New System.Windows.Forms.Padding(4, 6, 4, 6) Me.lnkAway.Name = "lnkAway" - Me.lnkAway.Size = New Size(26, 26) + Me.lnkAway.Size = New System.Drawing.Size(26, 26) Me.lnkAway.TabIndex = 28 Me.lnkAway.UseVisualStyleBackColor = False Me.lnkAway.Visible = False ' 'lnkNational ' - Me.lnkNational.BackgroundImage = CType(resources.GetObject("lnkNational.BackgroundImage"), Image) - Me.lnkNational.BackgroundImageLayout = ImageLayout.Zoom - Me.lnkNational.FlatAppearance.BorderColor = Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.lnkNational.BackgroundImage = CType(resources.GetObject("lnkNational.BackgroundImage"), System.Drawing.Image) + Me.lnkNational.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.lnkNational.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.lnkNational.FlatAppearance.BorderSize = 0 - Me.lnkNational.FlatAppearance.MouseOverBackColor = Color.White - Me.lnkNational.FlatStyle = FlatStyle.Flat - Me.lnkNational.ForeColor = Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) - Me.lnkNational.Location = New Point(72, 6) - Me.lnkNational.Margin = New Padding(4, 6, 4, 6) + Me.lnkNational.FlatAppearance.MouseOverBackColor = System.Drawing.Color.White + Me.lnkNational.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.lnkNational.ForeColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.lnkNational.Location = New System.Drawing.Point(72, 6) + Me.lnkNational.Margin = New System.Windows.Forms.Padding(4, 6, 4, 6) Me.lnkNational.Name = "lnkNational" - Me.lnkNational.Size = New Size(26, 26) + Me.lnkNational.Size = New System.Drawing.Size(26, 26) Me.lnkNational.TabIndex = 29 Me.lnkNational.UseVisualStyleBackColor = False Me.lnkNational.Visible = False ' 'lnkFrench ' - Me.lnkFrench.BackgroundImage = CType(resources.GetObject("lnkFrench.BackgroundImage"), Image) - Me.lnkFrench.BackgroundImageLayout = ImageLayout.Zoom - Me.lnkFrench.FlatAppearance.BorderColor = Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.lnkFrench.BackgroundImage = CType(resources.GetObject("lnkFrench.BackgroundImage"), System.Drawing.Image) + Me.lnkFrench.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.lnkFrench.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.lnkFrench.FlatAppearance.BorderSize = 0 - Me.lnkFrench.FlatAppearance.MouseOverBackColor = Color.White - Me.lnkFrench.FlatStyle = FlatStyle.Flat - Me.lnkFrench.ForeColor = Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) - Me.lnkFrench.Location = New Point(106, 6) - Me.lnkFrench.Margin = New Padding(4, 6, 4, 6) + Me.lnkFrench.FlatAppearance.MouseOverBackColor = System.Drawing.Color.White + Me.lnkFrench.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.lnkFrench.ForeColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.lnkFrench.Location = New System.Drawing.Point(106, 6) + Me.lnkFrench.Margin = New System.Windows.Forms.Padding(4, 6, 4, 6) Me.lnkFrench.Name = "lnkFrench" - Me.lnkFrench.Size = New Size(26, 26) + Me.lnkFrench.Size = New System.Drawing.Size(26, 26) Me.lnkFrench.TabIndex = 29 Me.lnkFrench.UseVisualStyleBackColor = False Me.lnkFrench.Visible = False ' 'lnkThree ' - Me.lnkThree.BackgroundImageLayout = ImageLayout.Zoom - Me.lnkThree.FlatAppearance.BorderColor = Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.lnkThree.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.lnkThree.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.lnkThree.FlatAppearance.BorderSize = 0 - Me.lnkThree.FlatAppearance.MouseOverBackColor = Color.White - Me.lnkThree.FlatStyle = FlatStyle.Flat - Me.lnkThree.ForeColor = Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) - Me.lnkThree.Location = New Point(140, 6) - Me.lnkThree.Margin = New Padding(4, 6, 4, 6) + Me.lnkThree.FlatAppearance.MouseOverBackColor = System.Drawing.Color.White + Me.lnkThree.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.lnkThree.ForeColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.lnkThree.Location = New System.Drawing.Point(140, 6) + Me.lnkThree.Margin = New System.Windows.Forms.Padding(4, 6, 4, 6) Me.lnkThree.Name = "lnkThree" - Me.lnkThree.Size = New Size(26, 26) + Me.lnkThree.Size = New System.Drawing.Size(26, 26) Me.lnkThree.TabIndex = 29 Me.lnkThree.UseVisualStyleBackColor = False Me.lnkThree.Visible = False ' 'lnkSix ' - Me.lnkSix.BackgroundImageLayout = ImageLayout.Zoom - Me.lnkSix.FlatAppearance.BorderColor = Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.lnkSix.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.lnkSix.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.lnkSix.FlatAppearance.BorderSize = 0 - Me.lnkSix.FlatAppearance.MouseOverBackColor = Color.White - Me.lnkSix.FlatStyle = FlatStyle.Flat - Me.lnkSix.ForeColor = Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) - Me.lnkSix.Location = New Point(174, 6) - Me.lnkSix.Margin = New Padding(4, 6, 4, 6) + Me.lnkSix.FlatAppearance.MouseOverBackColor = System.Drawing.Color.White + Me.lnkSix.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.lnkSix.ForeColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.lnkSix.Location = New System.Drawing.Point(174, 6) + Me.lnkSix.Margin = New System.Windows.Forms.Padding(4, 6, 4, 6) Me.lnkSix.Name = "lnkSix" - Me.lnkSix.Size = New Size(26, 26) + Me.lnkSix.Size = New System.Drawing.Size(26, 26) Me.lnkSix.TabIndex = 29 Me.lnkSix.UseVisualStyleBackColor = False Me.lnkSix.Visible = False ' 'lnkEnd1 ' - Me.lnkEnd1.BackgroundImageLayout = ImageLayout.Zoom - Me.lnkEnd1.FlatAppearance.BorderColor = Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.lnkEnd1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.lnkEnd1.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.lnkEnd1.FlatAppearance.BorderSize = 0 - Me.lnkEnd1.FlatAppearance.MouseOverBackColor = Color.White - Me.lnkEnd1.FlatStyle = FlatStyle.Flat - Me.lnkEnd1.ForeColor = Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) - Me.lnkEnd1.Location = New Point(208, 6) - Me.lnkEnd1.Margin = New Padding(4, 6, 4, 6) + Me.lnkEnd1.FlatAppearance.MouseOverBackColor = System.Drawing.Color.White + Me.lnkEnd1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.lnkEnd1.ForeColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.lnkEnd1.Location = New System.Drawing.Point(208, 6) + Me.lnkEnd1.Margin = New System.Windows.Forms.Padding(4, 6, 4, 6) Me.lnkEnd1.Name = "lnkEnd1" - Me.lnkEnd1.Size = New Size(26, 26) + Me.lnkEnd1.Size = New System.Drawing.Size(26, 26) Me.lnkEnd1.TabIndex = 29 Me.lnkEnd1.UseVisualStyleBackColor = False Me.lnkEnd1.Visible = False ' 'lnkEnd2 ' - Me.lnkEnd2.BackgroundImageLayout = ImageLayout.Zoom - Me.lnkEnd2.FlatAppearance.BorderColor = Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.lnkEnd2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.lnkEnd2.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.lnkEnd2.FlatAppearance.BorderSize = 0 - Me.lnkEnd2.FlatAppearance.MouseOverBackColor = Color.White - Me.lnkEnd2.FlatStyle = FlatStyle.Flat - Me.lnkEnd2.ForeColor = Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) - Me.lnkEnd2.Location = New Point(242, 6) - Me.lnkEnd2.Margin = New Padding(4, 6, 4, 6) + Me.lnkEnd2.FlatAppearance.MouseOverBackColor = System.Drawing.Color.White + Me.lnkEnd2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.lnkEnd2.ForeColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.lnkEnd2.Location = New System.Drawing.Point(242, 6) + Me.lnkEnd2.Margin = New System.Windows.Forms.Padding(4, 6, 4, 6) Me.lnkEnd2.Name = "lnkEnd2" - Me.lnkEnd2.Size = New Size(26, 26) + Me.lnkEnd2.Size = New System.Drawing.Size(26, 26) Me.lnkEnd2.TabIndex = 29 Me.lnkEnd2.UseVisualStyleBackColor = False Me.lnkEnd2.Visible = False ' 'lnkRef ' - Me.lnkRef.BackgroundImageLayout = ImageLayout.Zoom - Me.lnkRef.FlatAppearance.BorderColor = Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.lnkRef.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.lnkRef.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.lnkRef.FlatAppearance.BorderSize = 0 - Me.lnkRef.FlatAppearance.MouseOverBackColor = Color.White - Me.lnkRef.FlatStyle = FlatStyle.Flat - Me.lnkRef.ForeColor = Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) - Me.lnkRef.Location = New Point(276, 6) - Me.lnkRef.Margin = New Padding(4, 6, 4, 6) + Me.lnkRef.FlatAppearance.MouseOverBackColor = System.Drawing.Color.White + Me.lnkRef.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.lnkRef.ForeColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.lnkRef.Location = New System.Drawing.Point(276, 6) + Me.lnkRef.Margin = New System.Windows.Forms.Padding(4, 6, 4, 6) Me.lnkRef.Name = "lnkRef" - Me.lnkRef.Size = New Size(26, 26) + Me.lnkRef.Size = New System.Drawing.Size(26, 26) Me.lnkRef.TabIndex = 29 Me.lnkRef.UseVisualStyleBackColor = False Me.lnkRef.Visible = False ' 'lnkStar ' - Me.lnkStar.BackgroundImageLayout = ImageLayout.Zoom - Me.lnkStar.FlatAppearance.BorderColor = Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.lnkStar.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.lnkStar.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.lnkStar.FlatAppearance.BorderSize = 0 - Me.lnkStar.FlatAppearance.MouseOverBackColor = Color.White - Me.lnkStar.FlatStyle = FlatStyle.Flat - Me.lnkStar.ForeColor = Color.CornflowerBlue - Me.lnkStar.Location = New Point(310, 6) - Me.lnkStar.Margin = New Padding(4, 6, 4, 6) + Me.lnkStar.FlatAppearance.MouseOverBackColor = System.Drawing.Color.White + Me.lnkStar.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.lnkStar.ForeColor = System.Drawing.Color.CornflowerBlue + Me.lnkStar.Location = New System.Drawing.Point(310, 6) + Me.lnkStar.Margin = New System.Windows.Forms.Padding(4, 6, 4, 6) Me.lnkStar.Name = "lnkStar" - Me.lnkStar.Size = New Size(26, 26) + Me.lnkStar.Size = New System.Drawing.Size(26, 26) Me.lnkStar.TabIndex = 30 Me.lnkStar.UseVisualStyleBackColor = True Me.lnkStar.Visible = False ' 'lblNotInSeason ' - Me.lblNotInSeason.BackColor = Color.Transparent - Me.lblNotInSeason.FontSize = MetroLabelSize.Small - Me.lblNotInSeason.Location = New Point(2, 88) + Me.lblNotInSeason.BackColor = System.Drawing.Color.Transparent + Me.lblNotInSeason.FontSize = MetroFramework.MetroLabelSize.Small + Me.lblNotInSeason.Location = New System.Drawing.Point(2, 88) Me.lblNotInSeason.Name = "lblNotInSeason" - Me.lblNotInSeason.Size = New Size(306, 20) + Me.lblNotInSeason.Size = New System.Drawing.Size(306, 20) Me.lblNotInSeason.TabIndex = 13 Me.lblNotInSeason.Text = "NOT_IN_SEASON" - Me.lblNotInSeason.TextAlign = ContentAlignment.MiddleCenter + Me.lblNotInSeason.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.lblNotInSeason.UseCustomBackColor = True ' 'lblStreamStatus ' - Me.lblStreamStatus.Anchor = CType(((AnchorStyles.Bottom Or AnchorStyles.Left) _ - Or AnchorStyles.Right), AnchorStyles) - Me.lblStreamStatus.BackColor = Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) - Me.lblStreamStatus.FontWeight = MetroLabelWeight.Regular - Me.lblStreamStatus.ForeColor = Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) - Me.lblStreamStatus.Location = New Point(1, 109) + Me.lblStreamStatus.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblStreamStatus.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.lblStreamStatus.FontWeight = MetroFramework.MetroLabelWeight.Regular + Me.lblStreamStatus.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.lblStreamStatus.Location = New System.Drawing.Point(1, 109) Me.lblStreamStatus.Name = "lblStreamStatus" - Me.lblStreamStatus.Size = New Size(307, 38) + Me.lblStreamStatus.Size = New System.Drawing.Size(307, 38) Me.lblStreamStatus.TabIndex = 27 Me.lblStreamStatus.Text = "STREAM_STATUS" - Me.lblStreamStatus.TextAlign = ContentAlignment.MiddleCenter + Me.lblStreamStatus.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.lblStreamStatus.UseCustomBackColor = True Me.lblStreamStatus.UseCustomForeColor = True ' 'GameControl ' - Me.AutoScaleMode = AutoScaleMode.None - Me.BackColor = Color.White + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None + Me.BackColor = System.Drawing.Color.White Me.Controls.Add(Me.bpGameControl) - Me.Font = New Font("Segoe UI", 9.0!, FontStyle.Regular, GraphicsUnit.Point, CType(0, Byte)) + Me.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Name = "GameControl" - Me.Size = New Size(312, 151) + Me.Size = New System.Drawing.Size(312, 151) Me.bpGameControl.ResumeLayout(False) - Me.bpGameControl.PerformLayout() - CType(Me.picAway, ISupportInitialize).EndInit() - CType(Me.picHome, ISupportInitialize).EndInit() + CType(Me.picAway, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.picHome, System.ComponentModel.ISupportInitialize).EndInit() Me.flpStreams.ResumeLayout(False) Me.ResumeLayout(False) @@ -465,5 +484,6 @@ Namespace Controls Friend WithEvents lnkRef As Button Friend WithEvents lnkStar As Button Friend WithEvents lnkEnd1 As Button + Friend WithEvents btnRecap As Button End Class End Namespace \ No newline at end of file diff --git a/NHLGames/Controls/GameControl.resx b/NHLGames/Controls/GameControl.resx index 2880426..6f5f7fa 100644 --- a/NHLGames/Controls/GameControl.resx +++ b/NHLGames/Controls/GameControl.resx @@ -123,15 +123,12 @@ True - + True True - - True - True @@ -2174,6 +2171,42 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + iVBORw0KGgoAAAANSUhEUgAAAjQAAAKACAYAAACL0OJgAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -6217,12 +6250,6 @@ True - - True - - - True - True diff --git a/NHLGames/Controls/GameControl.vb b/NHLGames/Controls/GameControl.vb index 61f1f83..3176585 100644 --- a/NHLGames/Controls/GameControl.vb +++ b/NHLGames/Controls/GameControl.vb @@ -16,7 +16,7 @@ Namespace Controls Private ReadOnly _showTeamCityAbr As Boolean Private ReadOnly _showLiveTime As Boolean Private ReadOnly _broadcasters As Dictionary(Of String, String) - Public LiveReplayCode As LiveStatusCodeEnum = LiveStatusCodeEnum.Live + Public LiveReplayCode As LiveStatusCodeEnum Private _lnkUnknowns() As Button Private _themeChar = "l" Private _defaultBackColor = Color.FromArgb(224, 224, 224) @@ -93,6 +93,8 @@ Namespace Controls lblHomeScore.Visible = showScores lblAwayScore.Visible = showScores lblGameStatus.Visible = Not showScores + btnRecap.Visible = _game.Recap?.StreamUrl <> String.Empty + tt.SetToolTip(btnRecap, NHLGamesMetro.RmText.GetString("tipRecap")) If _game.HomeScore < _game.AwayScore Then lblHomeScore.ForeColor = Color.Gray @@ -102,7 +104,7 @@ Namespace Controls If showScores Then lblPeriod.Text = gameState - If Not String.Equals(_game.GamePeriod, $"3rd", StringComparison.CurrentCultureIgnoreCase) And _game.GamePeriod <> "" Then + If Not String.Equals(_game.GamePeriod, $"3rd", StringComparison.CurrentCultureIgnoreCase) And _game.GamePeriod <> String.Empty Then lblPeriod.Text = (gameState & $"/" & _game.GamePeriod. Replace($"OT", NHLGamesMetro.RmText.GetString("gamePeriodOt")). @@ -274,20 +276,22 @@ Namespace Controls Next End If - If Not _game.IsUnplayable Then - If _game.GameState < GameStateEnum.Ended And _game.GameDate.ToLocalTime() <= Date.Today.AddDays(1) Then + If _game.IsUnplayable Then + bpGameControl.BorderColour = Color.DarkOrange + Else + If _game.IsTodaysGame Then bpGameControl.BorderColour = Color.FromArgb(255, 0, 170, 210) Else bpGameControl.BorderColour = Color.FromArgb(255, 100, 100, 100) End If - Else - bpGameControl.BorderColour = Color.DarkOrange End If UpdateGame(_showScores, _showLiveScores, _showSeriesRecord, _showTeamCityAbr, _showLiveTime) End Sub Private Sub SetWholeGamePanel() + LiveReplayCode = If(_game.IsOffTheAir, LiveStatusCodeEnum.Replay, LiveStatusCodeEnum.Live) + SetTeamLogo(picAway, $"{_game.AwayAbbrev}_{_themeChar}") SetTeamLogo(picHome, $"{_game.HomeAbbrev}_{_themeChar}") @@ -399,6 +403,15 @@ Namespace Controls If Not args.Stream?.IsBroken Then Player.Watch(args) End Sub + Private Sub btnRecap_Click(sender As Object, e As EventArgs) Handles btnRecap.Click + Dim args = WatchArgs() + args.GameDate = _game.GameDate + args.Stream = _game.Recap + args.GameTitle = _game.AwayAbbrev & " @ " & _game.HomeAbbrev + args.GameIsOnAir = False + Player.Watch(args) + End Sub + Private Sub lnkAway_Click(sender As Object, e As EventArgs) Handles lnkAway.Click WatchStream(StreamTypeEnum.Away) End Sub @@ -471,6 +484,7 @@ Namespace Controls If lnkStar IsNot Nothing Then lnkStar.Dispose() If lblNotInSeason IsNot Nothing Then lblNotInSeason.Dispose() If lblStreamStatus IsNot Nothing Then lblStreamStatus.Dispose() + If btnRecap IsNot Nothing Then btnRecap.Dispose() If bpGameControl IsNot Nothing Then bpGameControl.Controls.Clear() bpGameControl.Dispose() @@ -496,7 +510,7 @@ Namespace Controls flpStreams.BackColor = Color.FromArgb(80, 80, 80) lblPeriod.BackColor = Color.FromArgb(80, 80, 80) lblStreamStatus.BackColor = Color.FromArgb(80, 80, 80) - lblStreamStatus.ForeColor = Color.LightGray + lblStreamStatus.ForeColor = Color.LightGray lblAwayTeam.Theme = MetroThemeStyle.Dark lblHomeTeam.Theme = MetroThemeStyle.Dark lblGameStatus.Theme = MetroThemeStyle.Dark @@ -505,6 +519,7 @@ Namespace Controls lblHomeScore.ForeColor = Color.LightGray lblNotInSeason.Theme = MetroThemeStyle.Dark lblDivider.BackColor = Color.Black + btnRecap.FlatAppearance.BorderColor = Color.LightGray For Each lnk In New Button() {lnkHome, lnkAway, lnkFrench, lnkNational, lnkEnd1, lnkEnd2, lnkRef, lnkStar, lnkThree, lnkSix} lnk.FlatAppearance.BorderColor = Color.FromArgb(80, 80, 80) lnk.FlatAppearance.MouseOverBackColor = Color.FromArgb(100, 100, 100) @@ -524,6 +539,7 @@ Namespace Controls lnkStar.BackgroundImage = ImageFetcher.GetEmbeddedImage("cam_star") lnkThree.BackgroundImage = ImageFetcher.GetEmbeddedImage("cam3way") lnkSix.BackgroundImage = ImageFetcher.GetEmbeddedImage("cam6way") + btnRecap.BackgroundImage = ImageFetcher.GetEmbeddedImage($"recap_{_themeChar}") End Sub End Class End Namespace diff --git a/NHLGames/English.resx b/NHLGames/English.resx index 5cc29d2..33e9559 100644 --- a/NHLGames/English.resx +++ b/NHLGames/English.resx @@ -246,7 +246,7 @@ Game panel - Save as + Output Settings tab @@ -910,7 +910,7 @@ Console - MLBAMProxy: Proxy is getting ready + MLBAMProxy: Proxy {0} is getting ready Console @@ -973,4 +973,8 @@ Server unavailable Game panel + + Recap + Game panel + \ No newline at end of file diff --git a/NHLGames/English1.Designer.vb b/NHLGames/English1.Designer.vb index 2ceaf5d..f5cf3e8 100644 --- a/NHLGames/English1.Designer.vb +++ b/NHLGames/English1.Designer.vb @@ -947,7 +947,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to Save as. + ''' Looks up a localized string similar to Output. ''' Friend Shared ReadOnly Property lblOutput() As String Get @@ -1487,7 +1487,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to MLBAMProxy: Proxy is getting ready. + ''' Looks up a localized string similar to MLBAMProxy: Proxy {0} is getting ready. ''' Friend Shared ReadOnly Property msgProxyStarting() As String Get @@ -1954,6 +1954,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Recap. + ''' + Friend Shared ReadOnly Property tipRecap() As String + Get + Return ResourceManager.GetString("tipRecap", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Refresh. ''' diff --git a/NHLGames/French.Designer.vb b/NHLGames/French.Designer.vb index ea09e60..73bae5f 100644 --- a/NHLGames/French.Designer.vb +++ b/NHLGames/French.Designer.vb @@ -767,7 +767,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to Enregistrer sous. + ''' Looks up a localized string similar to Sauvegarde. ''' Friend Shared ReadOnly Property lblOutput() As String Get @@ -1468,6 +1468,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Résumé. + ''' + Friend Shared ReadOnly Property tipRecap() As String + Get + Return ResourceManager.GetString("tipRecap", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Rafraîchir. ''' diff --git a/NHLGames/French.resx b/NHLGames/French.resx index 946f099..fd89970 100644 --- a/NHLGames/French.resx +++ b/NHLGames/French.resx @@ -754,7 +754,11 @@ Game panel - Enregistrer sous + Sauvegarde Settings tab + + Résumé + Game panel + \ No newline at end of file diff --git a/NHLGames/NHLGames.vbproj b/NHLGames/NHLGames.vbproj index 8c98a0e..39d3c66 100644 --- a/NHLGames/NHLGames.vbproj +++ b/NHLGames/NHLGames.vbproj @@ -471,6 +471,10 @@ + + + +