diff --git a/ShrlAlgoToolkit.Mvvm/Assists/BindingHelper.cs b/ShrlAlgoToolkit.Mvvm/Assists/BindingHelper.cs
deleted file mode 100644
index 5e9e387..0000000
--- a/ShrlAlgoToolkit.Mvvm/Assists/BindingHelper.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System.Windows;
-using System.Windows.Data;
-
-namespace ShrlAlgoToolkit.Mvvm.Assists
-{
- public static class BindingHelper
- {
- public static Binding GetBinding(this FrameworkElement element, DependencyProperty dependencyProperty)
- {
- var expression = element.GetBindingExpression(dependencyProperty);
- if (expression == null)
- {
- return null;
- }
- return expression.ParentBinding;
-
- }
- ///
- /// 获取绑定的源(模型视图)属性类型
- ///
- ///
- ///
- ///
- public static Type GetBindingPropertyType(this FrameworkElement element, DependencyProperty dependencyProperty)
- {
- var binding = element.GetBindingExpression(dependencyProperty);
- var source = binding.ResolvedSource;
- var prop = source.GetType().GetProperty(binding.ResolvedSourcePropertyName);
- return prop.PropertyType;
- }
- ///
- /// 设置绑定
- ///
- /// wpf框架元素
- /// 依赖属性
- /// 视图模型属性
- /// 视图模型
- public static void SetBinding(this FrameworkElement element,DependencyProperty dependencyProperty,string propertyName,object sourceData)
- {
- var description = new Binding() { Path = new PropertyPath(propertyName), Source = sourceData };
- element.SetBinding(dependencyProperty, description);
- }
- }
-}
diff --git a/ShrlAlgoToolkit.Mvvm/Assists/BindingProxy.cs b/ShrlAlgoToolkit.Mvvm/Assists/BindingProxy.cs
deleted file mode 100644
index e414ab1..0000000
--- a/ShrlAlgoToolkit.Mvvm/Assists/BindingProxy.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Windows;
-
-namespace ShrlAlgoToolkit.Mvvm.Assists
-{
- ///
- /// 绑定代理,用来传递绑定对象
- ///
- public class BindingProxy : Freezable
- {
- protected override Freezable CreateInstanceCore() => new BindingProxy();
-
- public object Data
- {
- get { return GetValue(DataProperty); }
- set { SetValue(DataProperty, value); }
- }
-
- public static readonly DependencyProperty DataProperty = DependencyProperty.Register(
- nameof(Data),
- typeof(object),
- typeof(BindingProxy)
- );
- }
-}
diff --git a/ShrlAlgoToolkit.Mvvm/Attach/TextSearchAssist.cs b/ShrlAlgoToolkit.Mvvm/Attach/TextSearchAssist.cs
deleted file mode 100644
index e406501..0000000
--- a/ShrlAlgoToolkit.Mvvm/Attach/TextSearchAssist.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System.Windows;
-
-namespace ShrlAlgoToolkit.Mvvm.Attach;
-
-public class TextSearchAssist
-{
- // Using a DependencyProperty as the backing store for IsTextMatch. This enables animation, styling, binding, etc...
- public static readonly DependencyProperty IsTextMatchProperty = DependencyProperty.RegisterAttached(
- "IsTextMatch",
- typeof(bool),
- typeof(TextSearchAssist),
- new UIPropertyMetadata(false)
- );
-
- // Using a DependencyProperty as the backing store for SearchValue. This enables animation, styling, binding, etc...
- public static readonly DependencyProperty SearchValueProperty = DependencyProperty.RegisterAttached(
- "SearchValue",
- typeof(string),
- typeof(TextSearchAssist),
- new FrameworkPropertyMetadata(string.Empty, FrameworkPropertyMetadataOptions.Inherits)
- );
-
- public static bool GetIsTextMatch(DependencyObject obj)
- {
- return (bool)obj.GetValue(IsTextMatchProperty);
- }
-
- public static string GetSearchValue(DependencyObject obj)
- {
- return (string)obj.GetValue(SearchValueProperty);
- }
-
- public static void SetIsTextMatch(DependencyObject obj, bool value)
- {
- obj.SetValue(IsTextMatchProperty, value);
- }
-
- public static void SetSearchValue(DependencyObject obj, string value)
- {
- obj.SetValue(SearchValueProperty, value);
- }
-}
diff --git a/ShrlAlgoToolkit.Mvvm/Behaviors/CloseByButtonBehavior.cs b/ShrlAlgoToolkit.Mvvm/Behaviors/CloseByButtonBehavior.cs
deleted file mode 100644
index d3fb03d..0000000
--- a/ShrlAlgoToolkit.Mvvm/Behaviors/CloseByButtonBehavior.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using Microsoft.Xaml.Behaviors;
-
-namespace ShrlAlgoToolkit.Mvvm.Behaviors;
-
-//
-//
-//
-//
-//
-//
-//
-//
-///
-/// 通过按钮点击,关闭窗口
-///
-public class CloseByButtonBehavior : Behavior
-{
- public static readonly DependencyProperty CommandProperty = DependencyProperty.Register(
- nameof(Command),
- typeof(ICommand),
- typeof(CloseByButtonBehavior)
- );
-
- public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register(
- nameof(CommandParameter),
- typeof(object),
- typeof(CloseByButtonBehavior)
- );
-
- public static readonly DependencyProperty CloseButtonProperty = DependencyProperty.Register(
- nameof(CloseButton),
- typeof(Button),
- typeof(CloseByButtonBehavior),
- new FrameworkPropertyMetadata(null, OnCloseButtonChanged)
- );
-
- public ICommand Command
- {
- get => (ICommand)GetValue(CommandProperty);
- set => SetValue(CommandProperty, value);
- }
-
- public object CommandParameter
- {
- get => GetValue(CommandParameterProperty);
- set => SetValue(CommandParameterProperty, value);
- }
-
- public Button CloseButton
- {
- get => (Button)GetValue(CloseButtonProperty);
- set => SetValue(CloseButtonProperty, value);
- }
-
- private static void OnCloseButtonChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
- {
- var window = ((CloseByButtonBehavior)d).AssociatedObject;
- ((Button)e.NewValue).Click += (s, e1) =>
- {
- var command = ((CloseByButtonBehavior)d).Command;
- var commandParameter = ((CloseByButtonBehavior)d).CommandParameter;
- command?.Execute(commandParameter);
- window.Close();
- };
- }
-}
diff --git a/ShrlAlgoToolkit.Mvvm/Behaviors/CloseByPropertyBehavior.cs b/ShrlAlgoToolkit.Mvvm/Behaviors/CloseByPropertyBehavior.cs
deleted file mode 100644
index 1596207..0000000
--- a/ShrlAlgoToolkit.Mvvm/Behaviors/CloseByPropertyBehavior.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System.Windows;
-using Microsoft.Xaml.Behaviors;
-
-namespace ShrlAlgoToolkit.Mvvm.Behaviors;
-
-///
-/// 通过设置属性值,关闭窗口
-///
-///
-///
-///
-/// i:Interaction.Behaviors>
-///
-///
-public class CloseByPropertyBehavior : Behavior
-{
- public static readonly DependencyProperty CloseTriggerProperty = DependencyProperty.Register(
- nameof(CloseTrigger),
- typeof(bool),
- typeof(CloseByPropertyBehavior),
- new PropertyMetadata(false, OnCloseTriggerChanged)
- );
-
- public bool CloseTrigger
- {
- get => (bool)GetValue(CloseTriggerProperty);
- set => SetValue(CloseTriggerProperty, value);
- }
-
- private static void OnCloseTriggerChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
- {
- if (d is CloseByPropertyBehavior behavior)
- {
- behavior.OnCloseTriggerChanged();
- }
- }
-
- private void OnCloseTriggerChanged()
- {
- // when closetrigger is true, close the window
- if (CloseTrigger)
- {
- AssociatedObject.Close();
- }
- }
-}
diff --git a/ShrlAlgoToolkit.Mvvm/Behaviors/DropFileBehavior.cs b/ShrlAlgoToolkit.Mvvm/Behaviors/DropFileBehavior.cs
deleted file mode 100644
index a0fd1e2..0000000
--- a/ShrlAlgoToolkit.Mvvm/Behaviors/DropFileBehavior.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System.Windows;
-using Microsoft.Xaml.Behaviors;
-
-namespace ShrlAlgoToolkit.Mvvm.Behaviors;
-
-///
-/// ��ק�ļ��¼�
-///
-/// DropFileBehaviors Data="{Binding FileNames,Mode=OneWayToSource}"���������Դ���Դ���ԣ�ͨ��Դ����ʵ��Mvvm
-/// ���ô�������AllowDrop�����ϲ㸲��һ�������Grid�����ô��ڵ�DropEnter��DropLeave(EventTrigger)�¼��������������Լ�����Drop�¼�������(ChangePropertyAction)
-class DropFileBehavior : Behavior
-{
- public string[] Data
- {
- get { return (string[])GetValue(DataProperty); }
- set { SetValue(DataProperty, value); }
- }
-
- public static readonly DependencyProperty DataProperty =
- DependencyProperty.Register(nameof(Data), typeof(string[]), typeof(DropFileBehavior), new PropertyMetadata(null));
-
-
- protected override void OnAttached()
- {
- AssociatedObject.AllowDrop = true;
- AssociatedObject.Drop += DropHandler;
- }
-
- private void DropHandler(object sender, DragEventArgs e)
- {
- if (e.Data.GetDataPresent(DataFormats.FileDrop))
- {
- Data = (string[])e.Data.GetData(DataFormats.FileDrop);
- }
- }
-
- protected override void OnDetaching()
- {
- AssociatedObject.Drop -= DropHandler;
- }
- protected override void OnChanged()
- {
- base.OnChanged();
- }
-}
\ No newline at end of file
diff --git a/ShrlAlgoToolkit.Mvvm/Behaviors/IValidationExceptionHandler.cs b/ShrlAlgoToolkit.Mvvm/Behaviors/IValidationExceptionHandler.cs
deleted file mode 100644
index ca303d8..0000000
--- a/ShrlAlgoToolkit.Mvvm/Behaviors/IValidationExceptionHandler.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace ShrlAlgoToolkit.Mvvm.Behaviors;
-
-public interface IValidationExceptionHandler
-{
- bool IsValid { get; set; }
-}
diff --git a/ShrlAlgoToolkit.Mvvm/Behaviors/ValidationRuleBehavior.cs b/ShrlAlgoToolkit.Mvvm/Behaviors/ValidationRuleBehavior.cs
deleted file mode 100644
index 86e1ca6..0000000
--- a/ShrlAlgoToolkit.Mvvm/Behaviors/ValidationRuleBehavior.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-using Microsoft.Xaml.Behaviors;
-
-namespace ShrlAlgoToolkit.Mvvm.Behaviors;
-
-///
-/// 在xaml的资源中声明,viewModel继承IValidationExceptionHandler,通过IsValid判断能否执行
-///
-public class ValidationRuleBehavior : Behavior
-{
- private int errorCount;
-
- protected override void OnAttached()
- {
- base.OnAttached();
- AssociatedObject.AddHandler(Validation.ErrorEvent, new EventHandler(OnValidationError));
- }
-
- protected override void OnDetaching()
- {
- AssociatedObject.RemoveHandler(Validation.ErrorEvent, new EventHandler(OnValidationError));
- }
-
- private void OnValidationError(object sender, ValidationErrorEventArgs e)
- {
- if (AssociatedObject.DataContext is IValidationExceptionHandler handler)
- {
- if (e.OriginalSource is UIElement elem)
- {
- if (e.Action == ValidationErrorEventAction.Added)
- {
- errorCount++;
- }
- else if (e.Action == ValidationErrorEventAction.Removed)
- {
- errorCount--;
- }
- }
-
- handler.IsValid = errorCount == 0;
- }
- }
-}
diff --git a/ShrlAlgoToolkit.Mvvm/Behaviors/WindowCloseByButtonBehavior.cs b/ShrlAlgoToolkit.Mvvm/Behaviors/WindowCloseByButtonBehavior.cs
deleted file mode 100644
index 15a92d3..0000000
--- a/ShrlAlgoToolkit.Mvvm/Behaviors/WindowCloseByButtonBehavior.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using Microsoft.Xaml.Behaviors;
-
-namespace ShrlAlgoToolkit.Mvvm.Behaviors;
-
-//
-//
-//
-//
-//
-//
-//
-//
-///
-/// 通过按钮点击,关闭窗口
-///
-public class WindowCloseByButtonBehavior
- : Behavior
-{
- public static readonly DependencyProperty CommandProperty = DependencyProperty.Register(
- nameof(Command),
- typeof(ICommand),
- typeof(WindowCloseByButtonBehavior)
- );
-
- public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register(
- nameof(CommandParameter),
- typeof(object),
- typeof(WindowCloseByButtonBehavior)
- );
-
- public static readonly DependencyProperty CloseButtonProperty = DependencyProperty.Register(
- nameof(CloseButton),
- typeof(Button),
- typeof(WindowCloseByButtonBehavior),
- new FrameworkPropertyMetadata(null, OnCloseButtonChanged)
- );
-
- public ICommand Command
- {
- get => (ICommand)GetValue(CommandProperty);
- set => SetValue(CommandProperty, value);
- }
-
- public object CommandParameter
- {
- get => GetValue(CommandParameterProperty);
- set => SetValue(CommandParameterProperty, value);
- }
-
- public Button CloseButton
- {
- get => (Button)GetValue(CloseButtonProperty);
- set => SetValue(CloseButtonProperty, value);
- }
-
- private static void OnCloseButtonChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
- {
- var window = ((WindowCloseByButtonBehavior)d).AssociatedObject;
- ((Button)e.NewValue).Click += (s, e1) =>
- {
- var command = ((WindowCloseByButtonBehavior)d).Command;
- var commandParameter = ((WindowCloseByButtonBehavior)d).CommandParameter;
- command?.Execute(commandParameter);
- window.Close();
- };
- }
-}
diff --git a/ShrlAlgoToolkit.RevitAddins/Assists/TextSearchAssist.cs b/ShrlAlgoToolkit.RevitAddins/Assists/TextSearchAssist.cs
new file mode 100644
index 0000000..db27715
--- /dev/null
+++ b/ShrlAlgoToolkit.RevitAddins/Assists/TextSearchAssist.cs
@@ -0,0 +1,36 @@
+using System.Windows;
+
+namespace ShrlAlgoToolkit.RevitAddins.Assists
+{
+ public class TextSearchAssist
+ {
+ // Using a DependencyProperty as the backing store for IsTextMatch. This enables animation, styling, binding, etc...
+ public static readonly DependencyProperty IsTextMatchProperty =
+ DependencyProperty.RegisterAttached("IsTextMatch", typeof(bool), typeof(TextSearchAssist), new UIPropertyMetadata(false));
+
+ // Using a DependencyProperty as the backing store for SearchValue. This enables animation, styling, binding, etc...
+ public static readonly DependencyProperty SearchValueProperty =
+ DependencyProperty.RegisterAttached("SearchValue", typeof(string), typeof(TextSearchAssist),
+ new FrameworkPropertyMetadata(string.Empty, FrameworkPropertyMetadataOptions.Inherits));
+
+ public static bool GetIsTextMatch(DependencyObject obj)
+ {
+ return (bool)obj.GetValue(IsTextMatchProperty);
+ }
+
+ public static string GetSearchValue(DependencyObject obj)
+ {
+ return (string)obj.GetValue(SearchValueProperty);
+ }
+
+ public static void SetIsTextMatch(DependencyObject obj, bool value)
+ {
+ obj.SetValue(IsTextMatchProperty, value);
+ }
+
+ public static void SetSearchValue(DependencyObject obj, string value)
+ {
+ obj.SetValue(SearchValueProperty, value);
+ }
+ }
+}
\ No newline at end of file
diff --git a/ShrlAlgoToolkit.Mvvm/Behaviors/CloseOnClickBehaviour.cs b/ShrlAlgoToolkit.RevitAddins/CloseOnClickBehaviour.cs
similarity index 100%
rename from ShrlAlgoToolkit.Mvvm/Behaviors/CloseOnClickBehaviour.cs
rename to ShrlAlgoToolkit.RevitAddins/CloseOnClickBehaviour.cs
diff --git a/ShrlAlgoToolkit.RevitAddins/Converters/SearchFamilyValueConverter.cs b/ShrlAlgoToolkit.RevitAddins/Converters/SearchFamilyValueConverter.cs
new file mode 100644
index 0000000..ec5ee32
--- /dev/null
+++ b/ShrlAlgoToolkit.RevitAddins/Converters/SearchFamilyValueConverter.cs
@@ -0,0 +1,25 @@
+using System.Windows.Controls;
+using System.Windows.Data;
+
+namespace ShrlAlgoToolkit.RevitAddins.Converters
+{
+ public class SearchFamilyValueConverter : IMultiValueConverter
+ {
+ public static SearchFamilyValueConverter Instance { get; } = new SearchFamilyValueConverter();
+ public object Convert(object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+ {
+ var cellText = values[0] == null ? string.Empty : values[0].ToString();
+ var searchText = values[1] as string;
+ var cell = values[2] as DataGridCell;
+
+ var head = cell?.Column?.Header?.ToString();
+
+ return head is "族名称" && !string.IsNullOrEmpty(searchText) && !string.IsNullOrEmpty(cellText) ? cellText.Contains(searchText) : (object)false;
+ }
+
+ public object[] ConvertBack(object value, Type[] targetTypes, object parameter, System.Globalization.CultureInfo culture)
+ {
+ return null;
+ }
+ }
+}
\ No newline at end of file
diff --git a/ShrlAlgoToolkit.RevitAddins/Converters/SearchTypeValueConverter.cs b/ShrlAlgoToolkit.RevitAddins/Converters/SearchTypeValueConverter.cs
index 1596fcd..5c1ff37 100644
--- a/ShrlAlgoToolkit.RevitAddins/Converters/SearchTypeValueConverter.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Converters/SearchTypeValueConverter.cs
@@ -17,25 +17,6 @@ namespace ShrlAlgoToolkit.RevitAddins.Converters
return head is "族类型" && !string.IsNullOrEmpty(searchText) && !string.IsNullOrEmpty(cellText) ? cellText.Contains(searchText) : (object)false;
}
- public object[] ConvertBack(object value, Type[] targetTypes, object parameter, System.Globalization.CultureInfo culture)
- {
- return null;
- }
- }
- public class SearchFamilyValueConverter : IMultiValueConverter
- {
- public static SearchFamilyValueConverter Instance { get; } = new SearchFamilyValueConverter();
- public object Convert(object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture)
- {
- var cellText = values[0] == null ? string.Empty : values[0].ToString();
- var searchText = values[1] as string;
- var cell = values[2] as DataGridCell;
-
- var head = cell?.Column?.Header?.ToString();
-
- return head is "族名称" && !string.IsNullOrEmpty(searchText) && !string.IsNullOrEmpty(cellText) ? cellText.Contains(searchText) : (object)false;
- }
-
public object[] ConvertBack(object value, Type[] targetTypes, object parameter, System.Globalization.CultureInfo culture)
{
return null;
diff --git a/ShrlAlgoToolkit.RevitAddins/Properties/Resources.Designer.cs b/ShrlAlgoToolkit.RevitAddins/Properties/Resources.Designer.cs
index ca64f27..54c57af 100644
--- a/ShrlAlgoToolkit.RevitAddins/Properties/Resources.Designer.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace ShrlAlgoToolkit.RevitAddins.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员,请编辑 .ResX 文件,然后重新运行 ResGen
// (以 /str 作为命令选项),或重新生成 VS 项目。
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
@@ -590,26 +590,6 @@ namespace ShrlAlgoToolkit.RevitAddins.Properties {
}
}
- ///
- /// 查找 System.Drawing.Bitmap 类型的本地化资源。
- ///
- internal static System.Drawing.Bitmap gauges_16px {
- get {
- object obj = ResourceManager.GetObject("gauges_16px", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// 查找 System.Drawing.Bitmap 类型的本地化资源。
- ///
- internal static System.Drawing.Bitmap gauges_32px {
- get {
- object obj = ResourceManager.GetObject("gauges_32px", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
///
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
///
@@ -860,26 +840,6 @@ namespace ShrlAlgoToolkit.RevitAddins.Properties {
}
}
- ///
- /// 查找 System.Drawing.Bitmap 类型的本地化资源。
- ///
- internal static System.Drawing.Bitmap pipe_net_16px {
- get {
- object obj = ResourceManager.GetObject("pipe_net_16px", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// 查找 System.Drawing.Bitmap 类型的本地化资源。
- ///
- internal static System.Drawing.Bitmap pipe_net_32px {
- get {
- object obj = ResourceManager.GetObject("pipe_net_32px", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
///
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
///
diff --git a/ShrlAlgoToolkit.RevitAddins/Properties/Resources.resx b/ShrlAlgoToolkit.RevitAddins/Properties/Resources.resx
index ab0fc51..c02c266 100644
--- a/ShrlAlgoToolkit.RevitAddins/Properties/Resources.resx
+++ b/ShrlAlgoToolkit.RevitAddins/Properties/Resources.resx
@@ -277,12 +277,6 @@
..\Resources\flip_workplane_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\gauges_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\gauges_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\head_room_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -358,12 +352,6 @@
..\Resources\pipe_creator_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\pipe_net_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\pipe_net_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\purge_16px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
diff --git a/ShrlAlgoToolkit.RevitAddins/Resources/gauges_16px.png b/ShrlAlgoToolkit.RevitAddins/Resources/gauges_16px.png
deleted file mode 100644
index 90c387c..0000000
Binary files a/ShrlAlgoToolkit.RevitAddins/Resources/gauges_16px.png and /dev/null differ
diff --git a/ShrlAlgoToolkit.RevitAddins/Resources/gauges_32px.png b/ShrlAlgoToolkit.RevitAddins/Resources/gauges_32px.png
deleted file mode 100644
index 66ac604..0000000
Binary files a/ShrlAlgoToolkit.RevitAddins/Resources/gauges_32px.png and /dev/null differ
diff --git a/ShrlAlgoToolkit.RevitAddins/Resources/pipe_net_16px.png b/ShrlAlgoToolkit.RevitAddins/Resources/pipe_net_16px.png
deleted file mode 100644
index f99c53e..0000000
Binary files a/ShrlAlgoToolkit.RevitAddins/Resources/pipe_net_16px.png and /dev/null differ
diff --git a/ShrlAlgoToolkit.RevitAddins/Resources/pipe_net_32px.png b/ShrlAlgoToolkit.RevitAddins/Resources/pipe_net_32px.png
deleted file mode 100644
index a1b0c20..0000000
Binary files a/ShrlAlgoToolkit.RevitAddins/Resources/pipe_net_32px.png and /dev/null differ
diff --git a/ShrlAlgoToolkit.RevitAddins/RvFamily/RenameFamilyView.xaml b/ShrlAlgoToolkit.RevitAddins/RvFamily/RenameFamilyView.xaml
index f2415d7..456e12b 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvFamily/RenameFamilyView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvFamily/RenameFamilyView.xaml
@@ -2,7 +2,7 @@
x:Class="ShrlAlgoToolkit.RevitAddins.RvFamily.RenameFamilyView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:attach="clr-namespace:ShrlAlgoToolkit.Mvvm.Attach;assembly=ShrlAlgoToolkit.Mvvm"
+ xmlns:mvvm="clr-namespace:ShrlAlgoToolkit.RevitAddins.Assists"
xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
xmlns:conv="clr-namespace:ShrlAlgoToolkit.RevitAddins.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -65,7 +65,7 @@
Grid.Row="0"
Grid.Column="1"
Grid.ColumnSpan="3"
- attach:TextSearchAssist.SearchValue="{Binding Text, ElementName=TbFound, UpdateSourceTrigger=PropertyChanged}"
+ mvvm:TextSearchAssist.SearchValue="{Binding Text, ElementName=TbFound, UpdateSourceTrigger=PropertyChanged}"
AutoGenerateColumns="False"
CanUserAddRows="False"
HeadersVisibility="Column"
@@ -76,7 +76,7 @@