diff --git a/BizHawk.MultiClient/AboutBox.Designer.cs b/BizHawk.MultiClient/AboutBox.Designer.cs index 9003e25724..0127a32764 100644 --- a/BizHawk.MultiClient/AboutBox.Designer.cs +++ b/BizHawk.MultiClient/AboutBox.Designer.cs @@ -44,7 +44,7 @@ this.pictureBox3 = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.pictureBox5 = new BizHawk.MultiClient.MyViewportPanel(); - this.Close = new System.Windows.Forms.Button(); + this.CloseBtn = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.mom2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.mom1)).BeginInit(); @@ -188,22 +188,22 @@ // // Close // - this.Close.Location = new System.Drawing.Point(424, 462); - this.Close.Name = "Close"; - this.Close.Size = new System.Drawing.Size(75, 23); - this.Close.TabIndex = 18; - this.Close.Text = "&Close"; - this.Close.UseVisualStyleBackColor = true; - this.Close.Click += new System.EventHandler(this.Close_Click); - this.Close.MouseEnter += new System.EventHandler(this.Close_MouseEnter); + this.CloseBtn.Location = new System.Drawing.Point(424, 462); + this.CloseBtn.Name = "Close"; + this.CloseBtn.Size = new System.Drawing.Size(75, 23); + this.CloseBtn.TabIndex = 18; + this.CloseBtn.Text = "&Close"; + this.CloseBtn.UseVisualStyleBackColor = true; + this.CloseBtn.Click += new System.EventHandler(this.Close_Click); + this.CloseBtn.MouseEnter += new System.EventHandler(this.Close_MouseEnter); // // AboutBox // - this.AcceptButton = this.Close; + this.AcceptButton = this.CloseBtn; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(511, 486); - this.Controls.Add(this.Close); + this.Controls.Add(this.CloseBtn); this.Controls.Add(this.pictureBox5); this.Controls.Add(this.pictureBox1); this.Controls.Add(this.pictureBox3); @@ -253,6 +253,6 @@ private System.Windows.Forms.PictureBox pictureBox4; private System.Windows.Forms.PictureBox pictureBox3; private System.Windows.Forms.PictureBox pictureBox1; - private System.Windows.Forms.Button Close; + private System.Windows.Forms.Button CloseBtn; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/AboutBox.cs b/BizHawk.MultiClient/AboutBox.cs index d15018385d..616ef35fdf 100644 --- a/BizHawk.MultiClient/AboutBox.cs +++ b/BizHawk.MultiClient/AboutBox.cs @@ -182,10 +182,10 @@ namespace BizHawk.MultiClient int width = Width; int height = Height; Random r = new Random(); - width = r.Next(1, Width - Close.Width); - height = r.Next(1, Height - Close.Height); - Close.Location = new Point(width, height); - Close.BringToFront(); + width = r.Next(1, Width - CloseBtn.Width); + height = r.Next(1, Height - CloseBtn.Height); + CloseBtn.Location = new Point(width, height); + CloseBtn.BringToFront(); } } diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index f69c34cb83..bdbdaa4ce2 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -169,7 +169,6 @@ namespace BizHawk.MultiClient public int MessagesColor = -1; public int AlertMessageColor = -65536; public int LastInputColor = -23296; - public int MovieColor = -65536; public int MovieInput = -8355712; public bool DisplayFPS = false; public int DispFPSx = 0; diff --git a/BizHawk.MultiClient/DisplayManager/DisplayManager.cs b/BizHawk.MultiClient/DisplayManager/DisplayManager.cs index 1821a2a869..b0afa62d42 100644 --- a/BizHawk.MultiClient/DisplayManager/DisplayManager.cs +++ b/BizHawk.MultiClient/DisplayManager/DisplayManager.cs @@ -427,23 +427,19 @@ namespace BizHawk.MultiClient if (Global.MovieSession.Movie.Mode == MOVIEMODE.PLAY) { - g.DrawString("Play", MessageFont,Brushes.Black, - g.ClipBounds.Width-47, - 0+1); - using(var brush = new SolidBrush(Color.FromArgb(Global.Config.MovieColor))) - g.DrawString("Play", MessageFont, brush, - g.ClipBounds.Width-48, - 0); + + int r = (int)g.ClipBounds.Width; + Point[] p = { new Point(r - 20, 2), + new Point(r - 4, 12), + new Point(r - 20, 22) }; + g.FillPolygon(new SolidBrush(Color.Red), p); + g.DrawPolygon(new Pen(new SolidBrush(Color.Pink)), p); + } else if (Global.MovieSession.Movie.Mode == MOVIEMODE.RECORD) { - g.DrawString("Record",AlertFont, Brushes.Black, - g.ClipBounds.Width-65, - 0+1); - using(var brush = new SolidBrush(Color.FromArgb(Global.Config.MovieColor))) - g.DrawString("Record",AlertFont, brush, - g.ClipBounds.Width-64, - 0); + g.FillEllipse(new SolidBrush(Color.Red), new Rectangle((int)g.ClipBounds.Width - 22, 2, 20, 20)); + g.DrawEllipse(new Pen(new SolidBrush(Color.Pink)), new Rectangle((int)g.ClipBounds.Width - 22, 2, 20, 20)); } if (Global.MovieSession.Movie.Mode != MOVIEMODE.INACTIVE && Global.Config.DisplaySubtitles) diff --git a/BizHawk.MultiClient/Program.cs b/BizHawk.MultiClient/Program.cs index eb5899a620..1aa9c542c0 100644 --- a/BizHawk.MultiClient/Program.cs +++ b/BizHawk.MultiClient/Program.cs @@ -51,7 +51,6 @@ namespace BizHawk.MultiClient mf.Show(); mf.Text = title; mf.ProgramRunLoop(); - int zzz = 9; } #if WINDOWS } diff --git a/BizHawk.MultiClient/config/MessageConfig.Designer.cs b/BizHawk.MultiClient/config/MessageConfig.Designer.cs index c7b7f32555..53dabdcc3c 100644 --- a/BizHawk.MultiClient/config/MessageConfig.Designer.cs +++ b/BizHawk.MultiClient/config/MessageConfig.Designer.cs @@ -49,10 +49,6 @@ this.MovieInputText = new System.Windows.Forms.TextBox(); this.label11 = new System.Windows.Forms.Label(); this.MovieInputColor = new System.Windows.Forms.Panel(); - this.label10 = new System.Windows.Forms.Label(); - this.MovieColorText = new System.Windows.Forms.TextBox(); - this.label9 = new System.Windows.Forms.Label(); - this.MovieColorPanel = new System.Windows.Forms.Panel(); this.LInputColorPanel = new System.Windows.Forms.Panel(); this.AlertColorPanel = new System.Windows.Forms.Panel(); this.ColorPanel = new System.Windows.Forms.Panel(); @@ -80,7 +76,6 @@ this.TL = new System.Windows.Forms.RadioButton(); this.AlertColorDialog = new System.Windows.Forms.ColorDialog(); this.LInputColorDialog = new System.Windows.Forms.ColorDialog(); - this.MovieColorDialog = new System.Windows.Forms.ColorDialog(); this.MovieInputColorDialog = new System.Windows.Forms.ColorDialog(); this.MessageTypeBox.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -280,10 +275,6 @@ this.groupBox2.Controls.Add(this.MovieInputText); this.groupBox2.Controls.Add(this.label11); this.groupBox2.Controls.Add(this.MovieInputColor); - this.groupBox2.Controls.Add(this.label10); - this.groupBox2.Controls.Add(this.MovieColorText); - this.groupBox2.Controls.Add(this.label9); - this.groupBox2.Controls.Add(this.MovieColorPanel); this.groupBox2.Controls.Add(this.LInputColorPanel); this.groupBox2.Controls.Add(this.AlertColorPanel); this.groupBox2.Controls.Add(this.ColorPanel); @@ -340,43 +331,6 @@ this.MovieInputColor.TabIndex = 9; this.MovieInputColor.DoubleClick += new System.EventHandler(this.MovieInputColor_DoubleClick); // - // label10 - // - this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(3, 214); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(86, 13); - this.label10.TabIndex = 21; - this.label10.Text = "Movie messages"; - // - // MovieColorText - // - this.MovieColorText.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; - this.MovieColorText.Location = new System.Drawing.Point(45, 229); - this.MovieColorText.MaxLength = 8; - this.MovieColorText.Name = "MovieColorText"; - this.MovieColorText.ReadOnly = true; - this.MovieColorText.Size = new System.Drawing.Size(59, 20); - this.MovieColorText.TabIndex = 20; - // - // label9 - // - this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(28, 234); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(18, 13); - this.label9.TabIndex = 19; - this.label9.Text = "0x"; - // - // MovieColorPanel - // - this.MovieColorPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.MovieColorPanel.Location = new System.Drawing.Point(4, 229); - this.MovieColorPanel.Name = "MovieColorPanel"; - this.MovieColorPanel.Size = new System.Drawing.Size(20, 20); - this.MovieColorPanel.TabIndex = 8; - this.MovieColorPanel.DoubleClick += new System.EventHandler(this.MovieColorPanel_DoubleClick); - // // LInputColorPanel // this.LInputColorPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; @@ -723,11 +677,6 @@ private System.Windows.Forms.Label RerecLabel; private System.Windows.Forms.RadioButton RerecordsRadio; private System.Windows.Forms.Panel ColorPanel; - private System.Windows.Forms.TextBox MovieColorText; - private System.Windows.Forms.Label label9; - private System.Windows.Forms.Panel MovieColorPanel; - private System.Windows.Forms.ColorDialog MovieColorDialog; - private System.Windows.Forms.Label label10; private System.Windows.Forms.TextBox MovieInputText; private System.Windows.Forms.Label label11; private System.Windows.Forms.Panel MovieInputColor; diff --git a/BizHawk.MultiClient/config/MessageConfig.cs b/BizHawk.MultiClient/config/MessageConfig.cs index 374114eb66..f879daab02 100644 --- a/BizHawk.MultiClient/config/MessageConfig.cs +++ b/BizHawk.MultiClient/config/MessageConfig.cs @@ -37,7 +37,6 @@ namespace BizHawk.MultiClient int MessageColor = Global.Config.MessagesColor; int AlertColor = Global.Config.AlertMessageColor; - int MovieColor = Global.Config.MovieColor; int MovieInput = Global.Config.MovieInput; int DispFPSanchor = Global.Config.DispFPSanchor; @@ -63,7 +62,6 @@ namespace BizHawk.MultiClient MessageColorDialog.Color = Color.FromArgb(MessageColor); AlertColorDialog.Color = Color.FromArgb(AlertColor); LInputColorDialog.Color = Color.FromArgb(LastInputColor); - MovieColorDialog.Color = Color.FromArgb(MovieColor); MovieInputColorDialog.Color = Color.FromArgb(MovieInput); SetColorBox(); SetPositionInfo(); @@ -98,10 +96,6 @@ namespace BizHawk.MultiClient LInputColorPanel.BackColor = LInputColorDialog.Color; LInputText.Text = String.Format("{0:X8}", LastInputColor); - MovieColor = MovieColorDialog.Color.ToArgb(); - MovieColorPanel.BackColor = MovieColorDialog.Color; - MovieColorText.Text = String.Format("{0:X8}", MovieColor); - MovieInput = MovieInputColorDialog.Color.ToArgb(); MovieInputColor.BackColor = MovieInputColorDialog.Color; MovieInputText.Text = String.Format("{0:X8}", MovieInput); @@ -205,9 +199,7 @@ namespace BizHawk.MultiClient Global.Config.MessagesColor = MessageColor; Global.Config.AlertMessageColor = AlertColor; Global.Config.LastInputColor = LastInputColor; - Global.Config.MovieColor = MovieColor; Global.Config.MovieInput = MovieInput; - Global.Config.DispFPSanchor = DispFPSanchor; Global.Config.DispFrameanchor = DispFrameanchor; Global.Config.DispLaganchor = DispLaganchor; @@ -388,19 +380,16 @@ namespace BizHawk.MultiClient Global.Config.MessagesColor = -1; Global.Config.AlertMessageColor = -65536; Global.Config.LastInputColor = -23296; - Global.Config.MovieColor = -65536; Global.Config.MovieInput = -8355712; MessageColor = Global.Config.MessagesColor; AlertColor = Global.Config.AlertMessageColor; LastInputColor = Global.Config.LastInputColor; - MovieColor = Global.Config.MovieColor; MovieInput = Global.Config.MovieInput; MessageColorDialog.Color = Color.FromArgb(MessageColor); AlertColorDialog.Color = Color.FromArgb(AlertColor); LInputColorDialog.Color = Color.FromArgb(LastInputColor); - MovieColorDialog.Color = Color.FromArgb(MovieColor); MovieInputColorDialog.Color = Color.FromArgb(MovieInput); Global.Config.DispFPSanchor = 0; @@ -527,12 +516,6 @@ namespace BizHawk.MultiClient SetColorBox(); } - private void MovieColorPanel_DoubleClick(object sender, EventArgs e) - { - if (MovieColorDialog.ShowDialog() == DialogResult.OK) - SetColorBox(); - } - private void MovieInputColor_DoubleClick(object sender, EventArgs e) { if (MovieInputColorDialog.ShowDialog() == DialogResult.OK) diff --git a/BizHawk.MultiClient/config/MessageConfig.resx b/BizHawk.MultiClient/config/MessageConfig.resx index ba577721bf..e3d42b198e 100644 --- a/BizHawk.MultiClient/config/MessageConfig.resx +++ b/BizHawk.MultiClient/config/MessageConfig.resx @@ -126,9 +126,6 @@ 299, 17 - - 440, 17 - 577, 17