Excel2CSPro: some changes to the functionality of the Excel -> CSPro dictionary operation + some bug fixes

Author: Oryxamus

Excel2CSPro/CreateDictionaryControl.cs

@@ -34,7 +34,7 @@ private void buttonSelectExcelFile_Click(object sender,EventArgs e)
             {
                 try
                 {
-                    _workbookController.OpenWorksheet(ofd.FileName);
+                    _workbookController.OpenWorkbook(ofd.FileName);
 
                     List<string> worksheetNames = _workbookController.WorksheetNames;
 
@@ -257,6 +257,9 @@ private void buttonCreateDictionary_Click(object sender,EventArgs e)
 
                     CreateDictionaryItemControl.ItemSelections selections = cdic.Selections;
 
+                    if( !selections.IncludeItem )
+                        continue;
+
                     if( !CSPro.Names.IsValid(selections.Name) )
                         throw new Exception(String.Format(Messages.InvalidName,selections.Name));
 

Excel2CSPro/CreateDictionaryItemControl.cs

@@ -21,7 +21,6 @@ public CreateDictionaryItemControl(CreateDictionaryControl.ColumnAnalysis column
                 checkBoxItemCreateValueSet.Text = String.Format(checkBoxItemCreateValueSet.Text,_columnAnalysis.Values.Count);
             }
 
-            checkBoxIncludeItem.Text = _columnAnalysis.ColumnAddress;
             textBoxItemName.Text = CSPro.Names.CreateFromLabel(_columnAnalysis.HeaderText);
             textBoxItemLength.Text = _columnAnalysis.MaximumLength.ToString();
 
@@ -44,10 +43,10 @@ private void checkBoxItemNumeric_CheckedChanged(object sender,EventArgs e)
         {
             bool isNumeric = checkBoxItemNumeric.Checked;
 
-            textBoxItemLength.Visible = !isNumeric;
+            textBoxItemLength.Enabled = !isNumeric;
 
-            textBoxItemBeforeDecLength.Visible = isNumeric;
-            textBoxItemAfterDecLength.Visible = isNumeric;
+            textBoxItemBeforeDecLength.Enabled = isNumeric;
+            textBoxItemAfterDecLength.Enabled = isNumeric;
 
             checkBoxItemCreateValueSet.Visible = isNumeric && _canCreateValueSet;
         }

Excel2CSPro/CreateDictionaryItemControl.resx

@@ -207,9 +207,6 @@
   <data name="textBoxItemAfterDecLength.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
   </data>
-  <data name="textBoxItemAfterDecLength.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
   <data name="&gt;&gt;textBoxItemAfterDecLength.Name" xml:space="preserve">
     <value>textBoxItemAfterDecLength</value>
   </data>
@@ -231,9 +228,6 @@
   <data name="textBoxItemBeforeDecLength.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
   </data>
-  <data name="textBoxItemBeforeDecLength.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
   <data name="&gt;&gt;textBoxItemBeforeDecLength.Name" xml:space="preserve">
     <value>textBoxItemBeforeDecLength</value>
   </data>

Excel2CSPro/WorkbookController.cs

@@ -7,33 +7,56 @@ namespace Excel2CSPro
     class WorkbookController
     {
         private static Excel.Application _application = null;
+        private static List<Excel.Workbook> _openWorkbooks = new List<Excel.Workbook>();
         private Excel.Workbook _workbook = null;
         private Excel.Worksheet _worksheet = null;
 
         public static void Close()
         {
             if( _application != null )
-                _application.Quit();
+            {
+                // ignore any errors closing the workbooks or Excel
+                try
+                {
+                    for( int i = _openWorkbooks.Count - 1; i >= 0; i-- )
+                        CloseWorkbook(_openWorkbooks[i]);
+                }
+
+                catch( Exception )
+                {
+                }
+
+                try
+                {
+                    _application.Quit();
+                }
+
+                catch( Exception )
+                {
+                }
+            }
         }
 
-        public void OpenWorksheet(string filename)
+        public void OpenWorkbook(string filename)
         {
-            CloseWorksheet();
+            if( _workbook != null )
+            {
+                CloseWorkbook(_workbook);
+                _workbook = null;
+            }
 
             if( _application == null )
                 _application = new Excel.Application();
 
             _workbook = _application.Workbooks.Open(filename,Type.Missing,true);
+            _openWorkbooks.Add(_workbook);
         }
 
-        public void CloseWorksheet()
+        public static void CloseWorkbook(Excel.Workbook workbook)
         {
-            if( _workbook != null )
-            {
-                _workbook.Saved = true; // disable any prompts to save the data
-                _workbook.Close();
-                _workbook = null;
-            }
+            workbook.Saved = true; // disable any prompts to save the data
+            workbook.Close();
+            _openWorkbooks.Remove(workbook);
         }
 
         public List<string> WorksheetNames