moved WpfDesigner-ColorPicker to ICSharpCode.SharpDevelop.Widgets.csproj

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/BrushEditor/SolidBrushEditor.xaml

@@ -1,14 +1,12 @@
-<UserControl
-	x:Class="ICSharpCode.WpfDesign.Designer.PropertyGrid.Editors.BrushEditor.SolidBrushEditor"
+<UserControl	x:Class="ICSharpCode.WpfDesign.Designer.PropertyGrid.Editors.BrushEditor.SolidBrushEditor"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:BrushEditor="clr-namespace:ICSharpCode.WpfDesign.Designer.PropertyGrid.Editors.BrushEditor"
+	xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets"
 	x:Name="this"
-	Height="284"
->
+	Height="284">
 	<TabControl>
 		<TabItem Header="Color Picker">
-			<BrushEditor:ColorPicker Color="{Binding Color, ElementName=this}" />
+			<widgets:ColorPicker Color="{Binding Color, ElementName=this}" />
 		</TabItem>
 		<TabItem Header="Color List">
 			<ListBox ItemsSource="{Binding AvailableColors}"

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj

@@ -165,10 +165,6 @@
     <Compile Include="PropertyGrid\Editors\BrushEditor\BrushTypeEditor.xaml.cs">
       <DependentUpon>BrushTypeEditor.xaml</DependentUpon>
     </Compile>
-    <Compile Include="PropertyGrid\Editors\BrushEditor\ColorHelper.cs" />
-    <Compile Include="PropertyGrid\Editors\BrushEditor\ColorPicker.xaml.cs">
-      <DependentUpon>ColorPicker.xaml</DependentUpon>
-    </Compile>
     <Compile Include="PropertyGrid\Editors\BrushEditor\GradientBrushEditor.xaml.cs">
       <DependentUpon>GradientBrushEditor.xaml</DependentUpon>
     </Compile>
@@ -176,7 +172,6 @@
       <DependentUpon>GradientSlider.xaml</DependentUpon>
     </Compile>
     <Compile Include="PropertyGrid\Editors\BrushEditor\NormalizedPanel.cs" />
-    <Compile Include="PropertyGrid\Editors\BrushEditor\Picker.cs" />
     <Compile Include="PropertyGrid\Editors\BrushEditor\SolidBrushEditor.xaml.cs">
       <DependentUpon>SolidBrushEditor.xaml</DependentUpon>
     </Compile>
@@ -279,10 +274,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="PropertyGrid\Editors\BrushEditor\ColorPicker.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="PropertyGrid\Editors\BrushEditor\GradientBrushEditor.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ColorHelper.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Media;
 
-namespace ICSharpCode.WpfDesign.Designer.PropertyGrid.Editors.BrushEditor
+namespace ICSharpCode.SharpDevelop.Widgets
 {
 	public static class ColorHelper
 	{

src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ColorPicker.xaml

@@ -1,9 +1,7 @@
-<UserControl x:Class="ICSharpCode.WpfDesign.Designer.PropertyGrid.Editors.BrushEditor.ColorPicker"
+<UserControl x:Class="ICSharpCode.SharpDevelop.Widgets.ColorPicker"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:Controls="clr-namespace:ICSharpCode.WpfDesign.Designer.Controls"
-             xmlns:BrushEditor="clr-namespace:ICSharpCode.WpfDesign.Designer.PropertyGrid.Editors.BrushEditor"
-             xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets"
+             xmlns:widgets="clr-namespace:ICSharpCode.SharpDevelop.Widgets"
              x:Name="this"
              Padding="5"
              Width="373">
@@ -55,7 +53,7 @@
 			</Border>
 			
 			<DockPanel Margin="0 3 0 0">
-				<BrushEditor:HexTextBox Text="{Binding Hex, ElementName=this, UpdateSourceTrigger=PropertyChanged}"
+				<widgets:HexTextBox Text="{Binding Hex, ElementName=this, UpdateSourceTrigger=PropertyChanged}"
 					Width="70"
 					Margin="5 0 0 0"
 					DockPanel.Dock="Right" />
@@ -143,7 +141,7 @@
 		
 		<Border Margin="10 0 0 0"
 		        DockPanel.Dock="Right">
-			<BrushEditor:Picker Orientation="Vertical"
+			<widgets:Picker Orientation="Vertical"
 				Value="{Binding H, ElementName=this}"
 				Minimum="360"
 				Maximum="0"
@@ -180,15 +178,15 @@
 					      Data="M 0 0 L -5 5 L 0 10 Z"
 					      Fill="Black" />
 				</Grid>
-			</BrushEditor:Picker>
+			</widgets:Picker>
 		</Border>
 		
 		<Border BorderBrush="Black"
 		        BorderThickness="1">
-			<BrushEditor:Picker Value="{Binding S, ElementName=this}"
+			<widgets:Picker Value="{Binding S, ElementName=this}"
 				Marker="{Binding ElementName=point}"
 				ClipToBounds="True">
-				<BrushEditor:Picker Orientation="Vertical"
+				<widgets:Picker Orientation="Vertical"
 					Value="{Binding V, ElementName=this}"
 					Minimum="100"
 					Maximum="0"
@@ -225,8 +223,8 @@
 						         Margin="1"
 						         IsHitTestVisible="False" />
 					</Grid>
-				</BrushEditor:Picker>
-			</BrushEditor:Picker>
+				</widgets:Picker>
+			</widgets:Picker>
 		</Border>
 	
 	</DockPanel>

src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ColorPicker.xaml.cs

@@ -16,7 +16,7 @@ using System.Windows.Navigation;
 using System.Windows.Shapes;
 using System.ComponentModel;
 
-namespace ICSharpCode.WpfDesign.Designer.PropertyGrid.Editors.BrushEditor
+namespace ICSharpCode.SharpDevelop.Widgets
 {
 	public partial class ColorPicker
 	{

src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj

@@ -63,6 +63,10 @@
       <Link>Configuration\GlobalAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="CollapsiblePanel.cs" />
+    <Compile Include="ColorHelper.cs" />
+    <Compile Include="ColorPicker.xaml.cs">
+      <DependentUpon>ColorPicker.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Configuration\AssemblyInfo.cs" />
     <Compile Include="DragListener.cs" />
     <Compile Include="ListViewSorting\AbstractListViewParseableColumnComparer.cs" />
@@ -76,6 +80,7 @@
     <Compile Include="NumericUpDown.cs">
       <DependentUpon>NumericUpDown.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Picker.cs" />
     <Compile Include="RadioButtonGroup.cs" />
     <Compile Include="Resources\BitmapResources.cs" />
     <Compile Include="SideBar\SideBar.cs">
@@ -99,6 +104,10 @@
     <EmbeddedResource Include="Resources\Icons.16x16.SortDescending.png" />
   </ItemGroup>
   <ItemGroup>
+    <Page Include="ColorPicker.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="NumericUpDown.xaml" />
     <Page Include="themes\generic.xaml" />
     <Page Include="ZoomScrollViewer.xaml" />

src/Main/ICSharpCode.SharpDevelop.Widgets/Project/Picker.cs

@@ -12,7 +12,7 @@ using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Data;
 
-namespace ICSharpCode.WpfDesign.Designer.PropertyGrid.Editors.BrushEditor
+namespace ICSharpCode.SharpDevelop.Widgets
 {
 	public class Picker : Grid
 	{