merge from main

instat/frmMain.vb

@@ -92,7 +92,7 @@ Public Class frmMain
         autoTranslate(Me)
     End Sub
 
-    Private Sub mnuFileNewWorksheet_Click(sender As Object, e As EventArgs) Handles mnuFileNewWorksheet.Click
+    Private Sub mnuFileNewDataFrame_Click(sender As Object, e As EventArgs) Handles mnuFileNewDataFrame.Click
         dlgFileNew.ShowDialog()
     End Sub
 
@@ -656,7 +656,7 @@ Public Class frmMain
         Me.Close()
     End Sub
 
-    Private Sub mnuFileOpenWorkbook_Click(sender As Object, e As EventArgs) Handles mnuFileOpenWorkbook.Click
+    Private Sub mnuFileOpenFromFile_Click(sender As Object, e As EventArgs) Handles mnuFileOpenFromFile.Click
         Dim kvpFile As KeyValuePair(Of String, String)
         Dim clsRsyntax As New RSyntax
 
@@ -707,7 +707,7 @@ Public Class frmMain
         Return New KeyValuePair(Of String, String)("", "")
     End Function
 
-    Private Sub mnuFileCloseWorksheet_Click(sender As Object, e As EventArgs) Handles mnuFileCloseWorksheet.Click
+    Private Sub mnuFileClose_Click(sender As Object, e As EventArgs) Handles mnuFileClose.Click
 
     End Sub
 

instat/ucrNewColumnName.vb

@@ -0,0 +1,37 @@
+' Instat-R
+' Copyright (C) 2015
+'
+' This program is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 3 of the License, or
+' (at your option) any later version.
+'
+' This program is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+' GNU General Public License for more details.
+'
+' You should have received a copy of the GNU General Public License k
+' along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Imports RDotNet
+Imports instat.Translations
+
+Public Class ucrNewColumnName
+    Public lstNextDefaultNames As GenericVector
+    Public strCurrDataFrame As String
+    Public strPrefix As String = "Val"
+
+    Private Sub ucrNewColumnName_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        lstNextDefaultNames = frmMain.clsRLink.GetDefaultNames(strPrefix)
+    End Sub
+
+    Public Sub SetDefaultName(strDataFrame As String)
+        Dim i As Integer
+        For i = 0 To lstNextDefaultNames.Length - 1
+            If lstNextDefaultNames.Names(i) = strDataFrame Then
+                cboColumnName.Text = lstNextDefaultNames.AsCharacter(i)
+            End If
+        Next
+    End Sub
+End Class