From 6e5d90bafe3eca21e64b0a04deba4afee98b2cfa Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 21 Feb 2014 10:24:29 -0500 Subject: rework checkboxes for block unrated items --- .../Configuration/UserConfiguration.cs | 30 ++++++++++++---------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'MediaBrowser.Model/Configuration/UserConfiguration.cs') diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs index fa2554e05..2145860c7 100644 --- a/MediaBrowser.Model/Configuration/UserConfiguration.cs +++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs @@ -12,12 +12,6 @@ namespace MediaBrowser.Model.Configuration /// The max parental rating. public int? MaxParentalRating { get; set; } - /// - /// Gets or sets a value indicating whether items with no rating information should be blocked. - /// - /// true if items with no rating info should be blocked; otherwise, false. - public bool BlockNotRated { get; set; } - /// /// Gets or sets a value indicating whether this instance is administrator. /// @@ -54,13 +48,6 @@ namespace MediaBrowser.Model.Configuration public bool DisplayUnairedEpisodes { get; set; } public bool EnableRemoteControlOfOtherUsers { get; set; } - public bool BlockUnratedMovies { get; set; } - public bool BlockUnratedTrailers { get; set; } - public bool BlockUnratedSeries { get; set; } - public bool BlockUnratedMusic { get; set; } - public bool BlockUnratedGames { get; set; } - public bool BlockUnratedBooks { get; set; } - public bool EnableLiveTvManagement { get; set; } public bool EnableLiveTvAccess { get; set; } @@ -68,6 +55,8 @@ namespace MediaBrowser.Model.Configuration public string[] BlockedMediaFolders { get; set; } + public UnratedItem[] BlockUnratedItems { get; set; } + /// /// Initializes a new instance of the class. /// @@ -75,13 +64,26 @@ namespace MediaBrowser.Model.Configuration { IsAdministrator = true; EnableRemoteControlOfOtherUsers = true; - BlockNotRated = false; EnableLiveTvManagement = true; EnableMediaPlayback = true; EnableLiveTvAccess = true; BlockedMediaFolders = new string[] { }; + BlockUnratedItems = new UnratedItem[] { }; } } + + public enum UnratedItem + { + Movie, + Trailer, + Series, + Music, + Game, + Book, + LiveTvChannel, + LiveTvProgram, + Other + } } -- cgit v1.2.3