Skip to content

Commit

Permalink
Merge pull request #102 from africanmathsinitiative/master
Browse files Browse the repository at this point in the history
Update main branch
  • Loading branch information
stevekogo authored Jul 8, 2016
2 parents edf4552 + d7dd4aa commit 3959328
Show file tree
Hide file tree
Showing 46 changed files with 1,060 additions and 419 deletions.
1 change: 1 addition & 0 deletions instat/dlgCombine.vb
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ Public Class dlgCombine
ucrInputColName.SetItemsTypeAsColumns()
ucrInputColName.SetDefaultTypeAsColumn()
ucrInputColName.SetDataFrameSelector(ucrSelectorCombineFactors.ucrAvailableDataFrames)
ucrBase.iHelpTopicID = 39
End Sub

Private Sub ReOpenDialog()
Expand Down

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

File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,13 @@
' 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 instat.Translations
Public Class dlgSheetMetadata
Public Class dlgDataFrameMetaData
Private Sub dlgSheetMetadata_Load(sender As Object, e As EventArgs) Handles MyBase.Load
autoTranslate(Me)
End Sub

Private Sub InitialiseDialog()
ucrBase.iHelpTopicID = 288

End Sub
End Class
1 change: 1 addition & 0 deletions instat/dlgDeleteMetadata.vb
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ Public Class dlgDeleteMetadata
ucrReceiverMetadataToDelete.Selector = ucrSelectorForDeleteMetadata
ucrReceiverMetadataToDelete.SetMeAsReceiver()
ucrSelectorForDeleteMetadata.SetItemType("metadata")
ucrBase.iHelpTopicID = 170
End Sub

Private Sub setDefaults()
Expand Down

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

File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 4 additions & 2 deletions instat/dlgMakeSheets.vb → instat/dlgFactorDataFrame.vb
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@
' along with this program. If not, see <http://www.gnu.org/licenses/>.
Imports instat.Translations

Public Class dlgMakeSheets
Public Class dlgFactorDataFrame
Public bFirstLoad As Boolean = True
Private Sub dlgMakeSheets_Load(sender As Object, e As EventArgs) Handles MyBase.Load

Private Sub dlgFactorDataFrame_Load(sender As Object, e As EventArgs) Handles MyBase.Load
autoTranslate(Me)

If bFirstLoad Then
Expand All @@ -28,6 +29,7 @@ Public Class dlgMakeSheets
End Sub

Private Sub InitialiseDialog()
ucrBase.iHelpTopicID = 162

End Sub
Private Sub SetDefaults()
Expand Down
12 changes: 11 additions & 1 deletion instat/dlgFind.Designer.vb

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

4 changes: 4 additions & 0 deletions instat/dlgFind.vb
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ Imports instat.Translations
Public Class dlgFind
Public currWindow As Form
Dim targetPos As Integer = 0

Private Sub InitialiseDialog()
ucrBase.iHelpTopicID = 406
End Sub
Private Sub cmdFindNext_Click(sender As Object, e As EventArgs) Handles cmdFindNext.Click

Select Case currWindow.Name
Expand Down
2 changes: 1 addition & 1 deletion instat/dlgFreezeColumns.vb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Public Class dlgFreezeColumns
End Sub

Private Sub InitialiseDialog()
'ucrBaseforFreezeColumns.iHelpTopicID = 165
ucrBaseforFreezeColumns.iHelpTopicID = 444
ucrReceiverMultipleforFreezeColumns.Selector = ucrSelectorByDataFrameAddRemoveforFreezeColumns
ucrReceiverMultipleforFreezeColumns.SetMeAsReceiver()
ucrBaseforFreezeColumns.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$set_freeze_columns")
Expand Down
83 changes: 16 additions & 67 deletions instat/dlgGeneralForGraphics.Designer.vb

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

Loading

0 comments on commit 3959328

Please sign in to comment.