diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index 30e4f41a1c4..be1e252645b 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -32,11 +32,11 @@ Public Class dlgDescribeTwoVariable 'FORMAT TABLE FUNCTIONS Private clsFootnoteCellBodyFunction, clsFootnoteCellFunction, clsFootnoteSubtitleLocationFunction, clsFootnoteTitleLocationFunction, clsSecondFootnoteCellBodyFunction, - clsSecondFootnoteCellFunction, clsStyleListFunction, + clsSecondFootnoteCellFunction, clsStyleListFunction, clsStubFootnoteFunction, clsTabFootnoteSubtitleFunction, clsTabFootnoteTitleFunction, clsTableSourcenoteFunction, clsTableTitleFunction, clsThemesTabOptionFunction, clsTabStyleCellTextFunction, clsTabStyleCellTitleFunction, clsTabStyleFunction, - clsTabStylePxFunction, clsgtExtrasThemesFuction As New RFunction + clsTabStylePxFunction, clsgtExtrasThemesFuction, clsStubCellsFunction, clsStubFunction As New RFunction Private clsGroupByPipeOperator, clsSummaryOperator As New ROperator @@ -201,6 +201,9 @@ Public Class dlgDescribeTwoVariable clsPivotWiderFunction = New RFunction clsgtExtrasThemesFuction = New RFunction clsMutableOperator = New ROperator + clsStubFunction = New RFunction + clsStubCellsFunction = New RFunction + clsStubFootnoteFunction = New RFunction ucrSelectorDescribeTwoVar.Reset() ucrReceiverFirstVars.SetMeAsReceiver() @@ -234,6 +237,15 @@ Public Class dlgDescribeTwoVariable clsgtExtrasThemesFuction.SetPackageName("gtExtras") + clsStubFunction.SetPackageName("gt") + clsStubFunction.SetRCommand("tab_stubhead") + + clsStubCellsFunction.SetPackageName("gt") + clsStubCellsFunction.SetRCommand("cells_stubhead") + + clsStubFootnoteFunction.SetPackageName("gt") + clsStubFootnoteFunction.SetRCommand("tab_footnote") + clsGroupByFunction.SetPackageName("dplyr") clsGroupByFunction.SetRCommand("group_by") @@ -910,11 +922,11 @@ Public Class dlgDescribeTwoVariable End Sub Private Sub cmdFormatTable_Click(sender As Object, e As EventArgs) Handles cmdFormatTable.Click - sdgFormatSummaryTables.SetRCode(clsNewTableTitleFunction:=clsTableTitleFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction, + sdgFormatSummaryTables.SetRCode(clsNewStubFunction:=clsStubFunction, clsNewGtFunction:=clsgtFunction, clsNewStubCellsFunction:=clsStubCellsFunction, clsNewTableTitleFunction:=clsTableTitleFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction, clsNewThemesTabOptionFunction:=clsThemesTabOptionFunction, clsNewFootnoteCellFunction:=clsFootnoteCellFunction, clsNewSecondFootnoteCellBodyFunction:=clsSecondFootnoteCellBodyFunction, - clsNewPipeOperator:=clsPipeOperator, clsNewFootnoteTitleLocationFunction:=clsFootnoteTitleLocationFunction, clsNewFootnoteCellBodyFunction:=clsFootnoteCellBodyFunction, + clsNewPipeOperator:=clsPipeOperator, clsNewFootnoteTitleLocationFunction:=clsFootnoteTitleLocationFunction, clsNewFootnoteCellBodyFunction:=clsFootnoteCellBodyFunction, clsNewStubFootnoteFunction:=clsStubFootnoteFunction, clsNewFootnoteSubtitleLocationFunction:=clsFootnoteSubtitleLocationFunction, clsNewTabFootnoteSubtitleFunction:=clsTabFootnoteSubtitleFunction, clsNewJoiningOperator:=clsJoiningPipeOperator, - clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction, clsNewgtExtraThemesFunction:=clsgtExtrasThemesFuction, clsNewMutableOperator:=clsMutableOperator, + clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction, clsNewgtExtraThemesFunction:=clsgtExtrasThemesFuction, clsNewMutableOPerator:=clsMutableOperator, clsNewTabStyleCellTextFunction:=clsTabStyleCellTextFunction, clsNewTabStyleFunction:=clsTabStyleFunction, clsNewTabStylePxFunction:=clsTabStylePxFunction, bReset:=bReset) sdgFormatSummaryTables.ShowDialog() End Sub diff --git a/instat/dlgOneVariableSummarise.vb b/instat/dlgOneVariableSummarise.vb index 056dd0c575f..5a73fdabff3 100644 --- a/instat/dlgOneVariableSummarise.vb +++ b/instat/dlgOneVariableSummarise.vb @@ -24,7 +24,7 @@ Public Class dlgOneVariableSummarise clsConcFunction, clsSummaryTableFunction, clsDummyFunction, clsSkimrFunction, clsPivotWiderFunction As New RFunction - Private clsTableTitleFunction, clsTabFootnoteTitleFunction, clsTableSourcenoteFunction, clsFootnoteTitleLocationFunction, + Private clsTableTitleFunction, clsStubFunction, clsStubFootnoteFunction, clsStubCellsFunction, clsTabFootnoteTitleFunction, clsTableSourcenoteFunction, clsFootnoteTitleLocationFunction, clsFootnoteSubtitleLocationFunction, clsTabFootnoteSubtitleFunction, clsFootnoteCellFunction, clsFootnoteCellBodyFunction, clsSecondFootnoteCellFunction, clsSecondFootnoteCellBodyFunction, clsTabStyleFunction, clsTabStyleCellTextFunction, clsTabStylePxFunction, clsTabStyleCellTitleFunction, clsThemesTabOptionsFunction, clsgtExtraThemesFunction As New RFunction @@ -127,6 +127,9 @@ Public Class dlgOneVariableSummarise clsSkimrFunction = New RFunction clsSummaryOperator = New ROperator clsPivotWiderFunction = New RFunction + clsStubFunction = New RFunction + clsStubCellsFunction = New RFunction + clsStubFootnoteFunction = New RFunction clsTableTitleFunction = New RFunction clsTabFootnoteTitleFunction = New RFunction @@ -162,6 +165,15 @@ Public Class dlgOneVariableSummarise clsTabStyleFunction.AddParameter("style", clsRFunctionParameter:=clsTabStyleCellTextFunction, iPosition:=0) clsTabStyleFunction.AddParameter("location", clsRFunctionParameter:=clsTabStyleCellTitleFunction, iPosition:=1) + clsStubFunction.SetPackageName("gt") + clsStubFunction.SetRCommand("tab_stubhead") + + clsStubCellsFunction.SetPackageName("gt") + clsStubCellsFunction.SetRCommand("cells_stubhead") + + clsStubFootnoteFunction.SetPackageName("gt") + clsStubFootnoteFunction.SetRCommand("tab_footnote") + clsTabStyleCellTitleFunction.SetPackageName("gt") clsTabStyleCellTitleFunction.SetRCommand("cells_title") clsTabStyleCellTitleFunction.AddParameter("groups", Chr(34) & "title" & Chr(34), iPosition:=0) @@ -414,7 +426,7 @@ Public Class dlgOneVariableSummarise End Sub Private Sub cmdFormatTable_Click(sender As Object, e As EventArgs) Handles cmdFormatTable.Click - sdgFormatSummaryTables.SetRCode(clsNewTableTitleFunction:=clsTableTitleFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction, + sdgFormatSummaryTables.SetRCode(clsNewStubFunction:=clsStubFunction, clsNewGtFunction:=clsGtFunction, clsNewStubCellsFunction:=clsStubCellsFunction, clsNewStubFootnoteFunction:=clsStubFootnoteFunction, clsNewTableTitleFunction:=clsTableTitleFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction, clsNewFootnoteCellFunction:=clsFootnoteCellFunction, clsNewSecondFootnoteCellBodyFunction:=clsSecondFootnoteCellBodyFunction, clsNewPipeOperator:=clsPipeOperator, clsNewFootnoteTitleLocationFunction:=clsFootnoteTitleLocationFunction, clsNewFootnoteCellBodyFunction:=clsFootnoteCellBodyFunction, clsNewFootnoteSubtitleLocationFunction:=clsFootnoteSubtitleLocationFunction, clsNewTabFootnoteSubtitleFunction:=clsTabFootnoteSubtitleFunction, clsNewJoiningOperator:=clsJoiningPipeOperator, @@ -446,4 +458,4 @@ Public Class dlgOneVariableSummarise Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverOneVarSummarise.ControlContentsChanged, ucrNudMaxSum.ControlContentsChanged, ucrSaveSummary.ControlContentsChanged TestOKEnabled() End Sub -End Class \ No newline at end of file +End Class diff --git a/instat/dlgSummaryTables.vb b/instat/dlgSummaryTables.vb index 6224d2dbdc4..8e6edcb4cb1 100644 --- a/instat/dlgSummaryTables.vb +++ b/instat/dlgSummaryTables.vb @@ -27,7 +27,7 @@ Public Class dlgSummaryTables Private clsStubHeadFunction, clsPivotWiderFunction As New RFunction Private iUcrBaseXLocation, iDialogueXsize As Integer - Private clsTableTitleFunction, clsTabFootnoteTitleFunction, clsTableSourcenoteFunction, clsFootnoteTitleLocationFunction, clsFootnoteSubtitleLocationFunction, + Private clsTableTitleFunction, clsStubFunction, clsStubCellsFunction, clsTabFootnoteTitleFunction, clsStubFootnoteFunction, clsTableSourcenoteFunction, clsFootnoteTitleLocationFunction, clsFootnoteSubtitleLocationFunction, clsTabFootnoteSubtitleFunction, clsFootnoteCellFunction, clsFootnoteCellBodyFunction, clsSecondFootnoteCellFunction, clsSecondFootnoteCellBodyFunction, clsTabStyleFunction, clsDummyFunction, clsTabStyleCellTextFunction, clsTabStylePxFunction, clsTabStyleCellTitleFunction, clsThemesTabOptionsFunction, @@ -194,7 +194,10 @@ Public Class dlgSummaryTables clsSummariesList = New RFunction clsConcFunction = New RFunction clsTableTitleFunction = New RFunction + clsStubFunction = New RFunction + clsStubCellsFunction = New RFunction clsTabFootnoteTitleFunction = New RFunction + clsStubFootnoteFunction = New RFunction clsTableSourcenoteFunction = New RFunction clsFootnoteTitleLocationFunction = New RFunction clsFootnoteSubtitleLocationFunction = New RFunction @@ -293,9 +296,18 @@ Public Class dlgSummaryTables clsTableTitleFunction.SetPackageName("gt") clsTableTitleFunction.SetRCommand("tab_header") + clsStubFunction.SetPackageName("gt") + clsStubFunction.SetRCommand("tab_stubhead") + + clsStubCellsFunction.SetPackageName("gt") + clsStubCellsFunction.SetRCommand("cells_stubhead") + clsTabFootnoteTitleFunction.SetPackageName("gt") clsTabFootnoteTitleFunction.SetRCommand("tab_footnote") + clsStubFootnoteFunction.SetPackageName("gt") + clsStubFootnoteFunction.SetRCommand("tab_footnote") + clsTabFootnoteSubtitleFunction.SetPackageName("gt") clsTabFootnoteSubtitleFunction.SetRCommand("tab_footnote") @@ -397,19 +409,19 @@ Public Class dlgSummaryTables Private Sub cmdFormatTable_Click(sender As Object, e As EventArgs) Handles cmdFormatTable.Click If rdoSummaryTable.Checked Then - sdgFormatSummaryTables.SetRCode(clsNewTableTitleFunction:=clsTableTitleFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction, + sdgFormatSummaryTables.SetRCode(clsNewStubCellsFunction:=clsStubCellsFunction, clsNewGtFunction:=clsGtFunction, clsNewTableTitleFunction:=clsTableTitleFunction, clsNewStubFunction:=clsStubFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewStubFootnoteFunction:=clsStubFootnoteFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction, clsNewFootnoteCellFunction:=clsFootnoteCellFunction, clsNewSecondFootnoteCellBodyFunction:=clsSecondFootnoteCellBodyFunction, clsNewPipeOperator:=clsPipeOperator, clsNewFootnoteTitleLocationFunction:=clsFootnoteTitleLocationFunction, clsNewFootnoteCellBodyFunction:=clsFootnoteCellBodyFunction, clsNewFootnoteSubtitleLocationFunction:=clsFootnoteSubtitleLocationFunction, clsNewTabFootnoteSubtitleFunction:=clsTabFootnoteSubtitleFunction, clsNewJoiningOperator:=clsJoiningPipeOperator, - clsNewMutableOperator:=clsSummaryOperator, clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction, + clsNewMutableOPerator:=clsSummaryOperator, clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction, clsNewTabStyleCellTextFunction:=clsTabStyleCellTextFunction, clsNewTabStyleFunction:=clsTabStyleFunction, clsNewTabStylePxFunction:=clsTabStylePxFunction, clsNewThemesTabOptionFunction:=clsThemesTabOptionsFunction, clsNewgtExtraThemesFunction:=clsgtExtraThemesFunction, bReset:=bResetFormatSubdialog) Else - sdgFormatSummaryTables.SetRCode(clsNewTableTitleFunction:=clsTableTitleFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction, + sdgFormatSummaryTables.SetRCode(clsNewStubCellsFunction:=clsStubCellsFunction, clsNewGtFunction:=clsGtFunction, clsNewTableTitleFunction:=clsTableTitleFunction, clsNewStubFunction:=clsStubFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewStubFootnoteFunction:=clsStubFootnoteFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction, clsNewFootnoteCellFunction:=clsFootnoteCellFunction, clsNewSecondFootnoteCellBodyFunction:=clsSecondFootnoteCellBodyFunction, clsNewPipeOperator:=clsPipeOperator, clsNewFootnoteTitleLocationFunction:=clsFootnoteTitleLocationFunction, clsNewFootnoteCellBodyFunction:=clsFootnoteCellBodyFunction, clsNewFootnoteSubtitleLocationFunction:=clsFootnoteSubtitleLocationFunction, clsNewTabFootnoteSubtitleFunction:=clsTabFootnoteSubtitleFunction, clsNewJoiningOperator:=clsJoiningPipeOperator, - clsNewMutableOperator:=clsFrequencyOperator, clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction, + clsNewMutableOPerator:=clsFrequencyOperator, clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction, clsNewTabStyleCellTextFunction:=clsTabStyleCellTextFunction, clsNewTabStyleFunction:=clsTabStyleFunction, clsNewTabStylePxFunction:=clsTabStylePxFunction, clsNewThemesTabOptionFunction:=clsThemesTabOptionsFunction, clsNewgtExtraThemesFunction:=clsgtExtraThemesFunction, bReset:=bResetFormatSubdialog) End If @@ -585,5 +597,4 @@ Public Class dlgSummaryTables End If End If End Sub - -End Class +End Class \ No newline at end of file diff --git a/instat/dlgUseTable.vb b/instat/dlgUseTable.vb index 0e5bd17a22c..a150588ccf2 100644 --- a/instat/dlgUseTable.vb +++ b/instat/dlgUseTable.vb @@ -20,13 +20,13 @@ Public Class dlgUseTable Private bReset As Boolean = True Private clsRFunctionAsHTML, clsRFunctionAsRTF, clsRFunctionAsWord, clsRFunctionAsLaTex, clsUseTableFunction As New RFunction - Private clsTableTitleFunction, clsTabFootnoteTitleFunction, clsTableSourcenoteFunction, clsDummyFunction, + Private clsTableTitleFunction, clsStubFunction, clsStubFootnoteFunction, clsStubCellsfunction, clsTabFootnoteTitleFunction, clsTableSourcenoteFunction, clsDummyFunction, clsThemesTabOptionsFunction, clsFootnoteCellFunction, clsSecondFootnoteCellBodyFunction, clsFootnoteTitleLocationFunction, clsFootnoteCellBodyFunction, clsFootnoteSubtitleLocationFunction, clsTabFootnoteSubtitleFunction, clsSecondFootnoteCellFunction, clsTabStyleCellTitleFunction, clsTabStyleCellTextFunction, clsTabStyleFunction, clsTabStylePxFunction, - clsgtExtraThemesFunction As New RFunction + clsgtExtraThemesFunction, clsGtFunction As New RFunction Private clsPipeOperator, clsSummaryOperator, clsJoiningPipeOperator As ROperator @@ -105,6 +105,7 @@ Public Class dlgUseTable clsSummaryOperator = New ROperator clsJoiningPipeOperator = New ROperator clsgtExtraThemesFunction = New RFunction + clsGtFunction = New RFunction 'rdoAsHTML.Checked = True ucrTablesReceiver.SetMeAsReceiver() @@ -120,6 +121,9 @@ Public Class dlgUseTable clsSummaryOperator.SetOperation("+") + clsGtFunction.SetPackageName("gt") + clsGtFunction.SetRCommand("gt") + clsTabStyleFunction.SetRCommand("tab_style") clsTabStyleFunction.SetPackageName("gt") clsTabStyleFunction.AddParameter("style", clsRFunctionParameter:=clsTabStyleCellTextFunction, iPosition:=0) @@ -210,7 +214,7 @@ Public Class dlgUseTable End Sub Private Sub cmdFormatOptions_Click(sender As Object, e As EventArgs) Handles cmdFormatOptions.Click - sdgFormatSummaryTables.SetRCode(clsNewTableTitleFunction:=clsTableTitleFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction, + sdgFormatSummaryTables.SetRCode(clsNewStubFunction:=clsStubFunction, clsNewGtFunction:=clsGtFunction, clsNewStubFootnoteFunction:=clsStubFootnoteFunction, clsNewStubCellsFunction:=clsStubCellsfunction, clsNewTableTitleFunction:=clsTableTitleFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction, clsNewFootnoteCellFunction:=clsFootnoteCellFunction, clsNewSecondFootnoteCellBodyFunction:=clsSecondFootnoteCellBodyFunction, clsNewPipeOperator:=clsPipeOperator, clsNewFootnoteTitleLocationFunction:=clsFootnoteTitleLocationFunction, clsNewFootnoteCellBodyFunction:=clsFootnoteCellBodyFunction, clsNewFootnoteSubtitleLocationFunction:=clsFootnoteSubtitleLocationFunction, clsNewTabFootnoteSubtitleFunction:=clsTabFootnoteSubtitleFunction, clsNewJoiningOperator:=clsJoiningPipeOperator, diff --git a/instat/sdgFormatSummaryTables.Designer.vb b/instat/sdgFormatSummaryTables.Designer.vb index 29570f56e07..97556f819f8 100644 --- a/instat/sdgFormatSummaryTables.Designer.vb +++ b/instat/sdgFormatSummaryTables.Designer.vb @@ -24,62 +24,53 @@ Partial Class sdgFormatSummaryTables Private Sub InitializeComponent() Me.tbpFormatOptions = New System.Windows.Forms.TabControl() Me.tbpTitle = New System.Windows.Forms.TabPage() - Me.grpSecondFootnote = New System.Windows.Forms.GroupBox() - Me.lblSecondColumns = New System.Windows.Forms.Label() - Me.lblSecondRows = New System.Windows.Forms.Label() - Me.lblSecondFootnote = New System.Windows.Forms.Label() - Me.lblFootnote = New System.Windows.Forms.Label() - Me.grpLocation = New System.Windows.Forms.GroupBox() - Me.lblColumns = New System.Windows.Forms.Label() - Me.lblRows = New System.Windows.Forms.Label() - Me.grpTitleSubtitle = New System.Windows.Forms.GroupBox() - Me.lblTitleSize = New System.Windows.Forms.Label() - Me.lblTitleFont = New System.Windows.Forms.Label() + Me.grpSubtitle = New System.Windows.Forms.GroupBox() + Me.cmdSubtitleFont = New System.Windows.Forms.Button() + Me.cmdSubtitleFormat = New System.Windows.Forms.Button() + Me.lblSubtitleFootnote = New System.Windows.Forms.Label() + Me.ucrInputSubtitleFootnote = New instat.ucrInputTextBox() + Me.ucrChkSubtitleFootnote = New instat.ucrCheck() + Me.ucrInputSubtitle = New instat.ucrInputTextBox() Me.lblSubtitle = New System.Windows.Forms.Label() + Me.ucrChkIncludeTitles = New instat.ucrCheck() + Me.grpTitle = New System.Windows.Forms.GroupBox() + Me.cmdTitleFont = New System.Windows.Forms.Button() + Me.cmdTitleFormat = New System.Windows.Forms.Button() + Me.lblTitleFootnote = New System.Windows.Forms.Label() + Me.ucrInputTitleFootnote = New instat.ucrInputTextBox() + Me.ucrChkTitleFootnote = New instat.ucrCheck() + Me.ucrInputTitle = New instat.ucrInputTextBox() Me.lblTitle = New System.Windows.Forms.Label() - Me.tbpFacets = New System.Windows.Forms.TabPage() - Me.tbpRows = New System.Windows.Forms.TabPage() - Me.tbpColumns = New System.Windows.Forms.TabPage() + Me.tbpStub = New System.Windows.Forms.TabPage() + Me.ucrChkStub = New instat.ucrCheck() + Me.grpStub = New System.Windows.Forms.GroupBox() + Me.cmdStubFont = New System.Windows.Forms.Button() + Me.cmdStubFormat = New System.Windows.Forms.Button() + Me.lblStubFootnote = New System.Windows.Forms.Label() + Me.ucrInputStubFootnote = New instat.ucrInputTextBox() + Me.ucrChkStubFootnote = New instat.ucrCheck() + Me.ucrInputStub = New instat.ucrInputTextBox() + Me.lblStubs = New System.Windows.Forms.Label() Me.tbpThemes = New System.Windows.Forms.TabPage() + Me.ucrInputSelectThemes = New instat.ucrInputComboBox() Me.cmdManualTheme = New System.Windows.Forms.Button() Me.rdoSelectTheme = New System.Windows.Forms.RadioButton() Me.rdoManualTheme = New System.Windows.Forms.RadioButton() - Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() - Me.ucrInputSecondFootnoteColumnLocation = New instat.ucrInputTextBox() - Me.ucrInputSecondFootnoteRowLocation = New instat.ucrInputTextBox() - Me.ucrInputSecondCellFootnote = New instat.ucrInputTextBox() - Me.ucrChKAddSecondFootnote = New instat.ucrCheck() - Me.ucrInputCellFootnote = New instat.ucrInputTextBox() - Me.ucrInputAddSourceNote = New instat.ucrInputTextBox() - Me.ucrChkAddSourcenote = New instat.ucrCheck() - Me.ucrInputFootnoteColumnLocation = New instat.ucrInputTextBox() - Me.ucrInputFootnoteRowLocation = New instat.ucrInputTextBox() - Me.ucrChkAddFootnote = New instat.ucrCheck() - Me.ucrChkAddTitleSubtitle = New instat.ucrCheck() - Me.ucrInputTitleFont = New instat.ucrInputTextBox() - Me.ucrNudTitleSize = New instat.ucrNud() - Me.ucrInputSubtitleFootnote = New instat.ucrInputTextBox() - Me.ucrInputTitleFootnote = New instat.ucrInputTextBox() - Me.ucrChkSubtitleFootnote = New instat.ucrCheck() - Me.ucrChkTitleFootnote = New instat.ucrCheck() - Me.ucrInputSubtitle = New instat.ucrInputTextBox() - Me.ucrInputTitle = New instat.ucrInputTextBox() - Me.ucrInputSelectThemes = New instat.ucrInputComboBox() Me.ucrPnlThemesPanel = New instat.UcrPanel() + Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() Me.tbpFormatOptions.SuspendLayout() Me.tbpTitle.SuspendLayout() - Me.grpSecondFootnote.SuspendLayout() - Me.grpLocation.SuspendLayout() - Me.grpTitleSubtitle.SuspendLayout() + Me.grpSubtitle.SuspendLayout() + Me.grpTitle.SuspendLayout() + Me.tbpStub.SuspendLayout() + Me.grpStub.SuspendLayout() Me.tbpThemes.SuspendLayout() Me.SuspendLayout() ' 'tbpFormatOptions ' Me.tbpFormatOptions.Controls.Add(Me.tbpTitle) - Me.tbpFormatOptions.Controls.Add(Me.tbpFacets) - Me.tbpFormatOptions.Controls.Add(Me.tbpRows) - Me.tbpFormatOptions.Controls.Add(Me.tbpColumns) + Me.tbpFormatOptions.Controls.Add(Me.tbpStub) Me.tbpFormatOptions.Controls.Add(Me.tbpThemes) Me.tbpFormatOptions.Location = New System.Drawing.Point(12, 12) Me.tbpFormatOptions.Name = "tbpFormatOptions" @@ -89,199 +80,323 @@ Partial Class sdgFormatSummaryTables ' 'tbpTitle ' - Me.tbpTitle.Controls.Add(Me.grpSecondFootnote) - Me.tbpTitle.Controls.Add(Me.lblSecondFootnote) - Me.tbpTitle.Controls.Add(Me.ucrInputSecondCellFootnote) - Me.tbpTitle.Controls.Add(Me.ucrChKAddSecondFootnote) - Me.tbpTitle.Controls.Add(Me.lblFootnote) - Me.tbpTitle.Controls.Add(Me.ucrInputCellFootnote) - Me.tbpTitle.Controls.Add(Me.ucrInputAddSourceNote) - Me.tbpTitle.Controls.Add(Me.ucrChkAddSourcenote) - Me.tbpTitle.Controls.Add(Me.grpLocation) - Me.tbpTitle.Controls.Add(Me.ucrChkAddFootnote) - Me.tbpTitle.Controls.Add(Me.ucrChkAddTitleSubtitle) - Me.tbpTitle.Controls.Add(Me.grpTitleSubtitle) + Me.tbpTitle.Controls.Add(Me.ucrChkIncludeTitles) + Me.tbpTitle.Controls.Add(Me.grpTitle) + Me.tbpTitle.Controls.Add(Me.grpSubtitle) Me.tbpTitle.Location = New System.Drawing.Point(4, 22) Me.tbpTitle.Name = "tbpTitle" - Me.tbpTitle.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3) + Me.tbpTitle.Padding = New System.Windows.Forms.Padding(3) Me.tbpTitle.Size = New System.Drawing.Size(580, 412) Me.tbpTitle.TabIndex = 0 Me.tbpTitle.Text = "Title" Me.tbpTitle.UseVisualStyleBackColor = True ' - 'grpSecondFootnote - ' - Me.grpSecondFootnote.Controls.Add(Me.ucrInputSecondFootnoteColumnLocation) - Me.grpSecondFootnote.Controls.Add(Me.ucrInputSecondFootnoteRowLocation) - Me.grpSecondFootnote.Controls.Add(Me.lblSecondColumns) - Me.grpSecondFootnote.Controls.Add(Me.lblSecondRows) - Me.grpSecondFootnote.Location = New System.Drawing.Point(11, 297) - Me.grpSecondFootnote.Name = "grpSecondFootnote" - Me.grpSecondFootnote.Size = New System.Drawing.Size(476, 74) - Me.grpSecondFootnote.TabIndex = 11 - Me.grpSecondFootnote.TabStop = False - Me.grpSecondFootnote.Text = "Location" - ' - 'lblSecondColumns - ' - Me.lblSecondColumns.AutoSize = True - Me.lblSecondColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondColumns.Location = New System.Drawing.Point(15, 26) - Me.lblSecondColumns.Name = "lblSecondColumns" - Me.lblSecondColumns.Size = New System.Drawing.Size(50, 13) - Me.lblSecondColumns.TabIndex = 4 - Me.lblSecondColumns.Text = "Columns:" - ' - 'lblSecondRows - ' - Me.lblSecondRows.AutoSize = True - Me.lblSecondRows.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondRows.Location = New System.Drawing.Point(15, 54) - Me.lblSecondRows.Name = "lblSecondRows" - Me.lblSecondRows.Size = New System.Drawing.Size(37, 13) - Me.lblSecondRows.TabIndex = 3 - Me.lblSecondRows.Text = "Rows:" - ' - 'lblSecondFootnote - ' - Me.lblSecondFootnote.AutoSize = True - Me.lblSecondFootnote.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondFootnote.Location = New System.Drawing.Point(137, 279) - Me.lblSecondFootnote.Name = "lblSecondFootnote" - Me.lblSecondFootnote.Size = New System.Drawing.Size(52, 13) - Me.lblSecondFootnote.TabIndex = 13 - Me.lblSecondFootnote.Text = "Footnote:" - ' - 'lblFootnote - ' - Me.lblFootnote.AutoSize = True - Me.lblFootnote.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFootnote.Location = New System.Drawing.Point(135, 176) - Me.lblFootnote.Name = "lblFootnote" - Me.lblFootnote.Size = New System.Drawing.Size(52, 13) - Me.lblFootnote.TabIndex = 9 - Me.lblFootnote.Text = "Footnote:" - ' - 'grpLocation - ' - Me.grpLocation.Controls.Add(Me.ucrInputFootnoteColumnLocation) - Me.grpLocation.Controls.Add(Me.ucrInputFootnoteRowLocation) - Me.grpLocation.Controls.Add(Me.lblColumns) - Me.grpLocation.Controls.Add(Me.lblRows) - Me.grpLocation.Location = New System.Drawing.Point(11, 198) - Me.grpLocation.Name = "grpLocation" - Me.grpLocation.Size = New System.Drawing.Size(474, 68) - Me.grpLocation.TabIndex = 5 - Me.grpLocation.TabStop = False - Me.grpLocation.Text = "Location" - ' - 'lblColumns - ' - Me.lblColumns.AutoSize = True - Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColumns.Location = New System.Drawing.Point(15, 20) - Me.lblColumns.Name = "lblColumns" - Me.lblColumns.Size = New System.Drawing.Size(50, 13) - Me.lblColumns.TabIndex = 4 - Me.lblColumns.Text = "Columns:" - ' - 'lblRows - ' - Me.lblRows.AutoSize = True - Me.lblRows.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRows.Location = New System.Drawing.Point(15, 48) - Me.lblRows.Name = "lblRows" - Me.lblRows.Size = New System.Drawing.Size(37, 13) - Me.lblRows.TabIndex = 3 - Me.lblRows.Text = "Rows:" - ' - 'grpTitleSubtitle - ' - Me.grpTitleSubtitle.Controls.Add(Me.ucrInputTitleFont) - Me.grpTitleSubtitle.Controls.Add(Me.ucrNudTitleSize) - Me.grpTitleSubtitle.Controls.Add(Me.lblTitleSize) - Me.grpTitleSubtitle.Controls.Add(Me.lblTitleFont) - Me.grpTitleSubtitle.Controls.Add(Me.ucrInputSubtitleFootnote) - Me.grpTitleSubtitle.Controls.Add(Me.ucrInputTitleFootnote) - Me.grpTitleSubtitle.Controls.Add(Me.ucrChkSubtitleFootnote) - Me.grpTitleSubtitle.Controls.Add(Me.ucrChkTitleFootnote) - Me.grpTitleSubtitle.Controls.Add(Me.ucrInputSubtitle) - Me.grpTitleSubtitle.Controls.Add(Me.ucrInputTitle) - Me.grpTitleSubtitle.Controls.Add(Me.lblSubtitle) - Me.grpTitleSubtitle.Controls.Add(Me.lblTitle) - Me.grpTitleSubtitle.Location = New System.Drawing.Point(6, 46) - Me.grpTitleSubtitle.Name = "grpTitleSubtitle" - Me.grpTitleSubtitle.Size = New System.Drawing.Size(479, 120) - Me.grpTitleSubtitle.TabIndex = 0 - Me.grpTitleSubtitle.TabStop = False - Me.grpTitleSubtitle.Text = "Title\Subtitle" - ' - 'lblTitleSize - ' - Me.lblTitleSize.AutoSize = True - Me.lblTitleSize.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblTitleSize.Location = New System.Drawing.Point(218, 89) - Me.lblTitleSize.Name = "lblTitleSize" - Me.lblTitleSize.Size = New System.Drawing.Size(53, 13) - Me.lblTitleSize.TabIndex = 9 - Me.lblTitleSize.Text = "Title Size:" - ' - 'lblTitleFont - ' - Me.lblTitleFont.AutoSize = True - Me.lblTitleFont.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblTitleFont.Location = New System.Drawing.Point(14, 85) - Me.lblTitleFont.Name = "lblTitleFont" - Me.lblTitleFont.Size = New System.Drawing.Size(54, 13) - Me.lblTitleFont.TabIndex = 8 - Me.lblTitleFont.Text = "Title Font:" + 'grpSubtitle + ' + Me.grpSubtitle.Controls.Add(Me.cmdSubtitleFormat) + Me.grpSubtitle.Controls.Add(Me.lblSubtitleFootnote) + Me.grpSubtitle.Controls.Add(Me.ucrInputSubtitleFootnote) + Me.grpSubtitle.Controls.Add(Me.ucrChkSubtitleFootnote) + Me.grpSubtitle.Controls.Add(Me.ucrInputSubtitle) + Me.grpSubtitle.Controls.Add(Me.lblSubtitle) + Me.grpSubtitle.Controls.Add(Me.cmdSubtitleFont) + Me.grpSubtitle.Location = New System.Drawing.Point(12, 224) + Me.grpSubtitle.Name = "grpSubtitle" + Me.grpSubtitle.Size = New System.Drawing.Size(479, 119) + Me.grpSubtitle.TabIndex = 10 + Me.grpSubtitle.TabStop = False + Me.grpSubtitle.Text = "Subtitle" + ' + 'cmdSubtitleFont + ' + Me.cmdSubtitleFont.Enabled = False + Me.cmdSubtitleFont.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdSubtitleFont.Location = New System.Drawing.Point(343, 16) + Me.cmdSubtitleFont.Name = "cmdSubtitleFont" + Me.cmdSubtitleFont.Size = New System.Drawing.Size(104, 23) + Me.cmdSubtitleFont.TabIndex = 20 + Me.cmdSubtitleFont.Text = "Font" + Me.cmdSubtitleFont.UseVisualStyleBackColor = True + ' + 'cmdSubtitleFormat + ' + Me.cmdSubtitleFormat.Enabled = False + Me.cmdSubtitleFormat.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdSubtitleFormat.Location = New System.Drawing.Point(343, 85) + Me.cmdSubtitleFormat.Name = "cmdSubtitleFormat" + Me.cmdSubtitleFormat.Size = New System.Drawing.Size(104, 23) + Me.cmdSubtitleFormat.TabIndex = 19 + Me.cmdSubtitleFormat.Text = "Format" + Me.cmdSubtitleFormat.UseVisualStyleBackColor = True + ' + 'lblSubtitleFootnote + ' + Me.lblSubtitleFootnote.AutoSize = True + Me.lblSubtitleFootnote.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblSubtitleFootnote.Location = New System.Drawing.Point(16, 95) + Me.lblSubtitleFootnote.Name = "lblSubtitleFootnote" + Me.lblSubtitleFootnote.Size = New System.Drawing.Size(31, 13) + Me.lblSubtitleFootnote.TabIndex = 12 + Me.lblSubtitleFootnote.Text = "Text:" + ' + 'ucrInputSubtitleFootnote + ' + Me.ucrInputSubtitleFootnote.AddQuotesIfUnrecognised = True + Me.ucrInputSubtitleFootnote.AutoSize = True + Me.ucrInputSubtitleFootnote.IsMultiline = False + Me.ucrInputSubtitleFootnote.IsReadOnly = False + Me.ucrInputSubtitleFootnote.Location = New System.Drawing.Point(68, 87) + Me.ucrInputSubtitleFootnote.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputSubtitleFootnote.Name = "ucrInputSubtitleFootnote" + Me.ucrInputSubtitleFootnote.Size = New System.Drawing.Size(119, 21) + Me.ucrInputSubtitleFootnote.TabIndex = 11 + ' + 'ucrChkSubtitleFootnote + ' + Me.ucrChkSubtitleFootnote.AutoSize = True + Me.ucrChkSubtitleFootnote.Checked = False + Me.ucrChkSubtitleFootnote.Location = New System.Drawing.Point(70, 46) + Me.ucrChkSubtitleFootnote.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkSubtitleFootnote.Name = "ucrChkSubtitleFootnote" + Me.ucrChkSubtitleFootnote.Size = New System.Drawing.Size(124, 34) + Me.ucrChkSubtitleFootnote.TabIndex = 10 + ' + 'ucrInputSubtitle + ' + Me.ucrInputSubtitle.AddQuotesIfUnrecognised = True + Me.ucrInputSubtitle.AutoSize = True + Me.ucrInputSubtitle.IsMultiline = False + Me.ucrInputSubtitle.IsReadOnly = False + Me.ucrInputSubtitle.Location = New System.Drawing.Point(70, 18) + Me.ucrInputSubtitle.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputSubtitle.Name = "ucrInputSubtitle" + Me.ucrInputSubtitle.Size = New System.Drawing.Size(137, 21) + Me.ucrInputSubtitle.TabIndex = 9 ' 'lblSubtitle ' Me.lblSubtitle.AutoSize = True Me.lblSubtitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSubtitle.Location = New System.Drawing.Point(15, 60) + Me.lblSubtitle.Location = New System.Drawing.Point(16, 23) Me.lblSubtitle.Name = "lblSubtitle" - Me.lblSubtitle.Size = New System.Drawing.Size(45, 13) - Me.lblSubtitle.TabIndex = 1 - Me.lblSubtitle.Text = "Subtitle:" + Me.lblSubtitle.Size = New System.Drawing.Size(31, 13) + Me.lblSubtitle.TabIndex = 8 + Me.lblSubtitle.Text = "Text:" + ' + 'ucrChkIncludeTitles + ' + Me.ucrChkIncludeTitles.AutoSize = True + Me.ucrChkIncludeTitles.Checked = False + Me.ucrChkIncludeTitles.Location = New System.Drawing.Point(9, 18) + Me.ucrChkIncludeTitles.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkIncludeTitles.Name = "ucrChkIncludeTitles" + Me.ucrChkIncludeTitles.Size = New System.Drawing.Size(156, 26) + Me.ucrChkIncludeTitles.TabIndex = 1 + ' + 'grpTitle + ' + Me.grpTitle.Controls.Add(Me.cmdTitleFont) + Me.grpTitle.Controls.Add(Me.cmdTitleFormat) + Me.grpTitle.Controls.Add(Me.lblTitleFootnote) + Me.grpTitle.Controls.Add(Me.ucrInputTitleFootnote) + Me.grpTitle.Controls.Add(Me.ucrChkTitleFootnote) + Me.grpTitle.Controls.Add(Me.ucrInputTitle) + Me.grpTitle.Controls.Add(Me.lblTitle) + Me.grpTitle.Location = New System.Drawing.Point(6, 46) + Me.grpTitle.Name = "grpTitle" + Me.grpTitle.Size = New System.Drawing.Size(479, 120) + Me.grpTitle.TabIndex = 0 + Me.grpTitle.TabStop = False + Me.grpTitle.Text = "Title" + ' + 'cmdTitleFont + ' + Me.cmdTitleFont.Enabled = False + Me.cmdTitleFont.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdTitleFont.Location = New System.Drawing.Point(350, 25) + Me.cmdTitleFont.Name = "cmdTitleFont" + Me.cmdTitleFont.Size = New System.Drawing.Size(104, 23) + Me.cmdTitleFont.TabIndex = 20 + Me.cmdTitleFont.Text = "Font" + Me.cmdTitleFont.UseVisualStyleBackColor = True + ' + 'cmdTitleFormat + ' + Me.cmdTitleFormat.Enabled = False + Me.cmdTitleFormat.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdTitleFormat.Location = New System.Drawing.Point(349, 86) + Me.cmdTitleFormat.Name = "cmdTitleFormat" + Me.cmdTitleFormat.Size = New System.Drawing.Size(104, 23) + Me.cmdTitleFormat.TabIndex = 19 + Me.cmdTitleFormat.Text = "Format" + Me.cmdTitleFormat.UseVisualStyleBackColor = True + ' + 'lblTitleFootnote + ' + Me.lblTitleFootnote.AutoSize = True + Me.lblTitleFootnote.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblTitleFootnote.Location = New System.Drawing.Point(22, 87) + Me.lblTitleFootnote.Name = "lblTitleFootnote" + Me.lblTitleFootnote.Size = New System.Drawing.Size(31, 13) + Me.lblTitleFootnote.TabIndex = 7 + Me.lblTitleFootnote.Text = "Text:" ' - 'lblTitle + 'ucrInputTitleFootnote ' - Me.lblTitle.AutoSize = True - Me.lblTitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblTitle.Location = New System.Drawing.Point(15, 25) - Me.lblTitle.Name = "lblTitle" - Me.lblTitle.Size = New System.Drawing.Size(30, 13) - Me.lblTitle.TabIndex = 0 - Me.lblTitle.Text = "Title:" + Me.ucrInputTitleFootnote.AddQuotesIfUnrecognised = True + Me.ucrInputTitleFootnote.AutoSize = True + Me.ucrInputTitleFootnote.IsMultiline = False + Me.ucrInputTitleFootnote.IsReadOnly = False + Me.ucrInputTitleFootnote.Location = New System.Drawing.Point(69, 87) + Me.ucrInputTitleFootnote.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputTitleFootnote.Name = "ucrInputTitleFootnote" + Me.ucrInputTitleFootnote.Size = New System.Drawing.Size(119, 21) + Me.ucrInputTitleFootnote.TabIndex = 6 ' - 'tbpFacets + 'ucrChkTitleFootnote ' - Me.tbpFacets.Location = New System.Drawing.Point(4, 22) - Me.tbpFacets.Name = "tbpFacets" - Me.tbpFacets.Size = New System.Drawing.Size(580, 412) - Me.tbpFacets.TabIndex = 3 - Me.tbpFacets.Text = "Facets" - Me.tbpFacets.UseVisualStyleBackColor = True + Me.ucrChkTitleFootnote.AutoSize = True + Me.ucrChkTitleFootnote.Checked = False + Me.ucrChkTitleFootnote.Location = New System.Drawing.Point(71, 51) + Me.ucrChkTitleFootnote.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkTitleFootnote.Name = "ucrChkTitleFootnote" + Me.ucrChkTitleFootnote.Size = New System.Drawing.Size(124, 34) + Me.ucrChkTitleFootnote.TabIndex = 4 ' - 'tbpRows + 'ucrInputTitle ' - Me.tbpRows.Location = New System.Drawing.Point(4, 22) - Me.tbpRows.Name = "tbpRows" - Me.tbpRows.Size = New System.Drawing.Size(580, 412) - Me.tbpRows.TabIndex = 4 - Me.tbpRows.Text = "Rows" - Me.tbpRows.UseVisualStyleBackColor = True + Me.ucrInputTitle.AddQuotesIfUnrecognised = True + Me.ucrInputTitle.AutoSize = True + Me.ucrInputTitle.IsMultiline = False + Me.ucrInputTitle.IsReadOnly = False + Me.ucrInputTitle.Location = New System.Drawing.Point(69, 25) + Me.ucrInputTitle.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputTitle.Name = "ucrInputTitle" + Me.ucrInputTitle.Size = New System.Drawing.Size(137, 21) + Me.ucrInputTitle.TabIndex = 2 ' - 'tbpColumns + 'lblTitle ' - Me.tbpColumns.Location = New System.Drawing.Point(4, 22) - Me.tbpColumns.Name = "tbpColumns" - Me.tbpColumns.Size = New System.Drawing.Size(580, 412) - Me.tbpColumns.TabIndex = 5 - Me.tbpColumns.Text = "Columns" - Me.tbpColumns.UseVisualStyleBackColor = True + Me.lblTitle.AutoSize = True + Me.lblTitle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblTitle.Location = New System.Drawing.Point(15, 25) + Me.lblTitle.Name = "lblTitle" + Me.lblTitle.Size = New System.Drawing.Size(31, 13) + Me.lblTitle.TabIndex = 0 + Me.lblTitle.Text = "Text:" + ' + 'tbpStub + ' + Me.tbpStub.Controls.Add(Me.ucrChkStub) + Me.tbpStub.Controls.Add(Me.grpStub) + Me.tbpStub.Location = New System.Drawing.Point(4, 22) + Me.tbpStub.Name = "tbpStub" + Me.tbpStub.Size = New System.Drawing.Size(580, 412) + Me.tbpStub.TabIndex = 5 + Me.tbpStub.Text = "Stub" + Me.tbpStub.UseVisualStyleBackColor = True + ' + 'ucrChkStub + ' + Me.ucrChkStub.AutoSize = True + Me.ucrChkStub.Checked = False + Me.ucrChkStub.Location = New System.Drawing.Point(10, 18) + Me.ucrChkStub.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkStub.Name = "ucrChkStub" + Me.ucrChkStub.Size = New System.Drawing.Size(156, 34) + Me.ucrChkStub.TabIndex = 2 + ' + 'grpStub + ' + Me.grpStub.Controls.Add(Me.cmdStubFont) + Me.grpStub.Controls.Add(Me.cmdStubFormat) + Me.grpStub.Controls.Add(Me.lblStubFootnote) + Me.grpStub.Controls.Add(Me.ucrInputStubFootnote) + Me.grpStub.Controls.Add(Me.ucrChkStubFootnote) + Me.grpStub.Controls.Add(Me.ucrInputStub) + Me.grpStub.Controls.Add(Me.lblStubs) + Me.grpStub.Location = New System.Drawing.Point(10, 71) + Me.grpStub.Name = "grpStub" + Me.grpStub.Size = New System.Drawing.Size(479, 120) + Me.grpStub.TabIndex = 1 + Me.grpStub.TabStop = False + Me.grpStub.Text = "Stub" + ' + 'cmdStubFont + ' + Me.cmdStubFont.Enabled = False + Me.cmdStubFont.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdStubFont.Location = New System.Drawing.Point(331, 25) + Me.cmdStubFont.Name = "cmdStubFont" + Me.cmdStubFont.Size = New System.Drawing.Size(104, 23) + Me.cmdStubFont.TabIndex = 20 + Me.cmdStubFont.Text = "Font" + Me.cmdStubFont.UseVisualStyleBackColor = True + ' + 'cmdStubFormat + ' + Me.cmdStubFormat.Enabled = False + Me.cmdStubFormat.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdStubFormat.Location = New System.Drawing.Point(331, 84) + Me.cmdStubFormat.Name = "cmdStubFormat" + Me.cmdStubFormat.Size = New System.Drawing.Size(104, 23) + Me.cmdStubFormat.TabIndex = 19 + Me.cmdStubFormat.Text = "Format" + Me.cmdStubFormat.UseVisualStyleBackColor = True + ' + 'lblStubFootnote + ' + Me.lblStubFootnote.AutoSize = True + Me.lblStubFootnote.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblStubFootnote.Location = New System.Drawing.Point(15, 90) + Me.lblStubFootnote.Name = "lblStubFootnote" + Me.lblStubFootnote.Size = New System.Drawing.Size(31, 13) + Me.lblStubFootnote.TabIndex = 7 + Me.lblStubFootnote.Text = "Text:" + ' + 'ucrInputStubFootnote + ' + Me.ucrInputStubFootnote.AddQuotesIfUnrecognised = True + Me.ucrInputStubFootnote.AutoSize = True + Me.ucrInputStubFootnote.IsMultiline = False + Me.ucrInputStubFootnote.IsReadOnly = False + Me.ucrInputStubFootnote.Location = New System.Drawing.Point(69, 87) + Me.ucrInputStubFootnote.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputStubFootnote.Name = "ucrInputStubFootnote" + Me.ucrInputStubFootnote.Size = New System.Drawing.Size(119, 21) + Me.ucrInputStubFootnote.TabIndex = 6 + ' + 'ucrChkStubFootnote + ' + Me.ucrChkStubFootnote.AutoSize = True + Me.ucrChkStubFootnote.Checked = False + Me.ucrChkStubFootnote.Location = New System.Drawing.Point(71, 51) + Me.ucrChkStubFootnote.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkStubFootnote.Name = "ucrChkStubFootnote" + Me.ucrChkStubFootnote.Size = New System.Drawing.Size(124, 34) + Me.ucrChkStubFootnote.TabIndex = 4 + ' + 'ucrInputStub + ' + Me.ucrInputStub.AddQuotesIfUnrecognised = True + Me.ucrInputStub.AutoSize = True + Me.ucrInputStub.IsMultiline = False + Me.ucrInputStub.IsReadOnly = False + Me.ucrInputStub.Location = New System.Drawing.Point(69, 25) + Me.ucrInputStub.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputStub.Name = "ucrInputStub" + Me.ucrInputStub.Size = New System.Drawing.Size(137, 21) + Me.ucrInputStub.TabIndex = 2 + ' + 'lblStubs + ' + Me.lblStubs.AutoSize = True + Me.lblStubs.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblStubs.Location = New System.Drawing.Point(15, 25) + Me.lblStubs.Name = "lblStubs" + Me.lblStubs.Size = New System.Drawing.Size(31, 13) + Me.lblStubs.TabIndex = 0 + Me.lblStubs.Text = "Text:" ' 'tbpThemes ' @@ -297,6 +412,18 @@ Partial Class sdgFormatSummaryTables Me.tbpThemes.Text = "Themes" Me.tbpThemes.UseVisualStyleBackColor = True ' + 'ucrInputSelectThemes + ' + Me.ucrInputSelectThemes.AddQuotesIfUnrecognised = True + Me.ucrInputSelectThemes.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputSelectThemes.GetSetSelectedIndex = -1 + Me.ucrInputSelectThemes.IsReadOnly = False + Me.ucrInputSelectThemes.Location = New System.Drawing.Point(157, 29) + Me.ucrInputSelectThemes.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputSelectThemes.Name = "ucrInputSelectThemes" + Me.ucrInputSelectThemes.Size = New System.Drawing.Size(168, 21) + Me.ucrInputSelectThemes.TabIndex = 3 + ' 'cmdManualTheme ' Me.cmdManualTheme.Location = New System.Drawing.Point(157, 59) @@ -328,245 +455,6 @@ Partial Class sdgFormatSummaryTables Me.rdoManualTheme.Text = "Manual Theme" Me.rdoManualTheme.UseVisualStyleBackColor = True ' - 'ucrBaseSubdialog - ' - Me.ucrBaseSubdialog.AutoSize = True - Me.ucrBaseSubdialog.Location = New System.Drawing.Point(190, 455) - Me.ucrBaseSubdialog.Margin = New System.Windows.Forms.Padding(4) - Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" - Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) - Me.ucrBaseSubdialog.TabIndex = 3 - ' - 'ucrInputSecondFootnoteColumnLocation - ' - Me.ucrInputSecondFootnoteColumnLocation.AddQuotesIfUnrecognised = True - Me.ucrInputSecondFootnoteColumnLocation.AutoSize = True - Me.ucrInputSecondFootnoteColumnLocation.IsMultiline = False - Me.ucrInputSecondFootnoteColumnLocation.IsReadOnly = False - Me.ucrInputSecondFootnoteColumnLocation.Location = New System.Drawing.Point(69, 22) - Me.ucrInputSecondFootnoteColumnLocation.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputSecondFootnoteColumnLocation.Name = "ucrInputSecondFootnoteColumnLocation" - Me.ucrInputSecondFootnoteColumnLocation.Size = New System.Drawing.Size(134, 21) - Me.ucrInputSecondFootnoteColumnLocation.TabIndex = 6 - ' - 'ucrInputSecondFootnoteRowLocation - ' - Me.ucrInputSecondFootnoteRowLocation.AddQuotesIfUnrecognised = True - Me.ucrInputSecondFootnoteRowLocation.AutoSize = True - Me.ucrInputSecondFootnoteRowLocation.IsMultiline = False - Me.ucrInputSecondFootnoteRowLocation.IsReadOnly = False - Me.ucrInputSecondFootnoteRowLocation.Location = New System.Drawing.Point(69, 50) - Me.ucrInputSecondFootnoteRowLocation.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputSecondFootnoteRowLocation.Name = "ucrInputSecondFootnoteRowLocation" - Me.ucrInputSecondFootnoteRowLocation.Size = New System.Drawing.Size(134, 21) - Me.ucrInputSecondFootnoteRowLocation.TabIndex = 5 - ' - 'ucrInputSecondCellFootnote - ' - Me.ucrInputSecondCellFootnote.AddQuotesIfUnrecognised = True - Me.ucrInputSecondCellFootnote.AutoSize = True - Me.ucrInputSecondCellFootnote.IsMultiline = False - Me.ucrInputSecondCellFootnote.IsReadOnly = False - Me.ucrInputSecondCellFootnote.Location = New System.Drawing.Point(190, 277) - Me.ucrInputSecondCellFootnote.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputSecondCellFootnote.Name = "ucrInputSecondCellFootnote" - Me.ucrInputSecondCellFootnote.Size = New System.Drawing.Size(132, 21) - Me.ucrInputSecondCellFootnote.TabIndex = 12 - ' - 'ucrChKAddSecondFootnote - ' - Me.ucrChKAddSecondFootnote.AutoSize = True - Me.ucrChKAddSecondFootnote.Checked = False - Me.ucrChKAddSecondFootnote.Location = New System.Drawing.Point(9, 277) - Me.ucrChKAddSecondFootnote.Margin = New System.Windows.Forms.Padding(6) - Me.ucrChKAddSecondFootnote.Name = "ucrChKAddSecondFootnote" - Me.ucrChKAddSecondFootnote.Size = New System.Drawing.Size(133, 34) - Me.ucrChKAddSecondFootnote.TabIndex = 10 - ' - 'ucrInputCellFootnote - ' - Me.ucrInputCellFootnote.AddQuotesIfUnrecognised = True - Me.ucrInputCellFootnote.AutoSize = True - Me.ucrInputCellFootnote.IsMultiline = False - Me.ucrInputCellFootnote.IsReadOnly = False - Me.ucrInputCellFootnote.Location = New System.Drawing.Point(188, 174) - Me.ucrInputCellFootnote.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputCellFootnote.Name = "ucrInputCellFootnote" - Me.ucrInputCellFootnote.Size = New System.Drawing.Size(134, 21) - Me.ucrInputCellFootnote.TabIndex = 8 - ' - 'ucrInputAddSourceNote - ' - Me.ucrInputAddSourceNote.AddQuotesIfUnrecognised = True - Me.ucrInputAddSourceNote.AutoSize = True - Me.ucrInputAddSourceNote.IsMultiline = False - Me.ucrInputAddSourceNote.IsReadOnly = False - Me.ucrInputAddSourceNote.Location = New System.Drawing.Point(148, 378) - Me.ucrInputAddSourceNote.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputAddSourceNote.Name = "ucrInputAddSourceNote" - Me.ucrInputAddSourceNote.Size = New System.Drawing.Size(104, 21) - Me.ucrInputAddSourceNote.TabIndex = 7 - ' - 'ucrChkAddSourcenote - ' - Me.ucrChkAddSourcenote.AutoSize = True - Me.ucrChkAddSourcenote.Checked = False - Me.ucrChkAddSourcenote.Location = New System.Drawing.Point(9, 378) - Me.ucrChkAddSourcenote.Margin = New System.Windows.Forms.Padding(6) - Me.ucrChkAddSourcenote.Name = "ucrChkAddSourcenote" - Me.ucrChkAddSourcenote.Size = New System.Drawing.Size(133, 34) - Me.ucrChkAddSourcenote.TabIndex = 6 - ' - 'ucrInputFootnoteColumnLocation - ' - Me.ucrInputFootnoteColumnLocation.AddQuotesIfUnrecognised = True - Me.ucrInputFootnoteColumnLocation.AutoSize = True - Me.ucrInputFootnoteColumnLocation.IsMultiline = False - Me.ucrInputFootnoteColumnLocation.IsReadOnly = False - Me.ucrInputFootnoteColumnLocation.Location = New System.Drawing.Point(69, 16) - Me.ucrInputFootnoteColumnLocation.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputFootnoteColumnLocation.Name = "ucrInputFootnoteColumnLocation" - Me.ucrInputFootnoteColumnLocation.Size = New System.Drawing.Size(134, 21) - Me.ucrInputFootnoteColumnLocation.TabIndex = 6 - ' - 'ucrInputFootnoteRowLocation - ' - Me.ucrInputFootnoteRowLocation.AddQuotesIfUnrecognised = True - Me.ucrInputFootnoteRowLocation.AutoSize = True - Me.ucrInputFootnoteRowLocation.IsMultiline = False - Me.ucrInputFootnoteRowLocation.IsReadOnly = False - Me.ucrInputFootnoteRowLocation.Location = New System.Drawing.Point(69, 44) - Me.ucrInputFootnoteRowLocation.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputFootnoteRowLocation.Name = "ucrInputFootnoteRowLocation" - Me.ucrInputFootnoteRowLocation.Size = New System.Drawing.Size(134, 21) - Me.ucrInputFootnoteRowLocation.TabIndex = 5 - ' - 'ucrChkAddFootnote - ' - Me.ucrChkAddFootnote.AutoSize = True - Me.ucrChkAddFootnote.Checked = False - Me.ucrChkAddFootnote.Location = New System.Drawing.Point(6, 172) - Me.ucrChkAddFootnote.Margin = New System.Windows.Forms.Padding(6) - Me.ucrChkAddFootnote.Name = "ucrChkAddFootnote" - Me.ucrChkAddFootnote.Size = New System.Drawing.Size(133, 34) - Me.ucrChkAddFootnote.TabIndex = 2 - ' - 'ucrChkAddTitleSubtitle - ' - Me.ucrChkAddTitleSubtitle.AutoSize = True - Me.ucrChkAddTitleSubtitle.Checked = False - Me.ucrChkAddTitleSubtitle.Location = New System.Drawing.Point(9, 18) - Me.ucrChkAddTitleSubtitle.Margin = New System.Windows.Forms.Padding(6) - Me.ucrChkAddTitleSubtitle.Name = "ucrChkAddTitleSubtitle" - Me.ucrChkAddTitleSubtitle.Size = New System.Drawing.Size(156, 34) - Me.ucrChkAddTitleSubtitle.TabIndex = 1 - ' - 'ucrInputTitleFont - ' - Me.ucrInputTitleFont.AddQuotesIfUnrecognised = True - Me.ucrInputTitleFont.AutoSize = True - Me.ucrInputTitleFont.IsMultiline = False - Me.ucrInputTitleFont.IsReadOnly = False - Me.ucrInputTitleFont.Location = New System.Drawing.Point(69, 82) - Me.ucrInputTitleFont.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputTitleFont.Name = "ucrInputTitleFont" - Me.ucrInputTitleFont.Size = New System.Drawing.Size(137, 21) - Me.ucrInputTitleFont.TabIndex = 16 - ' - 'ucrNudTitleSize - ' - Me.ucrNudTitleSize.AutoSize = True - Me.ucrNudTitleSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudTitleSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudTitleSize.Location = New System.Drawing.Point(342, 82) - Me.ucrNudTitleSize.Margin = New System.Windows.Forms.Padding(6) - Me.ucrNudTitleSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudTitleSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudTitleSize.Name = "ucrNudTitleSize" - Me.ucrNudTitleSize.Size = New System.Drawing.Size(50, 20) - Me.ucrNudTitleSize.TabIndex = 15 - Me.ucrNudTitleSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrInputSubtitleFootnote - ' - Me.ucrInputSubtitleFootnote.AddQuotesIfUnrecognised = True - Me.ucrInputSubtitleFootnote.AutoSize = True - Me.ucrInputSubtitleFootnote.IsMultiline = False - Me.ucrInputSubtitleFootnote.IsReadOnly = False - Me.ucrInputSubtitleFootnote.Location = New System.Drawing.Point(342, 55) - Me.ucrInputSubtitleFootnote.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputSubtitleFootnote.Name = "ucrInputSubtitleFootnote" - Me.ucrInputSubtitleFootnote.Size = New System.Drawing.Size(119, 21) - Me.ucrInputSubtitleFootnote.TabIndex = 7 - ' - 'ucrInputTitleFootnote - ' - Me.ucrInputTitleFootnote.AddQuotesIfUnrecognised = True - Me.ucrInputTitleFootnote.AutoSize = True - Me.ucrInputTitleFootnote.IsMultiline = False - Me.ucrInputTitleFootnote.IsReadOnly = False - Me.ucrInputTitleFootnote.Location = New System.Drawing.Point(342, 25) - Me.ucrInputTitleFootnote.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputTitleFootnote.Name = "ucrInputTitleFootnote" - Me.ucrInputTitleFootnote.Size = New System.Drawing.Size(119, 21) - Me.ucrInputTitleFootnote.TabIndex = 6 - ' - 'ucrChkSubtitleFootnote - ' - Me.ucrChkSubtitleFootnote.AutoSize = True - Me.ucrChkSubtitleFootnote.Checked = False - Me.ucrChkSubtitleFootnote.Location = New System.Drawing.Point(212, 56) - Me.ucrChkSubtitleFootnote.Margin = New System.Windows.Forms.Padding(6) - Me.ucrChkSubtitleFootnote.Name = "ucrChkSubtitleFootnote" - Me.ucrChkSubtitleFootnote.Size = New System.Drawing.Size(124, 34) - Me.ucrChkSubtitleFootnote.TabIndex = 5 - ' - 'ucrChkTitleFootnote - ' - Me.ucrChkTitleFootnote.AutoSize = True - Me.ucrChkTitleFootnote.Checked = False - Me.ucrChkTitleFootnote.Location = New System.Drawing.Point(212, 26) - Me.ucrChkTitleFootnote.Margin = New System.Windows.Forms.Padding(6) - Me.ucrChkTitleFootnote.Name = "ucrChkTitleFootnote" - Me.ucrChkTitleFootnote.Size = New System.Drawing.Size(124, 34) - Me.ucrChkTitleFootnote.TabIndex = 4 - ' - 'ucrInputSubtitle - ' - Me.ucrInputSubtitle.AddQuotesIfUnrecognised = True - Me.ucrInputSubtitle.AutoSize = True - Me.ucrInputSubtitle.IsMultiline = False - Me.ucrInputSubtitle.IsReadOnly = False - Me.ucrInputSubtitle.Location = New System.Drawing.Point(69, 55) - Me.ucrInputSubtitle.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputSubtitle.Name = "ucrInputSubtitle" - Me.ucrInputSubtitle.Size = New System.Drawing.Size(137, 21) - Me.ucrInputSubtitle.TabIndex = 3 - ' - 'ucrInputTitle - ' - Me.ucrInputTitle.AddQuotesIfUnrecognised = True - Me.ucrInputTitle.AutoSize = True - Me.ucrInputTitle.IsMultiline = False - Me.ucrInputTitle.IsReadOnly = False - Me.ucrInputTitle.Location = New System.Drawing.Point(69, 25) - Me.ucrInputTitle.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputTitle.Name = "ucrInputTitle" - Me.ucrInputTitle.Size = New System.Drawing.Size(137, 21) - Me.ucrInputTitle.TabIndex = 2 - ' - 'ucrInputSelectThemes - ' - Me.ucrInputSelectThemes.AddQuotesIfUnrecognised = True - Me.ucrInputSelectThemes.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputSelectThemes.GetSetSelectedIndex = -1 - Me.ucrInputSelectThemes.IsReadOnly = False - Me.ucrInputSelectThemes.Location = New System.Drawing.Point(157, 29) - Me.ucrInputSelectThemes.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputSelectThemes.Name = "ucrInputSelectThemes" - Me.ucrInputSelectThemes.Size = New System.Drawing.Size(168, 21) - Me.ucrInputSelectThemes.TabIndex = 3 - ' 'ucrPnlThemesPanel ' Me.ucrPnlThemesPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink @@ -576,6 +464,15 @@ Partial Class sdgFormatSummaryTables Me.ucrPnlThemesPanel.Size = New System.Drawing.Size(349, 70) Me.ucrPnlThemesPanel.TabIndex = 4 ' + 'ucrBaseSubdialog + ' + Me.ucrBaseSubdialog.AutoSize = True + Me.ucrBaseSubdialog.Location = New System.Drawing.Point(190, 455) + Me.ucrBaseSubdialog.Margin = New System.Windows.Forms.Padding(4) + Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" + Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) + Me.ucrBaseSubdialog.TabIndex = 3 + ' 'sdgFormatSummaryTables ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -593,12 +490,14 @@ Partial Class sdgFormatSummaryTables Me.tbpFormatOptions.ResumeLayout(False) Me.tbpTitle.ResumeLayout(False) Me.tbpTitle.PerformLayout() - Me.grpSecondFootnote.ResumeLayout(False) - Me.grpSecondFootnote.PerformLayout() - Me.grpLocation.ResumeLayout(False) - Me.grpLocation.PerformLayout() - Me.grpTitleSubtitle.ResumeLayout(False) - Me.grpTitleSubtitle.PerformLayout() + Me.grpSubtitle.ResumeLayout(False) + Me.grpSubtitle.PerformLayout() + Me.grpTitle.ResumeLayout(False) + Me.grpTitle.PerformLayout() + Me.tbpStub.ResumeLayout(False) + Me.tbpStub.PerformLayout() + Me.grpStub.ResumeLayout(False) + Me.grpStub.PerformLayout() Me.tbpThemes.ResumeLayout(False) Me.tbpThemes.PerformLayout() Me.ResumeLayout(False) @@ -608,46 +507,38 @@ Partial Class sdgFormatSummaryTables Friend WithEvents tbpFormatOptions As TabControl Friend WithEvents tbpTitle As TabPage - Friend WithEvents grpSecondFootnote As GroupBox - Friend WithEvents ucrInputSecondFootnoteColumnLocation As ucrInputTextBox - Friend WithEvents ucrInputSecondFootnoteRowLocation As ucrInputTextBox - Friend WithEvents lblSecondColumns As Label - Friend WithEvents lblSecondRows As Label - Friend WithEvents lblSecondFootnote As Label - Friend WithEvents ucrInputSecondCellFootnote As ucrInputTextBox - Friend WithEvents ucrChKAddSecondFootnote As ucrCheck - Friend WithEvents lblFootnote As Label - Friend WithEvents ucrInputCellFootnote As ucrInputTextBox - Friend WithEvents ucrInputAddSourceNote As ucrInputTextBox - Friend WithEvents ucrChkAddSourcenote As ucrCheck - Friend WithEvents grpLocation As GroupBox - Friend WithEvents ucrInputFootnoteColumnLocation As ucrInputTextBox - Friend WithEvents ucrInputFootnoteRowLocation As ucrInputTextBox - Friend WithEvents lblColumns As Label - Friend WithEvents lblRows As Label - Friend WithEvents ucrChkAddFootnote As ucrCheck - Friend WithEvents ucrChkAddTitleSubtitle As ucrCheck - Friend WithEvents grpTitleSubtitle As GroupBox - Friend WithEvents ucrInputTitleFont As ucrInputTextBox - Friend WithEvents ucrNudTitleSize As ucrNud - Friend WithEvents lblTitleSize As Label - Friend WithEvents lblTitleFont As Label - Friend WithEvents ucrInputSubtitleFootnote As ucrInputTextBox + Friend WithEvents ucrChkIncludeTitles As ucrCheck + Friend WithEvents grpTitle As GroupBox Friend WithEvents ucrInputTitleFootnote As ucrInputTextBox - Friend WithEvents ucrChkSubtitleFootnote As ucrCheck Friend WithEvents ucrChkTitleFootnote As ucrCheck - Friend WithEvents ucrInputSubtitle As ucrInputTextBox Friend WithEvents ucrInputTitle As ucrInputTextBox - Friend WithEvents lblSubtitle As Label Friend WithEvents lblTitle As Label Friend WithEvents ucrBaseSubdialog As ucrButtonsSubdialogue - Friend WithEvents tbpFacets As TabPage - Friend WithEvents tbpRows As TabPage - Friend WithEvents tbpColumns As TabPage + Friend WithEvents tbpStub As TabPage Friend WithEvents tbpThemes As TabPage Friend WithEvents rdoSelectTheme As RadioButton Friend WithEvents cmdManualTheme As Button Friend WithEvents rdoManualTheme As RadioButton Friend WithEvents ucrInputSelectThemes As ucrInputComboBox Friend WithEvents ucrPnlThemesPanel As UcrPanel + Friend WithEvents grpSubtitle As GroupBox + Friend WithEvents ucrInputSubtitleFootnote As ucrInputTextBox + Friend WithEvents ucrChkSubtitleFootnote As ucrCheck + Friend WithEvents ucrInputSubtitle As ucrInputTextBox + Friend WithEvents lblSubtitle As Label + Friend WithEvents grpStub As GroupBox + Friend WithEvents ucrInputStubFootnote As ucrInputTextBox + Friend WithEvents ucrChkStubFootnote As ucrCheck + Friend WithEvents ucrInputStub As ucrInputTextBox + Friend WithEvents lblStubs As Label + Friend WithEvents ucrChkStub As ucrCheck + Friend WithEvents lblSubtitleFootnote As Label + Friend WithEvents lblTitleFootnote As Label + Friend WithEvents lblStubFootnote As Label + Friend WithEvents cmdSubtitleFont As Button + Friend WithEvents cmdSubtitleFormat As Button + Friend WithEvents cmdTitleFont As Button + Friend WithEvents cmdTitleFormat As Button + Friend WithEvents cmdStubFont As Button + Friend WithEvents cmdStubFormat As Button End Class diff --git a/instat/sdgFormatSummaryTables.vb b/instat/sdgFormatSummaryTables.vb index a4890c9a25b..75e202e148c 100644 --- a/instat/sdgFormatSummaryTables.vb +++ b/instat/sdgFormatSummaryTables.vb @@ -17,8 +17,8 @@ Imports instat.Translations Public Class sdgFormatSummaryTables - Private clsTableTitleFunction, clsTabFootnoteTitleFunction, clsTableSourcenoteFunction, clsFootnoteCellFunction, - clsFootnoteTitleLocationFunction, clsFootnoteSubtitleLocationFunction, clsTabFootnoteSubtitleFunction, + Private clsTableTitleFunction, clsStubFunction, clsTabFootnoteTitleFunction, clsStubFootnoteFunction, clsStubCellsFunction, clsTableSourcenoteFunction, clsFootnoteCellFunction, + clsFootnoteTitleLocationFunction, clsFootnoteSubtitleLocationFunction, clsTabFootnoteSubtitleFunction, clsGtFunction, clsFootnoteCellBodyFunction, clsSecondFootnoteCellFunction, clsSecondFootnoteCellBodyFunction, clsTabStyleFunction, clsTabStyleCellTextFunction, clsTabStylePxFunction As New RFunction 'The dummy Function is used by input controls that add the parameter manually, @@ -60,95 +60,70 @@ Public Class sdgFormatSummaryTables ucrChkTitleFootnote.SetText("Add title footnote") ucrChkTitleFootnote.AddToLinkedControls(ucrInputTitleFootnote, {True}, bNewLinkedHideIfParameterMissing:=True) - ucrChkTitleFootnote.SetLinkedDisplayControl(grpTitleSubtitle) + ucrChkTitleFootnote.SetLinkedDisplayControl(grpTitle) ucrChkTitleFootnote.AddParameterPresentCondition(True, "title_footnote") ucrChkTitleFootnote.AddParameterPresentCondition(False, "title_footnote", False) - ucrInputSubtitleFootnote.SetParameter(New RParameter("subtitle_footnote", iNewPosition:=3)) + ucrChkStubFootnote.SetText("Add footnote") + ucrChkStubFootnote.AddToLinkedControls(ucrInputStubFootnote, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkStubFootnote.SetLinkedDisplayControl(grpStub) + + ucrChkStubFootnote.AddParameterPresentCondition(True, "title_stub_footnote") + ucrChkStubFootnote.AddParameterPresentCondition(False, "title_stub_footnote", False) + ucrInputSubtitleFootnote.SetParameter(New RParameter("subtitle_footnote", iNewPosition:=3)) ucrChkSubtitleFootnote.SetText("Add subtitle footnote") ucrChkSubtitleFootnote.AddToLinkedControls(ucrInputSubtitleFootnote, {True}, bNewLinkedHideIfParameterMissing:=True) - + ucrChkSubtitleFootnote.SetLinkedDisplayControl(grpSubtitle) ucrChkSubtitleFootnote.AddParameterPresentCondition(True, "subtitle_footnote") ucrChkSubtitleFootnote.AddParameterPresentCondition(False, "subtitle_footnote", False) - ucrInputTitleFont.SetParameter(New RParameter("font", iNewPosition:=0)) - ucrInputTitleFont.SetRDefault("NULL") - ucrInputTitleFont.SetLinkedDisplayControl(lblTitleFont) - - ucrNudTitleSize.SetParameter(New RParameter("size", iNewPosition:=0, bNewIncludeArgumentName:=False)) - ucrNudTitleSize.Increment = 1 - ucrNudTitleSize.SetMinMax(1) - ucrNudTitleSize.SetLinkedDisplayControl(lblTitleSize) - - ucrChkAddTitleSubtitle.SetText("Add title/subtitle") - ucrChkAddTitleSubtitle.AddToLinkedControls({ucrInputTitle, ucrInputSubtitle, ucrChkTitleFootnote, ucrChkSubtitleFootnote, ucrInputTitleFont, ucrNudTitleSize}, {True}, bNewLinkedHideIfParameterMissing:=True) - - ucrChkAddTitleSubtitle.AddParameterPresentCondition(True, "title_subtitle") - ucrChkAddTitleSubtitle.AddParameterPresentCondition(False, "title_subtitle", False) - - ucrInputFootnoteColumnLocation.SetParameter(New RParameter("col_location", 5)) - ucrInputFootnoteColumnLocation.SetValidationTypeAsNumericList() - - ucrInputFootnoteRowLocation.SetParameter(New RParameter("row_location", iNewPosition:=6)) - ucrInputFootnoteRowLocation.SetValidationTypeAsNumericList() - ucrInputFootnoteRowLocation.SetLinkedDisplayControl(grpLocation) + ucrChkIncludeTitles.SetText("Include titles") + ucrChkIncludeTitles.AddToLinkedControls({ucrInputTitle, ucrInputSubtitle, ucrChkTitleFootnote, ucrChkSubtitleFootnote}, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrInputTitleFootnote.SetLinkedDisplayControl(lblTitleFootnote) - ucrInputCellFootnote.SetParameter(New RParameter("cell_footnote", iNewPosition:=4)) - ucrInputCellFootnote.SetLinkedDisplayControl(lblFootnote) - ucrChkAddFootnote.SetText("Add footnote") - ucrChkAddFootnote.AddToLinkedControls({ucrInputCellFootnote, ucrInputFootnoteColumnLocation, ucrInputFootnoteRowLocation}, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkIncludeTitles.AddParameterPresentCondition(True, "title_subtitle") + ucrChkIncludeTitles.AddParameterPresentCondition(False, "title_subtitle", False) + ucrInputSubtitleFootnote.SetLinkedDisplayControl(lblSubtitleFootnote) - ucrChkAddFootnote.AddParameterPresentCondition(True, "cell_footnote") - ucrChkAddFootnote.AddParameterPresentCondition(False, "cell_footnote", False) + ucrChkStub.SetText("Include Stub") + ucrChkStub.AddToLinkedControls({ucrInputStub, ucrChkStubFootnote}, {True}, bNewLinkedHideIfParameterMissing:=True) - ucrChKAddSecondFootnote.SetText("Add second footnote") - ucrChKAddSecondFootnote.AddToLinkedControls({ucrInputSecondCellFootnote, ucrInputSecondFootnoteColumnLocation, ucrInputSecondFootnoteRowLocation}, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkStub.AddParameterPresentCondition(True, "title_stub") + ucrChkStub.AddParameterPresentCondition(False, "title_stub", False) - ucrInputSecondFootnoteRowLocation.SetParameter(New RParameter("second_row_location", iNewPosition:=7)) - ucrInputSecondFootnoteRowLocation.SetValidationTypeAsNumericList() + ucrInputStub.SetParameter(New RParameter("Stub", iNewPosition:=0)) + ucrInputStub.SetLinkedDisplayControl(lblStubs) - ucrInputSecondFootnoteColumnLocation.SetParameter(New RParameter("second_col_location", iNewPosition:=6)) - ucrInputSecondFootnoteColumnLocation.SetValidationTypeAsNumericList() - ucrInputSecondCellFootnote.SetParameter(New RParameter("second_footnote", iNewPosition:=4)) - ucrInputSecondCellFootnote.SetLinkedDisplayControl(lblSecondFootnote) - - ucrInputSecondFootnoteColumnLocation.SetLinkedDisplayControl(grpSecondFootnote) - - ucrChKAddSecondFootnote.AddParameterPresentCondition(True, "second_cellfootnote") - ucrChKAddSecondFootnote.AddParameterPresentCondition(False, "second_cellfootnote", False) - - ucrInputAddSourceNote.SetParameter(New RParameter("source_note", iNewPosition:=8)) - - ucrChkAddSourcenote.SetText("Add source") - ucrChkAddSourcenote.AddToLinkedControls(ucrInputAddSourceNote, {True}, bNewLinkedHideIfParameterMissing:=True) - - ucrChkAddSourcenote.AddParameterPresentCondition(True, "source_note") - ucrChkAddSourcenote.AddParameterPresentCondition(False, "source_note", False) + ucrInputStubFootnote.SetParameter(New RParameter("Stub_footnote", iNewPosition:=0)) + ucrInputStubFootnote.SetLinkedDisplayControl(lblStubFootnote) bControlsInitialised = True End Sub - Public Sub SetRCode(bReset As Boolean, clsNewTableTitleFunction As RFunction, clsNewTabFootnoteTitleFunction As RFunction, clsNewFootnoteCellFunction As RFunction, - clsNewTableSourcenoteFunction As RFunction, clsNewTabStyleFunction As RFunction, clsNewMutableOperator As ROperator, + Public Sub SetRCode(bReset As Boolean, clsNewGtFunction As RFunction, clsNewStubFunction As RFunction, clsNewTableTitleFunction As RFunction, clsNewStubFootnoteFunction As RFunction, clsNewStubCellsFunction As RFunction, clsNewTabFootnoteTitleFunction As RFunction, clsNewFootnoteCellFunction As RFunction, + clsNewTableSourcenoteFunction As RFunction, clsNewTabStyleFunction As RFunction, clsNewMutableOPerator As ROperator, clsNewPipeOperator As ROperator, clsNewFootnoteTitleLocationFunction As RFunction, clsNewFootnoteSubtitleLocationFunction As RFunction, clsNewTabFootnoteSubtitleFunction As RFunction, clsNewFootnoteCellBodyFunction As RFunction, clsNewJoiningOperator As ROperator, clsNewSecondFootnoteCellFunction As RFunction, clsNewTabStyleCellTextFunction As RFunction, clsNewSecondFootnoteCellBodyFunction As RFunction, clsNewTabStylePxFunction As RFunction, clsNewDummyFunction As RFunction, clsNewThemesTabOptionFunction As RFunction, clsNewgtExtraThemesFunction As RFunction) - If Not bControlsInitialised Then InitialiseControls() End If AddRemoveManualTheme() - + OptionsVisibility() bRCodeSet = False clsTableTitleFunction = clsNewTableTitleFunction + clsStubFunction = clsNewStubFunction clsTabFootnoteTitleFunction = clsNewTabFootnoteTitleFunction + clsStubFootnoteFunction = clsNewStubFootnoteFunction + clsStubCellsFunction = clsNewStubCellsFunction clsTabFootnoteSubtitleFunction = clsNewTabFootnoteSubtitleFunction + clsGtFunction = clsNewGtFunction clsTableSourcenoteFunction = clsNewTableSourcenoteFunction clsFootnoteSubtitleLocationFunction = clsNewFootnoteSubtitleLocationFunction clsFootnoteTitleLocationFunction = clsNewFootnoteTitleLocationFunction @@ -167,39 +142,40 @@ Public Class sdgFormatSummaryTables If bReset Then ucrInputSelectThemes.SetText("Dark Theme") + ucrChkIncludeTitles.SetRCode(clsPipeOperator, bReset, bCloneIfNeeded:=True) + ucrChkTitleFootnote.SetRCode(clsPipeOperator, bReset, bCloneIfNeeded:=True) + ucrChkSubtitleFootnote.SetRCode(clsPipeOperator, bReset, bCloneIfNeeded:=True) + ucrChkStub.SetRCode(clsPipeOperator, bReset, bCloneIfNeeded:=True) + ucrChkStubFootnote.SetRCode(clsPipeOperator, bReset, bCloneIfNeeded:=True) End If - ucrChkAddTitleSubtitle.SetRCode(clsPipeOperator, bReset, bCloneIfNeeded:=True) - ucrChkTitleFootnote.SetRCode(clsPipeOperator, bReset, bCloneIfNeeded:=True) - ucrChkAddFootnote.SetRCode(clsPipeOperator, bReset, bCloneIfNeeded:=True) - ucrChKAddSecondFootnote.SetRCode(clsPipeOperator, bReset, bCloneIfNeeded:=True) - ucrChkSubtitleFootnote.SetRCode(clsPipeOperator, bReset, bCloneIfNeeded:=True) - ucrChkAddSourcenote.SetRCode(clsPipeOperator, bReset, bCloneIfNeeded:=True) - ucrInputTitleFont.SetRCode(clsTabStyleCellTextFunction, bReset, bCloneIfNeeded:=True) - ucrNudTitleSize.SetRCode(clsTabStylePxFunction, bReset, bCloneIfNeeded:=True) ucrInputTitle.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=True) ucrInputSubtitle.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=True) - ucrInputCellFootnote.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=True) - ucrInputSecondCellFootnote.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=True) - ucrInputFootnoteColumnLocation.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=True) - ucrInputFootnoteRowLocation.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=True) - ucrInputSecondFootnoteColumnLocation.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=True) - ucrInputSecondFootnoteRowLocation.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=True) - ucrInputAddSourceNote.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=True) + ucrInputTitleFootnote.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=True) ucrInputSubtitleFootnote.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=True) ucrPnlThemesPanel.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=True) + ucrInputStub.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=True) + ucrInputStubFootnote.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=True) + bRCodeSet = True End Sub - Private Sub ucrChkAddTitleSubtitle_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddTitleSubtitle.ControlValueChanged + Private Sub ucrChkAddTitleSubtitle_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkIncludeTitles.ControlValueChanged AddTableTitle() AddFootnote() + OptionsVisibility() + End Sub + Private Sub OptionsVisibility() + cmdSubtitleFormat.Visible = ucrChkSubtitleFootnote.Checked + cmdTitleFormat.Visible = ucrChkTitleFootnote.Checked + cmdStubFormat.Visible = ucrChkStubFootnote.Checked + End Sub Private Sub AddTableTitle() - If ucrChkAddTitleSubtitle.Checked AndAlso (Not ucrInputTitle.IsEmpty OrElse Not ucrInputSubtitle.IsEmpty) Then + If ucrChkIncludeTitles.Checked AndAlso (Not ucrInputTitle.IsEmpty OrElse Not ucrInputSubtitle.IsEmpty) Then clsPipeOperator.AddParameter("title_subtitle", clsRFunctionParameter:=clsTableTitleFunction, iPosition:=1) clsPipeOperator.AddParameter("title_font", clsRFunctionParameter:=clsTabStyleFunction, iPosition:=5) Else @@ -208,21 +184,50 @@ Public Class sdgFormatSummaryTables End If End Sub + Private Sub AddStub() + If ucrChkStub.Checked AndAlso Not ucrInputStub.IsEmpty Then + clsPipeOperator.AddParameter("title_stub", clsRFunctionParameter:=clsStubFunction, iPosition:=1) + Else + clsPipeOperator.RemoveParameterByName("title_stub") + End If + AddRemoveOperatorStub() + End Sub + + Private Sub AddStubFootnote() + If Not bRCodeSet Then + Exit Sub + End If + If ucrChkStub.Checked Then + If ucrChkStubFootnote.Checked AndAlso Not ucrInputStubFootnote.IsEmpty Then + clsPipeOperator.AddParameter("title_stub_footnote", clsRFunctionParameter:=clsStubFootnoteFunction, iPosition:=1) + Else + clsPipeOperator.RemoveParameterByName("title_stub_footnote") + End If + Else + clsPipeOperator.RemoveParameterByName("title_stub_footnote") + End If + AddRemoveOperatorStub() + End Sub + Private Sub ucrInputTitle_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputTitle.ControlValueChanged AddTableTitle() - If Not ucrInputTitle.IsEmpty Then - clsTableTitleFunction.AddParameter("title", Chr(34) & ucrInputTitle.GetText() & Chr(34), iPosition:=0) - Else - clsTableTitleFunction.RemoveParameterByName("title") + If ucrChkIncludeTitles.Checked Then + If Not ucrInputTitle.IsEmpty Then + clsTableTitleFunction.AddParameter("title", Chr(34) & ucrInputTitle.GetText() & Chr(34), iPosition:=0) + Else + clsTableTitleFunction.RemoveParameterByName("title") + End If End If End Sub Private Sub ucrInputSubtitle_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputSubtitle.ControlValueChanged AddTableTitle() - If Not ucrInputSubtitle.IsEmpty Then - clsTableTitleFunction.AddParameter("subtitle", Chr(34) & ucrInputSubtitle.GetText() & Chr(34), iPosition:=1) - Else - clsTableTitleFunction.RemoveParameterByName("subtitle") + If ucrChkIncludeTitles.Checked Then + If Not ucrInputSubtitle.IsEmpty Then + clsTableTitleFunction.AddParameter("subtitle", Chr(34) & ucrInputSubtitle.GetText() & Chr(34), iPosition:=1) + Else + clsTableTitleFunction.RemoveParameterByName("subtitle") + End If End If End Sub @@ -230,15 +235,15 @@ Public Class sdgFormatSummaryTables If Not bRCodeSet Then Exit Sub End If - If ucrChkTitleFootnote.Checked AndAlso Not ucrInputTitleFootnote.IsEmpty Then - clsPipeOperator.AddParameter("title_footnote", clsRFunctionParameter:=clsTabFootnoteTitleFunction, iPosition:=1) + If ucrChkIncludeTitles.Checked Then + If ucrChkTitleFootnote.Checked AndAlso Not ucrInputTitleFootnote.IsEmpty Then + clsPipeOperator.AddParameter("title_footnote", clsRFunctionParameter:=clsTabFootnoteTitleFunction, iPosition:=2) + End If + If ucrChkSubtitleFootnote.Checked AndAlso Not ucrInputSubtitleFootnote.IsEmpty Then + clsPipeOperator.AddParameter("subtitle_footnote", clsRFunctionParameter:=clsTabFootnoteSubtitleFunction, iPosition:=2) + End If Else clsPipeOperator.RemoveParameterByName("title_footnote") - End If - - If ucrChkSubtitleFootnote.Checked AndAlso Not ucrInputSubtitleFootnote.IsEmpty Then - clsPipeOperator.AddParameter("subtitle_footnote", clsRFunctionParameter:=clsTabFootnoteSubtitleFunction, iPosition:=2) - Else clsPipeOperator.RemoveParameterByName("subtitle_footnote") End If End Sub @@ -259,159 +264,73 @@ Public Class sdgFormatSummaryTables clsTabFootnoteTitleFunction.RemoveParameterByName("locations") End If AddFootnote() - End Sub - - Private Sub ucrChkSubtitleFootnote_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSubtitleFootnote.ControlValueChanged - If ucrChkSubtitleFootnote.Checked Then - clsTabFootnoteSubtitleFunction.AddParameter("locations", clsRFunctionParameter:=clsFootnoteSubtitleLocationFunction, iPosition:=2) - clsFootnoteSubtitleLocationFunction.AddParameter("groups", Chr(34) & "subtitle" & Chr(34), iPosition:=0) - Else - clsFootnoteSubtitleLocationFunction.RemoveParameterByName("groups") - clsTabFootnoteSubtitleFunction.RemoveParameterByName("locations") - End If - AddFootnote() + OptionsVisibility() End Sub Private Sub ucrInputTitleFootnote_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputTitleFootnote.ControlValueChanged - If Not ucrInputTitleFootnote.IsEmpty Then - clsTabFootnoteTitleFunction.AddParameter("footnote", Chr(34) & ucrInputTitleFootnote.GetText() & Chr(34), iPosition:=1) - Else - clsTabFootnoteTitleFunction.RemoveParameterByName("footnote") + If ucrChkIncludeTitles.Checked Then + If Not ucrInputTitleFootnote.IsEmpty Then + clsTabFootnoteTitleFunction.AddParameter("footnote", Chr(34) & ucrInputTitleFootnote.GetText() & Chr(34), iPosition:=1) + Else + clsTabFootnoteTitleFunction.RemoveParameterByName("footnote") + End If End If AddFootnote() End Sub Private Sub ucrInputSubtitleFootnote_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputSubtitleFootnote.ControlValueChanged - If Not ucrInputSubtitleFootnote.IsEmpty Then - clsTabFootnoteSubtitleFunction.AddParameter("footnote", Chr(34) & ucrInputSubtitleFootnote.GetText & Chr(34), iPosition:=1) - Else - clsTabFootnoteSubtitleFunction.RemoveParameterByName("footnote") + If ucrChkIncludeTitles.Checked Then + If Not ucrInputSubtitleFootnote.IsEmpty Then + clsTabFootnoteSubtitleFunction.AddParameter("footnote", Chr(34) & ucrInputSubtitleFootnote.GetText & Chr(34), iPosition:=1) + Else + clsTabFootnoteSubtitleFunction.RemoveParameterByName("footnote") + End If End If AddFootnote() End Sub - Private Sub ucrInputAddSourceNote_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputAddSourceNote.ControlValueChanged - AddRemoveSourceNoteParameter() - AddSourceNote() + Private Sub PipeOperator_controlContentsChanged(ucrChangedControl As ucrCore) Handles ucrChkIncludeTitles.ControlContentsChanged, + ucrInputTitle.ControlContentsChanged, ucrInputTitleFootnote.ControlContentsChanged, ucrInputSubtitleFootnote.ControlContentsChanged, + ucrInputSubtitle.ControlContentsChanged, ucrChkSubtitleFootnote.ControlContentsChanged, ucrChkTitleFootnote.ControlContentsChanged + If ucrChkIncludeTitles.Checked Then + If Not ucrInputTitle.IsEmpty AndAlso Not ucrInputSubtitle.IsEmpty Then + clsJoiningOperator.AddParameter("pipe", clsROperatorParameter:=clsPipeOperator, iPosition:=1) + Else + clsJoiningOperator.RemoveParameterByName("pipe") + End If + If ucrChkTitleFootnote.Checked AndAlso ucrChkIncludeTitles.Checked Then + If Not ucrInputTitleFootnote.IsEmpty Then + clsJoiningOperator.AddParameter("pipe", clsROperatorParameter:=clsPipeOperator, iPosition:=1) + Else + clsJoiningOperator.RemoveParameterByName("pipe") + End If + If ucrChkSubtitleFootnote.Checked AndAlso ucrChkIncludeTitles.Checked Then + clsJoiningOperator.AddParameter("pipe", clsROperatorParameter:=clsPipeOperator, iPosition:=1) + Else + clsJoiningOperator.RemoveParameterByName("pipe") + End If + End If + End If End Sub - Private Sub PipeOperator_controlContentsChanged(ucrChangedControl As ucrCore) Handles ucrChkAddTitleSubtitle.ControlContentsChanged, - ucrChkAddFootnote.ControlContentsChanged, ucrChKAddSecondFootnote.ControlContentsChanged, ucrChkAddSourcenote.ControlContentsChanged, - ucrInputTitle.ControlContentsChanged, ucrInputSubtitle.ControlContentsChanged, ucrInputTitleFootnote.ControlContentsChanged, - ucrInputSubtitleFootnote.ControlContentsChanged, ucrInputAddSourceNote.ControlContentsChanged, - ucrInputCellFootnote.ControlContentsChanged, ucrInputSecondCellFootnote.ControlContentsChanged - - If ucrChkAddTitleSubtitle.Checked OrElse ucrChkAddFootnote.Checked OrElse ucrChKAddSecondFootnote.Checked OrElse ucrChkAddSourcenote.Checked OrElse - ucrChKAddSecondFootnote.Checked Then - If ucrInputTitle.IsEmpty AndAlso ucrInputSubtitle.IsEmpty AndAlso ucrInputTitleFootnote.IsEmpty AndAlso - ucrInputSubtitleFootnote.IsEmpty AndAlso ucrInputAddSourceNote.IsEmpty AndAlso ucrInputCellFootnote.IsEmpty AndAlso ucrInputSecondCellFootnote.IsEmpty Then + Private Sub AddRemoveOperatorStub() + If ucrChkStub.Checked Then + If ucrInputStub.IsEmpty Then clsJoiningOperator.RemoveParameterByName("pipe") Else clsJoiningOperator.AddParameter("pipe", clsROperatorParameter:=clsPipeOperator, iPosition:=1) End If - Else - clsJoiningOperator.RemoveParameterByName("pipe") - End If - End Sub - - Private Sub AddCellFootnote() - If Not bRCodeSet Then - Exit Sub - End If - If ucrChkAddFootnote.Checked AndAlso Not ucrInputCellFootnote.IsEmpty Then - clsPipeOperator.AddParameter("cell_footnote", clsRFunctionParameter:=clsFootnoteCellFunction, iPosition:=3) - Else - clsPipeOperator.RemoveParameterByName("cell_footnote") - End If - - If ucrChKAddSecondFootnote.Checked AndAlso Not ucrInputSecondCellFootnote.IsEmpty Then - clsPipeOperator.AddParameter("second_cellfootnote", clsRFunctionParameter:=clsSecondFootnoteCellFunction, iPosition:=3) - Else - clsPipeOperator.RemoveParameterByName("second_cellfootnote") - End If - End Sub - - Private Sub AddFootnote_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddFootnote.ControlValueChanged, ucrChKAddSecondFootnote.ControlValueChanged - If ucrChkAddFootnote.Checked Then - clsFootnoteCellFunction.AddParameter("locations", clsRFunctionParameter:=clsFootnoteCellBodyFunction, iPosition:=3) - Else - clsFootnoteCellFunction.RemoveParameterByName("locations") - End If - - If ucrChKAddSecondFootnote.Checked Then - clsSecondFootnoteCellFunction.AddParameter("locations", clsRFunctionParameter:=clsSecondFootnoteCellBodyFunction, iPosition:=3) - Else - clsSecondFootnoteCellFunction.RemoveParameterByName("locations") - End If - AddRemoveFootnote() - AddCellFootnote() - End Sub - - Private Sub ColumnLocation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputFootnoteColumnLocation.ControlValueChanged, ucrInputSecondFootnoteColumnLocation.ControlValueChanged - If Not ucrInputFootnoteColumnLocation.IsEmpty Then - clsFootnoteCellBodyFunction.AddParameter("columns", clsRFunctionParameter:=ucrInputFootnoteColumnLocation.clsRList, iPosition:=0) - Else - clsFootnoteCellBodyFunction.AddParameter("columns", "everything()", iPosition:=0) - End If - - If Not ucrInputSecondFootnoteColumnLocation.IsEmpty Then - clsSecondFootnoteCellBodyFunction.AddParameter("columns", clsRFunctionParameter:=ucrInputSecondFootnoteColumnLocation.clsRList, iPosition:=0) - Else - clsSecondFootnoteCellBodyFunction.AddParameter("columns", "everything()", iPosition:=0) - End If - End Sub - - Private Sub RowLocation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputFootnoteRowLocation.ControlValueChanged, ucrInputSecondFootnoteRowLocation.ControlValueChanged - If Not ucrInputFootnoteRowLocation.IsEmpty Then - clsFootnoteCellBodyFunction.AddParameter("rows", clsRFunctionParameter:=ucrInputFootnoteRowLocation.clsRList, iPosition:=1) - Else - clsFootnoteCellBodyFunction.AddParameter("rows", "everything()", iPosition:=1) - End If - - If Not ucrInputSecondFootnoteRowLocation.IsEmpty Then - clsSecondFootnoteCellBodyFunction.AddParameter("rows", clsRFunctionParameter:=ucrInputSecondFootnoteRowLocation.clsRList, iPosition:=1) - Else - clsSecondFootnoteCellBodyFunction.AddParameter("rows", "everything()", iPosition:=1) - End If - End Sub - - Private Sub Footnote_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputCellFootnote.ControlValueChanged, ucrInputSecondCellFootnote.ControlValueChanged - AddRemoveFootnote() - AddCellFootnote() - End Sub - - Private Sub AddRemoveFootnote() - If Not ucrInputCellFootnote.IsEmpty Then - clsFootnoteCellFunction.AddParameter("footnote", Chr(34) & ucrInputCellFootnote.GetText() & Chr(34), iPosition:=2) - Else - clsFootnoteCellFunction.RemoveParameterByName("footnote") - End If - - If Not ucrInputSecondCellFootnote.IsEmpty Then - clsSecondFootnoteCellFunction.AddParameter("footnote", Chr(34) & ucrInputSecondCellFootnote.GetText() & Chr(34), iPosition:=2) - Else - clsSecondFootnoteCellFunction.RemoveParameterByName("footnote") - End If - End Sub - - Private Sub AddSourceNote() - If ucrChkAddSourcenote.Checked AndAlso Not ucrInputAddSourceNote.IsEmpty Then - clsPipeOperator.AddParameter("source_note", iPosition:=4, clsRFunctionParameter:=clsTableSourcenoteFunction) - Else - clsPipeOperator.RemoveParameterByName("source_note") - End If - End Sub - - Private Sub ucrChkAddSourcenote_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddSourcenote.ControlValueChanged - AddSourceNote() - AddRemoveSourceNoteParameter() - End Sub + If ucrChkStubFootnote.Checked AndAlso ucrChkStub.Checked Then + If Not ucrInputStubFootnote.IsEmpty Then + clsJoiningOperator.AddParameter("pipe", clsROperatorParameter:=clsPipeOperator, iPosition:=1) + Else + clsJoiningOperator.RemoveParameterByName("pipe") + End If + End If - Private Sub AddRemoveSourceNoteParameter() - If Not ucrInputAddSourceNote.IsEmpty Then - clsTableSourcenoteFunction.AddParameter("source_note", Chr(34) & ucrInputAddSourceNote.GetText() & Chr(34), iPosition:=1) Else - clsTableSourcenoteFunction.RemoveParameterByName("source_note") + clsPipeOperator.RemoveParameterByName("title_stub_footnote") + clsGtFunction.RemoveParameterByName("rownames_to_stub") End If End Sub @@ -451,9 +370,49 @@ Public Class sdgFormatSummaryTables cmdManualTheme.Visible = rdoManualTheme.Checked End Sub - Private Sub tbpFormatOptions_Selecting(sender As Object, e As TabControlCancelEventArgs) Handles tbpFormatOptions.Selecting - If e.TabPageIndex = 1 Or e.TabPageIndex = 2 Or e.TabPageIndex = 3 Then - e.Cancel = True + Private Sub ucrInputStubs_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputStub.ControlValueChanged + If ucrChkStub.Checked Then + If Not ucrInputStub.IsEmpty Then + clsStubFunction.AddParameter("label", Chr(34) & ucrInputStub.GetText() & Chr(34), iPosition:=0) + clsGtFunction.AddParameter("rownames_to_stub", "TRUE", iPosition:=0) + Else + clsStubFunction.RemoveParameterByName("label") + clsGtFunction.RemoveParameterByName("rownames_to_stub") + End If + End If + AddStub() + End Sub + + Private Sub ucrInputStubsFootNote_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputStubFootnote.ControlValueChanged + If ucrChkStubFootnote.Checked Then + If Not ucrInputStubFootnote.IsEmpty Then + clsStubFootnoteFunction.AddParameter("footnote", Chr(34) & ucrInputStubFootnote.GetText() & Chr(34), iPosition:=0) + Else + clsStubFootnoteFunction.RemoveParameterByName("footnote") + End If + End If + AddStubFootnote() + AddRemoveOperatorStub() + End Sub + + Private Sub ucrChkFootNote_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkStubFootnote.ControlValueChanged + If ucrChkStubFootnote.Checked Then + clsStubFootnoteFunction.AddParameter("locations", clsRFunctionParameter:=clsStubCellsFunction, iPosition:=1) + Else + clsStubFootnoteFunction.RemoveParameterByName("locations") End If + AddStubFootnote() + OptionsVisibility() + AddRemoveOperatorStub() + End Sub + + Private Sub ucrChkStubs_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkStub.ControlValueChanged + AddStub() + AddRemoveOperatorStub() + AddStubFootnote() + End Sub + + Private Sub ucrChkSubtitleFootnote_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSubtitleFootnote.ControlValueChanged + OptionsVisibility() End Sub End Class \ No newline at end of file