diff --git a/fileFinder/MainForm.Designer.cs b/fileFinder/MainForm.Designer.cs index ed605bb..774c5f5 100644 --- a/fileFinder/MainForm.Designer.cs +++ b/fileFinder/MainForm.Designer.cs @@ -39,6 +39,9 @@ this.waitOrPauseLabel = new System.Windows.Forms.Label(); this.bottomPanel = new System.Windows.Forms.Panel(); this.infoLabel = new System.Windows.Forms.Label(); + this.fileUrlLabel = new System.Windows.Forms.Label(); + this.fileNameQueryLabel = new System.Windows.Forms.Label(); + this.fileInnerQueryLabel = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); this.splitContainer.Panel1.SuspendLayout(); this.splitContainer.Panel2.SuspendLayout(); @@ -65,11 +68,11 @@ this.dirSelectBtn.UseVisualStyleBackColor = true; this.dirSelectBtn.Click += new System.EventHandler(this.dirSelectBtn_Click); // - // curDirTextBox + // fileUrlTextBox // - this.fileUrlTextBox.Location = new System.Drawing.Point(12, 10); - this.fileUrlTextBox.Name = "curDirTextBox"; - this.fileUrlTextBox.Size = new System.Drawing.Size(650, 20); + this.fileUrlTextBox.Location = new System.Drawing.Point(151, 10); + this.fileUrlTextBox.Name = "fileUrlTextBox"; + this.fileUrlTextBox.Size = new System.Drawing.Size(511, 20); this.fileUrlTextBox.TabIndex = 1; this.fileUrlTextBox.Text = "C:\\Users\\itsmy_000\\Desktop\\a\\"; this.fileUrlTextBox.TextChanged += new System.EventHandler(this.fileUrlTextBox_TextChanged); @@ -85,6 +88,9 @@ // // splitContainer.Panel1 // + this.splitContainer.Panel1.Controls.Add(this.fileInnerQueryLabel); + this.splitContainer.Panel1.Controls.Add(this.fileNameQueryLabel); + this.splitContainer.Panel1.Controls.Add(this.fileUrlLabel); this.splitContainer.Panel1.Controls.Add(this.handleSearchBtn); this.splitContainer.Panel1.Controls.Add(this.dirSelectBtn); this.splitContainer.Panel1.Controls.Add(this.innerQueryTextBox); @@ -102,7 +108,7 @@ // // handleSearchBtn // - this.handleSearchBtn.Location = new System.Drawing.Point(668, 62); + this.handleSearchBtn.Location = new System.Drawing.Point(668, 61); this.handleSearchBtn.Name = "handleSearchBtn"; this.handleSearchBtn.Size = new System.Drawing.Size(120, 21); this.handleSearchBtn.TabIndex = 5; @@ -112,18 +118,18 @@ // // innerQueryTextBox // - this.innerQueryTextBox.Location = new System.Drawing.Point(12, 62); + this.innerQueryTextBox.Location = new System.Drawing.Point(151, 62); this.innerQueryTextBox.Name = "innerQueryTextBox"; - this.innerQueryTextBox.Size = new System.Drawing.Size(650, 20); + this.innerQueryTextBox.Size = new System.Drawing.Size(511, 20); this.innerQueryTextBox.TabIndex = 4; this.innerQueryTextBox.Tag = ""; this.innerQueryTextBox.TextChanged += new System.EventHandler(this.innerQueryTextBox_TextChanged); // - // queryTextBox + // nameQueryTextBox // - this.nameQueryTextBox.Location = new System.Drawing.Point(12, 36); - this.nameQueryTextBox.Name = "queryTextBox"; - this.nameQueryTextBox.Size = new System.Drawing.Size(776, 20); + this.nameQueryTextBox.Location = new System.Drawing.Point(151, 36); + this.nameQueryTextBox.Name = "nameQueryTextBox"; + this.nameQueryTextBox.Size = new System.Drawing.Size(511, 20); this.nameQueryTextBox.TabIndex = 3; this.nameQueryTextBox.Tag = ""; this.nameQueryTextBox.Text = "*.txt"; @@ -156,9 +162,36 @@ this.infoLabel.AutoSize = true; this.infoLabel.Location = new System.Drawing.Point(0, 0); this.infoLabel.Name = "infoLabel"; - this.infoLabel.Size = new System.Drawing.Size(263, 13); + this.infoLabel.Size = new System.Drawing.Size(278, 13); this.infoLabel.TabIndex = 0; - this.infoLabel.Text = "Time: 00:00:00 | Processed files: 0 | Current item: none"; + this.infoLabel.Text = "Time: 00:00:00 | Number of files: 0/0/0 | Current file: none"; + // + // fileUrlLabel + // + this.fileUrlLabel.AutoSize = true; + this.fileUrlLabel.Location = new System.Drawing.Point(12, 13); + this.fileUrlLabel.Name = "fileUrlLabel"; + this.fileUrlLabel.Size = new System.Drawing.Size(76, 13); + this.fileUrlLabel.TabIndex = 6; + this.fileUrlLabel.Text = "Путь к папке:"; + // + // fileNameQueryLabel + // + this.fileNameQueryLabel.AutoSize = true; + this.fileNameQueryLabel.Location = new System.Drawing.Point(12, 39); + this.fileNameQueryLabel.Name = "fileNameQueryLabel"; + this.fileNameQueryLabel.Size = new System.Drawing.Size(119, 13); + this.fileNameQueryLabel.TabIndex = 6; + this.fileNameQueryLabel.Text = "Шаблон имени файла:"; + // + // fileInnerQueryLabel + // + this.fileInnerQueryLabel.AutoSize = true; + this.fileInnerQueryLabel.Location = new System.Drawing.Point(12, 65); + this.fileInnerQueryLabel.Name = "fileInnerQueryLabel"; + this.fileInnerQueryLabel.Size = new System.Drawing.Size(133, 13); + this.fileInnerQueryLabel.TabIndex = 6; + this.fileInnerQueryLabel.Text = "Искомый текст в файле:"; // // MainForm // @@ -196,6 +229,9 @@ private System.Windows.Forms.TextBox nameQueryTextBox; private System.Windows.Forms.TextBox innerQueryTextBox; private System.Windows.Forms.Label waitOrPauseLabel; + private System.Windows.Forms.Label fileInnerQueryLabel; + private System.Windows.Forms.Label fileNameQueryLabel; + private System.Windows.Forms.Label fileUrlLabel; } } diff --git a/fileFinder/MainForm.cs b/fileFinder/MainForm.cs index 8980279..534519e 100644 --- a/fileFinder/MainForm.cs +++ b/fileFinder/MainForm.cs @@ -153,7 +153,7 @@ namespace fileFinder TimeSpan tS = mainController.elapsedTime(); string fileNumCounters = rpm.matchingFiles + "/" + rpm.processedFiles + "/" + rpm.totalNumOfFiles; string time = String.Format("{0:00}:{1:00}:{2:00}", tS.Hours, tS.Minutes, tS.Seconds); - infoLabel.Text = "Time: " + time + " " + "| Processed files: " + fileNumCounters + + infoLabel.Text = "Time: " + time + " " + "| Number of files: " + fileNumCounters + " | Current file: " + fileUrl; }