|
From: slartibartfast <sla...@us...> - 2004-09-30 21:58:38
|
Update of /cvsroot/seq/myseq/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1970 Modified Files: ListViewPanel.cs MapPane.cs MapPane.resx Log Message: Integrated 42! Changes into Version 1.16.3 rdy for release Index: MapPane.resx =================================================================== RCS file: /cvsroot/seq/myseq/client/MapPane.resx,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- MapPane.resx 30 Sep 2004 18:53:06 -0000 1.5 +++ MapPane.resx 30 Sep 2004 21:58:27 -0000 1.6 @@ -106,15 +106,15 @@ <data name="offsetx.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Public</value> </data> + <data name="offsety.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Public</value> + </data> <data name="offsety.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> <data name="offsety.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="offsety.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>Public</value> - </data> <data name="scale.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> @@ -205,8 +205,32 @@ <data name="lblZPos.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="$this.Name"> - <value>MapPane</value> + <data name="cmdLookup.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="cmdLookup.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="cmdLookup.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="txtLookup.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="txtLookup.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Public</value> + </data> + <data name="txtLookup.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="lblLookup.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="lblLookup.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="lblLookup.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> </data> <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> @@ -220,8 +244,8 @@ <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </data> - <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>80</value> + <data name="$this.Name"> + <value>MapPane</value> </data> <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>(Default)</value> @@ -232,6 +256,9 @@ <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> + <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>80</value> + </data> <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>8, 8</value> </data> Index: ListViewPanel.cs =================================================================== RCS file: /cvsroot/seq/myseq/client/ListViewPanel.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ListViewPanel.cs 30 Sep 2004 18:53:06 -0000 1.1 +++ ListViewPanel.cs 30 Sep 2004 21:58:27 -0000 1.2 @@ -10,216 +10,221 @@ namespace myseq { - public class ListViewPanel : System.Windows.Forms.UserControl { - public bool curDescend = false; + public class ListViewPanel : System.Windows.Forms.UserControl { + public bool curDescend = false; - public myseq.MapPane mapPane; + public myseq.MapPane mapPane; - private System.Windows.Forms.TextBox txtSpawnList; - private System.Windows.Forms.Button cmdReset; - public System.Windows.Forms.ListView listView; - - private System.ComponentModel.Container components = null; + private System.Windows.Forms.TextBox txtSpawnList; + private System.Windows.Forms.Button cmdReset; + public System.Windows.Forms.ListView listView; + + private System.ComponentModel.Container components = null; - public ListViewPanel() { - InitializeComponent(); - } + public ListViewPanel() { + InitializeComponent(); + } - protected override void Dispose(bool disposing) { - if (disposing && components != null) - components.Dispose(); + protected override void Dispose(bool disposing) { + if (disposing && components != null) + components.Dispose(); - base.Dispose( disposing ); - } + base.Dispose( disposing ); + } - #region Component Designer generated code - private void InitializeComponent() - { - this.txtSpawnList = new System.Windows.Forms.TextBox(); - this.cmdReset = new System.Windows.Forms.Button(); - this.listView = new System.Windows.Forms.ListView(); - this.SuspendLayout(); - // - // txtSpawnList - // - this.txtSpawnList.Location = new System.Drawing.Point(48, 0); - this.txtSpawnList.Name = "txtSpawnList"; - this.txtSpawnList.Size = new System.Drawing.Size(152, 20); - this.txtSpawnList.TabIndex = 1; - this.txtSpawnList.Text = ""; - this.txtSpawnList.TextChanged += new System.EventHandler(this.txtSpawnList_TextChanged); - // - // cmdReset - // - this.cmdReset.Location = new System.Drawing.Point(0, 0); - this.cmdReset.Name = "cmdReset"; - this.cmdReset.Size = new System.Drawing.Size(48, 20); - this.cmdReset.TabIndex = 0; - this.cmdReset.Text = "Reset"; - this.cmdReset.Click += new System.EventHandler(this.cmdReset_Click); - // - // listView - // - this.listView.AllowColumnReorder = true; - this.listView.FullRowSelect = true; - this.listView.GridLines = true; - this.listView.HideSelection = false; - this.listView.LabelWrap = false; - this.listView.Location = new System.Drawing.Point(0, 24); - this.listView.MultiSelect = false; - this.listView.Name = "listView"; - this.listView.Size = new System.Drawing.Size(200, 168); - this.listView.Sorting = System.Windows.Forms.SortOrder.Ascending; - this.listView.TabIndex = 2; - this.listView.View = System.Windows.Forms.View.Details; - this.listView.MouseEnter += new System.EventHandler(this.listView_MouseEnter); - this.listView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.listView_ColumnClick); - this.listView.SelectedIndexChanged += new System.EventHandler(this.listView_SelectedIndexChanged); - // - // ListViewPanel - // - this.Controls.Add(this.listView); - this.Controls.Add(this.cmdReset); - this.Controls.Add(this.txtSpawnList); - this.Name = "ListViewPanel"; - this.Size = new System.Drawing.Size(208, 200); - this.Resize += new System.EventHandler(this.ListViewPanel_Resize); - this.ResumeLayout(false); + #region Component Designer generated code + private void InitializeComponent() + { + this.txtSpawnList = new System.Windows.Forms.TextBox(); + this.cmdReset = new System.Windows.Forms.Button(); + this.listView = new System.Windows.Forms.ListView(); + this.SuspendLayout(); + // + // txtSpawnList + // + this.txtSpawnList.Location = new System.Drawing.Point(48, 0); + this.txtSpawnList.Name = "txtSpawnList"; + this.txtSpawnList.Size = new System.Drawing.Size(152, 20); + this.txtSpawnList.TabIndex = 1; + this.txtSpawnList.Text = ""; + this.txtSpawnList.TextChanged += new System.EventHandler(this.txtSpawnList_TextChanged); + // + // cmdReset + // + this.cmdReset.Location = new System.Drawing.Point(0, 0); + this.cmdReset.Name = "cmdReset"; + this.cmdReset.Size = new System.Drawing.Size(48, 20); + this.cmdReset.TabIndex = 0; + this.cmdReset.Text = "Reset"; + this.cmdReset.Click += new System.EventHandler(this.cmdReset_Click); + // + // listView + // + this.listView.AllowColumnReorder = true; + this.listView.FullRowSelect = true; + this.listView.GridLines = true; + this.listView.HideSelection = false; + this.listView.LabelWrap = false; + this.listView.Location = new System.Drawing.Point(0, 24); + this.listView.MultiSelect = false; + this.listView.Name = "listView"; + this.listView.Size = new System.Drawing.Size(200, 168); + this.listView.Sorting = System.Windows.Forms.SortOrder.Ascending; + this.listView.TabIndex = 2; + this.listView.View = System.Windows.Forms.View.Details; + this.listView.MouseEnter += new System.EventHandler(this.listView_MouseEnter); + this.listView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.listView_ColumnClick); + this.listView.SelectedIndexChanged += new System.EventHandler(this.listView_SelectedIndexChanged); + // + // ListViewPanel + // + this.Controls.Add(this.listView); + this.Controls.Add(this.cmdReset); + this.Controls.Add(this.txtSpawnList); + this.Name = "ListViewPanel"; + this.Size = new System.Drawing.Size(208, 200); + this.Resize += new System.EventHandler(this.ListViewPanel_Resize); + this.ResumeLayout(false); - } - #endregion + } + #endregion - private void ListViewPanel_Resize(object sender, EventArgs e) { - try { - txtSpawnList.Width = this.Width - txtSpawnList.Left; + private void ListViewPanel_Resize(object sender, EventArgs e) { + try { + txtSpawnList.Width = this.Width - txtSpawnList.Left; - listView.Width = this.Width; - listView.Height = this.Height - listView.Top; - } - catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.ListViewPanel_Resize: " + ex.Message);} - } + listView.Width = this.Width; + listView.Height = this.Height - listView.Top; + } + catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.ListViewPanel_Resize: " + ex.Message);} + } - private void cmdReset_Click(object sender, System.EventArgs e) { - try { - txtSpawnList.Text = ""; - txtSpawnList.Focus(); - } - catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.cmdReset_Click: " + ex.Message);} - } + private void cmdReset_Click(object sender, System.EventArgs e) { + try { + txtSpawnList.Text = ""; + txtSpawnList.Focus(); + } + catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.cmdReset_Click: " + ex.Message);} + } - private void txtSpawnList_TextChanged(object sender, EventArgs e) { - try { - foreach (ListViewItem lstItem in listView.Items) { - // Compile the regular expression. - Regex regEx = new Regex(".*" + txtSpawnList.Text + ".*", RegexOptions.IgnoreCase); - // Match the regular expression pattern against a text string. - if (regEx.Match(lstItem.Text).Success) { - lstItem.EnsureVisible(); - lstItem.Selected = true; - break; - } - } - } - catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.txtSpawnList_TextChanged: " + ex.Message);} - } + private void txtSpawnList_TextChanged(object sender, EventArgs e) { + SearchName(txtSpawnList.Text); + } + + public void SearchName(String name) + { + try { + Regex regEx = new Regex(".*" + txtSpawnList.Text + ".*", RegexOptions.IgnoreCase); + foreach (ListViewItem lstItem in listView.Items) { + // Compile the regular expression. + // Match the regular expression pattern against a text string. + if (regEx.Match(lstItem.Text).Success) { + lstItem.EnsureVisible(); + lstItem.Selected = true; + break; + } + } + } + catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.txtSpawnList_TextChanged: " + ex.Message);} + } - private void listView_MouseEnter(object sender, System.EventArgs e) { - try {listView.Focus();} - catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.listView_MouseEnter: " + ex.Message);} - } + private void listView_MouseEnter(object sender, System.EventArgs e) { + try {listView.Focus();} + catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.listView_MouseEnter: " + ex.Message);} + } - private void listView_ColumnClick(object sender, ColumnClickEventArgs e) { - try { - curDescend = !curDescend; - listView.ListViewItemSorter = new ListBoxComparer(listView.Items, curDescend, e.Column); - } - catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.listView_ColumnClick: " + ex.Message);} - } + private void listView_ColumnClick(object sender, ColumnClickEventArgs e) { + try { + curDescend = !curDescend; + listView.ListViewItemSorter = new ListBoxComparer(listView.Items, curDescend, e.Column); + } + catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.listView_ColumnClick: " + ex.Message);} + } - private void listView_SelectedIndexChanged(object sender, System.EventArgs e) { - ListView.SelectedIndexCollection sel = listView.SelectedIndices; + private void listView_SelectedIndexChanged(object sender, System.EventArgs e) { + ListView.SelectedIndexCollection sel = listView.SelectedIndices; - if (sel.Count > 0) { - try { - mapPane.mapCon.selectedID = int.Parse(listView.Items[sel[0]].SubItems[8].Text); - mapPane.mapCon.Invalidate(); - } - catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.listView_SelectedIndexChanged: " + ex.Message);} - - } - } + if (sel.Count > 0) { + try { + mapPane.mapCon.selectedID = int.Parse(listView.Items[sel[0]].SubItems[8].Text); + mapPane.mapCon.Invalidate(); + } + catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.listView_SelectedIndexChanged: " + ex.Message);} + + } + } - public void ColumnsAdd(string ColumnName, int ColumnWidth, HorizontalAlignment CoulumnAlign) { - try {listView.Columns.Add(ColumnName, ColumnWidth, CoulumnAlign);} - catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.ColumnsAdd: " + ex.Message);} - } - } + public void ColumnsAdd(string ColumnName, int ColumnWidth, HorizontalAlignment CoulumnAlign) { + try {listView.Columns.Add(ColumnName, ColumnWidth, CoulumnAlign);} + catch (Exception ex) {LogLib.WriteLine("Error in ListViewPanel.ColumnsAdd: " + ex.Message);} + } + } - public class ListBoxComparer : IComparer - { - public int Compare(object a, object b) - { - ListViewItem sa = (ListViewItem)a; - ListViewItem sb = (ListViewItem)b; - int res = 0; + public class ListBoxComparer : IComparer + { + public int Compare(object a, object b) + { + ListViewItem sa = (ListViewItem)a; + ListViewItem sb = (ListViewItem)b; + int res = 0; - if (Column == 0) // Name - res = string.Compare(sa.Text,sb.Text); - else if (Column == 1) // Level - { - int ia = int.Parse(sa.SubItems[1].Text); - int ib = int.Parse(sb.SubItems[1].Text); - if (ia < ib) res = -1; - else if (ia > ib) res = 1; - else res = 0; - } - else if ((Column == 2) || // Class - (Column == 3) || // Race - (Column == 4) || // Last Name - (Column == 5) || // Type - (Column == 6)) // Invis - res = string.Compare(sa.SubItems[Column].Text, sb.SubItems[Column].Text); - else if ((Column == 7) || // Run Speed - (Column == 10) || // X - (Column == 11) || // Y - (Column == 12) || // Z - (Column == 13)) // Distance - { - float fa = float.Parse(sa.SubItems[Column].Text); - float fb = float.Parse(sb.SubItems[Column].Text); - if (fa < fb) res = -1; - else if (fa > fb) res = 1; - else res = 0; - } - else if (Column == 8) - { // SpawnID - uint ia = uint.Parse(sa.SubItems[8].Text); - uint ib = uint.Parse(sb.SubItems[8].Text); - if (ia < ib) res = -1; - else if (ia > ib) res = 1; - else res = 0; - } - else if (Column == 9) - { - DateTime dta = DateTime.Parse(sa.SubItems[9].Text); - DateTime dtb = DateTime.Parse(sb.SubItems[9].Text); - res = DateTime.Compare(dta, dtb); - } - - if (Descending) res = -res; - - return res; - } + if (Column == 0) // Name + res = string.Compare(sa.Text,sb.Text); + else if (Column == 1) // Level + { + int ia = int.Parse(sa.SubItems[1].Text); + int ib = int.Parse(sb.SubItems[1].Text); + if (ia < ib) res = -1; + else if (ia > ib) res = 1; + else res = 0; + } + else if ((Column == 2) || // Class + (Column == 3) || // Race + (Column == 4) || // Last Name + (Column == 5) || // Type + (Column == 6)) // Invis + res = string.Compare(sa.SubItems[Column].Text, sb.SubItems[Column].Text); + else if ((Column == 7) || // Run Speed + (Column == 10) || // X + (Column == 11) || // Y + (Column == 12) || // Z + (Column == 13)) // Distance + { + float fa = float.Parse(sa.SubItems[Column].Text); + float fb = float.Parse(sb.SubItems[Column].Text); + if (fa < fb) res = -1; + else if (fa > fb) res = 1; + else res = 0; + } + else if (Column == 8) + { // SpawnID + uint ia = uint.Parse(sa.SubItems[8].Text); + uint ib = uint.Parse(sb.SubItems[8].Text); + if (ia < ib) res = -1; + else if (ia > ib) res = 1; + else res = 0; + } + else if (Column == 9) + { + DateTime dta = DateTime.Parse(sa.SubItems[9].Text); + DateTime dtb = DateTime.Parse(sb.SubItems[9].Text); + res = DateTime.Compare(dta, dtb); + } + + if (Descending) res = -res; + + return res; + } - public ListBoxComparer(ListView.ListViewItemCollection spawns, bool descending, int column) - { - Spawns = spawns; - Descending = descending; - Column = column; - } + public ListBoxComparer(ListView.ListViewItemCollection spawns, bool descending, int column) + { + Spawns = spawns; + Descending = descending; + Column = column; + } - private ListView.ListViewItemCollection Spawns; - private bool Descending; - private int Column; - } + private ListView.ListViewItemCollection Spawns; + private bool Descending; + private int Column; + } } Index: MapPane.cs =================================================================== RCS file: /cvsroot/seq/myseq/client/MapPane.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- MapPane.cs 30 Sep 2004 18:53:06 -0000 1.7 +++ MapPane.cs 30 Sep 2004 21:58:27 -0000 1.8 @@ -4,62 +4,97 @@ using System.Collections; using System.Windows.Forms; using System.ComponentModel; +using System.Text.RegularExpressions; + namespace myseq { - public class MapPane : System.Windows.Forms.UserControl { - public myseq.MapCon mapCon; + public class MapPane : System.Windows.Forms.UserControl { + public myseq.MapCon mapCon; - public System.Windows.Forms.NumericUpDown offsetx; - public System.Windows.Forms.NumericUpDown offsety; - public System.Windows.Forms.NumericUpDown scale; - public System.Windows.Forms.NumericUpDown filterzneg; - public System.Windows.Forms.NumericUpDown filterzpos; - public System.Windows.Forms.Button cmdCommand; + public System.Windows.Forms.NumericUpDown offsetx; + public System.Windows.Forms.NumericUpDown offsety; + public System.Windows.Forms.NumericUpDown scale; + public System.Windows.Forms.NumericUpDown filterzneg; + public System.Windows.Forms.NumericUpDown filterzpos; + public System.Windows.Forms.Button cmdCommand; + + public System.Windows.Forms.TextBox txtLookup; + private System.Windows.Forms.Button cmdLookup; - private System.Windows.Forms.Label lblScale; - private System.Windows.Forms.Label lblOffsetY; - private System.Windows.Forms.Label lblOffsetX; - private System.Windows.Forms.Label lblZNeg; - private System.Windows.Forms.Label lblZPos; + private System.Windows.Forms.Label lblScale; + private System.Windows.Forms.Label lblOffsetY; + private System.Windows.Forms.Label lblOffsetX; + private System.Windows.Forms.Label lblZNeg; + private System.Windows.Forms.Label lblZPos; + private System.Windows.Forms.Label lblLookup; - private System.ComponentModel.Container components = null; + private System.ComponentModel.Container components = null; - public MapPane() { - InitializeComponent(); + public MapPane() { + InitializeComponent(); + + // Create the quick lookup text field and buttn + + offsetx.Minimum = -100000; + offsetx.Maximum = 100000; + offsety.Minimum = -100000; + offsety.Maximum = 100000; + + scale.Maximum = 10000; + scale.Value = 100; + scale.Minimum = 10; - offsetx.Minimum = -100000; - offsetx.Maximum = 100000; - offsety.Minimum = -100000; - offsety.Maximum = 100000; - - scale.Maximum = 10000; - scale.Value = 100; - scale.Minimum = 10; + scale.Increment = 10; + offsetx.Increment = 20; + offsety.Increment = 20; - scale.Increment = 10; - offsetx.Increment = 20; - offsety.Increment = 20; + filterzneg.Increment = 5; + filterzpos.Increment = 5; + filterzpos.Minimum = 0; + filterzneg.Minimum = 0; + filterzpos.Maximum = 3500; + filterzneg.Maximum = 3500; + filterzneg.Value = 75; + filterzpos.Value = 75; + } - filterzneg.Increment = 5; - filterzpos.Increment = 5; - filterzpos.Minimum = 0; - filterzneg.Minimum = 0; - filterzpos.Maximum = 3500; - filterzneg.Maximum = 3500; - filterzneg.Value = 75; - filterzpos.Value = 75; - } + protected override void Dispose(bool disposing) { + if (disposing) + if (components != null) + components.Dispose(); - protected override void Dispose(bool disposing) { - if (disposing) - if (components != null) - components.Dispose(); + base.Dispose(disposing); + } + + private void cmdLookup_Click(object sender, System.EventArgs e) { + txtLookup.Text = ""; + txtLookup.Focus(); + Lookup(""); + } - base.Dispose(disposing); - } + private void txtLookup_KeyPress(object sender, System.Windows.Forms.KeyPressEventArgs e) { + if (e.KeyChar == (char)Keys.Enter) { + Lookup(txtLookup.Text); + txtLookup.Focus(); + e.Handled = true; + } + } + + private void Lookup(String name) + { + Regex regEx = new Regex(".*" + name + ".*", RegexOptions.IgnoreCase); + + foreach(Structures.SPAWNINFO sp in mapCon.mobs.Values) { + if (name.Length>0) { sp.isLookup = regEx.Match(sp.Name).Success; } + else { sp.isLookup = false; } + } + + mapCon.Invalidate(); + } + - #region Component Designer generated code - private void InitializeComponent() { + #region Component Designer generated code + private void InitializeComponent() { this.offsetx = new System.Windows.Forms.NumericUpDown(); this.offsety = new System.Windows.Forms.NumericUpDown(); this.scale = new System.Windows.Forms.NumericUpDown(); @@ -72,6 +107,9 @@ this.lblZNeg = new System.Windows.Forms.Label(); this.filterzpos = new System.Windows.Forms.NumericUpDown(); this.lblZPos = new System.Windows.Forms.Label(); + this.cmdLookup = new System.Windows.Forms.Button(); + this.txtLookup = new System.Windows.Forms.TextBox(); + this.lblLookup = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.offsetx)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.offsety)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.scale)).BeginInit(); @@ -216,8 +254,37 @@ this.lblZPos.TabIndex = 10; this.lblZPos.Text = "Z Pos"; // + // cmdLookup + // + this.cmdLookup.Location = new System.Drawing.Point(720, 448); + this.cmdLookup.Name = "cmdLookup"; + this.cmdLookup.Size = new System.Drawing.Size(48, 20); + this.cmdLookup.TabIndex = 4; + this.cmdLookup.Text = "Reset"; + this.cmdLookup.Click += new System.EventHandler(this.cmdLookup_Click); + // + // txtLookup + // + this.txtLookup.Location = new System.Drawing.Point(656, 448); + this.txtLookup.Name = "txtLookup"; + this.txtLookup.Size = new System.Drawing.Size(56, 20); + this.txtLookup.TabIndex = 5; + this.txtLookup.Text = ""; + this.txtLookup.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtLookup_KeyPress); + // + // lblLookup + // + this.lblLookup.Location = new System.Drawing.Point(608, 448); + this.lblLookup.Name = "lblLookup"; + this.lblLookup.Size = new System.Drawing.Size(48, 23); + this.lblLookup.TabIndex = 12; + this.lblLookup.Text = "Lookup"; + // // MapPane // + this.Controls.Add(this.lblLookup); + this.Controls.Add(this.txtLookup); + this.Controls.Add(this.cmdLookup); this.Controls.Add(this.filterzpos); this.Controls.Add(this.lblZPos); this.Controls.Add(this.filterzneg); @@ -231,7 +298,7 @@ this.Controls.Add(this.mapCon); this.Controls.Add(this.cmdCommand); this.Name = "MapPane"; - this.Size = new System.Drawing.Size(728, 480); + this.Size = new System.Drawing.Size(776, 480); this.Resize += new System.EventHandler(this.MapPane_Resize); ((System.ComponentModel.ISupportInitialize)(this.offsetx)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.offsety)).EndInit(); @@ -241,75 +308,79 @@ this.ResumeLayout(false); } - #endregion + #endregion - private void MapPane_Resize(object sender, EventArgs e) { - Size s = mapCon.Size; - Size t = Size; + private void MapPane_Resize(object sender, EventArgs e) { + Size s = mapCon.Size; + Size t = Size; - s.Width = t.Width; - s.Height = t.Height - 30; // Allow for controls - mapCon.Size = s; + s.Width = t.Width; + s.Height = t.Height - 30; // Allow for controls + mapCon.Size = s; - int top = Size.Height - 25; // Top of controls + int top = Size.Height - 25; // Top of controls - cmdCommand.Top = top; + cmdCommand.Top = top; - offsetx.Top = top; - lblOffsetX.Top = top; + offsetx.Top = top; + lblOffsetX.Top = top; - offsety.Top = top; - lblOffsetY.Top = top; + offsety.Top = top; + lblOffsetY.Top = top; - scale.Top = top; - lblScale.Top = top; + scale.Top = top; + lblScale.Top = top; - filterzneg.Top = top; - lblZNeg.Top = top; + filterzneg.Top = top; + lblZNeg.Top = top; - filterzpos.Top = top; - lblZPos.Top = top; + filterzpos.Top = top; + lblZPos.Top = top; - mapCon.onResize(); - mapCon.Invalidate(); - } + lblLookup.Top = top; + txtLookup.Top = top; + cmdLookup.Top = top; - private void offsetx_ValueChanged(object sender, System.EventArgs e) { - mapCon.m_panOffsetX = -(int)offsetx.Value; - mapCon.m_readjustRequired = true; - mapCon.Invalidate(); - } + mapCon.onResize(); + mapCon.Invalidate(); + } - private void offsety_ValueChanged(object sender, System.EventArgs e) { - mapCon.m_panOffsetY = -(int)offsety.Value; - mapCon.m_readjustRequired = true; - mapCon.Invalidate(); - } + private void offsetx_ValueChanged(object sender, System.EventArgs e) { + mapCon.m_panOffsetX = -(int)offsetx.Value; + mapCon.m_readjustRequired = true; + mapCon.Invalidate(); + } - private void scale_ValueChanged(object sender, System.EventArgs e) { - mapCon.scale = (float)(scale.Value)/100.0f; - mapCon.m_readjustRequired = true; - mapCon.Invalidate(); - } + private void offsety_ValueChanged(object sender, System.EventArgs e) { + mapCon.m_panOffsetY = -(int)offsety.Value; + mapCon.m_readjustRequired = true; + mapCon.Invalidate(); + } - private void cmdCommand_Click(object sender, System.EventArgs e) { - frmMain f1 = (frmMain)Parent; + private void scale_ValueChanged(object sender, System.EventArgs e) { + mapCon.scale = (float)(scale.Value)/100.0f; + mapCon.m_readjustRequired = true; + mapCon.Invalidate(); + } - f1.cmdCommand_Click(sender, e); - } + private void cmdCommand_Click(object sender, System.EventArgs e) { + frmMain f1 = (frmMain)Parent; - private void filterzpos_ValueChanged(object sender, System.EventArgs e) { - mapCon.filterpos = (int)filterzpos.Value; - mapCon.Invalidate(); - } + f1.cmdCommand_Click(sender, e); + } - private void filterzneg_ValueChanged(object sender, System.EventArgs e) { - mapCon.filterneg = (int)filterzneg.Value; - mapCon.Invalidate(); - } + private void filterzpos_ValueChanged(object sender, System.EventArgs e) { + mapCon.filterpos = (int)filterzpos.Value; + mapCon.Invalidate(); + } - private void mapCon_MouseEnter(object sender, System.EventArgs e) { - mapCon.Focus(); - } - } + private void filterzneg_ValueChanged(object sender, System.EventArgs e) { + mapCon.filterneg = (int)filterzneg.Value; + mapCon.Invalidate(); + } + + private void mapCon_MouseEnter(object sender, System.EventArgs e) { + mapCon.Focus(); + } + } } |