lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
Luke Pulverenti 2014-11-23 15:09:00 -05:00
commit 3c9986e651
4 changed files with 89 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
MediaBrowser.Server.Mac/AppController.cs
View File

@ -22,7 +22,32 @@ namespace MediaBrowser.Server.Mac
partial void HelloWorld(NSObject sender) partial void HelloWorld(NSObject sender)
{ {
Console.WriteLine("hello world");
}
partial void Quit(NSObject sender)
{
}
partial void Configure(NSObject sender)
{
}
partial void Browse(NSObject sender)
{
}
partial void Github(NSObject sender)
{
}
partial void ApiDocs(NSObject sender)
{
} }
} }
} }

2
MediaBrowser.Server.Mac/AppDelegate.cs
View File

@ -8,8 +8,6 @@ namespace MediaBrowser.Server.Mac
{ {
public partial class AppDelegate : NSApplicationDelegate public partial class AppDelegate : NSApplicationDelegate
{ {
MainWindowController mainWindowController;
public AppDelegate () public AppDelegate ()
{ {
} }

158
MediaBrowser.Server.Mac/MainMenu.xib
View File

@ -1,31 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data> <data>
<int key="IBDocument.SystemTarget">1080</int> <int key="IBDocument.SystemTarget">101000</int>
<string key="IBDocument.SystemVersion">12C3006</string> <string key="IBDocument.SystemVersion">13E28</string>
<string key="IBDocument.InterfaceBuilderVersion">2844</string> <string key="IBDocument.InterfaceBuilderVersion">6250</string>
<string key="IBDocument.AppKitVersion">1187.34</string> <string key="IBDocument.AppKitVersion">1265.21</string>
<string key="IBDocument.HIToolboxVersion">625.00</string> <string key="IBDocument.HIToolboxVersion">698.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">2844</string> <string key="NS.object.0">6250</string>
</object> </object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies"> <array key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSCustomObject</string> <string>NSCustomObject</string>
<string>NSMenu</string> <string>NSMenu</string>
<string>NSMenuItem</string> <string>NSMenuItem</string>
</object> </array>
<object class="NSArray" key="IBDocument.PluginDependencies"> <array key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object> </array>
<object class="NSMutableDictionary" key="IBDocument.Metadata"> <object class="NSMutableDictionary" key="IBDocument.Metadata">
<string key="NS.key.0">PluginDependencyRecalculationVersion</string> <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
<integer value="1" key="NS.object.0"/> <integer value="1" key="NS.object.0"/>
</object> </object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1048"> <array class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSCustomObject" id="1021"> <object class="NSCustomObject" id="1021">
<string key="NSClassName">NSApplication</string> <string key="NSClassName">NSApplication</string>
</object> </object>
@ -46,8 +43,7 @@
</object> </object>
<object class="NSMenu" id="761139089"> <object class="NSMenu" id="761139089">
<string key="NSTitle"/> <string key="NSTitle"/>
<object class="NSMutableArray" key="NSMenuItems"> <array class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMenuItem" id="92911173"> <object class="NSMenuItem" id="92911173">
<reference key="NSMenu" ref="761139089"/> <reference key="NSMenu" ref="761139089"/>
<string key="NSTitle">Hello World</string> <string key="NSTitle">Hello World</string>
@ -70,12 +66,11 @@
<reference key="NSOnImage" ref="793232119"/> <reference key="NSOnImage" ref="793232119"/>
<reference key="NSMixedImage" ref="438564198"/> <reference key="NSMixedImage" ref="438564198"/>
</object> </object>
</object> </array>
</object> </object>
</object> </array>
<object class="IBObjectContainer" key="IBDocument.Objects"> <object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords"> <array key="connectionRecords">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection"> <object class="IBOutletConnection" key="connection">
<string key="label">delegate</string> <string key="label">delegate</string>
@ -84,14 +79,6 @@
</object> </object>
<int key="connectionID">534</int> <int key="connectionID">534</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">terminate:</string>
<reference key="source" ref="1014"/>
<reference key="destination" ref="523607499"/>
</object>
<int key="connectionID">541</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection"> <object class="IBOutletConnection" key="connection">
<string key="label">statusMenu</string> <string key="label">statusMenu</string>
@ -108,15 +95,12 @@
</object> </object>
<int key="connectionID">542</int> <int key="connectionID">542</int>
</object> </object>
</object> </array>
<object class="IBMutableOrderedSet" key="objectRecords"> <object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects"> <array key="orderedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">0</int> <int key="objectID">0</int>
<object class="NSArray" key="object" id="0"> <array key="object" id="0"/>
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="children" ref="1048"/> <reference key="children" ref="1048"/>
<nil key="parent"/> <nil key="parent"/>
</object> </object>
@ -156,11 +140,10 @@
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">536</int> <int key="objectID">536</int>
<reference key="object" ref="761139089"/> <reference key="object" ref="761139089"/>
<object class="NSMutableArray" key="children"> <array class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="92911173"/> <reference ref="92911173"/>
<reference ref="523607499"/> <reference ref="523607499"/>
</object> </array>
<reference key="parent" ref="0"/> <reference key="parent" ref="0"/>
<string key="objectName">MediaBrowser.Server.Mac</string> <string key="objectName">MediaBrowser.Server.Mac</string>
</object> </object>
@ -174,52 +157,27 @@
<reference key="object" ref="523607499"/> <reference key="object" ref="523607499"/>
<reference key="parent" ref="761139089"/> <reference key="parent" ref="761139089"/>
</object> </object>
</object> </array>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>-1.IBPluginDependency</string>
<string>-2.IBPluginDependency</string>
<string>-3.IBPluginDependency</string>
<string>420.IBPluginDependency</string>
<string>533.IBPluginDependency</string>
<string>535.IBPluginDependency</string>
<string>536.IBPluginDependency</string>
<string>537.IBPluginDependency</string>
<string>538.IBPluginDependency</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<reference key="dict.values" ref="0"/>
</object> </object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="420.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="533.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="535.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="536.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="537.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="538.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/> <nil key="activeLocalization"/>
<object class="NSMutableDictionary" key="localizations"> <dictionary class="NSMutableDictionary" key="localizations"/>
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">542</int> <int key="maxID">542</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions"> <array class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">AppController</string> <string key="className">AppController</string>
<string key="superclassName">NSObject</string> <string key="superclassName">NSObject</string>
@ -247,7 +205,25 @@
</object> </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier"> <object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string> <string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/AppController.h</string> <string key="minorKey">../AppController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">AppController</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">HelloWorld:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">HelloWorld:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">HelloWorld:</string>
<string key="candidateClassName">id</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">../AppController.m</string>
</object> </object>
</object> </object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
@ -255,31 +231,23 @@
<string key="superclassName">NSObject</string> <string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier"> <object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string> <string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/AppDelegate.h</string> <string key="minorKey">../AppDelegate.h</string>
</object> </object>
</object> </object>
</object> </array>
</object> </object>
<int key="IBDocument.localizationMode">0</int> <int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">NO</bool>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies"> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
<integer value="3000" key="NS.object.0"/> <integer value="4600" key="NS.object.0"/>
</object> </object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int> <int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> <dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<bool key="EncodedWithXMLCoder">YES</bool> <string key="NSMenuCheckmark">{11, 11}</string>
<object class="NSArray" key="dict.sortedKeys"> <string key="NSMenuMixedState">{10, 3}</string>
<bool key="EncodedWithXMLCoder">YES</bool> </dictionary>
<string>NSMenuCheckmark</string>
<string>NSMenuMixedState</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{11, 11}</string>
<string>{10, 3}</string>
</object>
</object>
</data> </data>
</archive> </archive>

6
MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj
View File

@ -74,11 +74,6 @@
<Folder Include="Resources\" /> <Folder Include="Resources\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="MainWindow.cs" />
<Compile Include="MainWindowController.cs" />
<Compile Include="MainWindow.designer.cs">
<DependentUpon>MainWindow.cs</DependentUpon>
</Compile>
<Compile Include="Main.cs" /> <Compile Include="Main.cs" />
<Compile Include="AppDelegate.cs" /> <Compile Include="AppDelegate.cs" />
<Compile Include="AppDelegate.designer.cs"> <Compile Include="AppDelegate.designer.cs">
@ -90,7 +85,6 @@
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<InterfaceDefinition Include="MainWindow.xib" />
<InterfaceDefinition Include="MainMenu.xib" /> <InterfaceDefinition Include="MainMenu.xib" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>