Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
V
VIZ.Package
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘龙飞
VIZ.Package
Commits
4dbc1a2c
Commit
4dbc1a2c
authored
Apr 24, 2023
by
wangonghui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改图标和设置默认组改为勾选
parent
22cbcbae
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
8 deletions
+22
-8
VIZ.Package.Domain/Model/Conn/ConnGroupModel.cs
+1
-0
VIZ.Package.Module.Resource/Icons/take_update_36x36.png
+0
-0
VIZ.Package.Module.Resource/Icons/take_update_hover_36x36.png
+0
-0
VIZ.Package.Module.Resource/VIZ.Package.Module.Resource.csproj
+5
-0
VIZ.Package.Module/Preview/VizPreview/View/VizPreviewView.xaml
+2
-2
VIZ.Package.Module/Setting/Conn/View/ConnSettingView.xaml
+14
-6
No files found.
VIZ.Package.Domain/Model/Conn/ConnGroupModel.cs
View file @
4dbc1a2c
...
...
@@ -42,6 +42,7 @@ namespace VIZ.Package.Domain
#
endregion
#
region
IsEnabled
--
是否启用
private
bool
isEnabled
=
true
;
...
...
VIZ.Package.Module.Resource/Icons/take_update_36x36.png
0 → 100644
View file @
4dbc1a2c
1.55 KB
VIZ.Package.Module.Resource/Icons/take_update_hover_36x36.png
0 → 100644
View file @
4dbc1a2c
1.52 KB
VIZ.Package.Module.Resource/VIZ.Package.Module.Resource.csproj
View file @
4dbc1a2c
...
...
@@ -293,5 +293,9 @@
<ItemGroup>
<Resource Include="Icons\icon_cmd_32x32.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\take_update_36x36.png" />
<Resource Include="Icons\take_update_hover_36x36.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
VIZ.Package.Module/Preview/VizPreview/View/VizPreviewView.xaml
View file @
4dbc1a2c
...
...
@@ -50,8 +50,8 @@
IconHover="/VIZ.Package.Module.Resource;component/Icons/stop_hover_36x36.png"
Command="{Binding Path=StopCommand}"></fcommon:IconButton>
<fcommon:IconButton Content="更新" Margin="5,0,0,0" Style="{StaticResource IconButton_Preview}"
Icon="/VIZ.Package.Module.Resource;component/Icons/update_36x36.png"
IconHover="/VIZ.Package.Module.Resource;component/Icons/update_hover_36x36.png"
Icon="/VIZ.Package.Module.Resource;component/Icons/
take_
update_36x36.png"
IconHover="/VIZ.Package.Module.Resource;component/Icons/
take_
update_hover_36x36.png"
Command="{Binding Path=UpdateCommand}"></fcommon:IconButton>
</StackPanel>
...
...
VIZ.Package.Module/Setting/Conn/View/ConnSettingView.xaml
View file @
4dbc1a2c
...
...
@@ -14,7 +14,7 @@
xmlns:resource="clr-namespace:VIZ.Package.Module.Resource;assembly=VIZ.Package.Module.Resource"
xmlns:local="clr-namespace:VIZ.Package.Module"
d:DataContext="{d:DesignInstance Type=local:ConnSettingViewModel}"
mc:Ignorable="d"
mc:Ignorable="d"
x:Name="uc"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>
...
...
@@ -44,8 +44,8 @@
<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}}"/>
<Separator/>
<MenuItem Header="设为默认分组" Command="{Binding Path=PlacementTarget.DataContext.SetDefaultGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
<
!--<
Separator/>
<MenuItem Header="设为默认分组" Command="{Binding Path=PlacementTarget.DataContext.SetDefaultGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
-->
</ContextMenu>
</dxg:GridControl.ContextMenu>
<dxg:GridControl.Columns>
...
...
@@ -63,13 +63,21 @@
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
<dxg:GridColumn Header="默认分组" Width="80" AllowEditing="False"
AllowSorting="False" AllowColumnFiltering="False" ReadOnly="True">
AllowSorting="False" AllowColumnFiltering="False" ReadOnly="True"
>
<dxg:GridColumn.CellTemplate>
<DataTemplate>
<TextBlock Margin="4,0,4,0" VerticalAlignment="Center"
Text="{Binding Row.IsDefault,Converter={StaticResource Bool2StringConverter}}"></TextBlock>
<!--<TextBlock Margin="4,0,4,0" VerticalAlignment="Center"
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>
</dxg:GridColumn.CellTemplate>
</dxg:GridColumn>
<dxg:GridColumn Header="是否启用" FieldName="IsEnabled" Width="80" AllowSorting="False" AllowColumnFiltering="False">
<dxg:GridColumn.EditSettings>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment