"Other" tab in File options was removed. Closes #1930

Proxy settings set to UseDefaultProxy. Added Check in App.xaml.cs to reset the proxy to UseDefaultProxy if the ProxyServer setting is empty when ManualProxy is set. Closes #1929

diff --git a/trunk/Pithos.Client.WPF/App.xaml.cs b/trunk/Pithos.Client.WPF/App.xaml.cs
index 311149f..e69006c 100644 (file)
--- a/trunk/Pithos.Client.WPF/App.xaml.cs
+++ b/trunk/Pithos.Client.WPF/App.xaml.cs
@@ -32,6 +32,13 @@ namespace Pithos.Client.WPF
             AppDomain.CurrentDomain.UnhandledException += OnUnhandledException;
             TaskScheduler.UnobservedTaskException += OnUnobservedException;
 
+            //Fix incorrect proxy settings by switching to default proxy, if the proxy server settings is empty
+            if (Settings.Default.UseManualProxy && String.IsNullOrWhiteSpace(Settings.Default.ProxyServer))
+            {
+                Settings.Default.UseManualProxy = false;
+                Settings.Default.UseDefaultProxy = true;
+            }
+
             InitializeComponent();            
         }
 

diff --git a/trunk/Pithos.Client.WPF/FileProperties/FilePropertiesView.xaml b/trunk/Pithos.Client.WPF/FileProperties/FilePropertiesView.xaml
index d1d6b4e..a4a975c 100644 (file)
--- a/trunk/Pithos.Client.WPF/FileProperties/FilePropertiesView.xaml
+++ b/trunk/Pithos.Client.WPF/FileProperties/FilePropertiesView.xaml
@@ -118,7 +118,7 @@
                         </DataGrid>
                     </StackPanel>
                 </TabItem>
-                <TabItem Header="Other">
+                <!--<TabItem Header="Other">
                     <Grid>
                         <Grid.Resources>
                             <Style x:Key="NameColumnStyle" TargetType="TextBlock">
@@ -147,7 +147,7 @@
                         <TextBox x:Name="ContentDisposition" Grid.Row="1" Grid.Column="1" Style="{StaticResource ResourceKey=ValueColumnStyle}"/>
                         <TextBox x:Name="Manifest" Grid.Row="2" Grid.Column="1" Style="{StaticResource ResourceKey=ValueColumnStyle}"/>
                     </Grid>
-                </TabItem>
+                </TabItem>-->
             </TabControl>
             <StackPanel Orientation="Horizontal" Grid.Row="2" HorizontalAlignment="Right">
                 <Button Name="SaveChanges" Content="OK" Margin="5,5,10,5" Style="{StaticResource ButtonStyle}" IsDefault="False" />

diff --git a/trunk/Pithos.Client.WPF/Properties/Settings.Designer.cs b/trunk/Pithos.Client.WPF/Properties/Settings.Designer.cs
index 20a6dc5..d354094 100644 (file)
--- a/trunk/Pithos.Client.WPF/Properties/Settings.Designer.cs
+++ b/trunk/Pithos.Client.WPF/Properties/Settings.Designer.cs
@@ -181,7 +181,7 @@ namespace Pithos.Client.WPF.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
         public bool UseDefaultProxy {
             get {
                 return ((bool)(this["UseDefaultProxy"]));
@@ -193,7 +193,7 @@ namespace Pithos.Client.WPF.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
         public bool UseManualProxy {
             get {
                 return ((bool)(this["UseManualProxy"]));

diff --git a/trunk/Pithos.Client.WPF/Properties/Settings.settings b/trunk/Pithos.Client.WPF/Properties/Settings.settings
index 7a69659..a466a69 100644 (file)
--- a/trunk/Pithos.Client.WPF/Properties/Settings.settings
+++ b/trunk/Pithos.Client.WPF/Properties/Settings.settings
@@ -42,10 +42,10 @@
       <Value Profile="(Default)">False</Value>
     </Setting>
     <Setting Name="UseDefaultProxy" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
+      <Value Profile="(Default)">True</Value>
     </Setting>
     <Setting Name="UseManualProxy" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">True</Value>
+      <Value Profile="(Default)">False</Value>
     </Setting>
     <Setting Name="CloudfilesAuthenticationUrl" Type="System.String" Scope="Application">
       <Value Profile="(Default)">https://auth.api.rackspacecloud.com</Value>

diff --git a/trunk/Pithos.Client.WPF/app.config b/trunk/Pithos.Client.WPF/app.config
index 707287d..93124a0 100644 (file)
--- a/trunk/Pithos.Client.WPF/app.config
+++ b/trunk/Pithos.Client.WPF/app.config
@@ -67,10 +67,10 @@
         <value>False</value>
       </setting>
       <setting name="UseDefaultProxy" serializeAs="String">
-        <value>False</value>
+        <value>True</value>
       </setting>
       <setting name="UseManualProxy" serializeAs="String">
-        <value>True</value>
+        <value>False</value>
       </setting>
       <setting name="MustUpgrade" serializeAs="String">
         <value>True</value>

diff --git a/trunk/Pithos.Core/Agents/NetworkAgent.cs b/trunk/Pithos.Core/Agents/NetworkAgent.cs
index 9b2f301..0cf449e 100644 (file)
--- a/trunk/Pithos.Core/Agents/NetworkAgent.cs
+++ b/trunk/Pithos.Core/Agents/NetworkAgent.cs
@@ -628,7 +628,9 @@ namespace Pithos.Core.Agents
             Contract.EndContractBlock();
 
             if (_firstPoll) return;
-
+            //TODO: Do I need the "Modified" check if I'm not going to delete files that
+            //were not found on the server on the first run?
+            //TODO: Files that were not found on the server on the first run should be marked IN CONFLICT
             var deleteCandidates = from state in FileState.Queryable
                                    where state.Modified <= pollTime && state.FilePath.StartsWith(accountInfo.AccountPath)
                                    select state;