Mirrors/Switch-Toolbox
2
0
Fork 0
mirror of https://github.com/KillzXGaming/Switch-Toolbox synced 2024-11-22 04:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve file searching window (#428)

Browse source
This commit is contained in:
Crementif 2021-11-28 18:58:17 +01:00 committed by GitHub
parent 2e8632147c
commit bee25c6b06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 57 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Switch_Toolbox_Library/Forms/Editors/Object Editor/ObjectEditorTree.cs
View file

@ -1048,6 +1048,7 @@ namespace Toolbox.Library.Forms
var panel = new STPanel() { Dock = DockStyle.Fill };
panel.Controls.Add(searchForm);
form.AddControl(panel);
form.Text = "Search Window";
form.Show(this);
}

38
Switch_Toolbox_Library/Forms/Editors/Object Editor/SearchNodeForm.Designer.cs generated
View file

@ -39,6 +39,8 @@
this.listViewModeCB = new Toolbox.Library.Forms.STComboBox();
this.lblFoundEntries = new Toolbox.Library.Forms.STLabel();
this.chkUpdateDoubleClick = new Toolbox.Library.Forms.STCheckBox();
this.chkAllowWildcards = new Toolbox.Library.Forms.STCheckBox();
this.chkOpenWithDoubleClick = new Toolbox.Library.Forms.STCheckBox();
this.SuspendLayout();
//
// listViewCustom1
@ -50,6 +52,7 @@
this.listViewCustom1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.columnHeader1});
this.listViewCustom1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
this.listViewCustom1.HideSelection = false;
this.listViewCustom1.Location = new System.Drawing.Point(5, 77);
this.listViewCustom1.Name = "listViewCustom1";
this.listViewCustom1.OwnerDraw = true;
@ -88,7 +91,7 @@
// chkSearchSubNodes
//
this.chkSearchSubNodes.AutoSize = true;
this.chkSearchSubNodes.Location = new System.Drawing.Point(195, 31);
this.chkSearchSubNodes.Location = new System.Drawing.Point(8, 54);
this.chkSearchSubNodes.Name = "chkSearchSubNodes";
this.chkSearchSubNodes.Size = new System.Drawing.Size(111, 17);
this.chkSearchSubNodes.TabIndex = 14;
@ -118,7 +121,7 @@
// chkAutoSearch
//
this.chkAutoSearch.AutoSize = true;
this.chkAutoSearch.Location = new System.Drawing.Point(100, 31);
this.chkAutoSearch.Location = new System.Drawing.Point(207, 31);
this.chkAutoSearch.Name = "chkAutoSearch";
this.chkAutoSearch.Size = new System.Drawing.Size(85, 17);
this.chkAutoSearch.TabIndex = 17;
@ -132,6 +135,7 @@
this.listViewModeCB.BorderStyle = System.Windows.Forms.ButtonBorderStyle.Solid;
this.listViewModeCB.ButtonColor = System.Drawing.Color.Empty;
this.listViewModeCB.FormattingEnabled = true;
this.listViewModeCB.IsReadOnly = false;
this.listViewModeCB.Location = new System.Drawing.Point(5, 346);
this.listViewModeCB.Name = "listViewModeCB";
this.listViewModeCB.Size = new System.Drawing.Size(143, 21);
@ -151,17 +155,39 @@
// chkUpdateDoubleClick
//
this.chkUpdateDoubleClick.AutoSize = true;
this.chkUpdateDoubleClick.Location = new System.Drawing.Point(8, 54);
this.chkUpdateDoubleClick.Location = new System.Drawing.Point(125, 54);
this.chkUpdateDoubleClick.Name = "chkUpdateDoubleClick";
this.chkUpdateDoubleClick.Size = new System.Drawing.Size(138, 17);
this.chkUpdateDoubleClick.Size = new System.Drawing.Size(134, 17);
this.chkUpdateDoubleClick.TabIndex = 20;
this.chkUpdateDoubleClick.Text = "Update by Double Click";
this.chkUpdateDoubleClick.Text = "Select on Double Click";
this.chkUpdateDoubleClick.UseVisualStyleBackColor = true;
//
// chkAllowWildcards
//
this.chkAllowWildcards.AutoSize = true;
this.chkAllowWildcards.Location = new System.Drawing.Point(100, 31);
this.chkAllowWildcards.Name = "chkAllowWildcards";
this.chkAllowWildcards.Size = new System.Drawing.Size(101, 17);
this.chkAllowWildcards.TabIndex = 21;
this.chkAllowWildcards.Text = "Allow Wildcards";
this.chkAllowWildcards.UseVisualStyleBackColor = true;
this.chkAllowWildcards.CheckedChanged += new System.EventHandler(this.chkAllowWildcards_CheckedChanged);
//
// chkOpenWithDoubleClick
//
this.chkOpenWithDoubleClick.Location = new System.Drawing.Point(269, 54);
this.chkOpenWithDoubleClick.Name = "chkOpenWithDoubleClick";
this.chkOpenWithDoubleClick.Size = new System.Drawing.Size(136, 17);
this.chkOpenWithDoubleClick.TabIndex = 0;
this.chkOpenWithDoubleClick.Text = "Open by Double Click";
this.chkOpenWithDoubleClick.UseVisualStyleBackColor = true;
//
// SearchNodePanel
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.chkOpenWithDoubleClick);
this.Controls.Add(this.chkAllowWildcards);
this.Controls.Add(this.chkUpdateDoubleClick);
this.Controls.Add(this.lblFoundEntries);
this.Controls.Add(this.listViewModeCB);
@ -192,5 +218,7 @@
private System.Windows.Forms.ColumnHeader columnHeader1;
private STLabel lblFoundEntries;
private STCheckBox chkUpdateDoubleClick;
private STCheckBox chkAllowWildcards;
private STCheckBox chkOpenWithDoubleClick;
}
}

31
Switch_Toolbox_Library/Forms/Editors/Object Editor/SearchNodeForm.cs
View file

@ -5,6 +5,7 @@ using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows.Forms;
@ -18,6 +19,8 @@ namespace Toolbox.Library.Forms
private bool MatchCase => chkMatchCase.Checked;
private bool SearchSubNodes => chkSearchSubNodes.Checked;
private bool UpdateDoubleClick => chkUpdateDoubleClick.Checked;
private bool OpenDoubleClick => chkOpenWithDoubleClick.Checked;
private bool AllowWildcards => chkAllowWildcards.Checked;
private List<TreeNode> TreenodeLookup = new List<TreeNode>();
@ -67,21 +70,21 @@ namespace Toolbox.Library.Forms
TreenodeLookup.Clear();
foreach (TreeNode node in treeView.Nodes)
RecurvsiveTreeNodeSearch(node, text);
RecursiveTreeNodeSearch(node, text);
listViewCustom1.EndUpdate();
lblFoundEntries.Text = $"Found Entries {TreenodeLookup.Count} of {TotalNodeCount}";
}
private void RecurvsiveTreeNodeSearch(TreeNode parentNode, string text)
private static String WildCardToRegular(String query)
{
bool HasText = false;
return Regex.Escape(query).Replace("\\?", ".").Replace("\\*", ".*")+".*";
}
if (MatchCase)
HasText = parentNode.Text.IndexOf(text, StringComparison.Ordinal) >= 0;
else
HasText = parentNode.Text.IndexOf(text, StringComparison.OrdinalIgnoreCase) >= 0;
private void RecursiveTreeNodeSearch(TreeNode parentNode, string text)
{
bool HasText = Regex.IsMatch(parentNode.Text, AllowWildcards ? WildCardToRegular(text) : text, MatchCase ? RegexOptions.None : RegexOptions.IgnoreCase);
if (HasText)
{
@ -108,7 +111,7 @@ namespace Toolbox.Library.Forms
if (SearchSubNodes)
{
foreach (TreeNode node in parentNode.Nodes)
RecurvsiveTreeNodeSearch(node, text);
RecursiveTreeNodeSearch(node, text);
}
TotalNodeCount++;
@ -123,6 +126,14 @@ namespace Toolbox.Library.Forms
treeView.SelectedNode = TreenodeLookup[index];
treeView.Refresh();
}
if (listViewCustom1.SelectedItems.Count > 0 && OpenDoubleClick)
{
int index = listViewCustom1.SelectedIndices[0];
if (TreenodeLookup[index] is TreeNodeCustom)
((TreeNodeCustom)TreenodeLookup[index]).OnDoubleMouseClick(treeView);
if (TreenodeLookup[index].Tag != null && TreenodeLookup[index].Tag is TreeNodeCustom)
((TreeNodeCustom)TreenodeLookup[index].Tag).OnDoubleMouseClick(treeView);
}
}
private void listViewModeCB_SelectedIndexChanged(object sender, EventArgs e)
@ -152,5 +163,9 @@ namespace Toolbox.Library.Forms
treeView.SelectedNode = TreenodeLookup[index];
treeView.Refresh();
}
private void chkAllowWildcards_CheckedChanged(object sender, EventArgs e) {
UpdateSearchResults(searchTB.Text);
}
}
}