|
|
@@ -142,7 +142,7 @@
|
|
|
<StackPanel Margin="16,10,10,0">
|
|
|
<Label Content="文档" Style="{StaticResource Label}" />
|
|
|
<Border
|
|
|
- Margin="0,10,0,18"
|
|
|
+ Margin="0,10,0,16"
|
|
|
Background="{StaticResource color.sys.layout.mg}"
|
|
|
CornerRadius="6">
|
|
|
<StackPanel>
|
|
|
@@ -234,7 +234,7 @@
|
|
|
</Grid>
|
|
|
</StackPanel>
|
|
|
</Border>
|
|
|
-
|
|
|
+ <Grid Visibility="Collapsed">
|
|
|
<Label Content="打开图片文档" Style="{StaticResource Label}" />
|
|
|
<Border
|
|
|
Margin="0,10,0,18"
|
|
|
@@ -254,7 +254,7 @@
|
|
|
Style="{DynamicResource RadioButtonStyle1}" />
|
|
|
</StackPanel>
|
|
|
</Border>
|
|
|
-
|
|
|
+ </Grid>
|
|
|
<WrapPanel>
|
|
|
<Label
|
|
|
Margin="1,0"
|
|
|
@@ -293,7 +293,7 @@
|
|
|
<StackPanel Margin="16,10,10,0" Background="{StaticResource color.sys.layout.anti}">
|
|
|
<Label Content="默认视图和缩放" Style="{StaticResource Label}" />
|
|
|
<Border
|
|
|
- Margin="0,5,0,10"
|
|
|
+ Margin="0,10,0,16"
|
|
|
Background="{StaticResource color.sys.layout.mg}"
|
|
|
CornerRadius="6">
|
|
|
<Grid>
|
|
|
@@ -328,7 +328,7 @@
|
|
|
|
|
|
<Label Content="左侧面板" Style="{StaticResource Label}" />
|
|
|
<Border
|
|
|
- Margin="0,8"
|
|
|
+ Margin="0,8,0,16"
|
|
|
Background="{StaticResource color.sys.layout.mg}"
|
|
|
CornerRadius="6">
|
|
|
<StackPanel>
|
|
|
@@ -337,17 +337,17 @@
|
|
|
Content="默认显示："
|
|
|
Style="{StaticResource Label2}" />
|
|
|
<RadioButton
|
|
|
- Margin="12"
|
|
|
+ Margin="8,8,0,0"
|
|
|
Content="打开文件时收起"
|
|
|
IsChecked="{Binding View.NotShowBOTA, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
Style="{DynamicResource RadioButtonStyle1}" />
|
|
|
<RadioButton
|
|
|
- Margin="12,0,0,8"
|
|
|
+ Margin="8,8,0,0"
|
|
|
Content="打开APP记住上次选择"
|
|
|
IsChecked="{Binding View.RememberBOTA, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
Style="{DynamicResource RadioButtonStyle1}" />
|
|
|
<CheckBox
|
|
|
- Margin="12,0,0,10"
|
|
|
+ Margin="8,8,0,8"
|
|
|
Content="有大纲时默认显示大纲列表"
|
|
|
Foreground="{StaticResource color.sys.text.neutral.lv1}"
|
|
|
IsChecked="{Binding View.ShowOutLine}" />
|
|
|
@@ -356,12 +356,12 @@
|
|
|
|
|
|
<Label Content="属性面板" Style="{StaticResource Label}" />
|
|
|
<Border
|
|
|
- Margin="0,8,0,18"
|
|
|
+ Margin="0,8,0,16"
|
|
|
Background="{StaticResource color.sys.layout.mg}"
|
|
|
CornerRadius="6">
|
|
|
<WrapPanel>
|
|
|
<Label
|
|
|
- Margin="8,5"
|
|
|
+ Margin="8,8,16,8"
|
|
|
Content="显示方式："
|
|
|
Style="{StaticResource Label2}" />
|
|
|
<RadioButton
|
|
|
@@ -369,7 +369,7 @@
|
|
|
IsChecked="{Binding View.AutoExpandProperty}"
|
|
|
Style="{DynamicResource RadioButtonStyle1}" />
|
|
|
<RadioButton
|
|
|
- Margin="8,5"
|
|
|
+ Margin="8,8,0,8"
|
|
|
Content="手动展开"
|
|
|
IsChecked="{Binding View.ClickOpenProperty}"
|
|
|
Style="{DynamicResource RadioButtonStyle1}" />
|
|
|
@@ -377,10 +377,10 @@
|
|
|
</Border>
|
|
|
|
|
|
<Label Content="背景色：" Style="{StaticResource Label}" />
|
|
|
- <WrapPanel>
|
|
|
+ <WrapPanel Margin="0,8,0,16">
|
|
|
<Label Content="正常：" Style="{StaticResource Label2}" />
|
|
|
<compositecontrol:ColorContent SelectedColor="{Binding View.BackGround, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" ShowColorList="Collapsed" />
|
|
|
- <Label Content="全屏：" Style="{StaticResource Label}" />
|
|
|
+ <Label Content="全屏：" Style="{StaticResource Label}" Margin="16,0,0,0"/>
|
|
|
<compositecontrol:ColorContent SelectedColor="{Binding View.BackGroundInFulWindow, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" ShowColorList="Collapsed" />
|
|
|
</WrapPanel>
|
|
|
<CheckBox
|
|
|
@@ -388,7 +388,8 @@
|
|
|
Content="高亮表单"
|
|
|
Foreground="{StaticResource color.sys.text.neutral.lv1}"
|
|
|
IsChecked="{Binding View.HignlightForm, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
|
|
|
- <WrapPanel>
|
|
|
+ <!--域高亮色-->
|
|
|
+ <!--<WrapPanel>
|
|
|
<Label Content="域高亮色：" Style="{StaticResource Label2}" />
|
|
|
<compositecontrol:ColorContent SelectedColor="{Binding View.FormHighLightColor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" ShowColorList="Collapsed" />
|
|
|
</WrapPanel>
|
|
|
@@ -400,7 +401,7 @@
|
|
|
Margin="5,0,0,8"
|
|
|
Content="高亮链接"
|
|
|
Foreground="{StaticResource color.sys.text.neutral.lv1}"
|
|
|
- IsChecked="{Binding View.HighlightLink, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
|
|
|
+ IsChecked="{Binding View.HighlightLink, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />-->
|
|
|
</StackPanel>
|
|
|
</ScrollViewer>
|
|
|
</TabItem>
|
|
|
@@ -421,15 +422,15 @@
|
|
|
<StackPanel Margin="16,10,10,0">
|
|
|
<Label Content="注释默认颜色" Style="{StaticResource Label}" />
|
|
|
<Border
|
|
|
- Margin="0,8"
|
|
|
+ Margin="0,8,0,16"
|
|
|
Background="{StaticResource color.sys.layout.mg}"
|
|
|
CornerRadius="6">
|
|
|
- <Grid>
|
|
|
+ <Grid Margin="8,4,8,4">
|
|
|
<Grid.ColumnDefinitions>
|
|
|
- <ColumnDefinition />
|
|
|
- <ColumnDefinition />
|
|
|
- <ColumnDefinition Width="150" />
|
|
|
- <ColumnDefinition />
|
|
|
+ <ColumnDefinition Width="148"/>
|
|
|
+ <ColumnDefinition Width="88"/>
|
|
|
+ <ColumnDefinition Width="*"/>
|
|
|
+ <ColumnDefinition Width="56"/>
|
|
|
</Grid.ColumnDefinitions>
|
|
|
<Grid.RowDefinitions>
|
|
|
<RowDefinition />
|
|
|
@@ -443,9 +444,9 @@
|
|
|
<Label Content="highlights:" Style="{StaticResource Label2}" />
|
|
|
<compositecontrol:ColorContent
|
|
|
Grid.Column="1"
|
|
|
- Margin="10"
|
|
|
+ Height="40"
|
|
|
SelectedColor="{Binding Annote.HighLightColor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
- ShowColorList="Collapsed" />
|
|
|
+ ShowColorList="Collapsed" HorizontalAlignment="Left"/>
|
|
|
|
|
|
<Label
|
|
|
Grid.Column="2"
|
|
|
@@ -453,7 +454,7 @@
|
|
|
Style="{StaticResource Label2}" />
|
|
|
<compositecontrol:ColorContent
|
|
|
Grid.Column="3"
|
|
|
- Margin="10"
|
|
|
+ Height="40"
|
|
|
SelectedColor="{Binding Annote.RectangleBorderColor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
ShowColorList="Collapsed" />
|
|
|
<Label
|
|
|
@@ -463,9 +464,9 @@
|
|
|
<compositecontrol:ColorContent
|
|
|
Grid.Row="1"
|
|
|
Grid.Column="1"
|
|
|
- Margin="10"
|
|
|
+ Height="40"
|
|
|
SelectedColor="{Binding Annote.StrikethroughColor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
- ShowColorList="Collapsed" />
|
|
|
+ ShowColorList="Collapsed" HorizontalAlignment="Left"/>
|
|
|
<Label
|
|
|
Grid.Row="1"
|
|
|
Grid.Column="2"
|
|
|
@@ -474,7 +475,7 @@
|
|
|
<compositecontrol:ColorContent
|
|
|
Grid.Row="1"
|
|
|
Grid.Column="3"
|
|
|
- Margin="10"
|
|
|
+ Height="40"
|
|
|
SelectedColor="{Binding Annote.CircleBorderColor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
ShowColorList="Collapsed" />
|
|
|
<Label
|
|
|
@@ -484,9 +485,9 @@
|
|
|
<compositecontrol:ColorContent
|
|
|
Grid.Row="2"
|
|
|
Grid.Column="1"
|
|
|
- Margin="10"
|
|
|
+ Height="40"
|
|
|
SelectedColor="{Binding Annote.UnderLineColor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
- ShowColorList="Collapsed" />
|
|
|
+ ShowColorList="Collapsed" HorizontalAlignment="Left"/>
|
|
|
<Label
|
|
|
Grid.Row="2"
|
|
|
Grid.Column="2"
|
|
|
@@ -495,7 +496,7 @@
|
|
|
<compositecontrol:ColorContent
|
|
|
Grid.Row="2"
|
|
|
Grid.Column="3"
|
|
|
- Margin="10"
|
|
|
+ Height="40"
|
|
|
SelectedColor="{Binding Annote.LineColor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
ShowColorList="Collapsed" />
|
|
|
<Label
|
|
|
@@ -505,9 +506,9 @@
|
|
|
<compositecontrol:ColorContent
|
|
|
Grid.Row="3"
|
|
|
Grid.Column="1"
|
|
|
- Margin="10"
|
|
|
+ Height="40"
|
|
|
SelectedColor="{Binding Annote.FreeHandColor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
- ShowColorList="Collapsed" />
|
|
|
+ ShowColorList="Collapsed" HorizontalAlignment="Left"/>
|
|
|
<Label
|
|
|
Grid.Row="3"
|
|
|
Grid.Column="2"
|
|
|
@@ -516,7 +517,7 @@
|
|
|
<compositecontrol:ColorContent
|
|
|
Grid.Row="3"
|
|
|
Grid.Column="3"
|
|
|
- Margin="10"
|
|
|
+ Height="40"
|
|
|
SelectedColor="{Binding Annote.RectangleFillColor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
ShowColorList="Collapsed" />
|
|
|
<Label
|
|
|
@@ -526,9 +527,9 @@
|
|
|
<compositecontrol:ColorContent
|
|
|
Grid.Row="4"
|
|
|
Grid.Column="1"
|
|
|
- Margin="10"
|
|
|
+ Height="40"
|
|
|
SelectedColor="{Binding Annote.TextAnnoteColor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
- ShowColorList="Collapsed" />
|
|
|
+ ShowColorList="Collapsed" HorizontalAlignment="Left"/>
|
|
|
<Label
|
|
|
Grid.Row="4"
|
|
|
Grid.Column="2"
|
|
|
@@ -537,7 +538,7 @@
|
|
|
<compositecontrol:ColorContent
|
|
|
Grid.Row="4"
|
|
|
Grid.Column="3"
|
|
|
- Margin="10"
|
|
|
+ Height="40"
|
|
|
SelectedColor="{Binding Annote.CircleFillColor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
ShowColorList="Collapsed" />
|
|
|
<Label
|
|
|
@@ -547,22 +548,26 @@
|
|
|
<compositecontrol:ColorContent
|
|
|
Grid.Row="5"
|
|
|
Grid.Column="1"
|
|
|
- Margin="10"
|
|
|
+ Height="40"
|
|
|
SelectedColor="{Binding Annote.NoteAnnoteColor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
- ShowColorList="Collapsed" />
|
|
|
+ ShowColorList="Collapsed" HorizontalAlignment="Left"/>
|
|
|
</Grid>
|
|
|
</Border>
|
|
|
|
|
|
<Label Content="注释默认字体" Style="{StaticResource Label}" />
|
|
|
- <WrapPanel Margin="0,10">
|
|
|
- <WrapPanel>
|
|
|
- <Label Content="文本：" Style="{StaticResource Label2}" />
|
|
|
- <ComboBox
|
|
|
+ <Border
|
|
|
+ Margin="0,2,0,0"
|
|
|
+ Background="{StaticResource color.sys.layout.mg}"
|
|
|
+ CornerRadius="6">
|
|
|
+ <WrapPanel >
|
|
|
+ <WrapPanel>
|
|
|
+ <Label Content="文本：" Style="{StaticResource Label2}" />
|
|
|
+ <ComboBox
|
|
|
Width="228"
|
|
|
Height="30"
|
|
|
ItemsSource="{Binding AnnoteFamilyList}"
|
|
|
SelectedIndex="{Binding AnnoteSelectedIndex}" />
|
|
|
- <RadioButton
|
|
|
+ <RadioButton
|
|
|
Name="RbtLeft"
|
|
|
Width="32"
|
|
|
Height="32"
|
|
|
@@ -571,36 +576,36 @@
|
|
|
VerticalAlignment="Center"
|
|
|
IsChecked="{Binding LeftSelected}"
|
|
|
Style="{StaticResource GreyBgRadioBtnStyle}">
|
|
|
- <Grid Width="32" Height="32">
|
|
|
- <Canvas Margin="5,10,0,0">
|
|
|
- <Rectangle
|
|
|
+ <Grid Width="32" Height="32">
|
|
|
+ <Canvas Margin="5,10,0,0">
|
|
|
+ <Rectangle
|
|
|
Canvas.Top="0.25"
|
|
|
Width="14"
|
|
|
Height="1.5"
|
|
|
Stroke="{Binding ElementName=RbtLeft, Path=Foreground}"
|
|
|
StrokeThickness="1.5" />
|
|
|
- <Rectangle
|
|
|
+ <Rectangle
|
|
|
Canvas.Top="4.25"
|
|
|
Width="8"
|
|
|
Height="1.5"
|
|
|
Stroke="{Binding ElementName=RbtLeft, Path=Foreground}"
|
|
|
StrokeThickness="1.5" />
|
|
|
- <Rectangle
|
|
|
+ <Rectangle
|
|
|
Canvas.Top="12.25"
|
|
|
Width="8"
|
|
|
Height="1.5"
|
|
|
Stroke="{Binding ElementName=RbtLeft, Path=Foreground}"
|
|
|
StrokeThickness="1.5" />
|
|
|
- <Rectangle
|
|
|
+ <Rectangle
|
|
|
Canvas.Top="8.25"
|
|
|
Width="14"
|
|
|
Height="1.5"
|
|
|
Stroke="{Binding ElementName=RbtLeft, Path=Foreground}"
|
|
|
StrokeThickness="1.5" />
|
|
|
- </Canvas>
|
|
|
- </Grid>
|
|
|
- </RadioButton>
|
|
|
- <RadioButton
|
|
|
+ </Canvas>
|
|
|
+ </Grid>
|
|
|
+ </RadioButton>
|
|
|
+ <RadioButton
|
|
|
Name="RbtCenter"
|
|
|
Width="32"
|
|
|
Height="32"
|
|
|
@@ -609,38 +614,38 @@
|
|
|
VerticalAlignment="Center"
|
|
|
IsChecked="{Binding CenterSelected}"
|
|
|
Style="{StaticResource GreyBgRadioBtnStyle}">
|
|
|
- <Grid Width="32" Height="32">
|
|
|
- <Canvas Margin="5,10,0,0">
|
|
|
- <Rectangle
|
|
|
+ <Grid Width="32" Height="32">
|
|
|
+ <Canvas Margin="5,10,0,0">
|
|
|
+ <Rectangle
|
|
|
Canvas.Top="0.25"
|
|
|
Width="14"
|
|
|
Height="1.5"
|
|
|
Stroke="{Binding ElementName=RbtCenter, Path=Foreground}"
|
|
|
StrokeThickness="1.5" />
|
|
|
- <Rectangle
|
|
|
+ <Rectangle
|
|
|
Canvas.Left="3"
|
|
|
Canvas.Top="4.25"
|
|
|
Width="8"
|
|
|
Height="1.5"
|
|
|
Stroke="{Binding ElementName=RbtCenter, Path=Foreground}"
|
|
|
StrokeThickness="1.5" />
|
|
|
- <Rectangle
|
|
|
+ <Rectangle
|
|
|
Canvas.Left="3"
|
|
|
Canvas.Top="12.25"
|
|
|
Width="8"
|
|
|
Height="1.5"
|
|
|
Stroke="{Binding ElementName=RbtCenter, Path=Foreground}"
|
|
|
StrokeThickness="1.5" />
|
|
|
- <Rectangle
|
|
|
+ <Rectangle
|
|
|
Canvas.Top="8.25"
|
|
|
Width="14"
|
|
|
Height="1.5"
|
|
|
Stroke="{Binding ElementName=RbtCenter, Path=Foreground}"
|
|
|
StrokeThickness="1.5" />
|
|
|
- </Canvas>
|
|
|
- </Grid>
|
|
|
- </RadioButton>
|
|
|
- <RadioButton
|
|
|
+ </Canvas>
|
|
|
+ </Grid>
|
|
|
+ </RadioButton>
|
|
|
+ <RadioButton
|
|
|
Name="RbtRight"
|
|
|
Width="32"
|
|
|
Height="32"
|
|
|
@@ -649,38 +654,38 @@
|
|
|
VerticalAlignment="Center"
|
|
|
IsChecked="{Binding RightSelected}"
|
|
|
Style="{StaticResource GreyBgRadioBtnStyle}">
|
|
|
- <Grid Width="32" Height="32">
|
|
|
- <Canvas Margin="5,10,0,0">
|
|
|
- <Rectangle
|
|
|
+ <Grid Width="32" Height="32">
|
|
|
+ <Canvas Margin="5,10,0,0">
|
|
|
+ <Rectangle
|
|
|
Canvas.Top="0.25"
|
|
|
Width="14"
|
|
|
Height="1.5"
|
|
|
Stroke="{Binding ElementName=RbtRight, Path=Foreground}"
|
|
|
StrokeThickness="1.5" />
|
|
|
- <Rectangle
|
|
|
+ <Rectangle
|
|
|
Canvas.Left="6"
|
|
|
Canvas.Top="4.25"
|
|
|
Width="8"
|
|
|
Height="1.5"
|
|
|
Stroke="{Binding ElementName=RbtRight, Path=Foreground}"
|
|
|
StrokeThickness="1.5" />
|
|
|
- <Rectangle
|
|
|
+ <Rectangle
|
|
|
Canvas.Left="6"
|
|
|
Canvas.Top="12.25"
|
|
|
Width="8"
|
|
|
Height="1.5"
|
|
|
Stroke="{Binding ElementName=RbtRight, Path=Foreground}"
|
|
|
StrokeThickness="1.5" />
|
|
|
- <Rectangle
|
|
|
+ <Rectangle
|
|
|
Canvas.Top="8.25"
|
|
|
Width="14"
|
|
|
Height="1.5"
|
|
|
Stroke="{Binding ElementName=RbtRight, Path=Foreground}"
|
|
|
StrokeThickness="1.5" />
|
|
|
- </Canvas>
|
|
|
- </Grid>
|
|
|
- </RadioButton>
|
|
|
- <RadioButton
|
|
|
+ </Canvas>
|
|
|
+ </Grid>
|
|
|
+ </RadioButton>
|
|
|
+ <RadioButton
|
|
|
Name="RbtnStrech"
|
|
|
Width="32"
|
|
|
Height="32"
|
|
|
@@ -688,45 +693,46 @@
|
|
|
VerticalAlignment="Center"
|
|
|
IsChecked="{Binding StrechSelected}"
|
|
|
Style="{StaticResource GreyBgRadioBtnStyle}">
|
|
|
- <Grid Width="32" Height="32">
|
|
|
- <Canvas Margin="5,10,0,0">
|
|
|
- <Rectangle
|
|
|
+ <Grid Width="32" Height="32">
|
|
|
+ <Canvas Margin="5,10,0,0">
|
|
|
+ <Rectangle
|
|
|
Canvas.Top="0.25"
|
|
|
Width="14"
|
|
|
Height="1.5"
|
|
|
Stroke="{Binding ElementName=RbtnStrech, Path=Foreground}"
|
|
|
StrokeThickness="1.5" />
|
|
|
- <Rectangle
|
|
|
+ <Rectangle
|
|
|
Canvas.Top="8.25"
|
|
|
Width="14"
|
|
|
Height="1.5"
|
|
|
Stroke="{Binding ElementName=RbtnStrech, Path=Foreground}"
|
|
|
StrokeThickness="1.5" />
|
|
|
- <Rectangle
|
|
|
+ <Rectangle
|
|
|
Canvas.Top="4.25"
|
|
|
Width="14"
|
|
|
Height="1.5"
|
|
|
Stroke="{Binding ElementName=RbtnStrech, Path=Foreground}"
|
|
|
StrokeThickness="1.5" />
|
|
|
- <Rectangle
|
|
|
+ <Rectangle
|
|
|
Canvas.Top="12.25"
|
|
|
Width="14"
|
|
|
Height="1.5"
|
|
|
Stroke="{Binding ElementName=RbtnStrech, Path=Foreground}"
|
|
|
StrokeThickness="1.5" />
|
|
|
- </Canvas>
|
|
|
- </Grid>
|
|
|
- </RadioButton>
|
|
|
- </WrapPanel>
|
|
|
- <WrapPanel>
|
|
|
- <Label Content="便签：" Style="{StaticResource Label2}" />
|
|
|
- <ComboBox
|
|
|
+ </Canvas>
|
|
|
+ </Grid>
|
|
|
+ </RadioButton>
|
|
|
+ </WrapPanel>
|
|
|
+ <WrapPanel Margin="0,0,0,8">
|
|
|
+ <Label Content="便签：" Style="{StaticResource Label2}" />
|
|
|
+ <ComboBox
|
|
|
Width="228"
|
|
|
Height="30"
|
|
|
ItemsSource="{Binding AnnoteFamilyList}"
|
|
|
SelectedIndex="{Binding NoteSelectedIndex, Mode=TwoWay}" />
|
|
|
+ </WrapPanel>
|
|
|
</WrapPanel>
|
|
|
- </WrapPanel>
|
|
|
+ </Border>
|
|
|
</StackPanel>
|
|
|
</ScrollViewer>
|
|
|
</TabItem>
|
