From bc09cb371c2cd86c3f2922bc8ada5feec814fbc0 Mon Sep 17 00:00:00 2001 From: Mark Date: Wed, 4 Jul 2018 22:36:08 +0800 Subject: [PATCH] Fix for #442 --- TVRename/Forms/Preferences.Designer.cs | 995 ++++++++++++++----------- TVRename/Forms/Preferences.cs | 47 +- TVRename/Settings/Settings.cs | 8 + TVRename/Utility/Helper/FileHelper.cs | 19 +- 4 files changed, 594 insertions(+), 475 deletions(-) diff --git a/TVRename/Forms/Preferences.Designer.cs b/TVRename/Forms/Preferences.Designer.cs index eadf64296..549516f05 100644 --- a/TVRename/Forms/Preferences.Designer.cs +++ b/TVRename/Forms/Preferences.Designer.cs @@ -90,7 +90,6 @@ private void InitializeComponent() this.label20 = new System.Windows.Forms.Label(); this.txtParallelDownloads = new System.Windows.Forms.TextBox(); this.tbFilesAndFolders = new System.Windows.Forms.TabPage(); - this.chkRetainLanguageSpecificSubtitles = new System.Windows.Forms.CheckBox(); this.txtKeepTogether = new System.Windows.Forms.TextBox(); this.label39 = new System.Windows.Forms.Label(); this.cbKeepTogetherMode = new System.Windows.Forms.ComboBox(); @@ -103,7 +102,6 @@ private void InitializeComponent() this.label3 = new System.Windows.Forms.Label(); this.label19 = new System.Windows.Forms.Label(); this.txtMaxSampleSize = new System.Windows.Forms.TextBox(); - this.cbTxtToSub = new System.Windows.Forms.CheckBox(); this.label22 = new System.Windows.Forms.Label(); this.txtOtherExtensions = new System.Windows.Forms.TextBox(); this.cbForceLower = new System.Windows.Forms.CheckBox(); @@ -133,7 +131,6 @@ private void InitializeComponent() this.txtMissingXML = new System.Windows.Forms.TextBox(); this.tpScanOptions = new System.Windows.Forms.TabPage(); this.chkAutoMergeLibraryEpisodes = new System.Windows.Forms.CheckBox(); - this.chkAutoSearchForDownloadedFiles = new System.Windows.Forms.CheckBox(); this.chkAutoMergeDownloadEpisodes = new System.Windows.Forms.CheckBox(); this.chkPreventMove = new System.Windows.Forms.CheckBox(); this.label40 = new System.Windows.Forms.Label(); @@ -148,25 +145,8 @@ private void InitializeComponent() this.cbCheckSABnzbd = new System.Windows.Forms.CheckBox(); this.cbCheckuTorrent = new System.Windows.Forms.CheckBox(); this.cbSearchLocally = new System.Windows.Forms.CheckBox(); - this.tbFolderDeleting = new System.Windows.Forms.TabPage(); - this.cbCleanUpDownloadDir = new System.Windows.Forms.CheckBox(); - this.label32 = new System.Windows.Forms.Label(); - this.label30 = new System.Windows.Forms.Label(); - this.txtEmptyMaxSize = new System.Windows.Forms.TextBox(); - this.txtEmptyIgnoreWords = new System.Windows.Forms.TextBox(); - this.txtEmptyIgnoreExtensions = new System.Windows.Forms.TextBox(); - this.label31 = new System.Windows.Forms.Label(); - this.cbRecycleNotDelete = new System.Windows.Forms.CheckBox(); - this.cbEmptyMaxSize = new System.Windows.Forms.CheckBox(); - this.cbEmptyIgnoreWords = new System.Windows.Forms.CheckBox(); - this.cbEmptyIgnoreExtensions = new System.Windows.Forms.CheckBox(); - this.cbDeleteEmpty = new System.Windows.Forms.CheckBox(); this.tbMediaCenter = new System.Windows.Forms.TabPage(); this.cbNFOEpisodes = new System.Windows.Forms.CheckBox(); - this.panel2 = new System.Windows.Forms.Panel(); - this.rdEden = new System.Windows.Forms.RadioButton(); - this.rdFrodo = new System.Windows.Forms.RadioButton(); - this.rdBoth = new System.Windows.Forms.RadioButton(); this.panel1 = new System.Windows.Forms.Panel(); this.rbFolderBanner = new System.Windows.Forms.RadioButton(); this.rbFolderPoster = new System.Windows.Forms.RadioButton(); @@ -235,15 +215,6 @@ private void InitializeComponent() this.colShowStatus = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.colColor = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.tpBulkAdd = new System.Windows.Forms.TabPage(); - this.chkForceBulkAddToUseSettingsOnly = new System.Windows.Forms.CheckBox(); - this.label43 = new System.Windows.Forms.Label(); - this.label44 = new System.Windows.Forms.Label(); - this.tbIgnoreSuffixes = new System.Windows.Forms.TextBox(); - this.tbMovieTerms = new System.Windows.Forms.TextBox(); - this.label42 = new System.Windows.Forms.Label(); - this.label41 = new System.Windows.Forms.Label(); - this.cbIgnoreRecycleBin = new System.Windows.Forms.CheckBox(); - this.cbIgnoreNoVideoFolders = new System.Windows.Forms.CheckBox(); this.folderBrowser = new System.Windows.Forms.FolderBrowserDialog(); this.openFile = new System.Windows.Forms.OpenFileDialog(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); @@ -253,6 +224,38 @@ private void InitializeComponent() this.pyTivoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mede8erToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.noneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.cbDeleteEmpty = new System.Windows.Forms.CheckBox(); + this.cbEmptyIgnoreExtensions = new System.Windows.Forms.CheckBox(); + this.cbEmptyIgnoreWords = new System.Windows.Forms.CheckBox(); + this.cbEmptyMaxSize = new System.Windows.Forms.CheckBox(); + this.cbRecycleNotDelete = new System.Windows.Forms.CheckBox(); + this.label31 = new System.Windows.Forms.Label(); + this.txtEmptyIgnoreExtensions = new System.Windows.Forms.TextBox(); + this.txtEmptyIgnoreWords = new System.Windows.Forms.TextBox(); + this.txtEmptyMaxSize = new System.Windows.Forms.TextBox(); + this.label30 = new System.Windows.Forms.Label(); + this.label32 = new System.Windows.Forms.Label(); + this.cbCleanUpDownloadDir = new System.Windows.Forms.CheckBox(); + this.tbFolderDeleting = new System.Windows.Forms.TabPage(); + this.tpSubtitles = new System.Windows.Forms.TabPage(); + this.rdBoth = new System.Windows.Forms.RadioButton(); + this.rdFrodo = new System.Windows.Forms.RadioButton(); + this.rdEden = new System.Windows.Forms.RadioButton(); + this.panel2 = new System.Windows.Forms.Panel(); + this.chkRetainLanguageSpecificSubtitles = new System.Windows.Forms.CheckBox(); + this.label46 = new System.Windows.Forms.Label(); + this.txtSubtitleExtensions = new System.Windows.Forms.TextBox(); + this.cbTxtToSub = new System.Windows.Forms.CheckBox(); + this.groupBox8 = new System.Windows.Forms.GroupBox(); + this.label43 = new System.Windows.Forms.Label(); + this.label44 = new System.Windows.Forms.Label(); + this.tbIgnoreSuffixes = new System.Windows.Forms.TextBox(); + this.tbMovieTerms = new System.Windows.Forms.TextBox(); + this.groupBox9 = new System.Windows.Forms.GroupBox(); + this.chkForceBulkAddToUseSettingsOnly = new System.Windows.Forms.CheckBox(); + this.cbIgnoreRecycleBin = new System.Windows.Forms.CheckBox(); + this.cbIgnoreNoVideoFolders = new System.Windows.Forms.CheckBox(); + this.chkAutoSearchForDownloadedFiles = new System.Windows.Forms.CheckBox(); this.groupBox2.SuspendLayout(); this.tabControl1.SuspendLayout(); this.tbGeneral.SuspendLayout(); @@ -263,9 +266,7 @@ private void InitializeComponent() this.groupBox4.SuspendLayout(); this.groupBox3.SuspendLayout(); this.tpScanOptions.SuspendLayout(); - this.tbFolderDeleting.SuspendLayout(); this.tbMediaCenter.SuspendLayout(); - this.panel2.SuspendLayout(); this.panel1.SuspendLayout(); this.tbSearchFolders.SuspendLayout(); this.tbuTorrentNZB.SuspendLayout(); @@ -274,12 +275,17 @@ private void InitializeComponent() this.tpTreeColoring.SuspendLayout(); this.tpBulkAdd.SuspendLayout(); this.cmDefaults.SuspendLayout(); + this.tbFolderDeleting.SuspendLayout(); + this.tpSubtitles.SuspendLayout(); + this.panel2.SuspendLayout(); + this.groupBox8.SuspendLayout(); + this.groupBox9.SuspendLayout(); this.SuspendLayout(); // // OKButton // this.OKButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.OKButton.Location = new System.Drawing.Point(280, 469); + this.OKButton.Location = new System.Drawing.Point(366, 497); this.OKButton.Name = "OKButton"; this.OKButton.Size = new System.Drawing.Size(75, 23); this.OKButton.TabIndex = 0; @@ -291,7 +297,7 @@ private void InitializeComponent() // this.bnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.bnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.bnCancel.Location = new System.Drawing.Point(361, 469); + this.bnCancel.Location = new System.Drawing.Point(447, 497); this.bnCancel.Name = "bnCancel"; this.bnCancel.Size = new System.Drawing.Size(75, 23); this.bnCancel.TabIndex = 1; @@ -301,19 +307,23 @@ private void InitializeComponent() // // ReplacementsGrid // + this.ReplacementsGrid.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.ReplacementsGrid.BackColor = System.Drawing.SystemColors.Window; this.ReplacementsGrid.EnableSort = true; this.ReplacementsGrid.Location = new System.Drawing.Point(6, 19); this.ReplacementsGrid.Name = "ReplacementsGrid"; this.ReplacementsGrid.OptimizeMode = SourceGrid.CellOptimizeMode.ForRows; this.ReplacementsGrid.SelectionMode = SourceGrid.GridSelectionMode.Cell; - this.ReplacementsGrid.Size = new System.Drawing.Size(403, 62); + this.ReplacementsGrid.Size = new System.Drawing.Size(490, 62); this.ReplacementsGrid.TabIndex = 1; this.ReplacementsGrid.TabStop = true; this.ReplacementsGrid.ToolTipText = ""; // // groupBox2 // + this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.groupBox2.Controls.Add(this.label4); this.groupBox2.Controls.Add(this.txtExportRSSDaysPast); this.groupBox2.Controls.Add(this.bnBrowseWTWXML); @@ -329,7 +339,7 @@ private void InitializeComponent() this.groupBox2.Controls.Add(this.txtExportRSSMaxShows); this.groupBox2.Location = new System.Drawing.Point(6, 6); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(403, 113); + this.groupBox2.Size = new System.Drawing.Size(490, 113); this.groupBox2.TabIndex = 0; this.groupBox2.TabStop = false; this.groupBox2.Text = "When to Watch"; @@ -352,7 +362,8 @@ private void InitializeComponent() // // bnBrowseWTWXML // - this.bnBrowseWTWXML.Location = new System.Drawing.Point(322, 47); + this.bnBrowseWTWXML.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.bnBrowseWTWXML.Location = new System.Drawing.Point(407, 47); this.bnBrowseWTWXML.Name = "bnBrowseWTWXML"; this.bnBrowseWTWXML.Size = new System.Drawing.Size(75, 23); this.bnBrowseWTWXML.TabIndex = 19; @@ -362,9 +373,11 @@ private void InitializeComponent() // // txtWTWXML // + this.txtWTWXML.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.txtWTWXML.Location = new System.Drawing.Point(65, 49); this.txtWTWXML.Name = "txtWTWXML"; - this.txtWTWXML.Size = new System.Drawing.Size(251, 20); + this.txtWTWXML.Size = new System.Drawing.Size(335, 20); this.txtWTWXML.TabIndex = 18; // // cbWTWXML @@ -380,7 +393,8 @@ private void InitializeComponent() // // bnBrowseWTWRSS // - this.bnBrowseWTWRSS.Location = new System.Drawing.Point(321, 18); + this.bnBrowseWTWRSS.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.bnBrowseWTWRSS.Location = new System.Drawing.Point(406, 18); this.bnBrowseWTWRSS.Name = "bnBrowseWTWRSS"; this.bnBrowseWTWRSS.Size = new System.Drawing.Size(75, 23); this.bnBrowseWTWRSS.TabIndex = 2; @@ -390,9 +404,11 @@ private void InitializeComponent() // // txtWTWRSS // + this.txtWTWRSS.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.txtWTWRSS.Location = new System.Drawing.Point(64, 20); this.txtWTWRSS.Name = "txtWTWRSS"; - this.txtWTWRSS.Size = new System.Drawing.Size(251, 20); + this.txtWTWRSS.Size = new System.Drawing.Size(336, 20); this.txtWTWRSS.TabIndex = 1; // // cbWTWRSS @@ -456,16 +472,20 @@ private void InitializeComponent() // // txtSpecialsFolderName // + this.txtSpecialsFolderName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.txtSpecialsFolderName.Location = new System.Drawing.Point(113, 281); this.txtSpecialsFolderName.Name = "txtSpecialsFolderName"; - this.txtSpecialsFolderName.Size = new System.Drawing.Size(279, 20); + this.txtSpecialsFolderName.Size = new System.Drawing.Size(383, 20); this.txtSpecialsFolderName.TabIndex = 12; // // txtVideoExtensions // + this.txtVideoExtensions.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.txtVideoExtensions.Location = new System.Drawing.Point(99, 128); this.txtVideoExtensions.Name = "txtVideoExtensions"; - this.txtVideoExtensions.Size = new System.Drawing.Size(293, 20); + this.txtVideoExtensions.Size = new System.Drawing.Size(397, 20); this.txtVideoExtensions.TabIndex = 5; // // cbStartupTab @@ -593,11 +613,12 @@ private void InitializeComponent() this.tabControl1.Controls.Add(this.tbuTorrentNZB); this.tabControl1.Controls.Add(this.tpTreeColoring); this.tabControl1.Controls.Add(this.tpBulkAdd); + this.tabControl1.Controls.Add(this.tpSubtitles); this.tabControl1.Location = new System.Drawing.Point(12, 12); this.tabControl1.Multiline = true; this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(424, 445); + this.tabControl1.Size = new System.Drawing.Size(510, 473); this.tabControl1.TabIndex = 0; // // tbGeneral @@ -629,7 +650,7 @@ private void InitializeComponent() this.tbGeneral.Location = new System.Drawing.Point(4, 40); this.tbGeneral.Name = "tbGeneral"; this.tbGeneral.Padding = new System.Windows.Forms.Padding(3); - this.tbGeneral.Size = new System.Drawing.Size(416, 401); + this.tbGeneral.Size = new System.Drawing.Size(716, 455); this.tbGeneral.TabIndex = 0; this.tbGeneral.Text = "General"; this.tbGeneral.UseVisualStyleBackColor = true; @@ -803,7 +824,6 @@ private void InitializeComponent() // // tbFilesAndFolders // - this.tbFilesAndFolders.Controls.Add(this.chkRetainLanguageSpecificSubtitles); this.tbFilesAndFolders.Controls.Add(this.txtKeepTogether); this.tbFilesAndFolders.Controls.Add(this.label39); this.tbFilesAndFolders.Controls.Add(this.cbKeepTogetherMode); @@ -817,7 +837,6 @@ private void InitializeComponent() this.tbFilesAndFolders.Controls.Add(this.ReplacementsGrid); this.tbFilesAndFolders.Controls.Add(this.label19); this.tbFilesAndFolders.Controls.Add(this.txtMaxSampleSize); - this.tbFilesAndFolders.Controls.Add(this.cbTxtToSub); this.tbFilesAndFolders.Controls.Add(this.label22); this.tbFilesAndFolders.Controls.Add(this.label14); this.tbFilesAndFolders.Controls.Add(this.txtSpecialsFolderName); @@ -831,26 +850,18 @@ private void InitializeComponent() this.tbFilesAndFolders.Location = new System.Drawing.Point(4, 40); this.tbFilesAndFolders.Name = "tbFilesAndFolders"; this.tbFilesAndFolders.Padding = new System.Windows.Forms.Padding(3); - this.tbFilesAndFolders.Size = new System.Drawing.Size(416, 401); + this.tbFilesAndFolders.Size = new System.Drawing.Size(502, 429); this.tbFilesAndFolders.TabIndex = 1; this.tbFilesAndFolders.Text = "Files and Folders"; this.tbFilesAndFolders.UseVisualStyleBackColor = true; // - // chkRetainLanguageSpecificSubtitles - // - this.chkRetainLanguageSpecificSubtitles.AutoSize = true; - this.chkRetainLanguageSpecificSubtitles.Location = new System.Drawing.Point(172, 234); - this.chkRetainLanguageSpecificSubtitles.Name = "chkRetainLanguageSpecificSubtitles"; - this.chkRetainLanguageSpecificSubtitles.Size = new System.Drawing.Size(192, 17); - this.chkRetainLanguageSpecificSubtitles.TabIndex = 24; - this.chkRetainLanguageSpecificSubtitles.Text = "Retain &Language Specific Subtitles"; - this.chkRetainLanguageSpecificSubtitles.UseVisualStyleBackColor = true; - // // txtKeepTogether // + this.txtKeepTogether.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.txtKeepTogether.Location = new System.Drawing.Point(204, 206); this.txtKeepTogether.Name = "txtKeepTogether"; - this.txtKeepTogether.Size = new System.Drawing.Size(188, 20); + this.txtKeepTogether.Size = new System.Drawing.Size(292, 20); this.txtKeepTogether.TabIndex = 23; // // label39 @@ -879,9 +890,11 @@ private void InitializeComponent() // // tbSeasonSearchTerms // + this.tbSeasonSearchTerms.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.tbSeasonSearchTerms.Location = new System.Drawing.Point(113, 329); this.tbSeasonSearchTerms.Name = "tbSeasonSearchTerms"; - this.tbSeasonSearchTerms.Size = new System.Drawing.Size(279, 20); + this.tbSeasonSearchTerms.Size = new System.Drawing.Size(383, 20); this.tbSeasonSearchTerms.TabIndex = 20; // // label36 @@ -895,9 +908,11 @@ private void InitializeComponent() // // txtSeasonFolderName // + this.txtSeasonFolderName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.txtSeasonFolderName.Location = new System.Drawing.Point(113, 305); this.txtSeasonFolderName.Name = "txtSeasonFolderName"; - this.txtSeasonFolderName.Size = new System.Drawing.Size(279, 20); + this.txtSeasonFolderName.Size = new System.Drawing.Size(383, 20); this.txtSeasonFolderName.TabIndex = 18; // // label35 @@ -955,16 +970,6 @@ private void InitializeComponent() this.txtMaxSampleSize.TabIndex = 14; this.txtMaxSampleSize.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.TxtNumberOnlyKeyPress); // - // cbTxtToSub - // - this.cbTxtToSub.AutoSize = true; - this.cbTxtToSub.Location = new System.Drawing.Point(29, 234); - this.cbTxtToSub.Name = "cbTxtToSub"; - this.cbTxtToSub.Size = new System.Drawing.Size(118, 17); - this.cbTxtToSub.TabIndex = 9; - this.cbTxtToSub.Text = "&Rename .txt to .sub"; - this.cbTxtToSub.UseVisualStyleBackColor = true; - // // label22 // this.label22.AutoSize = true; @@ -976,9 +981,11 @@ private void InitializeComponent() // // txtOtherExtensions // + this.txtOtherExtensions.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.txtOtherExtensions.Location = new System.Drawing.Point(99, 154); this.txtOtherExtensions.Name = "txtOtherExtensions"; - this.txtOtherExtensions.Size = new System.Drawing.Size(293, 20); + this.txtOtherExtensions.Size = new System.Drawing.Size(397, 20); this.txtOtherExtensions.TabIndex = 7; // // cbForceLower @@ -1011,13 +1018,15 @@ private void InitializeComponent() this.tbAutoExport.Location = new System.Drawing.Point(4, 40); this.tbAutoExport.Name = "tbAutoExport"; this.tbAutoExport.Padding = new System.Windows.Forms.Padding(3); - this.tbAutoExport.Size = new System.Drawing.Size(416, 401); + this.tbAutoExport.Size = new System.Drawing.Size(502, 429); this.tbAutoExport.TabIndex = 2; this.tbAutoExport.Text = "Automatic Export"; this.tbAutoExport.UseVisualStyleBackColor = true; // // groupBox7 // + this.groupBox7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.groupBox7.Controls.Add(this.bnBrowseShowsHTML); this.groupBox7.Controls.Add(this.cbShowsHTML); this.groupBox7.Controls.Add(this.txtShowsHTMLTo); @@ -1026,14 +1035,15 @@ private void InitializeComponent() this.groupBox7.Controls.Add(this.txtShowsTXTTo); this.groupBox7.Location = new System.Drawing.Point(7, 203); this.groupBox7.Name = "groupBox7"; - this.groupBox7.Size = new System.Drawing.Size(402, 72); + this.groupBox7.Size = new System.Drawing.Size(489, 72); this.groupBox7.TabIndex = 4; this.groupBox7.TabStop = false; this.groupBox7.Text = "All Shows"; // // bnBrowseShowsHTML // - this.bnBrowseShowsHTML.Location = new System.Drawing.Point(321, 45); + this.bnBrowseShowsHTML.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.bnBrowseShowsHTML.Location = new System.Drawing.Point(406, 45); this.bnBrowseShowsHTML.Name = "bnBrowseShowsHTML"; this.bnBrowseShowsHTML.Size = new System.Drawing.Size(75, 23); this.bnBrowseShowsHTML.TabIndex = 8; @@ -1054,14 +1064,17 @@ private void InitializeComponent() // // txtShowsHTMLTo // + this.txtShowsHTMLTo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.txtShowsHTMLTo.Location = new System.Drawing.Point(64, 47); this.txtShowsHTMLTo.Name = "txtShowsHTMLTo"; - this.txtShowsHTMLTo.Size = new System.Drawing.Size(251, 20); + this.txtShowsHTMLTo.Size = new System.Drawing.Size(336, 20); this.txtShowsHTMLTo.TabIndex = 7; // // bnBrowseShowsTXT // - this.bnBrowseShowsTXT.Location = new System.Drawing.Point(321, 21); + this.bnBrowseShowsTXT.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.bnBrowseShowsTXT.Location = new System.Drawing.Point(406, 21); this.bnBrowseShowsTXT.Name = "bnBrowseShowsTXT"; this.bnBrowseShowsTXT.Size = new System.Drawing.Size(75, 23); this.bnBrowseShowsTXT.TabIndex = 5; @@ -1082,26 +1095,31 @@ private void InitializeComponent() // // txtShowsTXTTo // + this.txtShowsTXTTo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.txtShowsTXTTo.Location = new System.Drawing.Point(64, 23); this.txtShowsTXTTo.Name = "txtShowsTXTTo"; - this.txtShowsTXTTo.Size = new System.Drawing.Size(251, 20); + this.txtShowsTXTTo.Size = new System.Drawing.Size(335, 20); this.txtShowsTXTTo.TabIndex = 4; // // groupBox5 // + this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.groupBox5.Controls.Add(this.bnBrowseFOXML); this.groupBox5.Controls.Add(this.cbFOXML); this.groupBox5.Controls.Add(this.txtFOXML); this.groupBox5.Location = new System.Drawing.Point(6, 343); this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(402, 55); + this.groupBox5.Size = new System.Drawing.Size(490, 55); this.groupBox5.TabIndex = 3; this.groupBox5.TabStop = false; this.groupBox5.Text = "Finding and Organising"; // // bnBrowseFOXML // - this.bnBrowseFOXML.Location = new System.Drawing.Point(321, 19); + this.bnBrowseFOXML.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.bnBrowseFOXML.Location = new System.Drawing.Point(406, 19); this.bnBrowseFOXML.Name = "bnBrowseFOXML"; this.bnBrowseFOXML.Size = new System.Drawing.Size(75, 23); this.bnBrowseFOXML.TabIndex = 2; @@ -1122,26 +1140,31 @@ private void InitializeComponent() // // txtFOXML // + this.txtFOXML.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.txtFOXML.Location = new System.Drawing.Point(64, 21); this.txtFOXML.Name = "txtFOXML"; - this.txtFOXML.Size = new System.Drawing.Size(251, 20); + this.txtFOXML.Size = new System.Drawing.Size(336, 20); this.txtFOXML.TabIndex = 1; // // groupBox4 // + this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.groupBox4.Controls.Add(this.bnBrowseRenamingXML); this.groupBox4.Controls.Add(this.cbRenamingXML); this.groupBox4.Controls.Add(this.txtRenamingXML); this.groupBox4.Location = new System.Drawing.Point(6, 281); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(402, 57); + this.groupBox4.Size = new System.Drawing.Size(490, 57); this.groupBox4.TabIndex = 2; this.groupBox4.TabStop = false; this.groupBox4.Text = "Renaming"; // // bnBrowseRenamingXML // - this.bnBrowseRenamingXML.Location = new System.Drawing.Point(321, 19); + this.bnBrowseRenamingXML.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.bnBrowseRenamingXML.Location = new System.Drawing.Point(406, 19); this.bnBrowseRenamingXML.Name = "bnBrowseRenamingXML"; this.bnBrowseRenamingXML.Size = new System.Drawing.Size(75, 23); this.bnBrowseRenamingXML.TabIndex = 2; @@ -1162,13 +1185,17 @@ private void InitializeComponent() // // txtRenamingXML // + this.txtRenamingXML.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.txtRenamingXML.Location = new System.Drawing.Point(64, 21); this.txtRenamingXML.Name = "txtRenamingXML"; - this.txtRenamingXML.Size = new System.Drawing.Size(251, 20); + this.txtRenamingXML.Size = new System.Drawing.Size(336, 20); this.txtRenamingXML.TabIndex = 1; // // groupBox3 // + this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.groupBox3.Controls.Add(this.bnBrowseMissingCSV); this.groupBox3.Controls.Add(this.bnBrowseMissingXML); this.groupBox3.Controls.Add(this.txtMissingCSV); @@ -1177,14 +1204,15 @@ private void InitializeComponent() this.groupBox3.Controls.Add(this.txtMissingXML); this.groupBox3.Location = new System.Drawing.Point(6, 123); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(402, 79); + this.groupBox3.Size = new System.Drawing.Size(490, 79); this.groupBox3.TabIndex = 1; this.groupBox3.TabStop = false; this.groupBox3.Text = "Missing"; // // bnBrowseMissingCSV // - this.bnBrowseMissingCSV.Location = new System.Drawing.Point(321, 47); + this.bnBrowseMissingCSV.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.bnBrowseMissingCSV.Location = new System.Drawing.Point(406, 47); this.bnBrowseMissingCSV.Name = "bnBrowseMissingCSV"; this.bnBrowseMissingCSV.Size = new System.Drawing.Size(75, 23); this.bnBrowseMissingCSV.TabIndex = 2; @@ -1194,7 +1222,8 @@ private void InitializeComponent() // // bnBrowseMissingXML // - this.bnBrowseMissingXML.Location = new System.Drawing.Point(321, 19); + this.bnBrowseMissingXML.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.bnBrowseMissingXML.Location = new System.Drawing.Point(407, 19); this.bnBrowseMissingXML.Name = "bnBrowseMissingXML"; this.bnBrowseMissingXML.Size = new System.Drawing.Size(75, 23); this.bnBrowseMissingXML.TabIndex = 5; @@ -1204,9 +1233,11 @@ private void InitializeComponent() // // txtMissingCSV // + this.txtMissingCSV.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.txtMissingCSV.Location = new System.Drawing.Point(64, 48); this.txtMissingCSV.Name = "txtMissingCSV"; - this.txtMissingCSV.Size = new System.Drawing.Size(251, 20); + this.txtMissingCSV.Size = new System.Drawing.Size(336, 20); this.txtMissingCSV.TabIndex = 1; // // cbMissingXML @@ -1233,15 +1264,16 @@ private void InitializeComponent() // // txtMissingXML // + this.txtMissingXML.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.txtMissingXML.Location = new System.Drawing.Point(64, 21); this.txtMissingXML.Name = "txtMissingXML"; - this.txtMissingXML.Size = new System.Drawing.Size(251, 20); + this.txtMissingXML.Size = new System.Drawing.Size(336, 20); this.txtMissingXML.TabIndex = 4; // // tpScanOptions // this.tpScanOptions.Controls.Add(this.chkAutoMergeLibraryEpisodes); - this.tpScanOptions.Controls.Add(this.chkAutoSearchForDownloadedFiles); this.tpScanOptions.Controls.Add(this.chkAutoMergeDownloadEpisodes); this.tpScanOptions.Controls.Add(this.chkPreventMove); this.tpScanOptions.Controls.Add(this.label40); @@ -1259,7 +1291,7 @@ private void InitializeComponent() this.tpScanOptions.Location = new System.Drawing.Point(4, 40); this.tpScanOptions.Name = "tpScanOptions"; this.tpScanOptions.Padding = new System.Windows.Forms.Padding(3); - this.tpScanOptions.Size = new System.Drawing.Size(416, 401); + this.tpScanOptions.Size = new System.Drawing.Size(502, 429); this.tpScanOptions.TabIndex = 6; this.tpScanOptions.Text = "Scan Options"; this.tpScanOptions.UseVisualStyleBackColor = true; @@ -1274,16 +1306,6 @@ private void InitializeComponent() this.chkAutoMergeLibraryEpisodes.Text = "Automatically create merge rules for merged library episodes"; this.chkAutoMergeLibraryEpisodes.UseVisualStyleBackColor = true; // - // chkAutoSearchForDownloadedFiles - // - this.chkAutoSearchForDownloadedFiles.AutoSize = true; - this.chkAutoSearchForDownloadedFiles.Location = new System.Drawing.Point(9, 357); - this.chkAutoSearchForDownloadedFiles.Name = "chkAutoSearchForDownloadedFiles"; - this.chkAutoSearchForDownloadedFiles.Size = new System.Drawing.Size(186, 17); - this.chkAutoSearchForDownloadedFiles.TabIndex = 14; - this.chkAutoSearchForDownloadedFiles.Text = "Notify when new shows are found"; - this.chkAutoSearchForDownloadedFiles.UseVisualStyleBackColor = true; - // // chkAutoMergeDownloadEpisodes // this.chkAutoMergeDownloadEpisodes.AutoSize = true; @@ -1431,138 +1453,6 @@ private void InitializeComponent() this.cbSearchLocally.UseVisualStyleBackColor = true; this.cbSearchLocally.CheckedChanged += new System.EventHandler(this.cbSearchLocally_CheckedChanged); // - // tbFolderDeleting - // - this.tbFolderDeleting.Controls.Add(this.cbCleanUpDownloadDir); - this.tbFolderDeleting.Controls.Add(this.label32); - this.tbFolderDeleting.Controls.Add(this.label30); - this.tbFolderDeleting.Controls.Add(this.txtEmptyMaxSize); - this.tbFolderDeleting.Controls.Add(this.txtEmptyIgnoreWords); - this.tbFolderDeleting.Controls.Add(this.txtEmptyIgnoreExtensions); - this.tbFolderDeleting.Controls.Add(this.label31); - this.tbFolderDeleting.Controls.Add(this.cbRecycleNotDelete); - this.tbFolderDeleting.Controls.Add(this.cbEmptyMaxSize); - this.tbFolderDeleting.Controls.Add(this.cbEmptyIgnoreWords); - this.tbFolderDeleting.Controls.Add(this.cbEmptyIgnoreExtensions); - this.tbFolderDeleting.Controls.Add(this.cbDeleteEmpty); - this.tbFolderDeleting.Location = new System.Drawing.Point(4, 40); - this.tbFolderDeleting.Name = "tbFolderDeleting"; - this.tbFolderDeleting.Padding = new System.Windows.Forms.Padding(3); - this.tbFolderDeleting.Size = new System.Drawing.Size(416, 401); - this.tbFolderDeleting.TabIndex = 9; - this.tbFolderDeleting.Text = "Folder Deleting"; - this.tbFolderDeleting.UseVisualStyleBackColor = true; - // - // cbCleanUpDownloadDir - // - this.cbCleanUpDownloadDir.AutoSize = true; - this.cbCleanUpDownloadDir.Location = new System.Drawing.Point(16, 244); - this.cbCleanUpDownloadDir.Name = "cbCleanUpDownloadDir"; - this.cbCleanUpDownloadDir.Size = new System.Drawing.Size(276, 17); - this.cbCleanUpDownloadDir.TabIndex = 11; - this.cbCleanUpDownloadDir.Text = "Clean up already copied files from download directory"; - this.cbCleanUpDownloadDir.UseVisualStyleBackColor = true; - // - // label32 - // - this.label32.AutoSize = true; - this.label32.Location = new System.Drawing.Point(13, 168); - this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(72, 13); - this.label32.TabIndex = 6; - this.label32.Text = "Extra checks:"; - // - // label30 - // - this.label30.AutoSize = true; - this.label30.Location = new System.Drawing.Point(13, 43); - this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(291, 13); - this.label30.TabIndex = 1; - this.label30.Text = "Folders that have files left in them can also be \"empty\" if we:"; - // - // txtEmptyMaxSize - // - this.txtEmptyMaxSize.Location = new System.Drawing.Point(218, 189); - this.txtEmptyMaxSize.Name = "txtEmptyMaxSize"; - this.txtEmptyMaxSize.Size = new System.Drawing.Size(55, 20); - this.txtEmptyMaxSize.TabIndex = 8; - // - // txtEmptyIgnoreWords - // - this.txtEmptyIgnoreWords.Location = new System.Drawing.Point(95, 89); - this.txtEmptyIgnoreWords.Name = "txtEmptyIgnoreWords"; - this.txtEmptyIgnoreWords.Size = new System.Drawing.Size(306, 20); - this.txtEmptyIgnoreWords.TabIndex = 3; - this.toolTip1.SetToolTip(this.txtEmptyIgnoreWords, "For example \"sample\""); - // - // txtEmptyIgnoreExtensions - // - this.txtEmptyIgnoreExtensions.Location = new System.Drawing.Point(95, 139); - this.txtEmptyIgnoreExtensions.Name = "txtEmptyIgnoreExtensions"; - this.txtEmptyIgnoreExtensions.Size = new System.Drawing.Size(306, 20); - this.txtEmptyIgnoreExtensions.TabIndex = 5; - this.toolTip1.SetToolTip(this.txtEmptyIgnoreExtensions, "For example \".par2;.nzb;.nfo\""); - // - // label31 - // - this.label31.AutoSize = true; - this.label31.Location = new System.Drawing.Point(281, 193); - this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(23, 13); - this.label31.TabIndex = 9; - this.label31.Text = "MB"; - // - // cbRecycleNotDelete - // - this.cbRecycleNotDelete.AutoSize = true; - this.cbRecycleNotDelete.Location = new System.Drawing.Point(16, 221); - this.cbRecycleNotDelete.Name = "cbRecycleNotDelete"; - this.cbRecycleNotDelete.Size = new System.Drawing.Size(299, 17); - this.cbRecycleNotDelete.TabIndex = 10; - this.cbRecycleNotDelete.Text = "Folders with files are moved to the &recycle bin, not deleted"; - this.cbRecycleNotDelete.UseVisualStyleBackColor = true; - // - // cbEmptyMaxSize - // - this.cbEmptyMaxSize.AutoSize = true; - this.cbEmptyMaxSize.Location = new System.Drawing.Point(35, 191); - this.cbEmptyMaxSize.Name = "cbEmptyMaxSize"; - this.cbEmptyMaxSize.Size = new System.Drawing.Size(177, 17); - this.cbEmptyMaxSize.TabIndex = 7; - this.cbEmptyMaxSize.Text = "&Maximum total file size to delete:"; - this.cbEmptyMaxSize.UseVisualStyleBackColor = true; - // - // cbEmptyIgnoreWords - // - this.cbEmptyIgnoreWords.AutoSize = true; - this.cbEmptyIgnoreWords.Location = new System.Drawing.Point(35, 66); - this.cbEmptyIgnoreWords.Name = "cbEmptyIgnoreWords"; - this.cbEmptyIgnoreWords.Size = new System.Drawing.Size(366, 17); - this.cbEmptyIgnoreWords.TabIndex = 2; - this.cbEmptyIgnoreWords.Text = "Ignore any files with these &words in their name: (semicolon separated list)"; - this.cbEmptyIgnoreWords.UseVisualStyleBackColor = true; - // - // cbEmptyIgnoreExtensions - // - this.cbEmptyIgnoreExtensions.AutoSize = true; - this.cbEmptyIgnoreExtensions.Location = new System.Drawing.Point(35, 116); - this.cbEmptyIgnoreExtensions.Name = "cbEmptyIgnoreExtensions"; - this.cbEmptyIgnoreExtensions.Size = new System.Drawing.Size(305, 17); - this.cbEmptyIgnoreExtensions.TabIndex = 4; - this.cbEmptyIgnoreExtensions.Text = "&Ignore files with these extensions: (semicolon separated list)"; - this.cbEmptyIgnoreExtensions.UseVisualStyleBackColor = true; - // - // cbDeleteEmpty - // - this.cbDeleteEmpty.AutoSize = true; - this.cbDeleteEmpty.Location = new System.Drawing.Point(16, 18); - this.cbDeleteEmpty.Name = "cbDeleteEmpty"; - this.cbDeleteEmpty.Size = new System.Drawing.Size(204, 17); - this.cbDeleteEmpty.TabIndex = 0; - this.cbDeleteEmpty.Text = "&Delete empty folders after moving files"; - this.cbDeleteEmpty.UseVisualStyleBackColor = true; - // // tbMediaCenter // this.tbMediaCenter.Controls.Add(this.cbNFOEpisodes); @@ -1587,7 +1477,7 @@ private void InitializeComponent() this.tbMediaCenter.Location = new System.Drawing.Point(4, 40); this.tbMediaCenter.Name = "tbMediaCenter"; this.tbMediaCenter.Padding = new System.Windows.Forms.Padding(3); - this.tbMediaCenter.Size = new System.Drawing.Size(416, 401); + this.tbMediaCenter.Size = new System.Drawing.Size(716, 455); this.tbMediaCenter.TabIndex = 8; this.tbMediaCenter.Text = "Media Center"; this.tbMediaCenter.UseVisualStyleBackColor = true; @@ -1602,61 +1492,18 @@ private void InitializeComponent() this.cbNFOEpisodes.Text = "&NFO files for episodes"; this.cbNFOEpisodes.UseVisualStyleBackColor = true; // - // panel2 - // - this.panel2.Controls.Add(this.rdEden); - this.panel2.Controls.Add(this.rdFrodo); - this.panel2.Controls.Add(this.rdBoth); - this.panel2.Location = new System.Drawing.Point(201, 15); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(215, 40); - this.panel2.TabIndex = 23; - // - // rdEden + // panel1 // - this.rdEden.AutoSize = true; - this.rdEden.Location = new System.Drawing.Point(112, -1); - this.rdEden.Name = "rdEden"; - this.rdEden.Size = new System.Drawing.Size(50, 17); - this.rdEden.TabIndex = 20; - this.rdEden.TabStop = true; - this.rdEden.Text = "&Eden"; - this.rdEden.UseVisualStyleBackColor = true; + this.panel1.Controls.Add(this.rbFolderBanner); + this.panel1.Controls.Add(this.rbFolderPoster); + this.panel1.Controls.Add(this.rbFolderFanArt); + this.panel1.Controls.Add(this.rbFolderSeasonPoster); + this.panel1.Location = new System.Drawing.Point(59, 323); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(280, 24); + this.panel1.TabIndex = 22; // - // rdFrodo - // - this.rdFrodo.AutoSize = true; - this.rdFrodo.Location = new System.Drawing.Point(54, -1); - this.rdFrodo.Name = "rdFrodo"; - this.rdFrodo.Size = new System.Drawing.Size(52, 17); - this.rdFrodo.TabIndex = 19; - this.rdFrodo.TabStop = true; - this.rdFrodo.Text = "&Frodo"; - this.rdFrodo.UseVisualStyleBackColor = true; - // - // rdBoth - // - this.rdBoth.AutoSize = true; - this.rdBoth.Location = new System.Drawing.Point(168, -2); - this.rdBoth.Name = "rdBoth"; - this.rdBoth.Size = new System.Drawing.Size(47, 17); - this.rdBoth.TabIndex = 21; - this.rdBoth.TabStop = true; - this.rdBoth.Text = "&Both"; - this.rdBoth.UseVisualStyleBackColor = true; - // - // panel1 - // - this.panel1.Controls.Add(this.rbFolderBanner); - this.panel1.Controls.Add(this.rbFolderPoster); - this.panel1.Controls.Add(this.rbFolderFanArt); - this.panel1.Controls.Add(this.rbFolderSeasonPoster); - this.panel1.Location = new System.Drawing.Point(59, 323); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(280, 24); - this.panel1.TabIndex = 22; - // - // rbFolderBanner + // rbFolderBanner // this.rbFolderBanner.AutoSize = true; this.rbFolderBanner.Location = new System.Drawing.Point(0, 7); @@ -1712,7 +1559,8 @@ private void InitializeComponent() // // bnMCPresets // - this.bnMCPresets.Location = new System.Drawing.Point(335, 369); + this.bnMCPresets.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.bnMCPresets.Location = new System.Drawing.Point(635, 370); this.bnMCPresets.Name = "bnMCPresets"; this.bnMCPresets.Size = new System.Drawing.Size(75, 23); this.bnMCPresets.TabIndex = 16; @@ -1875,7 +1723,7 @@ private void InitializeComponent() this.tbSearchFolders.Controls.Add(this.label23); this.tbSearchFolders.Location = new System.Drawing.Point(4, 40); this.tbSearchFolders.Name = "tbSearchFolders"; - this.tbSearchFolders.Size = new System.Drawing.Size(416, 401); + this.tbSearchFolders.Size = new System.Drawing.Size(716, 455); this.tbSearchFolders.TabIndex = 3; this.tbSearchFolders.Text = "Search Folders"; this.tbSearchFolders.UseVisualStyleBackColor = true; @@ -1987,7 +1835,8 @@ private void InitializeComponent() // // bnOpenSearchFolder // - this.bnOpenSearchFolder.Location = new System.Drawing.Point(168, 369); + this.bnOpenSearchFolder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.bnOpenSearchFolder.Location = new System.Drawing.Point(165, 429); this.bnOpenSearchFolder.Name = "bnOpenSearchFolder"; this.bnOpenSearchFolder.Size = new System.Drawing.Size(75, 23); this.bnOpenSearchFolder.TabIndex = 4; @@ -1997,7 +1846,8 @@ private void InitializeComponent() // // bnRemoveSearchFolder // - this.bnRemoveSearchFolder.Location = new System.Drawing.Point(87, 369); + this.bnRemoveSearchFolder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.bnRemoveSearchFolder.Location = new System.Drawing.Point(84, 429); this.bnRemoveSearchFolder.Name = "bnRemoveSearchFolder"; this.bnRemoveSearchFolder.Size = new System.Drawing.Size(75, 23); this.bnRemoveSearchFolder.TabIndex = 3; @@ -2007,7 +1857,8 @@ private void InitializeComponent() // // bnAddSearchFolder // - this.bnAddSearchFolder.Location = new System.Drawing.Point(3, 369); + this.bnAddSearchFolder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.bnAddSearchFolder.Location = new System.Drawing.Point(3, 429); this.bnAddSearchFolder.Name = "bnAddSearchFolder"; this.bnAddSearchFolder.Size = new System.Drawing.Size(75, 23); this.bnAddSearchFolder.TabIndex = 2; @@ -2018,13 +1869,14 @@ private void InitializeComponent() // lbSearchFolders // this.lbSearchFolders.AllowDrop = true; - this.lbSearchFolders.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.lbSearchFolders.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))); this.lbSearchFolders.FormattingEnabled = true; this.lbSearchFolders.Location = new System.Drawing.Point(3, 153); this.lbSearchFolders.Name = "lbSearchFolders"; this.lbSearchFolders.ScrollAlwaysVisible = true; - this.lbSearchFolders.Size = new System.Drawing.Size(400, 212); + this.lbSearchFolders.Size = new System.Drawing.Size(700, 264); this.lbSearchFolders.TabIndex = 1; this.lbSearchFolders.DragDrop += new System.Windows.Forms.DragEventHandler(this.lbSearchFolders_DragDrop); this.lbSearchFolders.DragOver += new System.Windows.Forms.DragEventHandler(this.lbSearchFolders_DragOver); @@ -2053,7 +1905,7 @@ private void InitializeComponent() this.tbuTorrentNZB.Location = new System.Drawing.Point(4, 40); this.tbuTorrentNZB.Name = "tbuTorrentNZB"; this.tbuTorrentNZB.Padding = new System.Windows.Forms.Padding(3); - this.tbuTorrentNZB.Size = new System.Drawing.Size(416, 401); + this.tbuTorrentNZB.Size = new System.Drawing.Size(716, 455); this.tbuTorrentNZB.TabIndex = 4; this.tbuTorrentNZB.Text = "µTorrent / NZB"; this.tbuTorrentNZB.UseVisualStyleBackColor = true; @@ -2069,20 +1921,24 @@ private void InitializeComponent() // // tbPreferredRSSTerms // + this.tbPreferredRSSTerms.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.tbPreferredRSSTerms.Location = new System.Drawing.Point(241, 6); this.tbPreferredRSSTerms.Name = "tbPreferredRSSTerms"; - this.tbPreferredRSSTerms.Size = new System.Drawing.Size(169, 20); + this.tbPreferredRSSTerms.Size = new System.Drawing.Size(469, 20); this.tbPreferredRSSTerms.TabIndex = 23; // // groupBox1 // + this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.groupBox1.Controls.Add(this.txtSABHostPort); this.groupBox1.Controls.Add(this.txtSABAPIKey); this.groupBox1.Controls.Add(this.label8); this.groupBox1.Controls.Add(this.label9); this.groupBox1.Location = new System.Drawing.Point(3, 205); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(409, 81); + this.groupBox1.Size = new System.Drawing.Size(707, 81); this.groupBox1.TabIndex = 6; this.groupBox1.TabStop = false; this.groupBox1.Text = "SABnzbd"; @@ -2093,7 +1949,7 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.txtSABHostPort.Location = new System.Drawing.Point(75, 19); this.txtSABHostPort.Name = "txtSABHostPort"; - this.txtSABHostPort.Size = new System.Drawing.Size(247, 20); + this.txtSABHostPort.Size = new System.Drawing.Size(545, 20); this.txtSABHostPort.TabIndex = 1; // // txtSABAPIKey @@ -2102,7 +1958,7 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.txtSABAPIKey.Location = new System.Drawing.Point(75, 48); this.txtSABAPIKey.Name = "txtSABAPIKey"; - this.txtSABAPIKey.Size = new System.Drawing.Size(247, 20); + this.txtSABAPIKey.Size = new System.Drawing.Size(545, 20); this.txtSABAPIKey.TabIndex = 4; // // label8 @@ -2125,6 +1981,8 @@ private void InitializeComponent() // // groupBox6 // + this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.groupBox6.Controls.Add(this.bnUTBrowseResumeDat); this.groupBox6.Controls.Add(this.txtUTResumeDatPath); this.groupBox6.Controls.Add(this.bnRSSBrowseuTorrent); @@ -2133,7 +1991,7 @@ private void InitializeComponent() this.groupBox6.Controls.Add(this.txtRSSuTorrentPath); this.groupBox6.Location = new System.Drawing.Point(3, 292); this.groupBox6.Name = "groupBox6"; - this.groupBox6.Size = new System.Drawing.Size(409, 80); + this.groupBox6.Size = new System.Drawing.Size(707, 80); this.groupBox6.TabIndex = 5; this.groupBox6.TabStop = false; this.groupBox6.Text = "µTorrent"; @@ -2141,7 +1999,7 @@ private void InitializeComponent() // bnUTBrowseResumeDat // this.bnUTBrowseResumeDat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.bnUTBrowseResumeDat.Location = new System.Drawing.Point(328, 46); + this.bnUTBrowseResumeDat.Location = new System.Drawing.Point(626, 46); this.bnUTBrowseResumeDat.Name = "bnUTBrowseResumeDat"; this.bnUTBrowseResumeDat.Size = new System.Drawing.Size(75, 23); this.bnUTBrowseResumeDat.TabIndex = 5; @@ -2155,12 +2013,13 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.txtUTResumeDatPath.Location = new System.Drawing.Point(75, 48); this.txtUTResumeDatPath.Name = "txtUTResumeDatPath"; - this.txtUTResumeDatPath.Size = new System.Drawing.Size(247, 20); + this.txtUTResumeDatPath.Size = new System.Drawing.Size(545, 20); this.txtUTResumeDatPath.TabIndex = 4; // // bnRSSBrowseuTorrent // - this.bnRSSBrowseuTorrent.Location = new System.Drawing.Point(328, 17); + this.bnRSSBrowseuTorrent.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.bnRSSBrowseuTorrent.Location = new System.Drawing.Point(626, 16); this.bnRSSBrowseuTorrent.Name = "bnRSSBrowseuTorrent"; this.bnRSSBrowseuTorrent.Size = new System.Drawing.Size(75, 23); this.bnRSSBrowseuTorrent.TabIndex = 2; @@ -2192,18 +2051,20 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.txtRSSuTorrentPath.Location = new System.Drawing.Point(75, 19); this.txtRSSuTorrentPath.Name = "txtRSSuTorrentPath"; - this.txtRSSuTorrentPath.Size = new System.Drawing.Size(247, 20); + this.txtRSSuTorrentPath.Size = new System.Drawing.Size(545, 20); this.txtRSSuTorrentPath.TabIndex = 1; // // RSSGrid // + this.RSSGrid.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.RSSGrid.BackColor = System.Drawing.SystemColors.Window; this.RSSGrid.EnableSort = true; this.RSSGrid.Location = new System.Drawing.Point(3, 36); this.RSSGrid.Name = "RSSGrid"; this.RSSGrid.OptimizeMode = SourceGrid.CellOptimizeMode.ForRows; this.RSSGrid.SelectionMode = SourceGrid.GridSelectionMode.Cell; - this.RSSGrid.Size = new System.Drawing.Size(409, 136); + this.RSSGrid.Size = new System.Drawing.Size(707, 136); this.RSSGrid.TabIndex = 1; this.RSSGrid.TabStop = true; this.RSSGrid.ToolTipText = ""; @@ -2260,7 +2121,7 @@ private void InitializeComponent() this.tpTreeColoring.Location = new System.Drawing.Point(4, 40); this.tpTreeColoring.Name = "tpTreeColoring"; this.tpTreeColoring.Padding = new System.Windows.Forms.Padding(3); - this.tpTreeColoring.Size = new System.Drawing.Size(416, 401); + this.tpTreeColoring.Size = new System.Drawing.Size(716, 455); this.tpTreeColoring.TabIndex = 7; this.tpTreeColoring.Text = "Tree Coloring"; this.tpTreeColoring.UseVisualStyleBackColor = true; @@ -2276,11 +2137,13 @@ private void InitializeComponent() // // cboShowStatus // + this.cboShowStatus.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.cboShowStatus.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cboShowStatus.FormattingEnabled = true; this.cboShowStatus.Location = new System.Drawing.Point(51, 325); this.cboShowStatus.Name = "cboShowStatus"; - this.cboShowStatus.Size = new System.Drawing.Size(315, 21); + this.cboShowStatus.Size = new System.Drawing.Size(659, 21); this.cboShowStatus.TabIndex = 7; // // label5 @@ -2323,7 +2186,8 @@ private void InitializeComponent() // // btnAddShowStatusColoring // - this.btnAddShowStatusColoring.Location = new System.Drawing.Point(291, 355); + this.btnAddShowStatusColoring.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnAddShowStatusColoring.Location = new System.Drawing.Point(635, 354); this.btnAddShowStatusColoring.Name = "btnAddShowStatusColoring"; this.btnAddShowStatusColoring.Size = new System.Drawing.Size(75, 23); this.btnAddShowStatusColoring.TabIndex = 3; @@ -2333,6 +2197,8 @@ private void InitializeComponent() // // lvwDefinedColors // + this.lvwDefinedColors.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.lvwDefinedColors.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.colShowStatus, this.colColor}); @@ -2340,7 +2206,7 @@ private void InitializeComponent() this.lvwDefinedColors.Location = new System.Drawing.Point(6, 6); this.lvwDefinedColors.MultiSelect = false; this.lvwDefinedColors.Name = "lvwDefinedColors"; - this.lvwDefinedColors.Size = new System.Drawing.Size(399, 284); + this.lvwDefinedColors.Size = new System.Drawing.Size(704, 284); this.lvwDefinedColors.TabIndex = 0; this.lvwDefinedColors.UseCompatibleStateImageBehavior = false; this.lvwDefinedColors.View = System.Windows.Forms.View.Details; @@ -2359,97 +2225,378 @@ private void InitializeComponent() // // tpBulkAdd // - this.tpBulkAdd.Controls.Add(this.chkForceBulkAddToUseSettingsOnly); - this.tpBulkAdd.Controls.Add(this.label43); - this.tpBulkAdd.Controls.Add(this.label44); - this.tpBulkAdd.Controls.Add(this.tbIgnoreSuffixes); - this.tpBulkAdd.Controls.Add(this.tbMovieTerms); - this.tpBulkAdd.Controls.Add(this.label42); - this.tpBulkAdd.Controls.Add(this.label41); - this.tpBulkAdd.Controls.Add(this.cbIgnoreRecycleBin); - this.tpBulkAdd.Controls.Add(this.cbIgnoreNoVideoFolders); + this.tpBulkAdd.Controls.Add(this.groupBox9); + this.tpBulkAdd.Controls.Add(this.groupBox8); this.tpBulkAdd.Location = new System.Drawing.Point(4, 40); this.tpBulkAdd.Name = "tpBulkAdd"; this.tpBulkAdd.Padding = new System.Windows.Forms.Padding(3); - this.tpBulkAdd.Size = new System.Drawing.Size(416, 401); + this.tpBulkAdd.Size = new System.Drawing.Size(502, 429); this.tpBulkAdd.TabIndex = 10; this.tpBulkAdd.Text = "Bulk/Auto Add"; this.tpBulkAdd.UseVisualStyleBackColor = true; // - // chkForceBulkAddToUseSettingsOnly + // folderBrowser // - this.chkForceBulkAddToUseSettingsOnly.AutoSize = true; - this.chkForceBulkAddToUseSettingsOnly.Location = new System.Drawing.Point(15, 85); - this.chkForceBulkAddToUseSettingsOnly.Name = "chkForceBulkAddToUseSettingsOnly"; - this.chkForceBulkAddToUseSettingsOnly.Size = new System.Drawing.Size(248, 17); - this.chkForceBulkAddToUseSettingsOnly.TabIndex = 12; - this.chkForceBulkAddToUseSettingsOnly.Text = "Force to Use Season Words from Settings Only"; - this.toolTip1.SetToolTip(this.chkForceBulkAddToUseSettingsOnly, "If set then Bulk Add just uses the season words from settings. If not set (recomm" + - "ended) then Bulk Add finds addition season words from each show\'s configuration." + - ""); - this.chkForceBulkAddToUseSettingsOnly.UseVisualStyleBackColor = true; + this.folderBrowser.ShowNewFolderButton = false; + // + // openFile + // + this.openFile.Filter = "Torrent files (*.torrent)|*.torrent|All files (*.*)|*.*"; + // + // cmDefaults + // + this.cmDefaults.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.KODIToolStripMenuItem, + this.pyTivoToolStripMenuItem, + this.mede8erToolStripMenuItem, + this.noneToolStripMenuItem}); + this.cmDefaults.Name = "cmDefaults"; + this.cmDefaults.Size = new System.Drawing.Size(121, 92); + this.cmDefaults.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.cmDefaults_ItemClicked); + // + // KODIToolStripMenuItem + // + this.KODIToolStripMenuItem.Name = "KODIToolStripMenuItem"; + this.KODIToolStripMenuItem.Size = new System.Drawing.Size(120, 22); + this.KODIToolStripMenuItem.Tag = "1"; + this.KODIToolStripMenuItem.Text = "&KODI"; + // + // pyTivoToolStripMenuItem + // + this.pyTivoToolStripMenuItem.Name = "pyTivoToolStripMenuItem"; + this.pyTivoToolStripMenuItem.Size = new System.Drawing.Size(120, 22); + this.pyTivoToolStripMenuItem.Tag = "2"; + this.pyTivoToolStripMenuItem.Text = "&pyTivo"; + // + // mede8erToolStripMenuItem + // + this.mede8erToolStripMenuItem.Name = "mede8erToolStripMenuItem"; + this.mede8erToolStripMenuItem.Size = new System.Drawing.Size(120, 22); + this.mede8erToolStripMenuItem.Tag = "3"; + this.mede8erToolStripMenuItem.Text = "&Mede8er"; + // + // noneToolStripMenuItem + // + this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; + this.noneToolStripMenuItem.Size = new System.Drawing.Size(120, 22); + this.noneToolStripMenuItem.Tag = "4"; + this.noneToolStripMenuItem.Text = "&None"; + // + // cbDeleteEmpty + // + this.cbDeleteEmpty.AutoSize = true; + this.cbDeleteEmpty.Location = new System.Drawing.Point(16, 18); + this.cbDeleteEmpty.Name = "cbDeleteEmpty"; + this.cbDeleteEmpty.Size = new System.Drawing.Size(204, 17); + this.cbDeleteEmpty.TabIndex = 0; + this.cbDeleteEmpty.Text = "&Delete empty folders after moving files"; + this.cbDeleteEmpty.UseVisualStyleBackColor = true; + // + // cbEmptyIgnoreExtensions + // + this.cbEmptyIgnoreExtensions.AutoSize = true; + this.cbEmptyIgnoreExtensions.Location = new System.Drawing.Point(35, 116); + this.cbEmptyIgnoreExtensions.Name = "cbEmptyIgnoreExtensions"; + this.cbEmptyIgnoreExtensions.Size = new System.Drawing.Size(305, 17); + this.cbEmptyIgnoreExtensions.TabIndex = 4; + this.cbEmptyIgnoreExtensions.Text = "&Ignore files with these extensions: (semicolon separated list)"; + this.cbEmptyIgnoreExtensions.UseVisualStyleBackColor = true; + // + // cbEmptyIgnoreWords + // + this.cbEmptyIgnoreWords.AutoSize = true; + this.cbEmptyIgnoreWords.Location = new System.Drawing.Point(35, 66); + this.cbEmptyIgnoreWords.Name = "cbEmptyIgnoreWords"; + this.cbEmptyIgnoreWords.Size = new System.Drawing.Size(366, 17); + this.cbEmptyIgnoreWords.TabIndex = 2; + this.cbEmptyIgnoreWords.Text = "Ignore any files with these &words in their name: (semicolon separated list)"; + this.cbEmptyIgnoreWords.UseVisualStyleBackColor = true; + // + // cbEmptyMaxSize + // + this.cbEmptyMaxSize.AutoSize = true; + this.cbEmptyMaxSize.Location = new System.Drawing.Point(35, 191); + this.cbEmptyMaxSize.Name = "cbEmptyMaxSize"; + this.cbEmptyMaxSize.Size = new System.Drawing.Size(177, 17); + this.cbEmptyMaxSize.TabIndex = 7; + this.cbEmptyMaxSize.Text = "&Maximum total file size to delete:"; + this.cbEmptyMaxSize.UseVisualStyleBackColor = true; + // + // cbRecycleNotDelete + // + this.cbRecycleNotDelete.AutoSize = true; + this.cbRecycleNotDelete.Location = new System.Drawing.Point(16, 221); + this.cbRecycleNotDelete.Name = "cbRecycleNotDelete"; + this.cbRecycleNotDelete.Size = new System.Drawing.Size(299, 17); + this.cbRecycleNotDelete.TabIndex = 10; + this.cbRecycleNotDelete.Text = "Folders with files are moved to the &recycle bin, not deleted"; + this.cbRecycleNotDelete.UseVisualStyleBackColor = true; + // + // label31 + // + this.label31.AutoSize = true; + this.label31.Location = new System.Drawing.Point(281, 193); + this.label31.Name = "label31"; + this.label31.Size = new System.Drawing.Size(0, 13); + this.label31.TabIndex = 9; + // + // txtEmptyIgnoreExtensions + // + this.txtEmptyIgnoreExtensions.Location = new System.Drawing.Point(95, 139); + this.txtEmptyIgnoreExtensions.Name = "txtEmptyIgnoreExtensions"; + this.txtEmptyIgnoreExtensions.Size = new System.Drawing.Size(306, 20); + this.txtEmptyIgnoreExtensions.TabIndex = 5; + this.toolTip1.SetToolTip(this.txtEmptyIgnoreExtensions, "For example \".par2;.nzb;.nfo\""); + // + // txtEmptyIgnoreWords + // + this.txtEmptyIgnoreWords.Location = new System.Drawing.Point(95, 89); + this.txtEmptyIgnoreWords.Name = "txtEmptyIgnoreWords"; + this.txtEmptyIgnoreWords.Size = new System.Drawing.Size(306, 20); + this.txtEmptyIgnoreWords.TabIndex = 3; + this.toolTip1.SetToolTip(this.txtEmptyIgnoreWords, "For example \"sample\""); + // + // txtEmptyMaxSize + // + this.txtEmptyMaxSize.Location = new System.Drawing.Point(218, 189); + this.txtEmptyMaxSize.Name = "txtEmptyMaxSize"; + this.txtEmptyMaxSize.Size = new System.Drawing.Size(55, 20); + this.txtEmptyMaxSize.TabIndex = 8; + // + // label30 + // + this.label30.AutoSize = true; + this.label30.Location = new System.Drawing.Point(13, 43); + this.label30.Name = "label30"; + this.label30.Size = new System.Drawing.Size(0, 13); + this.label30.TabIndex = 1; + // + // label32 + // + this.label32.AutoSize = true; + this.label32.Location = new System.Drawing.Point(13, 168); + this.label32.Name = "label32"; + this.label32.Size = new System.Drawing.Size(0, 13); + this.label32.TabIndex = 6; + // + // cbCleanUpDownloadDir + // + this.cbCleanUpDownloadDir.AutoSize = true; + this.cbCleanUpDownloadDir.Location = new System.Drawing.Point(16, 244); + this.cbCleanUpDownloadDir.Name = "cbCleanUpDownloadDir"; + this.cbCleanUpDownloadDir.Size = new System.Drawing.Size(276, 17); + this.cbCleanUpDownloadDir.TabIndex = 11; + this.cbCleanUpDownloadDir.Text = "Clean up already copied files from download directory"; + this.cbCleanUpDownloadDir.UseVisualStyleBackColor = true; + // + // tbFolderDeleting + // + this.tbFolderDeleting.Controls.Add(this.cbCleanUpDownloadDir); + this.tbFolderDeleting.Controls.Add(this.label32); + this.tbFolderDeleting.Controls.Add(this.label30); + this.tbFolderDeleting.Controls.Add(this.txtEmptyMaxSize); + this.tbFolderDeleting.Controls.Add(this.txtEmptyIgnoreWords); + this.tbFolderDeleting.Controls.Add(this.txtEmptyIgnoreExtensions); + this.tbFolderDeleting.Controls.Add(this.label31); + this.tbFolderDeleting.Controls.Add(this.cbRecycleNotDelete); + this.tbFolderDeleting.Controls.Add(this.cbEmptyMaxSize); + this.tbFolderDeleting.Controls.Add(this.cbEmptyIgnoreWords); + this.tbFolderDeleting.Controls.Add(this.cbEmptyIgnoreExtensions); + this.tbFolderDeleting.Controls.Add(this.cbDeleteEmpty); + this.tbFolderDeleting.Location = new System.Drawing.Point(4, 40); + this.tbFolderDeleting.Name = "tbFolderDeleting"; + this.tbFolderDeleting.Padding = new System.Windows.Forms.Padding(3); + this.tbFolderDeleting.Size = new System.Drawing.Size(502, 429); + this.tbFolderDeleting.TabIndex = 9; + this.tbFolderDeleting.Text = "Folder Deleting"; + this.tbFolderDeleting.UseVisualStyleBackColor = true; + // + // tpSubtitles + // + this.tpSubtitles.Controls.Add(this.cbTxtToSub); + this.tpSubtitles.Controls.Add(this.label46); + this.tpSubtitles.Controls.Add(this.txtSubtitleExtensions); + this.tpSubtitles.Controls.Add(this.chkRetainLanguageSpecificSubtitles); + this.tpSubtitles.Location = new System.Drawing.Point(4, 40); + this.tpSubtitles.Name = "tpSubtitles"; + this.tpSubtitles.Padding = new System.Windows.Forms.Padding(3); + this.tpSubtitles.Size = new System.Drawing.Size(472, 385); + this.tpSubtitles.TabIndex = 11; + this.tpSubtitles.Text = "Subtitles"; + this.tpSubtitles.UseVisualStyleBackColor = true; + // + // rdBoth + // + this.rdBoth.AutoSize = true; + this.rdBoth.Location = new System.Drawing.Point(168, -2); + this.rdBoth.Name = "rdBoth"; + this.rdBoth.Size = new System.Drawing.Size(47, 17); + this.rdBoth.TabIndex = 21; + this.rdBoth.TabStop = true; + this.rdBoth.Text = "&Both"; + this.rdBoth.UseVisualStyleBackColor = true; + // + // rdFrodo + // + this.rdFrodo.AutoSize = true; + this.rdFrodo.Location = new System.Drawing.Point(54, -1); + this.rdFrodo.Name = "rdFrodo"; + this.rdFrodo.Size = new System.Drawing.Size(52, 17); + this.rdFrodo.TabIndex = 19; + this.rdFrodo.TabStop = true; + this.rdFrodo.Text = "&Frodo"; + this.rdFrodo.UseVisualStyleBackColor = true; + // + // rdEden + // + this.rdEden.AutoSize = true; + this.rdEden.Location = new System.Drawing.Point(112, -1); + this.rdEden.Name = "rdEden"; + this.rdEden.Size = new System.Drawing.Size(50, 17); + this.rdEden.TabIndex = 20; + this.rdEden.TabStop = true; + this.rdEden.Text = "&Eden"; + this.rdEden.UseVisualStyleBackColor = true; + // + // panel2 + // + this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.panel2.Controls.Add(this.rdEden); + this.panel2.Controls.Add(this.rdFrodo); + this.panel2.Controls.Add(this.rdBoth); + this.panel2.Location = new System.Drawing.Point(495, 6); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(215, 32); + this.panel2.TabIndex = 23; + // + // chkRetainLanguageSpecificSubtitles + // + this.chkRetainLanguageSpecificSubtitles.AutoSize = true; + this.chkRetainLanguageSpecificSubtitles.Location = new System.Drawing.Point(6, 15); + this.chkRetainLanguageSpecificSubtitles.Name = "chkRetainLanguageSpecificSubtitles"; + this.chkRetainLanguageSpecificSubtitles.Size = new System.Drawing.Size(192, 17); + this.chkRetainLanguageSpecificSubtitles.TabIndex = 25; + this.chkRetainLanguageSpecificSubtitles.Text = "Retain &Language Specific Subtitles"; + this.chkRetainLanguageSpecificSubtitles.UseVisualStyleBackColor = true; + // + // label46 + // + this.label46.AutoSize = true; + this.label46.Location = new System.Drawing.Point(3, 66); + this.label46.Name = "label46"; + this.label46.Size = new System.Drawing.Size(98, 13); + this.label46.TabIndex = 26; + this.label46.Text = "&Subtitle extensions:"; + // + // txtSubtitleExtensions + // + this.txtSubtitleExtensions.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.txtSubtitleExtensions.Location = new System.Drawing.Point(107, 63); + this.txtSubtitleExtensions.Name = "txtSubtitleExtensions"; + this.txtSubtitleExtensions.Size = new System.Drawing.Size(359, 20); + this.txtSubtitleExtensions.TabIndex = 27; + // + // cbTxtToSub + // + this.cbTxtToSub.AutoSize = true; + this.cbTxtToSub.Location = new System.Drawing.Point(6, 38); + this.cbTxtToSub.Name = "cbTxtToSub"; + this.cbTxtToSub.Size = new System.Drawing.Size(118, 17); + this.cbTxtToSub.TabIndex = 28; + this.cbTxtToSub.Text = "&Rename .txt to .sub"; + this.cbTxtToSub.UseVisualStyleBackColor = true; + // + // groupBox8 + // + this.groupBox8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.groupBox8.Controls.Add(this.chkAutoSearchForDownloadedFiles); + this.groupBox8.Controls.Add(this.label43); + this.groupBox8.Controls.Add(this.label44); + this.groupBox8.Controls.Add(this.tbIgnoreSuffixes); + this.groupBox8.Controls.Add(this.tbMovieTerms); + this.groupBox8.Location = new System.Drawing.Point(6, 127); + this.groupBox8.Name = "groupBox8"; + this.groupBox8.Size = new System.Drawing.Size(490, 107); + this.groupBox8.TabIndex = 13; + this.groupBox8.TabStop = false; + this.groupBox8.Text = "Auto Add"; // // label43 // this.label43.AutoSize = true; - this.label43.Location = new System.Drawing.Point(12, 180); + this.label43.Location = new System.Drawing.Point(3, 69); this.label43.Name = "label43"; this.label43.Size = new System.Drawing.Size(78, 13); - this.label43.TabIndex = 10; + this.label43.TabIndex = 14; this.label43.Text = "&Ignore suffixes:"; // // label44 // this.label44.AutoSize = true; - this.label44.Location = new System.Drawing.Point(12, 154); + this.label44.Location = new System.Drawing.Point(3, 43); this.label44.Name = "label44"; this.label44.Size = new System.Drawing.Size(71, 13); - this.label44.TabIndex = 8; + this.label44.TabIndex = 12; this.label44.Text = "&Movie Terms:"; // // tbIgnoreSuffixes // - this.tbIgnoreSuffixes.Location = new System.Drawing.Point(108, 177); + this.tbIgnoreSuffixes.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tbIgnoreSuffixes.Location = new System.Drawing.Point(99, 66); this.tbIgnoreSuffixes.Name = "tbIgnoreSuffixes"; - this.tbIgnoreSuffixes.Size = new System.Drawing.Size(293, 20); - this.tbIgnoreSuffixes.TabIndex = 11; + this.tbIgnoreSuffixes.Size = new System.Drawing.Size(388, 20); + this.tbIgnoreSuffixes.TabIndex = 15; this.toolTip1.SetToolTip(this.tbIgnoreSuffixes, "These terms and any text after them will be ignored when\r\nsearching on TVDB for t" + "he show title based on the filename."); // // tbMovieTerms // - this.tbMovieTerms.Location = new System.Drawing.Point(108, 151); + this.tbMovieTerms.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tbMovieTerms.Location = new System.Drawing.Point(99, 40); this.tbMovieTerms.Name = "tbMovieTerms"; - this.tbMovieTerms.Size = new System.Drawing.Size(293, 20); - this.tbMovieTerms.TabIndex = 9; + this.tbMovieTerms.Size = new System.Drawing.Size(388, 20); + this.tbMovieTerms.TabIndex = 13; this.toolTip1.SetToolTip(this.tbMovieTerms, "If a filename contains any of these terms then it is assumed\r\nthat it is a Film a" + "nd not a TV Show. Hence \'Auto Add\' is not\r\ninvoked for this file."); // - // label42 + // groupBox9 // - this.label42.AutoSize = true; - this.label42.Location = new System.Drawing.Point(12, 131); - this.label42.Name = "label42"; - this.label42.Size = new System.Drawing.Size(54, 13); - this.label42.TabIndex = 6; - this.label42.Text = "Auto Add:"; + this.groupBox9.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.groupBox9.Controls.Add(this.chkForceBulkAddToUseSettingsOnly); + this.groupBox9.Controls.Add(this.cbIgnoreRecycleBin); + this.groupBox9.Controls.Add(this.cbIgnoreNoVideoFolders); + this.groupBox9.Location = new System.Drawing.Point(6, 10); + this.groupBox9.Name = "groupBox9"; + this.groupBox9.Size = new System.Drawing.Size(490, 111); + this.groupBox9.TabIndex = 16; + this.groupBox9.TabStop = false; + this.groupBox9.Text = "Bulk Add"; // - // label41 + // chkForceBulkAddToUseSettingsOnly // - this.label41.AutoSize = true; - this.label41.Location = new System.Drawing.Point(12, 13); - this.label41.Name = "label41"; - this.label41.Size = new System.Drawing.Size(53, 13); - this.label41.TabIndex = 5; - this.label41.Text = "Bulk Add:"; + this.chkForceBulkAddToUseSettingsOnly.AutoSize = true; + this.chkForceBulkAddToUseSettingsOnly.Location = new System.Drawing.Point(6, 65); + this.chkForceBulkAddToUseSettingsOnly.Name = "chkForceBulkAddToUseSettingsOnly"; + this.chkForceBulkAddToUseSettingsOnly.Size = new System.Drawing.Size(248, 17); + this.chkForceBulkAddToUseSettingsOnly.TabIndex = 15; + this.chkForceBulkAddToUseSettingsOnly.Text = "Force to Use Season Words from Settings Only"; + this.toolTip1.SetToolTip(this.chkForceBulkAddToUseSettingsOnly, "If set then Bulk Add just uses the season words from settings. If not set (recomm" + + "ended) then Bulk Add finds addition season words from each show\'s configuration." + + ""); + this.chkForceBulkAddToUseSettingsOnly.UseVisualStyleBackColor = true; // // cbIgnoreRecycleBin // this.cbIgnoreRecycleBin.AutoSize = true; - this.cbIgnoreRecycleBin.Location = new System.Drawing.Point(15, 62); + this.cbIgnoreRecycleBin.Location = new System.Drawing.Point(6, 42); this.cbIgnoreRecycleBin.Name = "cbIgnoreRecycleBin"; this.cbIgnoreRecycleBin.Size = new System.Drawing.Size(116, 17); - this.cbIgnoreRecycleBin.TabIndex = 4; + this.cbIgnoreRecycleBin.TabIndex = 14; this.cbIgnoreRecycleBin.Text = "Ignore &Recycle Bin"; this.toolTip1.SetToolTip(this.cbIgnoreRecycleBin, "If set then Bulk Add ignores all files in the Recycle Bin"); this.cbIgnoreRecycleBin.UseVisualStyleBackColor = true; @@ -2457,61 +2604,24 @@ private void InitializeComponent() // cbIgnoreNoVideoFolders // this.cbIgnoreNoVideoFolders.AutoSize = true; - this.cbIgnoreNoVideoFolders.Location = new System.Drawing.Point(15, 39); + this.cbIgnoreNoVideoFolders.Location = new System.Drawing.Point(6, 19); this.cbIgnoreNoVideoFolders.Name = "cbIgnoreNoVideoFolders"; this.cbIgnoreNoVideoFolders.Size = new System.Drawing.Size(225, 17); - this.cbIgnoreNoVideoFolders.TabIndex = 3; + this.cbIgnoreNoVideoFolders.TabIndex = 13; this.cbIgnoreNoVideoFolders.Text = "&Only Include Folders containing Video files"; this.toolTip1.SetToolTip(this.cbIgnoreNoVideoFolders, "If set then only folders that contain video files are considered for the \'Bulk Ad" + "d\' feature"); this.cbIgnoreNoVideoFolders.UseVisualStyleBackColor = true; // - // folderBrowser - // - this.folderBrowser.ShowNewFolderButton = false; - // - // openFile - // - this.openFile.Filter = "Torrent files (*.torrent)|*.torrent|All files (*.*)|*.*"; - // - // cmDefaults - // - this.cmDefaults.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.KODIToolStripMenuItem, - this.pyTivoToolStripMenuItem, - this.mede8erToolStripMenuItem, - this.noneToolStripMenuItem}); - this.cmDefaults.Name = "cmDefaults"; - this.cmDefaults.Size = new System.Drawing.Size(121, 92); - this.cmDefaults.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.cmDefaults_ItemClicked); - // - // KODIToolStripMenuItem - // - this.KODIToolStripMenuItem.Name = "KODIToolStripMenuItem"; - this.KODIToolStripMenuItem.Size = new System.Drawing.Size(120, 22); - this.KODIToolStripMenuItem.Tag = "1"; - this.KODIToolStripMenuItem.Text = "&KODI"; - // - // pyTivoToolStripMenuItem - // - this.pyTivoToolStripMenuItem.Name = "pyTivoToolStripMenuItem"; - this.pyTivoToolStripMenuItem.Size = new System.Drawing.Size(120, 22); - this.pyTivoToolStripMenuItem.Tag = "2"; - this.pyTivoToolStripMenuItem.Text = "&pyTivo"; - // - // mede8erToolStripMenuItem - // - this.mede8erToolStripMenuItem.Name = "mede8erToolStripMenuItem"; - this.mede8erToolStripMenuItem.Size = new System.Drawing.Size(120, 22); - this.mede8erToolStripMenuItem.Tag = "3"; - this.mede8erToolStripMenuItem.Text = "&Mede8er"; - // - // noneToolStripMenuItem + // chkAutoSearchForDownloadedFiles // - this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; - this.noneToolStripMenuItem.Size = new System.Drawing.Size(120, 22); - this.noneToolStripMenuItem.Tag = "4"; - this.noneToolStripMenuItem.Text = "&None"; + this.chkAutoSearchForDownloadedFiles.AutoSize = true; + this.chkAutoSearchForDownloadedFiles.Location = new System.Drawing.Point(6, 19); + this.chkAutoSearchForDownloadedFiles.Name = "chkAutoSearchForDownloadedFiles"; + this.chkAutoSearchForDownloadedFiles.Size = new System.Drawing.Size(186, 17); + this.chkAutoSearchForDownloadedFiles.TabIndex = 16; + this.chkAutoSearchForDownloadedFiles.Text = "Notify when new shows are found"; + this.chkAutoSearchForDownloadedFiles.UseVisualStyleBackColor = true; // // Preferences // @@ -2519,15 +2629,18 @@ private void InitializeComponent() this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.bnCancel; - this.ClientSize = new System.Drawing.Size(448, 504); + this.ClientSize = new System.Drawing.Size(534, 532); + this.ControlBox = false; this.Controls.Add(this.tabControl1); this.Controls.Add(this.bnCancel); this.Controls.Add(this.OKButton); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; + this.MinimizeBox = false; + this.MinimumSize = new System.Drawing.Size(520, 550); this.Name = "Preferences"; this.ShowInTaskbar = false; + this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Preferences"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Preferences_FormClosing); @@ -2550,12 +2663,8 @@ private void InitializeComponent() this.groupBox3.PerformLayout(); this.tpScanOptions.ResumeLayout(false); this.tpScanOptions.PerformLayout(); - this.tbFolderDeleting.ResumeLayout(false); - this.tbFolderDeleting.PerformLayout(); this.tbMediaCenter.ResumeLayout(false); this.tbMediaCenter.PerformLayout(); - this.panel2.ResumeLayout(false); - this.panel2.PerformLayout(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); this.tbSearchFolders.ResumeLayout(false); @@ -2569,8 +2678,17 @@ private void InitializeComponent() this.tpTreeColoring.ResumeLayout(false); this.tpTreeColoring.PerformLayout(); this.tpBulkAdd.ResumeLayout(false); - this.tpBulkAdd.PerformLayout(); this.cmDefaults.ResumeLayout(false); + this.tbFolderDeleting.ResumeLayout(false); + this.tbFolderDeleting.PerformLayout(); + this.tpSubtitles.ResumeLayout(false); + this.tpSubtitles.PerformLayout(); + this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); + this.groupBox8.ResumeLayout(false); + this.groupBox8.PerformLayout(); + this.groupBox9.ResumeLayout(false); + this.groupBox9.PerformLayout(); this.ResumeLayout(false); } @@ -2737,22 +2855,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem mede8erToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem noneToolStripMenuItem; private System.Windows.Forms.CheckBox cbFantArtJpg; - private System.Windows.Forms.TabPage tbFolderDeleting; - private System.Windows.Forms.CheckBox cbEmptyIgnoreExtensions; - private System.Windows.Forms.CheckBox cbDeleteEmpty; - private System.Windows.Forms.TextBox txtEmptyMaxSize; - private System.Windows.Forms.TextBox txtEmptyIgnoreWords; - private System.Windows.Forms.TextBox txtEmptyIgnoreExtensions; - private System.Windows.Forms.Label label31; - private System.Windows.Forms.CheckBox cbEmptyMaxSize; - private System.Windows.Forms.Label label30; - private System.Windows.Forms.CheckBox cbEmptyIgnoreWords; - private System.Windows.Forms.Label label32; - private System.Windows.Forms.CheckBox cbRecycleNotDelete; - private System.Windows.Forms.RadioButton rdBoth; - private System.Windows.Forms.RadioButton rdEden; - private System.Windows.Forms.RadioButton rdFrodo; - private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.CheckBox cbNFOEpisodes; private System.Windows.Forms.GroupBox groupBox7; @@ -2761,7 +2863,6 @@ private void InitializeComponent() private System.Windows.Forms.TextBox txtShowsTXTTo; private System.Windows.Forms.Label label33; private System.Windows.Forms.CheckBox cbAutoCreateFolders; - private System.Windows.Forms.CheckBox cbCleanUpDownloadDir; private System.Windows.Forms.ComboBox cbMode; private System.Windows.Forms.Label label34; private System.Windows.Forms.TextBox txtSeasonFolderName; @@ -2784,24 +2885,44 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox chkHideMyShowsSpoilers; private System.Windows.Forms.CheckBox chkPreventMove; private System.Windows.Forms.CheckBox chkAutoMergeDownloadEpisodes; - private System.Windows.Forms.CheckBox chkAutoSearchForDownloadedFiles; private System.Windows.Forms.TabPage tpBulkAdd; - private System.Windows.Forms.Label label41; - private System.Windows.Forms.CheckBox cbIgnoreRecycleBin; - private System.Windows.Forms.CheckBox cbIgnoreNoVideoFolders; - private System.Windows.Forms.Label label42; - private System.Windows.Forms.Label label43; - private System.Windows.Forms.Label label44; - private System.Windows.Forms.TextBox tbIgnoreSuffixes; - private System.Windows.Forms.TextBox tbMovieTerms; - private System.Windows.Forms.CheckBox chkRetainLanguageSpecificSubtitles; - private System.Windows.Forms.CheckBox cbTxtToSub; - private System.Windows.Forms.CheckBox chkForceBulkAddToUseSettingsOnly; private System.Windows.Forms.Button bnBrowseShowsHTML; private System.Windows.Forms.CheckBox cbShowsHTML; private System.Windows.Forms.TextBox txtShowsHTMLTo; private System.Windows.Forms.Label label45; private System.Windows.Forms.TextBox tbPreferredRSSTerms; private System.Windows.Forms.CheckBox chkAutoMergeLibraryEpisodes; + private System.Windows.Forms.TabPage tbFolderDeleting; + private System.Windows.Forms.CheckBox cbCleanUpDownloadDir; + private System.Windows.Forms.Label label32; + private System.Windows.Forms.Label label30; + private System.Windows.Forms.TextBox txtEmptyMaxSize; + private System.Windows.Forms.TextBox txtEmptyIgnoreWords; + private System.Windows.Forms.TextBox txtEmptyIgnoreExtensions; + private System.Windows.Forms.Label label31; + private System.Windows.Forms.CheckBox cbRecycleNotDelete; + private System.Windows.Forms.CheckBox cbEmptyMaxSize; + private System.Windows.Forms.CheckBox cbEmptyIgnoreWords; + private System.Windows.Forms.CheckBox cbEmptyIgnoreExtensions; + private System.Windows.Forms.CheckBox cbDeleteEmpty; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.RadioButton rdEden; + private System.Windows.Forms.RadioButton rdFrodo; + private System.Windows.Forms.RadioButton rdBoth; + private System.Windows.Forms.TabPage tpSubtitles; + private System.Windows.Forms.Label label46; + private System.Windows.Forms.TextBox txtSubtitleExtensions; + private System.Windows.Forms.CheckBox chkRetainLanguageSpecificSubtitles; + private System.Windows.Forms.CheckBox cbTxtToSub; + private System.Windows.Forms.GroupBox groupBox9; + private System.Windows.Forms.CheckBox chkForceBulkAddToUseSettingsOnly; + private System.Windows.Forms.CheckBox cbIgnoreRecycleBin; + private System.Windows.Forms.CheckBox cbIgnoreNoVideoFolders; + private System.Windows.Forms.GroupBox groupBox8; + private System.Windows.Forms.CheckBox chkAutoSearchForDownloadedFiles; + private System.Windows.Forms.Label label43; + private System.Windows.Forms.Label label44; + private System.Windows.Forms.TextBox tbIgnoreSuffixes; + private System.Windows.Forms.TextBox tbMovieTerms; } } diff --git a/TVRename/Forms/Preferences.cs b/TVRename/Forms/Preferences.cs index 2db01eee4..c22028341 100644 --- a/TVRename/Forms/Preferences.cs +++ b/TVRename/Forms/Preferences.cs @@ -9,6 +9,7 @@ using System.Threading; using System.Windows.Forms; using System.Drawing; +using System.Globalization; using DirectoryInfo = Alphaleonis.Win32.Filesystem.DirectoryInfo; using ColumnHeader = SourceGrid.Cells.ColumnHeader; @@ -25,7 +26,7 @@ namespace TVRename /// public partial class Preferences : Form { - delegate void LoadLanguageDoneDel(); + private delegate void LoadLanguageDoneDel(); private readonly TVDoc mDoc; private Thread loadLanguageThread; @@ -56,7 +57,7 @@ private void OKButton_Click(object sender, EventArgs e) "Extensions list must be separated by semicolons, and each extension must start with a dot.", "Preferences", MessageBoxButtons.OK, MessageBoxIcon.Warning); tabControl1.SelectedTab = tbFolderDeleting; - txtVideoExtensions.Focus(); + txtEmptyIgnoreExtensions.Focus(); return; } @@ -69,13 +70,13 @@ private void OKButton_Click(object sender, EventArgs e) txtVideoExtensions.Focus(); return; } - if (!TVSettings.OKExtensionsString(txtVideoExtensions.Text)) + if (!TVSettings.OKExtensionsString(txtSubtitleExtensions.Text)) { MessageBox.Show( "Extensions list must be separated by semicolons, and each extension must start with a dot.", "Preferences", MessageBoxButtons.OK, MessageBoxIcon.Warning); - tabControl1.SelectedTab = tbFilesAndFolders; - txtVideoExtensions.Focus(); + tabControl1.SelectedTab = tpSubtitles; + txtSubtitleExtensions.Focus(); return; } if (!TVSettings.OKExtensionsString(txtOtherExtensions.Text)) @@ -131,6 +132,7 @@ private void OKButton_Click(object sender, EventArgs e) s.NotificationAreaIcon = cbNotificationIcon.Checked; s.VideoExtensionsString = txtVideoExtensions.Text; s.OtherExtensionsString = txtOtherExtensions.Text; + s.subtitleExtensionsString = txtSubtitleExtensions.Text; s.ExportRSSMaxDays = Convert.ToInt32(txtExportRSSMaxDays.Text); s.ExportRSSMaxShows = Convert.ToInt32(txtExportRSSMaxShows.Text); s.ExportRSSDaysPast = Convert.ToInt32(txtExportRSSDaysPast.Text); @@ -146,20 +148,15 @@ private void OKButton_Click(object sender, EventArgs e) s.SpecialsFolderName = txtSpecialsFolderName.Text; s.searchSeasonWordsString = tbSeasonSearchTerms.Text; s.preferredRSSSearchTermsString = tbPreferredRSSTerms.Text; - - s.defaultSeasonWord = txtSeasonFolderName.Text; s.keepTogetherExtensionsString = txtKeepTogether.Text; - s.ForceLowercaseFilenames = cbForceLower.Checked; s.IgnoreSamples = cbIgnoreSamples.Checked; - s.uTorrentPath = txtRSSuTorrentPath.Text; s.ResumeDatPath = txtUTResumeDatPath.Text; s.SABHostPort = txtSABHostPort.Text; s.SABAPIKey = txtSABAPIKey.Text; s.CheckSABnzbd = cbCheckSABnzbd.Checked; - s.SearchRSS = cbSearchRSS.Checked; s.EpTBNs = cbEpTBNs.Checked; s.NFOShows = cbNFOShows.Checked; @@ -347,13 +344,11 @@ private void Preferences_Load(object sender, EventArgs e) cbMissingCSV.Checked = s.ExportMissingCSV; txtMissingCSV.Text = s.ExportMissingCSVTo; - cbShowsTXT.Checked = s.ExportShowsTXT ; txtShowsTXTTo.Text = s.ExportShowsTXTTo; cbShowsHTML.Checked = s.ExportShowsHTML; txtShowsHTMLTo.Text = s.ExportShowsHTMLTo; - cbRenamingXML.Checked = s.ExportRenamingXML; txtRenamingXML.Text = s.ExportRenamingXMLTo; @@ -364,6 +359,7 @@ private void Preferences_Load(object sender, EventArgs e) cbNotificationIcon.Checked = s.NotificationAreaIcon; txtVideoExtensions.Text = s.GetVideoExtensionsString(); txtOtherExtensions.Text = s.GetOtherExtensionsString(); + txtSubtitleExtensions.Text = s.subtitleExtensionsString; txtKeepTogether.Text = s.GetKeepTogetherString(); tbSeasonSearchTerms.Text = s.GetSeasonSearchTermsString(); tbPreferredRSSTerms .Text = s.GetPreferredRSSSearchTermsString(); @@ -389,7 +385,7 @@ private void Preferences_Load(object sender, EventArgs e) cbCheckSABnzbd.Checked = s.CheckSABnzbd; txtParallelDownloads.Text = s.ParallelDownloads.ToString(); - tbPercentDirty.Text = s.upgradeDirtyPercent.ToString(); + tbPercentDirty.Text = s.upgradeDirtyPercent.ToString(CultureInfo.InvariantCulture); cbSearchRSS.Checked = s.SearchRSS; cbEpTBNs.Checked = s.EpTBNs; @@ -425,7 +421,6 @@ private void Preferences_Load(object sender, EventArgs e) cbShrinkLarge.Checked = s.ShrinkLargeMede8erImages; cbFantArtJpg.Checked = s.FanArtJpg; - #if DEBUG System.Diagnostics.Debug.Assert(s.Tidyup != null); #endif @@ -438,7 +433,6 @@ private void Preferences_Load(object sender, EventArgs e) cbEmptyMaxSize.Checked = s.Tidyup.EmptyMaxSizeCheck; txtEmptyMaxSize.Text = s.Tidyup.EmptyMaxSizeMB.ToString(); txtSeasonFolderName.Text = s.defaultSeasonWord; - cbIgnoreRecycleBin.Checked = s.BulkAddIgnoreRecycleBin; cbIgnoreNoVideoFolders.Checked = s.BulkAddCompareNoVideoFolders; @@ -478,7 +472,6 @@ private void Preferences_Load(object sender, EventArgs e) case TVSettings.BetaMode.BetaToo: cbMode.Text = "Beta"; break; - } EnableDisable(null, null); @@ -551,8 +544,6 @@ System.Collections.Generic.KeyValuePair showStatu FillTreeViewColoringShowStatusTypeCombobox(); } - - private void FillTreeViewColoringShowStatusTypeCombobox() { //System.Collections.Generic.KeyValuePair item = new System.Collections.Generic.KeyValuePair(); @@ -599,7 +590,6 @@ private void Browse(TextBox txt, string defaultExt, int filterIndex) txt.Text = saveFile.FileName; } - private void bnBrowseWTWXML_Click(object sender, EventArgs e) { Browse(txtWTWXML,"xml",2); @@ -642,7 +632,6 @@ private void bnBrowseMissingCSV_Click(object sender, EventArgs e) Browse(txtMissingCSV,"csv",3); } - private void bnBrowseWTWRSS_Click(object sender, EventArgs e) { Browse(txtWTWRSS, "rss", 1); @@ -842,19 +831,15 @@ private void SetupReplacementsGrid() ////////////////////////////////////////////////////////////////////// // header row - ColumnHeader h; - h = new ColumnHeader("Search"); - h.AutomaticSortEnabled = false; + ColumnHeader h = new ColumnHeader("Search") {AutomaticSortEnabled = false}; ReplacementsGrid[0, 0] = h; ReplacementsGrid[0, 0].View = titleModel; - h = new ColumnHeader("Replace"); - h.AutomaticSortEnabled = false; + h = new ColumnHeader("Replace") {AutomaticSortEnabled = false}; ReplacementsGrid[0, 1] = h; ReplacementsGrid[0, 1].View = titleModel; - h = new ColumnHeader("Case Ins."); - h.AutomaticSortEnabled = false; + h = new ColumnHeader("Case Ins.") {AutomaticSortEnabled = false}; ReplacementsGrid[0, 2] = h; ReplacementsGrid[0, 2].View = titleModel; } @@ -868,7 +853,7 @@ private void AddNewReplacementRow(string from, string to, bool ins) ReplacementsGrid[r, 0] = new SourceGrid.Cells.Cell(from, typeof(string)); ReplacementsGrid[r, 1] = new SourceGrid.Cells.Cell(to, typeof(string)); ReplacementsGrid[r, 2] = new SourceGrid.Cells.CheckBox(null, ins); - if (!string.IsNullOrEmpty(from) && (TVSettings.CompulsoryReplacements().IndexOf(from) != -1)) + if (!string.IsNullOrEmpty(from) && (TVSettings.CompulsoryReplacements().IndexOf(from, StringComparison.Ordinal) != -1)) { ReplacementsGrid[r, 0].Editor.EnableEdit = false; ReplacementsGrid[r, 0].View = roModel; @@ -900,9 +885,7 @@ private void SetupRssGrid() ////////////////////////////////////////////////////////////////////// // header row - - ColumnHeader h = new ColumnHeader("URL"); - h.AutomaticSortEnabled = false; + ColumnHeader h = new ColumnHeader("URL") {AutomaticSortEnabled = false}; RSSGrid[0, 0] = h; RSSGrid[0, 0].View = titleModel; } @@ -1070,7 +1053,7 @@ private void bnReplaceRemove_Click(object sender, EventArgs e) // don't delete compulsory items int n = rowsIndex[0]; string from = (string) (ReplacementsGrid[n, 0].Value); - if (string.IsNullOrEmpty(from) || (TVSettings.CompulsoryReplacements().IndexOf(from) == -1)) + if (string.IsNullOrEmpty(from) || (TVSettings.CompulsoryReplacements().IndexOf(from, StringComparison.Ordinal) == -1)) ReplacementsGrid.Rows.Remove(n); } } diff --git a/TVRename/Settings/Settings.cs b/TVRename/Settings/Settings.cs index eefa25f9b..426e0dcc5 100644 --- a/TVRename/Settings/Settings.cs +++ b/TVRename/Settings/Settings.cs @@ -337,6 +337,9 @@ public enum KeepTogetherModes public string[] keepTogetherExtensionsArray => keepTogetherExtensionsString.Split(';'); public string keepTogetherExtensionsString = ""; + public string[] subtitleExtensionsArray => subtitleExtensionsString.Split(';'); + public string subtitleExtensionsString = ""; + public string defaultSeasonWord = "Season"; public string[] searchSeasonWordsArray => searchSeasonWordsString.Split(';'); @@ -481,6 +484,8 @@ public void load(XmlReader reader) VideoExtensionsString = reader.ReadElementContentAsString(); else if (reader.Name == "OtherExtensions") OtherExtensionsString = reader.ReadElementContentAsString(); + else if (reader.Name == "SubtitleExtensions") + subtitleExtensionsString = reader.ReadElementContentAsString(); else if (reader.Name == "ExportRSSMaxDays") ExportRSSMaxDays = reader.ReadElementContentAsInt(); else if (reader.Name == "ExportRSSMaxShows") @@ -802,6 +807,7 @@ public void SetToDefaults() ".avi;.mpg;.mpeg;.mkv;.mp4;.wmv;.divx;.ogm;.qt;.rm;.m4v;.webm;.vob;.ovg;.ogg;.mov;.m4p;.3gp"; OtherExtensionsString = ".srt;.nfo;.txt;.tbn"; keepTogetherExtensionsString = ".srt;.nfo;.txt;.tbn"; + subtitleExtensionsString = ".srt;.sub;.sbv;.idx"; // have a guess at utorrent's path string[] guesses = new string[3]; @@ -865,6 +871,7 @@ public void WriteXML(XmlWriter writer) XmlHelper.WriteElementToXml(writer,"NotificationAreaIcon",NotificationAreaIcon); XmlHelper.WriteElementToXml(writer,"VideoExtensions",VideoExtensionsString); XmlHelper.WriteElementToXml(writer,"OtherExtensions",OtherExtensionsString); + XmlHelper.WriteElementToXml(writer,"SubtitleExtensions", subtitleExtensionsString); XmlHelper.WriteElementToXml(writer,"ExportRSSMaxDays",ExportRSSMaxDays); XmlHelper.WriteElementToXml(writer,"ExportRSSMaxShows",ExportRSSMaxShows); XmlHelper.WriteElementToXml(writer,"ExportRSSDaysPast",ExportRSSDaysPast); @@ -1244,3 +1251,4 @@ public bool KeepTogetherFilesWithType(string fileExtension) } } } + diff --git a/TVRename/Utility/Helper/FileHelper.cs b/TVRename/Utility/Helper/FileHelper.cs index 98a1205d8..ee0509808 100644 --- a/TVRename/Utility/Helper/FileHelper.cs +++ b/TVRename/Utility/Helper/FileHelper.cs @@ -3,6 +3,7 @@ using Alphaleonis.Win32.Filesystem; using Microsoft.WindowsAPICodePack.Shell; using Microsoft.WindowsAPICodePack.Shell.PropertySystem; +using NLog.Internal; namespace TVRename { @@ -10,14 +11,20 @@ public static class FileHelper { public static bool IsLanguageSpecificSubtitle(this FileInfo file, out string extension) { - const string regex = @"(?\.\w{2,3}\.(srt|sub|sbv))$"; + foreach (string subExtension in TVSettings.Instance.subtitleExtensionsArray) + { + string regex = @"(?\.\w{2,3}\"+subExtension+")$"; + + Match m = Regex.Match(file.Name, regex, RegexOptions.IgnoreCase); + + if (!m.Success) continue; - Match m = Regex.Match(file.Name, regex, RegexOptions.IgnoreCase); - extension = (m.Success) - ? m.Groups["ext"].ToString() - : ""; + extension = m.Groups["ext"].ToString(); + return true; + } - return m.Success; + extension = string.Empty; + return false; } public static int GetFilmLength(this FileInfo movieFile)