Fixed blocking issue

[pithos-ms-client] / trunk / Pithos.Client.WPF / Preferences / PreferencesView.xaml

diff --git a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
index 87295d8..01031ff 100644 (file)
--- a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
+++ b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
@@ -1,10 +1,8 @@
 <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"
-        xmlns:Converters="clr-namespace:Pithos.Client.WPF.Converters" 
-        x:Name="TheView"
+        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"
@@ -90,8 +88,8 @@
                                 <ColumnDefinition Width="50*"/>
                                 <ColumnDefinition Width="50*"/>
                             </Grid.ColumnDefinitions>
-                            <Button Name="AddAccount" Grid.Column="0"  Content="Add" ToolTip="Enter account details manually" Style="{StaticResource ButtonStyle}" HorizontalAlignment="Center" Margin="5,10,40,10" Width="75"/>
-                            <Button Name="RemoveAccount" Grid.Column="1"  Content="Remove" Style="{StaticResource ButtonStyle}" HorizontalAlignment="Center" Margin="5,10,-25,10" Width="75"/>
+                            <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'}"
@@ -142,9 +140,9 @@
                             <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 ButtonStyle}" Content="Selective Sync" />
-                                <Button Name="MoveAccountFolder" Content="Move ..." Width="100" Style="{StaticResource ButtonStyle}" Margin="20,5,5,5" Visibility="Hidden"/>
-                                <Button Name="ClearAccountCache" Content="Clear Cache" Width="100" Style="{StaticResource ButtonStyle}"/>
+                                <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>
                         
@@ -224,29 +222,33 @@
                     </StackPanel>
                 </TabItem.Header>
                 <WrapPanel Orientation="Vertical">
-                    <Button Content="Refresh Overlays" Name="RefreshOverlays" HorizontalAlignment="Left" Margin="5" Style="{StaticResource ButtonStyle}" Width="Auto" />
-                    <TextBlock Text="Polling Interval (secs)" Margin="5"/>
-                    <extToolkit:IntegerUpDown x:Name="Settings_PollingInterval" HorizontalAlignment="Left" Width="100" Margin="5,0" Watermark="Enter seconds" Minimum="1" />                    
-                    <TextBlock Text="Hashing Parallelism" Margin="5"/>
-                    <extToolkit: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"/>
-                    <extToolkit:IntegerUpDown x:Name="StartupDelay" HorizontalAlignment="Left" Width="100" Margin="5,0" Watermark="Enter number of tasks" Minimum="0" />
+                    <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="Enable Debug Logging" Height="16" HorizontalAlignment="Left" Margin="5,10,5,5" Name="DebugLoggingEnabled" VerticalAlignment="Top"/>
-                        <Button x:Name="OpenLogPath" Content="Open Log Path" HorizontalAlignment="Left" Margin="5" Style="{StaticResource ButtonStyle}" Width="Auto"/>
-                        <Button x:Name="OpenLogConsole" Content="Open Log Console" HorizontalAlignment="Left" Margin="5" Style="{StaticResource ButtonStyle}" Width="Auto" Visibility="Collapsed"/>
-                        <CheckBox Content="Ignore Certificate Errors" Height="16" HorizontalAlignment="Left" Margin="5,10,5,5" Name="IgnoreCertificateErrors" VerticalAlignment="Top"/>
+                            <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">
-            <Button Name="SaveChanges" Content="OK" Margin="5,5,10,5" Style="{StaticResource ButtonStyle}"/>
-            <Button Name="RejectChanges" Content="Cancel" Margin="5,5,10,5" Style="{StaticResource ButtonStyle}"/>
-            <Button Name="ApplyChanges" Content="Apply" Style="{StaticResource ButtonStyle}" />
+        <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>