pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

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

pull/14/head
Siegfried Pammer 15 years ago
parent
f5a56a05bd
commit
8405f8c707
7 changed files with 25 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/BrushEditor/SolidBrushEditor.xaml
  2. 9
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj
  3. 2
      src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ColorHelper.cs
  4. 20
      src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ColorPicker.xaml
  5. 2
      src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ColorPicker.xaml.cs
  6. 9
      src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj
  7. 2
      src/Main/ICSharpCode.SharpDevelop.Widgets/Project/Picker.cs

10
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/BrushEditor/SolidBrushEditor.xaml
Unescape View File

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

9
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj
Unescape View File

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

2
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/BrushEditor/ColorHelper.cs → src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ColorHelper.cs
Unescape View File

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

20
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/BrushEditor/ColorPicker.xaml → src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ColorPicker.xaml
Unescape View File

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

2
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/BrushEditor/ColorPicker.xaml.cs → src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ColorPicker.xaml.cs
Unescape View File

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

9
src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj
Unescape View File

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

2
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/BrushEditor/Picker.cs → src/Main/ICSharpCode.SharpDevelop.Widgets/Project/Picker.cs
Unescape View File

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