From 5e0177b9a68643b5792820550fecb557e22d9c9d Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Fri, 21 Jan 2011 16:43:19 +0000 Subject: [PATCH] Ram Watch - Finish tool strip, added images in an image folder. TODO: Does it need these or did it import them into the project resource? If images are needed, I hope it uses relative paths for grabbing them. --- BizHawk.MultiClient/RamWatch.Designer.cs | 76 +++++++++++++++++- BizHawk.MultiClient/RamWatch.cs | 25 ++++++ BizHawk.MultiClient/RamWatch.resx | 57 ++++++++++++- .../images/BuilderDialog_delete.bmp | Bin 0 -> 824 bytes .../images/BuilderDialog_movedown.bmp | Bin 0 -> 824 bytes .../images/BuilderDialog_moveup.bmp | Bin 0 -> 824 bytes BizHawk.MultiClient/images/FindHS.bmp | Bin 0 -> 1078 bytes 7 files changed, 156 insertions(+), 2 deletions(-) create mode 100644 BizHawk.MultiClient/images/BuilderDialog_delete.bmp create mode 100644 BizHawk.MultiClient/images/BuilderDialog_movedown.bmp create mode 100644 BizHawk.MultiClient/images/BuilderDialog_moveup.bmp create mode 100644 BizHawk.MultiClient/images/FindHS.bmp diff --git a/BizHawk.MultiClient/RamWatch.Designer.cs b/BizHawk.MultiClient/RamWatch.Designer.cs index 1dd4ee127c..2ffe3a3548 100644 --- a/BizHawk.MultiClient/RamWatch.Designer.cs +++ b/BizHawk.MultiClient/RamWatch.Designer.cs @@ -64,6 +64,12 @@ 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.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.menuStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout(); this.SuspendLayout(); @@ -301,7 +307,13 @@ this.openToolStripButton, this.saveToolStripButton, this.toolStripSeparator, - this.cutToolStripButton}); + this.NewWatchStripButton1, + this.EditWatchToolStripButton1, + this.cutToolStripButton, + this.DuplicateWatchToolStripButton, + this.toolStripSeparator5, + this.MoveUpStripButton1, + this.MoveDownStripButton1}); this.toolStrip1.Location = new System.Drawing.Point(0, 24); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(364, 25); @@ -363,6 +375,62 @@ this.cutToolStripButton.ToolTipText = "Remove Watch"; this.cutToolStripButton.Click += new System.EventHandler(this.cutToolStripButton_Click); // + // 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); + // + // MoveUpStripButton1 + // + this.MoveUpStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.MoveUpStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("MoveUpStripButton1.Image"))); + this.MoveUpStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.MoveUpStripButton1.Name = "MoveUpStripButton1"; + this.MoveUpStripButton1.Size = new System.Drawing.Size(23, 22); + this.MoveUpStripButton1.Text = "Move Up"; + this.MoveUpStripButton1.Click += new System.EventHandler(this.MoveUpStripButton1_Click); + // + // MoveDownStripButton1 + // + this.MoveDownStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.MoveDownStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("MoveDownStripButton1.Image"))); + this.MoveDownStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.MoveDownStripButton1.Name = "MoveDownStripButton1"; + this.MoveDownStripButton1.Size = new System.Drawing.Size(23, 22); + this.MoveDownStripButton1.Text = "Move Down"; + this.MoveDownStripButton1.Click += new System.EventHandler(this.MoveDownStripButton1_Click); + // + // toolStripSeparator5 + // + 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); + // // RamWatch // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -425,5 +493,11 @@ private System.Windows.Forms.ToolStripButton saveToolStripButton; private System.Windows.Forms.ToolStripSeparator toolStripSeparator; private System.Windows.Forms.ToolStripButton cutToolStripButton; + private System.Windows.Forms.ToolStripButton NewWatchStripButton1; + private System.Windows.Forms.ToolStripButton MoveUpStripButton1; + private System.Windows.Forms.ToolStripButton MoveDownStripButton1; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator5; + private System.Windows.Forms.ToolStripButton EditWatchToolStripButton1; + private System.Windows.Forms.ToolStripButton DuplicateWatchToolStripButton; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/RamWatch.cs b/BizHawk.MultiClient/RamWatch.cs index f38e5d308d..f2eaaf53a8 100644 --- a/BizHawk.MultiClient/RamWatch.cs +++ b/BizHawk.MultiClient/RamWatch.cs @@ -606,5 +606,30 @@ namespace BizHawk.MultiClient { RemoveWatch(); } + + private void NewWatchStripButton1_Click(object sender, EventArgs e) + { + AddNewWatch(); + } + + private void MoveUpStripButton1_Click(object sender, EventArgs e) + { + MoveUp(); + } + + private void MoveDownStripButton1_Click(object sender, EventArgs e) + { + MoveDown(); + } + + private void EditWatchToolStripButton1_Click(object sender, EventArgs e) + { + EditWatch(); + } + + private void DuplicateWatchToolStripButton_Click(object sender, EventArgs e) + { + DuplicateWatch(); + } } } diff --git a/BizHawk.MultiClient/RamWatch.resx b/BizHawk.MultiClient/RamWatch.resx index 39b4129207..37c1197eea 100644 --- a/BizHawk.MultiClient/RamWatch.resx +++ b/BizHawk.MultiClient/RamWatch.resx @@ -168,7 +168,23 @@ Cv71r/4OTrQ4xWMwWlcAAAAASUVORK5CYII= - + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAhdJREFUOE/Nk11I + U2EYx9ddFwVdFHYRVCCWQeEuUoaGXYTlIkeYTexi1MAbdzGlzWpr62J62EfaXBoUzTEr+rC0wbJJEuKw + KAYyCOqiLCuTippUltr6dc5Zmy6tm2564eE55/8+7+95z/+87xKFQoEY/zQkgByuzkHqnSEKq1oy2t/0 + dPNMcXGNj8nP0yxTmlilssq6lOfr6Wbz8lz3Y94+NHXnKdC42aRulgHei1EW0xcA7B39fJue5ebQM0ze + IdbvaGLpFjNpPRQdRQiOkFuWAmcBjrSGsbdH0Nu6Ka89x2aNR9z2aQqrO9BbLmMUfdE2dLFRLYhgB/rj + V+cAknHWtghvE19JTCWJPkqgs4fJ2yWwYqsF88kQ0vg0Nctg/AP7zdfJ3SlkAxqcvXLRvfgb3MGH7DFc + IqfEJi+WIv5knNjj9zgDD6gyd7O62MphTzgFcfsHMDT1UlHXibLSS365QF6ZgxzRfWkHRuFGam6fOLfb + xZptVlYWNVKkPZUCNJ8dIJn8wYuJL9y+/wqHP8a67bYsow7ZrvF6YpLRsXf03H2KwXmH/F9/SWHx3mJm + 5ru4+CWerhi6E5H/DCBtX4qx8Y/0Dz/Hd2WESlMPG0SvZA8OHg1Q03iBUl07qupWVNoW1pbaMp+RBqhr + z1Bh8FNyoA3lXhfLC+rTPmWdqt9PWebdF+yTn6WsNQbkWHCZFrkofwSma38Cudf4dHWDqG0AAAAASUVO + RK5CYII= + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAYdJREFUOE+t001L @@ -179,6 +195,45 @@ 1t2DI3WAP7oGoSYE3kwSPQofljcqm/kxjK4SCH0OXSMetItsUC26wZuOVptYhI0eEOuz1YI2gZnKBdpr 6iR9V2jkKOkBQpeiCryhFFr4eioft16iU7qNho4h1Dc00QOqlRuwpSSa+UawuZXdByIZsPoUaOmWwrUf owcOozlwZeto7ZXDuXvCfHV/+dGfqqrf44qgu28AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAF5JREFUOE/NkkEK + ACAIBPv/pyuDAkHXiS4FXUK2cbS1X06fIN0OAApr1+O+Ikh+VIVgyoiEtncMOJoLP04hcZI6fyIIHdA2 + FHY5BdKznAYJMGk6BK4z2Hhdcr1YadwAMzKIeOBQHJIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAeJJREFUOE+lk9FP + klEYxv1TSsecde0f0FpZrTbbal7URVvZuuJCr7pq2WzLNWy0iSHNwtIB9qG0ltLSYRJpBomUgZPMGSyU + 8SmJIOiv7zssCdrAzXd77s77e5/nnPdUVR20HBPfUCWNB4QsI176HB8IL/9iX2y1ubTMwx6utz0nuLhc + GWIfCxT153Z26ep/g9Md4FJLZ2WIZdQnAM4QSJ/BH5Z5aH6NNCljm0hgdSV4MppAPxQXCq5kil31OTx7 + DjLbOeSNNJFYUgBKq31glfpmN76F9QLEZHOJc73ubXQjMreln7Q+DdP/du0/QIsxhmNK5mjTMJ/m43mI + Qcmr5t5MZVlNpFiKrPM1vIbpVVQAOqSckF+ZekUX5UjTS+ouDFLb+CwPUPNupbN7k7WmEDcMX3hgXSpy + IP/OsrCyhXtuA6M0g+bc4wJATqaZ/x7DF4zg8f9g/OMibb355701kERriHL5fojzd2aFjNI0mjPdBUD9 + 6auUqlU/KwBZJV4skWUuvMmYV8b+Ls6jQQ81DfryO3KtfUoA/p3810G37T3VJ3TlARdvukhldjANeemx + z2B8MS0mq80GyySHj98rD2jQOpXbtgrVNprRnO2h5lQX1Sc7leYODh27W3nN9/WZDnroDx0A5wwhdtmt + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAEdJREFUOE9jYBj0 + 4MCBA//JdiRU83+yDIFpBtoOcgFphqBrJskQXJqJMoSQZqIMgYU4RWEAMmQYGADzBsgrZCUkspMv3TUC + AGYzbEaI9u+YAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAElJREFUOE9jYBje + 4MCBA/9hmGSfgjQCNcExlE+8OUPUAHRnI4cB0eFByBCiAhOXIURphsUTxbEAMghmCEk2o6cUijQTn+wo + UAkAY/VsRlvaylwAAAAASUVORK5CYII= \ No newline at end of file diff --git a/BizHawk.MultiClient/images/BuilderDialog_delete.bmp b/BizHawk.MultiClient/images/BuilderDialog_delete.bmp new file mode 100644 index 0000000000000000000000000000000000000000..13897c40863d15532ad1317b978f9dcfaf7fb4ff GIT binary patch literal 824 zcmcIfu?>JQ3=6O$Mo!=Y#LUjs90s9*$Z}}a0V+}j$9CLxTRKT+)_c+#?rLOAc&qch zw@QFsha7)=m$M!)j|fhwf6}pu(V|s>AIWZFD$E%X3`SeZWZF_gCJ6?^7}$HH8h0pv|v>X2?tCqcobu5A*dKx3z3T9S|AKMlMD<1B~85! literal 0 HcmV?d00001 diff --git a/BizHawk.MultiClient/images/FindHS.bmp b/BizHawk.MultiClient/images/FindHS.bmp new file mode 100644 index 0000000000000000000000000000000000000000..14c61ec991f306f441dbc8fc16054968c8031caf GIT binary patch literal 1078 zcmc&yUr1A76xYZyP!K8XA;=)i1%-QPGG-VNmJ1zWHdzm&2EMq5DQ#L?cRkEq_9yMS zG$@*5R#aNrVCf_gaa0(B42%kFxyptMomAGe_3QiA7S|Aj2>QYAo^#JRzjMxazk9Gk zv_35X5qTC8<|LV(mQTF@i+;Cb9o>M~43|c}kuaOSyUw0^exp%=c4aAAYs6@gi@}s` z4>JeyvuM7XIlX}}a-~)}?NnEy?PLk8$AqXa%ATY7hnybYmzMDM=>W#N?C@Psf@nc= z6hym;5c4x3ym>r`i8~JTYOBDO?@H9HrBC+2Lijx*p&+J)d-2GkhFL23C;FkQX8ef9 z@g+Qsck~QS(~AAqnm^>U&G$8{(OFjsu1ZMGC4i}{00wa$^!svx_gT%a+;JhSM+GqK z--gEG&A22lj?vyDomPFHr2!Nl0#ESFZNn{f1(=dNcrNOi2r=_AfR8W6G3K(MM^_Dl zWGlS(GfYyS;cGMCYjhUz#VDeaet3;auty5${4uJhSYG^uxxfhS=}v$>yz}?{&>r5_ zrd(gU5j~6w*J{gQm+ir2g#;ZnqF1-|DtIg!bT!DqN(*5+v;%j~t8%H1kHHQjmSf-W zdh`KCIW3w=oo;VtdMY0DdobZ~mgfKf literal 0 HcmV?d00001