Build #2 0.9.3.1

This commit is contained in:
JackCarterSmith 2017-06-19 22:00:26 +02:00
parent b6de217d20
commit 486df72669
8 changed files with 33 additions and 54 deletions

View File

@ -60,7 +60,8 @@ Partial Class AddMachine_ID
Me.AddMachine_ID_CancelButton.Location = New System.Drawing.Point(146, 132) Me.AddMachine_ID_CancelButton.Location = New System.Drawing.Point(146, 132)
Me.AddMachine_ID_CancelButton.Name = "AddMachine_ID_CancelButton" Me.AddMachine_ID_CancelButton.Name = "AddMachine_ID_CancelButton"
Me.AddMachine_ID_CancelButton.Size = New System.Drawing.Size(75, 23) Me.AddMachine_ID_CancelButton.Size = New System.Drawing.Size(75, 23)
Me.AddMachine_ID_CancelButton.TabIndex = 2 Me.AddMachine_ID_CancelButton.TabIndex = 0
Me.AddMachine_ID_CancelButton.TabStop = False
Me.AddMachine_ID_CancelButton.Text = "Annuler" Me.AddMachine_ID_CancelButton.Text = "Annuler"
Me.AddMachine_ID_CancelButton.UseVisualStyleBackColor = True Me.AddMachine_ID_CancelButton.UseVisualStyleBackColor = True
' '
@ -70,6 +71,7 @@ Partial Class AddMachine_ID
Me.NextButton.Name = "NextButton" Me.NextButton.Name = "NextButton"
Me.NextButton.Size = New System.Drawing.Size(75, 23) Me.NextButton.Size = New System.Drawing.Size(75, 23)
Me.NextButton.TabIndex = 1 Me.NextButton.TabIndex = 1
Me.NextButton.TabStop = False
Me.NextButton.Text = "Suivant" Me.NextButton.Text = "Suivant"
Me.NextButton.UseVisualStyleBackColor = True Me.NextButton.UseVisualStyleBackColor = True
' '
@ -90,6 +92,7 @@ Partial Class AddMachine_ID
Me.RandomIDButton.Name = "RandomIDButton" Me.RandomIDButton.Name = "RandomIDButton"
Me.RandomIDButton.Size = New System.Drawing.Size(59, 23) Me.RandomIDButton.Size = New System.Drawing.Size(59, 23)
Me.RandomIDButton.TabIndex = 102 Me.RandomIDButton.TabIndex = 102
Me.RandomIDButton.TabStop = False
Me.RandomIDButton.Text = "Aléatoire" Me.RandomIDButton.Text = "Aléatoire"
Me.RandomIDButton.UseVisualStyleBackColor = True Me.RandomIDButton.UseVisualStyleBackColor = True
' '

View File

@ -78,7 +78,7 @@ Partial Class EditSpecs
Me.OSCmbBox.Location = New System.Drawing.Point(47, 41) Me.OSCmbBox.Location = New System.Drawing.Point(47, 41)
Me.OSCmbBox.Name = "OSCmbBox" Me.OSCmbBox.Name = "OSCmbBox"
Me.OSCmbBox.Size = New System.Drawing.Size(315, 21) Me.OSCmbBox.Size = New System.Drawing.Size(315, 21)
Me.OSCmbBox.TabIndex = 16 Me.OSCmbBox.TabIndex = 7
' '
'RAMCmbBox 'RAMCmbBox
' '
@ -87,7 +87,7 @@ Partial Class EditSpecs
Me.RAMCmbBox.Location = New System.Drawing.Point(294, 18) Me.RAMCmbBox.Location = New System.Drawing.Point(294, 18)
Me.RAMCmbBox.Name = "RAMCmbBox" Me.RAMCmbBox.Name = "RAMCmbBox"
Me.RAMCmbBox.Size = New System.Drawing.Size(68, 21) Me.RAMCmbBox.Size = New System.Drawing.Size(68, 21)
Me.RAMCmbBox.TabIndex = 15 Me.RAMCmbBox.TabIndex = 5
' '
'ProcArchCmbBox 'ProcArchCmbBox
' '
@ -96,7 +96,7 @@ Partial Class EditSpecs
Me.ProcArchCmbBox.Location = New System.Drawing.Point(188, 18) Me.ProcArchCmbBox.Location = New System.Drawing.Point(188, 18)
Me.ProcArchCmbBox.Name = "ProcArchCmbBox" Me.ProcArchCmbBox.Name = "ProcArchCmbBox"
Me.ProcArchCmbBox.Size = New System.Drawing.Size(57, 21) Me.ProcArchCmbBox.Size = New System.Drawing.Size(57, 21)
Me.ProcArchCmbBox.TabIndex = 14 Me.ProcArchCmbBox.TabIndex = 4
' '
'Label7 'Label7
' '
@ -122,8 +122,7 @@ Partial Class EditSpecs
Me.ActivateCheck.Location = New System.Drawing.Point(72, 67) Me.ActivateCheck.Location = New System.Drawing.Point(72, 67)
Me.ActivateCheck.Name = "ActivateCheck" Me.ActivateCheck.Name = "ActivateCheck"
Me.ActivateCheck.Size = New System.Drawing.Size(73, 17) Me.ActivateCheck.Size = New System.Drawing.Size(73, 17)
Me.ActivateCheck.TabIndex = 4 Me.ActivateCheck.TabIndex = 9
Me.ActivateCheck.TabStop = False
Me.ActivateCheck.Text = "Activation" Me.ActivateCheck.Text = "Activation"
Me.ActivateCheck.UseVisualStyleBackColor = True Me.ActivateCheck.UseVisualStyleBackColor = True
' '
@ -133,8 +132,7 @@ Partial Class EditSpecs
Me.SoftCheck.Location = New System.Drawing.Point(151, 67) Me.SoftCheck.Location = New System.Drawing.Point(151, 67)
Me.SoftCheck.Name = "SoftCheck" Me.SoftCheck.Name = "SoftCheck"
Me.SoftCheck.Size = New System.Drawing.Size(68, 17) Me.SoftCheck.Size = New System.Drawing.Size(68, 17)
Me.SoftCheck.TabIndex = 3 Me.SoftCheck.TabIndex = 10
Me.SoftCheck.TabStop = False
Me.SoftCheck.Text = "Software" Me.SoftCheck.Text = "Software"
Me.SoftCheck.UseVisualStyleBackColor = True Me.SoftCheck.UseVisualStyleBackColor = True
' '
@ -144,8 +142,7 @@ Partial Class EditSpecs
Me.DrvCheck.Location = New System.Drawing.Point(7, 67) Me.DrvCheck.Location = New System.Drawing.Point(7, 67)
Me.DrvCheck.Name = "DrvCheck" Me.DrvCheck.Name = "DrvCheck"
Me.DrvCheck.Size = New System.Drawing.Size(59, 17) Me.DrvCheck.Size = New System.Drawing.Size(59, 17)
Me.DrvCheck.TabIndex = 2 Me.DrvCheck.TabIndex = 8
Me.DrvCheck.TabStop = False
Me.DrvCheck.Text = "Drivers" Me.DrvCheck.Text = "Drivers"
Me.DrvCheck.UseVisualStyleBackColor = True Me.DrvCheck.UseVisualStyleBackColor = True
' '
@ -155,8 +152,7 @@ Partial Class EditSpecs
Me.OSCheck.Location = New System.Drawing.Point(7, 43) Me.OSCheck.Location = New System.Drawing.Point(7, 43)
Me.OSCheck.Name = "OSCheck" Me.OSCheck.Name = "OSCheck"
Me.OSCheck.Size = New System.Drawing.Size(44, 17) Me.OSCheck.Size = New System.Drawing.Size(44, 17)
Me.OSCheck.TabIndex = 1 Me.OSCheck.TabIndex = 6
Me.OSCheck.TabStop = False
Me.OSCheck.Text = "O.S" Me.OSCheck.Text = "O.S"
Me.OSCheck.UseVisualStyleBackColor = True Me.OSCheck.UseVisualStyleBackColor = True
' '
@ -166,8 +162,7 @@ Partial Class EditSpecs
Me.HWCheck.Location = New System.Drawing.Point(7, 20) Me.HWCheck.Location = New System.Drawing.Point(7, 20)
Me.HWCheck.Name = "HWCheck" Me.HWCheck.Name = "HWCheck"
Me.HWCheck.Size = New System.Drawing.Size(72, 17) Me.HWCheck.Size = New System.Drawing.Size(72, 17)
Me.HWCheck.TabIndex = 0 Me.HWCheck.TabIndex = 3
Me.HWCheck.TabStop = False
Me.HWCheck.Text = "Hardware" Me.HWCheck.Text = "Hardware"
Me.HWCheck.UseVisualStyleBackColor = True Me.HWCheck.UseVisualStyleBackColor = True
' '
@ -246,8 +241,7 @@ Partial Class EditSpecs
Me.EmprunterName.Location = New System.Drawing.Point(109, 166) Me.EmprunterName.Location = New System.Drawing.Point(109, 166)
Me.EmprunterName.Name = "EmprunterName" Me.EmprunterName.Name = "EmprunterName"
Me.EmprunterName.Size = New System.Drawing.Size(150, 20) Me.EmprunterName.Size = New System.Drawing.Size(150, 20)
Me.EmprunterName.TabIndex = 11 Me.EmprunterName.TabIndex = 2
Me.EmprunterName.TabStop = False
' '
'EmpruntCheckBox 'EmpruntCheckBox
' '
@ -255,8 +249,7 @@ Partial Class EditSpecs
Me.EmpruntCheckBox.Location = New System.Drawing.Point(5, 168) Me.EmpruntCheckBox.Location = New System.Drawing.Point(5, 168)
Me.EmpruntCheckBox.Name = "EmpruntCheckBox" Me.EmpruntCheckBox.Name = "EmpruntCheckBox"
Me.EmpruntCheckBox.Size = New System.Drawing.Size(98, 17) Me.EmpruntCheckBox.Size = New System.Drawing.Size(98, 17)
Me.EmpruntCheckBox.TabIndex = 10 Me.EmpruntCheckBox.TabIndex = 1
Me.EmpruntCheckBox.TabStop = False
Me.EmpruntCheckBox.Text = "Emprunté par :" Me.EmpruntCheckBox.Text = "Emprunté par :"
Me.EmpruntCheckBox.UseVisualStyleBackColor = True Me.EmpruntCheckBox.UseVisualStyleBackColor = True
' '
@ -267,8 +260,7 @@ Partial Class EditSpecs
Me.DetailsBox.Name = "DetailsBox" Me.DetailsBox.Name = "DetailsBox"
Me.DetailsBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical Me.DetailsBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
Me.DetailsBox.Size = New System.Drawing.Size(383, 84) Me.DetailsBox.Size = New System.Drawing.Size(383, 84)
Me.DetailsBox.TabIndex = 9 Me.DetailsBox.TabIndex = 0
Me.DetailsBox.TabStop = False
' '
'Label5 'Label5
' '
@ -320,7 +312,7 @@ Partial Class EditSpecs
Me.SaveEditButton.Location = New System.Drawing.Point(166, 302) Me.SaveEditButton.Location = New System.Drawing.Point(166, 302)
Me.SaveEditButton.Name = "SaveEditButton" Me.SaveEditButton.Name = "SaveEditButton"
Me.SaveEditButton.Size = New System.Drawing.Size(194, 44) Me.SaveEditButton.Size = New System.Drawing.Size(194, 44)
Me.SaveEditButton.TabIndex = 7 Me.SaveEditButton.TabIndex = 11
Me.SaveEditButton.Text = "Enregistrer" Me.SaveEditButton.Text = "Enregistrer"
Me.SaveEditButton.UseVisualStyleBackColor = True Me.SaveEditButton.UseVisualStyleBackColor = True
' '

View File

@ -25,7 +25,6 @@ Partial Class IDGenerator
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(IDGenerator)) Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(IDGenerator))
Me.Barcode1 = New IDAutomation.Windows.Forms.LinearBarCode.Barcode() Me.Barcode1 = New IDAutomation.Windows.Forms.LinearBarCode.Barcode()
Me.GenerateNewIDButton = New System.Windows.Forms.Button() Me.GenerateNewIDButton = New System.Windows.Forms.Button()
Me.CloseButtonNewID = New System.Windows.Forms.Button()
Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.PictureBox1 = New System.Windows.Forms.PictureBox()
Me.newRandomIDBox = New System.Windows.Forms.MaskedTextBox() Me.newRandomIDBox = New System.Windows.Forms.MaskedTextBox()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@ -73,7 +72,8 @@ Partial Class IDGenerator
Me.Barcode1.Size = New System.Drawing.Size(171, 74) Me.Barcode1.Size = New System.Drawing.Size(171, 74)
Me.Barcode1.SuppSeparationCM = 0.5! Me.Barcode1.SuppSeparationCM = 0.5!
Me.Barcode1.SymbologyID = IDAutomation.Windows.Forms.LinearBarCode.Symbologies.Code39 Me.Barcode1.SymbologyID = IDAutomation.Windows.Forms.LinearBarCode.Symbologies.Code39
Me.Barcode1.TabIndex = 0 Me.Barcode1.TabIndex = 100
Me.Barcode1.TabStop = False
Me.Barcode1.TextFontColor = System.Drawing.Color.Black Me.Barcode1.TextFontColor = System.Drawing.Color.Black
Me.Barcode1.TextMarginCM = 0.1! Me.Barcode1.TextMarginCM = 0.1!
Me.Barcode1.TopMarginCM = 0.2! Me.Barcode1.TopMarginCM = 0.2!
@ -86,21 +86,11 @@ Partial Class IDGenerator
' '
Me.GenerateNewIDButton.Location = New System.Drawing.Point(12, 171) Me.GenerateNewIDButton.Location = New System.Drawing.Point(12, 171)
Me.GenerateNewIDButton.Name = "GenerateNewIDButton" Me.GenerateNewIDButton.Name = "GenerateNewIDButton"
Me.GenerateNewIDButton.Size = New System.Drawing.Size(198, 23) Me.GenerateNewIDButton.Size = New System.Drawing.Size(198, 39)
Me.GenerateNewIDButton.TabIndex = 1 Me.GenerateNewIDButton.TabIndex = 0
Me.GenerateNewIDButton.Text = "Générer nouvel ID" Me.GenerateNewIDButton.Text = "Générer nouvel ID"
Me.GenerateNewIDButton.UseVisualStyleBackColor = True Me.GenerateNewIDButton.UseVisualStyleBackColor = True
' '
'CloseButtonNewID
'
Me.CloseButtonNewID.DialogResult = System.Windows.Forms.DialogResult.Cancel
Me.CloseButtonNewID.Location = New System.Drawing.Point(51, 196)
Me.CloseButtonNewID.Name = "CloseButtonNewID"
Me.CloseButtonNewID.Size = New System.Drawing.Size(126, 23)
Me.CloseButtonNewID.TabIndex = 2
Me.CloseButtonNewID.Text = "Fermer"
Me.CloseButtonNewID.UseVisualStyleBackColor = True
'
'PictureBox1 'PictureBox1
' '
Me.PictureBox1.BackgroundImage = CType(resources.GetObject("PictureBox1.BackgroundImage"), System.Drawing.Image) Me.PictureBox1.BackgroundImage = CType(resources.GetObject("PictureBox1.BackgroundImage"), System.Drawing.Image)
@ -115,29 +105,25 @@ Partial Class IDGenerator
' '
Me.newRandomIDBox.AllowDrop = True Me.newRandomIDBox.AllowDrop = True
Me.newRandomIDBox.AsciiOnly = True Me.newRandomIDBox.AsciiOnly = True
Me.newRandomIDBox.BeepOnError = True
Me.newRandomIDBox.Location = New System.Drawing.Point(64, 145) Me.newRandomIDBox.Location = New System.Drawing.Point(64, 145)
Me.newRandomIDBox.Mask = "9999999999" Me.newRandomIDBox.Mask = "9999999999"
Me.newRandomIDBox.Name = "newRandomIDBox" Me.newRandomIDBox.Name = "newRandomIDBox"
Me.newRandomIDBox.Size = New System.Drawing.Size(100, 20) Me.newRandomIDBox.Size = New System.Drawing.Size(100, 20)
Me.newRandomIDBox.TabIndex = 4 Me.newRandomIDBox.TabIndex = 1
Me.newRandomIDBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center Me.newRandomIDBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
' '
'IDGenerator 'IDGenerator
' '
Me.AcceptButton = Me.GenerateNewIDButton
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.CloseButtonNewID Me.ClientSize = New System.Drawing.Size(224, 217)
Me.ClientSize = New System.Drawing.Size(224, 226)
Me.Controls.Add(Me.newRandomIDBox) Me.Controls.Add(Me.newRandomIDBox)
Me.Controls.Add(Me.CloseButtonNewID)
Me.Controls.Add(Me.GenerateNewIDButton) Me.Controls.Add(Me.GenerateNewIDButton)
Me.Controls.Add(Me.Barcode1) Me.Controls.Add(Me.Barcode1)
Me.Controls.Add(Me.PictureBox1) Me.Controls.Add(Me.PictureBox1)
Me.MaximizeBox = False Me.MaximizeBox = False
Me.MaximumSize = New System.Drawing.Size(240, 265)
Me.MinimizeBox = False Me.MinimizeBox = False
Me.MinimumSize = New System.Drawing.Size(240, 265)
Me.Name = "IDGenerator" Me.Name = "IDGenerator"
Me.ShowIcon = False Me.ShowIcon = False
Me.Text = "Générer de nouveaux IDs" Me.Text = "Générer de nouveaux IDs"
@ -149,7 +135,6 @@ Partial Class IDGenerator
Friend WithEvents Barcode1 As Barcode Friend WithEvents Barcode1 As Barcode
Friend WithEvents GenerateNewIDButton As Button Friend WithEvents GenerateNewIDButton As Button
Friend WithEvents CloseButtonNewID As Button
Friend WithEvents PictureBox1 As PictureBox Friend WithEvents PictureBox1 As PictureBox
Friend WithEvents newRandomIDBox As MaskedTextBox Friend WithEvents newRandomIDBox As MaskedTextBox
End Class End Class

View File

@ -28,8 +28,4 @@ generate:
Private Sub GenerateNewIDButton_Click(sender As Object, e As EventArgs) Handles GenerateNewIDButton.Click Private Sub GenerateNewIDButton_Click(sender As Object, e As EventArgs) Handles GenerateNewIDButton.Click
GenerateNewIDBarcode() GenerateNewIDBarcode()
End Sub End Sub
Private Sub CloseButtonNewID_Click(sender As Object, e As EventArgs) Handles CloseButtonNewID.Click
Me.Close()
End Sub
End Class End Class

View File

@ -33,7 +33,7 @@
<MinimumRequiredVersion>0.8.1.0</MinimumRequiredVersion> <MinimumRequiredVersion>0.8.1.0</MinimumRequiredVersion>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish> <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<ApplicationRevision>0</ApplicationRevision> <ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>0.9.1.%2a</ApplicationVersion> <ApplicationVersion>0.9.3.0</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted> <PublishWizardCompleted>true</PublishWizardCompleted>

View File

@ -126,7 +126,8 @@ Partial Class Main
Me.InvList.Name = "InvList" Me.InvList.Name = "InvList"
Me.InvList.ScrollAlwaysVisible = True Me.InvList.ScrollAlwaysVisible = True
Me.InvList.Size = New System.Drawing.Size(324, 316) Me.InvList.Size = New System.Drawing.Size(324, 316)
Me.InvList.TabIndex = 2 Me.InvList.TabIndex = 1
Me.InvList.TabStop = False
' '
'SendOutButton 'SendOutButton
' '
@ -266,7 +267,8 @@ Partial Class Main
' '
'IDBox 'IDBox
' '
Me.IDBox.InsertKeyMode = System.Windows.Forms.InsertKeyMode.Overwrite Me.IDBox.AllowDrop = True
Me.IDBox.AsciiOnly = True
Me.IDBox.Location = New System.Drawing.Point(37, 16) Me.IDBox.Location = New System.Drawing.Point(37, 16)
Me.IDBox.Mask = "9999999999" Me.IDBox.Mask = "9999999999"
Me.IDBox.Name = "IDBox" Me.IDBox.Name = "IDBox"

View File

@ -219,7 +219,7 @@ Public Class Main
Using con As New SQLiteConnection("URI=file:db.sqlite") Using con As New SQLiteConnection("URI=file:db.sqlite")
con.Open() con.Open()
Using cmd As New SQLiteCommand(con) Using cmd As New SQLiteCommand(con)
cmd.CommandText = "SELECT * FROM computers_desc WHERE id=" & IDBox.Text & ";" cmd.CommandText = "SELECT * FROM computers_desc WHERE id='" & IDBox.Text & "';"
dtr = cmd.ExecuteReader() dtr = cmd.ExecuteReader()
Dim id_found As Boolean = False Dim id_found As Boolean = False
While dtr.Read() While dtr.Read()
@ -267,7 +267,7 @@ Public Class Main
Using con As New SQLiteConnection("URI=file:db.sqlite") Using con As New SQLiteConnection("URI=file:db.sqlite")
con.Open() con.Open()
Using cmd As New SQLiteCommand(con) Using cmd As New SQLiteCommand(con)
cmd.CommandText = "SELECT * FROM computers_progress WHERE id=" & machineID & ";" cmd.CommandText = "SELECT * FROM computers_progress WHERE id='" & machineID & "';"
dtr = cmd.ExecuteReader() dtr = cmd.ExecuteReader()
While dtr.Read() While dtr.Read()
HWCheck.Checked = dtr.GetBoolean(1) HWCheck.Checked = dtr.GetBoolean(1)
@ -347,6 +347,7 @@ Public Class Main
End Sub End Sub
Private Sub IDBox_KeyDown(sender As Object, e As KeyEventArgs) Handles IDBox.KeyDown Private Sub IDBox_KeyDown(sender As Object, e As KeyEventArgs) Handles IDBox.KeyDown
If IDBox.Text.Length() = 10 And Not e.KeyCode.ToString() = "Return" Then IDBox.Text = ""
IDBox.Text = IDBox.Text & ScannerInterpreterFRLayout(e) IDBox.Text = IDBox.Text & ScannerInterpreterFRLayout(e)
End Sub End Sub

View File

@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' en utilisant '*', comme indiqué ci-dessous : ' en utilisant '*', comme indiqué ci-dessous :
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("0.9.1.0")> <Assembly: AssemblyVersion("0.9.3.0")>
<Assembly: AssemblyFileVersion("0.9.1.0")> <Assembly: AssemblyFileVersion("0.9.3.0")>