Properties added
This commit is contained in:
retr0volkov
@@ -18,6 +18,7 @@
|
||||
<vm:EditEquipmentDialogViewModel/>
|
||||
</Design.DataContext>
|
||||
<Window.Resources>
|
||||
<!-- ReSharper disable once Xaml.RedundantResource -->
|
||||
<ResourceDictionary>
|
||||
<ResourceDictionary.ThemeDictionaries>
|
||||
<ResourceDictionary x:Key="Light">
|
||||
@@ -47,7 +48,7 @@
|
||||
<TextBlock Grid.Column="0" Grid.Row="1" Margin="20,4,0,4"
|
||||
Text="{Binding Description}"
|
||||
IsVisible="{Binding !IsDescriptionEditing}"/>
|
||||
<TextBox Grid.Column="0" Grid.Row="1" Margin="12,4,0,4"
|
||||
<TextBox Grid.Column="0" Grid.Row="1" Margin="12,4,0,4"
|
||||
Text="{Binding Description}"
|
||||
IsVisible="{Binding IsDescriptionEditing}"/>
|
||||
<Button Grid.Column="1" Grid.Row="1" HorizontalAlignment="Center" Margin="10"
|
||||
@@ -129,15 +130,65 @@
|
||||
</DataTemplate>
|
||||
</ItemsRepeater.ItemTemplate>
|
||||
</ItemsRepeater>
|
||||
<Button HorizontalAlignment="Center" Margin="10"
|
||||
<Button HorizontalAlignment="Center" Margin="10" Width="30" Height="30"
|
||||
Command="{Binding AddInspectionCommand}">
|
||||
<Image Width="24" Source="avares://GazpromApp/Assets/ic_fluent_add_24_filled (Custom).png"/>
|
||||
<Image Width="24" Height="24" Source="avares://GazpromApp/Assets/ic_fluent_add_24_filled (Custom).png"/>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
</ScrollViewer>
|
||||
</TabItem>
|
||||
<TabItem Header="Свойства">
|
||||
|
||||
<ScrollViewer>
|
||||
<StackPanel>
|
||||
<TreeView ItemsSource="{Binding Properties}">
|
||||
<TreeView.DataTemplates>
|
||||
<TreeDataTemplate DataType="{x:Type vm:PropertyViewModel}"
|
||||
ItemsSource="{Binding Properties}">
|
||||
<Grid ColumnDefinitions="150,*,Auto,Auto,Auto">
|
||||
<TextBlock Grid.Column="0" FontSize="18" VerticalAlignment="Center"
|
||||
IsVisible="{Binding !IsEditing}"
|
||||
Text="{Binding Name}"/>
|
||||
<TextBox Grid.Column="0"
|
||||
IsVisible="{Binding IsEditing}"
|
||||
Text="{Binding Name}"/>
|
||||
|
||||
<TextBlock Grid.Column="1" FontSize="18" VerticalAlignment="Center"
|
||||
IsVisible="{Binding !IsEditing}"
|
||||
Text="{Binding Value}"/>
|
||||
<TextBox Grid.Column="1"
|
||||
IsVisible="{Binding IsEditing}"
|
||||
Text="{Binding Value}"/>
|
||||
|
||||
<Button Grid.Column="2" Width="30" Height="30" Margin="4" VerticalAlignment="Center"
|
||||
Command="{Binding #Root.((vm:EditEquipmentDialogViewModel)DataContext).AddPropertyCommand}"
|
||||
CommandParameter="{Binding .}">
|
||||
<Image Width="24" Height="24" Source="avares://GazpromApp/Assets/ic_fluent_add_24_filled (Custom).png"/>
|
||||
</Button>
|
||||
<Button Grid.Column="3" Width="30" Height="30" Margin="4" VerticalAlignment="Center"
|
||||
Command="{Binding #Root.((vm:EditEquipmentDialogViewModel)DataContext).EditPropertyCommand}"
|
||||
CommandParameter="{Binding .}">
|
||||
<Panel>
|
||||
<Image Width="24" Height="24" Source="avares://GazpromApp/Assets/ic_fluent_edit_24_filled (Custom).png"
|
||||
IsVisible="{Binding !IsEditing}"/>
|
||||
<Image Width="24" Height="24" Source="avares://GazpromApp/Assets/ic_fluent_save_24_filled (Custom).png"
|
||||
IsVisible="{Binding IsEditing}"/>
|
||||
</Panel>
|
||||
</Button>
|
||||
<Button Grid.Column="4" Width="30" Height="30" Margin="4" VerticalAlignment="Center"
|
||||
Command="{Binding #Root.((vm:EditEquipmentDialogViewModel)DataContext).DeletePropertyCommand}"
|
||||
CommandParameter="{Binding .}">
|
||||
<Image Height="24" Width="24" Source="avares://GazpromApp/Assets/ic_fluent_delete_24_filled (Custom).png"/>
|
||||
</Button>
|
||||
</Grid>
|
||||
</TreeDataTemplate>
|
||||
</TreeView.DataTemplates>
|
||||
</TreeView>
|
||||
<Button HorizontalAlignment="Center" Margin="10" Width="30" Height="30"
|
||||
Command="{Binding AddPropertySimpleCommand}">
|
||||
<Image Height="24" Width="24" Source="avares://GazpromApp/Assets/ic_fluent_add_24_filled (Custom).png"/>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
</ScrollViewer>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
|
||||
|
||||
@@ -16,6 +16,20 @@
|
||||
<Design.DataContext>
|
||||
<vm:EditPointDialogViewModel/>
|
||||
</Design.DataContext>
|
||||
<Window.Resources>
|
||||
<ResourceDictionary>
|
||||
<ResourceDictionary.ThemeDictionaries>
|
||||
<ResourceDictionary x:Key="Light">
|
||||
<SolidColorBrush x:Key="BackgroundBrush" Color="#f0f0f0"/>
|
||||
<SolidColorBrush x:Key="BorderBrush" Color="#d3d3d3"/>
|
||||
</ResourceDictionary>
|
||||
<ResourceDictionary x:Key="Dark">
|
||||
<SolidColorBrush x:Key="BackgroundBrush" Color="#101010"/>
|
||||
<SolidColorBrush x:Key="BorderBrush" Color="#303030"/>
|
||||
</ResourceDictionary>
|
||||
</ResourceDictionary.ThemeDictionaries>
|
||||
</ResourceDictionary>
|
||||
</Window.Resources>
|
||||
<Grid RowDefinitions="70,150,*,Auto" ColumnDefinitions="*,100,220" x:Name="Root">
|
||||
<TextBlock Grid.Column="0" Grid.Row="0" FontSize="28" Margin="20,4,0,4"
|
||||
Text="{Binding Name}"
|
||||
@@ -89,16 +103,17 @@
|
||||
<ScrollViewer>
|
||||
<StackPanel>
|
||||
<ItemsRepeater
|
||||
IsVisible="{Binding !IsEquipmentEmpty}"
|
||||
ItemsSource="{Binding Equipment}">
|
||||
<ItemsRepeater.Layout>
|
||||
<StackLayout Orientation="Vertical"/>
|
||||
</ItemsRepeater.Layout>
|
||||
<ItemsRepeater.ItemTemplate>
|
||||
<DataTemplate DataType="vm:EquipmentViewModel">
|
||||
<Expander HorizontalAlignment="Stretch" Margin="0,4,0,4">
|
||||
<Expander HorizontalAlignment="Stretch" Margin="0,4,0,4"
|
||||
Background="{DynamicResource BackgroundBrush}"
|
||||
BorderBrush="{DynamicResource BorderBrush}">
|
||||
<Expander.Header>
|
||||
<Grid Height="54" HorizontalAlignment="Left"
|
||||
<Grid Height="54" HorizontalAlignment="Stretch"
|
||||
ColumnDefinitions="52, 300, *, Auto">
|
||||
<Image Height="50" Width="50" Margin="0,2,2,2" HorizontalAlignment="Center" Stretch="Uniform"
|
||||
Source="{Binding Image.FileName, FallbackValue=null}"/>
|
||||
@@ -142,7 +157,53 @@
|
||||
<TabItem Header="Свойства">
|
||||
<ScrollViewer>
|
||||
<StackPanel>
|
||||
|
||||
<TreeView ItemsSource="{Binding Properties}">
|
||||
<TreeView.DataTemplates>
|
||||
<TreeDataTemplate DataType="{x:Type vm:PropertyViewModel}"
|
||||
ItemsSource="{Binding Properties}">
|
||||
<Grid ColumnDefinitions="150,*,Auto,Auto,Auto">
|
||||
<TextBlock Grid.Column="0" FontSize="18" VerticalAlignment="Center"
|
||||
IsVisible="{Binding !IsEditing}"
|
||||
Text="{Binding Name}"/>
|
||||
<TextBox Grid.Column="0"
|
||||
IsVisible="{Binding IsEditing}"
|
||||
Text="{Binding Name}"/>
|
||||
|
||||
<TextBlock Grid.Column="1" FontSize="18" VerticalAlignment="Center"
|
||||
IsVisible="{Binding !IsEditing}"
|
||||
Text="{Binding Value}"/>
|
||||
<TextBox Grid.Column="1"
|
||||
IsVisible="{Binding IsEditing}"
|
||||
Text="{Binding Value}"/>
|
||||
|
||||
<Button Grid.Column="2" Width="30" Height="30" Margin="4" VerticalAlignment="Center"
|
||||
Command="{Binding #Root.((vm:EditPointDialogViewModel)DataContext).AddPropertyCommand}"
|
||||
CommandParameter="{Binding .}">
|
||||
<Image Width="24" Height="24" Source="avares://GazpromApp/Assets/ic_fluent_add_24_filled (Custom).png"/>
|
||||
</Button>
|
||||
<Button Grid.Column="3" Width="30" Height="30" Margin="4" VerticalAlignment="Center"
|
||||
Command="{Binding #Root.((vm:EditPointDialogViewModel)DataContext).EditPropertyCommand}"
|
||||
CommandParameter="{Binding .}">
|
||||
<Panel>
|
||||
<Image Width="24" Height="24" Source="avares://GazpromApp/Assets/ic_fluent_edit_24_filled (Custom).png"
|
||||
IsVisible="{Binding !IsEditing}"/>
|
||||
<Image Width="24" Height="24" Source="avares://GazpromApp/Assets/ic_fluent_save_24_filled (Custom).png"
|
||||
IsVisible="{Binding IsEditing}"/>
|
||||
</Panel>
|
||||
</Button>
|
||||
<Button Grid.Column="4" Width="30" Height="30" Margin="4" VerticalAlignment="Center"
|
||||
Command="{Binding #Root.((vm:EditPointDialogViewModel)DataContext).DeletePropertyCommand}"
|
||||
CommandParameter="{Binding .}">
|
||||
<Image Height="24" Width="24" Source="avares://GazpromApp/Assets/ic_fluent_delete_24_filled (Custom).png"/>
|
||||
</Button>
|
||||
</Grid>
|
||||
</TreeDataTemplate>
|
||||
</TreeView.DataTemplates>
|
||||
</TreeView>
|
||||
<Button HorizontalAlignment="Center" Margin="10" Width="30" Height="30"
|
||||
Command="{Binding AddPropertySimpleCommand}">
|
||||
<Image Height="24" Width="24" Source="avares://GazpromApp/Assets/ic_fluent_add_24_filled (Custom).png"/>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
</ScrollViewer>
|
||||
</TabItem>
|
||||
|
||||
Reference in New Issue
Block a user