重命名控件库

2026-01-02 17:30:41 +08:00
parent fa0d280130
commit 785e5de36e
277 changed files with 1068 additions and 1242 deletions
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/BricksFinishesView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/BricksFinishesView.xaml
@@ -1,11 +1,11 @@
-<ui:NeoWindow
+<ms:MelWindow
    x:Class="ShrlAlgoToolkit.RevitAddins.RvCivil.BricksFinishesView"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:rvCivil="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvCivil"
-    xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
+    xmlns:ms="https://github.com/ShrlAlgo/Melskin"
    Title="铺贴"
    Width="180"
    Height="500"
@@ -16,45 +16,46 @@
    <Window.Resources>
        <ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
    </Window.Resources>
-    <ui:Grid ChildMargin="5" Columns="*">
+    <ms:Grid ChildMargin="5" Columns="*">
        <TextBox
            x:Name="TbPavementLength"
-            ui:InputAssist.Prefix="砖长："
-            ui:InputAssist.Suffix="mm"
+            ms:InputAssist.Prefix="砖长："
+            ms:InputAssist.Suffix="mm"
            InputMethod.IsInputMethodEnabled="False"
            Text="{Binding PavementLength, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}" />
        <TextBox
            x:Name="TbPavementWidth"
-            ui:InputAssist.Prefix="砖宽："
-            ui:InputAssist.Suffix="mm"
+            ms:InputAssist.Prefix="砖宽："
+            ms:InputAssist.Suffix="mm"
            InputMethod.IsInputMethodEnabled="False"
            Text="{Binding PavementWidth, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}" />
        <TextBox
            x:Name="TbPavementGap"
-            ui:InputAssist.Prefix="砖缝："
-            ui:InputAssist.Suffix="mm"
+            ms:InputAssist.Prefix="砖缝："
+            ms:InputAssist.Suffix="mm"
            InputMethod.IsInputMethodEnabled="False"
            Text="{Binding PavementGap, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}" />
        <TextBox
            x:Name="TbPavementThickness"
-            ui:InputAssist.Prefix="砖厚："
-            ui:InputAssist.Suffix="mm"
+            ms:InputAssist.Prefix="砖厚："
+            ms:InputAssist.Suffix="mm"
            InputMethod.IsInputMethodEnabled="False"
            Text="{Binding PavementThickness, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}" />
        <TextBox
            x:Name="TbPavementBaseOffset"
-            ui:InputAssist.Prefix="墙砖底标高："
-            ui:InputAssist.Suffix="mm"
+            ms:InputAssist.Prefix="墙砖底标高："
+            ms:InputAssist.Suffix="mm"
            InputMethod.IsInputMethodEnabled="False"
            Text="{Binding WallBaseOffset, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}" />
        <TextBox
            x:Name="TbPavementName"
-            ui:InputAssist.Prefix="铺砖名(类型名)："
+            ms:InputAssist.Prefix="铺砖名(类型名)："
            Text="{Binding PanelName, UpdateSourceTrigger=PropertyChanged}" />
        <GroupBox Grid.Row="1" Header="铺设方式">
            <UniformGrid Rows="1">
                <RadioButton Content="房间" IsChecked="{Binding ByRoom, UpdateSourceTrigger=PropertyChanged}" />
-                <RadioButton Content="平面" IsChecked="{Binding ByRoom, Converter={StaticResource InvertBooleanConverter}}" />
+                <RadioButton Content="平面"
+                             IsChecked="{Binding ByRoom, Converter={x:Static ms:InvertBooleanConverter.Instance}}" />
            </UniformGrid>
        </GroupBox>
        <CheckBox Content="边界留缝" IsChecked="{Binding IsEdgeExistGap, UpdateSourceTrigger=PropertyChanged}" />
@@ -63,6 +64,6 @@
            HorizontalAlignment="Stretch"
            Command="{Binding PlaceBricksCommand}"
            Content="铺设"
-            IsEnabled="{Binding HasErrors, Mode=OneWay, Converter={StaticResource InvertBooleanConverter}, UpdateSourceTrigger=PropertyChanged}" />
-    </ui:Grid>
-</ui:NeoWindow>
+            IsEnabled="{Binding HasErrors, Mode=OneWay, Converter={x:Static ms:InvertBooleanConverter.Instance}, UpdateSourceTrigger=PropertyChanged}" />
+    </ms:Grid>
+</ms:MelWindow>
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/CreateOpeningsView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/CreateOpeningsView.xaml
@@ -1,4 +1,4 @@
-<ui:NeoWindow
+<ui:MelWindow
    x:Class="ShrlAlgoToolkit.RevitAddins.RvCivil.CreateOpeningsView"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -6,7 +6,7 @@
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:rvCivil="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvCivil"
    xmlns:rvCivil1="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvCivil"
-    xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
+    xmlns:ui="https://github.com/ShrlAlgo/Melskin"
    Title="开洞设置"
    Width="200"
    Height="220"
@@ -43,4 +43,4 @@
            Content="开洞"
            ToolTip="选择添加套管则使用套管开洞" />
    </ui:Grid>
-</ui:NeoWindow>
+</ui:MelWindow>
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/FloorFinishesView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/FloorFinishesView.xaml
@@ -1,11 +1,11 @@
-<ui:NeoWindow
+<ms:MelWindow
    x:Class="ShrlAlgoToolkit.RevitAddins.RvCivil.FloorFinishesView"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:rvCivil="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvCivil"
-    xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
+    xmlns:ms="https://github.com/ShrlAlgo/Melskin"
    Title="房间饰面"
    Width="200"
    Height="500"
@@ -21,7 +21,7 @@
            </ResourceDictionary.MergedDictionaries>
        </ResourceDictionary>-->
    </Window.Resources>
-    <ui:Grid
+    <ms:Grid
        ChildMargin="5"
        Columns="*"
        Rows="Auto,*,Auto,Auto">
@@ -43,7 +43,7 @@
        </GroupBox>
        <TextBox
            Grid.Row="2"
-            ui:InputAssist.PlaceholderText="楼板偏移"
+            ms:InputAssist.PlaceholderText="楼板偏移"
            InputMethod.IsInputMethodEnabled="False"
            Text="{Binding FloorOffset, StringFormat={}{0:N2}, UpdateSourceTrigger=PropertyChanged}" />
        <!--<TextBox
@@ -68,7 +68,7 @@
        <Button
            Grid.Row="3"
            HorizontalAlignment="Stretch"
-            ui:ControlAssist.Icon="{ui:Icon Glyph=&#xEAB9;,
+            ms:ControlAssist.Icon="{ms:Icon Glyph=&#xEAB9;,
                                            FontFamily={StaticResource BoxIcons},
                                            Size=16}"
            Command="{Binding PlaceFloorCommand}"
@@ -78,5 +78,5 @@
            </ui:ControlAssist.Icon>-->


-    </ui:Grid>
-</ui:NeoWindow>
+    </ms:Grid>
+</ms:MelWindow>
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/ResolveCivilConnectView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/ResolveCivilConnectView.xaml
@@ -1,11 +1,11 @@
-<ui:NeoWindow
+<ms:MelWindow
    x:Class="ShrlAlgoToolkit.RevitAddins.RvCivil.ResolveCivilConnectView"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:rvCivil="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvCivil"
-    xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
+    xmlns:ms="https://github.com/ShrlAlgo/Melskin"
    Title="土建构件连接"
    Width="300"
    Height="600"
@@ -20,7 +20,7 @@
            </ResourceDictionary.MergedDictionaries>
        </ResourceDictionary>
    </Window.Resources>
-    <ui:Grid
+    <ms:Grid
        ChildMargin="5"
        Columns="*"
        Rows="*,Auto,Auto">
@@ -87,5 +87,5 @@
            Command="{Binding ModifyModelCommand}"
            Content="修改"
            ToolTip="相交的图元才会被修改" />
-    </ui:Grid>
-</ui:NeoWindow>
+    </ms:Grid>
+</ms:MelWindow>
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/ResolveCivilConnectView.xaml.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/ResolveCivilConnectView.xaml.cs
@@ -1,11 +1,11 @@
-using NeoUI.Controls;
+using Melskin.Controls;

 namespace ShrlAlgoToolkit.RevitAddins.RvCivil
 {
    /// <summary>
    ///     ResolveCivilConnectView.xaml 的交互逻辑
    /// </summary>
-    public partial class ResolveCivilConnectView : NeoWindow
+    public partial class ResolveCivilConnectView : MelWindow
    {
        public ResolveCivilConnectView()
        {
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/WallFinishesView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/WallFinishesView.xaml
@@ -1,11 +1,11 @@
-<ui:NeoWindow
+<ms:MelWindow
    x:Class="ShrlAlgoToolkit.RevitAddins.RvCivil.WallFinishesView"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:rvCivil="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvCivil"
-    xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
+    xmlns:ms="https://github.com/ShrlAlgo/Melskin"
    Title="墙饰面"
    Width="250"
    Height="500"
@@ -20,7 +20,7 @@
            </ResourceDictionary.MergedDictionaries>
        </ResourceDictionary>
    </Window.Resources>
-    <ui:Grid
+    <ms:Grid
        ChildMargin="5"
        Columns="*"
        Rows="*,Auto,Auto,Auto,Auto">
@@ -37,15 +37,15 @@
        <TextBox
            x:Name="TbWallHeight"
            Grid.Row="1"
-            ui:InputAssist.Prefix="饰面总高度："
-            ui:InputAssist.Suffix="mm"
+            ms:InputAssist.Prefix="饰面总高度："
+            ms:InputAssist.Suffix="mm"
            InputMethod.IsInputMethodEnabled="False"
            Text="{Binding WallHeight, StringFormat=\{0:F2\}, UpdateSourceTrigger=PropertyChanged}" />
        <TextBox
            x:Name="TbWallBase"
            Grid.Row="2"
-            ui:InputAssist.Prefix="饰面底部离地高度："
-            ui:InputAssist.Suffix="mm"
+            ms:InputAssist.Prefix="饰面底部离地高度："
+            ms:InputAssist.Suffix="mm"
            InputMethod.IsInputMethodEnabled="False"
            Text="{Binding WallBaseOffset, StringFormat=\{0:F2\}, UpdateSourceTrigger=PropertyChanged}" />
        <ComboBox
@@ -65,5 +65,5 @@
            VerticalAlignment="Center"
            Command="{Binding PlaceWallCommand}"
            Content="布置" />
-    </ui:Grid>
-</ui:NeoWindow>
+    </ms:Grid>
+</ms:MelWindow>