Gray/bookmark-manager-r4
Archived
1
0 Fork 0
Code Releases Activity

WIP: clean-up

Browse Source
This commit is contained in:
Ray committed 2021-09-07 17:21:28 +01:00
1 parent 1cdcca7267
commit f58608fc23
14 files changed
+205 -1196
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Windows/Forms/BookmarkTreeView.cs
+37 -92
View File
@@ -12,10 +12,7 @@ namespace RyzStudio.Windows.Forms
{
public partial class BookmarkTreeView : TreeView
{
public static string DecodePath(string value)
{
return System.Web.HttpUtility.UrlDecode(value);
}
public static string DecodePath(string value) => System.Web.HttpUtility.UrlDecode(value);
public static void DeleteNode(TreeNode node)
{
@@ -381,7 +378,7 @@ namespace RyzStudio.Windows.Forms
tn.Tag = viewModel;
tn.ToolTipText = viewModel.ToString();
TreeNode tn2 = addFolderPath(viewModel.TreeviewPath);
TreeNode tn2 = AddFolderPath(viewModel.TreeviewPath);
ThreadControl.Add(tn2, tn);
@@ -453,7 +450,7 @@ namespace RyzStudio.Windows.Forms
foreach (TreeNode item in this.Nodes)
{
traverseBookmarkList(ref itemCount, item);
TraverseBookmarkList(ref itemCount, item);
}
return itemCount;
@@ -489,8 +486,7 @@ namespace RyzStudio.Windows.Forms
this.AllowBeginEdit = true;
node.BeginEdit();
break;
default:
break;
default: break;
}
}
@@ -512,7 +508,7 @@ namespace RyzStudio.Windows.Forms
foreach (TreeNode item in this.Nodes)
{
traverseBookmarkList(rs, item);
TraverseBookmarkList(rs, item);
}
return rs;
@@ -616,8 +612,6 @@ namespace RyzStudio.Windows.Forms
public void Sort() => Sort(this.SelectedNode);
public void UpdateItem(TreeNode treeNode, BookmarkItemViewModel viewModel)
{
if (treeNode == null)
@@ -662,7 +656,7 @@ namespace RyzStudio.Windows.Forms
return;
}
if (isNodeChild(draggingNode, en))
if (IsNodeChild(draggingNode, en))
{
return;
}
@@ -879,14 +873,14 @@ namespace RyzStudio.Windows.Forms
return (int)IconSet.Default;
}
this.Add(this.ImageList, model.SiteAddress, bmp);
ThreadControl.Add(this, this.ImageList, model.SiteAddress, bmp);
//iconDatabase.AddIcon(model.SiteAddress, rawData);
return this.ImageList.Images.IndexOfKey(model.SiteAddress);
}
protected TreeNode addFolderPath(string path)
protected TreeNode AddFolderPath(string path)
{
TreeNode tn = null;
//TreeNode tn = this.Nodes[0];
@@ -919,7 +913,7 @@ namespace RyzStudio.Windows.Forms
{
if (!this.Nodes.ContainsKey(item))
{
this.Add(item, DecodePath(item), (int)IconSet.Root, (int)IconSet.Root);
ThreadControl.Add(this, item, DecodePath(item), (int)IconSet.Root, (int)IconSet.Root);
}
tn = this.Nodes[item];
@@ -928,7 +922,7 @@ namespace RyzStudio.Windows.Forms
{
if (!tn.Nodes.ContainsKey(item))
{
this.Add(tn, item, DecodePath(item), (int)IconSet.Folder1, (int)IconSet.Folder2);
ThreadControl.Add(tn, item, DecodePath(item), (int)IconSet.Folder1, (int)IconSet.Folder2);
}
tn = tn.Nodes[item];
@@ -938,14 +932,35 @@ namespace RyzStudio.Windows.Forms
return tn;
}
protected void traverseBookmarkList(List<BookmarkItemViewModel> rs, TreeNode node)
protected bool IsNodeChild(TreeNode dragNode, TreeNode dropNode)
{
TreeNode tn = dropNode;
while (true)
{
if (tn.Parent == null)
{
break;
}
if (tn.Equals(dragNode))
{
return true;
}
tn = tn.Parent;
}
return false;
}
protected void TraverseBookmarkList(List<BookmarkItemViewModel> rs, TreeNode node)
{
foreach (TreeNode tn in node.Nodes)
{
NodeType nodeType = GetNodeType(tn);
if (nodeType == NodeType.Folder)
{
traverseBookmarkList(rs, tn);
TraverseBookmarkList(rs, tn);
}
else if (nodeType == NodeType.Page)
{
@@ -960,14 +975,14 @@ namespace RyzStudio.Windows.Forms
}
}
protected void traverseBookmarkList(List<TreeNode> rs, TreeNode node)
protected void TraverseBookmarkList(List<TreeNode> rs, TreeNode node)
{
foreach (TreeNode tn in node.Nodes)
{
NodeType nodeType = GetNodeType(tn);
if (nodeType == NodeType.Folder)
{
traverseBookmarkList(rs, tn);
TraverseBookmarkList(rs, tn);
}
else if (nodeType == NodeType.Page)
{
@@ -982,14 +997,14 @@ namespace RyzStudio.Windows.Forms
}
}
protected void traverseBookmarkList(ref int itemCount, TreeNode node)
protected void TraverseBookmarkList(ref int itemCount, TreeNode node)
{
foreach (TreeNode tn in node.Nodes)
{
NodeType nodeType = GetNodeType(tn);
if (nodeType == NodeType.Folder)
{
traverseBookmarkList(ref itemCount, tn);
TraverseBookmarkList(ref itemCount, tn);
}
else if (nodeType == NodeType.Page)
{
@@ -998,76 +1013,6 @@ namespace RyzStudio.Windows.Forms
}
}
protected bool isNodeChild(TreeNode drag_node, TreeNode drop_node)
{
TreeNode tn = drop_node;
while (true)
{
if (tn.Parent == null)
{
break;
}
if (tn.Equals(drag_node))
{
return true;
}
tn = tn.Parent;
}
return false;
}
protected void Add(ImageList control, string key, Image value)
{
if (this.InvokeRequired)
{
this.Invoke(new MethodInvoker(() => {
control.Images.Add(key, value);
}));
}
else
{
control.Images.Add(key, value);
}
}
protected TreeNode Add(string key, string text, int imageIndex, int selectedImageIndex)
{
TreeNode rs = null;
if (this.InvokeRequired)
{
this.Invoke(new MethodInvoker(() => {
rs = this.Nodes.Add(key, text, imageIndex, selectedImageIndex);
}));
}
else
{
rs = this.Nodes.Add(key, text, imageIndex, selectedImageIndex);
}
return rs;
}
protected TreeNode Add(TreeNode control, string key, string text, int imageIndex, int selectedImageIndex)
{
TreeNode rs = null;
if (control.TreeView.InvokeRequired)
{
control.TreeView.Invoke(new MethodInvoker(() => {
rs = control.Nodes.Add(key, text, imageIndex, selectedImageIndex);
}));
}
else
{
rs = control.Nodes.Add(key, text, imageIndex, selectedImageIndex);
}
return rs;
}
}