Null Fix for long file names.

OFM added
new msg for OFM action in taksbar

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

diff --git a/trunk/CommonAssemblyVersion.cs b/trunk/CommonAssemblyVersion.cs
index a0be5e1..52e3417 100644 (file)
--- a/trunk/CommonAssemblyVersion.cs
+++ b/trunk/CommonAssemblyVersion.cs
@@ -46,7 +46,7 @@ using System.Reflection;
 // associated with an assembly.
 [assembly: AssemblyCompany("GRNET")]
 [assembly: AssemblyCopyright("Copyright © GRNet 2011-2013")]
-[assembly: AssemblyInformationalVersion("2012-11-28")]
+[assembly: AssemblyInformationalVersion("2012-12-02")]
 
 
 
@@ -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.21128.92")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.8.21202.94")]
\ No newline at end of file

diff --git a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
index b2c8c46..c9e7524 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.21128.92")]\r
+[assembly: AssemblyVersion("0.8.21202.94")]\r

diff --git a/trunk/Pithos.Client.WPF/Shell/ShellView.xaml b/trunk/Pithos.Client.WPF/Shell/ShellView.xaml
index c8c2a82..3cb7c46 100644 (file)
--- a/trunk/Pithos.Client.WPF/Shell/ShellView.xaml
+++ b/trunk/Pithos.Client.WPF/Shell/ShellView.xaml
@@ -78,6 +78,7 @@
                             </DataTemplate>
                         </MenuItem.ItemTemplate>
                     </MenuItem>
+                    <MenuItem Header="OFM" x:Name="OFM" cal:Message.Attach="openOFM"></MenuItem>
                     <MenuItem Header="Sync Now" x:Name="SynchNow" cal:Message.Attach="SynchNow" Visibility="{Binding Path=HasAccounts, Converter={StaticResource BooleanToVisible}}">
                         <MenuItem.Icon>
                           <Image Source="/PithosPlus;component/Images/synching2.png" />

diff --git a/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs b/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
index efd6a6f..c87cf3f 100644 (file)
--- a/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
+++ b/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
@@ -71,6 +71,7 @@ using System.Linq;
 using Pithos.Network;\r
 using StatusService = Pithos.Client.WPF.Services.StatusService;\r
 \r
+\r
 namespace Pithos.Client.WPF {\r
        using System.ComponentModel.Composition;\r
 \r
@@ -231,6 +232,11 @@ namespace Pithos.Client.WPF {
                VersionMessage = String.Format("Pithos+ {0}", fileVersion.FileVersion);\r
            }\r
 \r
+        public void openOFM()\r
+        {\r
+            \r
+        }\r
+\r
         public void CurrentSyncStatus()\r
         {\r
             if (Accounts.Count == 0)\r

diff --git a/trunk/Pithos.Core/Agents/TupleBuilder.cs b/trunk/Pithos.Core/Agents/TupleBuilder.cs
index 739d6d0..88bb9a0 100644 (file)
--- a/trunk/Pithos.Core/Agents/TupleBuilder.cs
+++ b/trunk/Pithos.Core/Agents/TupleBuilder.cs
@@ -68,11 +68,11 @@ namespace Pithos.Core.Agents
 \r
             var brokenTuples =( from tuple in tuples\r
                                where tuple.FileState != null && tuple.FileState.Checksum == null\r
-                                    && tuple.ObjectInfo != null && (tuple.FileInfo == null || !tuple.FileInfo.Exists)\r
+                                    && tuple.ObjectInfo != null && (tuple.FileInfo == null || !tuple.FileInfo.Exists) \r
                                select tuple).ToList();\r
 \r
 \r
-            var actualTuples = tuples.Except(brokenTuples).Where(tuple=>tuple.FileState ==null || tuple.FileState.FileStatus!=FileStatus.Conflict).ToList();\r
+            var actualTuples = tuples.Except(brokenTuples).Where(tuple => tuple.FileState == null || tuple.FileState.FileStatus != FileStatus.Conflict && tuple.FileState.FilePath.Length < 260).ToList();\r
             Debug.Assert(actualTuples.All(t => t.HashesValid()));\r
 \r
             foreach (var tuple in brokenTuples)\r

diff --git a/trunk/Pithos.Installer/PithosPlusRel.iss b/trunk/Pithos.Installer/PithosPlusRel.iss
index 6b4950a..ed1210f 100644 (file)
--- a/trunk/Pithos.Installer/PithosPlusRel.iss
+++ b/trunk/Pithos.Installer/PithosPlusRel.iss
@@ -463,7 +463,7 @@ begin
 
   //Remove Old Database
   DeleteFile(ExpandConstant('{localappdata}')+'\GRNET\PITHOS\pithos.db');
-  if '{AppVersion}' = '0.8.21128.93' Then DeleteFile(ExpandConstant('{localappdata}')+'\GRNET\PITHOS\pithos.sdf');
+  if '{AppVersion}' = '0.8.21128.94' Then DeleteFile(ExpandConstant('{localappdata}')+'\GRNET\PITHOS\pithos.sdf');
 end;
 
 procedure DeinitializeSetup();

diff --git a/trunk/Pithos.OFM/GUI/OFM.xaml b/trunk/Pithos.OFM/GUI/OFM.xaml
index 8896e97..8517feb 100644 (file)
--- a/trunk/Pithos.OFM/GUI/OFM.xaml
+++ b/trunk/Pithos.OFM/GUI/OFM.xaml
@@ -8,10 +8,21 @@
     Width="640" Height="480">
 
     <Grid x:Name="OFMLayout">
-        <r:Ribbon Title="Pithos+ OFM" x:Name="ribbon" >
+        <Grid.RowDefinitions>
+            <RowDefinition Height="140"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*"></ColumnDefinition>
+            <ColumnDefinition Width="50"></ColumnDefinition>
+            <ColumnDefinition Width="*"></ColumnDefinition>
+        </Grid.ColumnDefinitions>
+        <r:Ribbon Grid.Row="0" Grid.ColumnSpan="3" Title="Pithos+ OFM" x:Name="ribbon" >
             <r:RibbonTab Header="File"/>
             <r:RibbonTab Header="Sync"/>
             <r:RibbonTab Header="Accounts"/>
         </r:Ribbon>
+        <ListBox Name="OriginPanel" Grid.Row="1" Grid.Column="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"></ListBox>
+        <ListBox Name="TargetPanel" Grid.Row="1" Grid.Column="2" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" ></ListBox>
     </Grid>
 </r:RibbonWindow>
\ No newline at end of file