Restructured views

[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 95c5070..ea5d683 100644 (file)
--- a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
+++ b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
@@ -1,14 +1,14 @@
 <Window x:Class="Pithos.Client.WPF.PreferencesView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:tb="clr-namespace:Hardcodet.Wpf.TaskbarNotification;assembly=Hardcodet.Wpf.TaskbarNotification"
-        xmlns:cal="http://www.caliburnproject.org" 
-        x:Name="TheView"
+        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" x:Name="TheView"
         Title="Pithos Preferences" Height="381" Width="600" 
         ShowInTaskbar="true"
         WindowStartupLocation="CenterScreen"
         Icon="/Pithos.Client.WPF;component/Images/Tray.ico"
-        Background="#FFD4D0C8">
+        Background="{StaticResource {x:Static SystemColors.ControlBrushKey}}">
+        
     <Window.Resources>
         <ResourceDictionary>
         <ResourceDictionary.MergedDictionaries>
@@ -72,9 +72,21 @@
                             </ListBox.ItemTemplate>
                         </ListBox>
                         <StackPanel Orientation="Horizontal" Grid.Row="1">
-                            <Button Name="AddPithosAccount" Content="Add Pithos" Style="{StaticResource ButtonStyle}" Width="70"/>
-                            <Button Name="AddAccount" Content="Add Manual" Style="{StaticResource ButtonStyle}" Width="70"/>
-                            <Button Name="RemoveAccount" Content="Remove" Style="{StaticResource ButtonStyle}" Width="50"/>                            
+                            <extToolkit:DropDownButton Content="Add" Height="25" Width="75">
+                                <extToolkit:DropDownButton.DropDownContent>
+                                    <Menu>
+                                        <Menu.ItemsPanel>                                            
+                                                <ItemsPanelTemplate>
+                                                    <VirtualizingStackPanel Orientation="Vertical"/>
+                                                </ItemsPanelTemplate>                                            
+                                        </Menu.ItemsPanel>
+
+                                        <MenuItem Name="AddPithosAccount" Header="From Pithos" ToolTip="Go to Pithos site to login and retrieve the authentication token" cal:Message.Attach="AddPithosAccount"/>
+                                        <MenuItem Name="AddAccount" Header="Manually" ToolTip="Enter account details manually" cal:Message.Attach="AddAccount"/>
+                                    </Menu>
+                                </extToolkit:DropDownButton.DropDownContent>
+                            </extToolkit:DropDownButton>
+                            <Button Name="RemoveAccount" Content="Remove" Style="{StaticResource ButtonStyle}" Width="75"/>                            
                         </StackPanel>
                     </Grid>
                     <GroupBox Header="Account" Padding="5" Margin="5" Height="231" HorizontalAlignment="Stretch" VerticalAlignment="Top" Grid.Column="1">