Merge pull request #23 from africanmathsinitiative/master

Updating from Master.

instat/clsRecentFiles.vb

@@ -191,16 +191,18 @@ Public Class clsRecentFiles
             End If
         End If
 
-        If File.Exists(strFilePath) Then
-            dlgImportDataset.strFileToOpenOn = strFilePath
+        Dim strFilePathTmp As String = strFilePath.Replace("MRU:", "")
+        If File.Exists(strFilePathTmp) Then
+            dlgImportDataset.strFileToOpenOn = strFilePathTmp
             dlgImportDataset.ShowDialog()
-        Else
-            'removes the path to the non existent file
-            If DialogResult.Yes = MessageBox.Show(frmMain, "File not accessible. It may have been renamed, moved or deleted." & Environment.NewLine & Environment.NewLine & "Would you like to remove this file from the list?", "Cannot access file", MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation) Then
-                lstRecentOpenedFiles.Remove(strFilePath)
-                'update recent file menu items controls to not show the file name and path
-                UpdateRecentFilesMenuItems()
-            End If
+        ElseIf DialogResult.Yes = MessageBox.Show(    'else allow the user to remove file from list
+                    frmMain, "File not accessible. It may have been renamed, moved or deleted." &
+                    Environment.NewLine & Environment.NewLine &
+                    "Would you like to remove this file from the list?", "Cannot access file",
+                    MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation) Then
+            lstRecentOpenedFiles.Remove(strFilePathTmp)
+            'update recent file menu items controls to not show the file name and path
+            UpdateRecentFilesMenuItems()
         End If
     End Sub
 

instat/dlgClimSoft.resx

@@ -118,33 +118,33 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="btnEstablishConnection.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+  <data name="cmdEstablishConnection.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="btnEstablishConnection.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="cmdEstablishConnection.Location" type="System.Drawing.Point, System.Drawing">
     <value>8, 8</value>
   </data>
-  <data name="btnEstablishConnection.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="cmdEstablishConnection.Size" type="System.Drawing.Size, System.Drawing">
     <value>142, 23</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="btnEstablishConnection.TabIndex" type="System.Int32, mscorlib">
+  <data name="cmdEstablishConnection.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
   </data>
-  <data name="btnEstablishConnection.Text" xml:space="preserve">
-    <value>Establish Connection..</value>
+  <data name="cmdEstablishConnection.Text" xml:space="preserve">
+    <value>Establish Connection...</value>
   </data>
-  <data name="&gt;&gt;btnEstablishConnection.Name" xml:space="preserve">
-    <value>btnEstablishConnection</value>
+  <data name="&gt;&gt;cmdEstablishConnection.Name" xml:space="preserve">
+    <value>cmdEstablishConnection</value>
   </data>
-  <data name="&gt;&gt;btnEstablishConnection.Type" xml:space="preserve">
+  <data name="&gt;&gt;cmdEstablishConnection.Type" xml:space="preserve">
     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;btnEstablishConnection.Parent" xml:space="preserve">
+  <data name="&gt;&gt;cmdEstablishConnection.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="&gt;&gt;btnEstablishConnection.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;cmdEstablishConnection.ZOrder" xml:space="preserve">
     <value>17</value>
   </data>
   <data name="lblElements.AutoSize" type="System.Boolean, mscorlib">

instat/dlgClimSoft.vb

@@ -166,7 +166,7 @@ Public Class dlgClimSoft
         TestOKEnabled()
     End Sub
 
-    Private Sub btnEstablishConnection_Click(sender As Object, e As EventArgs) Handles btnEstablishConnection.Click
+    Private Sub btnEstablishConnection_Click(sender As Object, e As EventArgs) Handles cmdEstablishConnection.Click
         'shows the database connect sub dialog and checks if connection has been established
         sdgImportFromClimSoft.ShowDialog()
         CheckAndUpdateConnectionStatus()