Fixed merge conflicts to windows branch

.gitignore

@@ -14,3 +14,4 @@ SickBeard-win32-*.zip
 *.exe
 gc.ini
 CHANGELOG.txt
+.DS_Store

SickBeard.py

@@ -23,6 +23,7 @@ import sys
 if sys.hexversion >= 0x020600F0:
     from multiprocessing import Process, freeze_support
 
+import locale
 import os
 import os.path
 import threading
@@ -100,6 +101,16 @@ def main():
     sickbeard.PROG_DIR = os.path.dirname(sickbeard.MY_FULLNAME)
     sickbeard.MY_ARGS = sys.argv[1:]
 
+    try:
+        locale.setlocale(locale.LC_ALL, "")
+    except (locale.Error, IOError):
+        pass
+    sickbeard.SYS_ENCODING = locale.getpreferredencoding()
+    
+    # for OSes that are poorly configured I'll just force UTF-8
+    if not sickbeard.SYS_ENCODING or sickbeard.SYS_ENCODING in ('ANSI_X3.4-1968', 'US-ASCII'):
+        sickbeard.SYS_ENCODING = 'UTF-8'
+
     sickbeard.CONFIG_FILE = os.path.join(sickbeard.PROG_DIR, "config.ini")
 
     # need console logging for SickBeard.py and SickBeard-console.exe
@@ -109,7 +120,7 @@ def main():
     threading.currentThread().name = "MAIN"
 
     try:
-        opts, args = getopt.getopt(sys.argv[1:], "qfdp:", ['quiet', 'force-update', 'daemon', 'port=', 'tvbinz'])
+        opts, args = getopt.getopt(sys.argv[1:], "qfdp:", ['quiet', 'forceupdate', 'daemon', 'port=', 'tvbinz'])
     except getopt.GetoptError:
         print "Available options: --quiet, --forceupdate, --port, --daemon"
         sys.exit()

data/css/comingEpisodes.css

@@ -38,13 +38,14 @@ div#insideContent {
     float: left; 
     padding-top: 5px; 
     padding-left: 8px; 
-    line-height: 18px;
-    font-size: 18px;
+    line-height: 17px;
+    font-size: 16px;
+    text-shadow: -1px -1px 0 rgba(0,0,0,0.3);
 }
 
 .tvshowTitleIcons {
     float: right;
-    padding: 5px 10px 0px 0px;
+    padding: 3px 5px;
 }
 
 .tvshowDiv .title { 
@@ -149,3 +150,12 @@ span.pause {
     color: #FF0000;
     font-size: 12px;
 }
+
+.ep_summaryTrigger {
+    float: left;
+    padding-top: 5px;
+}
+.ep_summary {
+    margin-left: 25px;
+    padding-top: 5px;
+}
\ No newline at end of file

data/css/config.css

 #config{text-align:center;padding:0 30px 20px;}
 #config *{font-family:"Trebuchet MS", Verdana, sans-serif;margin:0;padding:0;}
+#config .imgLink img {padding-bottom:1px;}
 #config ul{list-style-type:none;}
 #config h3{font-size:1.5em;color:#000;}
 #config h4{font-size:1em;color:#333;text-transform:uppercase;margin:0 0 .2em;}
@@ -23,7 +24,7 @@
 #config label span.component-title{font-size:1.2em;font-weight:700;float:left;width:160px;margin-right:10px;}
 #config label span.component-desc{font-size:1.1em;}
 #config div.field-pair select{font-size:1.1em;border:1px solid #d4d0c8;}
-#config div.field-pair select option{line-height:1.4;padding:0 10px;}
+#config div.field-pair select option{line-height:1.4;padding:0 10px; border-bottom: 1px dotted #D7D7D7;}
 #config-settings{float:right;width:200px;background:#fffae5;border-bottom:1px dotted #666;border-top:1px solid #999;margin-right:20px;padding:20px 0 30px;}
 #config-settings .config-settings-group{border-bottom:1px dotted #999;padding-bottom:15px;margin:0 15px 15px;}
 #config-settings .config-settings-group h2{margin-bottom:0;}
@@ -36,8 +37,8 @@
 * html .clearfix{height:1%;}
 /* End hide from IE-mac */
 #provider_order_list{list-style-type:none;width:250px;margin:0;padding:0;}
-#provider_order_list li{font-size:1.3em;height:1.5em;font-family:Verdana;margin:0 5px 5px;padding:5px;}
-html>body #provider_order_list li{height:1.5em;line-height:1.3em;}
+#provider_order_list li{font-size:1.3em;height:1.3em;font-family:Verdana;margin:0 5px 5px;padding:6px;}
+#provider_order_list input{margin:0px 2px;}
 .providerDiv{display:none;padding-left:20px;}
 #config div.metadataDiv{display:none;}
 #config div.metadata_options{float:left;font-size:14px;font-family:Verdana;width:185px;color:#036;background:#F5F1E4;overflow:auto;border-left:1px solid #404040;border-top:1px solid #404040;border-bottom:1px solid #d4d0c8;border-right:1px solid #d4d0c8;padding:7px;}
@@ -51,3 +52,8 @@ html>body #provider_order_list li{height:1.5em;line-height:1.3em;}
 #upgrade-notification{line-height:1;color:#57442b;font-size:130%;font-weight:700;height:0;left:0;text-align:center;top:0;width:100%;z-index:100;margin:0;padding:0;}
 #upgrade-notification div{background-color:#c6b695;border-bottom:1px solid #af986b;padding:7px 0;}
 #header-fix{*margin-bottom: -31px; /* IE fix */height:21px;padding:0;}
+.infoTable {border-collapse: collapse;}
+.infoTableHeader, .infoTableCell {padding: 5px;}
+.infoTableHeader{font-weight:700;}
+
+#config div.testNotification {border: 1px dotted #CCCCCC; padding: 5px; margin-bottom: 10px; line-height:20px;}
\ No newline at end of file

data/css/default.css

 * { outline: 0; }
-img { border: 0; }
+img { border: 0; vertical-align: middle;}
 
 body {
 background-color:#fff;
 color:#000;
 font-family:'Verdana', 'Helvetica', 'Sans-serif', 'sans';
 font-size:12px;
-line-height:18px;
 margin:0;
 padding:0;
 }
@@ -78,10 +77,6 @@ font-size:9pt;
 margin:0;
 }
 
-td,td {
-padding:5px;
-}
-
 tr.active {
 font-weight:700;
 }
@@ -120,7 +115,7 @@ font-weight:700;
 }
 
 .h2footer {
-margin-top:-32px;
+margin-top:-33px;
 margin-right:5px;
 }
 .h2footer span {
@@ -140,6 +135,7 @@ border:1px solid #d4d0c8;
 div select option {
 line-height:1.4;
 padding:0 10px;
+border-bottom: 1px dotted #D7D7D7;
 }
 
 /* --------------- alignment ------------------- */
@@ -167,6 +163,7 @@ margin-top:20px;
 background-color:#F5F1E4;
 border-top:1px solid #000;
 color:#4e4e4e;
+line-height: 1.4em;
 }
 
 .sickbeardTable {
@@ -174,12 +171,19 @@ width:90%;
 margin-left:auto;
 margin-right:auto;
 }
-
 .sickbeardTable th{
 padding:2px;
 font-weight:700;
 background-color:#333;
 color:#FFF;
+text-shadow: -1px -1px 0 rgba(0,0,0,0.3);
+}
+.sickbeardTable td{
+padding:5px;
+}
+.sickbeardTable tfoot a {
+color:#FFF;
+text-decoration: none;
 }
 
 .row {
@@ -225,8 +229,7 @@ width:100%;
 height:100%;
 overflow:visible;
 text-align:center;
-line-height:16px;
-_line-height:14px;
+vertical-align: middle;
 }
 
 tr.seasonheader {
@@ -297,7 +300,6 @@ margin:10px;
 #MainMenu {
 background-color:#57442B;
 color:#F5F5F5;
-line-height:1;
 /*margin-bottom:1em;*/
 width:100%;
 border-bottom: 1px solid #333;
@@ -327,14 +329,14 @@ background-color:#000;
 color:#fff;
 }
 #donate {
-line-height:2px;
-background: none;
+line-height:1em;
+background: #57442B;
 float: right;
 }
 #donate a,#donate a:hover {
 background-color:#57442B;
 border:0;
-padding:3px 15px 0px;
+padding:4px 15px 0px;
 }
 #content {
 padding: 10px 15px 15px;
@@ -343,3 +345,8 @@ min-width:500px;
 z-index:1;
 clear:both;
 }
+.showLegend{
+font-weight:700;
+padding-right:10px;
+padding-bottom:1px;
+}
\ No newline at end of file

data/css/jquery.pnotify.default.css

+/* 
+	Document   : jquery.pnotify.default.css
+	Created on : Nov 23, 2009, 3:14:10 PM
+	Author     : Hunter Perrin
+	Version    : 1.0.0
+	Description:
+		Default styling for Pines Notify jQuery plugin.
+*/
+
+/* Notice
+----------------------------------*/
+.ui-pnotify {
+	top: 10px;
+	right: 15px;
+	position: absolute;
+	height: auto;
+	/* Ensure that the notices are on top of everything else. */
+	z-index: 9999;
+}
+/* This hides position: fixed from IE6, which doesn't understand it. */
+html > body .ui-pnotify {
+	position: fixed;
+}
+.ui-pnotify .ui-pnotify-shadow {
+	margin: 0;
+	position: absolute;
+	top: .1em;
+	left: .1em;
+	bottom: -.2em;
+	right: -.2em;
+	z-index: -1;
+}
+.ui-pnotify-container {
+	background-position: 0 0;
+	padding: .8em;
+	height: 100%;
+}
+.ui-pnotify-closer {
+	float: right;
+	margin-left: .2em;
+}
+.ui-pnotify-title {
+	display: block;
+	font-size: 1.2em;
+	font-weight: bold;
+	margin-bottom: .4em;
+}
+.ui-pnotify-text {
+	display: block;
+}
+.ui-pnotify-icon, .ui-pnotify-icon span {
+	display: block;
+	float: left;
+	margin-right: .2em;
+}
+/* History Pulldown
+----------------------------------*/
+.ui-pnotify-history-container {
+	position: absolute;
+	top: 0;
+	right: 18px;
+	width: 70px;
+	border-top: none;
+	/* Ensure that the history container is on top of the notices. */
+	z-index: 10000;
+}
+.ui-pnotify-history-container .ui-pnotify-history-header {
+	padding: 2px;
+}
+.ui-pnotify-history-container button {
+	cursor: pointer;
+	display: block;
+	width: 100%;
+}
+.ui-pnotify-history-container .ui-pnotify-history-pulldown {
+	display: block;
+	margin: 0 auto;
+}
+.ui-pnotify .picon {
+	background-color: transparent;
+	background-repeat: no-repeat;
+	background-position: center center;
+	width: 17px;
+	height: 17px;
+}
+.ui-pnotify .ui-widget {
+    font-family: verdana, sans-serif;
+    font-size: 95% !important;
+}
\ No newline at end of file