Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improved the column right-click menu and the Edit Cell dialog #8367

Merged
merged 19 commits into from Jul 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions instat/Interface/IDataViewGrid.vb
Expand Up @@ -25,6 +25,8 @@ Public Interface IDataViewGrid

Event DeleteValuesToDataframe()

Event EditCell()

Event WorksheetChanged()

Event WorksheetRemoved(worksheet As clsWorksheetAdapter)
Expand Down
2 changes: 2 additions & 0 deletions instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb
Expand Up @@ -29,6 +29,8 @@ Public Class ucrDataViewLinuxGrid

Public Event DeleteValueToDataframe() Implements IDataViewGrid.DeleteValuesToDataframe

Public Event EditCell() Implements IDataViewGrid.EditCell

Public Event WorksheetChanged() Implements IDataViewGrid.WorksheetChanged

Public Event WorksheetRemoved(worksheet As clsWorksheetAdapter) Implements IDataViewGrid.WorksheetRemoved
Expand Down
14 changes: 13 additions & 1 deletion instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb
Expand Up @@ -28,6 +28,8 @@ Public Class ucrDataViewReoGrid

Public Event DeleteValueToDataframe() Implements IDataViewGrid.DeleteValuesToDataframe

Public Event EditCell() Implements IDataViewGrid.EditCell

Public Event WorksheetChanged() Implements IDataViewGrid.WorksheetChanged

Public Event WorksheetRemoved(worksheet As clsWorksheetAdapter) Implements IDataViewGrid.WorksheetRemoved
Expand Down Expand Up @@ -86,7 +88,9 @@ Public Class ucrDataViewReoGrid
End If
Next

grdData.CurrentWorksheet.ScrollToCell("A1") ' will always set the scrollbar at the top.
If dataFrame.clsFilterOrColumnSelection.bFilterApplied Then
grdData.CurrentWorksheet.ScrollToCell("A1") ' will always set the scrollbar at the top.
End If

'todo. As of 30/05/2022, the reogrid control version used did not have this setting option
'see issue #7221 for more information.
Expand Down Expand Up @@ -202,4 +206,12 @@ Public Class ucrDataViewReoGrid
End If
End Sub

Private Sub Worksheet_AfterCellKeyDownEventArgs(sender As Object, e As KeyEventArgs) Handles grdData.KeyDown

If (e.KeyCode And Not Keys.Modifiers) = Keys.E AndAlso e.Modifiers = Keys.Control Then
'e.IsCancelled = True
RaiseEvent EditCell()
End If
End Sub

End Class
210 changes: 121 additions & 89 deletions instat/dlgEdit.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.