From 7acbce9b81b6d9a7f884d5fc8c16f64bb5029c08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0?= Date: Thu, 4 Oct 2018 02:47:29 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D1=8B=20?= =?UTF-8?q?=D1=85=D0=B8=D0=BD=D1=82=D1=8B,=20=D0=BF=D0=BE=D1=84=D0=B8?= =?UTF-8?q?=D0=BA=D1=81=D0=B8=D0=BB=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0?= =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20infoLabel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fileFinder/HintModel.cs | 22 ---------------------- fileFinder/MainForm.Designer.cs | 1 - fileFinder/MainForm.cs | 17 +++-------------- fileFinder/fileFinder.csproj | 1 - 4 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 fileFinder/HintModel.cs diff --git a/fileFinder/HintModel.cs b/fileFinder/HintModel.cs deleted file mode 100644 index 8374935..0000000 --- a/fileFinder/HintModel.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace fileFinder -{ - class HintModel - { - public HintModel () - { - isDirectoryHintActive = true; - isNameQueryHintActive = true; - isInnerQueryHintActive = true; - } - - public bool isDirectoryHintActive { get; set; } - public bool isNameQueryHintActive { get; set; } - public bool isInnerQueryHintActive { get; set; } - } -} diff --git a/fileFinder/MainForm.Designer.cs b/fileFinder/MainForm.Designer.cs index 774c5f5..222c7ad 100644 --- a/fileFinder/MainForm.Designer.cs +++ b/fileFinder/MainForm.Designer.cs @@ -76,7 +76,6 @@ this.fileUrlTextBox.TabIndex = 1; this.fileUrlTextBox.Text = "C:\\Users\\itsmy_000\\Desktop\\a\\"; this.fileUrlTextBox.TextChanged += new System.EventHandler(this.fileUrlTextBox_TextChanged); - this.fileUrlTextBox.Enter += new System.EventHandler(this.curDirTextBox_Enter); // // splitContainer // diff --git a/fileFinder/MainForm.cs b/fileFinder/MainForm.cs index 534519e..60615b1 100644 --- a/fileFinder/MainForm.cs +++ b/fileFinder/MainForm.cs @@ -8,7 +8,6 @@ namespace fileFinder { public partial class MainForm : Form { - HintModel hints = new HintModel(); TaskController mainController = new TaskController(); SearchQueryModel searchQueryModel; System.Timers.Timer updateInfoTimer = new System.Timers.Timer(1000); @@ -59,30 +58,20 @@ namespace fileFinder if (result == DialogResult.OK && !String.IsNullOrWhiteSpace(dialog.SelectedPath)) { fileUrlTextBox.Text = dialog.SelectedPath; - hints.isDirectoryHintActive = false; } } } - - private void curDirTextBox_Enter(object sender, EventArgs e) - { - //if (hints.isDirectoryHintActive) - //{ - // hints.isDirectoryHintActive = false; - // curDirTextBox.Text = ""; - //} - } private void reportProgress(object sender, ProgressReportModel report) { switch (mainController.state) { - case TaskState.Work: - updateInfoLabel(report.currentFileUrl, report); - break; case TaskState.Pause: updateResultViewer(report.currentTreeNode); break; + default: + updateInfoLabel(report.currentFileUrl, report); + break; } } diff --git a/fileFinder/fileFinder.csproj b/fileFinder/fileFinder.csproj index 015a164..74b3702 100644 --- a/fileFinder/fileFinder.csproj +++ b/fileFinder/fileFinder.csproj @@ -45,7 +45,6 @@ - Form