From ca21e7773176ddfd915c785ddf8b4fda5522bfb6 Mon Sep 17 00:00:00 2001 From: faush01 Date: Tue, 25 Nov 2014 14:20:04 +1100 Subject: [PATCH] remove some options --- resources/language/English/strings.xml | 35 ++++---------------------- resources/lib/Functions.py | 10 +------- resources/settings.xml | 15 ++++------- 3 files changed, 11 insertions(+), 49 deletions(-) diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml index 7fad067..0cb244f 100644 --- a/resources/language/English/strings.xml +++ b/resources/language/English/strings.xml @@ -1,14 +1,12 @@  - Primary Server Address - Auto enter single folder items: - Play from HTTP instead of SMB: + Server Address + Server Port: Log Level: Username: Password: Samba Username: Samba Password: - Transcode: Enable performance profiling MediaBrowser @@ -18,61 +16,38 @@ Advanced Username: Password: - - Port Number: - Number of recent Movies to show: - Number of recent TV episodes to show: - Number of recent Music Albums to show: - Mark watched at start of playback: - Set Season poster for episodes - + Incorrect Username/Password Username not found Waiting for server to delete - Confirm file delete? Delete this item? This action will delete media and associated data files. Interface - Include Stream Info - Include People - Include Overview On Resume Jump Back Seconds - Mark Played When Stopping Above % Add Item and Played Counts - - Background Art Refresh Rate (seconds) + Background Art Refresh Rate (seconds) Add Resume Percent Add Episode Number Show Load Progress Done Processing Item : - Offer delete for watched episodes Play Error This item is not playable - Local path detected - Your MB3 Server contains local paths. Please change server paths to UNC or change MBCon setting 'Play from Stream' to true. Path: - Warning - Debug logging enabled. - This will affect performance. Error MBCon service is not running Please restart XBMC - Search Skin does not support setting views Select item action (Requires Restart) - - Artwork - + Add Season Number - Flatten Seasons Server Detection Succeeded Found server Address : Select User - Profiling enabled. Error in ArtworkRotationThread Unable to connect to host Error in LoadMenuOptionsThread diff --git a/resources/lib/Functions.py b/resources/lib/Functions.py index 4a0fb6f..e3b1a35 100644 --- a/resources/lib/Functions.py +++ b/resources/lib/Functions.py @@ -985,11 +985,6 @@ def processDirectory(url, results, progress, pluginhandle): result = results.get("Items") if(result == None): result = [] - if len(result) == 1 and __settings__.getSetting('autoEnterSingle') == "true": - if result[0].get("Type") == "Season": - jsonData = downloadUtils.downloadUrl("http://" + server + "/mediabrowser/Users/" + userid + "/items?ParentId=" + result[0].get("Id") + '&IsVirtualUnAired=false&IsMissing=false&Fields=' + detailsString + '&SortBy=SortName&format=json', suppress=False, popup=1 ) - results = json.loads(jsonData) - result=results.get("Items") item_count = len(result) current_item = 1; @@ -1249,10 +1244,7 @@ def processDirectory(url, results, progress, pluginhandle): SortByTemp = __settings__.getSetting('sortby') if SortByTemp == '' and not (item_type == 'Series' or item_type == 'Season' or item_type == 'BoxSet' or item_type == 'MusicAlbum' or item_type == 'MusicArtist'): SortByTemp = 'SortName' - if item_type=='Series' and __settings__.getSetting('flattenSeasons')=='true': - u = 'http://' + server + '/mediabrowser/Users/'+ userid + '/items?ParentId=' +id +'&IncludeItemTypes=Episode&Recursive=true&IsVirtualUnAired=false&IsMissing=false&Fields=' + detailsString + '&SortBy=SortName'+'&format=json' - else: - u = 'http://' + server + '/mediabrowser/Users/'+ userid + '/items?ParentId=' +id +'&IsVirtualUnAired=false&IsMissing=false&Fields=' + detailsString + '&SortBy='+SortByTemp+'&format=json' + u = 'http://' + server + '/mediabrowser/Users/'+ userid + '/items?ParentId=' +id +'&IsVirtualUnAired=false&IsMissing=false&Fields=' + detailsString + '&SortBy='+SortByTemp+'&format=json' if (item.get("RecursiveItemCount") != 0): dirItems.append(addGUIItem(u, details, extraData)) else: diff --git a/resources/settings.xml b/resources/settings.xml index 7596de9..f4da38e 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -6,28 +6,23 @@ - - + + - - - + + - - - - - + \ No newline at end of file