Skip to content

Commit

Permalink
Merge pull request IDEMSInternational#1637 from dannyparsons/grid
Browse files Browse the repository at this point in the history
added grid to combine subdialog
  • Loading branch information
dannyparsons authored Aug 24, 2016
2 parents d734dfa + 6ea899b commit dfded23
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 5 deletions.
1 change: 0 additions & 1 deletion instat/frmMetaData.vb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ Public Class frmMetaData
grdMetaData.SetSettings(unvell.ReoGrid.WorkbookSettings.View_ShowHorScroll, False)
grdMetaData.CurrentWorksheet.SetSettings(unvell.ReoGrid.WorksheetSettings.Edit_Readonly, True)
grdMetaData.SheetTabNewButtonVisible = False
grdMetaData.SheetTabNewButtonVisible = False
grdMetaData.ColumnHeaderContextMenuStrip = context.grdData.ColumnHeaderContextMenuStrip
grdMetaData.ContextMenuStrip = context.grdData.ContextMenuStrip
grdMetaData.RowHeaderContextMenuStrip = context.grdData.RowHeaderContextMenuStrip
Expand Down
26 changes: 23 additions & 3 deletions instat/sdgCombineGraphOptions.Designer.vb

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

14 changes: 13 additions & 1 deletion instat/sdgCombineGraphOptions.vb
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,17 @@
'
' You should have received a copy of the GNU General Public License k
' along with this program. If not, see <http://www.gnu.org/licenses/>.
Imports unvell.ReoGrid
Imports unvell.ReoGrid.Events

Public Class sdgCombineGraphOptions
Private bFirstLoad As Boolean = True
Public clsRsyntax As New RSyntax
Private WithEvents grdCurrSheet As Worksheet

Private Sub sdgLayout_Load(sender As Object, e As EventArgs) Handles MyBase.Load
If bFirstLoad Then
InitialiseDialog()
SetDefaults()
bFirstLoad = False
End If
Expand All @@ -33,7 +38,11 @@ Public Class sdgCombineGraphOptions
End Sub

Private Sub InitialiseDialog()

grdLayout.SetSettings(unvell.ReoGrid.WorkbookSettings.View_ShowSheetTabControl, False)
grdLayout.SetSettings(unvell.ReoGrid.WorkbookSettings.View_ShowHorScroll, False)
grdLayout.SheetTabNewButtonVisible = False
grdCurrSheet = grdLayout.CurrentWorksheet
grdCurrSheet.SetSettings(unvell.ReoGrid.WorksheetSettings.Edit_DragSelectionToMoveCells, False)
End Sub

Public Sub SetRSyntax(clsNewRSyntax As RSyntax)
Expand Down Expand Up @@ -97,6 +106,9 @@ Public Class sdgCombineGraphOptions
nudColumns.Value = Math.Ceiling(Math.Sqrt(NoOfgraphs))
nudRows.Value = Math.Ceiling((NoOfgraphs / Math.Sqrt(NoOfgraphs)))
End If
End Sub

Private Sub grdCurrSheet_AfterCellEdit(sender As Object, e As CellAfterEditEventArgs) Handles grdCurrSheet.AfterCellEdit

End Sub
End Class

0 comments on commit dfded23

Please sign in to comment.