From 4c42bd83745a49954bdef11d1ff87692874ba5b7 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Mon, 18 Jul 2016 14:23:32 +0200
Subject: [PATCH] file browser dialog with icons
---
VECTO/File Browser/FB_Dialog.designer.vb | 161 ++++-----
VECTO/File Browser/FB_Dialog.resx | 21 ++
VECTO/File Browser/FB_Dialog.vb | 28 +-
VECTO/File Browser/FB_FavDlog.designer.vb | 166 +++++-----
VECTO/File Browser/FB_FavDlog.resx | 4 +-
VECTO/File Browser/FB_FavDlog.vb | 93 +++---
VECTO/GUI/F_MAINForm.Designer.vb | 387 +++++++++++-----------
VECTO/GUI/F_MAINForm.resx | 3 +
VECTO/GUI/F_MAINForm.vb | 28 +-
VECTO/GUI/F_VEH.Designer.vb | 141 ++++----
VECTO/GUI/F_VEH.vb | 19 +-
VECTO/My Project/Resources.Designer.vb | 52 ++-
VECTO/My Project/Resources.resx | 15 +
VECTO/VECTO.vbproj | 16 +
14 files changed, 627 insertions(+), 507 deletions(-)
diff --git a/VECTO/File Browser/FB_Dialog.designer.vb b/VECTO/File Browser/FB_Dialog.designer.vb
index 10b002072e..13be6e15b6 100644
--- a/VECTO/File Browser/FB_Dialog.designer.vb
+++ b/VECTO/File Browser/FB_Dialog.designer.vb
@@ -33,6 +33,7 @@ Partial Class FB_Dialog
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
+ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(FB_Dialog))
Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
Me.Label1 = New System.Windows.Forms.Label()
Me.ButtonNewDir = New System.Windows.Forms.Button()
@@ -42,10 +43,11 @@ Partial Class FB_Dialog
Me.TextBoxSearchFolder = New System.Windows.Forms.TextBox()
Me.ListViewFolder = New System.Windows.Forms.ListView()
Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.ImageList1 = New System.Windows.Forms.ImageList(Me.components)
Me.ComboBoxDrive = New System.Windows.Forms.ComboBox()
+ Me.Label5 = New System.Windows.Forms.Label()
Me.Label2 = New System.Windows.Forms.Label()
Me.ButtonAll = New System.Windows.Forms.Button()
- Me.LabelFileAnz = New System.Windows.Forms.Label()
Me.ComboBoxExt = New System.Windows.Forms.ComboBox()
Me.ButtonHisFile = New System.Windows.Forms.Button()
Me.TextBoxSearchFile = New System.Windows.Forms.TextBox()
@@ -61,8 +63,8 @@ Partial Class FB_Dialog
Me.ButtonCancel = New System.Windows.Forms.Button()
Me.TextBoxCurrent = New System.Windows.Forms.TextBox()
Me.Label3 = New System.Windows.Forms.Label()
- Me.ImageList1 = New System.Windows.Forms.ImageList(Me.components)
Me.Label4 = New System.Windows.Forms.Label()
+ Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainer1.Panel1.SuspendLayout()
Me.SplitContainer1.Panel2.SuspendLayout()
@@ -75,8 +77,7 @@ Partial Class FB_Dialog
Me.SplitContainer1.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.SplitContainer1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
- Me.SplitContainer1.Location = New System.Drawing.Point(3, 49)
+ Me.SplitContainer1.Location = New System.Drawing.Point(0, 46)
Me.SplitContainer1.Name = "SplitContainer1"
'
'SplitContainer1.Panel1
@@ -92,15 +93,15 @@ Partial Class FB_Dialog
'
'SplitContainer1.Panel2
'
+ Me.SplitContainer1.Panel2.Controls.Add(Me.Label5)
Me.SplitContainer1.Panel2.Controls.Add(Me.Label2)
Me.SplitContainer1.Panel2.Controls.Add(Me.ButtonAll)
- Me.SplitContainer1.Panel2.Controls.Add(Me.LabelFileAnz)
Me.SplitContainer1.Panel2.Controls.Add(Me.ComboBoxExt)
Me.SplitContainer1.Panel2.Controls.Add(Me.ButtonHisFile)
Me.SplitContainer1.Panel2.Controls.Add(Me.TextBoxSearchFile)
Me.SplitContainer1.Panel2.Controls.Add(Me.ListViewFiles)
- Me.SplitContainer1.Size = New System.Drawing.Size(562, 395)
- Me.SplitContainer1.SplitterDistance = 280
+ Me.SplitContainer1.Size = New System.Drawing.Size(734, 292)
+ Me.SplitContainer1.SplitterDistance = 365
Me.SplitContainer1.TabIndex = 5
Me.SplitContainer1.TabStop = False
'
@@ -108,7 +109,7 @@ Partial Class FB_Dialog
'
Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.Label1.AutoSize = True
- Me.Label1.Location = New System.Drawing.Point(3, 372)
+ Me.Label1.Location = New System.Drawing.Point(3, 272)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(32, 13)
Me.Label1.TabIndex = 28
@@ -116,54 +117,55 @@ Partial Class FB_Dialog
'
'ButtonNewDir
'
- Me.ButtonNewDir.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.ButtonNewDir.Location = New System.Drawing.Point(96, 2)
+ Me.ButtonNewDir.Image = Global.VECTO.My.Resources.Resources.new_dir
+ Me.ButtonNewDir.Location = New System.Drawing.Point(134, 2)
Me.ButtonNewDir.Name = "ButtonNewDir"
- Me.ButtonNewDir.Size = New System.Drawing.Size(38, 23)
+ Me.ButtonNewDir.Size = New System.Drawing.Size(24, 24)
Me.ButtonNewDir.TabIndex = 21
Me.ButtonNewDir.TabStop = False
- Me.ButtonNewDir.Text = "New"
+ Me.ToolTip1.SetToolTip(Me.ButtonNewDir, "Create new Directory")
Me.ButtonNewDir.UseVisualStyleBackColor = True
'
'ButtonDesktop
'
- Me.ButtonDesktop.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.ButtonDesktop.Location = New System.Drawing.Point(133, 2)
+ Me.ButtonDesktop.Image = Global.VECTO.My.Resources.Resources.desktop
+ Me.ButtonDesktop.Location = New System.Drawing.Point(82, 2)
Me.ButtonDesktop.Name = "ButtonDesktop"
- Me.ButtonDesktop.Size = New System.Drawing.Size(57, 23)
+ Me.ButtonDesktop.Size = New System.Drawing.Size(24, 24)
Me.ButtonDesktop.TabIndex = 22
Me.ButtonDesktop.TabStop = False
- Me.ButtonDesktop.Text = "Desktop"
+ Me.ToolTip1.SetToolTip(Me.ButtonDesktop, "Go to Desktop")
Me.ButtonDesktop.UseVisualStyleBackColor = True
'
'ButtonHisFolder
'
- Me.ButtonHisFolder.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.ButtonHisFolder.Location = New System.Drawing.Point(189, 2)
+ Me.ButtonHisFolder.Image = Global.VECTO.My.Resources.Resources.favorites
+ Me.ButtonHisFolder.Location = New System.Drawing.Point(106, 2)
Me.ButtonHisFolder.Name = "ButtonHisFolder"
- Me.ButtonHisFolder.Size = New System.Drawing.Size(87, 23)
+ Me.ButtonHisFolder.Size = New System.Drawing.Size(24, 24)
Me.ButtonHisFolder.TabIndex = 24
Me.ButtonHisFolder.TabStop = False
- Me.ButtonHisFolder.Text = "History / Fav."
+ Me.ToolTip1.SetToolTip(Me.ButtonHisFolder, "Select from recent directories / favorites")
Me.ButtonHisFolder.UseVisualStyleBackColor = True
'
'ButtonFolderBack
'
- Me.ButtonFolderBack.Location = New System.Drawing.Point(60, 2)
+ Me.ButtonFolderBack.Image = CType(resources.GetObject("ButtonFolderBack.Image"), System.Drawing.Image)
+ Me.ButtonFolderBack.Location = New System.Drawing.Point(58, 2)
Me.ButtonFolderBack.Name = "ButtonFolderBack"
- Me.ButtonFolderBack.Size = New System.Drawing.Size(28, 23)
+ Me.ButtonFolderBack.Size = New System.Drawing.Size(24, 24)
Me.ButtonFolderBack.TabIndex = 20
Me.ButtonFolderBack.TabStop = False
- Me.ButtonFolderBack.Text = "<"
+ Me.ToolTip1.SetToolTip(Me.ButtonFolderBack, "Move up one directory level")
Me.ButtonFolderBack.UseVisualStyleBackColor = True
'
'TextBoxSearchFolder
'
Me.TextBoxSearchFolder.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TextBoxSearchFolder.Location = New System.Drawing.Point(41, 369)
+ Me.TextBoxSearchFolder.Location = New System.Drawing.Point(37, 269)
Me.TextBoxSearchFolder.Name = "TextBoxSearchFolder"
- Me.TextBoxSearchFolder.Size = New System.Drawing.Size(234, 20)
+ Me.TextBoxSearchFolder.Size = New System.Drawing.Size(328, 20)
Me.TextBoxSearchFolder.TabIndex = 15
'
'ListViewFolder
@@ -175,10 +177,10 @@ Partial Class FB_Dialog
Me.ListViewFolder.FullRowSelect = True
Me.ListViewFolder.GridLines = True
Me.ListViewFolder.HideSelection = False
- Me.ListViewFolder.Location = New System.Drawing.Point(3, 27)
+ Me.ListViewFolder.Location = New System.Drawing.Point(-2, 27)
Me.ListViewFolder.MultiSelect = False
Me.ListViewFolder.Name = "ListViewFolder"
- Me.ListViewFolder.Size = New System.Drawing.Size(272, 339)
+ Me.ListViewFolder.Size = New System.Drawing.Size(367, 241)
Me.ListViewFolder.SmallImageList = Me.ImageList1
Me.ListViewFolder.TabIndex = 10
Me.ListViewFolder.UseCompatibleStateImageBehavior = False
@@ -189,20 +191,36 @@ Partial Class FB_Dialog
Me.ColumnHeader3.Text = "Sub-Directories"
Me.ColumnHeader3.Width = 368
'
+ 'ImageList1
+ '
+ Me.ImageList1.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit
+ Me.ImageList1.ImageSize = New System.Drawing.Size(16, 16)
+ Me.ImageList1.TransparentColor = System.Drawing.Color.Transparent
+ '
'ComboBoxDrive
'
Me.ComboBoxDrive.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.ComboBoxDrive.FormattingEnabled = True
- Me.ComboBoxDrive.Location = New System.Drawing.Point(5, 3)
+ Me.ComboBoxDrive.Location = New System.Drawing.Point(3, 3)
Me.ComboBoxDrive.Name = "ComboBoxDrive"
Me.ComboBoxDrive.Size = New System.Drawing.Size(54, 21)
Me.ComboBoxDrive.TabIndex = 5
'
+ 'Label5
+ '
+ Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.Label5.AutoSize = True
+ Me.Label5.Location = New System.Drawing.Point(295, 272)
+ Me.Label5.Name = "Label5"
+ Me.Label5.Size = New System.Drawing.Size(10, 13)
+ Me.Label5.TabIndex = 30
+ Me.Label5.Text = "."
+ '
'Label2
'
Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.Label2.AutoSize = True
- Me.Label2.Location = New System.Drawing.Point(3, 372)
+ Me.Label2.Location = New System.Drawing.Point(3, 272)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(32, 13)
Me.Label2.TabIndex = 29
@@ -210,50 +228,41 @@ Partial Class FB_Dialog
'
'ButtonAll
'
- Me.ButtonAll.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.ButtonAll.Location = New System.Drawing.Point(146, 2)
+ Me.ButtonAll.Location = New System.Drawing.Point(23, 2)
Me.ButtonAll.Name = "ButtonAll"
- Me.ButtonAll.Size = New System.Drawing.Size(71, 23)
+ Me.ButtonAll.Size = New System.Drawing.Size(71, 24)
Me.ButtonAll.TabIndex = 19
Me.ButtonAll.Text = "Select All"
+ Me.ToolTip1.SetToolTip(Me.ButtonAll, "Select All Files")
Me.ButtonAll.UseVisualStyleBackColor = True
'
- 'LabelFileAnz
- '
- Me.LabelFileAnz.AutoSize = True
- Me.LabelFileAnz.Location = New System.Drawing.Point(3, 7)
- Me.LabelFileAnz.Name = "LabelFileAnz"
- Me.LabelFileAnz.Size = New System.Drawing.Size(37, 13)
- Me.LabelFileAnz.TabIndex = 7
- Me.LabelFileAnz.Text = "0 Files"
- '
'ComboBoxExt
'
Me.ComboBoxExt.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.ComboBoxExt.FormattingEnabled = True
- Me.ComboBoxExt.Location = New System.Drawing.Point(216, 369)
+ Me.ComboBoxExt.Location = New System.Drawing.Point(307, 269)
Me.ComboBoxExt.Name = "ComboBoxExt"
Me.ComboBoxExt.Size = New System.Drawing.Size(57, 21)
Me.ComboBoxExt.TabIndex = 20
'
'ButtonHisFile
'
- Me.ButtonHisFile.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.ButtonHisFile.Location = New System.Drawing.Point(216, 2)
+ Me.ButtonHisFile.Image = Global.VECTO.My.Resources.Resources.file_history
+ Me.ButtonHisFile.Location = New System.Drawing.Point(-1, 2)
Me.ButtonHisFile.Name = "ButtonHisFile"
- Me.ButtonHisFile.Size = New System.Drawing.Size(57, 23)
+ Me.ButtonHisFile.Size = New System.Drawing.Size(24, 24)
Me.ButtonHisFile.TabIndex = 24
Me.ButtonHisFile.TabStop = False
- Me.ButtonHisFile.Text = "History"
+ Me.ToolTip1.SetToolTip(Me.ButtonHisFile, "Select from recent files")
Me.ButtonHisFile.UseVisualStyleBackColor = True
'
'TextBoxSearchFile
'
Me.TextBoxSearchFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TextBoxSearchFile.Location = New System.Drawing.Point(41, 369)
+ Me.TextBoxSearchFile.Location = New System.Drawing.Point(36, 269)
Me.TextBoxSearchFile.Name = "TextBoxSearchFile"
- Me.TextBoxSearchFile.Size = New System.Drawing.Size(174, 20)
+ Me.TextBoxSearchFile.Size = New System.Drawing.Size(257, 20)
Me.TextBoxSearchFile.TabIndex = 15
'
'ListViewFiles
@@ -266,9 +275,9 @@ Partial Class FB_Dialog
Me.ListViewFiles.FullRowSelect = True
Me.ListViewFiles.GridLines = True
Me.ListViewFiles.HideSelection = False
- Me.ListViewFiles.Location = New System.Drawing.Point(3, 27)
+ Me.ListViewFiles.Location = New System.Drawing.Point(0, 27)
Me.ListViewFiles.Name = "ListViewFiles"
- Me.ListViewFiles.Size = New System.Drawing.Size(270, 339)
+ Me.ListViewFiles.Size = New System.Drawing.Size(367, 241)
Me.ListViewFiles.SmallImageList = Me.ImageList1
Me.ListViewFiles.TabIndex = 10
Me.ListViewFiles.UseCompatibleStateImageBehavior = False
@@ -277,7 +286,7 @@ Partial Class FB_Dialog
'ColumnHeader1
'
Me.ColumnHeader1.Text = "Files"
- Me.ColumnHeader1.Width = 364
+ Me.ColumnHeader1.Width = 367
'
'ContextMenuFile
'
@@ -301,9 +310,9 @@ Partial Class FB_Dialog
'
Me.TextBoxPath.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TextBoxPath.Location = New System.Drawing.Point(3, 461)
+ Me.TextBoxPath.Location = New System.Drawing.Point(47, 354)
Me.TextBoxPath.Name = "TextBoxPath"
- Me.TextBoxPath.Size = New System.Drawing.Size(562, 20)
+ Me.TextBoxPath.Size = New System.Drawing.Size(680, 20)
Me.TextBoxPath.TabIndex = 15
'
'ContextMenuHisFolder
@@ -320,7 +329,7 @@ Partial Class FB_Dialog
'
Me.ButtonOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.ButtonOK.DialogResult = System.Windows.Forms.DialogResult.OK
- Me.ButtonOK.Location = New System.Drawing.Point(409, 488)
+ Me.ButtonOK.Location = New System.Drawing.Point(574, 383)
Me.ButtonOK.Name = "ButtonOK"
Me.ButtonOK.Size = New System.Drawing.Size(75, 23)
Me.ButtonOK.TabIndex = 20
@@ -332,7 +341,7 @@ Partial Class FB_Dialog
'
Me.ButtonCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.ButtonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.ButtonCancel.Location = New System.Drawing.Point(490, 488)
+ Me.ButtonCancel.Location = New System.Drawing.Point(652, 383)
Me.ButtonCancel.Name = "ButtonCancel"
Me.ButtonCancel.Size = New System.Drawing.Size(75, 23)
Me.ButtonCancel.TabIndex = 25
@@ -345,10 +354,10 @@ Partial Class FB_Dialog
Me.TextBoxCurrent.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.TextBoxCurrent.Cursor = System.Windows.Forms.Cursors.Hand
- Me.TextBoxCurrent.Location = New System.Drawing.Point(5, 23)
+ Me.TextBoxCurrent.Location = New System.Drawing.Point(5, 17)
Me.TextBoxCurrent.Name = "TextBoxCurrent"
Me.TextBoxCurrent.ReadOnly = True
- Me.TextBoxCurrent.Size = New System.Drawing.Size(557, 20)
+ Me.TextBoxCurrent.Size = New System.Drawing.Size(722, 20)
Me.TextBoxCurrent.TabIndex = 0
Me.TextBoxCurrent.TabStop = False
'
@@ -356,23 +365,16 @@ Partial Class FB_Dialog
'
Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.Label3.AutoSize = True
- Me.Label3.Location = New System.Drawing.Point(2, 447)
+ Me.Label3.Location = New System.Drawing.Point(5, 357)
Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(52, 13)
+ Me.Label3.Size = New System.Drawing.Size(38, 13)
Me.Label3.TabIndex = 29
- Me.Label3.Text = "Filename:"
- '
- 'ImageList1
- '
- Me.ImageList1.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit
- Me.ImageList1.ImageSize = New System.Drawing.Size(16, 16)
- Me.ImageList1.TransparentColor = System.Drawing.Color.Transparent
+ Me.Label3.Text = "Name:"
'
'Label4
'
- Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.Label4.AutoSize = True
- Me.Label4.Location = New System.Drawing.Point(3, 7)
+ Me.Label4.Location = New System.Drawing.Point(4, 3)
Me.Label4.Name = "Label4"
Me.Label4.Size = New System.Drawing.Size(89, 13)
Me.Label4.TabIndex = 30
@@ -383,7 +385,7 @@ Partial Class FB_Dialog
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButtonCancel
- Me.ClientSize = New System.Drawing.Size(569, 515)
+ Me.ClientSize = New System.Drawing.Size(734, 412)
Me.Controls.Add(Me.Label4)
Me.Controls.Add(Me.Label3)
Me.Controls.Add(Me.TextBoxCurrent)
@@ -391,11 +393,11 @@ Partial Class FB_Dialog
Me.Controls.Add(Me.ButtonOK)
Me.Controls.Add(Me.TextBoxPath)
Me.Controls.Add(Me.SplitContainer1)
- Me.MaximizeBox = False
Me.MinimizeBox = False
- Me.MinimumSize = New System.Drawing.Size(585, 268)
+ Me.MinimumSize = New System.Drawing.Size(341, 272)
Me.Name = "FB_Dialog"
Me.ShowIcon = False
+ Me.ShowInTaskbar = False
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
Me.Text = "File Browser"
Me.SplitContainer1.Panel1.ResumeLayout(False)
@@ -415,8 +417,7 @@ Partial Class FB_Dialog
Friend WithEvents ListViewFiles As System.Windows.Forms.ListView
Friend WithEvents ColumnHeader1 As System.Windows.Forms.ColumnHeader
Friend WithEvents TextBoxSearchFolder As System.Windows.Forms.TextBox
- Friend WithEvents TextBoxSearchFile As System.Windows.Forms.TextBox
- Friend WithEvents TextBoxPath As System.Windows.Forms.TextBox
+ Friend WithEvents TextBoxPath As System.Windows.Forms.TextBox
Friend WithEvents ButtonFolderBack As System.Windows.Forms.Button
Friend WithEvents ContextMenuHisFolder As System.Windows.Forms.ContextMenuStrip
Friend WithEvents ContextMenuHisFile As System.Windows.Forms.ContextMenuStrip
@@ -424,20 +425,22 @@ Partial Class FB_Dialog
Friend WithEvents ButtonHisFile As System.Windows.Forms.Button
Friend WithEvents ButtonOK As System.Windows.Forms.Button
Friend WithEvents ButtonCancel As System.Windows.Forms.Button
- Friend WithEvents ComboBoxExt As System.Windows.Forms.ComboBox
- Friend WithEvents TextBoxCurrent As System.Windows.Forms.TextBox
+ Friend WithEvents TextBoxCurrent As System.Windows.Forms.TextBox
Friend WithEvents ColumnHeader3 As System.Windows.Forms.ColumnHeader
- Friend WithEvents LabelFileAnz As System.Windows.Forms.Label
- Friend WithEvents ButtonDesktop As System.Windows.Forms.Button
+ Friend WithEvents ButtonDesktop As System.Windows.Forms.Button
Friend WithEvents ContextMenuFile As System.Windows.Forms.ContextMenuStrip
Friend WithEvents RenameFileToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents DeleteFileToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents ButtonNewDir As System.Windows.Forms.Button
Friend WithEvents ButtonAll As System.Windows.Forms.Button
Friend WithEvents Label1 As System.Windows.Forms.Label
- Friend WithEvents Label2 As System.Windows.Forms.Label
Friend WithEvents Label3 As System.Windows.Forms.Label
- Friend WithEvents ImageList1 As System.Windows.Forms.ImageList
Friend WithEvents Label4 As System.Windows.Forms.Label
+ Friend WithEvents ImageList1 As System.Windows.Forms.ImageList
+ Friend WithEvents ToolTip1 As System.Windows.Forms.ToolTip
+ Friend WithEvents Label5 As System.Windows.Forms.Label
+ Friend WithEvents Label2 As System.Windows.Forms.Label
+ Friend WithEvents ComboBoxExt As System.Windows.Forms.ComboBox
+ Friend WithEvents TextBoxSearchFile As System.Windows.Forms.TextBox
End Class
diff --git a/VECTO/File Browser/FB_Dialog.resx b/VECTO/File Browser/FB_Dialog.resx
index a152ac7649..67a95d3c92 100644
--- a/VECTO/File Browser/FB_Dialog.resx
+++ b/VECTO/File Browser/FB_Dialog.resx
@@ -117,6 +117,27 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>583, 17</value>
+ </metadata>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="ButtonFolderBack.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAKqSURBVDhPbZF3T1NRHIb5EvAh/McYDWI0sixblkRjGoypBoKJOAkOUESCYCLBiEZRVKBlVaQU
+ ECm2SNmUUsosXDvonrTMSo15vT0thApv8uae3JznOb97bpA3jqlnJoes1GqVFsMieQzzWAGMI/ehH8qD
+ gX4ahvOxpq9DNPc4CPB/aAE2dDVwzJTDRq9d6moYlbXwbInw1yMmjeWdwGFpyMESr+CPu5PU7WyBg6qE
+ sjcLGsUnrNo6CJwiC8NlZRzpPslegWezHb/Xv4LqYUE192EfvFcSwQ4L9glkpfC4O7C9yaPhVmy5mrH4
+ 7RKBvY3v9glyLRnIW2EiWXCavN+dxD5Zgu2NNrjXvmDL2YQNOxsLnUxQ8ioop6uQ0HuMgHesF8FaSCIw
+ AXdio2/fvcrFprMR6/Z6rJo/Yo5/AUuyClB0vYIcdRoy5YydqZ76UV8skiJsrjRg3VZLwzVw6t9itu0c
+ xr5fh4SuV5A2cBIx7aHo7E2DnMcMnMA8Xog162e4TO+xonsDu+YlpltTMcK/SmBvGbxQdAhSYbfbIWtO
+ CBSYRh/CZayGQ/caNnUlLNRzTHHPgiE4gpjuo+Sy+IIUzIsziGCyKS5QYBi+B4e2CjZVBcxUOYwLJeSU
+ /pY0DHLTsTzChGboPNQD6UQgbWAECvSDd2FVvoB5qQyG+WLoZgohbYxFX0MCxE2JBFT1J5Nm9igxwTkT
+ KNCKb8G0WArD3BNopwugmczHBH2KqJ6Bfk7MLuxtPGcGEnZUoGD5Zy70s0XQyh9AI82Davwm2SSsi9on
+ oIRJGK+PoPyoL2rRNfwSZWNReAUKIQuKPha9KRL8ylPoehUOCSeaCMfZkQSme9uP+qL8kR2s6MoMp/99
+ jqwl8R39jQOjteHrj7IORZfdCA3xbzsgQUH/AJeyUFejvjvmAAAAAElFTkSuQmCC
+</value>
+ </data>
<metadata name="ImageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>473, 17</value>
</metadata>
diff --git a/VECTO/File Browser/FB_Dialog.vb b/VECTO/File Browser/FB_Dialog.vb
index f87109f477..2eebf34c61 100644
--- a/VECTO/File Browser/FB_Dialog.vb
+++ b/VECTO/File Browser/FB_Dialog.vb
@@ -78,9 +78,9 @@ Public Class FB_Dialog
Private Sub Resized()
'To autosize to the width of the column heading, set the Width property to -2
ListViewFolder.Columns(0).Width = -2
- ListViewFolder.Columns(0).Width -= 2
+ 'ListViewFolder.Columns(0).Width -= 1
ListViewFiles.Columns(0).Width = -2
- ListViewFiles.Columns(0).Width -= 2
+ 'ListViewFiles.Columns(0).Width -= 1
End Sub
'SplitterMoved
@@ -205,6 +205,7 @@ Public Class FB_Dialog
'Form Config
ListViewFiles.MultiSelect = multiFile
ButtonAll.Visible = multiFile
+ Me.Title = title
Text = title
'Ext-Combobox
@@ -286,6 +287,8 @@ Public Class FB_Dialog
End If
End Function
+ Public Title As String
+
'Close and save File / Folder History
Public Sub SaveAndClose()
'Folder History
@@ -604,10 +607,15 @@ Public Class FB_Dialog
If Not _updateLock Then LoadListFiles()
End Sub
- Private Sub ButtonHisFolder_Click(sender As Object, e As EventArgs) Handles ButtonHisFolder.Click, ButtonHisFile.Click
+ Private Sub ButtonHisFolder_Click(sender As Object, e As EventArgs) Handles ButtonHisFolder.Click
ContextMenuHisFolder.Show(MousePosition)
End Sub
+
+ Private Sub ButtonHisFile_Click(sender As Object, e As EventArgs) Handles ButtonHisFile.Click
+ ContextMenuHisFile.Show(MousePosition)
+ End Sub
+
Private Sub ButtonAll_Click(sender As Object, e As EventArgs) Handles ButtonAll.Click
ListViewFiles.BeginUpdate()
For i = 0 To ListViewFiles.Items.Count - 1
@@ -633,7 +641,7 @@ Public Class FB_Dialog
If path = FavText Then
Dim favdlog = New FB_FavDlog
- If favdlog.ShowDialog = DialogResult.OK Then
+ If favdlog.ShowDialog(Me) = DialogResult.OK Then
For x = 10 To 19
path = favdlog.ListBox1.Items(x - 10)
If path = NoFavString Then
@@ -731,6 +739,9 @@ Public Class FB_Dialog
'Set Folder
_myFolder = path
If Microsoft.VisualBasic.Right(_myFolder, 1) <> "\" Then _myFolder &= "\"
+
+ Me.Text = Me.Title & " " & _myFolder
+
LoadListFolder()
LoadListFiles()
@@ -794,7 +805,6 @@ Public Class FB_Dialog
'Abort if bBrowseFolder
If _bBrowseFolder Then Exit Sub
- LabelFileAnz.Text = "0 Files"
'Define Extension-filter
Dim extStr As String()
If Trim(ComboBoxExt.Text.ToString) = "" Then
@@ -830,11 +840,6 @@ Public Class FB_Dialog
ListViewFiles.Items.Add(fi.ToString, x + 1)
Next
Next
- If x = 0 Then
- LabelFileAnz.Text = "1 File"
- Else
- LabelFileAnz.Text = x + 1 & " Files"
- End If
Catch ex As Exception
ListViewFiles.Items.Add("<ERROR: " & ex.Message.ToString & ">")
End Try
@@ -946,9 +951,6 @@ lb10:
_noExt = False
End Set
End Property
-
- Private Sub Label3_Click(sender As Object, e As EventArgs) Handles Label3.Click
- End Sub
End Class
diff --git a/VECTO/File Browser/FB_FavDlog.designer.vb b/VECTO/File Browser/FB_FavDlog.designer.vb
index f411d717e7..08648f6522 100644
--- a/VECTO/File Browser/FB_FavDlog.designer.vb
+++ b/VECTO/File Browser/FB_FavDlog.designer.vb
@@ -32,87 +32,93 @@ Partial Class FB_FavDlog
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
- Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
- Me.OK_Button = New System.Windows.Forms.Button()
- Me.Cancel_Button = New System.Windows.Forms.Button()
- Me.ListBox1 = New System.Windows.Forms.ListBox()
- Me.Label1 = New System.Windows.Forms.Label()
- Me.TableLayoutPanel1.SuspendLayout()
- Me.SuspendLayout()
- '
- 'TableLayoutPanel1
- '
- Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TableLayoutPanel1.ColumnCount = 2
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
- Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
- Me.TableLayoutPanel1.Location = New System.Drawing.Point(277, 155)
- Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
- Me.TableLayoutPanel1.RowCount = 1
- Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
- Me.TableLayoutPanel1.TabIndex = 0
- '
- 'OK_Button
- '
- Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.OK_Button.Location = New System.Drawing.Point(3, 3)
- Me.OK_Button.Name = "OK_Button"
- Me.OK_Button.Size = New System.Drawing.Size(67, 23)
- Me.OK_Button.TabIndex = 0
- Me.OK_Button.Text = "OK"
- '
- 'Cancel_Button
- '
- Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
- Me.Cancel_Button.Name = "Cancel_Button"
- Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
- Me.Cancel_Button.TabIndex = 1
- Me.Cancel_Button.Text = "Cancel"
- '
- 'ListBox1
- '
- Me.ListBox1.FormattingEnabled = True
- Me.ListBox1.Location = New System.Drawing.Point(12, 12)
- Me.ListBox1.Name = "ListBox1"
- Me.ListBox1.Size = New System.Drawing.Size(411, 134)
- Me.ListBox1.TabIndex = 1
- '
- 'Label1
- '
- Me.Label1.AutoSize = True
- Me.Label1.Location = New System.Drawing.Point(12, 163)
- Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(119, 13)
- Me.Label1.TabIndex = 2
- Me.Label1.Text = "Doubleclick Item to Edit"
- '
- 'FB_FavDlog
- '
- Me.AcceptButton = Me.OK_Button
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
- Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.CancelButton = Me.Cancel_Button
- Me.ClientSize = New System.Drawing.Size(435, 196)
- Me.Controls.Add(Me.Label1)
- Me.Controls.Add(Me.ListBox1)
- Me.Controls.Add(Me.TableLayoutPanel1)
- Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
- Me.MaximizeBox = False
- Me.MinimizeBox = False
- Me.Name = "FB_FavDlog"
- Me.ShowInTaskbar = False
- Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
- Me.Text = "Edit Favorites"
- Me.TableLayoutPanel1.ResumeLayout(False)
- Me.ResumeLayout(False)
- Me.PerformLayout()
+ Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+ Me.OK_Button = New System.Windows.Forms.Button()
+ Me.Cancel_Button = New System.Windows.Forms.Button()
+ Me.ListBox1 = New System.Windows.Forms.ListBox()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.TableLayoutPanel1.SuspendLayout()
+ Me.SuspendLayout()
+ '
+ 'TableLayoutPanel1
+ '
+ Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.TableLayoutPanel1.ColumnCount = 2
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
+ Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
+ Me.TableLayoutPanel1.Location = New System.Drawing.Point(326, 173)
+ Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
+ Me.TableLayoutPanel1.RowCount = 1
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
+ Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
+ Me.TableLayoutPanel1.TabIndex = 0
+ '
+ 'OK_Button
+ '
+ Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.OK_Button.Location = New System.Drawing.Point(3, 3)
+ Me.OK_Button.Name = "OK_Button"
+ Me.OK_Button.Size = New System.Drawing.Size(67, 23)
+ Me.OK_Button.TabIndex = 0
+ Me.OK_Button.Text = "OK"
+ '
+ 'Cancel_Button
+ '
+ Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
+ Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
+ Me.Cancel_Button.Name = "Cancel_Button"
+ Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
+ Me.Cancel_Button.TabIndex = 1
+ Me.Cancel_Button.Text = "Cancel"
+ '
+ 'ListBox1
+ '
+ Me.ListBox1.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.ListBox1.FormattingEnabled = True
+ Me.ListBox1.Location = New System.Drawing.Point(12, 12)
+ Me.ListBox1.Name = "ListBox1"
+ Me.ListBox1.Size = New System.Drawing.Size(460, 134)
+ Me.ListBox1.TabIndex = 1
+ '
+ 'Label1
+ '
+ Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.Label1.AutoSize = True
+ Me.Label1.Location = New System.Drawing.Point(369, 147)
+ Me.Label1.Name = "Label1"
+ Me.Label1.Size = New System.Drawing.Size(106, 13)
+ Me.Label1.TabIndex = 2
+ Me.Label1.Text = "(Double-Click to Edit)"
+ '
+ 'FB_FavDlog
+ '
+ Me.AcceptButton = Me.OK_Button
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit
+ Me.CancelButton = Me.Cancel_Button
+ Me.ClientSize = New System.Drawing.Size(484, 208)
+ Me.Controls.Add(Me.Label1)
+ Me.Controls.Add(Me.ListBox1)
+ Me.Controls.Add(Me.TableLayoutPanel1)
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow
+ Me.MaximizeBox = False
+ Me.MaximumSize = New System.Drawing.Size(5000, 242)
+ Me.MinimizeBox = False
+ Me.MinimumSize = New System.Drawing.Size(0, 242)
+ Me.Name = "FB_FavDlog"
+ Me.ShowIcon = False
+ Me.ShowInTaskbar = False
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+ Me.Text = "Edit Favorites"
+ Me.TableLayoutPanel1.ResumeLayout(False)
+ Me.ResumeLayout(False)
+ Me.PerformLayout()
- End Sub
+ End Sub
Friend WithEvents TableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel
Friend WithEvents OK_Button As System.Windows.Forms.Button
Friend WithEvents Cancel_Button As System.Windows.Forms.Button
diff --git a/VECTO/File Browser/FB_FavDlog.resx b/VECTO/File Browser/FB_FavDlog.resx
index 7080a7d118..1af7de150c 100644
--- a/VECTO/File Browser/FB_FavDlog.resx
+++ b/VECTO/File Browser/FB_FavDlog.resx
@@ -112,9 +112,9 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
\ No newline at end of file
diff --git a/VECTO/File Browser/FB_FavDlog.vb b/VECTO/File Browser/FB_FavDlog.vb
index a153ed545c..df7d5029d8 100644
--- a/VECTO/File Browser/FB_FavDlog.vb
+++ b/VECTO/File Browser/FB_FavDlog.vb
@@ -8,6 +8,8 @@
' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
'
' See the LICENSE.txt for the specific language governing permissions and limitations.
+Option Infer On
+
Imports System.Windows.Forms
''' <summary>
@@ -15,53 +17,46 @@ Imports System.Windows.Forms
''' </summary>
''' <remarks></remarks>
Public Class FB_FavDlog
-
- Private Const NoFavString As String = "<undefined>"
- Private Const EmptyText As String = " "
-
- Private Sub FB_FavDlog_Load(sender As Object, e As System.EventArgs) Handles Me.Load
- Dim x As Integer
- Dim txt As String
- For x = 10 To 19
- txt = FB_FolderHistory(x)
- If txt = EmptyText Then
- Me.ListBox1.Items.Add(NoFavString)
- Else
- Me.ListBox1.Items.Add(txt)
- End If
- Next
- End Sub
-
- Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click
- Me.DialogResult = System.Windows.Forms.DialogResult.OK
- Me.Close()
- End Sub
-
- Private Sub Cancel_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Cancel_Button.Click
- Me.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.Close()
- End Sub
-
- Private Sub ListBox1_MouseDoubleClick(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles ListBox1.MouseDoubleClick
- Dim i As Integer
- Dim txt As String
- Dim fb As cFileBrowser
-
- i = Me.ListBox1.SelectedIndex
-
- txt = Me.ListBox1.Items(i).ToString
-
- If txt = NoFavString Then txt = ""
-
- fb = New cFileBrowser("DirBr", True, True)
-
- If fb.OpenDialog(txt) Then
- txt = fb.Files(0)
- Me.ListBox1.Items.Insert(i, txt)
- Me.ListBox1.Items.RemoveAt(i + 1)
- End If
-
- End Sub
-
-
+ Private Const NoFavString As String = "<empty favorite slot>"
+ Private Const EmptyText As String = " "
+
+ Private Sub FB_FavDlog_Load(sender As Object, e As EventArgs) Handles Me.Load
+ For x = 10 To 19
+ Dim txt = FB_FolderHistory(x)
+ If txt = EmptyText Then
+ ListBox1.Items.Add(NoFavString)
+ Else
+ ListBox1.Items.Add(txt)
+ End If
+ Next
+ End Sub
+
+ Private Sub OK_Button_Click(sender As Object, e As EventArgs) Handles OK_Button.Click
+ DialogResult = DialogResult.OK
+ Close()
+ End Sub
+
+ Private Sub Cancel_Button_Click(sender As Object, e As EventArgs) Handles Cancel_Button.Click
+ DialogResult = DialogResult.Cancel
+ Close()
+ End Sub
+
+ Private Sub ListBox1_MouseDoubleClick(sender As Object, e As MouseEventArgs) Handles ListBox1.MouseDoubleClick
+ Dim i = ListBox1.SelectedIndex
+ Dim txt = ListBox1.Items(i).ToString
+
+ If txt = NoFavString Then txt = ""
+
+ Dim fb = New cFileBrowser("DirBr", True, True)
+
+ If fb.OpenDialog(txt) Then
+ txt = fb.Files(0)
+ ListBox1.Items.Insert(i, txt)
+ ListBox1.Items.RemoveAt(i + 1)
+ End If
+ End Sub
+
+ Private Sub ListBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListBox1.SelectedIndexChanged
+
+ End Sub
End Class
diff --git a/VECTO/GUI/F_MAINForm.Designer.vb b/VECTO/GUI/F_MAINForm.Designer.vb
index cd5b4f9105..689697f052 100644
--- a/VECTO/GUI/F_MAINForm.Designer.vb
+++ b/VECTO/GUI/F_MAINForm.Designer.vb
@@ -1,37 +1,37 @@
-' 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.
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class F_MAINForm
- Inherits System.Windows.Forms.Form
-
- 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
- <System.Diagnostics.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 System.ComponentModel.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.
- <System.Diagnostics.DebuggerStepThrough()> _
- Private Sub InitializeComponent()
+' 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.
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class F_MAINForm
+ Inherits System.Windows.Forms.Form
+
+ 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+ <System.Diagnostics.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 System.ComponentModel.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.
+ <System.Diagnostics.DebuggerStepThrough()> _
+ Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_MAINForm))
Me.StatusBAR = New System.Windows.Forms.StatusStrip()
@@ -40,6 +40,7 @@ Partial Class F_MAINForm
Me.ToolStripProgBarOverall = New System.Windows.Forms.ToolStripProgressBar()
Me.TabControl1 = New System.Windows.Forms.TabControl()
Me.TabPageGEN = New System.Windows.Forms.TabPage()
+ Me.Label6 = New System.Windows.Forms.Label()
Me.btStartV3 = New System.Windows.Forms.Button()
Me.LbDecl = New System.Windows.Forms.Label()
Me.PictureBox1 = New System.Windows.Forms.PictureBox()
@@ -50,7 +51,6 @@ Partial Class F_MAINForm
Me.LvGEN = New System.Windows.Forms.ListView()
Me.ColGENpath = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
Me.ColGENstatus = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
- Me.ButtonGENopt = New System.Windows.Forms.Button()
Me.ButtonGENremove = New System.Windows.Forms.Button()
Me.Button1 = New System.Windows.Forms.Button()
Me.ButtonGENadd = New System.Windows.Forms.Button()
@@ -131,6 +131,7 @@ Partial Class F_MAINForm
Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.OpenInGraphWindowToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
Me.StatusBAR.SuspendLayout()
Me.TabControl1.SuspendLayout()
Me.TabPageGEN.SuspendLayout()
@@ -147,7 +148,6 @@ Partial Class F_MAINForm
Me.SplitContainer1.Panel1.SuspendLayout()
Me.SplitContainer1.Panel2.SuspendLayout()
Me.SplitContainer1.SuspendLayout()
- Me.ToolStrip1.SuspendLayout()
Me.CmOpenFile.SuspendLayout()
Me.SuspendLayout()
'
@@ -156,14 +156,14 @@ Partial Class F_MAINForm
Me.StatusBAR.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLbStatus, Me.ToolStripProgBarJob, Me.ToolStripProgBarOverall})
Me.StatusBAR.Location = New System.Drawing.Point(0, 616)
Me.StatusBAR.Name = "StatusBAR"
- Me.StatusBAR.Size = New System.Drawing.Size(1136, 22)
+ Me.StatusBAR.Size = New System.Drawing.Size(1073, 22)
Me.StatusBAR.TabIndex = 7
Me.StatusBAR.Text = "StatusBAR"
'
'ToolStripLbStatus
'
Me.ToolStripLbStatus.Name = "ToolStripLbStatus"
- Me.ToolStripLbStatus.Size = New System.Drawing.Size(1121, 17)
+ Me.ToolStripLbStatus.Size = New System.Drawing.Size(1058, 17)
Me.ToolStripLbStatus.Spring = True
Me.ToolStripLbStatus.Text = "Status Text"
Me.ToolStripLbStatus.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -200,11 +200,12 @@ Partial Class F_MAINForm
Me.TabControl1.Name = "TabControl1"
Me.TabControl1.Padding = New System.Drawing.Point(0, 0)
Me.TabControl1.SelectedIndex = 0
- Me.TabControl1.Size = New System.Drawing.Size(1129, 373)
+ Me.TabControl1.Size = New System.Drawing.Size(1066, 308)
Me.TabControl1.TabIndex = 10
'
'TabPageGEN
'
+ Me.TabPageGEN.Controls.Add(Me.Label6)
Me.TabPageGEN.Controls.Add(Me.btStartV3)
Me.TabPageGEN.Controls.Add(Me.LbDecl)
Me.TabPageGEN.Controls.Add(Me.PictureBox1)
@@ -213,18 +214,27 @@ Partial Class F_MAINForm
Me.TabPageGEN.Controls.Add(Me.LbAutoShDown)
Me.TabPageGEN.Controls.Add(Me.ChBoxAllGEN)
Me.TabPageGEN.Controls.Add(Me.LvGEN)
- Me.TabPageGEN.Controls.Add(Me.ButtonGENopt)
Me.TabPageGEN.Controls.Add(Me.ButtonGENremove)
Me.TabPageGEN.Controls.Add(Me.Button1)
Me.TabPageGEN.Controls.Add(Me.ButtonGENadd)
Me.TabPageGEN.Location = New System.Drawing.Point(4, 22)
Me.TabPageGEN.Margin = New System.Windows.Forms.Padding(0)
Me.TabPageGEN.Name = "TabPageGEN"
- Me.TabPageGEN.Size = New System.Drawing.Size(1121, 347)
+ Me.TabPageGEN.Size = New System.Drawing.Size(1058, 282)
Me.TabPageGEN.TabIndex = 0
Me.TabPageGEN.Text = "Job Files"
Me.TabPageGEN.UseVisualStyleBackColor = True
'
+ 'Label6
+ '
+ Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.Label6.AutoSize = True
+ Me.Label6.Location = New System.Drawing.Point(838, 248)
+ Me.Label6.Name = "Label6"
+ Me.Label6.Size = New System.Drawing.Size(217, 13)
+ Me.Label6.TabIndex = 21
+ Me.Label6.Text = "(Double-Click to Edit, Right-Click for Options)"
+ '
'btStartV3
'
Me.btStartV3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -236,6 +246,7 @@ Partial Class F_MAINForm
Me.btStartV3.TabIndex = 20
Me.btStartV3.Text = "START V3"
Me.btStartV3.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText
+ Me.ToolTip1.SetToolTip(Me.btStartV3, "Start Simulation with Vecto 3")
Me.btStartV3.UseVisualStyleBackColor = True
'
'LbDecl
@@ -260,22 +271,24 @@ Partial Class F_MAINForm
'
'BtGENdown
'
- Me.BtGENdown.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.BtGENdown.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.BtGENdown.Image = Global.VECTO.My.Resources.Resources.Actions_arrow_down_icon
- Me.BtGENdown.Location = New System.Drawing.Point(272, 317)
+ Me.BtGENdown.Location = New System.Drawing.Point(294, 247)
Me.BtGENdown.Name = "BtGENdown"
- Me.BtGENdown.Size = New System.Drawing.Size(24, 24)
+ Me.BtGENdown.Size = New System.Drawing.Size(30, 30)
Me.BtGENdown.TabIndex = 6
+ Me.ToolTip1.SetToolTip(Me.BtGENdown, "Move job down one row")
Me.BtGENdown.UseVisualStyleBackColor = True
'
'BtGENup
'
- Me.BtGENup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.BtGENup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.BtGENup.Image = Global.VECTO.My.Resources.Resources.Actions_arrow_up_icon
- Me.BtGENup.Location = New System.Drawing.Point(248, 317)
+ Me.BtGENup.Location = New System.Drawing.Point(262, 247)
Me.BtGENup.Name = "BtGENup"
- Me.BtGENup.Size = New System.Drawing.Size(24, 24)
+ Me.BtGENup.Size = New System.Drawing.Size(30, 30)
Me.BtGENup.TabIndex = 4
+ Me.ToolTip1.SetToolTip(Me.BtGENup, "Move job up one row")
Me.BtGENup.UseVisualStyleBackColor = True
'
'LbAutoShDown
@@ -284,7 +297,7 @@ Partial Class F_MAINForm
Me.LbAutoShDown.AutoSize = True
Me.LbAutoShDown.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.LbAutoShDown.ForeColor = System.Drawing.Color.Red
- Me.LbAutoShDown.Location = New System.Drawing.Point(449, 323)
+ Me.LbAutoShDown.Location = New System.Drawing.Point(408, 255)
Me.LbAutoShDown.Name = "LbAutoShDown"
Me.LbAutoShDown.Size = New System.Drawing.Size(225, 13)
Me.LbAutoShDown.TabIndex = 17
@@ -295,11 +308,12 @@ Partial Class F_MAINForm
'
Me.ChBoxAllGEN.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.ChBoxAllGEN.AutoSize = True
- Me.ChBoxAllGEN.Location = New System.Drawing.Point(172, 320)
+ Me.ChBoxAllGEN.Location = New System.Drawing.Point(186, 255)
Me.ChBoxAllGEN.Name = "ChBoxAllGEN"
Me.ChBoxAllGEN.Size = New System.Drawing.Size(70, 17)
Me.ChBoxAllGEN.TabIndex = 16
Me.ChBoxAllGEN.Text = "Select All"
+ Me.ToolTip1.SetToolTip(Me.ChBoxAllGEN, "Select All / None")
Me.ChBoxAllGEN.UseVisualStyleBackColor = True
'
'LvGEN
@@ -317,7 +331,7 @@ Partial Class F_MAINForm
Me.LvGEN.LabelEdit = True
Me.LvGEN.Location = New System.Drawing.Point(114, 3)
Me.LvGEN.Name = "LvGEN"
- Me.LvGEN.Size = New System.Drawing.Size(1004, 312)
+ Me.LvGEN.Size = New System.Drawing.Size(941, 243)
Me.LvGEN.TabIndex = 14
Me.LvGEN.UseCompatibleStateImageBehavior = False
Me.LvGEN.View = System.Windows.Forms.View.Details
@@ -332,25 +346,16 @@ Partial Class F_MAINForm
Me.ColGENstatus.Text = ""
Me.ColGENstatus.Width = 175
'
- 'ButtonGENopt
- '
- Me.ButtonGENopt.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.ButtonGENopt.Location = New System.Drawing.Point(1039, 316)
- Me.ButtonGENopt.Name = "ButtonGENopt"
- Me.ButtonGENopt.Size = New System.Drawing.Size(80, 24)
- Me.ButtonGENopt.TabIndex = 8
- Me.ButtonGENopt.Text = "List Options"
- Me.ButtonGENopt.UseVisualStyleBackColor = True
- '
'ButtonGENremove
'
- Me.ButtonGENremove.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.ButtonGENremove.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.ButtonGENremove.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.ButtonGENremove.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon
- Me.ButtonGENremove.Location = New System.Drawing.Point(138, 316)
+ Me.ButtonGENremove.Location = New System.Drawing.Point(145, 247)
Me.ButtonGENremove.Name = "ButtonGENremove"
- Me.ButtonGENremove.Size = New System.Drawing.Size(24, 24)
+ Me.ButtonGENremove.Size = New System.Drawing.Size(30, 30)
Me.ButtonGENremove.TabIndex = 2
+ Me.ToolTip1.SetToolTip(Me.ButtonGENremove, "Remove selected entries")
Me.ButtonGENremove.UseVisualStyleBackColor = True
'
'Button1
@@ -363,17 +368,19 @@ Partial Class F_MAINForm
Me.Button1.TabIndex = 12
Me.Button1.Text = "START V2.2"
Me.Button1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText
+ Me.ToolTip1.SetToolTip(Me.Button1, "Start Simulation with Vecto 2.2")
Me.Button1.UseVisualStyleBackColor = True
'
'ButtonGENadd
'
- Me.ButtonGENadd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.ButtonGENadd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.ButtonGENadd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.ButtonGENadd.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon
- Me.ButtonGENadd.Location = New System.Drawing.Point(113, 316)
+ Me.ButtonGENadd.Location = New System.Drawing.Point(113, 247)
Me.ButtonGENadd.Name = "ButtonGENadd"
- Me.ButtonGENadd.Size = New System.Drawing.Size(24, 24)
+ Me.ButtonGENadd.Size = New System.Drawing.Size(30, 30)
Me.ButtonGENadd.TabIndex = 1
+ Me.ToolTip1.SetToolTip(Me.ButtonGENadd, "Add Job File")
Me.ButtonGENadd.UseVisualStyleBackColor = True
'
'TabPageDRI
@@ -388,7 +395,7 @@ Partial Class F_MAINForm
Me.TabPageDRI.Location = New System.Drawing.Point(4, 22)
Me.TabPageDRI.Name = "TabPageDRI"
Me.TabPageDRI.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPageDRI.Size = New System.Drawing.Size(1121, 347)
+ Me.TabPageDRI.Size = New System.Drawing.Size(1058, 256)
Me.TabPageDRI.TabIndex = 1
Me.TabPageDRI.Text = "Driving Cycles"
Me.TabPageDRI.UseVisualStyleBackColor = True
@@ -397,7 +404,7 @@ Partial Class F_MAINForm
'
Me.BtDRIdown.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.BtDRIdown.Image = Global.VECTO.My.Resources.Resources.Actions_arrow_down_icon
- Me.BtDRIdown.Location = New System.Drawing.Point(1003, 313)
+ Me.BtDRIdown.Location = New System.Drawing.Point(940, 222)
Me.BtDRIdown.Name = "BtDRIdown"
Me.BtDRIdown.Size = New System.Drawing.Size(30, 24)
Me.BtDRIdown.TabIndex = 3
@@ -407,7 +414,7 @@ Partial Class F_MAINForm
'
Me.BtDRIup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.BtDRIup.Image = Global.VECTO.My.Resources.Resources.Actions_arrow_up_icon
- Me.BtDRIup.Location = New System.Drawing.Point(973, 313)
+ Me.BtDRIup.Location = New System.Drawing.Point(910, 222)
Me.BtDRIup.Name = "BtDRIup"
Me.BtDRIup.Size = New System.Drawing.Size(30, 24)
Me.BtDRIup.TabIndex = 2
@@ -417,7 +424,7 @@ Partial Class F_MAINForm
'
Me.ChBoxAllDRI.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.ChBoxAllDRI.AutoSize = True
- Me.ChBoxAllDRI.Location = New System.Drawing.Point(74, 317)
+ Me.ChBoxAllDRI.Location = New System.Drawing.Point(74, 226)
Me.ChBoxAllDRI.Name = "ChBoxAllDRI"
Me.ChBoxAllDRI.Size = New System.Drawing.Size(70, 17)
Me.ChBoxAllDRI.TabIndex = 7
@@ -439,7 +446,7 @@ Partial Class F_MAINForm
Me.LvDRI.LabelEdit = True
Me.LvDRI.Location = New System.Drawing.Point(6, 6)
Me.LvDRI.Name = "LvDRI"
- Me.LvDRI.Size = New System.Drawing.Size(1109, 306)
+ Me.LvDRI.Size = New System.Drawing.Size(1046, 215)
Me.LvDRI.TabIndex = 6
Me.LvDRI.UseCompatibleStateImageBehavior = False
Me.LvDRI.View = System.Windows.Forms.View.Details
@@ -457,7 +464,7 @@ Partial Class F_MAINForm
'ButtonDRIedit
'
Me.ButtonDRIedit.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.ButtonDRIedit.Location = New System.Drawing.Point(1035, 313)
+ Me.ButtonDRIedit.Location = New System.Drawing.Point(972, 222)
Me.ButtonDRIedit.Name = "ButtonDRIedit"
Me.ButtonDRIedit.Size = New System.Drawing.Size(80, 23)
Me.ButtonDRIedit.TabIndex = 4
@@ -469,7 +476,7 @@ Partial Class F_MAINForm
Me.ButtonDRIremove.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.ButtonDRIremove.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.ButtonDRIremove.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon
- Me.ButtonDRIremove.Location = New System.Drawing.Point(37, 313)
+ Me.ButtonDRIremove.Location = New System.Drawing.Point(-26, 222)
Me.ButtonDRIremove.Name = "ButtonDRIremove"
Me.ButtonDRIremove.Size = New System.Drawing.Size(30, 24)
Me.ButtonDRIremove.TabIndex = 1
@@ -480,7 +487,7 @@ Partial Class F_MAINForm
Me.ButtonDRIadd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.ButtonDRIadd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.ButtonDRIadd.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon
- Me.ButtonDRIadd.Location = New System.Drawing.Point(6, 313)
+ Me.ButtonDRIadd.Location = New System.Drawing.Point(-57, 222)
Me.ButtonDRIadd.Name = "ButtonDRIadd"
Me.ButtonDRIadd.Size = New System.Drawing.Size(30, 24)
Me.ButtonDRIadd.TabIndex = 0
@@ -495,7 +502,7 @@ Partial Class F_MAINForm
Me.TabPgOptions.Location = New System.Drawing.Point(4, 22)
Me.TabPgOptions.Name = "TabPgOptions"
Me.TabPgOptions.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPgOptions.Size = New System.Drawing.Size(1121, 347)
+ Me.TabPgOptions.Size = New System.Drawing.Size(1058, 256)
Me.TabPgOptions.TabIndex = 2
Me.TabPgOptions.Text = "Options"
Me.TabPgOptions.UseVisualStyleBackColor = True
@@ -512,7 +519,7 @@ Partial Class F_MAINForm
Me.GrBoxBATCH.Controls.Add(Me.TbBOpath)
Me.GrBoxBATCH.Location = New System.Drawing.Point(6, 224)
Me.GrBoxBATCH.Name = "GrBoxBATCH"
- Me.GrBoxBATCH.Size = New System.Drawing.Size(1109, 117)
+ Me.GrBoxBATCH.Size = New System.Drawing.Size(1046, 26)
Me.GrBoxBATCH.TabIndex = 5
Me.GrBoxBATCH.TabStop = False
Me.GrBoxBATCH.Text = "Batch Options"
@@ -540,7 +547,7 @@ Partial Class F_MAINForm
'
Me.ButBObrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.ButBObrowse.Image = Global.VECTO.My.Resources.Resources.Open_icon
- Me.ButBObrowse.Location = New System.Drawing.Point(1048, 16)
+ Me.ButBObrowse.Location = New System.Drawing.Point(985, 16)
Me.ButBObrowse.Name = "ButBObrowse"
Me.ButBObrowse.Size = New System.Drawing.Size(24, 24)
Me.ButBObrowse.TabIndex = 3
@@ -562,7 +569,7 @@ Partial Class F_MAINForm
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.TbBOpath.Location = New System.Drawing.Point(227, 18)
Me.TbBOpath.Name = "TbBOpath"
- Me.TbBOpath.Size = New System.Drawing.Size(821, 20)
+ Me.TbBOpath.Size = New System.Drawing.Size(758, 20)
Me.TbBOpath.TabIndex = 1
'
'GrBoxSTD
@@ -572,7 +579,7 @@ Partial Class F_MAINForm
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.GrBoxSTD.Location = New System.Drawing.Point(6, 224)
Me.GrBoxSTD.Name = "GrBoxSTD"
- Me.GrBoxSTD.Size = New System.Drawing.Size(1109, 117)
+ Me.GrBoxSTD.Size = New System.Drawing.Size(1046, 26)
Me.GrBoxSTD.TabIndex = 14
Me.GrBoxSTD.TabStop = False
Me.GrBoxSTD.Text = "Standard Options"
@@ -581,7 +588,7 @@ Partial Class F_MAINForm
'
Me.ChBoxAutoSD.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.ChBoxAutoSD.AutoSize = True
- Me.ChBoxAutoSD.Location = New System.Drawing.Point(946, 6)
+ Me.ChBoxAutoSD.Location = New System.Drawing.Point(883, 6)
Me.ChBoxAutoSD.Name = "ChBoxAutoSD"
Me.ChBoxAutoSD.Size = New System.Drawing.Size(169, 17)
Me.ChBoxAutoSD.TabIndex = 13
@@ -702,7 +709,7 @@ Partial Class F_MAINForm
Me.TabPageDEV.Location = New System.Drawing.Point(4, 22)
Me.TabPageDEV.Name = "TabPageDEV"
Me.TabPageDEV.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPageDEV.Size = New System.Drawing.Size(1121, 347)
+ Me.TabPageDEV.Size = New System.Drawing.Size(1058, 256)
Me.TabPageDEV.TabIndex = 3
Me.TabPageDEV.Text = "Test"
Me.TabPageDEV.UseVisualStyleBackColor = True
@@ -711,7 +718,7 @@ Partial Class F_MAINForm
'
Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.Label1.AutoSize = True
- Me.Label1.Location = New System.Drawing.Point(1012, 328)
+ Me.Label1.Location = New System.Drawing.Point(1012, 237)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(106, 13)
Me.Label1.TabIndex = 1
@@ -728,7 +735,7 @@ Partial Class F_MAINForm
Me.LvDEVoptions.Location = New System.Drawing.Point(6, 6)
Me.LvDEVoptions.MultiSelect = False
Me.LvDEVoptions.Name = "LvDEVoptions"
- Me.LvDEVoptions.Size = New System.Drawing.Size(1109, 322)
+ Me.LvDEVoptions.Size = New System.Drawing.Size(1046, 231)
Me.LvDEVoptions.TabIndex = 0
Me.LvDEVoptions.UseCompatibleStateImageBehavior = False
Me.LvDEVoptions.View = System.Windows.Forms.View.Details
@@ -810,7 +817,7 @@ Partial Class F_MAINForm
Me.LvMsg.Location = New System.Drawing.Point(0, 0)
Me.LvMsg.Margin = New System.Windows.Forms.Padding(0)
Me.LvMsg.Name = "LvMsg"
- Me.LvMsg.Size = New System.Drawing.Size(1132, 196)
+ Me.LvMsg.Size = New System.Drawing.Size(1069, 261)
Me.LvMsg.TabIndex = 0
Me.LvMsg.UseCompatibleStateImageBehavior = False
Me.LvMsg.View = System.Windows.Forms.View.Details
@@ -849,18 +856,17 @@ Partial Class F_MAINForm
'SplitContainer1.Panel2
'
Me.SplitContainer1.Panel2.Controls.Add(Me.LvMsg)
- Me.SplitContainer1.Size = New System.Drawing.Size(1136, 586)
- Me.SplitContainer1.SplitterDistance = 382
+ Me.SplitContainer1.Size = New System.Drawing.Size(1073, 586)
+ Me.SplitContainer1.SplitterDistance = 317
Me.SplitContainer1.TabIndex = 12
'
'ToolStrip1
'
Me.ToolStrip1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
- Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripSeparator2, Me.ToolStripDrDnBtTools, Me.ToolStripDrDnBtInfo})
Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip1.Name = "ToolStrip1"
- Me.ToolStrip1.Size = New System.Drawing.Size(1136, 25)
+ Me.ToolStrip1.Size = New System.Drawing.Size(1073, 25)
Me.ToolStrip1.TabIndex = 11
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -1044,7 +1050,7 @@ Partial Class F_MAINForm
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(1136, 638)
+ Me.ClientSize = New System.Drawing.Size(1073, 638)
Me.Controls.Add(Me.ToolStrip1)
Me.Controls.Add(Me.SplitContainer1)
Me.Controls.Add(Me.StatusBAR)
@@ -1077,109 +1083,108 @@ Partial Class F_MAINForm
Me.SplitContainer1.Panel2.ResumeLayout(False)
CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainer1.ResumeLayout(False)
- Me.ToolStrip1.ResumeLayout(False)
- Me.ToolStrip1.PerformLayout()
Me.CmOpenFile.ResumeLayout(False)
Me.ResumeLayout(False)
Me.PerformLayout()
- End Sub
- Friend WithEvents Button1 As System.Windows.Forms.Button
- Friend WithEvents StatusBAR As System.Windows.Forms.StatusStrip
- Friend WithEvents ToolStripLbStatus As System.Windows.Forms.ToolStripStatusLabel
- Friend WithEvents TabControl1 As System.Windows.Forms.TabControl
- Friend WithEvents TabPageGEN As System.Windows.Forms.TabPage
- Friend WithEvents TabPageDRI As System.Windows.Forms.TabPage
- Friend WithEvents ButtonGENadd As System.Windows.Forms.Button
- Friend WithEvents ButtonGENremove As System.Windows.Forms.Button
- Friend WithEvents ButtonDRIremove As System.Windows.Forms.Button
- Friend WithEvents ButtonDRIadd As System.Windows.Forms.Button
- Friend WithEvents ButtonGENopt As System.Windows.Forms.Button
- Friend WithEvents ButtonDRIedit As System.Windows.Forms.Button
- Friend WithEvents ConMenFilelist As System.Windows.Forms.ContextMenuStrip
- Friend WithEvents SaveListToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents LoadListToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents LoadDefaultListToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents ClearListToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents BackgroundWorker1 As System.ComponentModel.BackgroundWorker
- Friend WithEvents ToolStripProgBarOverall As System.Windows.Forms.ToolStripProgressBar
- Friend WithEvents LvGEN As System.Windows.Forms.ListView
- Friend WithEvents ColGENpath As System.Windows.Forms.ColumnHeader
- Friend WithEvents ColGENstatus As System.Windows.Forms.ColumnHeader
- Friend WithEvents LvDRI As System.Windows.Forms.ListView
- Friend WithEvents ColDRIpath As System.Windows.Forms.ColumnHeader
- Friend WithEvents ColDRIstatus As System.Windows.Forms.ColumnHeader
- Friend WithEvents ChBoxAllGEN As System.Windows.Forms.CheckBox
- Friend WithEvents ChBoxAllDRI As System.Windows.Forms.CheckBox
- Friend WithEvents TabPgOptions As System.Windows.Forms.TabPage
- Friend WithEvents ChBoxModOut As System.Windows.Forms.CheckBox
- Friend WithEvents ChBoxUseGears As System.Windows.Forms.CheckBox
- Friend WithEvents ChBoxCyclDistCor As System.Windows.Forms.CheckBox
- Friend WithEvents PanelOptAllg As System.Windows.Forms.Panel
- Friend WithEvents LbAutoShDown As System.Windows.Forms.Label
- Friend WithEvents ChBoxAutoSD As System.Windows.Forms.CheckBox
- Friend WithEvents TbBOpath As System.Windows.Forms.TextBox
- Friend WithEvents CbBOmode As System.Windows.Forms.ComboBox
- Friend WithEvents Label2 As System.Windows.Forms.Label
- Friend WithEvents ButBObrowse As System.Windows.Forms.Button
- Friend WithEvents ChBoxBatchSubD As System.Windows.Forms.CheckBox
- Friend WithEvents LvMsg As System.Windows.Forms.ListView
- Friend WithEvents ColumnHeader1 As System.Windows.Forms.ColumnHeader
- Friend WithEvents SplitContainer1 As System.Windows.Forms.SplitContainer
- Friend WithEvents ColumnHeader2 As System.Windows.Forms.ColumnHeader
- Friend WithEvents ColumnHeader3 As System.Windows.Forms.ColumnHeader
- Friend WithEvents GrBoxBATCH As System.Windows.Forms.GroupBox
- Friend WithEvents TabPageDEV As System.Windows.Forms.TabPage
- Friend WithEvents LvDEVoptions As System.Windows.Forms.ListView
- Friend WithEvents ColumnHeader4 As System.Windows.Forms.ColumnHeader
- Friend WithEvents ColumnHeader5 As System.Windows.Forms.ColumnHeader
- Friend WithEvents ColumnHeader6 As System.Windows.Forms.ColumnHeader
- Friend WithEvents CmDEV As System.Windows.Forms.ContextMenuStrip
- Friend WithEvents ColumnHeader7 As System.Windows.Forms.ColumnHeader
- Friend WithEvents BtGENup As System.Windows.Forms.Button
- Friend WithEvents BtGENdown As System.Windows.Forms.Button
- Friend WithEvents BtDRIdown As System.Windows.Forms.Button
- Friend WithEvents BtDRIup As System.Windows.Forms.Button
- Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip
- Friend WithEvents ToolStripBtNew As System.Windows.Forms.ToolStripButton
- Friend WithEvents ToolStripBtOpen As System.Windows.Forms.ToolStripButton
- Friend WithEvents ToolStripDrDnBtTools As System.Windows.Forms.ToolStripDropDownButton
- Friend WithEvents GENEditorToolStripMenuItem1 As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents VEHEditorToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents ToolStripSeparator4 As System.Windows.Forms.ToolStripSeparator
- Friend WithEvents OpenLogToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents SettingsToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents ToolStripDrDnBtInfo As System.Windows.Forms.ToolStripDropDownButton
- Friend WithEvents CreateActivationFileToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents AboutVECTOToolStripMenuItem1 As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents ToolStripSeparator2 As System.Windows.Forms.ToolStripSeparator
- Friend WithEvents ToolStripProgBarJob As System.Windows.Forms.ToolStripProgressBar
- Friend WithEvents TmProgSec As System.Windows.Forms.Timer
- Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox
- Friend WithEvents EngineEditorToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents GearboxEditorToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents UserManualToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents ToolStripSeparator3 As System.Windows.Forms.ToolStripSeparator
- Friend WithEvents CmOpenFile As System.Windows.Forms.ContextMenuStrip
- Friend WithEvents OpenWithToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents ShowInFolderToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents ColumnHeader8 As System.Windows.Forms.ColumnHeader
- Friend WithEvents ColumnHeader9 As System.Windows.Forms.ColumnHeader
- Friend WithEvents UpdateNotesToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents SignOrVerifyFilesToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents ToolStripSeparator6 As System.Windows.Forms.ToolStripSeparator
- Friend WithEvents GrBoxSTD As System.Windows.Forms.GroupBox
- Friend WithEvents PnDeclOpt As System.Windows.Forms.Panel
- Friend WithEvents LbDecl As System.Windows.Forms.Label
- Friend WithEvents GraphToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents OpenInGraphWindowToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents CbBatch As System.Windows.Forms.CheckBox
- Friend WithEvents RbDev As System.Windows.Forms.RadioButton
- Friend WithEvents RbDecl As System.Windows.Forms.RadioButton
- Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox
- Friend WithEvents Label1 As System.Windows.Forms.Label
- Friend WithEvents ReportBugViaCITnetToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents btStartV3 As System.Windows.Forms.Button
- Friend WithEvents ChBoxMod1Hz As System.Windows.Forms.CheckBox
-
-End Class
+ End Sub
+ Friend WithEvents Button1 As System.Windows.Forms.Button
+ Friend WithEvents StatusBAR As System.Windows.Forms.StatusStrip
+ Friend WithEvents ToolStripLbStatus As System.Windows.Forms.ToolStripStatusLabel
+ Friend WithEvents TabControl1 As System.Windows.Forms.TabControl
+ Friend WithEvents TabPageGEN As System.Windows.Forms.TabPage
+ Friend WithEvents TabPageDRI As System.Windows.Forms.TabPage
+ Friend WithEvents ButtonGENadd As System.Windows.Forms.Button
+ Friend WithEvents ButtonGENremove As System.Windows.Forms.Button
+ Friend WithEvents ButtonDRIremove As System.Windows.Forms.Button
+ Friend WithEvents ButtonDRIadd As System.Windows.Forms.Button
+ Friend WithEvents ButtonDRIedit As System.Windows.Forms.Button
+ Friend WithEvents ConMenFilelist As System.Windows.Forms.ContextMenuStrip
+ Friend WithEvents SaveListToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents LoadListToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents LoadDefaultListToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents ClearListToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents BackgroundWorker1 As System.ComponentModel.BackgroundWorker
+ Friend WithEvents ToolStripProgBarOverall As System.Windows.Forms.ToolStripProgressBar
+ Friend WithEvents LvGEN As System.Windows.Forms.ListView
+ Friend WithEvents ColGENpath As System.Windows.Forms.ColumnHeader
+ Friend WithEvents ColGENstatus As System.Windows.Forms.ColumnHeader
+ Friend WithEvents LvDRI As System.Windows.Forms.ListView
+ Friend WithEvents ColDRIpath As System.Windows.Forms.ColumnHeader
+ Friend WithEvents ColDRIstatus As System.Windows.Forms.ColumnHeader
+ Friend WithEvents ChBoxAllGEN As System.Windows.Forms.CheckBox
+ Friend WithEvents ChBoxAllDRI As System.Windows.Forms.CheckBox
+ Friend WithEvents TabPgOptions As System.Windows.Forms.TabPage
+ Friend WithEvents ChBoxModOut As System.Windows.Forms.CheckBox
+ Friend WithEvents ChBoxUseGears As System.Windows.Forms.CheckBox
+ Friend WithEvents ChBoxCyclDistCor As System.Windows.Forms.CheckBox
+ Friend WithEvents PanelOptAllg As System.Windows.Forms.Panel
+ Friend WithEvents LbAutoShDown As System.Windows.Forms.Label
+ Friend WithEvents ChBoxAutoSD As System.Windows.Forms.CheckBox
+ Friend WithEvents TbBOpath As System.Windows.Forms.TextBox
+ Friend WithEvents CbBOmode As System.Windows.Forms.ComboBox
+ Friend WithEvents Label2 As System.Windows.Forms.Label
+ Friend WithEvents ButBObrowse As System.Windows.Forms.Button
+ Friend WithEvents ChBoxBatchSubD As System.Windows.Forms.CheckBox
+ Friend WithEvents LvMsg As System.Windows.Forms.ListView
+ Friend WithEvents ColumnHeader1 As System.Windows.Forms.ColumnHeader
+ Friend WithEvents SplitContainer1 As System.Windows.Forms.SplitContainer
+ Friend WithEvents ColumnHeader2 As System.Windows.Forms.ColumnHeader
+ Friend WithEvents ColumnHeader3 As System.Windows.Forms.ColumnHeader
+ Friend WithEvents GrBoxBATCH As System.Windows.Forms.GroupBox
+ Friend WithEvents TabPageDEV As System.Windows.Forms.TabPage
+ Friend WithEvents LvDEVoptions As System.Windows.Forms.ListView
+ Friend WithEvents ColumnHeader4 As System.Windows.Forms.ColumnHeader
+ Friend WithEvents ColumnHeader5 As System.Windows.Forms.ColumnHeader
+ Friend WithEvents ColumnHeader6 As System.Windows.Forms.ColumnHeader
+ Friend WithEvents CmDEV As System.Windows.Forms.ContextMenuStrip
+ Friend WithEvents ColumnHeader7 As System.Windows.Forms.ColumnHeader
+ Friend WithEvents BtGENup As System.Windows.Forms.Button
+ Friend WithEvents BtGENdown As System.Windows.Forms.Button
+ Friend WithEvents BtDRIdown As System.Windows.Forms.Button
+ Friend WithEvents BtDRIup As System.Windows.Forms.Button
+ Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip
+ Friend WithEvents ToolStripBtNew As System.Windows.Forms.ToolStripButton
+ Friend WithEvents ToolStripBtOpen As System.Windows.Forms.ToolStripButton
+ Friend WithEvents ToolStripDrDnBtTools As System.Windows.Forms.ToolStripDropDownButton
+ Friend WithEvents GENEditorToolStripMenuItem1 As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents VEHEditorToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents ToolStripSeparator4 As System.Windows.Forms.ToolStripSeparator
+ Friend WithEvents OpenLogToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents SettingsToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents ToolStripDrDnBtInfo As System.Windows.Forms.ToolStripDropDownButton
+ Friend WithEvents CreateActivationFileToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents AboutVECTOToolStripMenuItem1 As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents ToolStripSeparator2 As System.Windows.Forms.ToolStripSeparator
+ Friend WithEvents ToolStripProgBarJob As System.Windows.Forms.ToolStripProgressBar
+ Friend WithEvents TmProgSec As System.Windows.Forms.Timer
+ Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox
+ Friend WithEvents EngineEditorToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents GearboxEditorToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents UserManualToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents ToolStripSeparator3 As System.Windows.Forms.ToolStripSeparator
+ Friend WithEvents CmOpenFile As System.Windows.Forms.ContextMenuStrip
+ Friend WithEvents OpenWithToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents ShowInFolderToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents ColumnHeader8 As System.Windows.Forms.ColumnHeader
+ Friend WithEvents ColumnHeader9 As System.Windows.Forms.ColumnHeader
+ Friend WithEvents UpdateNotesToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents SignOrVerifyFilesToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents ToolStripSeparator6 As System.Windows.Forms.ToolStripSeparator
+ Friend WithEvents GrBoxSTD As System.Windows.Forms.GroupBox
+ Friend WithEvents PnDeclOpt As System.Windows.Forms.Panel
+ Friend WithEvents LbDecl As System.Windows.Forms.Label
+ Friend WithEvents GraphToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents OpenInGraphWindowToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents CbBatch As System.Windows.Forms.CheckBox
+ Friend WithEvents RbDev As System.Windows.Forms.RadioButton
+ Friend WithEvents RbDecl As System.Windows.Forms.RadioButton
+ Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox
+ Friend WithEvents Label1 As System.Windows.Forms.Label
+ Friend WithEvents ReportBugViaCITnetToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents btStartV3 As System.Windows.Forms.Button
+ Friend WithEvents ChBoxMod1Hz As System.Windows.Forms.CheckBox
+ Friend WithEvents Label6 As System.Windows.Forms.Label
+ Friend WithEvents ToolTip1 As System.Windows.Forms.ToolTip
+
+End Class
diff --git a/VECTO/GUI/F_MAINForm.resx b/VECTO/GUI/F_MAINForm.resx
index be3762deff..0d31c37361 100644
--- a/VECTO/GUI/F_MAINForm.resx
+++ b/VECTO/GUI/F_MAINForm.resx
@@ -120,6 +120,9 @@
<metadata name="StatusBAR.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>15, 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>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="PictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
diff --git a/VECTO/GUI/F_MAINForm.vb b/VECTO/GUI/F_MAINForm.vb
index 2dd4bd2df3..46080727ae 100644
--- a/VECTO/GUI/F_MAINForm.vb
+++ b/VECTO/GUI/F_MAINForm.vb
@@ -801,19 +801,6 @@ Public Class F_MAINForm
AddJobFile()
End Sub
- Private Sub ButtonGENoptions_Click(sender As Object, e As EventArgs) _
- Handles ButtonGENopt.Click
- ConMenTarget = LvGEN
- ConMenTarJob = True
-
- 'Locked functions show/hide
- LoadListToolStripMenuItem.Enabled = Not GUIlocked
- LoadDefaultListToolStripMenuItem.Enabled = Not GUIlocked
- ClearListToolStripMenuItem.Enabled = Not GUIlocked
-
- ConMenFilelist.Show(MousePosition)
- End Sub
-
Private Sub ListViewGEN_KeyDown(sender As Object, e As KeyEventArgs) _
Handles LvGEN.KeyDown
Select Case e.KeyCode
@@ -2815,5 +2802,20 @@ Lb1:
Private Sub LvMsg_MouseUp(sender As Object, e As MouseEventArgs) Handles LvMsg.MouseUp
mouseDownOnListView = False
+
+ End Sub
+
+ Private Sub LvGEN_MouseUp(sender As Object, e As MouseEventArgs) Handles LvGEN.MouseUp
+ If e.Button = MouseButtons.Right Then
+ ConMenTarget = LvGEN
+ ConMenTarJob = True
+
+ 'Locked functions show/hide
+ LoadListToolStripMenuItem.Enabled = Not GUIlocked
+ LoadDefaultListToolStripMenuItem.Enabled = Not GUIlocked
+ ClearListToolStripMenuItem.Enabled = Not GUIlocked
+
+ ConMenFilelist.Show(MousePosition)
+ End If
End Sub
End Class
diff --git a/VECTO/GUI/F_VEH.Designer.vb b/VECTO/GUI/F_VEH.Designer.vb
index edf5713b0b..0e0f400b5d 100644
--- a/VECTO/GUI/F_VEH.Designer.vb
+++ b/VECTO/GUI/F_VEH.Designer.vb
@@ -63,13 +63,13 @@ Partial Class F_VEH
Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
Me.GroupBox7 = New System.Windows.Forms.GroupBox()
- Me.Label15 = New System.Windows.Forms.Label()
Me.PnRt = New System.Windows.Forms.Panel()
+ Me.Label15 = New System.Windows.Forms.Label()
+ Me.BtRtBrowse = New System.Windows.Forms.Button()
+ Me.TbRtPath = New System.Windows.Forms.TextBox()
Me.Label45 = New System.Windows.Forms.Label()
Me.LbRtRatio = New System.Windows.Forms.Label()
Me.TbRtRatio = New System.Windows.Forms.TextBox()
- Me.BtRtBrowse = New System.Windows.Forms.Button()
- Me.TbRtPath = New System.Windows.Forms.TextBox()
Me.CbRtType = New System.Windows.Forms.ComboBox()
Me.Label46 = New System.Windows.Forms.Label()
Me.Label50 = New System.Windows.Forms.Label()
@@ -111,6 +111,7 @@ Partial Class F_VEH
Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.PnAll = New System.Windows.Forms.Panel()
Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+ Me.pnAngularGearFields = New System.Windows.Forms.Panel()
Me.Label4 = New System.Windows.Forms.Label()
Me.Label12 = New System.Windows.Forms.Label()
Me.Label10 = New System.Windows.Forms.Label()
@@ -135,6 +136,7 @@ Partial Class F_VEH
Me.CmOpenFile.SuspendLayout()
Me.PnAll.SuspendLayout()
Me.GroupBox2.SuspendLayout()
+ Me.pnAngularGearFields.SuspendLayout()
CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
@@ -398,10 +400,7 @@ Partial Class F_VEH
'
'GroupBox7
'
- Me.GroupBox7.Controls.Add(Me.Label15)
Me.GroupBox7.Controls.Add(Me.PnRt)
- Me.GroupBox7.Controls.Add(Me.BtRtBrowse)
- Me.GroupBox7.Controls.Add(Me.TbRtPath)
Me.GroupBox7.Controls.Add(Me.CbRtType)
Me.GroupBox7.Location = New System.Drawing.Point(6, 327)
Me.GroupBox7.Name = "GroupBox7"
@@ -410,30 +409,51 @@ Partial Class F_VEH
Me.GroupBox7.TabStop = False
Me.GroupBox7.Text = "Retarder Losses"
'
- 'Label15
- '
- Me.Label15.Location = New System.Drawing.Point(4, 66)
- Me.Label15.Name = "Label15"
- Me.Label15.Size = New System.Drawing.Size(269, 17)
- Me.Label15.TabIndex = 12
- Me.Label15.Text = "Retarder Loss Map"
- Me.Label15.TextAlign = System.Drawing.ContentAlignment.BottomLeft
- '
'PnRt
'
+ Me.PnRt.Controls.Add(Me.Label15)
+ Me.PnRt.Controls.Add(Me.BtRtBrowse)
+ Me.PnRt.Controls.Add(Me.TbRtPath)
Me.PnRt.Controls.Add(Me.Label45)
Me.PnRt.Controls.Add(Me.LbRtRatio)
Me.PnRt.Controls.Add(Me.TbRtRatio)
- Me.PnRt.Location = New System.Drawing.Point(6, 42)
+ Me.PnRt.Location = New System.Drawing.Point(3, 42)
Me.PnRt.Name = "PnRt"
- Me.PnRt.Size = New System.Drawing.Size(266, 34)
+ Me.PnRt.Size = New System.Drawing.Size(272, 63)
Me.PnRt.TabIndex = 1
'
+ 'Label15
+ '
+ Me.Label15.Location = New System.Drawing.Point(6, 23)
+ Me.Label15.Name = "Label15"
+ Me.Label15.Size = New System.Drawing.Size(201, 16)
+ Me.Label15.TabIndex = 15
+ Me.Label15.Text = "Retarder Loss Map"
+ Me.Label15.TextAlign = System.Drawing.ContentAlignment.BottomLeft
+ '
+ 'BtRtBrowse
+ '
+ Me.BtRtBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+ Me.BtRtBrowse.Image = Global.VECTO.My.Resources.Resources.Open_icon
+ Me.BtRtBrowse.Location = New System.Drawing.Point(245, 39)
+ Me.BtRtBrowse.Name = "BtRtBrowse"
+ Me.BtRtBrowse.Size = New System.Drawing.Size(24, 24)
+ Me.BtRtBrowse.TabIndex = 14
+ Me.BtRtBrowse.UseVisualStyleBackColor = True
+ '
+ 'TbRtPath
+ '
+ Me.TbRtPath.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+ Me.TbRtPath.Location = New System.Drawing.Point(6, 41)
+ Me.TbRtPath.Name = "TbRtPath"
+ Me.TbRtPath.Size = New System.Drawing.Size(239, 20)
+ Me.TbRtPath.TabIndex = 13
+ '
'Label45
'
Me.Label45.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Label45.AutoSize = True
- Me.Label45.Location = New System.Drawing.Point(247, 7)
+ Me.Label45.Location = New System.Drawing.Point(251, 4)
Me.Label45.Name = "Label45"
Me.Label45.Size = New System.Drawing.Size(16, 13)
Me.Label45.TabIndex = 10
@@ -441,7 +461,7 @@ Partial Class F_VEH
'
'LbRtRatio
'
- Me.LbRtRatio.Location = New System.Drawing.Point(19, 7)
+ Me.LbRtRatio.Location = New System.Drawing.Point(19, 4)
Me.LbRtRatio.Name = "LbRtRatio"
Me.LbRtRatio.Size = New System.Drawing.Size(167, 17)
Me.LbRtRatio.TabIndex = 5
@@ -451,29 +471,11 @@ Partial Class F_VEH
'TbRtRatio
'
Me.TbRtRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TbRtRatio.Location = New System.Drawing.Point(187, 4)
+ Me.TbRtRatio.Location = New System.Drawing.Point(193, 2)
Me.TbRtRatio.Name = "TbRtRatio"
Me.TbRtRatio.Size = New System.Drawing.Size(56, 20)
Me.TbRtRatio.TabIndex = 0
'
- 'BtRtBrowse
- '
- Me.BtRtBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
- Me.BtRtBrowse.Image = Global.VECTO.My.Resources.Resources.Open_icon
- Me.BtRtBrowse.Location = New System.Drawing.Point(249, 82)
- Me.BtRtBrowse.Name = "BtRtBrowse"
- Me.BtRtBrowse.Size = New System.Drawing.Size(24, 24)
- Me.BtRtBrowse.TabIndex = 3
- Me.BtRtBrowse.UseVisualStyleBackColor = True
- '
- 'TbRtPath
- '
- Me.TbRtPath.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
- Me.TbRtPath.Location = New System.Drawing.Point(5, 84)
- Me.TbRtPath.Name = "TbRtPath"
- Me.TbRtPath.Size = New System.Drawing.Size(244, 20)
- Me.TbRtPath.TabIndex = 2
- '
'CbRtType
'
Me.CbRtType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
@@ -834,12 +836,7 @@ Partial Class F_VEH
'
'GroupBox2
'
- Me.GroupBox2.Controls.Add(Me.Label4)
- Me.GroupBox2.Controls.Add(Me.Label12)
- Me.GroupBox2.Controls.Add(Me.Label10)
- Me.GroupBox2.Controls.Add(Me.tbAngularGearRatio)
- Me.GroupBox2.Controls.Add(Me.btAngularGearLossMapBrowse)
- Me.GroupBox2.Controls.Add(Me.tbAngularGearLossMapPath)
+ Me.GroupBox2.Controls.Add(Me.pnAngularGearFields)
Me.GroupBox2.Controls.Add(Me.cbAngularGearType)
Me.GroupBox2.Location = New System.Drawing.Point(290, 327)
Me.GroupBox2.Name = "GroupBox2"
@@ -848,59 +845,72 @@ Partial Class F_VEH
Me.GroupBox2.TabStop = False
Me.GroupBox2.Text = "Angular Gear"
'
+ 'pnAngularGearFields
+ '
+ Me.pnAngularGearFields.Controls.Add(Me.Label4)
+ Me.pnAngularGearFields.Controls.Add(Me.Label12)
+ Me.pnAngularGearFields.Controls.Add(Me.Label10)
+ Me.pnAngularGearFields.Controls.Add(Me.tbAngularGearRatio)
+ Me.pnAngularGearFields.Controls.Add(Me.btAngularGearLossMapBrowse)
+ Me.pnAngularGearFields.Controls.Add(Me.tbAngularGearLossMapPath)
+ Me.pnAngularGearFields.Location = New System.Drawing.Point(3, 42)
+ Me.pnAngularGearFields.Name = "pnAngularGearFields"
+ Me.pnAngularGearFields.Size = New System.Drawing.Size(272, 63)
+ Me.pnAngularGearFields.TabIndex = 6
+ '
'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(251, 49)
+ Me.Label4.Location = New System.Drawing.Point(251, 4)
Me.Label4.Name = "Label4"
Me.Label4.Size = New System.Drawing.Size(16, 13)
- Me.Label4.TabIndex = 10
+ Me.Label4.TabIndex = 16
Me.Label4.Text = "[-]"
'
'Label12
'
- Me.Label12.Location = New System.Drawing.Point(3, 67)
+ Me.Label12.Location = New System.Drawing.Point(6, 24)
Me.Label12.Name = "Label12"
- Me.Label12.Size = New System.Drawing.Size(269, 16)
- Me.Label12.TabIndex = 11
+ Me.Label12.Size = New System.Drawing.Size(263, 16)
+ Me.Label12.TabIndex = 17
Me.Label12.Text = "Transmission Loss Map or Efficiency Value [0..1]"
Me.Label12.TextAlign = System.Drawing.ContentAlignment.BottomLeft
'
'Label10
'
- Me.Label10.Location = New System.Drawing.Point(149, 49)
+ Me.Label10.Location = New System.Drawing.Point(144, 4)
Me.Label10.Name = "Label10"
Me.Label10.Size = New System.Drawing.Size(44, 18)
- Me.Label10.TabIndex = 5
+ Me.Label10.TabIndex = 15
Me.Label10.Text = "Ratio"
Me.Label10.TextAlign = System.Drawing.ContentAlignment.TopRight
'
'tbAngularGearRatio
'
Me.tbAngularGearRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.tbAngularGearRatio.Location = New System.Drawing.Point(194, 46)
+ Me.tbAngularGearRatio.Location = New System.Drawing.Point(193, 2)
Me.tbAngularGearRatio.Name = "tbAngularGearRatio"
Me.tbAngularGearRatio.Size = New System.Drawing.Size(56, 20)
- Me.tbAngularGearRatio.TabIndex = 0
+ Me.tbAngularGearRatio.TabIndex = 12
'
'btAngularGearLossMapBrowse
'
Me.btAngularGearLossMapBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.btAngularGearLossMapBrowse.Image = Global.VECTO.My.Resources.Resources.Open_icon
- Me.btAngularGearLossMapBrowse.Location = New System.Drawing.Point(249, 82)
+ Me.btAngularGearLossMapBrowse.Location = New System.Drawing.Point(244, 39)
Me.btAngularGearLossMapBrowse.Name = "btAngularGearLossMapBrowse"
Me.btAngularGearLossMapBrowse.Size = New System.Drawing.Size(24, 24)
- Me.btAngularGearLossMapBrowse.TabIndex = 3
+ Me.btAngularGearLossMapBrowse.TabIndex = 14
Me.btAngularGearLossMapBrowse.UseVisualStyleBackColor = True
'
'tbAngularGearLossMapPath
'
Me.tbAngularGearLossMapPath.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
- Me.tbAngularGearLossMapPath.Location = New System.Drawing.Point(5, 84)
+ Me.tbAngularGearLossMapPath.Location = New System.Drawing.Point(6, 41)
Me.tbAngularGearLossMapPath.Name = "tbAngularGearLossMapPath"
- Me.tbAngularGearLossMapPath.Size = New System.Drawing.Size(244, 20)
- Me.tbAngularGearLossMapPath.TabIndex = 2
+ Me.tbAngularGearLossMapPath.Size = New System.Drawing.Size(238, 20)
+ Me.tbAngularGearLossMapPath.TabIndex = 13
'
'cbAngularGearType
'
@@ -963,7 +973,6 @@ Partial Class F_VEH
Me.ToolStrip1.ResumeLayout(False)
Me.ToolStrip1.PerformLayout()
Me.GroupBox7.ResumeLayout(False)
- Me.GroupBox7.PerformLayout()
Me.PnRt.ResumeLayout(False)
Me.PnRt.PerformLayout()
Me.GroupBox8.ResumeLayout(False)
@@ -983,7 +992,8 @@ Partial Class F_VEH
Me.CmOpenFile.ResumeLayout(False)
Me.PnAll.ResumeLayout(False)
Me.GroupBox2.ResumeLayout(False)
- Me.GroupBox2.PerformLayout()
+ Me.pnAngularGearFields.ResumeLayout(False)
+ Me.pnAngularGearFields.PerformLayout()
CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -1017,8 +1027,6 @@ Partial Class F_VEH
Friend WithEvents GroupBox7 As System.Windows.Forms.GroupBox
Friend WithEvents LbRtRatio As System.Windows.Forms.Label
Friend WithEvents TbRtRatio As System.Windows.Forms.TextBox
- Friend WithEvents BtRtBrowse As System.Windows.Forms.Button
- Friend WithEvents TbRtPath As System.Windows.Forms.TextBox
Friend WithEvents CbRtType As System.Windows.Forms.ComboBox
Friend WithEvents Label45 As System.Windows.Forms.Label
Friend WithEvents PnRt As System.Windows.Forms.Panel
@@ -1067,12 +1075,15 @@ Partial Class F_VEH
Friend WithEvents PnCdATrTr As System.Windows.Forms.Panel
Friend WithEvents Label38 As System.Windows.Forms.Label
Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox
+ Friend WithEvents cbAngularGearType As System.Windows.Forms.ComboBox
+ Friend WithEvents Label15 As System.Windows.Forms.Label
+ Friend WithEvents BtRtBrowse As System.Windows.Forms.Button
+ Friend WithEvents TbRtPath As System.Windows.Forms.TextBox
+ Friend WithEvents pnAngularGearFields As System.Windows.Forms.Panel
Friend WithEvents Label4 As System.Windows.Forms.Label
+ Friend WithEvents Label12 As System.Windows.Forms.Label
Friend WithEvents Label10 As System.Windows.Forms.Label
Friend WithEvents tbAngularGearRatio As System.Windows.Forms.TextBox
Friend WithEvents btAngularGearLossMapBrowse As System.Windows.Forms.Button
Friend WithEvents tbAngularGearLossMapPath As System.Windows.Forms.TextBox
- Friend WithEvents cbAngularGearType As System.Windows.Forms.ComboBox
- Friend WithEvents Label12 As System.Windows.Forms.Label
- Friend WithEvents Label15 As System.Windows.Forms.Label
End Class
diff --git a/VECTO/GUI/F_VEH.vb b/VECTO/GUI/F_VEH.vb
index 4b047c81eb..f6142113a7 100644
--- a/VECTO/GUI/F_VEH.vb
+++ b/VECTO/GUI/F_VEH.vb
@@ -502,8 +502,6 @@ Public Class F_VEH
Select Case CbRtType.SelectedIndex
Case 1 'Primary
LbRtRatio.Text = "Ratio to engine speed"
- TbRtPath.Enabled = True
- BtRtBrowse.Enabled = True
PnRt.Enabled = True
Case 2 'Secondary
LbRtRatio.Text = "Ratio to cardan shaft speed"
@@ -512,8 +510,6 @@ Public Class F_VEH
PnRt.Enabled = True
Case Else '0 None
LbRtRatio.Text = "Ratio"
- TbRtPath.Enabled = False
- BtRtBrowse.Enabled = False
PnRt.Enabled = False
End Select
@@ -569,9 +565,8 @@ Public Class F_VEH
End Sub
Private Sub TBcw_TextChanged(sender As Object, e As EventArgs) _
- Handles TbLoad.TextChanged, TBrdyn.TextChanged, TBcdA.TextChanged, TbCdFile.TextChanged, TbRtPath.TextChanged,
- TbRtRatio.TextChanged, tbAngularGearRatio.TextChanged, tbAngularGearLossMapPath.TextChanged,
- cbAngularGearType.SelectedIndexChanged
+ Handles TbLoad.TextChanged, TBrdyn.TextChanged, TBcdA.TextChanged, TbCdFile.TextChanged, TbRtRatio.TextChanged,
+ cbAngularGearType.SelectedIndexChanged, TbRtPath.TextChanged, tbAngularGearLossMapPath.TextChanged, tbAngularGearRatio.TextChanged
Change()
End Sub
@@ -758,18 +753,13 @@ Public Class F_VEH
Handles cbAngularGearType.SelectedIndexChanged
Select Case cbAngularGearType.SelectedIndex
Case 1 'Separate Angular Gear
- tbAngularGearRatio.Enabled = True
+ pnAngularGearFields.Enabled = True
tbAngularGearRatio.Text = "1.0"
- btAngularGearLossMapBrowse.Enabled = True
- tbAngularGearLossMapPath.Enabled = True
Case Else 'Losses included in Transmission, None
tbAngularGearRatio.Text = ""
- tbAngularGearRatio.Enabled = False
- btAngularGearLossMapBrowse.Enabled = False
tbAngularGearLossMapPath.Text = ""
- tbAngularGearLossMapPath.Enabled = False
+ pnAngularGearFields.Enabled = False
End Select
-
Change()
End Sub
@@ -779,5 +769,6 @@ Public Class F_VEH
End Sub
#End Region
+
End Class
diff --git a/VECTO/My Project/Resources.Designer.vb b/VECTO/My Project/Resources.Designer.vb
index ddef06f3d9..f46ddbaa0d 100644
--- a/VECTO/My Project/Resources.Designer.vb
+++ b/VECTO/My Project/Resources.Designer.vb
@@ -1,7 +1,7 @@
'------------------------------------------------------------------------------
' <auto-generated>
' This code was generated by a tool.
-' Laufzeitversion:4.0.30319.34209
+' Runtime Version:4.0.30319.42000
'
' Changes to this file may cause incorrect behavior and will be lost if
' the code is regenerated.
@@ -130,6 +130,16 @@ Namespace My.Resources
End Get
End Property
+ '''<summary>
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
+ '''</summary>
+ Friend ReadOnly Property desktop() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("desktop", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
+
'''<summary>
''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
@@ -190,6 +200,26 @@ Namespace My.Resources
End Get
End Property
+ '''<summary>
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
+ '''</summary>
+ Friend ReadOnly Property favorites() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("favorites", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
+
+ '''<summary>
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
+ '''</summary>
+ Friend ReadOnly Property file_history() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("file_history", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
+
'''<summary>
''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
@@ -270,6 +300,16 @@ Namespace My.Resources
End Get
End Property
+ '''<summary>
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
+ '''</summary>
+ Friend ReadOnly Property new_dir() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("new_dir", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
+
'''<summary>
''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
@@ -360,6 +400,16 @@ Namespace My.Resources
End Get
End Property
+ '''<summary>
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
+ '''</summary>
+ Friend ReadOnly Property up_directory() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("up_directory", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
+
'''<summary>
''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
diff --git a/VECTO/My Project/Resources.resx b/VECTO/My Project/Resources.resx
index c3b31a6014..750b31bb0f 100644
--- a/VECTO/My Project/Resources.resx
+++ b/VECTO/My Project/Resources.resx
@@ -226,4 +226,19 @@
<data name="F_VECTO" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\F_VECTO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="desktop" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\desktop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="favorites" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\favorites.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="file_history" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\file-history.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="new_dir" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\new_dir.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="up_directory" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\up-directory16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index 44a18be57b..08875bd256 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -851,6 +851,7 @@
<None Include="..\User Manual\Release Notes.pdf">
<Link>Release Files\User Manual\Release Notes.pdf</Link>
</None>
+ <None Include="Resources\Icons.xcf" />
<None Include="VECTO_TemporaryKey.pfx" />
</ItemGroup>
<ItemGroup>
@@ -1505,6 +1506,21 @@
<Content Include="..\User Manual\usermanual.html">
<Link>Release Files\User Manual\usermanual.html</Link>
</Content>
+ <None Include="Resources\Up.bmp" />
+ <None Include="Resources\up-directory.png" />
+ <None Include="Resources\up-directory16x16.png" />
+ <None Include="Resources\new_dir.png" />
+ <None Include="Resources\desktop.png" />
+ <None Include="Resources\favorites.png" />
+ <None Include="Resources\file-history.png" />
+ <Content Include="Resources\F_ENG.ico" />
+ <Content Include="Resources\F_GBX.ico" />
+ <Content Include="Resources\F_VECTO.ico" />
+ <Content Include="Resources\F_VEH.ico" />
+ <Content Include="Resources\Graph.ico" />
+ <Content Include="Resources\Status-dialog-password-icon.ico" />
+ <Content Include="Resources\up.ico" />
+ <Content Include="Resources\up.png" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
<PropertyGroup>
--
GitLab