diff --git a/Docs/HOWTO.md b/Docs/HOWTO.md index 70bb9fb..0d0a0d2 100644 --- a/Docs/HOWTO.md +++ b/Docs/HOWTO.md @@ -1,5 +1,5 @@ # ByteniZ3R devtool DOC -#### version 0.9.16b +#### version 0.9.17b --- ## Index @@ -104,7 +104,7 @@ The graphical interface is designed to be used in a top-down flow. You can start by giving the project a name and information about it (version, author and description), although it is optional. -The next step will be to choose the type of data (waveform or noise) that we want to generate and modify its properties. +The next step will be to choose the type of waveform that we want to generate and modify its properties. Now you must configure the output format, indicating the programming language and the numerical system (decimal, hexadecimal or binary). diff --git a/README.md b/README.md index a2b6e4a..d949776 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,8 @@ You should have received a copy of the GNU General Public License along with thi ## History of versions -This application started as a tool that generated tables of random numbers that I used for the development of the visual effects application veejingSX for MSX computers. +This application started in the year 2013 as a tool called BytesGen, to generate tables of random numbers. +I used it for the development of the visual effects application veejingSX for MSX computers. Later I would add the option to load binary files and dump them in tables formatted for different programming languages. @@ -98,7 +99,7 @@ The decision to remove the binary load is due to the fact that I have been devel This functionality is no longer required. -### ByteniZ3R v0.9.n (2022). +### ByteniZ3R v0.9.17 (7 June 2022) - Removed binary file handling function. (Apps for this feature will be available soon.) - Removed compress data (No compression is obtained with this data type) @@ -110,7 +111,7 @@ This functionality is no longer required. - Add binary number system in output data settings. -### ByteniZ3R v0.9.1b (August 2021). +### ByteniZ3R v0.9.1b (August 2021) - Save/Load Project File. - Add Project Info diff --git a/_Release/ByteniZ3R.exe b/_Release/ByteniZ3R.exe index 6671fe9..2ebd936 100644 Binary files a/_Release/ByteniZ3R.exe and b/_Release/ByteniZ3R.exe differ diff --git a/_Release/ByteniZ3R_readme.TXT b/_Release/ByteniZ3R_readme.TXT index 017f2fe..4b06377 100644 --- a/_Release/ByteniZ3R_readme.TXT +++ b/_Release/ByteniZ3R_readme.TXT @@ -3,7 +3,7 @@ ByteniZ3R devtool Short: Waveform data table generator. Author: mvac7 -Version: 0.9.16b +Version: 0.9.17b Architecture: Microsoft .Net Framework 4.0 Programming language: Visual BASIC .net License: GNU General Public License v3 @@ -118,8 +118,8 @@ The graphical interface is designed to be used in a top-down flow. You can start by giving the project a name and information about it (version, author and description), although it is optional. -The next step will be to choose the type of data (waveform or noise) that we -want to generate and modify its properties. +The next step will be to choose the type of waveform that we want to generate +and modify its properties. Now you must configure the output format, indicating the programming language and the numerical system (decimal, hexadecimal or binary). diff --git a/sources/AboutWin.Designer.vb b/sources/AboutWin.Designer.vb index 06cbc24..05af625 100644 --- a/sources/AboutWin.Designer.vb +++ b/sources/AboutWin.Designer.vb @@ -30,7 +30,6 @@ Partial Class AboutWin Me.copyleftLabel = New System.Windows.Forms.Label() Me.versionLabel = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() - Me.Label2 = New System.Windows.Forms.Label() Me.DescriptionLabel = New System.Windows.Forms.Label() Me.OKButton = New System.Windows.Forms.Button() Me.LicenseButton = New System.Windows.Forms.Button() @@ -64,7 +63,7 @@ Partial Class AboutWin ' Me.copyleftLabel.BackColor = System.Drawing.Color.Transparent Me.copyleftLabel.Font = New System.Drawing.Font("Verdana", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.copyleftLabel.Location = New System.Drawing.Point(156, 120) + Me.copyleftLabel.Location = New System.Drawing.Point(156, 122) Me.copyleftLabel.Name = "copyleftLabel" Me.copyleftLabel.Size = New System.Drawing.Size(408, 18) Me.copyleftLabel.TabIndex = 3 @@ -90,23 +89,15 @@ Partial Class AboutWin Me.Label1.TabIndex = 8 Me.Label1.Text = "Version:" ' - 'Label2 - ' - Me.Label2.BackColor = System.Drawing.Color.Transparent - Me.Label2.Font = New System.Drawing.Font("Verdana", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label2.Location = New System.Drawing.Point(156, 147) - Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(87, 18) - Me.Label2.TabIndex = 10 - Me.Label2.Text = "Description:" - ' 'DescriptionLabel ' + Me.DescriptionLabel.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.DescriptionLabel.BackColor = System.Drawing.Color.Transparent Me.DescriptionLabel.Font = New System.Drawing.Font("Verdana", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.DescriptionLabel.Location = New System.Drawing.Point(156, 165) + Me.DescriptionLabel.Location = New System.Drawing.Point(156, 156) Me.DescriptionLabel.Name = "DescriptionLabel" - Me.DescriptionLabel.Size = New System.Drawing.Size(408, 43) + Me.DescriptionLabel.Size = New System.Drawing.Size(436, 50) Me.DescriptionLabel.TabIndex = 11 Me.DescriptionLabel.Text = "description..." ' @@ -163,6 +154,8 @@ Partial Class AboutWin ' 'LogoPanel ' + Me.LogoPanel.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.LogoPanel.BackColor = System.Drawing.Color.Transparent Me.LogoPanel.Controls.Add(Me.LogoPictureBox) Me.LogoPanel.Location = New System.Drawing.Point(158, 12) @@ -185,7 +178,6 @@ Partial Class AboutWin Me.Controls.Add(Me.LicenseButton) Me.Controls.Add(Me.OKButton) Me.Controls.Add(Me.DescriptionLabel) - Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.versionLabel) Me.Controls.Add(Me.copyleftLabel) @@ -210,7 +202,6 @@ Partial Class AboutWin Friend WithEvents versionLabel As System.Windows.Forms.Label Friend WithEvents LicenseButton As System.Windows.Forms.Button Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents Label2 As Label Friend WithEvents DescriptionLabel As Label Friend WithEvents LogoPictureBox As PictureBox Friend WithEvents iconPictureBox As PictureBox diff --git a/sources/ByteniZ3R.vbproj b/sources/ByteniZ3R.vbproj index 9ef84b9..80b61da 100644 --- a/sources/ByteniZ3R.vbproj +++ b/sources/ByteniZ3R.vbproj @@ -210,7 +210,6 @@ - diff --git a/sources/ConfigWin.Designer.vb b/sources/ConfigWin.Designer.vb index 40a22b5..1c8cd16 100644 --- a/sources/ConfigWin.Designer.vb +++ b/sources/ConfigWin.Designer.vb @@ -23,6 +23,7 @@ Partial Class ConfigWin _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(ConfigWin)) Me.NumFormatComboBox = New System.Windows.Forms.ComboBox() Me.CompressTypeComboBox = New System.Windows.Forms.ComboBox() Me.SizeLineComboBox = New System.Windows.Forms.ComboBox() @@ -61,8 +62,6 @@ Partial Class ConfigWin Me.Label3 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() - Me.OK_Button = New System.Windows.Forms.Button() - Me.Cancel_Button = New System.Windows.Forms.Button() Me.PathsPanel = New System.Windows.Forms.Panel() Me.BinaryPathControl = New ByteniZ3R.PathEntryControl() Me.BitmapsPathControl = New ByteniZ3R.PathEntryControl() @@ -83,7 +82,7 @@ Partial Class ConfigWin Me.ColorConfigsLabel = New System.Windows.Forms.Label() Me.ColorConfigsComboBox = New System.Windows.Forms.ComboBox() Me.GridColorButton = New System.Windows.Forms.Button() - Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.InitProjectGroupBox = New System.Windows.Forms.GroupBox() Me.PathLastPRJTextBox = New System.Windows.Forms.TextBox() Me.RadioButton3 = New System.Windows.Forms.RadioButton() Me.RadioButton2 = New System.Windows.Forms.RadioButton() @@ -97,18 +96,22 @@ Partial Class ConfigWin Me.AsmByteValuesComboBox = New System.Windows.Forms.ComboBox() Me.PathsTab = New System.Windows.Forms.TabPage() Me.ColorDialog1 = New System.Windows.Forms.ColorDialog() + Me.BottonsPanel = New System.Windows.Forms.Panel() + Me.OK_Button = New System.Windows.Forms.Button() + Me.Cancel_Button = New System.Windows.Forms.Button() Me.BASICGroupBox.SuspendLayout() Me.PathsPanel.SuspendLayout() Me.TabControl1.SuspendLayout() Me.OthersTab.SuspendLayout() Me.OutputdataGroupBox.SuspendLayout() - Me.GroupBox1.SuspendLayout() + Me.InitProjectGroupBox.SuspendLayout() Me.DataOutputTab.SuspendLayout() Me.GroupBox3.SuspendLayout() Me.GroupBox2.SuspendLayout() CType(Me.arrow2PictureBox, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.arrow1PictureBox, System.ComponentModel.ISupportInitialize).BeginInit() Me.PathsTab.SuspendLayout() + Me.BottonsPanel.SuspendLayout() Me.SuspendLayout() ' 'NumFormatComboBox @@ -515,33 +518,6 @@ Partial Class ConfigWin Me.Label1.Text = "Number system:" Me.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' - 'OK_Button - ' - Me.OK_Button.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.OK_Button.BackColor = System.Drawing.Color.PaleGreen - Me.OK_Button.Font = New System.Drawing.Font("Verdana", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.OK_Button.Location = New System.Drawing.Point(423, 512) - Me.OK_Button.Margin = New System.Windows.Forms.Padding(4) - Me.OK_Button.Name = "OK_Button" - Me.OK_Button.Size = New System.Drawing.Size(110, 36) - Me.OK_Button.TabIndex = 250 - Me.OK_Button.Text = "Ok" - Me.OK_Button.UseVisualStyleBackColor = False - ' - 'Cancel_Button - ' - Me.Cancel_Button.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Cancel_Button.BackColor = System.Drawing.Color.LightSalmon - Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.Cancel_Button.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Cancel_Button.Location = New System.Drawing.Point(541, 518) - Me.Cancel_Button.Margin = New System.Windows.Forms.Padding(4) - Me.Cancel_Button.Name = "Cancel_Button" - Me.Cancel_Button.Size = New System.Drawing.Size(70, 30) - Me.Cancel_Button.TabIndex = 251 - Me.Cancel_Button.Text = "Cancel" - Me.Cancel_Button.UseVisualStyleBackColor = False - ' 'PathsPanel ' Me.PathsPanel.AutoScroll = True @@ -560,7 +536,7 @@ Partial Class ConfigWin Me.PathsPanel.Dock = System.Windows.Forms.DockStyle.Fill Me.PathsPanel.Location = New System.Drawing.Point(3, 3) Me.PathsPanel.Name = "PathsPanel" - Me.PathsPanel.Size = New System.Drawing.Size(586, 461) + Me.PathsPanel.Size = New System.Drawing.Size(586, 484) Me.PathsPanel.TabIndex = 256 ' 'BinaryPathControl @@ -627,7 +603,7 @@ Partial Class ConfigWin ' Me.BytegenPathControl.Dock = System.Windows.Forms.DockStyle.Top Me.BytegenPathControl.Font = New System.Drawing.Font("Verdana", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.BytegenPathControl.Label = "ByteGen Project" + Me.BytegenPathControl.Label = "ByteniZ3R Project" Me.BytegenPathControl.Location = New System.Drawing.Point(0, 192) Me.BytegenPathControl.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.BytegenPathControl.Name = "BytegenPathControl" @@ -717,7 +693,7 @@ Partial Class ConfigWin Me.TabControl1.Location = New System.Drawing.Point(12, 12) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(600, 493) + Me.TabControl1.Size = New System.Drawing.Size(600, 516) Me.TabControl1.TabIndex = 256 ' 'OthersTab @@ -728,13 +704,13 @@ Partial Class ConfigWin Me.OthersTab.Controls.Add(Me.Label12) Me.OthersTab.Controls.Add(Me.Color0Button) Me.OthersTab.Controls.Add(Me.Label11) - Me.OthersTab.Controls.Add(Me.GroupBox1) + Me.OthersTab.Controls.Add(Me.InitProjectGroupBox) Me.OthersTab.Controls.Add(Me.Label10) Me.OthersTab.Controls.Add(Me.InfoNameTextBox) Me.OthersTab.Location = New System.Drawing.Point(4, 23) Me.OthersTab.Name = "OthersTab" Me.OthersTab.Padding = New System.Windows.Forms.Padding(3) - Me.OthersTab.Size = New System.Drawing.Size(592, 466) + Me.OthersTab.Size = New System.Drawing.Size(592, 489) Me.OthersTab.TabIndex = 2 Me.OthersTab.Text = "Miscellany" ' @@ -784,18 +760,19 @@ Partial Class ConfigWin Me.GridColorButton.TabIndex = 260 Me.GridColorButton.UseVisualStyleBackColor = True ' - 'GroupBox1 + 'InitProjectGroupBox ' - Me.GroupBox1.Controls.Add(Me.PathLastPRJTextBox) - Me.GroupBox1.Controls.Add(Me.RadioButton3) - Me.GroupBox1.Controls.Add(Me.RadioButton2) - Me.GroupBox1.Controls.Add(Me.RadioButton1) - Me.GroupBox1.Location = New System.Drawing.Point(38, 70) - Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(535, 173) - Me.GroupBox1.TabIndex = 256 - Me.GroupBox1.TabStop = False - Me.GroupBox1.Text = "tMSgfX Init Project" + Me.InitProjectGroupBox.Controls.Add(Me.PathLastPRJTextBox) + Me.InitProjectGroupBox.Controls.Add(Me.RadioButton3) + Me.InitProjectGroupBox.Controls.Add(Me.RadioButton2) + Me.InitProjectGroupBox.Controls.Add(Me.RadioButton1) + Me.InitProjectGroupBox.Enabled = False + Me.InitProjectGroupBox.Location = New System.Drawing.Point(38, 70) + Me.InitProjectGroupBox.Name = "InitProjectGroupBox" + Me.InitProjectGroupBox.Size = New System.Drawing.Size(535, 173) + Me.InitProjectGroupBox.TabIndex = 256 + Me.InitProjectGroupBox.TabStop = False + Me.InitProjectGroupBox.Text = "tMSgfX Init Project" ' 'PathLastPRJTextBox ' @@ -859,7 +836,7 @@ Partial Class ConfigWin Me.DataOutputTab.Location = New System.Drawing.Point(4, 22) Me.DataOutputTab.Name = "DataOutputTab" Me.DataOutputTab.Padding = New System.Windows.Forms.Padding(3) - Me.DataOutputTab.Size = New System.Drawing.Size(592, 467) + Me.DataOutputTab.Size = New System.Drawing.Size(592, 490) Me.DataOutputTab.TabIndex = 1 Me.DataOutputTab.Text = "Default Data Output" ' @@ -893,7 +870,7 @@ Partial Class ConfigWin ' 'arrow2PictureBox ' - Me.arrow2PictureBox.Image = Global.ByteniZ3R.My.Resources.Resources.arrow_left_24blue + Me.arrow2PictureBox.Image = CType(resources.GetObject("arrow2PictureBox.Image"), System.Drawing.Image) Me.arrow2PictureBox.Location = New System.Drawing.Point(343, 49) Me.arrow2PictureBox.Name = "arrow2PictureBox" Me.arrow2PictureBox.Size = New System.Drawing.Size(24, 24) @@ -902,7 +879,7 @@ Partial Class ConfigWin ' 'arrow1PictureBox ' - Me.arrow1PictureBox.Image = Global.ByteniZ3R.My.Resources.Resources.arrow_left_24blue + Me.arrow1PictureBox.Image = CType(resources.GetObject("arrow1PictureBox.Image"), System.Drawing.Image) Me.arrow1PictureBox.Location = New System.Drawing.Point(343, 20) Me.arrow1PictureBox.Name = "arrow1PictureBox" Me.arrow1PictureBox.Size = New System.Drawing.Size(24, 24) @@ -940,20 +917,65 @@ Partial Class ConfigWin Me.PathsTab.Location = New System.Drawing.Point(4, 22) Me.PathsTab.Name = "PathsTab" Me.PathsTab.Padding = New System.Windows.Forms.Padding(3) - Me.PathsTab.Size = New System.Drawing.Size(592, 467) + Me.PathsTab.Size = New System.Drawing.Size(592, 490) Me.PathsTab.TabIndex = 0 Me.PathsTab.Text = "Default paths" ' + 'BottonsPanel + ' + Me.BottonsPanel.Controls.Add(Me.OK_Button) + Me.BottonsPanel.Controls.Add(Me.Cancel_Button) + Me.BottonsPanel.Dock = System.Windows.Forms.DockStyle.Bottom + Me.BottonsPanel.Location = New System.Drawing.Point(0, 533) + Me.BottonsPanel.Name = "BottonsPanel" + Me.BottonsPanel.Padding = New System.Windows.Forms.Padding(4) + Me.BottonsPanel.Size = New System.Drawing.Size(624, 51) + Me.BottonsPanel.TabIndex = 257 + ' + 'OK_Button + ' + Me.OK_Button.BackColor = System.Drawing.Color.Transparent + Me.OK_Button.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.OK_Button.Dock = System.Windows.Forms.DockStyle.Right + Me.OK_Button.FlatAppearance.BorderSize = 0 + Me.OK_Button.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.OK_Button.Font = New System.Drawing.Font("Verdana", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.OK_Button.ForeColor = System.Drawing.SystemColors.ControlText + Me.OK_Button.Image = CType(resources.GetObject("OK_Button.Image"), System.Drawing.Image) + Me.OK_Button.Location = New System.Drawing.Point(378, 4) + Me.OK_Button.Margin = New System.Windows.Forms.Padding(4) + Me.OK_Button.Name = "OK_Button" + Me.OK_Button.Size = New System.Drawing.Size(132, 43) + Me.OK_Button.TabIndex = 3 + Me.OK_Button.UseVisualStyleBackColor = False + ' + 'Cancel_Button + ' + Me.Cancel_Button.BackColor = System.Drawing.Color.Transparent + Me.Cancel_Button.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel + Me.Cancel_Button.Dock = System.Windows.Forms.DockStyle.Right + Me.Cancel_Button.FlatAppearance.BorderSize = 0 + Me.Cancel_Button.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Cancel_Button.Font = New System.Drawing.Font("Verdana", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Cancel_Button.ForeColor = System.Drawing.Color.Black + Me.Cancel_Button.Image = CType(resources.GetObject("Cancel_Button.Image"), System.Drawing.Image) + Me.Cancel_Button.ImageAlign = System.Drawing.ContentAlignment.BottomCenter + Me.Cancel_Button.Location = New System.Drawing.Point(510, 4) + Me.Cancel_Button.Margin = New System.Windows.Forms.Padding(4) + Me.Cancel_Button.Name = "Cancel_Button" + Me.Cancel_Button.Size = New System.Drawing.Size(110, 43) + Me.Cancel_Button.TabIndex = 4 + Me.Cancel_Button.UseVisualStyleBackColor = False + ' 'ConfigWin ' - Me.AcceptButton = Me.OK_Button Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None - Me.BackColor = System.Drawing.Color.Gainsboro + Me.BackColor = System.Drawing.Color.LightGray Me.CancelButton = Me.Cancel_Button Me.ClientSize = New System.Drawing.Size(624, 584) Me.ControlBox = False - Me.Controls.Add(Me.Cancel_Button) - Me.Controls.Add(Me.OK_Button) + Me.Controls.Add(Me.BottonsPanel) Me.Controls.Add(Me.TabControl1) Me.Font = New System.Drawing.Font("Verdana", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow @@ -970,8 +992,8 @@ Partial Class ConfigWin Me.OthersTab.ResumeLayout(False) Me.OthersTab.PerformLayout() Me.OutputdataGroupBox.ResumeLayout(False) - Me.GroupBox1.ResumeLayout(False) - Me.GroupBox1.PerformLayout() + Me.InitProjectGroupBox.ResumeLayout(False) + Me.InitProjectGroupBox.PerformLayout() Me.DataOutputTab.ResumeLayout(False) Me.DataOutputTab.PerformLayout() Me.GroupBox3.ResumeLayout(False) @@ -981,6 +1003,7 @@ Partial Class ConfigWin CType(Me.arrow2PictureBox, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.arrow1PictureBox, System.ComponentModel.ISupportInitialize).EndInit() Me.PathsTab.ResumeLayout(False) + Me.BottonsPanel.ResumeLayout(False) Me.ResumeLayout(False) End Sub @@ -990,8 +1013,6 @@ Partial Class ConfigWin Friend WithEvents Label21 As System.Windows.Forms.Label Friend WithEvents CodeOutputComboBox As System.Windows.Forms.ComboBox Friend WithEvents BASICGroupBox As System.Windows.Forms.GroupBox - Friend WithEvents OK_Button As System.Windows.Forms.Button - Friend WithEvents Cancel_Button As System.Windows.Forms.Button Private WithEvents ToolTip1 As System.Windows.Forms.ToolTip Friend WithEvents FolderBrowserDialog1 As System.Windows.Forms.FolderBrowserDialog Friend WithEvents AsmByteDataTextBox As System.Windows.Forms.TextBox @@ -1001,19 +1022,19 @@ Partial Class ConfigWin Friend WithEvents Label1 As System.Windows.Forms.Label Friend WithEvents Label5 As System.Windows.Forms.Label Friend WithEvents DataLabelTextBox As System.Windows.Forms.TextBox - Friend WithEvents SpritesPathControl As ByteniZ3R.PathEntryControl - Friend WithEvents tMSgfXProjectPathControl As ByteniZ3R.PathEntryControl - Friend WithEvents nMSXtilesPathControl As ByteniZ3R.PathEntryControl - Friend WithEvents MSXBASICPathControl As ByteniZ3R.PathEntryControl - Friend WithEvents BitmapsPathControl As ByteniZ3R.PathEntryControl - Friend WithEvents PalettesPathControl As ByteniZ3R.PathEntryControl - Friend WithEvents OAMPathControl As ByteniZ3R.PathEntryControl + Friend WithEvents SpritesPathControl As PathEntryControl + Friend WithEvents tMSgfXProjectPathControl As PathEntryControl + Friend WithEvents nMSXtilesPathControl As PathEntryControl + Friend WithEvents MSXBASICPathControl As PathEntryControl + Friend WithEvents BitmapsPathControl As PathEntryControl + Friend WithEvents PalettesPathControl As PathEntryControl + Friend WithEvents OAMPathControl As PathEntryControl Friend WithEvents PathsPanel As System.Windows.Forms.Panel - Friend WithEvents BinaryPathControl As ByteniZ3R.PathEntryControl - Friend WithEvents SquaredsetsPathControl As ByteniZ3R.PathEntryControl - Friend WithEvents TilesetsPathControl As ByteniZ3R.PathEntryControl - Friend WithEvents MapsPathControl As ByteniZ3R.PathEntryControl - Friend WithEvents BytegenPathControl As ByteniZ3R.PathEntryControl + Friend WithEvents BinaryPathControl As PathEntryControl + Friend WithEvents SquaredsetsPathControl As PathEntryControl + Friend WithEvents TilesetsPathControl As PathEntryControl + Friend WithEvents MapsPathControl As PathEntryControl + Friend WithEvents BytegenPathControl As PathEntryControl Friend WithEvents LineNumberLabel As System.Windows.Forms.Label Friend WithEvents BASICincLineslTextBox As System.Windows.Forms.TextBox Friend WithEvents BASICinitLineTextBox As System.Windows.Forms.TextBox @@ -1033,7 +1054,7 @@ Partial Class ConfigWin Friend WithEvents OthersTab As TabPage Friend WithEvents Label10 As Label Friend WithEvents InfoNameTextBox As TextBox - Friend WithEvents GroupBox1 As GroupBox + Friend WithEvents InitProjectGroupBox As GroupBox Friend WithEvents PathLastPRJTextBox As TextBox Friend WithEvents RadioButton3 As RadioButton Friend WithEvents RadioButton2 As RadioButton @@ -1058,4 +1079,7 @@ Partial Class ConfigWin Friend WithEvents Label14 As Label Friend WithEvents ColorConfigsLabel As Label Friend WithEvents ColorConfigsComboBox As ComboBox + Friend WithEvents BottonsPanel As Panel + Friend WithEvents OK_Button As Button + Friend WithEvents Cancel_Button As Button End Class diff --git a/sources/ConfigWin.resx b/sources/ConfigWin.resx index beaad89..bc39ffa 100644 --- a/sources/ConfigWin.resx +++ b/sources/ConfigWin.resx @@ -120,13 +120,56 @@ 17, 17 - - 17, 17 - 116, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 + JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAkUlE + QVRIS7WNQQ6EMAwD+1peu38qFAlkV7PQoOQwQnbJuPXeS8EyEyyfaNvv+PAbgeU/hrxs4JKXDKg8fWCW + pw6QfAVzaFDocBXzaLhLOIpgLg1nAQdRzGcBfv6COTWcBRxEMZ+Gu4SjCObSoNDhKubRMEPHK5hDA/Em + eAPLmfKBQfnAoHxgUD4QBctMsMyjtx2XYzCL0lotvAAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 + JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAkUlE + QVRIS7WNQQ6EMAwD+1peu38qFAlkV7PQoOQwQnbJuPXeS8EyEyyfaNvv+PAbgeU/hrxs4JKXDKg8fWCW + pw6QfAVzaFDocBXzaLhLOIpgLg1nAQdRzGcBfv6COTWcBRxEMZ+Gu4SjCObSoNDhKubRMEPHK5hDA/Em + eAPLmfKBQfnAoHxgUD4QBctMsMyjtx2XYzCL0lotvAAAAABJRU5ErkJggg== + + 287, 17 + + + iVBORw0KGgoAAAANSUhEUgAAAH4AAAAkCAYAAABPNo4ZAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGISURBVHhe7dtRasRADAPQPWnP0cP2Lql3CSHSyHj2 + bzRx4ZUiRyHG330dxwHi5/2rbWa48xBQoe1huPP1Bz3Y9tSHf6jbvfUDP3+/bQPqticZypc0P+q2JwxU + ufnjOwcMVKn54zsHDFSp+eM7BwxUqfnjOwcMVKn54zsHDFSp+eM7BwxUyQHvwarneb4b3jdgoEoOeA9W + Pc/z3fC+AQNVWln1/dk8y2fnbnifgIEqraz6/mye5bNzN7xPwECVVlZ9fzbP8tm5G94nYKBKK6u+P5tn + +ezcDe8TMFCllVXfn805z9zf5UzshoEqraz6/mzOeeb+LmdiNwxUaWXV92fzLJ+du+F9AgaqtLLq+7N5 + ls/O3fA+AQNVcsB7sOr5b+dueJ+AgSo54D1Y9fy3cze8T8BAlZo/vnPAQJWaP75zwECVmj++c8BAlZo/ + vnPAQJWaP75zwECVmj++cxiCD1VuftRtTzKUL2l+1G0/+p8mn+W6dx/+WYbDXwE92PYw3HkIqND2gHc+ + Xv+jdo+bB0a3tgAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAAGYAAAAgCAYAAADg3g0TAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAG6SURBVGhD7drhagMxDAPgPfb29DevNCXWSXGSS26l + ePCNIVuB1n/3dRyHYz9/v9LNTnc4BVBI9zjd4fUHLKb/kYd5U9U9xMLPd7oB++6faEgfSeux7/7JB6yc + 9sM7GB+wUtoP72B8wEppP7yD8QErpf3wDsYHrNQD30Gs80mufl7sGx+wUg98B7HOJ7n6ebFvfMBKLbN9 + 7KHR/QJ7Bdutrd7HeQT7xges1DLbxx4a3S+wV7Dd2up9nEewb3zASi1X+0i9p/JornIl2ldzlffCvvEB + K7Vc7SP1nsqjucqVaF/NVd4L+8YHrNQy28eeovbrt1pzlSu4H1G9+s0e2Dc+YKWW2T72FLVfv9Waq1zB + /Yjq1W/2wL7xASu1jPajfTVXeTRXuTK6X8z2CuwbH7BSy2g/2ldzlUdzlSuj+8Vsr8C+8QEr9cB30Oh+ + ofbrt2bmaPU+ziPYNz5gpR74DhrdL9R+/dbMHK3ex3kE+8YHrJT2wzsYH7BS2g/vYHzASmk/vIPxASul + /fAO5hQ8sHJaj333TzSkj6T12Hf/kP/w915e98jDvJfTYV4BLKZ7nO5wCqCQ7uHvcHz9AiyV6icns2GL + AAAAAElFTkSuQmCC + + \ No newline at end of file diff --git a/sources/ConfigWin.vb b/sources/ConfigWin.vb index 4a1b8b3..abf969d 100644 --- a/sources/ConfigWin.vb +++ b/sources/ConfigWin.vb @@ -1,8 +1,9 @@ Imports System.IO - - +''' +''' +''' Public Class ConfigWin Private AppConfig As Config @@ -18,7 +19,7 @@ Public Class ConfigWin TILESETSX PALETTESX SQUAREDSX - BYTEGEN + BYTENIZ3R OAMSX PAINTSX End Enum @@ -34,14 +35,19 @@ Public Class ConfigWin Me.AppConfig = _config Me._type = aType + End Sub + + + + Private Sub ConfigWin_Load(sender As Object, e As EventArgs) Handles Me.Load + Select Case Me._type - Case CONFIG_TYPE.BYTEGEN + Case CONFIG_TYPE.BYTENIZ3R Me.BytegenPathControl.Visible = True Me.MSXBASICPathControl.Visible = True Me.BinaryPathControl.Visible = True Case CONFIG_TYPE.PAINTSX - ' Me.MSXBASICPathControl.Visible = True Me.BitmapsPathControl.Visible = True Me.PalettesPathControl.Visible = True @@ -95,6 +101,8 @@ Public Class ConfigWin Me.BitmapsPathControl.Visible = True Me.BinaryPathControl.Visible = True + Me.InitProjectGroupBox.Enabled = True + End Select @@ -157,71 +165,6 @@ Public Class ConfigWin - Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click - - ' ###################################################################### - ' update config data - Me.AppConfig.PathItemProject = tMSgfXProjectPathControl.GetItem() - Me.AppConfig.PathItemSprite = SpritesPathControl.GetItem() - Me.AppConfig.PathItemMap = MapsPathControl.GetItem() - Me.AppConfig.PathItemTileset = TilesetsPathControl.GetItem() - Me.AppConfig.PathItemPalette = PalettesPathControl.GetItem() - Me.AppConfig.PathItemOAM = OAMPathControl.GetItem() - Me.AppConfig.PathItemSupertile = SquaredsetsPathControl.GetItem() - Me.AppConfig.PathByteGen = BytegenPathControl.GetItem() - - - Me.AppConfig.PathItemNMSXtiles = nMSXtilesPathControl.GetItem() - Me.AppConfig.PathItemMSXBASIC = MSXBASICPathControl.GetItem() - Me.AppConfig.PathItemBitmap = BitmapsPathControl.GetItem() - Me.AppConfig.PathItemBinary = BinaryPathControl.GetItem() - - Me.AppConfig.defCodeOutput = Me.CodeOutputComboBox.SelectedIndex - Me.AppConfig.defCodeNumberSystem = Me.NumFormatComboBox.SelectedIndex - Me.AppConfig.defCodeLineSize = Me.SizeLineComboBox.SelectedIndex - Me.AppConfig.defCodeCompressType = Me.CompressTypeComboBox.SelectedIndex - Me.AppConfig.defAsmByteCommand = Me.AsmByteDataTextBox.Text - Me.AppConfig.defAsmWordDataCommand = Me.AsmWordDataTextBox.Text - Me.AppConfig.defCByteCommand = Me.CByteDataTextBox.Text - Me.AppConfig.defBASIC_initLine = CInt(Me.BASICinitLineTextBox.Text) - Me.AppConfig.defBASIC_incLines = CInt(Me.BASICincLineslTextBox.Text) - Me.AppConfig.defBASIC_remove0 = Me.RemoveZerosCheck.Checked - Me.AppConfig.defBASIC_DataInstruction = Me.BASICdataTextBox.Text - - If Me.BASICcommentComboBox.SelectedIndex = 1 Then - Me.AppConfig.defBASIC_CommentInstruction = "'" - Else - Me.AppConfig.defBASIC_CommentInstruction = "REM" - End If - - Me.AppConfig.defDataLabel = Me.DataLabelTextBox.Text - - Me.AppConfig.defAuthor = Me.InfoNameTextBox.Text - - If Me.RadioButton2.Checked = True Then - Me.AppConfig.firstProjectType = Config.FIRST_PROJECT.NEWPROJECT - ElseIf Me.RadioButton3.Checked = True Then - Me.AppConfig.firstProjectType = Config.FIRST_PROJECT.LASTPROJECT - Else - Me.AppConfig.firstProjectType = Config.FIRST_PROJECT.PRESENTATION - End If - - - Me.AppConfig.Color_Zero = Me.Color0Button.BackColor - Me.AppConfig.Color_Grid = Me.GridColorButton.BackColor - Me.AppConfig.Color_OUTPUT_INK = Me.OutputINKcolorButton.BackColor - Me.AppConfig.Color_OUTPUT_BG = Me.OutputBGcolorButton.BackColor - - - Me.AppConfig.InitOutputInfo() - ' ###################################################################### - - Me.DialogResult = System.Windows.Forms.DialogResult.OK - Me.Close() - End Sub - - - Public Function GetBASIC_CommentInstruction_Index(value As String) As Integer If value.ToUpper = "REM" Then Return 0 @@ -281,23 +224,6 @@ Public Class ConfigWin - 'Private Sub GridColorButton_Click(sender As Object, e As EventArgs) Handles GridColorButton.Click - ' Me.ColorDialog1.Color = Me.GridColorButton.BackColor - ' Me.ColorDialog1.ShowDialog() - ' SetColor(Me.GridColorButton, Me.ColorDialog1.Color) - 'End Sub - - - 'Private Sub OutputINKcolorButton_Click(sender As Object, e As EventArgs) Handles OutputINKcolorButton.Click - - 'End Sub - - 'Private Sub OutputBGcolorButton_Click(sender As Object, e As EventArgs) Handles OutputBGcolorButton.Click - - 'End Sub - - - Private Sub SetColor(ByRef aButton As Button, ByVal newColor As Color) aButton.BackColor = newColor aButton.Text = newColor.Name @@ -310,30 +236,6 @@ Public Class ConfigWin - 'Private Sub SetZeroColor(ByVal newColor As Color) - ' Me.Color0Button.BackColor = newColor - ' Me.Color0Button.Text = newColor.Name - ' If newColor.GetBrightness > 0.7 Then - ' Me.Color0Button.ForeColor = Color.Black - ' Else - ' Me.Color0Button.ForeColor = Color.White - ' End If - 'End Sub - - - - 'Private Sub SetGridColor(ByVal newColor As Color) - ' Me.GridColorButton.BackColor = newColor - ' Me.GridColorButton.Text = newColor.Name - ' If newColor.GetBrightness > 0.7 Then - ' Me.GridColorButton.ForeColor = Color.Black - ' Else - ' Me.GridColorButton.ForeColor = Color.White - ' End If - 'End Sub - - - Private Sub AsmByteValuesComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles AsmByteValuesComboBox.SelectedIndexChanged AsmByteDataTextBox.Text = AsmByteValuesComboBox.SelectedItem End Sub @@ -370,4 +272,68 @@ Public Class ConfigWin + Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click + + ' ###################################################################### + ' update config data + Me.AppConfig.PathItemProject = tMSgfXProjectPathControl.GetItem() + Me.AppConfig.PathItemSprite = SpritesPathControl.GetItem() + Me.AppConfig.PathItemMap = MapsPathControl.GetItem() + Me.AppConfig.PathItemTileset = TilesetsPathControl.GetItem() + Me.AppConfig.PathItemPalette = PalettesPathControl.GetItem() + Me.AppConfig.PathItemOAM = OAMPathControl.GetItem() + Me.AppConfig.PathItemSupertile = SquaredsetsPathControl.GetItem() + Me.AppConfig.PathByteGen = BytegenPathControl.GetItem() + + + Me.AppConfig.PathItemNMSXtiles = nMSXtilesPathControl.GetItem() + Me.AppConfig.PathItemMSXBASIC = MSXBASICPathControl.GetItem() + Me.AppConfig.PathItemBitmap = BitmapsPathControl.GetItem() + Me.AppConfig.PathItemBinary = BinaryPathControl.GetItem() + + Me.AppConfig.defCodeOutput = Me.CodeOutputComboBox.SelectedIndex + Me.AppConfig.defCodeNumberSystem = Me.NumFormatComboBox.SelectedIndex + Me.AppConfig.defCodeLineSize = Me.SizeLineComboBox.SelectedIndex + Me.AppConfig.defCodeCompressType = Me.CompressTypeComboBox.SelectedIndex + Me.AppConfig.defAsmByteCommand = Me.AsmByteDataTextBox.Text + Me.AppConfig.defAsmWordDataCommand = Me.AsmWordDataTextBox.Text + Me.AppConfig.defCByteCommand = Me.CByteDataTextBox.Text + Me.AppConfig.defBASIC_initLine = CInt(Me.BASICinitLineTextBox.Text) + Me.AppConfig.defBASIC_incLines = CInt(Me.BASICincLineslTextBox.Text) + Me.AppConfig.defBASIC_remove0 = Me.RemoveZerosCheck.Checked + Me.AppConfig.defBASIC_DataInstruction = Me.BASICdataTextBox.Text + + If Me.BASICcommentComboBox.SelectedIndex = 1 Then + Me.AppConfig.defBASIC_CommentInstruction = "'" + Else + Me.AppConfig.defBASIC_CommentInstruction = "REM" + End If + + Me.AppConfig.defDataLabel = Me.DataLabelTextBox.Text + + Me.AppConfig.defAuthor = Me.InfoNameTextBox.Text + + If Me.RadioButton2.Checked = True Then + Me.AppConfig.firstProjectType = Config.FIRST_PROJECT.NEWPROJECT + ElseIf Me.RadioButton3.Checked = True Then + Me.AppConfig.firstProjectType = Config.FIRST_PROJECT.LASTPROJECT + Else + Me.AppConfig.firstProjectType = Config.FIRST_PROJECT.PRESENTATION + End If + + + Me.AppConfig.Color_Zero = Me.Color0Button.BackColor + Me.AppConfig.Color_Grid = Me.GridColorButton.BackColor + Me.AppConfig.Color_OUTPUT_INK = Me.OutputINKcolorButton.BackColor + Me.AppConfig.Color_OUTPUT_BG = Me.OutputBGcolorButton.BackColor + + + Me.AppConfig.InitOutputInfo() + ' ###################################################################### + + Me.DialogResult = System.Windows.Forms.DialogResult.OK + Me.Close() + End Sub + + End Class \ No newline at end of file diff --git a/sources/MainForm.Designer.vb b/sources/MainForm.Designer.vb index 16bda77..a9f3997 100644 --- a/sources/MainForm.Designer.vb +++ b/sources/MainForm.Designer.vb @@ -106,7 +106,12 @@ Partial Class MainForm ' 'ToolTip1 ' + Me.ToolTip1.AutoPopDelay = 7000 + Me.ToolTip1.BackColor = System.Drawing.Color.WhiteSmoke + Me.ToolTip1.ForeColor = System.Drawing.Color.Black + Me.ToolTip1.InitialDelay = 500 Me.ToolTip1.IsBalloon = True + Me.ToolTip1.ReshowDelay = 100 ' 'WaveLengthTextBox ' @@ -230,8 +235,7 @@ Partial Class MainForm Me.LogoPictureBox.Size = New System.Drawing.Size(311, 70) Me.LogoPictureBox.TabIndex = 115 Me.LogoPictureBox.TabStop = False - Me.ToolTip1.SetToolTip(Me.LogoPictureBox, "Formerly known as BytesGen." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "The new name is due to a brain process of @Fubukimar" & - "u") + Me.ToolTip1.SetToolTip(Me.LogoPictureBox, resources.GetString("LogoPictureBox.ToolTip")) ' 'WaveFreqTrackBar ' @@ -508,7 +512,7 @@ Partial Class MainForm ' Me.GFXoutputPictureBox.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.GFXoutputPictureBox.BackColor = System.Drawing.Color.FromArgb(CType(CType(155, Byte), Integer), CType(CType(188, Byte), Integer), CType(CType(15, Byte), Integer)) + Me.GFXoutputPictureBox.BackColor = System.Drawing.Color.WhiteSmoke Me.GFXoutputPictureBox.Location = New System.Drawing.Point(370, 23) Me.GFXoutputPictureBox.Name = "GFXoutputPictureBox" Me.GFXoutputPictureBox.Size = New System.Drawing.Size(380, 160) @@ -604,7 +608,7 @@ Partial Class MainForm Me.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.MaximumSize = New System.Drawing.Size(800, 1200) - Me.MinimumSize = New System.Drawing.Size(800, 622) + Me.MinimumSize = New System.Drawing.Size(800, 620) Me.Name = "MainForm" Me.Text = "ByteniZ3R" CType(Me.LogoPictureBox, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/sources/MainForm.resx b/sources/MainForm.resx index 4474b79..b812bc4 100644 --- a/sources/MainForm.resx +++ b/sources/MainForm.resx @@ -120,6 +120,12 @@ 17, 17 + + This application started in the year 2013 as a tool called +BytesGen, to generate tables of random numbers. +I used it for the development of the visual effects +application veejingSX for MSX computers. + 116, 17 diff --git a/sources/MainForm.vb b/sources/MainForm.vb index 4a45730..4fbd831 100644 --- a/sources/MainForm.vb +++ b/sources/MainForm.vb @@ -3,19 +3,20 @@ Imports System.Xml Imports System.Windows.Forms -'v0.7.1.0 -'* basic line changes do increase to 10 (before = 15). -'* drag & drop a file from the system to the input file (binary file). -'* Added new output formats data (hex). -'* Output is cleared when switching tabs. - -'v0.7.2.0 -'* Output Textbox and buttons, added to the Output GroupBox. -'* clear button - ''' +''' ByteniZ3R devtool +''' Waveform data table generator +''' +''' Copyright (C) 2022 mvac7 +''' This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by +''' the Free Software Foundation, either version 3 of the License, or (at your option) any later version. ''' +''' This program is distributed in the hope that it will be useful, +''' but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +''' See the GNU General Public License for more details. +''' +''' You should have received a copy of the GNU General Public License along with this program. If not, see . ''' ''' Public Class MainForm @@ -90,7 +91,6 @@ Public Class MainForm Me.Progress = New ProgressController(Me) - If Not Me.AppConfig.Load() Then ' if not exist config file ShowAbout(True) @@ -132,7 +132,7 @@ Public Class MainForm filename = " · [" + filename + "]" End If - Me.Text = My.Application.Info.Title + " " + filename '" v" + My.Application.Info.Version.ToString + "b " + Me.Text = My.Application.Info.Title + " " + filename End Sub @@ -379,7 +379,6 @@ Public Class MainForm - 'GetCosineTable Private Function GetCosineTable(ByVal length As Short, ByVal minValueRange As Short, ByVal maxValueRange As Short, ByVal phase As Integer, ByVal freq As Integer) As Byte() Dim tmpData(length) As Byte @@ -969,34 +968,12 @@ Public Class MainForm End Sub + Private Sub WaveLengthTrackBar_KeyUp(sender As Object, e As KeyEventArgs) Handles WaveLengthTrackBar.KeyUp, WaveMinTrackBar.KeyUp, WaveMaxTrackBar.KeyUp, WavePhaseTrackBar.KeyUp, WaveFreqTrackBar.KeyUp GenerateData() End Sub - 'Private Sub WaveMinTrackBar_MouseUp(sender As System.Object, e As System.Windows.Forms.MouseEventArgs) Handles WaveMinTrackBar.MouseUp - ' GenerateData() - 'End Sub - - - - 'Private Sub WaveMaxTrackBar_MouseUp(sender As System.Object, e As System.Windows.Forms.MouseEventArgs) Handles WaveMaxTrackBar.MouseUp - ' GenerateData() - 'End Sub - - - - 'Private Sub WavePhaseTrackBar_MouseUp(sender As System.Object, e As System.Windows.Forms.MouseEventArgs) Handles WavePhaseTrackBar.MouseUp - ' GenerateData() - 'End Sub - - - - 'Private Sub WaveFreqTrackBar_MouseUp(sender As System.Object, e As System.Windows.Forms.MouseEventArgs) Handles WaveFreqTrackBar.MouseUp - ' GenerateData() - 'End Sub - - Private Sub WaveTypeComboBox_SelectedIndexChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) SetWaveState(WaveTypeComboBox.SelectedIndex) @@ -1087,6 +1064,7 @@ Public Class MainForm End Sub + Private Sub WaveMinTextBox_Validating(ByVal sender As System.Object, ByVal e As System.ComponentModel.CancelEventArgs) Handles WaveMinTextBox.Validating If Not IsNumeric(Me.WaveMinTextBox.Text) Then Me.WaveMinTextBox.Text = "0" @@ -1096,6 +1074,7 @@ Public Class MainForm End Sub + Private Sub WaveMaxTextBox_Validating(ByVal sender As System.Object, ByVal e As System.ComponentModel.CancelEventArgs) Handles WaveMaxTextBox.Validating If Not IsNumeric(Me.WaveMaxTextBox.Text) Then Me.WaveMaxTextBox.Text = "255" @@ -1105,6 +1084,7 @@ Public Class MainForm End Sub + Private Sub PhaseTextBox_Validating(ByVal sender As System.Object, ByVal e As System.ComponentModel.CancelEventArgs) Handles PhaseTextBox.Validating If Not IsNumeric(Me.PhaseTextBox.Text) Then Me.PhaseTextBox.Text = "0" @@ -1114,6 +1094,7 @@ Public Class MainForm End Sub + Private Sub FreqTextBox_Validating(sender As System.Object, e As System.ComponentModel.CancelEventArgs) Handles FreqTextBox.Validating If Not IsNumeric(Me.FreqTextBox.Text) Then Me.FreqTextBox.Text = "1" @@ -1396,7 +1377,6 @@ Public Class MainForm - ''' ''' Save a project, from an absolute path. ''' @@ -1669,7 +1649,7 @@ Public Class MainForm Private Sub SetConfig() - Dim aConfig As New ConfigWin(Me.AppConfig, ConfigWin.CONFIG_TYPE.BYTEGEN) + Dim aConfig As New ConfigWin(Me.AppConfig, ConfigWin.CONFIG_TYPE.BYTENIZ3R) If aConfig.ShowDialog() = DialogResult.OK Then Me.AppConfig.Save() @@ -1690,16 +1670,19 @@ Public Class MainForm End Sub + Private Sub NewButton_Click(sender As System.Object, e As System.EventArgs) Handles NewButton.Click NewProjectDialog() End Sub + Private Sub LoadButton_Click(sender As System.Object, e As System.EventArgs) Handles LoadButton.Click LoadProjectDialog() End Sub + Private Sub SaveButton_Click(sender As System.Object, e As System.EventArgs) Handles SaveButton.Click If Me.Path_Project = "" Then SaveProjectDialog() @@ -1709,51 +1692,66 @@ Public Class MainForm End Sub + Private Sub SaveAsButton_Click(sender As Object, e As EventArgs) Handles SaveAsButton.Click SaveProjectDialog() End Sub + Private Sub ProjectInfoButton_Click(sender As System.Object, e As System.EventArgs) Handles ProjectInfoButton.Click SetProjectInfo() End Sub + + Private Sub ConfigButton1_Click(sender As System.Object, e As System.EventArgs) Handles ConfigButton.Click SetConfig() End Sub + + Private Sub HelpButton_Click(sender As System.Object, e As System.EventArgs) Handles Help_Button.Click 'Dim helper As New HelpWin(Me.Name, helpURL) 'helper.ShowDialog() End Sub + + Private Sub AboutButton1_Click(sender As System.Object, e As System.EventArgs) Handles AboutButton.Click ShowAbout(False) End Sub - 'Private Sub GFXoutputPictureBox_SizeChanged(sender As Object, e As EventArgs) Handles Me.SizeChanged - ' ShowWave() - 'End Sub + Private Sub CopyAllButton_Click(sender As Object, e As EventArgs) Handles CopyAllButton.Click CopyAll() End Sub + + Private Sub SaveSourceButton_Click(sender As Object, e As EventArgs) Handles SaveSourceButton.Click SaveSourceDialog() End Sub + + Private Sub SaveBinaryFileButton_Click(sender As Object, e As EventArgs) Handles SaveBinaryFileButton.Click SaveBinaryDialog() End Sub + + Private Sub anOutputDataGBox_AccordionChanged(state As Boolean) Handles anOutputDataGBox.AccordionChanged SetOutputtextSize() End Sub + + Private Sub anOutputDataGBox_DataChanged() GenerateData() End Sub + End Class diff --git a/sources/My Project/AssemblyInfo.vb b/sources/My Project/AssemblyInfo.vb index 30c2289..6ad3602 100644 --- a/sources/My Project/AssemblyInfo.vb +++ b/sources/My Project/AssemblyInfo.vb @@ -9,9 +9,9 @@ Imports System.Runtime.InteropServices ' Revisar los valores de los atributos del ensamblado - + - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' mediante el asterisco ('*'), como se muestra a continuación: ' - - + + diff --git a/sources/My Project/Resources.Designer.vb b/sources/My Project/Resources.Designer.vb index 9fa2757..5c67c39 100644 --- a/sources/My Project/Resources.Designer.vb +++ b/sources/My Project/Resources.Designer.vb @@ -70,16 +70,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Busca un recurso adaptado de tipo System.Drawing.Bitmap. - ''' - Friend ReadOnly Property arrow_left_24blue() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("arrow_left_24blue", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - ''' ''' Busca un recurso adaptado de tipo System.Drawing.Bitmap. ''' diff --git a/sources/My Project/Resources.resx b/sources/My Project/Resources.resx index d667b7d..5e190cb 100644 --- a/sources/My Project/Resources.resx +++ b/sources/My Project/Resources.resx @@ -130,9 +130,6 @@ ..\Resources\folder_x24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\arrow_left_24blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\button_CopyAll.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/sources/ProjectPropertiesDialog.Designer.vb b/sources/ProjectPropertiesDialog.Designer.vb index cc57d8a..8163613 100644 --- a/sources/ProjectPropertiesDialog.Designer.vb +++ b/sources/ProjectPropertiesDialog.Designer.vb @@ -22,36 +22,61 @@ Partial Class ProjectPropertiesDialog 'No lo modifique con el editor de código. _ Private Sub InitializeComponent() - Me.ExitButton = New System.Windows.Forms.Button() - Me.OkButton = New System.Windows.Forms.Button() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(ProjectPropertiesDialog)) + Me.BottonsPanel = New System.Windows.Forms.Panel() + Me.OK_Button = New System.Windows.Forms.Button() + Me.Cancel_Button = New System.Windows.Forms.Button() Me.ProjectInfoUserControl1 = New ByteniZ3R.ProjectInfoUserControl() + Me.BottonsPanel.SuspendLayout() Me.SuspendLayout() ' - 'ExitButton + 'BottonsPanel ' - Me.ExitButton.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.ExitButton.BackColor = System.Drawing.Color.Salmon - Me.ExitButton.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.ExitButton.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.ExitButton.Location = New System.Drawing.Point(430, 291) - Me.ExitButton.Name = "ExitButton" - Me.ExitButton.Size = New System.Drawing.Size(60, 30) - Me.ExitButton.TabIndex = 9 - Me.ExitButton.Text = "Exit" - Me.ExitButton.UseVisualStyleBackColor = False + Me.BottonsPanel.Controls.Add(Me.OK_Button) + Me.BottonsPanel.Controls.Add(Me.Cancel_Button) + Me.BottonsPanel.Dock = System.Windows.Forms.DockStyle.Bottom + Me.BottonsPanel.Location = New System.Drawing.Point(0, 286) + Me.BottonsPanel.Name = "BottonsPanel" + Me.BottonsPanel.Padding = New System.Windows.Forms.Padding(4) + Me.BottonsPanel.Size = New System.Drawing.Size(500, 51) + Me.BottonsPanel.TabIndex = 26 ' - 'OkButton + 'OK_Button ' - Me.OkButton.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.OkButton.BackColor = System.Drawing.Color.LightGreen - Me.OkButton.DialogResult = System.Windows.Forms.DialogResult.OK - Me.OkButton.Font = New System.Drawing.Font("Verdana", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.OkButton.Location = New System.Drawing.Point(294, 286) - Me.OkButton.Name = "OkButton" - Me.OkButton.Size = New System.Drawing.Size(130, 36) - Me.OkButton.TabIndex = 8 - Me.OkButton.Text = "Ok" - Me.OkButton.UseVisualStyleBackColor = False + Me.OK_Button.BackColor = System.Drawing.Color.Transparent + Me.OK_Button.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.OK_Button.DialogResult = System.Windows.Forms.DialogResult.OK + Me.OK_Button.Dock = System.Windows.Forms.DockStyle.Right + Me.OK_Button.FlatAppearance.BorderSize = 0 + Me.OK_Button.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.OK_Button.Font = New System.Drawing.Font("Verdana", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.OK_Button.ForeColor = System.Drawing.SystemColors.ControlText + Me.OK_Button.Image = CType(resources.GetObject("OK_Button.Image"), System.Drawing.Image) + Me.OK_Button.Location = New System.Drawing.Point(254, 4) + Me.OK_Button.Margin = New System.Windows.Forms.Padding(4) + Me.OK_Button.Name = "OK_Button" + Me.OK_Button.Size = New System.Drawing.Size(132, 43) + Me.OK_Button.TabIndex = 3 + Me.OK_Button.UseVisualStyleBackColor = False + ' + 'Cancel_Button + ' + Me.Cancel_Button.BackColor = System.Drawing.Color.Transparent + Me.Cancel_Button.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel + Me.Cancel_Button.Dock = System.Windows.Forms.DockStyle.Right + Me.Cancel_Button.FlatAppearance.BorderSize = 0 + Me.Cancel_Button.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Cancel_Button.Font = New System.Drawing.Font("Verdana", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Cancel_Button.ForeColor = System.Drawing.Color.Black + Me.Cancel_Button.Image = CType(resources.GetObject("Cancel_Button.Image"), System.Drawing.Image) + Me.Cancel_Button.ImageAlign = System.Drawing.ContentAlignment.BottomCenter + Me.Cancel_Button.Location = New System.Drawing.Point(386, 4) + Me.Cancel_Button.Margin = New System.Windows.Forms.Padding(4) + Me.Cancel_Button.Name = "Cancel_Button" + Me.Cancel_Button.Size = New System.Drawing.Size(110, 43) + Me.Cancel_Button.TabIndex = 4 + Me.Cancel_Button.UseVisualStyleBackColor = False ' 'ProjectInfoUserControl1 ' @@ -66,21 +91,19 @@ Partial Class ProjectPropertiesDialog Me.ProjectInfoUserControl1.ProjectGroup = "" Me.ProjectInfoUserControl1.ProjectName = "" Me.ProjectInfoUserControl1.ProjectVersion = "" - Me.ProjectInfoUserControl1.Size = New System.Drawing.Size(498, 280) + Me.ProjectInfoUserControl1.Size = New System.Drawing.Size(500, 280) Me.ProjectInfoUserControl1.TabIndex = 25 ' 'ProjectPropertiesDialog ' - Me.AcceptButton = Me.OkButton Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.Gainsboro - Me.CancelButton = Me.ExitButton - Me.ClientSize = New System.Drawing.Size(498, 333) + Me.CancelButton = Me.Cancel_Button + Me.ClientSize = New System.Drawing.Size(500, 337) Me.ControlBox = False + Me.Controls.Add(Me.BottonsPanel) Me.Controls.Add(Me.ProjectInfoUserControl1) - Me.Controls.Add(Me.OkButton) - Me.Controls.Add(Me.ExitButton) Me.Font = New System.Drawing.Font("Verdana", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.ForeColor = System.Drawing.Color.Black Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle @@ -91,10 +114,12 @@ Partial Class ProjectPropertiesDialog Me.ShowIcon = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Text = "Project info" + Me.BottonsPanel.ResumeLayout(False) Me.ResumeLayout(False) End Sub - Friend WithEvents ExitButton As System.Windows.Forms.Button - Friend WithEvents OkButton As System.Windows.Forms.Button - Friend WithEvents ProjectInfoUserControl1 As ByteniZ3R.ProjectInfoUserControl + Friend WithEvents ProjectInfoUserControl1 As ProjectInfoUserControl + Friend WithEvents BottonsPanel As Panel + Friend WithEvents OK_Button As Button + Friend WithEvents Cancel_Button As Button End Class diff --git a/sources/ProjectPropertiesDialog.resx b/sources/ProjectPropertiesDialog.resx index d58980a..cda5d48 100644 --- a/sources/ProjectPropertiesDialog.resx +++ b/sources/ProjectPropertiesDialog.resx @@ -117,4 +117,32 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + iVBORw0KGgoAAAANSUhEUgAAAH4AAAAkCAYAAABPNo4ZAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGISURBVHhe7dtRasRADAPQPWnP0cP2Lql3CSHSyHj2 + bzRx4ZUiRyHG330dxwHi5/2rbWa48xBQoe1huPP1Bz3Y9tSHf6jbvfUDP3+/bQPqticZypc0P+q2JwxU + ufnjOwcMVKn54zsHDFSp+eM7BwxUqfnjOwcMVKn54zsHDFSp+eM7BwxUyQHvwarneb4b3jdgoEoOeA9W + Pc/z3fC+AQNVWln1/dk8y2fnbnifgIEqraz6/mye5bNzN7xPwECVVlZ9fzbP8tm5G94nYKBKK6u+P5tn + +ezcDe8TMFCllVXfn805z9zf5UzshoEqraz6/mzOeeb+LmdiNwxUaWXV92fzLJ+du+F9AgaqtLLq+7N5 + ls/O3fA+AQNVcsB7sOr5b+dueJ+AgSo54D1Y9fy3cze8T8BAlZo/vnPAQJWaP75zwECVmj++c8BAlZo/ + vnPAQJWaP75zwECVmj++cxiCD1VuftRtTzKUL2l+1G0/+p8mn+W6dx/+WYbDXwE92PYw3HkIqND2gHc+ + Xv+jdo+bB0a3tgAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAAGYAAAAgCAYAAADg3g0TAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAG6SURBVGhD7drhagMxDAPgPfb29DevNCXWSXGSS26l + ePCNIVuB1n/3dRyHYz9/v9LNTnc4BVBI9zjd4fUHLKb/kYd5U9U9xMLPd7oB++6faEgfSeux7/7JB6yc + 9sM7GB+wUtoP72B8wEppP7yD8QErpf3wDsYHrNQD30Gs80mufl7sGx+wUg98B7HOJ7n6ebFvfMBKLbN9 + 7KHR/QJ7Bdutrd7HeQT7xges1DLbxx4a3S+wV7Dd2up9nEewb3zASi1X+0i9p/JornIl2ldzlffCvvEB + K7Vc7SP1nsqjucqVaF/NVd4L+8YHrNQy28eeovbrt1pzlSu4H1G9+s0e2Dc+YKWW2T72FLVfv9Waq1zB + /Yjq1W/2wL7xASu1jPajfTVXeTRXuTK6X8z2CuwbH7BSy2g/2ldzlUdzlSuj+8Vsr8C+8QEr9cB30Oh+ + ofbrt2bmaPU+ziPYNz5gpR74DhrdL9R+/dbMHK3ex3kE+8YHrJT2wzsYH7BS2g/vYHzASmk/vIPxASul + /fAO5hQ8sHJaj333TzSkj6T12Hf/kP/w915e98jDvJfTYV4BLKZ7nO5wCqCQ7uHvcHz9AiyV6icns2GL + AAAAAElFTkSuQmCC + + \ No newline at end of file diff --git a/sources/ProjectPropertiesDialog.vb b/sources/ProjectPropertiesDialog.vb index 5c245c3..2dbffeb 100644 --- a/sources/ProjectPropertiesDialog.vb +++ b/sources/ProjectPropertiesDialog.vb @@ -51,5 +51,4 @@ Public Class ProjectPropertiesDialog End Function - End Class \ No newline at end of file diff --git a/sources/Resources/arrow_left_24blue.png b/sources/Resources/arrow_left_24blue.png deleted file mode 100644 index 3fc0df4..0000000 Binary files a/sources/Resources/arrow_left_24blue.png and /dev/null differ