From fc8f1e4f4639c452fb89a1fe23deb18588ef2877 Mon Sep 17 00:00:00 2001 From: deaspo Date: Wed, 11 Nov 2015 16:29:25 +0300 Subject: [PATCH 1/3] Added some changes to the menu File --- instat/frmMain.Designer.vb | 125 +++++++++++++++++++++---------------- 1 file changed, 72 insertions(+), 53 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 7fa24c0af08..1e785ff9569 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -143,13 +143,13 @@ Partial Class frmMain Me.LockUnlockToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFileIEODBC = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFileIEOutput = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator() + Me.tlSeparatorFile2 = New System.Windows.Forms.ToolStripSeparator() Me.MnuFileClose = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFileSave = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFileSaveAs = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFilePrint = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFilePrintPreview = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator6 = New System.Windows.Forms.ToolStripSeparator() + Me.tlSeparatorFile3 = New System.Windows.Forms.ToolStripSeparator() Me.mnuFIleExit = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEdit = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditUndo = New System.Windows.Forms.ToolStripMenuItem() @@ -214,13 +214,13 @@ Partial Class frmMain Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() Me.HelpToolStripButton = New System.Windows.Forms.ToolStripButton() Me.mnuBar = New System.Windows.Forms.MenuStrip() - Me.FileStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFileNewWorksheet = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFileOpenWorksheet = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFileOpenFromLibrary = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFileCloseWorksheet = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuFileIE = New System.Windows.Forms.ToolStripMenuItem() + Me.tlSeparatorFile = New System.Windows.Forms.ToolStripSeparator() + Me.mnuFileImportExport = New System.Windows.Forms.ToolStripMenuItem() Me.SubmitToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.CurrentWindowCtrlWToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.CurrentLineCtrlLToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -1022,67 +1022,77 @@ Partial Class frmMain ' 'mnuFileIEODBC ' + Me.mnuFileIEODBC.CheckOnClick = True Me.mnuFileIEODBC.Name = "mnuFileIEODBC" - Me.mnuFileIEODBC.Size = New System.Drawing.Size(150, 22) + Me.mnuFileIEODBC.Size = New System.Drawing.Size(141, 22) Me.mnuFileIEODBC.Tag = "ODBC_Query" Me.mnuFileIEODBC.Text = "ODBC Query" ' 'mnuFileIEOutput ' + Me.mnuFileIEOutput.CheckOnClick = True Me.mnuFileIEOutput.Name = "mnuFileIEOutput" - Me.mnuFileIEOutput.Size = New System.Drawing.Size(150, 22) + Me.mnuFileIEOutput.Size = New System.Drawing.Size(141, 22) Me.mnuFileIEOutput.Tag = "Output" Me.mnuFileIEOutput.Text = "Output..." ' - 'ToolStripSeparator5 + 'tlSeparatorFile2 ' - Me.ToolStripSeparator5.Name = "ToolStripSeparator5" - Me.ToolStripSeparator5.Size = New System.Drawing.Size(216, 6) + Me.tlSeparatorFile2.Name = "tlSeparatorFile2" + Me.tlSeparatorFile2.Size = New System.Drawing.Size(202, 6) ' 'MnuFileClose ' + Me.MnuFileClose.CheckOnClick = True Me.MnuFileClose.Name = "MnuFileClose" - Me.MnuFileClose.Size = New System.Drawing.Size(219, 22) + Me.MnuFileClose.Size = New System.Drawing.Size(205, 22) Me.MnuFileClose.Tag = "Close" Me.MnuFileClose.Text = "Close" ' 'mnuFileSave ' + Me.mnuFileSave.CheckOnClick = True Me.mnuFileSave.Name = "mnuFileSave" - Me.mnuFileSave.Size = New System.Drawing.Size(219, 22) + Me.mnuFileSave.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.S), System.Windows.Forms.Keys) + Me.mnuFileSave.Size = New System.Drawing.Size(205, 22) Me.mnuFileSave.Tag = "Save" - Me.mnuFileSave.Text = "Save Ctrl+S" + Me.mnuFileSave.Text = "Save" ' 'mnuFileSaveAs ' + Me.mnuFileSaveAs.CheckOnClick = True Me.mnuFileSaveAs.Name = "mnuFileSaveAs" - Me.mnuFileSaveAs.Size = New System.Drawing.Size(219, 22) + Me.mnuFileSaveAs.Size = New System.Drawing.Size(205, 22) Me.mnuFileSaveAs.Tag = "Save_As" Me.mnuFileSaveAs.Text = "Save As" ' 'mnuFilePrint ' + Me.mnuFilePrint.CheckOnClick = True Me.mnuFilePrint.Name = "mnuFilePrint" - Me.mnuFilePrint.Size = New System.Drawing.Size(219, 22) + Me.mnuFilePrint.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.P), System.Windows.Forms.Keys) + Me.mnuFilePrint.Size = New System.Drawing.Size(205, 22) Me.mnuFilePrint.Tag = "Print" - Me.mnuFilePrint.Text = "Print... Ctrl+P" + Me.mnuFilePrint.Text = "Print" ' 'mnuFilePrintPreview ' + Me.mnuFilePrintPreview.CheckOnClick = True Me.mnuFilePrintPreview.Name = "mnuFilePrintPreview" - Me.mnuFilePrintPreview.Size = New System.Drawing.Size(219, 22) + Me.mnuFilePrintPreview.Size = New System.Drawing.Size(205, 22) Me.mnuFilePrintPreview.Tag = "Print_Preview" Me.mnuFilePrintPreview.Text = "Print Preview" ' - 'ToolStripSeparator6 + 'tlSeparatorFile3 ' - Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(216, 6) + Me.tlSeparatorFile3.Name = "tlSeparatorFile3" + Me.tlSeparatorFile3.Size = New System.Drawing.Size(202, 6) ' 'mnuFIleExit ' + Me.mnuFIleExit.CheckOnClick = True Me.mnuFIleExit.Name = "mnuFIleExit" - Me.mnuFIleExit.Size = New System.Drawing.Size(219, 22) + Me.mnuFIleExit.Size = New System.Drawing.Size(205, 22) Me.mnuFIleExit.Tag = "Exit_" Me.mnuFIleExit.Text = "Exit" ' @@ -1353,17 +1363,19 @@ Partial Class frmMain ' 'mnuFileIEExport ' + Me.mnuFileIEExport.CheckOnClick = True Me.mnuFileIEExport.Name = "mnuFileIEExport" - Me.mnuFileIEExport.Size = New System.Drawing.Size(150, 22) + Me.mnuFileIEExport.Size = New System.Drawing.Size(141, 22) Me.mnuFileIEExport.Tag = "Export_as" Me.mnuFileIEExport.Text = "Export as..." ' 'mnuFIleIEASCII ' + Me.mnuFIleIEASCII.CheckOnClick = True Me.mnuFIleIEASCII.Name = "mnuFIleIEASCII" - Me.mnuFIleIEASCII.Size = New System.Drawing.Size(150, 22) + Me.mnuFIleIEASCII.Size = New System.Drawing.Size(141, 22) Me.mnuFIleIEASCII.Tag = "Import_ASCII" - Me.mnuFIleIEASCII.Text = "Import ASCII..." + Me.mnuFIleIEASCII.Text = "Import ASCII" ' 'stsStrip ' @@ -1534,63 +1546,70 @@ Partial Class frmMain 'mnuBar ' Me.mnuBar.AllowMerge = False - Me.mnuBar.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FileStripMenuItem, Me.mnuEdit, Me.SubmitToolStripMenuItem, Me.ManageToolStripMenuItem, Me.GraphicsToolStripMenuItem, Me.StatisticsToolStripMenuItem, Me.ClimaticToolStripMenuItem, Me.WindowToolStripMenuItem, Me.KiswahiliToolStripMenuItem, Me.HelpToolStripMenuItem, Me.ClimateMethodsToolStripMenuItem}) + Me.mnuBar.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFile, Me.mnuEdit, Me.SubmitToolStripMenuItem, Me.ManageToolStripMenuItem, Me.GraphicsToolStripMenuItem, Me.StatisticsToolStripMenuItem, Me.ClimaticToolStripMenuItem, Me.WindowToolStripMenuItem, Me.KiswahiliToolStripMenuItem, Me.HelpToolStripMenuItem, Me.ClimateMethodsToolStripMenuItem}) Me.mnuBar.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow Me.mnuBar.Location = New System.Drawing.Point(0, 0) Me.mnuBar.MdiWindowListItem = Me.WindowToolStripMenuItem Me.mnuBar.Name = "mnuBar" + Me.mnuBar.RenderMode = System.Windows.Forms.ToolStripRenderMode.System Me.mnuBar.Size = New System.Drawing.Size(769, 24) Me.mnuBar.TabIndex = 6 Me.mnuBar.Text = "Menu_strip" ' - 'FileStripMenuItem + 'mnuFile ' - Me.FileStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileNewWorksheet, Me.mnuFileOpenWorksheet, Me.mnuFileOpenFromLibrary, Me.mnuFileCloseWorksheet, Me.ToolStripSeparator4, Me.mnuFileIE, Me.ToolStripSeparator5, Me.MnuFileClose, Me.mnuFileSave, Me.mnuFileSaveAs, Me.mnuFilePrint, Me.mnuFilePrintPreview, Me.ToolStripSeparator6, Me.mnuFIleExit}) - Me.FileStripMenuItem.Name = "FileStripMenuItem" - Me.FileStripMenuItem.Size = New System.Drawing.Size(37, 20) - Me.FileStripMenuItem.Tag = "File" - Me.FileStripMenuItem.Text = "File" + Me.mnuFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileNewWorksheet, Me.mnuFileOpenWorksheet, Me.mnuFileOpenFromLibrary, Me.mnuFileCloseWorksheet, Me.tlSeparatorFile, Me.mnuFileImportExport, Me.tlSeparatorFile2, Me.MnuFileClose, Me.mnuFileSave, Me.mnuFileSaveAs, Me.mnuFilePrint, Me.mnuFilePrintPreview, Me.tlSeparatorFile3, Me.mnuFIleExit}) + Me.mnuFile.Name = "mnuFile" + Me.mnuFile.Size = New System.Drawing.Size(37, 20) + Me.mnuFile.Tag = "File" + Me.mnuFile.Text = "File" ' 'mnuFileNewWorksheet ' + Me.mnuFileNewWorksheet.CheckOnClick = True Me.mnuFileNewWorksheet.Name = "mnuFileNewWorksheet" - Me.mnuFileNewWorksheet.Size = New System.Drawing.Size(219, 22) + Me.mnuFileNewWorksheet.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.N), System.Windows.Forms.Keys) + Me.mnuFileNewWorksheet.Size = New System.Drawing.Size(205, 22) Me.mnuFileNewWorksheet.Tag = "New_Worksheet" - Me.mnuFileNewWorksheet.Text = "New Worksheet... Ctrl+N" + Me.mnuFileNewWorksheet.Text = "New Worksheet" ' 'mnuFileOpenWorksheet ' + Me.mnuFileOpenWorksheet.CheckOnClick = True Me.mnuFileOpenWorksheet.Name = "mnuFileOpenWorksheet" - Me.mnuFileOpenWorksheet.Size = New System.Drawing.Size(219, 22) + Me.mnuFileOpenWorksheet.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O), System.Windows.Forms.Keys) + Me.mnuFileOpenWorksheet.Size = New System.Drawing.Size(205, 22) Me.mnuFileOpenWorksheet.Tag = "Open_Worksheet" - Me.mnuFileOpenWorksheet.Text = "Open Worksheet... Ctrl+O" + Me.mnuFileOpenWorksheet.Text = "Open Worksheet" ' 'mnuFileOpenFromLibrary ' + Me.mnuFileOpenFromLibrary.CheckOnClick = True Me.mnuFileOpenFromLibrary.Name = "mnuFileOpenFromLibrary" - Me.mnuFileOpenFromLibrary.Size = New System.Drawing.Size(219, 22) + Me.mnuFileOpenFromLibrary.Size = New System.Drawing.Size(205, 22) Me.mnuFileOpenFromLibrary.Tag = "Open_From_Library" - Me.mnuFileOpenFromLibrary.Text = "Open From Library..." + Me.mnuFileOpenFromLibrary.Text = "Open From Library" ' 'mnuFileCloseWorksheet ' + Me.mnuFileCloseWorksheet.CheckOnClick = True Me.mnuFileCloseWorksheet.Name = "mnuFileCloseWorksheet" - Me.mnuFileCloseWorksheet.Size = New System.Drawing.Size(219, 22) + Me.mnuFileCloseWorksheet.Size = New System.Drawing.Size(205, 22) Me.mnuFileCloseWorksheet.Tag = "Close_Worksheet" Me.mnuFileCloseWorksheet.Text = "Close Worksheet" ' - 'ToolStripSeparator4 + 'tlSeparatorFile ' - Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(216, 6) + Me.tlSeparatorFile.Name = "tlSeparatorFile" + Me.tlSeparatorFile.Size = New System.Drawing.Size(202, 6) ' - 'mnuFileIE + 'mnuFileImportExport ' - Me.mnuFileIE.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFIleIEASCII, Me.mnuFileIEODBC, Me.mnuFileIEExport, Me.mnuFileIEOutput}) - Me.mnuFileIE.Name = "mnuFileIE" - Me.mnuFileIE.Size = New System.Drawing.Size(219, 22) - Me.mnuFileIE.Tag = "Import_Export" - Me.mnuFileIE.Text = "Import/Export" + Me.mnuFileImportExport.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFIleIEASCII, Me.mnuFileIEODBC, Me.mnuFileIEExport, Me.mnuFileIEOutput}) + Me.mnuFileImportExport.Name = "mnuFileImportExport" + Me.mnuFileImportExport.Size = New System.Drawing.Size(205, 22) + Me.mnuFileImportExport.Tag = "Import_Export" + Me.mnuFileImportExport.Text = "Import/Export" ' 'SubmitToolStripMenuItem ' @@ -1884,7 +1903,7 @@ Partial Class frmMain ' Me.GraphicsToolStripMenuItem1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimateMethodsGraphicsClipBoxPlot, Me.mnuClimateMethodsGraphicsCliplot, Me.mnuClimateMethodsGraphicsMissingValues, Me.mnuClimateMethodsGraphicsHistogram, Me.mnuClimateMethodsGraphicsCumExceedance, Me.mnuClimateMethodsGraphicsBoxplot, Me.mnuClimateMethodsGraphicsInventory, Me.mnuClimateMethodsGraphicsAnnualRainfall, Me.mnuClimateMethodsGraphicsRainCount, Me.mnuClimateMethodsGraphicsTimeseries, Me.mnuClimateMethodsGraphicsWindrose, Me.mnuClimateMethodsGraphicsMultipleLines}) Me.GraphicsToolStripMenuItem1.Name = "GraphicsToolStripMenuItem1" - Me.GraphicsToolStripMenuItem1.Size = New System.Drawing.Size(152, 22) + Me.GraphicsToolStripMenuItem1.Size = New System.Drawing.Size(120, 22) Me.GraphicsToolStripMenuItem1.Text = "Graphics" ' 'mnuClimateMethodsGraphicsClipBoxPlot @@ -2100,13 +2119,13 @@ Partial Class frmMain Friend WithEvents LockUnlockToolStripMenuItem As ToolStripMenuItem Friend WithEvents mnuFileIEODBC As ToolStripMenuItem Friend WithEvents mnuFileIEOutput As ToolStripMenuItem - Friend WithEvents ToolStripSeparator5 As ToolStripSeparator + Friend WithEvents tlSeparatorFile2 As ToolStripSeparator Friend WithEvents MnuFileClose As ToolStripMenuItem Friend WithEvents mnuFileSave As ToolStripMenuItem Friend WithEvents mnuFileSaveAs As ToolStripMenuItem Friend WithEvents mnuFilePrint As ToolStripMenuItem Friend WithEvents mnuFilePrintPreview As ToolStripMenuItem - Friend WithEvents ToolStripSeparator6 As ToolStripSeparator + Friend WithEvents tlSeparatorFile3 As ToolStripSeparator Friend WithEvents mnuFIleExit As ToolStripMenuItem Friend WithEvents mnuEdit As ToolStripMenuItem Friend WithEvents mnuEditUndo As ToolStripMenuItem @@ -2171,13 +2190,13 @@ Partial Class frmMain Friend WithEvents ToolStripSeparator3 As ToolStripSeparator Friend WithEvents HelpToolStripButton As ToolStripButton Private WithEvents mnuBar As MenuStrip - Friend WithEvents FileStripMenuItem As ToolStripMenuItem + Friend WithEvents mnuFile As ToolStripMenuItem Friend WithEvents mnuFileNewWorksheet As ToolStripMenuItem Friend WithEvents mnuFileOpenWorksheet As ToolStripMenuItem Friend WithEvents mnuFileOpenFromLibrary As ToolStripMenuItem Friend WithEvents mnuFileCloseWorksheet As ToolStripMenuItem - Friend WithEvents ToolStripSeparator4 As ToolStripSeparator - Friend WithEvents mnuFileIE As ToolStripMenuItem + Friend WithEvents tlSeparatorFile As ToolStripSeparator + Friend WithEvents mnuFileImportExport As ToolStripMenuItem Friend WithEvents SubmitToolStripMenuItem As ToolStripMenuItem Friend WithEvents CurrentWindowCtrlWToolStripMenuItem As ToolStripMenuItem Friend WithEvents CurrentLineCtrlLToolStripMenuItem As ToolStripMenuItem From 9f462da6d2250dfa83601af8ca683e392bb0cc71 Mon Sep 17 00:00:00 2001 From: dannyparsons Date: Wed, 11 Nov 2015 17:45:44 +0300 Subject: [PATCH 2/3] updated user controls and dot plot to use R syntax correctly --- instat/dlgDotPlot.designer.vb | 76 ++++++++++++++++++----------------- instat/dlgDotPlot.vb | 36 +++++++++++++---- instat/ucrReceiver.vb | 5 ++- instat/ucrReceiverMultiple.vb | 11 +++++ instat/ucrReceiverSingle.vb | 12 ++++++ instat/ucrSelector.vb | 1 + 6 files changed, 96 insertions(+), 45 deletions(-) diff --git a/instat/dlgDotPlot.designer.vb b/instat/dlgDotPlot.designer.vb index 256258daba7..7eb0e311e1d 100644 --- a/instat/dlgDotPlot.designer.vb +++ b/instat/dlgDotPlot.designer.vb @@ -22,29 +22,29 @@ Partial Class dlgDotPlot 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.Label1 = New System.Windows.Forms.Label() - Me.txtTittle = New System.Windows.Forms.TextBox() + Me.lblPlotTitle = New System.Windows.Forms.Label() + Me.txtTitle = New System.Windows.Forms.TextBox() Me.ucrBase = New instat.ucrButtons() Me.ucrAddRemove = New instat.ucrSelectorAddRemove() - Me.UcrReceiverSingle1 = New instat.ucrReceiverSingle() - Me.Label2 = New System.Windows.Forms.Label() + Me.ucrReceiverSingle = New instat.ucrReceiverSingle() + Me.lblVariableToPlot = New System.Windows.Forms.Label() Me.SuspendLayout() ' - 'Label1 + 'lblPlotTitle ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(25, 141) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(51, 13) - Me.Label1.TabIndex = 1 - Me.Label1.Text = "Plot Title " + Me.lblPlotTitle.AutoSize = True + Me.lblPlotTitle.Location = New System.Drawing.Point(25, 141) + Me.lblPlotTitle.Name = "lblPlotTitle" + Me.lblPlotTitle.Size = New System.Drawing.Size(51, 13) + Me.lblPlotTitle.TabIndex = 1 + Me.lblPlotTitle.Text = "Plot Title " ' - 'txtTittle + 'txtTitle ' - Me.txtTittle.Location = New System.Drawing.Point(82, 141) - Me.txtTittle.Name = "txtTittle" - Me.txtTittle.Size = New System.Drawing.Size(273, 20) - Me.txtTittle.TabIndex = 2 + Me.txtTitle.Location = New System.Drawing.Point(82, 141) + Me.txtTitle.Name = "txtTitle" + Me.txtTitle.Size = New System.Drawing.Size(273, 20) + Me.txtTitle.TabIndex = 2 ' 'ucrBase ' @@ -60,47 +60,49 @@ Partial Class dlgDotPlot Me.ucrAddRemove.Size = New System.Drawing.Size(186, 129) Me.ucrAddRemove.TabIndex = 3 ' - 'UcrReceiverSingle1 + 'ucrReceiverSingle ' - Me.UcrReceiverSingle1.Location = New System.Drawing.Point(211, 38) - Me.UcrReceiverSingle1.Name = "UcrReceiverSingle1" - Me.UcrReceiverSingle1.Size = New System.Drawing.Size(106, 26) - Me.UcrReceiverSingle1.TabIndex = 4 + Me.ucrReceiverSingle.Location = New System.Drawing.Point(211, 38) + Me.ucrReceiverSingle.Name = "ucrReceiverSingle" + Me.ucrReceiverSingle.Size = New System.Drawing.Size(106, 26) + Me.ucrReceiverSingle.TabIndex = 4 ' - 'Label2 + 'lblVariableToPlot ' - Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(211, 13) - Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(78, 13) - Me.Label2.TabIndex = 5 - Me.Label2.Text = "Variable to Plot" + Me.lblVariableToPlot.AutoSize = True + Me.lblVariableToPlot.Location = New System.Drawing.Point(211, 13) + Me.lblVariableToPlot.Name = "lblVariableToPlot" + Me.lblVariableToPlot.Size = New System.Drawing.Size(39, 13) + Me.lblVariableToPlot.TabIndex = 5 + Me.lblVariableToPlot.Tag = "Variable_to_Plot" + Me.lblVariableToPlot.Text = "Label1" ' 'dlgDotPlot ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(405, 226) - Me.Controls.Add(Me.Label2) - Me.Controls.Add(Me.UcrReceiverSingle1) + Me.Controls.Add(Me.lblVariableToPlot) + Me.Controls.Add(Me.ucrReceiverSingle) Me.Controls.Add(Me.ucrAddRemove) - Me.Controls.Add(Me.txtTittle) - Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.txtTitle) + Me.Controls.Add(Me.lblPlotTitle) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgDotPlot" - Me.Text = "dlgDotPlot" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Dot_Plot" Me.ResumeLayout(False) Me.PerformLayout() End Sub Friend WithEvents ucrBase As ucrButtons - Friend WithEvents Label1 As Label - Friend WithEvents txtTittle As TextBox + Friend WithEvents lblPlotTitle As Label + Friend WithEvents txtTitle As TextBox Friend WithEvents ucrAddRemove As ucrSelectorAddRemove - Friend WithEvents UcrReceiverSingle1 As ucrReceiverSingle - Friend WithEvents Label2 As Label + Friend WithEvents ucrReceiverSingle As ucrReceiverSingle + Friend WithEvents lblVariableToPlot As Label End Class diff --git a/instat/dlgDotPlot.vb b/instat/dlgDotPlot.vb index 972d7eab358..ff76750453e 100644 --- a/instat/dlgDotPlot.vb +++ b/instat/dlgDotPlot.vb @@ -1,14 +1,36 @@ - +' 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 . + +Imports instat.Translations + Public Class dlgDotPlot Private Sub dlgDotPlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load ucrBase.clsRsyntax.SetFunction("dotchart") - UcrReceiverSingle1.Selector = ucrAddRemove - UcrReceiverSingle1.SetMeAsReceiver() + ucrBase.clsRsyntax.iCallType = 0 + autoTranslate(Me) + ucrReceiverSingle.Selector = ucrAddRemove + ucrReceiverSingle.SetMeAsReceiver() End Sub - Private Sub ucrBase_ClickOk(sender As Object, e As EventArgs) Handles ucrBase.ClickOk - ucrBase.clsRsyntax.AddParameter("x", "data$" & UcrReceiverSingle1.txtReceiverSingle.Text & "") - ucrBase.clsRsyntax.AddParameter("main", Chr(34) & txtTittle.Text & Chr(34)) - frmMain.clsRInterface.RunScript(ucrBase.clsRsyntax.GetScript(), 0) + Private Sub txtTitle_Leave(sender As Object, e As EventArgs) Handles txtTitle.Leave + ucrBase.clsRsyntax.AddParameter("main", Chr(34) & txtTitle.Text & Chr(34)) End Sub + + Private Sub UcrReceiverSingle1_Leave(sender As Object, e As EventArgs) Handles ucrReceiverSingle.LeftText + ucrBase.clsRsyntax.AddParameter("x", "data$" & ucrReceiverSingle.txtReceiverSingle.Text & "") + End Sub + End Class \ No newline at end of file diff --git a/instat/ucrReceiver.vb b/instat/ucrReceiver.vb index 7b3032124db..c18f9ebcbf5 100644 --- a/instat/ucrReceiver.vb +++ b/instat/ucrReceiver.vb @@ -1,5 +1,5 @@ Imports instat.Translations -Public Class ucrReceiver +Public MustInherit Class ucrReceiver Public Selector As ucrSelector Public Overridable Sub AddSelected() @@ -17,4 +17,7 @@ Public Class ucrReceiver Private Sub ucrReceiver_Load(sender As Object, e As EventArgs) Handles MyBase.Load translateEach(Controls) End Sub + + Public MustOverride Sub EnterReceiver() + End Class diff --git a/instat/ucrReceiverMultiple.vb b/instat/ucrReceiverMultiple.vb index f9f5fbee64e..e66e1156be7 100644 --- a/instat/ucrReceiverMultiple.vb +++ b/instat/ucrReceiverMultiple.vb @@ -24,4 +24,15 @@ MsgBox("There is nothing to remove", vbInformation, "Selection message") End If End Sub + + Public Event LeftList(sender As Object, e As EventArgs) + + Public Overrides Sub EnterReceiver() + lstSelectedVariables.Focus() + End Sub + + Private Sub lstSelectedVariables_Leave(sender As Object, e As EventArgs) Handles lstSelectedVariables.Leave + RaiseEvent LeftList(sender, e) + End Sub + End Class \ No newline at end of file diff --git a/instat/ucrReceiverSingle.vb b/instat/ucrReceiverSingle.vb index fad86c09d3b..dce9de63b4f 100644 --- a/instat/ucrReceiverSingle.vb +++ b/instat/ucrReceiverSingle.vb @@ -29,5 +29,17 @@ MsgBox("There is nothing to remove", vbInformation, "Selection message") End If End Sub + + Public Event LeftText(sender As Object, e As EventArgs) + + Private Sub txtReceiverSingle_TextChanged(sender As Object, e As EventArgs) Handles txtReceiverSingle.Leave + RaiseEvent LeftText(sender, e) + End Sub + + Public Overrides Sub EnterReceiver() + txtReceiverSingle.Focus() + txtReceiverSingle.SelectionStart = txtReceiverSingle.SelectionLength + End Sub + End Class diff --git a/instat/ucrSelector.vb b/instat/ucrSelector.vb index 2c21eb191f0..fdb19812c2b 100644 --- a/instat/ucrSelector.vb +++ b/instat/ucrSelector.vb @@ -30,6 +30,7 @@ Public Class ucrSelector Public Sub Add() If (lstAvailableVariable.SelectedItems.Count > 0) Then CurrentReceiver.AddSelected() + CurrentReceiver.EnterReceiver() Else MsgBox("No item was selected", vbInformation, "Selection message") End If From 8b80ed2405c4e3f5953244f0bcd3c79529ffd879 Mon Sep 17 00:00:00 2001 From: deaspo Date: Wed, 11 Nov 2015 17:50:46 +0300 Subject: [PATCH 3/3] Tagged, applied naming conventions to the menu Edit --- instat/frmMain.Designer.vb | 383 +++++++++++++++++++++---------------- 1 file changed, 217 insertions(+), 166 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 1e785ff9569..c9cda7df987 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -164,32 +164,32 @@ Partial Class frmMain Me.mnuEditFont = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditRunWSEditor = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditViewEditText = New System.Windows.Forms.ToolStripMenuItem() - Me.NewF8ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.OpenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.OpenFromLibraryToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() - Me.SelectionToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditViewEditTextNew = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditViewEditTextOpen = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditViewEditTextOpenFromLibrary = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditViewEditTextSelection = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditViewEditMacro = New System.Windows.Forms.ToolStripMenuItem() - Me.NewToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.OpenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditMacroNew = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditMacroOpen = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditCommandLogging = New System.Windows.Forms.ToolStripMenuItem() - Me.StartF9ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.StopShiftF9ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ViewLogFileCtrlF9ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditCommandStart = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditCommandStop = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditCommandViewLogFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditOutputSpooling = New System.Windows.Forms.ToolStripMenuItem() - Me.StartToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.StopToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ViewToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditOutputSpoolingStart = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditOutputSpoolingStop = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditOutputSpoolingView = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditRecall = New System.Windows.Forms.ToolStripMenuItem() - Me.LastCommandShiftF11ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.LastDialogF11ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.RestartServerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.Last10DialoguesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditRecallLastCommand = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditRecallLastDialog = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditRecallRestartServer = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditRecallLast10Dialogues = New System.Windows.Forms.ToolStripMenuItem() Me.ClearListToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.FlagsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.DisableWarningsF6ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.PresentationModeShiftF6ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.DisplayFactorLevelsAsOrdinalsShiftF7ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.OPtionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditFlags = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditFlagsDisableWarnings = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditFlagsPresentationMode = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditFlagsDisplayFactorLevelsAsOrdinals = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditOptions = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFileIEExport = New System.Windows.Forms.ToolStripMenuItem() Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog() Me.mnuFIleIEASCII = New System.Windows.Forms.ToolStripMenuItem() @@ -1098,7 +1098,7 @@ Partial Class frmMain ' 'mnuEdit ' - Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditUndo, Me.mnuEditCut, Me.mnuEditCopy, Me.mnuEditCopySpecial, Me.mnuEditPaste, Me.mnuEditClear, Me.mnuEditSelectAll, Me.mnuEditFind, Me.mnuEditReplace, Me.mnuEditFont, Me.mnuEditRunWSEditor, Me.mnuEditViewEditText, Me.mnuEditViewEditMacro, Me.mnuEditCommandLogging, Me.mnuEditOutputSpooling, Me.mnuEditRecall, Me.FlagsToolStripMenuItem, Me.OPtionsToolStripMenuItem}) + Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditUndo, Me.mnuEditCut, Me.mnuEditCopy, Me.mnuEditCopySpecial, Me.mnuEditPaste, Me.mnuEditClear, Me.mnuEditSelectAll, Me.mnuEditFind, Me.mnuEditReplace, Me.mnuEditFont, Me.mnuEditRunWSEditor, Me.mnuEditViewEditText, Me.mnuEditViewEditMacro, Me.mnuEditCommandLogging, Me.mnuEditOutputSpooling, Me.mnuEditRecall, Me.mnuEditFlags, Me.mnuEditOptions}) Me.mnuEdit.Name = "mnuEdit" Me.mnuEdit.Size = New System.Drawing.Size(39, 20) Me.mnuEdit.Tag = "Edit" @@ -1106,221 +1106,265 @@ Partial Class frmMain ' 'mnuEditUndo ' + Me.mnuEditUndo.CheckOnClick = True Me.mnuEditUndo.Name = "mnuEditUndo" - Me.mnuEditUndo.Size = New System.Drawing.Size(221, 22) + Me.mnuEditUndo.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Z), System.Windows.Forms.Keys) + Me.mnuEditUndo.Size = New System.Drawing.Size(207, 22) Me.mnuEditUndo.Tag = "Undo" - Me.mnuEditUndo.Text = "Undo Ctrl+Z" + Me.mnuEditUndo.Text = "Undo" ' 'mnuEditCut ' + Me.mnuEditCut.CheckOnClick = True Me.mnuEditCut.Name = "mnuEditCut" - Me.mnuEditCut.Size = New System.Drawing.Size(221, 22) + Me.mnuEditCut.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.X), System.Windows.Forms.Keys) + Me.mnuEditCut.Size = New System.Drawing.Size(207, 22) Me.mnuEditCut.Tag = "Cut" - Me.mnuEditCut.Text = "Cut Ctrl+X" + Me.mnuEditCut.Text = "Cut" ' 'mnuEditCopy ' + Me.mnuEditCopy.CheckOnClick = True Me.mnuEditCopy.Name = "mnuEditCopy" - Me.mnuEditCopy.Size = New System.Drawing.Size(221, 22) + Me.mnuEditCopy.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) + Me.mnuEditCopy.Size = New System.Drawing.Size(207, 22) Me.mnuEditCopy.Tag = "Copy" - Me.mnuEditCopy.Text = "Copy Ctrl+C" + Me.mnuEditCopy.Text = "Copy" ' 'mnuEditCopySpecial ' + Me.mnuEditCopySpecial.CheckOnClick = True Me.mnuEditCopySpecial.Name = "mnuEditCopySpecial" - Me.mnuEditCopySpecial.Size = New System.Drawing.Size(221, 22) + Me.mnuEditCopySpecial.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Y), System.Windows.Forms.Keys) + Me.mnuEditCopySpecial.Size = New System.Drawing.Size(207, 22) Me.mnuEditCopySpecial.Tag = "Copy_Special" - Me.mnuEditCopySpecial.Text = "Copy Special Ctrl+Y" + Me.mnuEditCopySpecial.Text = "Copy Special" ' 'mnuEditPaste ' Me.mnuEditPaste.Name = "mnuEditPaste" - Me.mnuEditPaste.Size = New System.Drawing.Size(221, 22) + Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) + Me.mnuEditPaste.Size = New System.Drawing.Size(207, 22) Me.mnuEditPaste.Tag = "Paste" - Me.mnuEditPaste.Text = "Paste Ctrl+V" + Me.mnuEditPaste.Text = "Paste" ' 'mnuEditClear ' Me.mnuEditClear.Name = "mnuEditClear" - Me.mnuEditClear.Size = New System.Drawing.Size(221, 22) + Me.mnuEditClear.Size = New System.Drawing.Size(207, 22) Me.mnuEditClear.Tag = "Clear" Me.mnuEditClear.Text = "Clear Del" ' 'mnuEditSelectAll ' + Me.mnuEditSelectAll.CheckOnClick = True Me.mnuEditSelectAll.Name = "mnuEditSelectAll" - Me.mnuEditSelectAll.Size = New System.Drawing.Size(221, 22) + Me.mnuEditSelectAll.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys) + Me.mnuEditSelectAll.Size = New System.Drawing.Size(207, 22) Me.mnuEditSelectAll.Tag = "Select_All" - Me.mnuEditSelectAll.Text = "Select All Ctrls+A" + Me.mnuEditSelectAll.Text = "Select All " ' 'mnuEditFind ' + Me.mnuEditFind.CheckOnClick = True Me.mnuEditFind.Name = "mnuEditFind" - Me.mnuEditFind.Size = New System.Drawing.Size(221, 22) + Me.mnuEditFind.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F), System.Windows.Forms.Keys) + Me.mnuEditFind.Size = New System.Drawing.Size(207, 22) Me.mnuEditFind.Tag = "Find" - Me.mnuEditFind.Text = "Find Ctrl+F" + Me.mnuEditFind.Text = "Find" ' 'mnuEditReplace ' + Me.mnuEditReplace.CheckOnClick = True Me.mnuEditReplace.Name = "mnuEditReplace" - Me.mnuEditReplace.Size = New System.Drawing.Size(221, 22) + Me.mnuEditReplace.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.H), System.Windows.Forms.Keys) + Me.mnuEditReplace.Size = New System.Drawing.Size(207, 22) Me.mnuEditReplace.Tag = "Replace" - Me.mnuEditReplace.Text = "Replace Ctrl+H" + Me.mnuEditReplace.Text = "Replace" ' 'mnuEditFont ' + Me.mnuEditFont.CheckOnClick = True Me.mnuEditFont.Name = "mnuEditFont" - Me.mnuEditFont.Size = New System.Drawing.Size(221, 22) + Me.mnuEditFont.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.T), System.Windows.Forms.Keys) + Me.mnuEditFont.Size = New System.Drawing.Size(207, 22) Me.mnuEditFont.Tag = "Font" - Me.mnuEditFont.Text = "Font Ctrl+T" + Me.mnuEditFont.Text = "Font" ' 'mnuEditRunWSEditor ' + Me.mnuEditRunWSEditor.CheckOnClick = True Me.mnuEditRunWSEditor.Name = "mnuEditRunWSEditor" - Me.mnuEditRunWSEditor.Size = New System.Drawing.Size(221, 22) + Me.mnuEditRunWSEditor.ShortcutKeys = System.Windows.Forms.Keys.F7 + Me.mnuEditRunWSEditor.Size = New System.Drawing.Size(207, 22) Me.mnuEditRunWSEditor.Tag = "Run_Worksheet_Editor" - Me.mnuEditRunWSEditor.Text = "Run Worksheet Editor F7" + Me.mnuEditRunWSEditor.Text = "Run Worksheet Editor" ' 'mnuEditViewEditText ' - Me.mnuEditViewEditText.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NewF8ToolStripMenuItem, Me.OpenToolStripMenuItem, Me.OpenFromLibraryToolStripMenuItem1, Me.SelectionToolStripMenuItem}) + Me.mnuEditViewEditText.CheckOnClick = True + Me.mnuEditViewEditText.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditViewEditTextNew, Me.mnuEditViewEditTextOpen, Me.mnuEditViewEditTextOpenFromLibrary, Me.mnuEditViewEditTextSelection}) Me.mnuEditViewEditText.Name = "mnuEditViewEditText" - Me.mnuEditViewEditText.Size = New System.Drawing.Size(221, 22) + Me.mnuEditViewEditText.Size = New System.Drawing.Size(207, 22) Me.mnuEditViewEditText.Tag = "View_Edit_Text" Me.mnuEditViewEditText.Text = "View/Edit Text" ' - 'NewF8ToolStripMenuItem + 'mnuEditViewEditTextNew ' - Me.NewF8ToolStripMenuItem.Name = "NewF8ToolStripMenuItem" - Me.NewF8ToolStripMenuItem.Size = New System.Drawing.Size(182, 22) - Me.NewF8ToolStripMenuItem.Tag = "New" - Me.NewF8ToolStripMenuItem.Text = "New F8" + Me.mnuEditViewEditTextNew.CheckOnClick = True + Me.mnuEditViewEditTextNew.Name = "mnuEditViewEditTextNew" + Me.mnuEditViewEditTextNew.ShortcutKeys = System.Windows.Forms.Keys.F8 + Me.mnuEditViewEditTextNew.Size = New System.Drawing.Size(173, 22) + Me.mnuEditViewEditTextNew.Tag = "New" + Me.mnuEditViewEditTextNew.Text = "New" ' - 'OpenToolStripMenuItem + 'mnuEditViewEditTextOpen ' - Me.OpenToolStripMenuItem.Name = "OpenToolStripMenuItem" - Me.OpenToolStripMenuItem.Size = New System.Drawing.Size(182, 22) - Me.OpenToolStripMenuItem.Tag = "Open" - Me.OpenToolStripMenuItem.Text = "Open... Shift+F8" + Me.mnuEditViewEditTextOpen.CheckOnClick = True + Me.mnuEditViewEditTextOpen.Name = "mnuEditViewEditTextOpen" + Me.mnuEditViewEditTextOpen.ShortcutKeys = CType((System.Windows.Forms.Keys.Shift Or System.Windows.Forms.Keys.F8), System.Windows.Forms.Keys) + Me.mnuEditViewEditTextOpen.Size = New System.Drawing.Size(173, 22) + Me.mnuEditViewEditTextOpen.Tag = "Open" + Me.mnuEditViewEditTextOpen.Text = "Open" ' - 'OpenFromLibraryToolStripMenuItem1 + 'mnuEditViewEditTextOpenFromLibrary ' - Me.OpenFromLibraryToolStripMenuItem1.Name = "OpenFromLibraryToolStripMenuItem1" - Me.OpenFromLibraryToolStripMenuItem1.Size = New System.Drawing.Size(182, 22) - Me.OpenFromLibraryToolStripMenuItem1.Tag = "Open_From_Library" - Me.OpenFromLibraryToolStripMenuItem1.Text = "Open From Library..." + Me.mnuEditViewEditTextOpenFromLibrary.CheckOnClick = True + Me.mnuEditViewEditTextOpenFromLibrary.Name = "mnuEditViewEditTextOpenFromLibrary" + Me.mnuEditViewEditTextOpenFromLibrary.Size = New System.Drawing.Size(173, 22) + Me.mnuEditViewEditTextOpenFromLibrary.Tag = "Open_From_Library" + Me.mnuEditViewEditTextOpenFromLibrary.Text = "Open From Library" ' - 'SelectionToolStripMenuItem + 'mnuEditViewEditTextSelection ' - Me.SelectionToolStripMenuItem.Name = "SelectionToolStripMenuItem" - Me.SelectionToolStripMenuItem.Size = New System.Drawing.Size(182, 22) - Me.SelectionToolStripMenuItem.Tag = "Selection" - Me.SelectionToolStripMenuItem.Text = "Selection" + Me.mnuEditViewEditTextSelection.CheckOnClick = True + Me.mnuEditViewEditTextSelection.Name = "mnuEditViewEditTextSelection" + Me.mnuEditViewEditTextSelection.Size = New System.Drawing.Size(173, 22) + Me.mnuEditViewEditTextSelection.Tag = "Selection" + Me.mnuEditViewEditTextSelection.Text = "Selection" ' 'mnuEditViewEditMacro ' - Me.mnuEditViewEditMacro.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NewToolStripMenuItem, Me.OpenToolStripMenuItem1}) + Me.mnuEditViewEditMacro.CheckOnClick = True + Me.mnuEditViewEditMacro.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditMacroNew, Me.mnuEditMacroOpen}) Me.mnuEditViewEditMacro.Name = "mnuEditViewEditMacro" - Me.mnuEditViewEditMacro.Size = New System.Drawing.Size(221, 22) + Me.mnuEditViewEditMacro.Size = New System.Drawing.Size(207, 22) Me.mnuEditViewEditMacro.Tag = "View_Edit_Macro" Me.mnuEditViewEditMacro.Text = "View/Edit Macro" ' - 'NewToolStripMenuItem + 'mnuEditMacroNew ' - Me.NewToolStripMenuItem.Name = "NewToolStripMenuItem" - Me.NewToolStripMenuItem.Size = New System.Drawing.Size(112, 22) - Me.NewToolStripMenuItem.Text = "New" + Me.mnuEditMacroNew.CheckOnClick = True + Me.mnuEditMacroNew.Name = "mnuEditMacroNew" + Me.mnuEditMacroNew.Size = New System.Drawing.Size(152, 22) + Me.mnuEditMacroNew.Text = "New" ' - 'OpenToolStripMenuItem1 + 'mnuEditMacroOpen ' - Me.OpenToolStripMenuItem1.Name = "OpenToolStripMenuItem1" - Me.OpenToolStripMenuItem1.Size = New System.Drawing.Size(112, 22) - Me.OpenToolStripMenuItem1.Text = "Open..." + Me.mnuEditMacroOpen.CheckOnClick = True + Me.mnuEditMacroOpen.Name = "mnuEditMacroOpen" + Me.mnuEditMacroOpen.Size = New System.Drawing.Size(152, 22) + Me.mnuEditMacroOpen.Text = "Open..." ' 'mnuEditCommandLogging ' - Me.mnuEditCommandLogging.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StartF9ToolStripMenuItem, Me.StopShiftF9ToolStripMenuItem, Me.ViewLogFileCtrlF9ToolStripMenuItem}) + Me.mnuEditCommandLogging.CheckOnClick = True + Me.mnuEditCommandLogging.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditCommandStart, Me.mnuEditCommandStop, Me.mnuEditCommandViewLogFile}) Me.mnuEditCommandLogging.Name = "mnuEditCommandLogging" - Me.mnuEditCommandLogging.Size = New System.Drawing.Size(221, 22) + Me.mnuEditCommandLogging.Size = New System.Drawing.Size(207, 22) Me.mnuEditCommandLogging.Tag = "Command_Logging" Me.mnuEditCommandLogging.Text = "Command Logging" ' - 'StartF9ToolStripMenuItem + 'mnuEditCommandStart ' - Me.StartF9ToolStripMenuItem.Name = "StartF9ToolStripMenuItem" - Me.StartF9ToolStripMenuItem.Size = New System.Drawing.Size(203, 22) - Me.StartF9ToolStripMenuItem.Text = "Start... F9" + Me.mnuEditCommandStart.CheckOnClick = True + Me.mnuEditCommandStart.Name = "mnuEditCommandStart" + Me.mnuEditCommandStart.ShortcutKeys = System.Windows.Forms.Keys.F9 + Me.mnuEditCommandStart.Size = New System.Drawing.Size(189, 22) + Me.mnuEditCommandStart.Text = "Start" ' - 'StopShiftF9ToolStripMenuItem + 'mnuEditCommandStop ' - Me.StopShiftF9ToolStripMenuItem.Name = "StopShiftF9ToolStripMenuItem" - Me.StopShiftF9ToolStripMenuItem.Size = New System.Drawing.Size(203, 22) - Me.StopShiftF9ToolStripMenuItem.Text = "Stop Shift+F9" + Me.mnuEditCommandStop.Name = "mnuEditCommandStop" + Me.mnuEditCommandStop.ShortcutKeys = CType((System.Windows.Forms.Keys.Shift Or System.Windows.Forms.Keys.F9), System.Windows.Forms.Keys) + Me.mnuEditCommandStop.Size = New System.Drawing.Size(189, 22) + Me.mnuEditCommandStop.Text = "Stop" ' - 'ViewLogFileCtrlF9ToolStripMenuItem + 'mnuEditCommandViewLogFile ' - Me.ViewLogFileCtrlF9ToolStripMenuItem.Name = "ViewLogFileCtrlF9ToolStripMenuItem" - Me.ViewLogFileCtrlF9ToolStripMenuItem.Size = New System.Drawing.Size(203, 22) - Me.ViewLogFileCtrlF9ToolStripMenuItem.Text = "View Log File Ctrl+F9" + Me.mnuEditCommandViewLogFile.CheckOnClick = True + Me.mnuEditCommandViewLogFile.Name = "mnuEditCommandViewLogFile" + Me.mnuEditCommandViewLogFile.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F9), System.Windows.Forms.Keys) + Me.mnuEditCommandViewLogFile.Size = New System.Drawing.Size(189, 22) + Me.mnuEditCommandViewLogFile.Text = "View Log File" ' 'mnuEditOutputSpooling ' - Me.mnuEditOutputSpooling.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StartToolStripMenuItem, Me.StopToolStripMenuItem, Me.ViewToolStripMenuItem}) + Me.mnuEditOutputSpooling.CheckOnClick = True + Me.mnuEditOutputSpooling.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditOutputSpoolingStart, Me.mnuEditOutputSpoolingStop, Me.mnuEditOutputSpoolingView}) Me.mnuEditOutputSpooling.Name = "mnuEditOutputSpooling" - Me.mnuEditOutputSpooling.Size = New System.Drawing.Size(221, 22) + Me.mnuEditOutputSpooling.Size = New System.Drawing.Size(207, 22) Me.mnuEditOutputSpooling.Tag = "Output_Spooling" Me.mnuEditOutputSpooling.Text = "Output Spooling" ' - 'StartToolStripMenuItem + 'mnuEditOutputSpoolingStart ' - Me.StartToolStripMenuItem.Name = "StartToolStripMenuItem" - Me.StartToolStripMenuItem.Size = New System.Drawing.Size(153, 22) - Me.StartToolStripMenuItem.Text = "Start..." + Me.mnuEditOutputSpoolingStart.CheckOnClick = True + Me.mnuEditOutputSpoolingStart.Name = "mnuEditOutputSpoolingStart" + Me.mnuEditOutputSpoolingStart.Size = New System.Drawing.Size(153, 22) + Me.mnuEditOutputSpoolingStart.Text = "Start" ' - 'StopToolStripMenuItem + 'mnuEditOutputSpoolingStop ' - Me.StopToolStripMenuItem.Name = "StopToolStripMenuItem" - Me.StopToolStripMenuItem.Size = New System.Drawing.Size(153, 22) - Me.StopToolStripMenuItem.Text = "Stop" + Me.mnuEditOutputSpoolingStop.Name = "mnuEditOutputSpoolingStop" + Me.mnuEditOutputSpoolingStop.Size = New System.Drawing.Size(153, 22) + Me.mnuEditOutputSpoolingStop.Text = "Stop" ' - 'ViewToolStripMenuItem + 'mnuEditOutputSpoolingView ' - Me.ViewToolStripMenuItem.Name = "ViewToolStripMenuItem" - Me.ViewToolStripMenuItem.Size = New System.Drawing.Size(153, 22) - Me.ViewToolStripMenuItem.Text = "View Spool File" + Me.mnuEditOutputSpoolingView.Name = "mnuEditOutputSpoolingView" + Me.mnuEditOutputSpoolingView.Size = New System.Drawing.Size(153, 22) + Me.mnuEditOutputSpoolingView.Text = "View Spool File" ' 'mnuEditRecall ' - Me.mnuEditRecall.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LastCommandShiftF11ToolStripMenuItem, Me.LastDialogF11ToolStripMenuItem, Me.RestartServerToolStripMenuItem, Me.Last10DialoguesToolStripMenuItem}) + Me.mnuEditRecall.CheckOnClick = True + Me.mnuEditRecall.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditRecallLastCommand, Me.mnuEditRecallLastDialog, Me.mnuEditRecallRestartServer, Me.mnuEditRecallLast10Dialogues}) Me.mnuEditRecall.Name = "mnuEditRecall" - Me.mnuEditRecall.Size = New System.Drawing.Size(221, 22) + Me.mnuEditRecall.Size = New System.Drawing.Size(207, 22) Me.mnuEditRecall.Tag = "Recall" Me.mnuEditRecall.Text = "Recall" ' - 'LastCommandShiftF11ToolStripMenuItem + 'mnuEditRecallLastCommand ' - Me.LastCommandShiftF11ToolStripMenuItem.Name = "LastCommandShiftF11ToolStripMenuItem" - Me.LastCommandShiftF11ToolStripMenuItem.Size = New System.Drawing.Size(226, 22) - Me.LastCommandShiftF11ToolStripMenuItem.Text = "Last Command Shift+F11" + Me.mnuEditRecallLastCommand.CheckOnClick = True + Me.mnuEditRecallLastCommand.Name = "mnuEditRecallLastCommand" + Me.mnuEditRecallLastCommand.ShortcutKeys = CType((System.Windows.Forms.Keys.Shift Or System.Windows.Forms.Keys.F11), System.Windows.Forms.Keys) + Me.mnuEditRecallLastCommand.Size = New System.Drawing.Size(212, 22) + Me.mnuEditRecallLastCommand.Text = "Last Command" ' - 'LastDialogF11ToolStripMenuItem + 'mnuEditRecallLastDialog ' - Me.LastDialogF11ToolStripMenuItem.Name = "LastDialogF11ToolStripMenuItem" - Me.LastDialogF11ToolStripMenuItem.Size = New System.Drawing.Size(226, 22) - Me.LastDialogF11ToolStripMenuItem.Text = "Last Dialog F11" + Me.mnuEditRecallLastDialog.CheckOnClick = True + Me.mnuEditRecallLastDialog.Name = "mnuEditRecallLastDialog" + Me.mnuEditRecallLastDialog.ShortcutKeys = System.Windows.Forms.Keys.F11 + Me.mnuEditRecallLastDialog.Size = New System.Drawing.Size(212, 22) + Me.mnuEditRecallLastDialog.Text = "Last Dialog" ' - 'RestartServerToolStripMenuItem + 'mnuEditRecallRestartServer ' - Me.RestartServerToolStripMenuItem.Name = "RestartServerToolStripMenuItem" - Me.RestartServerToolStripMenuItem.Size = New System.Drawing.Size(226, 22) - Me.RestartServerToolStripMenuItem.Text = "Restart Server" + Me.mnuEditRecallRestartServer.CheckOnClick = True + Me.mnuEditRecallRestartServer.Name = "mnuEditRecallRestartServer" + Me.mnuEditRecallRestartServer.Size = New System.Drawing.Size(212, 22) + Me.mnuEditRecallRestartServer.Text = "Restart Server" ' - 'Last10DialoguesToolStripMenuItem + 'mnuEditRecallLast10Dialogues ' - Me.Last10DialoguesToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ClearListToolStripMenuItem}) - Me.Last10DialoguesToolStripMenuItem.Name = "Last10DialoguesToolStripMenuItem" - Me.Last10DialoguesToolStripMenuItem.Size = New System.Drawing.Size(226, 22) - Me.Last10DialoguesToolStripMenuItem.Text = "Last 10 Dialogues" + Me.mnuEditRecallLast10Dialogues.CheckOnClick = True + Me.mnuEditRecallLast10Dialogues.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ClearListToolStripMenuItem}) + Me.mnuEditRecallLast10Dialogues.Name = "mnuEditRecallLast10Dialogues" + Me.mnuEditRecallLast10Dialogues.Size = New System.Drawing.Size(212, 22) + Me.mnuEditRecallLast10Dialogues.Text = "Last 10 Dialogues" ' 'ClearListToolStripMenuItem ' @@ -1328,38 +1372,45 @@ Partial Class frmMain Me.ClearListToolStripMenuItem.Size = New System.Drawing.Size(122, 22) Me.ClearListToolStripMenuItem.Text = "Clear List" ' - 'FlagsToolStripMenuItem + 'mnuEditFlags ' - Me.FlagsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DisableWarningsF6ToolStripMenuItem, Me.PresentationModeShiftF6ToolStripMenuItem, Me.DisplayFactorLevelsAsOrdinalsShiftF7ToolStripMenuItem}) - Me.FlagsToolStripMenuItem.Name = "FlagsToolStripMenuItem" - Me.FlagsToolStripMenuItem.Size = New System.Drawing.Size(221, 22) - Me.FlagsToolStripMenuItem.Tag = "Flags" - Me.FlagsToolStripMenuItem.Text = "Flags" + Me.mnuEditFlags.CheckOnClick = True + Me.mnuEditFlags.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFlagsDisableWarnings, Me.mnuEditFlagsPresentationMode, Me.mnuEditFlagsDisplayFactorLevelsAsOrdinals}) + Me.mnuEditFlags.Name = "mnuEditFlags" + Me.mnuEditFlags.Size = New System.Drawing.Size(207, 22) + Me.mnuEditFlags.Tag = "Flags" + Me.mnuEditFlags.Text = "Flags" ' - 'DisableWarningsF6ToolStripMenuItem + 'mnuEditFlagsDisableWarnings ' - Me.DisableWarningsF6ToolStripMenuItem.Name = "DisableWarningsF6ToolStripMenuItem" - Me.DisableWarningsF6ToolStripMenuItem.Size = New System.Drawing.Size(309, 22) - Me.DisableWarningsF6ToolStripMenuItem.Text = "Disable Warnings F6" + Me.mnuEditFlagsDisableWarnings.Name = "mnuEditFlagsDisableWarnings" + Me.mnuEditFlagsDisableWarnings.ShortcutKeys = System.Windows.Forms.Keys.F6 + Me.mnuEditFlagsDisableWarnings.Size = New System.Drawing.Size(295, 22) + Me.mnuEditFlagsDisableWarnings.Text = "Disable Warnings" ' - 'PresentationModeShiftF6ToolStripMenuItem + 'mnuEditFlagsPresentationMode ' - Me.PresentationModeShiftF6ToolStripMenuItem.Name = "PresentationModeShiftF6ToolStripMenuItem" - Me.PresentationModeShiftF6ToolStripMenuItem.Size = New System.Drawing.Size(309, 22) - Me.PresentationModeShiftF6ToolStripMenuItem.Text = "Presentation Mode Shift+F6" + Me.mnuEditFlagsPresentationMode.CheckOnClick = True + Me.mnuEditFlagsPresentationMode.Name = "mnuEditFlagsPresentationMode" + Me.mnuEditFlagsPresentationMode.ShortcutKeys = CType((System.Windows.Forms.Keys.Shift Or System.Windows.Forms.Keys.F6), System.Windows.Forms.Keys) + Me.mnuEditFlagsPresentationMode.Size = New System.Drawing.Size(295, 22) + Me.mnuEditFlagsPresentationMode.Text = "Presentation Mode" ' - 'DisplayFactorLevelsAsOrdinalsShiftF7ToolStripMenuItem + 'mnuEditFlagsDisplayFactorLevelsAsOrdinals ' - Me.DisplayFactorLevelsAsOrdinalsShiftF7ToolStripMenuItem.Name = "DisplayFactorLevelsAsOrdinalsShiftF7ToolStripMenuItem" - Me.DisplayFactorLevelsAsOrdinalsShiftF7ToolStripMenuItem.Size = New System.Drawing.Size(309, 22) - Me.DisplayFactorLevelsAsOrdinalsShiftF7ToolStripMenuItem.Text = "Display Factor Levels as Ordinals Shift+F7" + Me.mnuEditFlagsDisplayFactorLevelsAsOrdinals.CheckOnClick = True + Me.mnuEditFlagsDisplayFactorLevelsAsOrdinals.Name = "mnuEditFlagsDisplayFactorLevelsAsOrdinals" + Me.mnuEditFlagsDisplayFactorLevelsAsOrdinals.ShortcutKeys = CType((System.Windows.Forms.Keys.Shift Or System.Windows.Forms.Keys.F7), System.Windows.Forms.Keys) + Me.mnuEditFlagsDisplayFactorLevelsAsOrdinals.Size = New System.Drawing.Size(295, 22) + Me.mnuEditFlagsDisplayFactorLevelsAsOrdinals.Text = "Display Factor Levels as Ordinals" ' - 'OPtionsToolStripMenuItem + 'mnuEditOptions ' - Me.OPtionsToolStripMenuItem.Name = "OPtionsToolStripMenuItem" - Me.OPtionsToolStripMenuItem.Size = New System.Drawing.Size(221, 22) - Me.OPtionsToolStripMenuItem.Tag = "Options" - Me.OPtionsToolStripMenuItem.Text = "Options..." + Me.mnuEditOptions.CheckOnClick = True + Me.mnuEditOptions.Name = "mnuEditOptions" + Me.mnuEditOptions.Size = New System.Drawing.Size(207, 22) + Me.mnuEditOptions.Tag = "Options" + Me.mnuEditOptions.Text = "Options..." ' 'mnuFileIEExport ' @@ -2140,32 +2191,32 @@ Partial Class frmMain Friend WithEvents mnuEditFont As ToolStripMenuItem Friend WithEvents mnuEditRunWSEditor As ToolStripMenuItem Friend WithEvents mnuEditViewEditText As ToolStripMenuItem - Friend WithEvents NewF8ToolStripMenuItem As ToolStripMenuItem - Friend WithEvents OpenToolStripMenuItem As ToolStripMenuItem - Friend WithEvents OpenFromLibraryToolStripMenuItem1 As ToolStripMenuItem - Friend WithEvents SelectionToolStripMenuItem As ToolStripMenuItem + Friend WithEvents mnuEditViewEditTextNew As ToolStripMenuItem + Friend WithEvents mnuEditViewEditTextOpen As ToolStripMenuItem + Friend WithEvents mnuEditViewEditTextOpenFromLibrary As ToolStripMenuItem + Friend WithEvents mnuEditViewEditTextSelection As ToolStripMenuItem Friend WithEvents mnuEditViewEditMacro As ToolStripMenuItem - Friend WithEvents NewToolStripMenuItem As ToolStripMenuItem - Friend WithEvents OpenToolStripMenuItem1 As ToolStripMenuItem + Friend WithEvents mnuEditMacroNew As ToolStripMenuItem + Friend WithEvents mnuEditMacroOpen As ToolStripMenuItem Friend WithEvents mnuEditCommandLogging As ToolStripMenuItem - Friend WithEvents StartF9ToolStripMenuItem As ToolStripMenuItem - Friend WithEvents StopShiftF9ToolStripMenuItem As ToolStripMenuItem - Friend WithEvents ViewLogFileCtrlF9ToolStripMenuItem As ToolStripMenuItem + Friend WithEvents mnuEditCommandStart As ToolStripMenuItem + Friend WithEvents mnuEditCommandStop As ToolStripMenuItem + Friend WithEvents mnuEditCommandViewLogFile As ToolStripMenuItem Friend WithEvents mnuEditOutputSpooling As ToolStripMenuItem - Friend WithEvents StartToolStripMenuItem As ToolStripMenuItem - Friend WithEvents StopToolStripMenuItem As ToolStripMenuItem - Friend WithEvents ViewToolStripMenuItem As ToolStripMenuItem + Friend WithEvents mnuEditOutputSpoolingStart As ToolStripMenuItem + Friend WithEvents mnuEditOutputSpoolingStop As ToolStripMenuItem + Friend WithEvents mnuEditOutputSpoolingView As ToolStripMenuItem Friend WithEvents mnuEditRecall As ToolStripMenuItem - Friend WithEvents LastCommandShiftF11ToolStripMenuItem As ToolStripMenuItem - Friend WithEvents LastDialogF11ToolStripMenuItem As ToolStripMenuItem - Friend WithEvents RestartServerToolStripMenuItem As ToolStripMenuItem - Friend WithEvents Last10DialoguesToolStripMenuItem As ToolStripMenuItem + Friend WithEvents mnuEditRecallLastCommand As ToolStripMenuItem + Friend WithEvents mnuEditRecallLastDialog As ToolStripMenuItem + Friend WithEvents mnuEditRecallRestartServer As ToolStripMenuItem + Friend WithEvents mnuEditRecallLast10Dialogues As ToolStripMenuItem Friend WithEvents ClearListToolStripMenuItem As ToolStripMenuItem - Friend WithEvents FlagsToolStripMenuItem As ToolStripMenuItem - Friend WithEvents DisableWarningsF6ToolStripMenuItem As ToolStripMenuItem - Friend WithEvents PresentationModeShiftF6ToolStripMenuItem As ToolStripMenuItem - Friend WithEvents DisplayFactorLevelsAsOrdinalsShiftF7ToolStripMenuItem As ToolStripMenuItem - Friend WithEvents OPtionsToolStripMenuItem As ToolStripMenuItem + Friend WithEvents mnuEditFlags As ToolStripMenuItem + Friend WithEvents mnuEditFlagsDisableWarnings As ToolStripMenuItem + Friend WithEvents mnuEditFlagsPresentationMode As ToolStripMenuItem + Friend WithEvents mnuEditFlagsDisplayFactorLevelsAsOrdinals As ToolStripMenuItem + Friend WithEvents mnuEditOptions As ToolStripMenuItem Friend WithEvents mnuFileIEExport As ToolStripMenuItem Friend WithEvents FolderBrowserDialog1 As FolderBrowserDialog Friend WithEvents mnuFIleIEASCII As ToolStripMenuItem