From d98520a4450eaeb745293e33fc2c19067264c683 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 21 Aug 2024 12:46:54 +0300 Subject: [PATCH 1/8] changes made --- instat/dlgImportOpenAppBuilder.Designer.vb | 52 +++++++++ instat/dlgImportOpenAppBuilder.resx | 120 +++++++++++++++++++++ instat/dlgImportOpenAppBuilder.vb | 3 + instat/frmMain.Designer.vb | 92 ++++++++-------- instat/frmMain.vb | 4 + instat/instat.vbproj | 9 ++ 6 files changed, 237 insertions(+), 43 deletions(-) create mode 100644 instat/dlgImportOpenAppBuilder.Designer.vb create mode 100644 instat/dlgImportOpenAppBuilder.resx create mode 100644 instat/dlgImportOpenAppBuilder.vb diff --git a/instat/dlgImportOpenAppBuilder.Designer.vb b/instat/dlgImportOpenAppBuilder.Designer.vb new file mode 100644 index 00000000000..719eb4ee0fb --- /dev/null +++ b/instat/dlgImportOpenAppBuilder.Designer.vb @@ -0,0 +1,52 @@ + _ +Partial Class dlgImportOpenAppBuilder + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(14, 331) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 0 + ' + 'dlgImportOpenAppBuilder + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(435, 391) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgImportOpenAppBuilder" + Me.Text = "Import From OpenAppBuilder" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgImportOpenAppBuilder.resx b/instat/dlgImportOpenAppBuilder.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/dlgImportOpenAppBuilder.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgImportOpenAppBuilder.vb b/instat/dlgImportOpenAppBuilder.vb new file mode 100644 index 00000000000..88073b55296 --- /dev/null +++ b/instat/dlgImportOpenAppBuilder.vb @@ -0,0 +1,3 @@ +Public Class dlgImportOpenAppBuilder + +End Class \ No newline at end of file diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 4b5909ef8c6..d6f36fd3069 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -185,6 +185,7 @@ Partial Class frmMain Me.mnuHelpGlossary = New System.Windows.Forms.ToolStripMenuItem() Me.mnuHelpLicence = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator29 = New System.Windows.Forms.ToolStripSeparator() + Me.RInstatResourcesSiteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.mnuHelpPackagesDocumentation = New System.Windows.Forms.ToolStripMenuItem() Me.OpenFile = New System.Windows.Forms.OpenFileDialog() Me.ToolStripSeparator16 = New System.Windows.Forms.ToolStripSeparator() @@ -700,7 +701,7 @@ Partial Class frmMain Me.mnuDataFrameMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuLogFile = New System.Windows.Forms.ToolStripMenuItem() - Me.RInstatResourcesSiteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuFileImportFromOpenAppBuilder = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -1559,42 +1560,42 @@ Partial Class frmMain 'mnuHelpHelpIntroduction ' Me.mnuHelpHelpIntroduction.Name = "mnuHelpHelpIntroduction" - Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(230, 22) Me.mnuHelpHelpIntroduction.Text = "Introduction..." ' 'mnuHelpFAQ ' Me.mnuHelpFAQ.Name = "mnuHelpFAQ" - Me.mnuHelpFAQ.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpFAQ.Size = New System.Drawing.Size(230, 22) Me.mnuHelpFAQ.Text = "FAQ..." ' 'mnuHelpGetingStarted ' Me.mnuHelpGetingStarted.Name = "mnuHelpGetingStarted" - Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(230, 22) Me.mnuHelpGetingStarted.Text = "Getting Started..." ' 'mnuHelpData ' Me.mnuHelpData.Name = "mnuHelpData" - Me.mnuHelpData.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpData.Size = New System.Drawing.Size(230, 22) Me.mnuHelpData.Text = "Data..." ' 'ToolStripSeparator28 ' Me.ToolStripSeparator28.Name = "ToolStripSeparator28" - Me.ToolStripSeparator28.Size = New System.Drawing.Size(215, 6) + Me.ToolStripSeparator28.Size = New System.Drawing.Size(227, 6) ' 'mnuHelpWindows ' Me.mnuHelpWindows.Name = "mnuHelpWindows" - Me.mnuHelpWindows.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpWindows.Size = New System.Drawing.Size(230, 22) Me.mnuHelpWindows.Text = "Windows..." ' 'ToolStripSeparator81 ' Me.ToolStripSeparator81.Name = "ToolStripSeparator81" - Me.ToolStripSeparator81.Size = New System.Drawing.Size(215, 6) + Me.ToolStripSeparator81.Size = New System.Drawing.Size(227, 6) ' 'mnuHelpMenus ' @@ -1688,40 +1689,46 @@ Partial Class frmMain 'mnuHelpAboutR ' Me.mnuHelpAboutR.Name = "mnuHelpAboutR" - Me.mnuHelpAboutR.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpAboutR.Size = New System.Drawing.Size(230, 22) Me.mnuHelpAboutR.Text = "About R..." Me.mnuHelpAboutR.Visible = False ' 'mnuHelpLearningStatistics ' Me.mnuHelpLearningStatistics.Name = "mnuHelpLearningStatistics" - Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(230, 22) Me.mnuHelpLearningStatistics.Text = "Learning Statistics..." Me.mnuHelpLearningStatistics.Visible = False ' 'mnuHelpRPackages ' Me.mnuHelpRPackages.Name = "mnuHelpRPackages" - Me.mnuHelpRPackages.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpRPackages.Size = New System.Drawing.Size(230, 22) Me.mnuHelpRPackages.Text = "R Packages..." ' 'mnuHelpGlossary ' Me.mnuHelpGlossary.Name = "mnuHelpGlossary" - Me.mnuHelpGlossary.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpGlossary.Size = New System.Drawing.Size(230, 22) Me.mnuHelpGlossary.Text = "Glossary..." ' 'mnuHelpLicence ' Me.mnuHelpLicence.Name = "mnuHelpLicence" - Me.mnuHelpLicence.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpLicence.Size = New System.Drawing.Size(230, 22) Me.mnuHelpLicence.Tag = "Licence..." Me.mnuHelpLicence.Text = "Licence..." ' 'ToolStripSeparator29 ' Me.ToolStripSeparator29.Name = "ToolStripSeparator29" - Me.ToolStripSeparator29.Size = New System.Drawing.Size(215, 6) + Me.ToolStripSeparator29.Size = New System.Drawing.Size(227, 6) + ' + 'RInstatResourcesSiteToolStripMenuItem + ' + Me.RInstatResourcesSiteToolStripMenuItem.Name = "RInstatResourcesSiteToolStripMenuItem" + Me.RInstatResourcesSiteToolStripMenuItem.Size = New System.Drawing.Size(230, 22) + Me.RInstatResourcesSiteToolStripMenuItem.Text = "R-Instat Resources Site" ' 'mnuHelpPackagesDocumentation ' @@ -2936,7 +2943,7 @@ Partial Class frmMain ' Me.mnuFileSave.Name = "mnuFileSave" 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(232, 22) + Me.mnuFileSave.Size = New System.Drawing.Size(241, 22) Me.mnuFileSave.Tag = "Save" Me.mnuFileSave.Text = "Save..." ' @@ -2944,7 +2951,7 @@ Partial Class frmMain ' Me.mnuFileSaveAs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileSaveAsDataAs, Me.mnuFileSaveAsOutputAs, Me.mnuFileSaveAsLogAs, Me.mnuFileSaveAsScriptAs}) Me.mnuFileSaveAs.Name = "mnuFileSaveAs" - Me.mnuFileSaveAs.Size = New System.Drawing.Size(232, 22) + Me.mnuFileSaveAs.Size = New System.Drawing.Size(241, 22) Me.mnuFileSaveAs.Tag = "Save_As" Me.mnuFileSaveAs.Text = "Save As" ' @@ -2977,7 +2984,7 @@ Partial Class frmMain Me.mnuFilePrint.Enabled = False Me.mnuFilePrint.Name = "mnuFilePrint" 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(232, 22) + Me.mnuFilePrint.Size = New System.Drawing.Size(241, 22) Me.mnuFilePrint.Tag = "Print" Me.mnuFilePrint.Text = "Print..." Me.mnuFilePrint.Visible = False @@ -2986,7 +2993,7 @@ Partial Class frmMain ' Me.mnuFilePrintPreview.Enabled = False Me.mnuFilePrintPreview.Name = "mnuFilePrintPreview" - Me.mnuFilePrintPreview.Size = New System.Drawing.Size(232, 22) + Me.mnuFilePrintPreview.Size = New System.Drawing.Size(241, 22) Me.mnuFilePrintPreview.Tag = "Print_Preview" Me.mnuFilePrintPreview.Text = "Print Preview..." Me.mnuFilePrintPreview.Visible = False @@ -2994,12 +3001,12 @@ Partial Class frmMain 'tlSeparatorFile3 ' Me.tlSeparatorFile3.Name = "tlSeparatorFile3" - Me.tlSeparatorFile3.Size = New System.Drawing.Size(229, 6) + Me.tlSeparatorFile3.Size = New System.Drawing.Size(238, 6) ' 'mnuFIleExit ' Me.mnuFIleExit.Name = "mnuFIleExit" - Me.mnuFIleExit.Size = New System.Drawing.Size(232, 22) + Me.mnuFIleExit.Size = New System.Drawing.Size(241, 22) Me.mnuFIleExit.Tag = "Exit" Me.mnuFIleExit.Text = "Exit" ' @@ -3381,7 +3388,7 @@ Partial Class frmMain ' 'mnuFile ' - Me.mnuFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileNewDataFrame, Me.mnuFileImportFromFile, Me.mnuFileImportFromLibrary, Me.ToolStripSeparator35, Me.mnuFileImportFromODK, Me.mnuFileImportFromCSPRO, Me.mnuFileImportFromDatabases, Me.mnuFileImportFromPostgres, Me.mnuFileImportFromRapidPro, Me.mnuFileImportandTidyNetCDFFile, Me.mnuFileConvert, Me.tlSeparatorFile, Me.mnuFileSave, Me.mnuFileSaveAs, Me.mnuFileExport, Me.mnuFilePrint, Me.mnuFilePrintPreview, Me.tlSeparatorFile3, Me.mnuFileCloseData, Me.ToolStripSeparator8, Me.mnuFIleExit}) + Me.mnuFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileNewDataFrame, Me.mnuFileImportFromFile, Me.mnuFileImportFromLibrary, Me.ToolStripSeparator35, Me.mnuFileImportFromODK, Me.mnuFileImportFromCSPRO, Me.mnuFileImportFromDatabases, Me.mnuFileImportFromPostgres, Me.mnuFileImportFromRapidPro, Me.mnuFileImportandTidyNetCDFFile, Me.mnuFileImportFromOpenAppBuilder, Me.mnuFileConvert, Me.tlSeparatorFile, Me.mnuFileSave, Me.mnuFileSaveAs, Me.mnuFileExport, Me.mnuFilePrint, Me.mnuFilePrintPreview, Me.tlSeparatorFile3, Me.mnuFileCloseData, Me.ToolStripSeparator8, Me.mnuFIleExit}) Me.mnuFile.Name = "mnuFile" Me.mnuFile.Size = New System.Drawing.Size(37, 22) Me.mnuFile.Tag = "File" @@ -3391,7 +3398,7 @@ Partial Class frmMain ' Me.mnuFileNewDataFrame.Name = "mnuFileNewDataFrame" Me.mnuFileNewDataFrame.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.N), System.Windows.Forms.Keys) - Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(232, 22) + Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(241, 22) Me.mnuFileNewDataFrame.Tag = "New_Data_Frame" Me.mnuFileNewDataFrame.Text = "New Data Frame..." ' @@ -3399,33 +3406,33 @@ Partial Class frmMain ' Me.mnuFileImportFromFile.Name = "mnuFileImportFromFile" Me.mnuFileImportFromFile.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O), System.Windows.Forms.Keys) - Me.mnuFileImportFromFile.Size = New System.Drawing.Size(232, 22) + Me.mnuFileImportFromFile.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromFile.Tag = "Import_From_File" Me.mnuFileImportFromFile.Text = "Import From File..." ' 'mnuFileImportFromLibrary ' Me.mnuFileImportFromLibrary.Name = "mnuFileImportFromLibrary" - Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(232, 22) + Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromLibrary.Tag = "Open_From_Library" Me.mnuFileImportFromLibrary.Text = "Import From Library..." ' 'ToolStripSeparator35 ' Me.ToolStripSeparator35.Name = "ToolStripSeparator35" - Me.ToolStripSeparator35.Size = New System.Drawing.Size(229, 6) + Me.ToolStripSeparator35.Size = New System.Drawing.Size(238, 6) ' 'mnuFileImportFromODK ' Me.mnuFileImportFromODK.Name = "mnuFileImportFromODK" - Me.mnuFileImportFromODK.Size = New System.Drawing.Size(232, 22) + Me.mnuFileImportFromODK.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromODK.Text = "Import From ODK..." ' 'mnuFileImportFromCSPRO ' Me.mnuFileImportFromCSPRO.Enabled = False Me.mnuFileImportFromCSPRO.Name = "mnuFileImportFromCSPRO" - Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(232, 22) + Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromCSPRO.Text = "Import From CSPRO..." Me.mnuFileImportFromCSPRO.Visible = False ' @@ -3433,7 +3440,7 @@ Partial Class frmMain ' Me.mnuFileImportFromDatabases.Enabled = False Me.mnuFileImportFromDatabases.Name = "mnuFileImportFromDatabases" - Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(232, 22) + Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromDatabases.Text = "Import From Databases..." Me.mnuFileImportFromDatabases.Visible = False ' @@ -3441,40 +3448,40 @@ Partial Class frmMain ' Me.mnuFileImportFromPostgres.Enabled = False Me.mnuFileImportFromPostgres.Name = "mnuFileImportFromPostgres" - Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(232, 22) + Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromPostgres.Text = "Import From Postgres" Me.mnuFileImportFromPostgres.Visible = False ' 'mnuFileImportFromRapidPro ' Me.mnuFileImportFromRapidPro.Name = "mnuFileImportFromRapidPro" - Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(232, 22) + Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromRapidPro.Text = "Import From RapidPro" ' 'mnuFileImportandTidyNetCDFFile ' Me.mnuFileImportandTidyNetCDFFile.Name = "mnuFileImportandTidyNetCDFFile" - Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(232, 22) + Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportandTidyNetCDFFile.Text = "Import and Tidy NetCDF File..." ' 'mnuFileConvert ' Me.mnuFileConvert.Enabled = False Me.mnuFileConvert.Name = "mnuFileConvert" - Me.mnuFileConvert.Size = New System.Drawing.Size(232, 22) + Me.mnuFileConvert.Size = New System.Drawing.Size(241, 22) Me.mnuFileConvert.Text = "Convert..." Me.mnuFileConvert.Visible = False ' 'tlSeparatorFile ' Me.tlSeparatorFile.Name = "tlSeparatorFile" - Me.tlSeparatorFile.Size = New System.Drawing.Size(229, 6) + Me.tlSeparatorFile.Size = New System.Drawing.Size(238, 6) ' 'mnuFileExport ' Me.mnuFileExport.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileExportExportDataSet, Me.mnuFileExportExportRObjectsToolStripMenuItem, Me.mnuFileExportExportRWorkspace, Me.mnuFileExportExportGraphAsImage}) Me.mnuFileExport.Name = "mnuFileExport" - Me.mnuFileExport.Size = New System.Drawing.Size(232, 22) + Me.mnuFileExport.Size = New System.Drawing.Size(241, 22) Me.mnuFileExport.Text = "Export" ' 'mnuFileExportExportDataSet @@ -3504,13 +3511,13 @@ Partial Class frmMain 'mnuFileCloseData ' Me.mnuFileCloseData.Name = "mnuFileCloseData" - Me.mnuFileCloseData.Size = New System.Drawing.Size(232, 22) + Me.mnuFileCloseData.Size = New System.Drawing.Size(241, 22) Me.mnuFileCloseData.Text = "Close Data Book" ' 'ToolStripSeparator8 ' Me.ToolStripSeparator8.Name = "ToolStripSeparator8" - Me.ToolStripSeparator8.Size = New System.Drawing.Size(229, 6) + Me.ToolStripSeparator8.Size = New System.Drawing.Size(238, 6) ' 'mnuPrepare ' @@ -5226,11 +5233,11 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' - 'RInstatResourcesSiteToolStripMenuItem + 'mnuFileImportFromOpenAppBuilder ' - Me.RInstatResourcesSiteToolStripMenuItem.Name = "RInstatResourcesSiteToolStripMenuItem" - Me.RInstatResourcesSiteToolStripMenuItem.Size = New System.Drawing.Size(230, 22) - Me.RInstatResourcesSiteToolStripMenuItem.Text = "R-Instat Resources Site" + Me.mnuFileImportFromOpenAppBuilder.Name = "mnuFileImportFromOpenAppBuilder" + Me.mnuFileImportFromOpenAppBuilder.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromOpenAppBuilder.Text = "Import From OpenAppBuilder..." ' 'frmMain ' @@ -5245,9 +5252,7 @@ Partial Class frmMain Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar Me.Name = "frmMain" - Me.Text = "R-Instat " + My.Application.Info.Version.Major.ToString + "." + - My.Application.Info.Version.Minor.ToString + "." + - My.Application.Info.Version.Build.ToString + Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized Me.stsStrip.ResumeLayout(False) Me.stsStrip.PerformLayout() @@ -5954,4 +5959,5 @@ Partial Class frmMain Friend WithEvents mnuSwapDataLogScript As ToolStripMenuItem Friend WithEvents mnuSwapDataMetadata As ToolStripMenuItem Friend WithEvents RInstatResourcesSiteToolStripMenuItem As ToolStripMenuItem + Friend WithEvents mnuFileImportFromOpenAppBuilder As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 5dcc43a4420..df40a3ae165 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2847,4 +2847,8 @@ Public Class frmMain Private Sub RInstatResourcesSiteToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles RInstatResourcesSiteToolStripMenuItem.Click Process.Start("https://ecampus.r-instat.org/course/view.php?id=14") End Sub + + Private Sub mnuFileImportFromOpenAppBuilder_Click(sender As Object, e As EventArgs) Handles mnuFileImportFromOpenAppBuilder.Click + dlgImportOpenAppBuilder.ShowDialog() + End Sub End Class diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 7670f979bf2..78fbab2eb1a 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -281,6 +281,12 @@ Form + + dlgImportOpenAppBuilder.vb + + + Form + dlgRandomSplit.vb @@ -3137,6 +3143,9 @@ dlgImportFromRapidPro.vb + + dlgImportOpenAppBuilder.vb + dlgInfillMissingValues.vb From d85ff3cad07ffa07538eafa00f10d68d5e4df0b9 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 21 Aug 2024 12:56:30 +0300 Subject: [PATCH 2/8] changes --- instat/dlgImportOpenAppBuilder.Designer.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/dlgImportOpenAppBuilder.Designer.vb b/instat/dlgImportOpenAppBuilder.Designer.vb index 719eb4ee0fb..79f72b5236d 100644 --- a/instat/dlgImportOpenAppBuilder.Designer.vb +++ b/instat/dlgImportOpenAppBuilder.Designer.vb @@ -43,6 +43,7 @@ Partial Class dlgImportOpenAppBuilder Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgImportOpenAppBuilder" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Import From OpenAppBuilder" Me.ResumeLayout(False) From e108e5b4e97da154ce82e6f2977e4dc791f14687 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 21 Aug 2024 12:58:38 +0300 Subject: [PATCH 3/8] changes --- instat/frmMain.Designer.vb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index d6f36fd3069..9360b4214b0 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -440,6 +440,7 @@ Partial Class frmMain Me.mnuFileImportFromPostgres = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFileImportFromRapidPro = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFileImportandTidyNetCDFFile = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuFileImportFromOpenAppBuilder = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFileConvert = New System.Windows.Forms.ToolStripMenuItem() Me.tlSeparatorFile = New System.Windows.Forms.ToolStripSeparator() Me.mnuFileExport = New System.Windows.Forms.ToolStripMenuItem() @@ -701,7 +702,6 @@ Partial Class frmMain Me.mnuDataFrameMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuLogFile = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuFileImportFromOpenAppBuilder = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -3464,6 +3464,13 @@ Partial Class frmMain Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportandTidyNetCDFFile.Text = "Import and Tidy NetCDF File..." ' + 'mnuFileImportFromOpenAppBuilder + ' + Me.mnuFileImportFromOpenAppBuilder.Enabled = False + Me.mnuFileImportFromOpenAppBuilder.Name = "mnuFileImportFromOpenAppBuilder" + Me.mnuFileImportFromOpenAppBuilder.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromOpenAppBuilder.Text = "Import From OpenAppBuilder..." + ' 'mnuFileConvert ' Me.mnuFileConvert.Enabled = False @@ -5233,12 +5240,6 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' - 'mnuFileImportFromOpenAppBuilder - ' - Me.mnuFileImportFromOpenAppBuilder.Name = "mnuFileImportFromOpenAppBuilder" - Me.mnuFileImportFromOpenAppBuilder.Size = New System.Drawing.Size(241, 22) - Me.mnuFileImportFromOpenAppBuilder.Text = "Import From OpenAppBuilder..." - ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) From 012a662eda78557b5082b9de297e2fc60c0c2166 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 21 Aug 2024 13:23:49 +0300 Subject: [PATCH 4/8] change --- instat/dlgImportOpenAppBuilder.Designer.vb | 53 --------- instat/dlgImportOpenAppBuilder.resx | 120 --------------------- instat/dlgImportOpenAppBuilder.vb | 3 - instat/frmMain.Designer.vb | 53 ++++----- instat/frmMain.vb | 3 - instat/instat.vbproj | 9 -- 6 files changed, 22 insertions(+), 219 deletions(-) delete mode 100644 instat/dlgImportOpenAppBuilder.Designer.vb delete mode 100644 instat/dlgImportOpenAppBuilder.resx delete mode 100644 instat/dlgImportOpenAppBuilder.vb diff --git a/instat/dlgImportOpenAppBuilder.Designer.vb b/instat/dlgImportOpenAppBuilder.Designer.vb deleted file mode 100644 index 79f72b5236d..00000000000 --- a/instat/dlgImportOpenAppBuilder.Designer.vb +++ /dev/null @@ -1,53 +0,0 @@ - _ -Partial Class dlgImportOpenAppBuilder - Inherits System.Windows.Forms.Form - - 'Form overrides dispose to clean up the component list. - _ - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Required by the Windows Form Designer - Private components As System.ComponentModel.IContainer - - 'NOTE: The following procedure is required by the Windows Form Designer - 'It can be modified using the Windows Form Designer. - 'Do not modify it using the code editor. - _ - Private Sub InitializeComponent() - Me.ucrBase = New instat.ucrButtons() - Me.SuspendLayout() - ' - 'ucrBase - ' - Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(14, 331) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 52) - Me.ucrBase.TabIndex = 0 - ' - 'dlgImportOpenAppBuilder - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(435, 391) - Me.Controls.Add(Me.ucrBase) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.MaximizeBox = False - Me.MinimizeBox = False - Me.Name = "dlgImportOpenAppBuilder" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Import From OpenAppBuilder" - Me.ResumeLayout(False) - - End Sub - - Friend WithEvents ucrBase As ucrButtons -End Class diff --git a/instat/dlgImportOpenAppBuilder.resx b/instat/dlgImportOpenAppBuilder.resx deleted file mode 100644 index 1af7de150c9..00000000000 --- a/instat/dlgImportOpenAppBuilder.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/instat/dlgImportOpenAppBuilder.vb b/instat/dlgImportOpenAppBuilder.vb deleted file mode 100644 index 88073b55296..00000000000 --- a/instat/dlgImportOpenAppBuilder.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class dlgImportOpenAppBuilder - -End Class \ No newline at end of file diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 9360b4214b0..c5e13641fad 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -440,7 +440,6 @@ Partial Class frmMain Me.mnuFileImportFromPostgres = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFileImportFromRapidPro = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFileImportandTidyNetCDFFile = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuFileImportFromOpenAppBuilder = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFileConvert = New System.Windows.Forms.ToolStripMenuItem() Me.tlSeparatorFile = New System.Windows.Forms.ToolStripSeparator() Me.mnuFileExport = New System.Windows.Forms.ToolStripMenuItem() @@ -2943,7 +2942,7 @@ Partial Class frmMain ' Me.mnuFileSave.Name = "mnuFileSave" 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(241, 22) + Me.mnuFileSave.Size = New System.Drawing.Size(232, 22) Me.mnuFileSave.Tag = "Save" Me.mnuFileSave.Text = "Save..." ' @@ -2951,7 +2950,7 @@ Partial Class frmMain ' Me.mnuFileSaveAs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileSaveAsDataAs, Me.mnuFileSaveAsOutputAs, Me.mnuFileSaveAsLogAs, Me.mnuFileSaveAsScriptAs}) Me.mnuFileSaveAs.Name = "mnuFileSaveAs" - Me.mnuFileSaveAs.Size = New System.Drawing.Size(241, 22) + Me.mnuFileSaveAs.Size = New System.Drawing.Size(232, 22) Me.mnuFileSaveAs.Tag = "Save_As" Me.mnuFileSaveAs.Text = "Save As" ' @@ -2984,7 +2983,7 @@ Partial Class frmMain Me.mnuFilePrint.Enabled = False Me.mnuFilePrint.Name = "mnuFilePrint" 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(241, 22) + Me.mnuFilePrint.Size = New System.Drawing.Size(232, 22) Me.mnuFilePrint.Tag = "Print" Me.mnuFilePrint.Text = "Print..." Me.mnuFilePrint.Visible = False @@ -2993,7 +2992,7 @@ Partial Class frmMain ' Me.mnuFilePrintPreview.Enabled = False Me.mnuFilePrintPreview.Name = "mnuFilePrintPreview" - Me.mnuFilePrintPreview.Size = New System.Drawing.Size(241, 22) + Me.mnuFilePrintPreview.Size = New System.Drawing.Size(232, 22) Me.mnuFilePrintPreview.Tag = "Print_Preview" Me.mnuFilePrintPreview.Text = "Print Preview..." Me.mnuFilePrintPreview.Visible = False @@ -3001,12 +3000,12 @@ Partial Class frmMain 'tlSeparatorFile3 ' Me.tlSeparatorFile3.Name = "tlSeparatorFile3" - Me.tlSeparatorFile3.Size = New System.Drawing.Size(238, 6) + Me.tlSeparatorFile3.Size = New System.Drawing.Size(229, 6) ' 'mnuFIleExit ' Me.mnuFIleExit.Name = "mnuFIleExit" - Me.mnuFIleExit.Size = New System.Drawing.Size(241, 22) + Me.mnuFIleExit.Size = New System.Drawing.Size(232, 22) Me.mnuFIleExit.Tag = "Exit" Me.mnuFIleExit.Text = "Exit" ' @@ -3388,7 +3387,7 @@ Partial Class frmMain ' 'mnuFile ' - Me.mnuFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileNewDataFrame, Me.mnuFileImportFromFile, Me.mnuFileImportFromLibrary, Me.ToolStripSeparator35, Me.mnuFileImportFromODK, Me.mnuFileImportFromCSPRO, Me.mnuFileImportFromDatabases, Me.mnuFileImportFromPostgres, Me.mnuFileImportFromRapidPro, Me.mnuFileImportandTidyNetCDFFile, Me.mnuFileImportFromOpenAppBuilder, Me.mnuFileConvert, Me.tlSeparatorFile, Me.mnuFileSave, Me.mnuFileSaveAs, Me.mnuFileExport, Me.mnuFilePrint, Me.mnuFilePrintPreview, Me.tlSeparatorFile3, Me.mnuFileCloseData, Me.ToolStripSeparator8, Me.mnuFIleExit}) + Me.mnuFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileNewDataFrame, Me.mnuFileImportFromFile, Me.mnuFileImportFromLibrary, Me.ToolStripSeparator35, Me.mnuFileImportFromODK, Me.mnuFileImportFromCSPRO, Me.mnuFileImportFromDatabases, Me.mnuFileImportFromPostgres, Me.mnuFileImportFromRapidPro, Me.mnuFileImportandTidyNetCDFFile, Me.mnuFileConvert, Me.tlSeparatorFile, Me.mnuFileSave, Me.mnuFileSaveAs, Me.mnuFileExport, Me.mnuFilePrint, Me.mnuFilePrintPreview, Me.tlSeparatorFile3, Me.mnuFileCloseData, Me.ToolStripSeparator8, Me.mnuFIleExit}) Me.mnuFile.Name = "mnuFile" Me.mnuFile.Size = New System.Drawing.Size(37, 22) Me.mnuFile.Tag = "File" @@ -3398,7 +3397,7 @@ Partial Class frmMain ' Me.mnuFileNewDataFrame.Name = "mnuFileNewDataFrame" Me.mnuFileNewDataFrame.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.N), System.Windows.Forms.Keys) - Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(241, 22) + Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(232, 22) Me.mnuFileNewDataFrame.Tag = "New_Data_Frame" Me.mnuFileNewDataFrame.Text = "New Data Frame..." ' @@ -3406,33 +3405,33 @@ Partial Class frmMain ' Me.mnuFileImportFromFile.Name = "mnuFileImportFromFile" Me.mnuFileImportFromFile.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O), System.Windows.Forms.Keys) - Me.mnuFileImportFromFile.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromFile.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromFile.Tag = "Import_From_File" Me.mnuFileImportFromFile.Text = "Import From File..." ' 'mnuFileImportFromLibrary ' Me.mnuFileImportFromLibrary.Name = "mnuFileImportFromLibrary" - Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromLibrary.Tag = "Open_From_Library" Me.mnuFileImportFromLibrary.Text = "Import From Library..." ' 'ToolStripSeparator35 ' Me.ToolStripSeparator35.Name = "ToolStripSeparator35" - Me.ToolStripSeparator35.Size = New System.Drawing.Size(238, 6) + Me.ToolStripSeparator35.Size = New System.Drawing.Size(229, 6) ' 'mnuFileImportFromODK ' Me.mnuFileImportFromODK.Name = "mnuFileImportFromODK" - Me.mnuFileImportFromODK.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromODK.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromODK.Text = "Import From ODK..." ' 'mnuFileImportFromCSPRO ' Me.mnuFileImportFromCSPRO.Enabled = False Me.mnuFileImportFromCSPRO.Name = "mnuFileImportFromCSPRO" - Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromCSPRO.Text = "Import From CSPRO..." Me.mnuFileImportFromCSPRO.Visible = False ' @@ -3440,7 +3439,7 @@ Partial Class frmMain ' Me.mnuFileImportFromDatabases.Enabled = False Me.mnuFileImportFromDatabases.Name = "mnuFileImportFromDatabases" - Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromDatabases.Text = "Import From Databases..." Me.mnuFileImportFromDatabases.Visible = False ' @@ -3448,47 +3447,40 @@ Partial Class frmMain ' Me.mnuFileImportFromPostgres.Enabled = False Me.mnuFileImportFromPostgres.Name = "mnuFileImportFromPostgres" - Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromPostgres.Text = "Import From Postgres" Me.mnuFileImportFromPostgres.Visible = False ' 'mnuFileImportFromRapidPro ' Me.mnuFileImportFromRapidPro.Name = "mnuFileImportFromRapidPro" - Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromRapidPro.Text = "Import From RapidPro" ' 'mnuFileImportandTidyNetCDFFile ' Me.mnuFileImportandTidyNetCDFFile.Name = "mnuFileImportandTidyNetCDFFile" - Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportandTidyNetCDFFile.Text = "Import and Tidy NetCDF File..." ' - 'mnuFileImportFromOpenAppBuilder - ' - Me.mnuFileImportFromOpenAppBuilder.Enabled = False - Me.mnuFileImportFromOpenAppBuilder.Name = "mnuFileImportFromOpenAppBuilder" - Me.mnuFileImportFromOpenAppBuilder.Size = New System.Drawing.Size(241, 22) - Me.mnuFileImportFromOpenAppBuilder.Text = "Import From OpenAppBuilder..." - ' 'mnuFileConvert ' Me.mnuFileConvert.Enabled = False Me.mnuFileConvert.Name = "mnuFileConvert" - Me.mnuFileConvert.Size = New System.Drawing.Size(241, 22) + Me.mnuFileConvert.Size = New System.Drawing.Size(232, 22) Me.mnuFileConvert.Text = "Convert..." Me.mnuFileConvert.Visible = False ' 'tlSeparatorFile ' Me.tlSeparatorFile.Name = "tlSeparatorFile" - Me.tlSeparatorFile.Size = New System.Drawing.Size(238, 6) + Me.tlSeparatorFile.Size = New System.Drawing.Size(229, 6) ' 'mnuFileExport ' Me.mnuFileExport.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileExportExportDataSet, Me.mnuFileExportExportRObjectsToolStripMenuItem, Me.mnuFileExportExportRWorkspace, Me.mnuFileExportExportGraphAsImage}) Me.mnuFileExport.Name = "mnuFileExport" - Me.mnuFileExport.Size = New System.Drawing.Size(241, 22) + Me.mnuFileExport.Size = New System.Drawing.Size(232, 22) Me.mnuFileExport.Text = "Export" ' 'mnuFileExportExportDataSet @@ -3518,13 +3510,13 @@ Partial Class frmMain 'mnuFileCloseData ' Me.mnuFileCloseData.Name = "mnuFileCloseData" - Me.mnuFileCloseData.Size = New System.Drawing.Size(241, 22) + Me.mnuFileCloseData.Size = New System.Drawing.Size(232, 22) Me.mnuFileCloseData.Text = "Close Data Book" ' 'ToolStripSeparator8 ' Me.ToolStripSeparator8.Name = "ToolStripSeparator8" - Me.ToolStripSeparator8.Size = New System.Drawing.Size(238, 6) + Me.ToolStripSeparator8.Size = New System.Drawing.Size(229, 6) ' 'mnuPrepare ' @@ -5960,5 +5952,4 @@ Partial Class frmMain Friend WithEvents mnuSwapDataLogScript As ToolStripMenuItem Friend WithEvents mnuSwapDataMetadata As ToolStripMenuItem Friend WithEvents RInstatResourcesSiteToolStripMenuItem As ToolStripMenuItem - Friend WithEvents mnuFileImportFromOpenAppBuilder As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index df40a3ae165..e5c70aac150 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2848,7 +2848,4 @@ Public Class frmMain Process.Start("https://ecampus.r-instat.org/course/view.php?id=14") End Sub - Private Sub mnuFileImportFromOpenAppBuilder_Click(sender As Object, e As EventArgs) Handles mnuFileImportFromOpenAppBuilder.Click - dlgImportOpenAppBuilder.ShowDialog() - End Sub End Class diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 78fbab2eb1a..7670f979bf2 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -281,12 +281,6 @@ Form - - dlgImportOpenAppBuilder.vb - - - Form - dlgRandomSplit.vb @@ -3143,9 +3137,6 @@ dlgImportFromRapidPro.vb - - dlgImportOpenAppBuilder.vb - dlgInfillMissingValues.vb From 4bcacf331f9dbfb3c8bdb03ce1e16655944b6307 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 21 Aug 2024 13:46:46 +0300 Subject: [PATCH 5/8] changes --- instat/dlgImportOpenAppBuilder.Designer.vb | 53 +++++++++ instat/dlgImportOpenAppBuilder.resx | 120 +++++++++++++++++++++ instat/dlgImportOpenAppBuilder.vb | 3 + instat/instat.vbproj | 9 ++ 4 files changed, 185 insertions(+) create mode 100644 instat/dlgImportOpenAppBuilder.Designer.vb create mode 100644 instat/dlgImportOpenAppBuilder.resx create mode 100644 instat/dlgImportOpenAppBuilder.vb diff --git a/instat/dlgImportOpenAppBuilder.Designer.vb b/instat/dlgImportOpenAppBuilder.Designer.vb new file mode 100644 index 00000000000..22b34703456 --- /dev/null +++ b/instat/dlgImportOpenAppBuilder.Designer.vb @@ -0,0 +1,53 @@ + _ +Partial Class dlgImportOpenAppBuilder + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(19, 276) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 0 + ' + 'dlgImportOpenAppBuilder + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(450, 341) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgImportOpenAppBuilder" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Import From OpenAppBuilder" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgImportOpenAppBuilder.resx b/instat/dlgImportOpenAppBuilder.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/dlgImportOpenAppBuilder.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgImportOpenAppBuilder.vb b/instat/dlgImportOpenAppBuilder.vb new file mode 100644 index 00000000000..88073b55296 --- /dev/null +++ b/instat/dlgImportOpenAppBuilder.vb @@ -0,0 +1,3 @@ +Public Class dlgImportOpenAppBuilder + +End Class \ No newline at end of file diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 7670f979bf2..78fbab2eb1a 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -281,6 +281,12 @@ Form + + dlgImportOpenAppBuilder.vb + + + Form + dlgRandomSplit.vb @@ -3137,6 +3143,9 @@ dlgImportFromRapidPro.vb + + dlgImportOpenAppBuilder.vb + dlgInfillMissingValues.vb From 67ee34e39678b331eb8a0393b60edaaae77b5dcf Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 21 Aug 2024 13:52:19 +0300 Subject: [PATCH 6/8] changes --- instat/frmMain.Designer.vb | 52 ++++++++++++++++++++++---------------- instat/frmMain.vb | 3 +++ 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index c5e13641fad..abf561bd505 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -701,6 +701,7 @@ Partial Class frmMain Me.mnuDataFrameMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuLogFile = New System.Windows.Forms.ToolStripMenuItem() + Me.ImportFromOpenAppBuilderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -2942,7 +2943,7 @@ Partial Class frmMain ' Me.mnuFileSave.Name = "mnuFileSave" 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(232, 22) + Me.mnuFileSave.Size = New System.Drawing.Size(241, 22) Me.mnuFileSave.Tag = "Save" Me.mnuFileSave.Text = "Save..." ' @@ -2950,7 +2951,7 @@ Partial Class frmMain ' Me.mnuFileSaveAs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileSaveAsDataAs, Me.mnuFileSaveAsOutputAs, Me.mnuFileSaveAsLogAs, Me.mnuFileSaveAsScriptAs}) Me.mnuFileSaveAs.Name = "mnuFileSaveAs" - Me.mnuFileSaveAs.Size = New System.Drawing.Size(232, 22) + Me.mnuFileSaveAs.Size = New System.Drawing.Size(241, 22) Me.mnuFileSaveAs.Tag = "Save_As" Me.mnuFileSaveAs.Text = "Save As" ' @@ -2983,7 +2984,7 @@ Partial Class frmMain Me.mnuFilePrint.Enabled = False Me.mnuFilePrint.Name = "mnuFilePrint" 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(232, 22) + Me.mnuFilePrint.Size = New System.Drawing.Size(241, 22) Me.mnuFilePrint.Tag = "Print" Me.mnuFilePrint.Text = "Print..." Me.mnuFilePrint.Visible = False @@ -2992,7 +2993,7 @@ Partial Class frmMain ' Me.mnuFilePrintPreview.Enabled = False Me.mnuFilePrintPreview.Name = "mnuFilePrintPreview" - Me.mnuFilePrintPreview.Size = New System.Drawing.Size(232, 22) + Me.mnuFilePrintPreview.Size = New System.Drawing.Size(241, 22) Me.mnuFilePrintPreview.Tag = "Print_Preview" Me.mnuFilePrintPreview.Text = "Print Preview..." Me.mnuFilePrintPreview.Visible = False @@ -3000,12 +3001,12 @@ Partial Class frmMain 'tlSeparatorFile3 ' Me.tlSeparatorFile3.Name = "tlSeparatorFile3" - Me.tlSeparatorFile3.Size = New System.Drawing.Size(229, 6) + Me.tlSeparatorFile3.Size = New System.Drawing.Size(238, 6) ' 'mnuFIleExit ' Me.mnuFIleExit.Name = "mnuFIleExit" - Me.mnuFIleExit.Size = New System.Drawing.Size(232, 22) + Me.mnuFIleExit.Size = New System.Drawing.Size(241, 22) Me.mnuFIleExit.Tag = "Exit" Me.mnuFIleExit.Text = "Exit" ' @@ -3387,7 +3388,7 @@ Partial Class frmMain ' 'mnuFile ' - Me.mnuFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileNewDataFrame, Me.mnuFileImportFromFile, Me.mnuFileImportFromLibrary, Me.ToolStripSeparator35, Me.mnuFileImportFromODK, Me.mnuFileImportFromCSPRO, Me.mnuFileImportFromDatabases, Me.mnuFileImportFromPostgres, Me.mnuFileImportFromRapidPro, Me.mnuFileImportandTidyNetCDFFile, Me.mnuFileConvert, Me.tlSeparatorFile, Me.mnuFileSave, Me.mnuFileSaveAs, Me.mnuFileExport, Me.mnuFilePrint, Me.mnuFilePrintPreview, Me.tlSeparatorFile3, Me.mnuFileCloseData, Me.ToolStripSeparator8, Me.mnuFIleExit}) + Me.mnuFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileNewDataFrame, Me.mnuFileImportFromFile, Me.mnuFileImportFromLibrary, Me.ToolStripSeparator35, Me.mnuFileImportFromODK, Me.mnuFileImportFromCSPRO, Me.mnuFileImportFromDatabases, Me.mnuFileImportFromPostgres, Me.mnuFileImportFromRapidPro, Me.mnuFileImportandTidyNetCDFFile, Me.ImportFromOpenAppBuilderToolStripMenuItem, Me.mnuFileConvert, Me.tlSeparatorFile, Me.mnuFileSave, Me.mnuFileSaveAs, Me.mnuFileExport, Me.mnuFilePrint, Me.mnuFilePrintPreview, Me.tlSeparatorFile3, Me.mnuFileCloseData, Me.ToolStripSeparator8, Me.mnuFIleExit}) Me.mnuFile.Name = "mnuFile" Me.mnuFile.Size = New System.Drawing.Size(37, 22) Me.mnuFile.Tag = "File" @@ -3397,7 +3398,7 @@ Partial Class frmMain ' Me.mnuFileNewDataFrame.Name = "mnuFileNewDataFrame" Me.mnuFileNewDataFrame.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.N), System.Windows.Forms.Keys) - Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(232, 22) + Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(241, 22) Me.mnuFileNewDataFrame.Tag = "New_Data_Frame" Me.mnuFileNewDataFrame.Text = "New Data Frame..." ' @@ -3405,33 +3406,33 @@ Partial Class frmMain ' Me.mnuFileImportFromFile.Name = "mnuFileImportFromFile" Me.mnuFileImportFromFile.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O), System.Windows.Forms.Keys) - Me.mnuFileImportFromFile.Size = New System.Drawing.Size(232, 22) + Me.mnuFileImportFromFile.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromFile.Tag = "Import_From_File" Me.mnuFileImportFromFile.Text = "Import From File..." ' 'mnuFileImportFromLibrary ' Me.mnuFileImportFromLibrary.Name = "mnuFileImportFromLibrary" - Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(232, 22) + Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromLibrary.Tag = "Open_From_Library" Me.mnuFileImportFromLibrary.Text = "Import From Library..." ' 'ToolStripSeparator35 ' Me.ToolStripSeparator35.Name = "ToolStripSeparator35" - Me.ToolStripSeparator35.Size = New System.Drawing.Size(229, 6) + Me.ToolStripSeparator35.Size = New System.Drawing.Size(238, 6) ' 'mnuFileImportFromODK ' Me.mnuFileImportFromODK.Name = "mnuFileImportFromODK" - Me.mnuFileImportFromODK.Size = New System.Drawing.Size(232, 22) + Me.mnuFileImportFromODK.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromODK.Text = "Import From ODK..." ' 'mnuFileImportFromCSPRO ' Me.mnuFileImportFromCSPRO.Enabled = False Me.mnuFileImportFromCSPRO.Name = "mnuFileImportFromCSPRO" - Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(232, 22) + Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromCSPRO.Text = "Import From CSPRO..." Me.mnuFileImportFromCSPRO.Visible = False ' @@ -3439,7 +3440,7 @@ Partial Class frmMain ' Me.mnuFileImportFromDatabases.Enabled = False Me.mnuFileImportFromDatabases.Name = "mnuFileImportFromDatabases" - Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(232, 22) + Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromDatabases.Text = "Import From Databases..." Me.mnuFileImportFromDatabases.Visible = False ' @@ -3447,40 +3448,40 @@ Partial Class frmMain ' Me.mnuFileImportFromPostgres.Enabled = False Me.mnuFileImportFromPostgres.Name = "mnuFileImportFromPostgres" - Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(232, 22) + Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromPostgres.Text = "Import From Postgres" Me.mnuFileImportFromPostgres.Visible = False ' 'mnuFileImportFromRapidPro ' Me.mnuFileImportFromRapidPro.Name = "mnuFileImportFromRapidPro" - Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(232, 22) + Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromRapidPro.Text = "Import From RapidPro" ' 'mnuFileImportandTidyNetCDFFile ' Me.mnuFileImportandTidyNetCDFFile.Name = "mnuFileImportandTidyNetCDFFile" - Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(232, 22) + Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportandTidyNetCDFFile.Text = "Import and Tidy NetCDF File..." ' 'mnuFileConvert ' Me.mnuFileConvert.Enabled = False Me.mnuFileConvert.Name = "mnuFileConvert" - Me.mnuFileConvert.Size = New System.Drawing.Size(232, 22) + Me.mnuFileConvert.Size = New System.Drawing.Size(241, 22) Me.mnuFileConvert.Text = "Convert..." Me.mnuFileConvert.Visible = False ' 'tlSeparatorFile ' Me.tlSeparatorFile.Name = "tlSeparatorFile" - Me.tlSeparatorFile.Size = New System.Drawing.Size(229, 6) + Me.tlSeparatorFile.Size = New System.Drawing.Size(238, 6) ' 'mnuFileExport ' Me.mnuFileExport.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileExportExportDataSet, Me.mnuFileExportExportRObjectsToolStripMenuItem, Me.mnuFileExportExportRWorkspace, Me.mnuFileExportExportGraphAsImage}) Me.mnuFileExport.Name = "mnuFileExport" - Me.mnuFileExport.Size = New System.Drawing.Size(232, 22) + Me.mnuFileExport.Size = New System.Drawing.Size(241, 22) Me.mnuFileExport.Text = "Export" ' 'mnuFileExportExportDataSet @@ -3510,13 +3511,13 @@ Partial Class frmMain 'mnuFileCloseData ' Me.mnuFileCloseData.Name = "mnuFileCloseData" - Me.mnuFileCloseData.Size = New System.Drawing.Size(232, 22) + Me.mnuFileCloseData.Size = New System.Drawing.Size(241, 22) Me.mnuFileCloseData.Text = "Close Data Book" ' 'ToolStripSeparator8 ' Me.ToolStripSeparator8.Name = "ToolStripSeparator8" - Me.ToolStripSeparator8.Size = New System.Drawing.Size(229, 6) + Me.ToolStripSeparator8.Size = New System.Drawing.Size(238, 6) ' 'mnuPrepare ' @@ -5232,6 +5233,12 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' + 'ImportFromOpenAppBuilderToolStripMenuItem + ' + Me.ImportFromOpenAppBuilderToolStripMenuItem.Name = "ImportFromOpenAppBuilderToolStripMenuItem" + Me.ImportFromOpenAppBuilderToolStripMenuItem.Size = New System.Drawing.Size(241, 22) + Me.ImportFromOpenAppBuilderToolStripMenuItem.Text = "Import From OpenAppBuilder..." + ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -5952,4 +5959,5 @@ Partial Class frmMain Friend WithEvents mnuSwapDataLogScript As ToolStripMenuItem Friend WithEvents mnuSwapDataMetadata As ToolStripMenuItem Friend WithEvents RInstatResourcesSiteToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ImportFromOpenAppBuilderToolStripMenuItem As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index e5c70aac150..5c164fe374c 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2848,4 +2848,7 @@ Public Class frmMain Process.Start("https://ecampus.r-instat.org/course/view.php?id=14") End Sub + Private Sub ImportFromOpenAppBuilderToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ImportFromOpenAppBuilderToolStripMenuItem.Click + dlgImportOpenAppBuilder.ShowDialog() + End Sub End Class From dcde0a27ccce6ff87e1d02b4ce468739e3730989 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 21 Aug 2024 14:07:05 +0300 Subject: [PATCH 7/8] changes --- instat/frmMain.Designer.vb | 18 +++++++++--------- instat/frmMain.vb | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index abf561bd505..d1bc98c7d0f 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -440,6 +440,7 @@ Partial Class frmMain Me.mnuFileImportFromPostgres = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFileImportFromRapidPro = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFileImportandTidyNetCDFFile = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuImportFromOpenAppBuilder = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFileConvert = New System.Windows.Forms.ToolStripMenuItem() Me.tlSeparatorFile = New System.Windows.Forms.ToolStripSeparator() Me.mnuFileExport = New System.Windows.Forms.ToolStripMenuItem() @@ -701,7 +702,6 @@ Partial Class frmMain Me.mnuDataFrameMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuLogFile = New System.Windows.Forms.ToolStripMenuItem() - Me.ImportFromOpenAppBuilderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -3388,7 +3388,7 @@ Partial Class frmMain ' 'mnuFile ' - Me.mnuFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileNewDataFrame, Me.mnuFileImportFromFile, Me.mnuFileImportFromLibrary, Me.ToolStripSeparator35, Me.mnuFileImportFromODK, Me.mnuFileImportFromCSPRO, Me.mnuFileImportFromDatabases, Me.mnuFileImportFromPostgres, Me.mnuFileImportFromRapidPro, Me.mnuFileImportandTidyNetCDFFile, Me.ImportFromOpenAppBuilderToolStripMenuItem, Me.mnuFileConvert, Me.tlSeparatorFile, Me.mnuFileSave, Me.mnuFileSaveAs, Me.mnuFileExport, Me.mnuFilePrint, Me.mnuFilePrintPreview, Me.tlSeparatorFile3, Me.mnuFileCloseData, Me.ToolStripSeparator8, Me.mnuFIleExit}) + Me.mnuFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileNewDataFrame, Me.mnuFileImportFromFile, Me.mnuFileImportFromLibrary, Me.ToolStripSeparator35, Me.mnuFileImportFromODK, Me.mnuFileImportFromCSPRO, Me.mnuFileImportFromDatabases, Me.mnuFileImportFromPostgres, Me.mnuFileImportFromRapidPro, Me.mnuFileImportandTidyNetCDFFile, Me.mnuImportFromOpenAppBuilder, Me.mnuFileConvert, Me.tlSeparatorFile, Me.mnuFileSave, Me.mnuFileSaveAs, Me.mnuFileExport, Me.mnuFilePrint, Me.mnuFilePrintPreview, Me.tlSeparatorFile3, Me.mnuFileCloseData, Me.ToolStripSeparator8, Me.mnuFIleExit}) Me.mnuFile.Name = "mnuFile" Me.mnuFile.Size = New System.Drawing.Size(37, 22) Me.mnuFile.Tag = "File" @@ -3464,6 +3464,12 @@ Partial Class frmMain Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportandTidyNetCDFFile.Text = "Import and Tidy NetCDF File..." ' + 'mnuImportFromOpenAppBuilder + ' + Me.mnuImportFromOpenAppBuilder.Name = "mnuImportFromOpenAppBuilder" + Me.mnuImportFromOpenAppBuilder.Size = New System.Drawing.Size(241, 22) + Me.mnuImportFromOpenAppBuilder.Text = "Import From OpenAppBuilder..." + ' 'mnuFileConvert ' Me.mnuFileConvert.Enabled = False @@ -5233,12 +5239,6 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' - 'ImportFromOpenAppBuilderToolStripMenuItem - ' - Me.ImportFromOpenAppBuilderToolStripMenuItem.Name = "ImportFromOpenAppBuilderToolStripMenuItem" - Me.ImportFromOpenAppBuilderToolStripMenuItem.Size = New System.Drawing.Size(241, 22) - Me.ImportFromOpenAppBuilderToolStripMenuItem.Text = "Import From OpenAppBuilder..." - ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -5959,5 +5959,5 @@ Partial Class frmMain Friend WithEvents mnuSwapDataLogScript As ToolStripMenuItem Friend WithEvents mnuSwapDataMetadata As ToolStripMenuItem Friend WithEvents RInstatResourcesSiteToolStripMenuItem As ToolStripMenuItem - Friend WithEvents ImportFromOpenAppBuilderToolStripMenuItem As ToolStripMenuItem + Friend WithEvents mnuImportFromOpenAppBuilder As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 5c164fe374c..c6b67b8acdd 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2848,7 +2848,7 @@ Public Class frmMain Process.Start("https://ecampus.r-instat.org/course/view.php?id=14") End Sub - Private Sub ImportFromOpenAppBuilderToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ImportFromOpenAppBuilderToolStripMenuItem.Click + Private Sub mnuImportFromOpenAppBuilder_Click(sender As Object, e As EventArgs) Handles mnuImportFromOpenAppBuilder.Click dlgImportOpenAppBuilder.ShowDialog() End Sub End Class From d70f657723742ee0706f803eebeb7b486f4118e4 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 21 Aug 2024 14:16:12 +0300 Subject: [PATCH 8/8] change --- instat/frmMain.Designer.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index d1bc98c7d0f..a7bf5ad1fa8 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -3466,6 +3466,7 @@ Partial Class frmMain ' 'mnuImportFromOpenAppBuilder ' + Me.mnuImportFromOpenAppBuilder.Enabled = False Me.mnuImportFromOpenAppBuilder.Name = "mnuImportFromOpenAppBuilder" Me.mnuImportFromOpenAppBuilder.Size = New System.Drawing.Size(241, 22) Me.mnuImportFromOpenAppBuilder.Text = "Import From OpenAppBuilder..."