diff --git a/DFF.cs b/DFF.cs index 597de82..a5ce270 100644 --- a/DFF.cs +++ b/DFF.cs @@ -11,6 +11,7 @@ using System.Windows.Forms; using System.Collections; using System.Threading; +using System.Diagnostics; using System.Security.AccessControl; //for FileSystemAccessRule in mscorlib as per http://docs.go-mono.com/index.aspx?link=T%3ASystem.Security.AccessControl.FileSystemAccessRule //using Mono.Unix; //using System.Diagnostics; //System.Diagnostics.Debug.WriteLine etc @@ -51,6 +52,14 @@ public DFF() public static long NowMS() { return DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond; } + public static string get_indent(int depth, string tab) { + string result = ""; + if (depth < 1) return ""; + for (int i=0; i= options.modified_start_datetime_utc.ToUniversalTime ())) { - if (!options.min_size_enable || (this_info.Length >= options.min_size)) { - if (!options.max_size_enable || (this_info.Length <= options.max_size)) { - if (string.IsNullOrEmpty(options.content_string) || (get_is_content_searchable(this_info.FullName)&&get_file_contains(this_info, options.content_string))) { - result = true; - } - } - } - } - } - } - Console.WriteLine ("...done get_is_match(FileInfo,bool)"); - } else Console.Error.WriteLine ("get_is_match(FileInfo,bool): non-file-like name skipped"); - } catch (IOException ioEx) { - //ignore since probably a permission issue - } catch (Exception exn) { - //Console.Error.WriteLine ("Could not finish get_is_match: " + exn.ToString ()); - Console.Error.WriteLine ("Could not finish get_is_match(FileInfo,bool):"+exn.ToString()); + if (this_info == null) { + string msg = "get_is_match(FileInfo,bool):null"; + Console.Error.WriteLine(msg); + Debug.WriteLine(msg); + return false; + } + if ( + this_info.Name.EndsWith(":") + || this_info.Name.StartsWith("Singleton") + || this_info.Name.EndsWith("Socket") + ) { + Debug.WriteLine("get_is_match(FileInfo,bool): non-file-like name skipped"); + return false; + } + + try { + Debug.WriteLine("get_is_match(FileInfo,"+(filenames_prefiltered_enable?"true":"false")+") '" + this_info.Name + "'..."); + if (options_name_string_tolower==null&&options.name_string!=null) { + options_name_string_tolower=options.name_string.ToLower(); + //;throw new ApplicationException("options_name_string_tolower was null but options.name_string was not (this should never happen)"); + } + + if (!filenames_prefiltered_enable) { + if (!is_like(this_info.Name, options.name_string)) + return false; + else { + if (options.name_string != null) + Debug.WriteLine(" name matches \""+options.name_string+"\""); + else + Debug.WriteLine(" name matches null"); + } + } + // Comparisons below are ok since time was manipulated if !options.endbefore_time_enable + if (options.modified_endbefore_date_enable && (this_info.LastWriteTime.ToUniversalTime () >= options.modified_endbefore_datetime_utc.ToUniversalTime())) + return false; + if (options.modified_start_date_enable && (this_info.LastWriteTime.ToUniversalTime () < options.modified_start_datetime_utc.ToUniversalTime ())) + return false; + if (options.min_size_enable && (this_info.Length < options.min_size)) + return false; + if (options.max_size_enable && (this_info.Length > options.max_size)) + return false; + if (string.IsNullOrEmpty(options.content_string) || (get_is_content_searchable(this_info.FullName)&&get_file_contains(this_info, options.content_string))) { + // It has to be a searchable file if content_string is used, and content_string must be found inside. + if (!string.IsNullOrEmpty(options.content_string)) + Debug.WriteLine(" content matches \""+options.content_string+"\""); + result = true; } - } else Console.Error.WriteLine ("get_is_match(FileInfo,bool):null"); + + } catch (IOException ioEx) { + //ignore since probably a permission issue + Debug.WriteLine(" Error: get_is_match failed with IOException on "+this_info.Name+":"+ioEx.ToString()); + } catch (Exception exn) { + //Console.Error.WriteLine ("Could not finish get_is_match: " + exn.ToString ()); + Console.Error.WriteLine ("Could not finish get_is_match(FileInfo,bool):"+exn.ToString()); + Debug.WriteLine(" Error: get_is_match failed with Exception on "+this_info.Name+":"+exn.ToString()); + } + Debug.WriteLine(" "+(result?"true":"false")+"...done get_is_match(FileInfo,bool)"); return result; } public bool get_is_match(DirectoryInfo this_info) { @@ -165,15 +231,28 @@ public bool get_is_match(DirectoryInfo this_info) { //Console.Error.WriteLine("get_is_match(DirectoryInfo) '" + this_info.Name + "'..."); //Console.Error.WriteLine(" options.name_string:" + options.name_string); //Console.Error.WriteLine(" options_name_string_tolower: " + options_name_string_tolower); - if (string.IsNullOrEmpty(options.name_string) || (options.name_string=="*") || (options.case_sensitive_enable ? this_info.Name.Contains(options.name_string) : this_info.Name.ToLower().Contains(options_name_string_tolower))) { + if (is_like(this_info.Name, options.name_string)) { //below is ok since time was manipulated if !options.endbefore_time_enable if (!options.modified_endbefore_date_enable || (this_info.LastWriteTime.ToFileTimeUtc () < options.modified_endbefore_datetime_utc.ToFileTimeUtc ())) { if (!options.modified_start_date_enable || (this_info.LastWriteTime.ToFileTimeUtc () >= options.modified_start_datetime_utc.ToFileTimeUtc ())) { result = true; } + else { + Debug.WriteLine("not after start date:"); + } + } + else { + Debug.WriteLine("not before end date:"); } } - } else Console.Error.WriteLine ("get_is_match(DirectoryInfo):null"); + else { + Debug.WriteLine("not like "+options.name_string+":"); + } + } + else { + Console.Error.WriteLine ("get_is_match(DirectoryInfo):null"); + Debug.WriteLine("null:"); + } return result; } public static bool ContainsI(ArrayList haystack, string needle) { @@ -373,6 +452,7 @@ private string ExecuteSearchRecursively(DirectoryInfo major_di, int depth) { participle = "getting directory list for '"+major_di.FullName+"'"; foreach (DirectoryInfo this_di in major_di.GetDirectories ()) { participle = "preparing to check (under major directory) in directory '"+this_di.FullName+"'"; + // Debug.WriteLine(participle); if (!enable) break; try { if (options.include_folders_as_results_enable) { @@ -403,24 +483,68 @@ private string ExecuteSearchRecursively(DirectoryInfo major_di, int depth) { } } if (this.non_directory_paths == null || Array.IndexOf (this.non_directory_paths, this_di.FullName) <= -1) { - if (get_is_folder_searchable(this_di,false)) { - ExecuteSearchRecursively(this_di, depth+1); + if (get_is_folder_searchable(this_di, false)) { + /* + if (get_is_match(this_di)) { + Debug.WriteLine(get_indent(depth, " ")+"++ "+this_di.Name); + // Add folders, not just directories, if not matching content. + participle = "adding a folder result"; + if (this_di==null) + Debug.WriteLine("ERROR: this_di is null"); + if (results != null) { + results.Add(this_di.FullName); + } + } + else { + Debug.WriteLine(get_indent(depth, " ")+"+ "+this_di.Name); + } + */ + // ^ already done in the previous case if include_folders_as_results_enable + string subResult = ExecuteSearchRecursively(this_di, depth+1); + if (subResult != null) { + if (err == null) err = subResult; + else err += ". " + subResult; + } + + // Debug.WriteLine shows in the SharpDevelop "Output" panel. + // - but only in Debug configuration! } + else { + Debug.WriteLine(get_indent(depth, " ")+"- (not searchable)"+this_di.Name); + } } + else { + Debug.WriteLine(get_indent(depth, " ")+"- (non-directory)"+this_di.Name); + } } catch (Exception exn) { if (depth==0) err = exn.ToString(); - Console.Error.WriteLine ("Could not finish accessing subdirectory while "+participle+" in ExecuteSearchRecursively '" + this_di.FullName + "': " + exn.ToString ()); + string msg = "Could not finish accessing subdirectory while "+participle+" in ExecuteSearchRecursively '" + this_di.FullName + "': " + exn.ToString (); + Debug.WriteLine(get_indent(depth, " ")+"- ("+exn.ToString()+")"+this_di.Name); + if (err == null) err = msg; + else err += ". " + msg; + Console.Error.WriteLine(msg); } } } + else { + Debug.WriteLine("- (enable==false) " + major_di.FullName); + } } catch (Exception exn) { + Debug.WriteLine("- ("+exn.ToString()+") " + major_di.FullName); if (depth==0) err = exn.ToString(); - Console.Error.WriteLine ("Could not finish accessing folder '" + major_di.FullName + "': " + exn.ToString ()); + string msg = "Could not finish accessing folder '" + major_di.FullName + "': " + exn.ToString (); + if (err == null) err = msg; + else err += ". " + msg; + Console.Error.WriteLine(msg); } } else { + string msg = "get_is_folder_searchable is false for " + major_di.FullName; + Debug.WriteLine(msg); //if (depth==0) err = "not a normal folder: '" + major_di.FullName + "'"; - Console.Error.WriteLine("get_is_folder_searchable is false for " + major_di.FullName); + if (err == null) err = msg; + else err += ". " + msg; + Console.Error.WriteLine(msg); } }//end if get_is_folder_searchable else { diff --git a/DFFSearchOptions.cs b/DFFSearchOptions.cs index b9ecb3d..63aa61f 100644 --- a/DFFSearchOptions.cs +++ b/DFFSearchOptions.cs @@ -11,6 +11,8 @@ using System.IO; using System.Windows.Forms; //using System.Diagnostics; //System.Diagnostics.Debug.WriteLine etc +using System.Reflection; // provides MethodBase +using System.Diagnostics; // provides Tracing namespace DeepFileFind { @@ -33,7 +35,23 @@ public class DFFSearchOptions public bool modified_endbefore_time_enable = false; public ArrayList start_directoryinfos = null; public ArrayList never_use_names = null; - public string name_string = null; + private string _name_string = null; + public string name_string { + get { + return _name_string; + } + set { + var stackTrace = new StackTrace(); + MethodBase method = stackTrace.GetFrame(1).GetMethod(); + string methodName = method.Name; + string className = method.ReflectedType.Name; + if (value != null) + Debug.WriteLine("name_string=\""+value+"\" as set by "+className+"."+methodName); + else + Debug.WriteLine("name_string=null as set by "+className+"."+methodName); + _name_string = value; + } + } public string content_string = null; public bool recursive_enable = true; public bool include_folders_as_results_enable = true; diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs index a3da523..fde93ac 100644 --- a/MainForm.Designer.cs +++ b/MainForm.Designer.cs @@ -104,7 +104,6 @@ private void InitializeComponent() this.tableLayoutPanel2.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout(); this.tableLayoutPanel4.SuspendLayout(); - this.tableLayoutPanel6.SuspendLayout(); this.tableLayoutPanel7.SuspendLayout(); this.menuStrip1.SuspendLayout(); this.resultContextMenuStrip.SuspendLayout(); @@ -195,7 +194,7 @@ private void InitializeComponent() this.tableLayoutPanel9.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel9.Controls.Add(this.label3, 0, 0); this.tableLayoutPanel9.Controls.Add(this.excludeTextBox, 1, 0); - this.tableLayoutPanel9.Location = new System.Drawing.Point(3, 405); + this.tableLayoutPanel9.Location = new System.Drawing.Point(3, 382); this.tableLayoutPanel9.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tableLayoutPanel9.Name = "tableLayoutPanel9"; this.tableLayoutPanel9.RowCount = 1; @@ -232,7 +231,7 @@ private void InitializeComponent() this.tableLayoutPanel8.Controls.Add(this.minSizeTextBox, 0, 0); this.tableLayoutPanel8.Controls.Add(this.minSizeCheckBox, 0, 0); this.tableLayoutPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel8.Location = new System.Drawing.Point(3, 324); + this.tableLayoutPanel8.Location = new System.Drawing.Point(3, 301); this.tableLayoutPanel8.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tableLayoutPanel8.Name = "tableLayoutPanel8"; this.tableLayoutPanel8.RowCount = 1; @@ -271,7 +270,7 @@ private void InitializeComponent() this.tableLayoutPanel5.Controls.Add(this.modifiedEndBeforeDateCheckBox, 0, 0); this.tableLayoutPanel5.Controls.Add(this.modifiedEndBeforeTimeCheckBox, 1, 0); this.tableLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel5.Location = new System.Drawing.Point(3, 266); + this.tableLayoutPanel5.Location = new System.Drawing.Point(3, 243); this.tableLayoutPanel5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tableLayoutPanel5.Name = "tableLayoutPanel5"; this.tableLayoutPanel5.RowCount = 1; @@ -311,7 +310,7 @@ private void InitializeComponent() this.modifiedEndBeforeDTPicker.Dock = System.Windows.Forms.DockStyle.Fill; this.modifiedEndBeforeDTPicker.Enabled = false; this.modifiedEndBeforeDTPicker.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.modifiedEndBeforeDTPicker.Location = new System.Drawing.Point(4, 296); + this.modifiedEndBeforeDTPicker.Location = new System.Drawing.Point(4, 273); this.modifiedEndBeforeDTPicker.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.modifiedEndBeforeDTPicker.Name = "modifiedEndBeforeDTPicker"; this.modifiedEndBeforeDTPicker.Size = new System.Drawing.Size(333, 23); @@ -330,7 +329,7 @@ private void InitializeComponent() // contentTextBox // this.contentTextBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.contentTextBox.Location = new System.Drawing.Point(4, 180); + this.contentTextBox.Location = new System.Drawing.Point(4, 157); this.contentTextBox.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.contentTextBox.Name = "contentTextBox"; this.contentTextBox.Size = new System.Drawing.Size(333, 23); @@ -341,7 +340,7 @@ private void InitializeComponent() // this.contentCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.contentCheckBox.AutoSize = true; - this.contentCheckBox.Location = new System.Drawing.Point(4, 155); + this.contentCheckBox.Location = new System.Drawing.Point(4, 132); this.contentCheckBox.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.contentCheckBox.Name = "contentCheckBox"; this.contentCheckBox.Size = new System.Drawing.Size(68, 19); @@ -354,13 +353,15 @@ private void InitializeComponent() // this.tableLayoutPanel2.AutoSize = true; this.tableLayoutPanel2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel2.ColumnCount = 3; + this.tableLayoutPanel2.ColumnCount = 4; this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel2.Controls.Add(this.findButton, 1, 0); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel2.Controls.Add(this.foldersCheckBox, 1, 0); + this.tableLayoutPanel2.Controls.Add(this.findButton, 2, 0); this.tableLayoutPanel2.Controls.Add(this.nameTextBox, 0, 0); - this.tableLayoutPanel2.Controls.Add(this.cancelButton, 2, 0); + this.tableLayoutPanel2.Controls.Add(this.cancelButton, 3, 0); this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 17); this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); @@ -390,7 +391,7 @@ private void InitializeComponent() this.nameTextBox.Location = new System.Drawing.Point(4, 6); this.nameTextBox.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.nameTextBox.Name = "nameTextBox"; - this.nameTextBox.Size = new System.Drawing.Size(200, 23); + this.nameTextBox.Size = new System.Drawing.Size(93, 23); this.nameTextBox.TabIndex = 0; this.nameTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.NameTextBoxKeyDown); // @@ -416,7 +417,7 @@ private void InitializeComponent() this.modifiedStartDTPicker.Dock = System.Windows.Forms.DockStyle.Fill; this.modifiedStartDTPicker.Enabled = false; this.modifiedStartDTPicker.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.modifiedStartDTPicker.Location = new System.Drawing.Point(4, 238); + this.modifiedStartDTPicker.Location = new System.Drawing.Point(4, 215); this.modifiedStartDTPicker.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.modifiedStartDTPicker.Name = "modifiedStartDTPicker"; this.modifiedStartDTPicker.Size = new System.Drawing.Size(333, 23); @@ -427,7 +428,7 @@ private void InitializeComponent() // this.locationComboBox.Dock = System.Windows.Forms.DockStyle.Fill; this.locationComboBox.FormattingEnabled = true; - this.locationComboBox.Location = new System.Drawing.Point(4, 99); + this.locationComboBox.Location = new System.Drawing.Point(4, 76); this.locationComboBox.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.locationComboBox.Name = "locationComboBox"; this.locationComboBox.Size = new System.Drawing.Size(333, 23); @@ -437,7 +438,7 @@ private void InitializeComponent() // this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(4, 81); + this.label1.Location = new System.Drawing.Point(4, 58); this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(204, 15); @@ -453,7 +454,7 @@ private void InitializeComponent() this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 80F)); this.tableLayoutPanel3.Controls.Add(this.recursiveCheckBox, 1, 0); this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 127); + this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 104); this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 1; @@ -485,7 +486,7 @@ private void InitializeComponent() this.tableLayoutPanel4.Controls.Add(this.modifiedStartTimeCheckBox, 1, 0); this.tableLayoutPanel4.Controls.Add(this.modifiedStartDateCheckBox, 0, 0); this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 208); + this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 185); this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; this.tableLayoutPanel4.RowCount = 1; @@ -526,27 +527,27 @@ private void InitializeComponent() this.tableLayoutPanel6.ColumnCount = 2; this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 80F)); - this.tableLayoutPanel6.Controls.Add(this.foldersCheckBox, 1, 0); this.tableLayoutPanel6.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel6.Location = new System.Drawing.Point(3, 56); this.tableLayoutPanel6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tableLayoutPanel6.Name = "tableLayoutPanel6"; this.tableLayoutPanel6.RowCount = 1; this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel6.Size = new System.Drawing.Size(335, 23); + this.tableLayoutPanel6.Size = new System.Drawing.Size(335, 1); this.tableLayoutPanel6.TabIndex = 20; // // foldersCheckBox // + this.foldersCheckBox.Anchor = System.Windows.Forms.AnchorStyles.Left; this.foldersCheckBox.AutoSize = true; this.foldersCheckBox.Checked = true; this.foldersCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.foldersCheckBox.Location = new System.Drawing.Point(70, 2); + this.foldersCheckBox.Location = new System.Drawing.Point(104, 8); this.foldersCheckBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.foldersCheckBox.Name = "foldersCheckBox"; - this.foldersCheckBox.Size = new System.Drawing.Size(166, 19); + this.foldersCheckBox.Size = new System.Drawing.Size(101, 19); this.foldersCheckBox.TabIndex = 3; - this.foldersCheckBox.Text = "Include folders as results"; + this.foldersCheckBox.Text = "Folder Names"; this.foldersCheckBox.UseVisualStyleBackColor = true; // // tableLayoutPanel7 @@ -558,7 +559,7 @@ private void InitializeComponent() this.tableLayoutPanel7.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 60F)); this.tableLayoutPanel7.Controls.Add(this.maxSizeTextBox, 0, 0); this.tableLayoutPanel7.Controls.Add(this.maxSizeCheckBox, 0, 0); - this.tableLayoutPanel7.Location = new System.Drawing.Point(3, 372); + this.tableLayoutPanel7.Location = new System.Drawing.Point(3, 349); this.tableLayoutPanel7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tableLayoutPanel7.Name = "tableLayoutPanel7"; this.tableLayoutPanel7.RowCount = 1; @@ -591,7 +592,7 @@ private void InitializeComponent() // this.minSizeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.minSizeLabel.AutoSize = true; - this.minSizeLabel.Location = new System.Drawing.Point(46, 355); + this.minSizeLabel.Location = new System.Drawing.Point(46, 332); this.minSizeLabel.Name = "minSizeLabel"; this.minSizeLabel.Size = new System.Drawing.Size(292, 15); this.minSizeLabel.TabIndex = 19; @@ -600,7 +601,7 @@ private void InitializeComponent() // follow_temporary_folders_enableCB // this.follow_temporary_folders_enableCB.AutoSize = true; - this.follow_temporary_folders_enableCB.Location = new System.Drawing.Point(4, 562); + this.follow_temporary_folders_enableCB.Location = new System.Drawing.Point(4, 539); this.follow_temporary_folders_enableCB.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.follow_temporary_folders_enableCB.Name = "follow_temporary_folders_enableCB"; this.follow_temporary_folders_enableCB.Size = new System.Drawing.Size(165, 19); @@ -611,7 +612,7 @@ private void InitializeComponent() // follow_system_folders_enableCB // this.follow_system_folders_enableCB.AutoSize = true; - this.follow_system_folders_enableCB.Location = new System.Drawing.Point(4, 537); + this.follow_system_folders_enableCB.Location = new System.Drawing.Point(4, 514); this.follow_system_folders_enableCB.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.follow_system_folders_enableCB.Name = "follow_system_folders_enableCB"; this.follow_system_folders_enableCB.Size = new System.Drawing.Size(146, 19); @@ -622,7 +623,7 @@ private void InitializeComponent() // follow_dot_folders_enableCB // this.follow_dot_folders_enableCB.AutoSize = true; - this.follow_dot_folders_enableCB.Location = new System.Drawing.Point(4, 512); + this.follow_dot_folders_enableCB.Location = new System.Drawing.Point(4, 489); this.follow_dot_folders_enableCB.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.follow_dot_folders_enableCB.Name = "follow_dot_folders_enableCB"; this.follow_dot_folders_enableCB.Size = new System.Drawing.Size(261, 19); @@ -633,7 +634,7 @@ private void InitializeComponent() // search_inside_hidden_files_enableCB // this.search_inside_hidden_files_enableCB.AutoSize = true; - this.search_inside_hidden_files_enableCB.Location = new System.Drawing.Point(4, 487); + this.search_inside_hidden_files_enableCB.Location = new System.Drawing.Point(4, 464); this.search_inside_hidden_files_enableCB.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.search_inside_hidden_files_enableCB.Name = "search_inside_hidden_files_enableCB"; this.search_inside_hidden_files_enableCB.Size = new System.Drawing.Size(130, 19); @@ -644,7 +645,7 @@ private void InitializeComponent() // follow_hidden_folders_enableCB // this.follow_hidden_folders_enableCB.AutoSize = true; - this.follow_hidden_folders_enableCB.Location = new System.Drawing.Point(4, 462); + this.follow_hidden_folders_enableCB.Location = new System.Drawing.Point(4, 439); this.follow_hidden_folders_enableCB.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.follow_hidden_folders_enableCB.Name = "follow_hidden_folders_enableCB"; this.follow_hidden_folders_enableCB.Size = new System.Drawing.Size(146, 19); @@ -655,7 +656,7 @@ private void InitializeComponent() // follow_folder_symlinks_enableCB // this.follow_folder_symlinks_enableCB.AutoSize = true; - this.follow_folder_symlinks_enableCB.Location = new System.Drawing.Point(4, 437); + this.follow_folder_symlinks_enableCB.Location = new System.Drawing.Point(4, 414); this.follow_folder_symlinks_enableCB.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.follow_folder_symlinks_enableCB.Name = "follow_folder_symlinks_enableCB"; this.follow_folder_symlinks_enableCB.Size = new System.Drawing.Size(260, 19); @@ -843,8 +844,6 @@ private void InitializeComponent() this.tableLayoutPanel3.PerformLayout(); this.tableLayoutPanel4.ResumeLayout(false); this.tableLayoutPanel4.PerformLayout(); - this.tableLayoutPanel6.ResumeLayout(false); - this.tableLayoutPanel6.PerformLayout(); this.tableLayoutPanel7.ResumeLayout(false); this.tableLayoutPanel7.PerformLayout(); this.menuStrip1.ResumeLayout(false);