[nodelist] add treelist ui and base logic

KevinSHIT · Jun 19, 2020 · d655083 · d655083
1 parent 11f74a1
commit d655083
Show file tree

Hide file tree

Showing 11 changed files with 301 additions and 190 deletions.
diff --git a/NaiveSharp/App.config b/NaiveSharp/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/NaiveSharp/Controller/Extension/Dictionary.cs b/NaiveSharp/Controller/Extension/Dictionary.cs
@@ -2,7 +2,7 @@
 
 namespace NaiveSharp.Controller.Extension
 {
-    public static class Dictionary
+    public static class DictionaryEx
     {
         public static bool HasKey<K, V>(this Dictionary<K, V> dic, K value)
             => dic.ContainsKey(value);

diff --git a/NaiveSharp/Controller/Extension/String.cs b/NaiveSharp/Controller/Extension/String.cs
@@ -2,7 +2,7 @@
 
 namespace NaiveSharp.Controller.Extension
 {
-    public static class String
+    public static class StringEx
     {
         public static string ToBase64(this string str)
             => ConvertToBase64(str, false);

diff --git a/NaiveSharp/Controller/Extension/String[].cs b/NaiveSharp/Controller/Extension/String[].cs
@@ -2,11 +2,11 @@
 
 namespace NaiveSharp.Controller.Extension
 {
-    public static class StringArray
+    public static class StringArrayEx
     {
         public static string[] Trim(this string[] ss)
         {
-            for (int i = 0; i < ss.Length; --i)
+            for (int i = 0; i < ss.Length; ++i)
             {
                 ss[i] = ss[i].Trim();
             }
@@ -22,7 +22,7 @@ public static string[] Trim(this string[] ss, bool removeNullOrWhiteSpace)
             else
             {
                 var x = new List<string>();
-                for (int i = 0; i < ss.Length; --i)
+                for (int i = 0; i < ss.Length; ++i)
                 {
                     if (string.IsNullOrWhiteSpace(ss[i]))
                     {

diff --git a/NaiveSharp/Controller/Extension/TreeNodeCollection.cs b/NaiveSharp/Controller/Extension/TreeNodeCollection.cs
@@ -0,0 +1,25 @@
+using System.Linq;
+using System.Windows.Forms;
+
+namespace NaiveSharp.Controller.Extension
+{
+    public static class TreeNodeCollectionEx
+    {
+        public static bool ContainsText(this TreeNodeCollection tnc, string text)
+        {
+            /*
+            => tnc.Cast<TreeNode>()
+                .Where(tn => tn.Text == text)
+                .Count() > 0;
+            */
+            foreach (TreeNode tn in tnc)
+            {
+                if (tn.Text == text)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}
diff --git a/NaiveSharp/Controller/NodeList.cs b/NaiveSharp/Controller/NodeList.cs
@@ -1,13 +1,44 @@
-using System.Collections.Generic;
+using NaiveSharp.Controller.Extension;
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
 using System.Windows.Forms;
 
 namespace NaiveSharp.Controller
 {
     public class NodeList
     {
-        public static void LoadFromStringArray(string[] s)
+        public static void LoadFromStringArray(ref TreeView tv, string[] s)
         {
+            tv.Nodes.Clear();
+            s = s.Trim(true);
+
+            string group = "default";
 
+            for (int i = 0; i < s.Length; ++i)
+            {
+                if (s[i].StartsEndsWith("[", "]"))
+                {
+                    group = s[i].Substring(1, s[i].Length - 2);
+                    if (!tv.Nodes.ContainsText(group))
+                    {
+                        tv.Nodes.Add(new TreeNode() { Name = group, Text = group });
+                    }
+                }
+                else
+                {
+                    if (i == 0)
+                    {
+                        tv.Nodes.Add(new TreeNode() { Name = group, Text = group });
+                    }
+                    tv.Nodes[group].Nodes.Add(new TreeNode()
+                    {
+                        Tag = s[i],
+                        Text = new Uri(s[i]).Fragment.Substring(1)
+                    });
+                }
+            }
         }
 
         public static string[] ToStringArray(TreeView tv)

diff --git a/NaiveSharp/NaiveSharp.csproj b/NaiveSharp/NaiveSharp.csproj
@@ -30,6 +30,7 @@
     <ApplicationVersion>0.5.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -84,6 +85,7 @@
     <Compile Include="Controller\Extension\Dictionary.cs" />
     <Compile Include="Controller\Extension\String.cs" />
     <Compile Include="Controller\Extension\String[].cs" />
+    <Compile Include="Controller\Extension\TreeNodeCollection.cs" />
     <Compile Include="Controller\IniHelper.cs" />
     <Compile Include="Controller\NaiveCmdBuilder.cs" />
     <Compile Include="Controller\Net.cs" />
@@ -120,6 +122,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <EmbeddedResource Include="View\About.resx">
       <DependentUpon>About.cs</DependentUpon>

diff --git a/NaiveSharp/Properties/Resources.Designer.cs b/NaiveSharp/Properties/Resources.Designer.cs
diff --git a/NaiveSharp/Properties/Settings.Designer.cs b/NaiveSharp/Properties/Settings.Designer.cs