Ignore:
Timestamp:
Oct 19, 2010, 11:07:42 AM (11 years ago)
Author:
matkovic
Message:

-fixed pathfinding
-fixed line drawing
-added Colorpicker
-fixed lock/unlock at TextInputWrapper
-feature: Background and TextForeground in TextInputWrapper added
-fixed a issue With loading and such
-WorkspaceModel doesn't throw exception anymore (Samples functional again)
-fixed some Styles
-Startable implemented and loaded right
-Startable Logo moved

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypPlugins/WorkspaceManager/View/VisualComponents/TextInputWrapper.xaml

    r1892 r1991  
    1818            <z:ContextMenuFixUnfixConverter x:Key="ContextMenuFixUnfixConverter"></z:ContextMenuFixUnfixConverter>
    1919            <z:ToolbarVisibilityConverter x:Key="ToolbarVisibilityConverter"></z:ToolbarVisibilityConverter>
     20            <z:TransparentColorConverter x:Key="TransparentColorConverter"></z:TransparentColorConverter>
     21            <z:MenuItemHeaderFixedConverter x:Key="MenuItemHeaderFixedConverter"></z:MenuItemHeaderFixedConverter>
    2022        </ResourceDictionary>
    2123    </UserControl.Resources>
     
    2325        <ContextMenu x:Name="ContextMenu">
    2426            <MenuItem x:Name="DeleteMenuItem" Header="Delete" Click="MenuItem_Click"></MenuItem>
    25             <MenuItem x:Name="FixUnfixMenuItem" Click="MenuItem_Click_1"></MenuItem>
     27            <MenuItem x:Name="FixUnfixMenuItem" Click="MenuItem_Click_1" Header="{Binding Path=IsFixed, Converter={StaticResource ResourceKey=MenuItemHeaderFixedConverter}, FallbackValue=Error}"></MenuItem>
    2628        </ContextMenu>
    2729    </UserControl.ContextMenu>
     
    4244        </Grid.Resources>
    4345
    44         <Grid x:Name="ParentPanel" Panel.ZIndex="201" IsEnabledChanged="IsEnabledChanged">
     46        <Grid x:Name="ParentPanel" Panel.ZIndex="201">
    4547            <Thumb x:Name="OverLayingControl" Opacity="0.01" DragDelta="OverLayingControl_DragDelta_Move" IsEnabled="{Binding Path=IsSelected}"></Thumb>
    4648            <Grid x:Name="root" Margin="10">
     
    4850
    4951                    <!-- This tool bar contains all the editing buttons. -->
    50                     <ToolBar Name="mainToolBar" Height="30" DockPanel.Dock="Top" Visibility="{Binding Path=IsSelected, Converter={StaticResource ResourceKey=ToolbarVisibilityConverter}}">
     52                    <ToolBar Foreground="Black" Name="mainToolBar" Background="{StaticResource ResourceKey=ToolBarBrush}" Height="30" DockPanel.Dock="Top" Visibility="{Binding Path=IsSelected, Converter={StaticResource ResourceKey=ToolbarVisibilityConverter}}">
     53                        <StackPanel Orientation="Horizontal">
     54                            <TextBlock Text="BG" VerticalAlignment="Center" FontSize="11"></TextBlock>
     55                            <Rectangle x:Name="BGColor" Fill="White" Margin="5,0,5,0" Width="23" Height="20" Stroke="#555" StrokeThickness="0.8" MouseLeftButtonDown="BGColor_MouseLeftButtonDown"></Rectangle>
     56                        </StackPanel>
     57
     58                        <StackPanel Orientation="Horizontal">
     59                            <TextBlock Text="Font" VerticalAlignment="Center" FontSize="11"></TextBlock>
     60                            <Rectangle x:Name="FontColor" Fill="Black" Margin="5,0,5,0" Width="23" Height="20" Stroke="#555" StrokeThickness="0.8" MouseLeftButtonDown="FontColor_MouseLeftButtonDown"></Rectangle>
     61                        </StackPanel>
     62
    5163
    5264                        <Button Style="{StaticResource formatImageStyle}" Command="ApplicationCommands.Cut" ToolTip="Cut">
     
    111123                    <!-- By default pressing tab moves focus to the next control. Setting AcceptsTab to true allows the
    112124           RichTextBox to accept tab characters. -->
    113                     <RichTextBox x:Name="mainRTB" AcceptsTab="True"></RichTextBox>
     125                    <RichTextBox x:Name="mainRTB" Foreground="{Binding ElementName=FontColor, Path=Fill, Converter={StaticResource ResourceKey=TransparentColorConverter}}" AcceptsTab="True" OverridesDefaultStyle="True" BorderBrush="Transparent" BorderThickness="0" Background="{Binding ElementName=BGColor, Path=Fill, Converter={StaticResource ResourceKey=TransparentColorConverter}}" Margin="3"></RichTextBox>
    114126                </DockPanel>
    115127            </Grid>
    116             <Border x:Name="Border" Margin="4.5" BorderBrush="WhiteSmoke" BorderThickness="{Binding Path=IsSelected, Converter={StaticResource ResourceKey=SelectedContentBrushConverter}, FallbackValue=1}"></Border>
     128            <Border x:Name="Border" Margin="4.5"></Border>
     129            <!--<Border x:Name="Border" Margin="4.5" BorderBrush="WhiteSmoke" BorderThickness="{Binding Path=IsSelected, Converter={StaticResource ResourceKey=SelectedContentBrushConverter}, FallbackValue=1}"></Border>-->
    117130            <Thumb Margin="15" Panel.ZIndex="200" Style="{StaticResource ResourceKey=ImageWrapperThumbStyle}" Name="BottomRightDelta" Opacity="1" Visibility="{Binding Path=IsSelected, Converter={StaticResource ResourceKey=SContentVisibilityConverter}, FallbackValue=Visible}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Cursor="SizeNWSE" DragDelta="Thumb_DragDelta">
    118131                <Thumb.Background>
Note: See TracChangeset for help on using the changeset viewer.