Revert "design changes"

This reverts commit c33259f.
borseno · Feb 7, 2019 · 2b95891 · 2b95891
1 parent c33259f
commit 2b95891
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 98 deletions.
diff --git a/BorsenoTextEditor.csproj b/BorsenoTextEditor.csproj
@@ -52,12 +52,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CellSelectionDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="CellSelectionDialog.Designer.cs">
-      <DependentUpon>CellSelectionDialog.cs</DependentUpon>
-    </Compile>
     <Compile Include="ChooseFileFromDBForm.cs">
       <SubType>Form</SubType>
     </Compile>

diff --git a/CellSelectionDialog.Designer.cs b/CellSelectionDialog.Designer.cs
diff --git a/CellSelectionDialog.cs b/CellSelectionDialog.cs
diff --git a/ChooseFileFromDBForm.Designer.cs b/ChooseFileFromDBForm.Designer.cs
diff --git a/ChooseFileFromDBForm.cs b/ChooseFileFromDBForm.cs
@@ -17,15 +17,13 @@ public partial class ChooseFileFromDBForm : Form
         private readonly string _connectionString;
         private readonly string _tableName;
         private readonly string _nameColumnName;
-        private CellSelectionDialog csd = null;
-
-        public bool IsSelected { get; private set; } = false;
+        private bool _isSelected = false;
 
         public string SelectedFileName
         {
             get
             {
-                if (IsSelected)
+                if (_isSelected)
                     return filesDBdataGridView.SelectedCells[0].ToString();
                 return null;
             }
@@ -51,36 +49,14 @@ private void OnLoad(object sender, EventArgs e)
                 dataAdapter.Fill(dataSet);
                 filesDBdataGridView.DataSource = dataSet.Tables[0];
             }
-            csd = new CellSelectionDialog();
-            csd.FormClosing += CellSelectionDialog_FormClosing;
-            csd.Show();
         }
 
         private void OnSelected(object sender, EventArgs e)
         {
             if (filesDBdataGridView.SelectedCells.Count == 1)
-                IsSelected = true;
+                _isSelected = true;
             else
                 MessageBox.Show(@"You can choose only one cell");
         }
-
-        private void OnSelectionChanged(object sender, EventArgs e)
-        {
-            if (csd != null)
-            {
-                csd.Cells = filesDBdataGridView.SelectedCells;
-                csd.BringToFront();
-            }
-        }
-        private void CellSelectionDialog_FormClosing(object sender, FormClosingEventArgs e)
-        {
-            if (csd.DialogResult == DialogResult.OK)
-            {
-                //Do something with csd.cells
-                MessageBox.Show(csd.Cells[0].Value.ToString());
-                //set the form to null;
-                csd = null;
-            }
-        }
     }
 }
diff --git a/DBFilePicker.cs b/DBFilePicker.cs
@@ -28,15 +28,23 @@ public DBFilePicker
 
         public string GetFile()
         {
-            // ???  I know it's a bad idea... I Tried to inherit from CommonDialog
-            while (!_chooseForm.IsSelected)
-                ;
-            return _chooseForm.SelectedFileName;
+            _chooseForm.FormClosed += OnFormClosed;
+            _chooseForm.Show();
+
+
+
+            throw new NotImplementedException();
         }
 
         public string GetOrCreateFile()
         {
             throw new NotImplementedException();
         }
+
+        private void OnFormClosed(object sender, EventArgs e)
+        {
+            _name = ((ChooseFileFromDBForm) sender).SelectedFileName;
+            GetFile();
+        }
     }
 }