Skip to content

Commit

Permalink
Update DataTypeInputControl
Browse files Browse the repository at this point in the history
  • Loading branch information
mvac7 committed May 31, 2022
1 parent 86323e0 commit 00088b4
Show file tree
Hide file tree
Showing 12 changed files with 321 additions and 278 deletions.
Binary file removed GFX/screenshots/ByteniZ3R_v0914b_screenshot01.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ This functionality is no longer required.
The most current versions have a new name because one day I woke up with the need to provide a unique and cool name.
The thinking brain behind the new name is Mr. [Fubukimaru](http://www.gamerachan.org/fubu/).

![ByteniZ3R screenshot](https://github.com/mvac7/mSXdevtools_ByteniZ3R/raw/main/GFX/screenshots/ByteniZ3R_v0914b_screenshot01.png)
![ByteniZ3R screenshot](https://github.com/mvac7/mSXdevtools_ByteniZ3R/raw/main/GFX/screenshots/ByteniZ3R_v0916b_screenshot01.png)


### ByteniZ3R v0.9.n (2022).
Expand Down
Binary file modified _Release/ByteniZ3R.exe
Binary file not shown.
276 changes: 158 additions & 118 deletions sources/DataTypeInputControl.Designer.vb

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions sources/DataTypeInputControl.resx
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,19 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="BasicPanel.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlh8ABuAIEBAJeS8P///wAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAABACwAAAAA8ABu
AAAI/wABCBxIsKDBgwgTKlzIsKHDhxAjSpxIseLBABgtatzIsaPHjyBDEsQYQKTJkyhTqlxJcqXLlzBj
yiRZUqbNmzhzPqRZU6fPn0Bf8uwZtKjRoxWHEkXKtKnTgUqXPp1KVWdUqVWzalV5FevWr2A5dvUatqxZ
h2PJnl3LFmratnDjCkyrVq7dqnTv6g2bd6/frH3/CnYaeLBho4UPK/aZeLFjm40fS3YZebLlk5Uva/6Y
ebNnjZ0/i5YYerTphqVPq0aYerVrt2Nfy2bYerbq2rZN484tejdvz75/aw4u3DLx4pKPI3esfLni5s4N
Q48ueDp1v9av682u3S737nG/gw1vK3782vLmzaJPz/ctunvg7t8Pjy/fOP36ye/jZ65///P+/kkHYIDV
DUggdgYeuF2CCnrHYIPhPQgheRJOeF6FFqqHYYbtxcYhgh5+uGCIIjpIYokRnogihSqueGGLLmoIY4wd
dkUjXOvdGFOOOgq1YY9I8QgkVz8OWZSQRmJWZJI/IclkSE4+ydmSUuIUZZViUYnlTFpuCdOVXibVZZgs
jUlmSmCeGVGaau5kZpsisQknbW/OOeWMdt4kZ56s1cnnRnv+WVCggiTCZmOhVvmJ6ESEItpooY8KGumf
k/JZaZ501bWokpluumMAAQEAOw==
</value>
</data>
</root>
58 changes: 46 additions & 12 deletions sources/DataTypeInputControl.vb
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,20 @@



Public Property FieldName As String
Get
If CodeLanguage = Language_CODE.ASSEMBLER Then
Return AsmFieldNameTextBox.Text
Else
Return CesFieldNameTextBox.Text
End If
End Get
Set(value As String)
AsmFieldNameTextBox.Text = value
CesFieldNameTextBox.Text = value
End Set
End Property



Public Sub New()
Expand All @@ -200,8 +214,11 @@
Private Sub DataTypeInputControl_Load(sender As Object, e As System.EventArgs) Handles Me.Load

' posiciona la caja con campos especificos para la salida en assembler
Me.AsmGroupBox.Location = Me.BasicGroupBox.Location
Me.CGroupBox.Location = Me.BasicGroupBox.Location
Me.AssemblerPanel.Location = Me.BasicPanel.Location
Me.CesPanel.Location = Me.BasicPanel.Location

Me.AssemblerPanel.BackgroundImage = Me.BasicPanel.BackgroundImage
Me.CesPanel.BackgroundImage = Me.BasicPanel.BackgroundImage

Me.LanguageComboBox.SelectedIndex = 0

Expand Down Expand Up @@ -345,7 +362,7 @@


Private Sub DataTypeInputControl_Paint(sender As Object, e As System.Windows.Forms.PaintEventArgs) Handles Me.Paint
Me.Size = New System.Drawing.Size(Me.Size.Width, 110)
Me.Size = New System.Drawing.Size(Me.Size.Width, 4 + 111 + 2)
End Sub


Expand All @@ -365,9 +382,9 @@

Select Case Me.LanguageComboBox.SelectedIndex
Case DataFormat.ProgrammingLanguage.BASIC 'basic
Me.BasicGroupBox.Visible = True
Me.AsmGroupBox.Visible = False
Me.CGroupBox.Visible = False
Me.BasicPanel.Visible = True
Me.AssemblerPanel.Visible = False
Me.CesPanel.Visible = False

'Me.RemoveZerosCheck.Enabled = True
Select Case Me.NumberSystemCombo.SelectedIndex
Expand All @@ -380,9 +397,9 @@
End Select

Case DataFormat.ProgrammingLanguage.C
Me.BasicGroupBox.Visible = False
Me.AsmGroupBox.Visible = False
Me.CGroupBox.Visible = True
Me.BasicPanel.Visible = False
Me.AssemblerPanel.Visible = False
Me.CesPanel.Visible = True

Select Case Me.NumberSystemCombo.SelectedIndex
Case DataFormat.DataType.DECIMAL_n To DataFormat.DataType.DECIMAL_nnnd
Expand All @@ -394,9 +411,9 @@
End Select

Case DataFormat.ProgrammingLanguage.ASSEMBLER
Me.BasicGroupBox.Visible = False
Me.AsmGroupBox.Visible = True
Me.CGroupBox.Visible = False
Me.BasicPanel.Visible = False
Me.AssemblerPanel.Visible = True
Me.CesPanel.Visible = False

Select Case Me.NumberSystemCombo.SelectedIndex
Case DataFormat.DataType.DECIMAL_n To DataFormat.DataType.DECIMAL_nnnd
Expand Down Expand Up @@ -557,4 +574,21 @@



Private Sub AsmFieldNameTextBox_Validating(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles AsmFieldNameTextBox.Validating
If Me.AsmFieldNameTextBox.Text.Trim() = "" Then
Me.AsmFieldNameTextBox.Text = "DATA"
End If
RaiseEvent DataChanged()
End Sub



Private Sub CesFieldNameTextBox_Validating(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles CesFieldNameTextBox.Validating
If Me.CesFieldNameTextBox.Text.Trim() = "" Then
Me.CesFieldNameTextBox.Text = "DATA"
End If
RaiseEvent DataChanged()
End Sub


End Class
10 changes: 5 additions & 5 deletions sources/MainForm.vb
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ Public Class MainForm

Me.anOutputDataGBox.DataTypeInput.InitControl(Me.AppConfig)

Me.anOutputDataGBox.FieldNameTextBox.Text = Me.AppConfig.defDataLabel
Me.anOutputDataGBox.DataTypeInput.FieldName = Me.AppConfig.defDataLabel

SetOutputtextSize()

Expand Down Expand Up @@ -243,7 +243,7 @@ Public Class MainForm

Dim comments As New ArrayList

Dim labelName As String = Me.anOutputDataGBox.FieldNameTextBox.Text
Dim labelName As String = Me.anOutputDataGBox.DataTypeInput.FieldName

Dim infoData As String = ""

Expand Down Expand Up @@ -1322,9 +1322,9 @@ Public Class MainForm

attrNode = subNode.SelectSingleNode("@Label")
If attrNode Is Nothing Then
Me.anOutputDataGBox.FieldNameTextBox.Text = "DATA"
Me.anOutputDataGBox.DataTypeInput.FieldName = "DATA"
Else
Me.anOutputDataGBox.FieldNameTextBox.Text = CStr(attrNode.InnerText)
Me.anOutputDataGBox.DataTypeInput.FieldName = CStr(attrNode.InnerText)
End If


Expand Down Expand Up @@ -1499,7 +1499,7 @@ Public Class MainForm
anItemElement.SetAttributeNode(anAttribute)

anAttribute = aXmlDoc.CreateAttribute("Label")
anAttribute.Value = CStr(Me.anOutputDataGBox.FieldNameTextBox.Text)
anAttribute.Value = CStr(Me.anOutputDataGBox.DataTypeInput.FieldName)
anItemElement.SetAttributeNode(anAttribute)
' END Output Data Config ################################################

Expand Down
4 changes: 2 additions & 2 deletions sources/My Project/AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' mediante el asterisco ('*'), como se muestra a continuación:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("0.9.15.0")>
<Assembly: AssemblyFileVersion("0.9.15.0")>
<Assembly: AssemblyVersion("0.9.16.0")>
<Assembly: AssemblyFileVersion("0.9.16.0")>
29 changes: 2 additions & 27 deletions sources/OutputDataGBox.Designer.vb

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

Loading

0 comments on commit 00088b4

Please sign in to comment.