diff --git a/.github/workflows/CreateInstaller.yml b/.github/workflows/CreateInstaller.yml index 368b50bb738..29b57c90aa1 100644 --- a/.github/workflows/CreateInstaller.yml +++ b/.github/workflows/CreateInstaller.yml @@ -74,14 +74,24 @@ jobs: version: "${{ inputs.major_version }}.${{ inputs.minor_version }}.${{ inputs.build_no }}.${env:BUILD_NUMBER}" # Create the app package by building and packaging the Windows Application Packaging project - #Same output for 64bit and 32 bit - - name: Create the app package + # 32 bit + - name: Create the app package 32bit run: msbuild $env:Solution_Name /p:Configuration=$env:Configuration /p:AppxBundlePlatforms=$env:Appx_Bundle_Platforms /p:UapAppxPackageBuildMode=$env:Appx_Package_Build_Mode /p:AppxBundle=$env:Appx_Bundle /p:PackageCertificateKeyFile=GitHubActionsWorkflow.pfx /p:PackageCertificatePassword=${{ secrets.Pfx_Key }} env: Appx_Bundle: Always - Appx_Bundle_Platforms: x64|x86 + Appx_Bundle_Platforms: x86 Appx_Package_Build_Mode: StoreUpload Configuration: ${{ matrix.configuration }} + + # Create the app package by building and packaging the Windows Application Packaging project + # 64bit + - name: Create the app package 64 bit + run: msbuild $env:Solution_Name /p:Configuration=$env:Configuration /p:Platform=x64 /p:UapAppxPackageBuildMode=$env:Appx_Package_Build_Mode /p:AppxBundle=$env:Appx_Bundle /p:PackageCertificateKeyFile=GitHubActionsWorkflow.pfx /p:PackageCertificatePassword=${{ secrets.Pfx_Key }} + env: + Appx_Bundle: Always + Appx_Bundle_Platforms: x64 + Appx_Package_Build_Mode: StoreUpload + Configuration: ${{ matrix.configuration }} # Create directory and copy over application to a 32bit folder # There is no difference in R instat other than the packaged R @@ -133,11 +143,11 @@ jobs: # Create directory and copy over InstatData (64bit) - name: Make Library directory 64 bit run: | - MKDIR instat\bin\Release\static\Library\ + MKDIR instat\bin\x64\Release\static\Library\ - name: Copy R-Instat Data 64 bit run: | - ROBOCOPY InstatData\data\ instat\bin\Release\static\Library\ /E + ROBOCOPY InstatData\data\ instat\bin\x64\Release\static\Library\ /E continue-on-error: true # Create directory and copy over InstatData (32bit) @@ -160,7 +170,7 @@ jobs: - name: Copy R 64 bit run: | - ROBOCOPY R-RInstat\64Bit\ instat\bin\Release\static\ /E + ROBOCOPY R-RInstat\64Bit\ instat\bin\x64\Release\static\ /E continue-on-error: true - name: Copy R 32 bit @@ -170,7 +180,7 @@ jobs: - name: Install R packages (64 bit) run: | - "instat\bin\Release\static\R\bin\Rscript.exe" "instat\static\InstatObject\R\InstallPackages.R" + "instat\bin\x64\Release\static\R\bin\Rscript.exe" "instat\static\InstatObject\R\InstallPackages.R" shell: cmd - name: Building the installer 64bit - With R @@ -187,7 +197,7 @@ jobs: - name: Remove 64 bit release files to free up space run: | - Remove-Item "instat\bin\Release\" -Recurse + Remove-Item "instat\bin\x64\Release\" -Recurse - name: Remove 64 innosetup to free up space run: | diff --git a/docs/Download.html b/docs/Download.html index 459ec6a18ea..901e17f66da 100644 --- a/docs/Download.html +++ b/docs/Download.html @@ -76,13 +76,23 @@
-
+

Download R-Instat

-

In response to the recent review of R-Instat by Bob Muenchen we have released a new version of R-Instat, version 0.7.5, which includes some new features and initial improvements from the review. Many thanks to Bob for reviewing R-Instat.

+

In response to the recent review of R-Instat + by Bob Muenchen we continue to develop new versions of R-Instat. Many thanks to Bob for reviewing R-Instat.

-

R-Instat 0.7.6 Installer 32 Bit (.exe 802MB)

+

Latest stable release 0.7.6

+

32 Bit Installer (.exe 802MB)

+

64 Bit Installer (.exe 802MB)

+

If you know that you have a 64 bit computer, we suggest you download the 64 Bit version

- R-Instat 0.7.6 Installer 64 Bit (.exe 802MB) +
+

Other releases (beta)

+

0.7.8

+

+ 32 Bit (.exe 780MB) | + 64 Bit (.exe 912MB) +

R-Instat is currently a Windows only application. However, it can be accessed on Mac or Linux through use of a Virtual Windows Machine.

Installation & Documentation

diff --git a/inno_install_script_64bit.iss b/inno_install_script_64bit.iss index eae4c890349..7ae8307c81b 100644 --- a/inno_install_script_64bit.iss +++ b/inno_install_script_64bit.iss @@ -28,8 +28,8 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; OnlyBelowVersion: 0 [Files] -Source: "instat\bin\Release\instat.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "instat\bin\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "instat\bin\x64\Release\instat.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "instat\bin\x64\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] diff --git a/instat/dlgCorrelation.designer.vb b/instat/dlgCorrelation.designer.vb index a7e2ebfc8d8..ec1834fa061 100644 --- a/instat/dlgCorrelation.designer.vb +++ b/instat/dlgCorrelation.designer.vb @@ -282,7 +282,7 @@ Partial Class dlgCorrelation Me.ucrChkDisplayAsDataFrame.Checked = False Me.ucrChkDisplayAsDataFrame.Location = New System.Drawing.Point(168, 128) Me.ucrChkDisplayAsDataFrame.Name = "ucrChkDisplayAsDataFrame" - Me.ucrChkDisplayAsDataFrame.Size = New System.Drawing.Size(162, 23) + Me.ucrChkDisplayAsDataFrame.Size = New System.Drawing.Size(206, 23) Me.ucrChkDisplayAsDataFrame.TabIndex = 1 ' 'ucrChkShave @@ -350,7 +350,7 @@ Partial Class dlgCorrelation ' Me.ucrChkAbsolute.AutoSize = True Me.ucrChkAbsolute.Checked = False - Me.ucrChkAbsolute.Location = New System.Drawing.Point(266, 417) + Me.ucrChkAbsolute.Location = New System.Drawing.Point(270, 417) Me.ucrChkAbsolute.Name = "ucrChkAbsolute" Me.ucrChkAbsolute.Size = New System.Drawing.Size(117, 23) Me.ucrChkAbsolute.TabIndex = 23 @@ -361,7 +361,7 @@ Partial Class dlgCorrelation Me.ucrInputRearrange.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputRearrange.GetSetSelectedIndex = -1 Me.ucrInputRearrange.IsReadOnly = False - Me.ucrInputRearrange.Location = New System.Drawing.Point(175, 416) + Me.ucrInputRearrange.Location = New System.Drawing.Point(179, 416) Me.ucrInputRearrange.Name = "ucrInputRearrange" Me.ucrInputRearrange.Size = New System.Drawing.Size(79, 21) Me.ucrInputRearrange.TabIndex = 22 @@ -381,9 +381,9 @@ Partial Class dlgCorrelation Me.ucrInputDisplayNas.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputDisplayNas.GetSetSelectedIndex = -1 Me.ucrInputDisplayNas.IsReadOnly = False - Me.ucrInputDisplayNas.Location = New System.Drawing.Point(127, 363) + Me.ucrInputDisplayNas.Location = New System.Drawing.Point(139, 363) Me.ucrInputDisplayNas.Name = "ucrInputDisplayNas" - Me.ucrInputDisplayNas.Size = New System.Drawing.Size(51, 21) + Me.ucrInputDisplayNas.Size = New System.Drawing.Size(55, 21) Me.ucrInputDisplayNas.TabIndex = 18 ' 'ucrChkLeadingZeros @@ -400,11 +400,11 @@ Partial Class dlgCorrelation Me.ucrNudDecimalPlaces.AutoSize = True Me.ucrNudDecimalPlaces.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudDecimalPlaces.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudDecimalPlaces.Location = New System.Drawing.Point(127, 338) + Me.ucrNudDecimalPlaces.Location = New System.Drawing.Point(140, 338) Me.ucrNudDecimalPlaces.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudDecimalPlaces.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudDecimalPlaces.Name = "ucrNudDecimalPlaces" - Me.ucrNudDecimalPlaces.Size = New System.Drawing.Size(50, 20) + Me.ucrNudDecimalPlaces.Size = New System.Drawing.Size(54, 19) Me.ucrNudDecimalPlaces.TabIndex = 16 Me.ucrNudDecimalPlaces.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' diff --git a/instat/dlgName.vb b/instat/dlgName.vb index 6b16611110a..8571ec149c0 100644 --- a/instat/dlgName.vb +++ b/instat/dlgName.vb @@ -546,4 +546,16 @@ Public Class dlgName Private Sub ucrCoreControls_ControlContentsChanged() Handles ucrInputNewName.ControlContentsChanged, ucrReceiverName.ControlContentsChanged, ucrPnlOptions.ControlContentsChanged TestOKEnabled() End Sub + + Private Sub grdCurrentWorkSheet_CellEditTextChanging(sender As Object, e As CellEditTextChangingEventArgs) Handles grdCurrentWorkSheet.CellEditTextChanging + If grdCurrentWorkSheet.ColumnCount > 0 Then + Dim iCol As Integer = e.Cell.Column + Dim parsedValue As Boolean + Dim strNewData As String = ValidateRVariable(e.Text, iCol) + If Not strNewData.ToLower.Equals("t") AndAlso Not strNewData.ToLower.Equals("f") AndAlso Not IsNumeric(strNewData) AndAlso Not Boolean.TryParse(strNewData, parsedValue) Then + RenameColumns(strNewData, e.Cell.Row, iCol) + ValidateNamesFromDictionary(iCol) + End If + End If + End Sub End Class diff --git a/instat/dlgNewDataFrame.Designer.vb b/instat/dlgNewDataFrame.Designer.vb index 514b7ef0b89..23523a1dea7 100644 --- a/instat/dlgNewDataFrame.Designer.vb +++ b/instat/dlgNewDataFrame.Designer.vb @@ -64,6 +64,12 @@ Partial Class dlgNewDataFrame Me.lblCommand = New System.Windows.Forms.Label() Me.btnExample = New System.Windows.Forms.Button() Me.dataTypeGridView = New System.Windows.Forms.DataGridView() + Me.no = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colNames = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.cbType = New System.Windows.Forms.DataGridViewComboBoxColumn() + Me.colDefault = New System.Windows.Forms.DataGridViewComboBoxColumn() + Me.colLevels = New System.Windows.Forms.DataGridViewComboBoxColumn() + Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.rdoLists = New System.Windows.Forms.RadioButton() Me.lblCategories = New System.Windows.Forms.Label() Me.lblLists = New System.Windows.Forms.Label() @@ -80,12 +86,6 @@ Partial Class dlgNewDataFrame Me.ucrNudCols = New instat.ucrNud() Me.ucrNudRows = New instat.ucrNud() Me.ucrBase = New instat.ucrButtons() - Me.no = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colNames = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.cbType = New System.Windows.Forms.DataGridViewComboBoxColumn() - Me.colDefault = New System.Windows.Forms.DataGridViewComboBoxColumn() - Me.colLevels = New System.Windows.Forms.DataGridViewComboBoxColumn() - Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() CType(Me.dataGridView, System.ComponentModel.ISupportInitialize).BeginInit() Me.mnuStripCommand.SuspendLayout() CType(Me.dataTypeGridView, System.ComponentModel.ISupportInitialize).BeginInit() @@ -336,6 +336,47 @@ Partial Class dlgNewDataFrame Me.dataTypeGridView.Size = New System.Drawing.Size(416, 115) Me.dataTypeGridView.TabIndex = 163 ' + 'no + ' + Me.no.FillWeight = 90.0! + Me.no.HeaderText = "No." + Me.no.Name = "no" + Me.no.ReadOnly = True + Me.no.Width = 30 + ' + 'colNames + ' + Me.colNames.HeaderText = "Name" + Me.colNames.Name = "colNames" + Me.colNames.Width = 60 + ' + 'cbType + ' + Me.cbType.HeaderText = "Type" + Me.cbType.Items.AddRange(New Object() {"Character", "Numeric", "Factor", "Integer"}) + Me.cbType.MaxDropDownItems = 4 + Me.cbType.Name = "cbType" + Me.cbType.Width = 60 + ' + 'colDefault + ' + Me.colDefault.HeaderText = "Default" + Me.colDefault.Items.AddRange(New Object() {"NA", "0", "1", "1,1000"}) + Me.colDefault.Name = "colDefault" + ' + 'colLevels + ' + Me.colLevels.HeaderText = "Levels" + Me.colLevels.Items.AddRange(New Object() {"No, Yes", "Bad, Poor, Average, Good, Great", "0-4,5-9,10-14,15-19, 20-64, 65+", "1:5"}) + Me.colLevels.Name = "colLevels" + ' + 'colLabel + ' + Me.colLabel.HeaderText = "Label" + Me.colLabel.Name = "colLabel" + Me.colLabel.Visible = False + Me.colLabel.Width = 80 + ' 'rdoLists ' Me.rdoLists.Appearance = System.Windows.Forms.Appearance.Button @@ -430,7 +471,7 @@ Partial Class dlgNewDataFrame Me.ucrChkVariable.Checked = False Me.ucrChkVariable.Location = New System.Drawing.Point(37, 101) Me.ucrChkVariable.Name = "ucrChkVariable" - Me.ucrChkVariable.Size = New System.Drawing.Size(100, 23) + Me.ucrChkVariable.Size = New System.Drawing.Size(138, 27) Me.ucrChkVariable.TabIndex = 162 ' 'ucrTryNewDataFrame @@ -509,47 +550,6 @@ Partial Class dlgNewDataFrame Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 15 ' - 'no - ' - Me.no.FillWeight = 90.0! - Me.no.HeaderText = "No." - Me.no.Name = "no" - Me.no.ReadOnly = True - Me.no.Width = 30 - ' - 'colNames - ' - Me.colNames.HeaderText = "Name" - Me.colNames.Name = "colNames" - Me.colNames.Width = 60 - ' - 'cbType - ' - Me.cbType.HeaderText = "Type" - Me.cbType.Items.AddRange(New Object() {"Character", "Numeric", "Factor", "Integer"}) - Me.cbType.MaxDropDownItems = 4 - Me.cbType.Name = "cbType" - Me.cbType.Width = 60 - ' - 'colDefault - ' - Me.colDefault.HeaderText = "Default" - Me.colDefault.Items.AddRange(New Object() {"NA", "0", "1", "1,1000"}) - Me.colDefault.Name = "colDefault" - ' - 'colLevels - ' - Me.colLevels.HeaderText = "Levels" - Me.colLevels.Items.AddRange(New Object() {"No, Yes", "Bad, Poor, Average, Good, Great", "0-4,5-9,10-14,15-19, 20-64, 65+", "1:5"}) - Me.colLevels.Name = "colLevels" - ' - 'colLabel - ' - Me.colLabel.HeaderText = "Label" - Me.colLabel.Name = "colLabel" - Me.colLabel.Visible = False - Me.colLabel.Width = 80 - ' 'dlgNewDataFrame ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) diff --git a/instat/dlgOptions.Designer.vb b/instat/dlgOptions.Designer.vb index 8154dc157b6..93e77139504 100644 --- a/instat/dlgOptions.Designer.vb +++ b/instat/dlgOptions.Designer.vb @@ -38,12 +38,12 @@ Partial Class dlgOptions 'Do not modify it using the code editor. Private Sub InitializeComponent() - Dim TreeNode13 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Languages") - Dim TreeNode14 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Comments") - Dim TreeNode15 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Import") - Dim TreeNode16 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Output Window") - Dim TreeNode17 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Commands") - Dim TreeNode18 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Data View") + Dim TreeNode1 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Languages") + Dim TreeNode2 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Comments") + Dim TreeNode3 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Import") + Dim TreeNode4 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Output Window") + Dim TreeNode5 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Commands") + Dim TreeNode6 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Data View") Me.cmdApply = New System.Windows.Forms.Button() Me.cmdHelp = New System.Windows.Forms.Button() Me.cmdCancel = New System.Windows.Forms.Button() @@ -64,6 +64,7 @@ Partial Class dlgOptions Me.ucrNudPreviewRows = New instat.ucrNud() Me.pnImportData = New System.Windows.Forms.Panel() Me.tbpOutputWindow = New System.Windows.Forms.TabPage() + Me.ucrNudMaximumOutputsHeight = New instat.ucrNud() Me.ucrChkMaximumOutputsHeight = New instat.ucrCheck() Me.ucrChkShowRCommandsinOutputWindow = New instat.ucrCheck() Me.ucrChkIncludeCommentsbyDefault = New instat.ucrCheck() @@ -124,7 +125,7 @@ Partial Class dlgOptions Me.ucrInputHost = New instat.ucrInputTextBox() Me.ucrInputDatabaseName = New instat.ucrInputTextBox() Me.cmdLanguage = New System.Windows.Forms.Button() - Me.ucrNudMaximumOutputsHeight = New instat.ucrNud() + Me.lversion = New System.Windows.Forms.Label() CType(Me.spltControls, System.ComponentModel.ISupportInitialize).BeginInit() Me.spltControls.Panel1.SuspendLayout() Me.spltControls.Panel2.SuspendLayout() @@ -149,9 +150,10 @@ Partial Class dlgOptions ' 'cmdApply ' - Me.cmdApply.Location = New System.Drawing.Point(384, 324) + Me.cmdApply.Location = New System.Drawing.Point(480, 405) + Me.cmdApply.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdApply.Name = "cmdApply" - Me.cmdApply.Size = New System.Drawing.Size(75, 23) + Me.cmdApply.Size = New System.Drawing.Size(94, 29) Me.cmdApply.TabIndex = 10 Me.cmdApply.Tag = "Apply" Me.cmdApply.Text = "Apply" @@ -159,9 +161,10 @@ Partial Class dlgOptions ' 'cmdHelp ' - Me.cmdHelp.Location = New System.Drawing.Point(465, 324) + Me.cmdHelp.Location = New System.Drawing.Point(581, 405) + Me.cmdHelp.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdHelp.Name = "cmdHelp" - Me.cmdHelp.Size = New System.Drawing.Size(75, 23) + Me.cmdHelp.Size = New System.Drawing.Size(94, 29) Me.cmdHelp.TabIndex = 12 Me.cmdHelp.Tag = "Help" Me.cmdHelp.Text = "Help" @@ -169,9 +172,10 @@ Partial Class dlgOptions ' 'cmdCancel ' - Me.cmdCancel.Location = New System.Drawing.Point(303, 324) + Me.cmdCancel.Location = New System.Drawing.Point(379, 405) + Me.cmdCancel.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdCancel.Name = "cmdCancel" - Me.cmdCancel.Size = New System.Drawing.Size(75, 23) + Me.cmdCancel.Size = New System.Drawing.Size(94, 29) Me.cmdCancel.TabIndex = 9 Me.cmdCancel.Tag = "Cancel" Me.cmdCancel.Text = "Cancel" @@ -179,9 +183,10 @@ Partial Class dlgOptions ' 'cmdOk ' - Me.cmdOk.Location = New System.Drawing.Point(222, 324) + Me.cmdOk.Location = New System.Drawing.Point(278, 405) + Me.cmdOk.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdOk.Name = "cmdOk" - Me.cmdOk.Size = New System.Drawing.Size(75, 23) + Me.cmdOk.Size = New System.Drawing.Size(94, 29) Me.cmdOk.TabIndex = 11 Me.cmdOk.Tag = "Ok" Me.cmdOk.Text = "Ok" @@ -189,7 +194,8 @@ Partial Class dlgOptions ' 'spltControls ' - Me.spltControls.Location = New System.Drawing.Point(5, 1) + Me.spltControls.Location = New System.Drawing.Point(6, 1) + Me.spltControls.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.spltControls.Name = "spltControls" ' 'spltControls.Panel1 @@ -200,15 +206,17 @@ Partial Class dlgOptions 'spltControls.Panel2 ' Me.spltControls.Panel2.Controls.Add(Me.tbcOptions) - Me.spltControls.Size = New System.Drawing.Size(760, 317) - Me.spltControls.SplitterDistance = 184 + Me.spltControls.Size = New System.Drawing.Size(950, 396) + Me.spltControls.SplitterDistance = 230 + Me.spltControls.SplitterWidth = 5 Me.spltControls.TabIndex = 8 ' 'cmdFactoryReset ' - Me.cmdFactoryReset.Location = New System.Drawing.Point(13, 287) + Me.cmdFactoryReset.Location = New System.Drawing.Point(16, 359) + Me.cmdFactoryReset.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdFactoryReset.Name = "cmdFactoryReset" - Me.cmdFactoryReset.Size = New System.Drawing.Size(100, 23) + Me.cmdFactoryReset.Size = New System.Drawing.Size(125, 29) Me.cmdFactoryReset.TabIndex = 13 Me.cmdFactoryReset.Tag = "Help" Me.cmdFactoryReset.Text = "Factory Reset" @@ -218,31 +226,32 @@ Partial Class dlgOptions ' Me.trOptions.Dock = System.Windows.Forms.DockStyle.Fill Me.trOptions.Location = New System.Drawing.Point(0, 0) + Me.trOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.trOptions.Name = "trOptions" - TreeNode13.Name = "ndLanguages" - TreeNode13.Tag = "1" - TreeNode13.Text = "Languages" - TreeNode13.ToolTipText = "Choose different languages" - TreeNode14.Name = "ndComments" - TreeNode14.Tag = "2" - TreeNode14.Text = "Comments" - TreeNode14.ToolTipText = "Comments for the dialogs" - TreeNode15.Name = "ndImport" - TreeNode15.Tag = "3" - TreeNode15.Text = "Import" - TreeNode15.ToolTipText = "Import Data Settings" - TreeNode16.Name = "ndOutputWindow" - TreeNode16.Tag = "4" - TreeNode16.Text = "Output Window" - TreeNode16.ToolTipText = "Output Window Formatting Options" - TreeNode17.Name = "ndCommands" - TreeNode17.Tag = "8" - TreeNode17.Text = "Commands" - TreeNode17.ToolTipText = "Commands Options" - TreeNode18.Name = "ndDataView" - TreeNode18.Text = "Data View" - Me.trOptions.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode13, TreeNode14, TreeNode15, TreeNode16, TreeNode17, TreeNode18}) - Me.trOptions.Size = New System.Drawing.Size(184, 317) + TreeNode1.Name = "ndLanguages" + TreeNode1.Tag = "1" + TreeNode1.Text = "Languages" + TreeNode1.ToolTipText = "Choose different languages" + TreeNode2.Name = "ndComments" + TreeNode2.Tag = "2" + TreeNode2.Text = "Comments" + TreeNode2.ToolTipText = "Comments for the dialogs" + TreeNode3.Name = "ndImport" + TreeNode3.Tag = "3" + TreeNode3.Text = "Import" + TreeNode3.ToolTipText = "Import Data Settings" + TreeNode4.Name = "ndOutputWindow" + TreeNode4.Tag = "4" + TreeNode4.Text = "Output Window" + TreeNode4.ToolTipText = "Output Window Formatting Options" + TreeNode5.Name = "ndCommands" + TreeNode5.Tag = "8" + TreeNode5.Text = "Commands" + TreeNode5.ToolTipText = "Commands Options" + TreeNode6.Name = "ndDataView" + TreeNode6.Text = "Data View" + Me.trOptions.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode1, TreeNode2, TreeNode3, TreeNode4, TreeNode5, TreeNode6}) + Me.trOptions.Size = New System.Drawing.Size(230, 396) Me.trOptions.TabIndex = 0 ' 'tbcOptions @@ -260,19 +269,22 @@ Partial Class dlgOptions Me.tbcOptions.Controls.Add(Me.tbpClimsoft) Me.tbcOptions.Dock = System.Windows.Forms.DockStyle.Fill Me.tbcOptions.Location = New System.Drawing.Point(0, 0) + Me.tbcOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbcOptions.Name = "tbcOptions" Me.tbcOptions.SelectedIndex = 0 - Me.tbcOptions.Size = New System.Drawing.Size(572, 317) + Me.tbcOptions.Size = New System.Drawing.Size(715, 396) Me.tbcOptions.TabIndex = 0 ' 'tbpLanguages ' + Me.tbpLanguages.Controls.Add(Me.lversion) Me.tbpLanguages.Controls.Add(Me.lblLanguage) Me.tbpLanguages.Controls.Add(Me.ucrInputLanguage) - Me.tbpLanguages.Location = New System.Drawing.Point(4, 22) + Me.tbpLanguages.Location = New System.Drawing.Point(4, 25) + Me.tbpLanguages.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbpLanguages.Name = "tbpLanguages" - Me.tbpLanguages.Padding = New System.Windows.Forms.Padding(3) - Me.tbpLanguages.Size = New System.Drawing.Size(564, 291) + Me.tbpLanguages.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpLanguages.Size = New System.Drawing.Size(707, 367) Me.tbpLanguages.TabIndex = 0 Me.tbpLanguages.Tag = "Languages" Me.tbpLanguages.Text = "Languages" @@ -281,9 +293,10 @@ Partial Class dlgOptions 'lblLanguage ' Me.lblLanguage.AutoSize = True - Me.lblLanguage.Location = New System.Drawing.Point(9, 18) + Me.lblLanguage.Location = New System.Drawing.Point(11, 22) + Me.lblLanguage.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblLanguage.Name = "lblLanguage" - Me.lblLanguage.Size = New System.Drawing.Size(61, 13) + Me.lblLanguage.Size = New System.Drawing.Size(80, 17) Me.lblLanguage.TabIndex = 3 Me.lblLanguage.Text = "Language :" ' @@ -293,18 +306,20 @@ Partial Class dlgOptions Me.ucrInputLanguage.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputLanguage.GetSetSelectedIndex = -1 Me.ucrInputLanguage.IsReadOnly = False - Me.ucrInputLanguage.Location = New System.Drawing.Point(75, 15) + Me.ucrInputLanguage.Location = New System.Drawing.Point(94, 19) + Me.ucrInputLanguage.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrInputLanguage.Name = "ucrInputLanguage" - Me.ucrInputLanguage.Size = New System.Drawing.Size(110, 21) + Me.ucrInputLanguage.Size = New System.Drawing.Size(138, 26) Me.ucrInputLanguage.TabIndex = 2 ' 'tbpComments ' Me.tbpComments.Controls.Add(Me.pnComments) - Me.tbpComments.Location = New System.Drawing.Point(4, 22) + Me.tbpComments.Location = New System.Drawing.Point(4, 25) + Me.tbpComments.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbpComments.Name = "tbpComments" - Me.tbpComments.Padding = New System.Windows.Forms.Padding(3) - Me.tbpComments.Size = New System.Drawing.Size(564, 291) + Me.tbpComments.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpComments.Size = New System.Drawing.Size(707, 367) Me.tbpComments.TabIndex = 1 Me.tbpComments.Tag = "Comments" Me.tbpComments.Text = "Comments" @@ -315,9 +330,10 @@ Partial Class dlgOptions Me.pnComments.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.pnComments.Controls.Add(Me.ucrInputComment) Me.pnComments.Controls.Add(Me.lblComment) - Me.pnComments.Location = New System.Drawing.Point(10, 10) + Me.pnComments.Location = New System.Drawing.Point(12, 12) + Me.pnComments.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.pnComments.Name = "pnComments" - Me.pnComments.Size = New System.Drawing.Size(391, 29) + Me.pnComments.Size = New System.Drawing.Size(489, 36) Me.pnComments.TabIndex = 2 ' 'ucrInputComment @@ -326,17 +342,19 @@ Partial Class dlgOptions Me.ucrInputComment.AutoSize = True Me.ucrInputComment.IsMultiline = False Me.ucrInputComment.IsReadOnly = False - Me.ucrInputComment.Location = New System.Drawing.Point(96, 5) + Me.ucrInputComment.Location = New System.Drawing.Point(120, 6) + Me.ucrInputComment.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrInputComment.Name = "ucrInputComment" - Me.ucrInputComment.Size = New System.Drawing.Size(292, 21) + Me.ucrInputComment.Size = New System.Drawing.Size(365, 26) Me.ucrInputComment.TabIndex = 1 ' 'lblComment ' Me.lblComment.AutoSize = True - Me.lblComment.Location = New System.Drawing.Point(2, 9) + Me.lblComment.Location = New System.Drawing.Point(2, 11) + Me.lblComment.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblComment.Name = "lblComment" - Me.lblComment.Size = New System.Drawing.Size(54, 13) + Me.lblComment.Size = New System.Drawing.Size(71, 17) Me.lblComment.TabIndex = 0 Me.lblComment.Tag = "Comment:" Me.lblComment.Text = "Comment:" @@ -346,9 +364,10 @@ Partial Class dlgOptions Me.tbpImport.Controls.Add(Me.lblPreviewRows) Me.tbpImport.Controls.Add(Me.ucrNudPreviewRows) Me.tbpImport.Controls.Add(Me.pnImportData) - Me.tbpImport.Location = New System.Drawing.Point(4, 22) + Me.tbpImport.Location = New System.Drawing.Point(4, 25) + Me.tbpImport.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbpImport.Name = "tbpImport" - Me.tbpImport.Size = New System.Drawing.Size(564, 291) + Me.tbpImport.Size = New System.Drawing.Size(707, 367) Me.tbpImport.TabIndex = 3 Me.tbpImport.Text = "Import" Me.tbpImport.UseVisualStyleBackColor = True @@ -356,9 +375,10 @@ Partial Class dlgOptions 'lblPreviewRows ' Me.lblPreviewRows.AutoSize = True - Me.lblPreviewRows.Location = New System.Drawing.Point(3, 9) + Me.lblPreviewRows.Location = New System.Drawing.Point(4, 11) + Me.lblPreviewRows.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblPreviewRows.Name = "lblPreviewRows" - Me.lblPreviewRows.Size = New System.Drawing.Size(130, 13) + Me.lblPreviewRows.Size = New System.Drawing.Size(169, 17) Me.lblPreviewRows.TabIndex = 0 Me.lblPreviewRows.Text = "Number of Preview Rows:" ' @@ -367,11 +387,12 @@ Partial Class dlgOptions Me.ucrNudPreviewRows.AutoSize = True Me.ucrNudPreviewRows.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPreviewRows.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudPreviewRows.Location = New System.Drawing.Point(152, 5) + Me.ucrNudPreviewRows.Location = New System.Drawing.Point(190, 6) + Me.ucrNudPreviewRows.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrNudPreviewRows.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudPreviewRows.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPreviewRows.Name = "ucrNudPreviewRows" - Me.ucrNudPreviewRows.Size = New System.Drawing.Size(50, 20) + Me.ucrNudPreviewRows.Size = New System.Drawing.Size(62, 25) Me.ucrNudPreviewRows.TabIndex = 3 Me.ucrNudPreviewRows.Value = New Decimal(New Integer() {10, 0, 0, 0}) ' @@ -379,7 +400,8 @@ Partial Class dlgOptions ' Me.pnImportData.AutoSize = True Me.pnImportData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.pnImportData.Location = New System.Drawing.Point(10, 10) + Me.pnImportData.Location = New System.Drawing.Point(12, 12) + Me.pnImportData.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.pnImportData.Name = "pnImportData" Me.pnImportData.Size = New System.Drawing.Size(0, 0) Me.pnImportData.TabIndex = 2 @@ -392,39 +414,57 @@ Partial Class dlgOptions Me.tbpOutputWindow.Controls.Add(Me.ucrChkIncludeCommentsbyDefault) Me.tbpOutputWindow.Controls.Add(Me.grpROptions) Me.tbpOutputWindow.Controls.Add(Me.pnFormatOptions) - Me.tbpOutputWindow.Location = New System.Drawing.Point(4, 22) + Me.tbpOutputWindow.Location = New System.Drawing.Point(4, 25) + Me.tbpOutputWindow.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbpOutputWindow.Name = "tbpOutputWindow" - Me.tbpOutputWindow.Padding = New System.Windows.Forms.Padding(3) - Me.tbpOutputWindow.Size = New System.Drawing.Size(564, 291) + Me.tbpOutputWindow.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpOutputWindow.Size = New System.Drawing.Size(707, 367) Me.tbpOutputWindow.TabIndex = 2 Me.tbpOutputWindow.Text = "Output Window" Me.tbpOutputWindow.UseVisualStyleBackColor = True ' + 'ucrNudMaximumOutputsHeight + ' + Me.ucrNudMaximumOutputsHeight.AutoSize = True + Me.ucrNudMaximumOutputsHeight.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMaximumOutputsHeight.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudMaximumOutputsHeight.Location = New System.Drawing.Point(598, 169) + Me.ucrNudMaximumOutputsHeight.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrNudMaximumOutputsHeight.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudMaximumOutputsHeight.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMaximumOutputsHeight.Name = "ucrNudMaximumOutputsHeight" + Me.ucrNudMaximumOutputsHeight.Size = New System.Drawing.Size(62, 25) + Me.ucrNudMaximumOutputsHeight.TabIndex = 29 + Me.ucrNudMaximumOutputsHeight.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'ucrChkMaximumOutputsHeight ' Me.ucrChkMaximumOutputsHeight.AutoSize = True Me.ucrChkMaximumOutputsHeight.Checked = False - Me.ucrChkMaximumOutputsHeight.Location = New System.Drawing.Point(310, 135) + Me.ucrChkMaximumOutputsHeight.Location = New System.Drawing.Point(388, 169) + Me.ucrChkMaximumOutputsHeight.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkMaximumOutputsHeight.Name = "ucrChkMaximumOutputsHeight" - Me.ucrChkMaximumOutputsHeight.Size = New System.Drawing.Size(162, 23) + Me.ucrChkMaximumOutputsHeight.Size = New System.Drawing.Size(202, 36) Me.ucrChkMaximumOutputsHeight.TabIndex = 28 ' 'ucrChkShowRCommandsinOutputWindow ' Me.ucrChkShowRCommandsinOutputWindow.AutoSize = True Me.ucrChkShowRCommandsinOutputWindow.Checked = False - Me.ucrChkShowRCommandsinOutputWindow.Location = New System.Drawing.Point(10, 158) + Me.ucrChkShowRCommandsinOutputWindow.Location = New System.Drawing.Point(12, 198) + Me.ucrChkShowRCommandsinOutputWindow.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkShowRCommandsinOutputWindow.Name = "ucrChkShowRCommandsinOutputWindow" - Me.ucrChkShowRCommandsinOutputWindow.Size = New System.Drawing.Size(271, 23) + Me.ucrChkShowRCommandsinOutputWindow.Size = New System.Drawing.Size(339, 36) Me.ucrChkShowRCommandsinOutputWindow.TabIndex = 27 ' 'ucrChkIncludeCommentsbyDefault ' Me.ucrChkIncludeCommentsbyDefault.AutoSize = True Me.ucrChkIncludeCommentsbyDefault.Checked = False - Me.ucrChkIncludeCommentsbyDefault.Location = New System.Drawing.Point(10, 135) + Me.ucrChkIncludeCommentsbyDefault.Location = New System.Drawing.Point(12, 169) + Me.ucrChkIncludeCommentsbyDefault.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkIncludeCommentsbyDefault.Name = "ucrChkIncludeCommentsbyDefault" - Me.ucrChkIncludeCommentsbyDefault.Size = New System.Drawing.Size(271, 23) + Me.ucrChkIncludeCommentsbyDefault.Size = New System.Drawing.Size(339, 36) Me.ucrChkIncludeCommentsbyDefault.TabIndex = 26 ' 'grpROptions @@ -432,9 +472,11 @@ Partial Class dlgOptions Me.grpROptions.Controls.Add(Me.ucrChkShowSignifStars) Me.grpROptions.Controls.Add(Me.ucrNudDigits) Me.grpROptions.Controls.Add(Me.lblNoDigits) - Me.grpROptions.Location = New System.Drawing.Point(10, 192) + Me.grpROptions.Location = New System.Drawing.Point(12, 240) + Me.grpROptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.grpROptions.Name = "grpROptions" - Me.grpROptions.Size = New System.Drawing.Size(271, 93) + Me.grpROptions.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpROptions.Size = New System.Drawing.Size(339, 116) Me.grpROptions.TabIndex = 25 Me.grpROptions.TabStop = False Me.grpROptions.Text = "R Options" @@ -443,9 +485,10 @@ Partial Class dlgOptions ' Me.ucrChkShowSignifStars.AutoSize = True Me.ucrChkShowSignifStars.Checked = False - Me.ucrChkShowSignifStars.Location = New System.Drawing.Point(7, 49) + Me.ucrChkShowSignifStars.Location = New System.Drawing.Point(9, 61) + Me.ucrChkShowSignifStars.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkShowSignifStars.Name = "ucrChkShowSignifStars" - Me.ucrChkShowSignifStars.Size = New System.Drawing.Size(255, 23) + Me.ucrChkShowSignifStars.Size = New System.Drawing.Size(319, 36) Me.ucrChkShowSignifStars.TabIndex = 28 ' 'ucrNudDigits @@ -453,20 +496,22 @@ Partial Class dlgOptions Me.ucrNudDigits.AutoSize = True Me.ucrNudDigits.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudDigits.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudDigits.Location = New System.Drawing.Point(177, 23) + Me.ucrNudDigits.Location = New System.Drawing.Point(221, 29) + Me.ucrNudDigits.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrNudDigits.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudDigits.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudDigits.Name = "ucrNudDigits" - Me.ucrNudDigits.Size = New System.Drawing.Size(50, 20) + Me.ucrNudDigits.Size = New System.Drawing.Size(62, 25) Me.ucrNudDigits.TabIndex = 27 Me.ucrNudDigits.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'lblNoDigits ' Me.lblNoDigits.AutoSize = True - Me.lblNoDigits.Location = New System.Drawing.Point(6, 23) + Me.lblNoDigits.Location = New System.Drawing.Point(8, 29) + Me.lblNoDigits.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblNoDigits.Name = "lblNoDigits" - Me.lblNoDigits.Size = New System.Drawing.Size(137, 13) + Me.lblNoDigits.Size = New System.Drawing.Size(183, 17) Me.lblNoDigits.TabIndex = 1 Me.lblNoDigits.Text = "Number of Digits to Display:" ' @@ -483,43 +528,48 @@ Partial Class dlgOptions Me.pnFormatOptions.Controls.Add(Me.lblOutputFormat) Me.pnFormatOptions.Controls.Add(Me.cmdCommentFormat) Me.pnFormatOptions.Controls.Add(Me.lblCommandFormat) - Me.pnFormatOptions.Location = New System.Drawing.Point(10, 10) + Me.pnFormatOptions.Location = New System.Drawing.Point(12, 12) + Me.pnFormatOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.pnFormatOptions.Name = "pnFormatOptions" - Me.pnFormatOptions.Size = New System.Drawing.Size(391, 118) + Me.pnFormatOptions.Size = New System.Drawing.Size(489, 147) Me.pnFormatOptions.TabIndex = 21 ' 'rtbCommentPreview ' - Me.rtbCommentPreview.Location = New System.Drawing.Point(124, 89) + Me.rtbCommentPreview.Location = New System.Drawing.Point(155, 111) + Me.rtbCommentPreview.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rtbCommentPreview.Name = "rtbCommentPreview" Me.rtbCommentPreview.ReadOnly = True - Me.rtbCommentPreview.Size = New System.Drawing.Size(147, 26) + Me.rtbCommentPreview.Size = New System.Drawing.Size(183, 32) Me.rtbCommentPreview.TabIndex = 22 Me.rtbCommentPreview.Text = "" ' 'rtbOutputPreview ' - Me.rtbOutputPreview.Location = New System.Drawing.Point(124, 49) + Me.rtbOutputPreview.Location = New System.Drawing.Point(155, 61) + Me.rtbOutputPreview.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rtbOutputPreview.Name = "rtbOutputPreview" Me.rtbOutputPreview.ReadOnly = True - Me.rtbOutputPreview.Size = New System.Drawing.Size(147, 26) + Me.rtbOutputPreview.Size = New System.Drawing.Size(183, 32) Me.rtbOutputPreview.TabIndex = 21 Me.rtbOutputPreview.Text = "" ' 'rtbCommandPreview ' - Me.rtbCommandPreview.Location = New System.Drawing.Point(124, 9) + Me.rtbCommandPreview.Location = New System.Drawing.Point(155, 11) + Me.rtbCommandPreview.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rtbCommandPreview.Name = "rtbCommandPreview" Me.rtbCommandPreview.ReadOnly = True - Me.rtbCommandPreview.Size = New System.Drawing.Size(147, 26) + Me.rtbCommandPreview.Size = New System.Drawing.Size(183, 32) Me.rtbCommandPreview.TabIndex = 20 Me.rtbCommandPreview.Text = "" ' 'cmdCommandFormat ' - Me.cmdCommandFormat.Location = New System.Drawing.Point(288, 9) + Me.cmdCommandFormat.Location = New System.Drawing.Point(360, 11) + Me.cmdCommandFormat.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdCommandFormat.Name = "cmdCommandFormat" - Me.cmdCommandFormat.Size = New System.Drawing.Size(100, 23) + Me.cmdCommandFormat.Size = New System.Drawing.Size(125, 29) Me.cmdCommandFormat.TabIndex = 10 Me.cmdCommandFormat.Text = "Change..." Me.cmdCommandFormat.UseVisualStyleBackColor = True @@ -527,17 +577,19 @@ Partial Class dlgOptions 'lblCommentFormat ' Me.lblCommentFormat.AutoSize = True - Me.lblCommentFormat.Location = New System.Drawing.Point(4, 94) + Me.lblCommentFormat.Location = New System.Drawing.Point(5, 118) + Me.lblCommentFormat.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblCommentFormat.Name = "lblCommentFormat" - Me.lblCommentFormat.Size = New System.Drawing.Size(89, 13) + Me.lblCommentFormat.Size = New System.Drawing.Size(119, 17) Me.lblCommentFormat.TabIndex = 19 Me.lblCommentFormat.Text = "Comment Format:" ' 'cmdOutputFormat ' - Me.cmdOutputFormat.Location = New System.Drawing.Point(288, 49) + Me.cmdOutputFormat.Location = New System.Drawing.Point(360, 61) + Me.cmdOutputFormat.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdOutputFormat.Name = "cmdOutputFormat" - Me.cmdOutputFormat.Size = New System.Drawing.Size(100, 23) + Me.cmdOutputFormat.Size = New System.Drawing.Size(125, 29) Me.cmdOutputFormat.TabIndex = 16 Me.cmdOutputFormat.Text = "Change..." Me.cmdOutputFormat.UseVisualStyleBackColor = True @@ -545,17 +597,19 @@ Partial Class dlgOptions 'lblOutputFormat ' Me.lblOutputFormat.AutoSize = True - Me.lblOutputFormat.Location = New System.Drawing.Point(4, 54) + Me.lblOutputFormat.Location = New System.Drawing.Point(5, 68) + Me.lblOutputFormat.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblOutputFormat.Name = "lblOutputFormat" - Me.lblOutputFormat.Size = New System.Drawing.Size(77, 13) + Me.lblOutputFormat.Size = New System.Drawing.Size(103, 17) Me.lblOutputFormat.TabIndex = 18 Me.lblOutputFormat.Text = "Output Format:" ' 'cmdCommentFormat ' - Me.cmdCommentFormat.Location = New System.Drawing.Point(288, 89) + Me.cmdCommentFormat.Location = New System.Drawing.Point(360, 111) + Me.cmdCommentFormat.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdCommentFormat.Name = "cmdCommentFormat" - Me.cmdCommentFormat.Size = New System.Drawing.Size(100, 23) + Me.cmdCommentFormat.Size = New System.Drawing.Size(125, 29) Me.cmdCommentFormat.TabIndex = 16 Me.cmdCommentFormat.Text = "Change..." Me.cmdCommentFormat.UseVisualStyleBackColor = True @@ -563,19 +617,21 @@ Partial Class dlgOptions 'lblCommandFormat ' Me.lblCommandFormat.AutoSize = True - Me.lblCommandFormat.Location = New System.Drawing.Point(4, 14) + Me.lblCommandFormat.Location = New System.Drawing.Point(5, 18) + Me.lblCommandFormat.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblCommandFormat.Name = "lblCommandFormat" - Me.lblCommandFormat.Size = New System.Drawing.Size(92, 13) + Me.lblCommandFormat.Size = New System.Drawing.Size(123, 17) Me.lblCommandFormat.TabIndex = 17 Me.lblCommandFormat.Text = "Command Format:" ' 'tbpEditor ' Me.tbpEditor.Controls.Add(Me.pnFormatEditor) - Me.tbpEditor.Location = New System.Drawing.Point(4, 22) + Me.tbpEditor.Location = New System.Drawing.Point(4, 25) + Me.tbpEditor.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbpEditor.Name = "tbpEditor" - Me.tbpEditor.Padding = New System.Windows.Forms.Padding(3) - Me.tbpEditor.Size = New System.Drawing.Size(564, 291) + Me.tbpEditor.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpEditor.Size = New System.Drawing.Size(707, 367) Me.tbpEditor.TabIndex = 10 Me.tbpEditor.Text = "Editor Window" Me.tbpEditor.ToolTipText = "Data View" @@ -587,16 +643,18 @@ Partial Class dlgOptions Me.pnFormatEditor.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.pnFormatEditor.Controls.Add(Me.cmdEditorFont) Me.pnFormatEditor.Controls.Add(Me.lblFont) - Me.pnFormatEditor.Location = New System.Drawing.Point(10, 10) + Me.pnFormatEditor.Location = New System.Drawing.Point(12, 12) + Me.pnFormatEditor.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.pnFormatEditor.Name = "pnFormatEditor" - Me.pnFormatEditor.Size = New System.Drawing.Size(212, 28) + Me.pnFormatEditor.Size = New System.Drawing.Size(265, 35) Me.pnFormatEditor.TabIndex = 22 ' 'cmdEditorFont ' - Me.cmdEditorFont.Location = New System.Drawing.Point(109, 2) + Me.cmdEditorFont.Location = New System.Drawing.Point(136, 2) + Me.cmdEditorFont.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdEditorFont.Name = "cmdEditorFont" - Me.cmdEditorFont.Size = New System.Drawing.Size(100, 23) + Me.cmdEditorFont.Size = New System.Drawing.Size(125, 29) Me.cmdEditorFont.TabIndex = 10 Me.cmdEditorFont.Text = "Change..." Me.cmdEditorFont.UseVisualStyleBackColor = True @@ -604,9 +662,10 @@ Partial Class dlgOptions 'lblFont ' Me.lblFont.AutoSize = True - Me.lblFont.Location = New System.Drawing.Point(4, 7) + Me.lblFont.Location = New System.Drawing.Point(5, 9) + Me.lblFont.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblFont.Name = "lblFont" - Me.lblFont.Size = New System.Drawing.Size(66, 13) + Me.lblFont.Size = New System.Drawing.Size(88, 17) Me.lblFont.TabIndex = 17 Me.lblFont.Text = "Format Font:" ' @@ -616,10 +675,11 @@ Partial Class dlgOptions Me.tbpCommands.Controls.Add(Me.ucrChkShowWaitDialog) Me.tbpCommands.Controls.Add(Me.ucrNudWaitSeconds) Me.tbpCommands.Controls.Add(Me.ucrChkIncludeDefaultParams) - Me.tbpCommands.Location = New System.Drawing.Point(4, 22) + Me.tbpCommands.Location = New System.Drawing.Point(4, 25) + Me.tbpCommands.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbpCommands.Name = "tbpCommands" - Me.tbpCommands.Padding = New System.Windows.Forms.Padding(3) - Me.tbpCommands.Size = New System.Drawing.Size(564, 291) + Me.tbpCommands.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpCommands.Size = New System.Drawing.Size(707, 367) Me.tbpCommands.TabIndex = 4 Me.tbpCommands.Tag = "Commands" Me.tbpCommands.Text = "Commands" @@ -628,9 +688,10 @@ Partial Class dlgOptions 'lblWaitSeconds ' Me.lblWaitSeconds.AutoSize = True - Me.lblWaitSeconds.Location = New System.Drawing.Point(403, 46) + Me.lblWaitSeconds.Location = New System.Drawing.Point(504, 58) + Me.lblWaitSeconds.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblWaitSeconds.Name = "lblWaitSeconds" - Me.lblWaitSeconds.Size = New System.Drawing.Size(47, 13) + Me.lblWaitSeconds.Size = New System.Drawing.Size(61, 17) Me.lblWaitSeconds.TabIndex = 8 Me.lblWaitSeconds.Text = "seconds" ' @@ -638,9 +699,10 @@ Partial Class dlgOptions ' Me.ucrChkShowWaitDialog.AutoSize = True Me.ucrChkShowWaitDialog.Checked = False - Me.ucrChkShowWaitDialog.Location = New System.Drawing.Point(6, 47) + Me.ucrChkShowWaitDialog.Location = New System.Drawing.Point(8, 59) + Me.ucrChkShowWaitDialog.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkShowWaitDialog.Name = "ucrChkShowWaitDialog" - Me.ucrChkShowWaitDialog.Size = New System.Drawing.Size(337, 23) + Me.ucrChkShowWaitDialog.Size = New System.Drawing.Size(421, 36) Me.ucrChkShowWaitDialog.TabIndex = 6 ' 'ucrNudWaitSeconds @@ -648,11 +710,12 @@ Partial Class dlgOptions Me.ucrNudWaitSeconds.AutoSize = True Me.ucrNudWaitSeconds.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWaitSeconds.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudWaitSeconds.Location = New System.Drawing.Point(349, 45) + Me.ucrNudWaitSeconds.Location = New System.Drawing.Point(436, 56) + Me.ucrNudWaitSeconds.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrNudWaitSeconds.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudWaitSeconds.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWaitSeconds.Name = "ucrNudWaitSeconds" - Me.ucrNudWaitSeconds.Size = New System.Drawing.Size(50, 20) + Me.ucrNudWaitSeconds.Size = New System.Drawing.Size(62, 25) Me.ucrNudWaitSeconds.TabIndex = 5 Me.ucrNudWaitSeconds.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -660,9 +723,10 @@ Partial Class dlgOptions ' Me.ucrChkIncludeDefaultParams.AutoSize = True Me.ucrChkIncludeDefaultParams.Checked = False - Me.ucrChkIncludeDefaultParams.Location = New System.Drawing.Point(6, 20) + Me.ucrChkIncludeDefaultParams.Location = New System.Drawing.Point(8, 25) + Me.ucrChkIncludeDefaultParams.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkIncludeDefaultParams.Name = "ucrChkIncludeDefaultParams" - Me.ucrChkIncludeDefaultParams.Size = New System.Drawing.Size(398, 23) + Me.ucrChkIncludeDefaultParams.Size = New System.Drawing.Size(498, 36) Me.ucrChkIncludeDefaultParams.TabIndex = 3 ' 'tbpDataView @@ -676,10 +740,11 @@ Partial Class dlgOptions Me.tbpDataView.Controls.Add(Me.lblMaxCols) Me.tbpDataView.Controls.Add(Me.ucrNudMaxRows) Me.tbpDataView.Controls.Add(Me.lblMaxRows) - Me.tbpDataView.Location = New System.Drawing.Point(4, 22) + Me.tbpDataView.Location = New System.Drawing.Point(4, 25) + Me.tbpDataView.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbpDataView.Name = "tbpDataView" - Me.tbpDataView.Padding = New System.Windows.Forms.Padding(3) - Me.tbpDataView.Size = New System.Drawing.Size(564, 291) + Me.tbpDataView.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpDataView.Size = New System.Drawing.Size(707, 367) Me.tbpDataView.TabIndex = 9 Me.tbpDataView.Text = "Data View" Me.tbpDataView.UseVisualStyleBackColor = True @@ -687,18 +752,20 @@ Partial Class dlgOptions 'lblEvery ' Me.lblEvery.AutoSize = True - Me.lblEvery.Location = New System.Drawing.Point(236, 102) + Me.lblEvery.Location = New System.Drawing.Point(295, 128) + Me.lblEvery.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblEvery.Name = "lblEvery" - Me.lblEvery.Size = New System.Drawing.Size(33, 13) + Me.lblEvery.Size = New System.Drawing.Size(43, 17) Me.lblEvery.TabIndex = 4 Me.lblEvery.Text = "every" ' 'lblMinutes ' Me.lblMinutes.AutoSize = True - Me.lblMinutes.Location = New System.Drawing.Point(341, 102) + Me.lblMinutes.Location = New System.Drawing.Point(426, 128) + Me.lblMinutes.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblMinutes.Name = "lblMinutes" - Me.lblMinutes.Size = New System.Drawing.Size(43, 13) + Me.lblMinutes.Size = New System.Drawing.Size(57, 17) Me.lblMinutes.TabIndex = 4 Me.lblMinutes.Text = "minutes" ' @@ -706,18 +773,20 @@ Partial Class dlgOptions ' Me.ucrChkAutoSave.AutoSize = True Me.ucrChkAutoSave.Checked = False - Me.ucrChkAutoSave.Location = New System.Drawing.Point(13, 104) + Me.ucrChkAutoSave.Location = New System.Drawing.Point(16, 130) + Me.ucrChkAutoSave.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkAutoSave.Name = "ucrChkAutoSave" - Me.ucrChkAutoSave.Size = New System.Drawing.Size(217, 23) + Me.ucrChkAutoSave.Size = New System.Drawing.Size(271, 36) Me.ucrChkAutoSave.TabIndex = 3 ' 'ucrChkShowDataonGrid ' Me.ucrChkShowDataonGrid.AutoSize = True Me.ucrChkShowDataonGrid.Checked = False - Me.ucrChkShowDataonGrid.Location = New System.Drawing.Point(13, 78) + Me.ucrChkShowDataonGrid.Location = New System.Drawing.Point(16, 98) + Me.ucrChkShowDataonGrid.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkShowDataonGrid.Name = "ucrChkShowDataonGrid" - Me.ucrChkShowDataonGrid.Size = New System.Drawing.Size(393, 23) + Me.ucrChkShowDataonGrid.Size = New System.Drawing.Size(491, 36) Me.ucrChkShowDataonGrid.TabIndex = 3 ' 'ucrNudAutoSaveMinutes @@ -725,11 +794,12 @@ Partial Class dlgOptions Me.ucrNudAutoSaveMinutes.AutoSize = True Me.ucrNudAutoSaveMinutes.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAutoSaveMinutes.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudAutoSaveMinutes.Location = New System.Drawing.Point(285, 99) + Me.ucrNudAutoSaveMinutes.Location = New System.Drawing.Point(356, 124) + Me.ucrNudAutoSaveMinutes.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrNudAutoSaveMinutes.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudAutoSaveMinutes.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAutoSaveMinutes.Name = "ucrNudAutoSaveMinutes" - Me.ucrNudAutoSaveMinutes.Size = New System.Drawing.Size(50, 20) + Me.ucrNudAutoSaveMinutes.Size = New System.Drawing.Size(62, 25) Me.ucrNudAutoSaveMinutes.TabIndex = 2 Me.ucrNudAutoSaveMinutes.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -738,20 +808,22 @@ Partial Class dlgOptions Me.ucrNudMaxCols.AutoSize = True Me.ucrNudMaxCols.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxCols.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudMaxCols.Location = New System.Drawing.Point(268, 41) + Me.ucrNudMaxCols.Location = New System.Drawing.Point(335, 51) + Me.ucrNudMaxCols.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrNudMaxCols.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudMaxCols.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxCols.Name = "ucrNudMaxCols" - Me.ucrNudMaxCols.Size = New System.Drawing.Size(50, 20) + Me.ucrNudMaxCols.Size = New System.Drawing.Size(62, 25) Me.ucrNudMaxCols.TabIndex = 2 Me.ucrNudMaxCols.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'lblMaxCols ' Me.lblMaxCols.AutoSize = True - Me.lblMaxCols.Location = New System.Drawing.Point(10, 44) + Me.lblMaxCols.Location = New System.Drawing.Point(12, 55) + Me.lblMaxCols.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblMaxCols.Name = "lblMaxCols" - Me.lblMaxCols.Size = New System.Drawing.Size(198, 13) + Me.lblMaxCols.Size = New System.Drawing.Size(264, 17) Me.lblMaxCols.TabIndex = 1 Me.lblMaxCols.Text = "Maximum Number of Columns to Display:" ' @@ -760,20 +832,22 @@ Partial Class dlgOptions Me.ucrNudMaxRows.AutoSize = True Me.ucrNudMaxRows.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxRows.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudMaxRows.Location = New System.Drawing.Point(268, 15) + Me.ucrNudMaxRows.Location = New System.Drawing.Point(335, 19) + Me.ucrNudMaxRows.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrNudMaxRows.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudMaxRows.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxRows.Name = "ucrNudMaxRows" - Me.ucrNudMaxRows.Size = New System.Drawing.Size(50, 20) + Me.ucrNudMaxRows.Size = New System.Drawing.Size(62, 25) Me.ucrNudMaxRows.TabIndex = 2 Me.ucrNudMaxRows.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'lblMaxRows ' Me.lblMaxRows.AutoSize = True - Me.lblMaxRows.Location = New System.Drawing.Point(10, 18) + Me.lblMaxRows.Location = New System.Drawing.Point(12, 22) + Me.lblMaxRows.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblMaxRows.Name = "lblMaxRows" - Me.lblMaxRows.Size = New System.Drawing.Size(185, 13) + Me.lblMaxRows.Size = New System.Drawing.Size(244, 17) Me.lblMaxRows.TabIndex = 1 Me.lblMaxRows.Text = "Maximum Number of Rows to Display:" ' @@ -782,19 +856,21 @@ Partial Class dlgOptions Me.tbpWorkingDirectory.Controls.Add(Me.cmdWorkingDirectory) Me.tbpWorkingDirectory.Controls.Add(Me.lblWorkingDirectory) Me.tbpWorkingDirectory.Controls.Add(Me.ucrWorkingDirectory) - Me.tbpWorkingDirectory.Location = New System.Drawing.Point(4, 22) + Me.tbpWorkingDirectory.Location = New System.Drawing.Point(4, 25) + Me.tbpWorkingDirectory.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbpWorkingDirectory.Name = "tbpWorkingDirectory" - Me.tbpWorkingDirectory.Padding = New System.Windows.Forms.Padding(3) - Me.tbpWorkingDirectory.Size = New System.Drawing.Size(564, 291) + Me.tbpWorkingDirectory.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpWorkingDirectory.Size = New System.Drawing.Size(707, 367) Me.tbpWorkingDirectory.TabIndex = 11 Me.tbpWorkingDirectory.Text = "Working Directory" Me.tbpWorkingDirectory.UseVisualStyleBackColor = True ' 'cmdWorkingDirectory ' - Me.cmdWorkingDirectory.Location = New System.Drawing.Point(399, 16) + Me.cmdWorkingDirectory.Location = New System.Drawing.Point(499, 20) + Me.cmdWorkingDirectory.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdWorkingDirectory.Name = "cmdWorkingDirectory" - Me.cmdWorkingDirectory.Size = New System.Drawing.Size(24, 21) + Me.cmdWorkingDirectory.Size = New System.Drawing.Size(30, 26) Me.cmdWorkingDirectory.TabIndex = 2 Me.cmdWorkingDirectory.Text = "..." Me.cmdWorkingDirectory.UseVisualStyleBackColor = True @@ -802,9 +878,10 @@ Partial Class dlgOptions 'lblWorkingDirectory ' Me.lblWorkingDirectory.AutoSize = True - Me.lblWorkingDirectory.Location = New System.Drawing.Point(13, 20) + Me.lblWorkingDirectory.Location = New System.Drawing.Point(16, 25) + Me.lblWorkingDirectory.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblWorkingDirectory.Name = "lblWorkingDirectory" - Me.lblWorkingDirectory.Size = New System.Drawing.Size(95, 13) + Me.lblWorkingDirectory.Size = New System.Drawing.Size(125, 17) Me.lblWorkingDirectory.TabIndex = 0 Me.lblWorkingDirectory.Text = "Working Directory:" ' @@ -814,9 +891,10 @@ Partial Class dlgOptions Me.ucrWorkingDirectory.AutoSize = True Me.ucrWorkingDirectory.IsMultiline = False Me.ucrWorkingDirectory.IsReadOnly = False - Me.ucrWorkingDirectory.Location = New System.Drawing.Point(138, 17) + Me.ucrWorkingDirectory.Location = New System.Drawing.Point(172, 21) + Me.ucrWorkingDirectory.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrWorkingDirectory.Name = "ucrWorkingDirectory" - Me.ucrWorkingDirectory.Size = New System.Drawing.Size(255, 21) + Me.ucrWorkingDirectory.Size = New System.Drawing.Size(319, 26) Me.ucrWorkingDirectory.TabIndex = 1 ' 'tbpGraphDisplay @@ -825,10 +903,11 @@ Partial Class dlgOptions Me.tbpGraphDisplay.Controls.Add(Me.rdoDisplayinRViewer) Me.tbpGraphDisplay.Controls.Add(Me.rdoDisplayinOutputWindow) Me.tbpGraphDisplay.Controls.Add(Me.ucrPnlGraphDisplay) - Me.tbpGraphDisplay.Location = New System.Drawing.Point(4, 22) + Me.tbpGraphDisplay.Location = New System.Drawing.Point(4, 25) + Me.tbpGraphDisplay.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbpGraphDisplay.Name = "tbpGraphDisplay" - Me.tbpGraphDisplay.Padding = New System.Windows.Forms.Padding(3) - Me.tbpGraphDisplay.Size = New System.Drawing.Size(564, 291) + Me.tbpGraphDisplay.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpGraphDisplay.Size = New System.Drawing.Size(707, 367) Me.tbpGraphDisplay.TabIndex = 12 Me.tbpGraphDisplay.Text = "Graph Display" Me.tbpGraphDisplay.UseVisualStyleBackColor = True @@ -837,9 +916,10 @@ Partial Class dlgOptions ' Me.rdoDisplayinSeparateWindows.AutoSize = True Me.rdoDisplayinSeparateWindows.Checked = True - Me.rdoDisplayinSeparateWindows.Location = New System.Drawing.Point(6, 52) + Me.rdoDisplayinSeparateWindows.Location = New System.Drawing.Point(8, 65) + Me.rdoDisplayinSeparateWindows.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoDisplayinSeparateWindows.Name = "rdoDisplayinSeparateWindows" - Me.rdoDisplayinSeparateWindows.Size = New System.Drawing.Size(163, 17) + Me.rdoDisplayinSeparateWindows.Size = New System.Drawing.Size(212, 21) Me.rdoDisplayinSeparateWindows.TabIndex = 1 Me.rdoDisplayinSeparateWindows.TabStop = True Me.rdoDisplayinSeparateWindows.Text = "Display in Separate Windows" @@ -848,9 +928,10 @@ Partial Class dlgOptions 'rdoDisplayinRViewer ' Me.rdoDisplayinRViewer.AutoSize = True - Me.rdoDisplayinRViewer.Location = New System.Drawing.Point(6, 29) + Me.rdoDisplayinRViewer.Location = New System.Drawing.Point(8, 36) + Me.rdoDisplayinRViewer.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoDisplayinRViewer.Name = "rdoDisplayinRViewer" - Me.rdoDisplayinRViewer.Size = New System.Drawing.Size(116, 17) + Me.rdoDisplayinRViewer.Size = New System.Drawing.Size(150, 21) Me.rdoDisplayinRViewer.TabIndex = 1 Me.rdoDisplayinRViewer.Text = "Display in R Viewer" Me.rdoDisplayinRViewer.UseVisualStyleBackColor = True @@ -858,9 +939,10 @@ Partial Class dlgOptions 'rdoDisplayinOutputWindow ' Me.rdoDisplayinOutputWindow.AutoSize = True - Me.rdoDisplayinOutputWindow.Location = New System.Drawing.Point(6, 6) + Me.rdoDisplayinOutputWindow.Location = New System.Drawing.Point(8, 8) + Me.rdoDisplayinOutputWindow.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoDisplayinOutputWindow.Name = "rdoDisplayinOutputWindow" - Me.rdoDisplayinOutputWindow.Size = New System.Drawing.Size(147, 17) + Me.rdoDisplayinOutputWindow.Size = New System.Drawing.Size(190, 21) Me.rdoDisplayinOutputWindow.TabIndex = 1 Me.rdoDisplayinOutputWindow.Text = "Display in Output Window" Me.rdoDisplayinOutputWindow.UseVisualStyleBackColor = True @@ -868,9 +950,10 @@ Partial Class dlgOptions 'ucrPnlGraphDisplay ' Me.ucrPnlGraphDisplay.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlGraphDisplay.Location = New System.Drawing.Point(0, 3) + Me.ucrPnlGraphDisplay.Location = New System.Drawing.Point(0, 4) + Me.ucrPnlGraphDisplay.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrPnlGraphDisplay.Name = "ucrPnlGraphDisplay" - Me.ucrPnlGraphDisplay.Size = New System.Drawing.Size(365, 66) + Me.ucrPnlGraphDisplay.Size = New System.Drawing.Size(456, 82) Me.ucrPnlGraphDisplay.TabIndex = 3 ' 'tbpTailoredMenus @@ -879,10 +962,11 @@ Partial Class dlgOptions Me.tbpTailoredMenus.Controls.Add(Me.ucrChkViewOptionsByContextMenu) Me.tbpTailoredMenus.Controls.Add(Me.ucrChkViewProcurementMenu) Me.tbpTailoredMenus.Controls.Add(Me.ucrChkViewClimaticMenu) - Me.tbpTailoredMenus.Location = New System.Drawing.Point(4, 22) + Me.tbpTailoredMenus.Location = New System.Drawing.Point(4, 25) + Me.tbpTailoredMenus.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbpTailoredMenus.Name = "tbpTailoredMenus" - Me.tbpTailoredMenus.Padding = New System.Windows.Forms.Padding(3) - Me.tbpTailoredMenus.Size = New System.Drawing.Size(564, 291) + Me.tbpTailoredMenus.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpTailoredMenus.Size = New System.Drawing.Size(707, 367) Me.tbpTailoredMenus.TabIndex = 13 Me.tbpTailoredMenus.Text = "Tailored Menus" Me.tbpTailoredMenus.UseVisualStyleBackColor = True @@ -891,36 +975,40 @@ Partial Class dlgOptions ' Me.ucrChkViewStructuredMenu.AutoSize = True Me.ucrChkViewStructuredMenu.Checked = False - Me.ucrChkViewStructuredMenu.Location = New System.Drawing.Point(7, 12) + Me.ucrChkViewStructuredMenu.Location = New System.Drawing.Point(9, 15) + Me.ucrChkViewStructuredMenu.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkViewStructuredMenu.Name = "ucrChkViewStructuredMenu" - Me.ucrChkViewStructuredMenu.Size = New System.Drawing.Size(378, 23) + Me.ucrChkViewStructuredMenu.Size = New System.Drawing.Size(472, 36) Me.ucrChkViewStructuredMenu.TabIndex = 2 ' 'ucrChkViewOptionsByContextMenu ' Me.ucrChkViewOptionsByContextMenu.AutoSize = True Me.ucrChkViewOptionsByContextMenu.Checked = False - Me.ucrChkViewOptionsByContextMenu.Location = New System.Drawing.Point(7, 90) + Me.ucrChkViewOptionsByContextMenu.Location = New System.Drawing.Point(9, 112) + Me.ucrChkViewOptionsByContextMenu.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkViewOptionsByContextMenu.Name = "ucrChkViewOptionsByContextMenu" - Me.ucrChkViewOptionsByContextMenu.Size = New System.Drawing.Size(413, 23) + Me.ucrChkViewOptionsByContextMenu.Size = New System.Drawing.Size(516, 36) Me.ucrChkViewOptionsByContextMenu.TabIndex = 1 ' 'ucrChkViewProcurementMenu ' Me.ucrChkViewProcurementMenu.AutoSize = True Me.ucrChkViewProcurementMenu.Checked = False - Me.ucrChkViewProcurementMenu.Location = New System.Drawing.Point(7, 64) + Me.ucrChkViewProcurementMenu.Location = New System.Drawing.Point(9, 80) + Me.ucrChkViewProcurementMenu.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkViewProcurementMenu.Name = "ucrChkViewProcurementMenu" - Me.ucrChkViewProcurementMenu.Size = New System.Drawing.Size(413, 23) + Me.ucrChkViewProcurementMenu.Size = New System.Drawing.Size(516, 36) Me.ucrChkViewProcurementMenu.TabIndex = 0 ' 'ucrChkViewClimaticMenu ' Me.ucrChkViewClimaticMenu.AutoSize = True Me.ucrChkViewClimaticMenu.Checked = False - Me.ucrChkViewClimaticMenu.Location = New System.Drawing.Point(7, 38) + Me.ucrChkViewClimaticMenu.Location = New System.Drawing.Point(9, 48) + Me.ucrChkViewClimaticMenu.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkViewClimaticMenu.Name = "ucrChkViewClimaticMenu" - Me.ucrChkViewClimaticMenu.Size = New System.Drawing.Size(407, 23) + Me.ucrChkViewClimaticMenu.Size = New System.Drawing.Size(509, 36) Me.ucrChkViewClimaticMenu.TabIndex = 0 ' 'tbpClimsoft @@ -933,10 +1021,11 @@ Partial Class dlgOptions Me.tbpClimsoft.Controls.Add(Me.ucrInputPort) Me.tbpClimsoft.Controls.Add(Me.ucrInputHost) Me.tbpClimsoft.Controls.Add(Me.ucrInputDatabaseName) - Me.tbpClimsoft.Location = New System.Drawing.Point(4, 22) + Me.tbpClimsoft.Location = New System.Drawing.Point(4, 25) + Me.tbpClimsoft.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbpClimsoft.Name = "tbpClimsoft" - Me.tbpClimsoft.Padding = New System.Windows.Forms.Padding(3) - Me.tbpClimsoft.Size = New System.Drawing.Size(564, 291) + Me.tbpClimsoft.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpClimsoft.Size = New System.Drawing.Size(707, 367) Me.tbpClimsoft.TabIndex = 14 Me.tbpClimsoft.Text = "Climsoft" Me.tbpClimsoft.UseVisualStyleBackColor = True @@ -945,9 +1034,10 @@ Partial Class dlgOptions ' Me.lblUserName.AutoSize = True Me.lblUserName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblUserName.Location = New System.Drawing.Point(6, 103) + Me.lblUserName.Location = New System.Drawing.Point(8, 129) + Me.lblUserName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblUserName.Name = "lblUserName" - Me.lblUserName.Size = New System.Drawing.Size(58, 13) + Me.lblUserName.Size = New System.Drawing.Size(77, 17) Me.lblUserName.TabIndex = 19 Me.lblUserName.Text = "Username:" ' @@ -955,9 +1045,10 @@ Partial Class dlgOptions ' Me.lblPort.AutoSize = True Me.lblPort.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblPort.Location = New System.Drawing.Point(6, 76) + Me.lblPort.Location = New System.Drawing.Point(8, 95) + Me.lblPort.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblPort.Name = "lblPort" - Me.lblPort.Size = New System.Drawing.Size(29, 13) + Me.lblPort.Size = New System.Drawing.Size(38, 17) Me.lblPort.TabIndex = 18 Me.lblPort.Text = "Port:" ' @@ -965,9 +1056,10 @@ Partial Class dlgOptions ' Me.lblHost.AutoSize = True Me.lblHost.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHost.Location = New System.Drawing.Point(6, 49) + Me.lblHost.Location = New System.Drawing.Point(8, 61) + Me.lblHost.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblHost.Name = "lblHost" - Me.lblHost.Size = New System.Drawing.Size(32, 13) + Me.lblHost.Size = New System.Drawing.Size(41, 17) Me.lblHost.TabIndex = 17 Me.lblHost.Text = "Host:" ' @@ -975,9 +1067,10 @@ Partial Class dlgOptions ' Me.lblDatabaseName.AutoSize = True Me.lblDatabaseName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblDatabaseName.Location = New System.Drawing.Point(6, 21) + Me.lblDatabaseName.Location = New System.Drawing.Point(8, 26) + Me.lblDatabaseName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblDatabaseName.Name = "lblDatabaseName" - Me.lblDatabaseName.Size = New System.Drawing.Size(87, 13) + Me.lblDatabaseName.Size = New System.Drawing.Size(114, 17) Me.lblDatabaseName.TabIndex = 16 Me.lblDatabaseName.Text = "Database Name:" ' @@ -987,9 +1080,10 @@ Partial Class dlgOptions Me.ucrInputUserName.AutoSize = True Me.ucrInputUserName.IsMultiline = False Me.ucrInputUserName.IsReadOnly = False - Me.ucrInputUserName.Location = New System.Drawing.Point(168, 96) + Me.ucrInputUserName.Location = New System.Drawing.Point(210, 120) + Me.ucrInputUserName.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrInputUserName.Name = "ucrInputUserName" - Me.ucrInputUserName.Size = New System.Drawing.Size(137, 21) + Me.ucrInputUserName.Size = New System.Drawing.Size(171, 26) Me.ucrInputUserName.TabIndex = 15 ' 'ucrInputPort @@ -998,9 +1092,10 @@ Partial Class dlgOptions Me.ucrInputPort.AutoSize = True Me.ucrInputPort.IsMultiline = False Me.ucrInputPort.IsReadOnly = False - Me.ucrInputPort.Location = New System.Drawing.Point(168, 69) + Me.ucrInputPort.Location = New System.Drawing.Point(210, 86) + Me.ucrInputPort.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrInputPort.Name = "ucrInputPort" - Me.ucrInputPort.Size = New System.Drawing.Size(137, 21) + Me.ucrInputPort.Size = New System.Drawing.Size(171, 26) Me.ucrInputPort.TabIndex = 14 ' 'ucrInputHost @@ -1009,9 +1104,10 @@ Partial Class dlgOptions Me.ucrInputHost.AutoSize = True Me.ucrInputHost.IsMultiline = False Me.ucrInputHost.IsReadOnly = False - Me.ucrInputHost.Location = New System.Drawing.Point(168, 43) + Me.ucrInputHost.Location = New System.Drawing.Point(210, 54) + Me.ucrInputHost.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrInputHost.Name = "ucrInputHost" - Me.ucrInputHost.Size = New System.Drawing.Size(137, 21) + Me.ucrInputHost.Size = New System.Drawing.Size(171, 26) Me.ucrInputHost.TabIndex = 13 ' 'ucrInputDatabaseName @@ -1020,41 +1116,39 @@ Partial Class dlgOptions Me.ucrInputDatabaseName.AutoSize = True Me.ucrInputDatabaseName.IsMultiline = False Me.ucrInputDatabaseName.IsReadOnly = False - Me.ucrInputDatabaseName.Location = New System.Drawing.Point(168, 17) + Me.ucrInputDatabaseName.Location = New System.Drawing.Point(210, 21) + Me.ucrInputDatabaseName.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrInputDatabaseName.Name = "ucrInputDatabaseName" - Me.ucrInputDatabaseName.Size = New System.Drawing.Size(137, 21) + Me.ucrInputDatabaseName.Size = New System.Drawing.Size(171, 26) Me.ucrInputDatabaseName.TabIndex = 12 ' 'cmdLanguage ' Me.cmdLanguage.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLanguage.Location = New System.Drawing.Point(545, 324) + Me.cmdLanguage.Location = New System.Drawing.Point(681, 405) + Me.cmdLanguage.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdLanguage.Name = "cmdLanguage" - Me.cmdLanguage.Size = New System.Drawing.Size(37, 23) + Me.cmdLanguage.Size = New System.Drawing.Size(46, 29) Me.cmdLanguage.TabIndex = 13 Me.cmdLanguage.Tag = "" Me.cmdLanguage.Text = "Lang" Me.cmdLanguage.UseVisualStyleBackColor = True ' - 'ucrNudMaximumOutputsHeight + 'lversion ' - Me.ucrNudMaximumOutputsHeight.AutoSize = True - Me.ucrNudMaximumOutputsHeight.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudMaximumOutputsHeight.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudMaximumOutputsHeight.Location = New System.Drawing.Point(478, 135) - Me.ucrNudMaximumOutputsHeight.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudMaximumOutputsHeight.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudMaximumOutputsHeight.Name = "ucrNudMaximumOutputsHeight" - Me.ucrNudMaximumOutputsHeight.Size = New System.Drawing.Size(50, 20) - Me.ucrNudMaximumOutputsHeight.TabIndex = 29 - Me.ucrNudMaximumOutputsHeight.Value = New Decimal(New Integer() {0, 0, 0, 0}) + Me.lversion.Location = New System.Drawing.Point(382, 334) + Me.lversion.Name = "lversion" + Me.lversion.Size = New System.Drawing.Size(318, 23) + Me.lversion.TabIndex = 4 + Me.lversion.Text = "v. " + Me.lversion.TextAlign = System.Drawing.ContentAlignment.TopRight ' 'dlgOptions ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(770, 353) + Me.ClientSize = New System.Drawing.Size(962, 441) Me.Controls.Add(Me.cmdLanguage) Me.Controls.Add(Me.cmdApply) Me.Controls.Add(Me.cmdHelp) @@ -1062,6 +1156,7 @@ Partial Class dlgOptions Me.Controls.Add(Me.cmdOk) Me.Controls.Add(Me.spltControls) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgOptions" @@ -1186,4 +1281,5 @@ Partial Class dlgOptions Friend WithEvents cmdLanguage As Button Friend WithEvents ucrChkMaximumOutputsHeight As ucrCheck Friend WithEvents ucrNudMaximumOutputsHeight As ucrNud + Friend WithEvents lversion As Label End Class diff --git a/instat/dlgOptions.vb b/instat/dlgOptions.vb index e0df2826ad4..5dba5e52be8 100644 --- a/instat/dlgOptions.vb +++ b/instat/dlgOptions.vb @@ -44,6 +44,7 @@ Public Class dlgOptions LoadInstatOptions() ApplyEnabled(False) autoTranslate(Me) + lversion.Text = "v. " + My.Application.Info.Version.ToString End Sub Private Sub InitialiseDialog() diff --git a/instat/dlgVisualizeData.Designer.vb b/instat/dlgVisualizeData.Designer.vb index 251e378681a..e74fb59e6e4 100644 --- a/instat/dlgVisualizeData.Designer.vb +++ b/instat/dlgVisualizeData.Designer.vb @@ -155,7 +155,7 @@ Partial Class dlgVisualizeData Me.ucrNudAdjustSize.AutoSize = True Me.ucrNudAdjustSize.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudAdjustSize.Increment = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudAdjustSize.Location = New System.Drawing.Point(156, 325) + Me.ucrNudAdjustSize.Location = New System.Drawing.Point(235, 325) Me.ucrNudAdjustSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudAdjustSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAdjustSize.Name = "ucrNudAdjustSize" @@ -169,7 +169,7 @@ Partial Class dlgVisualizeData Me.ucrChkAdjustSize.Checked = False Me.ucrChkAdjustSize.Location = New System.Drawing.Point(10, 325) Me.ucrChkAdjustSize.Name = "ucrChkAdjustSize" - Me.ucrChkAdjustSize.Size = New System.Drawing.Size(130, 23) + Me.ucrChkAdjustSize.Size = New System.Drawing.Size(219, 23) Me.ucrChkAdjustSize.TabIndex = 19 ' 'ucrNudSamplingFunction @@ -274,7 +274,7 @@ Partial Class dlgVisualizeData Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrBase.Location = New System.Drawing.Point(10, 385) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(405, 52) + Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 18 ' 'dlgVisualizeData diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 0b9b1d2fcdf..47df165499f 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -5107,7 +5107,9 @@ Partial Class frmMain Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar Me.Name = "frmMain" - Me.Text = "R-Instat " + Me.Text = "R-Instat " + My.Application.Info.Version.Major.ToString + "." + + My.Application.Info.Version.Minor.ToString + "." + + My.Application.Info.Version.Build.ToString Me.WindowState = System.Windows.Forms.FormWindowState.Maximized Me.stsStrip.ResumeLayout(False) Me.stsStrip.PerformLayout() diff --git a/instat/sdgWindowNumber.Designer.vb b/instat/sdgWindowNumber.Designer.vb index bd409b61e5c..22cb8bc0542 100644 --- a/instat/sdgWindowNumber.Designer.vb +++ b/instat/sdgWindowNumber.Designer.vb @@ -24,7 +24,7 @@ Partial Class sdgWindowNumber Private Sub InitializeComponent() Me.lblTitleSize = New System.Windows.Forms.Label() Me.lblPages = New System.Windows.Forms.Label() - Me.ucrSdgPICSARainfalbuttons = New instat.ucrButtonsSubdialogue() + Me.ucrBaseWindowNumber = New instat.ucrButtonsSubdialogue() Me.ucrNudPageNumber = New instat.ucrNud() Me.SuspendLayout() ' @@ -32,53 +32,56 @@ Partial Class sdgWindowNumber ' Me.lblTitleSize.AutoSize = True Me.lblTitleSize.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblTitleSize.Location = New System.Drawing.Point(4, 21) + Me.lblTitleSize.Location = New System.Drawing.Point(6, 29) + Me.lblTitleSize.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblTitleSize.Name = "lblTitleSize" - Me.lblTitleSize.Size = New System.Drawing.Size(109, 13) + Me.lblTitleSize.Size = New System.Drawing.Size(162, 20) Me.lblTitleSize.TabIndex = 30 Me.lblTitleSize.Text = "Enter window number" ' 'lblPages ' Me.lblPages.AutoSize = True - Me.lblPages.Location = New System.Drawing.Point(112, 21) + Me.lblPages.Location = New System.Drawing.Point(168, 32) + Me.lblPages.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblPages.Name = "lblPages" - Me.lblPages.Size = New System.Drawing.Size(0, 13) + Me.lblPages.Size = New System.Drawing.Size(0, 20) Me.lblPages.TabIndex = 32 ' - 'ucrSdgPICSARainfalbuttons + 'ucrBaseWindowNumber ' - Me.ucrSdgPICSARainfalbuttons.AutoSize = True - Me.ucrSdgPICSARainfalbuttons.Location = New System.Drawing.Point(4, 47) - Me.ucrSdgPICSARainfalbuttons.Margin = New System.Windows.Forms.Padding(4) - Me.ucrSdgPICSARainfalbuttons.Name = "ucrSdgPICSARainfalbuttons" - Me.ucrSdgPICSARainfalbuttons.Size = New System.Drawing.Size(224, 30) - Me.ucrSdgPICSARainfalbuttons.TabIndex = 31 + Me.ucrBaseWindowNumber.AutoSize = True + Me.ucrBaseWindowNumber.Location = New System.Drawing.Point(6, 72) + Me.ucrBaseWindowNumber.Margin = New System.Windows.Forms.Padding(6) + Me.ucrBaseWindowNumber.Name = "ucrBaseWindowNumber" + Me.ucrBaseWindowNumber.Size = New System.Drawing.Size(336, 46) + Me.ucrBaseWindowNumber.TabIndex = 31 ' 'ucrNudPageNumber ' Me.ucrNudPageNumber.AutoSize = True Me.ucrNudPageNumber.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPageNumber.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudPageNumber.Location = New System.Drawing.Point(158, 17) - Me.ucrNudPageNumber.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudPageNumber.Location = New System.Drawing.Point(237, 27) + Me.ucrNudPageNumber.Margin = New System.Windows.Forms.Padding(8) Me.ucrNudPageNumber.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudPageNumber.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPageNumber.Name = "ucrNudPageNumber" - Me.ucrNudPageNumber.Size = New System.Drawing.Size(50, 20) + Me.ucrNudPageNumber.Size = New System.Drawing.Size(75, 31) Me.ucrNudPageNumber.TabIndex = 29 Me.ucrNudPageNumber.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'sdgWindowNumber ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(231, 81) + Me.ClientSize = New System.Drawing.Size(346, 125) Me.Controls.Add(Me.lblPages) - Me.Controls.Add(Me.ucrSdgPICSARainfalbuttons) + Me.Controls.Add(Me.ucrBaseWindowNumber) Me.Controls.Add(Me.lblTitleSize) Me.Controls.Add(Me.ucrNudPageNumber) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Name = "sdgWindowNumber" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Window_Number" @@ -90,6 +93,6 @@ Partial Class sdgWindowNumber Friend WithEvents lblTitleSize As Label Friend WithEvents ucrNudPageNumber As ucrNud - Friend WithEvents ucrSdgPICSARainfalbuttons As ucrButtonsSubdialogue + Friend WithEvents ucrBaseWindowNumber As ucrButtonsSubdialogue Friend WithEvents lblPages As Label End Class diff --git a/instat/sdgWindowNumber.vb b/instat/sdgWindowNumber.vb index 5ac90ad5392..6e92af9f793 100644 --- a/instat/sdgWindowNumber.vb +++ b/instat/sdgWindowNumber.vb @@ -44,6 +44,8 @@ Public Class sdgWindowNumber End Sub Private Sub InitialiseControls() + ucrBaseWindowNumber.iHelpTopicID = 294 + ' the maximum number of rows/columns to display Dim iMaxRowsCols = If(enumWINNUMBERMode = WINNUMBERMode.Row, frmMain.clsInstatOptions.iMaxRows, frmMain.clsInstatOptions.iMaxCols) @@ -59,7 +61,10 @@ Public Class sdgWindowNumber lblPages.Text = "1-" & iRowOrColMaxPages & ":" End Sub - Private Sub ucrSdgPICSARainfalbuttons_ClickReturn(sender As Object, e As EventArgs) Handles ucrSdgPICSARainfalbuttons.ClickReturn - iPage = ucrNudPageNumber.GetText() + Private Sub ucrSdgPICSARainfalbuttons_ClickReturn(sender As Object, e As EventArgs) Handles ucrBaseWindowNumber.ClickReturn + Dim strPageNum As String = ucrNudPageNumber.GetText() + If strPageNum <> "" Then + iPage = CInt(strPageNum) + End If End Sub End Class \ No newline at end of file diff --git a/instat/static/Help/R-Instat.chm b/instat/static/Help/R-Instat.chm index 6c74efaee63..9ee589aac54 100644 Binary files a/instat/static/Help/R-Instat.chm and b/instat/static/Help/R-Instat.chm differ diff --git a/instat/translations/en/r_instat_not_menus.json b/instat/translations/en/r_instat_not_menus.json index 99a63597d9c..ad2cb68defa 100644 --- a/instat/translations/en/r_instat_not_menus.json +++ b/instat/translations/en/r_instat_not_menus.json @@ -3679,7 +3679,7 @@ "Formula": "Formula", "Dumbbell options": "Dumbbell options", "X End Variable:": "X End Variable:", - "Adjust size of variable": "Adjust size of variable", + "Adjust size of variable names:": "Adjust size of variable names:", "Shave": "Shave", "Rearrange": "Rearrange", "Leading Zeros": "Leading Zeros", @@ -3710,6 +3710,12 @@ "Category:": "Category:", "Show Command": "Show Command", "Lists:": "Lists:", + "Absolute": "Absolute", + "Omit Character Variables": "Omit Character Variables", + "True": "True", + "False": "False", + "Frequencies": "Frequencies", + "Slopes": "Slopes", "Subtotals": "Subtotals", "Initial Column Factor:": "Initial Column Factor:", "Initial Row Factor(s) :": "Initial Row Factor(s) :", diff --git a/instat/ucrAxes.Designer.vb b/instat/ucrAxes.Designer.vb index fb5f10ce71b..43a7f7632d1 100644 --- a/instat/ucrAxes.Designer.vb +++ b/instat/ucrAxes.Designer.vb @@ -380,9 +380,9 @@ Partial Class ucrAxes Me.ucrInputRelaceMissingvalues.AutoSize = True Me.ucrInputRelaceMissingvalues.IsMultiline = False Me.ucrInputRelaceMissingvalues.IsReadOnly = False - Me.ucrInputRelaceMissingvalues.Location = New System.Drawing.Point(112, 103) + Me.ucrInputRelaceMissingvalues.Location = New System.Drawing.Point(191, 103) Me.ucrInputRelaceMissingvalues.Name = "ucrInputRelaceMissingvalues" - Me.ucrInputRelaceMissingvalues.Size = New System.Drawing.Size(91, 21) + Me.ucrInputRelaceMissingvalues.Size = New System.Drawing.Size(78, 22) Me.ucrInputRelaceMissingvalues.TabIndex = 27 ' 'ucrInputExpand @@ -391,9 +391,9 @@ Partial Class ucrAxes Me.ucrInputExpand.AutoSize = True Me.ucrInputExpand.IsMultiline = False Me.ucrInputExpand.IsReadOnly = False - Me.ucrInputExpand.Location = New System.Drawing.Point(112, 187) + Me.ucrInputExpand.Location = New System.Drawing.Point(191, 187) Me.ucrInputExpand.Name = "ucrInputExpand" - Me.ucrInputExpand.Size = New System.Drawing.Size(91, 21) + Me.ucrInputExpand.Size = New System.Drawing.Size(78, 23) Me.ucrInputExpand.TabIndex = 27 ' 'ucrInputTransformation @@ -402,9 +402,9 @@ Partial Class ucrAxes Me.ucrInputTransformation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputTransformation.GetSetSelectedIndex = -1 Me.ucrInputTransformation.IsReadOnly = False - Me.ucrInputTransformation.Location = New System.Drawing.Point(112, 159) + Me.ucrInputTransformation.Location = New System.Drawing.Point(191, 159) Me.ucrInputTransformation.Name = "ucrInputTransformation" - Me.ucrInputTransformation.Size = New System.Drawing.Size(91, 21) + Me.ucrInputTransformation.Size = New System.Drawing.Size(78, 23) Me.ucrInputTransformation.TabIndex = 26 ' 'ucrInputPosition @@ -413,9 +413,9 @@ Partial Class ucrAxes Me.ucrInputPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputPosition.GetSetSelectedIndex = -1 Me.ucrInputPosition.IsReadOnly = False - Me.ucrInputPosition.Location = New System.Drawing.Point(112, 131) + Me.ucrInputPosition.Location = New System.Drawing.Point(191, 131) Me.ucrInputPosition.Name = "ucrInputPosition" - Me.ucrInputPosition.Size = New System.Drawing.Size(91, 21) + Me.ucrInputPosition.Size = New System.Drawing.Size(78, 23) Me.ucrInputPosition.TabIndex = 26 ' 'ucrChkExpand @@ -424,7 +424,7 @@ Partial Class ucrAxes Me.ucrChkExpand.Checked = False Me.ucrChkExpand.Location = New System.Drawing.Point(6, 187) Me.ucrChkExpand.Name = "ucrChkExpand" - Me.ucrChkExpand.Size = New System.Drawing.Size(100, 23) + Me.ucrChkExpand.Size = New System.Drawing.Size(202, 23) Me.ucrChkExpand.TabIndex = 23 ' 'ucrChkTransformation @@ -433,7 +433,7 @@ Partial Class ucrAxes Me.ucrChkTransformation.Checked = False Me.ucrChkTransformation.Location = New System.Drawing.Point(6, 159) Me.ucrChkTransformation.Name = "ucrChkTransformation" - Me.ucrChkTransformation.Size = New System.Drawing.Size(100, 23) + Me.ucrChkTransformation.Size = New System.Drawing.Size(202, 23) Me.ucrChkTransformation.TabIndex = 23 ' 'ucrChkPosition @@ -442,7 +442,7 @@ Partial Class ucrAxes Me.ucrChkPosition.Checked = False Me.ucrChkPosition.Location = New System.Drawing.Point(6, 131) Me.ucrChkPosition.Name = "ucrChkPosition" - Me.ucrChkPosition.Size = New System.Drawing.Size(100, 23) + Me.ucrChkPosition.Size = New System.Drawing.Size(202, 23) Me.ucrChkPosition.TabIndex = 23 ' 'ucrChkNaValue @@ -451,7 +451,7 @@ Partial Class ucrAxes Me.ucrChkNaValue.Checked = False Me.ucrChkNaValue.Location = New System.Drawing.Point(6, 103) Me.ucrChkNaValue.Name = "ucrChkNaValue" - Me.ucrChkNaValue.Size = New System.Drawing.Size(100, 23) + Me.ucrChkNaValue.Size = New System.Drawing.Size(202, 23) Me.ucrChkNaValue.TabIndex = 23 ' 'ucrInputUpperLimit @@ -807,10 +807,10 @@ Partial Class ucrAxes ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi + Me.Controls.Add(Me.grpScales) Me.Controls.Add(Me.grpScaleXDate) Me.Controls.Add(Me.grpMinorBreaks) Me.Controls.Add(Me.ucrInputAxisType) - Me.Controls.Add(Me.grpScales) Me.Controls.Add(Me.grpMajorBreaks) Me.Controls.Add(Me.grpAxisTitle) Me.Name = "ucrAxes" diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index 10df57984f9..cba34e869e3 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -905,11 +905,9 @@ Public Class ucrDataView sdgWindowNumber.iTotalRowOrColumn = GetCurrentDataFrameFocus().iTotalRowCount sdgWindowNumber.iEndRowOrColumn = GetCurrentDataFrameFocus().clsVisibleDataFramePage.intEndRow sdgWindowNumber.ShowDialog() - Dim iPageNum As Integer = sdgWindowNumber.iPage - If iPageNum > 0 Then - GetCurrentDataFrameFocus().clsVisibleDataFramePage.GoToSpecificRowPage(iPageNum) - RefreshWorksheet(_grid.CurrentWorksheet, GetCurrentDataFrameFocus()) - End If + + GetCurrentDataFrameFocus().clsVisibleDataFramePage.GoToSpecificRowPage(sdgWindowNumber.iPage) + RefreshWorksheet(_grid.CurrentWorksheet, GetCurrentDataFrameFocus()) End If End Sub @@ -919,11 +917,8 @@ Public Class ucrDataView sdgWindowNumber.iTotalRowOrColumn = GetCurrentDataFrameFocus().iTotalColumnCount sdgWindowNumber.iEndRowOrColumn = GetCurrentDataFrameFocus().clsVisibleDataFramePage.intEndColumn sdgWindowNumber.ShowDialog() - Dim iPageNum As Integer = sdgWindowNumber.iPage - If iPageNum > 0 Then - GetCurrentDataFrameFocus().clsVisibleDataFramePage.GoToSpecificColumnPage(iPageNum) - RefreshWorksheet(_grid.CurrentWorksheet, GetCurrentDataFrameFocus()) - End If + GetCurrentDataFrameFocus().clsVisibleDataFramePage.GoToSpecificColumnPage(sdgWindowNumber.iPage) + RefreshWorksheet(_grid.CurrentWorksheet, GetCurrentDataFrameFocus()) End If End Sub