This commit is contained in:
艾竹
2023-03-18 21:44:58 +08:00
parent d97938cc2b
commit 9b3c2633a7
32 changed files with 3229 additions and 77 deletions

View File

@@ -131,8 +131,8 @@
</StackPanel>
</controls:DropDownButton.Content>
<controls:DropDownButton.Items>
<MenuItem Header="插入图片"></MenuItem>
<MenuItem Header="移除已有图片"></MenuItem>
<MenuItem Header="插入图片" Command="{Binding AddImageCommand}"></MenuItem>
<MenuItem Header="移除已有图片" Command="{Binding RemoveImageCommand}"></MenuItem>
</controls:DropDownButton.Items>
</controls:DropDownButton>
<controls:DropDownButton>
@@ -143,8 +143,8 @@
</StackPanel>
</controls:DropDownButton.Content>
<controls:DropDownButton.Items>
<MenuItem Header="插入备注"></MenuItem>
<MenuItem Header="移除已有备注"></MenuItem>
<MenuItem Header="插入备注" Command="{Binding AddRemarkCommand}"></MenuItem>
<MenuItem Header="移除已有备注" Command="{Binding RemoveRemarkCommand}"></MenuItem>
</controls:DropDownButton.Items>
</controls:DropDownButton>
</UniformGrid>
@@ -345,6 +345,39 @@
<Path Stretch="Uniform" Fill="Green" Data="m 256,76 c 48.1,0 93.3,18.7 127.3,52.7 34,34 52.7,79.2 52.7,127.3 0,48.1 -18.7,93.3 -52.7,127.3 -34,34 -79.2,52.7 -127.3,52.7 -48.1,0 -93.3,-18.7 -127.3,-52.7 C 94.7,349.3 76,304.1 76,256 76,207.9 94.7,162.7 128.7,128.7 162.7,94.7 207.9,76 256,76 m 0,-28 C 141.1,48 48,141.1 48,256 48,370.9 141.1,464 256,464 370.9,464 464,370.9 464,256 464,141.1 370.9,48 256,48 Z M 362.6,192.9 345,174.8 c -0.7,-0.8 -1.8,-1.2 -2.8,-1.2 -1.1,0 -2.1,0.4 -2.8,1.2 L 217.4,297.7 173,253.3 c -0.8,-0.8 -1.8,-1.2 -2.8,-1.2 -1,0 -2,0.4 -2.8,1.2 l -17.8,17.8 c -1.6,1.6 -1.6,4.1 0,5.7 l 56,56 c 3.6,3.6 8,5.7 11.7,5.7 5.3,0 9.9,-3.9 11.6,-5.5 H 229 L 362.7,198.6 c 1.4,-1.7 1.4,-4.2 -0.1,-5.7 z"></Path>
</Button>
</UniformGrid>
<Grid Grid.Column="13" >
<Border BorderBrush="Gray" BorderThickness="1" CornerRadius="3">
<Grid>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBox x:Name="txtTag" VerticalContentAlignment="Center" BorderThickness="0" Background="Transparent"/>
<Line X1="0" Y1="0" X2="0" Y2="100" Stroke="Gray" StrokeThickness="0.5" HorizontalAlignment="Right"></Line>
<Button Grid.Column="1" Content="添加" Padding="6,0" Style="{StaticResource FlatButtonStyle}" Command="{Binding AddTagCommand}" CommandParameter="{Binding ElementName=txtTag,Path=Text}"/>
<Line X1="0" Y1="0" X2="150" Y2="0" Stroke="Gray" StrokeThickness="0.5" VerticalAlignment="Bottom" Grid.ColumnSpan="2"></Line>
<controls:TagControl Grid.Row="1" Grid.ColumnSpan="2" BorderBrush="Gray" HorizontalAlignment="Left" ItemsSource="{Binding SelectedItem.Tags}" Width="150">
<controls:TagControl.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal" x:Name="grid">
<TextBlock Text="{Binding .}"/>
<Button x:Name="clear" Style="{StaticResource FlatButtonStyle}" Padding="0" Content="X" Command="{Binding DataContext.RemoveTagCommand, RelativeSource={RelativeSource AncestorType={x:Type controls:TagControl}}}" CommandParameter="{Binding .}" Visibility="Collapsed"/>
</StackPanel>
<DataTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="clear" Property="Visibility" Value="Visible"/>
</Trigger>
</DataTemplate.Triggers>
</DataTemplate>
</controls:TagControl.ItemTemplate>
</controls:TagControl>
</Grid>
</Border>
</Grid>
</Grid>
</TabItem>
<TabItem Header="外观">
@@ -444,7 +477,7 @@
</Button>
</Grid>
<Line Grid.Column="7" X1="0" Y1="0" X2="0" Y2="100" StrokeDashArray="1" Stroke="Gray" StrokeThickness="1"></Line>
<Grid Grid.Column="8" DataContext="{Binding SelectedItem.FontViewModel}">
<Grid Grid.Column="8">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
@@ -456,8 +489,8 @@
BorderBrush="Gainsboro"
IsTextSearchEnabled="True"
ScrollViewer.CanContentScroll="False"
ItemsSource="{Binding FontFamilys}"
SelectedItem="{Binding FontFamily}">
ItemsSource="{Binding SelectedItem.FontViewModel.FontFamilys}"
SelectedItem="{Binding SelectedItem.FontViewModel.FontFamily}">
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding}"
@@ -471,8 +504,8 @@
Height="22"
BorderBrush="Gainsboro"
IsEditable="True"
ItemsSource="{Binding FontSizes}"
Text="{Binding FontSize}">
ItemsSource="{Binding SelectedItem.FontViewModel.FontSizes}"
Text="{Binding SelectedItem.FontViewModel.FontSize}">
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding}"/>
@@ -482,13 +515,15 @@
</StackPanel>
<StackPanel Grid.Row="1" Orientation="Horizontal">
<ToggleButton x:Name="buttonBold" Style="{StaticResource FlatToggleButtonStyle}" Width="18" Height="18"
IsChecked="{Binding FontWeight,Converter={dd:ConverterValueMapToBool Parameter='Regular'}, ConverterParameter='Bold'}">
IsChecked="{Binding SelectedItem.FontViewModel.FontWeight,Converter={dd:ConverterValueMapToBool Parameter='Regular'}, ConverterParameter='Bold'}">
<Path Stretch="Uniform" Margin="2" Fill="{Binding RelativeSource={RelativeSource AncestorType=ToggleButton}, Path=Foreground}" Data="M214 80Q266 80 299 107 331 134 331 176 331 201 320 222 308 243 291 251L291 253Q319 262 336 284 352 306 352 335 352 377 321 405 290 432 242 432L64 432 64 80 214 80ZM218 224Q239 224 253 211 267 198 267 180 267 164 254 154 240 144 218 144L128 144 128 224 218 224ZM236 368Q258 368 273 357 288 345 288 328 288 309 274 299 259 288 236 288L128 288 128 368 236 368Z"></Path>
</ToggleButton>
<ToggleButton x:Name="buttonItalic" Style="{StaticResource FlatToggleButtonStyle}" Width="18" Height="18"
IsChecked="{Binding FontStyle,Converter={dd:ConverterValueMapToBool Parameter='Normal'}, ConverterParameter='Italic'}">
IsChecked="{Binding SelectedItem.FontViewModel.FontStyle,Converter={dd:ConverterValueMapToBool Parameter='Normal'}, ConverterParameter='Italic'}">
<Path Stretch="Uniform" Margin="2" Fill="{Binding RelativeSource={RelativeSource AncestorType=ToggleButton}, Path=Foreground}" Data="M320 48v32a16 16 0 0 1-16 16h-62.76l-80 320H208a16 16 0 0 1 16 16v32a16 16 0 0 1-16 16H16a16 16 0 0 1-16-16v-32a16 16 0 0 1 16-16h62.76l80-320H112a16 16 0 0 1-16-16V48a16 16 0 0 1 16-16h192a16 16 0 0 1 16 16z"></Path>
</ToggleButton>
<controls:ColorPicker SelectedColor="{Binding SelectedItem.FontViewModel.FontColor}"/>
<controls:ColorPicker SelectedColor="{Binding SelectedItem.ColorViewModel.FillColor.Color}"/>
</StackPanel>
</Grid>
</Grid>
@@ -571,7 +606,7 @@
<TextBlock>适应窗口高度</TextBlock>
</StackPanel>
</Button>
</StackPanel>
<Line Grid.Column="4" X1="0" Y1="0" X2="0" Y2="100" StrokeDashArray="1" Stroke="Gray" StrokeThickness="1"></Line>
<Button Style="{StaticResource FlatButtonStyle}" Grid.Column="5" Command="{Binding AddChildCommand}">