From 2a845ebc3b3937c5bd018a2b79b6c6144ea06d8e Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 2 Mar 2013 14:25:31 +0000 Subject: [PATCH] Play Movie Dialog - fix time display of seconds, support ctrl+C on play movie list --- BizHawk.MultiClient/PlayMovie.Designer.cs | 1 + BizHawk.MultiClient/PlayMovie.cs | 62 ++++++++++++- BizHawk.MultiClient/movie/Movie.cs | 6 ++ .../tools/HexEditor.Designer.cs | 88 ++++++++++--------- BizHawk.MultiClient/tools/HexEditor.cs | 10 +++ 5 files changed, 122 insertions(+), 45 deletions(-) diff --git a/BizHawk.MultiClient/PlayMovie.Designer.cs b/BizHawk.MultiClient/PlayMovie.Designer.cs index 34b0f06ef4..3264907c32 100644 --- a/BizHawk.MultiClient/PlayMovie.Designer.cs +++ b/BizHawk.MultiClient/PlayMovie.Designer.cs @@ -255,6 +255,7 @@ this.MovieView.DragDrop += new System.Windows.Forms.DragEventHandler(this.MovieView_DragDrop); this.MovieView.DragEnter += new System.Windows.Forms.DragEventHandler(this.MovieView_DragEnter); this.MovieView.DoubleClick += new System.EventHandler(this.MovieView_DoubleClick); + this.MovieView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.MovieView_KeyDown); // // columnHeader1 // diff --git a/BizHawk.MultiClient/PlayMovie.cs b/BizHawk.MultiClient/PlayMovie.cs index c665252c71..067f127131 100644 --- a/BizHawk.MultiClient/PlayMovie.cs +++ b/BizHawk.MultiClient/PlayMovie.cs @@ -208,9 +208,13 @@ namespace BizHawk.MultiClient { int x = MovieList.Count; if (x == 1) + { MovieCount.Text = x.ToString() + " movie"; + } else + { MovieCount.Text = x.ToString() + " movies"; + } } private void PreHighlightMovie() @@ -236,15 +240,20 @@ namespace BizHawk.MultiClient for (int x = 0; x < Indexes.Count; x++) { if (Path.GetExtension(MovieList[Indexes[x]].Filename).ToUpper() == "." + Global.Config.MovieExtension) + { TAS.Add(x); + } } + if (TAS.Count == 1) { HighlightMovie(TAS[0]); return; } - if (TAS.Count > 1) + else if (TAS.Count > 1) + { Indexes = new List(TAS); + } //Final tie breaker - Last used file DateTime t = new DateTime(); @@ -286,26 +295,37 @@ namespace BizHawk.MultiClient string d = PathManager.MakeAbsolutePath(Global.Config.MoviesPath); if (!Directory.Exists(d)) + { Directory.CreateDirectory(d); + } string extension = "*." + Global.Config.MovieExtension; + foreach (string f in Directory.GetFiles(d, "*." + Global.Config.MovieExtension)) + { AddMovieToList(f, false); + } if (Global.Config.MovieExtension != "*.tas") { foreach (string f in Directory.GetFiles(d, "*.tas")) + { AddMovieToList(f, false); + } } else if (Global.Config.MovieExtension != "*.bkm") { foreach (string f in Directory.GetFiles(d, "*.bkm")) + { AddMovieToList(f, false); + } } if (Global.Config.PlayMovie_ShowStateFiles) { foreach (string f in Directory.GetFiles(d, "*.state")) + { AddStateToList(f); + } } if (Global.Config.PlayMovie_IncludeSubdir) @@ -314,11 +334,16 @@ namespace BizHawk.MultiClient foreach (string dir in subs) { foreach (string f in Directory.GetFiles(dir, "*." + Global.Config.MovieExtension)) + { AddMovieToList(f, false); + } + if (Global.Config.PlayMovie_ShowStateFiles) { foreach (string f in Directory.GetFiles(d, "*.state")) + { AddStateToList(f); + } } } } @@ -326,7 +351,6 @@ namespace BizHawk.MultiClient private void PlayMovie_Load(object sender, EventArgs e) { - IncludeSubDirectories.Checked = Global.Config.PlayMovie_IncludeSubdir; ShowStateFiles.Checked = Global.Config.PlayMovie_ShowStateFiles; MatchGameNameCheckBox.Checked = Global.Config.PlayMovie_MatchGameName; @@ -387,15 +411,24 @@ namespace BizHawk.MultiClient DetailsView.Items.Add(item); } + if (MovieList[x].Header.Comments.Count > 0) + { button1.Enabled = true; + } else + { button1.Enabled = false; + } if (MovieList[x].Subtitles.Count() > 0) + { button2.Enabled = true; + } else + { button2.Enabled = false; + } } private void button1_Click(object sender, EventArgs e) @@ -482,5 +515,30 @@ namespace BizHawk.MultiClient PreHighlightMovie(); } + private void MovieView_KeyDown(object sender, KeyEventArgs e) + { + if (e.Control && e.KeyCode == Keys.C) + { + ListView.SelectedIndexCollection indexes = MovieView.SelectedIndices; + if (indexes.Count > 0) + { + StringBuilder copyStr = new StringBuilder(); + foreach (int index in indexes) + { + copyStr.Append(MovieList[index].Filename); + copyStr.Append('\t'); + copyStr.Append(MovieList[index].SysID); + copyStr.Append('\t'); + copyStr.Append(MovieList[index].GameName); + copyStr.Append('\t'); + copyStr.Append(MovieList[index].GetTime(true)); + copyStr.Append('\n'); + + Clipboard.SetDataObject(copyStr.ToString()); + } + } + } + } + } } diff --git a/BizHawk.MultiClient/movie/Movie.cs b/BizHawk.MultiClient/movie/Movie.cs index 157e0a6854..d02e20eb31 100644 --- a/BizHawk.MultiClient/movie/Movie.cs +++ b/BizHawk.MultiClient/movie/Movie.cs @@ -746,6 +746,12 @@ namespace BizHawk.MultiClient } time += MakeDigits(minutes) + ":"; + + if (sec < 10) //Kludge + { + time += "0"; + } + time += Math.Round((decimal)sec, 2).ToString(); return time; diff --git a/BizHawk.MultiClient/tools/HexEditor.Designer.cs b/BizHawk.MultiClient/tools/HexEditor.Designer.cs index 02e02d82a7..2ae9949ea9 100644 --- a/BizHawk.MultiClient/tools/HexEditor.Designer.cs +++ b/BizHawk.MultiClient/tools/HexEditor.Designer.cs @@ -113,7 +113,7 @@ this.toolStripSeparator1, this.exitToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); this.fileToolStripMenuItem.Text = "&File"; this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.fileToolStripMenuItem_DropDownOpened); // @@ -122,36 +122,36 @@ this.saveToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.saveToolStripMenuItem.Size = new System.Drawing.Size(225, 22); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(229, 22); this.saveToolStripMenuItem.Text = "Save"; this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); // // saveAsBinaryToolStripMenuItem // this.saveAsBinaryToolStripMenuItem.Name = "saveAsBinaryToolStripMenuItem"; - this.saveAsBinaryToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.S))); - this.saveAsBinaryToolStripMenuItem.Size = new System.Drawing.Size(225, 22); + this.saveAsBinaryToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.S))); + this.saveAsBinaryToolStripMenuItem.Size = new System.Drawing.Size(229, 22); this.saveAsBinaryToolStripMenuItem.Text = "Save as binary..."; this.saveAsBinaryToolStripMenuItem.Click += new System.EventHandler(this.saveAsBinaryToolStripMenuItem_Click); // // dumpToFileToolStripMenuItem // this.dumpToFileToolStripMenuItem.Name = "dumpToFileToolStripMenuItem"; - this.dumpToFileToolStripMenuItem.Size = new System.Drawing.Size(225, 22); + this.dumpToFileToolStripMenuItem.Size = new System.Drawing.Size(229, 22); this.dumpToFileToolStripMenuItem.Text = "Save as text..."; this.dumpToFileToolStripMenuItem.Click += new System.EventHandler(this.dumpToFileToolStripMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(222, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(226, 6); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.exitToolStripMenuItem.Size = new System.Drawing.Size(225, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(229, 22); this.exitToolStripMenuItem.Text = "E&xit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // @@ -165,7 +165,7 @@ this.findNextToolStripMenuItem, this.findPrevToolStripMenuItem}); this.editToolStripMenuItem.Name = "editToolStripMenuItem"; - this.editToolStripMenuItem.Size = new System.Drawing.Size(37, 20); + this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); this.editToolStripMenuItem.Text = "&Edit"; this.editToolStripMenuItem.DropDownOpened += new System.EventHandler(this.editToolStripMenuItem_DropDownOpened); // @@ -174,7 +174,7 @@ this.copyToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Duplicate; this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; this.copyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); - this.copyToolStripMenuItem.Size = new System.Drawing.Size(144, 22); + this.copyToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.copyToolStripMenuItem.Text = "&Copy"; this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click); // @@ -183,20 +183,20 @@ this.pasteToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Paste; this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem"; this.pasteToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V))); - this.pasteToolStripMenuItem.Size = new System.Drawing.Size(144, 22); + this.pasteToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.pasteToolStripMenuItem.Text = "&Paste"; this.pasteToolStripMenuItem.Click += new System.EventHandler(this.pasteToolStripMenuItem_Click); // // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(141, 6); + this.toolStripSeparator6.Size = new System.Drawing.Size(143, 6); // // findToolStripMenuItem1 // this.findToolStripMenuItem1.Name = "findToolStripMenuItem1"; this.findToolStripMenuItem1.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); - this.findToolStripMenuItem1.Size = new System.Drawing.Size(144, 22); + this.findToolStripMenuItem1.Size = new System.Drawing.Size(146, 22); this.findToolStripMenuItem1.Text = "&Find..."; this.findToolStripMenuItem1.Click += new System.EventHandler(this.findToolStripMenuItem1_Click); // @@ -204,7 +204,7 @@ // this.findNextToolStripMenuItem.Name = "findNextToolStripMenuItem"; this.findNextToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F3; - this.findNextToolStripMenuItem.Size = new System.Drawing.Size(144, 22); + this.findNextToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.findNextToolStripMenuItem.Text = "Find Next"; this.findNextToolStripMenuItem.Click += new System.EventHandler(this.findNextToolStripMenuItem_Click); // @@ -212,7 +212,7 @@ // this.findPrevToolStripMenuItem.Name = "findPrevToolStripMenuItem"; this.findPrevToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F2; - this.findPrevToolStripMenuItem.Size = new System.Drawing.Size(144, 22); + this.findPrevToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.findPrevToolStripMenuItem.Text = "Find Prev"; this.findPrevToolStripMenuItem.Click += new System.EventHandler(this.findPrevToolStripMenuItem_Click); // @@ -229,14 +229,14 @@ this.unfreezeAllToolStripMenuItem, this.pokeAddressToolStripMenuItem}); this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; - this.optionsToolStripMenuItem.Size = new System.Drawing.Size(56, 20); + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(61, 20); this.optionsToolStripMenuItem.Text = "&Options"; this.optionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.optionsToolStripMenuItem_DropDownOpened); // // memoryDomainsToolStripMenuItem // this.memoryDomainsToolStripMenuItem.Name = "memoryDomainsToolStripMenuItem"; - this.memoryDomainsToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.memoryDomainsToolStripMenuItem.Size = new System.Drawing.Size(219, 22); this.memoryDomainsToolStripMenuItem.Text = "&Memory Domains"; this.memoryDomainsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.memoryDomainsToolStripMenuItem_DropDownOpened); // @@ -247,47 +247,47 @@ this.byteToolStripMenuItem1, this.byteToolStripMenuItem2}); this.dataSizeToolStripMenuItem.Name = "dataSizeToolStripMenuItem"; - this.dataSizeToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.dataSizeToolStripMenuItem.Size = new System.Drawing.Size(219, 22); this.dataSizeToolStripMenuItem.Text = "Data Size"; // // byteToolStripMenuItem // this.byteToolStripMenuItem.Name = "byteToolStripMenuItem"; - this.byteToolStripMenuItem.Size = new System.Drawing.Size(105, 22); + this.byteToolStripMenuItem.Size = new System.Drawing.Size(106, 22); this.byteToolStripMenuItem.Text = "1 Byte"; this.byteToolStripMenuItem.Click += new System.EventHandler(this.byteToolStripMenuItem_Click); // // byteToolStripMenuItem1 // this.byteToolStripMenuItem1.Name = "byteToolStripMenuItem1"; - this.byteToolStripMenuItem1.Size = new System.Drawing.Size(105, 22); + this.byteToolStripMenuItem1.Size = new System.Drawing.Size(106, 22); this.byteToolStripMenuItem1.Text = "2 Byte"; this.byteToolStripMenuItem1.Click += new System.EventHandler(this.byteToolStripMenuItem1_Click); // // byteToolStripMenuItem2 // this.byteToolStripMenuItem2.Name = "byteToolStripMenuItem2"; - this.byteToolStripMenuItem2.Size = new System.Drawing.Size(105, 22); + this.byteToolStripMenuItem2.Size = new System.Drawing.Size(106, 22); this.byteToolStripMenuItem2.Text = "4 Byte"; this.byteToolStripMenuItem2.Click += new System.EventHandler(this.byteToolStripMenuItem2_Click); // // enToolStripMenuItem // this.enToolStripMenuItem.Name = "enToolStripMenuItem"; - this.enToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.enToolStripMenuItem.Size = new System.Drawing.Size(219, 22); this.enToolStripMenuItem.Text = "Big Endian"; this.enToolStripMenuItem.Click += new System.EventHandler(this.enToolStripMenuItem_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(203, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(216, 6); // // goToAddressToolStripMenuItem // this.goToAddressToolStripMenuItem.Name = "goToAddressToolStripMenuItem"; this.goToAddressToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G))); - this.goToAddressToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.goToAddressToolStripMenuItem.Size = new System.Drawing.Size(219, 22); this.goToAddressToolStripMenuItem.Text = "&Go to Address..."; this.goToAddressToolStripMenuItem.Click += new System.EventHandler(this.goToAddressToolStripMenuItem_Click); // @@ -296,7 +296,7 @@ this.addToRamWatchToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; this.addToRamWatchToolStripMenuItem1.Name = "addToRamWatchToolStripMenuItem1"; this.addToRamWatchToolStripMenuItem1.ShortcutKeyDisplayString = "Ctrl+W"; - this.addToRamWatchToolStripMenuItem1.Size = new System.Drawing.Size(206, 22); + this.addToRamWatchToolStripMenuItem1.Size = new System.Drawing.Size(219, 22); this.addToRamWatchToolStripMenuItem1.Text = "Add to Ram Watch"; this.addToRamWatchToolStripMenuItem1.Click += new System.EventHandler(this.addToRamWatchToolStripMenuItem1_Click); // @@ -305,7 +305,7 @@ this.freezeAddressToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; this.freezeAddressToolStripMenuItem.Name = "freezeAddressToolStripMenuItem"; this.freezeAddressToolStripMenuItem.ShortcutKeyDisplayString = "Space"; - this.freezeAddressToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.freezeAddressToolStripMenuItem.Size = new System.Drawing.Size(219, 22); this.freezeAddressToolStripMenuItem.Text = "&Freeze Address"; this.freezeAddressToolStripMenuItem.Click += new System.EventHandler(this.freezeAddressToolStripMenuItem_Click); // @@ -314,7 +314,7 @@ this.unfreezeAllToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Unfreeze; this.unfreezeAllToolStripMenuItem.Name = "unfreezeAllToolStripMenuItem"; this.unfreezeAllToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Delete))); - this.unfreezeAllToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.unfreezeAllToolStripMenuItem.Size = new System.Drawing.Size(219, 22); this.unfreezeAllToolStripMenuItem.Text = "Unfreeze All"; this.unfreezeAllToolStripMenuItem.Click += new System.EventHandler(this.unfreezeAllToolStripMenuItem_Click); // @@ -323,7 +323,7 @@ this.pokeAddressToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.pokeAddressToolStripMenuItem.Name = "pokeAddressToolStripMenuItem"; this.pokeAddressToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); - this.pokeAddressToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.pokeAddressToolStripMenuItem.Size = new System.Drawing.Size(219, 22); this.pokeAddressToolStripMenuItem.Text = "&Poke Address"; this.pokeAddressToolStripMenuItem.Click += new System.EventHandler(this.pokeAddressToolStripMenuItem_Click); // @@ -336,14 +336,14 @@ this.toolStripSeparator3, this.restoreWindowSizeToolStripMenuItem}); this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; - this.settingsToolStripMenuItem.Size = new System.Drawing.Size(58, 20); + this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20); this.settingsToolStripMenuItem.Text = "&Settings"; this.settingsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.settingsToolStripMenuItem_DropDownOpened); // // autoloadToolStripMenuItem // this.autoloadToolStripMenuItem.Name = "autoloadToolStripMenuItem"; - this.autoloadToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.autoloadToolStripMenuItem.Size = new System.Drawing.Size(192, 22); this.autoloadToolStripMenuItem.Text = "Auto-load"; this.autoloadToolStripMenuItem.Click += new System.EventHandler(this.autoloadToolStripMenuItem_Click); // @@ -354,44 +354,44 @@ this.toolStripSeparator8, this.resetToDefaultToolStripMenuItem1}); this.customColorsToolStripMenuItem.Name = "customColorsToolStripMenuItem"; - this.customColorsToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.customColorsToolStripMenuItem.Size = new System.Drawing.Size(192, 22); this.customColorsToolStripMenuItem.Text = "Custom Colors"; // // setColorsToolStripMenuItem1 // this.setColorsToolStripMenuItem1.Name = "setColorsToolStripMenuItem1"; - this.setColorsToolStripMenuItem1.Size = new System.Drawing.Size(153, 22); + this.setColorsToolStripMenuItem1.Size = new System.Drawing.Size(157, 22); this.setColorsToolStripMenuItem1.Text = "Set Colors"; this.setColorsToolStripMenuItem1.Click += new System.EventHandler(this.setColorsToolStripMenuItem1_Click); // // toolStripSeparator8 // this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(150, 6); + this.toolStripSeparator8.Size = new System.Drawing.Size(154, 6); // // resetToDefaultToolStripMenuItem1 // this.resetToDefaultToolStripMenuItem1.Name = "resetToDefaultToolStripMenuItem1"; - this.resetToDefaultToolStripMenuItem1.Size = new System.Drawing.Size(153, 22); + this.resetToDefaultToolStripMenuItem1.Size = new System.Drawing.Size(157, 22); this.resetToDefaultToolStripMenuItem1.Text = "Reset to Default"; this.resetToDefaultToolStripMenuItem1.Click += new System.EventHandler(this.resetToDefaultToolStripMenuItem1_Click); // // saveWindowsSettingsToolStripMenuItem // this.saveWindowsSettingsToolStripMenuItem.Name = "saveWindowsSettingsToolStripMenuItem"; - this.saveWindowsSettingsToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.saveWindowsSettingsToolStripMenuItem.Size = new System.Drawing.Size(192, 22); this.saveWindowsSettingsToolStripMenuItem.Text = "Save windows settings"; this.saveWindowsSettingsToolStripMenuItem.Click += new System.EventHandler(this.saveWindowsSettingsToolStripMenuItem_Click); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(180, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(189, 6); // // restoreWindowSizeToolStripMenuItem // this.restoreWindowSizeToolStripMenuItem.Name = "restoreWindowSizeToolStripMenuItem"; - this.restoreWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.restoreWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(192, 22); this.restoreWindowSizeToolStripMenuItem.Text = "&Restore Window Size"; this.restoreWindowSizeToolStripMenuItem.Click += new System.EventHandler(this.restoreWindowSizeToolStripMenuItem_Click); // @@ -428,7 +428,7 @@ this.toolStripSeparator5, this.gotoAddressToolStripMenuItem1}); this.ViewerContextMenuStrip.Name = "ViewerContextMenuStrip"; - this.ViewerContextMenuStrip.Size = new System.Drawing.Size(220, 236); + this.ViewerContextMenuStrip.Size = new System.Drawing.Size(220, 214); this.ViewerContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.ViewerContextMenuStrip_Opening); // // copyToolStripMenuItem1 @@ -521,9 +521,9 @@ // // MemoryViewerBox // - this.MemoryViewerBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.MemoryViewerBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.MemoryViewerBox.ContextMenuStrip = this.ViewerContextMenuStrip; this.MemoryViewerBox.Controls.Add(this.AddressLabel); this.MemoryViewerBox.Controls.Add(this.vScrollBar1); @@ -537,6 +537,7 @@ this.MemoryViewerBox.TabIndex = 2; this.MemoryViewerBox.TabStop = false; this.MemoryViewerBox.Paint += new System.Windows.Forms.PaintEventHandler(this.MemoryViewerBox_Paint); + this.MemoryViewerBox.Enter += new System.EventHandler(this.MemoryViewerBox_Enter); // // AddressLabel // @@ -550,8 +551,8 @@ // // vScrollBar1 // - this.vScrollBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Right))); + this.vScrollBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); this.vScrollBar1.LargeChange = 16; this.vScrollBar1.Location = new System.Drawing.Point(539, 8); this.vScrollBar1.Name = "vScrollBar1"; @@ -568,6 +569,7 @@ this.AddressesLabel.Size = new System.Drawing.Size(31, 13); this.AddressesLabel.TabIndex = 0; this.AddressesLabel.Text = "RAM"; + this.AddressesLabel.Click += new System.EventHandler(this.AddressesLabel_Click); this.AddressesLabel.MouseClick += new System.Windows.Forms.MouseEventHandler(this.AddressesLabel_MouseClick); this.AddressesLabel.MouseDown += new System.Windows.Forms.MouseEventHandler(this.AddressesLabel_MouseDown); this.AddressesLabel.MouseLeave += new System.EventHandler(this.AddressesLabel_MouseLeave); diff --git a/BizHawk.MultiClient/tools/HexEditor.cs b/BizHawk.MultiClient/tools/HexEditor.cs index f8f2b799ce..2bcb1d6ab6 100644 --- a/BizHawk.MultiClient/tools/HexEditor.cs +++ b/BizHawk.MultiClient/tools/HexEditor.cs @@ -2387,5 +2387,15 @@ namespace BizHawk.MultiClient { MouseIsDown = false; } + + private void AddressesLabel_Click(object sender, EventArgs e) + { + + } + + private void MemoryViewerBox_Enter(object sender, EventArgs e) + { + + } } }