From 486df72669341bc8680c9e6055ca384b5ea0f772 Mon Sep 17 00:00:00 2001 From: JackCarterSmith Date: Mon, 19 Jun 2017 22:00:26 +0200 Subject: [PATCH] Build #2 0.9.3.1 --- .../AddMachine_ID.Designer.vb | 5 ++- .../EditSpecs.Designer.vb | 32 +++++++------------ .../IDGenerator.Designer.vb | 29 ++++------------- ISEN-Repair Inventory Manager/IDGenerator.vb | 4 --- .../ISEN-Repair Inventory Manager.vbproj | 2 +- .../Main.Designer.vb | 6 ++-- ISEN-Repair Inventory Manager/Main.vb | 5 +-- .../My Project/AssemblyInfo.vb | 4 +-- 8 files changed, 33 insertions(+), 54 deletions(-) diff --git a/ISEN-Repair Inventory Manager/AddMachine_ID.Designer.vb b/ISEN-Repair Inventory Manager/AddMachine_ID.Designer.vb index 69612f4..5aa0898 100644 --- a/ISEN-Repair Inventory Manager/AddMachine_ID.Designer.vb +++ b/ISEN-Repair Inventory Manager/AddMachine_ID.Designer.vb @@ -60,7 +60,8 @@ Partial Class AddMachine_ID Me.AddMachine_ID_CancelButton.Location = New System.Drawing.Point(146, 132) Me.AddMachine_ID_CancelButton.Name = "AddMachine_ID_CancelButton" 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.UseVisualStyleBackColor = True ' @@ -70,6 +71,7 @@ Partial Class AddMachine_ID Me.NextButton.Name = "NextButton" Me.NextButton.Size = New System.Drawing.Size(75, 23) Me.NextButton.TabIndex = 1 + Me.NextButton.TabStop = False Me.NextButton.Text = "Suivant" Me.NextButton.UseVisualStyleBackColor = True ' @@ -90,6 +92,7 @@ Partial Class AddMachine_ID Me.RandomIDButton.Name = "RandomIDButton" Me.RandomIDButton.Size = New System.Drawing.Size(59, 23) Me.RandomIDButton.TabIndex = 102 + Me.RandomIDButton.TabStop = False Me.RandomIDButton.Text = "Aléatoire" Me.RandomIDButton.UseVisualStyleBackColor = True ' diff --git a/ISEN-Repair Inventory Manager/EditSpecs.Designer.vb b/ISEN-Repair Inventory Manager/EditSpecs.Designer.vb index d52757e..1d727ae 100644 --- a/ISEN-Repair Inventory Manager/EditSpecs.Designer.vb +++ b/ISEN-Repair Inventory Manager/EditSpecs.Designer.vb @@ -78,7 +78,7 @@ Partial Class EditSpecs Me.OSCmbBox.Location = New System.Drawing.Point(47, 41) Me.OSCmbBox.Name = "OSCmbBox" Me.OSCmbBox.Size = New System.Drawing.Size(315, 21) - Me.OSCmbBox.TabIndex = 16 + Me.OSCmbBox.TabIndex = 7 ' 'RAMCmbBox ' @@ -87,7 +87,7 @@ Partial Class EditSpecs Me.RAMCmbBox.Location = New System.Drawing.Point(294, 18) Me.RAMCmbBox.Name = "RAMCmbBox" Me.RAMCmbBox.Size = New System.Drawing.Size(68, 21) - Me.RAMCmbBox.TabIndex = 15 + Me.RAMCmbBox.TabIndex = 5 ' 'ProcArchCmbBox ' @@ -96,7 +96,7 @@ Partial Class EditSpecs Me.ProcArchCmbBox.Location = New System.Drawing.Point(188, 18) Me.ProcArchCmbBox.Name = "ProcArchCmbBox" Me.ProcArchCmbBox.Size = New System.Drawing.Size(57, 21) - Me.ProcArchCmbBox.TabIndex = 14 + Me.ProcArchCmbBox.TabIndex = 4 ' 'Label7 ' @@ -122,8 +122,7 @@ Partial Class EditSpecs Me.ActivateCheck.Location = New System.Drawing.Point(72, 67) Me.ActivateCheck.Name = "ActivateCheck" Me.ActivateCheck.Size = New System.Drawing.Size(73, 17) - Me.ActivateCheck.TabIndex = 4 - Me.ActivateCheck.TabStop = False + Me.ActivateCheck.TabIndex = 9 Me.ActivateCheck.Text = "Activation" Me.ActivateCheck.UseVisualStyleBackColor = True ' @@ -133,8 +132,7 @@ Partial Class EditSpecs Me.SoftCheck.Location = New System.Drawing.Point(151, 67) Me.SoftCheck.Name = "SoftCheck" Me.SoftCheck.Size = New System.Drawing.Size(68, 17) - Me.SoftCheck.TabIndex = 3 - Me.SoftCheck.TabStop = False + Me.SoftCheck.TabIndex = 10 Me.SoftCheck.Text = "Software" Me.SoftCheck.UseVisualStyleBackColor = True ' @@ -144,8 +142,7 @@ Partial Class EditSpecs Me.DrvCheck.Location = New System.Drawing.Point(7, 67) Me.DrvCheck.Name = "DrvCheck" Me.DrvCheck.Size = New System.Drawing.Size(59, 17) - Me.DrvCheck.TabIndex = 2 - Me.DrvCheck.TabStop = False + Me.DrvCheck.TabIndex = 8 Me.DrvCheck.Text = "Drivers" Me.DrvCheck.UseVisualStyleBackColor = True ' @@ -155,8 +152,7 @@ Partial Class EditSpecs Me.OSCheck.Location = New System.Drawing.Point(7, 43) Me.OSCheck.Name = "OSCheck" Me.OSCheck.Size = New System.Drawing.Size(44, 17) - Me.OSCheck.TabIndex = 1 - Me.OSCheck.TabStop = False + Me.OSCheck.TabIndex = 6 Me.OSCheck.Text = "O.S" Me.OSCheck.UseVisualStyleBackColor = True ' @@ -166,8 +162,7 @@ Partial Class EditSpecs Me.HWCheck.Location = New System.Drawing.Point(7, 20) Me.HWCheck.Name = "HWCheck" Me.HWCheck.Size = New System.Drawing.Size(72, 17) - Me.HWCheck.TabIndex = 0 - Me.HWCheck.TabStop = False + Me.HWCheck.TabIndex = 3 Me.HWCheck.Text = "Hardware" Me.HWCheck.UseVisualStyleBackColor = True ' @@ -246,8 +241,7 @@ Partial Class EditSpecs Me.EmprunterName.Location = New System.Drawing.Point(109, 166) Me.EmprunterName.Name = "EmprunterName" Me.EmprunterName.Size = New System.Drawing.Size(150, 20) - Me.EmprunterName.TabIndex = 11 - Me.EmprunterName.TabStop = False + Me.EmprunterName.TabIndex = 2 ' 'EmpruntCheckBox ' @@ -255,8 +249,7 @@ Partial Class EditSpecs Me.EmpruntCheckBox.Location = New System.Drawing.Point(5, 168) Me.EmpruntCheckBox.Name = "EmpruntCheckBox" Me.EmpruntCheckBox.Size = New System.Drawing.Size(98, 17) - Me.EmpruntCheckBox.TabIndex = 10 - Me.EmpruntCheckBox.TabStop = False + Me.EmpruntCheckBox.TabIndex = 1 Me.EmpruntCheckBox.Text = "Emprunté par :" Me.EmpruntCheckBox.UseVisualStyleBackColor = True ' @@ -267,8 +260,7 @@ Partial Class EditSpecs Me.DetailsBox.Name = "DetailsBox" Me.DetailsBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical Me.DetailsBox.Size = New System.Drawing.Size(383, 84) - Me.DetailsBox.TabIndex = 9 - Me.DetailsBox.TabStop = False + Me.DetailsBox.TabIndex = 0 ' 'Label5 ' @@ -320,7 +312,7 @@ Partial Class EditSpecs Me.SaveEditButton.Location = New System.Drawing.Point(166, 302) Me.SaveEditButton.Name = "SaveEditButton" Me.SaveEditButton.Size = New System.Drawing.Size(194, 44) - Me.SaveEditButton.TabIndex = 7 + Me.SaveEditButton.TabIndex = 11 Me.SaveEditButton.Text = "Enregistrer" Me.SaveEditButton.UseVisualStyleBackColor = True ' diff --git a/ISEN-Repair Inventory Manager/IDGenerator.Designer.vb b/ISEN-Repair Inventory Manager/IDGenerator.Designer.vb index fdd54db..c3ee48f 100644 --- a/ISEN-Repair Inventory Manager/IDGenerator.Designer.vb +++ b/ISEN-Repair Inventory Manager/IDGenerator.Designer.vb @@ -25,7 +25,6 @@ Partial Class IDGenerator Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(IDGenerator)) Me.Barcode1 = New IDAutomation.Windows.Forms.LinearBarCode.Barcode() Me.GenerateNewIDButton = New System.Windows.Forms.Button() - Me.CloseButtonNewID = New System.Windows.Forms.Button() Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.newRandomIDBox = New System.Windows.Forms.MaskedTextBox() 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.SuppSeparationCM = 0.5! 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.TextMarginCM = 0.1! Me.Barcode1.TopMarginCM = 0.2! @@ -86,21 +86,11 @@ Partial Class IDGenerator ' Me.GenerateNewIDButton.Location = New System.Drawing.Point(12, 171) Me.GenerateNewIDButton.Name = "GenerateNewIDButton" - Me.GenerateNewIDButton.Size = New System.Drawing.Size(198, 23) - Me.GenerateNewIDButton.TabIndex = 1 + Me.GenerateNewIDButton.Size = New System.Drawing.Size(198, 39) + Me.GenerateNewIDButton.TabIndex = 0 Me.GenerateNewIDButton.Text = "Générer nouvel ID" 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 ' Me.PictureBox1.BackgroundImage = CType(resources.GetObject("PictureBox1.BackgroundImage"), System.Drawing.Image) @@ -115,29 +105,25 @@ Partial Class IDGenerator ' Me.newRandomIDBox.AllowDrop = True Me.newRandomIDBox.AsciiOnly = True - Me.newRandomIDBox.BeepOnError = True Me.newRandomIDBox.Location = New System.Drawing.Point(64, 145) Me.newRandomIDBox.Mask = "9999999999" Me.newRandomIDBox.Name = "newRandomIDBox" 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 ' 'IDGenerator ' + Me.AcceptButton = Me.GenerateNewIDButton Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.CancelButton = Me.CloseButtonNewID - Me.ClientSize = New System.Drawing.Size(224, 226) + Me.ClientSize = New System.Drawing.Size(224, 217) Me.Controls.Add(Me.newRandomIDBox) - Me.Controls.Add(Me.CloseButtonNewID) Me.Controls.Add(Me.GenerateNewIDButton) Me.Controls.Add(Me.Barcode1) Me.Controls.Add(Me.PictureBox1) Me.MaximizeBox = False - Me.MaximumSize = New System.Drawing.Size(240, 265) Me.MinimizeBox = False - Me.MinimumSize = New System.Drawing.Size(240, 265) Me.Name = "IDGenerator" Me.ShowIcon = False Me.Text = "Générer de nouveaux IDs" @@ -149,7 +135,6 @@ Partial Class IDGenerator Friend WithEvents Barcode1 As Barcode Friend WithEvents GenerateNewIDButton As Button - Friend WithEvents CloseButtonNewID As Button Friend WithEvents PictureBox1 As PictureBox Friend WithEvents newRandomIDBox As MaskedTextBox End Class diff --git a/ISEN-Repair Inventory Manager/IDGenerator.vb b/ISEN-Repair Inventory Manager/IDGenerator.vb index f178195..8331d5e 100644 --- a/ISEN-Repair Inventory Manager/IDGenerator.vb +++ b/ISEN-Repair Inventory Manager/IDGenerator.vb @@ -28,8 +28,4 @@ generate: Private Sub GenerateNewIDButton_Click(sender As Object, e As EventArgs) Handles GenerateNewIDButton.Click GenerateNewIDBarcode() End Sub - - Private Sub CloseButtonNewID_Click(sender As Object, e As EventArgs) Handles CloseButtonNewID.Click - Me.Close() - End Sub End Class \ No newline at end of file diff --git a/ISEN-Repair Inventory Manager/ISEN-Repair Inventory Manager.vbproj b/ISEN-Repair Inventory Manager/ISEN-Repair Inventory Manager.vbproj index cba40b5..053c756 100644 --- a/ISEN-Repair Inventory Manager/ISEN-Repair Inventory Manager.vbproj +++ b/ISEN-Repair Inventory Manager/ISEN-Repair Inventory Manager.vbproj @@ -33,7 +33,7 @@ 0.8.1.0 false 0 - 0.9.1.%2a + 0.9.3.0 false true true diff --git a/ISEN-Repair Inventory Manager/Main.Designer.vb b/ISEN-Repair Inventory Manager/Main.Designer.vb index 1d27e82..8d830fe 100644 --- a/ISEN-Repair Inventory Manager/Main.Designer.vb +++ b/ISEN-Repair Inventory Manager/Main.Designer.vb @@ -126,7 +126,8 @@ Partial Class Main Me.InvList.Name = "InvList" Me.InvList.ScrollAlwaysVisible = True Me.InvList.Size = New System.Drawing.Size(324, 316) - Me.InvList.TabIndex = 2 + Me.InvList.TabIndex = 1 + Me.InvList.TabStop = False ' 'SendOutButton ' @@ -266,7 +267,8 @@ Partial Class Main ' '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.Mask = "9999999999" Me.IDBox.Name = "IDBox" diff --git a/ISEN-Repair Inventory Manager/Main.vb b/ISEN-Repair Inventory Manager/Main.vb index f7cdbbd..bfc2e15 100644 --- a/ISEN-Repair Inventory Manager/Main.vb +++ b/ISEN-Repair Inventory Manager/Main.vb @@ -219,7 +219,7 @@ Public Class Main Using con As New SQLiteConnection("URI=file:db.sqlite") con.Open() 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() Dim id_found As Boolean = False While dtr.Read() @@ -267,7 +267,7 @@ Public Class Main Using con As New SQLiteConnection("URI=file:db.sqlite") con.Open() 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() While dtr.Read() HWCheck.Checked = dtr.GetBoolean(1) @@ -347,6 +347,7 @@ Public Class Main End Sub 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) End Sub diff --git a/ISEN-Repair Inventory Manager/My Project/AssemblyInfo.vb b/ISEN-Repair Inventory Manager/My Project/AssemblyInfo.vb index f8685df..c189a0c 100644 --- a/ISEN-Repair Inventory Manager/My Project/AssemblyInfo.vb +++ b/ISEN-Repair Inventory Manager/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' en utilisant '*', comme indiqué ci-dessous : ' - - + +