update mac project

MediaBrowser.Server.Mac.userprefs

@@ -1,18 +1,19 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="MediaBrowser.Server.Mac/Main.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="MediaBrowser.Server.Mac/AppController.cs">
     <Files>
-      <File FileName="MediaBrowser.Server.Mac/Main.cs" Line="120" Column="120" />
+      <File FileName="MediaBrowser.Server.Mac/AppController.cs" Line="28" Column="28" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State expanded="True">
-          <Node name="MediaBrowser.Server.Mac" expanded="True" />
+          <Node name="MediaBrowser.Server.Mac" expanded="True">
-          <Node name="MediaBrowser.Server.Mono" expanded="True" />
+            <Node name="Resources" expanded="True">
-          <Node name="MediaBrowser.Server.Startup.Common" expanded="True" selected="True" />
+              <Node name="appicon.icns" selected="True" />
-          <Node name="MediaBrowser.WebDashboard" expanded="True">
+            </Node>
-            <Node name="Api" expanded="True" />
           </Node>
+          <Node name="MediaBrowser.Server.Startup.Common" expanded="True" />
+          <Node name="MediaBrowser.WebDashboard" expanded="True" />
           <Node name="MediaBrowser.XbmcMetadata" expanded="True" />
           <Node name="OpenSubtitlesHandler" expanded="True" />
         </State>

MediaBrowser.Server.Mac/AppController.cs

@@ -26,29 +26,30 @@ namespace MediaBrowser.Server.Mac
 		{
 			Instance = this;
 			MainClass.AddDependencies (this);
+			ConfigurationManager.ConfigurationUpdated += Instance_ConfigurationUpdated;
 		}
 
 		public override void AwakeFromNib()
 		{
 			var statusItem = NSStatusBar.SystemStatusBar.CreateStatusItem(30);
 			statusItem.Menu = statusMenu;
-			statusItem.Image = NSImage.ImageNamed("touchicon");
+			statusItem.Image = NSImage.ImageNamed("statusicon");
 			statusItem.HighlightMode = true;
 
-			statusItem.Menu.RemoveAllItems ();
+			statusMenu.RemoveAllItems ();
 
 			browseMenuItem = new NSMenuItem ("Browse Media Library", "b", delegate {
 				Browse (this);
 			});
-			statusItem.Menu.AddItem (browseMenuItem);
+			statusMenu.AddItem (browseMenuItem);
 
 			configureMenuItem = new NSMenuItem ("Configure Media Browser", "c", delegate {
 				Configure (this);
 			});
-			statusItem.Menu.AddItem (configureMenuItem);
+			statusMenu.AddItem (configureMenuItem);
 
 			developerMenuItem = new NSMenuItem ("Developer Resources");
-			statusItem.Menu.AddItem (developerMenuItem);
+			statusMenu.AddItem (developerMenuItem);
 
 			var developerMenu = new NSMenu ();
 			developerMenuItem.Submenu = developerMenu;
@@ -66,12 +67,14 @@ namespace MediaBrowser.Server.Mac
 			communityMenuItem = new NSMenuItem ("Visit Community", "v", delegate {
 				Community (this);
 			});
-			statusItem.Menu.AddItem (communityMenuItem);
+			statusMenu.AddItem (communityMenuItem);
 
 			quitMenuItem = new NSMenuItem ("Quit", "q", delegate {
 				Quit (this);
 			});
-			statusItem.Menu.AddItem (quitMenuItem);
+			statusMenu.AddItem (quitMenuItem);
+
+			LocalizeText ();
 		}
 
 		public IServerApplicationHost AppHost{ get; set;}

MediaBrowser.Server.Mac/Info.plist

@@ -5,13 +5,15 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MediaBrowser.MediaBrowser.Server.Mac</string>
 	<key>CFBundleName</key>
-	<string>MediaBrowser.Server.Mac</string>
+	<string>Media Browser</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.6</string>
 	<key>LSUIElement</key>
 	<string>1</string>
+	<key>LSMultipleInstancesProhibited</key>
+	<string>1</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
@@ -20,5 +22,7 @@
 	<string>public.app-category.video</string>
 	<key>CFBundleDisplayName</key>
 	<string>Media Browser</string>
+	<key>CFBundleIconFile</key>
+	<string>appicon</string>
 </dict>
 </plist>

MediaBrowser.Server.Mac/Main.cs

@@ -72,8 +72,9 @@ namespace MediaBrowser.Server.Mac
 				// TODO: Use CommonApplicationData? Will we always have write access?
 				programDataPath = Path.Combine(Environment.GetFolderPath (Environment.SpecialFolder.ApplicationData), "mediabrowser-server");
 			}
-			// p5437mav0ABB83l
+
-			var resourcesPath = Path.Combine(Path.GetDirectoryName (applicationPath), "Resources");
+			// Within the mac bundle, go uo two levels then down into Resources folder
+			var resourcesPath = Path.Combine(Path.GetDirectoryName(Path.GetDirectoryName (applicationPath)), "Resources");
 
 			return new ServerApplicationPaths(programDataPath, applicationPath, resourcesPath);
 		}
@@ -109,9 +110,10 @@ namespace MediaBrowser.Server.Mac
 			var initProgress = new Progress<double>();
 
 			var task = _appHost.Init(initProgress);
-			task = task.ContinueWith(new Action<Task>(a => _appHost.RunStartupTasks()));
 
 			Task.WaitAll(task);
+
+			Task.Run (() => _appHost.RunStartupTasks());
 		}
 
 		/// <summary>

MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -92,6 +92,9 @@
     <Compile Include="Native\NativeApp.cs" />
     <Compile Include="Native\BaseMonoApp.cs" />
     <Compile Include="Native\NetworkManager.cs" />
+    <Compile Include="..\SharedVersion.cs">
+      <Link>SharedVersion.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <InterfaceDefinition Include="MainMenu.xib" />
@@ -105,6 +108,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="packages.config" />
+    <None Include="app.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
@@ -132,9 +136,45 @@
       <Project>{2E781478-814D-4A48-9D80-BFF206441A65}</Project>
       <Name>MediaBrowser.Server.Implementations</Name>
     </ProjectReference>
+    <ProjectReference Include="..\MediaBrowser.Dlna\MediaBrowser.Dlna.csproj">
+      <Project>{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}</Project>
+      <Name>MediaBrowser.Dlna</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\MediaBrowser.LocalMetadata\MediaBrowser.LocalMetadata.csproj">
+      <Project>{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}</Project>
+      <Name>MediaBrowser.LocalMetadata</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\MediaBrowser.MediaEncoding\MediaBrowser.MediaEncoding.csproj">
+      <Project>{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}</Project>
+      <Name>MediaBrowser.MediaEncoding</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\MediaBrowser.MediaInfo\MediaBrowser.MediaInfo.csproj">
+      <Project>{6E4145E4-C6D4-4E4D-94F2-87188DB6E239}</Project>
+      <Name>MediaBrowser.MediaInfo</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\MediaBrowser.Providers\MediaBrowser.Providers.csproj">
+      <Project>{442B5058-DCAF-4263-BB6A-F21E31120A1B}</Project>
+      <Name>MediaBrowser.Providers</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\MediaBrowser.WebDashboard\MediaBrowser.WebDashboard.csproj">
+      <Project>{5624B7B5-B5A7-41D8-9F10-CC5611109619}</Project>
+      <Name>MediaBrowser.WebDashboard</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\MediaBrowser.XbmcMetadata\MediaBrowser.XbmcMetadata.csproj">
+      <Project>{23499896-B135-4527-8574-C26E926EA99E}</Project>
+      <Name>MediaBrowser.XbmcMetadata</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\OpenSubtitlesHandler\OpenSubtitlesHandler.csproj">
+      <Project>{4A4402D4-E910-443B-B8FC-2C18286A2CA0}</Project>
+      <Name>OpenSubtitlesHandler</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\MediaBrowser.Api\MediaBrowser.Api.csproj">
+      <Project>{4FD51AC5-2C16-4308-A993-C3A84F3B4582}</Project>
+      <Name>MediaBrowser.Api</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="touchicon.png" />
+    <Content Include="statusicon.png" />
   </ItemGroup>
   <ItemGroup>
     <NativeReference Include="..\ThirdParty\MediaInfo\osx\libmediainfo.dylib">
@@ -2922,5 +2962,6 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\swipebox-master\js\jquery.swipebox.min.js">
       <Link>Resources\dashboard-ui\thirdparty\swipebox-master\js\jquery.swipebox.min.js</Link>
     </BundleResource>
+    <BundleResource Include="Resources\appicon.icns" />
   </ItemGroup>
 </Project>

MediaBrowser.Server.Mac/app.config

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <configSections>
+    <section name="nlog" type="NLog.Config.ConfigSectionHandler, NLog" />
+  </configSections>
+  <nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <targets async="true"></targets>
+  </nlog>
+</configuration>