Browse Source

- Set tooltips for Grid unit selectors and in-place editor.

- Reference ICSharpCode.SharpDevelop.Widgets in WpfDesign.Tests to remove Loader exceptions in Assembly.GetTypes().

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/wpfdesigner@6116 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Kumar Devvrat 16 years ago
parent
commit
d7ee6b9f51
  1. 1
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml
  2. 57
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/GridUnitSelector.xaml
  3. 4
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj

1
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml

@ -474,6 +474,7 @@
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type Controls:InPlaceEditor}"> <ControlTemplate TargetType="{x:Type Controls:InPlaceEditor}">
<TextBox Name="editor" <TextBox Name="editor"
ToolTip="Edit the Text. Press ESC key to make changes."
SnapsToDevicePixels="True" SnapsToDevicePixels="True"
Padding="{Binding Path=Padding}" Padding="{Binding Path=Padding}"
FontSize="{Binding Path=FontSize}" FontSize="{Binding Path=FontSize}"

57
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/GridUnitSelector.xaml

@ -1,29 +1,60 @@
<UserControl x:Class="ICSharpCode.WpfDesign.Designer.Controls.GridUnitSelector" <?xml version="1.0" encoding="utf-8"?>
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <UserControl
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Class="ICSharpCode.WpfDesign.Designer.Controls.GridUnitSelector" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Name="control" HorizontalContentAlignment="Left" VerticalContentAlignment="Top"> x:Name="control"
HorizontalContentAlignment="Left"
VerticalContentAlignment="Top">
<UserControl.Resources> <UserControl.Resources>
<Style TargetType="RadioButton"> <Style
<Setter Property="Template"> TargetType="RadioButton">
<Setter
Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate> <ControlTemplate>
<ToggleButton <ToggleButton
IsChecked="{Binding Path=IsChecked, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" IsChecked="{Binding Path=IsChecked, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
Content="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}}" Content="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}}"
Padding="{Binding Path=Padding, RelativeSource={RelativeSource TemplatedParent}}" Padding="{Binding Path=Padding, RelativeSource={RelativeSource TemplatedParent}}"
Name="toggleButton"/> Name="toggleButton" />
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
</UserControl.Resources> </UserControl.Resources>
<Border CornerRadius="3" BorderBrush="CornflowerBlue" Background="LightBlue" BorderThickness="1"> <Border
<StackPanel Orientation="{Binding Orientation, ElementName=control}"> CornerRadius="3"
<RadioButton x:Name="fixed" Content="Fixed" Margin="1" FontSize="8" GroupName="group" Checked="FixedChecked" /> BorderBrush="CornflowerBlue"
<RadioButton x:Name="star" Margin="1" FontSize="16" GroupName="group" Checked="StarChecked"> Background="LightBlue"
<TextBlock Text="*" Margin="3,-4,3,-8"/> BorderThickness="1">
<StackPanel
Orientation="{Binding Orientation, ElementName=control}">
<RadioButton
x:Name="fixed"
Content="Fixed"
Margin="1"
FontSize="8"
ToolTip="Fixed - Column size is fixed width"
GroupName="group"
Checked="FixedChecked" />
<RadioButton
x:Name="star"
Margin="1"
FontSize="16"
ToolTip="Star - Column size is weighted proportion"
GroupName="group"
Checked="StarChecked">
<TextBlock
Text="*"
Margin="3,-4,3,-8" />
</RadioButton> </RadioButton>
<RadioButton x:Name="auto" Content="Auto" Margin="1" FontSize="8" GroupName="group" Checked="AutoChecked" /> <RadioButton
x:Name="auto"
Content="Auto"
Margin="1"
FontSize="8"
ToolTip="Auto - Column size is determined by the Content(s)"
GroupName="group"
Checked="AutoChecked" />
</StackPanel> </StackPanel>
</Border> </Border>
</UserControl> </UserControl>

4
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj

@ -71,6 +71,10 @@
<None Include="app.config" /> <None Include="app.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj">
<Project>{8035765F-D51F-4A0C-A746-2FD100E19419}</Project>
<Name>ICSharpCode.SharpDevelop.Widgets</Name>
</ProjectReference>
<ProjectReference Include="..\..\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj"> <ProjectReference Include="..\..\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj">
<Project>{88DA149F-21B2-48AB-82C4-28FB6BDFD783}</Project> <Project>{88DA149F-21B2-48AB-82C4-28FB6BDFD783}</Project>
<Name>WpfDesign.XamlDom</Name> <Name>WpfDesign.XamlDom</Name>

Loading…
Cancel
Save