diff --git a/CHANGES.md b/CHANGES.md index d1cc05d..a31a8df 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,56 @@ -### 0.17.15 (2018-11-24 20:30:00 UTC) +### 0.18.0 (2018-11-26 19:30:00 UTC) + +* Update Beautiful Soup 4.6.0 (r449) to 4.6.3 (r475) +* Update CacheControl library 0.12.4 (bd94f7e) to 0.12.5 (cd91309) +* Update Certifi 2018.01.18 (e225253) to 2018.08.24 (8be9f89) +* Update dateutil module 2.7.2 (ff03c0f) to 2.7.2 (49690ee) +* Update feedparser 5.2.1 (5646f4c) to 5.2.1 (2b11c80) +* Update profilehooks module 1.10.0 (0ce1e29) to 1.10.1 (fdbf19d) +* Update PySocks 1.6.8 (524ceb4) to 1.6.8 (b687a34) +* Update Requests library 2.15.1 (282b01a) to 2.19.1 (2c6a842) +* Update scandir module 1.6 (c3592ee) to 1.9.0 (9ab3d1f) +* Update SimpleJSON 3.13.2 (6ffddbe) to 3.16.0 (e2a54f7) +* Update Tornado Web Server 5.0.1 (2b2a220a) to 5.1.1 (cc2cf07) +* Update unidecode module 1.0.22 (81f938d) to 1.0.22 (578cdb9) +* Update UnRar for Windows 5.60 to 5.61 +* Add idna library 2.7 (0f50bdc) +* Add urllib3 release 1.23 (7c216f4) +* Change if old scandir binary module is installed, fallback to slow Python module and inform user to upgrade binary +* Change site services tester to fallback to http if error with SSL +* Change postprocessor try to use folder name when filename does not contain show name +* Change force redirects in TVMaze API to be https +* Add display first 20 results in "Add show" view with a link to display more +* Add search results sort by Z to A to "Add show" view +* Add search results sort by newest aired to "Add show" view +* Add search results sort by oldest aired to "Add show" view +* Change requirements.txt Cheetah >= 3.1.0 +* Add bB torrent provider +* Add Snowfl torrent provider +* Fix manual search button on displayShow and episode view page +* Change feedback result of manual search on the clicked button image/tooltip +* Change reduce browser I/O on displayShow +* Fix displayShow bug where click holding on a season btn and then dragging away leaves 50% white +* Change Show List text "Search Show Name" to "Filter Show Name", and "Reset Search" to "Reset Filter" for clarity +* Change when getting a non existing folder, add the failed location to log messages +* Change add pulsing effect to warning indicators in navbar +* Add show search ability to menu Shows/"Add show" +* Change simplify options on final step of Add show +* Add quick set suggestion statuses in Episode Status Manager. Helpful for orphan "Snatches", or changes to "Skipped" etc. +* Change DisplayShow manual search button busy animation +* Add history view layouts to "Shows" menu +* Add a current layout indicator to "Shows"/"History" menu item +* Add the five last added shows to "Shows" menu under item "[1/2]" +* Change relabel ui "Episode Schedule" and "Episode View" to "Daily Schedule" +* Change displayShow, move table header sorting chevron images from right side of column to before text +* Change displayShow, move plotinfo from right side of name column to before the episode text +* Fix use correct columns for sorting on displayShow +* Fix sort by episode number on displayShow +* Change add images for manual search finished on displayShow to indicate completed fully (green) or low quality (bronze) +* Change improve image sizes to reduce page overhead +* Fix make release group comparison for proper/repack search case insensitive + + +### 0.17.15 (2018-11-24 20:30:00 UTC) * Fix pruning large watch lists * Add Ubuntu snap installer @@ -97,6 +149,8 @@ ### 0.17.0 (2018-08-24 23:40:00 UTC) +* Add ability to set episodes to suggested statuses in Episode Status Manager. Useful for orphaned "Snatches" or to undo + change to "Skipped", "Ignored", or "Wanted" to a previously known quality * Change save config values only where reqd. reduces file by up to 75% * Add 'Map an NZBGet "DestDir"' setting to config/Search/NZB Results tab (select NZBGet) * Add TVDB, TheXem, and GitHub buttons to page History/Layout "Provider fails" that fetches a site Up/Down report diff --git a/HACKS.txt b/HACKS.txt index c8727b4..0dd835e 100644 --- a/HACKS.txt +++ b/HACKS.txt @@ -10,6 +10,7 @@ Libs with customisations... /lib/hachoir_parser/guess.py /lib/hachoir_parser/misc/torrent.py /lib/lockfile/mkdirlockfile.py +/lib/scandir/scandir.py /lib/tmdb_api/tmdb_api.py /lib/tornado /lib/tvdb_api/tvdb_api.py diff --git a/_cleaner.py b/_cleaner.py index 0448acd..3f52dba 100644 --- a/_cleaner.py +++ b/_cleaner.py @@ -4,6 +4,32 @@ import os import shutil parent_dir = os.path.abspath(os.path.dirname(__file__)) +cleaned_file = os.path.abspath(os.path.join(parent_dir, '.cleaned004.tmp')) +test = os.path.abspath(os.path.join(parent_dir, 'lib', 'requests', 'packages')) +if not os.path.isfile(cleaned_file) or os.path.exists(test): + dead_dirs = [os.path.abspath(os.path.join(parent_dir, *d)) for d in [ + ('lib', 'requests', 'packages'), + ('lib', 'pynma') + ]] + + for dirpath, dirnames, filenames in os.walk(parent_dir): + for dead_dir in filter(lambda x: x in dead_dirs, [os.path.abspath(os.path.join(dirpath, d)) for d in dirnames]): + try: + shutil.rmtree(dead_dir) + except (StandardError, Exception): + pass + + for filename in [fn for fn in filenames if os.path.splitext(fn)[-1].lower() in ('.pyc', '.pyo')]: + try: + os.remove(os.path.abspath(os.path.join(dirpath, filename))) + except (StandardError, Exception): + pass + + with open(cleaned_file, 'wb') as fp: + fp.write('This file exists to prevent a rerun delete of *.pyc, *.pyo files') + fp.flush() + os.fsync(fp.fileno()) + cleaned_file = os.path.abspath(os.path.join(parent_dir, '.cleaned003.tmp')) test = os.path.abspath(os.path.join(parent_dir, 'lib', 'imdb')) if not os.path.isfile(cleaned_file) or os.path.exists(test): diff --git a/autoProcessTV/onTxComplete.sample.cfg b/autoProcessTV/onTxComplete.sample.cfg index 89fee2f..811fda9 100644 --- a/autoProcessTV/onTxComplete.sample.cfg +++ b/autoProcessTV/onTxComplete.sample.cfg @@ -8,10 +8,13 @@ ; Path where to copy completed downloads for SG to post process. ; This value *must* .. ; 1) be different to the path where the client saves completed downloads -; 2) be configured in SG (see section "To set up SickGear" in onTxComplete.bat) +; 2) be configured in SG (see "To set up SickGear" in onTxComplete script) ; This path should be created on first run, if not, create it yourself. +; Windows (add comment ; for Linux use) param1=F:\sg_pp +; Linux (remove comment ; for Linux use) +;param1=$HOME/sg_pp ; The Deluge label, or path tail used in Transmission (e.g. F:\Files\SG) diff --git a/autoProcessTV/onTxComplete.sh b/autoProcessTV/onTxComplete.sh new file mode 100755 index 0000000..098005f --- /dev/null +++ b/autoProcessTV/onTxComplete.sh @@ -0,0 +1,315 @@ +#!/bin/sh +: <<'main' +******************************************************************************* + +onTxComplete.sh v1.1 for SickGear + + Script to copy select files to a location for SickGear to post process. + + This is used with the 'Move' post process episode method + so that seeding files are not post processed over and over. + +******************************************************************************* + +Supported clients +----------------- +* Deluge clients 1.3.15 and newer clients +* qBittorrent 4.13+ and newer clients +* Transmission 2.84 and newer clients +* uTorrent 2.2.1 + +Supported OS +------------ +* Linux, FreeBSD and POSIX compliant Unix-like systems + + +How this works +-------------- +Completed downloads are copied from a seeding location to an isolated location. +SG will 'Move' processed content from isolation to the final show location. + +The four parameters; +param1 = Isolation path where to copy completed downloads for SG to process. + This value *must* .. + 1) be different to the path where the client saves completed downloads + 2) be configured in SG (see later, step a) + This path should be created on first run, if not, create it yourself. + +param2 = This filter value is compared with either a client set label, or the + tail of the path where the client downloaded seeding file is located. + Matching downloads are copied into isolation. + +param3 = Client set downloaded item category or label (e.g. "%L") + +param4 = Client set downloaded item content path (e.g. "%F", "%D/%F" etc) + +Token values for params 3 and 4 are found documented in the download client or +at the client webiste. Other clients may be able to replace param3 and param4 +to fit (see examples). + + +To set up SickGear +------------------ +a) Set /config/postProcessing/Post Processing -> "Completed TV downloads" + .. to match param1 + +b) Set /config/postProcessing/Post Processing -> "Process episode method" + .. to 'Move' + +c) Enable /config/postProcessing/Post Processing -> "Scan and post process" + +d) Enable /config/postProcessing/Post Processing -> "Postpone post processing" + +e) Set /config/search/Torrent Results -> "Set torrent label/category" + If using "Black hole" method or if there is no label field, then you must use + client auto labeller or a torrent completed save path that ends with param2, + for Transmission, see note(2) in that section below. + + +To set up the download client +----------------------------- + +For Deluge +---------- +Deluge clients call scripts with fixed params that prevent passing params, +rename onTxComplete.sample.cfg as onTxComplete.cfg and edit parameters there. + +A Deluge label is used to isolate SG downloads from everything else. + +1) Enable the "Label" plugin + +2) Enable the "Execute" plugin + +3) In the "Execute" plugin settings /Add Command/Event/Torrent Complete + set command to ... [script dir]/onTxComplete.sh + +4) Add the label set in step (e) to Deluge, right click the label and select + "Label Options"/Location/Move completed to/Other/ .. choose a folder created + where its name is identical to this label e.g. [path]/[label], ($HOME/downloads/SG) + +Reference: http://dev.deluge-torrent.org/wiki/Plugins/Execute + + +For qBittorrent +--------------- +The above four parameters are used to configure and run the script. + +Use one cmd from below replacing "[script dir]" with the path to this script + +Set Options/Downloads/Run an external program on torrent completion + +.. to run + [script dir]/onTxComplete.sh "$HOME/sg_pp" "SG" "%L" "%F" + + +For Transmission +---------------- +Transmission clients call scripts with fixed params that prevent passing params, +rename onTxComplete.sample.cfg as onTxComplete.cfg and edit parameters there. + +Transmission does not contain labels, instead, the set path(2) is compared +to the config file param2 value to isolate SG downloads from everything else. + +1) Edit/Preferences/Downloading/Call script when torrent is completed + ... Navigate to this script location and select it + +2) Follow "To set up SickGear" instruction but at step (e), + set "Downloaded files location" to a created folder with name ending in the + config file value of param2 e.g. [path]/[param2] + +Reference: https://web.archive.org/web/20171009055508/https://trac.transmissionbt.com/wiki/Scripts#OnTorrentCompletion + + +For uTorrent +------------ +The above four parameters are used to configure and run the script. + +Use one cmd below replacing "[script dir]" with the path to this script + +1) Set Preferences/Advanced/Run program/Run this program when a torrent finishes + [script dir]/onTxComplete.sh "$HOME/sg_pp" "SG" "%L" "%D/%F" + +It is advised to not use the uTorrent "Move completed downloads" feature because +it runs scripts before move actions complete, bad. Consider switching clients. + +Reference: https://stackoverflow.com/a/29071224 + +main +# *************************************************************************** +# Set 1 to enable test mode output (default: blank) +testmode= +# *************************************************************************** + +# Get install dir without trailing slash +install_dir="$(dirname $(realpath "$0"))" + +# Append text to logfile, and output text to stdio if testmode is "1" +log(){ + local logfile="${install_dir}/onTxComplete.log" + local txt="$1" + [ "1" == "$testmode" ] || [ "" != "$2" ] && echo "$txt" + + local ts="$(date '+%Y/%m/%d %H:%M:%S')" + if [ -e "$logfile" ]; then + echo "$ts $txt" >> "$logfile" + else + echo "$ts $txt" > "$logfile" + fi +} + +if [ -n "$4" ]; then + + # Use the four input parameters + # This also strips quotes used to safely pass values containing spaces + sg_path=$(echo $1 | xargs) + sg_label=$(echo $2 | xargs) + client_label=$(echo $3 | xargs) + content_path=$(echo $4 | xargs) + [ "1" != "$testmode" ] && [ "" != "$(echo $5 | xargs)" ] && testmode="1" + check_label_path_tail="" + +else + + # Process config file + cfgfile="$install_dir"/onTxComplete.cfg + eval $(sed -r '/[^=]+=[^=]+/!d;/^[ *;#]/d;s/\s*=\s*/=/g' "$cfgfile") + if [ "1" == "$testmode" ]; then + log "Config ... param1 = ${param1}" + log "Config ... param2 = ${param2}" + fi + + if [ -z "$param1" ] || [ -z "$param2" ]; then + log "Error: Issue while reading file $cfgfile" "force" + exit + fi + + sg_path="$param1" + sg_label="$param2" + + # Attempt to read Transmission environment variables + client_name="$TR_TORRENT_NAME" + client_path="$TR_TORRENT_DIR" + + if [ -z "$client_name" ] || [ -z "$client_path" ]; then + + # With no Transmission vars, attempt to read input parameters from Deluge + # Deluge sends id, name, and path + if [ -z "$3" ]; then + log "Error: not enough input params, read comments in $0 for usage" "force" + exit + fi + + # Deluge input parameters (i.e. "TorrentID" "Torrent Name" "Torrent Path") + # This also strips quotes used to safely pass values containing spaces + client_name=$(echo $2 | xargs) + client_path=$(echo $3 | xargs) + fi + content_path="$client_path/$client_name" + check_label_path_tail="1" +fi + +# Replace any double slashes in path with single slash +sg_path=$(echo ${sg_path} | sed -En "s/([/\])?[/\]*/\1/gp") +content_path=$(echo ${content_path} | sed -En "s/([/\])?[/\]*/\1/gp") + +# Remove any trailing slashes from paths +sg_path=${sg_path%/} +content_path=${content_path%/} +client_path=${client_path%/} + +if [ -n "$check_label_path_tail" ]; then + # Enable the copy action if path ends with user defined label + client_label="$sg_label" + + label_length=$(echo -n "$sg_label" | wc -m) + + [ "/$sg_label" != $(echo -n $client_path | tail -c $((1 + $label_length))) ] && client_label="skip copy" +fi + +# Create '.!sync' filename +syncext="!sync" +basefile="$sg_path/copying" +syncfile="$basefile.$syncext" && files="$basefile.files.txt" && tmp="$basefile.tmp" +num=2 +while [ -e "$syncfile" ]; do + syncfile="$sg_path/copying-$num.$syncext" && files="$basefile-$num.files.txt" && tmp="$basefile-$num.tmp" + num=$((1 + $num)) +done + +[ "1" == "$testmode" ] && log "Running in ***test mode*** - files will not be copied" +log "**** cmd = \"$(realpath "$0")\"" +log " param1 = \"$sg_path\"" +log " param2 = \"$sg_label\"" +log " param3 = \"$client_label\"" +log " param4 = \"$content_path\"" +log "syncfile = \"$syncfile\"" + + +case "$sg_label" in "$client_label"*) + + [ ! -d "$sg_path" ] && mkdir -p "$sg_path" + + if [ -d "$sg_path" ]; then + + # Determine file/folder as these need to be handled differently + if [ -d "$content_path" ]; then + + # Create a file to prevent SG premature post processing (ref: step (d)) .. + echo "Copying folder \"$content_path\" to \"$sg_path\"" > "$syncfile" + + cd "$content_path" + + # Copy from; `parent/` to `{pp}/parent/` and `parent/.../child/` to `{pp}/parent/child/` + parent="/${content_path##*/}" + + # Sort by largest to smallest filesize for copy + find . -type f -print0 | xargs -r0 ls -1S | while read srcfile; do + # Copy + child="" + relpath="${srcfile%/*}" + if [ "." != "$relpath" ]; then + child="/${relpath##*/}" + fi + filename="${srcfile##*/}" + dstdir="$sg_path$parent$child" + dstfile="$dstdir/$filename" + + if [ "1" == "$testmode" ]; then + + [ ! -d "$dstdir" ] && log "mkdir -p \"$dstdir\"" + if [ ! -e "$dstfile" ]; then + log "cp -p \"$srcfile\" \"$dstfile\" >/dev/null 2>&1" + else + log "Skipping, file exists \"$dstfile\"" + fi + + else + + [ ! -d "$dstdir" ] && mkdir -p "$dstdir" + [ ! -e "$dstfile" ] && cp -p "$srcfile" "$dstfile" >/dev/null 2>&1 + + fi + done + + [ "1" != "$testmode" ] && [ -f "$syncfile" ] && rm -f "$syncfile" + + else + + # Create a file to prevent SG premature post processing (ref: step (d)) .. + echo "Copying file \"$content_path\" to \"$sg_path/\"" > "$syncfile" + + if [ "1" == "$testmode" ]; then + + log "cp \"$content_path\" \"$sg_path/\"" + + else + + cp "$content_path" "$sg_path/" >/dev/null 2>&1 + [ -f "$syncfile" ] && rm -f "$syncfile" + + fi + fi + fi +esac + +exit diff --git a/gui/slick/css/dark.css b/gui/slick/css/dark.css index 3730947..f2c5c7f 100644 --- a/gui/slick/css/dark.css +++ b/gui/slick/css/dark.css @@ -24,6 +24,12 @@ pre .prelight-num{ color:#ff6d5e } +.snf .pulse, +.shows-not-found.n .snf .pulse{ border-color:#c3ed9b } +.shows-not-found.nn .snf .pulse{ border-color:#f6ff41 } +.shows-not-found.nnn .snf .pulse{ border-color:#ffba57 } +.shows-not-found.nnnn .snf .pulse{ border-color:#ff6d5e } + [class^="icon-"], [class*=" icon-"]{ background-image:url("../images/glyphicons-halflings.png") @@ -330,7 +336,7 @@ home_newShow.tmpl border:0 } -.step-one #searchResults .alt{ +.step-one #search-results .alt{ background-color:rgb(40, 40, 40) } @@ -492,6 +498,8 @@ body#display-show.back-art .displayshow-wrapper .label a:focus{ .translucent.pro.ii .day-of-week .day-number, .back-art.pro.ii .sickbeardTable .seasoncols th, .translucent.pro.ii .sickbeardTable .seasoncols th, +#display-show.back-art.pro.ii .sickbeardTable .seasoncols th, +#display-show.translucent.pro.ii .sickbeardTable .seasoncols th, .back-art.pro.ii .sickbeardTable thead .seasoncols td, .translucent.pro.ii .sickbeardTable thead .seasoncols td{ background-color:rgba(21, 82, 143, 0.5) @@ -982,16 +990,16 @@ fieldset[disabled] .navbar-default .btn-link:focus{ color:#ccc } -.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus{ +.dropdown-menu li > a{ + color:#ddd +} + +.dropdown-menu li > a:hover, .dropdown-menu li > a:focus{ color:#ddd; text-decoration:none; background-color:#15528f } -.dropdown-menu > li > a{ - color:#ddd -} - .component-group.bubblelist .bgcol, .dropdown-menu{ background-color:#333; @@ -1060,6 +1068,7 @@ fieldset[disabled] .navbar-default .btn-link:focus{ outline:thin dotted #333; outline:5px auto -webkit-focus-ring-color; outline-offset:-2px; + background-position:0; color:#ddd } @@ -1351,6 +1360,7 @@ input sizing (for config pages) ========================================================================== */ .showlist-select optgroup, +#set-status optgroup, #results-sortby optgroup, #pickShow optgroup, #showfilter optgroup, @@ -1361,6 +1371,7 @@ input sizing (for config pages) } .showlist-select optgroup option, +#set-status optgroup option, #results-sortby optgroup option, #pickShow optgroup option, #showfilter optgroup option, @@ -1418,7 +1429,7 @@ div.stepsguide .step p{ color:#ccc } -.stepDiv #searchResults div .exists-db{ +.stepDiv #search-results div .exists-db{ color:#1178B3 } diff --git a/gui/slick/css/fonts/sgicons.eot b/gui/slick/css/fonts/sgicons.eot index afe2fea..f4ecc4b 100644 Binary files a/gui/slick/css/fonts/sgicons.eot and b/gui/slick/css/fonts/sgicons.eot differ diff --git a/gui/slick/css/fonts/sgicons.svg b/gui/slick/css/fonts/sgicons.svg index 45618c2..680700e 100644 --- a/gui/slick/css/fonts/sgicons.svg +++ b/gui/slick/css/fonts/sgicons.svg @@ -7,18 +7,18 @@ - - + + - + - - + + @@ -28,34 +28,91 @@ - - - - - - - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gui/slick/css/fonts/sgicons.ttf b/gui/slick/css/fonts/sgicons.ttf index eceb418..0c04946 100644 Binary files a/gui/slick/css/fonts/sgicons.ttf and b/gui/slick/css/fonts/sgicons.ttf differ diff --git a/gui/slick/css/fonts/sgicons.woff b/gui/slick/css/fonts/sgicons.woff index 800e48a..2f806c0 100644 Binary files a/gui/slick/css/fonts/sgicons.woff and b/gui/slick/css/fonts/sgicons.woff differ diff --git a/gui/slick/css/light.css b/gui/slick/css/light.css index 3baeb8b..20f25f3 100644 --- a/gui/slick/css/light.css +++ b/gui/slick/css/light.css @@ -24,6 +24,12 @@ pre .prelight-num{ color:#ff6d5e } +.snf .pulse, +.shows-not-found.n .snf .pulse{ border-color:#6f8c53 } +.shows-not-found.nn .snf .pulse{ border-color:#b7b82c } +.shows-not-found.nnn .snf .pulse{ border-color:#eaab52 } +.shows-not-found.nnnn .snf .pulse{ border-color:#ff6d5e } + [class^="icon-"], [class*=" icon-"]{ background-image:url("../images/glyphicons-halflings-white.png") @@ -346,7 +352,7 @@ home_newShow.tmpl border-color:#dfdede } -.step-one #searchResults .alt{ +.step-one #search-results .alt{ background-color:rgb(245, 245, 245) } @@ -491,7 +497,9 @@ body#display-show.back-art, .back-art.pro.ii .day-of-week .day-number, .translucent.pro.ii .day-of-week .day-number, .back-art.pro.ii .sickbeardTable .seasoncols th, -.translucent.pro.ii .sickbeardTable .seasoncols th{ +.translucent.pro.ii .sickbeardTable .seasoncols th, +#display-show.back-art.pro.ii .sickbeardTable .seasoncols th, +#display-show.translucent.pro.ii .sickbeardTable .seasoncols th{ background-color:rgba(51, 51, 51, 0.7) } @@ -959,7 +967,11 @@ fieldset[disabled] .navbar-default .btn-link:focus{ color:#ccc } -.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus{ +.dropdown-menu li > a{ + color:#333 +} + +.dropdown-menu li > a:hover, .dropdown-menu li > a:focus{ color:#fff; text-decoration:none; background-color:#333 @@ -1317,6 +1329,7 @@ input sizing (for config pages) ========================================================================== */ .showlist-select optgroup, +#set-status optgroup, #results-sortby optgroup, #pickShow optgroup, #showfilter optgroup, @@ -1327,6 +1340,7 @@ input sizing (for config pages) } .showlist-select optgroup option, +#set-status optgroup option, #results-sortby optgroup option, #pickShow optgroup option, #showfilter optgroup option, @@ -1384,7 +1398,7 @@ div.stepsguide .disabledstep p{ color:#8a775e } -.stepDiv #searchResults div .exists-db{ +.stepDiv #search-results div .exists-db{ color:#1178B3 } diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css index 52be93d..b4744ea 100644 --- a/gui/slick/css/style.css +++ b/gui/slick/css/style.css @@ -129,11 +129,11 @@ fonts /* SickGear Icons */ @font-face{ font-family:"sgicons"; - src:url("fonts/sgicons.eot?v2"); - src:url("fonts/sgicons.eot?v2#iefix") format("embedded-opentype"), - url("fonts/sgicons.woff?v2") format("woff"), - url("fonts/sgicons.ttf?v2") format("truetype"), - url("fonts/sgicons.svg?v2#sgicons") format("svg"); + src:url("fonts/sgicons.eot?v3"); + src:url("fonts/sgicons.eot?v3#iefix") format("embedded-opentype"), + url("fonts/sgicons.woff?v3") format("woff"), + url("fonts/sgicons.ttf?v3") format("truetype"), + url("fonts/sgicons.svg?v3#sgicons") format("svg"); font-weight:normal; font-style:normal } @@ -180,8 +180,58 @@ inc_top.tmpl display:block; } +@-webkit-keyframes webkit-pulse{ + 0% { -webkit-transform:scale(0); opacity:0 } + 25% { -webkit-transform:scale(.1); opacity:.1 } + 50% { -webkit-transform:scale(.5); opacity:.3 } + 75% { -webkit-transform:scale(.8); opacity:.5 } + to { -webkit-transform:scale(1); opacity:0 } +} +@-moz-keyframes moz-pulse{ + 0% { -moz-transform:scale(0); opacity:0 } + 25% { -moz-transform:scale(.1); opacity:.1 } + 50% { -moz-transform:scale(.5); opacity:.3 } + 75% { -moz-transform:scale(.8); opacity:.5 } + to { -moz-transform:scale(1); opacity:0 } +} +@-o-keyframes o-pulse{ + 0% { -o-transform:scale(0); opacity:0 } + 25% { -o-transform:scale(.1); opacity:.1 } + 50% { -o-transform:scale(.5); opacity:.3 } + 75% { -o-transform:scale(.8); opacity:.5 } + to { -o-transform:scale(1); opacity:0 } +} +@keyframes pulse{ + 0% { transform:scale(0); opacity:0 } + 25% { transform:scale(.1); opacity:.1 } + 50% { transform:scale(.5); opacity:.3 } + 75% { transform:scale(.8); opacity:.5 } + to { transform:scale(1); opacity:0 } +} +.bar .pulse{ top:-5px; right:-6px } +.item .pulse{ top:-7px; right:0 } +.errors .pulse{ top:-5px } +.pulse{ + height:27px; + width:26px; + position:absolute; + z-index:10; + border:3px solid; + border-radius:70px; + -webkit-animation:webkit-pulse 1s ease-out; + -moz-animation:moz-pulse 1s ease-out; + -o-animation:o-pulse 1s ease-out; + animation:pulse 1s ease-out; + -webkit-animation-iteration-count:infinite; + -moz-animation-iteration-count:infinite; + -o-animation-iteration-count:infinite; + animation-iteration-count:infinite +} + + .navbar-default .navbar-nav .snf.item, .navbar-default .navbar-nav .logger.errors.item{ + position:relative; display:inline-block } @@ -513,7 +563,7 @@ inc_top.tmpl } .sgicon-info:before{ - content:"\e617" + content:"\e65b" } .sgicon-restart:before{ @@ -533,27 +583,27 @@ inc_top.tmpl } .sgicon-arrowup:before{ - content:"\e61c" + content:"\e63b" } .sgicon-arrowdown:before{ - content:"\e61d" + content:"\e63a" } .sgicon-plex:before{ - content:"\e61e" + content:"\e903" } .sgicon-kodi:before{ - content:"\e61f" + content:"\e901" } .sgicon-bittorrent:before{ - content:"\e620" + content:"\e910" } .sgicon-xbmc:before{ - content:"\e621" + content:"\e902" } .sgicon-rss:before{ @@ -589,7 +639,7 @@ inc_top.tmpl } .sgicon-warning:before{ - content:"\e62a" + content:"\e657" } .sgicon-list:before{ @@ -612,6 +662,18 @@ inc_top.tmpl content:"\e62f" } +.sgicon-downloaded:before{ + content:"\e634" +} + +.sgicon-watched:before{ + content:"\e643" +} + +.sgicon-failures:before{ + content:"\e685" +} + .sgicon-imdb:before{ content:"\e898" } @@ -638,6 +700,18 @@ inc_top.tmpl background-position:-337px 0 } +#add-show-name:hover{ + cursor:pointer +} + +#add-show-name input{ + margin:0 0 0 -1px; + padding:0 2px; + height:18px; + width:135px; + font-size:12px +} + /* ======================================================================= inc_bottom.tmpl ========================================================================== */ @@ -1138,7 +1212,7 @@ div.formpaginate{ border:1px solid } -#searchResults input[type="radio"]{ +#search-results input[type="radio"]{ vertical-align:-2px } @@ -1174,21 +1248,21 @@ div.formpaginate{ margin-left:10px } -.stepDiv #searchResults .results-item{ +.stepDiv #search-results .results-item{ width:100%; line-height:1.7 } -.stepDiv #searchResults .results-item input[disabled=disabled]{ +.stepDiv #search-results .results-item input[disabled=disabled]{ visibility:hidden } -.stepDiv #searchResults .results-item .exists-db{ +.stepDiv #search-results .results-item .exists-db{ font-weight:800; font-style:italic } -.stepDiv #searchResults #searchingAnim{ +.stepDiv #search-results #searchingAnim{ margin-right:6px } @@ -1896,6 +1970,7 @@ a.service img{ #display-show .tablesorter tr.unaired{ background-color:#f5f1e4 } +.unknown, #display-show.back-art.pro.ii .tablesorter tr.unaired{ background-color:rgba(245,241,228,0.7); color:#584b20 @@ -2004,6 +2079,13 @@ span.unaired b{ right:-2px } +#display-show .plotInfoNone, +#display-show .plotInfo{ + float:none; + top:-2px; + right:0 +} + .plotInfo{ cursor:help; } @@ -2019,6 +2101,14 @@ span.unaired b{ color:#000 } +#display-show .sickbeardTable{ + border-spacing:0 +} + +#display-show .sickbeardTable td{ + border-top:1px solid black +} + .sickbeardTable tr.header td, .sickbeardTable th{ color:#ddd; @@ -2076,8 +2166,7 @@ td.col-checkbox input[type="checkbox"]{ vertical-align:-2px } -th.col-metadata, -td.col-metadata{ +th.col-metadata{ width:28px } @@ -2125,11 +2214,28 @@ td.col-legend{ width:80px } +#display-show .tablesorter th.col-search{ + padding-right:4px +} + th.col-search, td.col-search{ width:46px } +td.col-search{ + font-size:10px +} + +.ep-search, +.ep-retry, +.ep-search img[src=""], +.ep-retry img[src=""]{ + display:inline-block; + width:16px; + height:16px +} + #testRenameTable tbody td.col-checkbox, #testRenameTable tbody td.col-ep{width:1%;vertical-align:middle} #testRenameTable tbody td.col-name{ @@ -3747,8 +3853,8 @@ input, textarea, select, .uneditable-input{ .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus, .back-art.pro.ii .navbar-default, -.dropdown-menu > li > a:hover, -.dropdown-menu > li > a:focus{ +.dropdown-menu li > a:hover, +.dropdown-menu li > a:focus{ background-image:none; text-decoration:none } @@ -3815,16 +3921,64 @@ fieldset[disabled] .navbar-default .btn-link:focus{ .component-group.bubblelist .item a img{vertical-align:bottom;opacity:0.65;filter:alpha(opacity=65)} .component-group.bubblelist .item a:hover img{opacity:1;filter:alpha(opacity=1)} -.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus{ +.dropdown-menu li > a{ + display:block; + padding:4px 20px; + clear:none; + font-weight:400 +} + +.dropdown-menu li > .history{ + width:70%; + display:inline-block; + padding-right:0 +} + +.dropdown-menu li > .history .sgicon-downloaded, +.dropdown-menu li > .history .sgicon-watched, +.dropdown-menu li > .history-sub [class^="sgicon-"]{ + margin:0 +} +.dropdown-menu li > .history .sgicon-failures{ + margin:0 2px 0 3px +} +.dropdown-menu li > .history .sgicon-downloaded, +.dropdown-menu li > .history .sgicon-watched, +.dropdown-menu li > .history .sgicon-failures, +.dropdown-menu li > .history-sub [class^="sgicon-"]{ + opacity:0.6;filter:alpha(opacity=0.6) +} +.dropdown-menu li > .history:hover .sgicon-downloaded, +.dropdown-menu li > .history:hover .sgicon-watched, +.dropdown-menu li > .history:hover .sgicon-failures, +.dropdown-menu li > .history-sub:hover [class^="sgicon-"]{ + opacity:1;filter:alpha(opacity=1) +} +.dropdown-menu li > .history-sub{ + width:28px; + padding:4px 7px; + float:right +} + +.dropdown-menu .added-last .truncate{ + max-width:135px +} + +.truncate{ + display:inline-block; + vertical-align:middle; + overflow:hidden; + white-space:nowrap; + -ms-text-overflow:ellipsis; + text-overflow:ellipsis +} + +.dropdown-menu li > a:hover, .dropdown-menu li > a:focus{ color:#262626; text-decoration:none; background-color:#f5f5f5 } -.dropdown-menu > li > a{ - padding:4px 20px -} - .dropdown-menu li.menu-item-noicon{ padding:0 0 0 20px } @@ -3841,6 +3995,19 @@ fieldset[disabled] .navbar-default .btn-link:focus{ box-shadow:0 6px 12px rgba(0, 0, 0, 0.176) } +.dropdown-menu #add-view{ + float:right; + padding:0 15px +} + +.dropdown-menu #add-view .paginate{ + font-size:0.7em +} + +.dropdown-menu .added-last{ + display:none +} + .img-trakt-16{background-image:url("../images/addshows/trakt16-black.png")} .img-imdb-16{background-image:url("../images/addshows/imdb16.png")} .img-anime-16{background-image:url("../images/addshows/anime16.png")} @@ -4377,7 +4544,7 @@ fieldset.sectionwrap{ border-width:0 } -.step-one #searchResults legend.legendStep{ +.step-one #search-results legend.legendStep{ margin-top:10px } @@ -4543,6 +4710,24 @@ tablesorter.css vertical-align:middle } +#display-show .tablesorter .tablesorter-header, +#display-show .tablesorter thead .tablesorter-headerDesc, +#display-show .tablesorter thead .tablesorter-headerAsc{background-image:none} +#display-show .tablesorter .tablesorter-header .hdr-text, +#display-show .tablesorter thead .tablesorter-headerDesc .hdr-text, +#display-show .tablesorter thead .tablesorter-headerAsc .hdr-text{margin-left:-8px;padding-left:18px;background:transparent no-repeat center left} +#display-show .tablesorter .tablesorter-header .hdr-text{background-image:url("data:image/gif;base64,R0lGODlhFQAJAIAAAP///////yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==")} +#display-show .tablesorter thead .tablesorter-headerDesc .hdr-text{background-image:url("data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7")} +#display-show .tablesorter thead .tablesorter-headerAsc .hdr-text{background-image:url("data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7")} + +#display-show .tablesorter .tablesorter-header{ + padding:4px 0 +} + +#display-show .tablesorter .tablesorter-header.col-name{ + padding-left:10px +} + .tablesorter .narrow.tablesorter-header{ padding:4px 18px 4px 4px } diff --git a/gui/slick/images/addshows/add-existing16-black.png b/gui/slick/images/addshows/add-existing16-black.png index 2d39c2a..755c7a5 100644 Binary files a/gui/slick/images/addshows/add-existing16-black.png and b/gui/slick/images/addshows/add-existing16-black.png differ diff --git a/gui/slick/images/addshows/add-existing32-black.png b/gui/slick/images/addshows/add-existing32-black.png index d27b714..d1003eb 100644 Binary files a/gui/slick/images/addshows/add-existing32-black.png and b/gui/slick/images/addshows/add-existing32-black.png differ diff --git a/gui/slick/images/addshows/add-existing32-white.png b/gui/slick/images/addshows/add-existing32-white.png index 61c732b..75c6a32 100644 Binary files a/gui/slick/images/addshows/add-existing32-white.png and b/gui/slick/images/addshows/add-existing32-white.png differ diff --git a/gui/slick/images/addshows/add-new32-black.png b/gui/slick/images/addshows/add-new32-black.png index 770671d..ab8cc0b 100644 Binary files a/gui/slick/images/addshows/add-new32-black.png and b/gui/slick/images/addshows/add-new32-black.png differ diff --git a/gui/slick/images/addshows/add-new32-white.png b/gui/slick/images/addshows/add-new32-white.png index 70bbf5d..c2cf61b 100644 Binary files a/gui/slick/images/addshows/add-new32-white.png and b/gui/slick/images/addshows/add-new32-white.png differ diff --git a/gui/slick/images/addshows/add-trakt32-black.png b/gui/slick/images/addshows/add-trakt32-black.png index 78b0210..b412b02 100644 Binary files a/gui/slick/images/addshows/add-trakt32-black.png and b/gui/slick/images/addshows/add-trakt32-black.png differ diff --git a/gui/slick/images/addshows/add-trakt32-white.png b/gui/slick/images/addshows/add-trakt32-white.png index 5ab5b21..be8d935 100644 Binary files a/gui/slick/images/addshows/add-trakt32-white.png and b/gui/slick/images/addshows/add-trakt32-white.png differ diff --git a/gui/slick/images/addshows/add-trending32-black.png b/gui/slick/images/addshows/add-trending32-black.png index 8f14e66..2d9ade1 100644 Binary files a/gui/slick/images/addshows/add-trending32-black.png and b/gui/slick/images/addshows/add-trending32-black.png differ diff --git a/gui/slick/images/addshows/add-trending32-white.png b/gui/slick/images/addshows/add-trending32-white.png index 5c5b460..5364ef8 100644 Binary files a/gui/slick/images/addshows/add-trending32-white.png and b/gui/slick/images/addshows/add-trending32-white.png differ diff --git a/gui/slick/images/arrows2.png b/gui/slick/images/arrows2.png index 5b3b9a5..1aa9d32 100644 Binary files a/gui/slick/images/arrows2.png and b/gui/slick/images/arrows2.png differ diff --git a/gui/slick/images/changelog16.png b/gui/slick/images/changelog16.png index 3f6807c..14f37d1 100644 Binary files a/gui/slick/images/changelog16.png and b/gui/slick/images/changelog16.png differ diff --git a/gui/slick/images/down-success.png b/gui/slick/images/down-success.png new file mode 100644 index 0000000..f67b390 Binary files /dev/null and b/gui/slick/images/down-success.png differ diff --git a/gui/slick/images/down-upgrade.png b/gui/slick/images/down-upgrade.png new file mode 100644 index 0000000..9295323 Binary files /dev/null and b/gui/slick/images/down-upgrade.png differ diff --git a/gui/slick/images/error16.png b/gui/slick/images/error16.png index d7d1952..7be1f17 100644 Binary files a/gui/slick/images/error16.png and b/gui/slick/images/error16.png differ diff --git a/gui/slick/images/glyphicons-halflings-white.png b/gui/slick/images/glyphicons-halflings-white.png index 2a369de..c3bf323 100644 Binary files a/gui/slick/images/glyphicons-halflings-white.png and b/gui/slick/images/glyphicons-halflings-white.png differ diff --git a/gui/slick/images/heart.png b/gui/slick/images/heart.png index 49bf81c..0e3bdd1 100644 Binary files a/gui/slick/images/heart.png and b/gui/slick/images/heart.png differ diff --git a/gui/slick/images/ico/favicon-16x16.png b/gui/slick/images/ico/favicon-16x16.png index 49e1c40..f882b05 100644 Binary files a/gui/slick/images/ico/favicon-16x16.png and b/gui/slick/images/ico/favicon-16x16.png differ diff --git a/gui/slick/images/loading16-red.gif b/gui/slick/images/loading16-red.gif new file mode 100644 index 0000000..1d032ec Binary files /dev/null and b/gui/slick/images/loading16-red.gif differ diff --git a/gui/slick/images/loading16_1C1F21.gif b/gui/slick/images/loading16_1C1F21.gif new file mode 100644 index 0000000..86dd8bf Binary files /dev/null and b/gui/slick/images/loading16_1C1F21.gif differ diff --git a/gui/slick/images/menu/system18-2.png b/gui/slick/images/menu/system18-2.png index dfd2dcd..97f6990 100644 Binary files a/gui/slick/images/menu/system18-2.png and b/gui/slick/images/menu/system18-2.png differ diff --git a/gui/slick/images/menu/system18.png b/gui/slick/images/menu/system18.png index fc3bbb0..55224ad 100644 Binary files a/gui/slick/images/menu/system18.png and b/gui/slick/images/menu/system18.png differ diff --git a/gui/slick/images/network/1live.png b/gui/slick/images/network/1live.png index bc743fa..a1c2f72 100644 Binary files a/gui/slick/images/network/1live.png and b/gui/slick/images/network/1live.png differ diff --git a/gui/slick/images/network/2be.png b/gui/slick/images/network/2be.png index aad036a..8d2f0b4 100644 Binary files a/gui/slick/images/network/2be.png and b/gui/slick/images/network/2be.png differ diff --git a/gui/slick/images/network/33.png b/gui/slick/images/network/33.png index d6d78e9..2954115 100644 Binary files a/gui/slick/images/network/33.png and b/gui/slick/images/network/33.png differ diff --git a/gui/slick/images/network/3sat.png b/gui/slick/images/network/3sat.png index 44ff9c4..37c6890 100644 Binary files a/gui/slick/images/network/3sat.png and b/gui/slick/images/network/3sat.png differ diff --git a/gui/slick/images/network/7mate.png b/gui/slick/images/network/7mate.png index c53a31a..c92c508 100644 Binary files a/gui/slick/images/network/7mate.png and b/gui/slick/images/network/7mate.png differ diff --git a/gui/slick/images/network/abc (australia).png b/gui/slick/images/network/abc (australia).png index ee320b3..28b5824 100644 Binary files a/gui/slick/images/network/abc (australia).png and b/gui/slick/images/network/abc (australia).png differ diff --git a/gui/slick/images/network/abc australia.png b/gui/slick/images/network/abc australia.png index ee320b3..28b5824 100644 Binary files a/gui/slick/images/network/abc australia.png and b/gui/slick/images/network/abc australia.png differ diff --git a/gui/slick/images/network/abc family.png b/gui/slick/images/network/abc family.png index 7a7d92f..dd890da 100644 Binary files a/gui/slick/images/network/abc family.png and b/gui/slick/images/network/abc family.png differ diff --git a/gui/slick/images/network/ahc.png b/gui/slick/images/network/ahc.png index 76b04b4..410a514 100644 Binary files a/gui/slick/images/network/ahc.png and b/gui/slick/images/network/ahc.png differ diff --git a/gui/slick/images/network/amazon.png b/gui/slick/images/network/amazon.png index ffa4f38..42e2b40 100644 Binary files a/gui/slick/images/network/amazon.png and b/gui/slick/images/network/amazon.png differ diff --git a/gui/slick/images/network/amc.png b/gui/slick/images/network/amc.png index e621625..8ef30db 100644 Binary files a/gui/slick/images/network/amc.png and b/gui/slick/images/network/amc.png differ diff --git a/gui/slick/images/network/animal planet.png b/gui/slick/images/network/animal planet.png index 22cf4f3..58c88b6 100644 Binary files a/gui/slick/images/network/animal planet.png and b/gui/slick/images/network/animal planet.png differ diff --git a/gui/slick/images/network/animax.png b/gui/slick/images/network/animax.png index f3a83a3..5c3bed4 100644 Binary files a/gui/slick/images/network/animax.png and b/gui/slick/images/network/animax.png differ diff --git a/gui/slick/images/network/antena 3.png b/gui/slick/images/network/antena 3.png index c01ab08..569f801 100644 Binary files a/gui/slick/images/network/antena 3.png and b/gui/slick/images/network/antena 3.png differ diff --git a/gui/slick/images/network/ard.png b/gui/slick/images/network/ard.png index 972adfb..849367f 100644 Binary files a/gui/slick/images/network/ard.png and b/gui/slick/images/network/ard.png differ diff --git a/gui/slick/images/network/arte.png b/gui/slick/images/network/arte.png index 29edda8..e5db57e 100644 Binary files a/gui/slick/images/network/arte.png and b/gui/slick/images/network/arte.png differ diff --git a/gui/slick/images/network/at-x.png b/gui/slick/images/network/at-x.png index ea27298..ff7a1b0 100644 Binary files a/gui/slick/images/network/at-x.png and b/gui/slick/images/network/at-x.png differ diff --git a/gui/slick/images/network/at5.png b/gui/slick/images/network/at5.png index 8269dca..0832882 100644 Binary files a/gui/slick/images/network/at5.png and b/gui/slick/images/network/at5.png differ diff --git a/gui/slick/images/network/avro.png b/gui/slick/images/network/avro.png index df69993..68779da 100644 Binary files a/gui/slick/images/network/avro.png and b/gui/slick/images/network/avro.png differ diff --git a/gui/slick/images/network/bandai visual.png b/gui/slick/images/network/bandai visual.png index 5507632..05f453d 100644 Binary files a/gui/slick/images/network/bandai visual.png and b/gui/slick/images/network/bandai visual.png differ diff --git a/gui/slick/images/network/bandai.png b/gui/slick/images/network/bandai.png index 581cab0..a4eb402 100644 Binary files a/gui/slick/images/network/bandai.png and b/gui/slick/images/network/bandai.png differ diff --git a/gui/slick/images/network/bbc america.png b/gui/slick/images/network/bbc america.png index 0226384..b0ededd 100644 Binary files a/gui/slick/images/network/bbc america.png and b/gui/slick/images/network/bbc america.png differ diff --git a/gui/slick/images/network/bbc canada.png b/gui/slick/images/network/bbc canada.png index 598d0ea..11ef742 100644 Binary files a/gui/slick/images/network/bbc canada.png and b/gui/slick/images/network/bbc canada.png differ diff --git a/gui/slick/images/network/bbc hd.png b/gui/slick/images/network/bbc hd.png index 3a6b3c3..f2a3e33 100644 Binary files a/gui/slick/images/network/bbc hd.png and b/gui/slick/images/network/bbc hd.png differ diff --git a/gui/slick/images/network/bio.png b/gui/slick/images/network/bio.png index 23072d4..4fd26fd 100644 Binary files a/gui/slick/images/network/bio.png and b/gui/slick/images/network/bio.png differ diff --git a/gui/slick/images/network/biography channel.png b/gui/slick/images/network/biography channel.png index 23072d4..4fd26fd 100644 Binary files a/gui/slick/images/network/biography channel.png and b/gui/slick/images/network/biography channel.png differ diff --git a/gui/slick/images/network/bloomberg.png b/gui/slick/images/network/bloomberg.png index 7d6e1dc..68d4057 100644 Binary files a/gui/slick/images/network/bloomberg.png and b/gui/slick/images/network/bloomberg.png differ diff --git a/gui/slick/images/network/bs11.png b/gui/slick/images/network/bs11.png index 51cdb9d..c6e6720 100644 Binary files a/gui/slick/images/network/bs11.png and b/gui/slick/images/network/bs11.png differ diff --git a/gui/slick/images/network/canal+.png b/gui/slick/images/network/canal+.png index 499ed8d..4af0a29 100644 Binary files a/gui/slick/images/network/canal+.png and b/gui/slick/images/network/canal+.png differ diff --git a/gui/slick/images/network/cbbc.png b/gui/slick/images/network/cbbc.png index 0b96fbb..20fb6f3 100644 Binary files a/gui/slick/images/network/cbbc.png and b/gui/slick/images/network/cbbc.png differ diff --git a/gui/slick/images/network/cbc.png b/gui/slick/images/network/cbc.png index f8b33e7..699a6f6 100644 Binary files a/gui/slick/images/network/cbc.png and b/gui/slick/images/network/cbc.png differ diff --git a/gui/slick/images/network/cbeebies.png b/gui/slick/images/network/cbeebies.png index e55bd5e..fc3a1a0 100644 Binary files a/gui/slick/images/network/cbeebies.png and b/gui/slick/images/network/cbeebies.png differ diff --git a/gui/slick/images/network/cbs.png b/gui/slick/images/network/cbs.png index 563a5ad..d061839 100644 Binary files a/gui/slick/images/network/cbs.png and b/gui/slick/images/network/cbs.png differ diff --git a/gui/slick/images/network/cctv.png b/gui/slick/images/network/cctv.png index 7d62fc5..0fb1c31 100644 Binary files a/gui/slick/images/network/cctv.png and b/gui/slick/images/network/cctv.png differ diff --git a/gui/slick/images/network/channel 4.png b/gui/slick/images/network/channel 4.png index 7e7006d..57befa1 100644 Binary files a/gui/slick/images/network/channel 4.png and b/gui/slick/images/network/channel 4.png differ diff --git a/gui/slick/images/network/cinemax.png b/gui/slick/images/network/cinemax.png index 7aee7a1..24d080c 100644 Binary files a/gui/slick/images/network/cinemax.png and b/gui/slick/images/network/cinemax.png differ diff --git a/gui/slick/images/network/cnn.png b/gui/slick/images/network/cnn.png index 4bea561..2b06149 100644 Binary files a/gui/slick/images/network/cnn.png and b/gui/slick/images/network/cnn.png differ diff --git a/gui/slick/images/network/comedy central hd.png b/gui/slick/images/network/comedy central hd.png index 6633118..457cbb3 100644 Binary files a/gui/slick/images/network/comedy central hd.png and b/gui/slick/images/network/comedy central hd.png differ diff --git a/gui/slick/images/network/comedy central.png b/gui/slick/images/network/comedy central.png index 6633118..457cbb3 100644 Binary files a/gui/slick/images/network/comedy central.png and b/gui/slick/images/network/comedy central.png differ diff --git a/gui/slick/images/network/cooking channel.png b/gui/slick/images/network/cooking channel.png index e97314c..3971359 100644 Binary files a/gui/slick/images/network/cooking channel.png and b/gui/slick/images/network/cooking channel.png differ diff --git a/gui/slick/images/network/crackle.png b/gui/slick/images/network/crackle.png index 77d5468..c4d482f 100644 Binary files a/gui/slick/images/network/crackle.png and b/gui/slick/images/network/crackle.png differ diff --git a/gui/slick/images/network/crime & investigation network.png b/gui/slick/images/network/crime & investigation network.png index b7394a5..f380595 100644 Binary files a/gui/slick/images/network/crime & investigation network.png and b/gui/slick/images/network/crime & investigation network.png differ diff --git a/gui/slick/images/network/crime and investigation network.png b/gui/slick/images/network/crime and investigation network.png index b7394a5..f380595 100644 Binary files a/gui/slick/images/network/crime and investigation network.png and b/gui/slick/images/network/crime and investigation network.png differ diff --git a/gui/slick/images/network/ctc.png b/gui/slick/images/network/ctc.png index 7a62fb7..c9d3b46 100644 Binary files a/gui/slick/images/network/ctc.png and b/gui/slick/images/network/ctc.png differ diff --git a/gui/slick/images/network/dave.png b/gui/slick/images/network/dave.png index f8289c8..6d4088a 100644 Binary files a/gui/slick/images/network/dave.png and b/gui/slick/images/network/dave.png differ diff --git a/gui/slick/images/network/discovery channel.png b/gui/slick/images/network/discovery channel.png index 83e886f..7baa530 100644 Binary files a/gui/slick/images/network/discovery channel.png and b/gui/slick/images/network/discovery channel.png differ diff --git a/gui/slick/images/network/discovery kids.png b/gui/slick/images/network/discovery kids.png index 81e7063..fd85ebc 100644 Binary files a/gui/slick/images/network/discovery kids.png and b/gui/slick/images/network/discovery kids.png differ diff --git a/gui/slick/images/network/discovery real time.png b/gui/slick/images/network/discovery real time.png index 35ec2bd..0874de1 100644 Binary files a/gui/slick/images/network/discovery real time.png and b/gui/slick/images/network/discovery real time.png differ diff --git a/gui/slick/images/network/discovery science.png b/gui/slick/images/network/discovery science.png index 759dbcd..917e498 100644 Binary files a/gui/slick/images/network/discovery science.png and b/gui/slick/images/network/discovery science.png differ diff --git a/gui/slick/images/network/discovery.png b/gui/slick/images/network/discovery.png index 2601a03..7baa530 100644 Binary files a/gui/slick/images/network/discovery.png and b/gui/slick/images/network/discovery.png differ diff --git a/gui/slick/images/network/disney channel.png b/gui/slick/images/network/disney channel.png index df415d2..2cf0c64 100644 Binary files a/gui/slick/images/network/disney channel.png and b/gui/slick/images/network/disney channel.png differ diff --git a/gui/slick/images/network/disney xd.png b/gui/slick/images/network/disney xd.png index 1708e5d..b29555e 100644 Binary files a/gui/slick/images/network/disney xd.png and b/gui/slick/images/network/disney xd.png differ diff --git a/gui/slick/images/network/disney.png b/gui/slick/images/network/disney.png index df415d2..2cf0c64 100644 Binary files a/gui/slick/images/network/disney.png and b/gui/slick/images/network/disney.png differ diff --git a/gui/slick/images/network/diy network.png b/gui/slick/images/network/diy network.png index db6dc25..ce62e7b 100644 Binary files a/gui/slick/images/network/diy network.png and b/gui/slick/images/network/diy network.png differ diff --git a/gui/slick/images/network/dmax.png b/gui/slick/images/network/dmax.png index 782d565..0b3202a 100644 Binary files a/gui/slick/images/network/dmax.png and b/gui/slick/images/network/dmax.png differ diff --git a/gui/slick/images/network/dr1.png b/gui/slick/images/network/dr1.png index d24521c..55b2d42 100644 Binary files a/gui/slick/images/network/dr1.png and b/gui/slick/images/network/dr1.png differ diff --git a/gui/slick/images/network/dr2.png b/gui/slick/images/network/dr2.png index 4ae0ab2..4459099 100644 Binary files a/gui/slick/images/network/dr2.png and b/gui/slick/images/network/dr2.png differ diff --git a/gui/slick/images/network/e!.png b/gui/slick/images/network/e!.png index 2cac23a..a6fa502 100644 Binary files a/gui/slick/images/network/e!.png and b/gui/slick/images/network/e!.png differ diff --git a/gui/slick/images/network/e4.png b/gui/slick/images/network/e4.png index dcc0834..855742d 100644 Binary files a/gui/slick/images/network/e4.png and b/gui/slick/images/network/e4.png differ diff --git a/gui/slick/images/network/een.png b/gui/slick/images/network/een.png index 464c270..4716247 100644 Binary files a/gui/slick/images/network/een.png and b/gui/slick/images/network/een.png differ diff --git a/gui/slick/images/network/einslive.png b/gui/slick/images/network/einslive.png index bc743fa..a1c2f72 100644 Binary files a/gui/slick/images/network/einslive.png and b/gui/slick/images/network/einslive.png differ diff --git a/gui/slick/images/network/el rey network.png b/gui/slick/images/network/el rey network.png index c5ee7b3..3bd42b5 100644 Binary files a/gui/slick/images/network/el rey network.png and b/gui/slick/images/network/el rey network.png differ diff --git a/gui/slick/images/network/endemol.png b/gui/slick/images/network/endemol.png index 66e8b31..9d74bb3 100644 Binary files a/gui/slick/images/network/endemol.png and b/gui/slick/images/network/endemol.png differ diff --git a/gui/slick/images/network/entertainment.png b/gui/slick/images/network/entertainment.png index 2cac23a..a6fa502 100644 Binary files a/gui/slick/images/network/entertainment.png and b/gui/slick/images/network/entertainment.png differ diff --git a/gui/slick/images/network/eredivisie live 1.png b/gui/slick/images/network/eredivisie live 1.png index 55f8b4a..bdd83c3 100644 Binary files a/gui/slick/images/network/eredivisie live 1.png and b/gui/slick/images/network/eredivisie live 1.png differ diff --git a/gui/slick/images/network/eredivisie live 2.png b/gui/slick/images/network/eredivisie live 2.png index 55f8b4a..bdd83c3 100644 Binary files a/gui/slick/images/network/eredivisie live 2.png and b/gui/slick/images/network/eredivisie live 2.png differ diff --git a/gui/slick/images/network/eredivisie live.png b/gui/slick/images/network/eredivisie live.png index 55f8b4a..bdd83c3 100644 Binary files a/gui/slick/images/network/eredivisie live.png and b/gui/slick/images/network/eredivisie live.png differ diff --git a/gui/slick/images/network/espn.png b/gui/slick/images/network/espn.png index 1b525ef..5b570b5 100644 Binary files a/gui/slick/images/network/espn.png and b/gui/slick/images/network/espn.png differ diff --git a/gui/slick/images/network/esquire network.png b/gui/slick/images/network/esquire network.png index 78b3af5..ca99bdb 100644 Binary files a/gui/slick/images/network/esquire network.png and b/gui/slick/images/network/esquire network.png differ diff --git a/gui/slick/images/network/eurosport 1.png b/gui/slick/images/network/eurosport 1.png index 0d18283..66237df 100644 Binary files a/gui/slick/images/network/eurosport 1.png and b/gui/slick/images/network/eurosport 1.png differ diff --git a/gui/slick/images/network/eurosport 2.png b/gui/slick/images/network/eurosport 2.png index 0d18283..66237df 100644 Binary files a/gui/slick/images/network/eurosport 2.png and b/gui/slick/images/network/eurosport 2.png differ diff --git a/gui/slick/images/network/eurosport hd.png b/gui/slick/images/network/eurosport hd.png index 0d18283..66237df 100644 Binary files a/gui/slick/images/network/eurosport hd.png and b/gui/slick/images/network/eurosport hd.png differ diff --git a/gui/slick/images/network/eurosport.png b/gui/slick/images/network/eurosport.png index 0d18283..66237df 100644 Binary files a/gui/slick/images/network/eurosport.png and b/gui/slick/images/network/eurosport.png differ diff --git a/gui/slick/images/network/fox channel.png b/gui/slick/images/network/fox channel.png index ef7f5c6..e2c595d 100644 Binary files a/gui/slick/images/network/fox channel.png and b/gui/slick/images/network/fox channel.png differ diff --git a/gui/slick/images/network/fox television classics.png b/gui/slick/images/network/fox television classics.png index e472d9c..74c854c 100644 Binary files a/gui/slick/images/network/fox television classics.png and b/gui/slick/images/network/fox television classics.png differ diff --git a/gui/slick/images/network/france 2.png b/gui/slick/images/network/france 2.png index dbff096..4f5578f 100644 Binary files a/gui/slick/images/network/france 2.png and b/gui/slick/images/network/france 2.png differ diff --git a/gui/slick/images/network/france 3.png b/gui/slick/images/network/france 3.png index 9fcfd1e..abe4845 100644 Binary files a/gui/slick/images/network/france 3.png and b/gui/slick/images/network/france 3.png differ diff --git a/gui/slick/images/network/fuji tv.png b/gui/slick/images/network/fuji tv.png index 92cc255..b71ea5e 100644 Binary files a/gui/slick/images/network/fuji tv.png and b/gui/slick/images/network/fuji tv.png differ diff --git a/gui/slick/images/network/funimation.png b/gui/slick/images/network/funimation.png index dd531ec..8c64656 100644 Binary files a/gui/slick/images/network/funimation.png and b/gui/slick/images/network/funimation.png differ diff --git a/gui/slick/images/network/fx.png b/gui/slick/images/network/fx.png index a6ad70c..f39249e 100644 Binary files a/gui/slick/images/network/fx.png and b/gui/slick/images/network/fx.png differ diff --git a/gui/slick/images/network/fxx.png b/gui/slick/images/network/fxx.png index 54863a7..c551e44 100644 Binary files a/gui/slick/images/network/fxx.png and b/gui/slick/images/network/fxx.png differ diff --git a/gui/slick/images/network/g4.png b/gui/slick/images/network/g4.png index 1df370a..2a142a2 100644 Binary files a/gui/slick/images/network/g4.png and b/gui/slick/images/network/g4.png differ diff --git a/gui/slick/images/network/game show network.png b/gui/slick/images/network/game show network.png index b151771..c4cf2bd 100644 Binary files a/gui/slick/images/network/game show network.png and b/gui/slick/images/network/game show network.png differ diff --git a/gui/slick/images/network/great american country.png b/gui/slick/images/network/great american country.png index c856001..57bb957 100644 Binary files a/gui/slick/images/network/great american country.png and b/gui/slick/images/network/great american country.png differ diff --git a/gui/slick/images/network/hdnet.png b/gui/slick/images/network/hdnet.png index 3ad69b8..9629de8 100644 Binary files a/gui/slick/images/network/hdnet.png and b/gui/slick/images/network/hdnet.png differ diff --git a/gui/slick/images/network/hgtv canada.png b/gui/slick/images/network/hgtv canada.png index 6e64a5d..6cb5391 100644 Binary files a/gui/slick/images/network/hgtv canada.png and b/gui/slick/images/network/hgtv canada.png differ diff --git a/gui/slick/images/network/hgtv.png b/gui/slick/images/network/hgtv.png index 86ee82b..a5b8135 100644 Binary files a/gui/slick/images/network/hgtv.png and b/gui/slick/images/network/hgtv.png differ diff --git a/gui/slick/images/network/history.png b/gui/slick/images/network/history.png index a2d4b25..4a2c202 100644 Binary files a/gui/slick/images/network/history.png and b/gui/slick/images/network/history.png differ diff --git a/gui/slick/images/network/hulu presents.png b/gui/slick/images/network/hulu presents.png index b42b43d..7397994 100644 Binary files a/gui/slick/images/network/hulu presents.png and b/gui/slick/images/network/hulu presents.png differ diff --git a/gui/slick/images/network/hulu.png b/gui/slick/images/network/hulu.png index b42b43d..7397994 100644 Binary files a/gui/slick/images/network/hulu.png and b/gui/slick/images/network/hulu.png differ diff --git a/gui/slick/images/network/investigation discovery.png b/gui/slick/images/network/investigation discovery.png index 084a315..d88931e 100644 Binary files a/gui/slick/images/network/investigation discovery.png and b/gui/slick/images/network/investigation discovery.png differ diff --git a/gui/slick/images/network/itv.png b/gui/slick/images/network/itv.png index 5fd35ab..75d3eb2 100644 Binary files a/gui/slick/images/network/itv.png and b/gui/slick/images/network/itv.png differ diff --git a/gui/slick/images/network/itv1.png b/gui/slick/images/network/itv1.png index 5fd35ab..75d3eb2 100644 Binary files a/gui/slick/images/network/itv1.png and b/gui/slick/images/network/itv1.png differ diff --git a/gui/slick/images/network/kro.png b/gui/slick/images/network/kro.png index 3af8647..2878f6f 100644 Binary files a/gui/slick/images/network/kro.png and b/gui/slick/images/network/kro.png differ diff --git a/gui/slick/images/network/la1.png b/gui/slick/images/network/la1.png index 4afdab2..f7e3fa6 100644 Binary files a/gui/slick/images/network/la1.png and b/gui/slick/images/network/la1.png differ diff --git a/gui/slick/images/network/la2.png b/gui/slick/images/network/la2.png index a016440..de91dc0 100644 Binary files a/gui/slick/images/network/la2.png and b/gui/slick/images/network/la2.png differ diff --git a/gui/slick/images/network/lasexta.png b/gui/slick/images/network/lasexta.png index a558cdf..935501b 100644 Binary files a/gui/slick/images/network/lasexta.png and b/gui/slick/images/network/lasexta.png differ diff --git a/gui/slick/images/network/lmn.png b/gui/slick/images/network/lmn.png index 95d6ce7..de6fcbb 100644 Binary files a/gui/slick/images/network/lmn.png and b/gui/slick/images/network/lmn.png differ diff --git a/gui/slick/images/network/m6.png b/gui/slick/images/network/m6.png index cb6634c..d65bc34 100644 Binary files a/gui/slick/images/network/m6.png and b/gui/slick/images/network/m6.png differ diff --git a/gui/slick/images/network/manhattan neighborhood network.png b/gui/slick/images/network/manhattan neighborhood network.png index 65f53b0..bdf7df9 100644 Binary files a/gui/slick/images/network/manhattan neighborhood network.png and b/gui/slick/images/network/manhattan neighborhood network.png differ diff --git a/gui/slick/images/network/mbs.png b/gui/slick/images/network/mbs.png index 56a15fb..44176e1 100644 Binary files a/gui/slick/images/network/mbs.png and b/gui/slick/images/network/mbs.png differ diff --git a/gui/slick/images/network/mdr.png b/gui/slick/images/network/mdr.png index c7f3ec8..a7f8b78 100644 Binary files a/gui/slick/images/network/mdr.png and b/gui/slick/images/network/mdr.png differ diff --git a/gui/slick/images/network/motorvision tv.png b/gui/slick/images/network/motorvision tv.png index f85768e..26b542c 100644 Binary files a/gui/slick/images/network/motorvision tv.png and b/gui/slick/images/network/motorvision tv.png differ diff --git a/gui/slick/images/network/mtv2.png b/gui/slick/images/network/mtv2.png index 00fef6c..b1790f6 100644 Binary files a/gui/slick/images/network/mtv2.png and b/gui/slick/images/network/mtv2.png differ diff --git a/gui/slick/images/network/nat geo wild.png b/gui/slick/images/network/nat geo wild.png index b672a8c..f75ff2a 100644 Binary files a/gui/slick/images/network/nat geo wild.png and b/gui/slick/images/network/nat geo wild.png differ diff --git a/gui/slick/images/network/national geographic.png b/gui/slick/images/network/national geographic.png index 99088c7..cb6457e 100644 Binary files a/gui/slick/images/network/national geographic.png and b/gui/slick/images/network/national geographic.png differ diff --git a/gui/slick/images/network/nbc.png b/gui/slick/images/network/nbc.png index 4f812b1..f454dde 100644 Binary files a/gui/slick/images/network/nbc.png and b/gui/slick/images/network/nbc.png differ diff --git a/gui/slick/images/network/nbcu tv.png b/gui/slick/images/network/nbcu tv.png index 4f812b1..f454dde 100644 Binary files a/gui/slick/images/network/nbcu tv.png and b/gui/slick/images/network/nbcu tv.png differ diff --git a/gui/slick/images/network/ndr.png b/gui/slick/images/network/ndr.png index c8af131..45c28eb 100644 Binary files a/gui/slick/images/network/ndr.png and b/gui/slick/images/network/ndr.png differ diff --git a/gui/slick/images/network/netflix.png b/gui/slick/images/network/netflix.png index 0f3da84..598d87c 100644 Binary files a/gui/slick/images/network/netflix.png and b/gui/slick/images/network/netflix.png differ diff --git a/gui/slick/images/network/ngc.png b/gui/slick/images/network/ngc.png index 99088c7..cb6457e 100644 Binary files a/gui/slick/images/network/ngc.png and b/gui/slick/images/network/ngc.png differ diff --git a/gui/slick/images/network/nhk.png b/gui/slick/images/network/nhk.png index a282ced..a012435 100644 Binary files a/gui/slick/images/network/nhk.png and b/gui/slick/images/network/nhk.png differ diff --git a/gui/slick/images/network/nick at nite.png b/gui/slick/images/network/nick at nite.png index efbdd4d..1458149 100644 Binary files a/gui/slick/images/network/nick at nite.png and b/gui/slick/images/network/nick at nite.png differ diff --git a/gui/slick/images/network/nickelodeon.png b/gui/slick/images/network/nickelodeon.png index 45a4d67..43ca2b1 100644 Binary files a/gui/slick/images/network/nickelodeon.png and b/gui/slick/images/network/nickelodeon.png differ diff --git a/gui/slick/images/network/nicktoons network.png b/gui/slick/images/network/nicktoons network.png index 45a4d67..43ca2b1 100644 Binary files a/gui/slick/images/network/nicktoons network.png and b/gui/slick/images/network/nicktoons network.png differ diff --git a/gui/slick/images/network/niconico.png b/gui/slick/images/network/niconico.png index 1dfc1ff..d0fff95 100644 Binary files a/gui/slick/images/network/niconico.png and b/gui/slick/images/network/niconico.png differ diff --git a/gui/slick/images/network/nonetwork.png b/gui/slick/images/network/nonetwork.png index a5918a7..15702ff 100644 Binary files a/gui/slick/images/network/nonetwork.png and b/gui/slick/images/network/nonetwork.png differ diff --git a/gui/slick/images/network/ntv.png b/gui/slick/images/network/ntv.png index 79a2b5f..21817b5 100644 Binary files a/gui/slick/images/network/ntv.png and b/gui/slick/images/network/ntv.png differ diff --git a/gui/slick/images/network/omroep max.png b/gui/slick/images/network/omroep max.png index 36cf31d..cd66e69 100644 Binary files a/gui/slick/images/network/omroep max.png and b/gui/slick/images/network/omroep max.png differ diff --git a/gui/slick/images/network/orf.png b/gui/slick/images/network/orf.png index 2be5b60..f78a904 100644 Binary files a/gui/slick/images/network/orf.png and b/gui/slick/images/network/orf.png differ diff --git a/gui/slick/images/network/orf1 hd.png b/gui/slick/images/network/orf1 hd.png index 2be5b60..f78a904 100644 Binary files a/gui/slick/images/network/orf1 hd.png and b/gui/slick/images/network/orf1 hd.png differ diff --git a/gui/slick/images/network/pay-per-view.png b/gui/slick/images/network/pay-per-view.png index f093a72..93de9d2 100644 Binary files a/gui/slick/images/network/pay-per-view.png and b/gui/slick/images/network/pay-per-view.png differ diff --git a/gui/slick/images/network/playstation network.png b/gui/slick/images/network/playstation network.png index b15e504..699a787 100644 Binary files a/gui/slick/images/network/playstation network.png and b/gui/slick/images/network/playstation network.png differ diff --git a/gui/slick/images/network/pro7.png b/gui/slick/images/network/pro7.png index 979902c..921abcf 100644 Binary files a/gui/slick/images/network/pro7.png and b/gui/slick/images/network/pro7.png differ diff --git a/gui/slick/images/network/production i.g.png b/gui/slick/images/network/production i.g.png index dc2c913..6a2e587 100644 Binary files a/gui/slick/images/network/production i.g.png and b/gui/slick/images/network/production i.g.png differ diff --git a/gui/slick/images/network/radio west.png b/gui/slick/images/network/radio west.png index cb73708..0799a7d 100644 Binary files a/gui/slick/images/network/radio west.png and b/gui/slick/images/network/radio west.png differ diff --git a/gui/slick/images/network/rooster teeth.png b/gui/slick/images/network/rooster teeth.png index f9cdecf..3bfa5a5 100644 Binary files a/gui/slick/images/network/rooster teeth.png and b/gui/slick/images/network/rooster teeth.png differ diff --git a/gui/slick/images/network/rte one.png b/gui/slick/images/network/rte one.png index c723ef9..9cc103b 100644 Binary files a/gui/slick/images/network/rte one.png and b/gui/slick/images/network/rte one.png differ diff --git a/gui/slick/images/network/rtl 4.png b/gui/slick/images/network/rtl 4.png index 7b29353..1d24d46 100644 Binary files a/gui/slick/images/network/rtl 4.png and b/gui/slick/images/network/rtl 4.png differ diff --git a/gui/slick/images/network/rtl 5.png b/gui/slick/images/network/rtl 5.png index 174d8f8..c470121 100644 Binary files a/gui/slick/images/network/rtl 5.png and b/gui/slick/images/network/rtl 5.png differ diff --git a/gui/slick/images/network/rtl 7.png b/gui/slick/images/network/rtl 7.png index a53f92f..1220baf 100644 Binary files a/gui/slick/images/network/rtl 7.png and b/gui/slick/images/network/rtl 7.png differ diff --git a/gui/slick/images/network/rtl 8.png b/gui/slick/images/network/rtl 8.png index 6c6da6a..7c080c4 100644 Binary files a/gui/slick/images/network/rtl 8.png and b/gui/slick/images/network/rtl 8.png differ diff --git a/gui/slick/images/network/rtl television.png b/gui/slick/images/network/rtl television.png index 6844f8f..a616c76 100644 Binary files a/gui/slick/images/network/rtl television.png and b/gui/slick/images/network/rtl television.png differ diff --git a/gui/slick/images/network/rtl4.png b/gui/slick/images/network/rtl4.png index 7b29353..1d24d46 100644 Binary files a/gui/slick/images/network/rtl4.png and b/gui/slick/images/network/rtl4.png differ diff --git a/gui/slick/images/network/rtl5.png b/gui/slick/images/network/rtl5.png index 174d8f8..c470121 100644 Binary files a/gui/slick/images/network/rtl5.png and b/gui/slick/images/network/rtl5.png differ diff --git a/gui/slick/images/network/rtl7.png b/gui/slick/images/network/rtl7.png index a53f92f..1220baf 100644 Binary files a/gui/slick/images/network/rtl7.png and b/gui/slick/images/network/rtl7.png differ diff --git a/gui/slick/images/network/rtl8.png b/gui/slick/images/network/rtl8.png index 6c6da6a..7c080c4 100644 Binary files a/gui/slick/images/network/rtl8.png and b/gui/slick/images/network/rtl8.png differ diff --git a/gui/slick/images/network/sat1.png b/gui/slick/images/network/sat1.png index 5ad0fa3..7c0a2dd 100644 Binary files a/gui/slick/images/network/sat1.png and b/gui/slick/images/network/sat1.png differ diff --git a/gui/slick/images/network/sbs australia.png b/gui/slick/images/network/sbs australia.png index 971b04b..0dba1d0 100644 Binary files a/gui/slick/images/network/sbs australia.png and b/gui/slick/images/network/sbs australia.png differ diff --git a/gui/slick/images/network/sbs.png b/gui/slick/images/network/sbs.png index 971b04b..0dba1d0 100644 Binary files a/gui/slick/images/network/sbs.png and b/gui/slick/images/network/sbs.png differ diff --git a/gui/slick/images/network/science channel.png b/gui/slick/images/network/science channel.png index 759dbcd..917e498 100644 Binary files a/gui/slick/images/network/science channel.png and b/gui/slick/images/network/science channel.png differ diff --git a/gui/slick/images/network/scifi.png b/gui/slick/images/network/scifi.png index fd5ce1d..665c4e6 100644 Binary files a/gui/slick/images/network/scifi.png and b/gui/slick/images/network/scifi.png differ diff --git a/gui/slick/images/network/seven network.png b/gui/slick/images/network/seven network.png index fd035eb..eaeb27b 100644 Binary files a/gui/slick/images/network/seven network.png and b/gui/slick/images/network/seven network.png differ diff --git a/gui/slick/images/network/showcase.png b/gui/slick/images/network/showcase.png index 5ae62e0..852eea5 100644 Binary files a/gui/slick/images/network/showcase.png and b/gui/slick/images/network/showcase.png differ diff --git a/gui/slick/images/network/showtime.png b/gui/slick/images/network/showtime.png index 330ba9d..5173f03 100644 Binary files a/gui/slick/images/network/showtime.png and b/gui/slick/images/network/showtime.png differ diff --git a/gui/slick/images/network/sky atlantic.png b/gui/slick/images/network/sky atlantic.png index 46dc638..8417a16 100644 Binary files a/gui/slick/images/network/sky atlantic.png and b/gui/slick/images/network/sky atlantic.png differ diff --git a/gui/slick/images/network/sky.png b/gui/slick/images/network/sky.png index f15e36d..5076f68 100644 Binary files a/gui/slick/images/network/sky.png and b/gui/slick/images/network/sky.png differ diff --git a/gui/slick/images/network/sky1.png b/gui/slick/images/network/sky1.png index 209755e..e46522b 100644 Binary files a/gui/slick/images/network/sky1.png and b/gui/slick/images/network/sky1.png differ diff --git a/gui/slick/images/network/smithsonian channel.png b/gui/slick/images/network/smithsonian channel.png index 4b88af1..5fc63e1 100644 Binary files a/gui/slick/images/network/smithsonian channel.png and b/gui/slick/images/network/smithsonian channel.png differ diff --git a/gui/slick/images/network/space.png b/gui/slick/images/network/space.png index 77e218d..c03106c 100644 Binary files a/gui/slick/images/network/space.png and b/gui/slick/images/network/space.png differ diff --git a/gui/slick/images/network/speed channel.png b/gui/slick/images/network/speed channel.png index 5b7edbd..4a62673 100644 Binary files a/gui/slick/images/network/speed channel.png and b/gui/slick/images/network/speed channel.png differ diff --git a/gui/slick/images/network/starz!.png b/gui/slick/images/network/starz!.png index 5ceed05..a3948b7 100644 Binary files a/gui/slick/images/network/starz!.png and b/gui/slick/images/network/starz!.png differ diff --git a/gui/slick/images/network/starz.png b/gui/slick/images/network/starz.png index 5ceed05..a3948b7 100644 Binary files a/gui/slick/images/network/starz.png and b/gui/slick/images/network/starz.png differ diff --git a/gui/slick/images/network/style network.png b/gui/slick/images/network/style network.png index 5c80a91..5c8436a 100644 Binary files a/gui/slick/images/network/style network.png and b/gui/slick/images/network/style network.png differ diff --git a/gui/slick/images/network/sunrise.png b/gui/slick/images/network/sunrise.png index 0e31f6f..d919e3e 100644 Binary files a/gui/slick/images/network/sunrise.png and b/gui/slick/images/network/sunrise.png differ diff --git a/gui/slick/images/network/super channel.png b/gui/slick/images/network/super channel.png index 33ae078..c690471 100644 Binary files a/gui/slick/images/network/super channel.png and b/gui/slick/images/network/super channel.png differ diff --git a/gui/slick/images/network/syndicated.png b/gui/slick/images/network/syndicated.png index feff12c..755a176 100644 Binary files a/gui/slick/images/network/syndicated.png and b/gui/slick/images/network/syndicated.png differ diff --git a/gui/slick/images/network/telecinco.png b/gui/slick/images/network/telecinco.png index 955b47a..0b13d15 100644 Binary files a/gui/slick/images/network/telecinco.png and b/gui/slick/images/network/telecinco.png differ diff --git a/gui/slick/images/network/teletoon.png b/gui/slick/images/network/teletoon.png index c9a86ad..1cc5c57 100644 Binary files a/gui/slick/images/network/teletoon.png and b/gui/slick/images/network/teletoon.png differ diff --git a/gui/slick/images/network/the discovery channel.png b/gui/slick/images/network/the discovery channel.png index 3765c50..7baa530 100644 Binary files a/gui/slick/images/network/the discovery channel.png and b/gui/slick/images/network/the discovery channel.png differ diff --git a/gui/slick/images/network/the hub.png b/gui/slick/images/network/the hub.png index 34e5e0f..f30e88e 100644 Binary files a/gui/slick/images/network/the hub.png and b/gui/slick/images/network/the hub.png differ diff --git a/gui/slick/images/network/the movie network.png b/gui/slick/images/network/the movie network.png index 836ba84..2fb21a1 100644 Binary files a/gui/slick/images/network/the movie network.png and b/gui/slick/images/network/the movie network.png differ diff --git a/gui/slick/images/network/the science channel.png b/gui/slick/images/network/the science channel.png index 759dbcd..917e498 100644 Binary files a/gui/slick/images/network/the science channel.png and b/gui/slick/images/network/the science channel.png differ diff --git a/gui/slick/images/network/the wb.png b/gui/slick/images/network/the wb.png index b575a09..2dabe32 100644 Binary files a/gui/slick/images/network/the wb.png and b/gui/slick/images/network/the wb.png differ diff --git a/gui/slick/images/network/tlc.png b/gui/slick/images/network/tlc.png index c48a68e..9d2c1b8 100644 Binary files a/gui/slick/images/network/tlc.png and b/gui/slick/images/network/tlc.png differ diff --git a/gui/slick/images/network/tmf.png b/gui/slick/images/network/tmf.png index 8fc18f0..43170d5 100644 Binary files a/gui/slick/images/network/tmf.png and b/gui/slick/images/network/tmf.png differ diff --git a/gui/slick/images/network/toei animation.png b/gui/slick/images/network/toei animation.png index 66b7aa8..4453fe3 100644 Binary files a/gui/slick/images/network/toei animation.png and b/gui/slick/images/network/toei animation.png differ diff --git a/gui/slick/images/network/toon disney.png b/gui/slick/images/network/toon disney.png index 696ad7d..10f284c 100644 Binary files a/gui/slick/images/network/toon disney.png and b/gui/slick/images/network/toon disney.png differ diff --git a/gui/slick/images/network/travel channel.png b/gui/slick/images/network/travel channel.png index b65d1c8..37ab809 100644 Binary files a/gui/slick/images/network/travel channel.png and b/gui/slick/images/network/travel channel.png differ diff --git a/gui/slick/images/network/tros.png b/gui/slick/images/network/tros.png index 5dcdb13..1b8d82a 100644 Binary files a/gui/slick/images/network/tros.png and b/gui/slick/images/network/tros.png differ diff --git a/gui/slick/images/network/tv 2.png b/gui/slick/images/network/tv 2.png index b73a2a9..5eda16f 100644 Binary files a/gui/slick/images/network/tv 2.png and b/gui/slick/images/network/tv 2.png differ diff --git a/gui/slick/images/network/tv asahi.png b/gui/slick/images/network/tv asahi.png index ef2e2db..20e3447 100644 Binary files a/gui/slick/images/network/tv asahi.png and b/gui/slick/images/network/tv asahi.png differ diff --git a/gui/slick/images/network/tv guide.png b/gui/slick/images/network/tv guide.png index 81c7652..f1ffd13 100644 Binary files a/gui/slick/images/network/tv guide.png and b/gui/slick/images/network/tv guide.png differ diff --git a/gui/slick/images/network/tv saitama.png b/gui/slick/images/network/tv saitama.png index dece55b..5cd1eef 100644 Binary files a/gui/slick/images/network/tv saitama.png and b/gui/slick/images/network/tv saitama.png differ diff --git a/gui/slick/images/network/tv tokyo.png b/gui/slick/images/network/tv tokyo.png index e80d4ca..7bc9f7a 100644 Binary files a/gui/slick/images/network/tv tokyo.png and b/gui/slick/images/network/tv tokyo.png differ diff --git a/gui/slick/images/network/tv west.png b/gui/slick/images/network/tv west.png index cb73708..0799a7d 100644 Binary files a/gui/slick/images/network/tv west.png and b/gui/slick/images/network/tv west.png differ diff --git a/gui/slick/images/network/tv2.png b/gui/slick/images/network/tv2.png index b73a2a9..5eda16f 100644 Binary files a/gui/slick/images/network/tv2.png and b/gui/slick/images/network/tv2.png differ diff --git a/gui/slick/images/network/tv3.png b/gui/slick/images/network/tv3.png index 322818a..451f5da 100644 Binary files a/gui/slick/images/network/tv3.png and b/gui/slick/images/network/tv3.png differ diff --git a/gui/slick/images/network/tv7.png b/gui/slick/images/network/tv7.png index d5bb6df..7992fae 100644 Binary files a/gui/slick/images/network/tv7.png and b/gui/slick/images/network/tv7.png differ diff --git a/gui/slick/images/network/tve.png b/gui/slick/images/network/tve.png index 4afdab2..f7e3fa6 100644 Binary files a/gui/slick/images/network/tve.png and b/gui/slick/images/network/tve.png differ diff --git a/gui/slick/images/network/tve1.png b/gui/slick/images/network/tve1.png index 4afdab2..f7e3fa6 100644 Binary files a/gui/slick/images/network/tve1.png and b/gui/slick/images/network/tve1.png differ diff --git a/gui/slick/images/network/upn.png b/gui/slick/images/network/upn.png index 41e4502..743a5f5 100644 Binary files a/gui/slick/images/network/upn.png and b/gui/slick/images/network/upn.png differ diff --git a/gui/slick/images/network/usa network.png b/gui/slick/images/network/usa network.png index 718f892..3bd2d9e 100644 Binary files a/gui/slick/images/network/usa network.png and b/gui/slick/images/network/usa network.png differ diff --git a/gui/slick/images/network/usa.png b/gui/slick/images/network/usa.png index 718f892..3bd2d9e 100644 Binary files a/gui/slick/images/network/usa.png and b/gui/slick/images/network/usa.png differ diff --git a/gui/slick/images/network/vara.png b/gui/slick/images/network/vara.png index 3f092cc..423f0de 100644 Binary files a/gui/slick/images/network/vara.png and b/gui/slick/images/network/vara.png differ diff --git a/gui/slick/images/network/velocity.png b/gui/slick/images/network/velocity.png index ff4700e..a3f5cdf 100644 Binary files a/gui/slick/images/network/velocity.png and b/gui/slick/images/network/velocity.png differ diff --git a/gui/slick/images/network/veronica.png b/gui/slick/images/network/veronica.png index 97dd7a5..d2166e9 100644 Binary files a/gui/slick/images/network/veronica.png and b/gui/slick/images/network/veronica.png differ diff --git a/gui/slick/images/network/vh1.png b/gui/slick/images/network/vh1.png index 46adb5f..e68c8d0 100644 Binary files a/gui/slick/images/network/vh1.png and b/gui/slick/images/network/vh1.png differ diff --git a/gui/slick/images/network/viz media.png b/gui/slick/images/network/viz media.png index 7825b79..7155608 100644 Binary files a/gui/slick/images/network/viz media.png and b/gui/slick/images/network/viz media.png differ diff --git a/gui/slick/images/network/vpro.png b/gui/slick/images/network/vpro.png index 3d7bb05..c682adf 100644 Binary files a/gui/slick/images/network/vpro.png and b/gui/slick/images/network/vpro.png differ diff --git a/gui/slick/images/network/vtm.png b/gui/slick/images/network/vtm.png index b5b9b82..41cc56b 100644 Binary files a/gui/slick/images/network/vtm.png and b/gui/slick/images/network/vtm.png differ diff --git a/gui/slick/images/network/wowow.png b/gui/slick/images/network/wowow.png index 518d9ef..48b3f89 100644 Binary files a/gui/slick/images/network/wowow.png and b/gui/slick/images/network/wowow.png differ diff --git a/gui/slick/images/network/xebec.png b/gui/slick/images/network/xebec.png index 3e2a295..7b96325 100644 Binary files a/gui/slick/images/network/xebec.png and b/gui/slick/images/network/xebec.png differ diff --git a/gui/slick/images/network/yahoo! screen.png b/gui/slick/images/network/yahoo! screen.png index 7e16628..d7698e7 100644 Binary files a/gui/slick/images/network/yahoo! screen.png and b/gui/slick/images/network/yahoo! screen.png differ diff --git a/gui/slick/images/network/zdf.png b/gui/slick/images/network/zdf.png index 07e94a8..73542e7 100644 Binary files a/gui/slick/images/network/zdf.png and b/gui/slick/images/network/zdf.png differ diff --git a/gui/slick/images/next.png b/gui/slick/images/next.png index 46e863a..14294a1 100644 Binary files a/gui/slick/images/next.png and b/gui/slick/images/next.png differ diff --git a/gui/slick/images/no16.png b/gui/slick/images/no16.png index d8279bc..acd87e1 100644 Binary files a/gui/slick/images/no16.png and b/gui/slick/images/no16.png differ diff --git a/gui/slick/images/notifiers/email.png b/gui/slick/images/notifiers/email.png index 6a7c163..432ef77 100644 Binary files a/gui/slick/images/notifiers/email.png and b/gui/slick/images/notifiers/email.png differ diff --git a/gui/slick/images/notifiers/plex.png b/gui/slick/images/notifiers/plex.png index f630f9b..2b6204d 100644 Binary files a/gui/slick/images/notifiers/plex.png and b/gui/slick/images/notifiers/plex.png differ diff --git a/gui/slick/images/notifiers/pytivo.png b/gui/slick/images/notifiers/pytivo.png index 9e01fd4..f5fec9b 100644 Binary files a/gui/slick/images/notifiers/pytivo.png and b/gui/slick/images/notifiers/pytivo.png differ diff --git a/gui/slick/images/notifiers/synologynotifier.png b/gui/slick/images/notifiers/synologynotifier.png index ebe55b1..27d1713 100644 Binary files a/gui/slick/images/notifiers/synologynotifier.png and b/gui/slick/images/notifiers/synologynotifier.png differ diff --git a/gui/slick/images/notifiers/trakt.png b/gui/slick/images/notifiers/trakt.png index e91f57f..411e1fc 100644 Binary files a/gui/slick/images/notifiers/trakt.png and b/gui/slick/images/notifiers/trakt.png differ diff --git a/gui/slick/images/notifiers/twitter.png b/gui/slick/images/notifiers/twitter.png index 8faaf38..3e129d1 100644 Binary files a/gui/slick/images/notifiers/twitter.png and b/gui/slick/images/notifiers/twitter.png differ diff --git a/gui/slick/images/prev.png b/gui/slick/images/prev.png index 4210f78..2a06c99 100644 Binary files a/gui/slick/images/prev.png and b/gui/slick/images/prev.png differ diff --git a/gui/slick/images/providers/bb.png b/gui/slick/images/providers/bb.png new file mode 100644 index 0000000..679a1e4 Binary files /dev/null and b/gui/slick/images/providers/bb.png differ diff --git a/gui/slick/images/providers/bithdtv.png b/gui/slick/images/providers/bithdtv.png index e2b2969..b3de190 100644 Binary files a/gui/slick/images/providers/bithdtv.png and b/gui/slick/images/providers/bithdtv.png differ diff --git a/gui/slick/images/providers/funfile.png b/gui/slick/images/providers/funfile.png index 7ee997b..8449319 100644 Binary files a/gui/slick/images/providers/funfile.png and b/gui/slick/images/providers/funfile.png differ diff --git a/gui/slick/images/providers/grabtheinfo.png b/gui/slick/images/providers/grabtheinfo.png index 4a11f06..a0de6cb 100644 Binary files a/gui/slick/images/providers/grabtheinfo.png and b/gui/slick/images/providers/grabtheinfo.png differ diff --git a/gui/slick/images/providers/hdbits.png b/gui/slick/images/providers/hdbits.png index 9defda5..caf5b99 100644 Binary files a/gui/slick/images/providers/hdbits.png and b/gui/slick/images/providers/hdbits.png differ diff --git a/gui/slick/images/providers/hdtorrents.png b/gui/slick/images/providers/hdtorrents.png index a19defc..46d43c2 100644 Binary files a/gui/slick/images/providers/hdtorrents.png and b/gui/slick/images/providers/hdtorrents.png differ diff --git a/gui/slick/images/providers/newztown_co_za.png b/gui/slick/images/providers/newztown_co_za.png index 5bdc9fe..0b1298e 100644 Binary files a/gui/slick/images/providers/newztown_co_za.png and b/gui/slick/images/providers/newztown_co_za.png differ diff --git a/gui/slick/images/providers/nzbzombie.png b/gui/slick/images/providers/nzbzombie.png index b6cf957..814cf54 100644 Binary files a/gui/slick/images/providers/nzbzombie.png and b/gui/slick/images/providers/nzbzombie.png differ diff --git a/gui/slick/images/providers/oznzb.png b/gui/slick/images/providers/oznzb.png index 5c5c531..683c52e 100644 Binary files a/gui/slick/images/providers/oznzb.png and b/gui/slick/images/providers/oznzb.png differ diff --git a/gui/slick/images/providers/pfmonkey.png b/gui/slick/images/providers/pfmonkey.png index bcf5e7c..a426816 100644 Binary files a/gui/slick/images/providers/pfmonkey.png and b/gui/slick/images/providers/pfmonkey.png differ diff --git a/gui/slick/images/providers/ptfiles.png b/gui/slick/images/providers/ptfiles.png index 2896ec9..e700d4e 100644 Binary files a/gui/slick/images/providers/ptfiles.png and b/gui/slick/images/providers/ptfiles.png differ diff --git a/gui/slick/images/providers/publichd.png b/gui/slick/images/providers/publichd.png index abe067d..4efb663 100644 Binary files a/gui/slick/images/providers/publichd.png and b/gui/slick/images/providers/publichd.png differ diff --git a/gui/slick/images/providers/revtt.png b/gui/slick/images/providers/revtt.png index 8e0ebc2..497cdf8 100644 Binary files a/gui/slick/images/providers/revtt.png and b/gui/slick/images/providers/revtt.png differ diff --git a/gui/slick/images/providers/shazbat.png b/gui/slick/images/providers/shazbat.png index d1c3f9b..41b032f 100644 Binary files a/gui/slick/images/providers/shazbat.png and b/gui/slick/images/providers/shazbat.png differ diff --git a/gui/slick/images/providers/snowfl.png b/gui/slick/images/providers/snowfl.png new file mode 100644 index 0000000..27706bf Binary files /dev/null and b/gui/slick/images/providers/snowfl.png differ diff --git a/gui/slick/images/providers/speedcd.png b/gui/slick/images/providers/speedcd.png index dd1ae30..c03a4ac 100644 Binary files a/gui/slick/images/providers/speedcd.png and b/gui/slick/images/providers/speedcd.png differ diff --git a/gui/slick/images/providers/the_pirate_bay.png b/gui/slick/images/providers/the_pirate_bay.png index d4118c8..cfeea6a 100644 Binary files a/gui/slick/images/providers/the_pirate_bay.png and b/gui/slick/images/providers/the_pirate_bay.png differ diff --git a/gui/slick/images/providers/torrenting.png b/gui/slick/images/providers/torrenting.png index 061df87..15f847f 100644 Binary files a/gui/slick/images/providers/torrenting.png and b/gui/slick/images/providers/torrenting.png differ diff --git a/gui/slick/images/providers/torrentleech.png b/gui/slick/images/providers/torrentleech.png index b7d4d0c..28afcce 100644 Binary files a/gui/slick/images/providers/torrentleech.png and b/gui/slick/images/providers/torrentleech.png differ diff --git a/gui/slick/images/providers/xspeeds.png b/gui/slick/images/providers/xspeeds.png index 46cdec3..96e0cde 100644 Binary files a/gui/slick/images/providers/xspeeds.png and b/gui/slick/images/providers/xspeeds.png differ diff --git a/gui/slick/images/rating.png b/gui/slick/images/rating.png index 298623c..723834f 100644 Binary files a/gui/slick/images/rating.png and b/gui/slick/images/rating.png differ diff --git a/gui/slick/images/subtitles/opensubtitles.png b/gui/slick/images/subtitles/opensubtitles.png index 14e2648..9c9ac4d 100644 Binary files a/gui/slick/images/subtitles/opensubtitles.png and b/gui/slick/images/subtitles/opensubtitles.png differ diff --git a/gui/slick/images/subtitles/podnapisiweb.png b/gui/slick/images/subtitles/podnapisiweb.png index c640d0d..3fc1254 100644 Binary files a/gui/slick/images/subtitles/podnapisiweb.png and b/gui/slick/images/subtitles/podnapisiweb.png differ diff --git a/gui/slick/images/subtitles/subscene.png b/gui/slick/images/subtitles/subscene.png index 5dde8e2..bd42ee3 100644 Binary files a/gui/slick/images/subtitles/subscene.png and b/gui/slick/images/subtitles/subscene.png differ diff --git a/gui/slick/images/subtitles/subswiki.png b/gui/slick/images/subtitles/subswiki.png index 8b0e083..08802e4 100644 Binary files a/gui/slick/images/subtitles/subswiki.png and b/gui/slick/images/subtitles/subswiki.png differ diff --git a/gui/slick/images/subtitles/subtitlesource.png b/gui/slick/images/subtitles/subtitlesource.png index 827a48a..5bced64 100644 Binary files a/gui/slick/images/subtitles/subtitlesource.png and b/gui/slick/images/subtitles/subtitlesource.png differ diff --git a/gui/slick/images/subtitles/usub.png b/gui/slick/images/subtitles/usub.png index feca36f..80dd713 100644 Binary files a/gui/slick/images/subtitles/usub.png and b/gui/slick/images/subtitles/usub.png differ diff --git a/gui/slick/images/tag.png b/gui/slick/images/tag.png index 270feea..92868d3 100644 Binary files a/gui/slick/images/tag.png and b/gui/slick/images/tag.png differ diff --git a/gui/slick/images/thetvdb16.png b/gui/slick/images/thetvdb16.png index 1f9a979..d010fe3 100644 Binary files a/gui/slick/images/thetvdb16.png and b/gui/slick/images/thetvdb16.png differ diff --git a/gui/slick/images/tmdb16.png b/gui/slick/images/tmdb16.png index c19727a..db26699 100644 Binary files a/gui/slick/images/tmdb16.png and b/gui/slick/images/tmdb16.png differ diff --git a/gui/slick/images/tvmaze16.png b/gui/slick/images/tvmaze16.png index ab91979..65de27e 100644 Binary files a/gui/slick/images/tvmaze16.png and b/gui/slick/images/tvmaze16.png differ diff --git a/gui/slick/images/tvrage16.png b/gui/slick/images/tvrage16.png index aa13940..23747e1 100644 Binary files a/gui/slick/images/tvrage16.png and b/gui/slick/images/tvrage16.png differ diff --git a/gui/slick/images/warning16.png b/gui/slick/images/warning16.png index 97a2ea2..2735496 100644 Binary files a/gui/slick/images/warning16.png and b/gui/slick/images/warning16.png differ diff --git a/gui/slick/images/xem.png b/gui/slick/images/xem.png index 634def2..66fa4c3 100644 Binary files a/gui/slick/images/xem.png and b/gui/slick/images/xem.png differ diff --git a/gui/slick/images/yes16.png b/gui/slick/images/yes16.png index a718ba3..14efce7 100644 Binary files a/gui/slick/images/yes16.png and b/gui/slick/images/yes16.png differ diff --git a/gui/slick/interfaces/default/config_general.tmpl b/gui/slick/interfaces/default/config_general.tmpl index f1e31da..6d6c618 100644 --- a/gui/slick/interfaces/default/config_general.tmpl +++ b/gui/slick/interfaces/default/config_general.tmpl @@ -239,8 +239,8 @@ Use as default home page: diff --git a/gui/slick/interfaces/default/displayShow.tmpl b/gui/slick/interfaces/default/displayShow.tmpl index d28eb87..a6bd97d 100644 --- a/gui/slick/interfaces/default/displayShow.tmpl +++ b/gui/slick/interfaces/default/displayShow.tmpl @@ -50,11 +50,11 @@ -
+
#if $has_art @@ -489,14 +489,14 @@ #set $attr_title_ep = ('', ' (Anime #)')[$show.is_anime] - + Meta - ##if $scene or $scene_anime - Scene#if $scene_anime# absolute#end if##end if# - Name - Air Date#if $sg_var('USE_SUBTITLES') and $show.subtitles + ##if $scene or $scene_anime + Scene#if $scene_anime# absolute#end if##end if# + Name + Air Date#if $sg_var('USE_SUBTITLES') and $show.subtitles Subtitles#end if - Status + Status Search diff --git a/gui/slick/interfaces/default/episodeView.tmpl b/gui/slick/interfaces/default/episodeView.tmpl index 19a30db..1e9468c 100644 --- a/gui/slick/interfaces/default/episodeView.tmpl +++ b/gui/slick/interfaces/default/episodeView.tmpl @@ -8,8 +8,8 @@ <% def sg_var(varname, default=False): return getattr(sickbeard, varname, default) %>#slurp# <% def sg_str(varname, default=''): return getattr(sickbeard, varname, default) %>#slurp# ## -#set global $title = 'Episode View' -#set global $header = 'Episode View' +#set global $title = 'Daily Schedule' +#set global $header = 'Daily Schedule' #set global $sbPath = '..' #set global $topmenu = 'home' #set $css = $getVar('css', '') @@ -17,6 +17,7 @@ #set $restart = 'Restart SickGear for new features on this page' #set $show_message = (None, $restart)[not $varExists('fanart')] #set global $page_body_attr = 'episode-view" class="' + $css +#set theme_suffix = ('', '-dark')['dark' == $sg_str('THEME_NAME', 'dark')] ## #import os.path #include $os.path.join($sg_str('PROG_DIR'), 'gui/slick/interfaces/default/inc_top.tmpl') @@ -176,7 +177,9 @@ .asc{border-top:0; border-bottom:8px solid} .desc{border-top:8px solid; border-bottom:0} #end if +.bfr{position:absolute;left:-999px;top:-999px}.bfr img,img.spinner,img.queued,img.search{display:inline-block;width:16px;height:16px}img.spinner{background:url(${sbRoot}/images/loading16${theme_suffix}.gif) no-repeat 0 0}img.queued{background:url(${sbRoot}/images/queued.png) no-repeat 0 0}img.search{background:url(${sbRoot}/images/search16.png) no-repeat 0 0} +
#if $show_message
@@ -293,9 +296,9 @@ }); $(document).ready(function(){ - - sortList = [[$table_sort_header_codes[$sort], 0]]; - +#end raw + var sortList = [[$table_sort_header_codes[$sort], 0]]; +#raw $('#showListTable:has(tbody tr)').tablesorter({ widgets: ['stickyHeaders'], sortList: sortList, @@ -381,9 +384,10 @@ #end if #end if - #set $show_id = '%s_%sx%s' % (str($cur_result['showid']), str($cur_result['season']), str($cur_result['episode'])) + #set $show_id = '%s_%sx%s' % ($cur_result['showid'], $cur_result['season'], $cur_result['episode']) + #set $id_sxe = '%s_%s' % ($cur_result['indexer'], $show_id) - + ## forced to use a div to wrap airdate, the column sort went crazy with a span
$sbdatetime.sbdatetime.sbfdatetime($cur_result['localtime']).decode($sickbeard.SYS_ENCODING)
$cur_result['localtime'].strftime('%Y%m%d%H%M') @@ -428,7 +432,7 @@ - [search] + [search] @@ -455,7 +459,7 @@ -
+ #set $id_sxe = '%s_%s_%sx%s' % ($cur_result['indexer'], $cur_result['showid'], $cur_result['season'], $cur_result['episode']) +
@@ -614,7 +619,7 @@ [$sickbeard.indexerApi(INDEXER_IMDB).name] #end if $sickbeard.indexerApi($cur_indexer).name - [search] + [search] @@ -888,9 +893,10 @@ window.setInterval('location.reload(true)', 30*60000); // Refresh every xx minut $('#Carousel').carousel({interval: 0}); $(document).bind('keyup', function(e) { - return ((!(e.hasOwnProperty('ctrlKey') && e.ctrlKey) && !(e.hasOwnProperty('altKey') && e.altKey)) && ( - (39 == e.which && $('.carousel').carousel('next')) || - (37 == e.which && $('.carousel').carousel('prev'))) || !0); + return (/undefined/i.test($.SickGear.PauseCarousel) && + (!(e.hasOwnProperty('ctrlKey') && e.ctrlKey) && !(e.hasOwnProperty('altKey') && e.altKey)) && ( + (39 == e.which && $('.carousel').carousel('next')) || + (37 == e.which && $('.carousel').carousel('prev'))) || !0); }); //--> diff --git a/gui/slick/interfaces/default/home.tmpl b/gui/slick/interfaces/default/home.tmpl index bb3abbb..f0259f5 100644 --- a/gui/slick/interfaces/default/home.tmpl +++ b/gui/slick/interfaces/default/home.tmpl @@ -77,8 +77,8 @@ #end if
- -   + +  
## @@ -161,7 +161,7 @@ #set $download_stat = str($cur_downloaded) #set $download_stat_tip = 'Downloaded: ' + str($cur_downloaded) #if $cur_snatched > 0 - #set $download_stat = '%s+%s' % ($download_stat, $sg_root, $cur_snatched) + #set $download_stat = '%s+%s' % ($download_stat, $sg_root, $cur_snatched) #set $download_stat_tip = download_stat_tip + ' ' + 'Snatched: ' + str($cur_snatched) #end if #set $download_stat = download_stat + ' / ' + str($cur_total) @@ -350,7 +350,7 @@ #set $download_stat = str($cur_downloaded) #set $download_stat_tip = 'Downloaded: ' + str($cur_downloaded) #if $cur_snatched > 0 - #set $download_stat = '%s+%s' % ($download_stat, $sg_root, $cur_snatched) + #set $download_stat = '%s+%s' % ($download_stat, $sg_root, $cur_snatched) #set $download_stat_tip = download_stat_tip + ' ' + 'Snatched: ' + str($cur_snatched) #end if #set $download_stat = download_stat + ' / ' + str($cur_total) diff --git a/gui/slick/interfaces/default/home_newShow.tmpl b/gui/slick/interfaces/default/home_newShow.tmpl index 7b17798..efb9545 100644 --- a/gui/slick/interfaces/default/home_newShow.tmpl +++ b/gui/slick/interfaces/default/home_newShow.tmpl @@ -95,7 +95,9 @@

Enter show name, TVDB ID, IMDb Url, or IMDb ID.  *SickGear supports english, language is used for show/episode data

-
+
+ + #end if diff --git a/gui/slick/interfaces/default/inc_addShowOptions.tmpl b/gui/slick/interfaces/default/inc_addShowOptions.tmpl index b4f9d4a..b7424bc 100644 --- a/gui/slick/interfaces/default/inc_addShowOptions.tmpl +++ b/gui/slick/interfaces/default/inc_addShowOptions.tmpl @@ -9,126 +9,128 @@ <% def sg_str(varname, default=''): return getattr(sickbeard, varname, default) %>#slurp#
-
- To reuse options below when adding more shows  -
+
+ To reuse options below when adding more shows  +
-
- -
+
+

Edit options anytime from the details view of the show

+
-
-

Tip: The following options are editable later in the detail view of the show

-
- -
+
#set $qualities = $Quality.splitQuality($sg_var('QUALITY_DEFAULT', SD)) #set global $any_qualities = $qualities[0] #set global $best_qualities = $qualities[1] #include $os.path.join($sg_str('PROG_DIR'), 'gui/slick/interfaces/default/inc_qualityChooser.tmpl') -
+
#try: - #if True == $enable_default_wanted: -
- From season 1 forward, set - - - - From latest going back, set - - - -
- #end if -#except (NameError, NotFound): - #pass -#end try - -
- +
-
- -
+ +
#if $enable_anime_options diff --git a/gui/slick/interfaces/default/inc_bottom.tmpl b/gui/slick/interfaces/default/inc_bottom.tmpl index 6b8d336..df61c02 100644 --- a/gui/slick/interfaces/default/inc_bottom.tmpl +++ b/gui/slick/interfaces/default/inc_bottom.tmpl @@ -65,7 +65,7 @@ if min_output: ( '', ' (+%s snatched)'\ -% '%s' +% '%s' % (localRoot, str(ep_snatched)) )[0 < ep_snatched] %> / $ep_total episodes downloaded $ep_percentage diff --git a/gui/slick/interfaces/default/inc_displayShow.tmpl b/gui/slick/interfaces/default/inc_displayShow.tmpl index ef46eda..102c5b4 100644 --- a/gui/slick/interfaces/default/inc_displayShow.tmpl +++ b/gui/slick/interfaces/default/inc_displayShow.tmpl @@ -1,7 +1,7 @@ #import datetime #import sickbeard #from sickbeard import network_timezones, sbdatetime, subtitles -#from sickbeard.common import Overview, Quality, statusStrings, ARCHIVED, UNAIRED, SUBTITLED +#from sickbeard.common import Overview, Quality, statusStrings, ARCHIVED, UNAIRED, SUBTITLED, SNATCHED_ANY, DOWNLOADED #from lib import subliminal <% def sg_var(varname, default=False): return getattr(sickbeard, varname, default) %>#slurp# <% def sg_str(varname, default=''): return getattr(sickbeard, varname, default) %>#slurp# @@ -26,9 +26,7 @@ #set never_aired = 0 < int($ep['season']) and 1 == int($ep['airdate']) #set $nfo, $nfo_img = (('No', '-no'), ('Yes', ''))[int($ep['hasnfo'])] @@ -101,16 +99,17 @@ #slurp #set $curStatus, $curQuality = $Quality.splitCompositeStatus(int($ep['status'])) #if Quality.NONE != $curQuality - + #else #end if
- #if $UNAIRED != int($ep['status']) - - #end if + #if $SUBTITLED == $curStatus##else#$statusStrings[$curStatus].replace('Downloaded', '')#end if# $Quality.get_quality_ui($curQuality)#if $SUBTITLED == $curStatus##else#$statusStrings[$curStatus].replace('Downloaded', '')#end if# #if 'Unknown' != $statusStrings[$curStatus]#$Quality.get_quality_ui($curQuality)#end if#$statusStrings[$curStatus].replace('SD DVD', 'SD DVD/BR/BD') #if 0 != int($ep['season']) - #if (int($ep['status']) in $Quality.SNATCHED or int($ep['status']) in $Quality.DOWNLOADED) and $sg_var('USE_FAILED_DOWNLOADS') - retry + #set $status = $Quality.splitCompositeStatus(int($ep['status']))[0] + #if ($status in $SNATCHED_ANY + [$DOWNLOADED, $ARCHIVED]) and $sg_var('USE_FAILED_DOWNLOADS') + retry #else - search + search #end if #end if #slurp diff --git a/gui/slick/interfaces/default/inc_top.tmpl b/gui/slick/interfaces/default/inc_top.tmpl index 5928baf..74dc391 100644 --- a/gui/slick/interfaces/default/inc_top.tmpl +++ b/gui/slick/interfaces/default/inc_top.tmpl @@ -127,38 +127,74 @@ #else #set $showlist_home, $episode_home = 2 * [''] #end if -
    +