Merge pull request #7 from IvoKrugers/develop

Button at the bottom
Move Addin info to manifest

Author: IvoKrugers

VisualStudioMac.SolutionTreeFilter/Constants.cs

@@ -2,7 +2,6 @@
 {
     public static class Constants
     {
-        internal const string Version = "17.3.1";
         internal const string SolutionFilterPadId = "VisualStudioMac.SolutionTreeFilter.Gui.FilterPad";
     }
 }

VisualStudioMac.SolutionTreeFilter/Gui/FilterPadWidget.UI.cs

@@ -102,16 +102,16 @@ protected virtual void Build()
                 ExpandHorizontal = true,
                 HorizontalPlacement = WidgetPlacement.Fill,
                 VerticalPlacement = WidgetPlacement.Center,
-                MarginLeft = 8,
-                MarginRight = 8,
+                MarginLeft = 2,
+                MarginRight = 2,
                 MultiLine = false,
                 PlaceholderText = ""
             };
 
             applyButton = new Button(ImageService.GetIcon("gtk-refresh"))
             {
                 TooltipText = "Apply the Project to expand",
-                MarginLeft = 2,
+                MarginLeft = 0,
                 MarginRight = 6,
                 ExpandHorizontal = false,
                 HorizontalPlacement = WidgetPlacement.End,
@@ -120,10 +120,15 @@ protected virtual void Build()
             };
 
             expandHBox.PackStart(expandLabel);
+            expandHBox.PackStart(projectsEntry, true, true);
             expandHBox.PackEnd(applyButton);
 
             // Expand projects section
-            var buttonsHBox = new HBox();
+            var buttonsHBox = new HBox()
+            {
+                MarginBottom = 6
+            };
+
             pinOpenDocumentsButton = new Button(ImageService.GetIcon(Stock.PinDown, Xwt.IconSize.Small), "Pin All Open Docs")
             {
                 MarginLeft = 6,
@@ -156,9 +161,9 @@ protected virtual void Build()
             var mainVBox = new VBox();
             mainVBox.PackStart(filterHBox, false, false);
             mainVBox.PackStart(filterEntry, true, true);
-            mainVBox.PackStart(buttonsHBox, false, false);
             mainVBox.PackStart(expandHBox, false, false);
-            mainVBox.PackStart(projectsEntry, false, true);
+            mainVBox.PackStart(buttonsHBox, false, false);
+            //mainVBox.PackStart(projectsEntry, false, true);
 
             // Force a height
             var mainFrame = new FrameBox(mainVBox) { MinHeight = 250 };

VisualStudioMac.SolutionTreeFilter/Properties/AddinInfo.cs

@@ -2,18 +2,18 @@
 using Mono.Addins.Description;
 using VisualStudioMac.SolutionTreeFilter;
 using System.Runtime.Versioning;
+using System.Reflection;
 
-[assembly: Addin(
-    "SolutionTreeFilter",
-    Namespace = "VisualStudioMac",
-    Version = Constants.Version,
-    Category = "IDE extensions"
-)]
+//[assembly: Addin(
+//    "SolutionTreeFilter",
+//    Namespace = "VisualStudioMac",
+//    Version = Constants.Version,
+//    Category = "IDE extensions")]
 
-[assembly: AddinName("SolutionTree Filter")]
-[assembly: AddinDescription("This extension adds a Pad which allows you to filter the solution tree by multiple search terms.\n\nby Ivo Krugers")]
-[assembly: AddinAuthor("Ivo Krugers")]
-[assembly: AddinUrl("https://github.com/IvoKrugers/VisualStudioMac.SolutionTreeFilter")]
+//[assembly: AddinName("SolutionTree Filter")]
+//[assembly: AddinDescription("This extension adds a Pad which allows you to filter the solution tree by multiple search terms.\n\nby Ivo Krugers")]
+//[assembly: AddinAuthor("Ivo Krugers")]
+//[assembly: AddinUrl("https://github.com/IvoKrugers/VisualStudioMac.SolutionTreeFilter")]
 
 [assembly: AddinDependency("::MonoDevelop.Core", MonoDevelop.BuildInfo.Version)]
 [assembly: AddinDependency("::MonoDevelop.Ide", MonoDevelop.BuildInfo.Version)]

VisualStudioMac.SolutionTreeFilter/Properties/Manifest.addin.xml

@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ExtensionModel>
+
+<Addin name        = "SolutionTree Filter"
+       id          = "SolutionTreeFilter"
+       namespace   = "VisualStudioMac"
+       author      = "Ivo Krugers"
+       copyright   = "MIT X11"
+       url         = "https://github.com/IvoKrugers/VisualStudioMac.SolutionTreeFilter"
+       description = "This extension adds a Pad which allows you to filter the solution tree by multiple search terms.\n\nby Ivo Krugers"
+       category    = "IDE extensions"
+       version     = "17.3.3">
+
 	<Runtime>
 		<Import assembly="VisualStudioMac.SolutionTreeFilter.dll" />
 	</Runtime>
@@ -71,4 +81,4 @@
         </Condition>-->
 	</Extension>
 
-</ExtensionModel>
+</Addin>

pack.sh

@@ -16,9 +16,9 @@ mono /Applications/Visual\ Studio.app/Contents/Resources/lib/monodevelop/bin/vst
 # Uninstall
 /Applications/Visual\ Studio\ \(Preview\).app/Contents/MacOS/vstool setup uninstall VisualStudioMac.SolutionTreeFilter -y
 
-# Install
-for filename in *.mpack;
-do
-  echo "$filename"
-  /Applications/Visual\ Studio\ \(Preview\).app/Contents/MacOS/vstool setup install "$PROJECTFOLDER/$filename" -y
-done
+# # Install
+# for filename in *.mpack;
+# do
+#   echo "$filename"
+#   /Applications/Visual\ Studio\ \(Preview\).app/Contents/MacOS/vstool setup install "$PROJECTFOLDER/$filename" -y
+# done