Skip to content

Commit

Permalink
Merge pull request #1981 from Lunalo/ModelsDialogs
Browse files Browse the repository at this point in the history
Changing dlgTablePlus to Show Model
  • Loading branch information
dannyparsons authored Oct 31, 2016
2 parents 2d1b368 + 7bf09a5 commit b982cb7
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 15 deletions.

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

2 changes: 1 addition & 1 deletion instat/dlgTablePlus.vb → instat/dlgShowModel.vb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
' 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 dlgTablePlus
Public Class dlgShowModel
Public bFirstLoad As Boolean = True
Private Sub dlgTablePlus_Load(sender As Object, e As EventArgs) Handles MyBase.Load
autoTranslate(Me)
Expand Down
6 changes: 5 additions & 1 deletion instat/frmMain.vb
Original file line number Diff line number Diff line change
Expand Up @@ -1115,7 +1115,7 @@ Public Class frmMain
End Sub

Private Sub TablesPlusToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuModelProbabilityDistributionsShowModel.Click
dlgTablePlus.ShowDialog()
dlgShowModel.ShowDialog()
End Sub

Private Sub mnuDescribeUseGraph_Click(sender As Object, e As EventArgs) Handles mnuDescribeUseGraph.Click
Expand Down Expand Up @@ -1237,4 +1237,8 @@ Public Class frmMain
Private Sub mnuFileSaveAsDataAs_Click(sender As Object, e As EventArgs) Handles mnuFileSaveAsDataAs.Click
dlgSaveAs.ShowDialog()
End Sub

Private Sub mnuModelProbabilityDistributionsCompareModels_Click(sender As Object, e As EventArgs) Handles mnuModelProbabilityDistributionsCompareModels.Click
dlgCompareModels.ShowDialog()
End Sub
End Class
18 changes: 9 additions & 9 deletions instat/instat.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -248,10 +248,10 @@
<Compile Include="dlgRugPlot.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="dlgTablePlus.Designer.vb">
<DependentUpon>dlgTablePlus.vb</DependentUpon>
<Compile Include="dlgShowModel.Designer.vb">
<DependentUpon>dlgShowModel.vb</DependentUpon>
</Compile>
<Compile Include="dlgTablePlus.vb">
<Compile Include="dlgShowModel.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="dlgTwoVariabletabulate.Designer.vb">
Expand Down Expand Up @@ -2622,14 +2622,14 @@
<EmbeddedResource Include="dlgSummaryBarOrPieChart.sw-KE.resx">
<DependentUpon>dlgSummaryBarOrPieChart.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="dlgTablePlus.fr-FR.resx">
<DependentUpon>dlgTablePlus.vb</DependentUpon>
<EmbeddedResource Include="dlgShowModel.fr-FR.resx">
<DependentUpon>dlgShowModel.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="dlgTablePlus.resx">
<DependentUpon>dlgTablePlus.vb</DependentUpon>
<EmbeddedResource Include="dlgShowModel.resx">
<DependentUpon>dlgShowModel.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="dlgTablePlus.sw-KE.resx">
<DependentUpon>dlgTablePlus.vb</DependentUpon>
<EmbeddedResource Include="dlgShowModel.sw-KE.resx">
<DependentUpon>dlgShowModel.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="dlgThemes.fr-FR.resx">
<DependentUpon>dlgThemes.vb</DependentUpon>
Expand Down

0 comments on commit b982cb7

Please sign in to comment.