PROMS/DataLoader/frmLoader.cs

@@ -182,7 +182,7 @@ namespace DataLoader
 			// When loading folders, i.e. the tree from dBase (old 16-bit) 
             // always clear the data
 			ldr.ClearData();
-            bool suc = ldr.LoadFolders();
+            bool suc = ldr.LoadFolders(tbVePromsPath.Text);
 		}
 
 		private void btnConvert_Click(object sender, System.EventArgs e)
@@ -193,8 +193,8 @@ namespace DataLoader
             if (cbPurgeData.Checked)
             {
                ldr.ClearData();
-               success=ldr.LoadFolders();
-			   if (success) success = ldr.LoadSecurity(tbVesamPath.Text);
+			   success = ldr.LoadFolders(tbVePromsPath.Text);
+			   if (success) success = ldr.LoadSecurity(tbVesamPath.Text, tbVePromsPath.Text);
             }
 				if (success)
 				{
@@ -287,9 +287,9 @@ namespace DataLoader
             if (cbPurgeData.Checked)
             {
                 ldr.ClearData();
-                ldr.LoadFolders();
+				ldr.LoadFolders(tbVePromsPath.Text);
             }
-            bool sec = ldr.LoadSecurity(tbVesamPath.Text);
+			bool sec = ldr.LoadSecurity(tbVesamPath.Text, tbVePromsPath.Text);
         }
 
         private void btnVETree_CSLA_Click(object sender, EventArgs e)
@@ -355,6 +355,8 @@ namespace DataLoader
 				this.cbPurgeData.CheckState = Properties.Settings.Default.PurgeData;
 			if (Properties.Settings.Default["LoadRTFDoc"] != null)
 				this.cbSaveRTF.CheckState = Properties.Settings.Default.LoadRTFDoc;
+			if (Properties.Settings.Default["VePromsFilename"] != null)
+				this.tbVePromsPath.Text = Properties.Settings.Default.VePromsFilename;
 			_Loading = false;
 		}
 
@@ -365,7 +367,15 @@ namespace DataLoader
 			Properties.Settings.Default.LoadWordDoc = cbSaveDoc.CheckState;
 			Properties.Settings.Default.LoadRTFDoc = cbSaveRTF.CheckState;
 			Properties.Settings.Default.PurgeData = cbPurgeData.CheckState;
+			Properties.Settings.Default.VePromsFilename = tbVePromsPath.Text;
 			Properties.Settings.Default.Save();
 		}
+
+		private void btnBrowseVeProms_Click(object sender, EventArgs e)
+		{
+			fbd.SelectedPath = tbVePromsPath.Text;
+			if (fbd.ShowDialog() == DialogResult.OK)
+				tbVePromsPath.Text = fbd.SelectedPath;
+		}
 	}
 }