diff --git a/BizHawk.MultiClient/RecordMovie.Designer.cs b/BizHawk.MultiClient/RecordMovie.Designer.cs index dba2e24b2c..95751f2df3 100644 --- a/BizHawk.MultiClient/RecordMovie.Designer.cs +++ b/BizHawk.MultiClient/RecordMovie.Designer.cs @@ -28,30 +28,55 @@ /// private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RecordMovie)); this.Cancel = new System.Windows.Forms.Button(); this.OK = new System.Windows.Forms.Button(); + this.Browse = new System.Windows.Forms.Button(); + this.RecordBox = new System.Windows.Forms.TextBox(); this.SuspendLayout(); // // Cancel // this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.Cancel.Location = new System.Drawing.Point(200, 238); + this.Cancel.Location = new System.Drawing.Point(282, 238); this.Cancel.Name = "Cancel"; this.Cancel.Size = new System.Drawing.Size(75, 23); this.Cancel.TabIndex = 0; this.Cancel.Text = "&Cancel"; this.Cancel.UseVisualStyleBackColor = true; + this.Cancel.Click += new System.EventHandler(this.Cancel_Click); // // OK // this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.OK.Location = new System.Drawing.Point(108, 238); + this.OK.Location = new System.Drawing.Point(190, 238); this.OK.Name = "OK"; this.OK.Size = new System.Drawing.Size(75, 23); this.OK.TabIndex = 1; this.OK.Text = "&Ok"; this.OK.UseVisualStyleBackColor = true; + this.OK.Click += new System.EventHandler(this.OK_Click); + // + // Browse + // + this.Browse.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.Browse.Location = new System.Drawing.Point(300, 40); + this.Browse.Name = "Browse"; + this.Browse.Size = new System.Drawing.Size(62, 23); + this.Browse.TabIndex = 2; + this.Browse.Text = "&Browse..."; + this.Browse.UseVisualStyleBackColor = true; + this.Browse.Click += new System.EventHandler(this.button1_Click); + // + // RecordBox + // + this.RecordBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.RecordBox.Location = new System.Drawing.Point(13, 40); + this.RecordBox.Name = "RecordBox"; + this.RecordBox.Size = new System.Drawing.Size(277, 20); + this.RecordBox.TabIndex = 3; // // RecordMovie // @@ -59,14 +84,19 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.Cancel; - this.ClientSize = new System.Drawing.Size(292, 273); + this.ClientSize = new System.Drawing.Size(374, 273); + this.Controls.Add(this.RecordBox); + this.Controls.Add(this.Browse); this.Controls.Add(this.OK); this.Controls.Add(this.Cancel); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "RecordMovie"; this.Text = "Record Movie"; + this.Load += new System.EventHandler(this.RecordMovie_Load); this.ResumeLayout(false); + this.PerformLayout(); } @@ -74,5 +104,7 @@ private System.Windows.Forms.Button Cancel; private System.Windows.Forms.Button OK; + private System.Windows.Forms.Button Browse; + private System.Windows.Forms.TextBox RecordBox; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/RecordMovie.cs b/BizHawk.MultiClient/RecordMovie.cs index 7705824622..73801ab072 100644 --- a/BizHawk.MultiClient/RecordMovie.cs +++ b/BizHawk.MultiClient/RecordMovie.cs @@ -6,14 +6,53 @@ using System.Drawing; using System.Linq; using System.Text; using System.Windows.Forms; +using System.IO; namespace BizHawk.MultiClient { public partial class RecordMovie : Form { + Movie MovieToRecord; + public RecordMovie() { InitializeComponent(); } + + private void OK_Click(object sender, EventArgs e) + { + Global.MainForm.UserMovie = MovieToRecord; + Global.MainForm.UserMovie.StartNewRecording(); + this.Close(); + } + + private void Cancel_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void button1_Click(object sender, EventArgs e) + { + SaveFileDialog sfd = new SaveFileDialog(); + sfd.InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.MoviesPath, ""); + sfd.DefaultExt = ".tas"; + sfd.FileName = Global.Game.Name; + sfd.Filter = "Movie files (*.tas)|*.TAS"; + + Global.Sound.StopSound(); + var result = sfd.ShowDialog(); + Global.Sound.StartSound(); + if (result == DialogResult.OK) + { + var file = new FileInfo(sfd.FileName); + MovieToRecord = new Movie(sfd.FileName, MOVIEMODE.RECORD); + RecordBox.Text = sfd.FileName; + } + } + + private void RecordMovie_Load(object sender, EventArgs e) + { + + } } } diff --git a/BizHawk.MultiClient/RecordMovie.resx b/BizHawk.MultiClient/RecordMovie.resx index ff31a6db56..dd257c67b1 100644 --- a/BizHawk.MultiClient/RecordMovie.resx +++ b/BizHawk.MultiClient/RecordMovie.resx @@ -117,4 +117,33 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA////AP64aABQUFAAwNjwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAMDAAMDAwAAAAAAAAAAAAMCAgMDAwMDAwAAAAMDAAADAgICAwMDAwMDAwMCAgMAAAMCAwMD + AwMDAwMDAgIDAAMEBAQDAgMDAwMDAwICAgMDBAQEAwICAwQDAwQDAgIDAAMDAwICAgMCAgIDAwMDAAAA + AwICAgMCAgIDAgMAAAAAAAAAAwMEBAQEBAQCAwAAAAAAAwMEBAQDAwMDAwMAAAAAAwQEAwMEBAMEBAQC + AwAAAAMEBAMDBAMEBAQEAgMAAAAAAwMDBAQDBAMDAwIDAAAAAAMCAgICAgICAgMEBAMAAAAAAwICAgIC + AwMEBAQDAAAAAAADAwMDAwAAAwMDAJH/AAAAcwAAAAEAAIABAAAAAAAAAAAAAIABAADABwAA8AMAAOAD + AADAAQAAwAEAAOABAADgAAAA8AAAAPgxAAA= + + \ No newline at end of file