diff --git a/DrfxFontFixer/App.xaml b/DrfxFontFixer/App.xaml index 4c10f9e..a160d73 100644 --- a/DrfxFontFixer/App.xaml +++ b/DrfxFontFixer/App.xaml @@ -1,15 +1,15 @@  + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> - - - + + + diff --git a/DrfxFontFixer/DrfxFontFixer.csproj b/DrfxFontFixer/DrfxFontFixer.csproj index b37301f..ab1a647 100644 --- a/DrfxFontFixer/DrfxFontFixer.csproj +++ b/DrfxFontFixer/DrfxFontFixer.csproj @@ -11,6 +11,6 @@ - + \ No newline at end of file diff --git a/DrfxFontFixer/MainWindow.xaml b/DrfxFontFixer/MainWindow.xaml index 2fe34a7..629072d 100644 --- a/DrfxFontFixer/MainWindow.xaml +++ b/DrfxFontFixer/MainWindow.xaml @@ -1,4 +1,4 @@ - @@ -24,7 +24,7 @@ - + - \ No newline at end of file + \ No newline at end of file diff --git a/ShrlAlgoToolkit.RevitAddins/RvMEP/ClashReportView.xaml b/ShrlAlgoToolkit.RevitAddins/RvMEP/ClashReportView.xaml index 666ba53..2ee793a 100644 --- a/ShrlAlgoToolkit.RevitAddins/RvMEP/ClashReportView.xaml +++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/ClashReportView.xaml @@ -1,4 +1,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/ShrlAlgoToolkit.RevitAddins/RvMEP/ClashResolveView.xaml b/ShrlAlgoToolkit.RevitAddins/RvMEP/ClashResolveView.xaml index d339503..46f9496 100644 --- a/ShrlAlgoToolkit.RevitAddins/RvMEP/ClashResolveView.xaml +++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/ClashResolveView.xaml @@ -1,4 +1,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/ShrlAlgoToolkit.RevitAddins/RvMEP/HeadroomCheckView.xaml b/ShrlAlgoToolkit.RevitAddins/RvMEP/HeadroomCheckView.xaml index 9e91b14..da0ec0a 100644 --- a/ShrlAlgoToolkit.RevitAddins/RvMEP/HeadroomCheckView.xaml +++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/HeadroomCheckView.xaml @@ -1,4 +1,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/ShrlAlgoToolkit.RevitAddins/RvMEP/MoveMEPCurveView.xaml b/ShrlAlgoToolkit.RevitAddins/RvMEP/MoveMEPCurveView.xaml index 0c9234f..550b856 100644 --- a/ShrlAlgoToolkit.RevitAddins/RvMEP/MoveMEPCurveView.xaml +++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/MoveMEPCurveView.xaml @@ -1,4 +1,4 @@ - - + diff --git a/ShrlAlgoToolkit.RevitAddins/RvMEP/RotateMEPView.xaml b/ShrlAlgoToolkit.RevitAddins/RvMEP/RotateMEPView.xaml index ddce17a..56b03ba 100644 --- a/ShrlAlgoToolkit.RevitAddins/RvMEP/RotateMEPView.xaml +++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/RotateMEPView.xaml @@ -1,4 +1,4 @@ - - + diff --git a/ShrlAlgoToolkit.RevitAddins/RvMEP/StandMepCurveView.xaml b/ShrlAlgoToolkit.RevitAddins/RvMEP/StandMepCurveView.xaml index 667f58b..29efacc 100644 --- a/ShrlAlgoToolkit.RevitAddins/RvMEP/StandMepCurveView.xaml +++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/StandMepCurveView.xaml @@ -1,4 +1,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/ShrlAlgoToolkit.RevitAddins/RvView/AlignTagsView.xaml b/ShrlAlgoToolkit.RevitAddins/RvView/AlignTagsView.xaml index dddeb95..7484b2c 100644 --- a/ShrlAlgoToolkit.RevitAddins/RvView/AlignTagsView.xaml +++ b/ShrlAlgoToolkit.RevitAddins/RvView/AlignTagsView.xaml @@ -1,11 +1,11 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/ShrlAlgoToolkit.RevitAddins/RvView/ElementControlDock.xaml b/ShrlAlgoToolkit.RevitAddins/RvView/ElementControlDock.xaml index 00cb3ae..20f724a 100644 --- a/ShrlAlgoToolkit.RevitAddins/RvView/ElementControlDock.xaml +++ b/ShrlAlgoToolkit.RevitAddins/RvView/ElementControlDock.xaml @@ -4,7 +4,7 @@ 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:ui="https://github.com/ShrlAlgo/NeoUI" + xmlns:ui="https://github.com/ShrlAlgo/Melskin" Background="{DynamicResource BackgroundLayoutBrush}" mc:Ignorable="d"> diff --git a/ShrlAlgoToolkit.RevitAddins/RvView/ExportSchedulesCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvView/ExportSchedulesCmd.cs index 0643615..e5b238b 100644 --- a/ShrlAlgoToolkit.RevitAddins/RvView/ExportSchedulesCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/RvView/ExportSchedulesCmd.cs @@ -4,7 +4,7 @@ using Autodesk.Revit.UI; using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.Assists; -using NeoUI.Controls; +using Melskin.Controls; namespace ShrlAlgoToolkit.RevitAddins.RvView; diff --git a/ShrlAlgoToolkit.RevitAddins/RvView/QuickViewSectionView.xaml b/ShrlAlgoToolkit.RevitAddins/RvView/QuickViewSectionView.xaml index 0efa447..a8acb5f 100644 --- a/ShrlAlgoToolkit.RevitAddins/RvView/QuickViewSectionView.xaml +++ b/ShrlAlgoToolkit.RevitAddins/RvView/QuickViewSectionView.xaml @@ -1,11 +1,11 @@ - - + diff --git a/ShrlAlgoToolkit.RevitAddins/RvView/SectionBoxControllerView.xaml b/ShrlAlgoToolkit.RevitAddins/RvView/SectionBoxControllerView.xaml index d850e03..258f14e 100644 --- a/ShrlAlgoToolkit.RevitAddins/RvView/SectionBoxControllerView.xaml +++ b/ShrlAlgoToolkit.RevitAddins/RvView/SectionBoxControllerView.xaml @@ -1,4 +1,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/ShrlAlgoToolkit.RevitAddins/RvView/SectionBoxControllerView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/RvView/SectionBoxControllerView.xaml.cs index df8623c..17416b7 100644 --- a/ShrlAlgoToolkit.RevitAddins/RvView/SectionBoxControllerView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/RvView/SectionBoxControllerView.xaml.cs @@ -1,11 +1,11 @@ -using NeoUI.Controls; +using Melskin.Controls; namespace ShrlAlgoToolkit.RevitAddins.RvView { /// /// SectionBoxControllerView.xaml 的交互逻辑 /// - public partial class SectionBoxControllerView : NeoWindow + public partial class SectionBoxControllerView : MelWindow { public SectionBoxControllerView() { diff --git a/ShrlAlgoToolkit.RevitAddins/RvView/SystemDisplayView.xaml b/ShrlAlgoToolkit.RevitAddins/RvView/SystemDisplayView.xaml index f40f81f..b686fb2 100644 --- a/ShrlAlgoToolkit.RevitAddins/RvView/SystemDisplayView.xaml +++ b/ShrlAlgoToolkit.RevitAddins/RvView/SystemDisplayView.xaml @@ -1,4 +1,4 @@ ---> - + diff --git a/ShrlAlgoToolkit.RevitAddins/RvView/ViewManagerView.xaml b/ShrlAlgoToolkit.RevitAddins/RvView/ViewManagerView.xaml index 0b9fdec..0ece1be 100644 --- a/ShrlAlgoToolkit.RevitAddins/RvView/ViewManagerView.xaml +++ b/ShrlAlgoToolkit.RevitAddins/RvView/ViewManagerView.xaml @@ -1,4 +1,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/ShrlAlgoToolkit.RevitAddins/RvView/VisibilityView.xaml b/ShrlAlgoToolkit.RevitAddins/RvView/VisibilityView.xaml index 5088ff4..7c64a44 100644 --- a/ShrlAlgoToolkit.RevitAddins/RvView/VisibilityView.xaml +++ b/ShrlAlgoToolkit.RevitAddins/RvView/VisibilityView.xaml @@ -1,4 +1,4 @@ - - + diff --git a/ShrlAlgoToolkit.RevitAddins/RvView/VisibilityView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/RvView/VisibilityView.xaml.cs index 688c085..6ff5564 100644 --- a/ShrlAlgoToolkit.RevitAddins/RvView/VisibilityView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/RvView/VisibilityView.xaml.cs @@ -1,11 +1,11 @@ -using NeoUI.Controls; +using Melskin.Controls; namespace ShrlAlgoToolkit.RevitAddins.RvView; /// /// VisibilityView.xaml 的交互逻辑 /// -public partial class VisibilityView : NeoWindow +public partial class VisibilityView : MelWindow { public VisibilityView() { diff --git a/ShrlAlgoToolkit.RevitAddins/ShrlAlgoToolkit.RevitAddins.csproj b/ShrlAlgoToolkit.RevitAddins/ShrlAlgoToolkit.RevitAddins.csproj index 97a6b17..b0da92e 100644 --- a/ShrlAlgoToolkit.RevitAddins/ShrlAlgoToolkit.RevitAddins.csproj +++ b/ShrlAlgoToolkit.RevitAddins/ShrlAlgoToolkit.RevitAddins.csproj @@ -128,10 +128,6 @@ Never - - Always - - Never @@ -147,7 +143,7 @@ - + diff --git a/ShrlAlgoToolkit.RevitAddins/WPFUI.xaml b/ShrlAlgoToolkit.RevitAddins/WPFUI.xaml index 792156d..70f5904 100644 --- a/ShrlAlgoToolkit.RevitAddins/WPFUI.xaml +++ b/ShrlAlgoToolkit.RevitAddins/WPFUI.xaml @@ -1,16 +1,16 @@  + xmlns:ui="https://github.com/ShrlAlgo/Melskin" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> - - - + + + @@ -41,7 +41,7 @@ - +