X-Git-Url: https://code.grnet.gr/git/pithos-ms-client/blobdiff_plain/70f12b3611056705c730a21b2495a30765f0de05..8dcf435dc1d3ade30585e5ae9aa4b41d6925d8f6:/trunk/Pithos.Client.WPF/Shell/ShellView.xaml

diff --git a/trunk/Pithos.Client.WPF/Shell/ShellView.xaml b/trunk/Pithos.Client.WPF/Shell/ShellView.xaml
index 0ea3bb1..0eeddeb 100644
--- a/trunk/Pithos.Client.WPF/Shell/ShellView.xaml
+++ b/trunk/Pithos.Client.WPF/Shell/ShellView.xaml
@@ -5,7 +5,7 @@
         xmlns:cal="http://www.caliburnproject.org"
         x:Name="TheView" WindowStartupLocation="CenterScreen" WindowStyle="None"
         Visibility="Collapsed"
-        Width="700" Height="200" SizeToContent="Width" WindowState="Minimized" Icon="/Pithos.Client.WPF;component/Images/PithosTaskbar.png">
+        Width="0" Height="0" WindowState="Minimized" Icon="/PithosPlus;component/Images/PithosTaskbar.png" xmlns:my="clr-namespace:Pithos.Client.WPF.Converters">
 
 <!--
     <Window.Background>
@@ -21,6 +21,7 @@
                 <ResourceDictionary Source="../PithosStyles.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <BooleanToVisibilityConverter x:Key="BooleanToVisible" />
+            <my:SingleLineConverter x:Key="SingleConverter" />
         </ResourceDictionary>
     </Window.Resources>
     <Grid>
@@ -31,45 +32,54 @@
 
         <tb:TaskbarIcon x:Name="TaskbarView"                           
                         IconSource="{Binding StatusIcon}" 
-                        ToolTipText="{Binding StatusMessage}"                        
+                        ToolTipText="{Binding TooltipMessage}"                        
                         MenuActivation="LeftOrRightClick" 
                         DoubleClickCommand="{Binding OpenPithosFolderCommand}"                         
                         >
             <tb:TaskbarIcon.ContextMenu>
                 <ContextMenu x:Name="TaskbarMenu" >
                     <MenuItem Header="{Binding OpenFolderCaption}" IsEnabled="{Binding HasAccounts}" x:Name="OpenPithosFolder" ItemsSource="{Binding Accounts}" >                        
-                        <MenuItem.ItemTemplate>
+                        <MenuItem.ItemTemplate>                            
                             <DataTemplate>
-                                <TextBlock x:Name="AccountLink"  Text="{Binding Path=UserName}" cal:Message.Attach="[Event MouseLeftButtonUp]=[Action OpenPithosFolder($dataContext)]" 
-                                           cal:Action.TargetWithoutContext="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=MenuItem, AncestorLevel=2}, Path=DataContext}" />
+                                <StackPanel 
+                                        cal:Message.Attach="[Event MouseLeftButtonUp]=[Action OpenPithosFolder($dataContext)]" 
+                                        cal:Action.TargetWithoutContext="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=MenuItem, AncestorLevel=2}, Path=DataContext}" >
+                                    <TextBlock x:Name="AccountLink"  Text="{Binding Path=UserName}" />
+                                    <TextBlock Text="{Binding Path=StorageUri}" FontStyle="Italic" FontSize="10" />
+                                </StackPanel>
                             </DataTemplate>
                         </MenuItem.ItemTemplate>                        
                         <MenuItem.Icon>
-                            <Image Source="/Pithos.Client.WPF;component/Images/Folder.ico" />
+                            <Image Source="/PithosPlus;component/Images/Folder.ico" />
                         </MenuItem.Icon>
                     </MenuItem>
                     <MenuItem Header="Go to Account Site" x:Name="GoToSiteMenu" ItemsSource="{Binding Accounts}" Visibility="{Binding Path=HasAccounts, Converter={StaticResource BooleanToVisible}}" >
                         <MenuItem.ItemTemplate>
                             <DataTemplate>
-                                <TextBlock x:Name="AccountLink" Text="{Binding Path=UserName}" cal:Message.Attach="[Event MouseLeftButtonUp]=[Action GoToSite($dataContext)]" 
-                                           cal:Action.TargetWithoutContext="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=MenuItem, AncestorLevel=2}, Path=DataContext}" />
+                                <StackPanel 
+                                        cal:Message.Attach="[Event MouseLeftButtonUp]=[Action GoToSite($dataContext)]" 
+                                        cal:Action.TargetWithoutContext="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=MenuItem, AncestorLevel=2}, Path=DataContext}" >
+                                    <TextBlock x:Name="AccountLink" Text="{Binding Path=UserName}" />
+                                    <TextBlock Text="{Binding Path=StorageUri}" FontStyle="Italic" FontSize="10" />
+                                </StackPanel>
                             </DataTemplate>
                         </MenuItem.ItemTemplate>
                         <MenuItem.Icon>
-                            <Image Source="/Pithos.Client.WPF;component/Images/Web.ico" />
+                            <Image Source="/PithosPlus;component/Images/Web.ico" />
                         </MenuItem.Icon>
                     </MenuItem>
 
                     <MenuItem Header="Recently Changed Files" x:Name="RecentFiles" ItemsSource="{Binding RecentFiles}">
                         <MenuItem.ItemTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding FileName}"/>
+                                <TextBlock Text="{Binding FileName}" cal:Message.Attach="[Event MouseLeftButtonUp]=[Action GoToFile($dataContext)]" 
+                                           cal:Action.TargetWithoutContext="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=MenuItem, AncestorLevel=2}, Path=DataContext}" />
                             </DataTemplate>
                         </MenuItem.ItemTemplate>
                     </MenuItem>
-                    <MenuItem Header="Sync Now" x:Name="SynchNow" cal:Message.Attach="SynchNow"/>
-                    <Separator  />                    
-                    <MenuItem Header="Usage" x:Name="Usages" ItemsSource="{Binding Accounts}">
+                    <MenuItem Header="Sync Now" x:Name="SynchNow" cal:Message.Attach="SynchNow" Visibility="{Binding Path=HasAccounts, Converter={StaticResource BooleanToVisible}}" />
+                    <Separator  Visibility="{Binding Path=HasAccounts, Converter={StaticResource BooleanToVisible}}"/>
+                    <MenuItem Header="Usage" x:Name="Usages" ItemsSource="{Binding Accounts}" Visibility="{Binding Path=HasAccounts, Converter={StaticResource BooleanToVisible}}" >
                         <MenuItem.ItemTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal">
@@ -81,22 +91,20 @@
                         </MenuItem.ItemTemplate>
                     </MenuItem>
                     <Separator  />
-                    <MenuItem Header="{Binding StatusMessage}" x:Name="StatusMessage" />
-                    <Separator  />
-                    <MenuItem  Header="{Binding PauseSyncCaption}" x:Name="ToggleSynching" cal:Message.Attach="ToggleSynching"  />
+                    <MenuItem  x:Name="StatusMessage" Header="{Binding Path=StatusMessage, Converter={StaticResource SingleConverter}}" MaxWidth="200" cal:Message.Attach="OnStatusAction" ToolTip="{Binding TooltipMessage}"/>
+                    <Separator  Visibility="{Binding Path=HasAccounts, Converter={StaticResource BooleanToVisible}}"/>
+                    <MenuItem  Header="{Binding PauseSyncCaption}" x:Name="ToggleSynching" cal:Message.Attach="ToggleSynching"  Visibility="{Binding Path=HasAccounts, Converter={StaticResource BooleanToVisible}}"/>
                     <Separator  />
+                    <MenuItem x:Name="ShowConflicts" Header="Show Conflicts" Visibility="{Binding Path=HasConflicts, Converter={StaticResource BooleanToVisible}}" cal:Message.Attach="ShowConflicts" />
                     <MenuItem  Header="Preferences ..." x:Name="ShowPreferences" cal:Message.Attach="ShowPreferences"  />
                     <Separator  />
                     <MenuItem  Header="Send Feedback" x:Name="SendFeedback" cal:Message.Attach="SendFeedback">
                         <MenuItem.Icon>
-                            <Image Source="/Pithos.Client.WPF;component/Images/Feedback.ico" />
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem  Header="About Pithos" x:Name="AboutPithos" cal:Message.Attach="AboutPithos">
-                        <MenuItem.Icon>
-                            <Image Source="/Pithos.Client.WPF;component/Images/About.ico" />
+                            <Image Source="/PithosPlus;component/Images/Feedback.ico" />
                         </MenuItem.Icon>
                     </MenuItem>
+                    <MenuItem  Header="Check For Updates" x:Name="CheckForUpgrade" cal:Message.Attach="CheckForUpgrade"/>
+                    <MenuItem  Header="{Binding MiniStatusCaption}" x:Name="ShowMiniStatus" cal:Message.Attach="ShowMiniStatus"/>
                     <MenuItem x:Name="GoToSiteRootMenu"  cal:Message.Attach="[Event MouseLeftButtonUp]=[Action GoToSite()]"
                               cal:Action.TargetWithoutContext="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=MenuItem, AncestorLevel=1}, Path=DataContext}" >
                         <MenuItem.HeaderTemplate>
@@ -106,16 +114,29 @@
                             </DataTemplate>
                         </MenuItem.HeaderTemplate>
                         <MenuItem.Icon>
-                            <Image Source="/Pithos.Client.WPF;component/Images/Web.ico" />
+                            <Image Source="/PithosPlus;component/Images/Web.ico" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem  Header="About Pithos" x:Name="AboutPithos" cal:Message.Attach="AboutPithos">
+                        <MenuItem.Icon>
+                            <Image Source="/PithosPlus;component/Images/About.ico" />
                         </MenuItem.Icon>
                     </MenuItem>
                     <Separator  />
                     <MenuItem  Header="Exit" Name="ExitPithos" cal:Message.Attach="ExitPithos" />
                 </ContextMenu>
             </tb:TaskbarIcon.ContextMenu>
+            <tb:TaskbarIcon.TrayToolTip>
+                <Border Background="White" 
+                        BorderBrush="Black" 
+                        BorderThickness="1" 
+                        CornerRadius="2">
+                    <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding TooltipMessage}" Margin="5"></TextBlock>
+                </Border>
+            </tb:TaskbarIcon.TrayToolTip>
         </tb:TaskbarIcon>
 <!--
-        <Image Margin="0,0,10,5" Source="/Pithos.Client.WPF;component/Images/logo.png" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Stretch="None"/>
+        <Image Margin="0,0,10,5" Source="/PithosPlus;component/Images/logo.png" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Stretch="None"/>
 -->
     </Grid>
 </Window>