Skip to content

V
VIZ.Package
Commit 4dbc1a2c by wangonghui
Options

修改图标和设置默认组改为勾选

parent 22cbcbae
Showing with 22 additions and 8 deletions
VIZ.Package.Domain/Model/Conn/ConnGroupModel.cs
...@@ -42,6 +42,7 @@ namespace VIZ.Package.Domain ...@@ -42,6 +42,7 @@ namespace VIZ.Package.Domain
#endregion #endregion
#region IsEnabled -- 是否启用 #region IsEnabled -- 是否启用
private bool isEnabled = true; private bool isEnabled = true;
......
VIZ.Package.Module.Resource/VIZ.Package.Module.Resource.csproj
...@@ -293,5 +293,9 @@ ...@@ -293,5 +293,9 @@
<ItemGroup> <ItemGroup>
<Resource Include="Icons\icon_cmd_32x32.png" /> <Resource Include="Icons\icon_cmd_32x32.png" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Resource Include="Icons\take_update_36x36.png" />
<Resource Include="Icons\take_update_hover_36x36.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>
\ No newline at end of file
VIZ.Package.Module/Preview/VizPreview/View/VizPreviewView.xaml
...@@ -50,8 +50,8 @@ ...@@ -50,8 +50,8 @@
IconHover="/VIZ.Package.Module.Resource;component/Icons/stop_hover_36x36.png" IconHover="/VIZ.Package.Module.Resource;component/Icons/stop_hover_36x36.png"
Command="{Binding Path=StopCommand}"></fcommon:IconButton> Command="{Binding Path=StopCommand}"></fcommon:IconButton>
<fcommon:IconButton Content="更新" Margin="5,0,0,0" Style="{StaticResource IconButton_Preview}" <fcommon:IconButton Content="更新" Margin="5,0,0,0" Style="{StaticResource IconButton_Preview}"
Icon="/VIZ.Package.Module.Resource;component/Icons/update_36x36.png" Icon="/VIZ.Package.Module.Resource;component/Icons/take_update_36x36.png"
IconHover="/VIZ.Package.Module.Resource;component/Icons/update_hover_36x36.png" IconHover="/VIZ.Package.Module.Resource;component/Icons/take_update_hover_36x36.png"
Command="{Binding Path=UpdateCommand}"></fcommon:IconButton> Command="{Binding Path=UpdateCommand}"></fcommon:IconButton>
</StackPanel> </StackPanel>
......
VIZ.Package.Module/Setting/Conn/View/ConnSettingView.xaml
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
xmlns:resource="clr-namespace:VIZ.Package.Module.Resource;assembly=VIZ.Package.Module.Resource" xmlns:resource="clr-namespace:VIZ.Package.Module.Resource;assembly=VIZ.Package.Module.Resource"
xmlns:local="clr-namespace:VIZ.Package.Module" xmlns:local="clr-namespace:VIZ.Package.Module"
d:DataContext="{d:DesignInstance Type=local:ConnSettingViewModel}" d:DataContext="{d:DesignInstance Type=local:ConnSettingViewModel}"
mc:Ignorable="d" mc:Ignorable="d" x:Name="uc"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources> <UserControl.Resources>
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
<ContextMenu> <ContextMenu>
<MenuItem Header="添加分组" Command="{Binding Path=PlacementTarget.DataContext.AddGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/> <MenuItem Header="添加分组" Command="{Binding Path=PlacementTarget.DataContext.AddGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
<MenuItem Header="删除分组" Command="{Binding Path=PlacementTarget.DataContext.DeleteGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/> <MenuItem Header="删除分组" Command="{Binding Path=PlacementTarget.DataContext.DeleteGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
<Separator/> <!--<Separator/>
<MenuItem Header="设为默认分组" Command="{Binding Path=PlacementTarget.DataContext.SetDefaultGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/> <MenuItem Header="设为默认分组" Command="{Binding Path=PlacementTarget.DataContext.SetDefaultGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>-->
</ContextMenu> </ContextMenu>
</dxg:GridControl.ContextMenu> </dxg:GridControl.ContextMenu>
<dxg:GridControl.Columns> <dxg:GridControl.Columns>
...@@ -63,13 +63,21 @@ ...@@ -63,13 +63,21 @@
</dxg:GridColumn.EditSettings> </dxg:GridColumn.EditSettings>
</dxg:GridColumn> </dxg:GridColumn>
<dxg:GridColumn Header="默认分组" Width="80" AllowEditing="False" <dxg:GridColumn Header="默认分组" Width="80" AllowEditing="False"
AllowSorting="False" AllowColumnFiltering="False" ReadOnly="True"> AllowSorting="False" AllowColumnFiltering="False" ReadOnly="True" >
<dxg:GridColumn.CellTemplate> <dxg:GridColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<TextBlock Margin="4,0,4,0" VerticalAlignment="Center" <!--<TextBlock Margin="4,0,4,0" VerticalAlignment="Center"
Text="{Binding Row.IsDefault,Converter={StaticResource Bool2StringConverter}}"></TextBlock> Text="{Binding Row.IsDefault,Converter={StaticResource Bool2StringConverter}}"></TextBlock>-->
<CheckBox IsChecked="{Binding Row.IsDefault,Mode=TwoWay}" Command="{Binding ElementName=uc, Path=DataContext.SetDefaultGroupCommand}"
HorizontalAlignment="Center" VerticalAlignment="Center">
</CheckBox>
</DataTemplate> </DataTemplate>
</dxg:GridColumn.CellTemplate> </dxg:GridColumn.CellTemplate>
</dxg:GridColumn> </dxg:GridColumn>
<dxg:GridColumn Header="是否启用" FieldName="IsEnabled" Width="80" AllowSorting="False" AllowColumnFiltering="False"> <dxg:GridColumn Header="是否启用" FieldName="IsEnabled" Width="80" AllowSorting="False" AllowColumnFiltering="False">
<dxg:GridColumn.EditSettings> <dxg:GridColumn.EditSettings>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment