From 785e5de36e421cfa545e07de5ab03ca43f9232f7 Mon Sep 17 00:00:00 2001 From: GG Z <903524121@qq.com> Date: Fri, 2 Jan 2026 17:30:41 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E6=8E=A7=E4=BB=B6?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DrfxFontFixer/App.xaml | 10 +- DrfxFontFixer/DrfxFontFixer.csproj | 2 +- DrfxFontFixer/MainWindow.xaml | 16 +- .../Melskin/Appearance/ControlsDictionary.cs | 2 +- NeoUI/Melskin/Appearance/ThemeManager.cs | 2 +- NeoUI/Melskin/Appearance/ThemeMode.cs | 2 +- .../Appearance/ThemePreferenceStore.cs | 2 +- NeoUI/Melskin/Appearance/ThemesDictionary.cs | 6 +- NeoUI/Melskin/Assets/MaterialSymbol.cs | 2 +- NeoUI/Melskin/Assists/BehaviorAssist.cs | 6 +- NeoUI/Melskin/Assists/BindingProxy.cs | 2 +- NeoUI/Melskin/Assists/ColorAssist.cs | 6 +- NeoUI/Melskin/Assists/ControlAssist.cs | 4 +- NeoUI/Melskin/Assists/DataGridAssist.cs | 2 +- NeoUI/Melskin/Assists/InputAssist.cs | 4 +- NeoUI/Melskin/Assists/ShadingAssist.cs | 2 +- NeoUI/Melskin/Assists/TabAssist.cs | 2 +- NeoUI/Melskin/Controls/Accordion.xaml | 8 +- NeoUI/Melskin/Controls/Accordion.xaml.cs | 2 +- NeoUI/Melskin/Controls/AccordionItem.cs | 2 +- NeoUI/Melskin/Controls/Alert.xaml | 12 +- NeoUI/Melskin/Controls/Alert.xaml.cs | 2 +- NeoUI/Melskin/Controls/Anchor.xaml | 6 +- NeoUI/Melskin/Controls/Anchor.xaml.cs | 8 +- NeoUI/Melskin/Controls/AppearanceType.cs | 2 +- NeoUI/Melskin/Controls/AutoComplete.xaml | 6 +- NeoUI/Melskin/Controls/AutoComplete.xaml.cs | 2 +- NeoUI/Melskin/Controls/Avatar.xaml | 6 +- NeoUI/Melskin/Controls/Avatar.xaml.cs | 2 +- NeoUI/Melskin/Controls/Badge.xaml | 6 +- NeoUI/Melskin/Controls/Badge.xaml.cs | 2 +- NeoUI/Melskin/Controls/Breadcrumb.xaml | 6 +- NeoUI/Melskin/Controls/Breadcrumb.xaml.cs | 2 +- NeoUI/Melskin/Controls/Button.xaml | 12 +- NeoUI/Melskin/Controls/Calendar.xaml | 2 +- NeoUI/Melskin/Controls/Card.xaml | 4 +- NeoUI/Melskin/Controls/Card.xaml.cs | 2 +- NeoUI/Melskin/Controls/Cascader.xaml | 10 +- NeoUI/Melskin/Controls/Cascader.xaml.cs | 4 +- NeoUI/Melskin/Controls/CheckBox.xaml | 4 +- NeoUI/Melskin/Controls/CheckableTag.xaml | 6 +- NeoUI/Melskin/Controls/CheckableTag.xaml.cs | 2 +- NeoUI/Melskin/Controls/Chip.xaml | 4 +- NeoUI/Melskin/Controls/Chip.xaml.cs | 2 +- NeoUI/Melskin/Controls/ChooseBox.xaml | 4 +- NeoUI/Melskin/Controls/ChooseBox.xaml.cs | 2 +- NeoUI/Melskin/Controls/CodeBox.xaml | 6 +- NeoUI/Melskin/Controls/CodeBox.xaml.cs | 2 +- .../Controls/ColorPicker/ColorInputMode.cs | 2 +- .../Controls/ColorPicker/ColorPanel.xaml | 10 +- .../Controls/ColorPicker/ColorPanel.xaml.cs | 4 +- .../Controls/ColorPicker/ColorPicker.xaml | 6 +- .../Controls/ColorPicker/ColorPicker.xaml.cs | 2 +- .../Melskin/Controls/ColorPicker/HSVColor.cs | 2 +- NeoUI/Melskin/Controls/ComboBox.xaml | 10 +- NeoUI/Melskin/Controls/DataGrid.xaml | 8 +- NeoUI/Melskin/Controls/DatePicker.xaml | 8 +- .../Controls/Decorations/DecorationBase.cs | 2 +- .../Controls/Decorations/EmbossBorder.xaml | 6 +- .../Controls/Decorations/EmbossBorder.xaml.cs | 2 +- .../Decorations/GlassChromeDecorator.cs | 4 +- .../Controls/Decorations/LightedSurface.xaml | 2 +- .../Decorations/LightedSurface.xaml.cs | 4 +- .../Controls/Decorations/SlotBorder.xaml | 6 +- .../Controls/Decorations/SlotBorder.xaml.cs | 2 +- NeoUI/Melskin/Controls/Divider.xaml | 2 +- NeoUI/Melskin/Controls/Divider.xaml.cs | 2 +- NeoUI/Melskin/Controls/Expander.xaml | 4 +- NeoUI/Melskin/Controls/FlattenButton.xaml | 4 +- NeoUI/Melskin/Controls/FlattenComboBox.xaml | 6 +- NeoUI/Melskin/Controls/FlattenTextBox.xaml | 2 +- NeoUI/Melskin/Controls/Heading.xaml | 2 +- NeoUI/Melskin/Controls/Heading.xaml.cs | 2 +- NeoUI/Melskin/Controls/Hyperlink.xaml | 4 +- NeoUI/Melskin/Controls/Hyperlink.xaml.cs | 2 +- NeoUI/Melskin/Controls/IconElement.xaml | 6 +- NeoUI/Melskin/Controls/IconElement.xaml.cs | 6 +- NeoUI/Melskin/Controls/Label.xaml | 2 +- NeoUI/Melskin/Controls/ListBox.xaml | 6 +- NeoUI/Melskin/Controls/ListView.xaml | 4 +- NeoUI/Melskin/Controls/MelWindow.xaml | 6 +- NeoUI/Melskin/Controls/MelWindow.xaml.cs | 18 +- NeoUI/Melskin/Controls/Menu.xaml | 8 +- NeoUI/Melskin/Controls/Modal/Modal.cs | 2 +- NeoUI/Melskin/Controls/Modal/ModalWindow.xaml | 2 +- .../Controls/Modal/ModalWindow.xaml.cs | 2 +- NeoUI/Melskin/Controls/MultiComboBox.xaml | 8 +- NeoUI/Melskin/Controls/MultiComboBox.xaml.cs | 2 +- NeoUI/Melskin/Controls/MultiTreeView.xaml | 2 +- NeoUI/Melskin/Controls/MultiTreeView.xaml.cs | 2 +- NeoUI/Melskin/Controls/NeuDataGrid.xaml.cs | 4 +- .../Controls/Notification/Notification.cs | 2 +- .../Notification/NotificationModel.cs | 2 +- .../Notification/NotificationPlacement.cs | 2 +- .../Controls/Notification/NotificationType.cs | 2 +- .../Notification/NotificationView.xaml | 4 +- .../Notification/NotificationView.xaml.cs | 2 +- NeoUI/Melskin/Controls/NumberBox.xaml | 8 +- NeoUI/Melskin/Controls/NumberBox.xaml.cs | 2 +- NeoUI/Melskin/Controls/NumericBox.cs | 2 +- NeoUI/Melskin/Controls/Pagination.xaml | 10 +- NeoUI/Melskin/Controls/Pagination.xaml.cs | 4 +- NeoUI/Melskin/Controls/PasswordBox.xaml | 10 +- NeoUI/Melskin/Controls/ProgressBar.xaml | 4 +- NeoUI/Melskin/Controls/PropertyField.xaml | 2 +- NeoUI/Melskin/Controls/PropertyField.xaml.cs | 2 +- NeoUI/Melskin/Controls/RadioButton.xaml | 2 +- NeoUI/Melskin/Controls/ScrollViewer.xaml | 4 +- NeoUI/Melskin/Controls/Slider.xaml | 2 +- NeoUI/Melskin/Controls/Spin.xaml | 4 +- NeoUI/Melskin/Controls/Spin.xaml.cs | 2 +- NeoUI/Melskin/Controls/SplashWindow/Border.cs | 2 +- .../Controls/SplashWindow/MathHelper.cs | 2 +- NeoUI/Melskin/Controls/SplashWindow/Splash.cs | 2 +- .../Controls/SplashWindow/SplashConfig.cs | 4 +- .../Controls/SplashWindow/SplashWindow.xaml | 4 +- .../SplashWindow/SplashWindow.xaml.cs | 2 +- NeoUI/Melskin/Controls/TabControl.xaml | 2 +- NeoUI/Melskin/Controls/Tag.xaml | 10 +- NeoUI/Melskin/Controls/Tag.xaml.cs | 2 +- NeoUI/Melskin/Controls/TextBox.xaml | 10 +- .../Melskin/Controls/TextBoxContextMenu.xaml | 2 +- NeoUI/Melskin/Controls/TimePicker.xaml | 6 +- NeoUI/Melskin/Controls/TimePicker.xaml.cs | 2 +- NeoUI/Melskin/Controls/Toast/IToastHost.cs | 2 +- NeoUI/Melskin/Controls/Toast/IToastService.cs | 2 +- NeoUI/Melskin/Controls/Toast/ScreenHost.cs | 2 +- NeoUI/Melskin/Controls/Toast/Toast.cs | 2 +- .../Melskin/Controls/Toast/ToastControl.xaml | 4 +- .../Controls/Toast/ToastControl.xaml.cs | 2 +- NeoUI/Melskin/Controls/Toast/ToastManager.cs | 2 +- NeoUI/Melskin/Controls/Toast/ToastType.cs | 2 +- NeoUI/Melskin/Controls/Toast/WindowHost.cs | 2 +- NeoUI/Melskin/Controls/ToggleButton.xaml | 4 +- NeoUI/Melskin/Controls/ToggleSwitch.xaml | 10 +- NeoUI/Melskin/Controls/ToggleSwitch.xaml.cs | 2 +- NeoUI/Melskin/Controls/ToolBar.xaml | 2 +- NeoUI/Melskin/Controls/ToolTip.xaml | 2 +- NeoUI/Melskin/Controls/TreeGrid.xaml | 4 +- NeoUI/Melskin/Controls/TreeGrid.xaml.cs | 2 +- NeoUI/Melskin/Controls/TreeView.xaml | 6 +- NeoUI/Melskin/Controls/UploadArea.xaml | 4 +- NeoUI/Melskin/Controls/UploadArea.xaml.cs | 4 +- NeoUI/Melskin/Controls/Variant.cs | 2 +- .../Controls/VistaFolderBrowserDialog.cs | 2 +- NeoUI/Melskin/Converters/BooleanConverter.cs | 2 +- .../BooleanToVisibilityConverter.cs | 2 +- .../Converters/ComparisionConverter.cs | 2 +- .../ComparisionToVisibilityConverter.cs | 2 +- .../Converters/DivideByTwoConverter.cs | 2 +- .../Internal/AlphaToPercentConverter.cs | 2 +- .../Internal/ColorToHexConverter.cs | 2 +- .../Internal/ColorToOpaqueColorConverter.cs | 2 +- .../CreateSlotClipGeometryConverter.cs | 2 +- .../Internal/DoubleToCornerRadiusConverter.cs | 2 +- .../Internal/HasChildrenMultiConverter.cs | 2 +- .../Internal/HueToBrushConverter.cs | 4 +- .../Internal/HueToColorConverter.cs | 4 +- .../IntensityToEmbossBlurConverter.cs | 2 +- ...IntensityToEmbossMarginLeftTopConverter.cs | 2 +- ...nsityToEmbossMarginRightBottomConverter.cs | 2 +- .../Internal/IntensityToSlotBlurConverter.cs | 2 +- .../IntensityToSlotLightMarginConverter.cs | 2 +- .../IntensityToSlotMarginConverter.cs | 2 +- .../IntensityToSlotShadowMarginConverter.cs | 2 +- .../Internal/InterlacedBackgroundConverter.cs | 2 +- .../Internal/InverseOpacityConverter.cs | 2 +- .../Internal/IsLastItemConverter.cs | 2 +- .../Internal/PropertyValueConverter.cs | 2 +- .../Internal/StringToCodeConverter.cs | 2 +- .../Internal/StringToMarkDownConverter.cs | 2 +- .../Internal/SymbolToCharConverter.cs | 4 +- .../Internal/ThumbPositionConverter.cs | 2 +- .../Internal/ValueToRangeWidthConverter.cs | 2 +- .../Converters/InvertBooleanConverter.cs | 2 +- .../Converters/NullOrEmptyConverter.cs | 2 +- .../Melskin/Converters/PercentageConverter.cs | 2 +- .../Converters/StringMatchConverter.cs | 2 +- .../Effects/BrightnessContrastEffect.cs | 4 +- NeoUI/Melskin/Effects/LightedSurfaceEffect.cs | 4 +- NeoUI/Melskin/Extensions/StringExtensions.cs | 2 +- NeoUI/Melskin/Extensions/VisualExtensions.cs | 2 +- NeoUI/Melskin/Layout/FlexibleRowPanel.cs | 2 +- NeoUI/Melskin/Layout/Grid.cs | 4 +- NeoUI/Melskin/Layout/StackPanel.cs | 2 +- NeoUI/Melskin/Layout/TableGrid.cs | 2 +- NeoUI/Melskin/Layout/UniformGrid.cs | 2 +- NeoUI/Melskin/Layout/WaterfallPanel.cs | 2 +- NeoUI/Melskin/Layout/WrapPanel.cs | 2 +- NeoUI/Melskin/Markup/EnumSourceExtension.cs | 2 +- NeoUI/Melskin/Markup/IconExtension.cs | 14 +- NeoUI/Melskin/Markup/SymbolIconExtension.cs | 4 +- NeoUI/Melskin/Melskin.csproj | 2 +- NeoUI/Melskin/Properties/AssemblyInfo.cs | 18 +- NeoUI/Melskin/Themes/Fonts.xaml | 2 +- NeoUI/Melskin/Themes/Generic.xaml | 4 +- NeoUI/Melskin/Themes/Styles.xaml | 128 ++--- NeoUI/Melskin/Utilities/RelayCommand.cs | 2 +- NeoUI/MelskinTest/App.xaml | 8 +- NeoUI/MelskinTest/App.xaml.cs | 6 +- NeoUI/MelskinTest/ColorPaletteControl.xaml | 4 +- NeoUI/MelskinTest/ColorPaletteControl.xaml.cs | 2 +- NeoUI/MelskinTest/ColorPaletteWindow.xaml | 12 +- NeoUI/MelskinTest/ColorPaletteWindow.xaml.cs | 2 +- NeoUI/MelskinTest/ControlTestWindow.xaml | 14 +- NeoUI/MelskinTest/ControlTestWindow.xaml.cs | 4 +- NeoUI/MelskinTest/DataModel/DataGridItem.cs | 2 +- NeoUI/MelskinTest/DataModel/TreeItemData.cs | 2 +- NeoUI/MelskinTest/IconsWindow.xaml | 26 +- NeoUI/MelskinTest/IconsWindow.xaml.cs | 4 +- NeoUI/MelskinTest/MainWindow.xaml | 544 +++++++++--------- NeoUI/MelskinTest/MainWindow.xaml.cs | 6 +- NeoUI/MelskinTest/MelskinTest.csproj | 2 +- NeoUI/MelskinTest/NeumorphismWindow.xaml | 238 ++++---- NeoUI/MelskinTest/NeumorphismWindow.xaml.cs | 2 +- NeoUI/MelskinTest/ViewModel.cs | 2 +- NeoUI/NeoUI/NeoUI.csproj | 48 -- NeoUI/NeoUITest/NeoUITest.csproj | 38 -- NeoUI/VariaStudio/VariaStudio.csproj | 48 -- NeoUI/VariaStudioTest/VariaStudioTest.csproj | 38 -- .../CADCurveToModelCurveCmd.cs | 1 + .../ModelManager/ModelCheckView.xaml | 14 +- .../ModelManager/ModelCheckView.xaml.cs | 4 +- .../ModelManager/SeparateModelWin.xaml | 14 +- .../ModelManager/SeparateModelWin.xaml.cs | 4 +- .../ModelManager/TemplateManagerView.xaml | 6 +- .../RvCivil/BricksFinishesView.xaml | 37 +- .../RvCivil/CreateOpeningsView.xaml | 6 +- .../RvCivil/FloorFinishesView.xaml | 14 +- .../RvCivil/ResolveCivilConnectView.xaml | 10 +- .../RvCivil/ResolveCivilConnectView.xaml.cs | 4 +- .../RvCivil/WallFinishesView.xaml | 18 +- .../RvCommon/AutoSaveView.xaml | 6 +- .../RvCommon/AutoSaveView.xaml.cs | 4 +- .../RvCommon/DetailSelectFiltersView.xaml | 6 +- .../RvCommon/DetailSelectFiltersView.xaml.cs | 4 +- .../RvCommon/InstanceCreatorView.xaml | 6 +- .../RvCommon/ModelByCurveCreatorView.xaml | 6 +- .../RvCommon/PipesCreatorView.xaml | 6 +- .../FamilyLibrary/FamilyLibraryView.xaml | 6 +- .../FamilyLibrary/FamilyLibraryViewModel.cs | 4 +- .../RvFamily/FamilyProcessorView.xaml | 6 +- .../RvFamily/FamilyProcessorViewModel.cs | 2 +- .../RvFamily/RenameFamilyView.xaml | 6 +- .../RvFamily/RenameTypeView.xaml | 6 +- .../RvFamily/UpgradeFamilyCmd.cs | 2 +- .../MetroGauges/GaugesModelView.xaml | 6 +- .../MetroTunnel/MetroTunnelView.xaml | 6 +- .../NetworkCreator/NetworkCreatorView.xaml | 6 +- .../RvMEP/AddInsulationView.xaml | 6 +- .../RvMEP/AnyConnectView.xaml | 6 +- .../RvMEP/AnyConnectViewModel.cs | 2 +- .../RvMEP/ArrangeMEPCurveView.xaml | 6 +- .../RvMEP/CableLayoutView.xaml | 6 +- .../RvMEP/ClashReportView.xaml | 6 +- .../RvMEP/ClashResolveView.xaml | 6 +- .../RvMEP/HeadroomCheckView.xaml | 6 +- .../RvMEP/MoveMEPCurveView.xaml | 6 +- .../RvMEP/RotateMEPView.xaml | 6 +- .../RvMEP/StandMepCurveView.xaml | 6 +- .../RvView/AlignTagsView.xaml | 6 +- .../RvView/ElementControlDock.xaml | 2 +- .../RvView/ExportSchedulesCmd.cs | 2 +- .../RvView/QuickViewSectionView.xaml | 6 +- .../RvView/SectionBoxControllerView.xaml | 6 +- .../RvView/SectionBoxControllerView.xaml.cs | 4 +- .../RvView/SystemDisplayView.xaml | 6 +- .../RvView/ViewManagerView.xaml | 6 +- .../RvView/VisibilityView.xaml | 6 +- .../RvView/VisibilityView.xaml.cs | 4 +- .../ShrlAlgoToolkit.RevitAddins.csproj | 6 +- ShrlAlgoToolkit.RevitAddins/WPFUI.xaml | 32 +- .../Windows/ColorPickerWin.xaml | 6 +- .../Windows/MessageWin.xaml | 6 +- .../Windows/MessageWin.xaml.cs | 4 +- .../Windows/NavigateViewWin.xaml | 6 +- ShrlAlgoToolkit.sln | 4 +- 277 files changed, 1068 insertions(+), 1242 deletions(-) delete mode 100644 NeoUI/NeoUI/NeoUI.csproj delete mode 100644 NeoUI/NeoUITest/NeoUITest.csproj delete mode 100644 NeoUI/VariaStudio/VariaStudio.csproj delete mode 100644 NeoUI/VariaStudioTest/VariaStudioTest.csproj 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 @@ - +