From 1e4f1775c5bc149191e320ffa3c824b6268e92bc Mon Sep 17 00:00:00 2001
From: pkanavos <pkanavos@gmail.com>
Date: Fri, 11 May 2012 20:25:07 +0300
Subject: [PATCH] The Tags tab of ContainerPropertiesView.xaml now works in a
 similar way to FileProperties/ContainerPropertiesView.xaml

---
 .../FileProperties/ContainerPropertiesView.xaml    |   39 +++++++++++---------
 .../FileProperties/ContainerPropertiesViewModel.cs |   30 +++++++++++++++
 .../FileProperties/FilePropertiesView.xaml         |    3 +-
 3 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/trunk/Pithos.Client.WPF/FileProperties/ContainerPropertiesView.xaml b/trunk/Pithos.Client.WPF/FileProperties/ContainerPropertiesView.xaml
index ffcd300..5698b39 100644
--- a/trunk/Pithos.Client.WPF/FileProperties/ContainerPropertiesView.xaml
+++ b/trunk/Pithos.Client.WPF/FileProperties/ContainerPropertiesView.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:cal="http://www.caliburnproject.org"
         xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
-        Title="ContainerPropertiesView" Height="500" Width="300"
+        Title="ContainerPropertiesView" Height="507" Width="400"
         Icon="/PithosPlus;component/Images/PithosTaskbar.png"
         Background="{StaticResource {x:Static SystemColors.ControlBrushKey}}">
     <Window.Resources>
@@ -70,22 +70,27 @@
             </Grid>
         
             </TabItem>
-            <TabItem Header="Metadata">            
-                <DataGrid ItemsSource="{Binding Tags}" x:Name="Tags"
-                    AutoGenerateColumns="False" CanUserAddRows="True" >
-                    <DataGrid.Columns>
-                        <DataGridTemplateColumn >
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <Button Content=" - " Command="DataGrid.DeleteCommand"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTextColumn Binding="{Binding Name}" Header="Key" />
-                        <DataGridTextColumn Binding="{Binding Value}" Header="Value"  />
-                    </DataGrid.Columns>
-                </DataGrid>
-            </TabItem>
+            <TabItem Header="Metadata">
+                    <StackPanel>
+                        <StackPanel Orientation="Horizontal">
+                            <TextBox x:Name="CurrentTag_Name" Width="145" Margin="5" Grid.Row="6"/>
+                            <TextBox x:Name="CurrentTag_Value" Width="145" Margin="5" Grid.Row="6"/>
+                            <Button x:Name="AddTag" Content="Update" Margin="5"/>
+                        </StackPanel>
+                        <DataGrid  x:Name="Tags" AutoGenerateColumns="False" GridLinesVisibility="None" 
+                                  IsReadOnly="False"
+                                  CanUserDeleteRows="True"
+                                  CanUserAddRows="False">
+                            <DataGrid.Columns>
+                                <DataGridTextColumn Binding="{Binding Name}" Header="Key" MinWidth="150" IsReadOnly="True"/>
+                                <DataGridTextColumn Binding="{Binding Value}" Header="Value"  MinWidth="100" IsReadOnly="True"/>
+                            </DataGrid.Columns>
+                        </DataGrid>
+                        <Button x:Name="DeleteTag" Content="Delete" 
+                                Command="DataGrid.DeleteCommand" CommandTarget="{Binding ElementName=Tags}"
+                                Style="{StaticResource ResourceKey=ButtonStyle}" HorizontalAlignment="Left" />
+                    </StackPanel>
+                </TabItem>
             <TabItem Header="Policies">
 
 
diff --git a/trunk/Pithos.Client.WPF/FileProperties/ContainerPropertiesViewModel.cs b/trunk/Pithos.Client.WPF/FileProperties/ContainerPropertiesViewModel.cs
index 1424a16..c77a980 100644
--- a/trunk/Pithos.Client.WPF/FileProperties/ContainerPropertiesViewModel.cs
+++ b/trunk/Pithos.Client.WPF/FileProperties/ContainerPropertiesViewModel.cs
@@ -283,12 +283,42 @@ namespace Pithos.Client.WPF.FileProperties
             items.Apply(collection.Add);
         }
 
+        private MetaValue _currentTag;
+        public MetaValue CurrentTag
+        {
+            get { return _currentTag; }
+            set
+            {
+                _currentTag = (value == null) ? new MetaValue() : value.Clone();
+                _currentTag.PropertyChanged += (o, e) => NotifyOfPropertyChange(() => CanAddTag);
+
+                NotifyOfPropertyChange(() => CurrentTag);
+                NotifyOfPropertyChange(() => CanAddTag);
+            }
+        }
+
         private readonly ObservableCollection<MetaValue> _tags;
         public ObservableCollection<MetaValue> Tags
         {
             get { return _tags; }
         }
 
+        public bool CanAddTag
+        {
+            get { return !String.IsNullOrWhiteSpace(CurrentTag.Name); }
+        }
+
+        public void AddTag()
+        {
+            var existingTag = Tags.FirstOrDefault(tag => tag.Name == CurrentTag.Name);
+            if (existingTag == null)
+                Tags.Add(CurrentTag.Clone());
+            else
+            {
+                existingTag.Value = CurrentTag.Value;
+            }
+        }
+
        /* private readonly ObservableCollection<MetaValue> _policies;
         public ObservableCollection<MetaValue> Policies
         {
diff --git a/trunk/Pithos.Client.WPF/FileProperties/FilePropertiesView.xaml b/trunk/Pithos.Client.WPF/FileProperties/FilePropertiesView.xaml
index d19aeb3..c5c265f 100644
--- a/trunk/Pithos.Client.WPF/FileProperties/FilePropertiesView.xaml
+++ b/trunk/Pithos.Client.WPF/FileProperties/FilePropertiesView.xaml
@@ -94,8 +94,7 @@
                             <TextBox x:Name="CurrentTag_Value" Width="145" Margin="5" Grid.Row="6"/>
                             <Button x:Name="AddTag" Content="Update" Margin="5"/>
                         </StackPanel>
-                        <DataGrid ItemsSource="{Binding Tags}" x:Name="Tags"
-                    AutoGenerateColumns="False" GridLinesVisibility="None" 
+                        <DataGrid  x:Name="Tags" AutoGenerateColumns="False" GridLinesVisibility="None" 
                                   IsReadOnly="False"
                                   CanUserDeleteRows="True"
                                   CanUserAddRows="False">
-- 
1.7.10.4