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

Conflicts:
	trunk/Pithos.Client.WPF/ShellViewModel.cs

diff --cc trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
index 4f9db3c,a232b1b..e782f31
--- 1/trunk/Pithos.Client.WPF/ShellViewModel.cs
--- 2/trunk/Pithos.Client.WPF/ShellViewModel.cs
+++ b/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
@@@ -17,6 -17,6 +17,7 @@@ using Pithos.Client.WPF.FileProperties
  using Pithos.Client.WPF.Properties;
  using Pithos.Client.WPF.SelectiveSynch;
  using Pithos.Client.WPF.Services;
++using Pithos.Client.WPF.Shell;
  using Pithos.Core;
  using Pithos.Interfaces;
  using System;
@@@ -50,22 -37,10 +51,19 @@@ namespace Pithos.Client.WPF 
          private IStatusChecker _statusChecker;
          private IEventAggregator _events;
  
-               
-         public PithosSettings Settings { get; private set; }
- 
-         public IScreen Parent { get; set; }
+         public PithosSettings Settings { get; private set; }        
  
 -
 +              
          private Dictionary<string, PithosMonitor> _monitors = new Dictionary<string, PithosMonitor>();
 +              ///<summary>
 +              /// Dictionary of account monitors, keyed by account
 +              ///</summary>
 +              ///<remarks>
 +              /// One monitor class is created for each account. The Shell needs access to the monitors to execute start/stop/pause commands,
 +              /// retrieve account and boject info            
 +              ///</remarks>
 +              // TODO: Does the Shell REALLY need access to the monitors? Could we achieve the same results with a better design?
 +              // TODO: The monitors should be internal to Pithos.Core, even though exposing them makes coding of the Object and Container windows easier
          public Dictionary<string, PithosMonitor> Monitors
          {
              get { return _monitors; }
@@@ -277,8 -237,8 +274,19 @@@
              
          }
  
++        public void AboutPithos()
++        {
++            var about = new AboutView();
++            _windowManager.ShowWindow(about);
++        }
++
++        public void SendFeedback()
++        {
++            var feedBack = new FeedbackView();
++            _windowManager.ShowWindow(feedBack);
++        }
  
 -        public PithosCommand OpenPithosFolderCommand { get; private set; }
 +        //public PithosCommand OpenPithosFolderCommand { get; private set; }
  
          public void OpenPithosFolder()
          {