From e8f79a9a9686f4297a191c707209fd07296bddb1 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Wed, 10 Aug 2016 16:47:52 +0200
Subject: [PATCH] GUI changes (removed special color for V3-only panels)
---
VECTO/GUI/F_MAINForm.Designer.vb | 110 +++++++++++++++----------------
VECTO/GUI/F_MAINForm.resx | 3 +
VECTO/GUI/F_MAINForm.vb | 38 +++++------
VECTO/GUI/F_VECTO.Designer.vb | 3 +-
VECTO/GUI/F_VECTO.resx | 10 +--
5 files changed, 80 insertions(+), 84 deletions(-)
diff --git a/VECTO/GUI/F_MAINForm.Designer.vb b/VECTO/GUI/F_MAINForm.Designer.vb
index df20f8e753..30ee7d860c 100644
--- a/VECTO/GUI/F_MAINForm.Designer.vb
+++ b/VECTO/GUI/F_MAINForm.Designer.vb
@@ -54,13 +54,13 @@ Partial Class F_MAINForm
Me.ButtonGENremove = New System.Windows.Forms.Button()
Me.ButtonGENadd = New System.Windows.Forms.Button()
Me.TabPageDRI = New System.Windows.Forms.TabPage()
+ Me.Label3 = New System.Windows.Forms.Label()
Me.BtDRIdown = New System.Windows.Forms.Button()
Me.BtDRIup = New System.Windows.Forms.Button()
Me.ChBoxAllDRI = New System.Windows.Forms.CheckBox()
Me.LvDRI = New System.Windows.Forms.ListView()
Me.ColDRIpath = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
Me.ColDRIstatus = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
- Me.ButtonDRIedit = New System.Windows.Forms.Button()
Me.ButtonDRIremove = New System.Windows.Forms.Button()
Me.ButtonDRIadd = New System.Windows.Forms.Button()
Me.TabPgOptions = New System.Windows.Forms.TabPage()
@@ -154,16 +154,16 @@ Partial Class F_MAINForm
'StatusBAR
'
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.Location = New System.Drawing.Point(0, 648)
Me.StatusBAR.Name = "StatusBAR"
- Me.StatusBAR.Size = New System.Drawing.Size(1073, 22)
+ Me.StatusBAR.Size = New System.Drawing.Size(1045, 22)
Me.StatusBAR.TabIndex = 7
Me.StatusBAR.Text = "StatusBAR"
'
'ToolStripLbStatus
'
Me.ToolStripLbStatus.Name = "ToolStripLbStatus"
- Me.ToolStripLbStatus.Size = New System.Drawing.Size(1058, 17)
+ Me.ToolStripLbStatus.Size = New System.Drawing.Size(948, 17)
Me.ToolStripLbStatus.Spring = True
Me.ToolStripLbStatus.Text = "Status Text"
Me.ToolStripLbStatus.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -200,7 +200,7 @@ 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(1070, 312)
+ Me.TabControl1.Size = New System.Drawing.Size(1042, 328)
Me.TabControl1.TabIndex = 10
'
'TabPageGEN
@@ -219,7 +219,7 @@ Partial Class F_MAINForm
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(1062, 286)
+ Me.TabPageGEN.Size = New System.Drawing.Size(1034, 302)
Me.TabPageGEN.TabIndex = 0
Me.TabPageGEN.Text = "Job Files"
Me.TabPageGEN.UseVisualStyleBackColor = True
@@ -228,7 +228,7 @@ Partial Class F_MAINForm
'
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(842, 252)
+ Me.Label6.Location = New System.Drawing.Point(814, 268)
Me.Label6.Name = "Label6"
Me.Label6.Size = New System.Drawing.Size(217, 13)
Me.Label6.TabIndex = 21
@@ -272,7 +272,7 @@ Partial Class F_MAINForm
'
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(307, 251)
+ Me.BtGENdown.Location = New System.Drawing.Point(307, 267)
Me.BtGENdown.Name = "BtGENdown"
Me.BtGENdown.Size = New System.Drawing.Size(30, 30)
Me.BtGENdown.TabIndex = 6
@@ -283,7 +283,7 @@ Partial Class F_MAINForm
'
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(276, 251)
+ Me.BtGENup.Location = New System.Drawing.Point(276, 267)
Me.BtGENup.Name = "BtGENup"
Me.BtGENup.Size = New System.Drawing.Size(30, 30)
Me.BtGENup.TabIndex = 4
@@ -296,7 +296,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(408, 259)
+ Me.LbAutoShDown.Location = New System.Drawing.Point(408, 275)
Me.LbAutoShDown.Name = "LbAutoShDown"
Me.LbAutoShDown.Size = New System.Drawing.Size(225, 13)
Me.LbAutoShDown.TabIndex = 17
@@ -307,7 +307,7 @@ 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(195, 258)
+ Me.ChBoxAllGEN.Location = New System.Drawing.Point(195, 274)
Me.ChBoxAllGEN.Name = "ChBoxAllGEN"
Me.ChBoxAllGEN.Size = New System.Drawing.Size(70, 17)
Me.ChBoxAllGEN.TabIndex = 16
@@ -330,7 +330,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(945, 247)
+ Me.LvGEN.Size = New System.Drawing.Size(917, 263)
Me.LvGEN.TabIndex = 14
Me.LvGEN.UseCompatibleStateImageBehavior = False
Me.LvGEN.View = System.Windows.Forms.View.Details
@@ -350,7 +350,7 @@ Partial Class F_MAINForm
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(147, 251)
+ Me.ButtonGENremove.Location = New System.Drawing.Point(147, 267)
Me.ButtonGENremove.Name = "ButtonGENremove"
Me.ButtonGENremove.Size = New System.Drawing.Size(33, 30)
Me.ButtonGENremove.TabIndex = 2
@@ -362,7 +362,7 @@ Partial Class F_MAINForm
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, 251)
+ Me.ButtonGENadd.Location = New System.Drawing.Point(113, 267)
Me.ButtonGENadd.Name = "ButtonGENadd"
Me.ButtonGENadd.Size = New System.Drawing.Size(33, 30)
Me.ButtonGENadd.TabIndex = 1
@@ -371,38 +371,48 @@ Partial Class F_MAINForm
'
'TabPageDRI
'
+ Me.TabPageDRI.Controls.Add(Me.Label3)
Me.TabPageDRI.Controls.Add(Me.BtDRIdown)
Me.TabPageDRI.Controls.Add(Me.BtDRIup)
Me.TabPageDRI.Controls.Add(Me.ChBoxAllDRI)
Me.TabPageDRI.Controls.Add(Me.LvDRI)
- Me.TabPageDRI.Controls.Add(Me.ButtonDRIedit)
Me.TabPageDRI.Controls.Add(Me.ButtonDRIremove)
Me.TabPageDRI.Controls.Add(Me.ButtonDRIadd)
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(1062, 286)
+ Me.TabPageDRI.Size = New System.Drawing.Size(952, 302)
Me.TabPageDRI.TabIndex = 1
Me.TabPageDRI.Text = "Driving Cycles"
Me.TabPageDRI.UseVisualStyleBackColor = True
'
+ 'Label3
+ '
+ Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.Label3.AutoSize = True
+ Me.Label3.Location = New System.Drawing.Point(732, 268)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(217, 13)
+ Me.Label3.TabIndex = 22
+ Me.Label3.Text = "(Double-Click to Edit, Right-Click for Options)"
+ '
'BtDRIdown
'
- Me.BtDRIdown.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.BtDRIdown.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.BtDRIdown.Image = Global.VECTO.My.Resources.Resources.Actions_arrow_down_icon
- Me.BtDRIdown.Location = New System.Drawing.Point(944, 252)
+ Me.BtDRIdown.Location = New System.Drawing.Point(196, 268)
Me.BtDRIdown.Name = "BtDRIdown"
- Me.BtDRIdown.Size = New System.Drawing.Size(30, 24)
+ Me.BtDRIdown.Size = New System.Drawing.Size(33, 30)
Me.BtDRIdown.TabIndex = 3
Me.BtDRIdown.UseVisualStyleBackColor = True
'
'BtDRIup
'
- Me.BtDRIup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.BtDRIup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.BtDRIup.Image = Global.VECTO.My.Resources.Resources.Actions_arrow_up_icon
- Me.BtDRIup.Location = New System.Drawing.Point(914, 252)
+ Me.BtDRIup.Location = New System.Drawing.Point(163, 268)
Me.BtDRIup.Name = "BtDRIup"
- Me.BtDRIup.Size = New System.Drawing.Size(30, 24)
+ Me.BtDRIup.Size = New System.Drawing.Size(33, 30)
Me.BtDRIup.TabIndex = 2
Me.BtDRIup.UseVisualStyleBackColor = True
'
@@ -410,7 +420,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, 256)
+ Me.ChBoxAllDRI.Location = New System.Drawing.Point(85, 275)
Me.ChBoxAllDRI.Name = "ChBoxAllDRI"
Me.ChBoxAllDRI.Size = New System.Drawing.Size(70, 17)
Me.ChBoxAllDRI.TabIndex = 7
@@ -432,7 +442,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(1050, 245)
+ Me.LvDRI.Size = New System.Drawing.Size(940, 261)
Me.LvDRI.TabIndex = 6
Me.LvDRI.UseCompatibleStateImageBehavior = False
Me.LvDRI.View = System.Windows.Forms.View.Details
@@ -447,35 +457,25 @@ Partial Class F_MAINForm
Me.ColDRIstatus.Text = ""
Me.ColDRIstatus.Width = 150
'
- '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(976, 252)
- Me.ButtonDRIedit.Name = "ButtonDRIedit"
- Me.ButtonDRIedit.Size = New System.Drawing.Size(80, 23)
- Me.ButtonDRIedit.TabIndex = 4
- Me.ButtonDRIedit.Text = "List Options"
- Me.ButtonDRIedit.UseVisualStyleBackColor = True
- '
'ButtonDRIremove
'
- Me.ButtonDRIremove.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.ButtonDRIremove.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), 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(-22, 252)
+ Me.ButtonDRIremove.Location = New System.Drawing.Point(38, 268)
Me.ButtonDRIremove.Name = "ButtonDRIremove"
- Me.ButtonDRIremove.Size = New System.Drawing.Size(30, 24)
+ Me.ButtonDRIremove.Size = New System.Drawing.Size(33, 30)
Me.ButtonDRIremove.TabIndex = 1
Me.ButtonDRIremove.UseVisualStyleBackColor = True
'
'ButtonDRIadd
'
- Me.ButtonDRIadd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.ButtonDRIadd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), 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(-53, 252)
+ Me.ButtonDRIadd.Location = New System.Drawing.Point(5, 268)
Me.ButtonDRIadd.Name = "ButtonDRIadd"
- Me.ButtonDRIadd.Size = New System.Drawing.Size(30, 24)
+ Me.ButtonDRIadd.Size = New System.Drawing.Size(33, 30)
Me.ButtonDRIadd.TabIndex = 0
Me.ButtonDRIadd.UseVisualStyleBackColor = True
'
@@ -488,7 +488,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(1062, 286)
+ Me.TabPgOptions.Size = New System.Drawing.Size(952, 302)
Me.TabPgOptions.TabIndex = 2
Me.TabPgOptions.Text = "Options"
Me.TabPgOptions.UseVisualStyleBackColor = True
@@ -505,7 +505,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(1050, 56)
+ Me.GrBoxBATCH.Size = New System.Drawing.Size(940, 72)
Me.GrBoxBATCH.TabIndex = 5
Me.GrBoxBATCH.TabStop = False
Me.GrBoxBATCH.Text = "Batch Options"
@@ -533,7 +533,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(989, 16)
+ Me.ButBObrowse.Location = New System.Drawing.Point(879, 16)
Me.ButBObrowse.Name = "ButBObrowse"
Me.ButBObrowse.Size = New System.Drawing.Size(24, 24)
Me.ButBObrowse.TabIndex = 3
@@ -555,7 +555,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(762, 20)
+ Me.TbBOpath.Size = New System.Drawing.Size(652, 20)
Me.TbBOpath.TabIndex = 1
'
'GrBoxSTD
@@ -565,7 +565,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(1050, 56)
+ Me.GrBoxSTD.Size = New System.Drawing.Size(940, 72)
Me.GrBoxSTD.TabIndex = 14
Me.GrBoxSTD.TabStop = False
Me.GrBoxSTD.Text = "Standard Options"
@@ -574,7 +574,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(887, 6)
+ Me.ChBoxAutoSD.Location = New System.Drawing.Point(777, 6)
Me.ChBoxAutoSD.Name = "ChBoxAutoSD"
Me.ChBoxAutoSD.Size = New System.Drawing.Size(169, 17)
Me.ChBoxAutoSD.TabIndex = 13
@@ -695,7 +695,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(1062, 286)
+ Me.TabPageDEV.Size = New System.Drawing.Size(952, 302)
Me.TabPageDEV.TabIndex = 3
Me.TabPageDEV.Text = "Test"
Me.TabPageDEV.UseVisualStyleBackColor = True
@@ -704,7 +704,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, 267)
+ Me.Label1.Location = New System.Drawing.Point(1012, 283)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(106, 13)
Me.Label1.TabIndex = 1
@@ -721,7 +721,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(1050, 261)
+ Me.LvDEVoptions.Size = New System.Drawing.Size(940, 277)
Me.LvDEVoptions.TabIndex = 0
Me.LvDEVoptions.UseCompatibleStateImageBehavior = False
Me.LvDEVoptions.View = System.Windows.Forms.View.Details
@@ -803,7 +803,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(1073, 265)
+ Me.LvMsg.Size = New System.Drawing.Size(1045, 281)
Me.LvMsg.TabIndex = 0
Me.LvMsg.UseCompatibleStateImageBehavior = False
Me.LvMsg.View = System.Windows.Forms.View.Details
@@ -841,8 +841,8 @@ Partial Class F_MAINForm
'SplitContainer1.Panel2
'
Me.SplitContainer1.Panel2.Controls.Add(Me.LvMsg)
- Me.SplitContainer1.Size = New System.Drawing.Size(1073, 586)
- Me.SplitContainer1.SplitterDistance = 317
+ Me.SplitContainer1.Size = New System.Drawing.Size(1045, 618)
+ Me.SplitContainer1.SplitterDistance = 333
Me.SplitContainer1.TabIndex = 12
'
'ToolStrip1
@@ -852,7 +852,7 @@ Partial Class F_MAINForm
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(1073, 25)
+ Me.ToolStrip1.Size = New System.Drawing.Size(1045, 25)
Me.ToolStrip1.TabIndex = 11
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -1037,7 +1037,7 @@ Partial Class F_MAINForm
Me.AcceptButton = Me.btStartV3
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(1073, 638)
+ Me.ClientSize = New System.Drawing.Size(1045, 670)
Me.Controls.Add(Me.ToolStrip1)
Me.Controls.Add(Me.SplitContainer1)
Me.Controls.Add(Me.StatusBAR)
@@ -1086,7 +1086,6 @@ Partial Class F_MAINForm
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
@@ -1184,5 +1183,6 @@ Partial Class F_MAINForm
Friend WithEvents PasteToolStripButton As System.Windows.Forms.ToolStripButton
Friend WithEvents toolStripSeparator1 As System.Windows.Forms.ToolStripSeparator
Friend WithEvents HelpToolStripButton As System.Windows.Forms.ToolStripButton
+ Friend WithEvents Label3 As System.Windows.Forms.Label
End Class
diff --git a/VECTO/GUI/F_MAINForm.resx b/VECTO/GUI/F_MAINForm.resx
index 0d31c37361..315e332dbf 100644
--- a/VECTO/GUI/F_MAINForm.resx
+++ b/VECTO/GUI/F_MAINForm.resx
@@ -223,6 +223,9 @@
<metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>732, 12</value>
</metadata>
+ <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>850, 12</value>
+ </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>49</value>
</metadata>
diff --git a/VECTO/GUI/F_MAINForm.vb b/VECTO/GUI/F_MAINForm.vb
index b7e0012fe5..dc963b9631 100644
--- a/VECTO/GUI/F_MAINForm.vb
+++ b/VECTO/GUI/F_MAINForm.vb
@@ -1054,25 +1054,15 @@ lbFound:
#Region "Events"
- Private Sub ButtonDRIadd_Click(sender As Object, e As EventArgs) _
- Handles ButtonDRIadd.Click
+ Private Sub ButtonDRIadd_Click(sender As Object, e As EventArgs) Handles ButtonDRIadd.Click
AddCycle()
End Sub
- Private Sub ButtonDRIremove_Click(sender As Object, e As EventArgs) _
- Handles ButtonDRIremove.Click
+ Private Sub ButtonDRIremove_Click(sender As Object, e As EventArgs) Handles ButtonDRIremove.Click
RemoveCycle()
End Sub
- Private Sub ButtonDRIoptions_Click(sender As Object, e As EventArgs) _
- Handles ButtonDRIedit.Click
- ConMenTarget = LvDRI
- ConMenTarJob = False
- ConMenFilelist.Show(MousePosition)
- End Sub
-
- Private Sub LvDRI_ItemChecked(sender As Object, e As ItemCheckedEventArgs) _
- Handles LvDRI.ItemChecked
+ Private Sub LvDRI_ItemChecked(sender As Object, e As ItemCheckedEventArgs) Handles LvDRI.ItemChecked
If e.Item.Checked Then
DRIchecked += 1
@@ -1084,8 +1074,7 @@ lbFound:
UpdateCycleTabText()
End Sub
- Private Sub ChBoxAllDRI_CheckedChanged(sender As Object, e As EventArgs) _
- Handles ChBoxAllDRI.CheckedChanged
+ Private Sub ChBoxAllDRI_CheckedChanged(sender As Object, e As EventArgs) Handles ChBoxAllDRI.CheckedChanged
Dim Check As Boolean
Dim x As ListViewItem
@@ -1116,8 +1105,7 @@ lbFound:
End If
End Sub
- Private Sub ListViewDRI_KeyDown(sender As Object, e As KeyEventArgs) _
- Handles LvDRI.KeyDown
+ Private Sub ListViewDRI_KeyDown(sender As Object, e As KeyEventArgs) Handles LvDRI.KeyDown
Select Case e.KeyCode
Case Keys.Delete, Keys.Back
If Not GUIlocked Then RemoveCycle()
@@ -1127,13 +1115,11 @@ lbFound:
End Sub
'Drag n' Drop
- Private Sub ListDRI_DragEnter(sender As Object, e As DragEventArgs) _
- Handles LvDRI.DragEnter
+ Private Sub ListDRI_DragEnter(sender As Object, e As DragEventArgs) Handles LvDRI.DragEnter
If (e.Data.GetDataPresent(DataFormats.FileDrop)) Then e.Effect = DragDropEffects.Copy
End Sub
- Private Sub ListDRI_DragDrop(sender As Object, e As DragEventArgs) _
- Handles LvDRI.DragDrop
+ Private Sub ListDRI_DragDrop(sender As Object, e As DragEventArgs) Handles LvDRI.DragDrop
Dim f As String()
f = CType(e.Data.GetData(DataFormats.FileDrop), Array)
AddToCycleListView(f)
@@ -2261,7 +2247,7 @@ lbFound:
lv0 = New ListViewItem
lv0.Text = Msg
- lv0.SubItems.Add(Now.ToString)
+ lv0.SubItems.Add(Now.ToString("HH:mm:ss.ff"))
lv0.SubItems.Add(Source)
If LvMsg.Items.Count > 9999 Then LvMsg.Items.RemoveAt(0)
@@ -2808,4 +2794,12 @@ Lb1:
ConMenFilelist.Show(MousePosition)
End If
End Sub
+
+ Private Sub LvDRI_MouseUp(sender As Object, e As MouseEventArgs) Handles LvDRI.MouseUp
+ If e.Button = MouseButtons.Right Then
+ ConMenTarget = LvDRI
+ ConMenTarJob = False
+ ConMenFilelist.Show(MousePosition)
+ End If
+ End Sub
End Class
diff --git a/VECTO/GUI/F_VECTO.Designer.vb b/VECTO/GUI/F_VECTO.Designer.vb
index c24ffe7428..1daf3feb55 100644
--- a/VECTO/GUI/F_VECTO.Designer.vb
+++ b/VECTO/GUI/F_VECTO.Designer.vb
@@ -569,7 +569,6 @@ Partial Class F_VECTO
'
'GroupBox2
'
- Me.GroupBox2.BackColor = System.Drawing.Color.AliceBlue
Me.GroupBox2.Controls.Add(Me.Label12)
Me.GroupBox2.Controls.Add(Me.tbDfCoastingScale)
Me.GroupBox2.Controls.Add(Me.Label11)
@@ -588,7 +587,7 @@ Partial Class F_VECTO
Me.GroupBox2.Size = New System.Drawing.Size(478, 124)
Me.GroupBox2.TabIndex = 3
Me.GroupBox2.TabStop = False
- Me.GroupBox2.Text = "Coasting Parameters WB2016 (v3 only)"
+ Me.GroupBox2.Text = "Coasting Parameters"
'
'Label12
'
diff --git a/VECTO/GUI/F_VECTO.resx b/VECTO/GUI/F_VECTO.resx
index 7270c94902..b53e4abbcd 100644
--- a/VECTO/GUI/F_VECTO.resx
+++ b/VECTO/GUI/F_VECTO.resx
@@ -124,7 +124,7 @@
<data name="ButtonVEH.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
+ YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/
776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC
AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5
@@ -142,7 +142,7 @@
<data name="ButtonGBX.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
+ YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/
776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC
AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5
@@ -160,7 +160,7 @@
<data name="ButtonMAP.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
+ YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/
776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC
AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5
@@ -178,7 +178,7 @@
<data name="btnDfVelocityDrop.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
+ YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/
776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC
AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5
@@ -196,7 +196,7 @@
<data name="btnDfTargetSpeed.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
+ YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/
776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC
AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5
--
GitLab