From 24428f3ca77a163ae54d9c67f942675f7f42e986 Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Tue, 20 Jun 2017 13:35:11 +0200 Subject: [PATCH] removing license --- VECTO/ApplicationEvents.vb | 6 - VECTO/Configuration.vb | 1 - VECTO/GUI/AboutBox.Designer.vb | 66 +---- VECTO/GUI/AboutBox.vb | 2 - VECTO/GUI/FileSignDialog.Designer.vb | 361 --------------------------- VECTO/GUI/FileSignDialog.resx | 145 ----------- VECTO/GUI/FileSignDialog.vb | 225 ----------------- VECTO/GUI/MainForm.Designer.vb | 29 +-- VECTO/GUI/MainForm.resx | 3 + VECTO/GUI/MainForm.vb | 60 +---- VECTO/Libraries/vectolic.dll | Bin 54272 -> 0 bytes VECTO/OutputData/JSONFileWriter.vb | 2 +- VECTO/VECTO.vbproj | 12 - VECTO/VECTO_Global.vb | 29 --- 14 files changed, 13 insertions(+), 928 deletions(-) delete mode 100644 VECTO/GUI/FileSignDialog.Designer.vb delete mode 100644 VECTO/GUI/FileSignDialog.resx delete mode 100644 VECTO/GUI/FileSignDialog.vb delete mode 100644 VECTO/Libraries/vectolic.dll diff --git a/VECTO/ApplicationEvents.vb b/VECTO/ApplicationEvents.vb index c9665b0d7d..0b6971c692 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 315694210f..ddbff60825 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 bde22d1a88..0fad78eab4 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 a6aeb1e60f..bf00e39bc4 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 2200de7a98..0000000000 --- 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 67506e4ae6..0000000000 --- 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 0e96fa5cc1..0000000000 --- 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 084944fddc..3493d8c43b 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 1ab95c20be..7a10cc6bc7 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 6ea4e1b2ee..46640a46b8 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 GIT binary patch literal 0 HcmV?d00001 literal 54272 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 G;Qs^SmJ~Dq diff --git a/VECTO/OutputData/JSONFileWriter.vb b/VECTO/OutputData/JSONFileWriter.vb index 078ef5a1a4..cd75ddf76e 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 8e8ee3c8bc..ae5fc514ab 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 c6c48b3ded..15f5bbc388 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 - - - - - - - - - - - - - - - - - - - - - -- GitLab