ISS Fixes

Updated Status
Fixed GUI Issues
Delete Container data
Fixed issue with net.http in 2008 server

Signed-off-by: George Pantazis <gpant@noc.grnet.gr>

diff --git a/trunk/CommonAssemblyVersion.cs b/trunk/CommonAssemblyVersion.cs
index 0388bea..84bede6 100644 (file)
--- a/trunk/CommonAssemblyVersion.cs
+++ b/trunk/CommonAssemblyVersion.cs
@@ -60,4 +60,4 @@ using System.Reflection;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.8.20919.40")]
+[assembly: AssemblyVersion("1.8.20922.41")]

diff --git a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
index d5fe64f..1388842 100644 (file)
--- a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
+++ b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
@@ -1,256 +1,263 @@
-<Window x:Class="Pithos.Client.WPF.Preferences.PreferencesView"
-        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"
+<Window x:Class="Pithos.Client.WPF.Preferences.PreferencesView"\r
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"\r
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"        \r
+        xmlns:cal="http://www.caliburnproject.org"\r
+        xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"\r
         xmlns:Converters="clr-namespace:Pithos.Client.WPF.Converters"\r
-        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" x:Name="TheView"
-        Title="Pithos+ Preferences" Height="436" Width="732" 
-        WindowStartupLocation="CenterScreen"
-        Icon="/PithosPlus;component/Images/PithosTaskbar.png"
-        WindowStyle="ToolWindow"        
-        ResizeMode="NoResize"
-        ShowInTaskbar="False"
-        BorderThickness="0"
-        Background="White">
-        
-        <!-- Background="{StaticResource {x:Static SystemColors.ControlBrushKey}}"> -->
-    <Window.Resources>
-        <ResourceDictionary>
-        <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="..\PithosStyles.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-            <Converters:NullToVisibilityConverter x:Key="NullToVisible" />
-            <BooleanToVisibilityConverter x:Key="BoolToVisible" />
-        </ResourceDictionary>
-    </Window.Resources>
-<!--    <Window.TaskbarItemInfo>
-        <TaskbarItemInfo Description="{Binding StatusMessage}" >
-            <TaskbarItemInfo.ThumbButtonInfos>
-                <ThumbButtonInfo>
-                    
-                </ThumbButtonInfo>
-            </TaskbarItemInfo.ThumbButtonInfos>
-        </TaskbarItemInfo>
-    </Window.TaskbarItemInfo>-->
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="Auto"/>
-        </Grid.RowDefinitions>
-
-       
-        <TabControl Grid.Row="0" x:Name="Tabs" >  
-            <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" x:Name="GeneralTab">
-                <TabItem.Header>
-                    <StackPanel>
-                        <Image Source="/PithosPlus;component/Images/General.png" Stretch="Uniform" Height="32"/>
-                        <TextBlock Text="General"/>
-                    </StackPanel>
-                </TabItem.Header>
-                <GroupBox  Height="66" VerticalAlignment="Top" Name="groupBox1" Margin="10,5">
-                    <StackPanel>
-                        <CheckBox Content="Show Desktop Notifications" Height="16" Name="Settings_ShowDesktopNotifications" Margin="5,10,5,0" />
-                        <CheckBox Content="Start on System Startup" Height="16" Name="Settings_StartOnSystemStartup" Margin="5,5,5,0" />
-                    </StackPanel>
-                </GroupBox>
-            </TabItem>
-            <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" x:Name="AccountTab" IsSelected="{Binding AccountTabSelected,Mode=OneWay}">
-                <TabItem.Header>
-                    <StackPanel>
-                        <Image Source="/PithosPlus;component/Images/Accounts.png" Stretch="Uniform" Height="32"/>
-                        <TextBlock Text="Accounts"/>
-                    </StackPanel>
-                </TabItem.Header>
-                <Grid VerticalAlignment="Stretch" >
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
-                    <Grid Margin="5,10,5,5" Column="0" Width="250">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="*"/>
-                            <RowDefinition Height="Auto"/>
-                        </Grid.RowDefinitions>
-                        <ListBox Name="Accounts" Grid.Row="0" VerticalAlignment="Stretch" ItemsSource="{Binding Accounts,Mode=OneWay}" SelectedItem="{Binding CurrentAccount,Mode=TwoWay}" >
-                            <ListBox.ItemTemplate>
-                                <DataTemplate>
-                                    <StackPanel Orientation="Horizontal">
-                                    <Image Visibility="{Binding Converter={StaticResource BoolToVisible}, Path=IsExpired,Mode=OneWay}" Source="/PithosPlus;component/Images/SmallWarning.png" Margin="2,0"/>
-                                        <StackPanel>
-                                    <TextBlock Text="{Binding AccountName}" />
-                                    <TextBlock Text="{Binding ServerUrl}" FontStyle="Italic" FontSize="10" />
-                                        </StackPanel>
-                                    </StackPanel>
-                                </DataTemplate>
-                            </ListBox.ItemTemplate>
-                        </ListBox>
-                        <Grid Grid.Row="1">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="50*"/>
-                                <ColumnDefinition Width="50*"/>
-                            </Grid.ColumnDefinitions>
-                            <Button Name="AddAccount" Grid.Column="0"  Content="Add" ToolTip="Enter account details manually" Style="{StaticResource BorderlessButton}" HorizontalAlignment="Center" Width="100"/>
-                            <Button Name="RemoveAccount" Grid.Column="1"  Content="Remove" Style="{StaticResource BorderlessButton}" HorizontalAlignment="Center" Width="100"/>
-                        </Grid>
-                    </Grid>
-                    <GroupBox Header="Account" Padding="5" Margin="5" Height="231" HorizontalAlignment="Stretch" VerticalAlignment="Top" Grid.Column="1" Visibility="{Binding Path=CurrentAccount, Converter={StaticResource NullToVisible},ConverterParameter='Invert'}"
-                              HorizontalContentAlignment="Center" VerticalContentAlignment="Center">
-                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" TextWrapping="Wrap" >
-                            No account is selected. Please select an account or add a new one.
-                        </TextBlock>    
-                    </GroupBox>
-                    <GroupBox Header="Account" Padding="5" Margin="5,5,5,0" Height="286" HorizontalAlignment="Stretch" VerticalAlignment="Top" Grid.Column="1" Visibility="{Binding Path=CurrentAccount, Converter={StaticResource NullToVisible}}">
-                            <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="91*"/>
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition />
-                            </Grid.RowDefinitions>
-                            <Label Content="Server" Grid.Column="0" Grid.Row="0" Margin="0,5" HorizontalAlignment="Left"/>
-                            <TextBox Name="CurrentAccount_ServerUrl" Grid.Column="1" Grid.Row="0" Margin="5"/>
-                            <Label Content="Account" Grid.Column="0" Grid.Row="1" Margin="0,5" HorizontalAlignment="Left"/>
-                            <TextBox Name="CurrentAccount_AccountName" Grid.Column="1" Grid.Row="1" Margin="5"/>
-                            <Grid Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" >
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="*"/>
-                                    <ColumnDefinition Width="Auto"/>
-                                </Grid.ColumnDefinitions>
-                                <Label Content="API Key" Grid.Column="0"  Margin="0,5" HorizontalAlignment="Left"/>
-                                <TextBox  Name="CurrentAccount_ApiKey" Grid.Column="1" Margin="5" />
-                                <Button Name="RefreshApiKey" Grid.Column="2" Content="Refresh" Margin="5"/>
-                            </Grid>
-                            <Label Content="Folder" Grid.Column="0" Grid.Row="3" Margin="0,5" HorizontalAlignment="Left"/>
-                            <Grid Grid.Row="3" Grid.Column="1" >
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*"/>
-                                    <ColumnDefinition Width="Auto"/>
-                                </Grid.ColumnDefinitions>
-                                <TextBox  Name="CurrentAccount_RootPath" Margin="5" HorizontalAlignment="Stretch" IsReadOnly="True" ToolTip="{Binding CurrentAccount.RootPath}" Height="61" TextWrapping="WrapWithOverflow" />
-                            </Grid>
-                            <CheckBox Name="CurrentAccount_IsActive" Content="Account is Active" Grid.Row="6"  Grid.Column="1"  />
-                            <CheckBox Name="CurrentAccount_SelectiveSyncEnabled" Content="Selective Sync Enabled" Grid.Row="7" Grid.Column="1"/>
-                            <StackPanel Orientation="Horizontal" Grid.Row="8" Grid.Column="1">
-                                <Button Name="SelectiveSyncFolders" Width="100" Style="{StaticResource BorderlessButton}" Content="Selective Sync" />
-                                <Button Name="MoveAccountFolder" Content="Move ..." Width="100" Style="{StaticResource BorderlessButton}" Margin="20,5,5,5" Visibility="Hidden"/>
-                                <Button Name="ClearAccountCache" Content="Clear Cache" Width="100" Style="{StaticResource BorderlessButton}"/>
-                            </StackPanel>
-                        </Grid>
-                        
-                    </GroupBox>
-                    
-                </Grid>
-            </TabItem>
-            <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" x:Name="PluginTab">
-                <TabItem.Header>
-                    <StackPanel>
-                        <Image Source="/PithosPlus;component/Images/Plugins.png" Stretch="Uniform" Height="32"/>
-                        <TextBlock Text="Plugins"/>
-                    </StackPanel>
-                </TabItem.Header>
-                </TabItem>
-            <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" Visibility="Collapsed" x:Name="RateTab">
-                <TabItem.Header>
-                    <StackPanel>
-                        <Image Source="/PithosPlus;component/Images/Bandwidth.png" Stretch="Uniform" Height="32"/>
-                        <TextBlock Text="Bandwidth"/>
-                    </StackPanel>
-                </TabItem.Header>
-                <StackPanel>
-                    <GroupBox Header="Download Rate" Height="100"   Margin="10,5" VerticalAlignment="Top">
-                        <Grid />
-                    </GroupBox>
-                    <GroupBox Header="Upload Rate" Height="100"   Margin="10,5" VerticalAlignment="Top">
-                        <Grid />
-                    </GroupBox>
-                </StackPanel>
-            </TabItem>
-            <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" x:Name="ProxyTab">
-                <TabItem.Header>
-                    <StackPanel>
-                        <Image Source="/PithosPlus;component/Images/Network.png" Stretch="Uniform" Height="32"/>
-                        <TextBlock Text="Proxy"/>
-                    </StackPanel>
-                </TabItem.Header>
-                    <Grid Margin="10,5">
-                        <RadioButton Name="Settings_UseDefaultProxy" Content="Use System Defaults" Margin="5,6,5,0" Height="16" VerticalAlignment="Top"/>
-                    <RadioButton Name="Settings_UseNoProxy" Content="No Proxy" Margin="5,25,5,0" Height="16" VerticalAlignment="Top"/>
-                    <RadioButton Name="Settings_UseManualProxy" Content="Manual" Margin="5,44,5,0" Height="16" VerticalAlignment="Top"/>
-                        <Label Content="Server" Height="28" HorizontalAlignment="Left" Margin="5,63,0,0" Name="label2" VerticalAlignment="Top" />
-                        <TextBox Height="23" HorizontalAlignment="Left" Margin="76,67,0,0" Name="Settings_ProxyServer" VerticalAlignment="Top" Width="162" IsEnabled="{Binding ElementName=Settings_UseManualProxy, Path=IsChecked}"/>
-                        <TextBlock Height="23" HorizontalAlignment="Left" Margin="244,67,0,0" Name="textBlock1" Text=":" VerticalAlignment="Top" />
-                        <TextBox Height="23" HorizontalAlignment="Left" Margin="254,67,0,0" Name="Settings_ProxyPort" VerticalAlignment="Top" Width="65" IsEnabled="{Binding ElementName=Settings_UseManualProxy, Path=IsChecked}"/>
-
-                        <GroupBox Height="109" HorizontalAlignment="Left" Margin="5,96,0,0" Name="groupBox2" VerticalAlignment="Top" Width="373" IsEnabled="{Binding ElementName=Settings_UseManualProxy, Path=IsChecked}">
-                            <GroupBox.Header>
-                                <CheckBox Content="Proxy requires authentication" Height="16" VerticalAlignment="Top" Name="Settings_ProxyAuthentication" />
-                            </GroupBox.Header>
-                            <Grid >
-                            <Grid.RowDefinitions>
-                                <RowDefinition/>
-                                <RowDefinition/>
-                                <RowDefinition/>
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition/>
-                                <ColumnDefinition/>
-                            </Grid.ColumnDefinitions>
-                                <Label Content="Username" Height="28" HorizontalAlignment="Left" Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" />
-                            <Label Content="Password" Height="28" HorizontalAlignment="Left" Grid.Row="1" Grid.Column="0" VerticalAlignment="Top" />
-                            <Label Content="Domain" Height="28" HorizontalAlignment="Left" Grid.Row="2" Grid.Column="0"  VerticalAlignment="Top" />
-                            <TextBox Height="23" HorizontalAlignment="Left" Grid.Row="0" Grid.Column="1" Name="Settings_ProxyUsername" VerticalAlignment="Top" Width="157" IsEnabled="{Binding IsChecked,ElementName=Settings_ProxyAuthentication}"/>
-                            <TextBox Height="23" HorizontalAlignment="Left" Grid.Row="1" Grid.Column="1" Name="Settings_ProxyPassword" VerticalAlignment="Top" Width="157" IsEnabled="{Binding IsChecked,ElementName=Settings_ProxyAuthentication}"/>
-                            <TextBox Height="23" HorizontalAlignment="Left" Grid.Row="2" Grid.Column="1" Name="Settings_ProxyDomain" VerticalAlignment="Top" Width="157" IsEnabled="{Binding IsChecked,ElementName=Settings_ProxyAuthentication}"/>
-                            </Grid>
-                        </GroupBox>
-                    </Grid>
-            </TabItem>
-            <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" x:Name="AdvancedTab">
-                <TabItem.Header>
-                    <StackPanel>
-                        <Image Source="/PithosPlus;component/Images/Advanced.png" Stretch="Uniform" Height="32"/>
-                        <TextBlock Text="Advanced"/>                        
-                    </StackPanel>
-                </TabItem.Header>
-                <WrapPanel Orientation="Vertical">
-                    <GroupBox Header="Settings">
-                        <StackPanel Margin="5">
-                            <TextBlock Text="Polling Interval (Seconds)" Margin="5"/>
-                            <xctk:IntegerUpDown x:Name="Settings_PollingInterval" HorizontalAlignment="Left" Width="100" Margin="5,0" Watermark="Enter seconds" Minimum="1" />                    
-                            <TextBlock Text="Hashing Parallelism" Margin="5"/>
-                            <xctk:IntegerUpDown x:Name="Settings_HashingParallelism" HorizontalAlignment="Left" Width="100" Margin="5,0" Watermark="Enter number of tasks" Minimum="1" />                    
-                            <TextBlock Text="Startup Delay (Minutes)" Margin="5"/>
-                            <xctk:IntegerUpDown x:Name="StartupDelay" HorizontalAlignment="Left" Width="100" Margin="5,0" Watermark="Enter number of tasks" Minimum="0" />
-                        </StackPanel>
-                    </GroupBox>
-                    <GroupBox Header="Logging">
-                        <StackPanel Margin="5">
-                            <CheckBox Content="Debug Logging" Height="16" HorizontalAlignment="Left" Margin="5,10,5,5" Name="DebugLoggingEnabled" VerticalAlignment="Top"/>
-                            <Button x:Name="OpenLogPath" Content="Log Folder" HorizontalAlignment="Left" Margin="5"  Style="{StaticResource BorderlessButton}" />
-                            <Button x:Name="OpenLogConsole" Content="Open Log Console" HorizontalAlignment="Left" Margin="5" Style="{StaticResource BorderlessButton}" Width="Auto" Visibility="Collapsed"/>
-                            <CheckBox Content="Ignore Certificates" Height="16" Foreground="Red" HorizontalAlignment="Left" Margin="5,10,5,5" Name="IgnoreCertificateErrors" VerticalAlignment="Top"/>
-                        </StackPanel>
-                    </GroupBox>
-                    <Button Content="Refresh Overlays" Name="RefreshOverlays" HorizontalAlignment="Left" Margin="5" Style="{StaticResource BorderlessButton}" />
-                </WrapPanel>
-            </TabItem>
-        </TabControl>
-
-        <StackPanel Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Right" Margin="2">
-            <Button Name="SaveChanges" Content="OK" Margin="5,5,10,5" Style="{StaticResource BorderlessButton}"/>
-            <Button Name="RejectChanges" Content="Cancel" Margin="5,5,10,5" Style="{StaticResource BorderlessButton}"/>
-            <Button Name="ApplyChanges" Content="Apply" Style="{StaticResource BorderlessButton}" />
-        </StackPanel>
-    </Grid>
-</Window>
+        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" x:Name="TheView"\r
+        Title="Pithos+ Preferences" Height="436" Width="732" \r
+        WindowStartupLocation="CenterScreen"\r
+        Icon="/PithosPlus;component/Images/PithosTaskbar.png"\r
+        WindowStyle="ToolWindow"        \r
+        ResizeMode="NoResize"\r
+        ShowInTaskbar="True"\r
+        BorderThickness="1"\r
+        Background="White">\r
+        \r
+        <!-- Background="{StaticResource {x:Static SystemColors.ControlBrushKey}}"> -->\r
+    <Window.Resources>\r
+        <ResourceDictionary>\r
+        <ResourceDictionary.MergedDictionaries>\r
+            <ResourceDictionary Source="..\PithosStyles.xaml" />\r
+            </ResourceDictionary.MergedDictionaries>\r
+            <Converters:NullToVisibilityConverter x:Key="NullToVisible" />\r
+            <BooleanToVisibilityConverter x:Key="BoolToVisible" />\r
+        </ResourceDictionary>\r
+    </Window.Resources>\r
+<!--    <Window.TaskbarItemInfo>\r
+        <TaskbarItemInfo Description="{Binding StatusMessage}" >\r
+            <TaskbarItemInfo.ThumbButtonInfos>\r
+                <ThumbButtonInfo>\r
+                    \r
+                </ThumbButtonInfo>\r
+            </TaskbarItemInfo.ThumbButtonInfos>\r
+        </TaskbarItemInfo>\r
+    </Window.TaskbarItemInfo>-->\r
+    <Grid>\r
+        <Grid.RowDefinitions>\r
+            <RowDefinition Height="*"/>\r
+            <RowDefinition Height="Auto"/>\r
+        </Grid.RowDefinitions>\r
+\r
+       \r
+        <TabControl Grid.Row="0" x:Name="Tabs" >  \r
+            <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" x:Name="GeneralTab">\r
+                <TabItem.Header>\r
+                    <StackPanel>\r
+                        <Image Source="/PithosPlus;component/Images/General.png" Stretch="Uniform" Height="32"/>\r
+                        <TextBlock Text="General"/>\r
+                    </StackPanel>\r
+                </TabItem.Header>\r
+                <GroupBox  Height="66" VerticalAlignment="Top" Name="groupBox1" Margin="10,5">\r
+                    <StackPanel>\r
+                        <CheckBox Content="Show Desktop Notifications" Height="16" Name="Settings_ShowDesktopNotifications" Margin="5,10,5,0" />\r
+                        <CheckBox Content="Start on System Startup" Height="16" Name="Settings_StartOnSystemStartup" Margin="5,5,5,0" />\r
+                    </StackPanel>\r
+                </GroupBox>\r
+            </TabItem>\r
+            <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" x:Name="AccountTab" IsSelected="{Binding AccountTabSelected,Mode=OneWay}">\r
+                <TabItem.Header>\r
+                    <StackPanel>\r
+                        <Image Source="/PithosPlus;component/Images/Accounts.png" Stretch="Uniform" Height="32"/>\r
+                        <TextBlock Text="Accounts"/>\r
+                    </StackPanel>\r
+                </TabItem.Header>\r
+                <Grid VerticalAlignment="Stretch" >\r
+                    <Grid.ColumnDefinitions>\r
+                        <ColumnDefinition Width="Auto"/>\r
+                        <ColumnDefinition Width="*"/>\r
+                    </Grid.ColumnDefinitions>\r
+                    <Grid Margin="5,10,5,5" Column="0" Width="250">\r
+                        <Grid.RowDefinitions>\r
+                            <RowDefinition Height="*"/>\r
+                            <RowDefinition Height="Auto"/>\r
+                        </Grid.RowDefinitions>\r
+                        <ListBox Name="Accounts" Grid.Row="0" VerticalAlignment="Stretch" ItemsSource="{Binding Accounts,Mode=OneWay}" SelectedItem="{Binding CurrentAccount,Mode=TwoWay}" >\r
+                            <ListBox.ItemTemplate>\r
+                                <DataTemplate>\r
+                                    <StackPanel Orientation="Horizontal">\r
+                                    <Image Visibility="{Binding Converter={StaticResource BoolToVisible}, Path=IsExpired,Mode=OneWay}" Source="/PithosPlus;component/Images/SmallWarning.png" Margin="2,0"/>\r
+                                        <StackPanel>\r
+                                    <TextBlock Text="{Binding AccountName}" />\r
+                                    <TextBlock Text="{Binding ServerUrl}" FontStyle="Italic" FontSize="10" />\r
+                                        </StackPanel>\r
+                                    </StackPanel>\r
+                                </DataTemplate>\r
+                            </ListBox.ItemTemplate>\r
+                        </ListBox>\r
+                        <Grid Grid.Row="1">\r
+                            <Grid.ColumnDefinitions>\r
+                                <ColumnDefinition Width="50*"/>\r
+                                <ColumnDefinition Width="50*"/>\r
+                            </Grid.ColumnDefinitions>\r
+                            <Button Name="AddAccount" Grid.Column="0"  Content="Add" ToolTip="Enter account details manually" HorizontalAlignment="Center" Width="100"/>\r
+                            <Button Name="RemoveAccount" Grid.Column="1"  Content="Remove" HorizontalAlignment="Center" Width="100"/>\r
+                        </Grid>\r
+                    </Grid>\r
+                    <GroupBox Header="Account" Padding="5" Margin="5" Height="231" HorizontalAlignment="Stretch" VerticalAlignment="Top" Grid.Column="1" Visibility="{Binding Path=CurrentAccount, Converter={StaticResource NullToVisible},ConverterParameter='Invert'}"\r
+                              HorizontalContentAlignment="Center" VerticalContentAlignment="Center">\r
+                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" TextWrapping="Wrap" >\r
+                            No account is selected. Please select an account or add a new one.\r
+                        </TextBlock>    \r
+                    </GroupBox>\r
+                    <GroupBox Header="Account" Padding="5" Margin="5,5,5,0" Height="286" HorizontalAlignment="Stretch" VerticalAlignment="Top" Grid.Column="1" Visibility="{Binding Path=CurrentAccount, Converter={StaticResource NullToVisible}}">\r
+                            <Grid>\r
+                            <Grid.ColumnDefinitions>\r
+                                <ColumnDefinition Width="Auto"/>\r
+                                <ColumnDefinition Width="91*"/>\r
+                            </Grid.ColumnDefinitions>\r
+                            <Grid.RowDefinitions>\r
+                                <RowDefinition Height="Auto"/>\r
+                                <RowDefinition Height="Auto"/>\r
+                                <RowDefinition Height="Auto"/>\r
+                                <RowDefinition Height="Auto"/>\r
+                                <RowDefinition Height="Auto"/>\r
+                                <RowDefinition Height="Auto"/>\r
+                                <RowDefinition Height="Auto"/>\r
+                                <RowDefinition Height="Auto"/>\r
+                                <RowDefinition />\r
+                            </Grid.RowDefinitions>\r
+                            <Label Content="Server" Grid.Column="0" Grid.Row="0" Margin="0,5" HorizontalAlignment="Left"/>\r
+                            <TextBox Name="CurrentAccount_ServerUrl" Grid.Column="1" Grid.Row="0" Margin="5"/>\r
+                            <Label Content="Account" Grid.Column="0" Grid.Row="1" Margin="0,5" HorizontalAlignment="Left"/>\r
+                            <TextBox Name="CurrentAccount_AccountName" Grid.Column="1" Grid.Row="1" Margin="5"/>\r
+                            <Grid Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" >\r
+                                <Grid.ColumnDefinitions>\r
+                                    <ColumnDefinition Width="Auto"/>\r
+                                    <ColumnDefinition Width="*"/>\r
+                                    <ColumnDefinition Width="Auto"/>\r
+                                </Grid.ColumnDefinitions>\r
+                                <Label Content="API Key" Grid.Column="0"  Margin="0,5" HorizontalAlignment="Left"/>\r
+                                <TextBox  Name="CurrentAccount_ApiKey" Grid.Column="1" Margin="5" />\r
+                                <Button Name="RefreshApiKey" Grid.Column="2" Content="Refresh" Margin="5"/>\r
+                            </Grid>\r
+                            <Label Content="Folder" Grid.Column="0" Grid.Row="3" Margin="0,5" HorizontalAlignment="Left"/>\r
+                            <Grid Grid.Row="3" Grid.Column="1" >\r
+                                <Grid.ColumnDefinitions>\r
+                                    <ColumnDefinition Width="*"/>\r
+                                    <ColumnDefinition Width="Auto"/>\r
+                                </Grid.ColumnDefinitions>\r
+                                <TextBox  Name="CurrentAccount_RootPath" Margin="5" HorizontalAlignment="Stretch" IsReadOnly="True" ToolTip="{Binding CurrentAccount.RootPath}" Height="61" TextWrapping="WrapWithOverflow" />\r
+                            </Grid>\r
+                            <CheckBox Name="CurrentAccount_IsActive" Content="Account is Active" Grid.Row="6"  Grid.Column="1"  />\r
+                            <CheckBox Name="CurrentAccount_SelectiveSyncEnabled" Content="Selective Sync Enabled" Grid.Row="7" Grid.Column="1"/>\r
+                            <StackPanel Orientation="Horizontal" Grid.Row="8" Grid.Column="1">\r
+                                <Button Name="SelectiveSyncFolders" Width="100" Height="25" Content="Selective Sync" />\r
+                                <Button Name="MoveAccountFolder" Content="Move ..." Width="100" Margin="20,5,5,5" Height="25" Visibility="Hidden"/>\r
+                                <Button Name="ClearAccountCache" Content="Clear Cache" Width="100" Height="25"/>\r
+                            </StackPanel>\r
+                        </Grid>\r
+                        \r
+                    </GroupBox>\r
+                    \r
+                </Grid>\r
+            </TabItem>\r
+            <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" x:Name="PluginTab">\r
+                <TabItem.Header>\r
+                    <StackPanel>\r
+                        <Image Source="/PithosPlus;component/Images/Plugins.png" Stretch="Uniform" Height="32"/>\r
+                        <TextBlock Text="Plugins"/>\r
+                    </StackPanel>\r
+                </TabItem.Header>\r
+                </TabItem>\r
+            <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" Visibility="Collapsed" x:Name="RateTab">\r
+                <TabItem.Header>\r
+                    <StackPanel>\r
+                        <Image Source="/PithosPlus;component/Images/Bandwidth.png" Stretch="Uniform" Height="32"/>\r
+                        <TextBlock Text="Bandwidth"/>\r
+                    </StackPanel>\r
+                </TabItem.Header>\r
+                <StackPanel>\r
+                    <GroupBox Header="Download Rate" Height="100"   Margin="10,5" VerticalAlignment="Top">\r
+                        <Grid />\r
+                    </GroupBox>\r
+                    <GroupBox Header="Upload Rate" Height="100"   Margin="10,5" VerticalAlignment="Top">\r
+                        <Grid />\r
+                    </GroupBox>\r
+                </StackPanel>\r
+            </TabItem>\r
+            <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" x:Name="ProxyTab">\r
+                <TabItem.Header>\r
+                    <StackPanel>\r
+                        <Image Source="/PithosPlus;component/Images/Network.png" Stretch="Uniform" Height="32"/>\r
+                        <TextBlock Text="Proxy"/>\r
+                    </StackPanel>\r
+                </TabItem.Header>\r
+                    <Grid Margin="10,5">\r
+                        <RadioButton Name="Settings_UseDefaultProxy" Content="Use System Defaults" Margin="5,6,5,0" Height="16" VerticalAlignment="Top"/>\r
+                    <RadioButton Name="Settings_UseNoProxy" Content="No Proxy" Margin="5,25,5,0" Height="16" VerticalAlignment="Top"/>\r
+                    <RadioButton Name="Settings_UseManualProxy" Content="Manual" Margin="5,44,5,0" Height="16" VerticalAlignment="Top"/>\r
+                        <Label Content="Server" Height="28" HorizontalAlignment="Left" Margin="5,63,0,0" Name="label2" VerticalAlignment="Top" />\r
+                        <TextBox Height="23" HorizontalAlignment="Left" Margin="76,67,0,0" Name="Settings_ProxyServer" VerticalAlignment="Top" Width="162" IsEnabled="{Binding ElementName=Settings_UseManualProxy, Path=IsChecked}"/>\r
+                        <TextBlock Height="23" HorizontalAlignment="Left" Margin="244,67,0,0" Name="textBlock1" Text=":" VerticalAlignment="Top" />\r
+                        <TextBox Height="23" HorizontalAlignment="Left" Margin="254,67,0,0" Name="Settings_ProxyPort" VerticalAlignment="Top" Width="65" IsEnabled="{Binding ElementName=Settings_UseManualProxy, Path=IsChecked}"/>\r
+\r
+                        <GroupBox Height="109" HorizontalAlignment="Left" Margin="5,96,0,0" Name="groupBox2" VerticalAlignment="Top" Width="373" IsEnabled="{Binding ElementName=Settings_UseManualProxy, Path=IsChecked}">\r
+                            <GroupBox.Header>\r
+                                <CheckBox Content="Proxy requires authentication" Height="16" VerticalAlignment="Top" Name="Settings_ProxyAuthentication" />\r
+                            </GroupBox.Header>\r
+                            <Grid >\r
+                            <Grid.RowDefinitions>\r
+                                <RowDefinition/>\r
+                                <RowDefinition/>\r
+                                <RowDefinition/>\r
+                            </Grid.RowDefinitions>\r
+                            <Grid.ColumnDefinitions>\r
+                                <ColumnDefinition/>\r
+                                <ColumnDefinition/>\r
+                            </Grid.ColumnDefinitions>\r
+                                <Label Content="Username" Height="28" HorizontalAlignment="Left" Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" />\r
+                            <Label Content="Password" Height="28" HorizontalAlignment="Left" Grid.Row="1" Grid.Column="0" VerticalAlignment="Top" />\r
+                            <Label Content="Domain" Height="28" HorizontalAlignment="Left" Grid.Row="2" Grid.Column="0"  VerticalAlignment="Top" />\r
+                            <TextBox Height="23" HorizontalAlignment="Left" Grid.Row="0" Grid.Column="1" Name="Settings_ProxyUsername" VerticalAlignment="Top" Width="157" IsEnabled="{Binding IsChecked,ElementName=Settings_ProxyAuthentication}"/>\r
+                            <TextBox Height="23" HorizontalAlignment="Left" Grid.Row="1" Grid.Column="1" Name="Settings_ProxyPassword" VerticalAlignment="Top" Width="157" IsEnabled="{Binding IsChecked,ElementName=Settings_ProxyAuthentication}"/>\r
+                            <TextBox Height="23" HorizontalAlignment="Left" Grid.Row="2" Grid.Column="1" Name="Settings_ProxyDomain" VerticalAlignment="Top" Width="157" IsEnabled="{Binding IsChecked,ElementName=Settings_ProxyAuthentication}"/>\r
+                            </Grid>\r
+                        </GroupBox>\r
+                    </Grid>\r
+            </TabItem>\r
+            <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" x:Name="AdvancedTab">\r
+                <TabItem.Header>\r
+                    <StackPanel>\r
+                        <Image Source="/PithosPlus;component/Images/Advanced.png" Stretch="Uniform" Height="32"/>\r
+                        <TextBlock Text="Advanced"/>                        \r
+                    </StackPanel>\r
+                </TabItem.Header>\r
+                <WrapPanel Orientation="Vertical">\r
+                    <GroupBox Header="Settings">\r
+                        <StackPanel Margin="5">\r
+                            <TextBlock Text="Polling Interval (Seconds)" Margin="5"/>\r
+                            <xctk:IntegerUpDown x:Name="Settings_PollingInterval" HorizontalAlignment="Left" Width="100" Margin="5,0" Watermark="Enter seconds" Minimum="1" />                    \r
+                            <TextBlock Text="Hashing Parallelism" Margin="5"/>\r
+                            <xctk:IntegerUpDown x:Name="Settings_HashingParallelism" HorizontalAlignment="Left" Width="100" Margin="5,0" Watermark="Enter number of tasks" Minimum="1" />                    \r
+                            <TextBlock Text="Startup Delay (Minutes)" Margin="5"/>\r
+                            <xctk:IntegerUpDown x:Name="StartupDelay" HorizontalAlignment="Left" Width="100" Margin="5,0" Watermark="Enter number of tasks" Minimum="0" />\r
+                        </StackPanel>\r
+                    </GroupBox>\r
+                    <GroupBox Header="Logging">\r
+                        <StackPanel Margin="5">\r
+                            <CheckBox Content="Debug Logging" Height="16" HorizontalAlignment="Left" Margin="5,10,5,5" Name="DebugLoggingEnabled" VerticalAlignment="Top"/>\r
+                            <Button x:Name="OpenLogPath" Content="Log Folder" HorizontalAlignment="Left" Margin="5"  Height="25" Width="100" />\r
+                            <Button x:Name="OpenLogConsole" Content="Open Log Console" HorizontalAlignment="Left" Margin="5" Height="25" Width="100" Visibility="Collapsed"/>\r
+                            <CheckBox Content="Ignore Certificates" Height="16" Foreground="Red" HorizontalAlignment="Left" Margin="5,10,5,5" Name="IgnoreCertificateErrors" VerticalAlignment="Top"/>\r
+                        </StackPanel>\r
+                    </GroupBox>\r
+                    <Button Content="Refresh Overlays" Name="RefreshOverlays" HorizontalAlignment="Left" Margin="5" Height="25" Width="100" />\r
+                    <GroupBox Header="Warning">\r
+                        <StackPanel Margin="5">\r
+                            <Button x:Name="WipeAccount" Content="Wipe Account" HorizontalAlignment="Left" Margin="5"  Height="25" Width="100" />\r
+                        </StackPanel>\r
+                    </GroupBox>\r
+\r
+                </WrapPanel>\r
+            </TabItem>\r
+        </TabControl>\r
+\r
+        <StackPanel Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Right" Margin="2">\r
+            <Button Name="SaveChanges" Content="OK" Margin="5,5,10,5" Height="25" Width="100" />\r
+            <Button Name="RejectChanges" Content="Cancel" Margin="5,5,10,5" Height="25" Width="100" />\r
+            <Button Name="ApplyChanges" Content="Apply" Height="25" Width="100" />\r
+<!--            <Button Name="ApplyChanges" Content="Apply" Style="{StaticResource BorderlessButton}" /> -->\r
+        </StackPanel>\r
+    </Grid>\r
+</Window>\r

diff --git a/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs b/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
index 5ecba00..75b0449 100644 (file)
--- a/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
+++ b/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
@@ -294,6 +294,13 @@ namespace Pithos.Client.WPF.Preferences
 \r
         }\r
 \r
+        public void WipeAccount()\r
+        {\r
+            var amonitor = Shell.Monitors[CurrentAccount.AccountKey];\r
+\r
+            //amonitor.CloudClient.\r
+        }\r
+\r
     \r
         public void OpenLogPath()\r
         {\r

diff --git a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
index 0308348..b7b7c51 100644 (file)
--- a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
+++ b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
@@ -94,4 +94,4 @@ using System.Windows;
 // by using the '*' as shown below:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
 [assembly: AssemblyInformationalVersion("2012-07-06")]\r
-[assembly: AssemblyVersion("0.8.20915.38")]\r
+[assembly: AssemblyVersion("0.8.20922.41")]\r

diff --git a/trunk/Pithos.Core/Agents/StatusAgent.cs b/trunk/Pithos.Core/Agents/StatusAgent.cs
index 16360ad..94eb0e1 100644 (file)
--- a/trunk/Pithos.Core/Agents/StatusAgent.cs
+++ b/trunk/Pithos.Core/Agents/StatusAgent.cs
@@ -606,6 +606,7 @@ namespace Pithos.Core.Agents
                     }\r
                     session.Flush();\r
                     tx.Commit();\r
+                    Log.ErrorFormat("DebugDB [{0}]:[{1}]\r\n{2}", path, objectInfo.UUID, objectInfo.X_Object_Hash);\r
                 }\r
             }\r
             catch (Exception exc)\r

diff --git a/trunk/Pithos.Installer/PithosPlus.iss b/trunk/Pithos.Installer/PithosPlus.iss
index da26a29..0045ae2 100644 (file)
--- a/trunk/Pithos.Installer/PithosPlus.iss
+++ b/trunk/Pithos.Installer/PithosPlus.iss
@@ -105,12 +105,25 @@ Source: "..\Pithos.Client.WPF\bin\Debug\Pithos.Core.dll"; DestDir: "{app}"; Flag
 Source: "..\Pithos.Client.WPF\bin\Debug\Pithos.Interfaces.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek\r
 Source: "..\Pithos.Client.WPF\bin\Debug\Pithos.Network.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek\r
 \r
-Source: "..\Pithos.Client.WPF\x86\SQLite.Interop.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek\r
-Source: "..\Pithos.Client.WPF\bin\Debug\System.Data.SQLite.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek\r
+Source: "..\Pithos.Client.WPF\bin\Debug\System.Data.SqlServerCe.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek\r
+Source: "..\Pithos.Client.WPF\bin\Debug\x86\sqlceca40.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek\r
+Source: "..\Pithos.Client.WPF\bin\Debug\x86\sqlcecompact40.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek\r
+Source: "..\Pithos.Client.WPF\bin\Debug\x86\sqlceer40EN.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek\r
+Source: "..\Pithos.Client.WPF\bin\Debug\x86\sqlceme40.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek\r
+Source: "..\Pithos.Client.WPF\bin\Debug\x86\sqlceqp40.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek\r
+Source: "..\Pithos.Client.WPF\bin\Debug\x86\sqlcese40.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek\r
+\r
+Source: "..\Pithos.Client.WPF\bin\Debug\x86\Microsoft.VC90.CRT\msvcr90.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek\r
+\r
+;Source: "..\Pithos.Client.WPF\x86\SQLite.Interop.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek\r
+;Source: "..\Pithos.Client.WPF\bin\Debug\System.Data.SQLite.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek\r
 \r
 Source: "..\Pithos.Client.WPF\bin\Debug\System.Threading.Tasks.Dataflow.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek\r
 Source: "..\Pithos.Client.WPF\bin\Debug\System.Windows.Interactivity.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek\r
 Source: "..\Pithos.Client.WPF\bin\Debug\WPFToolkit.Extended.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek\r
+\r
+Source: "..\Pithos.Client.WPF\bin\Debug\System.Net.Http.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek\r
+Source: "..\Pithos.Client.WPF\bin\Debug\System.Net.Http.xml"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek\r
 ; Tortoise\r
 Source: "TortoiseOverlays\License.txt"; DestDir: "{cf}/\TortoiseOverlays"; Flags: ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek\r
 Source: "TortoiseOverlays\x86\TortoiseOverlays.dll"; DestDir: "{cf}/\TortoiseOverlays"; Flags: restartreplace; Components: RequiredFiles; Languages: english french german spanish greek; Check: not Is64BitInstallMode\r

diff --git a/trunk/Pithos.Network/CloudFilesClient.cs b/trunk/Pithos.Network/CloudFilesClient.cs
index 22aeb0a..867a145 100644 (file)
--- a/trunk/Pithos.Network/CloudFilesClient.cs
+++ b/trunk/Pithos.Network/CloudFilesClient.cs
@@ -1308,6 +1308,18 @@ namespace Pithos.Network
 */\r
         }\r
 \r
+        public void WipeContainer(string account, Uri container)\r
+        {\r
+            if (container == null)\r
+                throw new ArgumentNullException("container", "The container property can't be empty");\r
+            if (container.IsAbsoluteUri)\r
+                throw new ArgumentException("The container must be relative", "container");\r
+            Contract.EndContractBlock();\r
+\r
+            DeleteContainer(account, new Uri(String.Format("{0}&delimiter=//", container), UriKind.Relative));\r
+        }\r
+\r
+\r
         public void DeleteContainer(string account, Uri container)\r
         {\r
             if (container == null)\r