Merge pull request #25 from IvoKrugers/develop

- Adapt to changes in SolutionPad - Bump Version 1.7.7
IvoKrugers · Nov 12, 2020 · 39b1c88 · 39b1c88
2 parents 9f0e66c + 102ffd3
commit 39b1c88
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 21 deletions.
diff --git a/EssentialsAddin/Constants.cs b/EssentialsAddin/Constants.cs
@@ -2,7 +2,7 @@
 {
     public static class Constants
     {
-        public const string Version = "1.7.6";
+        public const string Version = "1.7.7";
         public const string SolutionFilterPadId = "EssentialsAddin.SolutionFilterPad";
         public const string OutputFilterPadId = "EssentialsAddin.OutputFilterPad";
     }

diff --git a/EssentialsAddin/EssentialsAddin.csproj b/EssentialsAddin/EssentialsAddin.csproj
@@ -56,6 +56,7 @@
     <Compile Include="CommandHandlers\CurrentVersionMenuHandler.cs" />
     <Compile Include="Models\Release.cs" />
     <Compile Include="Helpers\TextBufferExtensions.cs" />
+    <Compile Include="Helpers\SolutionPadExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\Manifest.addin.xml" />

diff --git a/EssentialsAddin/Helpers/SolutionPadExtensions.cs b/EssentialsAddin/Helpers/SolutionPadExtensions.cs
@@ -0,0 +1,32 @@
+using System;
+using MonoDevelop.Ide.Gui.Components;
+using MonoDevelop.Ide.Gui.Pads;
+
+namespace EssentialsAddin.Helpers
+{
+    public static class SolutionPadExtensions
+    {
+        public static ExtensibleTreeViewController GetTreeView(this SolutionPad pad)
+        {
+            return (ExtensibleTreeViewController)pad.Controller;
+        }
+
+        public static ITreeNavigator GetRootNode(this SolutionPad pad)
+        {
+            return pad.GetTreeView().GetRootNode();
+        }
+
+        public static void CollapseTree(this SolutionPad pad)
+        {
+            var c = (ExtensibleTreeView)pad.Control;
+            c.CollapseTree();
+        }
+
+
+        public static ITreeNavigator GetRootNode(this ExtensibleTreeViewController treeview)
+        {
+            var pos = treeview.GetRootPosition();
+            return treeview.GetNodeAtPosition(pos);
+        }
+    }
+}
diff --git a/EssentialsAddin/SolutionFilter/FileNodeBuilderExtension.cs b/EssentialsAddin/SolutionFilter/FileNodeBuilderExtension.cs
@@ -96,7 +96,7 @@ public override void BuildNode(ITreeBuilder treeBuilder, object dataObject, Node
             {
                 if (!FilteredProjectCache.IsProjectItemEnabled(dataObject))
 
-                    nodeInfo.DisabledStyle = true;
+                    nodeInfo.Style = NodeInfo.LabelStyle.Disabled;
             }
 
             if (!(dataObject is ProjectFile))

diff --git a/EssentialsAddin/SolutionFilterWidget.cs b/EssentialsAddin/SolutionFilterWidget.cs
@@ -3,8 +3,10 @@
 using EssentialsAddin.Helpers;
 using EssentialsAddin.Services;
 using EssentialsAddin.SolutionFilter;
+using Gtk;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
+using MonoDevelop.Ide.Gui.Components;
 using MonoDevelop.Ide.Gui.Pads;
 using Xwt.GtkBackend;
 
@@ -31,8 +33,10 @@ private void Setup()
             if (pad == null)
                 return;
 
-            pad.TreeView.GrabFocus();
-            var root = pad.TreeView.GetRootNode();
+
+            pad.Control.GrabFocus();
+            var root = pad.GetRootNode();
+
             if (root != null)
             {
                 oneClickCheckbutton.Active = root.Options[FileNodeBuilderExtension.OneClickShowFileOption];
@@ -65,12 +69,12 @@ protected void collapseButton_Clicked(object sender, EventArgs e)
             if (pad != null)
             {
                 EssentialProperties.IsRefreshingTree = true;
-                pad.TreeView.CollapseTree();
-                var root = pad.TreeView.GetRootNode();
+                pad.CollapseTree();
+                var root = pad.GetRootNode();
                 if (root != null)
                 {
                     root.Expanded = false;
-                    pad.TreeView.RefreshNode(root);
+                    pad.GetTreeView().RefreshNode(root);
                     root.Expanded = true;
                     SolutionTreeExtensions.ExpandAll(root);
                 }
@@ -95,7 +99,7 @@ protected void OnEditingDone(object sender, EventArgs e)
         private void StartTimer()
         {
             StopTimer();
-            timer = new Timer(OnTimerElapsed, null, 1000, Timeout.Infinite); // dueTime in miliseconds
+            timer = new Timer(OnTimerElapsed, null, 1000, System.Threading.Timeout.Infinite); // dueTime in miliseconds
         }
 
         private void StopTimer()
@@ -104,7 +108,7 @@ private void StopTimer()
             timer = null;
         }
 
-        object refreshLock = new Object();
+        object refreshLock = new object();
         private void OnTimerElapsed(object state)
         {
             lock (refreshLock)
@@ -141,12 +145,12 @@ private void FilterSolutionPad()
                     return;
 
                 EssentialProperties.IsRefreshingTree = true;
-                pad.TreeView.CollapseTree();
-                var root = pad.TreeView.GetRootNode();
+                pad.CollapseTree();
+                var root = pad.GetRootNode();
                 if (root != null)
                 {
                     root.Expanded = false;
-                    pad.TreeView.RefreshNode(root);
+                    pad.GetTreeView().RefreshNode(root);
                     root.Expanded = true;
                     SolutionTreeExtensions.ExpandAll(root);
                 }
@@ -166,12 +170,12 @@ private void ExpandOnlyCSharpProjects()
                 return;
 
             EssentialProperties.IsRefreshingTree = true;
-            pad.TreeView.CollapseTree();
-            var root = pad.TreeView.GetRootNode();
+            pad.CollapseTree();
+            var root = pad.GetRootNode();
             if (root != null)
             {
                 root.Expanded = false;
-                pad.TreeView.RefreshNode(root);
+                pad.GetTreeView().RefreshNode(root);
                 root.Expanded = true;
                 SolutionTreeExtensions.ExpandOnlyCSharpProjects(root);
             }

diff --git a/...sentialsAddin.EssentialsAddin_1.7.6.mpack → ...sentialsAddin.EssentialsAddin_1.7.7.mpack b/...sentialsAddin.EssentialsAddin_1.7.6.mpack → ...sentialsAddin.EssentialsAddin_1.7.7.mpack
diff --git a/mpack/EssentialsAddin/main.mrep b/mpack/EssentialsAddin/main.mrep
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Repository xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Addin>
-    <Url>EssentialsAddin.EssentialsAddin_1.7.6.mpack</Url>
+    <Url>EssentialsAddin.EssentialsAddin_1.7.7.mpack</Url>
     <Addin>
       <Id>EssentialsAddin</Id>
       <Namespace>EssentialsAddin</Namespace>
       <Name>Essentials Addin</Name>
-      <Version>1.7.6</Version>
+      <Version>1.7.7</Version>
       <BaseVersion />
       <Author>Ivo Krugers</Author>
       <Copyright>Ivo Krugers</Copyright>
@@ -26,11 +26,11 @@ by Ivo Krugers</Description>
       <Dependencies>
         <AddinDependency>
           <AddinId>::MonoDevelop.Core</AddinId>
-          <Version>8.7.4</Version>
+          <Version>8.8</Version>
         </AddinDependency>
         <AddinDependency>
           <AddinId>::MonoDevelop.Ide</AddinId>
-          <Version>8.7.4</Version>
+          <Version>8.8</Version>
         </AddinDependency>
       </Dependencies>
       <OptionalDependencies />
@@ -51,7 +51,7 @@ by Ivo Krugers</Property>
         <Property name="Copyright">Ivo Krugers</Property>
         <Property name="Url">https://github.com/IvoKrugers/EssentialsAddin</Property>
         <Property name="UpdateRank">Important</Property>
-        <Property name="DownloadSize">45756</Property>
+        <Property name="DownloadSize">45944</Property>
       </Properties>
     </Addin>
   </Addin>

diff --git a/mpack/main.mrep b/mpack/main.mrep
@@ -3,6 +3,6 @@
   <Name>EssentialsAddin Repo (Ivo Krugers)</Name>
   <Repository>
     <Url>EssentialsAddin/main.mrep</Url>
-    <LastModified>2020-09-08T09:51:37.9794302+02:00</LastModified>
+    <LastModified>2020-11-12T11:57:33.1307733+01:00</LastModified>
   </Repository>
 </Repository>