X-Git-Url: https://code.grnet.gr/git/pithos-ms-client/blobdiff_plain/759bd3c4ac30f60c4af5dcadf0ed4dded58f9535..5b2e4db44ee763804b13cb1bfcb543f787648a61:/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml?ds=sidebyside

diff --git a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
index a88a868..01031ff 100644
--- a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
+++ b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
@@ -1,22 +1,25 @@
 <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"
-        Title="Pithos Preferences" Height="436" Width="600" 
-        ShowInTaskbar="true"
+        xmlns:Converters="clr-namespace:Pithos.Client.WPF.Converters"
+        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" x:Name="TheView"
+        Title="Pithos+ Preferences" Height="436" Width="732" 
         WindowStartupLocation="CenterScreen"
-        Icon="/Pithos.Client.WPF;component/Images/PithosTaskbar.png"
-        Background="{StaticResource {x:Static SystemColors.ControlBrushKey}}">
+        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>
@@ -35,11 +38,11 @@
         </Grid.RowDefinitions>
 
        
-        <TabControl Grid.Row="0">  
-            <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+        <TabControl Grid.Row="0" x:Name="Tabs" >  
+            <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" x:Name="GeneralTab">
                 <TabItem.Header>
                     <StackPanel>
-                        <Image Source="/Pithos.Client.WPF;component/Images/General.png" Stretch="Uniform" Height="32"/>
+                        <Image Source="/PithosPlus;component/Images/General.png" Stretch="Uniform" Height="32"/>
                         <TextBlock Text="General"/>
                     </StackPanel>
                 </TabItem.Header>
@@ -50,10 +53,10 @@
                     </StackPanel>
                 </GroupBox>
             </TabItem>
-            <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+            <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" x:Name="AccountTab" IsSelected="{Binding AccountTabSelected,Mode=OneWay}">
                 <TabItem.Header>
                     <StackPanel>
-                        <Image Source="/Pithos.Client.WPF;component/Images/Accounts.png" Stretch="Uniform" Height="32"/>
+                        <Image Source="/PithosPlus;component/Images/Accounts.png" Stretch="Uniform" Height="32"/>
                         <TextBlock Text="Accounts"/>
                     </StackPanel>
                 </TabItem.Header>
@@ -70,14 +73,24 @@
                         <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>
-                        <StackPanel Orientation="Horizontal" Grid.Row="1">
-                            <Button Name="AddAccount" Content="Add " ToolTip="Enter account details manually" Style="{StaticResource ButtonStyle}" Width="75"/>
-                            <Button Name="RemoveAccount" Content="Remove" Style="{StaticResource ButtonStyle}" Width="75"/>                            
-                        </StackPanel>
+                        <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">
@@ -85,7 +98,7 @@
                             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="266" HorizontalAlignment="Stretch" VerticalAlignment="Top" Grid.Column="1" Visibility="{Binding Path=CurrentAccount, Converter={StaticResource NullToVisible}}">
+                    <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"/>
@@ -98,36 +111,57 @@
                                 <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"/>
-                            <Label Content="API Key" Grid.Column="0" Grid.Row="2" Margin="0,5" HorizontalAlignment="Left"/>
-                            <TextBox  Name="CurrentAccount_ApiKey" Grid.Column="1" Grid.Row="2" 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" Grid.Column="0"/>
-                                <Button Name="MoveAccountFolder" Content="Move ..." Width="60" Height="30" Grid.Column="1" />
+                                <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.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"  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" Visibility="Collapsed">
+            <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="/Pithos.Client.WPF;component/Images/Bandwidth.png" Stretch="Uniform" Height="32"/>
+                        <Image Source="/PithosPlus;component/Images/Bandwidth.png" Stretch="Uniform" Height="32"/>
                         <TextBlock Text="Bandwidth"/>
                     </StackPanel>
                 </TabItem.Header>
@@ -140,10 +174,10 @@
                     </GroupBox>
                 </StackPanel>
             </TabItem>
-            <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+            <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" x:Name="ProxyTab">
                 <TabItem.Header>
                     <StackPanel>
-                        <Image Source="/Pithos.Client.WPF;component/Images/Network.png" Stretch="Uniform" Height="32"/>
+                        <Image Source="/PithosPlus;component/Images/Network.png" Stretch="Uniform" Height="32"/>
                         <TextBlock Text="Proxy"/>
                     </StackPanel>
                 </TabItem.Header>
@@ -180,30 +214,41 @@
                         </GroupBox>
                     </Grid>
             </TabItem>
-            <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+            <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" x:Name="AdvancedTab">
                 <TabItem.Header>
                     <StackPanel>
-                        <Image Source="/Pithos.Client.WPF;component/Images/Advanced.png" Stretch="Uniform" Height="32"/>
+                        <Image Source="/PithosPlus;component/Images/Advanced.png" Stretch="Uniform" Height="32"/>
                         <TextBlock Text="Advanced"/>                        
                     </StackPanel>
                 </TabItem.Header>
-                <StackPanel>
-                    <CheckBox Content="Activate Shell Extensions" Height="16" HorizontalAlignment="Left" Margin="5" Name="ExtensionsActivated" VerticalAlignment="Top" />
-                    <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="10" />                    
-                    <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" />                    
-                </StackPanel>
+                <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">
-            <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>