From 56239bf321d1db740671d74fab879123ccdd24a8 Mon Sep 17 00:00:00 2001 From: Luke Date: Tue, 27 Oct 2015 00:13:12 -0400 Subject: [PATCH] update mac project --- .../Emby.Server.Mac.csproj | 773 +++++++++++++++--- MediaBrowser.Server.Mac/Main.cs | 4 +- MediaBrowser.Server.Mac/MenuBarIcon.cs | 32 - MediaBrowser.Server.Mac/Native/BaseMonoApp.cs | 8 + 4 files changed, 651 insertions(+), 166 deletions(-) diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index c0a48d46b..62c2386f0 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -78,6 +78,12 @@ ..\ThirdParty\Mono.Security\Mono.Security.dll False + + ..\packages\CommonIO.1.0.0.5\lib\net45\CommonIO.dll + + + ..\packages\Patterns.Logging.1.0.0.2\lib\portable-net45+sl4+wp71+win8+wpa81\Patterns.Logging.dll + @@ -259,9 +265,6 @@ - - Resources\dashboard-ui\.DS_Store - Resources\dashboard-ui\about.html @@ -334,12 +337,12 @@ Resources\dashboard-ui\encodingsettings.html - - Resources\dashboard-ui\episodes.html - Resources\dashboard-ui\favicon.ico + + Resources\dashboard-ui\favorites.html + Resources\dashboard-ui\forgotpassword.html @@ -439,23 +442,8 @@ Resources\dashboard-ui\movies.html - - Resources\dashboard-ui\musicalbumartists.html - - - Resources\dashboard-ui\musicalbums.html - - - Resources\dashboard-ui\musicartists.html - - - Resources\dashboard-ui\musicgenres.html - - - Resources\dashboard-ui\musicrecommended.html - - - Resources\dashboard-ui\musicvideos.html + + Resources\dashboard-ui\music.html Resources\dashboard-ui\mypreferencesdisplay.html @@ -517,30 +505,24 @@ Resources\dashboard-ui\scheduledtasks.html + + Resources\dashboard-ui\search.html + Resources\dashboard-ui\secondaryitems.html Resources\dashboard-ui\selectserver.html - - Resources\dashboard-ui\serversecurity.html - Resources\dashboard-ui\shared.html - - Resources\dashboard-ui\songs.html - Resources\dashboard-ui\streamingsettings.html Resources\dashboard-ui\support.html - - Resources\dashboard-ui\supporter.html - Resources\dashboard-ui\supporterkey.html @@ -553,26 +535,8 @@ Resources\dashboard-ui\syncsettings.html - - Resources\dashboard-ui\tvgenres.html - - - Resources\dashboard-ui\tvlatest.html - - - Resources\dashboard-ui\tvpeople.html - - - Resources\dashboard-ui\tvrecommended.html - - - Resources\dashboard-ui\tvshows.html - - - Resources\dashboard-ui\tvstudios.html - - - Resources\dashboard-ui\tvupcoming.html + + Resources\dashboard-ui\tv.html Resources\dashboard-ui\useredit.html @@ -652,6 +616,9 @@ Resources\dashboard-ui\apiclient\events.js + + Resources\dashboard-ui\apiclient\fileupload.js + Resources\dashboard-ui\apiclient\localassetmanager.js @@ -673,9 +640,6 @@ Resources\dashboard-ui\apiclient\wakeonlan.js - - Resources\dashboard-ui\apiclient\alt\ajax.js - Resources\dashboard-ui\apiclient\alt\bean.js @@ -685,6 +649,249 @@ Resources\dashboard-ui\apiclient\alt\events.js + + Resources\dashboard-ui\apiclient\sync\contentuploader.js + + + Resources\dashboard-ui\apiclient\sync\mediasync.js + + + Resources\dashboard-ui\apiclient\sync\multiserversync.js + + + Resources\dashboard-ui\apiclient\sync\offlineusersync.js + + + Resources\dashboard-ui\apiclient\sync\serversync.js + + + Resources\dashboard-ui\bower_components\Sortable\.bower.json + + + Resources\dashboard-ui\bower_components\Sortable\.editorconfig + + + Resources\dashboard-ui\bower_components\Sortable\.gitignore + + + Resources\dashboard-ui\bower_components\Sortable\.jshintrc + + + Resources\dashboard-ui\bower_components\Sortable\CONTRIBUTING.md + + + Resources\dashboard-ui\bower_components\Sortable\Gruntfile.js + + + Resources\dashboard-ui\bower_components\Sortable\README.md + + + Resources\dashboard-ui\bower_components\Sortable\Sortable.html + + + Resources\dashboard-ui\bower_components\Sortable\Sortable.js + + + Resources\dashboard-ui\bower_components\Sortable\Sortable.min.js + + + Resources\dashboard-ui\bower_components\Sortable\bower.json + + + Resources\dashboard-ui\bower_components\Sortable\component.json + + + Resources\dashboard-ui\bower_components\Sortable\index.html + + + Resources\dashboard-ui\bower_components\Sortable\jquery.binding.js + + + Resources\dashboard-ui\bower_components\Sortable\knockout-sortable.js + + + Resources\dashboard-ui\bower_components\Sortable\ng-sortable.js + + + Resources\dashboard-ui\bower_components\Sortable\package.json + + + Resources\dashboard-ui\bower_components\Sortable\react-sortable-mixin.js + + + Resources\dashboard-ui\bower_components\Sortable\meteor\.versions + + + Resources\dashboard-ui\bower_components\Sortable\meteor\README.md + + + Resources\dashboard-ui\bower_components\Sortable\meteor\methods-client.js + + + Resources\dashboard-ui\bower_components\Sortable\meteor\methods-server.js + + + Resources\dashboard-ui\bower_components\Sortable\meteor\package.js + + + Resources\dashboard-ui\bower_components\Sortable\meteor\publish.sh + + + Resources\dashboard-ui\bower_components\Sortable\meteor\reactivize.js + + + Resources\dashboard-ui\bower_components\Sortable\meteor\runtests.bat + + + Resources\dashboard-ui\bower_components\Sortable\meteor\runtests.sh + + + Resources\dashboard-ui\bower_components\Sortable\meteor\template.html + + + Resources\dashboard-ui\bower_components\Sortable\meteor\test.js + + + Resources\dashboard-ui\bower_components\Sortable\meteor\example\README.md + + + Resources\dashboard-ui\bower_components\Sortable\meteor\example\model.js + + + Resources\dashboard-ui\bower_components\Sortable\meteor\example\run.bat + + + Resources\dashboard-ui\bower_components\Sortable\meteor\example\run.sh + + + Resources\dashboard-ui\bower_components\Sortable\meteor\example\.meteor\.finished-upgraders + + + Resources\dashboard-ui\bower_components\Sortable\meteor\example\.meteor\.gitignore + + + Resources\dashboard-ui\bower_components\Sortable\meteor\example\.meteor\.id + + + Resources\dashboard-ui\bower_components\Sortable\meteor\example\.meteor\packages + + + Resources\dashboard-ui\bower_components\Sortable\meteor\example\.meteor\platforms + + + Resources\dashboard-ui\bower_components\Sortable\meteor\example\.meteor\release + + + Resources\dashboard-ui\bower_components\Sortable\meteor\example\.meteor\versions + + + Resources\dashboard-ui\bower_components\Sortable\meteor\example\client\define-object-type.css + + + Resources\dashboard-ui\bower_components\Sortable\meteor\example\client\define-object-type.html + + + Resources\dashboard-ui\bower_components\Sortable\meteor\example\client\define-object-type.js + + + Resources\dashboard-ui\bower_components\Sortable\meteor\example\server\fixtures.js + + + Resources\dashboard-ui\bower_components\Sortable\meteor\example\server\sortable-collections.js + + + Resources\dashboard-ui\bower_components\Sortable\st\app.css + + + Resources\dashboard-ui\bower_components\Sortable\st\app.js + + + Resources\dashboard-ui\bower_components\Sortable\st\face-01.jpg + + + Resources\dashboard-ui\bower_components\Sortable\st\face-02.jpg + + + Resources\dashboard-ui\bower_components\Sortable\st\face-03.jpg + + + Resources\dashboard-ui\bower_components\Sortable\st\face-04.jpg + + + Resources\dashboard-ui\bower_components\Sortable\st\face-05.jpg + + + Resources\dashboard-ui\bower_components\Sortable\st\face-06.jpg + + + Resources\dashboard-ui\bower_components\Sortable\st\face-07.jpg + + + Resources\dashboard-ui\bower_components\Sortable\st\face-08.jpg + + + Resources\dashboard-ui\bower_components\Sortable\st\face-09.jpg + + + Resources\dashboard-ui\bower_components\Sortable\st\logo.png + + + Resources\dashboard-ui\bower_components\Sortable\st\og-image.png + + + Resources\dashboard-ui\bower_components\Sortable\st\iframe\frame.html + + + Resources\dashboard-ui\bower_components\Sortable\st\iframe\index.html + + + Resources\dashboard-ui\bower_components\doc-ready\.bower.json + + + Resources\dashboard-ui\bower_components\doc-ready\README.md + + + Resources\dashboard-ui\bower_components\doc-ready\bower.json + + + Resources\dashboard-ui\bower_components\doc-ready\doc-ready.js + + + Resources\dashboard-ui\bower_components\eventEmitter\.bower.json + + + Resources\dashboard-ui\bower_components\eventEmitter\EventEmitter.js + + + Resources\dashboard-ui\bower_components\eventEmitter\EventEmitter.min.js + + + Resources\dashboard-ui\bower_components\eventEmitter\README.md + + + Resources\dashboard-ui\bower_components\eventEmitter\UNLICENSE + + + Resources\dashboard-ui\bower_components\eventEmitter\bower.json + + + Resources\dashboard-ui\bower_components\eventEmitter\component.json + + + Resources\dashboard-ui\bower_components\eventie\.bower.json + + + Resources\dashboard-ui\bower_components\eventie\README.md + + + Resources\dashboard-ui\bower_components\eventie\bower.json + + + Resources\dashboard-ui\bower_components\eventie\eventie.js + + + Resources\dashboard-ui\bower_components\eventie\package.json + Resources\dashboard-ui\bower_components\fastclick\.bower.json @@ -700,6 +907,18 @@ Resources\dashboard-ui\bower_components\fastclick\lib\fastclick.js + + Resources\dashboard-ui\bower_components\fizzy-ui-utils\.bower.json + + + Resources\dashboard-ui\bower_components\fizzy-ui-utils\README.md + + + Resources\dashboard-ui\bower_components\fizzy-ui-utils\bower.json + + + Resources\dashboard-ui\bower_components\fizzy-ui-utils\utils.js + Resources\dashboard-ui\bower_components\font-roboto\.bower.json @@ -712,6 +931,39 @@ Resources\dashboard-ui\bower_components\font-roboto\roboto.html + + Resources\dashboard-ui\bower_components\get-size\.bower.json + + + Resources\dashboard-ui\bower_components\get-size\README.md + + + Resources\dashboard-ui\bower_components\get-size\bower.json + + + Resources\dashboard-ui\bower_components\get-size\get-size.js + + + Resources\dashboard-ui\bower_components\get-size\index.html + + + Resources\dashboard-ui\bower_components\get-style-property\.bower.json + + + Resources\dashboard-ui\bower_components\get-style-property\README.md + + + Resources\dashboard-ui\bower_components\get-style-property\bower.json + + + Resources\dashboard-ui\bower_components\get-style-property\component.json + + + Resources\dashboard-ui\bower_components\get-style-property\get-style-property.js + + + Resources\dashboard-ui\bower_components\get-style-property\package.json + Resources\dashboard-ui\bower_components\hammerjs\.bower.json @@ -763,6 +1015,30 @@ Resources\dashboard-ui\bower_components\hammerjs\package.json + + Resources\dashboard-ui\bower_components\howler.js\.bower.json + + + Resources\dashboard-ui\bower_components\howler.js\CHANGELOG.md + + + Resources\dashboard-ui\bower_components\howler.js\LICENSE.md + + + Resources\dashboard-ui\bower_components\howler.js\README.md + + + Resources\dashboard-ui\bower_components\howler.js\bower.json + + + Resources\dashboard-ui\bower_components\howler.js\howler.js + + + Resources\dashboard-ui\bower_components\howler.js\howler.min.js + + + Resources\dashboard-ui\bower_components\howler.js\package.json + Resources\dashboard-ui\bower_components\iron-a11y-announcer\.bower.json @@ -928,6 +1204,36 @@ Resources\dashboard-ui\bower_components\iron-checked-element-behavior\test\simple-checkbox.html + + Resources\dashboard-ui\bower_components\iron-collapse\.gitignore + + + Resources\dashboard-ui\bower_components\iron-collapse\README.md + + + Resources\dashboard-ui\bower_components\iron-collapse\bower.json + + + Resources\dashboard-ui\bower_components\iron-collapse\hero.svg + + + Resources\dashboard-ui\bower_components\iron-collapse\index.html + + + Resources\dashboard-ui\bower_components\iron-collapse\iron-collapse.html + + + Resources\dashboard-ui\bower_components\iron-collapse\demo\index.html + + + Resources\dashboard-ui\bower_components\iron-collapse\test\basic.html + + + Resources\dashboard-ui\bower_components\iron-collapse\test\horizontal.html + + + Resources\dashboard-ui\bower_components\iron-collapse\test\index.html + Resources\dashboard-ui\bower_components\iron-dropdown\.bower.json @@ -1012,6 +1318,9 @@ Resources\dashboard-ui\bower_components\iron-flex-layout\bower.json + + Resources\dashboard-ui\bower_components\iron-flex-layout\index.html + Resources\dashboard-ui\bower_components\iron-flex-layout\iron-flex-layout.html @@ -1075,6 +1384,9 @@ Resources\dashboard-ui\bower_components\iron-icon\iron-icon.html + + Resources\dashboard-ui\bower_components\iron-icon\demo\async.html + Resources\dashboard-ui\bower_components\iron-icon\demo\index.html @@ -1489,6 +1801,9 @@ Resources\dashboard-ui\bower_components\iron-selector\test\content.html + + Resources\dashboard-ui\bower_components\iron-selector\test\excluded-local-names.html + Resources\dashboard-ui\bower_components\iron-selector\test\index.html @@ -1876,6 +2191,81 @@ Resources\dashboard-ui\bower_components\jstree\src\themes\default-dark\throbber.gif + + Resources\dashboard-ui\bower_components\masonry\.bower.json + + + Resources\dashboard-ui\bower_components\masonry\README.mdown + + + Resources\dashboard-ui\bower_components\masonry\bower.json + + + Resources\dashboard-ui\bower_components\masonry\changelog.md + + + Resources\dashboard-ui\bower_components\masonry\masonry.js + + + Resources\dashboard-ui\bower_components\masonry\dist\masonry.pkgd.js + + + Resources\dashboard-ui\bower_components\masonry\dist\masonry.pkgd.min.js + + + Resources\dashboard-ui\bower_components\masonry\sandbox\add-items.html + + + Resources\dashboard-ui\bower_components\masonry\sandbox\basic.html + + + Resources\dashboard-ui\bower_components\masonry\sandbox\bottom-up.html + + + Resources\dashboard-ui\bower_components\masonry\sandbox\element-sizing.html + + + Resources\dashboard-ui\bower_components\masonry\sandbox\fit-width.html + + + Resources\dashboard-ui\bower_components\masonry\sandbox\fluid.html + + + Resources\dashboard-ui\bower_components\masonry\sandbox\jquery.html + + + Resources\dashboard-ui\bower_components\masonry\sandbox\right-to-left.html + + + Resources\dashboard-ui\bower_components\masonry\sandbox\sandbox.css + + + Resources\dashboard-ui\bower_components\masonry\sandbox\stamps.html + + + Resources\dashboard-ui\bower_components\masonry\sandbox\browserify\index.html + + + Resources\dashboard-ui\bower_components\masonry\sandbox\browserify\main.js + + + Resources\dashboard-ui\bower_components\masonry\sandbox\require-js\index.html + + + Resources\dashboard-ui\bower_components\masonry\sandbox\require-js\main.js + + + Resources\dashboard-ui\bower_components\matches-selector\.bower.json + + + Resources\dashboard-ui\bower_components\matches-selector\README.md + + + Resources\dashboard-ui\bower_components\matches-selector\bower.json + + + Resources\dashboard-ui\bower_components\matches-selector\matches-selector.js + Resources\dashboard-ui\bower_components\neon-animation\.bower.json @@ -2068,6 +2458,21 @@ Resources\dashboard-ui\bower_components\neon-animation\test\test-resizable-pages.html + + Resources\dashboard-ui\bower_components\outlayer\.bower.json + + + Resources\dashboard-ui\bower_components\outlayer\README.md + + + Resources\dashboard-ui\bower_components\outlayer\bower.json + + + Resources\dashboard-ui\bower_components\outlayer\item.js + + + Resources\dashboard-ui\bower_components\outlayer\outlayer.js + Resources\dashboard-ui\bower_components\paper-behaviors\.bower.json @@ -2086,9 +2491,15 @@ Resources\dashboard-ui\bower_components\paper-behaviors\paper-button-behavior.html + + Resources\dashboard-ui\bower_components\paper-behaviors\paper-checked-element-behavior.html + Resources\dashboard-ui\bower_components\paper-behaviors\paper-inky-focus-behavior.html + + Resources\dashboard-ui\bower_components\paper-behaviors\paper-ripple-behavior.html + Resources\dashboard-ui\bower_components\paper-behaviors\demo\index.html @@ -2104,9 +2515,15 @@ Resources\dashboard-ui\bower_components\paper-behaviors\test\paper-button-behavior.html + + Resources\dashboard-ui\bower_components\paper-behaviors\test\paper-checked-element-behavior.html + Resources\dashboard-ui\bower_components\paper-behaviors\test\paper-radio-button-behavior.html + + Resources\dashboard-ui\bower_components\paper-behaviors\test\paper-ripple-behavior.html + Resources\dashboard-ui\bower_components\paper-behaviors\test\test-button.html @@ -2479,8 +2896,8 @@ Resources\dashboard-ui\bower_components\paper-item\paper-item-body.html - - Resources\dashboard-ui\bower_components\paper-item\paper-item-shared.css + + Resources\dashboard-ui\bower_components\paper-item\paper-item-shared-styles.html Resources\dashboard-ui\bower_components\paper-item\paper-item.html @@ -2632,9 +3049,6 @@ Resources\dashboard-ui\bower_components\paper-radio-button\index.html - - Resources\dashboard-ui\bower_components\paper-radio-button\paper-radio-button.css - Resources\dashboard-ui\bower_components\paper-radio-button\paper-radio-button.html @@ -2725,15 +3139,15 @@ Resources\dashboard-ui\bower_components\paper-slider\index.html - - Resources\dashboard-ui\bower_components\paper-slider\paper-slider.css - Resources\dashboard-ui\bower_components\paper-slider\paper-slider.html Resources\dashboard-ui\bower_components\paper-slider\demo\index.html + + Resources\dashboard-ui\bower_components\paper-slider\test\a11y.html + Resources\dashboard-ui\bower_components\paper-slider\test\basic.html @@ -3175,6 +3589,81 @@ Resources\dashboard-ui\bower_components\webcomponentsjs\webcomponents.min.js + + Resources\dashboard-ui\components\paperdialoghelper.js + + + Resources\dashboard-ui\components\prompt.js + + + Resources\dashboard-ui\components\collectioneditor\collectioneditor.js + + + Resources\dashboard-ui\components\directorybrowser\directorybrowser.js + + + Resources\dashboard-ui\components\imagedownloader\imagedownloader.js + + + Resources\dashboard-ui\components\imagedownloader\imagedownloader.template.html + + + Resources\dashboard-ui\components\imageeditor\imageeditor.js + + + Resources\dashboard-ui\components\imageeditor\imageeditor.template.html + + + Resources\dashboard-ui\components\imageuploader\imageuploader.js + + + Resources\dashboard-ui\components\imageuploader\imageuploader.template.html + + + Resources\dashboard-ui\components\itemidentifier\itemidentifier.js + + + Resources\dashboard-ui\components\itemidentifier\itemidentifier.template.html + + + Resources\dashboard-ui\components\medialibrarycreator\medialibrarycreator.js + + + Resources\dashboard-ui\components\medialibrarycreator\medialibrarycreator.template.html + + + Resources\dashboard-ui\components\medialibraryeditor\medialibraryeditor.js + + + Resources\dashboard-ui\components\medialibraryeditor\medialibraryeditor.template.html + + + Resources\dashboard-ui\components\metadataeditor\metadataeditor.js + + + Resources\dashboard-ui\components\metadataeditor\metadataeditor.template.html + + + Resources\dashboard-ui\components\playlisteditor\playlisteditor.js + + + Resources\dashboard-ui\components\subtitleeditor\subtitleeditor.js + + + Resources\dashboard-ui\components\subtitleeditor\subtitleeditor.template.html + + + Resources\dashboard-ui\components\tvguide\tvguide.js + + + Resources\dashboard-ui\components\tvguide\tvguide.template.html + + + Resources\dashboard-ui\components\tvproviders\schedulesdirect.js + + + Resources\dashboard-ui\components\tvproviders\schedulesdirect.template.html + Resources\dashboard-ui\cordova\actionsheet.js @@ -3190,8 +3679,8 @@ Resources\dashboard-ui\cordova\externalplayer.js - - Resources\dashboard-ui\cordova\filesystem.js + + Resources\dashboard-ui\cordova\fileupload.js Resources\dashboard-ui\cordova\generaldevice.js @@ -3202,6 +3691,12 @@ Resources\dashboard-ui\cordova\imagestore.js + + Resources\dashboard-ui\cordova\localassetmanager.js + + + Resources\dashboard-ui\cordova\prompt.js + Resources\dashboard-ui\cordova\registrationservices.js @@ -3229,18 +3724,12 @@ Resources\dashboard-ui\cordova\android\appstorage.js - - Resources\dashboard-ui\cordova\android\filesystem.js - Resources\dashboard-ui\cordova\android\iap.js Resources\dashboard-ui\cordova\android\immersive.js - - Resources\dashboard-ui\cordova\android\localassetmanager.js - Resources\dashboard-ui\cordova\android\localsync.js @@ -3253,14 +3742,23 @@ Resources\dashboard-ui\cordova\android\nativedirectorychooser.js + + Resources\dashboard-ui\cordova\android\newapp.js + Resources\dashboard-ui\cordova\android\vlcplayer.js + + Resources\dashboard-ui\cordova\ios\backgroundfetch.js + Resources\dashboard-ui\cordova\ios\orientation.js - - Resources\dashboard-ui\css\.DS_Store + + Resources\dashboard-ui\cordova\ios\tabbar.js + + + Resources\dashboard-ui\cordova\ios\vlcplayer.js Resources\dashboard-ui\css\card.css @@ -3394,6 +3892,12 @@ Resources\dashboard-ui\css\fonts\roboto\ty9dfvLAziwdqQ2dHoyjphTbgVql8nDJpwnrE27mub0.woff2 + + Resources\dashboard-ui\css\images\ani_equalizer_black.gif + + + Resources\dashboard-ui\css\images\ani_equalizer_white.gif + Resources\dashboard-ui\css\images\checkmarkblack.png @@ -3544,9 +4048,6 @@ Resources\dashboard-ui\css\images\items\list\person.png - - Resources\dashboard-ui\css\images\items\list\remotesearch.png - Resources\dashboard-ui\css\images\items\searchhintsv2\tv.png @@ -3670,6 +4171,18 @@ Resources\dashboard-ui\css\images\userdata\password.png + + Resources\dashboard-ui\devices\android\android.css + + + Resources\dashboard-ui\devices\ie\ie.css + + + Resources\dashboard-ui\devices\ie\ie.js + + + Resources\dashboard-ui\devices\ios\ios.css + Resources\dashboard-ui\files\dummy.mp4 @@ -3721,9 +4234,6 @@ Resources\dashboard-ui\scripts\cinemamodeconfiguration.js - - Resources\dashboard-ui\scripts\collectioneditor.js - Resources\dashboard-ui\scripts\connectlogin.js @@ -3745,9 +4255,6 @@ Resources\dashboard-ui\scripts\devicesupload.js - - Resources\dashboard-ui\scripts\directorybrowser.js - Resources\dashboard-ui\scripts\dlnaprofile.js @@ -3760,18 +4267,9 @@ Resources\dashboard-ui\scripts\dlnasettings.js - - Resources\dashboard-ui\scripts\editcollectionitems.js - - - Resources\dashboard-ui\scripts\edititemimages.js - Resources\dashboard-ui\scripts\edititemmetadata.js - - Resources\dashboard-ui\scripts\edititemsubtitles.js - Resources\dashboard-ui\scripts\editorsidebar.js @@ -3949,9 +4447,6 @@ Resources\dashboard-ui\scripts\moviegenres.js - - Resources\dashboard-ui\scripts\moviepeople.js - Resources\dashboard-ui\scripts\movies.js @@ -3979,9 +4474,6 @@ Resources\dashboard-ui\scripts\musicrecommended.js - - Resources\dashboard-ui\scripts\musicvideos.js - Resources\dashboard-ui\scripts\mypreferencescommon.js @@ -4069,6 +4561,9 @@ Resources\dashboard-ui\scripts\searchmenu.js + + Resources\dashboard-ui\scripts\searchpage.js + Resources\dashboard-ui\scripts\secondaryitems.js @@ -4078,9 +4573,6 @@ Resources\dashboard-ui\scripts\selectserver.js - - Resources\dashboard-ui\scripts\serversecurity.js - Resources\dashboard-ui\scripts\shared.js @@ -4105,9 +4597,6 @@ Resources\dashboard-ui\scripts\supporterkeypage.js - - Resources\dashboard-ui\scripts\supporterpage.js - Resources\dashboard-ui\scripts\sync.js @@ -4132,9 +4621,6 @@ Resources\dashboard-ui\scripts\tvlatest.js - - Resources\dashboard-ui\scripts\tvpeople.js - Resources\dashboard-ui\scripts\tvrecommended.js @@ -4294,6 +4780,9 @@ Resources\dashboard-ui\strings\html\zh-CN.json + + Resources\dashboard-ui\strings\html\zh-HK.json + Resources\dashboard-ui\strings\html\zh-TW.json @@ -4408,14 +4897,20 @@ Resources\dashboard-ui\strings\javascript\zh-CN.json + + Resources\dashboard-ui\strings\javascript\zh-HK.json + Resources\dashboard-ui\strings\javascript\zh-TW.json - - Resources\dashboard-ui\themes\android.css + + Resources\dashboard-ui\themes\halloween\bg.jpg - - Resources\dashboard-ui\themes\ios.css + + Resources\dashboard-ui\themes\halloween\style.css + + + Resources\dashboard-ui\themes\halloween\theme.js Resources\dashboard-ui\thirdparty\browser.js @@ -4426,9 +4921,6 @@ Resources\dashboard-ui\thirdparty\emby-icons.html - - Resources\dashboard-ui\thirdparty\filesystem.js - Resources\dashboard-ui\thirdparty\headroom.js @@ -4438,9 +4930,6 @@ Resources\dashboard-ui\thirdparty\paper-button-style.css - - Resources\dashboard-ui\thirdparty\paper-ie10.css - Resources\dashboard-ui\thirdparty\fontawesome\css\font-awesome.css @@ -4471,6 +4960,36 @@ Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\custombuild.txt + + Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.checkbox.css + + + Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.checkbox.js + + + Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.collapsible.css + + + Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.collapsible.js + + + Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.controlgroup.css + + + Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.controlgroup.js + + + Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.listview.css + + + Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.listview.js + + + Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.panel.css + + + Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.panel.js + Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.popup.css @@ -4489,9 +5008,6 @@ Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.table.js - - Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jquery.mobile-1.4.5.min.css - Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jquery.mobile-1.4.5.min.map @@ -4501,21 +5017,12 @@ Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jquery.mobile.custom.js - - Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jquery.mobile.custom.min.js - Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jquery.mobile.custom.structure.css - - Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jquery.mobile.custom.structure.min.css - Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jquery.mobile.custom.theme.css - - Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jquery.mobile.custom.theme.min.css - Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\images\ajax-loader.gif @@ -5161,6 +5668,9 @@ Resources\dashboard-ui\thirdparty\social-share-kit-1.0.4\dist\js\social-share-kit.min.js + + Resources\dashboard-ui\thirdparty\viblast\viblast-video-js.swf + Resources\dashboard-ui\thirdparty\viblast\viblast.crypto.js @@ -5173,11 +5683,8 @@ Resources\dashboard-ui\thirdparty\viblast\worker.html - - Resources\dashboard-ui\tvproviders\schedulesdirect.js - - - Resources\dashboard-ui\tvproviders\schedulesdirect.template.html + + Resources\dashboard-ui\voice\textprocessor-en-us.js Resources\dashboard-ui\voice\voice.css diff --git a/MediaBrowser.Server.Mac/Main.cs b/MediaBrowser.Server.Mac/Main.cs index 0802b97b9..250dfd7e7 100644 --- a/MediaBrowser.Server.Mac/Main.cs +++ b/MediaBrowser.Server.Mac/Main.cs @@ -21,6 +21,8 @@ using Microsoft.Win32; using MonoMac.AppKit; using MonoMac.Foundation; using MonoMac.ObjCRuntime; +using CommonIO; +using MediaBrowser.Server.Implementations.Logging; namespace MediaBrowser.Server.Mac { @@ -89,7 +91,7 @@ namespace MediaBrowser.Server.Mac // Allow all https requests ServicePointManager.ServerCertificateValidationCallback = new RemoteCertificateValidationCallback(delegate { return true; }); - var fileSystem = new CommonFileSystem(logManager.GetLogger("FileSystem"), false, true); + var fileSystem = new ManagedFileSystem(new PatternsLogger(logManager.GetLogger("FileSystem")), false, true); var nativeApp = new NativeApp(); diff --git a/MediaBrowser.Server.Mac/MenuBarIcon.cs b/MediaBrowser.Server.Mac/MenuBarIcon.cs index c5c4d92de..4f2f845de 100644 --- a/MediaBrowser.Server.Mac/MenuBarIcon.cs +++ b/MediaBrowser.Server.Mac/MenuBarIcon.cs @@ -13,10 +13,7 @@ namespace MediaBrowser.Server.Mac { private NSMenuItem browseMenuItem; private NSMenuItem configureMenuItem; - private NSMenuItem developerMenuItem; private NSMenuItem quitMenuItem; - private NSMenuItem githubMenuItem; - private NSMenuItem apiMenuItem; private NSMenuItem communityMenuItem; public static MenuBarIcon Instance; @@ -71,22 +68,6 @@ namespace MediaBrowser.Server.Mac }); menu.AddItem (configureMenuItem); - developerMenuItem = new NSMenuItem ("Developer Resources"); - menu.AddItem (developerMenuItem); - - var developerMenu = new NSMenu (); - developerMenuItem.Submenu = developerMenu; - - apiMenuItem = new NSMenuItem ("Api Documentation", "a", delegate { - ApiDocs (NSApplication.SharedApplication); - }); - developerMenu.AddItem (apiMenuItem); - - githubMenuItem = new NSMenuItem ("Github", "g", delegate { - Github (NSApplication.SharedApplication); - }); - developerMenu.AddItem (githubMenuItem); - communityMenuItem = new NSMenuItem ("Visit Community", "v", delegate { Community (NSApplication.SharedApplication); }); @@ -120,16 +101,6 @@ namespace MediaBrowser.Server.Mac BrowserLauncher.OpenWebClient(MainClass.AppHost, Logger); } - private void Github(NSObject sender) - { - BrowserLauncher.OpenGithub(Logger); - } - - private void ApiDocs(NSObject sender) - { - BrowserLauncher.OpenSwagger(MainClass.AppHost, Logger); - } - public void Terminate() { NSApplication.SharedApplication.InvokeOnMainThread (() => NSApplication.SharedApplication.Terminate(NSApplication.SharedApplication)); @@ -167,9 +138,6 @@ namespace MediaBrowser.Server.Mac quitMenuItem.Title = localization.GetLocalizedString("LabelExit"); communityMenuItem.Title = localization.GetLocalizedString("LabelVisitCommunity"); - githubMenuItem.Title = localization.GetLocalizedString("LabelGithub"); - apiMenuItem.Title = localization.GetLocalizedString("LabelApiDocumentation"); - developerMenuItem.Title = localization.GetLocalizedString("LabelDeveloperResources"); browseMenuItem.Title = localization.GetLocalizedString("LabelBrowseLibrary"); configureMenuItem.Title = localization.GetLocalizedString("LabelConfigureMediaBrowser"); } diff --git a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs index da4675b5e..9b8b0cd1b 100644 --- a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs +++ b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs @@ -36,6 +36,14 @@ namespace MediaBrowser.Server.Mac } } + public virtual bool SupportsLibraryMonitor + { + get + { + return false; + } + } + /// /// Gets a value indicating whether this instance can self update. ///