From ff4ee7ab9c41f9756e1db6f25f701c8ca69cecf2 Mon Sep 17 00:00:00 2001 From: LukePulverenti Date: Wed, 27 Feb 2013 15:25:45 -0500 Subject: combined usermanager and userdata manager --- MediaBrowser.ServerApplication/MainWindow.xaml.cs | 29 ++++++++++------------- 1 file changed, 12 insertions(+), 17 deletions(-) (limited to 'MediaBrowser.ServerApplication/MainWindow.xaml.cs') diff --git a/MediaBrowser.ServerApplication/MainWindow.xaml.cs b/MediaBrowser.ServerApplication/MainWindow.xaml.cs index 1189e73d7..dbb3c9842 100644 --- a/MediaBrowser.ServerApplication/MainWindow.xaml.cs +++ b/MediaBrowser.ServerApplication/MainWindow.xaml.cs @@ -40,11 +40,6 @@ namespace MediaBrowser.ServerApplication /// The new item timer. private Timer NewItemTimer { get; set; } - /// - /// The _json serializer - /// - private readonly IJsonSerializer _jsonSerializer; - /// /// The _logger /// @@ -67,18 +62,13 @@ namespace MediaBrowser.ServerApplication /// The logger. /// The app host. /// logger - public MainWindow(IJsonSerializer jsonSerializer, ILogManager logManager, IApplicationHost appHost) + public MainWindow(ILogManager logManager, IApplicationHost appHost) { - if (jsonSerializer == null) - { - throw new ArgumentNullException("jsonSerializer"); - } if (logManager == null) { throw new ArgumentNullException("logManager"); } - _jsonSerializer = jsonSerializer; _logger = logManager.GetLogger("MainWindow"); _appHost = appHost; _logManager = logManager; @@ -255,7 +245,9 @@ namespace MediaBrowser.ServerApplication /// private void LaunchStartupWizard() { - App.OpenDashboardPage("wizardStart.html"); + var user = _appHost.Resolve().Users.FirstOrDefault(u => u.Configuration.IsAdministrator); + + App.OpenDashboardPage("wizardStart.html", user); } /// @@ -265,8 +257,8 @@ namespace MediaBrowser.ServerApplication /// The instance containing the event data. void cmdApiDocs_Click(object sender, EventArgs e) { - App.OpenUrl("http://localhost:" + Controller.Kernel.Instance.Configuration.HttpServerPortNumber + "/" + - Controller.Kernel.Instance.WebApplicationName + "/metadata"); + App.OpenUrl("http://localhost:" + Kernel.Instance.Configuration.HttpServerPortNumber + "/" + + Kernel.Instance.WebApplicationName + "/metadata"); } /// @@ -301,7 +293,8 @@ namespace MediaBrowser.ServerApplication /// The instance containing the event data. private void cmOpenExplorer_click(object sender, RoutedEventArgs e) { - (new LibraryExplorer(_jsonSerializer, _logger, _appHost)).Show(); + var explorer = (LibraryExplorer)_appHost.CreateInstance(typeof(LibraryExplorer)); + explorer.Show(); } /// @@ -311,7 +304,8 @@ namespace MediaBrowser.ServerApplication /// The instance containing the event data. private void cmOpenDashboard_click(object sender, RoutedEventArgs e) { - App.OpenDashboard(); + var user = _appHost.Resolve().Users.FirstOrDefault(u => u.Configuration.IsAdministrator); + App.OpenDashboard(user); } /// @@ -331,7 +325,8 @@ namespace MediaBrowser.ServerApplication /// The instance containing the event data. private void cmdBrowseLibrary_click(object sender, RoutedEventArgs e) { - App.OpenDashboardPage("index.html"); + var user = _appHost.Resolve().Users.FirstOrDefault(u => u.Configuration.IsAdministrator); + App.OpenDashboardPage("index.html", user); } /// -- cgit v1.2.3