From 786bace95fd77e14b7068b904c065fc84b89dc16 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Sat, 12 Oct 2024 08:48:30 +0300 Subject: [PATCH 01/32] implementing undo --- instat/Model/DataFrame/clsDataFramePage.vb | 8 ++++ .../DataGrid/ReoGrid/ucrDataViewReoGrid.vb | 8 ++++ instat/static/InstatObject/R/data_object_R6.R | 44 ++++++++++++++++++- .../static/InstatObject/R/instat_object_R6.R | 5 +++ 4 files changed, 64 insertions(+), 1 deletion(-) diff --git a/instat/Model/DataFrame/clsDataFramePage.vb b/instat/Model/DataFrame/clsDataFramePage.vb index 2c119733bc4..b522bab885b 100644 --- a/instat/Model/DataFrame/clsDataFramePage.vb +++ b/instat/Model/DataFrame/clsDataFramePage.vb @@ -205,6 +205,14 @@ Public Class clsDataFramePage Return Math.Ceiling(_iTotalColumnCount / iColumnIncrements) End Function + Public Sub Undo() + Dim clsUndoRFunction As New RFunction + clsUndoRFunction.SetRCommand(_clsRLink.strInstatDataObject & "$undo_last_action") + clsUndoRFunction.AddParameter("data_name", Chr(34) & _strDataFrameName & Chr(34)) + _clsRLink.RunScript(clsUndoRFunction.ToScript) + + End Sub + Private Function GetDataFrameFromRCommand() As DataFrame Dim clsGetDataFrameRFunction As New RFunction Dim expTemp As SymbolicExpression diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index 5971cb5d66c..86d26777714 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -276,6 +276,14 @@ Public Class ucrDataViewReoGrid ElseIf (e.KeyCode And Not Keys.Modifiers) = Keys.F AndAlso e.Modifiers = Keys.Control Then RaiseEvent FindRow() End If + + ' Detect Ctrl+Z for Undo operation + If e.Control AndAlso e.KeyCode = Keys.Z Then + ' Perform Undo + GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() + e.Handled = True + e.SuppressKeyPress = True + End If End Sub Private Function GetColumnIndex(strColName As String) As Integer diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index b8fde8f2682..5a53179272f 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -5,7 +5,7 @@ DataSheet <- R6::R6Class("DataSheet", imported_from = "", messages = TRUE, convert=TRUE, create = TRUE, start_point=1, filters = list(), column_selections = list(), objects = list(), - calculations = list(), scalars = list(), keys = list(), comments = list(), keep_attributes = TRUE) + calculations = list(), scalars = list(), keys = list(), comments = list(), keep_attributes = TRUE, history = list()) { # Set up the data object self$set_data(data, messages) @@ -31,6 +31,9 @@ DataSheet <- R6::R6Class("DataSheet", self$set_scalars(scalars) self$set_keys(keys) self$set_comments(comments) + self$set_history(history) + + self$save_state_to_history() # If no name for the data.frame has been given in the list we create a default one. # Decide how to choose default name index @@ -59,6 +62,7 @@ DataSheet <- R6::R6Class("DataSheet", column_selections = list(), objects = list(), keys = list(), + history = list(), comments = list(), calculations = list(), scalars = list(), @@ -161,6 +165,12 @@ DataSheet$set("public", "set_data", function(new_data, messages=TRUE, check_name } ) +DataSheet$set("public", "save_state_to_history", function() { + #shallow_copy <- list(data = private$data, variables_metadata = self$get_metadata(data_name_label), changes = self$changes) + self$set_history(append(private$history, list(private$data))) + self$set_history(list(private$data)) +}) + DataSheet$set("public", "set_meta", function(new_meta) { meta_data_copy <- new_meta self$clear_metadata() @@ -184,6 +194,23 @@ DataSheet$set("public", "clear_metadata", function() { } ) +DataSheet$set("public", "has_history", function() { + return(length(private$history) > 0) +} +) + +DataSheet$set("public", "undo_last_action", function() { + if (length(private$history) > 1) { + # Revert to the last saved state + previous_state <- private$history[[length(private$history) - 1]] + self$set_data(as.data.frame(previous_state)) # Restore the previous state + self$set_history(private$history[-length(private$history)]) # Remove the latest state from history + } else { + message("No more actions to undo.") + } +} +) + #Removed until can be fixed with attributes # DataSheet$set("public", "set_variables_metadata", function(new_meta) { # if(!is.data.frame(new_meta)) stop("variable metadata must be of type: data.frame") @@ -241,6 +268,13 @@ DataSheet$set("public", "set_scalars", function(new_scalars) { } ) +DataSheet$set("public", "set_history", function(history) { + if(!is.list(history)) stop("history must be of type: list") + self$append_to_changes(list(Set_property, "history")) + private$history <- append(private$history, history) +} +) + DataSheet$set("public", "set_keys", function(new_keys) { if(!is.list(new_keys)) stop("new_keys must be of type: list") self$append_to_changes(list(Set_property, "keys")) @@ -665,6 +699,9 @@ DataSheet$set("public", "add_scalar", function(scalar_name = "", scalar_value) { ) DataSheet$set("public", "add_columns_to_data", function(col_name = "", col_data, use_col_name_as_prefix = FALSE, hidden = FALSE, before, adjacent_column = "", num_cols, require_correct_length = TRUE, keep_existing_position = TRUE) { + # Save the current state to history before making modifications + self$save_state_to_history() + # Column name must be character if(!is.character(col_name)) stop("Column name must be of type: character") if(missing(num_cols)) { @@ -814,6 +851,10 @@ DataSheet$set("public", "cor", function(x_col_names, y_col_name, use = "everythi DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", new_col_name = "", label = "", type = "single", .fn, .cols = everything(), new_column_names_df, new_labels_df, ...) { curr_data <- self$get_data_frame(use_current_filter = FALSE, use_column_selection = FALSE) + + # Save the current state to history before making modifications + self$save_state_to_history() + # Column name must be character if (type == "single") { if (new_col_name != curr_col_name) { @@ -938,6 +979,7 @@ DataSheet$set("public", "remove_columns_in_data", function(cols=c(), allow_delet DataSheet$set("public", "replace_value_in_data", function(col_names, rows, old_value, old_is_missing = FALSE, start_value = NA, end_value = NA, new_value, new_is_missing = FALSE, closed_start_value = TRUE, closed_end_value = TRUE, locf = FALSE, from_last = FALSE) { curr_data <- self$get_data_frame(use_current_filter = FALSE) + self$save_state_to_history() # Column name must be character if(!all(is.character(col_names))) stop("Column name must be of type: character") if (!all(col_names %in% names(curr_data))) stop("Cannot find all columns in the data.") diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index 0634d1aabb4..a829b0ff3e4 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -1352,6 +1352,11 @@ DataBook$set("public","has_key", function(data_name) { } ) +DataBook$set("public","undo_last_action", function(data_name) { + self$get_data_objects(data_name)$undo_last_action() +} +) + DataBook$set("public","get_keys", function(data_name, key_name) { self$get_data_objects(data_name)$get_keys(key_name) } From 0c0a5fa6274b0752ce72990ca9117e015983c2ce Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Sat, 12 Oct 2024 08:56:28 +0300 Subject: [PATCH 02/32] more changes --- instat/static/InstatObject/R/data_object_R6.R | 3 +++ 1 file changed, 3 insertions(+) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 5a53179272f..626dd1171e7 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -945,6 +945,9 @@ DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", ne DataSheet$set("public", "remove_columns_in_data", function(cols=c(), allow_delete_all = FALSE) { + # Save the current state to history before making modifications + self$save_state_to_history() + if(length(cols) == self$get_column_count()) { if(allow_delete_all) { warning("You are deleting all columns in the data frame.") From 84ff435f8a31a54a455e58afd6e891e5cb7cd5f2 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Sat, 12 Oct 2024 10:39:01 +0300 Subject: [PATCH 03/32] more improvement --- instat/static/InstatObject/R/data_object_R6.R | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 626dd1171e7..cf9ee58e613 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -201,15 +201,13 @@ DataSheet$set("public", "has_history", function() { DataSheet$set("public", "undo_last_action", function() { if (length(private$history) > 1) { - # Revert to the last saved state previous_state <- private$history[[length(private$history) - 1]] self$set_data(as.data.frame(previous_state)) # Restore the previous state - self$set_history(private$history[-length(private$history)]) # Remove the latest state from history + # Here, do not remove the latest state } else { message("No more actions to undo.") } -} -) +}) #Removed until can be fixed with attributes # DataSheet$set("public", "set_variables_metadata", function(new_meta) { @@ -270,10 +268,13 @@ DataSheet$set("public", "set_scalars", function(new_scalars) { DataSheet$set("public", "set_history", function(history) { if(!is.list(history)) stop("history must be of type: list") - self$append_to_changes(list(Set_property, "history")) + MAX_HISTORY_SIZE <- 10 + # Limit history size + if (length(private$history) >= MAX_HISTORY_SIZE) { + private$history <- private$history[-1] # Remove the oldest entry + } private$history <- append(private$history, history) -} -) +}) DataSheet$set("public", "set_keys", function(new_keys) { if(!is.list(new_keys)) stop("new_keys must be of type: list") From 8db5ece404fcba8abce473bb90240ec51aca2c79 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 14 Oct 2024 10:33:23 +0300 Subject: [PATCH 04/32] improved the undo to be unlimited --- instat/static/InstatObject/R/data_object_R6.R | 8 +++----- instat/static/InstatObject/R/instat_object_R6.R | 5 +++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index cf9ee58e613..818e8adad8e 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -166,8 +166,6 @@ DataSheet$set("public", "set_data", function(new_data, messages=TRUE, check_name ) DataSheet$set("public", "save_state_to_history", function() { - #shallow_copy <- list(data = private$data, variables_metadata = self$get_metadata(data_name_label), changes = self$changes) - self$set_history(append(private$history, list(private$data))) self$set_history(list(private$data)) }) @@ -195,15 +193,15 @@ DataSheet$set("public", "clear_metadata", function() { ) DataSheet$set("public", "has_history", function() { - return(length(private$history) > 0) + return(length(private$history)) } ) DataSheet$set("public", "undo_last_action", function() { if (length(private$history) > 1) { - previous_state <- private$history[[length(private$history) - 1]] + previous_state <- private$history[[length(private$history)]] self$set_data(as.data.frame(previous_state)) # Restore the previous state - # Here, do not remove the latest state + private$history <- private$history[-length(private$history)] # Remove the latest state } else { message("No more actions to undo.") } diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index a829b0ff3e4..95affddcc3a 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -1352,6 +1352,11 @@ DataBook$set("public","has_key", function(data_name) { } ) +DataBook$set("public","has_history", function(data_name) { + self$get_data_objects(data_name)$has_history() +} +) + DataBook$set("public","undo_last_action", function(data_name) { self$get_data_objects(data_name)$undo_last_action() } From 2bb301871743bd46776e1563d8b65805897eec89 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 14 Oct 2024 11:02:36 +0300 Subject: [PATCH 05/32] set the focus on the grid --- instat/Interface/IDataViewGrid.vb | 2 ++ instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb | 4 ++++ instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb | 5 +++++ instat/ucrDataView.vb | 3 +++ 4 files changed, 14 insertions(+) diff --git a/instat/Interface/IDataViewGrid.vb b/instat/Interface/IDataViewGrid.vb index fa8914db568..4145675170f 100644 --- a/instat/Interface/IDataViewGrid.vb +++ b/instat/Interface/IDataViewGrid.vb @@ -44,6 +44,8 @@ Public Interface IDataViewGrid Sub AdjustColumnWidthAfterWrapping(strColumn As String, Optional bApplyWrap As Boolean = False) + Sub Focus() + Function GetSelectedColumns() As List(Of clsColumnHeaderDisplay) Function GetFirstRowHeader() As String diff --git a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb index b899d906312..3977f595ba1 100644 --- a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb +++ b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb @@ -69,6 +69,10 @@ Public Class ucrDataViewLinuxGrid Next End Sub + Public Sub FocusGrid() Implements IDataViewGrid.Focus + Me.Focus() + End Sub + Public Function SelectedTab() As String If tcTabs.SelectedTab Is Nothing Then Return "" diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index 86d26777714..7e96044857d 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -57,6 +57,11 @@ Public Class ucrDataViewReoGrid Next End Sub + Public Sub FocusGrid() Implements IDataViewGrid.Focus + grdData.Focus() + grdData.CurrentWorksheet.FocusPos = grdData.CurrentWorksheet.FocusPos + End Sub + Public Sub AddRowData(dataFrame As clsDataFrame) Implements IDataViewGrid.AddRowData Dim textColour As Color Dim strRowNames As String() diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index e41522cc43e..c9357defb4d 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -155,6 +155,8 @@ Public Class ucrDataView RefreshDisplayInformation() End If End If + + _grid.Focus() End Sub ''' @@ -190,6 +192,7 @@ Public Class ucrDataView StartWait() GetCurrentDataFrameFocus().clsPrepareFunctions.DeleteColumn(GetSelectedColumnNames()) EndWait() + _grid.Focus() End If End If End Sub From f5c6f49625539ad477be03bb406c54af8db878b6 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 14 Oct 2024 14:00:04 +0300 Subject: [PATCH 06/32] redo implementation --- instat/static/InstatObject/R/data_object_R6.R | 22 ++++++++++++++++++- .../static/InstatObject/R/instat_object_R6.R | 5 +++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 818e8adad8e..2d945478b50 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -5,7 +5,7 @@ DataSheet <- R6::R6Class("DataSheet", imported_from = "", messages = TRUE, convert=TRUE, create = TRUE, start_point=1, filters = list(), column_selections = list(), objects = list(), - calculations = list(), scalars = list(), keys = list(), comments = list(), keep_attributes = TRUE, history = list()) + calculations = list(), scalars = list(), keys = list(), comments = list(), keep_attributes = TRUE, history = list(), redo_history = list()) { # Set up the data object self$set_data(data, messages) @@ -63,6 +63,7 @@ DataSheet <- R6::R6Class("DataSheet", objects = list(), keys = list(), history = list(), + redo_history = list(), comments = list(), calculations = list(), scalars = list(), @@ -207,6 +208,25 @@ DataSheet$set("public", "undo_last_action", function() { } }) +# Redo function +DataSheet$set("public", "redo_last_action", function() { + if (length(private$redo_history) > 0) { + # Get the last undone state from redo history + next_state <- private$redo_history[[length(private$redo_history)]] + + # Restore the next state + self$set_data(as.data.frame(next_state)) + + # Move the state back to the history + private$history <- append(private$history, list(next_state)) + + # Remove the state from redo history + private$redo_history <- private$redo_history[-length(private$redo_history)] + } else { + message("No more actions to redo.") + } +}) + #Removed until can be fixed with attributes # DataSheet$set("public", "set_variables_metadata", function(new_meta) { # if(!is.data.frame(new_meta)) stop("variable metadata must be of type: data.frame") diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index 95affddcc3a..05a922fd26f 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -1362,6 +1362,11 @@ DataBook$set("public","undo_last_action", function(data_name) { } ) +DataBook$set("public","redo_last_action", function(data_name) { + self$get_data_objects(data_name)$redo_last_action() +} +) + DataBook$set("public","get_keys", function(data_name, key_name) { self$get_data_objects(data_name)$get_keys(key_name) } From 513f116d21fe4d39ab86fc035ea1091eb3b17018 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 14 Oct 2024 15:27:09 +0300 Subject: [PATCH 07/32] added undo feature to more operations done in data --- instat/static/InstatObject/R/data_object_R6.R | 5 + instat/ucrDataView.Designer.vb | 341 ++++++++++-------- instat/ucrDataView.resx | 2 +- instat/ucrDataView.vb | 6 +- 4 files changed, 197 insertions(+), 157 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 2d945478b50..27bae1008cd 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -1346,6 +1346,8 @@ DataSheet$set("public", "add_defaults_variables_metadata", function(column_names DataSheet$set("public", "remove_rows_in_data", function(row_names) { curr_data <- self$get_data_frame(use_current_filter = FALSE) + self$save_state_to_history() + if(!all(row_names %in% rownames(curr_data))) stop("Some of the row_names not found in data") rows_to_remove <- which(rownames(curr_data) %in% row_names) #Prefer not to use dplyr::slice as it produces a tibble @@ -1392,6 +1394,7 @@ DataSheet$set("public", "reorder_columns_in_data", function(col_order) { DataSheet$set("public", "insert_row_in_data", function(start_row, row_data = c(), number_rows = 1, before = FALSE) { curr_data <- self$get_data_frame(use_current_filter = FALSE) + self$save_state_to_history() curr_row_names <- rownames(curr_data) if (!start_row %in% curr_row_names) { stop(paste(start_row, " not found in rows")) @@ -4574,6 +4577,8 @@ DataSheet$set("public", "remove_empty", function(which = c("rows", "cols")) { DataSheet$set("public", "replace_values_with_NA", function(row_index, column_index) { curr_data <- self$get_data_frame(use_current_filter = FALSE) + self$save_state_to_history() + if(!all(row_index %in% seq_len(nrow(curr_data)))) stop("All row indexes must be within the dataframe") if(!all(column_index %in% seq_len(ncol(curr_data)))) stop("All column indexes must be within the dataframe") curr_data[row_index, column_index] <- NA diff --git a/instat/ucrDataView.Designer.vb b/instat/ucrDataView.Designer.vb index 72b122e3328..6f86b446e0f 100644 --- a/instat/ucrDataView.Designer.vb +++ b/instat/ucrDataView.Designer.vb @@ -150,9 +150,9 @@ Partial Class ucrDataView Me.lblRowNext = New System.Windows.Forms.Label() Me.lblColLast = New System.Windows.Forms.Label() Me.lblRowBack = New System.Windows.Forms.Label() + Me.ttGoToRowOrColPage = New System.Windows.Forms.ToolTip(Me.components) Me.ucrReoGrid = New instat.ucrDataViewReoGrid() Me.ucrLinuxGrid = New instat.ucrDataViewLinuxGrid() - Me.ttGoToRowOrColPage = New System.Windows.Forms.ToolTip(Me.components) Me.columnContextMenuStrip.SuspendLayout() Me.cellContextMenuStrip.SuspendLayout() Me.rowContextMenuStrip.SuspendLayout() @@ -171,159 +171,159 @@ Partial Class ucrDataView Me.columnContextMenuStrip.ImageScalingSize = New System.Drawing.Size(20, 20) Me.columnContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuColumnRename, Me.mnuDuplicateColumn, Me.mnuReorderColumns, Me.mnuInsertColsBefore, Me.mnuInsertColsAfter, Me.mnuDeleteCol, Me.ToolStripSeparator13, Me.mnuEditCell2, Me.mnuDeleteCells2, Me.toolStripMenuItem2, Me.mnuConvertToFactor, Me.mnuCovertToOrderedFactors, Me.mnuConvertText, Me.mnuConvertToLogical, Me.mnuConvertVariate, Me.ToolStripSeparator1, Me.mnuLevelsLabels, Me.toolStripMenuItem21, Me.mnuSort, Me.mnuColumnAddComment, Me.mnuColumnFilterRows, Me.mnuColumnContextColumnSelection, Me.mnuColumnContextRemoveCurrentColumnSelection, Me.mnuClearColumnFilter, Me.ToolStripSeparator8, Me.mnuHelp}) Me.columnContextMenuStrip.Name = "columnContextMenuStrip" - Me.columnContextMenuStrip.Size = New System.Drawing.Size(215, 496) + Me.columnContextMenuStrip.Size = New System.Drawing.Size(293, 706) ' 'mnuColumnRename ' Me.mnuColumnRename.Name = "mnuColumnRename" - Me.mnuColumnRename.Size = New System.Drawing.Size(214, 22) + Me.mnuColumnRename.Size = New System.Drawing.Size(292, 32) Me.mnuColumnRename.Text = "Rename Column..." ' 'mnuDuplicateColumn ' Me.mnuDuplicateColumn.Name = "mnuDuplicateColumn" - Me.mnuDuplicateColumn.Size = New System.Drawing.Size(214, 22) + Me.mnuDuplicateColumn.Size = New System.Drawing.Size(292, 32) Me.mnuDuplicateColumn.Text = "Duplicate Column..." ' 'mnuReorderColumns ' Me.mnuReorderColumns.Name = "mnuReorderColumns" - Me.mnuReorderColumns.Size = New System.Drawing.Size(214, 22) + Me.mnuReorderColumns.Size = New System.Drawing.Size(292, 32) Me.mnuReorderColumns.Text = "Reorder Column(s)..." ' 'mnuInsertColsBefore ' Me.mnuInsertColsBefore.Name = "mnuInsertColsBefore" - Me.mnuInsertColsBefore.Size = New System.Drawing.Size(214, 22) + Me.mnuInsertColsBefore.Size = New System.Drawing.Size(292, 32) Me.mnuInsertColsBefore.Text = "Insert Column(s) Before" ' 'mnuInsertColsAfter ' Me.mnuInsertColsAfter.Name = "mnuInsertColsAfter" - Me.mnuInsertColsAfter.Size = New System.Drawing.Size(214, 22) + Me.mnuInsertColsAfter.Size = New System.Drawing.Size(292, 32) Me.mnuInsertColsAfter.Text = "Insert Column(s) After" ' 'mnuDeleteCol ' Me.mnuDeleteCol.Name = "mnuDeleteCol" - Me.mnuDeleteCol.Size = New System.Drawing.Size(214, 22) + Me.mnuDeleteCol.Size = New System.Drawing.Size(292, 32) Me.mnuDeleteCol.Text = "Delete Column(s)" ' 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(211, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(289, 6) ' 'mnuEditCell2 ' Me.mnuEditCell2.Enabled = False Me.mnuEditCell2.Name = "mnuEditCell2" - Me.mnuEditCell2.Size = New System.Drawing.Size(214, 22) + Me.mnuEditCell2.Size = New System.Drawing.Size(292, 32) Me.mnuEditCell2.Text = "Edit Cell..." ' 'mnuDeleteCells2 ' Me.mnuDeleteCells2.Enabled = False Me.mnuDeleteCells2.Name = "mnuDeleteCells2" - Me.mnuDeleteCells2.Size = New System.Drawing.Size(214, 22) + Me.mnuDeleteCells2.Size = New System.Drawing.Size(292, 32) Me.mnuDeleteCells2.Text = "Delete Cell(s)" ' 'toolStripMenuItem2 ' Me.toolStripMenuItem2.Name = "toolStripMenuItem2" - Me.toolStripMenuItem2.Size = New System.Drawing.Size(211, 6) + Me.toolStripMenuItem2.Size = New System.Drawing.Size(289, 6) ' 'mnuConvertToFactor ' Me.mnuConvertToFactor.Name = "mnuConvertToFactor" - Me.mnuConvertToFactor.Size = New System.Drawing.Size(214, 22) + Me.mnuConvertToFactor.Size = New System.Drawing.Size(292, 32) Me.mnuConvertToFactor.Text = "Convert to Factor" ' 'mnuCovertToOrderedFactors ' Me.mnuCovertToOrderedFactors.Name = "mnuCovertToOrderedFactors" - Me.mnuCovertToOrderedFactors.Size = New System.Drawing.Size(214, 22) + Me.mnuCovertToOrderedFactors.Size = New System.Drawing.Size(292, 32) Me.mnuCovertToOrderedFactors.Text = "Convert to Ordered Factor" ' 'mnuConvertText ' Me.mnuConvertText.Name = "mnuConvertText" - Me.mnuConvertText.Size = New System.Drawing.Size(214, 22) + Me.mnuConvertText.Size = New System.Drawing.Size(292, 32) Me.mnuConvertText.Text = "Convert to Character" ' 'mnuConvertToLogical ' Me.mnuConvertToLogical.Name = "mnuConvertToLogical" - Me.mnuConvertToLogical.Size = New System.Drawing.Size(214, 22) + Me.mnuConvertToLogical.Size = New System.Drawing.Size(292, 32) Me.mnuConvertToLogical.Text = "Convert to Logical" ' 'mnuConvertVariate ' Me.mnuConvertVariate.Name = "mnuConvertVariate" - Me.mnuConvertVariate.Size = New System.Drawing.Size(214, 22) + Me.mnuConvertVariate.Size = New System.Drawing.Size(292, 32) Me.mnuConvertVariate.Text = "Convert to Numeric" ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(211, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(289, 6) ' 'mnuLevelsLabels ' Me.mnuLevelsLabels.Name = "mnuLevelsLabels" - Me.mnuLevelsLabels.Size = New System.Drawing.Size(214, 22) + Me.mnuLevelsLabels.Size = New System.Drawing.Size(292, 32) Me.mnuLevelsLabels.Text = "Levels/Labels..." ' 'toolStripMenuItem21 ' Me.toolStripMenuItem21.Name = "toolStripMenuItem21" - Me.toolStripMenuItem21.Size = New System.Drawing.Size(211, 6) + Me.toolStripMenuItem21.Size = New System.Drawing.Size(289, 6) ' 'mnuSort ' Me.mnuSort.Name = "mnuSort" - Me.mnuSort.Size = New System.Drawing.Size(214, 22) + Me.mnuSort.Size = New System.Drawing.Size(292, 32) Me.mnuSort.Text = "Sort..." ' 'mnuColumnAddComment ' Me.mnuColumnAddComment.Name = "mnuColumnAddComment" - Me.mnuColumnAddComment.Size = New System.Drawing.Size(214, 22) + Me.mnuColumnAddComment.Size = New System.Drawing.Size(292, 32) Me.mnuColumnAddComment.Text = "Add Comment..." ' 'mnuColumnFilterRows ' Me.mnuColumnFilterRows.Name = "mnuColumnFilterRows" - Me.mnuColumnFilterRows.Size = New System.Drawing.Size(214, 22) + Me.mnuColumnFilterRows.Size = New System.Drawing.Size(292, 32) Me.mnuColumnFilterRows.Text = "Filter Rows..." ' 'mnuColumnContextColumnSelection ' Me.mnuColumnContextColumnSelection.Name = "mnuColumnContextColumnSelection" - Me.mnuColumnContextColumnSelection.Size = New System.Drawing.Size(214, 22) + Me.mnuColumnContextColumnSelection.Size = New System.Drawing.Size(292, 32) Me.mnuColumnContextColumnSelection.Text = "Select Columns..." ' 'mnuColumnContextRemoveCurrentColumnSelection ' Me.mnuColumnContextRemoveCurrentColumnSelection.Name = "mnuColumnContextRemoveCurrentColumnSelection" - Me.mnuColumnContextRemoveCurrentColumnSelection.Size = New System.Drawing.Size(214, 22) + Me.mnuColumnContextRemoveCurrentColumnSelection.Size = New System.Drawing.Size(292, 32) Me.mnuColumnContextRemoveCurrentColumnSelection.Text = "Remove Column Selection" ' 'mnuClearColumnFilter ' Me.mnuClearColumnFilter.Name = "mnuClearColumnFilter" - Me.mnuClearColumnFilter.Size = New System.Drawing.Size(214, 22) + Me.mnuClearColumnFilter.Size = New System.Drawing.Size(292, 32) Me.mnuClearColumnFilter.Text = "Remove Current Filter" ' 'ToolStripSeparator8 ' Me.ToolStripSeparator8.Name = "ToolStripSeparator8" - Me.ToolStripSeparator8.Size = New System.Drawing.Size(211, 6) + Me.ToolStripSeparator8.Size = New System.Drawing.Size(289, 6) ' 'mnuHelp ' Me.mnuHelp.Name = "mnuHelp" - Me.mnuHelp.Size = New System.Drawing.Size(214, 22) + Me.mnuHelp.Size = New System.Drawing.Size(292, 32) Me.mnuHelp.Text = "Help" ' 'cellContextMenuStrip @@ -331,146 +331,146 @@ Partial Class ucrDataView Me.cellContextMenuStrip.ImageScalingSize = New System.Drawing.Size(20, 20) Me.cellContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuRenameColumn, Me.mnuDuplColumn, Me.mnuReorderColumn, Me.mnuDeleteCol2, Me.ToolStripSeparator14, Me.mnuEditCell, Me.mnuDeleteCells, Me.ToolStripSeparator5, Me.mnuConvertToFact, Me.mnuConvertToOrderedFactor, Me.mnuConvertToCharacter, Me.mnuConvertToLogic, Me.mnuConvertToNumeric, Me.ToolStripSeparator6, Me.mnuLabelsLevel, Me.ToolStripSeparator7, Me.mnuSorts, Me.mnuComment, Me.mnuFilterRows, Me.mnuCellContextColumnSelection, Me.mnuCellContextRemoveCurrentColumnSelection, Me.mnuRemoveCurrentFilters, Me.ToolStripSeparator9, Me.mnuHelp1}) Me.cellContextMenuStrip.Name = "cellContextMenuStrip" - Me.cellContextMenuStrip.Size = New System.Drawing.Size(215, 452) + Me.cellContextMenuStrip.Size = New System.Drawing.Size(293, 642) ' 'mnuRenameColumn ' Me.mnuRenameColumn.Name = "mnuRenameColumn" - Me.mnuRenameColumn.Size = New System.Drawing.Size(214, 22) + Me.mnuRenameColumn.Size = New System.Drawing.Size(292, 32) Me.mnuRenameColumn.Text = "Rename Column..." ' 'mnuDuplColumn ' Me.mnuDuplColumn.Name = "mnuDuplColumn" - Me.mnuDuplColumn.Size = New System.Drawing.Size(214, 22) + Me.mnuDuplColumn.Size = New System.Drawing.Size(292, 32) Me.mnuDuplColumn.Text = "Duplicate Column..." ' 'mnuReorderColumn ' Me.mnuReorderColumn.Name = "mnuReorderColumn" - Me.mnuReorderColumn.Size = New System.Drawing.Size(214, 22) + Me.mnuReorderColumn.Size = New System.Drawing.Size(292, 32) Me.mnuReorderColumn.Text = "Reorder Column(s)..." ' 'mnuDeleteCol2 ' Me.mnuDeleteCol2.Enabled = False Me.mnuDeleteCol2.Name = "mnuDeleteCol2" - Me.mnuDeleteCol2.Size = New System.Drawing.Size(214, 22) + Me.mnuDeleteCol2.Size = New System.Drawing.Size(292, 32) Me.mnuDeleteCol2.Text = "Delete Column(s)" ' 'ToolStripSeparator14 ' Me.ToolStripSeparator14.Name = "ToolStripSeparator14" - Me.ToolStripSeparator14.Size = New System.Drawing.Size(211, 6) + Me.ToolStripSeparator14.Size = New System.Drawing.Size(289, 6) ' 'mnuEditCell ' Me.mnuEditCell.Name = "mnuEditCell" - Me.mnuEditCell.Size = New System.Drawing.Size(214, 22) + Me.mnuEditCell.Size = New System.Drawing.Size(292, 32) Me.mnuEditCell.Text = "Edit Cell..." ' 'mnuDeleteCells ' Me.mnuDeleteCells.Name = "mnuDeleteCells" - Me.mnuDeleteCells.Size = New System.Drawing.Size(214, 22) + Me.mnuDeleteCells.Size = New System.Drawing.Size(292, 32) Me.mnuDeleteCells.Text = "Delete Cell(s)" ' 'ToolStripSeparator5 ' Me.ToolStripSeparator5.Name = "ToolStripSeparator5" - Me.ToolStripSeparator5.Size = New System.Drawing.Size(211, 6) + Me.ToolStripSeparator5.Size = New System.Drawing.Size(289, 6) ' 'mnuConvertToFact ' Me.mnuConvertToFact.Name = "mnuConvertToFact" - Me.mnuConvertToFact.Size = New System.Drawing.Size(214, 22) + Me.mnuConvertToFact.Size = New System.Drawing.Size(292, 32) Me.mnuConvertToFact.Text = "Convert to Factor" ' 'mnuConvertToOrderedFactor ' Me.mnuConvertToOrderedFactor.Name = "mnuConvertToOrderedFactor" - Me.mnuConvertToOrderedFactor.Size = New System.Drawing.Size(214, 22) + Me.mnuConvertToOrderedFactor.Size = New System.Drawing.Size(292, 32) Me.mnuConvertToOrderedFactor.Text = "Convert to Ordered Factor" ' 'mnuConvertToCharacter ' Me.mnuConvertToCharacter.Name = "mnuConvertToCharacter" - Me.mnuConvertToCharacter.Size = New System.Drawing.Size(214, 22) + Me.mnuConvertToCharacter.Size = New System.Drawing.Size(292, 32) Me.mnuConvertToCharacter.Text = "Convert to Character" ' 'mnuConvertToLogic ' Me.mnuConvertToLogic.Name = "mnuConvertToLogic" - Me.mnuConvertToLogic.Size = New System.Drawing.Size(214, 22) + Me.mnuConvertToLogic.Size = New System.Drawing.Size(292, 32) Me.mnuConvertToLogic.Text = "Convert to Logical" ' 'mnuConvertToNumeric ' Me.mnuConvertToNumeric.Name = "mnuConvertToNumeric" - Me.mnuConvertToNumeric.Size = New System.Drawing.Size(214, 22) + Me.mnuConvertToNumeric.Size = New System.Drawing.Size(292, 32) Me.mnuConvertToNumeric.Text = "Convert to Numeric" ' 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(211, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(289, 6) ' 'mnuLabelsLevel ' Me.mnuLabelsLevel.Name = "mnuLabelsLevel" - Me.mnuLabelsLevel.Size = New System.Drawing.Size(214, 22) + Me.mnuLabelsLevel.Size = New System.Drawing.Size(292, 32) Me.mnuLabelsLevel.Text = "Levels/Labels..." ' 'ToolStripSeparator7 ' Me.ToolStripSeparator7.Name = "ToolStripSeparator7" - Me.ToolStripSeparator7.Size = New System.Drawing.Size(211, 6) + Me.ToolStripSeparator7.Size = New System.Drawing.Size(289, 6) ' 'mnuSorts ' Me.mnuSorts.Name = "mnuSorts" - Me.mnuSorts.Size = New System.Drawing.Size(214, 22) + Me.mnuSorts.Size = New System.Drawing.Size(292, 32) Me.mnuSorts.Text = "Sort..." ' 'mnuComment ' Me.mnuComment.Name = "mnuComment" - Me.mnuComment.Size = New System.Drawing.Size(214, 22) + Me.mnuComment.Size = New System.Drawing.Size(292, 32) Me.mnuComment.Text = "Add Comment..." ' 'mnuFilterRows ' Me.mnuFilterRows.Name = "mnuFilterRows" - Me.mnuFilterRows.Size = New System.Drawing.Size(214, 22) + Me.mnuFilterRows.Size = New System.Drawing.Size(292, 32) Me.mnuFilterRows.Text = "Filter Rows..." ' 'mnuCellContextColumnSelection ' Me.mnuCellContextColumnSelection.Name = "mnuCellContextColumnSelection" - Me.mnuCellContextColumnSelection.Size = New System.Drawing.Size(214, 22) + Me.mnuCellContextColumnSelection.Size = New System.Drawing.Size(292, 32) Me.mnuCellContextColumnSelection.Text = "Select Columns..." ' 'mnuCellContextRemoveCurrentColumnSelection ' Me.mnuCellContextRemoveCurrentColumnSelection.Name = "mnuCellContextRemoveCurrentColumnSelection" - Me.mnuCellContextRemoveCurrentColumnSelection.Size = New System.Drawing.Size(214, 22) + Me.mnuCellContextRemoveCurrentColumnSelection.Size = New System.Drawing.Size(292, 32) Me.mnuCellContextRemoveCurrentColumnSelection.Text = "Remove Column Selection" ' 'mnuRemoveCurrentFilters ' Me.mnuRemoveCurrentFilters.Name = "mnuRemoveCurrentFilters" - Me.mnuRemoveCurrentFilters.Size = New System.Drawing.Size(214, 22) + Me.mnuRemoveCurrentFilters.Size = New System.Drawing.Size(292, 32) Me.mnuRemoveCurrentFilters.Text = "Remove Current Filter" ' 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(211, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(289, 6) ' 'mnuHelp1 ' Me.mnuHelp1.Name = "mnuHelp1" - Me.mnuHelp1.Size = New System.Drawing.Size(214, 22) + Me.mnuHelp1.Size = New System.Drawing.Size(292, 32) Me.mnuHelp1.Text = "Help" ' 'rowContextMenuStrip @@ -478,77 +478,77 @@ Partial Class ucrDataView Me.rowContextMenuStrip.ImageScalingSize = New System.Drawing.Size(20, 20) Me.rowContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuInsertRowsBefore, Me.mnuInsertRowsAfter, Me.mnuDeleteRows, Me.ToolStripSeparator2, Me.mnuAddComment, Me.ToolStripSeparator4, Me.mnuFilter, Me.mnuRowContextColumnSelection, Me.mnuRowContextRemoveCurrentColumnSelection, Me.mnuRemoveCurrentFilter, Me.ToolStripSeparator10, Me.mnuHelp2}) Me.rowContextMenuStrip.Name = "columnContextMenuStrip" - Me.rowContextMenuStrip.Size = New System.Drawing.Size(215, 220) + Me.rowContextMenuStrip.Size = New System.Drawing.Size(292, 343) ' 'mnuInsertRowsBefore ' Me.mnuInsertRowsBefore.Name = "mnuInsertRowsBefore" - Me.mnuInsertRowsBefore.Size = New System.Drawing.Size(214, 22) + Me.mnuInsertRowsBefore.Size = New System.Drawing.Size(291, 32) Me.mnuInsertRowsBefore.Text = "Insert Row(s) Before" ' 'mnuInsertRowsAfter ' Me.mnuInsertRowsAfter.Name = "mnuInsertRowsAfter" - Me.mnuInsertRowsAfter.Size = New System.Drawing.Size(214, 22) + Me.mnuInsertRowsAfter.Size = New System.Drawing.Size(291, 32) Me.mnuInsertRowsAfter.Text = "Insert Row(s) After" ' 'mnuDeleteRows ' Me.mnuDeleteRows.Name = "mnuDeleteRows" - Me.mnuDeleteRows.Size = New System.Drawing.Size(214, 22) + Me.mnuDeleteRows.Size = New System.Drawing.Size(291, 32) Me.mnuDeleteRows.Text = "Delete Row(s)" ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(211, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(288, 6) ' 'mnuAddComment ' Me.mnuAddComment.Name = "mnuAddComment" - Me.mnuAddComment.Size = New System.Drawing.Size(214, 22) + Me.mnuAddComment.Size = New System.Drawing.Size(291, 32) Me.mnuAddComment.Text = "Add Comment..." ' 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(211, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(288, 6) ' 'mnuFilter ' Me.mnuFilter.Name = "mnuFilter" - Me.mnuFilter.Size = New System.Drawing.Size(214, 22) + Me.mnuFilter.Size = New System.Drawing.Size(291, 32) Me.mnuFilter.Tag = "Filter..." Me.mnuFilter.Text = "Filter Rows..." ' 'mnuRowContextColumnSelection ' Me.mnuRowContextColumnSelection.Name = "mnuRowContextColumnSelection" - Me.mnuRowContextColumnSelection.Size = New System.Drawing.Size(214, 22) + Me.mnuRowContextColumnSelection.Size = New System.Drawing.Size(291, 32) Me.mnuRowContextColumnSelection.Text = "Select Columns..." ' 'mnuRowContextRemoveCurrentColumnSelection ' Me.mnuRowContextRemoveCurrentColumnSelection.Name = "mnuRowContextRemoveCurrentColumnSelection" - Me.mnuRowContextRemoveCurrentColumnSelection.Size = New System.Drawing.Size(214, 22) + Me.mnuRowContextRemoveCurrentColumnSelection.Size = New System.Drawing.Size(291, 32) Me.mnuRowContextRemoveCurrentColumnSelection.Text = "Remove Column Selection" ' 'mnuRemoveCurrentFilter ' Me.mnuRemoveCurrentFilter.Name = "mnuRemoveCurrentFilter" - Me.mnuRemoveCurrentFilter.Size = New System.Drawing.Size(214, 22) + Me.mnuRemoveCurrentFilter.Size = New System.Drawing.Size(291, 32) Me.mnuRemoveCurrentFilter.Tag = "Remove_Current_Filter" Me.mnuRemoveCurrentFilter.Text = "Remove Current Filter" ' 'ToolStripSeparator10 ' Me.ToolStripSeparator10.Name = "ToolStripSeparator10" - Me.ToolStripSeparator10.Size = New System.Drawing.Size(211, 6) + Me.ToolStripSeparator10.Size = New System.Drawing.Size(288, 6) ' 'mnuHelp2 ' Me.mnuHelp2.Name = "mnuHelp2" - Me.mnuHelp2.Size = New System.Drawing.Size(214, 22) + Me.mnuHelp2.Size = New System.Drawing.Size(291, 32) Me.mnuHelp2.Text = "Help" ' 'statusColumnMenu @@ -556,77 +556,77 @@ Partial Class ucrDataView Me.statusColumnMenu.ImageScalingSize = New System.Drawing.Size(20, 20) Me.statusColumnMenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.renameSheet, Me.reorderSheet, Me.CopySheet, Me.deleteDataFrame, Me.HideSheet, Me.unhideSheet, Me.ToolStripSeparator12, Me.mnuBottomAddComment, Me.mnuViewHTML, Me.ViewSheet, Me.ToolStripSeparator11, Me.mnuHelp3}) Me.statusColumnMenu.Name = "statusColumnMenu" - Me.statusColumnMenu.Size = New System.Drawing.Size(163, 236) + Me.statusColumnMenu.Size = New System.Drawing.Size(218, 336) ' 'renameSheet ' Me.renameSheet.Name = "renameSheet" - Me.renameSheet.Size = New System.Drawing.Size(162, 22) + Me.renameSheet.Size = New System.Drawing.Size(217, 32) Me.renameSheet.Text = "Rename..." ' 'reorderSheet ' Me.reorderSheet.Name = "reorderSheet" - Me.reorderSheet.Size = New System.Drawing.Size(162, 22) + Me.reorderSheet.Size = New System.Drawing.Size(217, 32) Me.reorderSheet.Text = "Reorder..." ' 'CopySheet ' Me.CopySheet.Name = "CopySheet" - Me.CopySheet.Size = New System.Drawing.Size(162, 22) + Me.CopySheet.Size = New System.Drawing.Size(217, 32) Me.CopySheet.Text = "Copy..." ' 'deleteDataFrame ' Me.deleteDataFrame.Name = "deleteDataFrame" - Me.deleteDataFrame.Size = New System.Drawing.Size(162, 22) + Me.deleteDataFrame.Size = New System.Drawing.Size(217, 32) Me.deleteDataFrame.Text = "Delete..." ' 'HideSheet ' Me.HideSheet.Name = "HideSheet" - Me.HideSheet.Size = New System.Drawing.Size(162, 22) + Me.HideSheet.Size = New System.Drawing.Size(217, 32) Me.HideSheet.Text = "Hide" ' 'unhideSheet ' Me.unhideSheet.Name = "unhideSheet" - Me.unhideSheet.Size = New System.Drawing.Size(162, 22) + Me.unhideSheet.Size = New System.Drawing.Size(217, 32) Me.unhideSheet.Text = "Unhide..." ' 'ToolStripSeparator12 ' Me.ToolStripSeparator12.Name = "ToolStripSeparator12" - Me.ToolStripSeparator12.Size = New System.Drawing.Size(159, 6) + Me.ToolStripSeparator12.Size = New System.Drawing.Size(214, 6) ' 'mnuBottomAddComment ' Me.mnuBottomAddComment.Name = "mnuBottomAddComment" - Me.mnuBottomAddComment.Size = New System.Drawing.Size(162, 22) + Me.mnuBottomAddComment.Size = New System.Drawing.Size(217, 32) Me.mnuBottomAddComment.Text = "Add Comment..." ' 'mnuViewHTML ' Me.mnuViewHTML.Enabled = False Me.mnuViewHTML.Name = "mnuViewHTML" - Me.mnuViewHTML.Size = New System.Drawing.Size(162, 22) + Me.mnuViewHTML.Size = New System.Drawing.Size(217, 32) Me.mnuViewHTML.Text = "View HTML" ' 'ViewSheet ' Me.ViewSheet.Name = "ViewSheet" - Me.ViewSheet.Size = New System.Drawing.Size(162, 22) + Me.ViewSheet.Size = New System.Drawing.Size(217, 32) Me.ViewSheet.Text = "View Data Frame" ' 'ToolStripSeparator11 ' Me.ToolStripSeparator11.Name = "ToolStripSeparator11" - Me.ToolStripSeparator11.Size = New System.Drawing.Size(159, 6) + Me.ToolStripSeparator11.Size = New System.Drawing.Size(214, 6) ' 'mnuHelp3 ' Me.mnuHelp3.Name = "mnuHelp3" - Me.mnuHelp3.Size = New System.Drawing.Size(162, 22) + Me.mnuHelp3.Size = New System.Drawing.Size(217, 32) Me.mnuHelp3.Text = "Help" ' 'lblHeaderDataView @@ -636,9 +636,10 @@ Partial Class ucrDataView Me.lblHeaderDataView.Dock = System.Windows.Forms.DockStyle.Fill Me.lblHeaderDataView.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) Me.lblHeaderDataView.ForeColor = System.Drawing.SystemColors.Control - Me.lblHeaderDataView.Location = New System.Drawing.Point(3, 0) + Me.lblHeaderDataView.Location = New System.Drawing.Point(4, 0) + Me.lblHeaderDataView.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblHeaderDataView.Name = "lblHeaderDataView" - Me.lblHeaderDataView.Size = New System.Drawing.Size(742, 20) + Me.lblHeaderDataView.Size = New System.Drawing.Size(1114, 30) Me.lblHeaderDataView.TabIndex = 5 Me.lblHeaderDataView.Text = "Data View" Me.lblHeaderDataView.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -649,7 +650,7 @@ Partial Class ucrDataView Me.tlpTableContainer.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333!)) Me.tlpTableContainer.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333!)) Me.tlpTableContainer.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333!)) - Me.tlpTableContainer.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 13.0!)) + Me.tlpTableContainer.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20.0!)) Me.tlpTableContainer.Controls.Add(Me.panelSectionsAll, 0, 1) Me.tlpTableContainer.Controls.Add(Me.lblHeaderDataView, 0, 0) Me.tlpTableContainer.Controls.Add(Me.TblPanPageDisplay, 1, 2) @@ -657,12 +658,13 @@ Partial Class ucrDataView Me.tlpTableContainer.Controls.Add(Me.ucrLinuxGrid, 1, 1) Me.tlpTableContainer.Dock = System.Windows.Forms.DockStyle.Fill Me.tlpTableContainer.Location = New System.Drawing.Point(0, 0) + Me.tlpTableContainer.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tlpTableContainer.Name = "tlpTableContainer" Me.tlpTableContainer.RowCount = 3 - Me.tlpTableContainer.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20.0!)) + Me.tlpTableContainer.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30.0!)) Me.tlpTableContainer.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!)) - Me.tlpTableContainer.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20.0!)) - Me.tlpTableContainer.Size = New System.Drawing.Size(748, 481) + Me.tlpTableContainer.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30.0!)) + Me.tlpTableContainer.Size = New System.Drawing.Size(1122, 722) Me.tlpTableContainer.TabIndex = 6 ' 'panelSectionsAll @@ -672,10 +674,11 @@ Partial Class ucrDataView Me.panelSectionsAll.Controls.Add(Me.panelSectionStart) Me.panelSectionsAll.Controls.Add(Me.panelSectionRecent) Me.panelSectionsAll.Dock = System.Windows.Forms.DockStyle.Fill - Me.panelSectionsAll.Location = New System.Drawing.Point(3, 23) + Me.panelSectionsAll.Location = New System.Drawing.Point(4, 34) + Me.panelSectionsAll.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.panelSectionsAll.Name = "panelSectionsAll" Me.tlpTableContainer.SetRowSpan(Me.panelSectionsAll, 2) - Me.panelSectionsAll.Size = New System.Drawing.Size(243, 455) + Me.panelSectionsAll.Size = New System.Drawing.Size(366, 684) Me.panelSectionsAll.TabIndex = 9 ' 'panelSectionAdvanced @@ -684,9 +687,10 @@ Partial Class ucrDataView Me.panelSectionAdvanced.Controls.Add(Me.lblAdvanced) Me.panelSectionAdvanced.Controls.Add(Me.linkStartRestoreBackup) Me.panelSectionAdvanced.Controls.Add(Me.linkStartPasteScriptfromClipboard) - Me.panelSectionAdvanced.Location = New System.Drawing.Point(27, 412) + Me.panelSectionAdvanced.Location = New System.Drawing.Point(40, 618) + Me.panelSectionAdvanced.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.panelSectionAdvanced.Name = "panelSectionAdvanced" - Me.panelSectionAdvanced.Size = New System.Drawing.Size(374, 83) + Me.panelSectionAdvanced.Size = New System.Drawing.Size(561, 124) Me.panelSectionAdvanced.TabIndex = 12 ' 'linkStartAddRPackage @@ -695,9 +699,10 @@ Partial Class ucrDataView Me.linkStartAddRPackage.AutoSize = True Me.linkStartAddRPackage.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartAddRPackage.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartAddRPackage.Location = New System.Drawing.Point(5, 64) + Me.linkStartAddRPackage.Location = New System.Drawing.Point(8, 96) + Me.linkStartAddRPackage.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.linkStartAddRPackage.Name = "linkStartAddRPackage" - Me.linkStartAddRPackage.Size = New System.Drawing.Size(187, 13) + Me.linkStartAddRPackage.Size = New System.Drawing.Size(275, 20) Me.linkStartAddRPackage.TabIndex = 6 Me.linkStartAddRPackage.TabStop = True Me.linkStartAddRPackage.Text = "Add R Package To R-Instat... (Online)" @@ -707,9 +712,10 @@ Partial Class ucrDataView Me.lblAdvanced.AutoSize = True Me.lblAdvanced.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAdvanced.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblAdvanced.Location = New System.Drawing.Point(3, 4) + Me.lblAdvanced.Location = New System.Drawing.Point(4, 6) + Me.lblAdvanced.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblAdvanced.Name = "lblAdvanced" - Me.lblAdvanced.Size = New System.Drawing.Size(108, 25) + Me.lblAdvanced.Size = New System.Drawing.Size(159, 37) Me.lblAdvanced.TabIndex = 0 Me.lblAdvanced.Text = "Advanced" ' @@ -719,9 +725,10 @@ Partial Class ucrDataView Me.linkStartRestoreBackup.AutoSize = True Me.linkStartRestoreBackup.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartRestoreBackup.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartRestoreBackup.Location = New System.Drawing.Point(5, 47) + Me.linkStartRestoreBackup.Location = New System.Drawing.Point(8, 70) + Me.linkStartRestoreBackup.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.linkStartRestoreBackup.Name = "linkStartRestoreBackup" - Me.linkStartRestoreBackup.Size = New System.Drawing.Size(145, 13) + Me.linkStartRestoreBackup.Size = New System.Drawing.Size(216, 20) Me.linkStartRestoreBackup.TabIndex = 4 Me.linkStartRestoreBackup.TabStop = True Me.linkStartRestoreBackup.Text = "Restore Data From Backup..." @@ -732,9 +739,10 @@ Partial Class ucrDataView Me.linkStartPasteScriptfromClipboard.AutoSize = True Me.linkStartPasteScriptfromClipboard.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartPasteScriptfromClipboard.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartPasteScriptfromClipboard.Location = New System.Drawing.Point(5, 30) + Me.linkStartPasteScriptfromClipboard.Location = New System.Drawing.Point(8, 45) + Me.linkStartPasteScriptfromClipboard.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.linkStartPasteScriptfromClipboard.Name = "linkStartPasteScriptfromClipboard" - Me.linkStartPasteScriptfromClipboard.Size = New System.Drawing.Size(137, 13) + Me.linkStartPasteScriptfromClipboard.Size = New System.Drawing.Size(207, 20) Me.linkStartPasteScriptfromClipboard.TabIndex = 5 Me.linkStartPasteScriptfromClipboard.TabStop = True Me.linkStartPasteScriptfromClipboard.Text = "Paste Script From Clipboard" @@ -745,9 +753,10 @@ Partial Class ucrDataView Me.panelSectionHelp.Controls.Add(Me.linkHelpGettingStarted) Me.panelSectionHelp.Controls.Add(Me.lblHelp) Me.panelSectionHelp.Controls.Add(Me.linkHelpRInstatResourcesSite) - Me.panelSectionHelp.Location = New System.Drawing.Point(28, 317) + Me.panelSectionHelp.Location = New System.Drawing.Point(42, 476) + Me.panelSectionHelp.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.panelSectionHelp.Name = "panelSectionHelp" - Me.panelSectionHelp.Size = New System.Drawing.Size(374, 81) + Me.panelSectionHelp.Size = New System.Drawing.Size(561, 122) Me.panelSectionHelp.TabIndex = 12 ' 'linkHelpData @@ -756,9 +765,10 @@ Partial Class ucrDataView Me.linkHelpData.AutoSize = True Me.linkHelpData.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkHelpData.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpData.Location = New System.Drawing.Point(5, 47) + Me.linkHelpData.Location = New System.Drawing.Point(8, 70) + Me.linkHelpData.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.linkHelpData.Name = "linkHelpData" - Me.linkHelpData.Size = New System.Drawing.Size(39, 13) + Me.linkHelpData.Size = New System.Drawing.Size(56, 20) Me.linkHelpData.TabIndex = 12 Me.linkHelpData.TabStop = True Me.linkHelpData.Text = "Data..." @@ -769,9 +779,10 @@ Partial Class ucrDataView Me.linkHelpGettingStarted.AutoSize = True Me.linkHelpGettingStarted.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkHelpGettingStarted.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpGettingStarted.Location = New System.Drawing.Point(5, 30) + Me.linkHelpGettingStarted.Location = New System.Drawing.Point(8, 45) + Me.linkHelpGettingStarted.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.linkHelpGettingStarted.Name = "linkHelpGettingStarted" - Me.linkHelpGettingStarted.Size = New System.Drawing.Size(87, 13) + Me.linkHelpGettingStarted.Size = New System.Drawing.Size(131, 20) Me.linkHelpGettingStarted.TabIndex = 11 Me.linkHelpGettingStarted.TabStop = True Me.linkHelpGettingStarted.Text = "Getting Started..." @@ -781,9 +792,10 @@ Partial Class ucrDataView Me.lblHelp.AutoSize = True Me.lblHelp.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblHelp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHelp.Location = New System.Drawing.Point(3, 4) + Me.lblHelp.Location = New System.Drawing.Point(4, 6) + Me.lblHelp.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblHelp.Name = "lblHelp" - Me.lblHelp.Size = New System.Drawing.Size(56, 25) + Me.lblHelp.Size = New System.Drawing.Size(82, 37) Me.lblHelp.TabIndex = 2 Me.lblHelp.Text = "Help" ' @@ -793,9 +805,10 @@ Partial Class ucrDataView Me.linkHelpRInstatResourcesSite.AutoSize = True Me.linkHelpRInstatResourcesSite.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkHelpRInstatResourcesSite.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpRInstatResourcesSite.Location = New System.Drawing.Point(5, 64) + Me.linkHelpRInstatResourcesSite.Location = New System.Drawing.Point(8, 96) + Me.linkHelpRInstatResourcesSite.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.linkHelpRInstatResourcesSite.Name = "linkHelpRInstatResourcesSite" - Me.linkHelpRInstatResourcesSite.Size = New System.Drawing.Size(158, 13) + Me.linkHelpRInstatResourcesSite.Size = New System.Drawing.Size(239, 20) Me.linkHelpRInstatResourcesSite.TabIndex = 9 Me.linkHelpRInstatResourcesSite.TabStop = True Me.linkHelpRInstatResourcesSite.Text = "R-Instat Resources Site (Online)" @@ -807,9 +820,10 @@ Partial Class ucrDataView Me.panelSectionStart.Controls.Add(Me.linkStartNewDataFrame) Me.panelSectionStart.Controls.Add(Me.linkStartOpenFile) Me.panelSectionStart.Controls.Add(Me.linkStartOpenLibrary) - Me.panelSectionStart.Location = New System.Drawing.Point(28, 15) + Me.panelSectionStart.Location = New System.Drawing.Point(42, 22) + Me.panelSectionStart.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.panelSectionStart.Name = "panelSectionStart" - Me.panelSectionStart.Size = New System.Drawing.Size(374, 100) + Me.panelSectionStart.Size = New System.Drawing.Size(561, 150) Me.panelSectionStart.TabIndex = 11 ' 'linkStartPasteData @@ -818,9 +832,10 @@ Partial Class ucrDataView Me.linkStartPasteData.AutoSize = True Me.linkStartPasteData.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartPasteData.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartPasteData.Location = New System.Drawing.Point(5, 81) + Me.linkStartPasteData.Location = New System.Drawing.Point(8, 122) + Me.linkStartPasteData.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.linkStartPasteData.Name = "linkStartPasteData" - Me.linkStartPasteData.Size = New System.Drawing.Size(142, 13) + Me.linkStartPasteData.Size = New System.Drawing.Size(213, 20) Me.linkStartPasteData.TabIndex = 7 Me.linkStartPasteData.TabStop = True Me.linkStartPasteData.Text = "Paste Data From Clipboard..." @@ -830,9 +845,10 @@ Partial Class ucrDataView Me.lblStart.AutoSize = True Me.lblStart.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblStart.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblStart.Location = New System.Drawing.Point(3, 4) + Me.lblStart.Location = New System.Drawing.Point(4, 6) + Me.lblStart.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblStart.Name = "lblStart" - Me.lblStart.Size = New System.Drawing.Size(57, 25) + Me.lblStart.Size = New System.Drawing.Size(85, 37) Me.lblStart.TabIndex = 0 Me.lblStart.Text = "Start" ' @@ -842,9 +858,10 @@ Partial Class ucrDataView Me.linkStartNewDataFrame.AutoSize = True Me.linkStartNewDataFrame.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartNewDataFrame.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartNewDataFrame.Location = New System.Drawing.Point(5, 30) + Me.linkStartNewDataFrame.Location = New System.Drawing.Point(8, 45) + Me.linkStartNewDataFrame.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.linkStartNewDataFrame.Name = "linkStartNewDataFrame" - Me.linkStartNewDataFrame.Size = New System.Drawing.Size(96, 13) + Me.linkStartNewDataFrame.Size = New System.Drawing.Size(141, 20) Me.linkStartNewDataFrame.TabIndex = 3 Me.linkStartNewDataFrame.TabStop = True Me.linkStartNewDataFrame.Text = "New Data Frame..." @@ -855,9 +872,10 @@ Partial Class ucrDataView Me.linkStartOpenFile.AutoSize = True Me.linkStartOpenFile.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartOpenFile.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartOpenFile.Location = New System.Drawing.Point(5, 47) + Me.linkStartOpenFile.Location = New System.Drawing.Point(8, 70) + Me.linkStartOpenFile.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.linkStartOpenFile.Name = "linkStartOpenFile" - Me.linkStartOpenFile.Size = New System.Drawing.Size(90, 13) + Me.linkStartOpenFile.Size = New System.Drawing.Size(137, 20) Me.linkStartOpenFile.TabIndex = 4 Me.linkStartOpenFile.TabStop = True Me.linkStartOpenFile.Text = "Import From File..." @@ -868,9 +886,10 @@ Partial Class ucrDataView Me.linkStartOpenLibrary.AutoSize = True Me.linkStartOpenLibrary.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartOpenLibrary.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartOpenLibrary.Location = New System.Drawing.Point(5, 64) + Me.linkStartOpenLibrary.Location = New System.Drawing.Point(8, 96) + Me.linkStartOpenLibrary.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.linkStartOpenLibrary.Name = "linkStartOpenLibrary" - Me.linkStartOpenLibrary.Size = New System.Drawing.Size(105, 13) + Me.linkStartOpenLibrary.Size = New System.Drawing.Size(159, 20) Me.linkStartOpenLibrary.TabIndex = 5 Me.linkStartOpenLibrary.TabStop = True Me.linkStartOpenLibrary.Text = "Import From Library..." @@ -881,9 +900,10 @@ Partial Class ucrDataView Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.panelSectionRecent.Controls.Add(Me.lblRecent) Me.panelSectionRecent.Controls.Add(Me.panelRecentMenuItems) - Me.panelSectionRecent.Location = New System.Drawing.Point(28, 124) + Me.panelSectionRecent.Location = New System.Drawing.Point(42, 186) + Me.panelSectionRecent.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.panelSectionRecent.Name = "panelSectionRecent" - Me.panelSectionRecent.Size = New System.Drawing.Size(179, 186) + Me.panelSectionRecent.Size = New System.Drawing.Size(270, 279) Me.panelSectionRecent.TabIndex = 13 ' 'lblRecent @@ -891,9 +911,10 @@ Partial Class ucrDataView Me.lblRecent.AutoSize = True Me.lblRecent.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblRecent.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRecent.Location = New System.Drawing.Point(3, 4) + Me.lblRecent.Location = New System.Drawing.Point(4, 6) + Me.lblRecent.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblRecent.Name = "lblRecent" - Me.lblRecent.Size = New System.Drawing.Size(80, 25) + Me.lblRecent.Size = New System.Drawing.Size(116, 37) Me.lblRecent.TabIndex = 1 Me.lblRecent.Text = "Recent" ' @@ -902,9 +923,10 @@ Partial Class ucrDataView Me.panelRecentMenuItems.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.panelRecentMenuItems.AutoScroll = True - Me.panelRecentMenuItems.Location = New System.Drawing.Point(5, 30) + Me.panelRecentMenuItems.Location = New System.Drawing.Point(8, 45) + Me.panelRecentMenuItems.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.panelRecentMenuItems.Name = "panelRecentMenuItems" - Me.panelRecentMenuItems.Size = New System.Drawing.Size(159, 138) + Me.panelRecentMenuItems.Size = New System.Drawing.Size(240, 207) Me.panelRecentMenuItems.TabIndex = 6 ' 'TblPanPageDisplay @@ -936,21 +958,22 @@ Partial Class ucrDataView Me.TblPanPageDisplay.Controls.Add(Me.lblRowBack, 3, 0) Me.TblPanPageDisplay.Dock = System.Windows.Forms.DockStyle.Fill Me.TblPanPageDisplay.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.TblPanPageDisplay.Location = New System.Drawing.Point(249, 461) + Me.TblPanPageDisplay.Location = New System.Drawing.Point(374, 692) Me.TblPanPageDisplay.Margin = New System.Windows.Forms.Padding(0) Me.TblPanPageDisplay.Name = "TblPanPageDisplay" Me.TblPanPageDisplay.RowCount = 1 Me.TblPanPageDisplay.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!)) - Me.TblPanPageDisplay.Size = New System.Drawing.Size(499, 20) + Me.TblPanPageDisplay.Size = New System.Drawing.Size(748, 30) Me.TblPanPageDisplay.TabIndex = 8 ' 'lblColFirst ' Me.lblColFirst.AutoSize = True Me.lblColFirst.Dock = System.Windows.Forms.DockStyle.Fill - Me.lblColFirst.Location = New System.Drawing.Point(315, 0) + Me.lblColFirst.Location = New System.Drawing.Point(472, 0) + Me.lblColFirst.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblColFirst.Name = "lblColFirst" - Me.lblColFirst.Size = New System.Drawing.Size(18, 20) + Me.lblColFirst.Size = New System.Drawing.Size(26, 30) Me.lblColFirst.TabIndex = 15 Me.lblColFirst.Text = "«" Me.lblColFirst.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -959,9 +982,10 @@ Partial Class ucrDataView ' Me.lblColDisplay.AutoSize = True Me.lblColDisplay.Dock = System.Windows.Forms.DockStyle.Fill - Me.lblColDisplay.Location = New System.Drawing.Point(252, 0) + Me.lblColDisplay.Location = New System.Drawing.Point(378, 0) + Me.lblColDisplay.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblColDisplay.Name = "lblColDisplay" - Me.lblColDisplay.Size = New System.Drawing.Size(57, 20) + Me.lblColDisplay.Size = New System.Drawing.Size(86, 30) Me.lblColDisplay.TabIndex = 14 Me.lblColDisplay.Text = "Label1" Me.lblColDisplay.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -970,9 +994,10 @@ Partial Class ucrDataView ' Me.lblColNext.AutoSize = True Me.lblColNext.Dock = System.Windows.Forms.DockStyle.Fill - Me.lblColNext.Location = New System.Drawing.Point(363, 0) + Me.lblColNext.Location = New System.Drawing.Point(541, 0) + Me.lblColNext.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblColNext.Name = "lblColNext" - Me.lblColNext.Size = New System.Drawing.Size(18, 20) + Me.lblColNext.Size = New System.Drawing.Size(27, 30) Me.lblColNext.TabIndex = 13 Me.lblColNext.Text = ">" Me.lblColNext.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -981,9 +1006,10 @@ Partial Class ucrDataView ' Me.lblColBack.AutoSize = True Me.lblColBack.Dock = System.Windows.Forms.DockStyle.Fill - Me.lblColBack.Location = New System.Drawing.Point(339, 0) + Me.lblColBack.Location = New System.Drawing.Point(506, 0) + Me.lblColBack.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblColBack.Name = "lblColBack" - Me.lblColBack.Size = New System.Drawing.Size(18, 20) + Me.lblColBack.Size = New System.Drawing.Size(27, 30) Me.lblColBack.TabIndex = 12 Me.lblColBack.Text = "<" Me.lblColBack.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -992,9 +1018,10 @@ Partial Class ucrDataView ' Me.lblRowLast.AutoSize = True Me.lblRowLast.Dock = System.Windows.Forms.DockStyle.Fill - Me.lblRowLast.Location = New System.Drawing.Point(228, 0) + Me.lblRowLast.Location = New System.Drawing.Point(344, 0) + Me.lblRowLast.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblRowLast.Name = "lblRowLast" - Me.lblRowLast.Size = New System.Drawing.Size(18, 20) + Me.lblRowLast.Size = New System.Drawing.Size(26, 30) Me.lblRowLast.TabIndex = 11 Me.lblRowLast.Text = "»" Me.lblRowLast.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1003,9 +1030,10 @@ Partial Class ucrDataView ' Me.lblRowFirst.AutoSize = True Me.lblRowFirst.Dock = System.Windows.Forms.DockStyle.Fill - Me.lblRowFirst.Location = New System.Drawing.Point(156, 0) + Me.lblRowFirst.Location = New System.Drawing.Point(240, 0) + Me.lblRowFirst.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblRowFirst.Name = "lblRowFirst" - Me.lblRowFirst.Size = New System.Drawing.Size(18, 20) + Me.lblRowFirst.Size = New System.Drawing.Size(26, 30) Me.lblRowFirst.TabIndex = 10 Me.lblRowFirst.Text = "«" Me.lblRowFirst.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1015,9 +1043,10 @@ Partial Class ucrDataView Me.lblRowDisplay.AutoSize = True Me.lblRowDisplay.Dock = System.Windows.Forms.DockStyle.Fill Me.lblRowDisplay.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.lblRowDisplay.Location = New System.Drawing.Point(93, 0) + Me.lblRowDisplay.Location = New System.Drawing.Point(146, 0) + Me.lblRowDisplay.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblRowDisplay.Name = "lblRowDisplay" - Me.lblRowDisplay.Size = New System.Drawing.Size(57, 20) + Me.lblRowDisplay.Size = New System.Drawing.Size(86, 30) Me.lblRowDisplay.TabIndex = 9 Me.lblRowDisplay.Text = "Label1" Me.lblRowDisplay.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -1026,9 +1055,10 @@ Partial Class ucrDataView ' Me.lblRowNext.AutoSize = True Me.lblRowNext.Dock = System.Windows.Forms.DockStyle.Fill - Me.lblRowNext.Location = New System.Drawing.Point(204, 0) + Me.lblRowNext.Location = New System.Drawing.Point(309, 0) + Me.lblRowNext.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblRowNext.Name = "lblRowNext" - Me.lblRowNext.Size = New System.Drawing.Size(18, 20) + Me.lblRowNext.Size = New System.Drawing.Size(27, 30) Me.lblRowNext.TabIndex = 8 Me.lblRowNext.Text = ">" Me.lblRowNext.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1037,9 +1067,10 @@ Partial Class ucrDataView ' Me.lblColLast.AutoSize = True Me.lblColLast.Dock = System.Windows.Forms.DockStyle.Fill - Me.lblColLast.Location = New System.Drawing.Point(387, 0) + Me.lblColLast.Location = New System.Drawing.Point(576, 0) + Me.lblColLast.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblColLast.Name = "lblColLast" - Me.lblColLast.Size = New System.Drawing.Size(18, 20) + Me.lblColLast.Size = New System.Drawing.Size(26, 30) Me.lblColLast.TabIndex = 7 Me.lblColLast.Text = "»" Me.lblColLast.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1048,9 +1079,10 @@ Partial Class ucrDataView ' Me.lblRowBack.AutoSize = True Me.lblRowBack.Dock = System.Windows.Forms.DockStyle.Fill - Me.lblRowBack.Location = New System.Drawing.Point(180, 0) + Me.lblRowBack.Location = New System.Drawing.Point(274, 0) + Me.lblRowBack.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblRowBack.Name = "lblRowBack" - Me.lblRowBack.Size = New System.Drawing.Size(18, 20) + Me.lblRowBack.Size = New System.Drawing.Size(27, 30) Me.lblRowBack.TabIndex = 5 Me.lblRowBack.Text = "<" Me.lblRowBack.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1058,29 +1090,28 @@ Partial Class ucrDataView 'ucrReoGrid ' Me.ucrReoGrid.Dock = System.Windows.Forms.DockStyle.Fill - Me.ucrReoGrid.Location = New System.Drawing.Point(500, 22) - Me.ucrReoGrid.Margin = New System.Windows.Forms.Padding(2) + Me.ucrReoGrid.Location = New System.Drawing.Point(751, 33) Me.ucrReoGrid.Name = "ucrReoGrid" - Me.ucrReoGrid.Size = New System.Drawing.Size(246, 437) + Me.ucrReoGrid.Size = New System.Drawing.Size(368, 656) Me.ucrReoGrid.TabIndex = 12 ' 'ucrLinuxGrid ' Me.ucrLinuxGrid.Dock = System.Windows.Forms.DockStyle.Fill - Me.ucrLinuxGrid.Location = New System.Drawing.Point(251, 22) - Me.ucrLinuxGrid.Margin = New System.Windows.Forms.Padding(2) + Me.ucrLinuxGrid.Location = New System.Drawing.Point(377, 33) Me.ucrLinuxGrid.Name = "ucrLinuxGrid" - Me.ucrLinuxGrid.Size = New System.Drawing.Size(245, 437) + Me.ucrLinuxGrid.Size = New System.Drawing.Size(368, 656) Me.ucrLinuxGrid.TabIndex = 13 ' 'ucrDataView ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.Controls.Add(Me.tlpTableContainer) + Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.Name = "ucrDataView" - Me.Size = New System.Drawing.Size(748, 481) + Me.Size = New System.Drawing.Size(1122, 722) Me.Tag = "Data_View" Me.columnContextMenuStrip.ResumeLayout(False) Me.cellContextMenuStrip.ResumeLayout(False) diff --git a/instat/ucrDataView.resx b/instat/ucrDataView.resx index 59af2d7d414..ff250794f81 100644 --- a/instat/ucrDataView.resx +++ b/instat/ucrDataView.resx @@ -133,6 +133,6 @@ 706, 17 - 25 + 118 \ No newline at end of file diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index c9357defb4d..89c4f0a1104 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -187,7 +187,7 @@ Public Class ucrDataView If GetSelectedColumns.Count = GetCurrentDataFrameFocus()?.iTotalColumnCount Then MsgBox("Cannot delete all visible columns." & Environment.NewLine & "Use Prepare > Data Object > Delete Data Frame if you wish to delete the data.", MsgBoxStyle.Information, "Cannot Delete All Columns") Else - Dim deleteCol = MsgBox("Are you sure you want to delete these column(s)?" & Environment.NewLine & "This action cannot be undone.", MessageBoxButtons.YesNo, "Delete Column") + Dim deleteCol = MsgBox("Are you sure you want to delete these column(s)?", MessageBoxButtons.YesNo, "Delete Column") If deleteCol = DialogResult.Yes Then StartWait() GetCurrentDataFrameFocus().clsPrepareFunctions.DeleteColumn(GetSelectedColumnNames()) @@ -201,12 +201,14 @@ Public Class ucrDataView StartWait() GetCurrentDataFrameFocus().clsPrepareFunctions.InsertRows(GetSelectedRows.Count, GetLastSelectedRow(), False) EndWait() + _grid.Focus() End Sub Private Sub mnuInsertRowsBefore_Click(sender As Object, e As EventArgs) Handles mnuInsertRowsBefore.Click StartWait() GetCurrentDataFrameFocus().clsPrepareFunctions.InsertRows(GetSelectedRows.Count, GetFirstSelectedRow, True) EndWait() + _grid.Focus() End Sub Private Sub mnuDeleteRows_Click(sender As Object, e As EventArgs) Handles mnuDeleteRows.Click @@ -215,6 +217,7 @@ Public Class ucrDataView StartWait() GetCurrentDataFrameFocus().clsPrepareFunctions.DeleteRows(GetSelectedRows()) EndWait() + _grid.Focus() End If End Sub @@ -911,6 +914,7 @@ Public Class ucrDataView StartWait() GetCurrentDataFrameFocus().clsPrepareFunctions.DeleteCells(GetSelectedRows(), GetSelectedColumnIndexes()) EndWait() + _grid.Focus() End If End Sub From 7d3efbb44376350846a33013a2cc323ae7fdaff6 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 16 Oct 2024 12:49:31 +0300 Subject: [PATCH 08/32] added and implemented switch off undo checkbox --- instat/Interface/IDataViewGrid.vb | 2 + .../DataGrid/Linux/ucrDataViewLinuxGrid.vb | 2 + .../DataGrid/ReoGrid/ucrDataViewReoGrid.vb | 5 +- instat/clsInstatOptions.vb | 12 + instat/clsInstatOptionsDefaults.vb | 1 + instat/dlgOptions.Designer.vb | 544 ++++++++++-------- instat/dlgOptions.vb | 5 +- instat/static/InstatObject/R/data_object_R6.R | 2 +- instat/ucrColumnMetadata.vb | 2 +- instat/ucrDataView.vb | 20 + 10 files changed, 352 insertions(+), 243 deletions(-) diff --git a/instat/Interface/IDataViewGrid.vb b/instat/Interface/IDataViewGrid.vb index 4145675170f..b4df19941b6 100644 --- a/instat/Interface/IDataViewGrid.vb +++ b/instat/Interface/IDataViewGrid.vb @@ -33,6 +33,8 @@ Public Interface IDataViewGrid Event FindRow() + Event Undo() + Sub AddColumns(visiblePage As clsDataFramePage) Sub AddRowData(dataFrame As clsDataFrame) diff --git a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb index 3977f595ba1..3b0a6cb9641 100644 --- a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb +++ b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb @@ -33,6 +33,8 @@ Public Class ucrDataViewLinuxGrid Public Event FindRow() Implements IDataViewGrid.FindRow + Public Event Undo() Implements IDataViewGrid.Undo + Public Event WorksheetChanged() Implements IDataViewGrid.WorksheetChanged Public Event WorksheetRemoved(worksheet As clsWorksheetAdapter) Implements IDataViewGrid.WorksheetRemoved diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index 7e96044857d..ffc92709e83 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -33,6 +33,8 @@ Public Class ucrDataViewReoGrid Public Event FindRow() Implements IDataViewGrid.FindRow + Public Event Undo() Implements IDataViewGrid.Undo + Public Event WorksheetChanged() Implements IDataViewGrid.WorksheetChanged Public Event WorksheetRemoved(worksheet As clsWorksheetAdapter) Implements IDataViewGrid.WorksheetRemoved @@ -284,8 +286,7 @@ Public Class ucrDataViewReoGrid ' Detect Ctrl+Z for Undo operation If e.Control AndAlso e.KeyCode = Keys.Z Then - ' Perform Undo - GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() + RaiseEvent Undo() e.Handled = True e.SuppressKeyPress = True End If diff --git a/instat/clsInstatOptions.vb b/instat/clsInstatOptions.vb index 1bd05535f48..4f02cb7d8ec 100644 --- a/instat/clsInstatOptions.vb +++ b/instat/clsInstatOptions.vb @@ -43,6 +43,7 @@ Imports RDotNet Public bShowSignifStars As Nullable(Of Boolean) Public bChangeDataFrame As Nullable(Of Boolean) Public bAutoSaveData As Nullable(Of Boolean) + Public bUndoSwitchAction As Nullable(Of Boolean) Public iAutoSaveDataMinutes As Nullable(Of Integer) Public bShowWaitDialog As Nullable(Of Boolean) Public iWaitTimeDelaySeconds As Nullable(Of Integer) @@ -84,6 +85,7 @@ Imports RDotNet bShowSignifStars = clsInstatOptionsDefaults.DEFAULTbShowSignifStars bChangeDataFrame = clsInstatOptionsDefaults.DEFAULTbChangeDataFrame bAutoSaveData = clsInstatOptionsDefaults.DEFAULTbAutoSaveData + bUndoSwitchAction = clsInstatOptionsDefaults.DEFAULTbUndoSwitchAction iAutoSaveDataMinutes = clsInstatOptionsDefaults.DEFAULTiAutoSaveDataMinutes bShowWaitDialog = clsInstatOptionsDefaults.DEFAULTbShowWaitDialog iWaitTimeDelaySeconds = clsInstatOptionsDefaults.DEFAULTiWaitTimeDelaySeconds @@ -244,6 +246,12 @@ Imports RDotNet SetAutoSaveData(clsInstatOptionsDefaults.DEFAULTbAutoSaveData) End If + If bUndoSwitchAction.HasValue Then + SetUndoSwitchAction(bUndoSwitchAction) + Else + SetUndoSwitchAction(clsInstatOptionsDefaults.DEFAULTbUndoSwitchAction) + End If + If iAutoSaveDataMinutes.HasValue Then SetAutoSaveDataMinutes(iAutoSaveDataMinutes) Else @@ -530,6 +538,10 @@ Imports RDotNet bAutoSaveData = bNewAutoSave End Sub + Public Sub SetUndoSwitchAction(bNewUndoSwitchAction As Boolean) + bUndoSwitchAction = bNewUndoSwitchAction + End Sub + Public Sub SetAutoSaveDataMinutes(iNewMinutes As Integer) iAutoSaveDataMinutes = iNewMinutes frmMain.ResetTimer() diff --git a/instat/clsInstatOptionsDefaults.vb b/instat/clsInstatOptionsDefaults.vb index 7047c81a86a..dfffa158f30 100644 --- a/instat/clsInstatOptionsDefaults.vb +++ b/instat/clsInstatOptionsDefaults.vb @@ -45,6 +45,7 @@ Public Class clsInstatOptionsDefaults Public Shared ReadOnly DEFAULTiDigits As Integer = 4 Public Shared ReadOnly DEFAULTbShowSignifStars As Boolean = False Public Shared ReadOnly DEFAULTbAutoSaveData As Boolean = True + Public Shared ReadOnly DEFAULTbUndoSwitchAction As Boolean = True Public Shared ReadOnly DEFAULTiAutoSaveDataMinutes As Integer = 10 Public Shared ReadOnly DEFAULTbShowWaitDialog As Boolean = True Public Shared ReadOnly DEFAULTiWaitTimeDelaySeconds As Integer = 2 diff --git a/instat/dlgOptions.Designer.vb b/instat/dlgOptions.Designer.vb index ed5bd9584f7..7e6cfb377c8 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 TreeNode7 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Languages") - Dim TreeNode8 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Comments") - Dim TreeNode9 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Import") - Dim TreeNode10 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Output Window") - Dim TreeNode11 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Commands") - Dim TreeNode12 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() @@ -128,6 +128,7 @@ Partial Class dlgOptions Me.ucrInputDatabaseName = New instat.ucrInputTextBox() Me.tbpWebsite = New System.Windows.Forms.TabPage() Me.ucrChkReminder = New instat.ucrCheck() + Me.ucrChkSwitchUndo = New instat.ucrCheck() CType(Me.spltControls, System.ComponentModel.ISupportInitialize).BeginInit() Me.spltControls.Panel1.SuspendLayout() Me.spltControls.Panel2.SuspendLayout() @@ -153,9 +154,10 @@ Partial Class dlgOptions ' 'cmdApply ' - Me.cmdApply.Location = New System.Drawing.Point(384, 324) + Me.cmdApply.Location = New System.Drawing.Point(576, 486) + 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(112, 34) Me.cmdApply.TabIndex = 10 Me.cmdApply.Tag = "Apply" Me.cmdApply.Text = "Apply" @@ -163,9 +165,10 @@ Partial Class dlgOptions ' 'cmdHelp ' - Me.cmdHelp.Location = New System.Drawing.Point(465, 324) + Me.cmdHelp.Location = New System.Drawing.Point(698, 486) + 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(112, 34) Me.cmdHelp.TabIndex = 12 Me.cmdHelp.Tag = "Help" Me.cmdHelp.Text = "Help" @@ -173,9 +176,10 @@ Partial Class dlgOptions ' 'cmdCancel ' - Me.cmdCancel.Location = New System.Drawing.Point(303, 324) + Me.cmdCancel.Location = New System.Drawing.Point(454, 486) + 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(112, 34) Me.cmdCancel.TabIndex = 9 Me.cmdCancel.Tag = "Cancel" Me.cmdCancel.Text = "Cancel" @@ -183,9 +187,10 @@ Partial Class dlgOptions ' 'cmdOk ' - Me.cmdOk.Location = New System.Drawing.Point(222, 324) + Me.cmdOk.Location = New System.Drawing.Point(333, 486) + 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(112, 34) Me.cmdOk.TabIndex = 11 Me.cmdOk.Tag = "Ok" Me.cmdOk.Text = "Ok" @@ -194,9 +199,10 @@ Partial Class dlgOptions '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(818, 486) + 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(56, 34) Me.cmdLanguage.TabIndex = 13 Me.cmdLanguage.Tag = "" Me.cmdLanguage.Text = "Lang" @@ -204,7 +210,8 @@ Partial Class dlgOptions ' 'spltControls ' - Me.spltControls.Location = New System.Drawing.Point(5, 1) + Me.spltControls.Location = New System.Drawing.Point(8, 2) + Me.spltControls.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.spltControls.Name = "spltControls" ' 'spltControls.Panel1 @@ -215,15 +222,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(1140, 476) + Me.spltControls.SplitterDistance = 276 + Me.spltControls.SplitterWidth = 6 Me.spltControls.TabIndex = 8 ' 'cmdFactoryReset ' - Me.cmdFactoryReset.Location = New System.Drawing.Point(13, 287) + Me.cmdFactoryReset.Location = New System.Drawing.Point(20, 430) + 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(150, 34) Me.cmdFactoryReset.TabIndex = 13 Me.cmdFactoryReset.Tag = "Help" Me.cmdFactoryReset.Text = "Factory Reset" @@ -233,31 +242,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" - TreeNode7.Name = "ndLanguages" - TreeNode7.Tag = "1" - TreeNode7.Text = "Languages" - TreeNode7.ToolTipText = "Choose different languages" - TreeNode8.Name = "ndComments" - TreeNode8.Tag = "2" - TreeNode8.Text = "Comments" - TreeNode8.ToolTipText = "Comments for the dialogs" - TreeNode9.Name = "ndImport" - TreeNode9.Tag = "3" - TreeNode9.Text = "Import" - TreeNode9.ToolTipText = "Import Data Settings" - TreeNode10.Name = "ndOutputWindow" - TreeNode10.Tag = "4" - TreeNode10.Text = "Output Window" - TreeNode10.ToolTipText = "Output Window Formatting Options" - TreeNode11.Name = "ndCommands" - TreeNode11.Tag = "8" - TreeNode11.Text = "Commands" - TreeNode11.ToolTipText = "Commands Options" - TreeNode12.Name = "ndDataView" - TreeNode12.Text = "Data View" - Me.trOptions.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode7, TreeNode8, TreeNode9, TreeNode10, TreeNode11, TreeNode12}) - 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(276, 476) Me.trOptions.TabIndex = 0 ' 'tbcOptions @@ -276,9 +286,10 @@ Partial Class dlgOptions Me.tbcOptions.Controls.Add(Me.tbpWebsite) 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(858, 476) Me.tbcOptions.TabIndex = 0 ' 'tbpLanguages @@ -286,10 +297,11 @@ Partial Class dlgOptions 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, 29) + 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(850, 443) Me.tbpLanguages.TabIndex = 0 Me.tbpLanguages.Tag = "Languages" Me.tbpLanguages.Text = "Languages" @@ -297,10 +309,9 @@ Partial Class dlgOptions ' 'lversion ' - Me.lversion.Location = New System.Drawing.Point(306, 267) - Me.lversion.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) + Me.lversion.Location = New System.Drawing.Point(459, 400) Me.lversion.Name = "lversion" - Me.lversion.Size = New System.Drawing.Size(254, 18) + Me.lversion.Size = New System.Drawing.Size(381, 27) Me.lversion.TabIndex = 4 Me.lversion.Text = "v. " Me.lversion.TextAlign = System.Drawing.ContentAlignment.TopRight @@ -308,9 +319,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(14, 27) + 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(89, 20) Me.lblLanguage.TabIndex = 3 Me.lblLanguage.Text = "Language :" ' @@ -320,19 +332,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.Margin = New System.Windows.Forms.Padding(6) + Me.ucrInputLanguage.Location = New System.Drawing.Point(112, 22) + Me.ucrInputLanguage.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputLanguage.Name = "ucrInputLanguage" - Me.ucrInputLanguage.Size = New System.Drawing.Size(110, 21) + Me.ucrInputLanguage.Size = New System.Drawing.Size(165, 32) 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, 29) + 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(850, 443) Me.tbpComments.TabIndex = 1 Me.tbpComments.Tag = "Comments" Me.tbpComments.Text = "Comments" @@ -343,9 +356,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(15, 15) + 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(586, 44) Me.pnComments.TabIndex = 2 ' 'ucrInputComment @@ -354,18 +368,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.Margin = New System.Windows.Forms.Padding(6) + Me.ucrInputComment.Location = New System.Drawing.Point(144, 8) + Me.ucrInputComment.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputComment.Name = "ucrInputComment" - Me.ucrInputComment.Size = New System.Drawing.Size(292, 21) + Me.ucrInputComment.Size = New System.Drawing.Size(438, 32) 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(3, 14) + 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(82, 20) Me.lblComment.TabIndex = 0 Me.lblComment.Tag = "Comment:" Me.lblComment.Text = "Comment:" @@ -375,9 +390,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, 29) + 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(850, 443) Me.tbpImport.TabIndex = 3 Me.tbpImport.Text = "Import" Me.tbpImport.UseVisualStyleBackColor = True @@ -385,9 +401,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, 14) + 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(189, 20) Me.lblPreviewRows.TabIndex = 0 Me.lblPreviewRows.Text = "Number of Preview Rows:" ' @@ -396,12 +413,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(270, 5) - Me.ucrNudPreviewRows.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudPreviewRows.Location = New System.Drawing.Point(405, 8) + Me.ucrNudPreviewRows.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) 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(75, 30) Me.ucrNudPreviewRows.TabIndex = 3 Me.ucrNudPreviewRows.Value = New Decimal(New Integer() {10, 0, 0, 0}) ' @@ -409,7 +426,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(15, 15) + 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 @@ -422,10 +440,11 @@ 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, 29) + 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(850, 443) Me.tbpOutputWindow.TabIndex = 2 Me.tbpOutputWindow.Text = "Output Window" Me.tbpOutputWindow.UseVisualStyleBackColor = True @@ -435,12 +454,12 @@ Partial Class dlgOptions Me.ucrNudMaxOutputsHeight.AutoSize = True Me.ucrNudMaxOutputsHeight.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxOutputsHeight.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudMaxOutputsHeight.Location = New System.Drawing.Point(506, 135) - Me.ucrNudMaxOutputsHeight.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudMaxOutputsHeight.Location = New System.Drawing.Point(759, 202) + Me.ucrNudMaxOutputsHeight.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrNudMaxOutputsHeight.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudMaxOutputsHeight.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxOutputsHeight.Name = "ucrNudMaxOutputsHeight" - Me.ucrNudMaxOutputsHeight.Size = New System.Drawing.Size(50, 20) + Me.ucrNudMaxOutputsHeight.Size = New System.Drawing.Size(75, 30) Me.ucrNudMaxOutputsHeight.TabIndex = 29 Me.ucrNudMaxOutputsHeight.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -448,30 +467,30 @@ Partial Class dlgOptions ' Me.ucrChkMaxOutputsHeight.AutoSize = True Me.ucrChkMaxOutputsHeight.Checked = False - Me.ucrChkMaxOutputsHeight.Location = New System.Drawing.Point(300, 135) - Me.ucrChkMaxOutputsHeight.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkMaxOutputsHeight.Location = New System.Drawing.Point(450, 202) + Me.ucrChkMaxOutputsHeight.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkMaxOutputsHeight.Name = "ucrChkMaxOutputsHeight" - Me.ucrChkMaxOutputsHeight.Size = New System.Drawing.Size(196, 34) + Me.ucrChkMaxOutputsHeight.Size = New System.Drawing.Size(294, 51) Me.ucrChkMaxOutputsHeight.TabIndex = 28 ' 'ucrChkShowRCommandsinOutputWindow ' Me.ucrChkShowRCommandsinOutputWindow.AutoSize = True Me.ucrChkShowRCommandsinOutputWindow.Checked = False - Me.ucrChkShowRCommandsinOutputWindow.Location = New System.Drawing.Point(10, 160) - Me.ucrChkShowRCommandsinOutputWindow.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkShowRCommandsinOutputWindow.Location = New System.Drawing.Point(15, 240) + Me.ucrChkShowRCommandsinOutputWindow.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkShowRCommandsinOutputWindow.Name = "ucrChkShowRCommandsinOutputWindow" - Me.ucrChkShowRCommandsinOutputWindow.Size = New System.Drawing.Size(271, 34) + Me.ucrChkShowRCommandsinOutputWindow.Size = New System.Drawing.Size(406, 51) Me.ucrChkShowRCommandsinOutputWindow.TabIndex = 27 ' 'ucrChkIncludeCommentsbyDefault ' Me.ucrChkIncludeCommentsbyDefault.AutoSize = True Me.ucrChkIncludeCommentsbyDefault.Checked = False - Me.ucrChkIncludeCommentsbyDefault.Location = New System.Drawing.Point(10, 135) - Me.ucrChkIncludeCommentsbyDefault.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkIncludeCommentsbyDefault.Location = New System.Drawing.Point(15, 202) + Me.ucrChkIncludeCommentsbyDefault.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkIncludeCommentsbyDefault.Name = "ucrChkIncludeCommentsbyDefault" - Me.ucrChkIncludeCommentsbyDefault.Size = New System.Drawing.Size(271, 34) + Me.ucrChkIncludeCommentsbyDefault.Size = New System.Drawing.Size(406, 51) Me.ucrChkIncludeCommentsbyDefault.TabIndex = 26 ' 'grpROptions @@ -479,9 +498,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(15, 288) + 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(406, 140) Me.grpROptions.TabIndex = 25 Me.grpROptions.TabStop = False Me.grpROptions.Text = "R Options" @@ -490,10 +511,10 @@ Partial Class dlgOptions ' Me.ucrChkShowSignifStars.AutoSize = True Me.ucrChkShowSignifStars.Checked = False - Me.ucrChkShowSignifStars.Location = New System.Drawing.Point(7, 49) - Me.ucrChkShowSignifStars.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkShowSignifStars.Location = New System.Drawing.Point(10, 74) + Me.ucrChkShowSignifStars.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkShowSignifStars.Name = "ucrChkShowSignifStars" - Me.ucrChkShowSignifStars.Size = New System.Drawing.Size(255, 34) + Me.ucrChkShowSignifStars.Size = New System.Drawing.Size(382, 51) Me.ucrChkShowSignifStars.TabIndex = 28 ' 'ucrNudDigits @@ -501,21 +522,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.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudDigits.Location = New System.Drawing.Point(266, 34) + Me.ucrNudDigits.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) 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(75, 30) 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(9, 34) + 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(204, 20) Me.lblNoDigits.TabIndex = 1 Me.lblNoDigits.Text = "Number of Digits to Display:" ' @@ -532,43 +554,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(15, 15) + 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(586, 175) Me.pnFormatOptions.TabIndex = 21 ' 'rtbCommentPreview ' - Me.rtbCommentPreview.Location = New System.Drawing.Point(124, 89) + Me.rtbCommentPreview.Location = New System.Drawing.Point(186, 134) + 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(218, 37) Me.rtbCommentPreview.TabIndex = 22 Me.rtbCommentPreview.Text = "" ' 'rtbOutputPreview ' - Me.rtbOutputPreview.Location = New System.Drawing.Point(124, 49) + Me.rtbOutputPreview.Location = New System.Drawing.Point(186, 74) + 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(218, 37) Me.rtbOutputPreview.TabIndex = 21 Me.rtbOutputPreview.Text = "" ' 'rtbCommandPreview ' - Me.rtbCommandPreview.Location = New System.Drawing.Point(124, 9) + Me.rtbCommandPreview.Location = New System.Drawing.Point(186, 14) + 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(218, 37) Me.rtbCommandPreview.TabIndex = 20 Me.rtbCommandPreview.Text = "" ' 'cmdCommandFormat ' - Me.cmdCommandFormat.Location = New System.Drawing.Point(288, 9) + Me.cmdCommandFormat.Location = New System.Drawing.Point(432, 14) + 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(150, 34) Me.cmdCommandFormat.TabIndex = 10 Me.cmdCommandFormat.Text = "Change..." Me.cmdCommandFormat.UseVisualStyleBackColor = True @@ -576,17 +603,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(6, 141) + 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(137, 20) 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(432, 74) + 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(150, 34) Me.cmdOutputFormat.TabIndex = 16 Me.cmdOutputFormat.Text = "Change..." Me.cmdOutputFormat.UseVisualStyleBackColor = True @@ -594,17 +623,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(6, 81) + 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(117, 20) 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(432, 134) + 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(150, 34) Me.cmdCommentFormat.TabIndex = 16 Me.cmdCommentFormat.Text = "Change..." Me.cmdCommentFormat.UseVisualStyleBackColor = True @@ -612,19 +643,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(6, 21) + 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(141, 20) 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, 29) + 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(850, 443) Me.tbpEditor.TabIndex = 10 Me.tbpEditor.Text = "Editor Window" Me.tbpEditor.ToolTipText = "Data View" @@ -636,16 +669,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(15, 15) + 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(318, 41) Me.pnFormatEditor.TabIndex = 22 ' 'cmdEditorFont ' - Me.cmdEditorFont.Location = New System.Drawing.Point(109, 2) + Me.cmdEditorFont.Location = New System.Drawing.Point(164, 3) + 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(150, 34) Me.cmdEditorFont.TabIndex = 10 Me.cmdEditorFont.Text = "Change..." Me.cmdEditorFont.UseVisualStyleBackColor = True @@ -653,9 +688,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(6, 10) + 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(101, 20) Me.lblFont.TabIndex = 17 Me.lblFont.Text = "Format Font:" ' @@ -665,10 +701,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, 29) + 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(850, 443) Me.tbpCommands.TabIndex = 4 Me.tbpCommands.Tag = "Commands" Me.tbpCommands.Text = "Commands" @@ -677,9 +714,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(604, 69) + 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(69, 20) Me.lblWaitSeconds.TabIndex = 8 Me.lblWaitSeconds.Text = "seconds" ' @@ -687,10 +725,10 @@ Partial Class dlgOptions ' Me.ucrChkShowWaitDialog.AutoSize = True Me.ucrChkShowWaitDialog.Checked = False - Me.ucrChkShowWaitDialog.Location = New System.Drawing.Point(6, 47) - Me.ucrChkShowWaitDialog.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkShowWaitDialog.Location = New System.Drawing.Point(9, 70) + Me.ucrChkShowWaitDialog.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkShowWaitDialog.Name = "ucrChkShowWaitDialog" - Me.ucrChkShowWaitDialog.Size = New System.Drawing.Size(337, 34) + Me.ucrChkShowWaitDialog.Size = New System.Drawing.Size(506, 51) Me.ucrChkShowWaitDialog.TabIndex = 6 ' 'ucrNudWaitSeconds @@ -698,12 +736,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.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudWaitSeconds.Location = New System.Drawing.Point(524, 68) + Me.ucrNudWaitSeconds.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) 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(75, 30) Me.ucrNudWaitSeconds.TabIndex = 5 Me.ucrNudWaitSeconds.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -711,14 +749,15 @@ Partial Class dlgOptions ' Me.ucrChkIncludeDefaultParams.AutoSize = True Me.ucrChkIncludeDefaultParams.Checked = False - Me.ucrChkIncludeDefaultParams.Location = New System.Drawing.Point(6, 20) - Me.ucrChkIncludeDefaultParams.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkIncludeDefaultParams.Location = New System.Drawing.Point(9, 30) + Me.ucrChkIncludeDefaultParams.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkIncludeDefaultParams.Name = "ucrChkIncludeDefaultParams" - Me.ucrChkIncludeDefaultParams.Size = New System.Drawing.Size(398, 34) + Me.ucrChkIncludeDefaultParams.Size = New System.Drawing.Size(597, 51) Me.ucrChkIncludeDefaultParams.TabIndex = 3 ' 'tbpDataView ' + Me.tbpDataView.Controls.Add(Me.ucrChkSwitchUndo) Me.tbpDataView.Controls.Add(Me.lblEvery) Me.tbpDataView.Controls.Add(Me.lblMinutes) Me.tbpDataView.Controls.Add(Me.ucrChkAutoSave) @@ -728,10 +767,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, 29) + 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(850, 443) Me.tbpDataView.TabIndex = 9 Me.tbpDataView.Text = "Data View" Me.tbpDataView.UseVisualStyleBackColor = True @@ -739,18 +779,20 @@ Partial Class dlgOptions 'lblEvery ' Me.lblEvery.AutoSize = True - Me.lblEvery.Location = New System.Drawing.Point(220, 115) + Me.lblEvery.Location = New System.Drawing.Point(330, 172) + 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(46, 20) Me.lblEvery.TabIndex = 4 Me.lblEvery.Text = "every" ' 'lblMinutes ' Me.lblMinutes.AutoSize = True - Me.lblMinutes.Location = New System.Drawing.Point(340, 115) + Me.lblMinutes.Location = New System.Drawing.Point(510, 172) + 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(65, 20) Me.lblMinutes.TabIndex = 4 Me.lblMinutes.Text = "minutes" ' @@ -758,20 +800,20 @@ Partial Class dlgOptions ' Me.ucrChkAutoSave.AutoSize = True Me.ucrChkAutoSave.Checked = False - Me.ucrChkAutoSave.Location = New System.Drawing.Point(13, 114) - Me.ucrChkAutoSave.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkAutoSave.Location = New System.Drawing.Point(20, 171) + Me.ucrChkAutoSave.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkAutoSave.Name = "ucrChkAutoSave" - Me.ucrChkAutoSave.Size = New System.Drawing.Size(217, 34) + Me.ucrChkAutoSave.Size = New System.Drawing.Size(326, 51) Me.ucrChkAutoSave.TabIndex = 3 ' 'ucrChkShowDataonGrid ' Me.ucrChkShowDataonGrid.AutoSize = True Me.ucrChkShowDataonGrid.Checked = False - Me.ucrChkShowDataonGrid.Location = New System.Drawing.Point(13, 78) - Me.ucrChkShowDataonGrid.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkShowDataonGrid.Location = New System.Drawing.Point(20, 117) + Me.ucrChkShowDataonGrid.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkShowDataonGrid.Name = "ucrChkShowDataonGrid" - Me.ucrChkShowDataonGrid.Size = New System.Drawing.Size(393, 34) + Me.ucrChkShowDataonGrid.Size = New System.Drawing.Size(590, 51) Me.ucrChkShowDataonGrid.TabIndex = 3 ' 'ucrNudAutoSaveMinutes @@ -779,12 +821,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(268, 112) - Me.ucrNudAutoSaveMinutes.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudAutoSaveMinutes.Location = New System.Drawing.Point(402, 168) + Me.ucrNudAutoSaveMinutes.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) 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(75, 30) Me.ucrNudAutoSaveMinutes.TabIndex = 2 Me.ucrNudAutoSaveMinutes.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -793,21 +835,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.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudMaxCols.Location = New System.Drawing.Point(402, 62) + Me.ucrNudMaxCols.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) 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(75, 30) 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(15, 66) + 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(297, 20) Me.lblMaxCols.TabIndex = 1 Me.lblMaxCols.Text = "Maximum Number of Columns to Display:" ' @@ -816,21 +859,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.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudMaxRows.Location = New System.Drawing.Point(402, 22) + Me.ucrNudMaxRows.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) 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(75, 30) 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(15, 27) + 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(275, 20) Me.lblMaxRows.TabIndex = 1 Me.lblMaxRows.Text = "Maximum Number of Rows to Display:" ' @@ -839,19 +883,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, 29) + 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(850, 443) 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(598, 24) + 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(36, 32) Me.cmdWorkingDirectory.TabIndex = 2 Me.cmdWorkingDirectory.Text = "..." Me.cmdWorkingDirectory.UseVisualStyleBackColor = True @@ -859,9 +905,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(20, 30) + 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(138, 20) Me.lblWorkingDirectory.TabIndex = 0 Me.lblWorkingDirectory.Text = "Working Directory:" ' @@ -871,10 +918,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.Margin = New System.Windows.Forms.Padding(6) + Me.ucrWorkingDirectory.Location = New System.Drawing.Point(207, 26) + Me.ucrWorkingDirectory.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrWorkingDirectory.Name = "ucrWorkingDirectory" - Me.ucrWorkingDirectory.Size = New System.Drawing.Size(255, 21) + Me.ucrWorkingDirectory.Size = New System.Drawing.Size(382, 32) Me.ucrWorkingDirectory.TabIndex = 1 ' 'tbpGraphDisplay @@ -883,10 +930,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, 29) + 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(850, 443) Me.tbpGraphDisplay.TabIndex = 12 Me.tbpGraphDisplay.Text = "Graph Display" Me.tbpGraphDisplay.UseVisualStyleBackColor = True @@ -895,9 +943,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(9, 78) + 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(239, 24) Me.rdoDisplayinSeparateWindows.TabIndex = 1 Me.rdoDisplayinSeparateWindows.TabStop = True Me.rdoDisplayinSeparateWindows.Text = "Display in Separate Windows" @@ -906,9 +955,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(9, 44) + 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(169, 24) Me.rdoDisplayinRViewer.TabIndex = 1 Me.rdoDisplayinRViewer.Text = "Display in R Viewer" Me.rdoDisplayinRViewer.UseVisualStyleBackColor = True @@ -916,9 +966,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(9, 9) + 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(214, 24) Me.rdoDisplayinOutputWindow.TabIndex = 1 Me.rdoDisplayinOutputWindow.Text = "Display in Output Window" Me.rdoDisplayinOutputWindow.UseVisualStyleBackColor = True @@ -926,10 +977,10 @@ Partial Class dlgOptions 'ucrPnlGraphDisplay ' Me.ucrPnlGraphDisplay.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlGraphDisplay.Location = New System.Drawing.Point(0, 3) - Me.ucrPnlGraphDisplay.Margin = New System.Windows.Forms.Padding(5) + Me.ucrPnlGraphDisplay.Location = New System.Drawing.Point(0, 4) + Me.ucrPnlGraphDisplay.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrPnlGraphDisplay.Name = "ucrPnlGraphDisplay" - Me.ucrPnlGraphDisplay.Size = New System.Drawing.Size(365, 66) + Me.ucrPnlGraphDisplay.Size = New System.Drawing.Size(548, 99) Me.ucrPnlGraphDisplay.TabIndex = 3 ' 'tbpTailoredMenus @@ -938,10 +989,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, 29) + 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(850, 443) Me.tbpTailoredMenus.TabIndex = 13 Me.tbpTailoredMenus.Text = "Tailored Menus" Me.tbpTailoredMenus.UseVisualStyleBackColor = True @@ -950,40 +1002,40 @@ Partial Class dlgOptions ' Me.ucrChkViewStructuredMenu.AutoSize = True Me.ucrChkViewStructuredMenu.Checked = False - Me.ucrChkViewStructuredMenu.Location = New System.Drawing.Point(7, 12) - Me.ucrChkViewStructuredMenu.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkViewStructuredMenu.Location = New System.Drawing.Point(10, 18) + Me.ucrChkViewStructuredMenu.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkViewStructuredMenu.Name = "ucrChkViewStructuredMenu" - Me.ucrChkViewStructuredMenu.Size = New System.Drawing.Size(378, 34) + Me.ucrChkViewStructuredMenu.Size = New System.Drawing.Size(567, 51) Me.ucrChkViewStructuredMenu.TabIndex = 2 ' 'ucrChkViewOptionsByContextMenu ' Me.ucrChkViewOptionsByContextMenu.AutoSize = True Me.ucrChkViewOptionsByContextMenu.Checked = False - Me.ucrChkViewOptionsByContextMenu.Location = New System.Drawing.Point(7, 137) - Me.ucrChkViewOptionsByContextMenu.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkViewOptionsByContextMenu.Location = New System.Drawing.Point(10, 206) + Me.ucrChkViewOptionsByContextMenu.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkViewOptionsByContextMenu.Name = "ucrChkViewOptionsByContextMenu" - Me.ucrChkViewOptionsByContextMenu.Size = New System.Drawing.Size(413, 34) + Me.ucrChkViewOptionsByContextMenu.Size = New System.Drawing.Size(620, 51) Me.ucrChkViewOptionsByContextMenu.TabIndex = 1 ' 'ucrChkViewProcurementMenu ' Me.ucrChkViewProcurementMenu.AutoSize = True Me.ucrChkViewProcurementMenu.Checked = False - Me.ucrChkViewProcurementMenu.Location = New System.Drawing.Point(7, 95) - Me.ucrChkViewProcurementMenu.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkViewProcurementMenu.Location = New System.Drawing.Point(10, 142) + Me.ucrChkViewProcurementMenu.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkViewProcurementMenu.Name = "ucrChkViewProcurementMenu" - Me.ucrChkViewProcurementMenu.Size = New System.Drawing.Size(413, 34) + Me.ucrChkViewProcurementMenu.Size = New System.Drawing.Size(620, 51) Me.ucrChkViewProcurementMenu.TabIndex = 0 ' 'ucrChkViewClimaticMenu ' Me.ucrChkViewClimaticMenu.AutoSize = True Me.ucrChkViewClimaticMenu.Checked = False - Me.ucrChkViewClimaticMenu.Location = New System.Drawing.Point(7, 53) - Me.ucrChkViewClimaticMenu.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkViewClimaticMenu.Location = New System.Drawing.Point(10, 80) + Me.ucrChkViewClimaticMenu.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkViewClimaticMenu.Name = "ucrChkViewClimaticMenu" - Me.ucrChkViewClimaticMenu.Size = New System.Drawing.Size(407, 34) + Me.ucrChkViewClimaticMenu.Size = New System.Drawing.Size(610, 51) Me.ucrChkViewClimaticMenu.TabIndex = 0 ' 'tbpClimsoft @@ -996,10 +1048,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, 29) + 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(850, 443) Me.tbpClimsoft.TabIndex = 14 Me.tbpClimsoft.Text = "Climsoft" Me.tbpClimsoft.UseVisualStyleBackColor = True @@ -1008,9 +1061,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(9, 154) + 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(87, 20) Me.lblUserName.TabIndex = 19 Me.lblUserName.Text = "Username:" ' @@ -1018,9 +1072,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(9, 114) + 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(42, 20) Me.lblPort.TabIndex = 18 Me.lblPort.Text = "Port:" ' @@ -1028,9 +1083,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(9, 74) + 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(47, 20) Me.lblHost.TabIndex = 17 Me.lblHost.Text = "Host:" ' @@ -1038,9 +1094,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(9, 32) + 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(129, 20) Me.lblDatabaseName.TabIndex = 16 Me.lblDatabaseName.Text = "Database Name:" ' @@ -1050,10 +1107,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.Margin = New System.Windows.Forms.Padding(6) + Me.ucrInputUserName.Location = New System.Drawing.Point(252, 144) + Me.ucrInputUserName.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputUserName.Name = "ucrInputUserName" - Me.ucrInputUserName.Size = New System.Drawing.Size(137, 21) + Me.ucrInputUserName.Size = New System.Drawing.Size(206, 32) Me.ucrInputUserName.TabIndex = 15 ' 'ucrInputPort @@ -1062,10 +1119,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.Margin = New System.Windows.Forms.Padding(6) + Me.ucrInputPort.Location = New System.Drawing.Point(252, 104) + Me.ucrInputPort.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputPort.Name = "ucrInputPort" - Me.ucrInputPort.Size = New System.Drawing.Size(137, 21) + Me.ucrInputPort.Size = New System.Drawing.Size(206, 32) Me.ucrInputPort.TabIndex = 14 ' 'ucrInputHost @@ -1074,10 +1131,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.Margin = New System.Windows.Forms.Padding(6) + Me.ucrInputHost.Location = New System.Drawing.Point(252, 64) + Me.ucrInputHost.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputHost.Name = "ucrInputHost" - Me.ucrInputHost.Size = New System.Drawing.Size(137, 21) + Me.ucrInputHost.Size = New System.Drawing.Size(206, 32) Me.ucrInputHost.TabIndex = 13 ' 'ucrInputDatabaseName @@ -1086,20 +1143,19 @@ 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.Margin = New System.Windows.Forms.Padding(6) + Me.ucrInputDatabaseName.Location = New System.Drawing.Point(252, 26) + Me.ucrInputDatabaseName.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputDatabaseName.Name = "ucrInputDatabaseName" - Me.ucrInputDatabaseName.Size = New System.Drawing.Size(137, 21) + Me.ucrInputDatabaseName.Size = New System.Drawing.Size(206, 32) Me.ucrInputDatabaseName.TabIndex = 12 ' 'tbpWebsite ' Me.tbpWebsite.Controls.Add(Me.ucrChkReminder) - Me.tbpWebsite.Location = New System.Drawing.Point(4, 22) - Me.tbpWebsite.Margin = New System.Windows.Forms.Padding(2) + Me.tbpWebsite.Location = New System.Drawing.Point(4, 29) Me.tbpWebsite.Name = "tbpWebsite" - Me.tbpWebsite.Padding = New System.Windows.Forms.Padding(2) - Me.tbpWebsite.Size = New System.Drawing.Size(564, 291) + Me.tbpWebsite.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3) + Me.tbpWebsite.Size = New System.Drawing.Size(850, 443) Me.tbpWebsite.TabIndex = 15 Me.tbpWebsite.Text = "Website" Me.tbpWebsite.UseVisualStyleBackColor = True @@ -1108,18 +1164,28 @@ Partial Class dlgOptions ' Me.ucrChkReminder.AutoSize = True Me.ucrChkReminder.Checked = False - Me.ucrChkReminder.Location = New System.Drawing.Point(7, 22) - Me.ucrChkReminder.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkReminder.Location = New System.Drawing.Point(10, 33) + Me.ucrChkReminder.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkReminder.Name = "ucrChkReminder" - Me.ucrChkReminder.Size = New System.Drawing.Size(413, 34) + Me.ucrChkReminder.Size = New System.Drawing.Size(620, 51) Me.ucrChkReminder.TabIndex = 2 ' + 'ucrChkSwitchUndo + ' + Me.ucrChkSwitchUndo.AutoSize = True + Me.ucrChkSwitchUndo.Checked = False + Me.ucrChkSwitchUndo.Location = New System.Drawing.Point(20, 227) + Me.ucrChkSwitchUndo.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkSwitchUndo.Name = "ucrChkSwitchUndo" + Me.ucrChkSwitchUndo.Size = New System.Drawing.Size(326, 51) + Me.ucrChkSwitchUndo.TabIndex = 5 + ' 'dlgOptions ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.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(1155, 530) Me.Controls.Add(Me.cmdLanguage) Me.Controls.Add(Me.cmdApply) Me.Controls.Add(Me.cmdHelp) @@ -1127,6 +1193,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" @@ -1256,4 +1323,5 @@ Partial Class dlgOptions Friend WithEvents lversion As Label Friend WithEvents tbpWebsite As TabPage Friend WithEvents ucrChkReminder As ucrCheck + Friend WithEvents ucrChkSwitchUndo As ucrCheck End Class diff --git a/instat/dlgOptions.vb b/instat/dlgOptions.vb index 35cf301c8b7..658ed78081e 100644 --- a/instat/dlgOptions.vb +++ b/instat/dlgOptions.vb @@ -78,6 +78,7 @@ Public Class dlgOptions ucrChkShowDataonGrid.SetText("Display dialog's selected data frame in grid") ucrChkIncludeDefaultParams.SetText("Include Default Parameter Values in R Commands") ucrChkAutoSave.SetText("Auto save a backup of data") + ucrChkSwitchUndo.SetText("Switch off undo") ucrChkShowWaitDialog.SetText("Show waiting dialog when command takes longer than") ucrChkReminder.SetText("Remind me later when R-Instat new version available") ucrChkAutoSave.AddToLinkedControls(ucrNudAutoSaveMinutes, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -102,6 +103,7 @@ Public Class dlgOptions Private Sub LoadInstatOptions() ucrChkIncludeDefaultParams.Checked = frmMain.clsInstatOptions.bIncludeRDefaultParameters ucrChkAutoSave.Checked = frmMain.clsInstatOptions.bAutoSaveData + ucrChkSwitchUndo.Checked = frmMain.clsInstatOptions.bUndoSwitchAction SetOutputFont(frmMain.clsInstatOptions.fntOutput, frmMain.clsInstatOptions.clrOutput) SetCommandFont(frmMain.clsInstatOptions.fntScript, frmMain.clsInstatOptions.clrScript) SetCommentFont(frmMain.clsInstatOptions.fntComment, frmMain.clsInstatOptions.clrComment) @@ -172,6 +174,7 @@ Public Class dlgOptions frmMain.clsInstatOptions.SetMaxRows(ucrNudMaxRows.Value) frmMain.clsInstatOptions.SetMaxCols(ucrNudMaxCols.Value) frmMain.clsInstatOptions.SetAutoSaveData(ucrChkAutoSave.Checked) + frmMain.clsInstatOptions.SetUndoSwitchAction(ucrChkSwitchUndo.Checked) frmMain.clsInstatOptions.SetAutoSaveDataMinutes(ucrNudAutoSaveMinutes.Value) frmMain.clsInstatOptions.SetLanguageCultureCode(strCurrLanguageCulture) frmMain.clsInstatOptions.SetWorkingDirectory(strWorkingDirectory) @@ -360,7 +363,7 @@ Public Class dlgOptions End Sub - Private Sub AllControls_ControlValueChanged() Handles ucrNudMaxCols.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrNudWaitSeconds.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged + Private Sub AllControls_ControlValueChanged() Handles ucrNudMaxCols.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrNudWaitSeconds.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged, ucrChkSwitchUndo.ControlValueChanged ApplyEnabled(True) End Sub diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 065e053bf9d..b0c7ac4ce48 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -286,7 +286,7 @@ DataSheet$set("public", "set_scalars", function(new_scalars) { DataSheet$set("public", "set_history", function(history) { if(!is.list(history)) stop("history must be of type: list") - MAX_HISTORY_SIZE <- 10 + MAX_HISTORY_SIZE <- 5 # Limit history size if (length(private$history) >= MAX_HISTORY_SIZE) { private$history <- private$history[-1] # Remove the oldest entry diff --git a/instat/ucrColumnMetadata.vb b/instat/ucrColumnMetadata.vb index d9f4db985ec..2d102ea97c4 100644 --- a/instat/ucrColumnMetadata.vb +++ b/instat/ucrColumnMetadata.vb @@ -387,7 +387,7 @@ Public Class ucrColumnMetadata If _grid.GetSelectedRows.Count = GetCurrentDataFrameFocus()?.iTotalColumnCount Then MsgBox("Cannot delete all visible columns." & Environment.NewLine & "Use Prepare > Data Object > Delete Data Frame if you wish to delete the data.", MsgBoxStyle.Information, "Cannot Delete All Columns") Else - Dim deleteCol = MsgBox("Are you sure you want to delete these column(s)?" & Environment.NewLine & "This action cannot be undone.", MessageBoxButtons.YesNo, "Delete Column") + Dim deleteCol = MsgBox("Are you sure you want to delete these column(s)?", MessageBoxButtons.YesNo, "Delete Column") If deleteCol = DialogResult.Yes Then StartWait() GetCurrentDataFrameFocus().clsPrepareFunctions.DeleteColumn(GetSelectedDataframeColumnsFromSelectedRows) diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index 89c4f0a1104..9f3690bce3f 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -89,6 +89,7 @@ Public Class ucrDataView AddHandler _grid.DeleteValuesToDataframe, AddressOf DeleteCell_Click AddHandler _grid.EditCell, AddressOf EditCell AddHandler _grid.FindRow, AddressOf FindRow + AddHandler _grid.Undo, AddressOf Undo End Sub Private Sub RefreshWorksheet(fillWorkSheet As clsWorksheetAdapter, dataFrame As clsDataFrame) @@ -1013,6 +1014,25 @@ Public Class ucrDataView dlgFindInVariableOrFilter.ShowDialog() End Sub + Private Sub Undo() + If frmMain.clsInstatOptions.bUndoSwitchAction Then + Dim bUndo As Boolean = True + If GetCurrentDataFrameFocus.iTotalRowCount > 1000 Then + Dim result As DialogResult = MessageBox.Show(Me, "The dataset you are working with has more than 1000 rows, which may cause the undo operation to be slow. Do you want to proceed?", + "Large Data Set Detected", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) + ' Check if the user clicked No + If result = DialogResult.No Then + bUndo = False + End If + End If + + + If bUndo Then + GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() + End If + End If + End Sub + Public Sub SearchRowInGrid(rowNumbers As List(Of Integer), strColumn As String, Optional iRow As Integer = 0, Optional bApplyToRows As Boolean = False) _grid.SearchRowInGrid(rowNumbers, strColumn, iRow, bApplyToRows) From 6e55c526b7e8a029f332a112ea14cc3c9de92551 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 16 Oct 2024 14:34:34 +0300 Subject: [PATCH 09/32] improvement in the switch off undo --- instat/Model/DataFrame/clsDataFramePage.vb | 17 + instat/clsInstatOptions.vb | 35 +- instat/clsInstatOptionsDefaults.vb | 4 +- instat/dlgOptions.Designer.vb | 235 ++- instat/dlgOptions.vb | 18 +- instat/frmMain.Designer.vb | 1382 +++++++++-------- instat/frmMain.resx | 4 +- instat/frmMain.vb | 4 + instat/static/InstatObject/R/data_object_R6.R | 2 +- instat/ucrDataView.vb | 29 +- 10 files changed, 930 insertions(+), 800 deletions(-) diff --git a/instat/Model/DataFrame/clsDataFramePage.vb b/instat/Model/DataFrame/clsDataFramePage.vb index b522bab885b..3fb28e84784 100644 --- a/instat/Model/DataFrame/clsDataFramePage.vb +++ b/instat/Model/DataFrame/clsDataFramePage.vb @@ -213,6 +213,23 @@ Public Class clsDataFramePage End Sub + Public Function HasHistory() + Dim expTemp As SymbolicExpression + Dim bHasHistory As Boolean = False + Dim clsHasHistoryFunction As New RFunction + + clsHasHistoryFunction.SetRCommand(_clsRLink.strInstatDataObject & "$has_history") + clsHasHistoryFunction.AddParameter("data_name", Chr(34) & _strDataFrameName & Chr(34)) + If clsHasHistoryFunction IsNot Nothing Then + expTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsHasHistoryFunction.ToScript(), bSilent:=True) + If expTemp IsNot Nothing AndAlso expTemp.AsCharacter(0) = "TRUE" Then + bHasHistory = True + End If + End If + + Return bHasHistory + End Function + Private Function GetDataFrameFromRCommand() As DataFrame Dim clsGetDataFrameRFunction As New RFunction Dim expTemp As SymbolicExpression diff --git a/instat/clsInstatOptions.vb b/instat/clsInstatOptions.vb index 4f02cb7d8ec..41799e583a3 100644 --- a/instat/clsInstatOptions.vb +++ b/instat/clsInstatOptions.vb @@ -31,6 +31,8 @@ Imports RDotNet Public iPreviewRows As Nullable(Of Integer) Public iMaxRows As Nullable(Of Integer) Public iMaxCols As Nullable(Of Integer) + Public iUndoColLimit As Nullable(Of Integer) + Public iUndoRowLimit As Nullable(Of Integer) Public lstColourPalette As List(Of Color) Public strGraphDisplayOption As String Public bCommandsinOutput As Nullable(Of Boolean) @@ -76,6 +78,8 @@ Imports RDotNet iPreviewRows = clsInstatOptionsDefaults.DEFAULTiPreviewRows iMaxRows = clsInstatOptionsDefaults.DEFAULTiMaxRows iMaxCols = clsInstatOptionsDefaults.DEFAULTiMaxCols + iUndoColLimit = clsInstatOptionsDefaults.DEFAULTiUndoColLimit + iUndoRowLimit = clsInstatOptionsDefaults.DEFAULTiUndoRowLimit strComment = Translations.GetTranslation(clsInstatOptionsDefaults.DEFAULTstrComment) strGraphDisplayOption = clsInstatOptionsDefaults.DEFAULTstrGraphDisplayOption strLanguageCultureCode = clsInstatOptionsDefaults.DEFAULTstrLanguageCultureCode @@ -85,7 +89,6 @@ Imports RDotNet bShowSignifStars = clsInstatOptionsDefaults.DEFAULTbShowSignifStars bChangeDataFrame = clsInstatOptionsDefaults.DEFAULTbChangeDataFrame bAutoSaveData = clsInstatOptionsDefaults.DEFAULTbAutoSaveData - bUndoSwitchAction = clsInstatOptionsDefaults.DEFAULTbUndoSwitchAction iAutoSaveDataMinutes = clsInstatOptionsDefaults.DEFAULTiAutoSaveDataMinutes bShowWaitDialog = clsInstatOptionsDefaults.DEFAULTbShowWaitDialog iWaitTimeDelaySeconds = clsInstatOptionsDefaults.DEFAULTiWaitTimeDelaySeconds @@ -146,6 +149,18 @@ Imports RDotNet SetMaxCols(clsInstatOptionsDefaults.DEFAULTiMaxCols) End If + If iUndoColLimit.HasValue Then + SetUndoColLimit(iUndoColLimit) + Else + SetUndoColLimit(clsInstatOptionsDefaults.DEFAULTiUndoColLimit) + End If + + If iUndoRowLimit.HasValue Then + SetUndoRowLimit(iUndoRowLimit) + Else + SetUndoRowLimit(clsInstatOptionsDefaults.DEFAULTiUndoRowLimit) + End If + If bCommandsinOutput.HasValue Then SetCommandInOutpt(bCommandsinOutput) Else @@ -246,12 +261,6 @@ Imports RDotNet SetAutoSaveData(clsInstatOptionsDefaults.DEFAULTbAutoSaveData) End If - If bUndoSwitchAction.HasValue Then - SetUndoSwitchAction(bUndoSwitchAction) - Else - SetUndoSwitchAction(clsInstatOptionsDefaults.DEFAULTbUndoSwitchAction) - End If - If iAutoSaveDataMinutes.HasValue Then SetAutoSaveDataMinutes(iAutoSaveDataMinutes) Else @@ -364,6 +373,14 @@ Imports RDotNet Return If(expression Is Nothing OrElse expression.Type = Internals.SymbolicExpressionType.Null, Nothing, expression.AsCharacter(0)) End Function + Public Sub SetUndoColLimit(iNewUndoColLimit As Integer) + iUndoColLimit = iNewUndoColLimit + End Sub + + Public Sub SetUndoRowLimit(iNewUndoRowLimit As Integer) + iUndoRowLimit = iNewUndoRowLimit + End Sub + Public Sub SetMaxRows(iRows As Integer) iMaxRows = iRows frmMain.UpdateAllGrids() @@ -538,10 +555,6 @@ Imports RDotNet bAutoSaveData = bNewAutoSave End Sub - Public Sub SetUndoSwitchAction(bNewUndoSwitchAction As Boolean) - bUndoSwitchAction = bNewUndoSwitchAction - End Sub - Public Sub SetAutoSaveDataMinutes(iNewMinutes As Integer) iAutoSaveDataMinutes = iNewMinutes frmMain.ResetTimer() diff --git a/instat/clsInstatOptionsDefaults.vb b/instat/clsInstatOptionsDefaults.vb index dfffa158f30..ffcf62d0ddb 100644 --- a/instat/clsInstatOptionsDefaults.vb +++ b/instat/clsInstatOptionsDefaults.vb @@ -33,6 +33,8 @@ Public Class clsInstatOptionsDefaults Public Shared ReadOnly DEFAULTiPreviewRows As Integer = 10 Public Shared ReadOnly DEFAULTiMaxRows As Integer = 1000 Public Shared ReadOnly DEFAULTiMaxCols As Integer = 50 + Public Shared ReadOnly DEFAULTiUndoColLimit As Integer = 200 + Public Shared ReadOnly DEFAULTiUndoRowLimit As Integer = 200000 Public Shared ReadOnly DEFAULTstrComment As String = "Dialog:" Public Shared ReadOnly DEFAULTstrGraphDisplayOption As String = "view_output_window" Public Shared ReadOnly DEFAULTbChangeDataFrame As Boolean = False @@ -45,7 +47,7 @@ Public Class clsInstatOptionsDefaults Public Shared ReadOnly DEFAULTiDigits As Integer = 4 Public Shared ReadOnly DEFAULTbShowSignifStars As Boolean = False Public Shared ReadOnly DEFAULTbAutoSaveData As Boolean = True - Public Shared ReadOnly DEFAULTbUndoSwitchAction As Boolean = True + Public Shared ReadOnly DEFAULTbUndoSwitchAction As Boolean = False Public Shared ReadOnly DEFAULTiAutoSaveDataMinutes As Integer = 10 Public Shared ReadOnly DEFAULTbShowWaitDialog As Boolean = True Public Shared ReadOnly DEFAULTiWaitTimeDelaySeconds As Integer = 2 diff --git a/instat/dlgOptions.Designer.vb b/instat/dlgOptions.Designer.vb index 7e6cfb377c8..4f9e071cf9f 100644 --- a/instat/dlgOptions.Designer.vb +++ b/instat/dlgOptions.Designer.vb @@ -94,6 +94,11 @@ Partial Class dlgOptions Me.ucrNudWaitSeconds = New instat.ucrNud() Me.ucrChkIncludeDefaultParams = New instat.ucrCheck() Me.tbpDataView = New System.Windows.Forms.TabPage() + Me.Label3 = New System.Windows.Forms.Label() + Me.ucrNudRowUndoLimit = New instat.ucrNud() + Me.Label2 = New System.Windows.Forms.Label() + Me.Label1 = New System.Windows.Forms.Label() + Me.ucrNudColUndoLimit = New instat.ucrNud() Me.lblEvery = New System.Windows.Forms.Label() Me.lblMinutes = New System.Windows.Forms.Label() Me.ucrChkAutoSave = New instat.ucrCheck() @@ -128,7 +133,7 @@ Partial Class dlgOptions Me.ucrInputDatabaseName = New instat.ucrInputTextBox() Me.tbpWebsite = New System.Windows.Forms.TabPage() Me.ucrChkReminder = New instat.ucrCheck() - Me.ucrChkSwitchUndo = New instat.ucrCheck() + Me.Label4 = New System.Windows.Forms.Label() CType(Me.spltControls, System.ComponentModel.ISupportInitialize).BeginInit() Me.spltControls.Panel1.SuspendLayout() Me.spltControls.Panel2.SuspendLayout() @@ -155,7 +160,7 @@ Partial Class dlgOptions 'cmdApply ' Me.cmdApply.Location = New System.Drawing.Point(576, 486) - Me.cmdApply.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdApply.Margin = New System.Windows.Forms.Padding(4) Me.cmdApply.Name = "cmdApply" Me.cmdApply.Size = New System.Drawing.Size(112, 34) Me.cmdApply.TabIndex = 10 @@ -166,7 +171,7 @@ Partial Class dlgOptions 'cmdHelp ' Me.cmdHelp.Location = New System.Drawing.Point(698, 486) - Me.cmdHelp.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdHelp.Margin = New System.Windows.Forms.Padding(4) Me.cmdHelp.Name = "cmdHelp" Me.cmdHelp.Size = New System.Drawing.Size(112, 34) Me.cmdHelp.TabIndex = 12 @@ -177,7 +182,7 @@ Partial Class dlgOptions 'cmdCancel ' Me.cmdCancel.Location = New System.Drawing.Point(454, 486) - Me.cmdCancel.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdCancel.Margin = New System.Windows.Forms.Padding(4) Me.cmdCancel.Name = "cmdCancel" Me.cmdCancel.Size = New System.Drawing.Size(112, 34) Me.cmdCancel.TabIndex = 9 @@ -188,7 +193,7 @@ Partial Class dlgOptions 'cmdOk ' Me.cmdOk.Location = New System.Drawing.Point(333, 486) - Me.cmdOk.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdOk.Margin = New System.Windows.Forms.Padding(4) Me.cmdOk.Name = "cmdOk" Me.cmdOk.Size = New System.Drawing.Size(112, 34) Me.cmdOk.TabIndex = 11 @@ -200,7 +205,7 @@ Partial Class dlgOptions ' Me.cmdLanguage.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdLanguage.Location = New System.Drawing.Point(818, 486) - Me.cmdLanguage.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdLanguage.Margin = New System.Windows.Forms.Padding(4) Me.cmdLanguage.Name = "cmdLanguage" Me.cmdLanguage.Size = New System.Drawing.Size(56, 34) Me.cmdLanguage.TabIndex = 13 @@ -211,7 +216,7 @@ Partial Class dlgOptions 'spltControls ' Me.spltControls.Location = New System.Drawing.Point(8, 2) - Me.spltControls.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.spltControls.Margin = New System.Windows.Forms.Padding(4) Me.spltControls.Name = "spltControls" ' 'spltControls.Panel1 @@ -230,7 +235,7 @@ Partial Class dlgOptions 'cmdFactoryReset ' Me.cmdFactoryReset.Location = New System.Drawing.Point(20, 430) - Me.cmdFactoryReset.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdFactoryReset.Margin = New System.Windows.Forms.Padding(4) Me.cmdFactoryReset.Name = "cmdFactoryReset" Me.cmdFactoryReset.Size = New System.Drawing.Size(150, 34) Me.cmdFactoryReset.TabIndex = 13 @@ -242,7 +247,7 @@ 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.Margin = New System.Windows.Forms.Padding(4) Me.trOptions.Name = "trOptions" TreeNode1.Name = "ndLanguages" TreeNode1.Tag = "1" @@ -286,7 +291,7 @@ Partial Class dlgOptions Me.tbcOptions.Controls.Add(Me.tbpWebsite) 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.Margin = New System.Windows.Forms.Padding(4) Me.tbcOptions.Name = "tbcOptions" Me.tbcOptions.SelectedIndex = 0 Me.tbcOptions.Size = New System.Drawing.Size(858, 476) @@ -298,9 +303,9 @@ Partial Class dlgOptions Me.tbpLanguages.Controls.Add(Me.lblLanguage) Me.tbpLanguages.Controls.Add(Me.ucrInputLanguage) Me.tbpLanguages.Location = New System.Drawing.Point(4, 29) - Me.tbpLanguages.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpLanguages.Margin = New System.Windows.Forms.Padding(4) Me.tbpLanguages.Name = "tbpLanguages" - Me.tbpLanguages.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpLanguages.Padding = New System.Windows.Forms.Padding(4) Me.tbpLanguages.Size = New System.Drawing.Size(850, 443) Me.tbpLanguages.TabIndex = 0 Me.tbpLanguages.Tag = "Languages" @@ -342,9 +347,9 @@ Partial Class dlgOptions ' Me.tbpComments.Controls.Add(Me.pnComments) Me.tbpComments.Location = New System.Drawing.Point(4, 29) - Me.tbpComments.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpComments.Margin = New System.Windows.Forms.Padding(4) Me.tbpComments.Name = "tbpComments" - Me.tbpComments.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpComments.Padding = New System.Windows.Forms.Padding(4) Me.tbpComments.Size = New System.Drawing.Size(850, 443) Me.tbpComments.TabIndex = 1 Me.tbpComments.Tag = "Comments" @@ -357,7 +362,7 @@ Partial Class dlgOptions Me.pnComments.Controls.Add(Me.ucrInputComment) Me.pnComments.Controls.Add(Me.lblComment) Me.pnComments.Location = New System.Drawing.Point(15, 15) - Me.pnComments.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.pnComments.Margin = New System.Windows.Forms.Padding(4) Me.pnComments.Name = "pnComments" Me.pnComments.Size = New System.Drawing.Size(586, 44) Me.pnComments.TabIndex = 2 @@ -391,7 +396,7 @@ Partial Class dlgOptions Me.tbpImport.Controls.Add(Me.ucrNudPreviewRows) Me.tbpImport.Controls.Add(Me.pnImportData) Me.tbpImport.Location = New System.Drawing.Point(4, 29) - Me.tbpImport.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpImport.Margin = New System.Windows.Forms.Padding(4) Me.tbpImport.Name = "tbpImport" Me.tbpImport.Size = New System.Drawing.Size(850, 443) Me.tbpImport.TabIndex = 3 @@ -414,7 +419,7 @@ Partial Class dlgOptions 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(405, 8) - Me.ucrNudPreviewRows.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrNudPreviewRows.Margin = New System.Windows.Forms.Padding(8) 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" @@ -427,7 +432,7 @@ Partial Class dlgOptions Me.pnImportData.AutoSize = True Me.pnImportData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.pnImportData.Location = New System.Drawing.Point(15, 15) - Me.pnImportData.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.pnImportData.Margin = New System.Windows.Forms.Padding(4) Me.pnImportData.Name = "pnImportData" Me.pnImportData.Size = New System.Drawing.Size(0, 0) Me.pnImportData.TabIndex = 2 @@ -441,9 +446,9 @@ Partial Class dlgOptions Me.tbpOutputWindow.Controls.Add(Me.grpROptions) Me.tbpOutputWindow.Controls.Add(Me.pnFormatOptions) Me.tbpOutputWindow.Location = New System.Drawing.Point(4, 29) - Me.tbpOutputWindow.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpOutputWindow.Margin = New System.Windows.Forms.Padding(4) Me.tbpOutputWindow.Name = "tbpOutputWindow" - Me.tbpOutputWindow.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpOutputWindow.Padding = New System.Windows.Forms.Padding(4) Me.tbpOutputWindow.Size = New System.Drawing.Size(850, 443) Me.tbpOutputWindow.TabIndex = 2 Me.tbpOutputWindow.Text = "Output Window" @@ -455,7 +460,7 @@ Partial Class dlgOptions Me.ucrNudMaxOutputsHeight.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxOutputsHeight.Increment = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudMaxOutputsHeight.Location = New System.Drawing.Point(759, 202) - Me.ucrNudMaxOutputsHeight.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrNudMaxOutputsHeight.Margin = New System.Windows.Forms.Padding(8) Me.ucrNudMaxOutputsHeight.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudMaxOutputsHeight.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxOutputsHeight.Name = "ucrNudMaxOutputsHeight" @@ -468,7 +473,7 @@ Partial Class dlgOptions Me.ucrChkMaxOutputsHeight.AutoSize = True Me.ucrChkMaxOutputsHeight.Checked = False Me.ucrChkMaxOutputsHeight.Location = New System.Drawing.Point(450, 202) - Me.ucrChkMaxOutputsHeight.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkMaxOutputsHeight.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkMaxOutputsHeight.Name = "ucrChkMaxOutputsHeight" Me.ucrChkMaxOutputsHeight.Size = New System.Drawing.Size(294, 51) Me.ucrChkMaxOutputsHeight.TabIndex = 28 @@ -478,7 +483,7 @@ Partial Class dlgOptions Me.ucrChkShowRCommandsinOutputWindow.AutoSize = True Me.ucrChkShowRCommandsinOutputWindow.Checked = False Me.ucrChkShowRCommandsinOutputWindow.Location = New System.Drawing.Point(15, 240) - Me.ucrChkShowRCommandsinOutputWindow.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkShowRCommandsinOutputWindow.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkShowRCommandsinOutputWindow.Name = "ucrChkShowRCommandsinOutputWindow" Me.ucrChkShowRCommandsinOutputWindow.Size = New System.Drawing.Size(406, 51) Me.ucrChkShowRCommandsinOutputWindow.TabIndex = 27 @@ -488,7 +493,7 @@ Partial Class dlgOptions Me.ucrChkIncludeCommentsbyDefault.AutoSize = True Me.ucrChkIncludeCommentsbyDefault.Checked = False Me.ucrChkIncludeCommentsbyDefault.Location = New System.Drawing.Point(15, 202) - Me.ucrChkIncludeCommentsbyDefault.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkIncludeCommentsbyDefault.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkIncludeCommentsbyDefault.Name = "ucrChkIncludeCommentsbyDefault" Me.ucrChkIncludeCommentsbyDefault.Size = New System.Drawing.Size(406, 51) Me.ucrChkIncludeCommentsbyDefault.TabIndex = 26 @@ -499,9 +504,9 @@ Partial Class dlgOptions Me.grpROptions.Controls.Add(Me.ucrNudDigits) Me.grpROptions.Controls.Add(Me.lblNoDigits) Me.grpROptions.Location = New System.Drawing.Point(15, 288) - Me.grpROptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpROptions.Margin = New System.Windows.Forms.Padding(4) Me.grpROptions.Name = "grpROptions" - Me.grpROptions.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpROptions.Padding = New System.Windows.Forms.Padding(4) Me.grpROptions.Size = New System.Drawing.Size(406, 140) Me.grpROptions.TabIndex = 25 Me.grpROptions.TabStop = False @@ -512,7 +517,7 @@ Partial Class dlgOptions Me.ucrChkShowSignifStars.AutoSize = True Me.ucrChkShowSignifStars.Checked = False Me.ucrChkShowSignifStars.Location = New System.Drawing.Point(10, 74) - Me.ucrChkShowSignifStars.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkShowSignifStars.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkShowSignifStars.Name = "ucrChkShowSignifStars" Me.ucrChkShowSignifStars.Size = New System.Drawing.Size(382, 51) Me.ucrChkShowSignifStars.TabIndex = 28 @@ -523,7 +528,7 @@ Partial Class dlgOptions 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(266, 34) - Me.ucrNudDigits.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrNudDigits.Margin = New System.Windows.Forms.Padding(8) 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" @@ -555,7 +560,7 @@ Partial Class dlgOptions Me.pnFormatOptions.Controls.Add(Me.cmdCommentFormat) Me.pnFormatOptions.Controls.Add(Me.lblCommandFormat) Me.pnFormatOptions.Location = New System.Drawing.Point(15, 15) - Me.pnFormatOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.pnFormatOptions.Margin = New System.Windows.Forms.Padding(4) Me.pnFormatOptions.Name = "pnFormatOptions" Me.pnFormatOptions.Size = New System.Drawing.Size(586, 175) Me.pnFormatOptions.TabIndex = 21 @@ -563,7 +568,7 @@ Partial Class dlgOptions 'rtbCommentPreview ' Me.rtbCommentPreview.Location = New System.Drawing.Point(186, 134) - Me.rtbCommentPreview.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rtbCommentPreview.Margin = New System.Windows.Forms.Padding(4) Me.rtbCommentPreview.Name = "rtbCommentPreview" Me.rtbCommentPreview.ReadOnly = True Me.rtbCommentPreview.Size = New System.Drawing.Size(218, 37) @@ -573,7 +578,7 @@ Partial Class dlgOptions 'rtbOutputPreview ' Me.rtbOutputPreview.Location = New System.Drawing.Point(186, 74) - Me.rtbOutputPreview.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rtbOutputPreview.Margin = New System.Windows.Forms.Padding(4) Me.rtbOutputPreview.Name = "rtbOutputPreview" Me.rtbOutputPreview.ReadOnly = True Me.rtbOutputPreview.Size = New System.Drawing.Size(218, 37) @@ -583,7 +588,7 @@ Partial Class dlgOptions 'rtbCommandPreview ' Me.rtbCommandPreview.Location = New System.Drawing.Point(186, 14) - Me.rtbCommandPreview.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rtbCommandPreview.Margin = New System.Windows.Forms.Padding(4) Me.rtbCommandPreview.Name = "rtbCommandPreview" Me.rtbCommandPreview.ReadOnly = True Me.rtbCommandPreview.Size = New System.Drawing.Size(218, 37) @@ -593,7 +598,7 @@ Partial Class dlgOptions 'cmdCommandFormat ' Me.cmdCommandFormat.Location = New System.Drawing.Point(432, 14) - Me.cmdCommandFormat.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdCommandFormat.Margin = New System.Windows.Forms.Padding(4) Me.cmdCommandFormat.Name = "cmdCommandFormat" Me.cmdCommandFormat.Size = New System.Drawing.Size(150, 34) Me.cmdCommandFormat.TabIndex = 10 @@ -613,7 +618,7 @@ Partial Class dlgOptions 'cmdOutputFormat ' Me.cmdOutputFormat.Location = New System.Drawing.Point(432, 74) - Me.cmdOutputFormat.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdOutputFormat.Margin = New System.Windows.Forms.Padding(4) Me.cmdOutputFormat.Name = "cmdOutputFormat" Me.cmdOutputFormat.Size = New System.Drawing.Size(150, 34) Me.cmdOutputFormat.TabIndex = 16 @@ -633,7 +638,7 @@ Partial Class dlgOptions 'cmdCommentFormat ' Me.cmdCommentFormat.Location = New System.Drawing.Point(432, 134) - Me.cmdCommentFormat.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdCommentFormat.Margin = New System.Windows.Forms.Padding(4) Me.cmdCommentFormat.Name = "cmdCommentFormat" Me.cmdCommentFormat.Size = New System.Drawing.Size(150, 34) Me.cmdCommentFormat.TabIndex = 16 @@ -654,9 +659,9 @@ Partial Class dlgOptions ' Me.tbpEditor.Controls.Add(Me.pnFormatEditor) Me.tbpEditor.Location = New System.Drawing.Point(4, 29) - Me.tbpEditor.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpEditor.Margin = New System.Windows.Forms.Padding(4) Me.tbpEditor.Name = "tbpEditor" - Me.tbpEditor.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpEditor.Padding = New System.Windows.Forms.Padding(4) Me.tbpEditor.Size = New System.Drawing.Size(850, 443) Me.tbpEditor.TabIndex = 10 Me.tbpEditor.Text = "Editor Window" @@ -670,7 +675,7 @@ Partial Class dlgOptions Me.pnFormatEditor.Controls.Add(Me.cmdEditorFont) Me.pnFormatEditor.Controls.Add(Me.lblFont) Me.pnFormatEditor.Location = New System.Drawing.Point(15, 15) - Me.pnFormatEditor.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.pnFormatEditor.Margin = New System.Windows.Forms.Padding(4) Me.pnFormatEditor.Name = "pnFormatEditor" Me.pnFormatEditor.Size = New System.Drawing.Size(318, 41) Me.pnFormatEditor.TabIndex = 22 @@ -678,7 +683,7 @@ Partial Class dlgOptions 'cmdEditorFont ' Me.cmdEditorFont.Location = New System.Drawing.Point(164, 3) - Me.cmdEditorFont.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdEditorFont.Margin = New System.Windows.Forms.Padding(4) Me.cmdEditorFont.Name = "cmdEditorFont" Me.cmdEditorFont.Size = New System.Drawing.Size(150, 34) Me.cmdEditorFont.TabIndex = 10 @@ -702,9 +707,9 @@ Partial Class dlgOptions Me.tbpCommands.Controls.Add(Me.ucrNudWaitSeconds) Me.tbpCommands.Controls.Add(Me.ucrChkIncludeDefaultParams) Me.tbpCommands.Location = New System.Drawing.Point(4, 29) - Me.tbpCommands.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpCommands.Margin = New System.Windows.Forms.Padding(4) Me.tbpCommands.Name = "tbpCommands" - Me.tbpCommands.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpCommands.Padding = New System.Windows.Forms.Padding(4) Me.tbpCommands.Size = New System.Drawing.Size(850, 443) Me.tbpCommands.TabIndex = 4 Me.tbpCommands.Tag = "Commands" @@ -726,7 +731,7 @@ Partial Class dlgOptions Me.ucrChkShowWaitDialog.AutoSize = True Me.ucrChkShowWaitDialog.Checked = False Me.ucrChkShowWaitDialog.Location = New System.Drawing.Point(9, 70) - Me.ucrChkShowWaitDialog.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkShowWaitDialog.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkShowWaitDialog.Name = "ucrChkShowWaitDialog" Me.ucrChkShowWaitDialog.Size = New System.Drawing.Size(506, 51) Me.ucrChkShowWaitDialog.TabIndex = 6 @@ -737,7 +742,7 @@ Partial Class dlgOptions 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(524, 68) - Me.ucrNudWaitSeconds.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrNudWaitSeconds.Margin = New System.Windows.Forms.Padding(8) 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" @@ -750,14 +755,19 @@ Partial Class dlgOptions Me.ucrChkIncludeDefaultParams.AutoSize = True Me.ucrChkIncludeDefaultParams.Checked = False Me.ucrChkIncludeDefaultParams.Location = New System.Drawing.Point(9, 30) - Me.ucrChkIncludeDefaultParams.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkIncludeDefaultParams.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkIncludeDefaultParams.Name = "ucrChkIncludeDefaultParams" Me.ucrChkIncludeDefaultParams.Size = New System.Drawing.Size(597, 51) Me.ucrChkIncludeDefaultParams.TabIndex = 3 ' 'tbpDataView ' - Me.tbpDataView.Controls.Add(Me.ucrChkSwitchUndo) + Me.tbpDataView.Controls.Add(Me.Label4) + Me.tbpDataView.Controls.Add(Me.Label3) + Me.tbpDataView.Controls.Add(Me.ucrNudRowUndoLimit) + Me.tbpDataView.Controls.Add(Me.Label2) + Me.tbpDataView.Controls.Add(Me.Label1) + Me.tbpDataView.Controls.Add(Me.ucrNudColUndoLimit) Me.tbpDataView.Controls.Add(Me.lblEvery) Me.tbpDataView.Controls.Add(Me.lblMinutes) Me.tbpDataView.Controls.Add(Me.ucrChkAutoSave) @@ -768,14 +778,72 @@ Partial Class dlgOptions Me.tbpDataView.Controls.Add(Me.ucrNudMaxRows) Me.tbpDataView.Controls.Add(Me.lblMaxRows) Me.tbpDataView.Location = New System.Drawing.Point(4, 29) - Me.tbpDataView.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpDataView.Margin = New System.Windows.Forms.Padding(4) Me.tbpDataView.Name = "tbpDataView" - Me.tbpDataView.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpDataView.Padding = New System.Windows.Forms.Padding(4) Me.tbpDataView.Size = New System.Drawing.Size(850, 443) Me.tbpDataView.TabIndex = 9 Me.tbpDataView.Text = "Data View" Me.tbpDataView.UseVisualStyleBackColor = True ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(781, 230) + Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(46, 20) + Me.Label3.TabIndex = 10 + Me.Label3.Text = "rows." + ' + 'ucrNudRowUndoLimit + ' + Me.ucrNudRowUndoLimit.AutoSize = True + Me.ucrNudRowUndoLimit.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudRowUndoLimit.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudRowUndoLimit.Location = New System.Drawing.Point(692, 227) + Me.ucrNudRowUndoLimit.Margin = New System.Windows.Forms.Padding(8) + Me.ucrNudRowUndoLimit.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudRowUndoLimit.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudRowUndoLimit.Name = "ucrNudRowUndoLimit" + Me.ucrNudRowUndoLimit.Size = New System.Drawing.Size(77, 30) + Me.ucrNudRowUndoLimit.TabIndex = 9 + Me.ucrNudRowUndoLimit.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(595, 230) + Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(86, 20) + Me.Label2.TabIndex = 8 + Me.Label2.Text = "columns or" + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(16, 230) + Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(482, 20) + Me.Label1.TabIndex = 7 + Me.Label1.Text = "Switch off spreadsheet-syle undo when a dataframe has more than" + ' + 'ucrNudColUndoLimit + ' + Me.ucrNudColUndoLimit.AutoSize = True + Me.ucrNudColUndoLimit.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudColUndoLimit.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudColUndoLimit.Location = New System.Drawing.Point(506, 227) + Me.ucrNudColUndoLimit.Margin = New System.Windows.Forms.Padding(8) + Me.ucrNudColUndoLimit.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudColUndoLimit.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudColUndoLimit.Name = "ucrNudColUndoLimit" + Me.ucrNudColUndoLimit.Size = New System.Drawing.Size(81, 30) + Me.ucrNudColUndoLimit.TabIndex = 6 + Me.ucrNudColUndoLimit.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'lblEvery ' Me.lblEvery.AutoSize = True @@ -801,7 +869,7 @@ Partial Class dlgOptions Me.ucrChkAutoSave.AutoSize = True Me.ucrChkAutoSave.Checked = False Me.ucrChkAutoSave.Location = New System.Drawing.Point(20, 171) - Me.ucrChkAutoSave.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkAutoSave.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkAutoSave.Name = "ucrChkAutoSave" Me.ucrChkAutoSave.Size = New System.Drawing.Size(326, 51) Me.ucrChkAutoSave.TabIndex = 3 @@ -811,7 +879,7 @@ Partial Class dlgOptions Me.ucrChkShowDataonGrid.AutoSize = True Me.ucrChkShowDataonGrid.Checked = False Me.ucrChkShowDataonGrid.Location = New System.Drawing.Point(20, 117) - Me.ucrChkShowDataonGrid.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkShowDataonGrid.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkShowDataonGrid.Name = "ucrChkShowDataonGrid" Me.ucrChkShowDataonGrid.Size = New System.Drawing.Size(590, 51) Me.ucrChkShowDataonGrid.TabIndex = 3 @@ -822,7 +890,7 @@ Partial Class dlgOptions 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(402, 168) - Me.ucrNudAutoSaveMinutes.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrNudAutoSaveMinutes.Margin = New System.Windows.Forms.Padding(8) 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" @@ -836,7 +904,7 @@ Partial Class dlgOptions 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(402, 62) - Me.ucrNudMaxCols.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrNudMaxCols.Margin = New System.Windows.Forms.Padding(8) 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" @@ -860,7 +928,7 @@ Partial Class dlgOptions 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(402, 22) - Me.ucrNudMaxRows.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrNudMaxRows.Margin = New System.Windows.Forms.Padding(8) 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" @@ -884,9 +952,9 @@ Partial Class dlgOptions Me.tbpWorkingDirectory.Controls.Add(Me.lblWorkingDirectory) Me.tbpWorkingDirectory.Controls.Add(Me.ucrWorkingDirectory) Me.tbpWorkingDirectory.Location = New System.Drawing.Point(4, 29) - Me.tbpWorkingDirectory.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpWorkingDirectory.Margin = New System.Windows.Forms.Padding(4) Me.tbpWorkingDirectory.Name = "tbpWorkingDirectory" - Me.tbpWorkingDirectory.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpWorkingDirectory.Padding = New System.Windows.Forms.Padding(4) Me.tbpWorkingDirectory.Size = New System.Drawing.Size(850, 443) Me.tbpWorkingDirectory.TabIndex = 11 Me.tbpWorkingDirectory.Text = "Working Directory" @@ -895,7 +963,7 @@ Partial Class dlgOptions 'cmdWorkingDirectory ' Me.cmdWorkingDirectory.Location = New System.Drawing.Point(598, 24) - Me.cmdWorkingDirectory.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdWorkingDirectory.Margin = New System.Windows.Forms.Padding(4) Me.cmdWorkingDirectory.Name = "cmdWorkingDirectory" Me.cmdWorkingDirectory.Size = New System.Drawing.Size(36, 32) Me.cmdWorkingDirectory.TabIndex = 2 @@ -931,9 +999,9 @@ Partial Class dlgOptions Me.tbpGraphDisplay.Controls.Add(Me.rdoDisplayinOutputWindow) Me.tbpGraphDisplay.Controls.Add(Me.ucrPnlGraphDisplay) Me.tbpGraphDisplay.Location = New System.Drawing.Point(4, 29) - Me.tbpGraphDisplay.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpGraphDisplay.Margin = New System.Windows.Forms.Padding(4) Me.tbpGraphDisplay.Name = "tbpGraphDisplay" - Me.tbpGraphDisplay.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpGraphDisplay.Padding = New System.Windows.Forms.Padding(4) Me.tbpGraphDisplay.Size = New System.Drawing.Size(850, 443) Me.tbpGraphDisplay.TabIndex = 12 Me.tbpGraphDisplay.Text = "Graph Display" @@ -944,7 +1012,7 @@ Partial Class dlgOptions Me.rdoDisplayinSeparateWindows.AutoSize = True Me.rdoDisplayinSeparateWindows.Checked = True Me.rdoDisplayinSeparateWindows.Location = New System.Drawing.Point(9, 78) - Me.rdoDisplayinSeparateWindows.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoDisplayinSeparateWindows.Margin = New System.Windows.Forms.Padding(4) Me.rdoDisplayinSeparateWindows.Name = "rdoDisplayinSeparateWindows" Me.rdoDisplayinSeparateWindows.Size = New System.Drawing.Size(239, 24) Me.rdoDisplayinSeparateWindows.TabIndex = 1 @@ -956,7 +1024,7 @@ Partial Class dlgOptions ' Me.rdoDisplayinRViewer.AutoSize = True Me.rdoDisplayinRViewer.Location = New System.Drawing.Point(9, 44) - Me.rdoDisplayinRViewer.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoDisplayinRViewer.Margin = New System.Windows.Forms.Padding(4) Me.rdoDisplayinRViewer.Name = "rdoDisplayinRViewer" Me.rdoDisplayinRViewer.Size = New System.Drawing.Size(169, 24) Me.rdoDisplayinRViewer.TabIndex = 1 @@ -967,7 +1035,7 @@ Partial Class dlgOptions ' Me.rdoDisplayinOutputWindow.AutoSize = True Me.rdoDisplayinOutputWindow.Location = New System.Drawing.Point(9, 9) - Me.rdoDisplayinOutputWindow.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoDisplayinOutputWindow.Margin = New System.Windows.Forms.Padding(4) Me.rdoDisplayinOutputWindow.Name = "rdoDisplayinOutputWindow" Me.rdoDisplayinOutputWindow.Size = New System.Drawing.Size(214, 24) Me.rdoDisplayinOutputWindow.TabIndex = 1 @@ -978,7 +1046,7 @@ Partial Class dlgOptions ' Me.ucrPnlGraphDisplay.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrPnlGraphDisplay.Location = New System.Drawing.Point(0, 4) - Me.ucrPnlGraphDisplay.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrPnlGraphDisplay.Margin = New System.Windows.Forms.Padding(8) Me.ucrPnlGraphDisplay.Name = "ucrPnlGraphDisplay" Me.ucrPnlGraphDisplay.Size = New System.Drawing.Size(548, 99) Me.ucrPnlGraphDisplay.TabIndex = 3 @@ -990,9 +1058,9 @@ Partial Class dlgOptions Me.tbpTailoredMenus.Controls.Add(Me.ucrChkViewProcurementMenu) Me.tbpTailoredMenus.Controls.Add(Me.ucrChkViewClimaticMenu) Me.tbpTailoredMenus.Location = New System.Drawing.Point(4, 29) - Me.tbpTailoredMenus.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpTailoredMenus.Margin = New System.Windows.Forms.Padding(4) Me.tbpTailoredMenus.Name = "tbpTailoredMenus" - Me.tbpTailoredMenus.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpTailoredMenus.Padding = New System.Windows.Forms.Padding(4) Me.tbpTailoredMenus.Size = New System.Drawing.Size(850, 443) Me.tbpTailoredMenus.TabIndex = 13 Me.tbpTailoredMenus.Text = "Tailored Menus" @@ -1003,7 +1071,7 @@ Partial Class dlgOptions Me.ucrChkViewStructuredMenu.AutoSize = True Me.ucrChkViewStructuredMenu.Checked = False Me.ucrChkViewStructuredMenu.Location = New System.Drawing.Point(10, 18) - Me.ucrChkViewStructuredMenu.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkViewStructuredMenu.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkViewStructuredMenu.Name = "ucrChkViewStructuredMenu" Me.ucrChkViewStructuredMenu.Size = New System.Drawing.Size(567, 51) Me.ucrChkViewStructuredMenu.TabIndex = 2 @@ -1013,7 +1081,7 @@ Partial Class dlgOptions Me.ucrChkViewOptionsByContextMenu.AutoSize = True Me.ucrChkViewOptionsByContextMenu.Checked = False Me.ucrChkViewOptionsByContextMenu.Location = New System.Drawing.Point(10, 206) - Me.ucrChkViewOptionsByContextMenu.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkViewOptionsByContextMenu.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkViewOptionsByContextMenu.Name = "ucrChkViewOptionsByContextMenu" Me.ucrChkViewOptionsByContextMenu.Size = New System.Drawing.Size(620, 51) Me.ucrChkViewOptionsByContextMenu.TabIndex = 1 @@ -1023,7 +1091,7 @@ Partial Class dlgOptions Me.ucrChkViewProcurementMenu.AutoSize = True Me.ucrChkViewProcurementMenu.Checked = False Me.ucrChkViewProcurementMenu.Location = New System.Drawing.Point(10, 142) - Me.ucrChkViewProcurementMenu.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkViewProcurementMenu.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkViewProcurementMenu.Name = "ucrChkViewProcurementMenu" Me.ucrChkViewProcurementMenu.Size = New System.Drawing.Size(620, 51) Me.ucrChkViewProcurementMenu.TabIndex = 0 @@ -1033,7 +1101,7 @@ Partial Class dlgOptions Me.ucrChkViewClimaticMenu.AutoSize = True Me.ucrChkViewClimaticMenu.Checked = False Me.ucrChkViewClimaticMenu.Location = New System.Drawing.Point(10, 80) - Me.ucrChkViewClimaticMenu.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkViewClimaticMenu.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkViewClimaticMenu.Name = "ucrChkViewClimaticMenu" Me.ucrChkViewClimaticMenu.Size = New System.Drawing.Size(610, 51) Me.ucrChkViewClimaticMenu.TabIndex = 0 @@ -1049,9 +1117,9 @@ Partial Class dlgOptions Me.tbpClimsoft.Controls.Add(Me.ucrInputHost) Me.tbpClimsoft.Controls.Add(Me.ucrInputDatabaseName) Me.tbpClimsoft.Location = New System.Drawing.Point(4, 29) - Me.tbpClimsoft.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpClimsoft.Margin = New System.Windows.Forms.Padding(4) Me.tbpClimsoft.Name = "tbpClimsoft" - Me.tbpClimsoft.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpClimsoft.Padding = New System.Windows.Forms.Padding(4) Me.tbpClimsoft.Size = New System.Drawing.Size(850, 443) Me.tbpClimsoft.TabIndex = 14 Me.tbpClimsoft.Text = "Climsoft" @@ -1154,7 +1222,7 @@ Partial Class dlgOptions Me.tbpWebsite.Controls.Add(Me.ucrChkReminder) Me.tbpWebsite.Location = New System.Drawing.Point(4, 29) Me.tbpWebsite.Name = "tbpWebsite" - Me.tbpWebsite.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3) + Me.tbpWebsite.Padding = New System.Windows.Forms.Padding(3) Me.tbpWebsite.Size = New System.Drawing.Size(850, 443) Me.tbpWebsite.TabIndex = 15 Me.tbpWebsite.Text = "Website" @@ -1165,20 +1233,20 @@ Partial Class dlgOptions Me.ucrChkReminder.AutoSize = True Me.ucrChkReminder.Checked = False Me.ucrChkReminder.Location = New System.Drawing.Point(10, 33) - Me.ucrChkReminder.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkReminder.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkReminder.Name = "ucrChkReminder" Me.ucrChkReminder.Size = New System.Drawing.Size(620, 51) Me.ucrChkReminder.TabIndex = 2 ' - 'ucrChkSwitchUndo + 'Label4 ' - Me.ucrChkSwitchUndo.AutoSize = True - Me.ucrChkSwitchUndo.Checked = False - Me.ucrChkSwitchUndo.Location = New System.Drawing.Point(20, 227) - Me.ucrChkSwitchUndo.Margin = New System.Windows.Forms.Padding(8) - Me.ucrChkSwitchUndo.Name = "ucrChkSwitchUndo" - Me.ucrChkSwitchUndo.Size = New System.Drawing.Size(326, 51) - Me.ucrChkSwitchUndo.TabIndex = 5 + Me.Label4.AutoSize = True + Me.Label4.Location = New System.Drawing.Point(25, 262) + Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(541, 20) + Me.Label4.TabIndex = 11 + Me.Label4.Text = "(Any changes from the default only apply to the current session of R-Instat.)" ' 'dlgOptions ' @@ -1193,7 +1261,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.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgOptions" @@ -1323,5 +1391,10 @@ Partial Class dlgOptions Friend WithEvents lversion As Label Friend WithEvents tbpWebsite As TabPage Friend WithEvents ucrChkReminder As ucrCheck - Friend WithEvents ucrChkSwitchUndo As ucrCheck + Friend WithEvents ucrNudColUndoLimit As ucrNud + Friend WithEvents Label2 As Label + Friend WithEvents Label1 As Label + Friend WithEvents Label3 As Label + Friend WithEvents ucrNudRowUndoLimit As ucrNud + Friend WithEvents Label4 As Label End Class diff --git a/instat/dlgOptions.vb b/instat/dlgOptions.vb index 658ed78081e..f355500249f 100644 --- a/instat/dlgOptions.vb +++ b/instat/dlgOptions.vb @@ -61,6 +61,13 @@ Public Class dlgOptions ucrNudWaitSeconds.Maximum = Integer.MaxValue ucrNudWaitSeconds.Increment = 0.5 + ucrNudColUndoLimit.Maximum = 1000 + ucrNudColUndoLimit.Minimum = 200 + ucrNudColUndoLimit.Increment = 100 + ucrNudRowUndoLimit.Maximum = Integer.MaxValue + ucrNudRowUndoLimit.Minimum = 200000 + ucrNudRowUndoLimit.Increment = 100000 + strPreviewText = "R-Instat 2017" rtbCommandPreview.Text = strPreviewText rtbCommentPreview.Text = strPreviewText @@ -78,7 +85,6 @@ Public Class dlgOptions ucrChkShowDataonGrid.SetText("Display dialog's selected data frame in grid") ucrChkIncludeDefaultParams.SetText("Include Default Parameter Values in R Commands") ucrChkAutoSave.SetText("Auto save a backup of data") - ucrChkSwitchUndo.SetText("Switch off undo") ucrChkShowWaitDialog.SetText("Show waiting dialog when command takes longer than") ucrChkReminder.SetText("Remind me later when R-Instat new version available") ucrChkAutoSave.AddToLinkedControls(ucrNudAutoSaveMinutes, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -103,13 +109,14 @@ Public Class dlgOptions Private Sub LoadInstatOptions() ucrChkIncludeDefaultParams.Checked = frmMain.clsInstatOptions.bIncludeRDefaultParameters ucrChkAutoSave.Checked = frmMain.clsInstatOptions.bAutoSaveData - ucrChkSwitchUndo.Checked = frmMain.clsInstatOptions.bUndoSwitchAction SetOutputFont(frmMain.clsInstatOptions.fntOutput, frmMain.clsInstatOptions.clrOutput) SetCommandFont(frmMain.clsInstatOptions.fntScript, frmMain.clsInstatOptions.clrScript) SetCommentFont(frmMain.clsInstatOptions.fntComment, frmMain.clsInstatOptions.clrComment) SetEditorFont(frmMain.clsInstatOptions.fntEditor, frmMain.clsInstatOptions.clrEditor) ucrNudMaxRows.Value = frmMain.clsInstatOptions.iMaxRows ucrNudMaxCols.Value = frmMain.clsInstatOptions.iMaxCols + ucrNudColUndoLimit.Value = frmMain.clsInstatOptions.iUndoColLimit + ucrNudRowUndoLimit.Value = frmMain.clsInstatOptions.iUndoRowLimit ucrNudAutoSaveMinutes.Value = frmMain.clsInstatOptions.iAutoSaveDataMinutes ucrNudPreviewRows.Value = frmMain.clsInstatOptions.iPreviewRows ucrInputComment.SetName(frmMain.clsInstatOptions.strComment) @@ -173,8 +180,9 @@ Public Class dlgOptions frmMain.clsInstatOptions.SetPreviewRows(ucrNudPreviewRows.Value) frmMain.clsInstatOptions.SetMaxRows(ucrNudMaxRows.Value) frmMain.clsInstatOptions.SetMaxCols(ucrNudMaxCols.Value) + frmMain.clsInstatOptions.SetUndoColLimit(ucrNudColUndoLimit.Value) + frmMain.clsInstatOptions.SetUndoRowLimit(ucrNudRowUndoLimit.Value) frmMain.clsInstatOptions.SetAutoSaveData(ucrChkAutoSave.Checked) - frmMain.clsInstatOptions.SetUndoSwitchAction(ucrChkSwitchUndo.Checked) frmMain.clsInstatOptions.SetAutoSaveDataMinutes(ucrNudAutoSaveMinutes.Value) frmMain.clsInstatOptions.SetLanguageCultureCode(strCurrLanguageCulture) frmMain.clsInstatOptions.SetWorkingDirectory(strWorkingDirectory) @@ -363,7 +371,7 @@ Public Class dlgOptions End Sub - Private Sub AllControls_ControlValueChanged() Handles ucrNudMaxCols.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrNudWaitSeconds.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged, ucrChkSwitchUndo.ControlValueChanged + Private Sub AllControls_ControlValueChanged() Handles ucrNudMaxCols.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrNudWaitSeconds.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged, ucrNudColUndoLimit.ControlValueChanged, ucrNudRowUndoLimit.ControlValueChanged ApplyEnabled(True) End Sub @@ -431,7 +439,7 @@ Public Class dlgOptions ApplyEnabled(True) End Sub - Private Sub AllControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudWaitSeconds.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrNudMaxCols.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged + Private Sub AllControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudWaitSeconds.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrNudMaxCols.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged, ucrNudColUndoLimit.ControlValueChanged, ucrNudRowUndoLimit.ControlValueChanged End Sub diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index afe0b327e86..af04f1a6834 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -58,13 +58,13 @@ Partial Class frmMain Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificTablesGraphs = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeGeneral = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator38 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeSpecificBarPieChart = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificBoxplotJitterViolinPlot = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificHistogramDensityFrequencyPlot = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificPointPlot = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificLineSmoothPlot = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator38 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuDescribeGeneral = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator26 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeSpecificMapPlot = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificDotPlot = New System.Windows.Forms.ToolStripMenuItem() @@ -384,6 +384,7 @@ Partial Class frmMain Me.tlSeparatorFile3 = New System.Windows.Forms.ToolStripSeparator() Me.mnuFIleExit = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEdit = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuUndo = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditFind = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditCopy = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditPaste = New System.Windows.Forms.ToolStripMenuItem() @@ -728,7 +729,7 @@ Partial Class frmMain ' Me.mnuDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariable, Me.mnuDescribeTwoThreeVariables, Me.mnuDescribeSpecificTablesGraphs, Me.mnuDescribeSpecificTables, Me.ToolStripSeparator9, Me.mnuDescribeMultivariate, Me.ToolStripSeparator13, Me.mnuDescribeUseTable, Me.mnuDescribeUseGraph, Me.mnuDescribeCombineGraph, Me.mnuDescribeThemes, Me.mnuDescribeViewGraph}) Me.mnuDescribe.Name = "mnuDescribe" - Me.mnuDescribe.Size = New System.Drawing.Size(64, 22) + Me.mnuDescribe.Size = New System.Drawing.Size(96, 29) Me.mnuDescribe.Tag = "Describe" Me.mnuDescribe.Text = "Describe" ' @@ -736,25 +737,25 @@ Partial Class frmMain ' Me.mnuDescribeOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariableVisualiseData, Me.ToolStripSeparator72, Me.mnuDescribeOneVariableSummarise, Me.mnuDescribeOneVariableGraph, Me.ToolStripSeparator33, Me.mnuDescribeOneVariableFrequencies, Me.mnuDescribeOneVariableRatingData}) Me.mnuDescribeOneVariable.Name = "mnuDescribeOneVariable" - Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeOneVariable.Tag = "One_Variable" Me.mnuDescribeOneVariable.Text = "One Variable" ' 'mnuDescribeOneVariableVisualiseData ' Me.mnuDescribeOneVariableVisualiseData.Name = "mnuDescribeOneVariableVisualiseData" - Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableVisualiseData.Text = "Visualise Data..." ' 'ToolStripSeparator72 ' Me.ToolStripSeparator72.Name = "ToolStripSeparator72" - Me.ToolStripSeparator72.Size = New System.Drawing.Size(152, 6) + Me.ToolStripSeparator72.Size = New System.Drawing.Size(232, 6) ' 'mnuDescribeOneVariableSummarise ' Me.mnuDescribeOneVariableSummarise.Name = "mnuDescribeOneVariableSummarise" - Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableSummarise.Tag = "Summarise..." Me.mnuDescribeOneVariableSummarise.Text = "Summarise..." Me.mnuDescribeOneVariableSummarise.ToolTipText = "One Variable Summarise, Skim and Customised" @@ -762,26 +763,26 @@ Partial Class frmMain 'mnuDescribeOneVariableGraph ' Me.mnuDescribeOneVariableGraph.Name = "mnuDescribeOneVariableGraph" - Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableGraph.Tag = "Graph..." Me.mnuDescribeOneVariableGraph.Text = "Graph..." ' 'ToolStripSeparator33 ' Me.ToolStripSeparator33.Name = "ToolStripSeparator33" - Me.ToolStripSeparator33.Size = New System.Drawing.Size(152, 6) + Me.ToolStripSeparator33.Size = New System.Drawing.Size(232, 6) ' 'mnuDescribeOneVariableFrequencies ' Me.mnuDescribeOneVariableFrequencies.Name = "mnuDescribeOneVariableFrequencies" - Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableFrequencies.Text = "Frequencies..." Me.mnuDescribeOneVariableFrequencies.ToolTipText = "Table or Graph. Also Stem and Leaf Plots" ' 'mnuDescribeOneVariableRatingData ' Me.mnuDescribeOneVariableRatingData.Name = "mnuDescribeOneVariableRatingData" - Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableRatingData.Text = "Rating Data..." Me.mnuDescribeOneVariableRatingData.ToolTipText = "Table, Stacked Graph or Likert Graph" ' @@ -789,26 +790,26 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeTwoThreeVariablesPivotTable, Me.ToolStripSeparator36, Me.mnuDescribeTwoVariablesSummarise, Me.mnuDescribeTwoVariablesGraph, Me.ToolStripSeparator34, Me.mnuDescribeTwoThreeVariablesCorrelations, Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies, Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies}) Me.mnuDescribeTwoThreeVariables.Name = "mnuDescribeTwoThreeVariables" - Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeTwoThreeVariables.Tag = "Two_Variables" Me.mnuDescribeTwoThreeVariables.Text = "Two/Three Variables" ' 'mnuDescribeTwoThreeVariablesPivotTable ' Me.mnuDescribeTwoThreeVariablesPivotTable.Name = "mnuDescribeTwoThreeVariablesPivotTable" - Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoThreeVariablesPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator36 ' Me.ToolStripSeparator36.Name = "ToolStripSeparator36" - Me.ToolStripSeparator36.Size = New System.Drawing.Size(203, 6) + Me.ToolStripSeparator36.Size = New System.Drawing.Size(305, 6) ' 'mnuDescribeTwoVariablesSummarise ' Me.mnuDescribeTwoVariablesSummarise.DoubleClickEnabled = True Me.mnuDescribeTwoVariablesSummarise.Name = "mnuDescribeTwoVariablesSummarise" - Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoVariablesSummarise.Tag = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.Text = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.ToolTipText = "Skim or Two Variables" @@ -816,19 +817,19 @@ Partial Class frmMain 'mnuDescribeTwoVariablesGraph ' Me.mnuDescribeTwoVariablesGraph.Name = "mnuDescribeTwoVariablesGraph" - Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoVariablesGraph.Tag = "Graph..." Me.mnuDescribeTwoVariablesGraph.Text = "Graph..." ' 'ToolStripSeparator34 ' Me.ToolStripSeparator34.Name = "ToolStripSeparator34" - Me.ToolStripSeparator34.Size = New System.Drawing.Size(203, 6) + Me.ToolStripSeparator34.Size = New System.Drawing.Size(305, 6) ' 'mnuDescribeTwoThreeVariablesCorrelations ' Me.mnuDescribeTwoThreeVariablesCorrelations.Name = "mnuDescribeTwoThreeVariablesCorrelations" - Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoThreeVariablesCorrelations.Text = "Correlations..." Me.mnuDescribeTwoThreeVariablesCorrelations.ToolTipText = "Multiple Variables or Two Variables" ' @@ -836,14 +837,14 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.DoubleClickEnabled = True Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Name = "mnuDescribeTwoThreeVariablesTwoWayFrequencies" - Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Text = "Two-Way Frequencies..." Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.ToolTipText = "Table or Graph" ' 'mnuDescribeTwoThreeVariablesThreeWayFrequencies ' Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Name = "mnuDescribeTwoThreeVariablesThreeWayFrequencies" - Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Text = "Three-Way Frequencies..." Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.ToolTipText = "Table or Graph" ' @@ -851,25 +852,14 @@ Partial Class frmMain ' Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator38, Me.mnuDescribeGeneral, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot}) Me.mnuDescribeSpecificTablesGraphs.Name = "mnuDescribeSpecificTablesGraphs" - Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeSpecificTablesGraphs.Tag = "Graph_Dialogs" Me.mnuDescribeSpecificTablesGraphs.Text = "Graphs" ' - 'mnuDescribeGeneral - ' - Me.mnuDescribeGeneral.Name = "mnuDescribeGeneral" - Me.mnuDescribeGeneral.Size = New System.Drawing.Size(209, 22) - Me.mnuDescribeGeneral.Text = "General..." - ' - 'ToolStripSeparator38 - ' - Me.ToolStripSeparator38.Name = "ToolStripSeparator38" - Me.ToolStripSeparator38.Size = New System.Drawing.Size(206, 6) - ' 'mnuDescribeSpecificBarPieChart ' Me.mnuDescribeSpecificBarPieChart.Name = "mnuDescribeSpecificBarPieChart" - Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificBarPieChart.Tag = "Bar_Chart" Me.mnuDescribeSpecificBarPieChart.Text = "Bar Chart..." Me.mnuDescribeSpecificBarPieChart.ToolTipText = "Bar, Column, Lollipop, Pie, and Donut Charts, plus Treemaps and Wordclouds" @@ -877,7 +867,7 @@ Partial Class frmMain 'mnuDescribeSpecificBoxplotJitterViolinPlot ' Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Name = "mnuDescribeSpecificBoxplotJitterViolinPlot" - Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Tag = "Boxplot..." Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Text = "Boxplot..." Me.mnuDescribeSpecificBoxplotJitterViolinPlot.ToolTipText = "Boxplot (including Tufte), Jitter and Violin Plots" @@ -885,7 +875,7 @@ Partial Class frmMain 'mnuDescribeSpecificHistogramDensityFrequencyPlot ' Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Name = "mnuDescribeSpecificHistogramDensityFrequencyPlot" - Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Tag = "Histogram..." Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Text = "Histogram..." Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.ToolTipText = "Histograms, Dotplots, Density and Ridge Plots and Frequency Polygons" @@ -893,7 +883,7 @@ Partial Class frmMain 'mnuDescribeSpecificPointPlot ' Me.mnuDescribeSpecificPointPlot.Name = "mnuDescribeSpecificPointPlot" - Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificPointPlot.Tag = "Point_Plot..." Me.mnuDescribeSpecificPointPlot.Text = "Scatter Plot..." Me.mnuDescribeSpecificPointPlot.ToolTipText = "Point Plot" @@ -901,20 +891,31 @@ Partial Class frmMain 'mnuDescribeSpecificLineSmoothPlot ' Me.mnuDescribeSpecificLineSmoothPlot.Name = "mnuDescribeSpecificLineSmoothPlot" - Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificLineSmoothPlot.Tag = "Line_Plot..." Me.mnuDescribeSpecificLineSmoothPlot.Text = "Line Plot..." Me.mnuDescribeSpecificLineSmoothPlot.ToolTipText = "Line Plots, Smoothed Plots, Dumbbell and Slope Plots" ' + 'ToolStripSeparator38 + ' + Me.ToolStripSeparator38.Name = "ToolStripSeparator38" + Me.ToolStripSeparator38.Size = New System.Drawing.Size(309, 6) + ' + 'mnuDescribeGeneral + ' + Me.mnuDescribeGeneral.Name = "mnuDescribeGeneral" + Me.mnuDescribeGeneral.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeGeneral.Text = "General..." + ' 'ToolStripSeparator26 ' Me.ToolStripSeparator26.Name = "ToolStripSeparator26" - Me.ToolStripSeparator26.Size = New System.Drawing.Size(206, 6) + Me.ToolStripSeparator26.Size = New System.Drawing.Size(309, 6) ' 'mnuDescribeSpecificMapPlot ' Me.mnuDescribeSpecificMapPlot.Name = "mnuDescribeSpecificMapPlot" - Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificMapPlot.Text = "Heatmap..." Me.mnuDescribeSpecificMapPlot.ToolTipText = "Heat Map and Chorolopleth Map" ' @@ -922,7 +923,7 @@ Partial Class frmMain ' Me.mnuDescribeSpecificDotPlot.Enabled = False Me.mnuDescribeSpecificDotPlot.Name = "mnuDescribeSpecificDotPlot" - Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificDotPlot.Tag = "Dotplot..." Me.mnuDescribeSpecificDotPlot.Text = "Dot Plot..." Me.mnuDescribeSpecificDotPlot.Visible = False @@ -930,28 +931,28 @@ Partial Class frmMain 'mnuDescribeSpecificMosaic ' Me.mnuDescribeSpecificMosaic.Name = "mnuDescribeSpecificMosaic" - Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificMosaic.Text = "Mosaic Plot..." Me.mnuDescribeSpecificMosaic.ToolTipText = "Mosaic Plot" ' 'mnuDescribeSpecificCummulativeDistribution ' Me.mnuDescribeSpecificCummulativeDistribution.Name = "mnuDescribeSpecificCummulativeDistribution" - Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificCummulativeDistribution.Text = "Cumulative Distribution..." Me.mnuDescribeSpecificCummulativeDistribution.ToolTipText = "Cumulative Graph and Exceedance Graph" ' 'mnuDescribeSpecificParallelCoordinatePlot ' Me.mnuDescribeSpecificParallelCoordinatePlot.Name = "mnuDescribeSpecificParallelCoordinatePlot" - Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificParallelCoordinatePlot.Text = "Parallel Coordinate Plot..." ' 'mnuDescribeSpecificTables ' Me.mnuDescribeSpecificTables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSummaries, Me.mnuDescribePresentation}) Me.mnuDescribeSpecificTables.Name = "mnuDescribeSpecificTables" - Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeSpecificTables.Tag = "Table_Dialogs" Me.mnuDescribeSpecificTables.Text = "Tables..." Me.mnuDescribeSpecificTables.ToolTipText = "Frequency tables and Summary tables" @@ -959,95 +960,95 @@ Partial Class frmMain 'mnuDescribeSummaries ' Me.mnuDescribeSummaries.Name = "mnuDescribeSummaries" - Me.mnuDescribeSummaries.Size = New System.Drawing.Size(149, 22) + Me.mnuDescribeSummaries.Size = New System.Drawing.Size(224, 34) Me.mnuDescribeSummaries.Text = "Summaries..." ' 'mnuDescribePresentation ' Me.mnuDescribePresentation.Name = "mnuDescribePresentation" - Me.mnuDescribePresentation.Size = New System.Drawing.Size(149, 22) + Me.mnuDescribePresentation.Size = New System.Drawing.Size(224, 34) Me.mnuDescribePresentation.Text = "Presentation..." ' 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(268, 6) ' 'mnuDescribeMultivariate ' Me.mnuDescribeMultivariate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeMultivariateCorrelations, Me.mnuDescribeMultivariateprincipalComponents, Me.mnuDescribeMultivariateCanonicalCorrelations, Me.mnuDescribeMultivariateClusterAnalysis}) Me.mnuDescribeMultivariate.Name = "mnuDescribeMultivariate" - Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeMultivariate.Text = "Multivariate" ' 'mnuDescribeMultivariateCorrelations ' Me.mnuDescribeMultivariateCorrelations.Name = "mnuDescribeMultivariateCorrelations" - Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(302, 34) Me.mnuDescribeMultivariateCorrelations.Text = "Correlations..." Me.mnuDescribeMultivariateCorrelations.ToolTipText = "Multiple Variables or Two Variables" ' 'mnuDescribeMultivariateprincipalComponents ' Me.mnuDescribeMultivariateprincipalComponents.Name = "mnuDescribeMultivariateprincipalComponents" - Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(302, 34) Me.mnuDescribeMultivariateprincipalComponents.Text = "Principal Components..." ' 'mnuDescribeMultivariateCanonicalCorrelations ' Me.mnuDescribeMultivariateCanonicalCorrelations.Name = "mnuDescribeMultivariateCanonicalCorrelations" - Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(302, 34) Me.mnuDescribeMultivariateCanonicalCorrelations.Text = "Canonical Correlations..." ' 'mnuDescribeMultivariateClusterAnalysis ' Me.mnuDescribeMultivariateClusterAnalysis.Name = "mnuDescribeMultivariateClusterAnalysis" - Me.mnuDescribeMultivariateClusterAnalysis.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateClusterAnalysis.Size = New System.Drawing.Size(302, 34) Me.mnuDescribeMultivariateClusterAnalysis.Text = "Cluster Analysis..." Me.mnuDescribeMultivariateClusterAnalysis.ToolTipText = "Partitioning or Hierarchical" ' 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(268, 6) ' 'mnuDescribeUseTable ' Me.mnuDescribeUseTable.Name = "mnuDescribeUseTable" - Me.mnuDescribeUseTable.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeUseTable.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeUseTable.Text = "Use Table..." ' 'mnuDescribeUseGraph ' Me.mnuDescribeUseGraph.Name = "mnuDescribeUseGraph" - Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeUseGraph.Text = "Use Graph..." ' 'mnuDescribeCombineGraph ' Me.mnuDescribeCombineGraph.Name = "mnuDescribeCombineGraph" - Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeCombineGraph.Text = "Combine Graphs..." ' 'mnuDescribeThemes ' Me.mnuDescribeThemes.Enabled = False Me.mnuDescribeThemes.Name = "mnuDescribeThemes" - Me.mnuDescribeThemes.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeThemes.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeThemes.Text = "Themes..." Me.mnuDescribeThemes.Visible = False ' 'mnuDescribeViewGraph ' Me.mnuDescribeViewGraph.Name = "mnuDescribeViewGraph" - Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeViewGraph.Text = "View Graph..." ' 'mnuModel ' Me.mnuModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributions, Me.ToolStripSeparator3, Me.mnuModelFitModel, Me.mnuModelCompareModels, Me.mnuModelUseModel, Me.mnuModelOtherOneVariable, Me.mnuModelOtherTwoVariables, Me.mnuModelOtherThreeVariables, Me.mnuModelOtherGeneral}) Me.mnuModel.Name = "mnuModel" - Me.mnuModel.Size = New System.Drawing.Size(53, 22) + Me.mnuModel.Size = New System.Drawing.Size(79, 29) Me.mnuModel.Tag = "Model" Me.mnuModel.Text = "Model" ' @@ -1055,168 +1056,168 @@ Partial Class frmMain ' Me.mnuModelProbabilityDistributions.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributionsShowModel, Me.mnuModelProbabilityDistributionsCompareModels, Me.mnuModelProbabilityDistributionsRandomSamplesUseModel}) Me.mnuModelProbabilityDistributions.Name = "mnuModelProbabilityDistributions" - Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(201, 22) + Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(305, 34) Me.mnuModelProbabilityDistributions.Tag = "Probability_Distributions" Me.mnuModelProbabilityDistributions.Text = "Probability Distributions" ' 'mnuModelProbabilityDistributionsShowModel ' Me.mnuModelProbabilityDistributionsShowModel.Name = "mnuModelProbabilityDistributionsShowModel" - Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(178, 22) + Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(271, 34) Me.mnuModelProbabilityDistributionsShowModel.Text = "Show Model..." ' 'mnuModelProbabilityDistributionsCompareModels ' Me.mnuModelProbabilityDistributionsCompareModels.Enabled = False Me.mnuModelProbabilityDistributionsCompareModels.Name = "mnuModelProbabilityDistributionsCompareModels" - Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(178, 22) + Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(271, 34) Me.mnuModelProbabilityDistributionsCompareModels.Tag = "Show_Models..." Me.mnuModelProbabilityDistributionsCompareModels.Text = "Compare Models..." ' 'mnuModelProbabilityDistributionsRandomSamplesUseModel ' Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Name = "mnuModelProbabilityDistributionsRandomSamplesUseModel" - Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(178, 22) + Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(271, 34) Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Tag = "RandomSamples_(Use_Model)..." Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Text = "Random Samples ..." ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(302, 6) ' 'mnuModelFitModel ' Me.mnuModelFitModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelFitModelOneVariable, Me.mnuModelFitModelTwoVariables, Me.mnuModelFitModelThreeVariables, Me.mnuModelFitModelFourVariables, Me.ToolStripSeparator24, Me.mnuModelFitModelGeneral, Me.mnuModelFitModelMachineLearning, Me.ToolStripSeparator57, Me.mnuModelFitModelHypothesisTestsKeyboard, Me.mnuModelFitModelModelKeyboard}) Me.mnuModelFitModel.Name = "mnuModelFitModel" - Me.mnuModelFitModel.Size = New System.Drawing.Size(201, 22) + Me.mnuModelFitModel.Size = New System.Drawing.Size(305, 34) Me.mnuModelFitModel.Tag = "Fit_Model..." Me.mnuModelFitModel.Text = "Fit Model" ' 'mnuModelFitModelOneVariable ' Me.mnuModelFitModelOneVariable.Name = "mnuModelFitModelOneVariable" - Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelOneVariable.Text = "One Variable..." ' 'mnuModelFitModelTwoVariables ' Me.mnuModelFitModelTwoVariables.Name = "mnuModelFitModelTwoVariables" - Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelTwoVariables.Text = "Two Variables..." ' 'mnuModelFitModelThreeVariables ' Me.mnuModelFitModelThreeVariables.Name = "mnuModelFitModelThreeVariables" - Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelThreeVariables.Text = "Three Variables..." ' 'mnuModelFitModelFourVariables ' Me.mnuModelFitModelFourVariables.Name = "mnuModelFitModelFourVariables" - Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelFourVariables.Text = "Four Variables..." ' 'ToolStripSeparator24 ' Me.ToolStripSeparator24.Name = "ToolStripSeparator24" - Me.ToolStripSeparator24.Size = New System.Drawing.Size(225, 6) + Me.ToolStripSeparator24.Size = New System.Drawing.Size(344, 6) ' 'mnuModelFitModelGeneral ' Me.mnuModelFitModelGeneral.Name = "mnuModelFitModelGeneral" - Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelGeneral.Text = "General..." ' 'mnuModelFitModelMachineLearning ' Me.mnuModelFitModelMachineLearning.Enabled = False Me.mnuModelFitModelMachineLearning.Name = "mnuModelFitModelMachineLearning" - Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelMachineLearning.Text = "Machine Learning (Caret)..." Me.mnuModelFitModelMachineLearning.Visible = False ' 'ToolStripSeparator57 ' Me.ToolStripSeparator57.Name = "ToolStripSeparator57" - Me.ToolStripSeparator57.Size = New System.Drawing.Size(225, 6) + Me.ToolStripSeparator57.Size = New System.Drawing.Size(344, 6) ' 'mnuModelFitModelHypothesisTestsKeyboard ' Me.mnuModelFitModelHypothesisTestsKeyboard.Name = "mnuModelFitModelHypothesisTestsKeyboard" - Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelHypothesisTestsKeyboard.Text = "Hypothesis Tests Keyboards..." ' 'mnuModelFitModelModelKeyboard ' Me.mnuModelFitModelModelKeyboard.Name = "mnuModelFitModelModelKeyboard" - Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelModelKeyboard.Text = "Fit Model Keyboards..." ' 'mnuModelCompareModels ' Me.mnuModelCompareModels.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelCompareModelsOneVariable}) Me.mnuModelCompareModels.Name = "mnuModelCompareModels" - Me.mnuModelCompareModels.Size = New System.Drawing.Size(201, 22) + Me.mnuModelCompareModels.Size = New System.Drawing.Size(305, 34) Me.mnuModelCompareModels.Text = "Compare Models" ' 'mnuModelCompareModelsOneVariable ' Me.mnuModelCompareModelsOneVariable.Name = "mnuModelCompareModelsOneVariable" - Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(149, 22) + Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(226, 34) Me.mnuModelCompareModelsOneVariable.Text = "One Variable..." ' 'mnuModelUseModel ' Me.mnuModelUseModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelUseModelOneVariable, Me.mnuModelUseModelTwoVariables, Me.ToolStripSeparator59, Me.mnuModelUseModelGlance, Me.mnuModelUseModelTidy, Me.mnuModelUseModelAugment, Me.ToolStripSeparator58, Me.mnuModelUseModelUseModelKeyboard}) Me.mnuModelUseModel.Name = "mnuModelUseModel" - Me.mnuModelUseModel.Size = New System.Drawing.Size(201, 22) + Me.mnuModelUseModel.Size = New System.Drawing.Size(305, 34) Me.mnuModelUseModel.Text = "Use Model" ' 'mnuModelUseModelOneVariable ' Me.mnuModelUseModelOneVariable.Name = "mnuModelUseModelOneVariable" - Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelOneVariable.Text = "One Variable..." ' 'mnuModelUseModelTwoVariables ' Me.mnuModelUseModelTwoVariables.Name = "mnuModelUseModelTwoVariables" - Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelTwoVariables.Text = "Two Variables..." ' 'ToolStripSeparator59 ' Me.ToolStripSeparator59.Name = "ToolStripSeparator59" - Me.ToolStripSeparator59.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator59.Size = New System.Drawing.Size(297, 6) ' 'mnuModelUseModelGlance ' Me.mnuModelUseModelGlance.Name = "mnuModelUseModelGlance" - Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelGlance.Text = "Glance..." ' 'mnuModelUseModelTidy ' Me.mnuModelUseModelTidy.Name = "mnuModelUseModelTidy" - Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelTidy.Text = "Tidy..." ' 'mnuModelUseModelAugment ' Me.mnuModelUseModelAugment.Name = "mnuModelUseModelAugment" - Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelAugment.Text = "Augment..." ' 'ToolStripSeparator58 ' Me.ToolStripSeparator58.Name = "ToolStripSeparator58" - Me.ToolStripSeparator58.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator58.Size = New System.Drawing.Size(297, 6) ' 'mnuModelUseModelUseModelKeyboard ' Me.mnuModelUseModelUseModelKeyboard.Name = "mnuModelUseModelUseModelKeyboard" - Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelUseModelKeyboard.Text = "Use Model Keyboards..." ' 'mnuModelOtherOneVariable @@ -1224,7 +1225,7 @@ Partial Class frmMain Me.mnuModelOtherOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherOneVariableExactResults, Me.mnuModelOtherOneVariableSampleSummaryData, Me.mnuModelOtherOneVariableNonParametric, Me.mnuModelOtherOneVariableGoodnessofFit}) Me.mnuModelOtherOneVariable.Enabled = False Me.mnuModelOtherOneVariable.Name = "mnuModelOtherOneVariable" - Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(201, 22) + Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(305, 34) Me.mnuModelOtherOneVariable.Tag = "Other_(One_Variable)" Me.mnuModelOtherOneVariable.Text = "Other (One Variable)" Me.mnuModelOtherOneVariable.Visible = False @@ -1232,7 +1233,7 @@ Partial Class frmMain 'mnuModelOtherOneVariableExactResults ' Me.mnuModelOtherOneVariableExactResults.Name = "mnuModelOtherOneVariableExactResults" - Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(252, 34) Me.mnuModelOtherOneVariableExactResults.Tag = "Exact_Results..." Me.mnuModelOtherOneVariableExactResults.Text = "Exact Results..." ' @@ -1240,7 +1241,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableSampleSummaryData.Enabled = False Me.mnuModelOtherOneVariableSampleSummaryData.Name = "mnuModelOtherOneVariableSampleSummaryData" - Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(252, 34) Me.mnuModelOtherOneVariableSampleSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherOneVariableSampleSummaryData.Text = "Summary Data..." ' @@ -1248,7 +1249,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableNonParametric.Enabled = False Me.mnuModelOtherOneVariableNonParametric.Name = "mnuModelOtherOneVariableNonParametric" - Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(252, 34) Me.mnuModelOtherOneVariableNonParametric.Tag = "Non_Parametric..." Me.mnuModelOtherOneVariableNonParametric.Text = "Non Parametric..." ' @@ -1256,7 +1257,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableGoodnessofFit.Enabled = False Me.mnuModelOtherOneVariableGoodnessofFit.Name = "mnuModelOtherOneVariableGoodnessofFit" - Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(252, 34) Me.mnuModelOtherOneVariableGoodnessofFit.Tag = "Goodness_of_Fit" Me.mnuModelOtherOneVariableGoodnessofFit.Text = "Goodness of Fit..." ' @@ -1265,7 +1266,7 @@ Partial Class frmMain Me.mnuModelOtherTwoVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherTwoVariablesTwoSamples, Me.mnuModelOtherTwoVariablesSummaryData, Me.mnuModelOtherTwoVariablesSimpleRegression, Me.mnuModelOtherTwoVariablesOneWayANOVA, Me.mnuModelOtherTwoVariablesNonParametricTwoSamples, Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA}) Me.mnuModelOtherTwoVariables.Enabled = False Me.mnuModelOtherTwoVariables.Name = "mnuModelOtherTwoVariables" - Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(201, 22) + Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(305, 34) Me.mnuModelOtherTwoVariables.Tag = "Other_(Two_Variables)" Me.mnuModelOtherTwoVariables.Text = "Other (Two Variables)" Me.mnuModelOtherTwoVariables.Visible = False @@ -1274,7 +1275,7 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesTwoSamples.Name = "mnuModelOtherTwoVariablesTwoSamples" - Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesTwoSamples.Tag = "Two_Samples..." Me.mnuModelOtherTwoVariablesTwoSamples.Text = "Two Samples..." ' @@ -1282,21 +1283,21 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesSummaryData.Enabled = False Me.mnuModelOtherTwoVariablesSummaryData.Name = "mnuModelOtherTwoVariablesSummaryData" - Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherTwoVariablesSummaryData.Text = "Summary Data..." ' 'mnuModelOtherTwoVariablesSimpleRegression ' Me.mnuModelOtherTwoVariablesSimpleRegression.Name = "mnuModelOtherTwoVariablesSimpleRegression" - Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesSimpleRegression.Tag = "Simple_Regression..." Me.mnuModelOtherTwoVariablesSimpleRegression.Text = "Simple Regression..." ' 'mnuModelOtherTwoVariablesOneWayANOVA ' Me.mnuModelOtherTwoVariablesOneWayANOVA.Name = "mnuModelOtherTwoVariablesOneWayANOVA" - Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesOneWayANOVA.Tag = "One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesOneWayANOVA.Text = "One Way ANOVA..." ' @@ -1304,14 +1305,14 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Name = "mnuModelOtherTwoVariablesNonParametricTwoSamples" - Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Tag = "Non_Parameteric_Two_Samples..." Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Text = "Non Parametric Two Samples..." ' 'mnuModelOtherTwoVariablesNonParametricOneWayANOVA ' Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Name = "mnuModelOtherTwoVariablesNonParametricOneWayANOVA" - Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Tag = "Non_Parameteric_One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Text = "Non Parameteric One Way ANOVA..." ' @@ -1320,7 +1321,7 @@ Partial Class frmMain Me.mnuModelOtherThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherThreeVariablesSimpleWithGroups, Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA, Me.mnuModelOtherThreeVariablesChisquareTest}) Me.mnuModelOtherThreeVariables.Enabled = False Me.mnuModelOtherThreeVariables.Name = "mnuModelOtherThreeVariables" - Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(201, 22) + Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(305, 34) Me.mnuModelOtherThreeVariables.Tag = "Other_(Three_Variable)" Me.mnuModelOtherThreeVariables.Text = "Other (Three Variable)" Me.mnuModelOtherThreeVariables.Visible = False @@ -1329,21 +1330,21 @@ Partial Class frmMain ' Me.mnuModelOtherThreeVariablesSimpleWithGroups.Enabled = False Me.mnuModelOtherThreeVariablesSimpleWithGroups.Name = "mnuModelOtherThreeVariablesSimpleWithGroups" - Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(259, 22) + Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(389, 34) Me.mnuModelOtherThreeVariablesSimpleWithGroups.Tag = "Simple_with_groups..." Me.mnuModelOtherThreeVariablesSimpleWithGroups.Text = "Simple With Groups..." ' 'mnuModelOtherThreeVariablesNonParametricTwoWayANOVA ' Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Name = "mnuModelOtherThreeVariablesNonParametricTwoWayANOVA" - Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(259, 22) + Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(389, 34) Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Tag = "Non_Parametric_Two_Way_ANOVA..." Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Text = "Non Parametric Two Way ANOVA..." ' 'mnuModelOtherThreeVariablesChisquareTest ' Me.mnuModelOtherThreeVariablesChisquareTest.Name = "mnuModelOtherThreeVariablesChisquareTest" - Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(259, 22) + Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(389, 34) Me.mnuModelOtherThreeVariablesChisquareTest.Tag = "Chi-square_Test" Me.mnuModelOtherThreeVariablesChisquareTest.Text = "Chi-square Test..." ' @@ -1352,7 +1353,7 @@ Partial Class frmMain Me.mnuModelOtherGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherGeneralANOVAGeneral, Me.mnuModelOtherGeneralRegression, Me.mnuModelOtherGeneralLogLinear}) Me.mnuModelOtherGeneral.Enabled = False Me.mnuModelOtherGeneral.Name = "mnuModelOtherGeneral" - Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(201, 22) + Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(305, 34) Me.mnuModelOtherGeneral.Tag = "Other_(General)" Me.mnuModelOtherGeneral.Text = "Other (General)" Me.mnuModelOtherGeneral.Visible = False @@ -1361,7 +1362,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralANOVAGeneral.Enabled = False Me.mnuModelOtherGeneralANOVAGeneral.Name = "mnuModelOtherGeneralANOVAGeneral" - Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(251, 34) Me.mnuModelOtherGeneralANOVAGeneral.Tag = "ANOVA_General..." Me.mnuModelOtherGeneralANOVAGeneral.Text = "ANOVA General..." ' @@ -1369,7 +1370,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralRegression.Enabled = False Me.mnuModelOtherGeneralRegression.Name = "mnuModelOtherGeneralRegression" - Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(251, 34) Me.mnuModelOtherGeneralRegression.Tag = "Regression..." Me.mnuModelOtherGeneralRegression.Text = "Regression..." ' @@ -1377,7 +1378,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralLogLinear.Enabled = False Me.mnuModelOtherGeneralLogLinear.Name = "mnuModelOtherGeneralLogLinear" - Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(251, 34) Me.mnuModelOtherGeneralLogLinear.Tag = "Log_Linear" Me.mnuModelOtherGeneralLogLinear.Text = "Log Linear..." ' @@ -1385,7 +1386,7 @@ Partial Class frmMain ' Me.mnuClimaticExamine.Enabled = False Me.mnuClimaticExamine.Name = "mnuClimaticExamine" - Me.mnuClimaticExamine.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticExamine.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticExamine.Tag = "Examine" Me.mnuClimaticExamine.Text = "Examine..." Me.mnuClimaticExamine.Visible = False @@ -1394,7 +1395,7 @@ Partial Class frmMain ' Me.mnuClimaticProcess.Enabled = False Me.mnuClimaticProcess.Name = "mnuClimaticProcess" - Me.mnuClimaticProcess.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticProcess.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticProcess.Tag = "Process" Me.mnuClimaticProcess.Text = "Process..." Me.mnuClimaticProcess.Visible = False @@ -1403,7 +1404,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporation.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticEvaporationSite, Me.mnuClimaticEvaporationPenman}) Me.mnuClimaticEvaporation.Name = "mnuClimaticEvaporation" - Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticEvaporation.Tag = "Evaporation" Me.mnuClimaticEvaporation.Text = "Evaporation" Me.mnuClimaticEvaporation.Visible = False @@ -1412,7 +1413,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationSite.Enabled = False Me.mnuClimaticEvaporationSite.Name = "mnuClimaticEvaporationSite" - Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(127, 22) + Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(189, 34) Me.mnuClimaticEvaporationSite.Tag = "Site" Me.mnuClimaticEvaporationSite.Text = "Site..." ' @@ -1420,7 +1421,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationPenman.Enabled = False Me.mnuClimaticEvaporationPenman.Name = "mnuClimaticEvaporationPenman" - Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(127, 22) + Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(189, 34) Me.mnuClimaticEvaporationPenman.Tag = "Penman" Me.mnuClimaticEvaporationPenman.Text = "Penman..." ' @@ -1428,7 +1429,7 @@ Partial Class frmMain ' Me.mnuClimaticCrop.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCropCropCoefficients, Me.mnuClimaticCropWaterSatisfactionIndex}) Me.mnuClimaticCrop.Name = "mnuClimaticCrop" - Me.mnuClimaticCrop.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticCrop.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticCrop.Tag = "Crop" Me.mnuClimaticCrop.Text = "Crop" Me.mnuClimaticCrop.Visible = False @@ -1437,21 +1438,21 @@ Partial Class frmMain ' Me.mnuClimaticCropCropCoefficients.Enabled = False Me.mnuClimaticCropCropCoefficients.Name = "mnuClimaticCropCropCoefficients" - Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticCropCropCoefficients.Text = "Crop Coefficients..." ' 'mnuClimaticCropWaterSatisfactionIndex ' Me.mnuClimaticCropWaterSatisfactionIndex.Enabled = False Me.mnuClimaticCropWaterSatisfactionIndex.Name = "mnuClimaticCropWaterSatisfactionIndex" - Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticCropWaterSatisfactionIndex.Text = "Water Satisfaction Index..." ' 'mnuClimaticHeatSum ' Me.mnuClimaticHeatSum.Enabled = False Me.mnuClimaticHeatSum.Name = "mnuClimaticHeatSum" - Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticHeatSum.Tag = "Heat_Sum" Me.mnuClimaticHeatSum.Text = "Heat Sum..." Me.mnuClimaticHeatSum.Visible = False @@ -1460,7 +1461,7 @@ Partial Class frmMain ' Me.mnuView.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuViewDataView, Me.mnuViewOutput, Me.mnuViewLogScript, Me.mnuViewColumnMetadata, Me.mnuViewDataFrameMetadata, Me.mnuViewStructuredMenu, Me.ToolStripSeparator22, Me.mnuViewClimaticMenu, Me.mnuViewProcurementMenu, Me.mnuViewOptionsByContextMenu, Me.ToolStripSeparator39, Me.mnuViewResetToDefaultLayout, Me.mnuViewSwapDataAndMetadata, Me.mnuViewSwapDataAndScript}) Me.mnuView.Name = "mnuView" - Me.mnuView.Size = New System.Drawing.Size(44, 22) + Me.mnuView.Size = New System.Drawing.Size(65, 29) Me.mnuView.Tag = "View" Me.mnuView.Text = "View" ' @@ -1468,7 +1469,7 @@ Partial Class frmMain ' Me.mnuViewDataView.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataView.Name = "mnuViewDataView" - Me.mnuViewDataView.Size = New System.Drawing.Size(213, 22) + Me.mnuViewDataView.Size = New System.Drawing.Size(326, 34) Me.mnuViewDataView.Tag = "Data_View" Me.mnuViewDataView.Text = "Data View" ' @@ -1476,21 +1477,21 @@ Partial Class frmMain ' Me.mnuViewOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOutput.Name = "mnuViewOutput" - Me.mnuViewOutput.Size = New System.Drawing.Size(213, 22) + Me.mnuViewOutput.Size = New System.Drawing.Size(326, 34) Me.mnuViewOutput.Text = "Output" ' 'mnuViewLogScript ' Me.mnuViewLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewLogScript.Name = "mnuViewLogScript" - Me.mnuViewLogScript.Size = New System.Drawing.Size(213, 22) + Me.mnuViewLogScript.Size = New System.Drawing.Size(326, 34) Me.mnuViewLogScript.Text = "Log/Script" ' 'mnuViewColumnMetadata ' Me.mnuViewColumnMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewColumnMetadata.Name = "mnuViewColumnMetadata" - Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(213, 22) + Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(326, 34) Me.mnuViewColumnMetadata.Tag = "Column_Metadata" Me.mnuViewColumnMetadata.Text = "Column Metadata" ' @@ -1498,7 +1499,7 @@ Partial Class frmMain ' Me.mnuViewDataFrameMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataFrameMetadata.Name = "mnuViewDataFrameMetadata" - Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(213, 22) + Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(326, 34) Me.mnuViewDataFrameMetadata.Tag = "Data_Frame_Metadata" Me.mnuViewDataFrameMetadata.Text = "Data Frame Metadata" ' @@ -1506,19 +1507,19 @@ Partial Class frmMain ' Me.mnuViewStructuredMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewStructuredMenu.Name = "mnuViewStructuredMenu" - Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(213, 22) + Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(326, 34) Me.mnuViewStructuredMenu.Text = "Structured Menu" ' 'ToolStripSeparator22 ' Me.ToolStripSeparator22.Name = "ToolStripSeparator22" - Me.ToolStripSeparator22.Size = New System.Drawing.Size(210, 6) + Me.ToolStripSeparator22.Size = New System.Drawing.Size(323, 6) ' 'mnuViewClimaticMenu ' Me.mnuViewClimaticMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewClimaticMenu.Name = "mnuViewClimaticMenu" - Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(213, 22) + Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(326, 34) Me.mnuViewClimaticMenu.Tag = "" Me.mnuViewClimaticMenu.Text = "Climatic Menu" ' @@ -1526,7 +1527,7 @@ Partial Class frmMain ' Me.mnuViewProcurementMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewProcurementMenu.Name = "mnuViewProcurementMenu" - Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(213, 22) + Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(326, 34) Me.mnuViewProcurementMenu.Tag = "" Me.mnuViewProcurementMenu.Text = "Procurement Menu" ' @@ -1534,232 +1535,232 @@ Partial Class frmMain ' Me.mnuViewOptionsByContextMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOptionsByContextMenu.Name = "mnuViewOptionsByContextMenu" - Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(213, 22) + Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(326, 34) Me.mnuViewOptionsByContextMenu.Text = "Experiments" ' 'ToolStripSeparator39 ' Me.ToolStripSeparator39.Name = "ToolStripSeparator39" - Me.ToolStripSeparator39.Size = New System.Drawing.Size(210, 6) + Me.ToolStripSeparator39.Size = New System.Drawing.Size(323, 6) ' 'mnuViewResetToDefaultLayout ' Me.mnuViewResetToDefaultLayout.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewResetToDefaultLayout.Name = "mnuViewResetToDefaultLayout" - Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(213, 22) + Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(326, 34) Me.mnuViewResetToDefaultLayout.Text = "Reset to Default Layout" ' 'mnuViewSwapDataAndMetadata ' Me.mnuViewSwapDataAndMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewSwapDataAndMetadata.Name = "mnuViewSwapDataAndMetadata" - Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(213, 22) + Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(326, 34) Me.mnuViewSwapDataAndMetadata.Text = "Swap Data and Metadata" ' 'mnuViewSwapDataAndScript ' Me.mnuViewSwapDataAndScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewSwapDataAndScript.Name = "mnuViewSwapDataAndScript" - Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(213, 22) + Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(326, 34) Me.mnuViewSwapDataAndScript.Text = "Swap Data and Log/Script" ' 'mnuHelp ' Me.mnuHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuHelpHelpIntroduction, Me.mnuHelpFAQ, Me.mnuHelpGetingStarted, Me.mnuHelpData, Me.ToolStripSeparator28, Me.mnuHelpWindows, Me.ToolStripSeparator81, Me.mnuHelpMenus, Me.mnuHelpAboutR, Me.mnuHelpLearningStatistics, Me.mnuHelpRPackages, Me.mnuHelpGlossary, Me.mnuHelpLicence, Me.ToolStripSeparator29, Me.RInstatResourcesSiteToolStripMenuItem, Me.mnuHelpPackagesDocumentation}) Me.mnuHelp.Name = "mnuHelp" - Me.mnuHelp.Size = New System.Drawing.Size(44, 22) + Me.mnuHelp.Size = New System.Drawing.Size(65, 29) Me.mnuHelp.Tag = "Help" Me.mnuHelp.Text = "Help" ' 'mnuHelpHelpIntroduction ' Me.mnuHelpHelpIntroduction.Name = "mnuHelpHelpIntroduction" - Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(344, 34) Me.mnuHelpHelpIntroduction.Text = "Introduction..." ' 'mnuHelpFAQ ' Me.mnuHelpFAQ.Name = "mnuHelpFAQ" - Me.mnuHelpFAQ.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpFAQ.Size = New System.Drawing.Size(344, 34) Me.mnuHelpFAQ.Text = "FAQ..." ' 'mnuHelpGetingStarted ' Me.mnuHelpGetingStarted.Name = "mnuHelpGetingStarted" - Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(344, 34) Me.mnuHelpGetingStarted.Text = "Getting Started..." ' 'mnuHelpData ' Me.mnuHelpData.Name = "mnuHelpData" - Me.mnuHelpData.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpData.Size = New System.Drawing.Size(344, 34) Me.mnuHelpData.Text = "Data..." ' 'ToolStripSeparator28 ' Me.ToolStripSeparator28.Name = "ToolStripSeparator28" - Me.ToolStripSeparator28.Size = New System.Drawing.Size(227, 6) + Me.ToolStripSeparator28.Size = New System.Drawing.Size(341, 6) ' 'mnuHelpWindows ' Me.mnuHelpWindows.Name = "mnuHelpWindows" - Me.mnuHelpWindows.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpWindows.Size = New System.Drawing.Size(344, 34) Me.mnuHelpWindows.Text = "Windows..." ' 'ToolStripSeparator81 ' Me.ToolStripSeparator81.Name = "ToolStripSeparator81" - Me.ToolStripSeparator81.Size = New System.Drawing.Size(227, 6) + Me.ToolStripSeparator81.Size = New System.Drawing.Size(341, 6) ' 'mnuHelpMenus ' Me.mnuHelpMenus.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MenusAndDialogsToolStripMenuItem, Me.ToolStripSeparator82, Me.FileToolStripMenuItem, Me.EditToolStripMenuItem, Me.PrepareToolStripMenuItem, Me.DescribeToolStripMenuItem, Me.ModelToolStripMenuItem, Me.ToolStripSeparator83, Me.StructuredToolStripMenuItem, Me.ClimaticToolStripMenuItem, Me.ProcurementToolStripMenuItem, Me.ExperimentsToolStripMenuItem, Me.ToolsToolStripMenuItem, Me.ViewToolStripMenuItem}) Me.mnuHelpMenus.Name = "mnuHelpMenus" - Me.mnuHelpMenus.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpMenus.Size = New System.Drawing.Size(344, 34) Me.mnuHelpMenus.Text = "Menus and Dialogs" ' 'MenusAndDialogsToolStripMenuItem ' Me.MenusAndDialogsToolStripMenuItem.Name = "MenusAndDialogsToolStripMenuItem" - Me.MenusAndDialogsToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.MenusAndDialogsToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.MenusAndDialogsToolStripMenuItem.Text = "Menus and Dialogs..." ' 'ToolStripSeparator82 ' Me.ToolStripSeparator82.Name = "ToolStripSeparator82" - Me.ToolStripSeparator82.Size = New System.Drawing.Size(181, 6) + Me.ToolStripSeparator82.Size = New System.Drawing.Size(276, 6) ' 'FileToolStripMenuItem ' Me.FileToolStripMenuItem.Name = "FileToolStripMenuItem" - Me.FileToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.FileToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.FileToolStripMenuItem.Text = "File..." ' 'EditToolStripMenuItem ' Me.EditToolStripMenuItem.Name = "EditToolStripMenuItem" - Me.EditToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.EditToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.EditToolStripMenuItem.Text = "Edit..." ' 'PrepareToolStripMenuItem ' Me.PrepareToolStripMenuItem.Name = "PrepareToolStripMenuItem" - Me.PrepareToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.PrepareToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.PrepareToolStripMenuItem.Text = "Prepare..." ' 'DescribeToolStripMenuItem ' Me.DescribeToolStripMenuItem.Name = "DescribeToolStripMenuItem" - Me.DescribeToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.DescribeToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.DescribeToolStripMenuItem.Text = "Describe..." ' 'ModelToolStripMenuItem ' Me.ModelToolStripMenuItem.Name = "ModelToolStripMenuItem" - Me.ModelToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ModelToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ModelToolStripMenuItem.Text = "Model..." ' 'ToolStripSeparator83 ' Me.ToolStripSeparator83.Name = "ToolStripSeparator83" - Me.ToolStripSeparator83.Size = New System.Drawing.Size(181, 6) + Me.ToolStripSeparator83.Size = New System.Drawing.Size(276, 6) ' 'StructuredToolStripMenuItem ' Me.StructuredToolStripMenuItem.Name = "StructuredToolStripMenuItem" - Me.StructuredToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.StructuredToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.StructuredToolStripMenuItem.Text = "Structured..." ' 'ClimaticToolStripMenuItem ' Me.ClimaticToolStripMenuItem.Name = "ClimaticToolStripMenuItem" - Me.ClimaticToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ClimaticToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ClimaticToolStripMenuItem.Text = "Climatic..." ' 'ProcurementToolStripMenuItem ' Me.ProcurementToolStripMenuItem.Name = "ProcurementToolStripMenuItem" - Me.ProcurementToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ProcurementToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ProcurementToolStripMenuItem.Text = "Procurement..." ' 'ExperimentsToolStripMenuItem ' Me.ExperimentsToolStripMenuItem.Name = "ExperimentsToolStripMenuItem" - Me.ExperimentsToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ExperimentsToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ExperimentsToolStripMenuItem.Text = "Experiments..." ' 'ToolsToolStripMenuItem ' Me.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem" - Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ToolsToolStripMenuItem.Text = "Tools..." ' 'ViewToolStripMenuItem ' Me.ViewToolStripMenuItem.Name = "ViewToolStripMenuItem" - Me.ViewToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ViewToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ViewToolStripMenuItem.Text = "View..." ' 'mnuHelpAboutR ' Me.mnuHelpAboutR.Name = "mnuHelpAboutR" - Me.mnuHelpAboutR.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpAboutR.Size = New System.Drawing.Size(344, 34) Me.mnuHelpAboutR.Text = "About R..." Me.mnuHelpAboutR.Visible = False ' 'mnuHelpLearningStatistics ' Me.mnuHelpLearningStatistics.Name = "mnuHelpLearningStatistics" - Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(344, 34) Me.mnuHelpLearningStatistics.Text = "Learning Statistics..." Me.mnuHelpLearningStatistics.Visible = False ' 'mnuHelpRPackages ' Me.mnuHelpRPackages.Name = "mnuHelpRPackages" - Me.mnuHelpRPackages.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpRPackages.Size = New System.Drawing.Size(344, 34) Me.mnuHelpRPackages.Text = "R Packages..." ' 'mnuHelpGlossary ' Me.mnuHelpGlossary.Name = "mnuHelpGlossary" - Me.mnuHelpGlossary.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpGlossary.Size = New System.Drawing.Size(344, 34) Me.mnuHelpGlossary.Text = "Glossary..." ' 'mnuHelpLicence ' Me.mnuHelpLicence.Name = "mnuHelpLicence" - Me.mnuHelpLicence.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpLicence.Size = New System.Drawing.Size(344, 34) Me.mnuHelpLicence.Tag = "Licence..." Me.mnuHelpLicence.Text = "Licence..." ' 'ToolStripSeparator29 ' Me.ToolStripSeparator29.Name = "ToolStripSeparator29" - Me.ToolStripSeparator29.Size = New System.Drawing.Size(227, 6) + Me.ToolStripSeparator29.Size = New System.Drawing.Size(341, 6) ' 'RInstatResourcesSiteToolStripMenuItem ' Me.RInstatResourcesSiteToolStripMenuItem.Name = "RInstatResourcesSiteToolStripMenuItem" - Me.RInstatResourcesSiteToolStripMenuItem.Size = New System.Drawing.Size(230, 22) + Me.RInstatResourcesSiteToolStripMenuItem.Size = New System.Drawing.Size(344, 34) Me.RInstatResourcesSiteToolStripMenuItem.Text = "R-Instat Resources Site" ' 'mnuHelpPackagesDocumentation ' Me.mnuHelpPackagesDocumentation.Name = "mnuHelpPackagesDocumentation" - Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(344, 34) Me.mnuHelpPackagesDocumentation.Text = "R-Packages Documentation..." ' 'ToolStripSeparator16 ' Me.ToolStripSeparator16.Name = "ToolStripSeparator16" - Me.ToolStripSeparator16.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator16.Size = New System.Drawing.Size(322, 6) ' 'mnuClimatic ' Me.mnuClimatic.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFile, Me.ToolStripSeparator18, Me.mnuExamineEditData, Me.mnuClimaticTidyandExamine, Me.mnuClimaticDates, Me.mnuClimaticDefineClimaticData, Me.mnuClimaticCheckData, Me.mnuClimaticPrepare, Me.ToolStripSeparator30, Me.mnuClimaticDescribe, Me.mnuClimaticNCMP, Me.mnuClimaticPICSA, Me.mnuCMSAF, Me.mnuClimaticCompare, Me.mnuClimaticMapping, Me.ToolStripSeparator16, Me.mnuClimaticModel, Me.mnuClimaticExamine, Me.mnuClimaticProcess, Me.ToolStripSeparator23, Me.mnuClimaticSCF, Me.mnuClimaticEvaporation, Me.mnuClimaticCrop, Me.mnuClimaticHeatSum, Me.mnuClimaticClimateMethods}) Me.mnuClimatic.Name = "mnuClimatic" - Me.mnuClimatic.Size = New System.Drawing.Size(63, 22) + Me.mnuClimatic.Size = New System.Drawing.Size(90, 29) Me.mnuClimatic.Tag = "Climatic" Me.mnuClimatic.Text = "Climatic" ' @@ -1767,288 +1768,288 @@ Partial Class frmMain ' Me.mnuClimaticFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFileImportSST, Me.mnuClimaticFileImportfromIRIDataLibrary, Me.mnuClimaticFileImportfromClimateDataStore, Me.mnuClimaticFileImportandTidyNetCDF, Me.mnuClimaticFileImportandTidyShapefile, Me.mnuClimateFileImportfromClimSoft, Me.mnuClimaticFileImportfromCliData, Me.ToolStripSeparator15, Me.mnuClimaticFileExportToClimsoft, Me.mnuClimaticFileExportToCPT, Me.mnuExportToWWRToolStrip, Me.mnuClimaticFileExportToClimpact, Me.mnuClimaticFileExportToGoogleBucketsToolStrip}) Me.mnuClimaticFile.Name = "mnuClimaticFile" - Me.mnuClimaticFile.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticFile.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticFile.Text = "File" ' 'mnuClimaticFileImportSST ' Me.mnuClimaticFileImportSST.Name = "mnuClimaticFileImportSST" - Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportSST.Text = "Import SST..." ' 'mnuClimaticFileImportfromIRIDataLibrary ' Me.mnuClimaticFileImportfromIRIDataLibrary.Name = "mnuClimaticFileImportfromIRIDataLibrary" - Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportfromIRIDataLibrary.Text = "Import from IRI Data Library..." ' 'mnuClimaticFileImportfromClimateDataStore ' Me.mnuClimaticFileImportfromClimateDataStore.Name = "mnuClimaticFileImportfromClimateDataStore" - Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportfromClimateDataStore.Text = "Import from CDS (Climate Data Store)..." ' 'mnuClimaticFileImportandTidyNetCDF ' Me.mnuClimaticFileImportandTidyNetCDF.Name = "mnuClimaticFileImportandTidyNetCDF" - Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportandTidyNetCDF.Text = "Import and Tidy NetCDF..." ' 'mnuClimaticFileImportandTidyShapefile ' Me.mnuClimaticFileImportandTidyShapefile.Name = "mnuClimaticFileImportandTidyShapefile" - Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportandTidyShapefile.Text = "Import and Tidy Shapefile..." ' 'mnuClimateFileImportfromClimSoft ' Me.mnuClimateFileImportfromClimSoft.Name = "mnuClimateFileImportfromClimSoft" - Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(282, 22) + Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(426, 34) Me.mnuClimateFileImportfromClimSoft.Text = "Import from Climsoft..." ' 'mnuClimaticFileImportfromCliData ' Me.mnuClimaticFileImportfromCliData.Enabled = False Me.mnuClimaticFileImportfromCliData.Name = "mnuClimaticFileImportfromCliData" - Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportfromCliData.Text = "Import from CLIDATA..." Me.mnuClimaticFileImportfromCliData.Visible = False ' 'ToolStripSeparator15 ' Me.ToolStripSeparator15.Name = "ToolStripSeparator15" - Me.ToolStripSeparator15.Size = New System.Drawing.Size(279, 6) + Me.ToolStripSeparator15.Size = New System.Drawing.Size(423, 6) ' 'mnuClimaticFileExportToClimsoft ' Me.mnuClimaticFileExportToClimsoft.Name = "mnuClimaticFileExportToClimsoft" - Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileExportToClimsoft.Text = "Export to Climsoft..." ' 'mnuClimaticFileExportToCPT ' Me.mnuClimaticFileExportToCPT.Name = "mnuClimaticFileExportToCPT" - Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileExportToCPT.Tag = "Export_to_CPT" Me.mnuClimaticFileExportToCPT.Text = "Export to CPT..." ' 'mnuExportToWWRToolStrip ' Me.mnuExportToWWRToolStrip.Name = "mnuExportToWWRToolStrip" - Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(282, 22) + Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(426, 34) Me.mnuExportToWWRToolStrip.Text = "Export to World Weather Records..." ' 'mnuClimaticFileExportToClimpact ' Me.mnuClimaticFileExportToClimpact.Name = "mnuClimaticFileExportToClimpact" - Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileExportToClimpact.Text = "Export to Climpact..." ' 'mnuClimaticFileExportToGoogleBucketsToolStrip ' Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Name = "mnuClimaticFileExportToGoogleBucketsToolStrip" - Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Text = "Export to Google Buckets..." ' 'ToolStripSeparator18 ' Me.ToolStripSeparator18.Name = "ToolStripSeparator18" - Me.ToolStripSeparator18.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator18.Size = New System.Drawing.Size(322, 6) ' 'mnuExamineEditData ' Me.mnuExamineEditData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticExamineEditDataVisualiseData, Me.mnuExamineEditDataPivotTable, Me.ToolStripSeparator27, Me.mnuExamineEditDataOneVariableSummarise, Me.mnuExamineEditDataOneVariableGraph, Me.mnuExamineEditDataOneVariableFrequencies, Me.ToolStripSeparator78, Me.mnuExamineEditDataSetupForDataEditing, Me.mnuExamineEditDataDailyDataEditing, Me.mnuExamineEditDataCompareColumns}) Me.mnuExamineEditData.Name = "mnuExamineEditData" - Me.mnuExamineEditData.Size = New System.Drawing.Size(212, 22) + Me.mnuExamineEditData.Size = New System.Drawing.Size(325, 34) Me.mnuExamineEditData.Text = "Examine/Edit Data" ' 'mnuClimaticExamineEditDataVisualiseData ' Me.mnuClimaticExamineEditDataVisualiseData.Name = "mnuClimaticExamineEditDataVisualiseData" - Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(215, 22) + Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(324, 34) Me.mnuClimaticExamineEditDataVisualiseData.Text = "Visualise Data..." ' 'mnuExamineEditDataPivotTable ' Me.mnuExamineEditDataPivotTable.Name = "mnuExamineEditDataPivotTable" - Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator27 ' Me.ToolStripSeparator27.Name = "ToolStripSeparator27" - Me.ToolStripSeparator27.Size = New System.Drawing.Size(212, 6) + Me.ToolStripSeparator27.Size = New System.Drawing.Size(321, 6) ' 'mnuExamineEditDataOneVariableSummarise ' Me.mnuExamineEditDataOneVariableSummarise.Name = "mnuExamineEditDataOneVariableSummarise" - Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuExamineEditDataOneVariableGraph ' Me.mnuExamineEditDataOneVariableGraph.Name = "mnuExamineEditDataOneVariableGraph" - Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuExamineEditDataOneVariableFrequencies ' Me.mnuExamineEditDataOneVariableFrequencies.Name = "mnuExamineEditDataOneVariableFrequencies" - Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataOneVariableFrequencies.Text = "One Variable Frequencies..." ' 'ToolStripSeparator78 ' Me.ToolStripSeparator78.Name = "ToolStripSeparator78" - Me.ToolStripSeparator78.Size = New System.Drawing.Size(212, 6) + Me.ToolStripSeparator78.Size = New System.Drawing.Size(321, 6) ' 'mnuExamineEditDataSetupForDataEditing ' Me.mnuExamineEditDataSetupForDataEditing.Name = "mnuExamineEditDataSetupForDataEditing" - Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataSetupForDataEditing.Text = "Setup for Data Editing..." ' 'mnuExamineEditDataDailyDataEditing ' Me.mnuExamineEditDataDailyDataEditing.Name = "mnuExamineEditDataDailyDataEditing" - Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataDailyDataEditing.Text = "Daily Data Editing..." ' 'mnuExamineEditDataCompareColumns ' Me.mnuExamineEditDataCompareColumns.Name = "mnuExamineEditDataCompareColumns" - Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataCompareColumns.Text = "Compare Columns..." ' 'mnuClimaticTidyandExamine ' Me.mnuClimaticTidyandExamine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticTidyandExamineTidyDailyData, Me.ToolStripSeparator71, Me.mnuClimaticTidyandExamineReplaceValues, Me.mnuClimaticTidyandExamineDuplicateRows, Me.mnuClimaticTidyandExamineNonNumericCases, Me.ToolStripSeparator54, Me.mnuClimaticTidyandExamineTransformText, Me.mnuClimaticTidyandExamineSplitText, Me.ToolStripSeparator80, Me.mnuClimaticTidyandExamineStack, Me.mnuClimaticTidyandExamineUnstack, Me.mnuClimaticTidyandExamineMerge, Me.mnuClimaticTidyandExamineAppend, Me.ToolStripSeparator69, Me.mnuClimaticTidyDataKey}) Me.mnuClimaticTidyandExamine.Name = "mnuClimaticTidyandExamine" - Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticTidyandExamine.Text = "Tidy Data" ' 'mnuClimaticTidyandExamineTidyDailyData ' Me.mnuClimaticTidyandExamineTidyDailyData.Name = "mnuClimaticTidyandExamineTidyDailyData" - Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineTidyDailyData.Text = "Tidy Daily Data..." ' 'ToolStripSeparator71 ' Me.ToolStripSeparator71.Name = "ToolStripSeparator71" - Me.ToolStripSeparator71.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator71.Size = New System.Drawing.Size(298, 6) ' 'mnuClimaticTidyandExamineReplaceValues ' Me.mnuClimaticTidyandExamineReplaceValues.Name = "mnuClimaticTidyandExamineReplaceValues" - Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineReplaceValues.Text = "Replace Values..." ' 'mnuClimaticTidyandExamineDuplicateRows ' Me.mnuClimaticTidyandExamineDuplicateRows.Name = "mnuClimaticTidyandExamineDuplicateRows" - Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineDuplicateRows.Text = "Duplicate Rows..." ' 'mnuClimaticTidyandExamineNonNumericCases ' Me.mnuClimaticTidyandExamineNonNumericCases.Name = "mnuClimaticTidyandExamineNonNumericCases" - Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator54 ' Me.ToolStripSeparator54.Name = "ToolStripSeparator54" - Me.ToolStripSeparator54.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator54.Size = New System.Drawing.Size(298, 6) ' 'mnuClimaticTidyandExamineTransformText ' Me.mnuClimaticTidyandExamineTransformText.Name = "mnuClimaticTidyandExamineTransformText" - Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineTransformText.Text = "Transform Text..." ' 'mnuClimaticTidyandExamineSplitText ' Me.mnuClimaticTidyandExamineSplitText.Name = "mnuClimaticTidyandExamineSplitText" - Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineSplitText.Text = "Split Text..." ' 'ToolStripSeparator80 ' Me.ToolStripSeparator80.Name = "ToolStripSeparator80" - Me.ToolStripSeparator80.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator80.Size = New System.Drawing.Size(298, 6) ' 'mnuClimaticTidyandExamineStack ' Me.mnuClimaticTidyandExamineStack.Name = "mnuClimaticTidyandExamineStack" - Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineStack.Text = "Stack (Pivot Longer)..." ' 'mnuClimaticTidyandExamineUnstack ' Me.mnuClimaticTidyandExamineUnstack.Name = "mnuClimaticTidyandExamineUnstack" - Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuClimaticTidyandExamineMerge ' Me.mnuClimaticTidyandExamineMerge.Name = "mnuClimaticTidyandExamineMerge" - Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineMerge.Text = "Add (Merge) Columns..." ' 'mnuClimaticTidyandExamineAppend ' Me.mnuClimaticTidyandExamineAppend.Name = "mnuClimaticTidyandExamineAppend" - Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineAppend.Text = "Append (Bind Rows)..." ' 'ToolStripSeparator69 ' Me.ToolStripSeparator69.Name = "ToolStripSeparator69" - Me.ToolStripSeparator69.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator69.Size = New System.Drawing.Size(298, 6) ' 'mnuClimaticTidyDataKey ' Me.mnuClimaticTidyDataKey.Name = "mnuClimaticTidyDataKey" - Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyDataKey.Text = "Add Key..." ' 'mnuClimaticDates ' Me.mnuClimaticDates.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDatesGenerateDates, Me.mnuClimaticDatesMakeDate, Me.mnuClimaticDatesInfillMissingDates, Me.mnuClimaticDatesUseDate, Me.mnuClimaticDatesMakeTime, Me.mnuClimaticDatesUseTime}) Me.mnuClimaticDates.Name = "mnuClimaticDates" - Me.mnuClimaticDates.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticDates.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticDates.Text = "Dates" ' 'mnuClimaticDatesGenerateDates ' Me.mnuClimaticDatesGenerateDates.Name = "mnuClimaticDatesGenerateDates" - Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesGenerateDates.Text = "Generate Dates..." ' 'mnuClimaticDatesMakeDate ' Me.mnuClimaticDatesMakeDate.Name = "mnuClimaticDatesMakeDate" - Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesMakeDate.Text = "Make Date..." ' 'mnuClimaticDatesInfillMissingDates ' Me.mnuClimaticDatesInfillMissingDates.Name = "mnuClimaticDatesInfillMissingDates" - Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuClimaticDatesUseDate ' Me.mnuClimaticDatesUseDate.Name = "mnuClimaticDatesUseDate" - Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesUseDate.Text = "Use Date..." ' 'mnuClimaticDatesMakeTime ' Me.mnuClimaticDatesMakeTime.Enabled = False Me.mnuClimaticDatesMakeTime.Name = "mnuClimaticDatesMakeTime" - Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesMakeTime.Text = "Make Time..." Me.mnuClimaticDatesMakeTime.Visible = False ' @@ -2056,175 +2057,175 @@ Partial Class frmMain ' Me.mnuClimaticDatesUseTime.Enabled = False Me.mnuClimaticDatesUseTime.Name = "mnuClimaticDatesUseTime" - Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesUseTime.Text = "Use Time..." Me.mnuClimaticDatesUseTime.Visible = False ' 'mnuClimaticDefineClimaticData ' Me.mnuClimaticDefineClimaticData.Name = "mnuClimaticDefineClimaticData" - Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticDefineClimaticData.Text = "Define Climatic Data..." ' 'mnuClimaticCheckData ' Me.mnuClimaticCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCheckDataInventory, Me.mnuClimaticCheckDataDisplayDaily, Me.ToolStripSeparator65, Me.mnuClimaticCheckDataFillMissingValues, Me.mnuClimaticCheckDataBoxplot, Me.mnuClimaticCheckDataQCTemperatures, Me.mnuClimaticCheckDataQCRainfall, Me.ToolStripSeparator70, Me.mnuClimaticCheckDataHomogenization, Me.mnuClimaticCheckDataCheckStationLocations, Me.mnuClimaticCheckDataDistances}) Me.mnuClimaticCheckData.Name = "mnuClimaticCheckData" - Me.mnuClimaticCheckData.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticCheckData.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticCheckData.Text = "Check Data" ' 'mnuClimaticCheckDataInventory ' Me.mnuClimaticCheckDataInventory.Name = "mnuClimaticCheckDataInventory" - Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataInventory.Text = "Inventory..." ' 'mnuClimaticCheckDataDisplayDaily ' Me.mnuClimaticCheckDataDisplayDaily.Name = "mnuClimaticCheckDataDisplayDaily" - Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataDisplayDaily.Text = "Display Daily..." ' 'ToolStripSeparator65 ' Me.ToolStripSeparator65.Name = "ToolStripSeparator65" - Me.ToolStripSeparator65.Size = New System.Drawing.Size(207, 6) + Me.ToolStripSeparator65.Size = New System.Drawing.Size(310, 6) ' 'mnuClimaticCheckDataFillMissingValues ' Me.mnuClimaticCheckDataFillMissingValues.Name = "mnuClimaticCheckDataFillMissingValues" - Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataFillMissingValues.Text = "Fill Missing Values..." ' 'mnuClimaticCheckDataBoxplot ' Me.mnuClimaticCheckDataBoxplot.Name = "mnuClimaticCheckDataBoxplot" - Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataBoxplot.Text = "Boxplot..." ' 'mnuClimaticCheckDataQCTemperatures ' Me.mnuClimaticCheckDataQCTemperatures.Name = "mnuClimaticCheckDataQCTemperatures" - Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataQCTemperatures.Text = "QC Temperatures..." ' 'mnuClimaticCheckDataQCRainfall ' Me.mnuClimaticCheckDataQCRainfall.Name = "mnuClimaticCheckDataQCRainfall" - Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataQCRainfall.Text = "QC Rainfall..." ' 'ToolStripSeparator70 ' Me.ToolStripSeparator70.Name = "ToolStripSeparator70" - Me.ToolStripSeparator70.Size = New System.Drawing.Size(207, 6) + Me.ToolStripSeparator70.Size = New System.Drawing.Size(310, 6) ' 'mnuClimaticCheckDataHomogenization ' Me.mnuClimaticCheckDataHomogenization.Name = "mnuClimaticCheckDataHomogenization" - Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataHomogenization.Text = "Homogenization..." ' 'mnuClimaticCheckDataCheckStationLocations ' Me.mnuClimaticCheckDataCheckStationLocations.Name = "mnuClimaticCheckDataCheckStationLocations" - Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataCheckStationLocations.Text = "Check Station Locations..." ' 'mnuClimaticCheckDataDistances ' Me.mnuClimaticCheckDataDistances.Name = "mnuClimaticCheckDataDistances" - Me.mnuClimaticCheckDataDistances.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataDistances.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataDistances.Text = "Distances..." ' 'mnuClimaticPrepare ' Me.mnuClimaticPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuCimaticPrepareTransform, Me.mnuClimaticPrepareConversions, Me.ToolStripSeparator37, Me.mnuClimaticPrepareClimaticSummaries, Me.mnuClimaticPrepareStartoftheRains, Me.mnuClimaticPrepareEndOfRains, Me.mnuClimaticPrepareLengthOfSeason, Me.mnuClimaticPrepareSpells, Me.mnuClimaticPrepareExtremes, Me.ToolStripSeparator64, Me.mnuClimaticPrepareClimdex, Me.ToolStripSeparator51, Me.mnuClimaticPrepareEvapotranspiration, Me.mnuClimaticPrepareSummary, Me.mnuClimaticPrepareNewWorksheet, Me.mnuClimaticPrepareImportDailyData, Me.mnuClimaticPrepareMakeFactor, Me.mnuClimaticPrepareShiftDailyData, Me.mnuClimaticPrepareUnstackDailyData, Me.mnuClimaticPrepareStackDailyData}) Me.mnuClimaticPrepare.Name = "mnuClimaticPrepare" - Me.mnuClimaticPrepare.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticPrepare.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticPrepare.Tag = "Prepare" Me.mnuClimaticPrepare.Text = "Prepare" ' 'mnuCimaticPrepareTransform ' Me.mnuCimaticPrepareTransform.Name = "mnuCimaticPrepareTransform" - Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(189, 22) + Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(281, 34) Me.mnuCimaticPrepareTransform.Text = "Transform..." ' 'mnuClimaticPrepareConversions ' Me.mnuClimaticPrepareConversions.Name = "mnuClimaticPrepareConversions" - Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareConversions.Text = "Conversions..." ' 'ToolStripSeparator37 ' Me.ToolStripSeparator37.Name = "ToolStripSeparator37" - Me.ToolStripSeparator37.Size = New System.Drawing.Size(186, 6) + Me.ToolStripSeparator37.Size = New System.Drawing.Size(278, 6) ' 'mnuClimaticPrepareClimaticSummaries ' Me.mnuClimaticPrepareClimaticSummaries.Name = "mnuClimaticPrepareClimaticSummaries" - Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareClimaticSummaries.Text = "Climatic Summaries..." ' 'mnuClimaticPrepareStartoftheRains ' Me.mnuClimaticPrepareStartoftheRains.Name = "mnuClimaticPrepareStartoftheRains" - Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareStartoftheRains.Text = "Start of the Rains..." ' 'mnuClimaticPrepareEndOfRains ' Me.mnuClimaticPrepareEndOfRains.Name = "mnuClimaticPrepareEndOfRains" - Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareEndOfRains.Text = "End of Rains..." ' 'mnuClimaticPrepareLengthOfSeason ' Me.mnuClimaticPrepareLengthOfSeason.Name = "mnuClimaticPrepareLengthOfSeason" - Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareLengthOfSeason.Text = "Length of Season..." ' 'mnuClimaticPrepareSpells ' Me.mnuClimaticPrepareSpells.Name = "mnuClimaticPrepareSpells" - Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareSpells.Text = "Spells..." ' 'mnuClimaticPrepareExtremes ' Me.mnuClimaticPrepareExtremes.Name = "mnuClimaticPrepareExtremes" - Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareExtremes.Text = "Extremes..." ' 'ToolStripSeparator64 ' Me.ToolStripSeparator64.Name = "ToolStripSeparator64" - Me.ToolStripSeparator64.Size = New System.Drawing.Size(186, 6) + Me.ToolStripSeparator64.Size = New System.Drawing.Size(278, 6) ' 'mnuClimaticPrepareClimdex ' Me.mnuClimaticPrepareClimdex.Name = "mnuClimaticPrepareClimdex" - Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareClimdex.Text = "Climdex..." ' 'ToolStripSeparator51 ' Me.ToolStripSeparator51.Name = "ToolStripSeparator51" - Me.ToolStripSeparator51.Size = New System.Drawing.Size(186, 6) + Me.ToolStripSeparator51.Size = New System.Drawing.Size(278, 6) ' 'mnuClimaticPrepareEvapotranspiration ' Me.mnuClimaticPrepareEvapotranspiration.Name = "mnuClimaticPrepareEvapotranspiration" - Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareEvapotranspiration.Text = "Evapotranspiration..." ' 'mnuClimaticPrepareSummary ' Me.mnuClimaticPrepareSummary.Enabled = False Me.mnuClimaticPrepareSummary.Name = "mnuClimaticPrepareSummary" - Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareSummary.Text = "Summary..." Me.mnuClimaticPrepareSummary.Visible = False ' @@ -2232,7 +2233,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareNewWorksheet.Enabled = False Me.mnuClimaticPrepareNewWorksheet.Name = "mnuClimaticPrepareNewWorksheet" - Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareNewWorksheet.Tag = "New_Worksheet" Me.mnuClimaticPrepareNewWorksheet.Text = "New Worksheet..." Me.mnuClimaticPrepareNewWorksheet.Visible = False @@ -2241,7 +2242,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareImportDailyData.Enabled = False Me.mnuClimaticPrepareImportDailyData.Name = "mnuClimaticPrepareImportDailyData" - Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareImportDailyData.Tag = "Import_daily_data" Me.mnuClimaticPrepareImportDailyData.Text = "Import daily Data..." Me.mnuClimaticPrepareImportDailyData.Visible = False @@ -2250,7 +2251,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareMakeFactor.Enabled = False Me.mnuClimaticPrepareMakeFactor.Name = "mnuClimaticPrepareMakeFactor" - Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareMakeFactor.Tag = "Make_Factor" Me.mnuClimaticPrepareMakeFactor.Text = "Make Factor..." Me.mnuClimaticPrepareMakeFactor.Visible = False @@ -2259,7 +2260,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareShiftDailyData.Enabled = False Me.mnuClimaticPrepareShiftDailyData.Name = "mnuClimaticPrepareShiftDailyData" - Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareShiftDailyData.Tag = "Shift_Daily_data" Me.mnuClimaticPrepareShiftDailyData.Text = "Shift Daily Data..." Me.mnuClimaticPrepareShiftDailyData.Visible = False @@ -2268,7 +2269,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareUnstackDailyData.Enabled = False Me.mnuClimaticPrepareUnstackDailyData.Name = "mnuClimaticPrepareUnstackDailyData" - Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareUnstackDailyData.Tag = "Unstack_Daily_data" Me.mnuClimaticPrepareUnstackDailyData.Text = "Unstack Daily Data..." Me.mnuClimaticPrepareUnstackDailyData.Visible = False @@ -2277,7 +2278,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareStackDailyData.Enabled = False Me.mnuClimaticPrepareStackDailyData.Name = "mnuClimaticPrepareStackDailyData" - Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareStackDailyData.Tag = "Stack_Daily_data" Me.mnuClimaticPrepareStackDailyData.Text = "Stack Daily data..." Me.mnuClimaticPrepareStackDailyData.Visible = False @@ -2285,361 +2286,361 @@ Partial Class frmMain 'ToolStripSeparator30 ' Me.ToolStripSeparator30.Name = "ToolStripSeparator30" - Me.ToolStripSeparator30.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator30.Size = New System.Drawing.Size(322, 6) ' 'mnuClimaticDescribe ' Me.mnuClimaticDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDescribeSummarise23Variables, Me.mnuClimaticDescribeGraph23Variables, Me.ToolStripSeparator31, Me.mnuClimaticDescribeSPISPEI, Me.mnuClimaticDescribeClimograph, Me.mnuClimaticDescribeTrendGraph, Me.mnuClimaticDescribeSeasonalGraph, Me.mnuClimaticDescribeIDF, Me.ToolStripSeparator17, Me.mnuClimaticDescribeWindRose, Me.mnuClimaticDescribeWindPollutionRose, Me.mnuClimaticDescribeOtherRosePlots}) Me.mnuClimaticDescribe.Name = "mnuClimaticDescribe" - Me.mnuClimaticDescribe.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticDescribe.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticDescribe.Text = "Describe" ' 'mnuClimaticDescribeSummarise23Variables ' Me.mnuClimaticDescribeSummarise23Variables.Name = "mnuClimaticDescribeSummarise23Variables" - Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeSummarise23Variables.Text = "Summarise 2/3 Variables..." ' 'mnuClimaticDescribeGraph23Variables ' Me.mnuClimaticDescribeGraph23Variables.Name = "mnuClimaticDescribeGraph23Variables" - Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeGraph23Variables.Text = "Graph 2/3 Variables..." ' 'ToolStripSeparator31 ' Me.ToolStripSeparator31.Name = "ToolStripSeparator31" - Me.ToolStripSeparator31.Size = New System.Drawing.Size(208, 6) + Me.ToolStripSeparator31.Size = New System.Drawing.Size(318, 6) ' 'mnuClimaticDescribeSPISPEI ' Me.mnuClimaticDescribeSPISPEI.Name = "mnuClimaticDescribeSPISPEI" - Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeSPISPEI.Text = "SPI/SPEI..." ' 'mnuClimaticDescribeClimograph ' Me.mnuClimaticDescribeClimograph.Name = "mnuClimaticDescribeClimograph" - Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeClimograph.Text = "Climograph..." ' 'mnuClimaticDescribeTrendGraph ' Me.mnuClimaticDescribeTrendGraph.Name = "mnuClimaticDescribeTrendGraph" - Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeTrendGraph.Text = "Trend Graph..." ' 'mnuClimaticDescribeSeasonalGraph ' Me.mnuClimaticDescribeSeasonalGraph.Name = "mnuClimaticDescribeSeasonalGraph" - Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeSeasonalGraph.Text = "Seasonal Graph..." ' 'mnuClimaticDescribeIDF ' Me.mnuClimaticDescribeIDF.Name = "mnuClimaticDescribeIDF" - Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeIDF.Text = "IDF..." ' 'ToolStripSeparator17 ' Me.ToolStripSeparator17.Name = "ToolStripSeparator17" - Me.ToolStripSeparator17.Size = New System.Drawing.Size(208, 6) + Me.ToolStripSeparator17.Size = New System.Drawing.Size(318, 6) ' 'mnuClimaticDescribeWindRose ' Me.mnuClimaticDescribeWindRose.Name = "mnuClimaticDescribeWindRose" - Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeWindRose.Text = "Wind Rose..." ' 'mnuClimaticDescribeWindPollutionRose ' Me.mnuClimaticDescribeWindPollutionRose.Name = "mnuClimaticDescribeWindPollutionRose" - Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeWindPollutionRose.Text = "Wind/Pollution Rose..." ' 'mnuClimaticDescribeOtherRosePlots ' Me.mnuClimaticDescribeOtherRosePlots.Name = "mnuClimaticDescribeOtherRosePlots" - Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeOtherRosePlots.Text = "Other Rose Plots..." ' 'mnuClimaticNCMP ' Me.mnuClimaticNCMP.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticNCMPIndices, Me.mnuClimaticNCMPVariogram, Me.mnuClimaticNCMPRegionAverage, Me.mnuClimaticNCMPTrendGraphs, Me.mnuClimaticNCMPCountRecords, Me.mnuClimaticNCMPSummary}) Me.mnuClimaticNCMP.Name = "mnuClimaticNCMP" - Me.mnuClimaticNCMP.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticNCMP.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticNCMP.Text = "NCMP" ' 'mnuClimaticNCMPIndices ' Me.mnuClimaticNCMPIndices.Name = "mnuClimaticNCMPIndices" - Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPIndices.Text = "Indices..." ' 'mnuClimaticNCMPVariogram ' Me.mnuClimaticNCMPVariogram.Name = "mnuClimaticNCMPVariogram" - Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPVariogram.Text = "Variogram..." ' 'mnuClimaticNCMPRegionAverage ' Me.mnuClimaticNCMPRegionAverage.Name = "mnuClimaticNCMPRegionAverage" - Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPRegionAverage.Text = "Region Average..." ' 'mnuClimaticNCMPTrendGraphs ' Me.mnuClimaticNCMPTrendGraphs.Name = "mnuClimaticNCMPTrendGraphs" - Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPTrendGraphs.Text = "Trend Graphs..." ' 'mnuClimaticNCMPCountRecords ' Me.mnuClimaticNCMPCountRecords.Name = "mnuClimaticNCMPCountRecords" - Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPCountRecords.Text = "Count Records..." ' 'mnuClimaticNCMPSummary ' Me.mnuClimaticNCMPSummary.Name = "mnuClimaticNCMPSummary" - Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPSummary.Text = "Summary..." ' 'mnuClimaticPICSA ' Me.mnuClimaticPICSA.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticPICSARainfallGraph, Me.mnuClimaticPICSATemperatureGraph, Me.mnuClimaticPICSAGeneralGrap, Me.ToolStripSeparator73, Me.mnuClimaticPICSACumExeedenceGraph, Me.mnuClimaticPICSACrops}) Me.mnuClimaticPICSA.Name = "mnuClimaticPICSA" - Me.mnuClimaticPICSA.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticPICSA.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticPICSA.Text = "PICSA" ' 'mnuClimaticPICSARainfallGraph ' Me.mnuClimaticPICSARainfallGraph.Name = "mnuClimaticPICSARainfallGraph" - Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSARainfallGraph.Text = "Rainfall Graph..." ' 'mnuClimaticPICSATemperatureGraph ' Me.mnuClimaticPICSATemperatureGraph.Name = "mnuClimaticPICSATemperatureGraph" - Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSATemperatureGraph.Text = "Temperature Graph..." ' 'mnuClimaticPICSAGeneralGrap ' Me.mnuClimaticPICSAGeneralGrap.Name = "mnuClimaticPICSAGeneralGrap" - Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSAGeneralGrap.Text = "General Graph..." ' 'ToolStripSeparator73 ' Me.ToolStripSeparator73.Name = "ToolStripSeparator73" - Me.ToolStripSeparator73.Size = New System.Drawing.Size(243, 6) + Me.ToolStripSeparator73.Size = New System.Drawing.Size(361, 6) ' 'mnuClimaticPICSACumExeedenceGraph ' Me.mnuClimaticPICSACumExeedenceGraph.Name = "mnuClimaticPICSACumExeedenceGraph" - Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSACumExeedenceGraph.Text = "Cumulative/Exceedance Graph..." ' 'mnuClimaticPICSACrops ' Me.mnuClimaticPICSACrops.Name = "mnuClimaticPICSACrops" - Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSACrops.Text = "Crops..." ' 'mnuCMSAF ' Me.mnuCMSAF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCMSAFPlotRegion, Me.mnuClimaticCMSAFExporttoCMSAFRToolbox}) Me.mnuCMSAF.Name = "mnuCMSAF" - Me.mnuCMSAF.Size = New System.Drawing.Size(212, 22) + Me.mnuCMSAF.Size = New System.Drawing.Size(325, 34) Me.mnuCMSAF.Text = "CM SAF" ' 'mnuClimaticCMSAFPlotRegion ' Me.mnuClimaticCMSAFPlotRegion.Name = "mnuClimaticCMSAFPlotRegion" - Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(231, 22) + Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(351, 34) Me.mnuClimaticCMSAFPlotRegion.Text = "Plot Region..." ' 'mnuClimaticCMSAFExporttoCMSAFRToolbox ' Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Name = "mnuClimaticCMSAFExporttoCMSAFRToolbox" - Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(231, 22) + Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(351, 34) Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Text = "Export to CM SAF R Toolbox..." ' 'mnuClimaticCompare ' Me.mnuClimaticCompare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCompareCalculation, Me.mnuClimaticCompareSummary, Me.ToolStripSeparator66, Me.mnuClimaticCompareCorrelations, Me.mnuClimaticCompareScatterplot, Me.mnuClimaticCompareTimeSeriesPlot, Me.mnuClimaticCompareSeasonalPlot, Me.mnuClimaticCompareDensityPlot, Me.mnuClimaticCompareConditionalQuantiles, Me.mnuClimaticCompareTaylorDiagram}) Me.mnuClimaticCompare.Name = "mnuClimaticCompare" - Me.mnuClimaticCompare.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticCompare.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticCompare.Text = "Compare" ' 'mnuClimaticCompareCalculation ' Me.mnuClimaticCompareCalculation.Name = "mnuClimaticCompareCalculation" - Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareCalculation.Text = "Calculation..." ' 'mnuClimaticCompareSummary ' Me.mnuClimaticCompareSummary.Name = "mnuClimaticCompareSummary" - Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareSummary.Text = "Summary..." ' 'ToolStripSeparator66 ' Me.ToolStripSeparator66.Name = "ToolStripSeparator66" - Me.ToolStripSeparator66.Size = New System.Drawing.Size(195, 6) + Me.ToolStripSeparator66.Size = New System.Drawing.Size(293, 6) ' 'mnuClimaticCompareCorrelations ' Me.mnuClimaticCompareCorrelations.Name = "mnuClimaticCompareCorrelations" - Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareCorrelations.Text = "Correlations..." ' 'mnuClimaticCompareScatterplot ' Me.mnuClimaticCompareScatterplot.Name = "mnuClimaticCompareScatterplot" - Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareScatterplot.Text = "Scatterplot..." ' 'mnuClimaticCompareTimeSeriesPlot ' Me.mnuClimaticCompareTimeSeriesPlot.Name = "mnuClimaticCompareTimeSeriesPlot" - Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareTimeSeriesPlot.Text = "Time Series Plot..." ' 'mnuClimaticCompareSeasonalPlot ' Me.mnuClimaticCompareSeasonalPlot.Name = "mnuClimaticCompareSeasonalPlot" - Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareSeasonalPlot.Text = "Seasonal Plot..." ' 'mnuClimaticCompareDensityPlot ' Me.mnuClimaticCompareDensityPlot.Name = "mnuClimaticCompareDensityPlot" - Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareDensityPlot.Text = "Density Plot..." ' 'mnuClimaticCompareConditionalQuantiles ' Me.mnuClimaticCompareConditionalQuantiles.Name = "mnuClimaticCompareConditionalQuantiles" - Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareConditionalQuantiles.Text = "Conditional Quantiles..." ' 'mnuClimaticCompareTaylorDiagram ' Me.mnuClimaticCompareTaylorDiagram.Name = "mnuClimaticCompareTaylorDiagram" - Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareTaylorDiagram.Text = "Taylor Diagram..." ' 'mnuClimaticMapping ' Me.mnuClimaticMapping.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticMappingMap, Me.mnuClimaticMappingCheckStationLocations}) Me.mnuClimaticMapping.Name = "mnuClimaticMapping" - Me.mnuClimaticMapping.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticMapping.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticMapping.Text = "Mapping" ' 'mnuClimaticMappingMap ' Me.mnuClimaticMappingMap.Name = "mnuClimaticMappingMap" - Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticMappingMap.Text = "Map..." ' 'mnuClimaticMappingCheckStationLocations ' Me.mnuClimaticMappingCheckStationLocations.Name = "mnuClimaticMappingCheckStationLocations" - Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticMappingCheckStationLocations.Text = "Check Station Locations..." ' 'mnuClimaticModel ' Me.mnuClimaticModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticModelsExtremes, Me.mnuClimaticModelCircular, Me.mnuClimaticModelMarkovModelling}) Me.mnuClimaticModel.Name = "mnuClimaticModel" - Me.mnuClimaticModel.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticModel.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticModel.Text = "Model" ' 'mnuClimaticModelsExtremes ' Me.mnuClimaticModelsExtremes.Name = "mnuClimaticModelsExtremes" - Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(271, 34) Me.mnuClimaticModelsExtremes.Text = "Extremes..." ' 'mnuClimaticModelCircular ' Me.mnuClimaticModelCircular.Enabled = False Me.mnuClimaticModelCircular.Name = "mnuClimaticModelCircular" - Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(271, 34) Me.mnuClimaticModelCircular.Text = "Circular..." Me.mnuClimaticModelCircular.Visible = False ' 'mnuClimaticModelMarkovModelling ' Me.mnuClimaticModelMarkovModelling.Name = "mnuClimaticModelMarkovModelling" - Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(271, 34) Me.mnuClimaticModelMarkovModelling.Tag = "Markov_Modelling" Me.mnuClimaticModelMarkovModelling.Text = "Markov Modelling..." ' 'ToolStripSeparator23 ' Me.ToolStripSeparator23.Name = "ToolStripSeparator23" - Me.ToolStripSeparator23.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator23.Size = New System.Drawing.Size(322, 6) ' 'mnuClimaticSCF ' Me.mnuClimaticSCF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticSCFSupportOpenSST, Me.mnuClimaticSCFSupportExporttoCPT, Me.ToolStripSeparator32, Me.mnuClimaticSCFSupportCorrelations, Me.mnuClimaticSCFSupportPrincipalComponents, Me.mnuClimaticSCFSupportCanonicalCorrelations, Me.mnuClimaticSCFSupportCumulativeExceedanceGraph}) Me.mnuClimaticSCF.Name = "mnuClimaticSCF" - Me.mnuClimaticSCF.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticSCF.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticSCF.Text = "Seasonal Forecast Support" ' 'mnuClimaticSCFSupportOpenSST ' Me.mnuClimaticSCFSupportOpenSST.Name = "mnuClimaticSCFSupportOpenSST" - Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportOpenSST.Text = "Open SST..." ' 'mnuClimaticSCFSupportExporttoCPT ' Me.mnuClimaticSCFSupportExporttoCPT.Name = "mnuClimaticSCFSupportExporttoCPT" - Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportExporttoCPT.Tag = "Export_to_CPT" Me.mnuClimaticSCFSupportExporttoCPT.Text = "Export to CPT..." ' 'ToolStripSeparator32 ' Me.ToolStripSeparator32.Name = "ToolStripSeparator32" - Me.ToolStripSeparator32.Size = New System.Drawing.Size(243, 6) + Me.ToolStripSeparator32.Size = New System.Drawing.Size(361, 6) ' 'mnuClimaticSCFSupportCorrelations ' Me.mnuClimaticSCFSupportCorrelations.Name = "mnuClimaticSCFSupportCorrelations" - Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportCorrelations.Text = "Correlations..." ' 'mnuClimaticSCFSupportPrincipalComponents ' Me.mnuClimaticSCFSupportPrincipalComponents.Name = "mnuClimaticSCFSupportPrincipalComponents" - Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportPrincipalComponents.Text = "Principal Components..." ' 'mnuClimaticSCFSupportCanonicalCorrelations ' Me.mnuClimaticSCFSupportCanonicalCorrelations.Name = "mnuClimaticSCFSupportCanonicalCorrelations" - Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportCanonicalCorrelations.Text = "Canonical Correlations..." ' 'mnuClimaticSCFSupportCumulativeExceedanceGraph ' Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Name = "mnuClimaticSCFSupportCumulativeExceedanceGraph" - Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Text = "Cumulative/Exceedance Graph..." ' 'mnuClimaticClimateMethods ' Me.mnuClimaticClimateMethods.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsDataManipulation, Me.mnuClimaticClimateMethodsGraphics, Me.mnuClimaticClimateMethodsModel, Me.mnuClimaticClimateMethodsAdditional, Me.mnuClimateMethodsCreateClimateObject}) Me.mnuClimaticClimateMethods.Name = "mnuClimaticClimateMethods" - Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethods.Tag = "Climatic_Methods" Me.mnuClimaticClimateMethods.Text = "Climate Methods" Me.mnuClimaticClimateMethods.Visible = False @@ -2648,7 +2649,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulation.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsDataManipulationStartOfRain, Me.mnuClimaticClimateMethodsDataManipulationEndOfRain, Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth, Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular, Me.mnuClimaticClimateMethodsDataManipulationDayMonth, Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily, Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear, Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal, Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength, Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA, Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents, Me.mnuClimaticClimateMethodsDataManipulationMissingData, Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable, Me.mnuClimateMethodsDataManipulationMonthlySummaries, Me.mnuClimateMethodsDataManipulationOutputForCD}) Me.mnuClimaticClimateMethodsDataManipulation.Name = "mnuClimaticClimateMethodsDataManipulation" - Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(199, 22) + Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(297, 34) Me.mnuClimaticClimateMethodsDataManipulation.Tag = "Data_Manipulation" Me.mnuClimaticClimateMethodsDataManipulation.Text = "Data Manipulation" ' @@ -2656,7 +2657,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Name = "mnuClimaticClimateMethodsDataManipulationStartOfRain" - Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Tag = "Start_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Text = "Start of Rain..." ' @@ -2664,7 +2665,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Name = "mnuClimaticClimateMethodsDataManipulationEndOfRain" - Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Tag = "End_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Text = "End of Rain..." ' @@ -2672,7 +2673,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Tag = "Change_Format_Month" Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Text = "Change Format Day Month..." ' @@ -2680,7 +2681,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Name = "mnuClimaticClimateMethodsDataManipulationExportCPTToTabular" - Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Tag = "Expot_CPT_to_Tabular" Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Text = "Export CPT to Tabular..." ' @@ -2688,7 +2689,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Tag = "Day_Month" Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Text = "Day Month..." ' @@ -2696,7 +2697,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDaily" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Tag = "Display_Daily" Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Text = "Display Daily..." ' @@ -2704,7 +2705,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Tag = "Display_DOY_of_Year" Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Text = "Display DOY of Year..." ' @@ -2712,7 +2713,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Name = "mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal" - Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Tag = "Display_Rain_Running_Total" Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Text = "Display Rain Running Total..." ' @@ -2720,7 +2721,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Name = "mnuClimaticClimateMethodsDataManipulationDisplaySpellLength" - Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Tag = "Display_Spell_length" Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Text = "Display Spell Length..." ' @@ -2728,7 +2729,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Name = "mnuClimaticClimateMethodsDataManipulationExportForPICSA" - Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Tag = "Export_for_PICSA" Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Text = "Export for PICSA..." ' @@ -2736,7 +2737,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Name = "mnuClimaticClimateMethodsDataManipulationExtremeEvents" - Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Tag = "Extreme_Events" Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Text = "Extreme Events..." ' @@ -2744,7 +2745,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingData.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingData.Name = "mnuClimaticClimateMethodsDataManipulationMissingData" - Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationMissingData.Tag = "Missing_Data" Me.mnuClimaticClimateMethodsDataManipulationMissingData.Text = "Missing Data..." ' @@ -2752,7 +2753,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Name = "mnuClimaticClimateMethodsDataManipulationMissingDataTable" - Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Tag = "Missing_Data_Table" Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Text = "Missing Data Table..." ' @@ -2760,7 +2761,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationMonthlySummaries.Enabled = False Me.mnuClimateMethodsDataManipulationMonthlySummaries.Name = "mnuClimateMethodsDataManipulationMonthlySummaries" - Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(227, 22) + Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(342, 34) Me.mnuClimateMethodsDataManipulationMonthlySummaries.Tag = "Monthly_Summaries" Me.mnuClimateMethodsDataManipulationMonthlySummaries.Text = "Monthly Summaries..." ' @@ -2768,7 +2769,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationOutputForCD.Enabled = False Me.mnuClimateMethodsDataManipulationOutputForCD.Name = "mnuClimateMethodsDataManipulationOutputForCD" - Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(227, 22) + Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(342, 34) Me.mnuClimateMethodsDataManipulationOutputForCD.Tag = "Output_for_CDT" Me.mnuClimateMethodsDataManipulationOutputForCD.Text = "Output for CDT..." ' @@ -2776,7 +2777,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphics.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot, Me.mnuClimaticClimateMethodsGraphicsCliplot, Me.mnuClimaticClimateMethodsGraphicsMissingValues, Me.mnuClimaticClimateMethodsGraphicsHistogram, Me.mnuClimaticClimateMethodsGraphicsCumExceedance, Me.mnuClimaticClimateMethodsGraphicsBoxplot, Me.mnuClimaticClimateMethodsGraphicsInventory, Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall, Me.mnuClimaticClimateMethodsGraphicsRainCount, Me.mnuClimaticClimateMethodsGraphicsTimeseries, Me.mnuClimaticClimateMethodsGraphicsWindrose, Me.mnuClimateMethodsGraphicsMultipleLines, Me.mnuClmateMethodThreeSummaries}) Me.mnuClimaticClimateMethodsGraphics.Name = "mnuClimaticClimateMethodsGraphics" - Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(199, 22) + Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(297, 34) Me.mnuClimaticClimateMethodsGraphics.Tag = "Graphics" Me.mnuClimaticClimateMethodsGraphics.Text = "Graphics" ' @@ -2784,7 +2785,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Name = "mnuClimaticClimateMethodsGraphicsClipBoxPlot" - Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Tag = "Cliboxplot" Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Text = "Cliboxplot..." ' @@ -2792,7 +2793,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCliplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCliplot.Name = "mnuClimaticClimateMethodsGraphicsCliplot" - Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsCliplot.Tag = "Cliplot" Me.mnuClimaticClimateMethodsGraphicsCliplot.Text = "Cliplot..." ' @@ -2800,7 +2801,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsMissingValues.Enabled = False Me.mnuClimaticClimateMethodsGraphicsMissingValues.Name = "mnuClimaticClimateMethodsGraphicsMissingValues" - Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsMissingValues.Tag = "Missing_values" Me.mnuClimaticClimateMethodsGraphicsMissingValues.Text = "Missing Values..." ' @@ -2808,7 +2809,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsHistogram.Enabled = False Me.mnuClimaticClimateMethodsGraphicsHistogram.Name = "mnuClimaticClimateMethodsGraphicsHistogram" - Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsHistogram.Tag = "Histogram" Me.mnuClimaticClimateMethodsGraphicsHistogram.Text = "Histogram..." ' @@ -2816,7 +2817,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Name = "mnuClimaticClimateMethodsGraphicsCumExceedance" - Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Tag = "Cumulative_Exceedence" Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Text = "Cummulative Exceedance..." ' @@ -2824,7 +2825,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsBoxplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsBoxplot.Name = "mnuClimaticClimateMethodsGraphicsBoxplot" - Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsBoxplot.Tag = "Boxplot" Me.mnuClimaticClimateMethodsGraphicsBoxplot.Text = "Boxplot..." ' @@ -2832,7 +2833,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsInventory.Enabled = False Me.mnuClimaticClimateMethodsGraphicsInventory.Name = "mnuClimaticClimateMethodsGraphicsInventory" - Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsInventory.Tag = "Inventory" Me.mnuClimaticClimateMethodsGraphicsInventory.Text = "Inventory..." ' @@ -2840,7 +2841,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Enabled = False Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Name = "mnuClimaticClimateMethodsGraphicsAnnualRainfall" - Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Tag = "Annual_rainfall" Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Text = "Annual Rainfall..." ' @@ -2848,7 +2849,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsRainCount.Enabled = False Me.mnuClimaticClimateMethodsGraphicsRainCount.Name = "mnuClimaticClimateMethodsGraphicsRainCount" - Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsRainCount.Tag = "Rain_count" Me.mnuClimaticClimateMethodsGraphicsRainCount.Text = "Rain Count..." ' @@ -2856,7 +2857,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsTimeseries.Enabled = False Me.mnuClimaticClimateMethodsGraphicsTimeseries.Name = "mnuClimaticClimateMethodsGraphicsTimeseries" - Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsTimeseries.Tag = "Timeseries" Me.mnuClimaticClimateMethodsGraphicsTimeseries.Text = "Timeseries..." ' @@ -2864,7 +2865,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsWindrose.Enabled = False Me.mnuClimaticClimateMethodsGraphicsWindrose.Name = "mnuClimaticClimateMethodsGraphicsWindrose" - Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsWindrose.Tag = "Windrose" Me.mnuClimaticClimateMethodsGraphicsWindrose.Text = "Windrose..." ' @@ -2872,7 +2873,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsGraphicsMultipleLines.Enabled = False Me.mnuClimateMethodsGraphicsMultipleLines.Name = "mnuClimateMethodsGraphicsMultipleLines" - Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(220, 22) + Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(325, 34) Me.mnuClimateMethodsGraphicsMultipleLines.Tag = "Multiple_lines" Me.mnuClimateMethodsGraphicsMultipleLines.Text = "Multple Lines..." ' @@ -2880,7 +2881,7 @@ Partial Class frmMain ' Me.mnuClmateMethodThreeSummaries.Enabled = False Me.mnuClmateMethodThreeSummaries.Name = "mnuClmateMethodThreeSummaries" - Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(220, 22) + Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(325, 34) Me.mnuClmateMethodThreeSummaries.Tag = "Three_Summaries" Me.mnuClmateMethodThreeSummaries.Text = "Three Summaries..." ' @@ -2888,7 +2889,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsModel.Enabled = False Me.mnuClimaticClimateMethodsModel.Name = "mnuClimaticClimateMethodsModel" - Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(199, 22) + Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(297, 34) Me.mnuClimaticClimateMethodsModel.Tag = "Model" Me.mnuClimaticClimateMethodsModel.Text = "Model..." ' @@ -2896,7 +2897,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditional.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsAdditionalOutputForCPT, Me.mnuClimaticClimateMethodsAdditionalRainsStatistics, Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary, Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain, Me.mnuClimaticClimateMethodsAdditionalWaterBalance}) Me.mnuClimaticClimateMethodsAdditional.Name = "mnuClimaticClimateMethodsAdditional" - Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(199, 22) + Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(297, 34) Me.mnuClimaticClimateMethodsAdditional.Tag = "Additional" Me.mnuClimaticClimateMethodsAdditional.Text = "Additional" ' @@ -2904,7 +2905,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Enabled = False Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Name = "mnuClimaticClimateMethodsAdditionalOutputForCPT" - Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Tag = "Output_for_CPT" Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Text = "Output for CPT..." ' @@ -2912,7 +2913,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Enabled = False Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Name = "mnuClimaticClimateMethodsAdditionalRainsStatistics" - Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Tag = "Rain_Statistics" Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Text = "Rains Statistics..." ' @@ -2920,7 +2921,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummary" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Tag = "Seasonal_Summary" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Text = "Seasonal Summary..." ' @@ -2928,7 +2929,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Tag = "Seasonal_Summary_Rain" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Text = "Seasonal Summary Rain..." ' @@ -2936,7 +2937,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Enabled = False Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Name = "mnuClimaticClimateMethodsAdditionalWaterBalance" - Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Tag = "Water_Balance" Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Text = "Water Balance..." ' @@ -2944,7 +2945,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsCreateClimateObject.Enabled = False Me.mnuClimateMethodsCreateClimateObject.Name = "mnuClimateMethodsCreateClimateObject" - Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(199, 22) + Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(297, 34) Me.mnuClimateMethodsCreateClimateObject.Tag = "Create_Climate_Object" Me.mnuClimateMethodsCreateClimateObject.Text = "Create Climate Object..." ' @@ -2952,7 +2953,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(365, 34) Me.mnuFileSave.Tag = "Save" Me.mnuFileSave.Text = "Save..." ' @@ -2960,32 +2961,32 @@ 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(365, 34) Me.mnuFileSaveAs.Tag = "Save_As" Me.mnuFileSaveAs.Text = "Save As" ' 'mnuFileSaveAsDataAs ' Me.mnuFileSaveAsDataAs.Name = "mnuFileSaveAsDataAs" - Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(164, 22) + Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(250, 34) Me.mnuFileSaveAsDataAs.Text = "Save Data As..." ' 'mnuFileSaveAsOutputAs ' Me.mnuFileSaveAsOutputAs.Name = "mnuFileSaveAsOutputAs" - Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(164, 22) + Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(250, 34) Me.mnuFileSaveAsOutputAs.Text = "Save Output As..." ' 'mnuFileSaveAsLogAs ' Me.mnuFileSaveAsLogAs.Name = "mnuFileSaveAsLogAs" - Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(164, 22) + Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(250, 34) Me.mnuFileSaveAsLogAs.Text = "Save Log As..." ' 'mnuFileSaveAsScriptAs ' Me.mnuFileSaveAsScriptAs.Name = "mnuFileSaveAsScriptAs" - Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(164, 22) + Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(250, 34) Me.mnuFileSaveAsScriptAs.Text = "Save Script As..." ' 'mnuFilePrint @@ -2993,7 +2994,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(365, 34) Me.mnuFilePrint.Tag = "Print" Me.mnuFilePrint.Text = "Print..." Me.mnuFilePrint.Visible = False @@ -3002,7 +3003,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(365, 34) Me.mnuFilePrintPreview.Tag = "Print_Preview" Me.mnuFilePrintPreview.Text = "Print Preview..." Me.mnuFilePrintPreview.Visible = False @@ -3010,28 +3011,36 @@ Partial Class frmMain 'tlSeparatorFile3 ' Me.tlSeparatorFile3.Name = "tlSeparatorFile3" - Me.tlSeparatorFile3.Size = New System.Drawing.Size(238, 6) + Me.tlSeparatorFile3.Size = New System.Drawing.Size(362, 6) ' 'mnuFIleExit ' Me.mnuFIleExit.Name = "mnuFIleExit" - Me.mnuFIleExit.Size = New System.Drawing.Size(241, 22) + Me.mnuFIleExit.Size = New System.Drawing.Size(365, 34) Me.mnuFIleExit.Tag = "Exit" Me.mnuFIleExit.Text = "Exit" ' 'mnuEdit ' - Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll}) + Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuUndo, Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll}) Me.mnuEdit.Name = "mnuEdit" - Me.mnuEdit.Size = New System.Drawing.Size(39, 22) + Me.mnuEdit.Size = New System.Drawing.Size(58, 29) Me.mnuEdit.Tag = "Edit" Me.mnuEdit.Text = "Edit" ' + 'mnuUndo + ' + Me.mnuUndo.Name = "mnuUndo" + Me.mnuUndo.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Shift) _ + Or System.Windows.Forms.Keys.Z), System.Windows.Forms.Keys) + Me.mnuUndo.Size = New System.Drawing.Size(270, 34) + Me.mnuUndo.Text = "Undo" + ' 'mnuEditFind ' Me.mnuEditFind.Name = "mnuEditFind" Me.mnuEditFind.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F), System.Windows.Forms.Keys) - Me.mnuEditFind.Size = New System.Drawing.Size(167, 22) + Me.mnuEditFind.Size = New System.Drawing.Size(270, 34) Me.mnuEditFind.Tag = "Find" Me.mnuEditFind.Text = "Find" ' @@ -3039,7 +3048,7 @@ Partial Class frmMain ' Me.mnuEditCopy.Name = "mnuEditCopy" Me.mnuEditCopy.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopy.Size = New System.Drawing.Size(167, 22) + Me.mnuEditCopy.Size = New System.Drawing.Size(270, 34) Me.mnuEditCopy.Tag = "Copy" Me.mnuEditCopy.Text = "Copy" ' @@ -3047,27 +3056,27 @@ Partial Class frmMain ' Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuEditPaste.Size = New System.Drawing.Size(167, 22) + Me.mnuEditPaste.Size = New System.Drawing.Size(270, 34) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' 'mnuEditPasteNew ' Me.mnuEditPasteNew.Name = "mnuEditPasteNew" - Me.mnuEditPasteNew.Size = New System.Drawing.Size(167, 22) + Me.mnuEditPasteNew.Size = New System.Drawing.Size(270, 34) Me.mnuEditPasteNew.Text = "Paste New" ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" - Me.mnuEditWordwrap.Size = New System.Drawing.Size(167, 22) + Me.mnuEditWordwrap.Size = New System.Drawing.Size(270, 34) Me.mnuEditWordwrap.Text = "Wordwrap" ' 'mnuEditSelectAll ' Me.mnuEditSelectAll.Name = "mnuEditSelectAll" Me.mnuEditSelectAll.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys) - Me.mnuEditSelectAll.Size = New System.Drawing.Size(167, 22) + Me.mnuEditSelectAll.Size = New System.Drawing.Size(270, 34) Me.mnuEditSelectAll.Tag = "Select_All" Me.mnuEditSelectAll.Text = "Select All " ' @@ -3075,17 +3084,18 @@ Partial Class frmMain ' Me.stsStrip.ImageScalingSize = New System.Drawing.Size(24, 24) Me.stsStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tstatus}) - Me.stsStrip.Location = New System.Drawing.Point(0, 460) + Me.stsStrip.Location = New System.Drawing.Point(0, 691) Me.stsStrip.Name = "stsStrip" + Me.stsStrip.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0) Me.stsStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional - Me.stsStrip.Size = New System.Drawing.Size(834, 22) + Me.stsStrip.Size = New System.Drawing.Size(1251, 32) Me.stsStrip.TabIndex = 8 Me.stsStrip.Text = "Status" ' 'tstatus ' Me.tstatus.Name = "tstatus" - Me.tstatus.Size = New System.Drawing.Size(119, 17) + Me.tstatus.Size = New System.Drawing.Size(182, 25) Me.tstatus.Text = "No worksheet loaded" ' 'Tool_strip @@ -3094,12 +3104,12 @@ Partial Class frmMain Me.Tool_strip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden Me.Tool_strip.ImageScalingSize = New System.Drawing.Size(30, 30) Me.Tool_strip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuTbOpen, Me.mnuTbOpenFromLibrary, Me.mnuTbSave, Me.toolStripSeparator, Me.mnuTbLast10Dialogs, Me.separator2, Me.mnuTbDataView, Me.mnuTbOutput, Me.ToolStripSeparator74, Me.mnuLastGraph, Me.ToolStripSeparator75, Me.mnuTbLogScript, Me.mnuMetadata, Me.ToolStripSeparator76, Me.mnuTbResetLayout, Me.separator3, Me.mnuTbHelp, Me.ToolStripSeparator77, Me.mnuTbLan, Me.separator1}) - Me.Tool_strip.Location = New System.Drawing.Point(0, 24) + Me.Tool_strip.Location = New System.Drawing.Point(0, 33) Me.Tool_strip.Name = "Tool_strip" - Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0) + Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0) Me.Tool_strip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional Me.Tool_strip.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.Tool_strip.Size = New System.Drawing.Size(834, 37) + Me.Tool_strip.Size = New System.Drawing.Size(1251, 39) Me.Tool_strip.TabIndex = 7 Me.Tool_strip.Text = "Tool" ' @@ -3111,7 +3121,7 @@ Partial Class frmMain Me.mnuTbOpen.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOpen.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOpen.Name = "mnuTbOpen" - Me.mnuTbOpen.Size = New System.Drawing.Size(53, 34) + Me.mnuTbOpen.Size = New System.Drawing.Size(53, 36) Me.mnuTbOpen.Text = "&Open" Me.mnuTbOpen.ToolTipText = "Import" ' @@ -3122,7 +3132,7 @@ Partial Class frmMain Me.mnuTbOpenFromLibrary.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOpenFromLibrary.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOpenFromLibrary.Name = "mnuTbOpenFromLibrary" - Me.mnuTbOpenFromLibrary.Size = New System.Drawing.Size(34, 34) + Me.mnuTbOpenFromLibrary.Size = New System.Drawing.Size(34, 36) Me.mnuTbOpenFromLibrary.ToolTipText = "Import From Library" ' 'mnuTbSave @@ -3134,40 +3144,40 @@ Partial Class frmMain Me.mnuTbSave.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbSave.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbSave.Name = "mnuTbSave" - Me.mnuTbSave.Size = New System.Drawing.Size(53, 34) + Me.mnuTbSave.Size = New System.Drawing.Size(53, 36) Me.mnuTbSave.Text = "&Save" ' 'mnuSaveData ' Me.mnuSaveData.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveData.Name = "mnuSaveData" - Me.mnuSaveData.Size = New System.Drawing.Size(139, 22) + Me.mnuSaveData.Size = New System.Drawing.Size(213, 34) Me.mnuSaveData.Text = "Save Data" ' 'mnuSaveOutput ' Me.mnuSaveOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveOutput.Name = "mnuSaveOutput" - Me.mnuSaveOutput.Size = New System.Drawing.Size(139, 22) + Me.mnuSaveOutput.Size = New System.Drawing.Size(213, 34) Me.mnuSaveOutput.Text = "Save Output" ' 'mnuSaveScript ' Me.mnuSaveScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveScript.Name = "mnuSaveScript" - Me.mnuSaveScript.Size = New System.Drawing.Size(139, 22) + Me.mnuSaveScript.Size = New System.Drawing.Size(213, 34) Me.mnuSaveScript.Text = "Save Script" ' 'mnuSaveLog ' Me.mnuSaveLog.Name = "mnuSaveLog" - Me.mnuSaveLog.Size = New System.Drawing.Size(139, 22) + Me.mnuSaveLog.Size = New System.Drawing.Size(213, 34) Me.mnuSaveLog.Text = "Save Log" ' 'toolStripSeparator ' Me.toolStripSeparator.Name = "toolStripSeparator" - Me.toolStripSeparator.Size = New System.Drawing.Size(6, 37) + Me.toolStripSeparator.Size = New System.Drawing.Size(6, 39) ' 'mnuTbLast10Dialogs ' @@ -3183,7 +3193,7 @@ Partial Class frmMain 'separator2 ' Me.separator2.Name = "separator2" - Me.separator2.Size = New System.Drawing.Size(6, 37) + Me.separator2.Size = New System.Drawing.Size(6, 39) ' 'mnuTbDataView ' @@ -3193,7 +3203,7 @@ Partial Class frmMain Me.mnuTbDataView.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbDataView.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbDataView.Name = "mnuTbDataView" - Me.mnuTbDataView.Size = New System.Drawing.Size(34, 34) + Me.mnuTbDataView.Size = New System.Drawing.Size(34, 36) Me.mnuTbDataView.ToolTipText = "Toggle Data view open and closed" ' 'mnuTbOutput @@ -3205,34 +3215,34 @@ Partial Class frmMain Me.mnuTbOutput.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOutput.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOutput.Name = "mnuTbOutput" - Me.mnuTbOutput.Size = New System.Drawing.Size(53, 34) + Me.mnuTbOutput.Size = New System.Drawing.Size(53, 36) Me.mnuTbOutput.ToolTipText = "Toggle Output window open and closed" ' 'mnuOutputWindow ' Me.mnuOutputWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuOutputWindow.Name = "mnuOutputWindow" - Me.mnuOutputWindow.Size = New System.Drawing.Size(178, 22) + Me.mnuOutputWindow.Size = New System.Drawing.Size(271, 34) Me.mnuOutputWindow.Text = "Show Output" ' 'mnuShowRCommand ' Me.mnuShowRCommand.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuShowRCommand.Name = "mnuShowRCommand" - Me.mnuShowRCommand.Size = New System.Drawing.Size(178, 22) + Me.mnuShowRCommand.Size = New System.Drawing.Size(271, 34) Me.mnuShowRCommand.Text = "Show R Commands" ' 'mnuIncludeComments ' Me.mnuIncludeComments.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuIncludeComments.Name = "mnuIncludeComments" - Me.mnuIncludeComments.Size = New System.Drawing.Size(178, 22) + Me.mnuIncludeComments.Size = New System.Drawing.Size(271, 34) Me.mnuIncludeComments.Text = "Show Comments" ' 'ToolStripSeparator74 ' Me.ToolStripSeparator74.Name = "ToolStripSeparator74" - Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 37) + Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 39) ' 'mnuLastGraph ' @@ -3249,25 +3259,25 @@ Partial Class frmMain 'mnuNormalViewer ' Me.mnuNormalViewer.Name = "mnuNormalViewer" - Me.mnuNormalViewer.Size = New System.Drawing.Size(128, 22) + Me.mnuNormalViewer.Size = New System.Drawing.Size(194, 34) Me.mnuNormalViewer.Text = "Viewer..." ' 'mnuploty ' Me.mnuploty.Name = "mnuploty" - Me.mnuploty.Size = New System.Drawing.Size(128, 22) + Me.mnuploty.Size = New System.Drawing.Size(194, 34) Me.mnuploty.Text = "Plotly..." ' 'mnuRViewer ' Me.mnuRViewer.Name = "mnuRViewer" - Me.mnuRViewer.Size = New System.Drawing.Size(128, 22) + Me.mnuRViewer.Size = New System.Drawing.Size(194, 34) Me.mnuRViewer.Text = "R Viewer..." ' 'ToolStripSeparator75 ' Me.ToolStripSeparator75.Name = "ToolStripSeparator75" - Me.ToolStripSeparator75.Size = New System.Drawing.Size(6, 37) + Me.ToolStripSeparator75.Size = New System.Drawing.Size(6, 39) ' 'mnuTbLogScript ' @@ -3285,14 +3295,14 @@ Partial Class frmMain ' Me.mnuLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuLogScript.Name = "mnuLogScript" - Me.mnuLogScript.Size = New System.Drawing.Size(210, 22) + Me.mnuLogScript.Size = New System.Drawing.Size(321, 34) Me.mnuLogScript.Text = "Log/Script" ' 'mnuSwapDataLogScript ' Me.mnuSwapDataLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSwapDataLogScript.Name = "mnuSwapDataLogScript" - Me.mnuSwapDataLogScript.Size = New System.Drawing.Size(210, 22) + Me.mnuSwapDataLogScript.Size = New System.Drawing.Size(321, 34) Me.mnuSwapDataLogScript.Text = "Swap Data and Log/Script" ' 'mnuMetadata @@ -3311,27 +3321,27 @@ Partial Class frmMain ' Me.mnuColumnMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuColumnMetadat.Name = "mnuColumnMetadat" - Me.mnuColumnMetadat.Size = New System.Drawing.Size(214, 22) + Me.mnuColumnMetadat.Size = New System.Drawing.Size(326, 34) Me.mnuColumnMetadat.Text = " Column Metadata..." ' 'mnuDataFrameMetadat ' Me.mnuDataFrameMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuDataFrameMetadat.Name = "mnuDataFrameMetadat" - Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(214, 22) + Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(326, 34) Me.mnuDataFrameMetadat.Text = " Data Frame Metadata..." ' 'mnuSwapDataMetadata ' Me.mnuSwapDataMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSwapDataMetadata.Name = "mnuSwapDataMetadata" - Me.mnuSwapDataMetadata.Size = New System.Drawing.Size(214, 22) + Me.mnuSwapDataMetadata.Size = New System.Drawing.Size(326, 34) Me.mnuSwapDataMetadata.Text = "Swap Data and Metadata..." ' 'ToolStripSeparator76 ' Me.ToolStripSeparator76.Name = "ToolStripSeparator76" - Me.ToolStripSeparator76.Size = New System.Drawing.Size(6, 37) + Me.ToolStripSeparator76.Size = New System.Drawing.Size(6, 39) ' 'mnuTbResetLayout ' @@ -3340,13 +3350,13 @@ Partial Class frmMain Me.mnuTbResetLayout.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbResetLayout.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbResetLayout.Name = "mnuTbResetLayout" - Me.mnuTbResetLayout.Size = New System.Drawing.Size(34, 34) + Me.mnuTbResetLayout.Size = New System.Drawing.Size(34, 36) Me.mnuTbResetLayout.ToolTipText = "Reset to Default Layout" ' 'separator3 ' Me.separator3.Name = "separator3" - Me.separator3.Size = New System.Drawing.Size(6, 37) + Me.separator3.Size = New System.Drawing.Size(6, 39) ' 'mnuTbHelp ' @@ -3355,13 +3365,13 @@ Partial Class frmMain Me.mnuTbHelp.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbHelp.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbHelp.Name = "mnuTbHelp" - Me.mnuTbHelp.Size = New System.Drawing.Size(34, 34) + Me.mnuTbHelp.Size = New System.Drawing.Size(34, 36) Me.mnuTbHelp.Text = "He&lp" ' 'ToolStripSeparator77 ' Me.ToolStripSeparator77.Name = "ToolStripSeparator77" - Me.ToolStripSeparator77.Size = New System.Drawing.Size(6, 37) + Me.ToolStripSeparator77.Size = New System.Drawing.Size(6, 39) ' 'mnuTbLan ' @@ -3370,28 +3380,28 @@ Partial Class frmMain Me.mnuTbLan.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbLan.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbLan.Name = "mnuTbLan" - Me.mnuTbLan.Size = New System.Drawing.Size(34, 34) + Me.mnuTbLan.Size = New System.Drawing.Size(34, 36) Me.mnuTbLan.ToolTipText = "Changes the menu language to English, and from English" ' 'separator1 ' Me.separator1.Name = "separator1" - Me.separator1.Size = New System.Drawing.Size(6, 37) + Me.separator1.Size = New System.Drawing.Size(6, 39) ' 'mnuBar ' Me.mnuBar.AllowMerge = False Me.mnuBar.BackColor = System.Drawing.SystemColors.ControlLightLight + Me.mnuBar.GripMargin = New System.Windows.Forms.Padding(2, 2, 0, 2) Me.mnuBar.ImageScalingSize = New System.Drawing.Size(24, 24) Me.mnuBar.ImeMode = System.Windows.Forms.ImeMode.[On] Me.mnuBar.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFile, Me.mnuEdit, Me.mnuPrepare, Me.mnuDescribe, Me.mnuModel, Me.mnuStructured, Me.mnuClimatic, Me.mnuProcurement, Me.mnuOptionsByContext, Me.mnuTools, Me.mnuView, Me.mnuHelp}) Me.mnuBar.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow Me.mnuBar.Location = New System.Drawing.Point(0, 0) Me.mnuBar.Name = "mnuBar" - Me.mnuBar.Padding = New System.Windows.Forms.Padding(4, 1, 0, 1) Me.mnuBar.RenderMode = System.Windows.Forms.ToolStripRenderMode.System Me.mnuBar.ShowItemToolTips = True - Me.mnuBar.Size = New System.Drawing.Size(834, 24) + Me.mnuBar.Size = New System.Drawing.Size(1251, 33) Me.mnuBar.TabIndex = 6 Me.mnuBar.Text = "Menu_strip" ' @@ -3399,7 +3409,7 @@ Partial Class frmMain ' 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.Size = New System.Drawing.Size(54, 29) Me.mnuFile.Tag = "File" Me.mnuFile.Text = "File" ' @@ -3407,7 +3417,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(365, 34) Me.mnuFileNewDataFrame.Tag = "New_Data_Frame" Me.mnuFileNewDataFrame.Text = "New Data Frame..." ' @@ -3415,33 +3425,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(365, 34) 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(365, 34) 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(362, 6) ' 'mnuFileImportFromODK ' Me.mnuFileImportFromODK.Name = "mnuFileImportFromODK" - Me.mnuFileImportFromODK.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromODK.Size = New System.Drawing.Size(365, 34) 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(365, 34) Me.mnuFileImportFromCSPRO.Text = "Import From CSPRO..." Me.mnuFileImportFromCSPRO.Visible = False ' @@ -3449,7 +3459,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(365, 34) Me.mnuFileImportFromDatabases.Text = "Import From Databases..." Me.mnuFileImportFromDatabases.Visible = False ' @@ -3457,88 +3467,88 @@ 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(365, 34) 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(365, 34) 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(365, 34) Me.mnuFileImportandTidyNetCDFFile.Text = "Import and Tidy NetCDF File..." ' 'mnuImportFromOpenAppBuilder ' Me.mnuImportFromOpenAppBuilder.Name = "mnuImportFromOpenAppBuilder" - Me.mnuImportFromOpenAppBuilder.Size = New System.Drawing.Size(241, 22) + Me.mnuImportFromOpenAppBuilder.Size = New System.Drawing.Size(365, 34) Me.mnuImportFromOpenAppBuilder.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(365, 34) 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(362, 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(365, 34) Me.mnuFileExport.Text = "Export" ' 'mnuFileExportExportDataSet ' Me.mnuFileExportExportDataSet.Name = "mnuFileExportExportDataSet" - Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(204, 22) + Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(310, 34) Me.mnuFileExportExportDataSet.Text = "Export Dataset..." ' 'mnuFileExportExportRObjectsToolStripMenuItem ' Me.mnuFileExportExportRObjectsToolStripMenuItem.Name = "mnuFileExportExportRObjectsToolStripMenuItem" - Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(204, 22) + Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(310, 34) Me.mnuFileExportExportRObjectsToolStripMenuItem.Text = "Export R Objects..." ' 'mnuFileExportExportRWorkspace ' Me.mnuFileExportExportRWorkspace.Name = "mnuFileExportExportRWorkspace" - Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(204, 22) + Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(310, 34) Me.mnuFileExportExportRWorkspace.Text = "Export R Workspace..." ' 'mnuFileExportExportGraphAsImage ' Me.mnuFileExportExportGraphAsImage.Name = "mnuFileExportExportGraphAsImage" - Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(204, 22) + Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(310, 34) Me.mnuFileExportExportGraphAsImage.Text = "Export Graph As Image..." ' 'mnuFileCloseData ' Me.mnuFileCloseData.Name = "mnuFileCloseData" - Me.mnuFileCloseData.Size = New System.Drawing.Size(241, 22) + Me.mnuFileCloseData.Size = New System.Drawing.Size(365, 34) 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(362, 6) ' 'mnuPrepare ' Me.mnuPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrame, Me.mnuPrepareCheckData, Me.ToolStripSeparator6, Me.mnuPrepareCalculator, Me.ToolStripSeparator79, Me.mnuPrepareColumnCalculate, Me.mnuPrepareColumnFactor, Me.mnuPrepareColumnText, Me.mnuPrepareColumnDate, Me.mnuPrepareColumnDefine, Me.ToolStripSeparator4, Me.mnuPrepareDataReshape, Me.ToolStripSeparator7, Me.mnuPrepareKeysAndLinks, Me.mnuPrepareDataBook, Me.mnuPrepareRObjects}) Me.mnuPrepare.Name = "mnuPrepare" - Me.mnuPrepare.Size = New System.Drawing.Size(59, 22) + Me.mnuPrepare.Size = New System.Drawing.Size(88, 29) Me.mnuPrepare.Tag = "Prepare" Me.mnuPrepare.Text = "Prepare" ' @@ -3546,105 +3556,105 @@ Partial Class frmMain ' Me.mnuPrepareDataFrame.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrameViewData, Me.mnuPrepareDataFrameRenameColumn, Me.mnuPrepareDataFrameDuplicateColumn, Me.mnuPrepareDataFrameRowNumbersNames, Me.ToolStripSeparator1, Me.mnuPrepareDataFrameSort, Me.mnuPrepareDataFrameFilterRows, Me.mnuPrepareDataFrameSelectColumns, Me.mnuPrepareDataFrameReplaceValues, Me.mnuPrepareDataFrameConvertColumns, Me.ToolStripSeparator2, Me.mnuPrepareDataFrameReorderColumns, Me.mnuPrepareDataFrameAddMergeColumns, Me.mnuPrepareDataFrameInsertColumnsRows, Me.mnuPrepareDataFrameDeleteColumnsRows, Me.mnuPrepareDataFrameProtectColumn, Me.mnuPrepareDataFrameFreezeColumns, Me.mnuPrepareDataframeColourByProperty}) Me.mnuPrepareDataFrame.Name = "mnuPrepareDataFrame" - Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareDataFrame.Tag = "Data_Frame" Me.mnuPrepareDataFrame.Text = "Data Frame" ' 'mnuPrepareDataFrameViewData ' Me.mnuPrepareDataFrameViewData.Name = "mnuPrepareDataFrameViewData" - Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameViewData.Tag = "View_Data..." Me.mnuPrepareDataFrameViewData.Text = "View Data..." ' 'mnuPrepareDataFrameRenameColumn ' Me.mnuPrepareDataFrameRenameColumn.Name = "mnuPrepareDataFrameRenameColumn" - Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameRenameColumn.Tag = "Rename_Column..." Me.mnuPrepareDataFrameRenameColumn.Text = "Rename Columns..." ' 'mnuPrepareDataFrameDuplicateColumn ' Me.mnuPrepareDataFrameDuplicateColumn.Name = "mnuPrepareDataFrameDuplicateColumn" - Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameDuplicateColumn.Text = "Duplicate Column..." ' 'mnuPrepareDataFrameRowNumbersNames ' Me.mnuPrepareDataFrameRowNumbersNames.Name = "mnuPrepareDataFrameRowNumbersNames" - Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameRowNumbersNames.Tag = "Row_Numbers/Names..." Me.mnuPrepareDataFrameRowNumbersNames.Text = "Row Numbers/Names..." ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(298, 6) ' 'mnuPrepareDataFrameSort ' Me.mnuPrepareDataFrameSort.Name = "mnuPrepareDataFrameSort" - Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameSort.Tag = "Sort..." Me.mnuPrepareDataFrameSort.Text = "Sort..." ' 'mnuPrepareDataFrameFilterRows ' Me.mnuPrepareDataFrameFilterRows.Name = "mnuPrepareDataFrameFilterRows" - Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameFilterRows.Tag = "Filter..." Me.mnuPrepareDataFrameFilterRows.Text = "Filter Rows..." ' 'mnuPrepareDataFrameSelectColumns ' Me.mnuPrepareDataFrameSelectColumns.Name = "mnuPrepareDataFrameSelectColumns" - Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameSelectColumns.Text = "Select Columns..." ' 'mnuPrepareDataFrameReplaceValues ' Me.mnuPrepareDataFrameReplaceValues.Name = "mnuPrepareDataFrameReplaceValues" - Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameReplaceValues.Tag = "Replace_Values..." Me.mnuPrepareDataFrameReplaceValues.Text = "Replace Values..." ' 'mnuPrepareDataFrameConvertColumns ' Me.mnuPrepareDataFrameConvertColumns.Name = "mnuPrepareDataFrameConvertColumns" - Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameConvertColumns.Tag = "Convert_Columns..." Me.mnuPrepareDataFrameConvertColumns.Text = "Convert Columns..." ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(298, 6) ' 'mnuPrepareDataFrameReorderColumns ' Me.mnuPrepareDataFrameReorderColumns.Name = "mnuPrepareDataFrameReorderColumns" - Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameReorderColumns.Tag = "Reorder_Columns..." Me.mnuPrepareDataFrameReorderColumns.Text = "Reorder Columns..." ' 'mnuPrepareDataFrameAddMergeColumns ' Me.mnuPrepareDataFrameAddMergeColumns.Name = "mnuPrepareDataFrameAddMergeColumns" - Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameAddMergeColumns.Text = "Add (Merge) Columns..." ' 'mnuPrepareDataFrameInsertColumnsRows ' Me.mnuPrepareDataFrameInsertColumnsRows.Name = "mnuPrepareDataFrameInsertColumnsRows" - Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameInsertColumnsRows.Tag = "Insert_Columns/Rows..." Me.mnuPrepareDataFrameInsertColumnsRows.Text = "Insert Columns/Rows..." ' 'mnuPrepareDataFrameDeleteColumnsRows ' Me.mnuPrepareDataFrameDeleteColumnsRows.Name = "mnuPrepareDataFrameDeleteColumnsRows" - Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameDeleteColumnsRows.Tag = "Delete_Columns/Rows..." Me.mnuPrepareDataFrameDeleteColumnsRows.Text = "Delete Columns/Rows..." ' @@ -3652,7 +3662,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameProtectColumn.Enabled = False Me.mnuPrepareDataFrameProtectColumn.Name = "mnuPrepareDataFrameProtectColumn" - Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameProtectColumn.Tag = "..." Me.mnuPrepareDataFrameProtectColumn.Text = "Protect Column..." Me.mnuPrepareDataFrameProtectColumn.Visible = False @@ -3661,7 +3671,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameFreezeColumns.Enabled = False Me.mnuPrepareDataFrameFreezeColumns.Name = "mnuPrepareDataFrameFreezeColumns" - Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameFreezeColumns.Tag = "Freeze_Columns..." Me.mnuPrepareDataFrameFreezeColumns.Text = "Freeze Columns..." Me.mnuPrepareDataFrameFreezeColumns.Visible = False @@ -3669,7 +3679,7 @@ Partial Class frmMain 'mnuPrepareDataframeColourByProperty ' Me.mnuPrepareDataframeColourByProperty.Name = "mnuPrepareDataframeColourByProperty" - Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataframeColourByProperty.Text = "Colour by Property..." ' 'mnuPrepareCheckData @@ -3677,107 +3687,107 @@ Partial Class frmMain Me.mnuPrepareCheckData.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right Me.mnuPrepareCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareCheckDataVisualiseData, Me.mnuPrepareCheckDataPivotTable, Me.ToolStripSeparator50, Me.mnuPrepareCheckDataDuplicates, Me.mnuPrepareCheckDataCompareColumns, Me.mnuPrepareCheckDataNonNumericCases, Me.ToolStripSeparator49, Me.mnuPrepareCheckDataBoxplot, Me.mnuPrepareCheckDataOneVariableSummarise, Me.mnuPrepareCheckDataOneVariableGraph, Me.mnuPrepareCheckDataOneWayFrequencies, Me.mnuPrepareCheckDataViewDeleteLabels, Me.ToolStripSeparator41, Me.mnuPrepareCheckDataExportOpenRefine, Me.mnuPrepareCheckDataImportOpenRefine, Me.ToolStripSeparator40, Me.mnuPreparePrepareToShareJitter, Me.mnuPrepareCheckDataPrePareToShareSdcPackage, Me.mnuPrepareCheckDataAnonymiseIDColumn}) Me.mnuPrepareCheckData.Name = "mnuPrepareCheckData" - Me.mnuPrepareCheckData.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareCheckData.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareCheckData.Text = "Check Data" ' 'mnuPrepareCheckDataVisualiseData ' Me.mnuPrepareCheckDataVisualiseData.Name = "mnuPrepareCheckDataVisualiseData" - Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataVisualiseData.Text = "Visualise Data..." ' 'mnuPrepareCheckDataPivotTable ' Me.mnuPrepareCheckDataPivotTable.Name = "mnuPrepareCheckDataPivotTable" - Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator50 ' Me.ToolStripSeparator50.Name = "ToolStripSeparator50" - Me.ToolStripSeparator50.Size = New System.Drawing.Size(242, 6) + Me.ToolStripSeparator50.Size = New System.Drawing.Size(367, 6) ' 'mnuPrepareCheckDataDuplicates ' Me.mnuPrepareCheckDataDuplicates.Name = "mnuPrepareCheckDataDuplicates" - Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataDuplicates.Text = "Duplicate Rows..." ' 'mnuPrepareCheckDataCompareColumns ' Me.mnuPrepareCheckDataCompareColumns.Name = "mnuPrepareCheckDataCompareColumns" - Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataCompareColumns.Text = "Compare Columns..." ' 'mnuPrepareCheckDataNonNumericCases ' Me.mnuPrepareCheckDataNonNumericCases.Name = "mnuPrepareCheckDataNonNumericCases" - Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator49 ' Me.ToolStripSeparator49.Name = "ToolStripSeparator49" - Me.ToolStripSeparator49.Size = New System.Drawing.Size(242, 6) + Me.ToolStripSeparator49.Size = New System.Drawing.Size(367, 6) ' 'mnuPrepareCheckDataBoxplot ' Me.mnuPrepareCheckDataBoxplot.Name = "mnuPrepareCheckDataBoxplot" - Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataBoxplot.Text = "Boxplot..." ' 'mnuPrepareCheckDataOneVariableSummarise ' Me.mnuPrepareCheckDataOneVariableSummarise.Name = "mnuPrepareCheckDataOneVariableSummarise" - Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuPrepareCheckDataOneVariableGraph ' Me.mnuPrepareCheckDataOneVariableGraph.Name = "mnuPrepareCheckDataOneVariableGraph" - Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuPrepareCheckDataOneWayFrequencies ' Me.mnuPrepareCheckDataOneWayFrequencies.Name = "mnuPrepareCheckDataOneWayFrequencies" - Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataOneWayFrequencies.Text = "One Variable Frequencies..." ' 'mnuPrepareCheckDataViewDeleteLabels ' Me.mnuPrepareCheckDataViewDeleteLabels.Name = "mnuPrepareCheckDataViewDeleteLabels" - Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataViewDeleteLabels.Text = "View/Delete Labels..." ' 'ToolStripSeparator41 ' Me.ToolStripSeparator41.Name = "ToolStripSeparator41" - Me.ToolStripSeparator41.Size = New System.Drawing.Size(242, 6) + Me.ToolStripSeparator41.Size = New System.Drawing.Size(367, 6) ' 'mnuPrepareCheckDataExportOpenRefine ' Me.mnuPrepareCheckDataExportOpenRefine.Name = "mnuPrepareCheckDataExportOpenRefine" - Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataExportOpenRefine.Text = "Export To OpenRefine..." ' 'mnuPrepareCheckDataImportOpenRefine ' Me.mnuPrepareCheckDataImportOpenRefine.Name = "mnuPrepareCheckDataImportOpenRefine" - Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataImportOpenRefine.Text = "Import From OpenRefine..." Me.mnuPrepareCheckDataImportOpenRefine.Visible = False ' 'ToolStripSeparator40 ' Me.ToolStripSeparator40.Name = "ToolStripSeparator40" - Me.ToolStripSeparator40.Size = New System.Drawing.Size(242, 6) + Me.ToolStripSeparator40.Size = New System.Drawing.Size(367, 6) ' 'mnuPreparePrepareToShareJitter ' Me.mnuPreparePrepareToShareJitter.Enabled = False Me.mnuPreparePrepareToShareJitter.Name = "mnuPreparePrepareToShareJitter" - Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(245, 22) + Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(370, 34) Me.mnuPreparePrepareToShareJitter.Text = "Jitter..." Me.mnuPreparePrepareToShareJitter.Visible = False ' @@ -3785,95 +3795,95 @@ Partial Class frmMain ' Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Enabled = False Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Name = "mnuPrepareCheckDataPrePareToShareSdcPackage" - Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Text = "Prepare to Share (sdc package)..." Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Visible = False ' 'mnuPrepareCheckDataAnonymiseIDColumn ' Me.mnuPrepareCheckDataAnonymiseIDColumn.Name = "mnuPrepareCheckDataAnonymiseIDColumn" - Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataAnonymiseIDColumn.Text = "Anonymise ID Column..." ' 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(248, 6) ' 'mnuPrepareCalculator ' Me.mnuPrepareCalculator.Name = "mnuPrepareCalculator" - Me.mnuPrepareCalculator.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareCalculator.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareCalculator.Tag = "Calculator..." Me.mnuPrepareCalculator.Text = "Calculator..." ' 'ToolStripSeparator79 ' Me.ToolStripSeparator79.Name = "ToolStripSeparator79" - Me.ToolStripSeparator79.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator79.Size = New System.Drawing.Size(248, 6) ' 'mnuPrepareColumnCalculate ' Me.mnuPrepareColumnCalculate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnNumericRegularSequence, Me.mnuPrepareColumnNumericEnter, Me.ToolStripSeparator25, Me.mnuPrepareColumnNumericRowSummaries, Me.mnuPrepareColumnNumericTransform, Me.mnuPrepareColumnNumericPolynomials, Me.ToolStripSeparator56, Me.mnuPrepareColumnNumericRandomSamples, Me.mnuPrepareColumnNumericPermuteRows}) Me.mnuPrepareColumnCalculate.Name = "mnuPrepareColumnCalculate" - Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnCalculate.Tag = "Column:_Calculate" Me.mnuPrepareColumnCalculate.Text = "Column: Numeric" ' 'mnuPrepareColumnNumericRegularSequence ' Me.mnuPrepareColumnNumericRegularSequence.Name = "mnuPrepareColumnNumericRegularSequence" - Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericRegularSequence.Tag = "Regular_Sequence..." Me.mnuPrepareColumnNumericRegularSequence.Text = "Regular Sequence..." ' 'mnuPrepareColumnNumericEnter ' Me.mnuPrepareColumnNumericEnter.Name = "mnuPrepareColumnNumericEnter" - Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericEnter.Text = "Enter..." ' 'ToolStripSeparator25 ' Me.ToolStripSeparator25.Name = "ToolStripSeparator25" - Me.ToolStripSeparator25.Size = New System.Drawing.Size(200, 6) + Me.ToolStripSeparator25.Size = New System.Drawing.Size(301, 6) ' 'mnuPrepareColumnNumericRowSummaries ' Me.mnuPrepareColumnNumericRowSummaries.Name = "mnuPrepareColumnNumericRowSummaries" - Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericRowSummaries.Text = "Row Summaries..." ' 'mnuPrepareColumnNumericTransform ' Me.mnuPrepareColumnNumericTransform.Name = "mnuPrepareColumnNumericTransform" - Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericTransform.Tag = "Rank..." Me.mnuPrepareColumnNumericTransform.Text = "Transform..." ' 'mnuPrepareColumnNumericPolynomials ' Me.mnuPrepareColumnNumericPolynomials.Name = "mnuPrepareColumnNumericPolynomials" - Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericPolynomials.Tag = "Polynomials..." Me.mnuPrepareColumnNumericPolynomials.Text = "Polynomials..." ' 'ToolStripSeparator56 ' Me.ToolStripSeparator56.Name = "ToolStripSeparator56" - Me.ToolStripSeparator56.Size = New System.Drawing.Size(200, 6) + Me.ToolStripSeparator56.Size = New System.Drawing.Size(301, 6) ' 'mnuPrepareColumnNumericRandomSamples ' Me.mnuPrepareColumnNumericRandomSamples.Name = "mnuPrepareColumnNumericRandomSamples" - Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericRandomSamples.Tag = "Random_Samples..." Me.mnuPrepareColumnNumericRandomSamples.Text = "Random Samples..." ' 'mnuPrepareColumnNumericPermuteRows ' Me.mnuPrepareColumnNumericPermuteRows.Name = "mnuPrepareColumnNumericPermuteRows" - Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericPermuteRows.Tag = "Permute_Rows..." Me.mnuPrepareColumnNumericPermuteRows.Text = "Permute/Sample Rows..." ' @@ -3881,105 +3891,105 @@ Partial Class frmMain ' Me.mnuPrepareColumnFactor.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnFactorConvertToFactor, Me.mnuPrepareColumnFactorRecodeNumeric, Me.mnuPrepareColumnFactorCountInFactor, Me.ToolStripSeparator12, Me.mnuPrepareColumnFactorRecodeFactor, Me.mnuPrepareColumnFactorCombineFactors, Me.mnuPrepareColumnFactorDummyVariables, Me.ToolStripSeparator14, Me.mnuPrepareColumnFactorLevelsLabels, Me.mnuPrepareColumnFactorReorderLevels, Me.mnuPrepareColumnFactorReferenceLevel, Me.mnuPrepareColumnFactorUnusedLevels, Me.mnuPrepareColumnFactorContrasts, Me.ToolStripSeparator19, Me.mnuPrepareColumnFactorFactorDataFrame}) Me.mnuPrepareColumnFactor.Name = "mnuPrepareColumnFactor" - Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnFactor.Tag = "Column:_Factor" Me.mnuPrepareColumnFactor.Text = "Column: Factor" ' 'mnuPrepareColumnFactorConvertToFactor ' Me.mnuPrepareColumnFactorConvertToFactor.Name = "mnuPrepareColumnFactorConvertToFactor" - Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorConvertToFactor.Tag = "Convert_To_Factor" Me.mnuPrepareColumnFactorConvertToFactor.Text = "Convert To Factor..." ' 'mnuPrepareColumnFactorRecodeNumeric ' Me.mnuPrepareColumnFactorRecodeNumeric.Name = "mnuPrepareColumnFactorRecodeNumeric" - Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorRecodeNumeric.Tag = "Recode_Numeric..." Me.mnuPrepareColumnFactorRecodeNumeric.Text = "Recode Numeric..." ' 'mnuPrepareColumnFactorCountInFactor ' Me.mnuPrepareColumnFactorCountInFactor.Name = "mnuPrepareColumnFactorCountInFactor" - Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorCountInFactor.Text = "Count in Factor..." ' 'ToolStripSeparator12 ' Me.ToolStripSeparator12.Name = "ToolStripSeparator12" - Me.ToolStripSeparator12.Size = New System.Drawing.Size(176, 6) + Me.ToolStripSeparator12.Size = New System.Drawing.Size(267, 6) ' 'mnuPrepareColumnFactorRecodeFactor ' Me.mnuPrepareColumnFactorRecodeFactor.Name = "mnuPrepareColumnFactorRecodeFactor" - Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorRecodeFactor.Tag = "Recode_Factor..." Me.mnuPrepareColumnFactorRecodeFactor.Text = "Recode Factor..." ' 'mnuPrepareColumnFactorCombineFactors ' Me.mnuPrepareColumnFactorCombineFactors.Name = "mnuPrepareColumnFactorCombineFactors" - Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorCombineFactors.Tag = "Combine_Factors..." Me.mnuPrepareColumnFactorCombineFactors.Text = "Combine Factors..." ' 'mnuPrepareColumnFactorDummyVariables ' Me.mnuPrepareColumnFactorDummyVariables.Name = "mnuPrepareColumnFactorDummyVariables" - Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorDummyVariables.Tag = "Dummy_Variables..." Me.mnuPrepareColumnFactorDummyVariables.Text = "Dummy Variables..." ' 'ToolStripSeparator14 ' Me.ToolStripSeparator14.Name = "ToolStripSeparator14" - Me.ToolStripSeparator14.Size = New System.Drawing.Size(176, 6) + Me.ToolStripSeparator14.Size = New System.Drawing.Size(267, 6) ' 'mnuPrepareColumnFactorLevelsLabels ' Me.mnuPrepareColumnFactorLevelsLabels.Name = "mnuPrepareColumnFactorLevelsLabels" - Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorLevelsLabels.Tag = "Levels/Labels..." Me.mnuPrepareColumnFactorLevelsLabels.Text = "Levels/Labels..." ' 'mnuPrepareColumnFactorReorderLevels ' Me.mnuPrepareColumnFactorReorderLevels.Name = "mnuPrepareColumnFactorReorderLevels" - Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorReorderLevels.Tag = "Reorder_Levels..." Me.mnuPrepareColumnFactorReorderLevels.Text = "Reorder Levels..." ' 'mnuPrepareColumnFactorReferenceLevel ' Me.mnuPrepareColumnFactorReferenceLevel.Name = "mnuPrepareColumnFactorReferenceLevel" - Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorReferenceLevel.Tag = "Reference_Level..." Me.mnuPrepareColumnFactorReferenceLevel.Text = "Reference Level..." ' 'mnuPrepareColumnFactorUnusedLevels ' Me.mnuPrepareColumnFactorUnusedLevels.Name = "mnuPrepareColumnFactorUnusedLevels" - Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorUnusedLevels.Tag = "Unused_Levels..." Me.mnuPrepareColumnFactorUnusedLevels.Text = "Unused Levels..." ' 'mnuPrepareColumnFactorContrasts ' Me.mnuPrepareColumnFactorContrasts.Name = "mnuPrepareColumnFactorContrasts" - Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorContrasts.Tag = "Contrasts..." Me.mnuPrepareColumnFactorContrasts.Text = "Contrasts..." ' 'ToolStripSeparator19 ' Me.ToolStripSeparator19.Name = "ToolStripSeparator19" - Me.ToolStripSeparator19.Size = New System.Drawing.Size(176, 6) + Me.ToolStripSeparator19.Size = New System.Drawing.Size(267, 6) ' 'mnuPrepareColumnFactorFactorDataFrame ' Me.mnuPrepareColumnFactorFactorDataFrame.Name = "mnuPrepareColumnFactorFactorDataFrame" - Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorFactorDataFrame.Tag = "Factor_Data_Frame" Me.mnuPrepareColumnFactorFactorDataFrame.Text = "Factor Data Frame..." ' @@ -3987,42 +3997,42 @@ Partial Class frmMain ' Me.mnuPrepareColumnText.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnTextFindReplace, Me.mnuPrepareColumnTextSearch, Me.mnuPrepareColumnTextTransform, Me.mnuPrepareColumnTextSplit, Me.mnuPrepareColumnTextCombine, Me.mnuPrepareColumnTextMatch, Me.mnuPrepareColumnTextDistance}) Me.mnuPrepareColumnText.Name = "mnuPrepareColumnText" - Me.mnuPrepareColumnText.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareColumnText.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnText.Tag = "Column:_Text" Me.mnuPrepareColumnText.Text = "Column: Text" ' 'mnuPrepareColumnTextFindReplace ' Me.mnuPrepareColumnTextFindReplace.Name = "mnuPrepareColumnTextFindReplace" - Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextFindReplace.Tag = "Find/Replace..." Me.mnuPrepareColumnTextFindReplace.Text = "Find/Replace..." ' 'mnuPrepareColumnTextSearch ' Me.mnuPrepareColumnTextSearch.Name = "mnuPrepareColumnTextSearch" - Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextSearch.Text = "Search..." Me.mnuPrepareColumnTextSearch.Visible = False ' 'mnuPrepareColumnTextTransform ' Me.mnuPrepareColumnTextTransform.Name = "mnuPrepareColumnTextTransform" - Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextTransform.Tag = "Transform..." Me.mnuPrepareColumnTextTransform.Text = "Transform..." ' 'mnuPrepareColumnTextSplit ' Me.mnuPrepareColumnTextSplit.Name = "mnuPrepareColumnTextSplit" - Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextSplit.Tag = "Split..." Me.mnuPrepareColumnTextSplit.Text = "Split..." ' 'mnuPrepareColumnTextCombine ' Me.mnuPrepareColumnTextCombine.Name = "mnuPrepareColumnTextCombine" - Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextCombine.Tag = "Combine..." Me.mnuPrepareColumnTextCombine.Text = "Combine..." ' @@ -4030,7 +4040,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnTextMatch.Enabled = False Me.mnuPrepareColumnTextMatch.Name = "mnuPrepareColumnTextMatch" - Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextMatch.Tag = "Match..." Me.mnuPrepareColumnTextMatch.Text = "Match..." Me.mnuPrepareColumnTextMatch.Visible = False @@ -4038,7 +4048,7 @@ Partial Class frmMain 'mnuPrepareColumnTextDistance ' Me.mnuPrepareColumnTextDistance.Name = "mnuPrepareColumnTextDistance" - Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextDistance.Tag = "Distance..." Me.mnuPrepareColumnTextDistance.Text = "Distance..." ' @@ -4046,38 +4056,38 @@ Partial Class frmMain ' Me.mnuPrepareColumnDate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDateGenerateDate, Me.mnuPrepareColumnDateMakeDate, Me.mnuPrepareColumnDateInfillMissingDates, Me.mnuPrepareColumnDateUseDate, Me.mnuPrepareColumnDateMakeTime, Me.mnuPrepareColumnDateUseTime}) Me.mnuPrepareColumnDate.Name = "mnuPrepareColumnDate" - Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnDate.Text = "Column: Date" ' 'mnuPrepareColumnDateGenerateDate ' Me.mnuPrepareColumnDateGenerateDate.Name = "mnuPrepareColumnDateGenerateDate" - Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateGenerateDate.Text = "Generate Dates..." ' 'mnuPrepareColumnDateMakeDate ' Me.mnuPrepareColumnDateMakeDate.Name = "mnuPrepareColumnDateMakeDate" - Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateMakeDate.Text = "Make Date..." ' 'mnuPrepareColumnDateInfillMissingDates ' Me.mnuPrepareColumnDateInfillMissingDates.Name = "mnuPrepareColumnDateInfillMissingDates" - Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuPrepareColumnDateUseDate ' Me.mnuPrepareColumnDateUseDate.Name = "mnuPrepareColumnDateUseDate" - Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateUseDate.Text = "Use Date..." ' 'mnuPrepareColumnDateMakeTime ' Me.mnuPrepareColumnDateMakeTime.Enabled = False Me.mnuPrepareColumnDateMakeTime.Name = "mnuPrepareColumnDateMakeTime" - Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateMakeTime.Text = "Make Time..." Me.mnuPrepareColumnDateMakeTime.Visible = False ' @@ -4085,7 +4095,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnDateUseTime.Enabled = False Me.mnuPrepareColumnDateUseTime.Name = "mnuPrepareColumnDateUseTime" - Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateUseTime.Text = "Use Time..." Me.mnuPrepareColumnDateUseTime.Visible = False ' @@ -4093,169 +4103,169 @@ Partial Class frmMain ' Me.mnuPrepareColumnDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDefineConvertColumns, Me.ToolStripSeparator55, Me.mnuPrepareColumnDefineCircular}) Me.mnuPrepareColumnDefine.Name = "mnuPrepareColumnDefine" - Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnDefine.Text = "Column: Define" ' 'mnuPrepareColumnDefineConvertColumns ' Me.mnuPrepareColumnDefineConvertColumns.Name = "mnuPrepareColumnDefineConvertColumns" - Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(176, 22) + Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(263, 34) Me.mnuPrepareColumnDefineConvertColumns.Text = "Convert Columns..." ' 'ToolStripSeparator55 ' Me.ToolStripSeparator55.Name = "ToolStripSeparator55" - Me.ToolStripSeparator55.Size = New System.Drawing.Size(173, 6) + Me.ToolStripSeparator55.Size = New System.Drawing.Size(260, 6) ' 'mnuPrepareColumnDefineCircular ' Me.mnuPrepareColumnDefineCircular.Name = "mnuPrepareColumnDefineCircular" - Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(176, 22) + Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(263, 34) Me.mnuPrepareColumnDefineCircular.Text = "Circular..." ' 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(248, 6) ' 'mnuPrepareDataReshape ' Me.mnuPrepareDataReshape.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnReshapeColumnSummaries, Me.mnuPrepareColumnReshapeGeneralSummaries, Me.ToolStripSeparator10, Me.mnuPrepareColumnReshapeStack, Me.mnuPrepareColumnReshapeUnstack, Me.mnuPrepareColumnReshapeMerge, Me.ToolStripSeparator11, Me.mnuPrepareAppendDataFrame, Me.mnuPrepareColumnReshapeSubset, Me.mnuPrepareColumnReshapeRandomSubset, Me.mnuPrepareColumnReshapeTranspose, Me.mnuPrepareDataReshapeScaleOrDistance, Me.mnuPrepareDataReshapeRandomSplit}) Me.mnuPrepareDataReshape.Name = "mnuPrepareDataReshape" - Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareDataReshape.Tag = "" Me.mnuPrepareDataReshape.Text = "Data Reshape" ' 'mnuPrepareColumnReshapeColumnSummaries ' Me.mnuPrepareColumnReshapeColumnSummaries.Name = "mnuPrepareColumnReshapeColumnSummaries" - Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeColumnSummaries.Tag = "Column_Summaries..." Me.mnuPrepareColumnReshapeColumnSummaries.Text = "Column Summaries..." ' 'mnuPrepareColumnReshapeGeneralSummaries ' Me.mnuPrepareColumnReshapeGeneralSummaries.Name = "mnuPrepareColumnReshapeGeneralSummaries" - Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeGeneralSummaries.Text = "General Summaries..." ' 'ToolStripSeparator10 ' Me.ToolStripSeparator10.Name = "ToolStripSeparator10" - Me.ToolStripSeparator10.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator10.Size = New System.Drawing.Size(292, 6) ' 'mnuPrepareColumnReshapeStack ' Me.mnuPrepareColumnReshapeStack.Name = "mnuPrepareColumnReshapeStack" - Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeStack.Tag = "Stack..." Me.mnuPrepareColumnReshapeStack.Text = "Stack (Pivot Longer)..." ' 'mnuPrepareColumnReshapeUnstack ' Me.mnuPrepareColumnReshapeUnstack.Name = "mnuPrepareColumnReshapeUnstack" - Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeUnstack.Tag = "Unstack..." Me.mnuPrepareColumnReshapeUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuPrepareColumnReshapeMerge ' Me.mnuPrepareColumnReshapeMerge.Name = "mnuPrepareColumnReshapeMerge" - Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeMerge.Tag = "Merge (Join)..." Me.mnuPrepareColumnReshapeMerge.Text = "Merge (Join)..." ' 'ToolStripSeparator11 ' Me.ToolStripSeparator11.Name = "ToolStripSeparator11" - Me.ToolStripSeparator11.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator11.Size = New System.Drawing.Size(292, 6) ' 'mnuPrepareAppendDataFrame ' Me.mnuPrepareAppendDataFrame.Name = "mnuPrepareAppendDataFrame" - Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareAppendDataFrame.Text = "Append (Bind Rows)..." ' 'mnuPrepareColumnReshapeSubset ' Me.mnuPrepareColumnReshapeSubset.Name = "mnuPrepareColumnReshapeSubset" - Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeSubset.Tag = "Subset..." Me.mnuPrepareColumnReshapeSubset.Text = "Subset..." ' 'mnuPrepareColumnReshapeRandomSubset ' Me.mnuPrepareColumnReshapeRandomSubset.Name = "mnuPrepareColumnReshapeRandomSubset" - Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeRandomSubset.Tag = "Random_Subset..." Me.mnuPrepareColumnReshapeRandomSubset.Text = "Random Subset..." ' 'mnuPrepareColumnReshapeTranspose ' Me.mnuPrepareColumnReshapeTranspose.Name = "mnuPrepareColumnReshapeTranspose" - Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeTranspose.Tag = "Transpose..." Me.mnuPrepareColumnReshapeTranspose.Text = "Transpose..." ' 'mnuPrepareDataReshapeScaleOrDistance ' Me.mnuPrepareDataReshapeScaleOrDistance.Name = "mnuPrepareDataReshapeScaleOrDistance" - Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareDataReshapeScaleOrDistance.Text = "Scale/Distance..." ' 'mnuPrepareDataReshapeRandomSplit ' Me.mnuPrepareDataReshapeRandomSplit.Name = "mnuPrepareDataReshapeRandomSplit" - Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareDataReshapeRandomSplit.Text = "Random Split..." ' 'ToolStripSeparator7 ' Me.ToolStripSeparator7.Name = "ToolStripSeparator7" - Me.ToolStripSeparator7.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator7.Size = New System.Drawing.Size(248, 6) ' 'mnuPrepareKeysAndLinks ' Me.mnuPrepareKeysAndLinks.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareKeysAndLinksAddKey, Me.mnuPrepareKeysAndLinksViewAndRemoveKey, Me.mnuPrepareKeysAndLinksAddLink, Me.mnuPrepareKeysAndLinksViewAndRemoveKeys, Me.mnuPrepareKeysAndLinksAddComment}) Me.mnuPrepareKeysAndLinks.Name = "mnuPrepareKeysAndLinks" - Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareKeysAndLinks.Text = "Keys and Links" ' 'mnuPrepareKeysAndLinksAddKey ' Me.mnuPrepareKeysAndLinksAddKey.Name = "mnuPrepareKeysAndLinksAddKey" - Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksAddKey.Text = "Add Key..." ' 'mnuPrepareKeysAndLinksViewAndRemoveKey ' Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Name = "mnuPrepareKeysAndLinksViewAndRemoveKey" - Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Text = "View and Remove Keys..." ' 'mnuPrepareKeysAndLinksAddLink ' Me.mnuPrepareKeysAndLinksAddLink.Name = "mnuPrepareKeysAndLinksAddLink" - Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksAddLink.Text = "Add Link..." ' 'mnuPrepareKeysAndLinksViewAndRemoveKeys ' Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Name = "mnuPrepareKeysAndLinksViewAndRemoveKeys" - Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Text = "View and Remove Links..." ' 'mnuPrepareKeysAndLinksAddComment ' Me.mnuPrepareKeysAndLinksAddComment.Name = "mnuPrepareKeysAndLinksAddComment" - Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksAddComment.Text = "Add Comment..." ' 'mnuPrepareDataBook ' Me.mnuPrepareDataBook.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataObjectDataFrameMetadata, Me.mnuPrepareDataObjectRenameDataFrame, Me.mnuPrepareDataObjectReorderDataFrames, Me.mnuPrepareDataObjectCopyDataFrame, Me.mnuPrepareDataObjectDeleteDataFrame, Me.ToolStripSeparator21, Me.mnuPrepareDataObjectHideDataframes, Me.mnuPrepareDataObjectMetadata, Me.mnuPrepareDataObjectRenameMetadata, Me.mnuPrepareDataObjectReorderMetadata, Me.mnuPrepareDataObjectDeleteMetadata}) Me.mnuPrepareDataBook.Name = "mnuPrepareDataBook" - Me.mnuPrepareDataBook.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareDataBook.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareDataBook.Tag = "Data_Object" Me.mnuPrepareDataBook.Text = "Data Book" ' @@ -4263,7 +4273,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDataFrameMetadata.Enabled = False Me.mnuPrepareDataObjectDataFrameMetadata.Name = "mnuPrepareDataObjectDataFrameMetadata" - Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectDataFrameMetadata.Tag = "Data_Frame_Metadata..." Me.mnuPrepareDataObjectDataFrameMetadata.Text = "Data Frame Metadata..." Me.mnuPrepareDataObjectDataFrameMetadata.Visible = False @@ -4271,46 +4281,46 @@ Partial Class frmMain 'mnuPrepareDataObjectRenameDataFrame ' Me.mnuPrepareDataObjectRenameDataFrame.Name = "mnuPrepareDataObjectRenameDataFrame" - Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectRenameDataFrame.Tag = "ReName_Data_Frame..." Me.mnuPrepareDataObjectRenameDataFrame.Text = "Rename Data Frame..." ' 'mnuPrepareDataObjectReorderDataFrames ' Me.mnuPrepareDataObjectReorderDataFrames.Name = "mnuPrepareDataObjectReorderDataFrames" - Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectReorderDataFrames.Tag = "Reorder_Data_Frames..." Me.mnuPrepareDataObjectReorderDataFrames.Text = "Reorder Data Frames..." ' 'mnuPrepareDataObjectCopyDataFrame ' Me.mnuPrepareDataObjectCopyDataFrame.Name = "mnuPrepareDataObjectCopyDataFrame" - Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectCopyDataFrame.Tag = "Copy_Data_Frame..." Me.mnuPrepareDataObjectCopyDataFrame.Text = "Copy Data Frame..." ' 'mnuPrepareDataObjectDeleteDataFrame ' Me.mnuPrepareDataObjectDeleteDataFrame.Name = "mnuPrepareDataObjectDeleteDataFrame" - Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectDeleteDataFrame.Tag = "Delete_Data_Frame..." Me.mnuPrepareDataObjectDeleteDataFrame.Text = "Delete Data Frames..." ' 'ToolStripSeparator21 ' Me.ToolStripSeparator21.Name = "ToolStripSeparator21" - Me.ToolStripSeparator21.Size = New System.Drawing.Size(207, 6) + Me.ToolStripSeparator21.Size = New System.Drawing.Size(315, 6) ' 'mnuPrepareDataObjectHideDataframes ' Me.mnuPrepareDataObjectHideDataframes.Name = "mnuPrepareDataObjectHideDataframes" - Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectHideDataframes.Text = "Hide/Show Data Frames..." ' 'mnuPrepareDataObjectMetadata ' Me.mnuPrepareDataObjectMetadata.Name = "mnuPrepareDataObjectMetadata" - Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectMetadata.Tag = "Metadata..." Me.mnuPrepareDataObjectMetadata.Text = "Metadata..." ' @@ -4318,7 +4328,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectRenameMetadata.Enabled = False Me.mnuPrepareDataObjectRenameMetadata.Name = "mnuPrepareDataObjectRenameMetadata" - Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectRenameMetadata.Tag = "Rename_Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Text = "Rename Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Visible = False @@ -4327,7 +4337,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectReorderMetadata.Enabled = False Me.mnuPrepareDataObjectReorderMetadata.Name = "mnuPrepareDataObjectReorderMetadata" - Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectReorderMetadata.Tag = "Reorder_Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Text = "Reorder Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Visible = False @@ -4336,7 +4346,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDeleteMetadata.Enabled = False Me.mnuPrepareDataObjectDeleteMetadata.Name = "mnuPrepareDataObjectDeleteMetadata" - Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectDeleteMetadata.Tag = "Delete_Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Text = "Delete Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Visible = False @@ -4345,35 +4355,35 @@ Partial Class frmMain ' Me.mnuPrepareRObjects.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareRObjectsView, Me.mnuPrepareRObjectsRename, Me.mnuPrepareRObjectsReorder, Me.mnuPrepareRObjectsDelete}) Me.mnuPrepareRObjects.Name = "mnuPrepareRObjects" - Me.mnuPrepareRObjects.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareRObjects.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareRObjects.Tag = "R_Objects" Me.mnuPrepareRObjects.Text = "R Objects" ' 'mnuPrepareRObjectsView ' Me.mnuPrepareRObjectsView.Name = "mnuPrepareRObjectsView" - Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(126, 22) + Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(189, 34) Me.mnuPrepareRObjectsView.Tag = "View..." Me.mnuPrepareRObjectsView.Text = "View..." ' 'mnuPrepareRObjectsRename ' Me.mnuPrepareRObjectsRename.Name = "mnuPrepareRObjectsRename" - Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(126, 22) + Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(189, 34) Me.mnuPrepareRObjectsRename.Tag = "Rename..." Me.mnuPrepareRObjectsRename.Text = "Rename..." ' 'mnuPrepareRObjectsReorder ' Me.mnuPrepareRObjectsReorder.Name = "mnuPrepareRObjectsReorder" - Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(126, 22) + Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(189, 34) Me.mnuPrepareRObjectsReorder.Tag = "Reorder" Me.mnuPrepareRObjectsReorder.Text = "Reorder..." ' 'mnuPrepareRObjectsDelete ' Me.mnuPrepareRObjectsDelete.Name = "mnuPrepareRObjectsDelete" - Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(126, 22) + Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(189, 34) Me.mnuPrepareRObjectsDelete.Tag = "Delete..." Me.mnuPrepareRObjectsDelete.Text = "Delete..." ' @@ -4381,78 +4391,78 @@ Partial Class frmMain ' Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival, Me.mnuStructuredTimeSeries, Me.ToolStripSeparator63, Me.mnuStructuredClimatic, Me.mnuStructuredProcurement, Me.mnuStructuredOptionByContext, Me.mnuStructuredSurvey}) Me.mnuStructured.Name = "mnuStructured" - Me.mnuStructured.Size = New System.Drawing.Size(74, 22) + Me.mnuStructured.Size = New System.Drawing.Size(109, 29) Me.mnuStructured.Text = "Structured" ' 'mnuStructuredCircular ' Me.mnuStructuredCircular.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircularDefine, Me.mnuStructuredCircularCalculator, Me.mnuStructuredCircularSummaries, Me.ToolStripSeparator46, Me.mnuStructuredCircularDensityPlot, Me.ToolStripSeparator67, Me.mnuStructuredCircularWindRose, Me.mnuStructuredCircularWindPollutionRose, Me.mnuStructuredCircularOtherRosePlots, Me.ToolStripSeparator68, Me.mnuStructuredCircularCirclize}) Me.mnuStructuredCircular.Name = "mnuStructuredCircular" - Me.mnuStructuredCircular.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredCircular.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredCircular.Text = "Circular" ' 'mnuStructuredCircularDefine ' Me.mnuStructuredCircularDefine.Name = "mnuStructuredCircularDefine" - Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularDefine.Text = "Define..." ' 'mnuStructuredCircularCalculator ' Me.mnuStructuredCircularCalculator.Name = "mnuStructuredCircularCalculator" - Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularCalculator.Text = "Calculator..." ' 'mnuStructuredCircularSummaries ' Me.mnuStructuredCircularSummaries.Name = "mnuStructuredCircularSummaries" - Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularSummaries.Text = "Summaries..." ' 'ToolStripSeparator46 ' Me.ToolStripSeparator46.Name = "ToolStripSeparator46" - Me.ToolStripSeparator46.Size = New System.Drawing.Size(189, 6) + Me.ToolStripSeparator46.Size = New System.Drawing.Size(284, 6) ' 'mnuStructuredCircularDensityPlot ' Me.mnuStructuredCircularDensityPlot.Name = "mnuStructuredCircularDensityPlot" - Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularDensityPlot.Text = "Circular Plots..." ' 'ToolStripSeparator67 ' Me.ToolStripSeparator67.Name = "ToolStripSeparator67" - Me.ToolStripSeparator67.Size = New System.Drawing.Size(189, 6) + Me.ToolStripSeparator67.Size = New System.Drawing.Size(284, 6) ' 'mnuStructuredCircularWindRose ' Me.mnuStructuredCircularWindRose.Name = "mnuStructuredCircularWindRose" - Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularWindRose.Text = "Wind Rose..." ' 'mnuStructuredCircularWindPollutionRose ' Me.mnuStructuredCircularWindPollutionRose.Name = "mnuStructuredCircularWindPollutionRose" - Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularWindPollutionRose.Text = "Wind/Pollution Rose..." ' 'mnuStructuredCircularOtherRosePlots ' Me.mnuStructuredCircularOtherRosePlots.Name = "mnuStructuredCircularOtherRosePlots" - Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularOtherRosePlots.Text = "Other Rose Plots..." ' 'ToolStripSeparator68 ' Me.ToolStripSeparator68.Name = "ToolStripSeparator68" - Me.ToolStripSeparator68.Size = New System.Drawing.Size(189, 6) + Me.ToolStripSeparator68.Size = New System.Drawing.Size(284, 6) ' 'mnuStructuredCircularCirclize ' Me.mnuStructuredCircularCirclize.Enabled = False Me.mnuStructuredCircularCirclize.Name = "mnuStructuredCircularCirclize" - Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularCirclize.Text = "Circlize..." Me.mnuStructuredCircularCirclize.Visible = False ' @@ -4460,126 +4470,126 @@ Partial Class frmMain ' Me.mnuStructuredLow_Flow.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredLow_FlowDefine}) Me.mnuStructuredLow_Flow.Name = "mnuStructuredLow_Flow" - Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredLow_Flow.Text = "Low_Flow" Me.mnuStructuredLow_Flow.Visible = False ' 'mnuStructuredLow_FlowDefine ' Me.mnuStructuredLow_FlowDefine.Name = "mnuStructuredLow_FlowDefine" - Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(117, 22) + Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(177, 34) Me.mnuStructuredLow_FlowDefine.Text = "Define..." ' 'mnuStructuredSurvival ' Me.mnuStructuredSurvival.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredSurvivalDefine}) Me.mnuStructuredSurvival.Name = "mnuStructuredSurvival" - Me.mnuStructuredSurvival.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredSurvival.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredSurvival.Text = "Survival" ' 'mnuStructuredSurvivalDefine ' Me.mnuStructuredSurvivalDefine.Name = "mnuStructuredSurvivalDefine" - Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(117, 22) + Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(177, 34) Me.mnuStructuredSurvivalDefine.Text = "Define..." ' 'mnuStructuredTimeSeries ' Me.mnuStructuredTimeSeries.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDefine, Me.ToolStripSeparator60, Me.mnuStructuredTimeSeriesDescribe, Me.ToolStripSeparator61, Me.mnuStructuredTimeSeriesModel, Me.ToolStripSeparator62}) Me.mnuStructuredTimeSeries.Name = "mnuStructuredTimeSeries" - Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredTimeSeries.Text = "Time Series" Me.mnuStructuredTimeSeries.Visible = False ' 'mnuStructuredTimeSeriesDefine ' Me.mnuStructuredTimeSeriesDefine.Name = "mnuStructuredTimeSeriesDefine" - Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(119, 22) + Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(182, 34) Me.mnuStructuredTimeSeriesDefine.Text = "Define..." ' 'ToolStripSeparator60 ' Me.ToolStripSeparator60.Name = "ToolStripSeparator60" - Me.ToolStripSeparator60.Size = New System.Drawing.Size(116, 6) + Me.ToolStripSeparator60.Size = New System.Drawing.Size(179, 6) ' 'mnuStructuredTimeSeriesDescribe ' Me.mnuStructuredTimeSeriesDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDescribeOneVariable, Me.mnuStructuredTimeSeriesDescribeGeneral}) Me.mnuStructuredTimeSeriesDescribe.Name = "mnuStructuredTimeSeriesDescribe" - Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(119, 22) + Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(182, 34) Me.mnuStructuredTimeSeriesDescribe.Text = "Describe" ' 'mnuStructuredTimeSeriesDescribeOneVariable ' Me.mnuStructuredTimeSeriesDescribeOneVariable.Name = "mnuStructuredTimeSeriesDescribeOneVariable" - Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(149, 22) + Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(226, 34) Me.mnuStructuredTimeSeriesDescribeOneVariable.Text = "One Variable..." ' 'mnuStructuredTimeSeriesDescribeGeneral ' Me.mnuStructuredTimeSeriesDescribeGeneral.Name = "mnuStructuredTimeSeriesDescribeGeneral" - Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(149, 22) + Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(226, 34) Me.mnuStructuredTimeSeriesDescribeGeneral.Text = "General..." ' 'ToolStripSeparator61 ' Me.ToolStripSeparator61.Name = "ToolStripSeparator61" - Me.ToolStripSeparator61.Size = New System.Drawing.Size(116, 6) + Me.ToolStripSeparator61.Size = New System.Drawing.Size(179, 6) ' 'mnuStructuredTimeSeriesModel ' Me.mnuStructuredTimeSeriesModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesModelOneVariable, Me.mnuStructuredTimeSeriesModelGeneral}) Me.mnuStructuredTimeSeriesModel.Name = "mnuStructuredTimeSeriesModel" - Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(119, 22) + Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(182, 34) Me.mnuStructuredTimeSeriesModel.Text = "Model" ' 'mnuStructuredTimeSeriesModelOneVariable ' Me.mnuStructuredTimeSeriesModelOneVariable.Name = "mnuStructuredTimeSeriesModelOneVariable" - Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(149, 22) + Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(226, 34) Me.mnuStructuredTimeSeriesModelOneVariable.Text = "One Variable..." ' 'mnuStructuredTimeSeriesModelGeneral ' Me.mnuStructuredTimeSeriesModelGeneral.Name = "mnuStructuredTimeSeriesModelGeneral" - Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(149, 22) + Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(226, 34) Me.mnuStructuredTimeSeriesModelGeneral.Text = "General..." ' 'ToolStripSeparator62 ' Me.ToolStripSeparator62.Name = "ToolStripSeparator62" - Me.ToolStripSeparator62.Size = New System.Drawing.Size(116, 6) + Me.ToolStripSeparator62.Size = New System.Drawing.Size(179, 6) ' 'ToolStripSeparator63 ' Me.ToolStripSeparator63.Name = "ToolStripSeparator63" - Me.ToolStripSeparator63.Size = New System.Drawing.Size(183, 6) + Me.ToolStripSeparator63.Size = New System.Drawing.Size(278, 6) ' 'mnuStructuredClimatic ' Me.mnuStructuredClimatic.Name = "mnuStructuredClimatic" - Me.mnuStructuredClimatic.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredClimatic.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredClimatic.Text = "Climatic..." Me.mnuStructuredClimatic.Visible = False ' 'mnuStructuredProcurement ' Me.mnuStructuredProcurement.Name = "mnuStructuredProcurement" - Me.mnuStructuredProcurement.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredProcurement.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredProcurement.Text = "Procurement..." Me.mnuStructuredProcurement.Visible = False ' 'mnuStructuredOptionByContext ' Me.mnuStructuredOptionByContext.Name = "mnuStructuredOptionByContext" - Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredOptionByContext.Text = "Options by Context..." Me.mnuStructuredOptionByContext.Visible = False ' 'mnuStructuredSurvey ' Me.mnuStructuredSurvey.Name = "mnuStructuredSurvey" - Me.mnuStructuredSurvey.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredSurvey.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredSurvey.Text = "Survey" Me.mnuStructuredSurvey.Visible = False ' @@ -4587,424 +4597,424 @@ Partial Class frmMain ' Me.mnuProcurement.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementOpenFromLibrary, Me.mnuProcurementDefineData, Me.mnuProcurementPrepare, Me.mnuProcurementDescribe, Me.mnuProcurementMapping, Me.mnuProcurementModel, Me.ToolStripSeparator45, Me.mnuProcurementDefineRedFlags, Me.mnuProcurementUseCRI}) Me.mnuProcurement.Name = "mnuProcurement" - Me.mnuProcurement.Size = New System.Drawing.Size(88, 22) + Me.mnuProcurement.Size = New System.Drawing.Size(129, 29) Me.mnuProcurement.Text = "Procurement" ' 'mnuProcurementOpenFromLibrary ' Me.mnuProcurementOpenFromLibrary.Name = "mnuProcurementOpenFromLibrary" - Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementOpenFromLibrary.Text = "Open From Library..." ' 'mnuProcurementDefineData ' Me.mnuProcurementDefineData.Name = "mnuProcurementDefineData" - Me.mnuProcurementDefineData.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementDefineData.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementDefineData.Text = "Define Procurement Data..." ' 'mnuProcurementPrepare ' Me.mnuProcurementPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementPrepareFilterByCountry, Me.ToolStripSeparator42, Me.mnuProcurementPrepareDefineContractValueCategories, Me.mnuProcurementPrepareRecodeNumericIntoQuantiles, Me.mnuProcurementPrepareSetFactorReferenceLevel, Me.mnuProcurementPrepareUseAwardDate, Me.ToolStripSeparator43, Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther, Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther, Me.mnuProcurementPrepareMergeAdditionalData}) Me.mnuProcurementPrepare.Name = "mnuProcurementPrepare" - Me.mnuProcurementPrepare.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementPrepare.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementPrepare.Text = "Prepare" ' 'mnuProcurementPrepareFilterByCountry ' Me.mnuProcurementPrepareFilterByCountry.Name = "mnuProcurementPrepareFilterByCountry" - Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareFilterByCountry.Text = "Filter by Country (or other)..." ' 'ToolStripSeparator42 ' Me.ToolStripSeparator42.Name = "ToolStripSeparator42" - Me.ToolStripSeparator42.Size = New System.Drawing.Size(355, 6) + Me.ToolStripSeparator42.Size = New System.Drawing.Size(536, 6) ' 'mnuProcurementPrepareDefineContractValueCategories ' Me.mnuProcurementPrepareDefineContractValueCategories.Name = "mnuProcurementPrepareDefineContractValueCategories" - Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareDefineContractValueCategories.Text = "Define Contract Value Categories..." ' 'mnuProcurementPrepareRecodeNumericIntoQuantiles ' Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Name = "mnuProcurementPrepareRecodeNumericIntoQuantiles" - Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Text = "Recode Numeric into Quantiles..." ' 'mnuProcurementPrepareSetFactorReferenceLevel ' Me.mnuProcurementPrepareSetFactorReferenceLevel.Name = "mnuProcurementPrepareSetFactorReferenceLevel" - Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareSetFactorReferenceLevel.Text = "Set Factor Reference Level..." ' 'mnuProcurementPrepareUseAwardDate ' Me.mnuProcurementPrepareUseAwardDate.Name = "mnuProcurementPrepareUseAwardDate" - Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareUseAwardDate.Text = "Use Award Date (or other)..." ' 'ToolStripSeparator43 ' Me.ToolStripSeparator43.Name = "ToolStripSeparator43" - Me.ToolStripSeparator43.Size = New System.Drawing.Size(355, 6) + Me.ToolStripSeparator43.Size = New System.Drawing.Size(536, 6) ' 'mnuProcurementPrepareSummariseRedFlagsByCountryorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Text = "Summarise Red Flags by Country (or other)..." ' 'mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Text = "Summarise Red Flags by Country and Year (or other)..." ' 'mnuProcurementPrepareMergeAdditionalData ' Me.mnuProcurementPrepareMergeAdditionalData.Name = "mnuProcurementPrepareMergeAdditionalData" - Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareMergeAdditionalData.Text = "Merge Additional Data..." ' 'mnuProcurementDescribe ' Me.mnuProcurementDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeOneVariableSummarise, Me.mnuProcurementDescribeOneVariableGraph, Me.ToolStripSeparator44, Me.mnuProcurementDescribeCategorical, Me.mnuProcurementDescribeNumeric}) Me.mnuProcurementDescribe.Name = "mnuProcurementDescribe" - Me.mnuProcurementDescribe.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementDescribe.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementDescribe.Text = "Describe" ' 'mnuProcurementDescribeOneVariableSummarise ' Me.mnuProcurementDescribeOneVariableSummarise.Name = "mnuProcurementDescribeOneVariableSummarise" - Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(211, 22) + Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(319, 34) Me.mnuProcurementDescribeOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuProcurementDescribeOneVariableGraph ' Me.mnuProcurementDescribeOneVariableGraph.Name = "mnuProcurementDescribeOneVariableGraph" - Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(211, 22) + Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(319, 34) Me.mnuProcurementDescribeOneVariableGraph.Text = "One Variable Graph..." ' 'ToolStripSeparator44 ' Me.ToolStripSeparator44.Name = "ToolStripSeparator44" - Me.ToolStripSeparator44.Size = New System.Drawing.Size(208, 6) + Me.ToolStripSeparator44.Size = New System.Drawing.Size(316, 6) ' 'mnuProcurementDescribeCategorical ' Me.mnuProcurementDescribeCategorical.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeCategoricalOneVarFreq, Me.mnuProcurementDescribeCategoricalTwoVarFreq, Me.ToolStripSeparator52, Me.mnuProcurementDescribeCategoricalBarCharts, Me.mnuProcurementDescribeCategoricalMosaic, Me.mnuProcurementDescribeCategoricalTreemap, Me.DisplayTopNToolStripMenuItem}) Me.mnuProcurementDescribeCategorical.Name = "mnuProcurementDescribeCategorical" - Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(211, 22) + Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(319, 34) Me.mnuProcurementDescribeCategorical.Text = "Categorical" ' 'mnuProcurementDescribeCategoricalOneVarFreq ' Me.mnuProcurementDescribeCategoricalOneVarFreq.Name = "mnuProcurementDescribeCategoricalOneVarFreq" - Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalOneVarFreq.Text = "One Variable Frequencies..." ' 'mnuProcurementDescribeCategoricalTwoVarFreq ' Me.mnuProcurementDescribeCategoricalTwoVarFreq.Name = "mnuProcurementDescribeCategoricalTwoVarFreq" - Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalTwoVarFreq.Text = "Two Variable Frequencies by Sector (or other)..." ' 'ToolStripSeparator52 ' Me.ToolStripSeparator52.Name = "ToolStripSeparator52" - Me.ToolStripSeparator52.Size = New System.Drawing.Size(316, 6) + Me.ToolStripSeparator52.Size = New System.Drawing.Size(479, 6) ' 'mnuProcurementDescribeCategoricalBarCharts ' Me.mnuProcurementDescribeCategoricalBarCharts.Name = "mnuProcurementDescribeCategoricalBarCharts" - Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalBarCharts.Text = "Bar Chart..." ' 'mnuProcurementDescribeCategoricalMosaic ' Me.mnuProcurementDescribeCategoricalMosaic.Name = "mnuProcurementDescribeCategoricalMosaic" - Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalMosaic.Text = "Mosaic Plot..." ' 'mnuProcurementDescribeCategoricalTreemap ' Me.mnuProcurementDescribeCategoricalTreemap.Name = "mnuProcurementDescribeCategoricalTreemap" - Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalTreemap.Text = "Treemap..." ' 'DisplayTopNToolStripMenuItem ' Me.DisplayTopNToolStripMenuItem.Name = "DisplayTopNToolStripMenuItem" - Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(319, 22) + Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(482, 34) Me.DisplayTopNToolStripMenuItem.Text = "Display Top N..." ' 'mnuProcurementDescribeNumeric ' Me.mnuProcurementDescribeNumeric.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeNumericBoxplot, Me.HistogramToolStripMenuItem, Me.ToolStripSeparator53, Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers}) Me.mnuProcurementDescribeNumeric.Name = "mnuProcurementDescribeNumeric" - Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(211, 22) + Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(319, 34) Me.mnuProcurementDescribeNumeric.Text = "Numeric" ' 'mnuProcurementDescribeNumericBoxplot ' Me.mnuProcurementDescribeNumericBoxplot.Name = "mnuProcurementDescribeNumericBoxplot" - Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(258, 22) + Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(389, 34) Me.mnuProcurementDescribeNumericBoxplot.Text = "Boxplot..." ' 'HistogramToolStripMenuItem ' Me.HistogramToolStripMenuItem.Name = "HistogramToolStripMenuItem" - Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(258, 22) + Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(389, 34) Me.HistogramToolStripMenuItem.Text = "Histogram..." ' 'ToolStripSeparator53 ' Me.ToolStripSeparator53.Name = "ToolStripSeparator53" - Me.ToolStripSeparator53.Size = New System.Drawing.Size(255, 6) + Me.ToolStripSeparator53.Size = New System.Drawing.Size(386, 6) ' 'mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers ' Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Name = "mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers" - Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(258, 22) + Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(389, 34) Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Text = "Correlations (Red Flags or others)..." ' 'mnuProcurementMapping ' Me.mnuProcurementMapping.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementMappingMapCountryValues}) Me.mnuProcurementMapping.Name = "mnuProcurementMapping" - Me.mnuProcurementMapping.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementMapping.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementMapping.Text = "Mapping" ' 'mnuProcurementMappingMapCountryValues ' Me.mnuProcurementMappingMapCountryValues.Name = "mnuProcurementMappingMapCountryValues" - Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(189, 22) + Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(285, 34) Me.mnuProcurementMappingMapCountryValues.Text = "Map Country Values..." ' 'mnuProcurementModel ' Me.mnuProcurementModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementModelDefineCorruption, Me.mnuProcurementModelFitModelToolStripMenuItem}) Me.mnuProcurementModel.Name = "mnuProcurementModel" - Me.mnuProcurementModel.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementModel.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementModel.Text = "Model" ' 'mnuProcurementModelDefineCorruption ' Me.mnuProcurementModelDefineCorruption.Name = "mnuProcurementModelDefineCorruption" - Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(233, 22) + Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(351, 34) Me.mnuProcurementModelDefineCorruption.Text = "Define Corruption Indicators..." ' 'mnuProcurementModelFitModelToolStripMenuItem ' Me.mnuProcurementModelFitModelToolStripMenuItem.Name = "mnuProcurementModelFitModelToolStripMenuItem" - Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(233, 22) + Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(351, 34) Me.mnuProcurementModelFitModelToolStripMenuItem.Text = "Fit Model..." ' 'ToolStripSeparator45 ' Me.ToolStripSeparator45.Name = "ToolStripSeparator45" - Me.ToolStripSeparator45.Size = New System.Drawing.Size(214, 6) + Me.ToolStripSeparator45.Size = New System.Drawing.Size(324, 6) ' 'mnuProcurementDefineRedFlags ' Me.mnuProcurementDefineRedFlags.Name = "mnuProcurementDefineRedFlags" - Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementDefineRedFlags.Text = "Define Red Flag Variables..." ' 'mnuProcurementUseCRI ' Me.mnuProcurementUseCRI.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementCTFVCalculateCRI, Me.mnuProcurementUseCRISummariseCRIbyCountry}) Me.mnuProcurementUseCRI.Name = "mnuProcurementUseCRI" - Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementUseCRI.Text = "Corruption Risk Index (CRI)" ' 'mnuProcurementCTFVCalculateCRI ' Me.mnuProcurementCTFVCalculateCRI.Name = "mnuProcurementCTFVCalculateCRI" - Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(278, 22) + Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(418, 34) Me.mnuProcurementCTFVCalculateCRI.Text = "Define Corruption Risk Index (CRI)..." ' 'mnuProcurementUseCRISummariseCRIbyCountry ' Me.mnuProcurementUseCRISummariseCRIbyCountry.Name = "mnuProcurementUseCRISummariseCRIbyCountry" - Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(278, 22) + Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(418, 34) Me.mnuProcurementUseCRISummariseCRIbyCountry.Text = "Summarise CRI by Country (or other)..." ' 'mnuOptionsByContext ' Me.mnuOptionsByContext.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckData, Me.mnuOptionsByContextDefine, Me.mnuOptionsByContextPrepare, Me.mnuOptionsByContextDescribe, Me.mnuOptionsByContextModel, Me.mnuOptionsByContextCropModel}) Me.mnuOptionsByContext.Name = "mnuOptionsByContext" - Me.mnuOptionsByContext.Size = New System.Drawing.Size(84, 22) + Me.mnuOptionsByContext.Size = New System.Drawing.Size(124, 29) Me.mnuOptionsByContext.Text = "Experiments" ' 'mnuOptionsByContextCheckData ' Me.mnuOptionsByContextCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckDataDuplicateRows, Me.mnuOptionsByContextCheckDataCompareColumns, Me.ToolStripSeparator47, Me.mnuOptionsByContextCheckDataOneVariableSummarise, Me.mnuOptionsByContextCheckDataOneVariableGraph, Me.mnuOptionsByContextCheckDataOneVariableFrequencies}) Me.mnuOptionsByContextCheckData.Name = "mnuOptionsByContextCheckData" - Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextCheckData.Text = "Check Data" ' 'mnuOptionsByContextCheckDataDuplicateRows ' Me.mnuOptionsByContextCheckDataDuplicateRows.Name = "mnuOptionsByContextCheckDataDuplicateRows" - Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataDuplicateRows.Text = "Duplicate Rows..." ' 'mnuOptionsByContextCheckDataCompareColumns ' Me.mnuOptionsByContextCheckDataCompareColumns.Name = "mnuOptionsByContextCheckDataCompareColumns" - Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataCompareColumns.Text = "Compare Columns..." ' 'ToolStripSeparator47 ' Me.ToolStripSeparator47.Name = "ToolStripSeparator47" - Me.ToolStripSeparator47.Size = New System.Drawing.Size(212, 6) + Me.ToolStripSeparator47.Size = New System.Drawing.Size(321, 6) ' 'mnuOptionsByContextCheckDataOneVariableSummarise ' Me.mnuOptionsByContextCheckDataOneVariableSummarise.Name = "mnuOptionsByContextCheckDataOneVariableSummarise" - Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuOptionsByContextCheckDataOneVariableGraph ' Me.mnuOptionsByContextCheckDataOneVariableGraph.Name = "mnuOptionsByContextCheckDataOneVariableGraph" - Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuOptionsByContextCheckDataOneVariableFrequencies ' Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Name = "mnuOptionsByContextCheckDataOneVariableFrequencies" - Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Text = "One Variable Frequencies..." ' 'mnuOptionsByContextDefine ' Me.mnuOptionsByContextDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDefineOnStation, Me.mnuOptionsByContextDefineOnFarm}) Me.mnuOptionsByContextDefine.Name = "mnuOptionsByContextDefine" - Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextDefine.Text = "Define" ' 'mnuOptionsByContextDefineOnStation ' Me.mnuOptionsByContextDefineOnStation.Name = "mnuOptionsByContextDefineOnStation" - Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(147, 22) + Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(222, 34) Me.mnuOptionsByContextDefineOnStation.Text = "On - Station..." ' 'mnuOptionsByContextDefineOnFarm ' Me.mnuOptionsByContextDefineOnFarm.Name = "mnuOptionsByContextDefineOnFarm" - Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(147, 22) + Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(222, 34) Me.mnuOptionsByContextDefineOnFarm.Text = "On - Farm..." ' 'mnuOptionsByContextPrepare ' Me.mnuOptionsByContextPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions, Me.ToolStripSeparator48, Me.mnuOptionsByContextMergeAdditionalData, Me.mnuOptionsByContextPrepareStack, Me.mnuOptionsByContextPrepareUnstack}) Me.mnuOptionsByContextPrepare.Name = "mnuOptionsByContextPrepare" - Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextPrepare.Text = "Prepare" ' 'mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions ' Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Name = "mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions" - Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(282, 22) + Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(421, 34) Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Text = "Calculate Difference Between Options..." ' 'ToolStripSeparator48 ' Me.ToolStripSeparator48.Name = "ToolStripSeparator48" - Me.ToolStripSeparator48.Size = New System.Drawing.Size(279, 6) + Me.ToolStripSeparator48.Size = New System.Drawing.Size(418, 6) ' 'mnuOptionsByContextMergeAdditionalData ' Me.mnuOptionsByContextMergeAdditionalData.Name = "mnuOptionsByContextMergeAdditionalData" - Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(282, 22) + Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(421, 34) Me.mnuOptionsByContextMergeAdditionalData.Text = "Merge Additional Data..." ' 'mnuOptionsByContextPrepareStack ' Me.mnuOptionsByContextPrepareStack.Name = "mnuOptionsByContextPrepareStack" - Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(282, 22) + Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(421, 34) Me.mnuOptionsByContextPrepareStack.Text = "Stack (Pivot Longer)..." ' 'mnuOptionsByContextPrepareUnstack ' Me.mnuOptionsByContextPrepareUnstack.Name = "mnuOptionsByContextPrepareUnstack" - Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(282, 22) + Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(421, 34) Me.mnuOptionsByContextPrepareUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuOptionsByContextDescribe ' Me.mnuOptionsByContextDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDescribeCompareTwoTreatments, Me.mnuOptionsByContextDescribeCompareMultipleTreatments, Me.mnuOptionsByContextDescribeBoxplot}) Me.mnuOptionsByContextDescribe.Name = "mnuOptionsByContextDescribe" - Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextDescribe.Text = "Describe" ' 'mnuOptionsByContextDescribeCompareTwoTreatments ' Me.mnuOptionsByContextDescribeCompareTwoTreatments.Name = "mnuOptionsByContextDescribeCompareTwoTreatments" - Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(224, 22) + Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(337, 34) Me.mnuOptionsByContextDescribeCompareTwoTreatments.Text = "Compare Two Options..." ' 'mnuOptionsByContextDescribeCompareMultipleTreatments ' Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Enabled = False Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Name = "mnuOptionsByContextDescribeCompareMultipleTreatments" - Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(224, 22) + Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(337, 34) Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Text = "Compare Multiple Options..." ' 'mnuOptionsByContextDescribeBoxplot ' Me.mnuOptionsByContextDescribeBoxplot.Name = "mnuOptionsByContextDescribeBoxplot" - Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(224, 22) + Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(337, 34) Me.mnuOptionsByContextDescribeBoxplot.Text = "Boxplot..." ' 'mnuOptionsByContextModel ' Me.mnuOptionsByContextModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextModelFitModel, Me.mnuOptionsByContextGeneralFitModel}) Me.mnuOptionsByContextModel.Name = "mnuOptionsByContextModel" - Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextModel.Text = "Model" ' 'mnuOptionsByContextModelFitModel ' Me.mnuOptionsByContextModelFitModel.Name = "mnuOptionsByContextModelFitModel" - Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(176, 22) + Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(265, 34) Me.mnuOptionsByContextModelFitModel.Text = "Fit Model..." ' 'mnuOptionsByContextGeneralFitModel ' Me.mnuOptionsByContextGeneralFitModel.Name = "mnuOptionsByContextGeneralFitModel" - Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(176, 22) + Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(265, 34) Me.mnuOptionsByContextGeneralFitModel.Text = "General Fit Model..." ' 'mnuOptionsByContextCropModel ' Me.mnuOptionsByContextCropModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCropModelApsimxExamples}) Me.mnuOptionsByContextCropModel.Name = "mnuOptionsByContextCropModel" - Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextCropModel.Text = "Crop Model" ' 'mnuOptionsByContextCropModelApsimxExamples ' Me.mnuOptionsByContextCropModelApsimxExamples.Name = "mnuOptionsByContextCropModelApsimxExamples" - Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(176, 22) + Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(264, 34) Me.mnuOptionsByContextCropModelApsimxExamples.Text = "Apsimx Examples..." ' 'mnuTools ' Me.mnuTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuToolsRunRCode, Me.mnuToolsRestartR, Me.mnuToolsCheckForUpdates, Me.mnuToolsClearOutputWindow, Me.ToolStripSeparator5, Me.mnuToolsSaveCurrentOptions, Me.mnuToolsRestoreBackup, Me.mnuToolsInstallRPackage, Me.mnuToolsOptions}) Me.mnuTools.Name = "mnuTools" - Me.mnuTools.Size = New System.Drawing.Size(46, 22) + Me.mnuTools.Size = New System.Drawing.Size(69, 29) Me.mnuTools.Text = "Tools" ' 'mnuToolsRunRCode ' Me.mnuToolsRunRCode.Enabled = False Me.mnuToolsRunRCode.Name = "mnuToolsRunRCode" - Me.mnuToolsRunRCode.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsRunRCode.Size = New System.Drawing.Size(298, 34) Me.mnuToolsRunRCode.Tag = "Run_R_Code..." Me.mnuToolsRunRCode.Text = "Run R Code..." ' @@ -5012,54 +5022,54 @@ Partial Class frmMain ' Me.mnuToolsRestartR.Enabled = False Me.mnuToolsRestartR.Name = "mnuToolsRestartR" - Me.mnuToolsRestartR.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsRestartR.Size = New System.Drawing.Size(298, 34) Me.mnuToolsRestartR.Tag = "Restart_R" Me.mnuToolsRestartR.Text = "Restart R" ' 'mnuToolsCheckForUpdates ' Me.mnuToolsCheckForUpdates.Name = "mnuToolsCheckForUpdates" - Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(298, 34) Me.mnuToolsCheckForUpdates.Tag = "Check_for_Updates..." Me.mnuToolsCheckForUpdates.Text = "Check for Updates..." ' 'mnuToolsClearOutputWindow ' Me.mnuToolsClearOutputWindow.Name = "mnuToolsClearOutputWindow" - Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(298, 34) Me.mnuToolsClearOutputWindow.Tag = "Clear_Output_Window..." Me.mnuToolsClearOutputWindow.Text = "Clear Output Window..." ' 'ToolStripSeparator5 ' Me.ToolStripSeparator5.Name = "ToolStripSeparator5" - Me.ToolStripSeparator5.Size = New System.Drawing.Size(195, 6) + Me.ToolStripSeparator5.Size = New System.Drawing.Size(295, 6) ' 'mnuToolsSaveCurrentOptions ' Me.mnuToolsSaveCurrentOptions.Enabled = False Me.mnuToolsSaveCurrentOptions.Name = "mnuToolsSaveCurrentOptions" - Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(298, 34) Me.mnuToolsSaveCurrentOptions.Tag = "Save_Current_Options..." Me.mnuToolsSaveCurrentOptions.Text = "Save Current Options..." ' 'mnuToolsRestoreBackup ' Me.mnuToolsRestoreBackup.Name = "mnuToolsRestoreBackup" - Me.mnuToolsRestoreBackup.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsRestoreBackup.Size = New System.Drawing.Size(298, 34) Me.mnuToolsRestoreBackup.Tag = "Load_Options..." Me.mnuToolsRestoreBackup.Text = "Restore Backup..." ' 'mnuToolsInstallRPackage ' Me.mnuToolsInstallRPackage.Name = "mnuToolsInstallRPackage" - Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(298, 34) Me.mnuToolsInstallRPackage.Text = "Install R Package..." ' 'mnuToolsOptions ' Me.mnuToolsOptions.Name = "mnuToolsOptions" - Me.mnuToolsOptions.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsOptions.Size = New System.Drawing.Size(298, 34) Me.mnuToolsOptions.Tag = "Options..." Me.mnuToolsOptions.Text = "Options..." ' @@ -5073,7 +5083,8 @@ Partial Class frmMain ' Me.splOverall.BackColor = System.Drawing.Color.LightGray Me.splOverall.Dock = System.Windows.Forms.DockStyle.Fill - Me.splOverall.Location = New System.Drawing.Point(0, 61) + Me.splOverall.Location = New System.Drawing.Point(0, 72) + Me.splOverall.Margin = New System.Windows.Forms.Padding(4) Me.splOverall.Name = "splOverall" Me.splOverall.Orientation = System.Windows.Forms.Orientation.Horizontal ' @@ -5086,9 +5097,9 @@ Partial Class frmMain ' Me.splOverall.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splOverall.Panel2.Controls.Add(Me.splDataOutput) - Me.splOverall.Size = New System.Drawing.Size(834, 399) - Me.splOverall.SplitterDistance = 160 - Me.splOverall.SplitterWidth = 5 + Me.splOverall.Size = New System.Drawing.Size(1251, 619) + Me.splOverall.SplitterDistance = 248 + Me.splOverall.SplitterWidth = 8 Me.splOverall.TabIndex = 10 ' 'splExtraWindows @@ -5096,6 +5107,7 @@ Partial Class frmMain Me.splExtraWindows.BackColor = System.Drawing.Color.LightGray Me.splExtraWindows.Dock = System.Windows.Forms.DockStyle.Fill Me.splExtraWindows.Location = New System.Drawing.Point(0, 0) + Me.splExtraWindows.Margin = New System.Windows.Forms.Padding(4) Me.splExtraWindows.Name = "splExtraWindows" ' 'splExtraWindows.Panel1 @@ -5107,9 +5119,9 @@ Partial Class frmMain ' Me.splExtraWindows.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splExtraWindows.Panel2.Controls.Add(Me.ucrScriptWindow) - Me.splExtraWindows.Size = New System.Drawing.Size(834, 160) - Me.splExtraWindows.SplitterDistance = 252 - Me.splExtraWindows.SplitterWidth = 5 + Me.splExtraWindows.Size = New System.Drawing.Size(1251, 248) + Me.splExtraWindows.SplitterDistance = 378 + Me.splExtraWindows.SplitterWidth = 8 Me.splExtraWindows.TabIndex = 0 ' 'splMetadata @@ -5117,6 +5129,7 @@ Partial Class frmMain Me.splMetadata.BackColor = System.Drawing.Color.LightGray Me.splMetadata.Dock = System.Windows.Forms.DockStyle.Fill Me.splMetadata.Location = New System.Drawing.Point(0, 0) + Me.splMetadata.Margin = New System.Windows.Forms.Padding(4) Me.splMetadata.Name = "splMetadata" ' 'splMetadata.Panel1 @@ -5127,9 +5140,9 @@ Partial Class frmMain ' Me.splMetadata.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splMetadata.Panel2.Controls.Add(Me.ucrDataFrameMeta) - Me.splMetadata.Size = New System.Drawing.Size(252, 160) - Me.splMetadata.SplitterDistance = 68 - Me.splMetadata.SplitterWidth = 5 + Me.splMetadata.Size = New System.Drawing.Size(378, 248) + Me.splMetadata.SplitterDistance = 102 + Me.splMetadata.SplitterWidth = 8 Me.splMetadata.TabIndex = 0 ' 'ucrColumnMeta @@ -5139,9 +5152,9 @@ Partial Class frmMain Me.ucrColumnMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrColumnMeta.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrColumnMeta.Location = New System.Drawing.Point(0, 0) - Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrColumnMeta.Name = "ucrColumnMeta" - Me.ucrColumnMeta.Size = New System.Drawing.Size(68, 160) + Me.ucrColumnMeta.Size = New System.Drawing.Size(102, 248) Me.ucrColumnMeta.TabIndex = 0 ' 'ucrDataFrameMeta @@ -5150,9 +5163,9 @@ Partial Class frmMain Me.ucrDataFrameMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrDataFrameMeta.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrDataFrameMeta.Location = New System.Drawing.Point(0, 0) - Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrDataFrameMeta.Name = "ucrDataFrameMeta" - Me.ucrDataFrameMeta.Size = New System.Drawing.Size(179, 160) + Me.ucrDataFrameMeta.Size = New System.Drawing.Size(268, 248) Me.ucrDataFrameMeta.TabIndex = 0 ' 'ucrScriptWindow @@ -5161,9 +5174,9 @@ Partial Class frmMain Me.ucrScriptWindow.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrScriptWindow.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrScriptWindow.Location = New System.Drawing.Point(0, 0) - Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrScriptWindow.Name = "ucrScriptWindow" - Me.ucrScriptWindow.Size = New System.Drawing.Size(577, 160) + Me.ucrScriptWindow.Size = New System.Drawing.Size(865, 248) Me.ucrScriptWindow.strActiveTabText = "" Me.ucrScriptWindow.TabIndex = 2 Me.ucrScriptWindow.Tag = "Script_Window" @@ -5173,6 +5186,7 @@ Partial Class frmMain Me.splDataOutput.BackColor = System.Drawing.Color.LightGray Me.splDataOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.splDataOutput.Location = New System.Drawing.Point(0, 0) + Me.splDataOutput.Margin = New System.Windows.Forms.Padding(4) Me.splDataOutput.Name = "splDataOutput" ' 'splDataOutput.Panel1 @@ -5184,9 +5198,9 @@ Partial Class frmMain ' Me.splDataOutput.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splDataOutput.Panel2.Controls.Add(Me.ucrOutput) - Me.splDataOutput.Size = New System.Drawing.Size(834, 234) - Me.splDataOutput.SplitterDistance = 382 - Me.splDataOutput.SplitterWidth = 5 + Me.splDataOutput.Size = New System.Drawing.Size(1251, 363) + Me.splDataOutput.SplitterDistance = 573 + Me.splDataOutput.SplitterWidth = 8 Me.splDataOutput.TabIndex = 0 ' 'ucrDataViewer @@ -5196,9 +5210,9 @@ Partial Class frmMain Me.ucrDataViewer.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrDataViewer.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrDataViewer.Location = New System.Drawing.Point(0, 0) - Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrDataViewer.Name = "ucrDataViewer" - Me.ucrDataViewer.Size = New System.Drawing.Size(382, 234) + Me.ucrDataViewer.Size = New System.Drawing.Size(573, 363) Me.ucrDataViewer.TabIndex = 0 Me.ucrDataViewer.Tag = "Data_View" ' @@ -5208,9 +5222,9 @@ Partial Class frmMain Me.ucrOutput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrOutput.Location = New System.Drawing.Point(0, 0) - Me.ucrOutput.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrOutput.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrOutput.Name = "ucrOutput" - Me.ucrOutput.Size = New System.Drawing.Size(447, 234) + Me.ucrOutput.Size = New System.Drawing.Size(670, 363) Me.ucrOutput.TabIndex = 0 ' 'mnuPlotly @@ -5250,9 +5264,9 @@ Partial Class frmMain ' 'frmMain ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.ClientSize = New System.Drawing.Size(834, 482) + Me.ClientSize = New System.Drawing.Size(1251, 723) Me.Controls.Add(Me.splOverall) Me.Controls.Add(Me.stsStrip) Me.Controls.Add(Me.Tool_strip) @@ -5260,6 +5274,7 @@ Partial Class frmMain Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar + Me.Margin = New System.Windows.Forms.Padding(4) Me.Name = "frmMain" Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized @@ -5972,4 +5987,5 @@ Partial Class frmMain Friend WithEvents mnuImportFromOpenAppBuilder As ToolStripMenuItem Friend WithEvents ToolStripSeparator15 As ToolStripSeparator Friend WithEvents mnuClimaticCheckDataDistances As ToolStripMenuItem + Friend WithEvents mnuUndo As ToolStripMenuItem End Class diff --git a/instat/frmMain.resx b/instat/frmMain.resx index c73bcdce42b..e679779467e 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -136,7 +136,7 @@ iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ h9mHMiJLMGYmmi1R/5gzMRjjTNTMoEtYJlmWUVwMiSYODMvG1MzhnDNzA0opsJFAKGxxMMrHoB+8trSv P899763lo+32R+GX3PScc999v95zzj3nvgRImJjkYe3zkxQUDauMEHHdd06o8swkrTHxud845JT0SNrq QyB2OAPYXTaE7FwLaWu443G7D+kpv0ORvVquZrnDi6KEkKuHpznkl/dJWrwQRNNZJ7JfuIrCklvweL2S @@ -162,7 +162,7 @@ iVBORw0KGgoAAAANSUhEUgAAAG8AAABvCAYAAADixZ5gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAjpSURBVHhe7V3LaxVXHE4EwQq+IAaVbgQf0FYLBQnx9Q+4 + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAjpSURBVHhe7V3LaxVXHE4EwQq+IAaVbgQf0FYLBQnx9Q+4 UExQ92oSqkVXopsuEsymXbRYCkVtgkJtVfpY+Eh1YaWWdiOJWdgWbWmlG000kTxujMnp+cY5ZnLyu7nn NXPPuZkPPpLce+b7nd/3hXtn5p6ZW8VyBIs8vICRhxcw8vACRh5ewMjDCxh5eAEjDy9gGIU3OjrKmpub WXV1NauqqsppSPgHH+GnCbTDe/bsGauvrycnk9OM8PPp06exw+rQCm9kZITV1dWRE8hpR/g6PDwcO60G diff --git a/instat/frmMain.vb b/instat/frmMain.vb index d86e0193856..d911c3daadc 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2894,4 +2894,8 @@ Public Class frmMain Private Sub mnuClimaticCheckDataDistances_Click(sender As Object, e As EventArgs) Handles mnuClimaticCheckDataDistances.Click dlgDistances.ShowDialog() End Sub + + Private Sub mnuUndo_Click(sender As Object, e As EventArgs) Handles mnuUndo.Click + ucrDataViewer.Undo() + End Sub End Class diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index b0c7ac4ce48..ebdf4047bf9 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -194,7 +194,7 @@ DataSheet$set("public", "clear_metadata", function() { ) DataSheet$set("public", "has_history", function() { - return(length(private$history)) + return(length(private$history) > 1) } ) diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index 9f3690bce3f..adb105daee0 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -101,6 +101,7 @@ Public Class ucrDataView _grid.AddRowData(dataFrame) _grid.UpdateWorksheetStyle(fillWorkSheet) dataFrame.clsVisibleDataFramePage.HasChanged = False + frmMain.mnuUndo.Enabled = dataFrame.clsVisibleDataFramePage.HasHistory RefreshDisplayInformation() End Sub @@ -275,6 +276,7 @@ Public Class ucrDataView SetDisplayLabels() UpdateNavigationButtons() SetGridVisibility(True) + frmMain.mnuUndo.Enabled = GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasHistory Else frmMain.tstatus.Text = GetTranslation("No data loaded") SetGridVisibility(False) @@ -1010,27 +1012,22 @@ Public Class ucrDataView EditCell() End Sub - Private Sub FindRow() + Public Sub FindRow() dlgFindInVariableOrFilter.ShowDialog() End Sub - Private Sub Undo() - If frmMain.clsInstatOptions.bUndoSwitchAction Then - Dim bUndo As Boolean = True - If GetCurrentDataFrameFocus.iTotalRowCount > 1000 Then - Dim result As DialogResult = MessageBox.Show(Me, "The dataset you are working with has more than 1000 rows, which may cause the undo operation to be slow. Do you want to proceed?", - "Large Data Set Detected", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) - ' Check if the user clicked No - If result = DialogResult.No Then - bUndo = False - End If - End If - + Public Sub Undo() + If (GetCurrentDataFrameFocus().iTotalColumnCount >= frmMain.clsInstatOptions.iUndoColLimit) OrElse + (GetCurrentDataFrameFocus().iTotalRowCount >= frmMain.clsInstatOptions.iUndoRowLimit) Then + frmMain.mnuUndo.Enabled = False + Exit Sub + End If - If bUndo Then - GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() - End If + If GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasHistory Then + frmMain.mnuUndo.Enabled = True + GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() End If + End Sub Public Sub SearchRowInGrid(rowNumbers As List(Of Integer), strColumn As String, Optional iRow As Integer = 0, From 08342f5723e2e3202973c9987bf9e2ad7b8edebe Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 16 Oct 2024 15:17:51 +0300 Subject: [PATCH 10/32] implemented Ctrl+Z under undo menu --- instat/Interface/IDataViewGrid.vb | 2 -- .../UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb | 2 -- .../UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb | 9 --------- instat/frmMain.Designer.vb | 3 +-- instat/ucrDataView.vb | 1 - 5 files changed, 1 insertion(+), 16 deletions(-) diff --git a/instat/Interface/IDataViewGrid.vb b/instat/Interface/IDataViewGrid.vb index b4df19941b6..4145675170f 100644 --- a/instat/Interface/IDataViewGrid.vb +++ b/instat/Interface/IDataViewGrid.vb @@ -33,8 +33,6 @@ Public Interface IDataViewGrid Event FindRow() - Event Undo() - Sub AddColumns(visiblePage As clsDataFramePage) Sub AddRowData(dataFrame As clsDataFrame) diff --git a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb index 3b0a6cb9641..3977f595ba1 100644 --- a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb +++ b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb @@ -33,8 +33,6 @@ Public Class ucrDataViewLinuxGrid Public Event FindRow() Implements IDataViewGrid.FindRow - Public Event Undo() Implements IDataViewGrid.Undo - Public Event WorksheetChanged() Implements IDataViewGrid.WorksheetChanged Public Event WorksheetRemoved(worksheet As clsWorksheetAdapter) Implements IDataViewGrid.WorksheetRemoved diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index ffc92709e83..af8a4ea89e3 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -33,8 +33,6 @@ Public Class ucrDataViewReoGrid Public Event FindRow() Implements IDataViewGrid.FindRow - Public Event Undo() Implements IDataViewGrid.Undo - Public Event WorksheetChanged() Implements IDataViewGrid.WorksheetChanged Public Event WorksheetRemoved(worksheet As clsWorksheetAdapter) Implements IDataViewGrid.WorksheetRemoved @@ -283,13 +281,6 @@ Public Class ucrDataViewReoGrid ElseIf (e.KeyCode And Not Keys.Modifiers) = Keys.F AndAlso e.Modifiers = Keys.Control Then RaiseEvent FindRow() End If - - ' Detect Ctrl+Z for Undo operation - If e.Control AndAlso e.KeyCode = Keys.Z Then - RaiseEvent Undo() - e.Handled = True - e.SuppressKeyPress = True - End If End Sub Private Function GetColumnIndex(strColName As String) As Integer diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index af04f1a6834..925cc2f7010 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -3031,8 +3031,7 @@ Partial Class frmMain 'mnuUndo ' Me.mnuUndo.Name = "mnuUndo" - Me.mnuUndo.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Shift) _ - Or System.Windows.Forms.Keys.Z), System.Windows.Forms.Keys) + Me.mnuUndo.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Z), System.Windows.Forms.Keys) Me.mnuUndo.Size = New System.Drawing.Size(270, 34) Me.mnuUndo.Text = "Undo" ' diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index adb105daee0..fcb92ca83ec 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -89,7 +89,6 @@ Public Class ucrDataView AddHandler _grid.DeleteValuesToDataframe, AddressOf DeleteCell_Click AddHandler _grid.EditCell, AddressOf EditCell AddHandler _grid.FindRow, AddressOf FindRow - AddHandler _grid.Undo, AddressOf Undo End Sub Private Sub RefreshWorksheet(fillWorkSheet As clsWorksheetAdapter, dataFrame As clsDataFrame) From 66d205be264ac16a510e8e29791def313c42c7f8 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 16 Oct 2024 18:15:06 +0300 Subject: [PATCH 11/32] design fixes, and added a msg for the limits when exceeded --- instat/clsInstatOptionsDefaults.vb | 4 +- instat/dlgOptions.Designer.vb | 92 +++++++++++++++--------------- instat/dlgOptions.vb | 4 +- instat/ucrDataView.vb | 28 ++++++++- 4 files changed, 75 insertions(+), 53 deletions(-) diff --git a/instat/clsInstatOptionsDefaults.vb b/instat/clsInstatOptionsDefaults.vb index ffcf62d0ddb..d839f3c53b4 100644 --- a/instat/clsInstatOptionsDefaults.vb +++ b/instat/clsInstatOptionsDefaults.vb @@ -33,8 +33,8 @@ Public Class clsInstatOptionsDefaults Public Shared ReadOnly DEFAULTiPreviewRows As Integer = 10 Public Shared ReadOnly DEFAULTiMaxRows As Integer = 1000 Public Shared ReadOnly DEFAULTiMaxCols As Integer = 50 - Public Shared ReadOnly DEFAULTiUndoColLimit As Integer = 200 - Public Shared ReadOnly DEFAULTiUndoRowLimit As Integer = 200000 + Public Shared ReadOnly DEFAULTiUndoColLimit As Integer = 0 + Public Shared ReadOnly DEFAULTiUndoRowLimit As Integer = 100000 Public Shared ReadOnly DEFAULTstrComment As String = "Dialog:" Public Shared ReadOnly DEFAULTstrGraphDisplayOption As String = "view_output_window" Public Shared ReadOnly DEFAULTbChangeDataFrame As Boolean = False diff --git a/instat/dlgOptions.Designer.vb b/instat/dlgOptions.Designer.vb index 4f9e071cf9f..4ffbef3ba91 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 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") + Dim TreeNode7 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Languages") + Dim TreeNode8 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Comments") + Dim TreeNode9 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Import") + Dim TreeNode10 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Output Window") + Dim TreeNode11 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Commands") + Dim TreeNode12 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() @@ -94,6 +94,7 @@ Partial Class dlgOptions Me.ucrNudWaitSeconds = New instat.ucrNud() Me.ucrChkIncludeDefaultParams = New instat.ucrCheck() Me.tbpDataView = New System.Windows.Forms.TabPage() + Me.Label4 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() Me.ucrNudRowUndoLimit = New instat.ucrNud() Me.Label2 = New System.Windows.Forms.Label() @@ -133,7 +134,6 @@ Partial Class dlgOptions Me.ucrInputDatabaseName = New instat.ucrInputTextBox() Me.tbpWebsite = New System.Windows.Forms.TabPage() Me.ucrChkReminder = New instat.ucrCheck() - Me.Label4 = New System.Windows.Forms.Label() CType(Me.spltControls, System.ComponentModel.ISupportInitialize).BeginInit() Me.spltControls.Panel1.SuspendLayout() Me.spltControls.Panel2.SuspendLayout() @@ -249,29 +249,29 @@ Partial Class dlgOptions Me.trOptions.Location = New System.Drawing.Point(0, 0) Me.trOptions.Margin = New System.Windows.Forms.Padding(4) Me.trOptions.Name = "trOptions" - 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}) + TreeNode7.Name = "ndLanguages" + TreeNode7.Tag = "1" + TreeNode7.Text = "Languages" + TreeNode7.ToolTipText = "Choose different languages" + TreeNode8.Name = "ndComments" + TreeNode8.Tag = "2" + TreeNode8.Text = "Comments" + TreeNode8.ToolTipText = "Comments for the dialogs" + TreeNode9.Name = "ndImport" + TreeNode9.Tag = "3" + TreeNode9.Text = "Import" + TreeNode9.ToolTipText = "Import Data Settings" + TreeNode10.Name = "ndOutputWindow" + TreeNode10.Tag = "4" + TreeNode10.Text = "Output Window" + TreeNode10.ToolTipText = "Output Window Formatting Options" + TreeNode11.Name = "ndCommands" + TreeNode11.Tag = "8" + TreeNode11.Text = "Commands" + TreeNode11.ToolTipText = "Commands Options" + TreeNode12.Name = "ndDataView" + TreeNode12.Text = "Data View" + Me.trOptions.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode7, TreeNode8, TreeNode9, TreeNode10, TreeNode11, TreeNode12}) Me.trOptions.Size = New System.Drawing.Size(276, 476) Me.trOptions.TabIndex = 0 ' @@ -786,10 +786,20 @@ Partial Class dlgOptions Me.tbpDataView.Text = "Data View" Me.tbpDataView.UseVisualStyleBackColor = True ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.Location = New System.Drawing.Point(25, 297) + Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(541, 20) + Me.Label4.TabIndex = 11 + Me.Label4.Text = "(Any changes from the default only apply to the current session of R-Instat.)" + ' 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(781, 230) + Me.Label3.Location = New System.Drawing.Point(669, 262) Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(46, 20) @@ -801,19 +811,19 @@ Partial Class dlgOptions Me.ucrNudRowUndoLimit.AutoSize = True Me.ucrNudRowUndoLimit.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudRowUndoLimit.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudRowUndoLimit.Location = New System.Drawing.Point(692, 227) + Me.ucrNudRowUndoLimit.Location = New System.Drawing.Point(529, 259) Me.ucrNudRowUndoLimit.Margin = New System.Windows.Forms.Padding(8) Me.ucrNudRowUndoLimit.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudRowUndoLimit.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudRowUndoLimit.Name = "ucrNudRowUndoLimit" - Me.ucrNudRowUndoLimit.Size = New System.Drawing.Size(77, 30) + Me.ucrNudRowUndoLimit.Size = New System.Drawing.Size(91, 30) Me.ucrNudRowUndoLimit.TabIndex = 9 Me.ucrNudRowUndoLimit.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(595, 230) + Me.Label2.Location = New System.Drawing.Point(629, 230) Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(86, 20) @@ -835,12 +845,12 @@ Partial Class dlgOptions Me.ucrNudColUndoLimit.AutoSize = True Me.ucrNudColUndoLimit.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudColUndoLimit.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudColUndoLimit.Location = New System.Drawing.Point(506, 227) + Me.ucrNudColUndoLimit.Location = New System.Drawing.Point(529, 227) Me.ucrNudColUndoLimit.Margin = New System.Windows.Forms.Padding(8) Me.ucrNudColUndoLimit.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudColUndoLimit.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudColUndoLimit.Name = "ucrNudColUndoLimit" - Me.ucrNudColUndoLimit.Size = New System.Drawing.Size(81, 30) + Me.ucrNudColUndoLimit.Size = New System.Drawing.Size(91, 30) Me.ucrNudColUndoLimit.TabIndex = 6 Me.ucrNudColUndoLimit.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -1238,16 +1248,6 @@ Partial Class dlgOptions Me.ucrChkReminder.Size = New System.Drawing.Size(620, 51) Me.ucrChkReminder.TabIndex = 2 ' - 'Label4 - ' - Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(25, 262) - Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(541, 20) - Me.Label4.TabIndex = 11 - Me.Label4.Text = "(Any changes from the default only apply to the current session of R-Instat.)" - ' 'dlgOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) diff --git a/instat/dlgOptions.vb b/instat/dlgOptions.vb index f355500249f..f1898476d71 100644 --- a/instat/dlgOptions.vb +++ b/instat/dlgOptions.vb @@ -62,10 +62,10 @@ Public Class dlgOptions ucrNudWaitSeconds.Increment = 0.5 ucrNudColUndoLimit.Maximum = 1000 - ucrNudColUndoLimit.Minimum = 200 + ucrNudColUndoLimit.Minimum = 0 ucrNudColUndoLimit.Increment = 100 ucrNudRowUndoLimit.Maximum = Integer.MaxValue - ucrNudRowUndoLimit.Minimum = 200000 + ucrNudRowUndoLimit.Minimum = 100000 ucrNudRowUndoLimit.Increment = 100000 strPreviewText = "R-Instat 2017" diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index fcb92ca83ec..22bd3f5a733 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -1017,13 +1017,35 @@ Public Class ucrDataView Public Sub Undo() If (GetCurrentDataFrameFocus().iTotalColumnCount >= frmMain.clsInstatOptions.iUndoColLimit) OrElse - (GetCurrentDataFrameFocus().iTotalRowCount >= frmMain.clsInstatOptions.iUndoRowLimit) Then - frmMain.mnuUndo.Enabled = False + (GetCurrentDataFrameFocus().iTotalRowCount >= frmMain.clsInstatOptions.iUndoRowLimit) Then + + ' Retrieve the default limits for rows and columns + Dim colLimit As Integer = frmMain.clsInstatOptions.iUndoColLimit + Dim rowLimit As Integer = frmMain.clsInstatOptions.iUndoRowLimit + + ' Construct the concise message + Dim msg As String = "The current data frame exceeds the undo limit (Columns: " & colLimit & ", Rows: " & rowLimit & ")." + + ' Append information on whether it's the rows, columns, or both + If GetCurrentDataFrameFocus().iTotalColumnCount >= colLimit AndAlso + GetCurrentDataFrameFocus().iTotalRowCount >= rowLimit Then + msg &= " Both columns and rows exceed the limit." + ElseIf GetCurrentDataFrameFocus().iTotalColumnCount >= colLimit Then + msg &= " Columns exceed the limit." + ElseIf GetCurrentDataFrameFocus().iTotalRowCount >= rowLimit Then + msg &= " Rows exceed the limit." + End If + + msg &= " Please go to Tools > Options to adjust the limits." + + ' Display the message box + MsgBox(msg, vbExclamation, "Undo Limit Exceeded") + Exit Sub End If + If GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasHistory Then - frmMain.mnuUndo.Enabled = True GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() End If From 1a60e3be1a7837161cfd1718685cb37a075dbd2c Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 16 Oct 2024 18:24:33 +0300 Subject: [PATCH 12/32] set the deault column to 100 --- instat/clsInstatOptionsDefaults.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/clsInstatOptionsDefaults.vb b/instat/clsInstatOptionsDefaults.vb index d839f3c53b4..cfe0ad3d2b4 100644 --- a/instat/clsInstatOptionsDefaults.vb +++ b/instat/clsInstatOptionsDefaults.vb @@ -33,7 +33,7 @@ Public Class clsInstatOptionsDefaults Public Shared ReadOnly DEFAULTiPreviewRows As Integer = 10 Public Shared ReadOnly DEFAULTiMaxRows As Integer = 1000 Public Shared ReadOnly DEFAULTiMaxCols As Integer = 50 - Public Shared ReadOnly DEFAULTiUndoColLimit As Integer = 0 + Public Shared ReadOnly DEFAULTiUndoColLimit As Integer = 100 Public Shared ReadOnly DEFAULTiUndoRowLimit As Integer = 100000 Public Shared ReadOnly DEFAULTstrComment As String = "Dialog:" Public Shared ReadOnly DEFAULTstrGraphDisplayOption As String = "view_output_window" From 2a1d8d5014fae6d042cc886e913715525e9c26ee Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 16 Oct 2024 18:28:03 +0300 Subject: [PATCH 13/32] set the default to 200 for cols --- instat/clsInstatOptionsDefaults.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/clsInstatOptionsDefaults.vb b/instat/clsInstatOptionsDefaults.vb index cfe0ad3d2b4..82851729b85 100644 --- a/instat/clsInstatOptionsDefaults.vb +++ b/instat/clsInstatOptionsDefaults.vb @@ -33,7 +33,7 @@ Public Class clsInstatOptionsDefaults Public Shared ReadOnly DEFAULTiPreviewRows As Integer = 10 Public Shared ReadOnly DEFAULTiMaxRows As Integer = 1000 Public Shared ReadOnly DEFAULTiMaxCols As Integer = 50 - Public Shared ReadOnly DEFAULTiUndoColLimit As Integer = 100 + Public Shared ReadOnly DEFAULTiUndoColLimit As Integer = 200 Public Shared ReadOnly DEFAULTiUndoRowLimit As Integer = 100000 Public Shared ReadOnly DEFAULTstrComment As String = "Dialog:" Public Shared ReadOnly DEFAULTstrGraphDisplayOption As String = "view_output_window" From 6845c03d234e254e57720c9d8703437125e9aa96 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 18 Oct 2024 11:40:19 +0300 Subject: [PATCH 14/32] memory management for the undo feature --- instat/static/InstatObject/R/data_object_R6.R | 28 +++++++++++++++++-- .../InstatObject/R/stand_alone_functions.R | 10 +++++++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index ebdf4047bf9..517f9c51342 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -203,6 +203,9 @@ DataSheet$set("public", "undo_last_action", function() { previous_state <- private$history[[length(private$history)]] self$set_data(as.data.frame(previous_state)) # Restore the previous state private$history <- private$history[-length(private$history)] # Remove the latest state + + # Release memory by triggering garbage collection + gc() } else { message("No more actions to undo.") } @@ -284,14 +287,33 @@ DataSheet$set("public", "set_scalars", function(new_scalars) { } ) +# Set history with memory management DataSheet$set("public", "set_history", function(history) { - if(!is.list(history)) stop("history must be of type: list") - MAX_HISTORY_SIZE <- 5 + if (!is.list(history)) stop("history must be of type: list") + + # Define memory and history limits + MAX_HISTORY_SIZE <- 5 # Limit to last 5 history states + MAX_MEMORY_LIMIT_MB <- 1024 # Limit the memory usage for undo history + + # Check current memory usage + current_memory <- monitor_memory() + + # If memory exceeds limit, remove the oldest entry + if (current_memory > MAX_MEMORY_LIMIT_MB) { + message(paste("Memory limit exceeded:", round(current_memory, 2), "MB. Removing oldest entry.")) + private$history <- private$history[-1] # Remove the oldest entry + gc() # Trigger garbage collection to free memory + } + # Limit history size if (length(private$history) >= MAX_HISTORY_SIZE) { private$history <- private$history[-1] # Remove the oldest entry } - private$history <- append(private$history, history) + + private$history <- append(private$history, list(history)) + + # Explicitly call garbage collection to release memory + gc() }) DataSheet$set("public", "set_keys", function(new_keys) { diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index f85ee657f6f..043d26a36ad 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -3415,3 +3415,13 @@ frac20 <- function(x) {paste0(round(x * 20), "/", 20)} #Give fraction our of 20 frac100 <- function(x) {paste0(round(x * 100), "/", 100)} # Give fraction our of 100 for a decimal value frac_den <- function(x, den) {paste0(round(x * den), "/", den)} # Give fraction for a given denominator + +# Monitor memory usage function +monitor_memory <- function() { + if (.Platform$OS.type == "windows") { + mem_used <- memory.size() + } #else { + # mem_used <- sum(gc()[, "used"]) / 1024 # Convert KB to MB on non-Windows systems + # } + return(mem_used) +} \ No newline at end of file From 68a40a4b1b4a4a55aebc8de9a9f7a2d8612c6299 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 18 Oct 2024 11:44:42 +0300 Subject: [PATCH 15/32] added timer --- instat/static/InstatObject/R/data_object_R6.R | 2 ++ instat/static/InstatObject/R/stand_alone_functions.R | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 517f9c51342..7b35c4b8f6d 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -199,6 +199,7 @@ DataSheet$set("public", "has_history", function() { ) DataSheet$set("public", "undo_last_action", function() { + time_operation({ if (length(private$history) > 1) { previous_state <- private$history[[length(private$history)]] self$set_data(as.data.frame(previous_state)) # Restore the previous state @@ -209,6 +210,7 @@ DataSheet$set("public", "undo_last_action", function() { } else { message("No more actions to undo.") } + }) }) # Redo function diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index 043d26a36ad..ef7ae16ee90 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -3424,4 +3424,9 @@ monitor_memory <- function() { # mem_used <- sum(gc()[, "used"]) / 1024 # Convert KB to MB on non-Windows systems # } return(mem_used) +} + +time_operation <- function(expr) { + timing <- system.time(expr) + print(timing) } \ No newline at end of file From 7654b1295f692ce804a643a74abafededd9b43c7 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 18 Oct 2024 12:39:32 +0300 Subject: [PATCH 16/32] added switch off undo option --- instat/clsInstatOptions.vb | 12 ++++ instat/clsInstatOptionsDefaults.vb | 1 + instat/dlgOptions.Designer.vb | 71 +++++++++++-------- instat/dlgOptions.vb | 15 +++- instat/static/InstatObject/R/data_object_R6.R | 4 +- instat/ucrDataView.vb | 51 ++++++------- 6 files changed, 95 insertions(+), 59 deletions(-) diff --git a/instat/clsInstatOptions.vb b/instat/clsInstatOptions.vb index 41799e583a3..548562707c6 100644 --- a/instat/clsInstatOptions.vb +++ b/instat/clsInstatOptions.vb @@ -45,6 +45,7 @@ Imports RDotNet Public bShowSignifStars As Nullable(Of Boolean) Public bChangeDataFrame As Nullable(Of Boolean) Public bAutoSaveData As Nullable(Of Boolean) + Public bSwitchOffUndo As Nullable(Of Boolean) Public bUndoSwitchAction As Nullable(Of Boolean) Public iAutoSaveDataMinutes As Nullable(Of Integer) Public bShowWaitDialog As Nullable(Of Boolean) @@ -89,6 +90,7 @@ Imports RDotNet bShowSignifStars = clsInstatOptionsDefaults.DEFAULTbShowSignifStars bChangeDataFrame = clsInstatOptionsDefaults.DEFAULTbChangeDataFrame bAutoSaveData = clsInstatOptionsDefaults.DEFAULTbAutoSaveData + bSwitchOffUndo = clsInstatOptionsDefaults.DEFAULTbSwitchOffUndo iAutoSaveDataMinutes = clsInstatOptionsDefaults.DEFAULTiAutoSaveDataMinutes bShowWaitDialog = clsInstatOptionsDefaults.DEFAULTbShowWaitDialog iWaitTimeDelaySeconds = clsInstatOptionsDefaults.DEFAULTiWaitTimeDelaySeconds @@ -261,6 +263,12 @@ Imports RDotNet SetAutoSaveData(clsInstatOptionsDefaults.DEFAULTbAutoSaveData) End If + If bSwitchOffUndo.HasValue Then + SetOffUndo(bSwitchOffUndo) + Else + SetOffUndo(clsInstatOptionsDefaults.DEFAULTbSwitchOffUndo) + End If + If iAutoSaveDataMinutes.HasValue Then SetAutoSaveDataMinutes(iAutoSaveDataMinutes) Else @@ -555,6 +563,10 @@ Imports RDotNet bAutoSaveData = bNewAutoSave End Sub + Public Sub SetOffUndo(bNewSwitchOffUndo As Boolean) + bSwitchOffUndo = bNewSwitchOffUndo + End Sub + Public Sub SetAutoSaveDataMinutes(iNewMinutes As Integer) iAutoSaveDataMinutes = iNewMinutes frmMain.ResetTimer() diff --git a/instat/clsInstatOptionsDefaults.vb b/instat/clsInstatOptionsDefaults.vb index 82851729b85..6c69fd40326 100644 --- a/instat/clsInstatOptionsDefaults.vb +++ b/instat/clsInstatOptionsDefaults.vb @@ -47,6 +47,7 @@ Public Class clsInstatOptionsDefaults Public Shared ReadOnly DEFAULTiDigits As Integer = 4 Public Shared ReadOnly DEFAULTbShowSignifStars As Boolean = False Public Shared ReadOnly DEFAULTbAutoSaveData As Boolean = True + Public Shared ReadOnly DEFAULTbSwitchOffUndo As Boolean = True Public Shared ReadOnly DEFAULTbUndoSwitchAction As Boolean = False Public Shared ReadOnly DEFAULTiAutoSaveDataMinutes As Integer = 10 Public Shared ReadOnly DEFAULTbShowWaitDialog As Boolean = True diff --git a/instat/dlgOptions.Designer.vb b/instat/dlgOptions.Designer.vb index 4ffbef3ba91..5642d7bc6bc 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 TreeNode7 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Languages") - Dim TreeNode8 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Comments") - Dim TreeNode9 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Import") - Dim TreeNode10 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Output Window") - Dim TreeNode11 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Commands") - Dim TreeNode12 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() @@ -94,6 +94,7 @@ Partial Class dlgOptions Me.ucrNudWaitSeconds = New instat.ucrNud() Me.ucrChkIncludeDefaultParams = New instat.ucrCheck() Me.tbpDataView = New System.Windows.Forms.TabPage() + Me.ucrChkTurnOffUndo = New instat.ucrCheck() Me.Label4 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() Me.ucrNudRowUndoLimit = New instat.ucrNud() @@ -249,29 +250,29 @@ Partial Class dlgOptions Me.trOptions.Location = New System.Drawing.Point(0, 0) Me.trOptions.Margin = New System.Windows.Forms.Padding(4) Me.trOptions.Name = "trOptions" - TreeNode7.Name = "ndLanguages" - TreeNode7.Tag = "1" - TreeNode7.Text = "Languages" - TreeNode7.ToolTipText = "Choose different languages" - TreeNode8.Name = "ndComments" - TreeNode8.Tag = "2" - TreeNode8.Text = "Comments" - TreeNode8.ToolTipText = "Comments for the dialogs" - TreeNode9.Name = "ndImport" - TreeNode9.Tag = "3" - TreeNode9.Text = "Import" - TreeNode9.ToolTipText = "Import Data Settings" - TreeNode10.Name = "ndOutputWindow" - TreeNode10.Tag = "4" - TreeNode10.Text = "Output Window" - TreeNode10.ToolTipText = "Output Window Formatting Options" - TreeNode11.Name = "ndCommands" - TreeNode11.Tag = "8" - TreeNode11.Text = "Commands" - TreeNode11.ToolTipText = "Commands Options" - TreeNode12.Name = "ndDataView" - TreeNode12.Text = "Data View" - Me.trOptions.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode7, TreeNode8, TreeNode9, TreeNode10, TreeNode11, TreeNode12}) + 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(276, 476) Me.trOptions.TabIndex = 0 ' @@ -762,6 +763,7 @@ Partial Class dlgOptions ' 'tbpDataView ' + Me.tbpDataView.Controls.Add(Me.ucrChkTurnOffUndo) Me.tbpDataView.Controls.Add(Me.Label4) Me.tbpDataView.Controls.Add(Me.Label3) Me.tbpDataView.Controls.Add(Me.ucrNudRowUndoLimit) @@ -786,6 +788,16 @@ Partial Class dlgOptions Me.tbpDataView.Text = "Data View" Me.tbpDataView.UseVisualStyleBackColor = True ' + 'ucrChkTurnOffUndo + ' + Me.ucrChkTurnOffUndo.AutoSize = True + Me.ucrChkTurnOffUndo.Checked = False + Me.ucrChkTurnOffUndo.Location = New System.Drawing.Point(20, 349) + Me.ucrChkTurnOffUndo.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkTurnOffUndo.Name = "ucrChkTurnOffUndo" + Me.ucrChkTurnOffUndo.Size = New System.Drawing.Size(326, 51) + Me.ucrChkTurnOffUndo.TabIndex = 12 + ' 'Label4 ' Me.Label4.AutoSize = True @@ -1397,4 +1409,5 @@ Partial Class dlgOptions Friend WithEvents Label3 As Label Friend WithEvents ucrNudRowUndoLimit As ucrNud Friend WithEvents Label4 As Label + Friend WithEvents ucrChkTurnOffUndo As ucrCheck End Class diff --git a/instat/dlgOptions.vb b/instat/dlgOptions.vb index f1898476d71..76e880c2129 100644 --- a/instat/dlgOptions.vb +++ b/instat/dlgOptions.vb @@ -85,6 +85,7 @@ Public Class dlgOptions ucrChkShowDataonGrid.SetText("Display dialog's selected data frame in grid") ucrChkIncludeDefaultParams.SetText("Include Default Parameter Values in R Commands") ucrChkAutoSave.SetText("Auto save a backup of data") + ucrChkTurnOffUndo.SetText("Switch off Spreadsheet-Style Undo") ucrChkShowWaitDialog.SetText("Show waiting dialog when command takes longer than") ucrChkReminder.SetText("Remind me later when R-Instat new version available") ucrChkAutoSave.AddToLinkedControls(ucrNudAutoSaveMinutes, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -109,6 +110,7 @@ Public Class dlgOptions Private Sub LoadInstatOptions() ucrChkIncludeDefaultParams.Checked = frmMain.clsInstatOptions.bIncludeRDefaultParameters ucrChkAutoSave.Checked = frmMain.clsInstatOptions.bAutoSaveData + ucrChkTurnOffUndo.Checked = frmMain.clsInstatOptions.bSwitchOffUndo SetOutputFont(frmMain.clsInstatOptions.fntOutput, frmMain.clsInstatOptions.clrOutput) SetCommandFont(frmMain.clsInstatOptions.fntScript, frmMain.clsInstatOptions.clrScript) SetCommentFont(frmMain.clsInstatOptions.fntComment, frmMain.clsInstatOptions.clrComment) @@ -183,6 +185,7 @@ Public Class dlgOptions frmMain.clsInstatOptions.SetUndoColLimit(ucrNudColUndoLimit.Value) frmMain.clsInstatOptions.SetUndoRowLimit(ucrNudRowUndoLimit.Value) frmMain.clsInstatOptions.SetAutoSaveData(ucrChkAutoSave.Checked) + frmMain.clsInstatOptions.SetOffUndo(ucrChkTurnOffUndo.Checked) frmMain.clsInstatOptions.SetAutoSaveDataMinutes(ucrNudAutoSaveMinutes.Value) frmMain.clsInstatOptions.SetLanguageCultureCode(strCurrLanguageCulture) frmMain.clsInstatOptions.SetWorkingDirectory(strWorkingDirectory) @@ -371,7 +374,7 @@ Public Class dlgOptions End Sub - Private Sub AllControls_ControlValueChanged() Handles ucrNudMaxCols.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrNudWaitSeconds.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged, ucrNudColUndoLimit.ControlValueChanged, ucrNudRowUndoLimit.ControlValueChanged + Private Sub AllControls_ControlValueChanged() Handles ucrNudMaxCols.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrChkTurnOffUndo.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrNudWaitSeconds.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged, ucrNudColUndoLimit.ControlValueChanged, ucrNudRowUndoLimit.ControlValueChanged ApplyEnabled(True) End Sub @@ -439,7 +442,15 @@ Public Class dlgOptions ApplyEnabled(True) End Sub - Private Sub AllControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudWaitSeconds.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrNudMaxCols.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged, ucrNudColUndoLimit.ControlValueChanged, ucrNudRowUndoLimit.ControlValueChanged + Private Sub AllControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudWaitSeconds.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrNudMaxCols.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged, ucrNudColUndoLimit.ControlValueChanged, ucrNudRowUndoLimit.ControlValueChanged, ucrChkTurnOffUndo.ControlValueChanged + + End Sub + + Private Sub ucrInputLanguage_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputLanguage.ControlValueChanged + + End Sub + + Private Sub ucrPnlGraphDisplay_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlGraphDisplay.ControlValueChanged End Sub diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 7b35c4b8f6d..724916232cd 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -33,8 +33,6 @@ DataSheet <- R6::R6Class("DataSheet", self$set_comments(comments) self$set_history(history) - self$save_state_to_history() - # If no name for the data.frame has been given in the list we create a default one. # Decide how to choose default name index if ( !(is.null(data_name) || data_name == "" || missing(data_name))) { @@ -294,7 +292,7 @@ DataSheet$set("public", "set_history", function(history) { if (!is.list(history)) stop("history must be of type: list") # Define memory and history limits - MAX_HISTORY_SIZE <- 5 # Limit to last 5 history states + MAX_HISTORY_SIZE <- 10 # Limit to last 10 history states MAX_MEMORY_LIMIT_MB <- 1024 # Limit the memory usage for undo history # Check current memory usage diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index 22bd3f5a733..5298e163f82 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -1016,39 +1016,40 @@ Public Class ucrDataView End Sub Public Sub Undo() - If (GetCurrentDataFrameFocus().iTotalColumnCount >= frmMain.clsInstatOptions.iUndoColLimit) OrElse + If frmMain.clsInstatOptions.bSwitchOffUndo Then + If (GetCurrentDataFrameFocus().iTotalColumnCount >= frmMain.clsInstatOptions.iUndoColLimit) OrElse (GetCurrentDataFrameFocus().iTotalRowCount >= frmMain.clsInstatOptions.iUndoRowLimit) Then - ' Retrieve the default limits for rows and columns - Dim colLimit As Integer = frmMain.clsInstatOptions.iUndoColLimit - Dim rowLimit As Integer = frmMain.clsInstatOptions.iUndoRowLimit - - ' Construct the concise message - Dim msg As String = "The current data frame exceeds the undo limit (Columns: " & colLimit & ", Rows: " & rowLimit & ")." - - ' Append information on whether it's the rows, columns, or both - If GetCurrentDataFrameFocus().iTotalColumnCount >= colLimit AndAlso - GetCurrentDataFrameFocus().iTotalRowCount >= rowLimit Then - msg &= " Both columns and rows exceed the limit." - ElseIf GetCurrentDataFrameFocus().iTotalColumnCount >= colLimit Then - msg &= " Columns exceed the limit." - ElseIf GetCurrentDataFrameFocus().iTotalRowCount >= rowLimit Then - msg &= " Rows exceed the limit." - End If + ' Retrieve the default limits for rows and columns + Dim colLimit As Integer = frmMain.clsInstatOptions.iUndoColLimit + Dim rowLimit As Integer = frmMain.clsInstatOptions.iUndoRowLimit + + ' Construct the concise message + Dim msg As String = "The current data frame exceeds the undo limit (Columns: " & colLimit & ", Rows: " & rowLimit & ")." + + ' Append information on whether it's the rows, columns, or both + If GetCurrentDataFrameFocus().iTotalColumnCount >= colLimit AndAlso + GetCurrentDataFrameFocus().iTotalRowCount >= rowLimit Then + msg &= " Both columns and rows exceed the limit." + ElseIf GetCurrentDataFrameFocus().iTotalColumnCount >= colLimit Then + msg &= " Columns exceed the limit." + ElseIf GetCurrentDataFrameFocus().iTotalRowCount >= rowLimit Then + msg &= " Rows exceed the limit." + End If - msg &= " Please go to Tools > Options to adjust the limits." + msg &= " Please go to Tools > Options to adjust the limits." - ' Display the message box - MsgBox(msg, vbExclamation, "Undo Limit Exceeded") + ' Display the message box + MsgBox(msg, vbExclamation, "Undo Limit Exceeded") - Exit Sub - End If + Exit Sub + End If - If GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasHistory Then - GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() + If GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasHistory Then + GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() + End If End If - End Sub Public Sub SearchRowInGrid(rowNumbers As List(Of Integer), strColumn As String, Optional iRow As Integer = 0, From c033eec220dfb169687c8b1dfe8fdefff5ae97ba Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 18 Oct 2024 12:53:07 +0300 Subject: [PATCH 17/32] small design change --- instat/clsInstatOptionsDefaults.vb | 3 +-- instat/dlgOptions.vb | 2 +- instat/ucrDataView.vb | 14 +++++++++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/instat/clsInstatOptionsDefaults.vb b/instat/clsInstatOptionsDefaults.vb index 6c69fd40326..5a6720f27ef 100644 --- a/instat/clsInstatOptionsDefaults.vb +++ b/instat/clsInstatOptionsDefaults.vb @@ -47,8 +47,7 @@ Public Class clsInstatOptionsDefaults Public Shared ReadOnly DEFAULTiDigits As Integer = 4 Public Shared ReadOnly DEFAULTbShowSignifStars As Boolean = False Public Shared ReadOnly DEFAULTbAutoSaveData As Boolean = True - Public Shared ReadOnly DEFAULTbSwitchOffUndo As Boolean = True - Public Shared ReadOnly DEFAULTbUndoSwitchAction As Boolean = False + Public Shared ReadOnly DEFAULTbSwitchOffUndo As Boolean = False Public Shared ReadOnly DEFAULTiAutoSaveDataMinutes As Integer = 10 Public Shared ReadOnly DEFAULTbShowWaitDialog As Boolean = True Public Shared ReadOnly DEFAULTiWaitTimeDelaySeconds As Integer = 2 diff --git a/instat/dlgOptions.vb b/instat/dlgOptions.vb index 76e880c2129..c85eb3672c3 100644 --- a/instat/dlgOptions.vb +++ b/instat/dlgOptions.vb @@ -85,7 +85,7 @@ Public Class dlgOptions ucrChkShowDataonGrid.SetText("Display dialog's selected data frame in grid") ucrChkIncludeDefaultParams.SetText("Include Default Parameter Values in R Commands") ucrChkAutoSave.SetText("Auto save a backup of data") - ucrChkTurnOffUndo.SetText("Switch off Spreadsheet-Style Undo") + ucrChkTurnOffUndo.SetText("Switch on Spreadsheet-Style Undo") ucrChkShowWaitDialog.SetText("Show waiting dialog when command takes longer than") ucrChkReminder.SetText("Remind me later when R-Instat new version available") ucrChkAutoSave.AddToLinkedControls(ucrNudAutoSaveMinutes, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index 5298e163f82..cb1ce5e43f9 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -1016,8 +1016,13 @@ Public Class ucrDataView End Sub Public Sub Undo() - If frmMain.clsInstatOptions.bSwitchOffUndo Then - If (GetCurrentDataFrameFocus().iTotalColumnCount >= frmMain.clsInstatOptions.iUndoColLimit) OrElse + If Not frmMain.clsInstatOptions.bSwitchOffUndo Then + ' Show a message box indicating that undo is turned off + MsgBox("Undo is turned off, go to Tools > Options to turn it on.", vbInformation, "Undo Disabled") + Exit Sub + End If + + If (GetCurrentDataFrameFocus().iTotalColumnCount >= frmMain.clsInstatOptions.iUndoColLimit) OrElse (GetCurrentDataFrameFocus().iTotalRowCount >= frmMain.clsInstatOptions.iUndoRowLimit) Then ' Retrieve the default limits for rows and columns @@ -1046,9 +1051,8 @@ Public Class ucrDataView End If - If GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasHistory Then - GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() - End If + If GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasHistory Then + GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() End If End Sub From 1d61315bf1ed1b174aea4505189570e51e19cacf Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 18 Oct 2024 13:03:57 +0300 Subject: [PATCH 18/32] added timing --- instat/static/InstatObject/R/data_object_R6.R | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 724916232cd..062eadf87be 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -197,20 +197,40 @@ DataSheet$set("public", "has_history", function() { ) DataSheet$set("public", "undo_last_action", function() { - time_operation({ + # Track the start time + start_time <- Sys.time() + + # Perform the undo action if (length(private$history) > 1) { previous_state <- private$history[[length(private$history)]] self$set_data(as.data.frame(previous_state)) # Restore the previous state - private$history <- private$history[-length(private$history)] # Remove the latest state - # Release memory by triggering garbage collection - gc() + private$history <- private$history[-length(private$history)] # Remove the latest state } else { message("No more actions to undo.") } - }) + + # Trigger garbage collection to free memory + gc() + + # Track the end time + end_time <- Sys.time() + + # Calculate elapsed time + elapsed_time <- as.numeric(difftime(end_time, start_time, units = "secs")) + + # Define a threshold for acceptable timing (in seconds) + acceptable_time_threshold <- 1.0 # Set this to your desired threshold + + # Check if the operation took longer than the acceptable threshold + if (elapsed_time > acceptable_time_threshold) { + warning(sprintf("undo operation took too long: %f seconds.", elapsed_time)) + } else { + message(sprintf("undo operation completed successfully in %f seconds.", elapsed_time)) + } }) + # Redo function DataSheet$set("public", "redo_last_action", function() { if (length(private$redo_history) > 0) { From c3e772f97b650096321beb98c3f77306e0c5ce50 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 18 Oct 2024 13:42:16 +0300 Subject: [PATCH 19/32] minor design change --- instat/clsInstatOptionsDefaults.vb | 2 +- instat/dlgOptions.Designer.vb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/instat/clsInstatOptionsDefaults.vb b/instat/clsInstatOptionsDefaults.vb index 5a6720f27ef..8a4ee9b62cd 100644 --- a/instat/clsInstatOptionsDefaults.vb +++ b/instat/clsInstatOptionsDefaults.vb @@ -34,7 +34,7 @@ Public Class clsInstatOptionsDefaults Public Shared ReadOnly DEFAULTiMaxRows As Integer = 1000 Public Shared ReadOnly DEFAULTiMaxCols As Integer = 50 Public Shared ReadOnly DEFAULTiUndoColLimit As Integer = 200 - Public Shared ReadOnly DEFAULTiUndoRowLimit As Integer = 100000 + Public Shared ReadOnly DEFAULTiUndoRowLimit As Integer = 200000 Public Shared ReadOnly DEFAULTstrComment As String = "Dialog:" Public Shared ReadOnly DEFAULTstrGraphDisplayOption As String = "view_output_window" Public Shared ReadOnly DEFAULTbChangeDataFrame As Boolean = False diff --git a/instat/dlgOptions.Designer.vb b/instat/dlgOptions.Designer.vb index 5642d7bc6bc..53fdd6c58d4 100644 --- a/instat/dlgOptions.Designer.vb +++ b/instat/dlgOptions.Designer.vb @@ -811,7 +811,7 @@ Partial Class dlgOptions 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(669, 262) + Me.Label3.Location = New System.Drawing.Point(684, 262) Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(46, 20) @@ -828,14 +828,14 @@ Partial Class dlgOptions Me.ucrNudRowUndoLimit.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudRowUndoLimit.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudRowUndoLimit.Name = "ucrNudRowUndoLimit" - Me.ucrNudRowUndoLimit.Size = New System.Drawing.Size(91, 30) + Me.ucrNudRowUndoLimit.Size = New System.Drawing.Size(106, 30) Me.ucrNudRowUndoLimit.TabIndex = 9 Me.ucrNudRowUndoLimit.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(629, 230) + Me.Label2.Location = New System.Drawing.Point(644, 230) Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(86, 20) @@ -862,7 +862,7 @@ Partial Class dlgOptions Me.ucrNudColUndoLimit.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudColUndoLimit.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudColUndoLimit.Name = "ucrNudColUndoLimit" - Me.ucrNudColUndoLimit.Size = New System.Drawing.Size(91, 30) + Me.ucrNudColUndoLimit.Size = New System.Drawing.Size(106, 30) Me.ucrNudColUndoLimit.TabIndex = 6 Me.ucrNudColUndoLimit.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' From da5b9cb92c4ee6dbd0329edc9f4c1fedff52b3c8 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 18 Oct 2024 14:01:14 +0300 Subject: [PATCH 20/32] extended undo to reorder columns --- instat/static/InstatObject/R/data_object_R6.R | 3 +++ 1 file changed, 3 insertions(+) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 062eadf87be..184112cc473 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -1414,6 +1414,9 @@ DataSheet$set("public", "get_next_default_column_name", function(prefix) { DataSheet$set("public", "reorder_columns_in_data", function(col_order) { if (ncol(self$get_data_frame(use_current_filter = FALSE, use_column_selection = FALSE)) != length(col_order)) stop("Columns to order should be same as columns in the data.") + # Save the current state to history before making modifications + self$save_state_to_history() + if(is.numeric(col_order)) { if(!(identical(sort(col_order), sort(as.numeric(1:ncol(data)))))) { stop("Invalid column order") From aa1bc04e5206e19d67f6bc040a9a996dfb7c0951 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 18 Oct 2024 14:34:01 +0300 Subject: [PATCH 21/32] minor bug and design change --- instat/clsInstatOptionsDefaults.vb | 2 +- instat/static/InstatObject/R/data_object_R6.R | 17 ----------------- instat/ucrDataView.vb | 8 +++++--- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/instat/clsInstatOptionsDefaults.vb b/instat/clsInstatOptionsDefaults.vb index 8a4ee9b62cd..6c840acc498 100644 --- a/instat/clsInstatOptionsDefaults.vb +++ b/instat/clsInstatOptionsDefaults.vb @@ -47,7 +47,7 @@ Public Class clsInstatOptionsDefaults Public Shared ReadOnly DEFAULTiDigits As Integer = 4 Public Shared ReadOnly DEFAULTbShowSignifStars As Boolean = False Public Shared ReadOnly DEFAULTbAutoSaveData As Boolean = True - Public Shared ReadOnly DEFAULTbSwitchOffUndo As Boolean = False + Public Shared ReadOnly DEFAULTbSwitchOffUndo As Boolean = True Public Shared ReadOnly DEFAULTiAutoSaveDataMinutes As Integer = 10 Public Shared ReadOnly DEFAULTbShowWaitDialog As Boolean = True Public Shared ReadOnly DEFAULTiWaitTimeDelaySeconds As Integer = 2 diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 184112cc473..fc5b205242e 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -197,8 +197,6 @@ DataSheet$set("public", "has_history", function() { ) DataSheet$set("public", "undo_last_action", function() { - # Track the start time - start_time <- Sys.time() # Perform the undo action if (length(private$history) > 1) { @@ -213,21 +211,6 @@ DataSheet$set("public", "undo_last_action", function() { # Trigger garbage collection to free memory gc() - # Track the end time - end_time <- Sys.time() - - # Calculate elapsed time - elapsed_time <- as.numeric(difftime(end_time, start_time, units = "secs")) - - # Define a threshold for acceptable timing (in seconds) - acceptable_time_threshold <- 1.0 # Set this to your desired threshold - - # Check if the operation took longer than the acceptable threshold - if (elapsed_time > acceptable_time_threshold) { - warning(sprintf("undo operation took too long: %f seconds.", elapsed_time)) - } else { - message(sprintf("undo operation completed successfully in %f seconds.", elapsed_time)) - } }) diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index cb1ce5e43f9..d799a279cc9 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -1022,7 +1022,8 @@ Public Class ucrDataView Exit Sub End If - If (GetCurrentDataFrameFocus().iTotalColumnCount >= frmMain.clsInstatOptions.iUndoColLimit) OrElse + If _clsDataBook.DataFrames.Count > 0 Then + If (GetCurrentDataFrameFocus().iTotalColumnCount >= frmMain.clsInstatOptions.iUndoColLimit) OrElse (GetCurrentDataFrameFocus().iTotalRowCount >= frmMain.clsInstatOptions.iUndoRowLimit) Then ' Retrieve the default limits for rows and columns @@ -1051,8 +1052,9 @@ Public Class ucrDataView End If - If GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasHistory Then - GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() + If GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasHistory Then + GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() + End If End If End Sub From 493508967e9457d874f13df28ca346dd948760ed Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 18 Oct 2024 14:38:42 +0300 Subject: [PATCH 22/32] minor design change --- instat/dlgOptions.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgOptions.vb b/instat/dlgOptions.vb index c85eb3672c3..76e880c2129 100644 --- a/instat/dlgOptions.vb +++ b/instat/dlgOptions.vb @@ -85,7 +85,7 @@ Public Class dlgOptions ucrChkShowDataonGrid.SetText("Display dialog's selected data frame in grid") ucrChkIncludeDefaultParams.SetText("Include Default Parameter Values in R Commands") ucrChkAutoSave.SetText("Auto save a backup of data") - ucrChkTurnOffUndo.SetText("Switch on Spreadsheet-Style Undo") + ucrChkTurnOffUndo.SetText("Switch off Spreadsheet-Style Undo") ucrChkShowWaitDialog.SetText("Show waiting dialog when command takes longer than") ucrChkReminder.SetText("Remind me later when R-Instat new version available") ucrChkAutoSave.AddToLinkedControls(ucrNudAutoSaveMinutes, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) From 95c67519000ed680c33fc100cf21945c5c80c647 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 21 Oct 2024 17:31:01 +0300 Subject: [PATCH 23/32] minor change for switch off undo --- instat/clsInstatOptionsDefaults.vb | 2 +- instat/ucrDataView.vb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/clsInstatOptionsDefaults.vb b/instat/clsInstatOptionsDefaults.vb index 6c840acc498..8a4ee9b62cd 100644 --- a/instat/clsInstatOptionsDefaults.vb +++ b/instat/clsInstatOptionsDefaults.vb @@ -47,7 +47,7 @@ Public Class clsInstatOptionsDefaults Public Shared ReadOnly DEFAULTiDigits As Integer = 4 Public Shared ReadOnly DEFAULTbShowSignifStars As Boolean = False Public Shared ReadOnly DEFAULTbAutoSaveData As Boolean = True - Public Shared ReadOnly DEFAULTbSwitchOffUndo As Boolean = True + Public Shared ReadOnly DEFAULTbSwitchOffUndo As Boolean = False Public Shared ReadOnly DEFAULTiAutoSaveDataMinutes As Integer = 10 Public Shared ReadOnly DEFAULTbShowWaitDialog As Boolean = True Public Shared ReadOnly DEFAULTiWaitTimeDelaySeconds As Integer = 2 diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index d799a279cc9..1c827f1c1c7 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -1016,7 +1016,7 @@ Public Class ucrDataView End Sub Public Sub Undo() - If Not frmMain.clsInstatOptions.bSwitchOffUndo Then + If frmMain.clsInstatOptions.bSwitchOffUndo Then ' Show a message box indicating that undo is turned off MsgBox("Undo is turned off, go to Tools > Options to turn it on.", vbInformation, "Undo Disabled") Exit Sub From e82885ec712dae88eff68b158b1a2560e30f44f5 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 21 Oct 2024 18:00:54 +0300 Subject: [PATCH 24/32] R code addtion --- instat/static/InstatObject/R/instat_object_R6.R | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index 1fa96618a94..29e9100c280 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -11,6 +11,7 @@ DataBook <- R6::R6Class("DataBook", self$set_meta(instat_obj_metadata) self$set_objects(list()) self$set_scalars(list()) + self$set_history(list()) if (missing(data_tables) || length(data_tables) == 0) { self$set_data_objects(list()) @@ -31,6 +32,7 @@ DataBook <- R6::R6Class("DataBook", .metadata = list(), .objects = list(), .scalars = list(), + .history = list(), .links = list(), .data_sheets_changed = FALSE, .database_connection = NULL, @@ -316,6 +318,12 @@ DataBook$set("public", "set_objects", function(new_objects) { } ) +DataBook$set("public", "set_history", function(new_history) { + if (!is.list(new_history)) stop("history must be of type: list") + private$.history <- new_history +} +) + DataBook$set("public", "set_scalars", function(new_scalars) { if(!is.list(new_scalars)) stop("new_scalars must be of type: list") private$.scalars <- new_scalars From b89a0b5e3ad04ae97cceec4807a6f972f5ffcba9 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 22 Oct 2024 09:33:39 +0300 Subject: [PATCH 25/32] more r code changes --- instat/Model/DataFrame/clsDataFramePage.vb | 4 +- instat/static/InstatObject/R/data_object_R6.R | 82 +++++++++---------- .../static/InstatObject/R/instat_object_R6.R | 20 +++-- instat/ucrDataView.vb | 6 +- 4 files changed, 59 insertions(+), 53 deletions(-) diff --git a/instat/Model/DataFrame/clsDataFramePage.vb b/instat/Model/DataFrame/clsDataFramePage.vb index 3fb28e84784..3926bc24f29 100644 --- a/instat/Model/DataFrame/clsDataFramePage.vb +++ b/instat/Model/DataFrame/clsDataFramePage.vb @@ -213,12 +213,12 @@ Public Class clsDataFramePage End Sub - Public Function HasHistory() + Public Function HasUndoHistory() Dim expTemp As SymbolicExpression Dim bHasHistory As Boolean = False Dim clsHasHistoryFunction As New RFunction - clsHasHistoryFunction.SetRCommand(_clsRLink.strInstatDataObject & "$has_history") + clsHasHistoryFunction.SetRCommand(_clsRLink.strInstatDataObject & "$has_undo_history") clsHasHistoryFunction.AddParameter("data_name", Chr(34) & _strDataFrameName & Chr(34)) If clsHasHistoryFunction IsNot Nothing Then expTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsHasHistoryFunction.ToScript(), bSilent:=True) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index fc5b205242e..bcfe8a4c382 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -5,7 +5,7 @@ DataSheet <- R6::R6Class("DataSheet", imported_from = "", messages = TRUE, convert=TRUE, create = TRUE, start_point=1, filters = list(), column_selections = list(), objects = list(), - calculations = list(), scalars = list(), keys = list(), comments = list(), keep_attributes = TRUE, history = list(), redo_history = list()) + calculations = list(), scalars = list(), keys = list(), comments = list(), keep_attributes = TRUE, undo_history = list(), redo_undo_history = list()) { # Set up the data object self$set_data(data, messages) @@ -31,7 +31,7 @@ DataSheet <- R6::R6Class("DataSheet", self$set_scalars(scalars) self$set_keys(keys) self$set_comments(comments) - self$set_history(history) + self$set_undo_history(undo_history) # If no name for the data.frame has been given in the list we create a default one. # Decide how to choose default name index @@ -60,8 +60,8 @@ DataSheet <- R6::R6Class("DataSheet", column_selections = list(), objects = list(), keys = list(), - history = list(), - redo_history = list(), + undo_history = list(), + redo_undo_history = list(), comments = list(), calculations = list(), scalars = list(), @@ -164,8 +164,8 @@ DataSheet$set("public", "set_data", function(new_data, messages=TRUE, check_name } ) -DataSheet$set("public", "save_state_to_history", function() { - self$set_history(list(private$data)) +DataSheet$set("public", "save_state_to_undo_history", function() { + self$set_undo_history(list(private$data)) }) DataSheet$set("public", "set_meta", function(new_meta) { @@ -191,19 +191,19 @@ DataSheet$set("public", "clear_metadata", function() { } ) -DataSheet$set("public", "has_history", function() { - return(length(private$history) > 1) +DataSheet$set("public", "has_undo_history", function() { + return(length(private$undo_history) > 1) } ) DataSheet$set("public", "undo_last_action", function() { # Perform the undo action - if (length(private$history) > 1) { - previous_state <- private$history[[length(private$history)]] + if (length(private$undo_history) > 1) { + previous_state <- private$undo_history[[length(private$undo_history)]] self$set_data(as.data.frame(previous_state)) # Restore the previous state - private$history <- private$history[-length(private$history)] # Remove the latest state + private$undo_history <- private$undo_history[-length(private$undo_history)] # Remove the latest state } else { message("No more actions to undo.") } @@ -216,18 +216,18 @@ DataSheet$set("public", "undo_last_action", function() { # Redo function DataSheet$set("public", "redo_last_action", function() { - if (length(private$redo_history) > 0) { - # Get the last undone state from redo history - next_state <- private$redo_history[[length(private$redo_history)]] + if (length(private$redo_undo_history) > 0) { + # Get the last undone state from redo undo_history + next_state <- private$redo_undo_history[[length(private$redo_undo_history)]] # Restore the next state self$set_data(as.data.frame(next_state)) - # Move the state back to the history - private$history <- append(private$history, list(next_state)) + # Move the state back to the undo_history + private$undo_history <- append(private$undo_history, list(next_state)) - # Remove the state from redo history - private$redo_history <- private$redo_history[-length(private$redo_history)] + # Remove the state from redo undo_history + private$redo_undo_history <- private$redo_undo_history[-length(private$redo_undo_history)] } else { message("No more actions to redo.") } @@ -290,13 +290,13 @@ DataSheet$set("public", "set_scalars", function(new_scalars) { } ) -# Set history with memory management -DataSheet$set("public", "set_history", function(history) { - if (!is.list(history)) stop("history must be of type: list") +# Set undo_history with memory management +DataSheet$set("public", "set_undo_history", function(new_undo_history) { + if (!is.list(new_undo_history)) stop("undo_history must be of type: list") - # Define memory and history limits - MAX_HISTORY_SIZE <- 10 # Limit to last 10 history states - MAX_MEMORY_LIMIT_MB <- 1024 # Limit the memory usage for undo history + # Define memory and undo_history limits + MAX_undo_history_SIZE <- 10 # Limit to last 10 undo_history states + MAX_MEMORY_LIMIT_MB <- 1024 # Limit the memory usage for undo undo_history # Check current memory usage current_memory <- monitor_memory() @@ -304,16 +304,16 @@ DataSheet$set("public", "set_history", function(history) { # If memory exceeds limit, remove the oldest entry if (current_memory > MAX_MEMORY_LIMIT_MB) { message(paste("Memory limit exceeded:", round(current_memory, 2), "MB. Removing oldest entry.")) - private$history <- private$history[-1] # Remove the oldest entry + private$undo_history <- private$undo_history[-1] # Remove the oldest entry gc() # Trigger garbage collection to free memory } - # Limit history size - if (length(private$history) >= MAX_HISTORY_SIZE) { - private$history <- private$history[-1] # Remove the oldest entry + # Limit undo_history size + if (length(private$undo_history) >= MAX_undo_history_SIZE) { + private$undo_history <- private$undo_history[-1] # Remove the oldest entry } - private$history <- append(private$history, list(history)) + private$undo_history <- append(private$undo_history, list(new_undo_history)) # Explicitly call garbage collection to release memory gc() @@ -743,8 +743,8 @@ DataSheet$set("public", "add_scalar", function(scalar_name = "", scalar_value) { ) DataSheet$set("public", "add_columns_to_data", function(col_name = "", col_data, use_col_name_as_prefix = FALSE, hidden = FALSE, before, adjacent_column = "", num_cols, require_correct_length = TRUE, keep_existing_position = TRUE) { - # Save the current state to history before making modifications - self$save_state_to_history() + # Save the current state to undo_history before making modifications + self$save_state_to_undo_history() # Column name must be character if(!is.character(col_name)) stop("Column name must be of type: character") @@ -896,8 +896,8 @@ DataSheet$set("public", "cor", function(x_col_names, y_col_name, use = "everythi DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", new_col_name = "", label = "", type = "single", .fn, .cols = everything(), new_column_names_df, new_labels_df, ...) { curr_data <- self$get_data_frame(use_current_filter = FALSE, use_column_selection = FALSE) - # Save the current state to history before making modifications - self$save_state_to_history() + # Save the current state to undo_history before making modifications + self$save_state_to_undo_history() # Column name must be character if (type == "single") { @@ -989,8 +989,8 @@ DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", ne DataSheet$set("public", "remove_columns_in_data", function(cols=c(), allow_delete_all = FALSE) { - # Save the current state to history before making modifications - self$save_state_to_history() + # Save the current state to undo_history before making modifications + self$save_state_to_undo_history() if(length(cols) == self$get_column_count()) { if(allow_delete_all) { @@ -1026,7 +1026,7 @@ DataSheet$set("public", "remove_columns_in_data", function(cols=c(), allow_delet DataSheet$set("public", "replace_value_in_data", function(col_names, rows, old_value, old_is_missing = FALSE, start_value = NA, end_value = NA, new_value, new_is_missing = FALSE, closed_start_value = TRUE, closed_end_value = TRUE, locf = FALSE, from_last = FALSE) { curr_data <- self$get_data_frame(use_current_filter = FALSE) - self$save_state_to_history() + self$save_state_to_undo_history() # Column name must be character if(!all(is.character(col_names))) stop("Column name must be of type: character") if (!all(col_names %in% names(curr_data))) stop("Cannot find all columns in the data.") @@ -1371,7 +1371,7 @@ DataSheet$set("public", "add_defaults_variables_metadata", function(column_names DataSheet$set("public", "remove_rows_in_data", function(row_names) { curr_data <- self$get_data_frame(use_current_filter = FALSE) - self$save_state_to_history() + self$save_state_to_undo_history() if(!all(row_names %in% rownames(curr_data))) stop("Some of the row_names not found in data") rows_to_remove <- which(rownames(curr_data) %in% row_names) @@ -1397,8 +1397,8 @@ DataSheet$set("public", "get_next_default_column_name", function(prefix) { DataSheet$set("public", "reorder_columns_in_data", function(col_order) { if (ncol(self$get_data_frame(use_current_filter = FALSE, use_column_selection = FALSE)) != length(col_order)) stop("Columns to order should be same as columns in the data.") - # Save the current state to history before making modifications - self$save_state_to_history() + # Save the current state to undo_history before making modifications + self$save_state_to_undo_history() if(is.numeric(col_order)) { if(!(identical(sort(col_order), sort(as.numeric(1:ncol(data)))))) { @@ -1422,7 +1422,7 @@ DataSheet$set("public", "reorder_columns_in_data", function(col_order) { DataSheet$set("public", "insert_row_in_data", function(start_row, row_data = c(), number_rows = 1, before = FALSE) { curr_data <- self$get_data_frame(use_current_filter = FALSE) - self$save_state_to_history() + self$save_state_to_undo_history() curr_row_names <- rownames(curr_data) if (!start_row %in% curr_row_names) { stop(paste(start_row, " not found in rows")) @@ -4605,7 +4605,7 @@ DataSheet$set("public", "remove_empty", function(which = c("rows", "cols")) { DataSheet$set("public", "replace_values_with_NA", function(row_index, column_index) { curr_data <- self$get_data_frame(use_current_filter = FALSE) - self$save_state_to_history() + self$save_state_to_undo_history() if(!all(row_index %in% seq_len(nrow(curr_data)))) stop("All row indexes must be within the dataframe") if(!all(column_index %in% seq_len(ncol(curr_data)))) stop("All column indexes must be within the dataframe") diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index 29e9100c280..8c4d49f9db6 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -11,7 +11,7 @@ DataBook <- R6::R6Class("DataBook", self$set_meta(instat_obj_metadata) self$set_objects(list()) self$set_scalars(list()) - self$set_history(list()) + self$set_undo_history(list()) if (missing(data_tables) || length(data_tables) == 0) { self$set_data_objects(list()) @@ -32,7 +32,7 @@ DataBook <- R6::R6Class("DataBook", .metadata = list(), .objects = list(), .scalars = list(), - .history = list(), + .undo_history = list(), .links = list(), .data_sheets_changed = FALSE, .database_connection = NULL, @@ -318,12 +318,18 @@ DataBook$set("public", "set_objects", function(new_objects) { } ) -DataBook$set("public", "set_history", function(new_history) { - if (!is.list(new_history)) stop("history must be of type: list") - private$.history <- new_history +DataBook$set("public", "set_undo_history", function(new_undo_history) { + if (!is.list(new_undo_history)) stop("undo_history must be of type: list") + + private$.undo_history <- new_undo_history } ) +DataSheet$set("public", "disable_undo", function() { + private$.undo_history <- list() # Clear history + self$undo_enabled <- FALSE # Disable undo functionality +}) + DataBook$set("public", "set_scalars", function(new_scalars) { if(!is.list(new_scalars)) stop("new_scalars must be of type: list") private$.scalars <- new_scalars @@ -1360,8 +1366,8 @@ DataBook$set("public","has_key", function(data_name) { } ) -DataBook$set("public","has_history", function(data_name) { - self$get_data_objects(data_name)$has_history() +DataBook$set("public","has_undo_history", function(data_name) { + self$get_data_objects(data_name)$has_undo_history() } ) diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index 1c827f1c1c7..152bd23aa57 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -100,7 +100,7 @@ Public Class ucrDataView _grid.AddRowData(dataFrame) _grid.UpdateWorksheetStyle(fillWorkSheet) dataFrame.clsVisibleDataFramePage.HasChanged = False - frmMain.mnuUndo.Enabled = dataFrame.clsVisibleDataFramePage.HasHistory + frmMain.mnuUndo.Enabled = dataFrame.clsVisibleDataFramePage.HasUndoHistory RefreshDisplayInformation() End Sub @@ -275,7 +275,7 @@ Public Class ucrDataView SetDisplayLabels() UpdateNavigationButtons() SetGridVisibility(True) - frmMain.mnuUndo.Enabled = GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasHistory + frmMain.mnuUndo.Enabled = GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasUndoHistory Else frmMain.tstatus.Text = GetTranslation("No data loaded") SetGridVisibility(False) @@ -1052,7 +1052,7 @@ Public Class ucrDataView End If - If GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasHistory Then + If GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasUndoHistory Then GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() End If End If From 743cec73290569dfab65a6f0b1b429212154b174 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 22 Oct 2024 14:39:02 +0300 Subject: [PATCH 26/32] code change --- instat/static/InstatObject/R/instat_object_R6.R | 5 ----- 1 file changed, 5 deletions(-) diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index 8c4d49f9db6..e53d37cd90d 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -325,11 +325,6 @@ DataBook$set("public", "set_undo_history", function(new_undo_history) { } ) -DataSheet$set("public", "disable_undo", function() { - private$.undo_history <- list() # Clear history - self$undo_enabled <- FALSE # Disable undo functionality -}) - DataBook$set("public", "set_scalars", function(new_scalars) { if(!is.list(new_scalars)) stop("new_scalars must be of type: list") private$.scalars <- new_scalars From d4f93ddc794393d8dfd89ae88d2eb749e5122495 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 22 Oct 2024 17:38:25 +0300 Subject: [PATCH 27/32] implemented the possibility to switch on/off undo in different datasets --- instat/Interface/IDataViewGrid.vb | 2 ++ instat/Model/DataFrame/clsDataFramePage.vb | 27 +++++++++++++++++++ .../DataGrid/Linux/ucrDataViewLinuxGrid.vb | 2 ++ .../DataGrid/ReoGrid/ucrDataViewReoGrid.vb | 7 +++++ instat/dlgOptions.vb | 1 + instat/frmMain.vb | 4 +++ instat/static/InstatObject/R/data_object_R6.R | 24 +++++++++++------ .../static/InstatObject/R/instat_object_R6.R | 9 +++++++ instat/ucrDataView.vb | 19 +++++++++++++ 9 files changed, 87 insertions(+), 8 deletions(-) diff --git a/instat/Interface/IDataViewGrid.vb b/instat/Interface/IDataViewGrid.vb index 4145675170f..3bc8368f164 100644 --- a/instat/Interface/IDataViewGrid.vb +++ b/instat/Interface/IDataViewGrid.vb @@ -29,6 +29,8 @@ Public Interface IDataViewGrid Event WorksheetChanged() + Event WorksheetInserted() + Event WorksheetRemoved(worksheet As clsWorksheetAdapter) Event FindRow() diff --git a/instat/Model/DataFrame/clsDataFramePage.vb b/instat/Model/DataFrame/clsDataFramePage.vb index 3926bc24f29..062e2216a90 100644 --- a/instat/Model/DataFrame/clsDataFramePage.vb +++ b/instat/Model/DataFrame/clsDataFramePage.vb @@ -213,6 +213,33 @@ Public Class clsDataFramePage End Sub + Public Function IsUndo(strCurrentDataFrame As String) + Dim clsIsUndoFunction As New RFunction + Dim expTemp As SymbolicExpression + clsIsUndoFunction.SetRCommand(_clsRLink.strInstatDataObject & "$is_undo") + clsIsUndoFunction.AddParameter("data_name", Chr(34) & strCurrentDataFrame & Chr(34)) + + If clsIsUndoFunction IsNot Nothing Then + expTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsIsUndoFunction.ToScript(), bSilent:=True) + If expTemp IsNot Nothing AndAlso expTemp.AsCharacter(0) = "TRUE" Then + Return True + End If + End If + + Return False + End Function + + Public Sub DisableEnableUndo(bDisable As Boolean, strCurrentDataFrame As String) + Dim clsEnableDisableUndoRFunction As New RFunction + clsEnableDisableUndoRFunction.SetRCommand(_clsRLink.strInstatDataObject & "$set_enable_disable_undo") + clsEnableDisableUndoRFunction.AddParameter("data_name", Chr(34) & strCurrentDataFrame & Chr(34)) + + Dim strDisable As String = If(bDisable, "TRUE", "FALSE") + clsEnableDisableUndoRFunction.AddParameter("disable_undo", strDisable) + _clsRLink.RunScript(clsEnableDisableUndoRFunction.ToScript) + + End Sub + Public Function HasUndoHistory() Dim expTemp As SymbolicExpression Dim bHasHistory As Boolean = False diff --git a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb index 3977f595ba1..103d1d540d0 100644 --- a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb +++ b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb @@ -35,6 +35,8 @@ Public Class ucrDataViewLinuxGrid Public Event WorksheetChanged() Implements IDataViewGrid.WorksheetChanged + Public Event WorksheetInserted() Implements IDataViewGrid.WorksheetInserted + Public Event WorksheetRemoved(worksheet As clsWorksheetAdapter) Implements IDataViewGrid.WorksheetRemoved Public Sub AddColumns(visiblePage As clsDataFramePage) Implements IDataViewGrid.AddColumns diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index af8a4ea89e3..d2b1a9cf276 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -35,6 +35,8 @@ Public Class ucrDataViewReoGrid Public Event WorksheetChanged() Implements IDataViewGrid.WorksheetChanged + Public Event WorksheetInserted() Implements IDataViewGrid.WorksheetInserted + Public Event WorksheetRemoved(worksheet As clsWorksheetAdapter) Implements IDataViewGrid.WorksheetRemoved Public Sub AddColumns(visiblePage As clsDataFramePage) Implements IDataViewGrid.AddColumns @@ -222,6 +224,11 @@ Public Class ucrDataViewReoGrid RaiseEvent WorksheetChanged() End Sub + Private Sub grdData_WorksheetInserted(sender As Object, e As EventArgs) Handles grdData.WorksheetInserted + RaiseEvent WorksheetInserted() + End Sub + + Private Sub grdData_WorksheetRemoved(sender As Object, e As WorksheetRemovedEventArgs) Handles grdData.WorksheetRemoved RaiseEvent WorksheetRemoved(New clsWorksheetAdapter(e.Worksheet)) End Sub diff --git a/instat/dlgOptions.vb b/instat/dlgOptions.vb index 76e880c2129..f1c25588dca 100644 --- a/instat/dlgOptions.vb +++ b/instat/dlgOptions.vb @@ -209,6 +209,7 @@ Public Class dlgOptions frmMain.clsInstatOptions.SetMaximumOutputsHeight(If(ucrChkMaxOutputsHeight.Checked, ucrNudMaxOutputsHeight.Value, -1)) frmMain.clsInstatOptions.ExecuteRGlobalOptions() + frmMain.DisableEnableUndo(ucrChkTurnOffUndo.Checked) End Sub Private Sub SetView() diff --git a/instat/frmMain.vb b/instat/frmMain.vb index d911c3daadc..de20ca54564 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -685,6 +685,10 @@ Public Class frmMain End If End Sub + Public Sub DisableEnableUndo(bDisable As Boolean) + ucrDataViewer.DisableEnableUndo(bDisable) + End Sub + Private Sub mnuFileNewDataFrame_Click(sender As Object, e As EventArgs) Handles mnuFileNewDataFrame.Click dlgNewDataFrame.ShowDialog() End Sub diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index bcfe8a4c382..5a241fc68b1 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -5,7 +5,7 @@ DataSheet <- R6::R6Class("DataSheet", imported_from = "", messages = TRUE, convert=TRUE, create = TRUE, start_point=1, filters = list(), column_selections = list(), objects = list(), - calculations = list(), scalars = list(), keys = list(), comments = list(), keep_attributes = TRUE, undo_history = list(), redo_undo_history = list()) + calculations = list(), scalars = list(), keys = list(), comments = list(), keep_attributes = TRUE, undo_history = list(), redo_undo_history = list(), disable_undo = FALSE) { # Set up the data object self$set_data(data, messages) @@ -31,7 +31,6 @@ DataSheet <- R6::R6Class("DataSheet", self$set_scalars(scalars) self$set_keys(keys) self$set_comments(comments) - self$set_undo_history(undo_history) # If no name for the data.frame has been given in the list we create a default one. # Decide how to choose default name index @@ -65,7 +64,8 @@ DataSheet <- R6::R6Class("DataSheet", comments = list(), calculations = list(), scalars = list(), - changes = list(), + changes = list(), + disable_undo = FALSE, .current_filter = list(), .current_column_selection = list(), .data_changed = FALSE, @@ -163,11 +163,19 @@ DataSheet$set("public", "set_data", function(new_data, messages=TRUE, check_name } } ) +DataSheet$set("public", "set_enable_disable_undo", function(disable_undo) { + private$disable_undo <- disable_undo + if(disable_undo) {private$undo_history <- list()} +}) DataSheet$set("public", "save_state_to_undo_history", function() { self$set_undo_history(list(private$data)) }) +DataSheet$set("public", "is_undo", function() { + return(private$disable_undo) +}) + DataSheet$set("public", "set_meta", function(new_meta) { meta_data_copy <- new_meta self$clear_metadata() @@ -192,14 +200,14 @@ DataSheet$set("public", "clear_metadata", function() { ) DataSheet$set("public", "has_undo_history", function() { - return(length(private$undo_history) > 1) + return(length(private$undo_history) > 0) } ) DataSheet$set("public", "undo_last_action", function() { # Perform the undo action - if (length(private$undo_history) > 1) { + if (length(private$undo_history) > 0) { previous_state <- private$undo_history[[length(private$undo_history)]] self$set_data(as.data.frame(previous_state)) # Restore the previous state @@ -293,7 +301,7 @@ DataSheet$set("public", "set_scalars", function(new_scalars) { # Set undo_history with memory management DataSheet$set("public", "set_undo_history", function(new_undo_history) { if (!is.list(new_undo_history)) stop("undo_history must be of type: list") - + if(!private$disable_undo){ # Define memory and undo_history limits MAX_undo_history_SIZE <- 10 # Limit to last 10 undo_history states MAX_MEMORY_LIMIT_MB <- 1024 # Limit the memory usage for undo undo_history @@ -314,9 +322,9 @@ DataSheet$set("public", "set_undo_history", function(new_undo_history) { } private$undo_history <- append(private$undo_history, list(new_undo_history)) - # Explicitly call garbage collection to release memory - gc() + #gc() + } }) DataSheet$set("public", "set_keys", function(new_keys) { diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index e53d37cd90d..5270526bc58 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -1361,6 +1361,15 @@ DataBook$set("public","has_key", function(data_name) { } ) +DataBook$set("public","set_enable_disable_undo", function(data_name, disable_undo) { + self$get_data_objects(data_name)$set_enable_disable_undo(disable_undo) +} +) + +DataBook$set("public", "is_undo", function(data_name) { + self$get_data_objects(data_name)$is_undo() +}) + DataBook$set("public","has_undo_history", function(data_name) { self$get_data_objects(data_name)$has_undo_history() } diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index 152bd23aa57..854d76580a2 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -82,6 +82,7 @@ Public Class ucrDataView Private Sub AttachEventsToGrid() AddHandler _grid.WorksheetChanged, AddressOf CurrentWorksheetChanged + AddHandler _grid.WorksheetInserted, AddressOf WorksheetInserted AddHandler _grid.WorksheetRemoved, AddressOf WorksheetRemoved AddHandler _grid.ReplaceValueInData, AddressOf ReplaceValueInData AddHandler _grid.PasteValuesToDataframe, AddressOf PasteValuesToDataFrame @@ -101,6 +102,7 @@ Public Class ucrDataView _grid.UpdateWorksheetStyle(fillWorkSheet) dataFrame.clsVisibleDataFramePage.HasChanged = False frmMain.mnuUndo.Enabled = dataFrame.clsVisibleDataFramePage.HasUndoHistory + RefreshDisplayInformation() End Sub @@ -248,9 +250,14 @@ Public Class ucrDataView dlgName.ShowDialog() End Sub + Public Sub WorksheetInserted() + DisableEnableUndo(frmMain.clsInstatOptions.bSwitchOffUndo) + End Sub + Public Sub CurrentWorksheetChanged() frmMain.ucrColumnMeta.SetCurrentDataFrame(GetCurrentDataFrameNameFocus()) RefreshDisplayInformation() + IsUndo() End Sub Public Function GetFirstRowHeader() As String @@ -269,6 +276,12 @@ Public Class ucrDataView _grid.AdjustColumnWidthAfterWrapping(strColumn, bApplyWrap) End Sub + Public Sub IsUndo() + If GetWorkSheetCount() <> 0 AndAlso _clsDataBook IsNot Nothing AndAlso GetCurrentDataFrameFocus() IsNot Nothing Then + frmMain.clsInstatOptions.SetOffUndo(GetCurrentDataFrameFocus.clsVisibleDataFramePage.IsUndo(GetCurrentDataFrameNameFocus)) + End If + End Sub + Private Sub RefreshDisplayInformation() If GetWorkSheetCount() <> 0 AndAlso _clsDataBook IsNot Nothing AndAlso GetCurrentDataFrameFocus() IsNot Nothing Then frmMain.tstatus.Text = _grid.CurrentWorksheet.Name @@ -282,6 +295,12 @@ Public Class ucrDataView End If End Sub + Public Sub DisableEnableUndo(bDisable As Boolean) + If GetWorkSheetCount() <> 0 AndAlso _clsDataBook IsNot Nothing AndAlso GetCurrentDataFrameFocus() IsNot Nothing Then + GetCurrentDataFrameFocus.clsVisibleDataFramePage.DisableEnableUndo(bDisable, GetCurrentDataFrameNameFocus) + End If + End Sub + Private Sub ResizeLabels() Const iMinSize As Single = 4.5 TblPanPageDisplay.Font = New Font(TblPanPageDisplay.Font.FontFamily, 12, TblPanPageDisplay.Font.Style) From 15a8932db4038b4f85af0e8c1343f1ed1b2e47cf Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 22 Oct 2024 18:04:16 +0300 Subject: [PATCH 28/32] minor addition --- instat/static/InstatObject/R/data_object_R6.R | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 5a241fc68b1..2e9ecf7dee0 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -165,7 +165,10 @@ DataSheet$set("public", "set_data", function(new_data, messages=TRUE, check_name ) DataSheet$set("public", "set_enable_disable_undo", function(disable_undo) { private$disable_undo <- disable_undo - if(disable_undo) {private$undo_history <- list()} + if(disable_undo) { + private$undo_history <- list() + gc() + } }) DataSheet$set("public", "save_state_to_undo_history", function() { From 15a35d9cf6c9672a3aa65bc1859764afa86d6bdf Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 23 Oct 2024 10:56:36 +0300 Subject: [PATCH 29/32] Call gc() to ensure memory is freed promptly for removing/resetting in the list --- instat/static/InstatObject/R/data_object_R6.R | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 2e9ecf7dee0..2a2f10820bd 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -215,13 +215,13 @@ DataSheet$set("public", "undo_last_action", function() { self$set_data(as.data.frame(previous_state)) # Restore the previous state private$undo_history <- private$undo_history[-length(private$undo_history)] # Remove the latest state + + # Trigger garbage collection to free memory + gc() } else { message("No more actions to undo.") } - # Trigger garbage collection to free memory - gc() - }) @@ -322,11 +322,10 @@ DataSheet$set("public", "set_undo_history", function(new_undo_history) { # Limit undo_history size if (length(private$undo_history) >= MAX_undo_history_SIZE) { private$undo_history <- private$undo_history[-1] # Remove the oldest entry + gc() # Trigger garbage collection to free memory } private$undo_history <- append(private$undo_history, list(new_undo_history)) - # Explicitly call garbage collection to release memory - #gc() } }) From aca453ad984f8d149f45e242a4a54bff94269aab Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 23 Oct 2024 14:35:11 +0300 Subject: [PATCH 30/32] Added the logger and code addition --- instat/dlgCalculator.vb | 7 +++++++ instat/ucrDataView.vb | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb index b12f61d9ae4..c7eee20e0ad 100644 --- a/instat/dlgCalculator.vb +++ b/instat/dlgCalculator.vb @@ -36,8 +36,11 @@ Public Class dlgCalculator Private strDefaultKeyboard As String ' Note: This list needs to be updated when a new keyboard is added. Private strKeyboards() As String = {"Basic", "Maths", "Logical and Symbols", "Transform", "Summary", "Probability", "Factor", "Text/Strings (Character Columns)", "Dates/Times", "Circular", "Wakefield", "Goodness of Fit", "List", "Complex", "Integer", "Functions"} + Private Shared ReadOnly Logger As NLog.Logger = NLog.LogManager.GetCurrentClassLogger() + Private Sub dlgCalculator_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Dim start = DateTime.Now If bFirstLoad Then InitialiseDialog() iBasicWidth = Me.Width @@ -48,6 +51,10 @@ Public Class dlgCalculator ReopenDialog() TestOKEnabled() autoTranslate(Me) + + Logger.Debug("This is in the load") + Logger.Debug(Process.GetCurrentProcess().WorkingSet64) + Logger.Debug("Time", DateTime.Now - start) End Sub Private Sub TestOKEnabled() diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index 854d76580a2..53f09a8b6ac 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -101,7 +101,7 @@ Public Class ucrDataView _grid.AddRowData(dataFrame) _grid.UpdateWorksheetStyle(fillWorkSheet) dataFrame.clsVisibleDataFramePage.HasChanged = False - frmMain.mnuUndo.Enabled = dataFrame.clsVisibleDataFramePage.HasUndoHistory + 'frmMain.mnuUndo.Enabled = dataFrame.clsVisibleDataFramePage.HasUndoHistory RefreshDisplayInformation() End Sub @@ -158,6 +158,7 @@ Public Class ucrDataView RefreshDisplayInformation() End If End If + frmMain.mnuUndo.Enabled = GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasUndoHistory _grid.Focus() End Sub From 28beaa27835886a6cd2ac4b9ff8104de648fd0b8 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 23 Oct 2024 14:51:54 +0300 Subject: [PATCH 31/32] minor bug fix --- instat/ucrDataView.vb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index 53f09a8b6ac..7b1acaca241 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -101,7 +101,6 @@ Public Class ucrDataView _grid.AddRowData(dataFrame) _grid.UpdateWorksheetStyle(fillWorkSheet) dataFrame.clsVisibleDataFramePage.HasChanged = False - 'frmMain.mnuUndo.Enabled = dataFrame.clsVisibleDataFramePage.HasUndoHistory RefreshDisplayInformation() End Sub @@ -158,8 +157,7 @@ Public Class ucrDataView RefreshDisplayInformation() End If End If - frmMain.mnuUndo.Enabled = GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasUndoHistory - + EnableDisableUndoMenu() _grid.Focus() End Sub @@ -237,6 +235,12 @@ Public Class ucrDataView _grid.SelectAll() End Sub + Private Sub EnableDisableUndoMenu() + If GetWorkSheetCount() <> 0 AndAlso _clsDataBook IsNot Nothing AndAlso GetCurrentDataFrameFocus() IsNot Nothing Then + frmMain.mnuUndo.Enabled = GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasUndoHistory + End If + End Sub + Private Sub deleteSheet_Click(sender As Object, e As EventArgs) Handles deleteDataFrame.Click dlgDeleteDataFrames.SetDataFrameToAdd(_grid.CurrentWorksheet.Name) dlgDeleteDataFrames.ShowDialog() @@ -289,7 +293,7 @@ Public Class ucrDataView SetDisplayLabels() UpdateNavigationButtons() SetGridVisibility(True) - frmMain.mnuUndo.Enabled = GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasUndoHistory + EnableDisableUndoMenu() Else frmMain.tstatus.Text = GetTranslation("No data loaded") SetGridVisibility(False) From 2c6a091dff3a3cf28cedacd54fb0937484f968e3 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 23 Oct 2024 18:53:16 +0300 Subject: [PATCH 32/32] improved the management of metadat in undo --- instat/static/InstatObject/R/data_object_R6.R | 74 ++++++++++++------- 1 file changed, 46 insertions(+), 28 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 2a2f10820bd..45145ecd644 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -172,7 +172,7 @@ DataSheet$set("public", "set_enable_disable_undo", function(disable_undo) { }) DataSheet$set("public", "save_state_to_undo_history", function() { - self$set_undo_history(list(private$data)) + self$set_undo_history(private$data, attributes(private$data)) }) DataSheet$set("public", "is_undo", function() { @@ -209,19 +209,31 @@ DataSheet$set("public", "has_undo_history", function() { DataSheet$set("public", "undo_last_action", function() { - # Perform the undo action + # Check if there's any action to undo if (length(private$undo_history) > 0) { + # Get the last state from the undo history previous_state <- private$undo_history[[length(private$undo_history)]] - self$set_data(as.data.frame(previous_state)) # Restore the previous state - private$undo_history <- private$undo_history[-length(private$undo_history)] # Remove the latest state + # Restore the data and its attributes + restored_data <- previous_state$data # Extract the dataframe + restored_attributes <- previous_state$attributes # Extract the attributes + + # Set the dataframe in the DataSheet + self$set_data(as.data.frame(restored_data)) + + # Restore attributes + restored_attributes <- previous_state$attributes # Extract the attributes + for (property in names(restored_attributes)) { + self$append_to_metadata(property, restored_attributes[[property]]) + } + # Remove the latest state from the undo history + private$undo_history <- private$undo_history[-length(private$undo_history)] # Trigger garbage collection to free memory gc() } else { message("No more actions to undo.") } - }) @@ -302,33 +314,39 @@ DataSheet$set("public", "set_scalars", function(new_scalars) { ) # Set undo_history with memory management -DataSheet$set("public", "set_undo_history", function(new_undo_history) { - if (!is.list(new_undo_history)) stop("undo_history must be of type: list") - if(!private$disable_undo){ - # Define memory and undo_history limits - MAX_undo_history_SIZE <- 10 # Limit to last 10 undo_history states - MAX_MEMORY_LIMIT_MB <- 1024 # Limit the memory usage for undo undo_history - - # Check current memory usage - current_memory <- monitor_memory() - - # If memory exceeds limit, remove the oldest entry - if (current_memory > MAX_MEMORY_LIMIT_MB) { - message(paste("Memory limit exceeded:", round(current_memory, 2), "MB. Removing oldest entry.")) - private$undo_history <- private$undo_history[-1] # Remove the oldest entry - gc() # Trigger garbage collection to free memory - } - - # Limit undo_history size - if (length(private$undo_history) >= MAX_undo_history_SIZE) { - private$undo_history <- private$undo_history[-1] # Remove the oldest entry - gc() # Trigger garbage collection to free memory - } +DataSheet$set("public", "set_undo_history", function(new_data, attributes = list()) { + if (!is.data.frame(new_data)) stop("new_data must be of type: data.frame") - private$undo_history <- append(private$undo_history, list(new_undo_history)) + if (!private$disable_undo) { + # Define memory and undo_history limits + MAX_undo_history_SIZE <- 10 # Limit to last 10 undo_history states + MAX_MEMORY_LIMIT_MB <- 1024 # Limit the memory usage for undo_history + + # Check current memory usage + current_memory <- monitor_memory() + + # If memory exceeds limit, remove the oldest entry + if (current_memory > MAX_MEMORY_LIMIT_MB) { + message(paste("Memory limit exceeded:", round(current_memory, 2), "MB. Removing oldest entry.")) + private$undo_history <- private$undo_history[-1] # Remove the oldest entry + gc() # Trigger garbage collection to free memory + } + + # Limit undo_history size + if (length(private$undo_history) >= MAX_undo_history_SIZE) { + private$undo_history <- private$undo_history[-1] # Remove the oldest entry + gc() # Trigger garbage collection to free memory + } + + # Package the new data and attributes into a list + new_undo_entry <- list(data = new_data, attributes = attributes) + + # Append the new entry to the undo history + private$undo_history <- append(private$undo_history, list(new_undo_entry)) } }) + DataSheet$set("public", "set_keys", function(new_keys) { if(!is.list(new_keys)) stop("new_keys must be of type: list") self$append_to_changes(list(Set_property, "keys"))