WIP: clean-up + icons

This commit is contained in:
Ray committed 2021-09-14 20:36:04 +01:00
1 parent c770265283
commit c00d42a7d8
20 files changed
+1223 -642

No files matched your search

+53 -52
View File
@@ -627,11 +627,11 @@ namespace RyzStudio.Windows.Forms
this.HasChanged = true;
}
public void AddItem(TreeNode treeNode, BookmarkItemViewModel viewModel)
public TreeNode AddItem(TreeNode treeNode, BookmarkItemViewModel viewModel)
{
if (treeNode == null)
{
return;
return null;
}
int iconIndex = addIcon(viewModel);
@@ -643,6 +643,8 @@ namespace RyzStudio.Windows.Forms
treeNode.Nodes.Add(tn);
this.HasChanged = true;
return tn;
}
//public void AddOrUpdateItem(TreeNode treeNode, BookmarkItemViewModel viewModel)
@@ -854,24 +856,23 @@ namespace RyzStudio.Windows.Forms
public new void Sort() => Sort(this.SelectedNode);
//public void UpdateItem(TreeNode treeNode, BookmarkItemViewModel viewModel)
//{
// if (treeNode == null)
// {
// return;
// }
public void UpdateItem(TreeNode treeNode, BookmarkItemViewModel model, Image image)
{
if (treeNode == null)
{
return;
}
// int iconIndex = addIcon(viewModel);
int iconIndex = addIcon(model);
// treeNode.Text = viewModel.SiteName;
// treeNode.ImageIndex = iconIndex;
// treeNode.SelectedImageIndex = iconIndex;
// treeNode.Tag = viewModel;
// treeNode.ToolTipText = viewModel.ToString();
// this.HasChanged = true;
//}
treeNode.Text = model.SiteName;
treeNode.ImageIndex = iconIndex;
treeNode.SelectedImageIndex = iconIndex;
treeNode.Tag = model;
treeNode.ToolTipText = model.ToString();
this.HasChanged = true;
}
protected int addIcon(BookmarkItemViewModel viewModel)
@@ -1015,43 +1016,43 @@ namespace RyzStudio.Windows.Forms
}
}
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);
}
else if (nodeType == NodeType.Page)
{
BookmarkItemViewModel nodeTag = GetNodeModel(tn);
nodeTag.TreeviewPath = GetNodePath(tn);
//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);
// }
// else if (nodeType == NodeType.Page)
// {
// BookmarkItemViewModel nodeTag = GetNodeModel(tn);
// nodeTag.TreeviewPath = GetNodePath(tn);
if (nodeTag != null)
{
rs.Add(tn);
}
}
}
}
// if (nodeTag != null)
// {
// rs.Add(tn);
// }
// }
// }
//}
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);
}
else if (nodeType == NodeType.Page)
{
itemCount++;
}
}
}
//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);
// }
// else if (nodeType == NodeType.Page)
// {
// itemCount++;
// }
// }
//}