From faf4095f62510403c4a2a1671bfb02580b12d10f Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Fri, 21 Jan 2011 17:40:12 +0000 Subject: [PATCH] Ram Watch - Short cut keys for Watches Menu items --- BizHawk.MultiClient/RamWatch.Designer.cs | 112 ++++++++++++----------- BizHawk.MultiClient/RamWatch.cs | 2 +- BizHawk.MultiClient/RamWatch.resx | 48 +++++----- 3 files changed, 84 insertions(+), 78 deletions(-) diff --git a/BizHawk.MultiClient/RamWatch.Designer.cs b/BizHawk.MultiClient/RamWatch.Designer.cs index f54dee0033..0e99717dbf 100644 --- a/BizHawk.MultiClient/RamWatch.Designer.cs +++ b/BizHawk.MultiClient/RamWatch.Designer.cs @@ -58,18 +58,18 @@ this.Value = new System.Windows.Forms.ColumnHeader(); this.Notes = new System.Windows.Forms.ColumnHeader(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.WatchCountLabel = new System.Windows.Forms.Label(); this.newToolStripButton = new System.Windows.Forms.ToolStripButton(); this.openToolStripButton = new System.Windows.Forms.ToolStripButton(); this.saveToolStripButton = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator = new System.Windows.Forms.ToolStripSeparator(); - this.cutToolStripButton = new System.Windows.Forms.ToolStripButton(); this.NewWatchStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.EditWatchToolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.cutToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.DuplicateWatchToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.MoveUpStripButton1 = new System.Windows.Forms.ToolStripButton(); this.MoveDownStripButton1 = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); - this.EditWatchToolStripButton1 = new System.Windows.Forms.ToolStripButton(); - this.DuplicateWatchToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.WatchCountLabel = new System.Windows.Forms.Label(); this.menuStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout(); this.SuspendLayout(); @@ -220,47 +220,53 @@ // newWatchToolStripMenuItem // this.newWatchToolStripMenuItem.Name = "newWatchToolStripMenuItem"; - this.newWatchToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.newWatchToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A))); + this.newWatchToolStripMenuItem.Size = new System.Drawing.Size(179, 22); this.newWatchToolStripMenuItem.Text = "&New Watch"; this.newWatchToolStripMenuItem.Click += new System.EventHandler(this.newWatchToolStripMenuItem_Click); // // editWatchToolStripMenuItem // this.editWatchToolStripMenuItem.Name = "editWatchToolStripMenuItem"; - this.editWatchToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.editWatchToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E))); + this.editWatchToolStripMenuItem.Size = new System.Drawing.Size(179, 22); this.editWatchToolStripMenuItem.Text = "&Edit Watch"; this.editWatchToolStripMenuItem.Click += new System.EventHandler(this.editWatchToolStripMenuItem_Click); // // removeWatchToolStripMenuItem // this.removeWatchToolStripMenuItem.Name = "removeWatchToolStripMenuItem"; - this.removeWatchToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.removeWatchToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); + this.removeWatchToolStripMenuItem.Size = new System.Drawing.Size(197, 22); this.removeWatchToolStripMenuItem.Text = "&Remove Watch"; this.removeWatchToolStripMenuItem.Click += new System.EventHandler(this.removeWatchToolStripMenuItem_Click); // // duplicateWatchToolStripMenuItem // this.duplicateWatchToolStripMenuItem.Name = "duplicateWatchToolStripMenuItem"; - this.duplicateWatchToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.duplicateWatchToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); + this.duplicateWatchToolStripMenuItem.Size = new System.Drawing.Size(202, 22); this.duplicateWatchToolStripMenuItem.Text = "&Duplicate Watch"; this.duplicateWatchToolStripMenuItem.Click += new System.EventHandler(this.duplicateWatchToolStripMenuItem_Click); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(160, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(172, 6); // // moveUpToolStripMenuItem // this.moveUpToolStripMenuItem.Name = "moveUpToolStripMenuItem"; - this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.moveUpToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Up))); + this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(202, 22); this.moveUpToolStripMenuItem.Text = "Move &Up"; this.moveUpToolStripMenuItem.Click += new System.EventHandler(this.moveUpToolStripMenuItem_Click); // // moveDownToolStripMenuItem // this.moveDownToolStripMenuItem.Name = "moveDownToolStripMenuItem"; - this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.moveDownToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Down))); + this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(202, 22); this.moveDownToolStripMenuItem.Text = "Move &Down"; this.moveDownToolStripMenuItem.Click += new System.EventHandler(this.moveDownToolStripMenuItem_Click); // @@ -320,15 +326,6 @@ this.toolStrip1.TabIndex = 2; this.toolStrip1.Text = "toolStrip1"; // - // WatchCountLabel - // - this.WatchCountLabel.AutoSize = true; - this.WatchCountLabel.Location = new System.Drawing.Point(22, 57); - this.WatchCountLabel.Name = "WatchCountLabel"; - this.WatchCountLabel.Size = new System.Drawing.Size(56, 13); - this.WatchCountLabel.TabIndex = 4; - this.WatchCountLabel.Text = "0 watches"; - // // newToolStripButton // this.newToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; @@ -364,6 +361,27 @@ this.toolStripSeparator.Name = "toolStripSeparator"; this.toolStripSeparator.Size = new System.Drawing.Size(6, 25); // + // NewWatchStripButton1 + // + this.NewWatchStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.NewWatchStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("NewWatchStripButton1.Image"))); + this.NewWatchStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.NewWatchStripButton1.Name = "NewWatchStripButton1"; + this.NewWatchStripButton1.Size = new System.Drawing.Size(23, 22); + this.NewWatchStripButton1.Text = "New Watch"; + this.NewWatchStripButton1.ToolTipText = "New Watch"; + this.NewWatchStripButton1.Click += new System.EventHandler(this.NewWatchStripButton1_Click); + // + // EditWatchToolStripButton1 + // + this.EditWatchToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.EditWatchToolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("EditWatchToolStripButton1.Image"))); + this.EditWatchToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.EditWatchToolStripButton1.Name = "EditWatchToolStripButton1"; + this.EditWatchToolStripButton1.Size = new System.Drawing.Size(23, 22); + this.EditWatchToolStripButton1.Text = "Edit Watch"; + this.EditWatchToolStripButton1.Click += new System.EventHandler(this.EditWatchToolStripButton1_Click); + // // cutToolStripButton // this.cutToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; @@ -375,16 +393,20 @@ this.cutToolStripButton.ToolTipText = "Remove Watch"; this.cutToolStripButton.Click += new System.EventHandler(this.cutToolStripButton_Click); // - // NewWatchStripButton1 + // DuplicateWatchToolStripButton // - this.NewWatchStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.NewWatchStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("NewWatchStripButton1.Image"))); - this.NewWatchStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.NewWatchStripButton1.Name = "NewWatchStripButton1"; - this.NewWatchStripButton1.Size = new System.Drawing.Size(23, 22); - this.NewWatchStripButton1.Text = "New Watch"; - this.NewWatchStripButton1.ToolTipText = "New Watch"; - this.NewWatchStripButton1.Click += new System.EventHandler(this.NewWatchStripButton1_Click); + this.DuplicateWatchToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.DuplicateWatchToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("DuplicateWatchToolStripButton.Image"))); + this.DuplicateWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.DuplicateWatchToolStripButton.Name = "DuplicateWatchToolStripButton"; + this.DuplicateWatchToolStripButton.Size = new System.Drawing.Size(23, 22); + this.DuplicateWatchToolStripButton.Text = "Duplicate Watch"; + this.DuplicateWatchToolStripButton.Click += new System.EventHandler(this.DuplicateWatchToolStripButton_Click); + // + // toolStripSeparator5 + // + this.toolStripSeparator5.Name = "toolStripSeparator5"; + this.toolStripSeparator5.Size = new System.Drawing.Size(6, 25); // // MoveUpStripButton1 // @@ -406,30 +428,14 @@ this.MoveDownStripButton1.Text = "Move Down"; this.MoveDownStripButton1.Click += new System.EventHandler(this.MoveDownStripButton1_Click); // - // toolStripSeparator5 + // WatchCountLabel // - this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(6, 25); - // - // EditWatchToolStripButton1 - // - this.EditWatchToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.EditWatchToolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("EditWatchToolStripButton1.Image"))); - this.EditWatchToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.EditWatchToolStripButton1.Name = "EditWatchToolStripButton1"; - this.EditWatchToolStripButton1.Size = new System.Drawing.Size(23, 22); - this.EditWatchToolStripButton1.Text = "Edit Watch"; - this.EditWatchToolStripButton1.Click += new System.EventHandler(this.EditWatchToolStripButton1_Click); - // - // DuplicateWatchToolStripButton - // - this.DuplicateWatchToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.DuplicateWatchToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("DuplicateWatchToolStripButton.Image"))); - this.DuplicateWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.DuplicateWatchToolStripButton.Name = "DuplicateWatchToolStripButton"; - this.DuplicateWatchToolStripButton.Size = new System.Drawing.Size(23, 22); - this.DuplicateWatchToolStripButton.Text = "Duplicate Watch"; - this.DuplicateWatchToolStripButton.Click += new System.EventHandler(this.DuplicateWatchToolStripButton_Click); + this.WatchCountLabel.AutoSize = true; + this.WatchCountLabel.Location = new System.Drawing.Point(22, 57); + this.WatchCountLabel.Name = "WatchCountLabel"; + this.WatchCountLabel.Size = new System.Drawing.Size(56, 13); + this.WatchCountLabel.TabIndex = 4; + this.WatchCountLabel.Text = "0 watches"; // // RamWatch // diff --git a/BizHawk.MultiClient/RamWatch.cs b/BizHawk.MultiClient/RamWatch.cs index d261d30c82..95a6491611 100644 --- a/BizHawk.MultiClient/RamWatch.cs +++ b/BizHawk.MultiClient/RamWatch.cs @@ -17,9 +17,9 @@ namespace BizHawk.MultiClient //implement separator feature //Display value differently based on signed or hex, endian, type //Currently address is 4 digit hex, but at some point it needs to be smart enough to adjust size based on the emulator core used - //Make Edit/Add/Duplicate Watch windows appear in relation to the listview box //Make a context menu for add/remove/Dup/etc, make the context menu & edit watch windows appear in relation to where they right clicked //TODO: Call AskSave in main client X function + //Address can be changed, when that event is triggered, open the edit watch dialog int defaultWidth; //For saving the default size of the dialog, so the user can restore if desired int defaultHeight; List watchList = new List(); diff --git a/BizHawk.MultiClient/RamWatch.resx b/BizHawk.MultiClient/RamWatch.resx index 305f62f7f5..ec3afca263 100644 --- a/BizHawk.MultiClient/RamWatch.resx +++ b/BizHawk.MultiClient/RamWatch.resx @@ -166,14 +166,6 @@ e41tHNbucUGnKxICiqXjHpTPJgHBZ/Nv4U1oHqGZJVwstiNe72JwI+J3PYA2MV8IMjOG2dzLfOatBg+2 7JDQ0tEPX9cguvv8GHg5hH0mC9S6eiQweLumDhqNVQgo06dP9fN4UsIoJHRnOhVtmxZGM1NXKoJ3JmTH Cv71r/4OTrQ4xWMwWlcAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAF5JREFUOE/NkkEK - ACAIBPv/pyuDAkHXiS4FXUK2cbS1X06fIN0OAApr1+O+Ikh+VIVgyoiEtncMOJoLP04hcZI6fyIIHdA2 - FHY5BdKznAYJMGk6BK4z2Hhdcr1YadwAMzKIeOBQHJIAAAAASUVORK5CYII= @@ -190,22 +182,6 @@ 5ru4+CWerhi6E5H/DCBtX4qx8Y/0Dz/Hd2WESlMPG0SvZA8OHg1Q03iBUl07qupWVNoW1pbaMp+RBqhr z1Bh8FNyoA3lXhfLC+rTPmWdqt9PWebdF+yTn6WsNQbkWHCZFrkofwSma38Cudf4dHWDqG0AAAAASUVO RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAEdJREFUOE9jYBj0 - 4MCBA//JdiRU83+yDIFpBtoOcgFphqBrJskQXJqJMoSQZqIMgYU4RWEAMmQYGADzBsgrZCUkspMv3TUC - AGYzbEaI9u+YAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAElJREFUOE9jYBje - 4MCBA/9hmGSfgjQCNcExlE+8OUPUAHRnI4cB0eFByBCiAhOXIURphsUTxbEAMghmCEk2o6cUijQTn+wo - UAkAY/VsRlvaylwAAAAASUVORK5CYII= @@ -219,6 +195,14 @@ 1t2DI3WAP7oGoSYE3kwSPQofljcqm/kxjK4SCH0OXSMetItsUC26wZuOVptYhI0eEOuz1YI2gZnKBdpr 6iR9V2jkKOkBQpeiCryhFFr4eioft16iU7qNho4h1Dc00QOqlRuwpSSa+UawuZXdByIZsPoUaOmWwrUf owcOozlwZeto7ZXDuXvCfHV/+dGfqqrf44qgu28AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAF5JREFUOE/NkkEK + ACAIBPv/pyuDAkHXiS4FXUK2cbS1X06fIN0OAApr1+O+Ikh+VIVgyoiEtncMOJoLP04hcZI6fyIIHdA2 + FHY5BdKznAYJMGk6BK4z2Hhdcr1YadwAMzKIeOBQHJIAAAAASUVORK5CYII= @@ -234,6 +218,22 @@ 6auUqlU/KwBZJV4skWUuvMmYV8b+Ls6jQQ81DfryO3KtfUoA/p3810G37T3VJ3TlARdvukhldjANeemx z2B8MS0mq80GyySHj98rD2jQOpXbtgrVNprRnO2h5lQX1Sc7leYODh27W3nN9/WZDnroDx0A5wwhdtmt AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAEdJREFUOE9jYBj0 + 4MCBA//JdiRU83+yDIFpBtoOcgFphqBrJskQXJqJMoSQZqIMgYU4RWEAMmQYGADzBsgrZCUkspMv3TUC + AGYzbEaI9u+YAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAElJREFUOE9jYBje + 4MCBA/9hmGSfgjQCNcExlE+8OUPUAHRnI4cB0eFByBCiAhOXIURphsUTxbEAMghmCEk2o6cUijQTn+wo + UAkAY/VsRlvaylwAAAAASUVORK5CYII=