Fix for multiple preferences windows

diff --git a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
index 2115f04..bfde0a9 100644 (file)
--- a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
+++ b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
@@ -9,7 +9,8 @@
         ShowInTaskbar="true"
         WindowStartupLocation="CenterScreen"
         Icon="/PithosPlus;component/Images/PithosTaskbar.png"
-        WindowStyle="ToolWindow"
+        WindowStyle="ToolWindow"        
+        Topmost="True"
         ResizeMode="NoResize"
         Background="White">
         

diff --git a/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs b/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
index be62c07..469ea54 100644 (file)
--- a/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
+++ b/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
@@ -115,6 +115,7 @@ namespace Pithos.Client.WPF.Preferences
         public PreferencesViewModel(IWindowManager windowManager, IEventAggregator events, ShellViewModel shell, PithosSettings settings)\r
             :this(windowManager,events,shell,settings,null)\r
         {\r
+            this.DisplayName = "Pithos+ Preferences";\r
         }\r
 \r
         public PreferencesViewModel(IWindowManager windowManager, IEventAggregator events, ShellViewModel shell, PithosSettings settings, string currentTab)\r

diff --git a/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs b/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
index 78dc503..4fab311 100644 (file)
--- a/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
+++ b/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
@@ -538,8 +538,8 @@ namespace Pithos.Client.WPF {
                    var preferences = IoC.Get<PreferencesViewModel>();//??new PreferencesViewModel(_windowManager, _events, this, Settings,currentTab);
             if (!String.IsNullOrWhiteSpace(currentTab))
                 preferences.SelectedTab = currentTab;
-
-                   _windowManager.ShowDialog(preferences);
+            if (!preferences.IsActive)
+                       _windowManager.ShowDialog(preferences);
                        
                }