From dd0f9366396d8e01262da2e93a65569d6bbcad47 Mon Sep 17 00:00:00 2001
From: George Pantazis <gpant@noc.grnet.gr>
Date: Thu, 29 Mar 2012 19:56:53 +0300
Subject: [PATCH] Fixed container path edit in user profile. Fixed small issue
 in installer.

Signed-off-by: George Pantazis <gpant@noc.grnet.gr>
---
 trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml |   10 ++++------
 trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs       |    4 ++--
 trunk/Pithos.Installer/PithosPlus.iss                    |    3 ++-
 trunk/Pithos.Installer/PithosPlus.~is                    |    2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
index 9a25b3d..8f15947 100644
--- a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
+++ b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
@@ -124,13 +124,11 @@
                                     <ColumnDefinition Width="*"/>
                                     <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
-                                <TextBox  Name="CurrentAccount_RootPath" Margin="5" HorizontalAlignment="Stretch" Grid.Column="0" IsReadOnly="True" ToolTip="{Binding CurrentAccount.RootPath}"/>                                    
-                                
-                                <Button Name="MoveAccountFolder" Content="Move ..." Width="60" Height="30" Grid.Column="1" />
+                                <TextBox  Name="CurrentAccount_RootPath" Margin="1,5,5,-30" HorizontalAlignment="Stretch" IsReadOnly="True" ToolTip="{Binding CurrentAccount.RootPath}" Height="61" TextWrapping="WrapWithOverflow" />
                             </Grid>
-                            <CheckBox Name="CurrentAccount_IsActive" Content="Account is Active" Grid.Column="1" Grid.Row="4" Margin="5"/>
-                            <Button Name="SelectiveSyncFolders" Content="Selective Sync" Width="Auto" HorizontalAlignment="Left" Style="{StaticResource ButtonStyle}" Grid.Column="1" Grid.Row="6"/>
-                            
+                            <CheckBox Name="CurrentAccount_IsActive" Content="Account is Active" Grid.Row="6" Margin="6,66,126,6" Grid.ColumnSpan="2" />
+                            <Button Name="SelectiveSyncFolders" Content="Selective Sync" Width="Auto" HorizontalAlignment="Right" Style="{StaticResource ButtonStyle}" Grid.Row="6" Margin="0,40,18,24" Grid.Column="1" />
+                            <Button Name="MoveAccountFolder" Content="Move ..." Margin="6,40,126,24" Grid.Row="6" Grid.Column="1" />
                         </Grid>
                         
                     </GroupBox>
diff --git a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
index 8dbceac..9f6513f 100644
--- a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
+++ b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
@@ -93,5 +93,5 @@ using System.Windows;
 // 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("0.7.20317.0")]
-[assembly: AssemblyFileVersionAttribute("0.7.20317.0")]
+[assembly: AssemblyVersion("0.7.20318.0")]
+[assembly: AssemblyFileVersionAttribute("0.7.20318.0")]
diff --git a/trunk/Pithos.Installer/PithosPlus.iss b/trunk/Pithos.Installer/PithosPlus.iss
index 8b89b43..b86bd3f 100644
--- a/trunk/Pithos.Installer/PithosPlus.iss
+++ b/trunk/Pithos.Installer/PithosPlus.iss
@@ -43,6 +43,7 @@ AppReadmeFile=My Readme
 UninstallDisplayIcon={app}\PithosPlus.exe
 WizardImageFile=Images\ppWZDImage.bmp
 WizardSmallImageFile=Images\pithos_logo-square-icon-35.bmp
+WizardImageBackColor=$FFFFFF
 VersionInfoVersion={#MyAppVersion}
 MinVersion=0,5.01sp3
 ArchitecturesInstallIn64BitMode=x64
@@ -565,7 +566,7 @@ function ShouldSkipPage(CurPage: Integer): Boolean;
     end;
     
 [Run]
-;Kill Running Task
+;Kill Running Task from older versions
 Filename: cmd; parameters: /c taskkill /f /im pithos.exe; Flags: runhidden
 Filename: cmd; parameters: /c taskkill /f /im pithos.client.WPF.exe; Flags: runhidden
 ;Launch Redist
diff --git a/trunk/Pithos.Installer/PithosPlus.~is b/trunk/Pithos.Installer/PithosPlus.~is
index eb1779c..e7e72d3 100644
--- a/trunk/Pithos.Installer/PithosPlus.~is
+++ b/trunk/Pithos.Installer/PithosPlus.~is
@@ -565,7 +565,7 @@ function ShouldSkipPage(CurPage: Integer): Boolean;
     end;
     
 [Run]
-;Kill Running Task
+;Kill Running Task from older versions
 Filename: cmd; parameters: /c taskkill /f /im pithos.exe; Flags: runhidden
 Filename: cmd; parameters: /c taskkill /f /im pithos.client.WPF.exe; Flags: runhidden
 ;Launch Redist
-- 
1.7.10.4