diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj index 5373e04070..4047a9ffc7 100644 --- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj +++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj @@ -883,6 +883,7 @@ + diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs index 278aaefd7d..4a303279c2 100644 --- a/BizHawk.MultiClient/MainForm.Designer.cs +++ b/BizHawk.MultiClient/MainForm.Designer.cs @@ -193,6 +193,7 @@ this.rAMSearchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.rAMPokeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.hexEditorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.traceLoggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tAStudioToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); this.luaConsoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -289,7 +290,6 @@ this.cmiScreenshotClipboard = new System.Windows.Forms.ToolStripMenuItem(); this.cmiCloseRom = new System.Windows.Forms.ToolStripMenuItem(); this.cmiShowMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.traceLoggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.StatusSlot0.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); @@ -1710,6 +1710,14 @@ this.hexEditorToolStripMenuItem.Text = "&Hex Editor"; this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click); // + // traceLoggerToolStripMenuItem + // + this.traceLoggerToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.pencil; + this.traceLoggerToolStripMenuItem.Name = "traceLoggerToolStripMenuItem"; + this.traceLoggerToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.traceLoggerToolStripMenuItem.Text = "Trace &Logger"; + this.traceLoggerToolStripMenuItem.Click += new System.EventHandler(this.traceLoggerToolStripMenuItem_Click); + // // tAStudioToolStripMenuItem // this.tAStudioToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; @@ -2494,13 +2502,6 @@ this.cmiShowMenu.Text = "Show Menu"; this.cmiShowMenu.Click += new System.EventHandler(this.showMenuToolStripMenuItem_Click); // - // traceLoggerToolStripMenuItem - // - this.traceLoggerToolStripMenuItem.Name = "traceLoggerToolStripMenuItem"; - this.traceLoggerToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.traceLoggerToolStripMenuItem.Text = "Trace &Logger"; - this.traceLoggerToolStripMenuItem.Click += new System.EventHandler(this.traceLoggerToolStripMenuItem_Click); - // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F); diff --git a/BizHawk.MultiClient/Properties/Resources.Designer.cs b/BizHawk.MultiClient/Properties/Resources.Designer.cs index 6b70b18bc0..d8da5f8963 100644 --- a/BizHawk.MultiClient/Properties/Resources.Designer.cs +++ b/BizHawk.MultiClient/Properties/Resources.Designer.cs @@ -472,6 +472,13 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap pencil { + get { + object obj = ResourceManager.GetObject("pencil", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap Play { get { object obj = ResourceManager.GetObject("Play", resourceCulture); diff --git a/BizHawk.MultiClient/Properties/Resources.resx b/BizHawk.MultiClient/Properties/Resources.resx index d8694a45c5..82eb9f6955 100644 --- a/BizHawk.MultiClient/Properties/Resources.resx +++ b/BizHawk.MultiClient/Properties/Resources.resx @@ -834,4 +834,7 @@ ..\images\SNESControllerIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\pencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/BizHawk.MultiClient/images/pencil.ico b/BizHawk.MultiClient/images/pencil.ico new file mode 100644 index 0000000000..fc14f6ee77 Binary files /dev/null and b/BizHawk.MultiClient/images/pencil.ico differ diff --git a/BizHawk.MultiClient/images/pencil.png b/BizHawk.MultiClient/images/pencil.png new file mode 100644 index 0000000000..0fdf017f08 Binary files /dev/null and b/BizHawk.MultiClient/images/pencil.png differ diff --git a/BizHawk.MultiClient/tools/TraceLogger.Designer.cs b/BizHawk.MultiClient/tools/TraceLogger.Designer.cs index a7d061f823..b3ca7ad034 100644 --- a/BizHawk.MultiClient/tools/TraceLogger.Designer.cs +++ b/BizHawk.MultiClient/tools/TraceLogger.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TraceLogger)); this.TraceView = new BizHawk.VirtualListView(); this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.groupBox1 = new System.Windows.Forms.GroupBox(); @@ -172,6 +173,7 @@ this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Controls.Add(this.menuStrip1); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MainMenuStrip = this.menuStrip1; this.Name = "TraceLogger"; this.Text = "TraceLogger"; diff --git a/BizHawk.MultiClient/tools/TraceLogger.resx b/BizHawk.MultiClient/tools/TraceLogger.resx index 0f6d8eb42b..eedcd56d7a 100644 --- a/BizHawk.MultiClient/tools/TraceLogger.resx +++ b/BizHawk.MultiClient/tools/TraceLogger.resx @@ -120,4 +120,100 @@ 17, 17 + + + + AAABAAIAEBAAAAAAIABoBAAAJgAAACAgAAAAACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAAEAE + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAwMDAyEEBwgvAAAALwAAADMAAAA1AAAAMwAAAC8AAAArAAAAJQAA + AB0AAAAXAAAADwAAAAkAAAAD////Af///wEAAAADEBYZwR43Pzv///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////AUJLTT16rLz7N3WJef///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8Bl6mwoX2yxP8SJy2vAAAAA/// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////AVJZXBM/REbfHR0d8SAg + IJn///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8BExMTKRgY + GNklJSXzJCQki////wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wETExM1GRkZ3SUlJfExMTF9////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////ARMTE0McHBzjHh4e6zQ0NGf///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8BExMTUx4eHusaGhrlJiYmVf///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wETExNjICAg7xAQEN0DAwNB////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////ARMTE3UiIiLzDQ0N2QAAADP///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8BFxcXhSMjI/ULCwvVAAAAJ/// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wEYGBiXIiIi8wkJ + Cc8AAAAd////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8BExMTBRQU + FKUfHx/tXFxc0VNTUx3///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wETExMJX19fw39/f/cGBga5////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////AUtLSxUNDQ3DIiIifQAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8oAAAAIAAAAEAAAAABACAAAAAAAIAQAAAAAAAAAAAAAAAA + AAAAAAAA////AQAAAAcAAAATAAAAIwAAADEAAAA5AAAAPQAAAD8AAAA/AAAAQQAAAEEAAABBAAAAPwAA + AD8AAAA7AAAAOQAAADUAAAAxAAAALwAAACkAAAAlAAAAIQAAAB0AAAAZAAAAFQAAABEAAAAPAAAACwAA + AAcAAAAFAAAAA////wH///8B////Af///wEGBgZLDxcbPQAAABUAAAAdAAAAIQAAACUAAAAnAAAAKQAA + ACkAAAApAAAAJwAAACUAAAAlAAAAIwAAACEAAAAfAAAAGwAAABkAAAAXAAAAFQAAABEAAAAPAAAACwAA + AAkAAAAFAAAAA////wH///8B////Af///wH///8B////AQAAAAcVHB71Fycsm////wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////ASInKXUBAQL/HzlA3RcX + Lwv///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////AUVO + UduDusz/QYGV9SFCTUf///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8BMjIyG6G4wf2DvM7/R5ix/yhWZKH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8BYmtvkbzW4P+CvM7/SaK9/yhebucACQkb////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wEAAAADkqCm773W4P9tl6X/ERkc5QAAANcAAAAN////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wFSWVxNlKGo/ygqKvElJSX/BQUFzxkZ + GcUAAAAH////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wEeICClExMT5yMj + I/kkJCT9ICAg2ysrK78AAAAD////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wETExOfExMT3yQkJP0jIyP5LS0t4yQkJKv///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////ARMTEwMTExOvFBQU2yUlJf8iIiLzISEh5yoqKp3///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////ARMTEwcTExO/FRUV1yYmJv8gICDtMzMz7zQ0NI////8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////ARMTEw0TExPNFxcX1SUlJf8fHx/nMjIy8y8v + L3X///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////ARMTExUTExPZGxsb1SUl + Jf8cHBzfFxcX8zU1NWP///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////ARMT + Ex8TExPlHR0d1SUlJf8gICDbOTk59yQkJEX///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////ARMTEysTExPtICAg2SUlJf8bGxvVDg4O8Tk5OT3///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////ARMTEzcTExPzIyMj3yUlJf8bGxvRJCQk7xwcHCf///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////ARMTE0UTExP1JCQk5SUlJf8ODg7LAAAA4RYW + Fhv///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////ARMTE1UTExPzJycn6SUl + Jf8LCwvLAAAA1Q0NDRP///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////ARMT + E2cTExPxJycn7yUlJf8HBwfNAAAAyQQEBAv///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////ARMTE3sUFBTrKCgo9SQkJP8FBQXPAAAAuwAAAAf///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////ARMTE48dHR3lJCQk+yQkJP0DAwPVAAAAqQAAAAP///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////ARMTE6EiIiLhJCQk/SMjI/cCAgLdAAAAmf// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8BExMTBRMTE7MiIiLdJSUl/yEh + IfMBAQHjAAAAhf///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8BExMTCRMT + E8MfHx/ZJiYm/yAgIO0BAQHrAAAAcf///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8BExMTDxMTE88ZGRnVJSUl/x4eHuUAAADvLi4ub////wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8BExMTFxMTE9sUFBTVJSUl/1paWuvJycn/U1NTc////wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8BExMTIRMTE+ViYmLp4uLi/4eHh/EDAwPzAAAAP/// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8BT09PQaWlpf9ubm7vJSUl/xMT + E9kAAADb////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8BS0tLURMT + E/MLCwvjExMT9Q0NDXn///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8BERERUwkJCeFRUVGH////AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + + \ No newline at end of file