Revision f2d88248 trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs

b/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
348 348

  
349 349
		#region Commands
350 350

  
351
		public void ShowPreferences()
351
        public void ShowPreferences()
352
        {
353
            ShowPreferences(null);
354
        }
355

  
356
		public void ShowPreferences(string currentTab)
352 357
		{
353 358
			//Settings.Reload();
354
			var preferences = new PreferencesViewModel(_windowManager,_events, this,Settings);            
355
			_windowManager.ShowDialog(preferences);
359
		    var preferences = new PreferencesViewModel(_windowManager, _events, this, Settings,currentTab);
360
		    _windowManager.ShowDialog(preferences);
356 361
			
357 362
		}
358 363

  
......
861 866
			
862 867
			if (Settings.ShowDesktopNotifications)
863 868
			{
864
				var tv = (ShellView) GetView();                
865
				var balloon=new PithosBalloon{Title=notification.Title,Message=notification.Message,Icon=icon};
869
				var tv = (ShellView) GetView();
870
			    System.Action clickAction = null;
871
                if (notification is ExpirationNotification)
872
                {
873
                    clickAction = ()=>ShowPreferences("AccountTab");
874
                }
875
				var balloon=new PithosBalloon{Title=notification.Title,Message=notification.Message,Icon=icon,ClickAction=clickAction};
866 876
				tv.TaskbarView.ShowCustomBalloon(balloon,PopupAnimation.Fade,4000);
867 877
//				tv.TaskbarView.ShowBalloonTip(notification.Title, notification.Message, icon);
868 878
			}

Also available in: Unified diff