Index: MP-TVSeries/Configuration/GUIConfiguration.designer.cs =================================================================== --- MP-TVSeries/Configuration/GUIConfiguration.designer.cs (revision 2110) +++ MP-TVSeries/Configuration/GUIConfiguration.designer.cs (working copy) @@ -54,24 +54,24 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ConfigurationForm)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); this.columnHeader_Series = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader_Title = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader_Season = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); @@ -1007,8 +1007,8 @@ // this.dataGridView_Replace.AllowUserToResizeColumns = false; this.dataGridView_Replace.AllowUserToResizeRows = false; - dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; - this.dataGridView_Replace.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle19; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; + this.dataGridView_Replace.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dataGridView_Replace.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); @@ -1015,38 +1015,38 @@ this.dataGridView_Replace.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; this.dataGridView_Replace.BackgroundColor = System.Drawing.SystemColors.Window; this.dataGridView_Replace.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle20.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Replace.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle20; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Replace.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dataGridView_Replace.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; - dataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle21.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Replace.DefaultCellStyle = dataGridViewCellStyle21; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Replace.DefaultCellStyle = dataGridViewCellStyle3; this.dataGridView_Replace.Location = new System.Drawing.Point(0, 75); this.dataGridView_Replace.MultiSelect = false; this.dataGridView_Replace.Name = "dataGridView_Replace"; this.dataGridView_Replace.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Sunken; - dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle22.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Replace.RowHeadersDefaultCellStyle = dataGridViewCellStyle22; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Replace.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dataGridView_Replace.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToDisplayedHeaders; - dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; - this.dataGridView_Replace.RowsDefaultCellStyle = dataGridViewCellStyle23; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; + this.dataGridView_Replace.RowsDefaultCellStyle = dataGridViewCellStyle5; this.dataGridView_Replace.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; this.dataGridView_Replace.RowTemplate.Height = 18; this.dataGridView_Replace.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.True; @@ -1660,12 +1660,11 @@ this.checkBox_CountSpecialEpisodesAsWatched.Location = new System.Drawing.Point(404, 378); this.checkBox_CountSpecialEpisodesAsWatched.Name = "checkBox_CountSpecialEpisodesAsWatched"; this.checkBox_CountSpecialEpisodesAsWatched.Option = "checkBox_DontCountSpecialEpisodes"; - this.checkBox_CountSpecialEpisodesAsWatched.Size = new System.Drawing.Size(305, 17); + this.checkBox_CountSpecialEpisodesAsWatched.Size = new System.Drawing.Size(270, 17); this.checkBox_CountSpecialEpisodesAsWatched.TabIndex = 1; - this.checkBox_CountSpecialEpisodesAsWatched.Text = "Always count the Special (Season 0) episodes as watched "; + this.checkBox_CountSpecialEpisodesAsWatched.Text = "Count the Special (Season 0) episodes as watched "; this.checkBox_CountSpecialEpisodesAsWatched.ToolTip = ""; - this.toolTip_InfoHelp.SetToolTip(this.checkBox_CountSpecialEpisodesAsWatched, "Check this option if you want the Special (Season 0) episodes \r\nto be counted as " + - "watched episodes in the total watched field."); + this.toolTip_InfoHelp.SetToolTip(this.checkBox_CountSpecialEpisodesAsWatched, resources.GetString("checkBox_CountSpecialEpisodesAsWatched.ToolTip")); this.checkBox_CountSpecialEpisodesAsWatched.UseVisualStyleBackColor = true; this.checkBox_CountSpecialEpisodesAsWatched.CheckedChanged += new System.EventHandler(this.checkBox_DontCountSpecialEpisodes_CheckedChanged); // @@ -1857,37 +1856,37 @@ | System.Windows.Forms.AnchorStyles.Right))); this.dataGridView1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; this.dataGridView1.BackgroundColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle24.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle24; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridViewTextBoxColumn1, this.dataGridViewTextBoxColumn2}); - dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; - dataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle25.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle25; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; + dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle7; this.dataGridView1.Location = new System.Drawing.Point(0, 176); this.dataGridView1.MultiSelect = false; this.dataGridView1.Name = "dataGridView1"; - dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle26.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle26; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle8; this.dataGridView1.RowHeadersVisible = false; this.dataGridView1.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToDisplayedHeaders; this.dataGridView1.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; @@ -2077,8 +2076,8 @@ // this.dataGridView_Expressions.AllowUserToResizeColumns = false; this.dataGridView_Expressions.AllowUserToResizeRows = false; - dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; - this.dataGridView_Expressions.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle27; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; + this.dataGridView_Expressions.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9; this.dataGridView_Expressions.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); @@ -2085,38 +2084,38 @@ this.dataGridView_Expressions.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; this.dataGridView_Expressions.BackgroundColor = System.Drawing.SystemColors.Window; this.dataGridView_Expressions.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle28.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Expressions.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle28; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle10.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Expressions.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10; this.dataGridView_Expressions.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; - dataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle29.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Expressions.DefaultCellStyle = dataGridViewCellStyle29; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; + dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle11.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Expressions.DefaultCellStyle = dataGridViewCellStyle11; this.dataGridView_Expressions.Location = new System.Drawing.Point(1, 72); this.dataGridView_Expressions.MultiSelect = false; this.dataGridView_Expressions.Name = "dataGridView_Expressions"; this.dataGridView_Expressions.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Sunken; - dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle30.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle30.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Expressions.RowHeadersDefaultCellStyle = dataGridViewCellStyle30; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle12.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Expressions.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; this.dataGridView_Expressions.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToDisplayedHeaders; - dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; - this.dataGridView_Expressions.RowsDefaultCellStyle = dataGridViewCellStyle31; + dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; + this.dataGridView_Expressions.RowsDefaultCellStyle = dataGridViewCellStyle13; this.dataGridView_Expressions.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; this.dataGridView_Expressions.RowTemplate.Height = 18; this.dataGridView_Expressions.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.True; @@ -2232,45 +2231,45 @@ // this.dataGridView_ImportPathes.AllowUserToResizeColumns = false; this.dataGridView_ImportPathes.AllowUserToResizeRows = false; - dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; - this.dataGridView_ImportPathes.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle32; + dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; + this.dataGridView_ImportPathes.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle14; this.dataGridView_ImportPathes.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.dataGridView_ImportPathes.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; this.dataGridView_ImportPathes.BackgroundColor = System.Drawing.SystemColors.Window; this.dataGridView_ImportPathes.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle33.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle33.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_ImportPathes.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle33; + dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle15.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_ImportPathes.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15; this.dataGridView_ImportPathes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; - dataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle34.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_ImportPathes.DefaultCellStyle = dataGridViewCellStyle34; + dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; + dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle16.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_ImportPathes.DefaultCellStyle = dataGridViewCellStyle16; this.dataGridView_ImportPathes.Location = new System.Drawing.Point(0, 0); this.dataGridView_ImportPathes.MultiSelect = false; this.dataGridView_ImportPathes.Name = "dataGridView_ImportPathes"; this.dataGridView_ImportPathes.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Sunken; - dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle35.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_ImportPathes.RowHeadersDefaultCellStyle = dataGridViewCellStyle35; + dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_ImportPathes.RowHeadersDefaultCellStyle = dataGridViewCellStyle17; this.dataGridView_ImportPathes.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToDisplayedHeaders; - dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; - this.dataGridView_ImportPathes.RowsDefaultCellStyle = dataGridViewCellStyle36; + dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; + this.dataGridView_ImportPathes.RowsDefaultCellStyle = dataGridViewCellStyle18; this.dataGridView_ImportPathes.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; this.dataGridView_ImportPathes.RowTemplate.Height = 18; this.dataGridView_ImportPathes.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.True; Index: MP-TVSeries/Configuration/GUIConfiguration.resx =================================================================== --- MP-TVSeries/Configuration/GUIConfiguration.resx (revision 2110) +++ MP-TVSeries/Configuration/GUIConfiguration.resx (working copy) @@ -134,7 +134,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA6 - eQAAAk1TRnQBSQFMAgEBDAEAASQBBQEkAQUBGAEAARgBAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFg + eQAAAk1TRnQBSQFMAgEBDAEAATQBBQE0AQUBGAEAARgBAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFg AwABYAMAAQEBAAEgBgABkP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AFUAAQEDBAEGAwsBDwMSBBkBIwMdASkDHgErAx0BKQMY ASEDEQEXAwoBDgMEAQUDAAEBLwAEAQECAwMEBAEFAwQBBQMDAQQDAgEDAwIBAwMBAQIDAQECAwABAQMA @@ -821,6 +821,10 @@ * Playback of Watched/Seen episodes. * Playback using Playlist player. + + Check this option if you want to calculate episode counts were Special (Season 0) episodes to be counted as watched episodes in the Series view. +This will only count episodes that you can see when browsing GUI. + If enabled and episode has been rated, mark the episode as watched. Index: MP-TVSeries/DB Classes/DBEpisode.cs =================================================================== --- MP-TVSeries/DB Classes/DBEpisode.cs (revision 2110) +++ MP-TVSeries/DB Classes/DBEpisode.cs (working copy) @@ -1421,7 +1421,7 @@ epsTotal = 0; int parseResult = 0; int epsWatched = 0; - int seasonIndex = 0; + int seasonIndex = -1; // we either get two rows (one for normal episodes, one for double episodes), // or we get no rows so we add them @@ -1456,9 +1456,15 @@ } else if (DBOption.GetOptions(DBOption.cCountEmptyAndFutureAiredEps)) { - // no airdate field set, this occurs for specials most of the time + // no airdate field set, this occurs for specials most of the time epsTotal++; } + else if (DBOption.GetOptions(DBOption.cCountSpecialEpisodesAsWatched)) + { + // Need to increment epsTotal when the cCountSpecialEpisodesAsWatched = true. + // Otherwise the epsUnWatched become wrong. + epsTotal++; + } } catch { Index: MP-TVSeries/DB Classes/DBSeries.cs =================================================================== --- MP-TVSeries/DB Classes/DBSeries.cs (revision 2110) +++ MP-TVSeries/DB Classes/DBSeries.cs (working copy) @@ -865,7 +865,7 @@ seriesEpsTotal += count; // Count the Special (Season 0 (zero)) episodes as watched! - if ( (season[DBSeason.cIndex] != 0) && (DBOption.GetOptions(DBOption.cCountSpecialEpisodesAsWatched)) ) + if ((season[DBSeason.cIndex] != 0) || (season[DBSeason.cIndex] == 0 && !DBOption.GetOptions(DBOption.cCountSpecialEpisodesAsWatched))) { seriesEpsUnWatched += unWatchedCount; } @@ -909,7 +909,7 @@ seriesEpsTotal += epsTotal; // Count the Special (Season 0 (zero)) episodes as watched! - if ((season[DBSeason.cIndex] != 0) && (DBOption.GetOptions(DBOption.cCountSpecialEpisodesAsWatched))) + if ((season[DBSeason.cIndex] != 0) || (season[DBSeason.cIndex] == 0 && !DBOption.GetOptions(DBOption.cCountSpecialEpisodesAsWatched))) { seriesEpsUnWatched += epsUnWatched; } Index: MP-TVSeries/imageAllocator.cs =================================================================== --- MP-TVSeries/imageAllocator.cs (revision 2110) +++ MP-TVSeries/imageAllocator.cs (working copy) @@ -471,12 +471,12 @@ public static string GetRandomBanner(List BannerList) { const string graphicalBannerRecognizerSubstring = "-g"; - string langIdentifier = "-lang" + Online_Parsing_Classes.OnlineAPI.SelLanguageAsString + "-"; + string englishLangIdentifier = "-lang" + Online_Parsing_Classes.OnlineAPI.SelLanguageAsString + "-"; // random banners are prefered in the following order - // 1) own lang + graphical - // 2) own lang but not graphical - // 3) english + graphical (english really is any other language banners that are in db) + // 1) Series Language with Graphical + // 2) Series Language but not Graphical + // 3) english with graphical (english really is any other language banners that are in db) // 4) english but not graphical string randImage = null; @@ -485,10 +485,10 @@ if (randImage == null) { - List langG = new List(); - List lang = new List(); - List engG = new List(); - List eng = new List(); + List SeriesLanguageWithGraphical = new List(); + List SeriesLanguageWithoutGraphical = new List(); + List EnglishLanguageWithGraphical = new List(); + List EnglishLanguageWithoutGraphical = new List(); for (int i = 0; i < BannerList.Count; i++) { if (File.Exists(BannerList[i])) @@ -495,17 +495,17 @@ { if (BannerList[i].Contains(graphicalBannerRecognizerSubstring)) { - if (BannerList[i].Contains(langIdentifier)) - langG.Add(BannerList[i]); + if (BannerList[i].Contains(englishLangIdentifier)) + EnglishLanguageWithGraphical.Add(BannerList[i]); else - engG.Add(BannerList[i]); + SeriesLanguageWithGraphical.Add(BannerList[i]); } else { - if (BannerList[i].Contains(langIdentifier)) - lang.Add(BannerList[i]); + if (BannerList[i].Contains(englishLangIdentifier)) + SeriesLanguageWithoutGraphical.Add(BannerList[i]); else - eng.Add(BannerList[i]); + EnglishLanguageWithoutGraphical.Add(BannerList[i]); } } } @@ -512,10 +512,14 @@ try { - if (langG.Count > 0) randImage = langG[new Random().Next(0, langG.Count)]; - else if (lang.Count > 0) randImage = lang[new Random().Next(0, lang.Count)]; - else if (engG.Count > 0) randImage = engG[new Random().Next(0, engG.Count)]; - else if (eng.Count > 0) randImage = eng[new Random().Next(0, eng.Count)]; + if (SeriesLanguageWithGraphical.Count > 0) + randImage = SeriesLanguageWithGraphical[new Random().Next(0, SeriesLanguageWithGraphical.Count)]; + else if (SeriesLanguageWithoutGraphical.Count > 0) + randImage = SeriesLanguageWithoutGraphical[new Random().Next(0, SeriesLanguageWithoutGraphical.Count)]; + else if (EnglishLanguageWithGraphical.Count > 0) + randImage = EnglishLanguageWithGraphical[new Random().Next(0, EnglishLanguageWithGraphical.Count)]; + else if (EnglishLanguageWithoutGraphical.Count > 0) + randImage = EnglishLanguageWithoutGraphical[new Random().Next(0, EnglishLanguageWithoutGraphical.Count)]; else return string.Empty; } catch Index: MP-TVSeries/Online Parsing Classes/GetBanner.cs =================================================================== --- MP-TVSeries/Online Parsing Classes/GetBanner.cs (revision 2110) +++ MP-TVSeries/Online Parsing Classes/GetBanner.cs (working copy) @@ -48,6 +48,7 @@ abstract class Artwork : IComparable where T : Artwork { + public string SeriesID = string.Empty; public string SeriesName = string.Empty; public string OnlinePath = string.Empty; public string FileName = string.Empty; @@ -62,9 +63,20 @@ // 2. Highest Rated // 3. Number of Votes - double thisArtwork = this.Language == OnlineAPI.SelLanguageAsString ? 100.0 : 0.0; - double otherArtwork = other.Language == OnlineAPI.SelLanguageAsString ? 100.0 : 0.0; + double thisArtwork; + double otherArtwork; + if(DBOption.GetOptions(DBOption.cOverrideLanguage)) + { + thisArtwork = this.Language == OnlineAPI.GetLanguageOverride(this.SeriesID) ? 100.0 : 0.0; + otherArtwork = other.Language == OnlineAPI.GetLanguageOverride(other.SeriesID) ? 100.0 : 0.0; + } + else + { + thisArtwork = this.Language == OnlineAPI.SelLanguageAsString ? 100.0 : 0.0; + otherArtwork = other.Language == OnlineAPI.SelLanguageAsString ? 100.0 : 0.0; + } + if (this.Rating == other.Rating) { thisArtwork += this.RatingCount; @@ -75,7 +87,7 @@ otherArtwork += other.Rating; return otherArtwork.CompareTo(thisArtwork); - } + } } class WideBannerSeries : Artwork @@ -165,10 +177,11 @@ } if (!string.IsNullOrEmpty(banner.SelectSingleNode("RatingCount").InnerText)) - seriesWideBanners.RatingCount = int.Parse(banner.SelectSingleNode("RatingCount").InnerText); + seriesWideBanners.RatingCount = int.Parse(banner.SelectSingleNode("RatingCount").InnerText); - widebannerSeriesList.Add(seriesWideBanners); - } + seriesWideBanners.SeriesID = seriesID; + widebannerSeriesList.Add(seriesWideBanners); + } // sort by highest rated widebannerSeriesList.Sort(); @@ -208,6 +221,7 @@ if (!string.IsNullOrEmpty(banner.SelectSingleNode("RatingCount").InnerText)) seriesPoster.RatingCount = int.Parse(banner.SelectSingleNode("RatingCount").InnerText); + seriesPoster.SeriesID = seriesID; posterSeriesList.Add(seriesPoster); } @@ -253,6 +267,7 @@ if (!seasons.Contains(seasonPoster.SeasonIndex)) seasons.Add(seasonPoster.SeasonIndex); + seasonPoster.SeriesID = seriesID; posterSeasonList.Add(seasonPoster); } @@ -276,9 +291,9 @@ } } } - + map.SeasonPosters = posterSeasonList; - #endregion + #endregion // series already in? if (SeriesBannersMap.Contains(map)) @@ -289,8 +304,9 @@ seriesMap.SeriesPosters.AddRange(map.SeriesPosters); } else + { SeriesBannersMap.Add(map); - + } } public void DownloadBanners(string onlineLanguage) Index: MP-TVSeries/Online Parsing Classes/GetSeries.cs =================================================================== --- MP-TVSeries/Online Parsing Classes/GetSeries.cs (revision 2110) +++ MP-TVSeries/Online Parsing Classes/GetSeries.cs (working copy) @@ -78,7 +78,7 @@ { MinLSDistance = ur.Min(r => r.LSDistance), SeriesScored = ur.OrderBy(r => r.LSDistance).FirstOrDefault(), - SeriesUserLang = ur.FirstOrDefault(r => r.Series["language"] == Online_Parsing_Classes.OnlineAPI.SelLanguageAsString), + SeriesUserLang = ur.FirstOrDefault(r => r.Series["language"] == r.Series[DBOnlineSeries.cLanguage]), SeriesEng = ur.FirstOrDefault(r => r.Series["language"] == "en"), }; Index: MP-TVSeries/Online Parsing Classes/OnlineAPI.cs =================================================================== --- MP-TVSeries/Online Parsing Classes/OnlineAPI.cs (revision 2110) +++ MP-TVSeries/Online Parsing Classes/OnlineAPI.cs (working copy) @@ -68,9 +68,8 @@ } set { selLang = value; } } - #endregion - static private string GetLanguageOverride(String sSeriesID) + public static string GetLanguageOverride(String sSeriesID) { string sqlCon = string.Empty; SQLCondition cond = new SQLCondition(); @@ -78,7 +77,7 @@ sqlCon = "id = " + sSeriesID; cond.AddCustom(sqlCon); - // Get the language that the user has selected in the Detail View for the serie + // Get the language that the user has selected for the serie List seriesLanguage = DBOnlineSeries.GetSingleField(DBOnlineSeries.cLanguage, cond, new DBOnlineSeries()); if ((seriesLanguage.Count > 0) && (seriesLanguage[0] != "")) @@ -87,10 +86,11 @@ } else { - //If there is no language prefered for the series, the fallback is Language on the Online Data view. + //If there is no language prefered for the series, the fallback is SelLanguageAsString (en). return SelLanguageAsString; } } + #endregion static public XmlNode GetMirrors(String sServer) { Index: MP-TVSeries/Online Parsing Classes/OnlineParse.cs =================================================================== --- MP-TVSeries/Online Parsing Classes/OnlineParse.cs (revision 2110) +++ MP-TVSeries/Online Parsing Classes/OnlineParse.cs (working copy) @@ -1338,7 +1338,17 @@ m_worker.ReportProgress(0, new ParsingProgress(ParsingAction.UpdateBanners, string.Format("{0} - {1}", series[DBOnlineSeries.cPrettyName], name), nIndex, seriesList.Count, series, name)); } }); - bannerParser.DownloadBanners(Online_Parsing_Classes.OnlineAPI.SelLanguageAsString); + + // Other language for the Series? + if (DBOption.GetOptions(DBOption.cOverrideLanguage)) + { + //Get the prefered language for the Series. + bannerParser.DownloadBanners(Online_Parsing_Classes.OnlineAPI.GetLanguageOverride(series[DBOnlineSeries.cID])); + } + else + { + bannerParser.DownloadBanners(Online_Parsing_Classes.OnlineAPI.SelLanguageAsString); + } // update database with available banners SeriesBannersMap seriesArtwork = Helper.getElementFromList(series[DBSeries.cID], "SeriesID", 0, bannerParser.SeriesBannersMap); @@ -2139,9 +2149,11 @@ #region SeriesHelpers public static DBOnlineSeries SearchForSeries(string seriesName, bool bNoExactMatch, IFeedback feedback) { + string SelLang = string.Empty; string nameToSearch = seriesName; - while (true) { + while (true) + { // query online db for possible matches GetSeries GetSeriesParser = new GetSeries(nameToSearch); @@ -2164,12 +2176,24 @@ Dictionary uniqueSeriesIds = new Dictionary(); foreach (DBOnlineSeries onlineSeries in GetSeriesParser.Results) // make them unique (each seriesID) - if possible in users lang { + // Other language for the Series? + if (DBOption.GetOptions(DBOption.cOverrideLanguage)) + { + //Get the prefered language for the Series. + SelLang = Online_Parsing_Classes.OnlineAPI.GetLanguageOverride(onlineSeries[DBOnlineSeries.cID]); + } + else + { + SelLang = Online_Parsing_Classes.OnlineAPI.SelLanguageAsString; + } + if (!uniqueSeriesIds.ContainsKey(onlineSeries[DBOnlineSeries.cID])) uniqueSeriesIds.Add(onlineSeries[DBOnlineSeries.cID], onlineSeries); - else if (onlineSeries["language"] == Online_Parsing_Classes.OnlineAPI.SelLanguageAsString) + else if (onlineSeries["language"] == SelLang) uniqueSeriesIds[onlineSeries[DBOnlineSeries.cID]] = onlineSeries; } - foreach (KeyValuePair onlineSeries in uniqueSeriesIds) { + foreach (KeyValuePair onlineSeries in uniqueSeriesIds) + { Choices.Add(new CItem(onlineSeries.Value[DBOnlineSeries.cPrettyName], "SeriesID: " + onlineSeries.Value[DBOnlineSeries.cID] + Environment.NewLine + onlineSeries.Value[DBOnlineSeries.cSummary], Index: MP-TVSeries/TVSeriesPlugin.cs =================================================================== --- MP-TVSeries/TVSeriesPlugin.cs (revision 2110) +++ MP-TVSeries/TVSeriesPlugin.cs (working copy) @@ -287,8 +287,7 @@ downloadTorrent, downloadNZB, filterUnwatched, - actionChangeSeriesLanguage, - actionCountSpecialEpisodesAsWatched + actionChangeSeriesLanguage } enum eContextMenus @@ -4111,10 +4110,6 @@ dlg.Add(pItem); pItem.ItemId = (int)eContextItems.actionChangeSeriesLanguage; - pItem = new GUIListItem(Translation.CountSpecialEpisodesAsWatched + " (" + (DBOption.GetOptions(DBOption.cCountSpecialEpisodesAsWatched) ? Translation.on : Translation.off) + ")"); - dlg.Add(pItem); - pItem.ItemId = (int)eContextItems.actionCountSpecialEpisodesAsWatched; - dlg.DoModal(GUIWindowManager.ActiveWindow); if (dlg.SelectedId >= 0) { @@ -4175,57 +4170,11 @@ case (int)eContextItems.actionChangeSeriesLanguage: DBOption.SetOptions(DBOption.cOverrideLanguage, !DBOption.GetOptions(DBOption.cOverrideLanguage)); break; - - case (int)eContextItems.actionCountSpecialEpisodesAsWatched: - DBOption.SetOptions(DBOption.cCountSpecialEpisodesAsWatched, !DBOption.GetOptions(DBOption.cCountSpecialEpisodesAsWatched)); - - // Set number of watched/unwatched episodes in the background thread - allSeries = DBSeries.Get(new SQLCondition()); - - if (allSeries.Count > 0) - { - MPTVSeriesLog.Write("Begin Count Special Episode as Watched/ Unwatched"); - BackgroundWorker backgroundWorker = new BackgroundWorker(); - backgroundWorker.DoWork += new DoWorkEventHandler(asyncCountSpecialEpisodesAsWatched); - backgroundWorker.RunWorkerCompleted += new RunWorkerCompletedEventHandler(asyncCountSpecialEpisodesAsWatchedCompleted); - backgroundWorker.ProgressChanged += new ProgressChangedEventHandler((s, e) => - { - if (backgroundWorker.IsBusy) - { - object[] userState = e.UserState as object[]; - backgroundWorker.ReportProgress(0, new ParsingProgress(ParsingAction.UpdateEpisodeCounts, (userState[0] as DBSeries).ToString(), (int)userState[1], allSeries.Count)); - } - }); - backgroundWorker.RunWorkerAsync(allSeries); - } - break; } } } #endregion - void asyncCountSpecialEpisodesAsWatched(object sender, DoWorkEventArgs e) - { - System.Threading.Thread.CurrentThread.Priority = System.Threading.ThreadPriority.Lowest; - - List allSeries = (List)e.Argument; - foreach (var series in allSeries) - { - int epsTotal = 0; - int epsUnWatched = 0; - DBEpisode.GetSeriesEpisodeCounts(series[DBSeries.cID], out epsTotal, out epsUnWatched); - series[DBOnlineSeries.cEpisodeCount] = epsTotal; - series[DBOnlineSeries.cEpisodesUnWatched] = epsUnWatched; - series.Commit(); - } - } - - void asyncCountSpecialEpisodesAsWatchedCompleted(object sender, RunWorkerCompletedEventArgs e) - { - MPTVSeriesLog.Write("Count Special Episode as Watched/ Unwatched completed!"); - LoadFacade(); - } - #region View Tags Menu private void ShowViewTagsMenu(bool add, DBSeries series) {