diff --git a/Ink Canvas.sln b/Ink Canvas.sln index a6df8582..0bf57c17 100644 --- a/Ink Canvas.sln +++ b/Ink Canvas.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 18 VisualStudioVersion = 18.4.11626.88 stable @@ -7,6 +7,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InkCanvasForClass", "Ink Ca EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InkCanvas.PluginSdk", "InkCanvas.PluginSdk\InkCanvas.PluginSdk.csproj", "{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InkCanvas.Controls", "InkCanvas.Controls\InkCanvas.Controls.csproj", "{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -61,6 +63,26 @@ Global {6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|x64.Build.0 = Release|Any CPU {6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|x86.ActiveCfg = Release|Any CPU {6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|x86.Build.0 = Release|Any CPU + {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|ARM.ActiveCfg = Debug|Any CPU + {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|ARM.Build.0 = Debug|Any CPU + {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|ARM64.Build.0 = Debug|Any CPU + {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|x64.ActiveCfg = Debug|Any CPU + {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|x64.Build.0 = Debug|Any CPU + {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|x86.ActiveCfg = Debug|Any CPU + {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|x86.Build.0 = Debug|Any CPU + {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|Any CPU.Build.0 = Release|Any CPU + {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|ARM.ActiveCfg = Release|Any CPU + {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|ARM.Build.0 = Release|Any CPU + {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|ARM64.ActiveCfg = Release|Any CPU + {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|ARM64.Build.0 = Release|Any CPU + {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|x64.ActiveCfg = Release|Any CPU + {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|x64.Build.0 = Release|Any CPU + {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|x86.ActiveCfg = Release|Any CPU + {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Ink Canvas/Helpers/Converters.cs b/Ink Canvas/Helpers/Converters.cs index a6908ccc..36b3443f 100644 --- a/Ink Canvas/Helpers/Converters.cs +++ b/Ink Canvas/Helpers/Converters.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Globalization; using System.Windows; using System.Windows.Data; diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj index 9494d2c0..878a711e 100644 --- a/Ink Canvas/InkCanvasForClass.csproj +++ b/Ink Canvas/InkCanvasForClass.csproj @@ -148,6 +148,7 @@ + diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index 4154a471..0590b40f 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -7,7 +7,8 @@ xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf" xmlns:c="clr-namespace:Ink_Canvas.Converter" xmlns:Controls="http://schemas.microsoft.com/netfx/2009/xaml/presentation" - xmlns:controls="clr-namespace:Ink_Canvas.Controls" + xmlns:controls="clr-namespace:Ink_Canvas.Controls;assembly=InkCanvas.Controls" + xmlns:localControls="clr-namespace:Ink_Canvas.Controls" xmlns:Windows="clr-namespace:Ink_Canvas.Windows" xmlns:props="clr-namespace:Ink_Canvas.Properties" xmlns:i18n="clr-namespace:Ink_Canvas.MarkupExtensions" @@ -3982,7 +3983,7 @@ - diff --git a/Ink Canvas/packages.lock.json b/Ink Canvas/packages.lock.json index 8a422a46..7369c9f4 100644 --- a/Ink Canvas/packages.lock.json +++ b/Ink Canvas/packages.lock.json @@ -345,6 +345,13 @@ "resolved": "4.5.0", "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, + "inkcanvas.controls": { + "type": "Project", + "dependencies": { + "iNKORE.UI.WPF": "[1.2.8, )", + "iNKORE.UI.WPF.Modern": "[0.10.2.1, )" + } + }, "inkcanvas.pluginsdk": { "type": "Project" } diff --git a/Ink Canvas/Controls/CopyButton.xaml b/InkCanvas.Controls/CopyButton.xaml similarity index 100% rename from Ink Canvas/Controls/CopyButton.xaml rename to InkCanvas.Controls/CopyButton.xaml diff --git a/Ink Canvas/Controls/CopyButton.xaml.cs b/InkCanvas.Controls/CopyButton.xaml.cs similarity index 100% rename from Ink Canvas/Controls/CopyButton.xaml.cs rename to InkCanvas.Controls/CopyButton.xaml.cs diff --git a/InkCanvas.Controls/InkCanvas.Controls.csproj b/InkCanvas.Controls/InkCanvas.Controls.csproj new file mode 100644 index 00000000..ef3b7559 --- /dev/null +++ b/InkCanvas.Controls/InkCanvas.Controls.csproj @@ -0,0 +1,19 @@ + + + + net6.0-windows10.0.19041.0 + disable + disable + Ink_Canvas.Controls + InkCanvas.Controls + true + 10 + CA1416 + + + + + + + + diff --git a/Ink Canvas/Controls/LabeledToggleSwitch.xaml b/InkCanvas.Controls/LabeledToggleSwitch.xaml similarity index 99% rename from Ink Canvas/Controls/LabeledToggleSwitch.xaml rename to InkCanvas.Controls/LabeledToggleSwitch.xaml index 369d40a8..507da20c 100644 --- a/Ink Canvas/Controls/LabeledToggleSwitch.xaml +++ b/InkCanvas.Controls/LabeledToggleSwitch.xaml @@ -23,4 +23,4 @@ Foreground="#a1a1aa" Visibility="Collapsed"/> - \ No newline at end of file + diff --git a/Ink Canvas/Controls/LabeledToggleSwitch.xaml.cs b/InkCanvas.Controls/LabeledToggleSwitch.xaml.cs similarity index 100% rename from Ink Canvas/Controls/LabeledToggleSwitch.xaml.cs rename to InkCanvas.Controls/LabeledToggleSwitch.xaml.cs diff --git a/Ink Canvas/Controls/ToolbarImageButton.xaml b/InkCanvas.Controls/ToolbarImageButton.xaml similarity index 100% rename from Ink Canvas/Controls/ToolbarImageButton.xaml rename to InkCanvas.Controls/ToolbarImageButton.xaml diff --git a/Ink Canvas/Controls/ToolbarImageButton.xaml.cs b/InkCanvas.Controls/ToolbarImageButton.xaml.cs similarity index 99% rename from Ink Canvas/Controls/ToolbarImageButton.xaml.cs rename to InkCanvas.Controls/ToolbarImageButton.xaml.cs index 9892a099..17d7940b 100644 --- a/Ink Canvas/Controls/ToolbarImageButton.xaml.cs +++ b/InkCanvas.Controls/ToolbarImageButton.xaml.cs @@ -107,4 +107,4 @@ namespace Ink_Canvas.Controls ButtonMouseUp?.Invoke(this, new RoutedEventArgs(e.RoutedEvent, this)); } } -} \ No newline at end of file +}