diff options
| author | Eric Reed <ebr@mediabrowser3.com> | 2013-04-16 16:21:54 -0400 |
|---|---|---|
| committer | Eric Reed <ebr@mediabrowser3.com> | 2013-04-16 16:21:54 -0400 |
| commit | c3a84d8db5aa2aa2531bdb7595d1b92a2608ad69 (patch) | |
| tree | ed1a0ede6ab13cb6f538b4e7f11bec87c8e12db4 | |
| parent | bc037652757c9d12c512135710b2691c03e2f593 (diff) | |
| parent | cfde6c10e673aaa2008bfa63fee26f0838b7faa2 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.ServerApplication/MainWindow.xaml.cs | 13 | ||||
| -rw-r--r-- | MediaBrowser.sln | 3 |
2 files changed, 14 insertions, 2 deletions
diff --git a/MediaBrowser.ServerApplication/MainWindow.xaml.cs b/MediaBrowser.ServerApplication/MainWindow.xaml.cs index d3ad61a7d..645c838ab 100644 --- a/MediaBrowser.ServerApplication/MainWindow.xaml.cs +++ b/MediaBrowser.ServerApplication/MainWindow.xaml.cs @@ -48,9 +48,13 @@ namespace MediaBrowser.ServerApplication /// <summary> /// Initializes a new instance of the <see cref="MainWindow" /> class. /// </summary> - /// <param name="jsonSerializer">The json serializer.</param> - /// <param name="logger">The logger.</param> + /// <param name="logManager">The log manager.</param> /// <param name="appHost">The app host.</param> + /// <param name="configurationManager">The configuration manager.</param> + /// <param name="userManager">The user manager.</param> + /// <param name="libraryManager">The library manager.</param> + /// <param name="jsonSerializer">The json serializer.</param> + /// <param name="displayPreferencesManager">The display preferences manager.</param> /// <exception cref="System.ArgumentNullException">logger</exception> public MainWindow(ILogManager logManager, IApplicationHost appHost, IServerConfigurationManager configurationManager, IUserManager userManager, ILibraryManager libraryManager, IJsonSerializer jsonSerializer, IDisplayPreferencesManager displayPreferencesManager) { @@ -95,6 +99,11 @@ namespace MediaBrowser.ServerApplication LoadLogWindow(null, EventArgs.Empty); _logManager.LoggerLoaded += LoadLogWindow; _configurationManager.ConfigurationUpdated += Instance_ConfigurationUpdated; + + if (_appHost.IsFirstRun) + { + Dispatcher.InvokeAsync(() => MbTaskbarIcon.ShowBalloonTip("Media Browser", "Welcome to Media Browser Server!", Hardcodet.Wpf.TaskbarNotification.BalloonIcon.None)); + } } /// <summary> diff --git a/MediaBrowser.sln b/MediaBrowser.sln index f9f5e9436..eb3251f74 100644 --- a/MediaBrowser.sln +++ b/MediaBrowser.sln @@ -173,4 +173,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(Performance) = preSolution + HasPerformanceSessions = true + EndGlobalSection EndGlobal |