继续整理

This commit is contained in:
艾竹
2023-04-08 18:08:00 +08:00
parent 2edb4ffb14
commit fa96573cbd
2 changed files with 32 additions and 321 deletions

View File

@@ -827,6 +827,7 @@
<Fluent:MenuItem Header="直线连接线" Size="Middle" IsCheckable="True" IsChecked="{Binding LineDrawMode,Converter={dd:ConverterValueMapToBool Parameter='ConnectingLineStraight'}, ConverterParameter='ConnectingLineStraight'}" Icon="{iconPacks:Material Kind=VectorLine}"/>
<Fluent:MenuItem Header="折线连接线" Size="Middle" IsCheckable="True" IsChecked="{Binding LineDrawMode,Converter={dd:ConverterValueMapToBool Parameter='ConnectingLineCorner'}, ConverterParameter='ConnectingLineCorner'}" Icon="{iconPacks:Material Kind=VectorPolyline}"/>
<Fluent:MenuItem Header="边界连接线" Size="Middle" IsCheckable="True" IsChecked="{Binding LineDrawMode,Converter={dd:ConverterValueMapToBool Parameter='ConnectingLineBoundary'}, ConverterParameter='ConnectingLineBoundary'}" Icon="{iconPacks:Material Kind=VectorPolylineEdit}"/>
<Fluent:MenuItem Header="自动连接" Size="Middle" IsCheckable="True" IsChecked="{Binding EnableSnapping}" Icon="{iconPacks:Material Kind=TransitConnectionHorizontal}"/>
<Fluent:SplitButton.Style>
<Style TargetType="{x:Type Fluent:SplitButton}" BasedOn="{StaticResource RibbonSplitButtonStyle}">
<Setter Property="LargeIcon">
@@ -979,23 +980,23 @@
</Fluent:ToggleButton>
</Fluent:RibbonGroupBox>
<Fluent:RibbonGroupBox Header="操作" IsEnabled="{Binding SelectedItem,Converter={StaticResource NullableToBooleanConverter}}"
<Fluent:RibbonGroupBox Header="操作" IsEnabled="{Binding PageViewModel.DiagramViewModel.SelectedItem,Converter={StaticResource NullableToBooleanConverter}}"
IsLauncherVisible="True">
<Fluent:DropDownButton Header="位置" Icon="{iconPacks:Material Kind=LayersOutline}" Width="50" VerticalAlignment="Top">
<Fluent:DropDownButton.LargeIcon>
<iconPacks:PackIconMaterial Kind="LayersOutline" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Fluent:DropDownButton.LargeIcon>
<Fluent:Button Margin="5" Header="置于顶层" Command="{Binding BringToFrontCommand}" Size="Middle" Icon="/AIStudio.Wpf.DiagramApp;component/Images/BringToFront.png"/>
<Fluent:Button Margin="5" Header="置于底层" Command="{Binding SendToBackCommand}" Size="Middle" Icon="/AIStudio.Wpf.DiagramApp;component/Images/SendToBack.png"/>
<Fluent:Button Margin="5" Header="上移一层" Command="{Binding BringForwardCommand}" Size="Middle" Icon="/AIStudio.Wpf.DiagramApp;component/Images/BringForward.png"/>
<Fluent:Button Margin="5" Header="下移一层" Command="{Binding SendBackwardCommand}" Size="Middle" Icon="/AIStudio.Wpf.DiagramApp;component/Images/SendBackward.png"/>
<Fluent:Button Margin="5" Header="置于顶层" Command="{Binding PageViewModel.DiagramViewModel.BringToFrontCommand}" Size="Middle" Icon="/AIStudio.Wpf.DiagramApp;component/Images/BringToFront.png"/>
<Fluent:Button Margin="5" Header="置于底层" Command="{Binding PageViewModel.DiagramViewModel.SendToBackCommand}" Size="Middle" Icon="/AIStudio.Wpf.DiagramApp;component/Images/SendToBack.png"/>
<Fluent:Button Margin="5" Header="上移一层" Command="{Binding PageViewModel.DiagramViewModel.BringForwardCommand}" Size="Middle" Icon="/AIStudio.Wpf.DiagramApp;component/Images/BringForward.png"/>
<Fluent:Button Margin="5" Header="下移一层" Command="{Binding PageViewModel.DiagramViewModel.SendBackwardCommand}" Size="Middle" Icon="/AIStudio.Wpf.DiagramApp;component/Images/SendBackward.png"/>
</Fluent:DropDownButton>
<Fluent:DropDownButton Header="组合" Icon="{iconPacks:Material Kind=Group}" Width="50" VerticalAlignment="Top">
<Fluent:DropDownButton.LargeIcon>
<iconPacks:PackIconMaterial Kind="Group" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Fluent:DropDownButton.LargeIcon>
<Fluent:Button Margin="5" Header="组合" Command="{Binding GroupCommand}" Size="Middle" Icon="/AIStudio.Wpf.DiagramApp;component/Images/BringForward.png"/>
<Fluent:Button Margin="5" Header="取消组合" Command="{Binding UngroupCommand}" Size="Middle" Icon="/AIStudio.Wpf.DiagramApp;component/Images/SendBackward.png"/>
<Fluent:Button Margin="5" Header="组合" Command="{Binding PageViewModel.DiagramViewModel.GroupCommand}" Size="Middle" Icon="/AIStudio.Wpf.DiagramApp;component/Images/BringForward.png"/>
<Fluent:Button Margin="5" Header="取消组合" Command="{Binding PageViewModel.DiagramViewModel.UngroupCommand}" Size="Middle" Icon="/AIStudio.Wpf.DiagramApp;component/Images/SendBackward.png"/>
</Fluent:DropDownButton>
<Fluent:DropDownButton Header="对齐" Icon="{iconPacks:Material Kind=AlignHorizontalLeft}" Width="50" VerticalAlignment="Top">
<Fluent:DropDownButton.LargeIcon>
@@ -1003,20 +1004,20 @@
</Fluent:DropDownButton.LargeIcon>
<TextBlock Margin="5" Text="对齐"/>
<StackPanel Orientation="Horizontal">
<Fluent:Button Margin="5" Command="{Binding AlignLeftCommand}" Size="Small" Icon="/AIStudio.Wpf.DiagramApp;component/Images/AlignObjectsLeft.png"/>
<Fluent:Button Margin="5" Command="{Binding AlignHorizontalCentersCommand}" Size="Small" Icon="/AIStudio.Wpf.DiagramApp;component/Images/AlignObjectsCenteredHorizontal.png"/>
<Fluent:Button Margin="5" Command="{Binding AlignRightCommand}" Size="Small" Icon="/AIStudio.Wpf.DiagramApp;component/Images/AlignObjectsRight.png"/>
<Fluent:Button Margin="5" Command="{Binding PageViewModel.DiagramViewModel.AlignLeftCommand}" Size="Small" Icon="/AIStudio.Wpf.DiagramApp;component/Images/AlignObjectsLeft.png"/>
<Fluent:Button Margin="5" Command="{Binding PageViewModel.DiagramViewModel.AlignHorizontalCentersCommand}" Size="Small" Icon="/AIStudio.Wpf.DiagramApp;component/Images/AlignObjectsCenteredHorizontal.png"/>
<Fluent:Button Margin="5" Command="{Binding PageViewModel.DiagramViewModel.AlignRightCommand}" Size="Small" Icon="/AIStudio.Wpf.DiagramApp;component/Images/AlignObjectsRight.png"/>
</StackPanel>
<StackPanel Orientation="Horizontal">
<Fluent:Button Margin="5" Command="{Binding AlignTopCommand}" Size="Small" Icon="/AIStudio.Wpf.DiagramApp;component/Images/AlignObjectsTop.png"/>
<Fluent:Button Margin="5" Command="{Binding AlignVerticalCentersCommand}" Size="Small" Icon="/AIStudio.Wpf.DiagramApp;component/Images/AlignObjectsCenteredVertical.png"/>
<Fluent:Button Margin="5" Command="{Binding AlignBottomCommand}" Size="Small" Icon="/AIStudio.Wpf.DiagramApp;component/Images/AlignObjectsBottom.png"/>
<Fluent:Button Margin="5" Command="{Binding PageViewModel.DiagramViewModel.AlignTopCommand}" Size="Small" Icon="/AIStudio.Wpf.DiagramApp;component/Images/AlignObjectsTop.png"/>
<Fluent:Button Margin="5" Command="{Binding PageViewModel.DiagramViewModel.AlignVerticalCentersCommand}" Size="Small" Icon="/AIStudio.Wpf.DiagramApp;component/Images/AlignObjectsCenteredVertical.png"/>
<Fluent:Button Margin="5" Command="{Binding PageViewModel.DiagramViewModel.AlignBottomCommand}" Size="Small" Icon="/AIStudio.Wpf.DiagramApp;component/Images/AlignObjectsBottom.png"/>
</StackPanel>
<Separator />
<TextBlock Margin="5" Text="等距分布"/>
<StackPanel Orientation="Horizontal">
<Fluent:Button Margin="5" Command="{Binding DistributeHorizontalCommand}" Size="Small" Icon="/AIStudio.Wpf.DiagramApp;component/Images/DistributeObjectsHorizontal.png"/>
<Fluent:Button Margin="5" Command="{Binding DistributeVerticalCommand}" Size="Small" Icon="/AIStudio.Wpf.DiagramApp;component/Images/DistributeObjectsVertical.png"/>
<Fluent:Button Margin="5" Command="{Binding PageViewModel.DiagramViewModel.DistributeHorizontalCommand}" Size="Small" Icon="/AIStudio.Wpf.DiagramApp;component/Images/DistributeObjectsHorizontal.png"/>
<Fluent:Button Margin="5" Command="{Binding PageViewModel.DiagramViewModel.DistributeVerticalCommand}" Size="Small" Icon="/AIStudio.Wpf.DiagramApp;component/Images/DistributeObjectsVertical.png"/>
</StackPanel>
</Fluent:DropDownButton>
<Fluent:SplitButton Header="翻转" Icon="{iconPacks:VaadinIcons Kind=FlipH}" Width="50" VerticalAlignment="Top" IsCheckable="True" IsChecked="{Binding SelectedItem.ShowRotate}">
@@ -1025,15 +1026,15 @@
</Fluent:SplitButton.LargeIcon>
<StackPanel Orientation="Horizontal">
<TextBlock Margin="5" Text="镜像" VerticalAlignment="Center"/>
<Fluent:ToggleButton IsChecked="{Binding SelectedItem.ScaleX,Converter={dd:ConverterValueMapToBool Parameter='1'}, ConverterParameter='-1'}"
<Fluent:ToggleButton IsChecked="{Binding PageViewModel.DiagramViewModel.SelectedItem.ScaleX,Converter={dd:ConverterValueMapToBool Parameter='1'}, ConverterParameter='-1'}"
Margin="5" Size="Small" Icon="{iconPacks:Material Kind=FlipHorizontal}"/>
<Fluent:ToggleButton IsChecked="{Binding SelectedItem.ScaleY,Converter={dd:ConverterValueMapToBool Parameter='1'}, ConverterParameter='-1'}"
<Fluent:ToggleButton IsChecked="{Binding PageViewModel.DiagramViewModel.SelectedItem.ScaleY,Converter={dd:ConverterValueMapToBool Parameter='1'}, ConverterParameter='-1'}"
Margin="5" Size="Small" Icon="{iconPacks:Material Kind=FlipVertical}"/>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Margin="5" Text="旋转" VerticalAlignment="Center"/>
<controls:SliderRotation Value="{Binding SelectedItem.Angle,Mode=TwoWay}"/>
<Fluent:Spinner Margin="5" Width="60" Size="Small" Value="{Binding SelectedItem.Angle,Mode=TwoWay}" Maximum="359" Minimum="0"
<controls:SliderRotation Value="{Binding PageViewModel.DiagramViewModel.SelectedItem.Angle,Mode=TwoWay}"/>
<Fluent:Spinner Margin="5" Width="60" Size="Small" Value="{Binding PageViewModel.DiagramViewModel.SelectedItem.Angle,Mode=TwoWay}" Maximum="359" Minimum="0"
Format="0 deg" />
</StackPanel>
</Fluent:SplitButton>
@@ -1044,28 +1045,28 @@
<TextBlock Margin="5" Text="大小" />
<StackPanel Orientation="Horizontal">
<TextBlock Margin="5" Text="宽" Width="15" VerticalAlignment="Center"/>
<Fluent:Spinner Margin="5" Width="60" Size="Small" Value="{Binding SelectedItem.ItemWidth,Mode=TwoWay}" Minimum="0"
<Fluent:Spinner Margin="5" Width="60" Size="Small" Value="{Binding PageViewModel.DiagramViewModel.SelectedItem.ItemWidth,Mode=TwoWay}" Minimum="0"
Format="0" />
<TextBlock Margin="5" Text="高" Width="15" VerticalAlignment="Center"/>
<Fluent:Spinner Margin="5" Width="60" Size="Small" Value="{Binding SelectedItem.ItemHeight,Mode=TwoWay}" Minimum="0"
<Fluent:Spinner Margin="5" Width="60" Size="Small" Value="{Binding PageViewModel.DiagramViewModel.SelectedItem.ItemHeight,Mode=TwoWay}" Minimum="0"
Format="0" />
</StackPanel>
<TextBlock Margin="5" Text="X/Y位置"/>
<StackPanel Orientation="Horizontal">
<TextBlock Margin="5" Text="X" Width="15" VerticalAlignment="Center"/>
<Fluent:Spinner Margin="5" Width="60" Size="Small" Value="{Binding SelectedItem.Left,Mode=TwoWay}" Minimum="0"
<Fluent:Spinner Margin="5" Width="60" Size="Small" Value="{Binding PageViewModel.DiagramViewModel.SelectedItem.Left,Mode=TwoWay}" Minimum="0"
Format="0" />
<TextBlock Margin="5" Text="Y" Width="15" VerticalAlignment="Center"/>
<Fluent:Spinner Margin="5" Width="60" Size="Small" Value="{Binding SelectedItem.Top,Mode=TwoWay}" Minimum="0"
<Fluent:Spinner Margin="5" Width="60" Size="Small" Value="{Binding PageViewModel.DiagramViewModel.SelectedItem.Top,Mode=TwoWay}" Minimum="0"
Format="0" />
</StackPanel>
<Separator />
<TextBlock Margin="5" Text="等大小"/>
<UniformGrid Rows="1">
<Fluent:Button Margin="5" ToolTip="等宽" Command="{Binding SameWidthCommand}" Size="Small" Icon="{iconPacks:FontAwesome Kind=ArrowsAltHSolid}"/>
<Fluent:Button Margin="5" ToolTip="等高" Command="{Binding SameHeightCommand}" Size="Small" Icon="{iconPacks:FontAwesome Kind=ArrowsAltVSolid}"/>
<Fluent:Button Margin="5" ToolTip="等大小" Command="{Binding SameSizeCommand}" Size="Small" Icon="{iconPacks:FontAwesome Kind=ArrowsAltSolid}"/>
<Fluent:Button Margin="5" ToolTip="等角度" CommandParameter="{Binding SelectedItem}" Size="Small" Icon="{iconPacks:Material Kind=AngleAcute}"/>
<Fluent:Button Margin="5" ToolTip="等宽" Command="{Binding PageViewModel.DiagramViewModel.SameWidthCommand}" Size="Small" Icon="{iconPacks:FontAwesome Kind=ArrowsAltHSolid}"/>
<Fluent:Button Margin="5" ToolTip="等高" Command="{Binding PageViewModel.DiagramViewModel.SameHeightCommand}" Size="Small" Icon="{iconPacks:FontAwesome Kind=ArrowsAltVSolid}"/>
<Fluent:Button Margin="5" ToolTip="等大小" Command="{Binding PageViewModel.DiagramViewModel.SameSizeCommand}" Size="Small" Icon="{iconPacks:FontAwesome Kind=ArrowsAltSolid}"/>
<Fluent:Button Margin="5" ToolTip="等角度" Command="{Binding PageViewModel.DiagramViewModel.SameAngleCommand}" Size="Small" Icon="{iconPacks:Material Kind=AngleAcute}"/>
</UniformGrid>
</Fluent:DropDownButton>
@@ -1307,7 +1308,7 @@
</Fluent:SplitButton.ToolTip>
</Fluent:SplitButton>
<Fluent:Button Header="居中" Size="Middle" Icon="{iconPacks:Material Kind=ImageFilterCenterFocus}" Command="{Binding CenterCommand}" >
<Fluent:Button Header="居中" Size="Middle" Icon="{iconPacks:Material Kind=ImageFilterCenterFocus}" Command="{Binding PageViewModel.DiagramViewModel.CenterCommand}" >
<Fluent:Button.ToolTip>
<Fluent:ScreenTip Title="CenterAlign"
Text="元素居中"