diff --git a/VECTO/ApplicationEvents.vb b/VECTO/ApplicationEvents.vb index c9665b0d7d4e2edae1dc459bbe7d3c98b23bc097..0b6971c6923812106ae58d46a4e7d84d24d2ac66 100644 --- a/VECTO/ApplicationEvents.vb +++ b/VECTO/ApplicationEvents.vb @@ -112,12 +112,6 @@ Namespace My 'Restart log if log file too large LogFile.SizeCheck() - - - 'License initialization - Lic = New vectolic.cLicense - Lic.AppVersion = "2.2" 'VECTOvers - Lic.FilePath = MyAppPath & "license.dat" End Sub Private Sub MyApplication_UnhandledException(ByVal sender As Object, diff --git a/VECTO/Configuration.vb b/VECTO/Configuration.vb index 315694210f274230eddce3bce6230cd0acb550f0..ddbff60825b231f8aa1da3673fbba5b8a1e7729d 100644 --- a/VECTO/Configuration.vb +++ b/VECTO/Configuration.vb @@ -91,7 +91,6 @@ Public Class Configuration Public Sub Save() Dim header As Dictionary(Of String, Object) = New Dictionary(Of String, Object) - header.Add("CreatedBy", Lic.LicString & " (" & Lic.GUID & ")") header.Add("Date", Now.ToUniversalTime().ToString("o")) header.Add("AppVersion", VECTOvers) header.Add("FileVersion", FormatVersion) diff --git a/VECTO/GUI/AboutBox.Designer.vb b/VECTO/GUI/AboutBox.Designer.vb index bde22d1a8880d8e60b1b860f69a76931513a47d6..0fad78eab49d8941ae7b3ecff8bc02b74e9b74f7 100644 --- a/VECTO/GUI/AboutBox.Designer.vb +++ b/VECTO/GUI/AboutBox.Designer.vb @@ -36,59 +36,23 @@ Partial Class AboutBox 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. <DebuggerStepThrough()> _ Private Sub InitializeComponent() - Me.Label10 = New System.Windows.Forms.Label() - Me.LabelLic = New System.Windows.Forms.Label() - Me.LabelLicDate = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() Me.Label8 = New System.Windows.Forms.Label() - Me.Panel1 = New System.Windows.Forms.Panel() Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.Label1 = New System.Windows.Forms.Label() Me.LinkLabel1 = New System.Windows.Forms.LinkLabel() Me.LinkLabel2 = New System.Windows.Forms.LinkLabel() Me.Label3 = New System.Windows.Forms.Label() Me.PictureBoxJRC = New System.Windows.Forms.PictureBox() - Me.Panel1.SuspendLayout() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxJRC, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'Label10 - ' - Me.Label10.AutoSize = True - Me.Label10.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label10.Location = New System.Drawing.Point(9, 250) - Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(75, 13) - Me.Label10.TabIndex = 11 - Me.Label10.Text = "License file:" - ' - 'LabelLic - ' - Me.LabelLic.AutoSize = True - Me.LabelLic.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.LabelLic.Location = New System.Drawing.Point(3, 0) - Me.LabelLic.Name = "LabelLic" - Me.LabelLic.Size = New System.Drawing.Size(22, 13) - Me.LabelLic.TabIndex = 12 - Me.LabelLic.Text = "Lic" - ' - 'LabelLicDate - ' - Me.LabelLicDate.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.LabelLicDate.AutoSize = True - Me.LabelLicDate.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.LabelLicDate.Location = New System.Drawing.Point(3, 26) - Me.LabelLicDate.Name = "LabelLicDate" - Me.LabelLicDate.Size = New System.Drawing.Size(12, 13) - Me.LabelLicDate.TabIndex = 13 - Me.LabelLicDate.Text = "-" - ' 'Label2 ' Me.Label2.AutoSize = True Me.Label2.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label2.Location = New System.Drawing.Point(9, 346) + Me.Label2.Location = New System.Drawing.Point(12, 241) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(162, 13) Me.Label2.TabIndex = 7 @@ -98,22 +62,12 @@ Partial Class AboutBox ' Me.Label8.AutoSize = True Me.Label8.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label8.Location = New System.Drawing.Point(24, 368) + Me.Label8.Location = New System.Drawing.Point(27, 263) Me.Label8.Name = "Label8" Me.Label8.Size = New System.Drawing.Size(158, 39) Me.Label8.TabIndex = 3 Me.Label8.Text = "Joint Research Centre" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Sustainable Transport Unit" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "European Commission" ' - 'Panel1 - ' - Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D - Me.Panel1.Controls.Add(Me.LabelLic) - Me.Panel1.Controls.Add(Me.LabelLicDate) - Me.Panel1.Location = New System.Drawing.Point(12, 266) - Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(464, 52) - Me.Panel1.TabIndex = 16 - ' 'PictureBox1 ' Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_About @@ -127,7 +81,7 @@ Partial Class AboutBox ' Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(9, 436) + Me.Label1.Location = New System.Drawing.Point(12, 331) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(105, 13) Me.Label1.TabIndex = 7 @@ -136,7 +90,7 @@ Partial Class AboutBox 'LinkLabel1 ' Me.LinkLabel1.AutoSize = True - Me.LinkLabel1.Location = New System.Drawing.Point(120, 436) + Me.LinkLabel1.Location = New System.Drawing.Point(123, 331) Me.LinkLabel1.Name = "LinkLabel1" Me.LinkLabel1.Size = New System.Drawing.Size(122, 13) Me.LinkLabel1.TabIndex = 17 @@ -168,7 +122,7 @@ Partial Class AboutBox ' Me.PictureBoxJRC.Cursor = System.Windows.Forms.Cursors.Hand Me.PictureBoxJRC.Image = Global.TUGraz.VECTO.My.Resources.Resources.JRC_About - Me.PictureBoxJRC.Location = New System.Drawing.Point(216, 353) + Me.PictureBoxJRC.Location = New System.Drawing.Point(219, 248) Me.PictureBoxJRC.Name = "PictureBoxJRC" Me.PictureBoxJRC.Size = New System.Drawing.Size(260, 54) Me.PictureBoxJRC.TabIndex = 15 @@ -177,14 +131,12 @@ Partial Class AboutBox 'AboutBox ' Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(491, 474) + Me.ClientSize = New System.Drawing.Size(491, 356) Me.Controls.Add(Me.Label3) Me.Controls.Add(Me.LinkLabel2) Me.Controls.Add(Me.LinkLabel1) - Me.Controls.Add(Me.Panel1) Me.Controls.Add(Me.PictureBoxJRC) Me.Controls.Add(Me.PictureBox1) - Me.Controls.Add(Me.Label10) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.Label8) @@ -192,21 +144,15 @@ Partial Class AboutBox Me.Name = "AboutBox" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "About VECTO" - Me.Panel1.ResumeLayout(False) - Me.Panel1.PerformLayout() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBoxJRC, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents Label10 As Label - Friend WithEvents LabelLic As Label - Friend WithEvents LabelLicDate As Label Friend WithEvents PictureBox1 As PictureBox Friend WithEvents Label2 As Label Friend WithEvents Label8 As Label - Friend WithEvents Panel1 As Panel Friend WithEvents Label1 As Label Friend WithEvents LinkLabel1 As LinkLabel Friend WithEvents LinkLabel2 As LinkLabel diff --git a/VECTO/GUI/AboutBox.vb b/VECTO/GUI/AboutBox.vb index a6aeb1e60f4d046cf06c0b866e9e0cdcc5d00d09..bf00e39bc42b93679b12c6e1b02cef03a6981dec 100644 --- a/VECTO/GUI/AboutBox.vb +++ b/VECTO/GUI/AboutBox.vb @@ -18,8 +18,6 @@ Public Class AboutBox 'Initialize Private Sub F10_AboutBox_Load(ByVal sender As Object, ByVal e As EventArgs) Handles MyBase.Load Text = "VECTO " & VECTOvers & " / VectoCore " & COREvers - LabelLic.Text = Lic.LicString - LabelLicDate.Text = "Expiring date (y/m/d): " & Lic.ExpTime End Sub 'e-mail links---------------------------------------------------------------- diff --git a/VECTO/GUI/FileSignDialog.Designer.vb b/VECTO/GUI/FileSignDialog.Designer.vb deleted file mode 100644 index 2200de7a98365159ce9d84d7334b88c922807a50..0000000000000000000000000000000000000000 --- a/VECTO/GUI/FileSignDialog.Designer.vb +++ /dev/null @@ -1,361 +0,0 @@ -' Copyright 2014 European Union. -' Licensed under the EUPL (the 'Licence'); -' -' * You may not use this work except in compliance with the Licence. -' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl -' * Unless required by applicable law or agreed to in writing, -' software distributed under the Licence is distributed on an "AS IS" basis, -' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -' -' See the LICENSE.txt for the specific language governing permissions and limitations. -Imports System.ComponentModel -Imports Microsoft.VisualBasic.CompilerServices - -<DesignerGenerated()> _ -Partial Class FileSignDialog - Inherits Form - - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - <DebuggerNonUserCode()> _ - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Wird vom Windows Form-Designer benötigt. - Private components As IContainer - - 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. - 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. - 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - <DebuggerStepThrough()> _ - Private Sub InitializeComponent() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(FileSignDialog)) - Me.TbSigFile = New System.Windows.Forms.TextBox() - Me.Label1 = New System.Windows.Forms.Label() - Me.BtBrowse = New System.Windows.Forms.Button() - Me.lvFiles = New System.Windows.Forms.ListView() - Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) - Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) - Me.BtSign = New System.Windows.Forms.Button() - Me.BtClose = New System.Windows.Forms.Button() - Me.BtRemFLD = New System.Windows.Forms.Button() - Me.BtAddFLD = New System.Windows.Forms.Button() - Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.BtClearList = New System.Windows.Forms.Button() - Me.BtReload = New System.Windows.Forms.Button() - Me.GroupBox2 = New System.Windows.Forms.GroupBox() - Me.LbStatus = New System.Windows.Forms.Label() - Me.LbMode = New System.Windows.Forms.Label() - Me.LbDateStr = New System.Windows.Forms.Label() - Me.TbPubKey = New System.Windows.Forms.TextBox() - Me.TbLicStr = New System.Windows.Forms.TextBox() - Me.Label5 = New System.Windows.Forms.Label() - Me.Label6 = New System.Windows.Forms.Label() - Me.Label3 = New System.Windows.Forms.Label() - Me.Label4 = New System.Windows.Forms.Label() - Me.Label2 = New System.Windows.Forms.Label() - Me.GroupBox1.SuspendLayout() - Me.GroupBox2.SuspendLayout() - Me.SuspendLayout() - ' - 'TbSigFile - ' - Me.TbSigFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TbSigFile.Location = New System.Drawing.Point(12, 29) - Me.TbSigFile.Name = "TbSigFile" - Me.TbSigFile.Size = New System.Drawing.Size(528, 20) - Me.TbSigFile.TabIndex = 0 - ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(12, 13) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(99, 13) - Me.Label1.TabIndex = 4 - Me.Label1.Text = "Signature file (.vsig)" - ' - 'BtBrowse - ' - Me.BtBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.BtBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon - Me.BtBrowse.Location = New System.Drawing.Point(541, 27) - Me.BtBrowse.Name = "BtBrowse" - Me.BtBrowse.Size = New System.Drawing.Size(24, 24) - Me.BtBrowse.TabIndex = 1 - Me.BtBrowse.UseVisualStyleBackColor = True - ' - 'lvFiles - ' - Me.lvFiles.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.lvFiles.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2}) - Me.lvFiles.FullRowSelect = True - Me.lvFiles.GridLines = True - Me.lvFiles.LabelEdit = True - Me.lvFiles.Location = New System.Drawing.Point(6, 19) - Me.lvFiles.MultiSelect = False - Me.lvFiles.Name = "lvFiles" - Me.lvFiles.Size = New System.Drawing.Size(565, 217) - Me.lvFiles.TabIndex = 0 - Me.lvFiles.UseCompatibleStateImageBehavior = False - Me.lvFiles.View = System.Windows.Forms.View.Details - ' - 'ColumnHeader1 - ' - Me.ColumnHeader1.Text = "File" - Me.ColumnHeader1.Width = 408 - ' - 'ColumnHeader2 - ' - Me.ColumnHeader2.Text = "Status" - Me.ColumnHeader2.Width = 141 - ' - 'BtSign - ' - Me.BtSign.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.BtSign.Location = New System.Drawing.Point(12, 487) - Me.BtSign.Name = "BtSign" - Me.BtSign.Size = New System.Drawing.Size(126, 23) - Me.BtSign.TabIndex = 5 - Me.BtSign.Text = "Create Signature File" - Me.BtSign.UseVisualStyleBackColor = True - ' - 'BtClose - ' - Me.BtClose.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.BtClose.Location = New System.Drawing.Point(522, 487) - Me.BtClose.Name = "BtClose" - Me.BtClose.Size = New System.Drawing.Size(67, 23) - Me.BtClose.TabIndex = 6 - Me.BtClose.Text = "Close" - Me.BtClose.UseVisualStyleBackColor = True - ' - 'BtRemFLD - ' - Me.BtRemFLD.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.BtRemFLD.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon - Me.BtRemFLD.Location = New System.Drawing.Point(29, 236) - Me.BtRemFLD.Name = "BtRemFLD" - Me.BtRemFLD.Size = New System.Drawing.Size(24, 24) - Me.BtRemFLD.TabIndex = 2 - Me.BtRemFLD.UseVisualStyleBackColor = True - ' - 'BtAddFLD - ' - Me.BtAddFLD.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.BtAddFLD.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon - Me.BtAddFLD.Location = New System.Drawing.Point(5, 236) - Me.BtAddFLD.Name = "BtAddFLD" - Me.BtAddFLD.Size = New System.Drawing.Size(24, 24) - Me.BtAddFLD.TabIndex = 1 - Me.BtAddFLD.UseVisualStyleBackColor = True - ' - 'GroupBox1 - ' - Me.GroupBox1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.GroupBox1.Controls.Add(Me.lvFiles) - Me.GroupBox1.Controls.Add(Me.BtClearList) - Me.GroupBox1.Controls.Add(Me.BtRemFLD) - Me.GroupBox1.Controls.Add(Me.BtAddFLD) - Me.GroupBox1.Location = New System.Drawing.Point(12, 210) - Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(577, 271) - Me.GroupBox1.TabIndex = 4 - Me.GroupBox1.TabStop = False - Me.GroupBox1.Text = "Files" - ' - 'BtClearList - ' - Me.BtClearList.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.BtClearList.Location = New System.Drawing.Point(508, 236) - Me.BtClearList.Name = "BtClearList" - Me.BtClearList.Size = New System.Drawing.Size(63, 24) - Me.BtClearList.TabIndex = 3 - Me.BtClearList.Text = "Clear List" - Me.BtClearList.UseVisualStyleBackColor = True - ' - 'BtReload - ' - Me.BtReload.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.BtReload.Image = Global.TUGraz.VECTO.My.Resources.Resources.Refresh_icon - Me.BtReload.Location = New System.Drawing.Point(565, 27) - Me.BtReload.Name = "BtReload" - Me.BtReload.Size = New System.Drawing.Size(24, 24) - Me.BtReload.TabIndex = 2 - Me.BtReload.UseVisualStyleBackColor = True - ' - 'GroupBox2 - ' - Me.GroupBox2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.GroupBox2.Controls.Add(Me.LbStatus) - Me.GroupBox2.Controls.Add(Me.LbMode) - Me.GroupBox2.Controls.Add(Me.LbDateStr) - Me.GroupBox2.Controls.Add(Me.TbPubKey) - Me.GroupBox2.Controls.Add(Me.TbLicStr) - Me.GroupBox2.Controls.Add(Me.Label5) - Me.GroupBox2.Controls.Add(Me.Label6) - Me.GroupBox2.Controls.Add(Me.Label3) - Me.GroupBox2.Controls.Add(Me.Label4) - Me.GroupBox2.Controls.Add(Me.Label2) - Me.GroupBox2.Location = New System.Drawing.Point(12, 55) - Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Size = New System.Drawing.Size(577, 149) - Me.GroupBox2.TabIndex = 3 - Me.GroupBox2.TabStop = False - Me.GroupBox2.Text = "File Information" - ' - 'LbStatus - ' - Me.LbStatus.AutoSize = True - Me.LbStatus.Location = New System.Drawing.Point(99, 116) - Me.LbStatus.Name = "LbStatus" - Me.LbStatus.Size = New System.Drawing.Size(0, 13) - Me.LbStatus.TabIndex = 4 - ' - 'LbMode - ' - Me.LbMode.AutoSize = True - Me.LbMode.Location = New System.Drawing.Point(99, 87) - Me.LbMode.Name = "LbMode" - Me.LbMode.Size = New System.Drawing.Size(0, 13) - Me.LbMode.TabIndex = 3 - ' - 'LbDateStr - ' - Me.LbDateStr.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.LbDateStr.AutoSize = True - Me.LbDateStr.Location = New System.Drawing.Point(421, 87) - Me.LbDateStr.Name = "LbDateStr" - Me.LbDateStr.Size = New System.Drawing.Size(0, 13) - Me.LbDateStr.TabIndex = 2 - ' - 'TbPubKey - ' - Me.TbPubKey.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TbPubKey.Location = New System.Drawing.Point(99, 48) - Me.TbPubKey.Name = "TbPubKey" - Me.TbPubKey.ReadOnly = True - Me.TbPubKey.Size = New System.Drawing.Size(472, 20) - Me.TbPubKey.TabIndex = 1 - ' - 'TbLicStr - ' - Me.TbLicStr.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TbLicStr.Location = New System.Drawing.Point(99, 22) - Me.TbLicStr.Name = "TbLicStr" - Me.TbLicStr.ReadOnly = True - Me.TbLicStr.Size = New System.Drawing.Size(472, 20) - Me.TbLicStr.TabIndex = 0 - ' - 'Label5 - ' - Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(33, 51) - Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(60, 13) - Me.Label5.TabIndex = 0 - Me.Label5.Text = "Public Key:" - ' - 'Label6 - ' - Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(53, 116) - Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(40, 13) - Me.Label6.TabIndex = 0 - Me.Label6.Text = "Status:" - ' - 'Label3 - ' - Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(56, 87) - Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(37, 13) - Me.Label3.TabIndex = 0 - Me.Label3.Text = "Mode:" - ' - 'Label4 - ' - Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(340, 87) - Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(75, 13) - Me.Label4.TabIndex = 0 - Me.Label4.Text = "Creation Time:" - ' - 'Label2 - ' - Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(12, 25) - Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(81, 13) - Me.Label2.TabIndex = 0 - Me.Label2.Text = "License Owner:" - ' - 'FileSignDialog - ' - Me.ClientSize = New System.Drawing.Size(601, 522) - Me.Controls.Add(Me.GroupBox2) - Me.Controls.Add(Me.BtReload) - Me.Controls.Add(Me.GroupBox1) - Me.Controls.Add(Me.BtClose) - Me.Controls.Add(Me.BtSign) - Me.Controls.Add(Me.BtBrowse) - Me.Controls.Add(Me.Label1) - Me.Controls.Add(Me.TbSigFile) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) - Me.MaximizeBox = False - Me.MinimizeBox = False - Me.MinimumSize = New System.Drawing.Size(480, 400) - Me.Name = "FileSignDialog" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Sign & Verify Files" - Me.GroupBox1.ResumeLayout(False) - Me.GroupBox2.ResumeLayout(False) - Me.GroupBox2.PerformLayout() - Me.ResumeLayout(False) - Me.PerformLayout() - - End Sub - Friend WithEvents TbSigFile As TextBox - Friend WithEvents Label1 As Label - Friend WithEvents BtBrowse As Button - Friend WithEvents lvFiles As ListView - Friend WithEvents ColumnHeader1 As ColumnHeader - Friend WithEvents ColumnHeader2 As ColumnHeader - Friend WithEvents BtSign As Button - Friend WithEvents BtClose As Button - Friend WithEvents BtRemFLD As Button - Friend WithEvents BtAddFLD As Button - Friend WithEvents GroupBox1 As GroupBox - Friend WithEvents BtClearList As Button - Friend WithEvents BtReload As Button - Friend WithEvents GroupBox2 As GroupBox - Friend WithEvents Label3 As Label - Friend WithEvents Label4 As Label - Friend WithEvents Label2 As Label - Friend WithEvents LbMode As Label - Friend WithEvents LbDateStr As Label - Friend WithEvents TbPubKey As TextBox - Friend WithEvents TbLicStr As TextBox - Friend WithEvents Label5 As Label - Friend WithEvents LbStatus As Label - Friend WithEvents Label6 As Label - -End Class diff --git a/VECTO/GUI/FileSignDialog.resx b/VECTO/GUI/FileSignDialog.resx deleted file mode 100644 index 67506e4ae66e49508c6860afb6374f19ef548823..0000000000000000000000000000000000000000 --- a/VECTO/GUI/FileSignDialog.resx +++ /dev/null @@ -1,145 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<root> - <!-- - Microsoft ResX Schema - - Version 2.0 - - The primary goals of this format is to allow a simple XML format - that is mostly human readable. The generation and parsing of the - various data types are done through the TypeConverter classes - associated with the data types. - - Example: - - ... ado.net/XML headers & schema ... - <resheader name="resmimetype">text/microsoft-resx</resheader> - <resheader name="version">2.0</resheader> - <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> - <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> - <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> - <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> - <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> - <value>[base64 mime encoded serialized .NET Framework object]</value> - </data> - <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> - <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> - <comment>This is a comment</comment> - </data> - - There are any number of "resheader" rows that contain simple - name/value pairs. - - Each data row contains a name, and value. The row also contains a - type or mimetype. Type corresponds to a .NET class that support - text/value conversion through the TypeConverter architecture. - Classes that don't support this are serialized and stored with the - mimetype set. - - The mimetype is used for serialized objects, and tells the - ResXResourceReader how to depersist the object. This is currently not - extensible. For a given mimetype the value must be set accordingly: - - Note - application/x-microsoft.net.object.binary.base64 is the format - that the ResXResourceWriter will generate, however the reader can - read any of the formats listed below. - - mimetype: application/x-microsoft.net.object.binary.base64 - value : The object must be serialized with - : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter - : and then encoded with base64 encoding. - - mimetype: application/x-microsoft.net.object.soap.base64 - value : The object must be serialized with - : System.Runtime.Serialization.Formatters.Soap.SoapFormatter - : and then encoded with base64 encoding. - - mimetype: application/x-microsoft.net.object.bytearray.base64 - value : The object must be serialized into a byte array - : using a System.ComponentModel.TypeConverter - : and then encoded with base64 encoding. - --> - <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> - <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> - <xsd:element name="root" msdata:IsDataSet="true"> - <xsd:complexType> - <xsd:choice maxOccurs="unbounded"> - <xsd:element name="metadata"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="value" type="xsd:string" minOccurs="0" /> - </xsd:sequence> - <xsd:attribute name="name" use="required" type="xsd:string" /> - <xsd:attribute name="type" type="xsd:string" /> - <xsd:attribute name="mimetype" type="xsd:string" /> - <xsd:attribute ref="xml:space" /> - </xsd:complexType> - </xsd:element> - <xsd:element name="assembly"> - <xsd:complexType> - <xsd:attribute name="alias" type="xsd:string" /> - <xsd:attribute name="name" type="xsd:string" /> - </xsd:complexType> - </xsd:element> - <xsd:element name="data"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> - <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> - <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> - <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> - <xsd:attribute ref="xml:space" /> - </xsd:complexType> - </xsd:element> - <xsd:element name="resheader"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required" /> - </xsd:complexType> - </xsd:element> - </xsd:choice> - </xsd:complexType> - </xsd:element> - </xsd:schema> - <resheader name="resmimetype"> - <value>text/microsoft-resx</value> - </resheader> - <resheader name="version"> - <value>2.0</value> - </resheader> - <resheader name="reader"> - <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </resheader> - <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="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> - <value> - AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAQAAAAZBAQEMwYGBjIAAAAVAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAA4zMzNxpaWl3dPT0/7R0dH+nZ2d4DExMXIAAAAJAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAdDQ0N/2dnZ/dzc3P/i4uL/5+fn/+vr6//Y2Nj+PT09ggAAAAMAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAEBAQsv7+/8NfX1//c3Nz/3t7e/+fn5//r6+v/7Ozs/8TExPcJCQknAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAMTExaMvLy//Z2dn/3Nzc/9zc3P/h4eH/6enp/+zs7P/r6+v/ODg4awAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAEtLS327u7vrampqLWhoaFvb29v+39/f/+Li4v/r6+v/6urq/0pK - SnMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABLS0tmra2t9BQUFFsmJiZz1dXV/OTk5P/g4OD/5OTk/+jo - 6P9sbGzHAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIiIiHs7Ozvetra3/xMTE/97e3v/k5OT/5ubm/+fn - 5//g4OD/4uLi/2pqasMAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAACSkpJ22NjY/uHh4f/j4+P/5OTk/+Xl - 5f/h4eH/xsbG/+bm5v/o6Oj/bm5uvwAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAL+/v1/Z2dnd3t7e/t7e - 3vzJycn2uru6/9fY1//Y2dj/6enp/+rq6v9wcHC8AAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAc3NzAZGR - kRaNjY0Sf4B/Mn5+fnXDxMPq29vb/9zc3P/r6+v/7Ozs/3FxcbkAAAAdAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAQEBADoKCgsN3d3fze3t7/4OHg/+7u7v/u7u7/cnJytgAAABoAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAADc3NwK/v7+DxcXF1+Li4v/l5eX/8PDw//Hx8f9WVlaFAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC0tLTrn5+f/5+fn/+np6f/z8/P/gYGBogAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAmJiYKt7e3suTk5PXs7Oz/7e7t/39/ - f50AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACoqKhc2tras9vb - 27xeXl48//8AAOH/AADAfwAAgH8AAIB/AACwfwAAsD8AAIAfAADADwAA4AcAAP8DAAD/AQAA/4AAAP/g - AAD/4AAA//kAAA== -</value> - </data> -</root> \ No newline at end of file diff --git a/VECTO/GUI/FileSignDialog.vb b/VECTO/GUI/FileSignDialog.vb deleted file mode 100644 index 0e96fa5cc1220fce90cfdbc98f12a53718108a3b..0000000000000000000000000000000000000000 --- a/VECTO/GUI/FileSignDialog.vb +++ /dev/null @@ -1,225 +0,0 @@ -' Copyright 2014 European Union. -' Licensed under the EUPL (the 'Licence'); -' -' * You may not use this work except in compliance with the Licence. -' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl -' * Unless required by applicable law or agreed to in writing, -' software distributed under the Licence is distributed on an "AS IS" basis, -' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -' -' See the LICENSE.txt for the specific language governing permissions and limitations. -Imports System.IO -Imports System.Windows.Forms -Imports vectolic - -''' <summary> -''' Create/Verify signature files (.vsig). -''' </summary> -''' <remarks></remarks> -Public Class FileSignDialog - 'Create signature file - Private Sub BtSign_Click(sender As Object, e As EventArgs) Handles BtSign.Click - Dim listViewItem As ListViewItem - Dim mainDirectory As String - - If lvFiles.Items.Count = 0 Then - MsgBox("No files selected!", MsgBoxStyle.Critical) - Exit Sub - End If - - If Trim(TbSigFile.Text) = "" Then - MsgBox("No signature file path defined!", MsgBoxStyle.Critical) - Exit Sub - End If - - If File.Exists(TbSigFile.Text) Then - If MsgBox("Overwrite existing signature file?", MsgBoxStyle.YesNo) = MsgBoxResult.No Then Exit Sub - End If - - ClearForm(False) - - - mainDirectory = GetPath(TbSigFile.Text) - - - Lic.FileSigning.NewFile() - Lic.FileSigning.Mode = cFileSigning.tMode.Manual - - - For Each listViewItem In lvFiles.Items - Lic.FileSigning.AddFile(FileRepl(listViewItem.SubItems(0).Text, mainDirectory)) - listViewItem.SubItems(1).Text = "" - listViewItem.ForeColor = Color.Black - Next - - If Lic.FileSigning.WriteSigFile(TbSigFile.Text, LicSigAppCode) Then - LbStatus.Text = "Signature file created successfully" - LbStatus.ForeColor = Color.DarkGreen - Else - LbStatus.Text = "Fail to create signature file! " & Lic.FileSigning.ErrorMsg - LbStatus.ForeColor = Color.Red - End If - - TbLicStr.Text = Lic.FileSigning.CreatorLicStr - TbPubKey.Text = Lic.FileSigning.PubKey - LbMode.Text = Lic.FileSigning.ModeConv(Lic.FileSigning.Mode) - LbDateStr.Text = Lic.FileSigning.DateStr - - If Lic.FileSigning.FilesOK.Count > 0 Then - For Each listViewItem In lvFiles.Items - listViewItem.SubItems(1).Text = Lic.FileSigning.FilesMsg(listViewItem.Index) - If Lic.FileSigning.FilesOK(listViewItem.Index) Then - listViewItem.ForeColor = Color.DarkGreen - Else - listViewItem.ForeColor = Color.Red - Exit For - End If - Next - End If - End Sub - - 'Verify existing signature file - Public Sub VerifySigFile() - Dim lv0 As ListViewItem - Dim i As Integer - - If Not File.Exists(TbSigFile.Text) Then - MsgBox("Signature file not found!", MsgBoxStyle.Critical) - Exit Sub - End If - - ClearForm(True) - - If Lic.FileSigning.ReadSigFile(TbSigFile.Text, LicSigAppCode) Then - LbStatus.Text = "File signature verified" - LbStatus.ForeColor = Color.DarkGreen - Else - LbStatus.Text = "ERROR! " & Lic.FileSigning.ErrorMsg - LbStatus.ForeColor = Color.Red - End If - - TbLicStr.Text = Lic.FileSigning.CreatorLicStr - TbPubKey.Text = Lic.FileSigning.PubKey - LbMode.Text = Lic.FileSigning.ModeConv(Lic.FileSigning.Mode) - If Lic.FileSigning.Mode = cFileSigning.tMode.Auto Then - LbMode.ForeColor = Color.DarkGreen - Else - LbMode.ForeColor = Color.Red - End If - LbDateStr.Text = Lic.FileSigning.DateStr - - For i = 0 To Lic.FileSigning.FilesOK.Count - 1 - lv0 = New ListViewItem(Lic.FileSigning.Files(i)) - lv0.SubItems.Add(Lic.FileSigning.FilesMsg(i)) - If Lic.FileSigning.FilesOK(i) Then - lv0.ForeColor = Color.DarkGreen - Else - lv0.ForeColor = Color.Red - End If - lvFiles.Items.Add(lv0) - Next - End Sub - - 'Clear form - Private Sub ClearForm(clearFileList As Boolean) - If ClearFileList Then lvFiles.Items.Clear() - TbLicStr.Text = "" - TbPubKey.Text = "" - LbMode.Text = "" - LbDateStr.Text = "" - LbStatus.Text = "" - LbMode.ForeColor = DefaultForeColor - LbMode.BackColor = DefaultBackColor - LbStatus.ForeColor = DefaultForeColor - LbStatus.BackColor = DefaultBackColor - End Sub - - -#Region "GUI Controls" - - Private Sub BtBrowse_Click(sender As Object, e As EventArgs) Handles BtBrowse.Click - Dim fb As New FileBrowser("sig", False, True) - fb.Extensions = New String() {"vsig"} - - If fb.CustomDialog(TbSigFile.Text, False, False, FileBrowserFileExtensionMode.ForceExt, False, "vsig") Then - TbSigFile.Text = fb.Files(0) - End If - - If File.Exists(TbSigFile.Text) Then - VerifySigFile() - End If - End Sub - - Private Sub BtAddFLD_Click(sender As Object, e As EventArgs) Handles BtAddFLD.Click - AddFile() - End Sub - - Private Sub BtRemFLD_Click(sender As Object, e As EventArgs) Handles BtRemFLD.Click - RemoveFile() - End Sub - - Private Sub BtClose_Click(sender As Object, e As EventArgs) Handles BtClose.Click - Close() - End Sub - - Private Sub BtClearList_Click(sender As Object, e As EventArgs) Handles BtClearList.Click - lvFiles.Items.Clear() - End Sub - - Private Sub BtReload_Click(sender As Object, e As EventArgs) Handles BtReload.Click - VerifySigFile() - End Sub - - Private Sub lvFiles_KeyDown(sender As Object, e As KeyEventArgs) Handles lvFiles.KeyDown - Select Case e.KeyCode - Case Keys.Delete, Keys.Back - RemoveFile() - End Select - End Sub - -#End Region - - 'Add File - Private Sub AddFile() - Dim lvi As ListViewItem - Dim fb As New FileBrowser("xxx", False, True) - Dim str As String - - If fb.OpenDialog("", True) Then - - For Each str In fb.Files - - lvi = New ListViewItem(str) - lvi.SubItems.Add("") - lvi.ForeColor = Color.Black - - lvFiles.Items.Add(lvi) - lvi.EnsureVisible() - - lvFiles.Focus() - - Next - - End If - End Sub - - 'Remove File - Private Sub RemoveFile() - Dim i0 As Integer - - If lvFiles.Items.Count = 0 Then Exit Sub - - If lvFiles.SelectedItems.Count = 0 Then lvFiles.Items(lvFiles.Items.Count - 1).Selected = True - - i0 = lvFiles.SelectedItems(0).Index - - lvFiles.SelectedItems(0).Remove() - - If i0 < lvFiles.Items.Count Then - lvFiles.Items(i0).Selected = True - lvFiles.Items(i0).EnsureVisible() - End If - - lvFiles.Focus() - End Sub -End Class diff --git a/VECTO/GUI/MainForm.Designer.vb b/VECTO/GUI/MainForm.Designer.vb index 084944fddc92935d6d4c85dcae8c5b38d1d4b434..3493d8c43bb013e8cb856f1e65b29e69b17a6701 100644 --- a/VECTO/GUI/MainForm.Designer.vb +++ b/VECTO/GUI/MainForm.Designer.vb @@ -99,8 +99,6 @@ Partial Class MainForm Me.GearboxEditorToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GraphToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator6 = New System.Windows.Forms.ToolStripSeparator() - Me.SignOrVerifyFilesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator() Me.OpenLogToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SettingsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripDrDnBtInfo = New System.Windows.Forms.ToolStripDropDownButton() @@ -108,7 +106,6 @@ Partial Class MainForm Me.UpdateNotesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ReportBugViaCITnetToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() - Me.CreateActivationFileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AboutVECTOToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.CmDEV = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.TmProgSec = New System.Windows.Forms.Timer(Me.components) @@ -672,7 +669,7 @@ Partial Class MainForm ' 'ToolStripDrDnBtTools ' - Me.ToolStripDrDnBtTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GENEditorToolStripMenuItem1, Me.VEHEditorToolStripMenuItem, Me.EngineEditorToolStripMenuItem, Me.GearboxEditorToolStripMenuItem, Me.GraphToolStripMenuItem, Me.ToolStripSeparator6, Me.SignOrVerifyFilesToolStripMenuItem, Me.ToolStripSeparator4, Me.OpenLogToolStripMenuItem, Me.SettingsToolStripMenuItem}) + Me.ToolStripDrDnBtTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GENEditorToolStripMenuItem1, Me.VEHEditorToolStripMenuItem, Me.EngineEditorToolStripMenuItem, Me.GearboxEditorToolStripMenuItem, Me.GraphToolStripMenuItem, Me.ToolStripSeparator6, Me.OpenLogToolStripMenuItem, Me.SettingsToolStripMenuItem}) Me.ToolStripDrDnBtTools.Image = Global.TUGraz.VECTO.My.Resources.Resources.Misc_Tools_icon Me.ToolStripDrDnBtTools.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripDrDnBtTools.Name = "ToolStripDrDnBtTools" @@ -719,19 +716,6 @@ Partial Class MainForm Me.ToolStripSeparator6.Name = "ToolStripSeparator6" Me.ToolStripSeparator6.Size = New System.Drawing.Size(167, 6) ' - 'SignOrVerifyFilesToolStripMenuItem - ' - Me.SignOrVerifyFilesToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.Status_dialog_password_icon - Me.SignOrVerifyFilesToolStripMenuItem.Name = "SignOrVerifyFilesToolStripMenuItem" - Me.SignOrVerifyFilesToolStripMenuItem.Size = New System.Drawing.Size(170, 22) - Me.SignOrVerifyFilesToolStripMenuItem.Text = "Sign or Verify Files" - ' - 'ToolStripSeparator4 - ' - Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(167, 6) - Me.ToolStripSeparator4.Visible = False - ' 'OpenLogToolStripMenuItem ' Me.OpenLogToolStripMenuItem.Name = "OpenLogToolStripMenuItem" @@ -746,7 +730,7 @@ Partial Class MainForm ' 'ToolStripDrDnBtInfo ' - Me.ToolStripDrDnBtInfo.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.UserManualToolStripMenuItem, Me.UpdateNotesToolStripMenuItem, Me.ReportBugViaCITnetToolStripMenuItem, Me.ToolStripSeparator3, Me.CreateActivationFileToolStripMenuItem, Me.AboutVECTOToolStripMenuItem1}) + Me.ToolStripDrDnBtInfo.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.UserManualToolStripMenuItem, Me.UpdateNotesToolStripMenuItem, Me.ReportBugViaCITnetToolStripMenuItem, Me.ToolStripSeparator3, Me.AboutVECTOToolStripMenuItem1}) Me.ToolStripDrDnBtInfo.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon Me.ToolStripDrDnBtInfo.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripDrDnBtInfo.Name = "ToolStripDrDnBtInfo" @@ -776,12 +760,6 @@ Partial Class MainForm Me.ToolStripSeparator3.Name = "ToolStripSeparator3" Me.ToolStripSeparator3.Size = New System.Drawing.Size(219, 6) ' - 'CreateActivationFileToolStripMenuItem - ' - Me.CreateActivationFileToolStripMenuItem.Name = "CreateActivationFileToolStripMenuItem" - Me.CreateActivationFileToolStripMenuItem.Size = New System.Drawing.Size(222, 22) - Me.CreateActivationFileToolStripMenuItem.Text = "Create Activation File" - ' 'AboutVECTOToolStripMenuItem1 ' Me.AboutVECTOToolStripMenuItem1.Name = "AboutVECTOToolStripMenuItem1" @@ -905,11 +883,9 @@ Partial Class MainForm Friend WithEvents ToolStripDrDnBtTools As ToolStripDropDownButton Friend WithEvents GENEditorToolStripMenuItem1 As ToolStripMenuItem Friend WithEvents VEHEditorToolStripMenuItem As ToolStripMenuItem - Friend WithEvents ToolStripSeparator4 As ToolStripSeparator Friend WithEvents OpenLogToolStripMenuItem As ToolStripMenuItem Friend WithEvents SettingsToolStripMenuItem As ToolStripMenuItem Friend WithEvents ToolStripDrDnBtInfo As ToolStripDropDownButton - Friend WithEvents CreateActivationFileToolStripMenuItem As ToolStripMenuItem Friend WithEvents AboutVECTOToolStripMenuItem1 As ToolStripMenuItem Friend WithEvents ToolStripSeparator2 As ToolStripSeparator Friend WithEvents ToolStripProgBarJob As ToolStripProgressBar @@ -925,7 +901,6 @@ Partial Class MainForm Friend WithEvents ColumnHeader8 As ColumnHeader Friend WithEvents ColumnHeader9 As ColumnHeader Friend WithEvents UpdateNotesToolStripMenuItem As ToolStripMenuItem - Friend WithEvents SignOrVerifyFilesToolStripMenuItem As ToolStripMenuItem Friend WithEvents ToolStripSeparator6 As ToolStripSeparator Friend WithEvents LbDecl As Label Friend WithEvents GraphToolStripMenuItem As ToolStripMenuItem diff --git a/VECTO/GUI/MainForm.resx b/VECTO/GUI/MainForm.resx index 1ab95c20be0eb1a9777f7aae6720fb67961848f1..7a10cc6bc771ee05159f0a0d4132dbe37d358569 100644 --- a/VECTO/GUI/MainForm.resx +++ b/VECTO/GUI/MainForm.resx @@ -223,6 +223,9 @@ <metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>732, 12</value> </metadata> + <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>850, 12</value> + </metadata> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>49</value> </metadata> diff --git a/VECTO/GUI/MainForm.vb b/VECTO/GUI/MainForm.vb index 6ea4e1b2ee87e50d96e3c5368124383e164bf2da..46640a46b889d89a166ccbb70554072a5034ff79 100644 --- a/VECTO/GUI/MainForm.vb +++ b/VECTO/GUI/MainForm.vb @@ -253,31 +253,9 @@ Public Class MainForm VectoWorkerV3.WorkerReportsProgress = True VectoWorkerV3.WorkerSupportsCancellation = True - 'Set mode (Batch/Standard) ModeUpdate() - -#If DEBUG Then - Const LicCheck As Boolean = False -#Else - Const LicCheck As Boolean = True -#End If - - 'License check - If LicCheck And Not Lic.LICcheck() Then - MsgBox("License File invalid!" & vbCrLf & vbCrLf & Lic.FailMsg) - If Lic.CreateActFile(MyAppPath & "ActivationCode.dat") Then - MsgBox("Activation File created.") - Else - MsgBox("Failed to create Activation File! Is Directory Read-Only?") - End If - Close() - Else - GUIMsg(MessageType.Normal, "License File validated.") - If Lic.TimeWarn Then GUIMsg(MessageType.Warn, "License expiring date (y/m/d): " & Lic.ExpTime) - End If - DeclOnOff() End Sub @@ -399,8 +377,6 @@ Public Class MainForm End Try Case ".VECTO" OpenVECTOeditor(file) - Case ".VSIG" - OpenSigFile(file) Case Else MsgBox("Type '" & GetExtension(file) & "' unknown!", MsgBoxStyle.Critical) End Select @@ -694,7 +670,7 @@ lbFound: 'Open input file Private Sub ToolStripBtOpen_Click(sender As Object, e As EventArgs) Handles ToolStripBtOpen.Click - If JobfileFileBrowser.OpenDialog("", False, "vecto,vveh,vgbx,veng,vsig") Then + If JobfileFileBrowser.OpenDialog("", False, "vecto,vveh,vgbx,veng") Then OpenVectoFile(JobfileFileBrowser.Files(0)) End If End Sub @@ -740,16 +716,6 @@ lbFound: graphForm.Show() End Sub - Private Sub SignOrVerifyFilesToolStripMenuItem_Click(sender As Object, e As EventArgs) _ - Handles SignOrVerifyFilesToolStripMenuItem.Click - If Not FileSignDialog.Visible Then - FileSignDialog.Show() - Else - If FileSignDialog.WindowState = FormWindowState.Minimized Then FileSignDialog.WindowState = FormWindowState.Normal - FileSignDialog.BringToFront() - End If - End Sub - Private Sub OpenLogToolStripMenuItem_Click(sender As Object, e As EventArgs) _ Handles OpenLogToolStripMenuItem.Click Process.Start(MyAppPath & "log.txt") @@ -787,18 +753,6 @@ lbFound: JiraDialog.ShowDialog() End Sub - Private Sub CreateActivationFileToolStripMenuItem_Click(sender As Object, e As EventArgs) _ - Handles CreateActivationFileToolStripMenuItem.Click - If MsgBox("Create Activation File ?", MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then - If Lic.CreateActFile(MyAppPath & "ActivationCode.dat") Then - GUIMsg(MessageType.Normal, "Activation File created.") - Else - GUIMsg(MessageType.Err, "Failed to create Activation File!") - MsgBox("ERROR! Failed to create Activation File!", MsgBoxStyle.Critical) - End If - End If - End Sub - Private Sub AboutVECTOToolStripMenuItem1_Click(sender As Object, e As EventArgs) _ Handles AboutVECTOToolStripMenuItem1.Click AboutBox.ShowDialog() @@ -1335,18 +1289,6 @@ lbFound: VectoJobForm.Activate() End Sub - 'Open signature file (.vsig) - Friend Sub OpenSigFile(file As String) - If Not FileSignDialog.Visible Then - FileSignDialog.Show() - - End If - FileSignDialog.WindowState = FormWindowState.Normal - FileSignDialog.TbSigFile.Text = file - FileSignDialog.VerifySigFile() - FileSignDialog.Activate() - End Sub - 'Save job and cycle file lists Private Sub SaveFileLists() _jobListView.SaveList() diff --git a/VECTO/Libraries/vectolic.dll b/VECTO/Libraries/vectolic.dll deleted file mode 100644 index a9fa8b3aec990bda37244108eff13227cc70a9cd..0000000000000000000000000000000000000000 Binary files a/VECTO/Libraries/vectolic.dll and /dev/null differ diff --git a/VECTO/OutputData/JSONFileWriter.vb b/VECTO/OutputData/JSONFileWriter.vb index 078ef5a1a41b316861038cff841d3a0aa71e3b16..cd75ddf76eb4090ae86cb979ee68c3ce24f173c6 100644 --- a/VECTO/OutputData/JSONFileWriter.vb +++ b/VECTO/OutputData/JSONFileWriter.vb @@ -67,7 +67,7 @@ Public Class JSONFileWriter Protected Function GetHeader(fileVersion As Integer) As Dictionary(Of String, Object) Dim header As Dictionary(Of String, Object) = New Dictionary(Of String, Object) - header.Add("CreatedBy", Lic.LicString & " (" & Lic.GUID & ")") + header.Add("CreatedBy", "") header.Add("Date", Now.ToUniversalTime().ToString("o")) header.Add("AppVersion", VECTOvers) header.Add("FileVersion", fileVersion) diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj index 8e8ee3c8bcb0a0ba19f3a824ab3f6f20f6872609..ae5fc514ab3eefb96066e653dc8e7ce19d7fd4bb 100644 --- a/VECTO/VECTO.vbproj +++ b/VECTO/VECTO.vbproj @@ -161,9 +161,6 @@ <Reference Include="System.Windows.Forms.DataVisualization" /> <Reference Include="System.Xml" /> <Reference Include="System.Xml.Linq" /> - <Reference Include="vectolic"> - <HintPath>.\vectolic.dll</HintPath> - </Reference> </ItemGroup> <ItemGroup> <Import Include="Microsoft.VisualBasic" /> @@ -195,12 +192,6 @@ <SubType>Form</SubType> </Compile> <Compile Include="Input Files\AdvancedAuxiliary.vb" /> - <Compile Include="GUI\FileSignDialog.Designer.vb"> - <DependentUpon>FileSignDialog.vb</DependentUpon> - </Compile> - <Compile Include="GUI\FileSignDialog.vb"> - <SubType>Form</SubType> - </Compile> <Compile Include="GUI\GraphForm.Designer.vb"> <DependentUpon>GraphForm.vb</DependentUpon> </Compile> @@ -336,9 +327,6 @@ <EmbeddedResource Include="File Browser\FileBrowserFavoritesDialog.resx"> <DependentUpon>FileBrowserFavoritesDialog.vb</DependentUpon> </EmbeddedResource> - <EmbeddedResource Include="GUI\FileSignDialog.resx"> - <DependentUpon>FileSignDialog.vb</DependentUpon> - </EmbeddedResource> <EmbeddedResource Include="GUI\GraphForm.resx"> <DependentUpon>GraphForm.vb</DependentUpon> </EmbeddedResource> diff --git a/VECTO/VECTO_Global.vb b/VECTO/VECTO_Global.vb index c6c48b3deda86246944c20bddeb1b6b12578e40f..15f5bbc3880ad564280f3b2ee1482737a62644b1 100644 --- a/VECTO/VECTO_Global.vb +++ b/VECTO/VECTO_Global.vb @@ -25,19 +25,12 @@ Public Module VECTO_Global Public LogFile As FileLogger 'to ensure correct format for backgroundworker thread - Public VectoWorkerV3 As BackgroundWorker Public Cfg As Configuration - 'Public sKey As csKey - Public ReadOnly FileFormat As Encoding = Encoding.UTF8 - Public Lic As cLicense - 'Public VSUM As cVSUM - 'Public DEV As cDEV - Public ProgBarCtrl As ProgressbarControl @@ -256,28 +249,6 @@ Module Constants ' ReSharper disable once ClassNeverInstantiated.Global - End Module - - - - - - - - - - - - - - - - - - - - -