Merge branch 'master' of https://code.grnet.gr/git/pithos-ms-client

diff --git a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
index 6283711..6190ee4 100644 (file)
--- 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.20424.1")]
-[assembly: AssemblyFileVersionAttribute("0.7.20424.1")]
+[assembly: AssemblyVersion("0.7.20425.0")]
+[assembly: AssemblyFileVersionAttribute("0.7.20425.0")]

diff --git a/trunk/Pithos.Client.WPF/Shell/ShellView.xaml b/trunk/Pithos.Client.WPF/Shell/ShellView.xaml
index 0eeddeb..6b7af7e 100644 (file)
--- a/trunk/Pithos.Client.WPF/Shell/ShellView.xaml
+++ b/trunk/Pithos.Client.WPF/Shell/ShellView.xaml
@@ -91,7 +91,7 @@
                         </MenuItem.ItemTemplate>
                     </MenuItem>
                     <Separator  />
-                    <MenuItem  x:Name="StatusMessage" Header="{Binding Path=StatusMessage, Converter={StaticResource SingleConverter}}" MaxWidth="200" cal:Message.Attach="OnStatusAction" ToolTip="{Binding TooltipMessage}"/>
+                    <MenuItem  x:Name="StatusMessage" Header="{Binding Path=StatusMessage, Converter={StaticResource SingleConverter}}" MaxWidth="200" cal:Message.Attach="CurrentSyncStatus" 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  />
@@ -104,7 +104,6 @@
                         </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>

diff --git a/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs b/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
index 4aef954..824e44d 100644 (file)
--- a/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
+++ b/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
@@ -195,13 +195,27 @@ namespace Pithos.Client.WPF {
                VersionMessage = String.Format("Pithos+ {0}", fileVersion.FileVersion);
            }
 
-        public void OnStatusAction()
+        public void CurrentSyncStatus()
         {
-            if (Accounts.Count==0)
+            if (Accounts.Count == 0)
             {
                 ShowPreferences("AccountTab");
             }
+            else
+            {
+                if (!_statusVisible)
+                    _windowManager.ShowWindow(MiniStatus);
+                else
+                {
+                    if (MiniStatus.IsActive)
+                        MiniStatus.TryClose();
+                }
+                _statusVisible = !_statusVisible;
+
+                NotifyOfPropertyChange(() => MiniStatusCaption);
+            }
         }
+
            protected override void OnActivate()
                {
                        base.OnActivate();
@@ -383,6 +397,14 @@ namespace Pithos.Client.WPF {
                }
            }
 
+        public string ToggleStatusWindowMessage
+        {
+            get
+            {
+                return String.Format("{0}" + Environment.NewLine + "{1} Toggle Mini Status");
+            }
+        }
+
            private readonly ObservableConcurrentCollection<AccountInfo> _accounts = new ObservableConcurrentCollection<AccountInfo>();
                public ObservableConcurrentCollection<AccountInfo> Accounts
                {
@@ -505,20 +527,6 @@ namespace Pithos.Client.WPF {
                }
            }
 
-           public void ShowMiniStatus()
-        {            
-            if (!_statusVisible)
-                _windowManager.ShowWindow(MiniStatus);
-            else
-            {           
-                if (MiniStatus.IsActive)
-                    MiniStatus.TryClose();
-            }
-            _statusVisible=!_statusVisible;
-
-               NotifyOfPropertyChange(()=>MiniStatusCaption);
-        }
-
            public bool HasConflicts
            {
             get { return true; }