diff --git a/VECTO/GUI/AboutBox.Designer.vb b/VECTO/GUI/AboutBox.Designer.vb
index fa8e20b654515c7cad86024db5d92c0bb863e35a..57d8e61498875612e68321444101f71aeba6efe1 100644
--- a/VECTO/GUI/AboutBox.Designer.vb
+++ b/VECTO/GUI/AboutBox.Designer.vb
@@ -36,109 +36,109 @@ Partial Class AboutBox
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<DebuggerStepThrough()> _
Private Sub InitializeComponent()
- Me.Label10 = New Label()
- Me.LabelLic = New Label()
- Me.LabelLicDate = New Label()
- Me.Label2 = New Label()
- Me.Label8 = New Label()
- Me.Panel1 = New Panel()
- Me.PictureBox1 = New PictureBox()
- Me.Label1 = New Label()
- Me.LinkLabel1 = New LinkLabel()
- Me.LinkLabel2 = New LinkLabel()
- Me.Label3 = New Label()
- Me.PictureBoxJRC = New PictureBox()
+ Me.Label10 = New System.Windows.Forms.Label()
+ Me.LabelLic = New System.Windows.Forms.Label()
+ Me.LabelLicDate = New System.Windows.Forms.Label()
+ Me.Label2 = New System.Windows.Forms.Label()
+ Me.Label8 = New System.Windows.Forms.Label()
+ Me.Panel1 = New System.Windows.Forms.Panel()
+ Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.LinkLabel1 = New System.Windows.Forms.LinkLabel()
+ Me.LinkLabel2 = New System.Windows.Forms.LinkLabel()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.PictureBoxJRC = New System.Windows.Forms.PictureBox()
Me.Panel1.SuspendLayout()
- CType(Me.PictureBox1, ISupportInitialize).BeginInit()
- CType(Me.PictureBoxJRC, ISupportInitialize).BeginInit()
+ CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.PictureBoxJRC, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'Label10
'
Me.Label10.AutoSize = True
- Me.Label10.Font = New Font("Verdana", 8.25!, FontStyle.Regular, GraphicsUnit.Point, CType(0, Byte))
- Me.Label10.Location = New Point(9, 250)
+ Me.Label10.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label10.Location = New System.Drawing.Point(9, 250)
Me.Label10.Name = "Label10"
- Me.Label10.Size = New Size(75, 13)
+ Me.Label10.Size = New System.Drawing.Size(75, 13)
Me.Label10.TabIndex = 11
Me.Label10.Text = "License file:"
'
'LabelLic
'
Me.LabelLic.AutoSize = True
- Me.LabelLic.Font = New Font("Verdana", 8.25!, FontStyle.Regular, GraphicsUnit.Point, CType(0, Byte))
- Me.LabelLic.Location = New Point(3, 0)
+ Me.LabelLic.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.LabelLic.Location = New System.Drawing.Point(3, 0)
Me.LabelLic.Name = "LabelLic"
- Me.LabelLic.Size = New Size(22, 13)
+ Me.LabelLic.Size = New System.Drawing.Size(22, 13)
Me.LabelLic.TabIndex = 12
Me.LabelLic.Text = "Lic"
'
'LabelLicDate
'
- Me.LabelLicDate.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
+ Me.LabelLicDate.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.LabelLicDate.AutoSize = True
- Me.LabelLicDate.Font = New Font("Verdana", 8.25!, FontStyle.Regular, GraphicsUnit.Point, CType(0, Byte))
- Me.LabelLicDate.Location = New Point(3, 26)
+ Me.LabelLicDate.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.LabelLicDate.Location = New System.Drawing.Point(3, 26)
Me.LabelLicDate.Name = "LabelLicDate"
- Me.LabelLicDate.Size = New Size(12, 13)
+ Me.LabelLicDate.Size = New System.Drawing.Size(12, 13)
Me.LabelLicDate.TabIndex = 13
Me.LabelLicDate.Text = "-"
'
'Label2
'
Me.Label2.AutoSize = True
- Me.Label2.Font = New Font("Verdana", 8.25!, FontStyle.Regular, GraphicsUnit.Point, CType(0, Byte))
- Me.Label2.Location = New Point(9, 346)
+ Me.Label2.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label2.Location = New System.Drawing.Point(9, 346)
Me.Label2.Name = "Label2"
- Me.Label2.Size = New Size(162, 13)
+ Me.Label2.Size = New System.Drawing.Size(162, 13)
Me.Label2.TabIndex = 7
Me.Label2.Text = "Developed on behalf of the"
'
'Label8
'
Me.Label8.AutoSize = True
- Me.Label8.Font = New Font("Verdana", 8.25!, FontStyle.Regular, GraphicsUnit.Point, CType(0, Byte))
- Me.Label8.Location = New Point(24, 368)
+ Me.Label8.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label8.Location = New System.Drawing.Point(24, 368)
Me.Label8.Name = "Label8"
- Me.Label8.Size = New Size(158, 39)
+ Me.Label8.Size = New System.Drawing.Size(158, 39)
Me.Label8.TabIndex = 3
- Me.Label8.Text = "Joint Research Centre" & ChrW(13) & ChrW(10) & "Sustainable Transport Unit" & ChrW(13) & ChrW(10) & "European Commission"
+ Me.Label8.Text = "Joint Research Centre" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Sustainable Transport Unit" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "European Commission"
'
'Panel1
'
- Me.Panel1.BorderStyle = BorderStyle.Fixed3D
+ Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
Me.Panel1.Controls.Add(Me.LabelLic)
Me.Panel1.Controls.Add(Me.LabelLicDate)
- Me.Panel1.Location = New Point(12, 266)
+ Me.Panel1.Location = New System.Drawing.Point(12, 266)
Me.Panel1.Name = "Panel1"
- Me.Panel1.Size = New Size(464, 52)
+ Me.Panel1.Size = New System.Drawing.Size(464, 52)
Me.Panel1.TabIndex = 16
'
'PictureBox1
'
- Me.PictureBox1.Image = VECTO_About
- Me.PictureBox1.Location = New Point(23, 12)
+ Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_About
+ Me.PictureBox1.Location = New System.Drawing.Point(23, 12)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New Size(447, 182)
+ Me.PictureBox1.Size = New System.Drawing.Size(447, 182)
Me.PictureBox1.TabIndex = 14
Me.PictureBox1.TabStop = False
'
'Label1
'
Me.Label1.AutoSize = True
- Me.Label1.Font = New Font("Verdana", 8.25!, FontStyle.Regular, GraphicsUnit.Point, CType(0, Byte))
- Me.Label1.Location = New Point(9, 436)
+ Me.Label1.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label1.Location = New System.Drawing.Point(9, 436)
Me.Label1.Name = "Label1"
- Me.Label1.Size = New Size(105, 13)
+ Me.Label1.Size = New System.Drawing.Size(105, 13)
Me.Label1.TabIndex = 7
Me.Label1.Text = "Support Contact:"
'
'LinkLabel1
'
Me.LinkLabel1.AutoSize = True
- Me.LinkLabel1.Location = New Point(120, 436)
+ Me.LinkLabel1.Location = New System.Drawing.Point(120, 436)
Me.LinkLabel1.Name = "LinkLabel1"
- Me.LinkLabel1.Size = New Size(122, 13)
+ Me.LinkLabel1.Size = New System.Drawing.Size(122, 13)
Me.LinkLabel1.TabIndex = 17
Me.LinkLabel1.TabStop = True
Me.LinkLabel1.Text = "vecto@jrc.ec.europa.eu"
@@ -146,10 +146,10 @@ Partial Class AboutBox
'LinkLabel2
'
Me.LinkLabel2.AutoSize = True
- Me.LinkLabel2.Font = New Font("Verdana", 8.25!)
- Me.LinkLabel2.Location = New Point(20, 197)
+ Me.LinkLabel2.Font = New System.Drawing.Font("Verdana", 8.25!)
+ Me.LinkLabel2.Location = New System.Drawing.Point(20, 197)
Me.LinkLabel2.Name = "LinkLabel2"
- Me.LinkLabel2.Size = New Size(210, 13)
+ Me.LinkLabel2.Size = New System.Drawing.Size(210, 13)
Me.LinkLabel2.TabIndex = 18
Me.LinkLabel2.TabStop = True
Me.LinkLabel2.Text = "VECTO is licensed under EUPL 1.1+"
@@ -157,29 +157,27 @@ Partial Class AboutBox
'Label3
'
Me.Label3.AutoSize = True
- Me.Label3.Font = New Font("Verdana", 8.25!)
- Me.Label3.Location = New Point(20, 213)
+ Me.Label3.Font = New System.Drawing.Font("Verdana", 8.25!)
+ Me.Label3.Location = New System.Drawing.Point(20, 213)
Me.Label3.Name = "Label3"
- Me.Label3.Size = New Size(237, 13)
+ Me.Label3.Size = New System.Drawing.Size(237, 13)
Me.Label3.TabIndex = 19
Me.Label3.Text = "Copyright © 2012-2016 European Union"
'
'PictureBoxJRC
'
- Me.PictureBoxJRC.Cursor = Cursors.Hand
- Me.PictureBoxJRC.Image = JRC_About
- Me.PictureBoxJRC.Location = New Point(216, 353)
+ Me.PictureBoxJRC.Cursor = System.Windows.Forms.Cursors.Hand
+ Me.PictureBoxJRC.Image = Global.TUGraz.VECTO.My.Resources.Resources.JRC_About
+ Me.PictureBoxJRC.Location = New System.Drawing.Point(216, 353)
Me.PictureBoxJRC.Name = "PictureBoxJRC"
- Me.PictureBoxJRC.Size = New Size(260, 54)
+ Me.PictureBoxJRC.Size = New System.Drawing.Size(260, 54)
Me.PictureBoxJRC.TabIndex = 15
Me.PictureBoxJRC.TabStop = False
'
- 'F_AboutBox
+ 'AboutBox
'
- Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!)
- Me.AutoScaleMode = AutoScaleMode.Font
- Me.BackColor = Color.White
- Me.ClientSize = New Size(491, 474)
+ Me.BackColor = System.Drawing.Color.White
+ Me.ClientSize = New System.Drawing.Size(491, 474)
Me.Controls.Add(Me.Label3)
Me.Controls.Add(Me.LinkLabel2)
Me.Controls.Add(Me.LinkLabel1)
@@ -190,14 +188,14 @@ Partial Class AboutBox
Me.Controls.Add(Me.Label1)
Me.Controls.Add(Me.Label2)
Me.Controls.Add(Me.Label8)
- Me.FormBorderStyle = FormBorderStyle.FixedToolWindow
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
Me.Name = "AboutBox"
- Me.StartPosition = FormStartPosition.CenterParent
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
Me.Text = "About VECTO"
Me.Panel1.ResumeLayout(False)
Me.Panel1.PerformLayout()
- CType(Me.PictureBox1, ISupportInitialize).EndInit()
- CType(Me.PictureBoxJRC, ISupportInitialize).EndInit()
+ CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.PictureBoxJRC, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
diff --git a/VECTO/GUI/GearboxForm.Designer.vb b/VECTO/GUI/GearboxForm.Designer.vb
index b5f2c27885587bbd0a1610f38f88d9e684c80b9f..b9b9047b67e72dc697f56187c4c3313f4e5f36fd 100644
--- a/VECTO/GUI/GearboxForm.Designer.vb
+++ b/VECTO/GUI/GearboxForm.Designer.vb
@@ -78,6 +78,7 @@ Partial Class GearboxForm
Me.Label20 = New System.Windows.Forms.Label()
Me.Label19 = New System.Windows.Forms.Label()
Me.PnTorqRes = New System.Windows.Forms.Panel()
+ Me.Label25 = New System.Windows.Forms.Label()
Me.Label2 = New System.Windows.Forms.Label()
Me.Label4 = New System.Windows.Forms.Label()
Me.TbTqResv = New System.Windows.Forms.TextBox()
@@ -119,7 +120,6 @@ Partial Class GearboxForm
Me.Label32 = New System.Windows.Forms.Label()
Me.PnInertiaTI = New System.Windows.Forms.Panel()
Me.PicBox = New System.Windows.Forms.PictureBox()
- Me.Label25 = New System.Windows.Forms.Label()
Me.ToolStrip1.SuspendLayout()
Me.StatusStrip1.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -495,6 +495,16 @@ Partial Class GearboxForm
Me.PnTorqRes.Size = New System.Drawing.Size(426, 32)
Me.PnTorqRes.TabIndex = 2
'
+ 'Label25
+ '
+ Me.Label25.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.Label25.AutoSize = True
+ Me.Label25.Location = New System.Drawing.Point(294, 9)
+ Me.Label25.Name = "Label25"
+ Me.Label25.Size = New System.Drawing.Size(129, 13)
+ Me.Label25.TabIndex = 1
+ Me.Label25.Text = "(Early shift-up, Skip gears)"
+ '
'Label2
'
Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -693,7 +703,7 @@ Partial Class GearboxForm
'
Me.BtTCShiftFileBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.BtTCShiftFileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.BtTCShiftFileBrowse.Location = New System.Drawing.Point(353, 104)
+ Me.BtTCShiftFileBrowse.Location = New System.Drawing.Point(348, 102)
Me.BtTCShiftFileBrowse.Name = "BtTCShiftFileBrowse"
Me.BtTCShiftFileBrowse.Size = New System.Drawing.Size(24, 24)
Me.BtTCShiftFileBrowse.TabIndex = 5
@@ -721,7 +731,7 @@ Partial Class GearboxForm
'LblTCShiftFile
'
Me.LblTCShiftFile.AutoSize = True
- Me.LblTCShiftFile.Location = New System.Drawing.Point(5, 78)
+ Me.LblTCShiftFile.Location = New System.Drawing.Point(4, 88)
Me.LblTCShiftFile.Name = "LblTCShiftFile"
Me.LblTCShiftFile.Size = New System.Drawing.Size(172, 13)
Me.LblTCShiftFile.TabIndex = 5
@@ -882,16 +892,6 @@ Partial Class GearboxForm
Me.PicBox.TabIndex = 48
Me.PicBox.TabStop = False
'
- 'Label25
- '
- Me.Label25.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label25.AutoSize = True
- Me.Label25.Location = New System.Drawing.Point(294, 9)
- Me.Label25.Name = "Label25"
- Me.Label25.Size = New System.Drawing.Size(129, 13)
- Me.Label25.TabIndex = 1
- Me.Label25.Text = "(Early shift-up, Skip gears)"
- '
'GearboxForm
'
Me.AcceptButton = Me.ButOK
diff --git a/VECTO/GUI/GraphEditChannelDialog.Designer.vb b/VECTO/GUI/GraphEditChannelDialog.Designer.vb
index cb71b3a869f86ffeb8533ec178c37d61b9e83c48..7294e5ce49a7749703b7b6c463ea37ccb78c7b40 100644
--- a/VECTO/GUI/GraphEditChannelDialog.Designer.vb
+++ b/VECTO/GUI/GraphEditChannelDialog.Designer.vb
@@ -26,67 +26,67 @@ Partial Class GraphEditChannelDialog
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<DebuggerStepThrough()> _
Private Sub InitializeComponent()
- Me.TableLayoutPanel1 = New TableLayoutPanel()
- Me.OK_Button = New Button()
- Me.Cancel_Button = New Button()
- Me.ComboBox1 = New ComboBox()
- Me.GroupBox1 = New GroupBox()
- Me.RbRight = New RadioButton()
- Me.RbLeft = New RadioButton()
+ Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+ Me.OK_Button = New System.Windows.Forms.Button()
+ Me.Cancel_Button = New System.Windows.Forms.Button()
+ Me.ComboBox1 = New System.Windows.Forms.ComboBox()
+ Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+ Me.RbRight = New System.Windows.Forms.RadioButton()
+ Me.RbLeft = New System.Windows.Forms.RadioButton()
Me.TableLayoutPanel1.SuspendLayout()
Me.GroupBox1.SuspendLayout()
Me.SuspendLayout()
'
'TableLayoutPanel1
'
- Me.TableLayoutPanel1.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles)
+ 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 ColumnStyle(SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New ColumnStyle(SizeType.Percent, 50.0!))
+ 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 Point(58, 110)
+ Me.TableLayoutPanel1.Location = New System.Drawing.Point(58, 110)
Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
Me.TableLayoutPanel1.RowCount = 1
- Me.TableLayoutPanel1.RowStyles.Add(New RowStyle(SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.Size = New Size(146, 29)
+ 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 = AnchorStyles.None
- Me.OK_Button.Location = New Point(3, 3)
+ 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 Size(67, 23)
+ 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 = AnchorStyles.None
- Me.Cancel_Button.DialogResult = DialogResult.Cancel
- Me.Cancel_Button.Location = New Point(76, 3)
+ 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 Size(67, 23)
+ Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
Me.Cancel_Button.TabIndex = 1
Me.Cancel_Button.Text = "Cancel"
'
'ComboBox1
'
- Me.ComboBox1.DropDownStyle = ComboBoxStyle.DropDownList
+ Me.ComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.ComboBox1.FormattingEnabled = True
- Me.ComboBox1.Location = New Point(12, 12)
+ Me.ComboBox1.Location = New System.Drawing.Point(12, 12)
Me.ComboBox1.Name = "ComboBox1"
- Me.ComboBox1.Size = New Size(188, 21)
+ Me.ComboBox1.Size = New System.Drawing.Size(188, 21)
Me.ComboBox1.TabIndex = 1
'
'GroupBox1
'
Me.GroupBox1.Controls.Add(Me.RbRight)
Me.GroupBox1.Controls.Add(Me.RbLeft)
- Me.GroupBox1.Location = New Point(12, 39)
+ Me.GroupBox1.Location = New System.Drawing.Point(12, 39)
Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Size = New Size(188, 55)
+ Me.GroupBox1.Size = New System.Drawing.Size(188, 55)
Me.GroupBox1.TabIndex = 2
Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Y Axis"
@@ -94,9 +94,9 @@ Partial Class GraphEditChannelDialog
'RbRight
'
Me.RbRight.AutoSize = True
- Me.RbRight.Location = New Point(80, 19)
+ Me.RbRight.Location = New System.Drawing.Point(80, 19)
Me.RbRight.Name = "RbRight"
- Me.RbRight.Size = New Size(50, 17)
+ Me.RbRight.Size = New System.Drawing.Size(50, 17)
Me.RbRight.TabIndex = 3
Me.RbRight.TabStop = True
Me.RbRight.Text = "Right"
@@ -105,30 +105,28 @@ Partial Class GraphEditChannelDialog
'RbLeft
'
Me.RbLeft.AutoSize = True
- Me.RbLeft.Location = New Point(16, 19)
+ Me.RbLeft.Location = New System.Drawing.Point(16, 19)
Me.RbLeft.Name = "RbLeft"
- Me.RbLeft.Size = New Size(43, 17)
+ Me.RbLeft.Size = New System.Drawing.Size(43, 17)
Me.RbLeft.TabIndex = 3
Me.RbLeft.TabStop = True
Me.RbLeft.Text = "Left"
Me.RbLeft.UseVisualStyleBackColor = True
'
- 'F_Graph_ChEdit
+ 'GraphEditChannelDialog
'
Me.AcceptButton = Me.OK_Button
- Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!)
- Me.AutoScaleMode = AutoScaleMode.Font
Me.CancelButton = Me.Cancel_Button
- Me.ClientSize = New Size(216, 151)
+ Me.ClientSize = New System.Drawing.Size(216, 151)
Me.Controls.Add(Me.GroupBox1)
Me.Controls.Add(Me.ComboBox1)
Me.Controls.Add(Me.TableLayoutPanel1)
- Me.FormBorderStyle = FormBorderStyle.FixedDialog
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
Me.MaximizeBox = False
Me.MinimizeBox = False
Me.Name = "GraphEditChannelDialog"
Me.ShowInTaskbar = False
- Me.StartPosition = FormStartPosition.CenterParent
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
Me.Text = "Edit Channel"
Me.TableLayoutPanel1.ResumeLayout(False)
Me.GroupBox1.ResumeLayout(False)
diff --git a/VECTO/GUI/JiraDialog.Designer.vb b/VECTO/GUI/JiraDialog.Designer.vb
index 2636603f0e877a655aed45186b958d736926b886..d2d57d1518e80337401cd3af7da4161c6e3f4c1c 100644
--- a/VECTO/GUI/JiraDialog.Designer.vb
+++ b/VECTO/GUI/JiraDialog.Designer.vb
@@ -26,40 +26,40 @@ Partial Class JiraDialog
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<DebuggerStepThrough()> _
Private Sub InitializeComponent()
- Me.OK_Button = New Button()
- Me.Label1 = New Label()
- Me.LinkLabel1 = New LinkLabel()
- Me.GroupBox1 = New GroupBox()
- Me.LinkLabel3 = New LinkLabel()
- Me.Label2 = New Label()
- Me.Button1 = New Button()
+ Me.OK_Button = New System.Windows.Forms.Button()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.LinkLabel1 = New System.Windows.Forms.LinkLabel()
+ Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+ Me.LinkLabel3 = New System.Windows.Forms.LinkLabel()
+ Me.Label2 = New System.Windows.Forms.Label()
+ Me.Button1 = New System.Windows.Forms.Button()
Me.GroupBox1.SuspendLayout()
Me.SuspendLayout()
'
'OK_Button
'
- Me.OK_Button.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles)
- Me.OK_Button.Location = New Point(356, 205)
+ Me.OK_Button.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.OK_Button.Location = New System.Drawing.Point(356, 205)
Me.OK_Button.Name = "OK_Button"
- Me.OK_Button.Size = New Size(67, 23)
+ Me.OK_Button.Size = New System.Drawing.Size(67, 23)
Me.OK_Button.TabIndex = 0
Me.OK_Button.Text = "Close"
'
'Label1
'
Me.Label1.AutoSize = True
- Me.Label1.Location = New Point(6, 16)
+ Me.Label1.Location = New System.Drawing.Point(6, 16)
Me.Label1.Name = "Label1"
- Me.Label1.Size = New Size(269, 13)
+ Me.Label1.Size = New System.Drawing.Size(269, 13)
Me.Label1.TabIndex = 1
Me.Label1.Text = "You need a CITnet user account to create a new issue."
'
'LinkLabel1
'
Me.LinkLabel1.AutoSize = True
- Me.LinkLabel1.Location = New Point(6, 65)
+ Me.LinkLabel1.Location = New System.Drawing.Point(6, 65)
Me.LinkLabel1.Name = "LinkLabel1"
- Me.LinkLabel1.Size = New Size(141, 13)
+ Me.LinkLabel1.Size = New System.Drawing.Size(141, 13)
Me.LinkLabel1.TabIndex = 2
Me.LinkLabel1.TabStop = True
Me.LinkLabel1.Text = "JIRA Quick Start Guide (pdf)"
@@ -70,9 +70,9 @@ Partial Class JiraDialog
Me.GroupBox1.Controls.Add(Me.Label1)
Me.GroupBox1.Controls.Add(Me.Label2)
Me.GroupBox1.Controls.Add(Me.LinkLabel1)
- Me.GroupBox1.Location = New Point(12, 86)
+ Me.GroupBox1.Location = New System.Drawing.Point(12, 86)
Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Size = New Size(411, 100)
+ Me.GroupBox1.Size = New System.Drawing.Size(411, 100)
Me.GroupBox1.TabIndex = 3
Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Help"
@@ -80,9 +80,9 @@ Partial Class JiraDialog
'LinkLabel3
'
Me.LinkLabel3.AutoSize = True
- Me.LinkLabel3.Location = New Point(246, 33)
+ Me.LinkLabel3.Location = New System.Drawing.Point(246, 33)
Me.LinkLabel3.Name = "LinkLabel3"
- Me.LinkLabel3.Size = New Size(122, 13)
+ Me.LinkLabel3.Size = New System.Drawing.Size(122, 13)
Me.LinkLabel3.TabIndex = 18
Me.LinkLabel3.TabStop = True
Me.LinkLabel3.Text = "vecto@jrc.ec.europa.eu"
@@ -90,37 +90,35 @@ Partial Class JiraDialog
'Label2
'
Me.Label2.AutoSize = True
- Me.Label2.Location = New Point(6, 33)
+ Me.Label2.Location = New System.Drawing.Point(6, 33)
Me.Label2.Name = "Label2"
- Me.Label2.Size = New Size(241, 13)
+ Me.Label2.Size = New System.Drawing.Size(241, 13)
Me.Label2.TabIndex = 3
Me.Label2.Text = "If you don't have one yet please contact support: "
'
'Button1
'
- Me.Button1.Font = New Font("Microsoft Sans Serif", 15.75!, FontStyle.Bold, GraphicsUnit.Point, CType(0, Byte))
- Me.Button1.Location = New Point(12, 12)
+ Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Button1.Location = New System.Drawing.Point(12, 12)
Me.Button1.Name = "Button1"
- Me.Button1.Size = New Size(411, 54)
+ Me.Button1.Size = New System.Drawing.Size(411, 54)
Me.Button1.TabIndex = 4
Me.Button1.Text = "Create JIRA Issue"
Me.Button1.UseVisualStyleBackColor = True
'
- 'F_JIRA
+ 'JiraDialog
'
Me.AcceptButton = Me.OK_Button
- Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!)
- Me.AutoScaleMode = AutoScaleMode.Font
- Me.ClientSize = New Size(435, 240)
+ Me.ClientSize = New System.Drawing.Size(435, 240)
Me.Controls.Add(Me.Button1)
Me.Controls.Add(Me.GroupBox1)
Me.Controls.Add(Me.OK_Button)
- Me.FormBorderStyle = FormBorderStyle.FixedDialog
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
Me.MaximizeBox = False
Me.MinimizeBox = False
Me.Name = "JiraDialog"
Me.ShowInTaskbar = False
- Me.StartPosition = FormStartPosition.CenterParent
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
Me.Text = "Report Issue via CITnet"
Me.GroupBox1.ResumeLayout(False)
Me.GroupBox1.PerformLayout()
diff --git a/VECTO/GUI/MainForm.Designer.vb b/VECTO/GUI/MainForm.Designer.vb
index 159fa53a5e68fc64f7182a2ef6d78fbd6fcd918f..017f81d8f88c791a04aa6fe4a1f9e70abe770a8c 100644
--- a/VECTO/GUI/MainForm.Designer.vb
+++ b/VECTO/GUI/MainForm.Designer.vb
@@ -521,7 +521,7 @@ Partial Class MainForm
Me.ConMenFilelist.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ShowInFolderMenuItem, Me.SaveListToolStripMenuItem, Me.LoadListToolStripMenuItem, Me.LoadDefaultListToolStripMenuItem, Me.ClearListToolStripMenuItem})
Me.ConMenFilelist.Name = "ConMenFilelist"
Me.ConMenFilelist.ShowImageMargin = False
- Me.ConMenFilelist.Size = New System.Drawing.Size(151, 136)
+ Me.ConMenFilelist.Size = New System.Drawing.Size(151, 114)
'
'ShowInFolderMenuItem
'
@@ -766,7 +766,8 @@ Partial Class MainForm
'CmDEV
'
Me.CmDEV.Name = "CmDEV"
- Me.CmDEV.Size = New System.Drawing.Size(61, 4)
+ Me.CmDEV.ShowImageMargin = False
+ Me.CmDEV.Size = New System.Drawing.Size(36, 4)
'
'TmProgSec
'
@@ -776,7 +777,8 @@ Partial Class MainForm
'
Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.OpenInGraphWindowToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
Me.CmOpenFile.Name = "CmOpenFile"
- Me.CmOpenFile.Size = New System.Drawing.Size(199, 70)
+ Me.CmOpenFile.ShowImageMargin = False
+ Me.CmOpenFile.Size = New System.Drawing.Size(174, 70)
'
'OpenWithToolStripMenuItem
'
diff --git a/VECTO/GUI/Settings.Designer.vb b/VECTO/GUI/Settings.Designer.vb
index e19fa616df85a333fef08cb4ef9eb3bcc89a85c9..6c44023dfcc949d46651d819d9f1bb6a2b6736c2 100644
--- a/VECTO/GUI/Settings.Designer.vb
+++ b/VECTO/GUI/Settings.Designer.vb
@@ -26,30 +26,30 @@ Partial Class Settings
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<DebuggerStepThrough()> _
Private Sub InitializeComponent()
- Me.ButtonOK = New Button()
- Me.ButtonCancel = New Button()
- Me.GroupBox3 = New GroupBox()
- Me.GroupBox5 = New GroupBox()
- Me.TbOpenCmdName = New TextBox()
- Me.Label7 = New Label()
- Me.TbOpenCmd = New TextBox()
- Me.Label12 = New Label()
- Me.TextBoxLogSize = New TextBox()
- Me.Label16 = New Label()
- Me.TabControl1 = New TabControl()
- Me.TabPage2 = New TabPage()
- Me.GrCalc = New GroupBox()
- Me.Label11 = New Label()
- Me.Label9 = New Label()
- Me.Label3 = New Label()
- Me.TbCO2toFC = New TextBox()
- Me.Label10 = New Label()
- Me.TbFuelDens = New TextBox()
- Me.Label8 = New Label()
- Me.TbAirDensity = New TextBox()
- Me.Label2 = New Label()
- Me.ButReset = New Button()
- Me.BtHelp = New Button()
+ Me.ButtonOK = New System.Windows.Forms.Button()
+ Me.ButtonCancel = New System.Windows.Forms.Button()
+ Me.GroupBox3 = New System.Windows.Forms.GroupBox()
+ Me.GroupBox5 = New System.Windows.Forms.GroupBox()
+ Me.TbOpenCmdName = New System.Windows.Forms.TextBox()
+ Me.Label7 = New System.Windows.Forms.Label()
+ Me.TbOpenCmd = New System.Windows.Forms.TextBox()
+ Me.Label12 = New System.Windows.Forms.Label()
+ Me.TextBoxLogSize = New System.Windows.Forms.TextBox()
+ Me.Label16 = New System.Windows.Forms.Label()
+ Me.TabControl1 = New System.Windows.Forms.TabControl()
+ Me.TabPage2 = New System.Windows.Forms.TabPage()
+ Me.GrCalc = New System.Windows.Forms.GroupBox()
+ Me.Label11 = New System.Windows.Forms.Label()
+ Me.Label9 = New System.Windows.Forms.Label()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.TbCO2toFC = New System.Windows.Forms.TextBox()
+ Me.Label10 = New System.Windows.Forms.Label()
+ Me.TbFuelDens = New System.Windows.Forms.TextBox()
+ Me.Label8 = New System.Windows.Forms.Label()
+ Me.TbAirDensity = New System.Windows.Forms.TextBox()
+ Me.Label2 = New System.Windows.Forms.Label()
+ Me.ButReset = New System.Windows.Forms.Button()
+ Me.BtHelp = New System.Windows.Forms.Button()
Me.GroupBox3.SuspendLayout()
Me.GroupBox5.SuspendLayout()
Me.TabControl1.SuspendLayout()
@@ -59,21 +59,21 @@ Partial Class Settings
'
'ButtonOK
'
- Me.ButtonOK.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles)
- Me.ButtonOK.Location = New Point(347, 278)
+ Me.ButtonOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.ButtonOK.Location = New System.Drawing.Point(145, 288)
Me.ButtonOK.Name = "ButtonOK"
- Me.ButtonOK.Size = New Size(75, 24)
+ Me.ButtonOK.Size = New System.Drawing.Size(75, 24)
Me.ButtonOK.TabIndex = 2
Me.ButtonOK.Text = "OK"
Me.ButtonOK.UseVisualStyleBackColor = True
'
'ButtonCancel
'
- Me.ButtonCancel.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles)
- Me.ButtonCancel.DialogResult = DialogResult.Cancel
- Me.ButtonCancel.Location = New Point(428, 278)
+ 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(226, 288)
Me.ButtonCancel.Name = "ButtonCancel"
- Me.ButtonCancel.Size = New Size(75, 24)
+ Me.ButtonCancel.Size = New System.Drawing.Size(75, 24)
Me.ButtonCancel.TabIndex = 3
Me.ButtonCancel.Text = "Cancel"
Me.ButtonCancel.UseVisualStyleBackColor = True
@@ -83,9 +83,9 @@ Partial Class Settings
Me.GroupBox3.Controls.Add(Me.GroupBox5)
Me.GroupBox3.Controls.Add(Me.TextBoxLogSize)
Me.GroupBox3.Controls.Add(Me.Label16)
- Me.GroupBox3.Location = New Point(5, 6)
+ Me.GroupBox3.Location = New System.Drawing.Point(5, 6)
Me.GroupBox3.Name = "GroupBox3"
- Me.GroupBox3.Size = New Size(489, 124)
+ Me.GroupBox3.Size = New System.Drawing.Size(268, 129)
Me.GroupBox3.TabIndex = 0
Me.GroupBox3.TabStop = False
Me.GroupBox3.Text = "Interface"
@@ -96,81 +96,81 @@ Partial Class Settings
Me.GroupBox5.Controls.Add(Me.Label7)
Me.GroupBox5.Controls.Add(Me.TbOpenCmd)
Me.GroupBox5.Controls.Add(Me.Label12)
- Me.GroupBox5.Location = New Point(230, 19)
+ Me.GroupBox5.Location = New System.Drawing.Point(7, 45)
Me.GroupBox5.Name = "GroupBox5"
- Me.GroupBox5.Size = New Size(253, 96)
+ Me.GroupBox5.Size = New System.Drawing.Size(253, 76)
Me.GroupBox5.TabIndex = 1
Me.GroupBox5.TabStop = False
Me.GroupBox5.Text = "File Open Command"
'
'TbOpenCmdName
'
- Me.TbOpenCmdName.Location = New Point(66, 19)
+ Me.TbOpenCmdName.Location = New System.Drawing.Point(66, 19)
Me.TbOpenCmdName.Name = "TbOpenCmdName"
- Me.TbOpenCmdName.Size = New Size(174, 20)
+ Me.TbOpenCmdName.Size = New System.Drawing.Size(174, 20)
Me.TbOpenCmdName.TabIndex = 0
'
'Label7
'
Me.Label7.AutoSize = True
- Me.Label7.Location = New Point(6, 48)
+ Me.Label7.Location = New System.Drawing.Point(6, 48)
Me.Label7.Name = "Label7"
- Me.Label7.Size = New Size(54, 13)
+ Me.Label7.Size = New System.Drawing.Size(54, 13)
Me.Label7.TabIndex = 12
Me.Label7.Text = "Command"
'
'TbOpenCmd
'
- Me.TbOpenCmd.Location = New Point(66, 45)
+ Me.TbOpenCmd.Location = New System.Drawing.Point(66, 45)
Me.TbOpenCmd.Name = "TbOpenCmd"
- Me.TbOpenCmd.Size = New Size(174, 20)
+ Me.TbOpenCmd.Size = New System.Drawing.Size(174, 20)
Me.TbOpenCmd.TabIndex = 1
'
'Label12
'
Me.Label12.AutoSize = True
- Me.Label12.Location = New Point(25, 22)
+ Me.Label12.Location = New System.Drawing.Point(6, 22)
Me.Label12.Name = "Label12"
- Me.Label12.Size = New Size(35, 13)
+ Me.Label12.Size = New System.Drawing.Size(35, 13)
Me.Label12.TabIndex = 12
Me.Label12.Text = "Name"
'
'TextBoxLogSize
'
- Me.TextBoxLogSize.Location = New Point(134, 38)
+ Me.TextBoxLogSize.Location = New System.Drawing.Point(123, 19)
Me.TextBoxLogSize.Name = "TextBoxLogSize"
- Me.TextBoxLogSize.Size = New Size(36, 20)
+ Me.TextBoxLogSize.Size = New System.Drawing.Size(36, 20)
Me.TextBoxLogSize.TabIndex = 0
'
'Label16
'
Me.Label16.AutoSize = True
- Me.Label16.Location = New Point(18, 41)
+ Me.Label16.Location = New System.Drawing.Point(6, 22)
Me.Label16.Name = "Label16"
- Me.Label16.Size = New Size(110, 13)
+ Me.Label16.Size = New System.Drawing.Size(110, 13)
Me.Label16.TabIndex = 10
Me.Label16.Text = "Logfile Size Limit [MB]"
'
'TabControl1
'
- Me.TabControl1.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _
- Or AnchorStyles.Left) _
- Or AnchorStyles.Right), AnchorStyles)
+ Me.TabControl1.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.TabControl1.Controls.Add(Me.TabPage2)
- Me.TabControl1.Location = New Point(3, 3)
+ Me.TabControl1.Location = New System.Drawing.Point(3, 3)
Me.TabControl1.Name = "TabControl1"
Me.TabControl1.SelectedIndex = 0
- Me.TabControl1.Size = New Size(508, 269)
+ Me.TabControl1.Size = New System.Drawing.Size(306, 279)
Me.TabControl1.TabIndex = 12
'
'TabPage2
'
Me.TabPage2.Controls.Add(Me.GrCalc)
Me.TabPage2.Controls.Add(Me.GroupBox3)
- Me.TabPage2.Location = New Point(4, 22)
+ Me.TabPage2.Location = New System.Drawing.Point(4, 22)
Me.TabPage2.Name = "TabPage2"
- Me.TabPage2.Padding = New Padding(3)
- Me.TabPage2.Size = New Size(500, 243)
+ Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
+ Me.TabPage2.Size = New System.Drawing.Size(298, 253)
Me.TabPage2.TabIndex = 0
Me.TabPage2.Text = "VECTO"
Me.TabPage2.UseVisualStyleBackColor = True
@@ -186,9 +186,9 @@ Partial Class Settings
Me.GrCalc.Controls.Add(Me.Label8)
Me.GrCalc.Controls.Add(Me.TbAirDensity)
Me.GrCalc.Controls.Add(Me.Label2)
- Me.GrCalc.Location = New Point(6, 136)
+ Me.GrCalc.Location = New System.Drawing.Point(6, 141)
Me.GrCalc.Name = "GrCalc"
- Me.GrCalc.Size = New Size(488, 103)
+ Me.GrCalc.Size = New System.Drawing.Size(267, 107)
Me.GrCalc.TabIndex = 1
Me.GrCalc.TabStop = False
Me.GrCalc.Text = "Calculation"
@@ -196,111 +196,109 @@ Partial Class Settings
'Label11
'
Me.Label11.AutoSize = True
- Me.Label11.Location = New Point(164, 66)
+ Me.Label11.Location = New System.Drawing.Point(158, 77)
Me.Label11.Name = "Label11"
- Me.Label11.Size = New Size(77, 13)
+ Me.Label11.Size = New System.Drawing.Size(77, 13)
Me.Label11.TabIndex = 16
Me.Label11.Text = "[kgCO2/KgFC]"
'
'Label9
'
Me.Label9.AutoSize = True
- Me.Label9.Location = New Point(309, 22)
+ Me.Label9.Location = New System.Drawing.Point(158, 51)
Me.Label9.Name = "Label9"
- Me.Label9.Size = New Size(41, 13)
+ Me.Label9.Size = New System.Drawing.Size(41, 13)
Me.Label9.TabIndex = 16
Me.Label9.Text = "[kg/m³]"
'
'Label3
'
Me.Label3.AutoSize = True
- Me.Label3.Location = New Point(130, 22)
+ Me.Label3.Location = New System.Drawing.Point(158, 25)
Me.Label3.Name = "Label3"
- Me.Label3.Size = New Size(41, 13)
+ Me.Label3.Size = New System.Drawing.Size(41, 13)
Me.Label3.TabIndex = 16
Me.Label3.Text = "[kg/m³]"
'
'TbCO2toFC
'
- Me.TbCO2toFC.Location = New Point(108, 63)
+ Me.TbCO2toFC.Location = New System.Drawing.Point(102, 74)
Me.TbCO2toFC.Name = "TbCO2toFC"
- Me.TbCO2toFC.Size = New Size(50, 20)
+ Me.TbCO2toFC.Size = New System.Drawing.Size(50, 20)
Me.TbCO2toFC.TabIndex = 2
'
'Label10
'
Me.Label10.AutoSize = True
- Me.Label10.Location = New Point(11, 66)
+ Me.Label10.Location = New System.Drawing.Point(5, 77)
Me.Label10.Name = "Label10"
- Me.Label10.Size = New Size(91, 13)
+ Me.Label10.Size = New System.Drawing.Size(91, 13)
Me.Label10.TabIndex = 14
Me.Label10.Text = "CO2-to-Fuel Ratio"
'
'TbFuelDens
'
- Me.TbFuelDens.Location = New Point(253, 19)
+ Me.TbFuelDens.Location = New System.Drawing.Point(102, 48)
Me.TbFuelDens.Name = "TbFuelDens"
- Me.TbFuelDens.Size = New Size(50, 20)
+ Me.TbFuelDens.Size = New System.Drawing.Size(50, 20)
Me.TbFuelDens.TabIndex = 1
'
'Label8
'
Me.Label8.AutoSize = True
- Me.Label8.Location = New Point(184, 22)
+ Me.Label8.Location = New System.Drawing.Point(5, 51)
Me.Label8.Name = "Label8"
- Me.Label8.Size = New Size(63, 13)
+ Me.Label8.Size = New System.Drawing.Size(63, 13)
Me.Label8.TabIndex = 14
Me.Label8.Text = "Fuel density"
'
'TbAirDensity
'
- Me.TbAirDensity.Location = New Point(74, 19)
+ Me.TbAirDensity.Location = New System.Drawing.Point(102, 22)
Me.TbAirDensity.Name = "TbAirDensity"
- Me.TbAirDensity.Size = New Size(50, 20)
+ Me.TbAirDensity.Size = New System.Drawing.Size(50, 20)
Me.TbAirDensity.TabIndex = 0
'
'Label2
'
Me.Label2.AutoSize = True
- Me.Label2.Location = New Point(11, 22)
+ Me.Label2.Location = New System.Drawing.Point(5, 25)
Me.Label2.Name = "Label2"
- Me.Label2.Size = New Size(57, 13)
+ Me.Label2.Size = New System.Drawing.Size(57, 13)
Me.Label2.TabIndex = 14
Me.Label2.Text = "Air Density"
'
'ButReset
'
- Me.ButReset.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
- Me.ButReset.Location = New Point(31, 278)
+ Me.ButReset.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+ Me.ButReset.Location = New System.Drawing.Point(31, 288)
Me.ButReset.Name = "ButReset"
- Me.ButReset.Size = New Size(108, 24)
+ Me.ButReset.Size = New System.Drawing.Size(108, 24)
Me.ButReset.TabIndex = 1
Me.ButReset.Text = "Reset All Settings"
Me.ButReset.UseVisualStyleBackColor = True
'
'BtHelp
'
- Me.BtHelp.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
- Me.BtHelp.Image = Help_icon
- Me.BtHelp.Location = New Point(4, 278)
+ Me.BtHelp.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+ Me.BtHelp.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon
+ Me.BtHelp.Location = New System.Drawing.Point(4, 288)
Me.BtHelp.Name = "BtHelp"
- Me.BtHelp.Size = New Size(24, 24)
+ Me.BtHelp.Size = New System.Drawing.Size(24, 24)
Me.BtHelp.TabIndex = 0
Me.BtHelp.UseVisualStyleBackColor = True
'
- 'F_Settings
+ 'Settings
'
Me.AcceptButton = Me.ButtonOK
- Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!)
- Me.AutoScaleMode = AutoScaleMode.Font
Me.CancelButton = Me.ButtonCancel
- Me.ClientSize = New Size(515, 310)
+ Me.ClientSize = New System.Drawing.Size(313, 320)
Me.Controls.Add(Me.BtHelp)
Me.Controls.Add(Me.ButReset)
Me.Controls.Add(Me.TabControl1)
Me.Controls.Add(Me.ButtonCancel)
Me.Controls.Add(Me.ButtonOK)
- Me.FormBorderStyle = FormBorderStyle.FixedToolWindow
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
Me.MaximizeBox = False
Me.MinimizeBox = False
Me.Name = "Settings"
diff --git a/VECTO/GUI/VectoJobForm.Designer.vb b/VECTO/GUI/VectoJobForm.Designer.vb
index 0a049b3157b8b71449a673ab5a63e2b2274190e2..6c0c061bde50d33c1eba7552d77772bf3bed8dc2 100644
--- a/VECTO/GUI/VectoJobForm.Designer.vb
+++ b/VECTO/GUI/VectoJobForm.Designer.vb
@@ -203,11 +203,11 @@ Partial Class VectoJobForm
Me.Label2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Label2.AutoSize = True
- Me.Label2.Location = New System.Drawing.Point(379, 108)
+ Me.Label2.Location = New System.Drawing.Point(391, 109)
Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(133, 13)
+ Me.Label2.Size = New System.Drawing.Size(118, 13)
Me.Label2.TabIndex = 3
- Me.Label2.Text = "(Double-Click to Open File)"
+ Me.Label2.Text = "(Right-Click for Options)"
'
'LvCycles
'
@@ -374,7 +374,7 @@ Partial Class VectoJobForm
Me.Label32.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Label32.AutoSize = True
- Me.Label32.Location = New System.Drawing.Point(406, 216)
+ Me.Label32.Location = New System.Drawing.Point(403, 217)
Me.Label32.Name = "Label32"
Me.Label32.Size = New System.Drawing.Size(106, 13)
Me.Label32.TabIndex = 3
@@ -547,7 +547,7 @@ Partial Class VectoJobForm
Me.TabPgDriver.Location = New System.Drawing.Point(4, 22)
Me.TabPgDriver.Name = "TabPgDriver"
Me.TabPgDriver.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPgDriver.Size = New System.Drawing.Size(527, 477)
+ Me.TabPgDriver.Size = New System.Drawing.Size(527, 487)
Me.TabPgDriver.TabIndex = 7
Me.TabPgDriver.Text = "Driver Assist"
Me.TabPgDriver.UseVisualStyleBackColor = True
@@ -1190,18 +1190,19 @@ Partial Class VectoJobForm
'
Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
Me.CmOpenFile.Name = "CmOpenFile"
- Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
+ Me.CmOpenFile.ShowImageMargin = False
+ Me.CmOpenFile.Size = New System.Drawing.Size(128, 48)
'
'OpenWithToolStripMenuItem
'
Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
- Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+ Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(127, 22)
Me.OpenWithToolStripMenuItem.Text = "Open with ..."
'
'ShowInFolderToolStripMenuItem
'
Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
- Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+ Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(127, 22)
Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
'
'PicVehicle
diff --git a/VECTO/GUI/VectoJobForm.vb b/VECTO/GUI/VectoJobForm.vb
index 58a8ba57e2c3847046c3c23e316c11d265b01111..08486d12121fe9fb13f216bd7f062194bb0656c4 100644
--- a/VECTO/GUI/VectoJobForm.vb
+++ b/VECTO/GUI/VectoJobForm.vb
@@ -71,7 +71,7 @@ Public Class VectoJobForm
TabControl1.TabPages(x).Show()
Next
- LvAux.Columns(AuxViewColumns.AuxInputOrTech).Width = -2
+ LvAux.Columns(AuxViewColumns.AuxInputOrTech).Width = - 2
'Declaration Mode
If Cfg.DeclMode Then
@@ -393,7 +393,7 @@ Public Class VectoJobForm
Dim vectoJob As IEngineeringJobInputData = Nothing
Dim inputData As IEngineeringInputDataProvider = Nothing
Try
- inputData = TryCast(JSONInputDataFactory.ReadComponentData(file),
+ inputData = TryCast(JSONInputDataFactory.ReadComponentData(file),
IEngineeringInputDataProvider)
vectoJob = inputData.JobInputData()
Catch ex As Exception
@@ -408,7 +408,7 @@ Public Class VectoJobForm
Close()
MainForm.RbDecl.Checked = Not MainForm.RbDecl.Checked
MainForm.OpenVectoFile(file)
- Case -1
+ Case - 1
Exit Sub
End Select
End If
@@ -832,7 +832,7 @@ Public Class VectoJobForm
'_auxDialog.CbType.Text = ""
_auxDialog.TbID.Text = "" '!!! Set Type before ID, because changing the type will overwrite the id !!!
-lbDlog:
+ lbDlog:
If _auxDialog.ShowDialog = DialogResult.OK Then
id = UCase(Trim(_auxDialog.TbID.Text))
@@ -881,7 +881,8 @@ lbDlog:
If selItem.SubItems(AuxViewColumns.AuxID).Text <> AuxiliaryTypeHelper.GetAuxKey(AuxiliaryType.SteeringPump) Then
_auxDialog.NumAxles = 0
Else
- _auxDialog.NumAxles = If(String.IsNullOrWhiteSpace(TbAxleConf.Text), 1, AxleConfigurationHelper.Parse(TbAxleConf.Text).NumAxles())
+ _auxDialog.NumAxles =
+ If(String.IsNullOrWhiteSpace(TbAxleConf.Text), 1, AxleConfigurationHelper.Parse(TbAxleConf.Text).NumAxles())
End If
@@ -902,14 +903,15 @@ lbDlog:
End If
Else
- _auxDialog.CbTech.SelectedIndex = -1
+ _auxDialog.CbTech.SelectedIndex = - 1
_auxDialog.TbPath.Text = selItem.SubItems(AuxViewColumns.AuxInputOrTech).Text
End If
'_auxDialog.TbID.Text = selItem.SubItems(AuxViewColumns.AuxID).Text
If _auxDialog.ShowDialog = DialogResult.OK Then
- selItem.SubItems(AuxViewColumns.AuxID).Text = _auxDialog.CbType.SelectedValue.ToString() 'UCase(Trim(_auxDialog.TbID.Text))
+ selItem.SubItems(AuxViewColumns.AuxID).Text = _auxDialog.CbType.SelectedValue.ToString() _
+ 'UCase(Trim(_auxDialog.TbID.Text))
selItem.SubItems(AuxViewColumns.AuxType).Text = _auxDialog.CbType.Text
If Cfg.DeclMode Then
@@ -974,11 +976,6 @@ lbDlog:
#Region "Cycle list"
- Private Sub LvCycles_DoubleClick(sender As Object, e As EventArgs) Handles LvCycles.DoubleClick
- If LvCycles.SelectedItems.Count > 0 Then _
- OpenFiles(FileRepl(LvCycles.SelectedItems(0).SubItems(0).Text, GetPath(VectoFile)))
- End Sub
-
Private Sub LvCycles_KeyDown(sender As Object, e As KeyEventArgs) Handles LvCycles.KeyDown
Select Case e.KeyCode
Case Keys.Delete, Keys.Back
@@ -1159,7 +1156,7 @@ lbDlog:
If(Not String.IsNullOrWhiteSpace(VectoFile), Path.Combine(Path.GetDirectoryName(VectoFile), TbGBX.Text), TbGBX.Text)
If File.Exists(gearboxFile) Then
Try
- Dim inputData As IEngineeringInputDataProvider = TryCast(JSONInputDataFactory.ReadComponentData(gearboxFile),
+ Dim inputData As IEngineeringInputDataProvider = TryCast(JSONInputDataFactory.ReadComponentData(gearboxFile),
IEngineeringInputDataProvider)
gearbox = inputData.GearboxInputData
Catch
@@ -1242,7 +1239,7 @@ lbDlog:
If(Not String.IsNullOrWhiteSpace(VectoFile), Path.Combine(Path.GetDirectoryName(VectoFile), TbENG.Text), TbENG.Text)
If File.Exists(engineFile) Then
Try
- Dim inputData As IEngineeringInputDataProvider = TryCast(JSONInputDataFactory.ReadComponentData(engineFile),
+ Dim inputData As IEngineeringInputDataProvider = TryCast(JSONInputDataFactory.ReadComponentData(engineFile),
IEngineeringInputDataProvider)
engine = inputData.EngineInputData
Catch
@@ -1285,10 +1282,10 @@ lbDlog:
s.Name = "Motoring"
chart.Series.Add(s)
- pmax = fullLoadCurve.MaxPower.Value() / 1000 'FLD0.Pfull(FLD0.EngineRatedSpeed)
+ pmax = fullLoadCurve.MaxPower.Value()/1000 'FLD0.Pfull(FLD0.EngineRatedSpeed)
- TbEngTxt.Text = String.Format("{0} l {1} kw {2}", (engine.Displacement.Value() * 1000).ToString("0.0"),
+ TbEngTxt.Text = String.Format("{0} l {1} kw {2}", (engine.Displacement.Value()*1000).ToString("0.0"),
pmax.ToString("#"), engine.ModelName)
Dim fuelConsumptionMap As FuelConsumptionMap = FuelConsumptionMapReader.Create(engine.FuelConsumptionMap)
@@ -1312,7 +1309,7 @@ lbDlog:
If(Not String.IsNullOrWhiteSpace(VectoFile), Path.Combine(Path.GetDirectoryName(VectoFile), TbVEH.Text), TbVEH.Text)
If File.Exists(vehicleFile) Then
Try
- Dim inputData As IEngineeringInputDataProvider = TryCast(JSONInputDataFactory.ReadComponentData(vehicleFile),
+ Dim inputData As IEngineeringInputDataProvider = TryCast(JSONInputDataFactory.ReadComponentData(vehicleFile),
IEngineeringInputDataProvider)
vehicle = inputData.VehicleInputData
Catch
@@ -1325,7 +1322,7 @@ lbDlog:
Dim s0 As Segment = Nothing
Try
- s0 = DeclarationData.Segments.Lookup(vehicle.VehicleCategory, vehicle.AxleConfiguration, maxMass, 0.SI(Of Kilogram),
+ s0 = DeclarationData.Segments.Lookup(vehicle.VehicleCategory, vehicle.AxleConfiguration, maxMass, 0.SI (Of Kilogram),
True)
Catch
End Try
@@ -1344,12 +1341,12 @@ lbDlog:
End If
- PicVehicle.Image = ConvPicPath(If(s0 Is Nothing, -1, HDVclass.ToInt()), False) _
+ PicVehicle.Image = ConvPicPath(If(s0 Is Nothing, - 1, HDVclass.ToInt()), False) _
'Image.FromFile(cDeclaration.ConvPicPath(HDVclass, False))
TbHVCclass.Text = String.Format("HDV Class {0}", HDVclass)
TbVehCat.Text = vehicle.VehicleCategory.GetCategoryName() 'ConvVehCat(VEH0.VehCat, True)
- TbMass.Text = (vehicle.GrossVehicleMassRating.Value() / 1000) & " t"
+ TbMass.Text = (vehicle.GrossVehicleMassRating.Value()/1000) & " t"
TbAxleConf.Text = vehicle.AxleConfiguration.GetName() 'ConvAxleConf(VEH0.AxleConf)
End Sub
@@ -1392,7 +1389,7 @@ lbDlog:
Private Sub picAuxInfo_MouseEnter(sender As Object, e As EventArgs) Handles picAuxInfo.MouseEnter
- If cboAdvancedAuxiliaries.SelectedIndex = -1 Then Exit Sub
+ If cboAdvancedAuxiliaries.SelectedIndex = - 1 Then Exit Sub
'Get tooltip
Dim item As AdvancedAuxiliary
@@ -1524,9 +1521,6 @@ lbDlog:
OpenFiles(FileRepl(LvCycles.SelectedItems(0).SubItems(0).Text, GetPath(VectoFile)))
End If
End Sub
-
- Private Sub LvCycles_SelectedIndexChanged(sender As Object, e As EventArgs) Handles LvCycles.SelectedIndexChanged
- End Sub
End Class
diff --git a/VECTO/GUI/VehicleAuxiliariesDialog.Designer.vb b/VECTO/GUI/VehicleAuxiliariesDialog.Designer.vb
index 662f9cd5828af4c50b1264c41ad45fb6cb04a049..929f10003e84da14230e44dbc6671e2c39e2a0e1 100644
--- a/VECTO/GUI/VehicleAuxiliariesDialog.Designer.vb
+++ b/VECTO/GUI/VehicleAuxiliariesDialog.Designer.vb
@@ -275,6 +275,7 @@ Partial Class VehicleAuxiliariesDialog
Me.Controls.Add(Me.PnFile)
Me.Controls.Add(Me.PnTech)
Me.Controls.Add(Me.TableLayoutPanel1)
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
Me.MaximizeBox = False
Me.MinimizeBox = False
Me.Name = "VehicleAuxiliariesDialog"
diff --git a/VECTO/GUI/VehicleAxleDialog.Designer.vb b/VECTO/GUI/VehicleAxleDialog.Designer.vb
index 8516f0a9709fa225a8c295847fffb3acc752a7b5..3b413fa40fe1f93e26bfeff4ec422c48ac36cf33 100644
--- a/VECTO/GUI/VehicleAxleDialog.Designer.vb
+++ b/VECTO/GUI/VehicleAxleDialog.Designer.vb
@@ -35,164 +35,164 @@ Partial Class VehicleAxleDialog
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<DebuggerStepThrough()> _
Private Sub InitializeComponent()
- Me.TableLayoutPanel1 = New TableLayoutPanel()
- Me.OK_Button = New Button()
- Me.Cancel_Button = New Button()
- Me.Label1 = New Label()
- Me.TbAxleShare = New TextBox()
- Me.Label2 = New Label()
- Me.Label3 = New Label()
- Me.Label4 = New Label()
- Me.TbRRC = New TextBox()
- Me.Label5 = New Label()
- Me.Label6 = New Label()
- Me.TbFzISO = New TextBox()
- Me.Label9 = New Label()
- Me.Label10 = New Label()
- Me.CbTwinT = New CheckBox()
- Me.PnAxle = New Panel()
- Me.TbI_wheels = New TextBox()
- Me.Label7 = New Label()
- Me.Label32 = New Label()
- Me.Label8 = New Label()
- Me.CbWheels = New ComboBox()
+ Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+ Me.OK_Button = New System.Windows.Forms.Button()
+ Me.Cancel_Button = New System.Windows.Forms.Button()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.TbAxleShare = New System.Windows.Forms.TextBox()
+ Me.Label2 = New System.Windows.Forms.Label()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.Label4 = New System.Windows.Forms.Label()
+ Me.TbRRC = New System.Windows.Forms.TextBox()
+ Me.Label5 = New System.Windows.Forms.Label()
+ Me.Label6 = New System.Windows.Forms.Label()
+ Me.TbFzISO = New System.Windows.Forms.TextBox()
+ Me.Label9 = New System.Windows.Forms.Label()
+ Me.Label10 = New System.Windows.Forms.Label()
+ Me.CbTwinT = New System.Windows.Forms.CheckBox()
+ Me.PnAxle = New System.Windows.Forms.Panel()
+ Me.TbI_wheels = New System.Windows.Forms.TextBox()
+ Me.Label7 = New System.Windows.Forms.Label()
+ Me.Label32 = New System.Windows.Forms.Label()
+ Me.Label8 = New System.Windows.Forms.Label()
+ Me.CbWheels = New System.Windows.Forms.ComboBox()
Me.TableLayoutPanel1.SuspendLayout()
Me.PnAxle.SuspendLayout()
Me.SuspendLayout()
'
'TableLayoutPanel1
'
- Me.TableLayoutPanel1.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles)
+ 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 ColumnStyle(SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New ColumnStyle(SizeType.Percent, 50.0!))
+ 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 Point(250, 217)
+ Me.TableLayoutPanel1.Location = New System.Drawing.Point(303, 124)
Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
Me.TableLayoutPanel1.RowCount = 1
- Me.TableLayoutPanel1.RowStyles.Add(New RowStyle(SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.Size = New Size(146, 29)
+ 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 = 4
'
'OK_Button
'
- Me.OK_Button.Anchor = AnchorStyles.None
- Me.OK_Button.Location = New Point(3, 3)
+ 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 Size(67, 23)
+ 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 = AnchorStyles.None
- Me.Cancel_Button.DialogResult = DialogResult.Cancel
- Me.Cancel_Button.Location = New Point(76, 3)
+ 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 Size(67, 23)
+ Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
Me.Cancel_Button.TabIndex = 1
Me.Cancel_Button.Text = "Cancel"
'
'Label1
'
Me.Label1.AutoSize = True
- Me.Label1.Location = New Point(7, 10)
+ Me.Label1.Location = New System.Drawing.Point(3, 3)
Me.Label1.Name = "Label1"
- Me.Label1.Size = New Size(96, 13)
+ Me.Label1.Size = New System.Drawing.Size(96, 13)
Me.Label1.TabIndex = 1
Me.Label1.Text = "Relative Axle Load"
'
'TbAxleShare
'
- Me.TbAxleShare.Location = New Point(109, 8)
+ Me.TbAxleShare.Location = New System.Drawing.Point(105, 0)
Me.TbAxleShare.Name = "TbAxleShare"
- Me.TbAxleShare.Size = New Size(53, 20)
+ Me.TbAxleShare.Size = New System.Drawing.Size(84, 20)
Me.TbAxleShare.TabIndex = 0
'
'Label2
'
Me.Label2.AutoSize = True
- Me.Label2.Location = New Point(168, 11)
+ Me.Label2.Location = New System.Drawing.Point(195, 3)
Me.Label2.Name = "Label2"
- Me.Label2.Size = New Size(40, 13)
+ Me.Label2.Size = New System.Drawing.Size(40, 13)
Me.Label2.TabIndex = 1
Me.Label2.Text = "[-][0..1]"
'
'Label3
'
Me.Label3.AutoSize = True
- Me.Label3.Location = New Point(41, 108)
+ Me.Label3.Location = New System.Drawing.Point(55, 66)
Me.Label3.Name = "Label3"
- Me.Label3.Size = New Size(51, 13)
+ Me.Label3.Size = New System.Drawing.Size(51, 13)
Me.Label3.TabIndex = 1
Me.Label3.Text = "RRC ISO"
'
'Label4
'
Me.Label4.AutoSize = True
- Me.Label4.Location = New Point(188, 108)
+ Me.Label4.Location = New System.Drawing.Point(202, 66)
Me.Label4.Name = "Label4"
- Me.Label4.Size = New Size(16, 13)
+ Me.Label4.Size = New System.Drawing.Size(16, 13)
Me.Label4.TabIndex = 1
Me.Label4.Text = "[-]"
'
'TbRRC
'
- Me.TbRRC.Location = New Point(98, 105)
+ Me.TbRRC.Location = New System.Drawing.Point(112, 63)
Me.TbRRC.Name = "TbRRC"
- Me.TbRRC.Size = New Size(84, 20)
+ Me.TbRRC.Size = New System.Drawing.Size(84, 20)
Me.TbRRC.TabIndex = 2
'
'Label5
'
Me.Label5.AutoSize = True
- Me.Label5.Location = New Point(53, 154)
+ Me.Label5.Location = New System.Drawing.Point(67, 91)
Me.Label5.Name = "Label5"
- Me.Label5.Size = New Size(39, 13)
+ Me.Label5.Size = New System.Drawing.Size(39, 13)
Me.Label5.TabIndex = 1
Me.Label5.Text = "Fz ISO"
'
'Label6
'
Me.Label6.AutoSize = True
- Me.Label6.Location = New Point(188, 154)
+ Me.Label6.Location = New System.Drawing.Point(202, 91)
Me.Label6.Name = "Label6"
- Me.Label6.Size = New Size(21, 13)
+ Me.Label6.Size = New System.Drawing.Size(21, 13)
Me.Label6.TabIndex = 1
Me.Label6.Text = "[N]"
'
'TbFzISO
'
- Me.TbFzISO.Location = New Point(98, 151)
+ Me.TbFzISO.Location = New System.Drawing.Point(112, 89)
Me.TbFzISO.Name = "TbFzISO"
- Me.TbFzISO.Size = New Size(84, 20)
+ Me.TbFzISO.Size = New System.Drawing.Size(84, 20)
Me.TbFzISO.TabIndex = 3
'
'Label9
'
Me.Label9.AutoSize = True
- Me.Label9.Location = New Point(223, 108)
+ Me.Label9.Location = New System.Drawing.Point(248, 66)
Me.Label9.Name = "Label9"
- Me.Label9.Size = New Size(146, 13)
+ Me.Label9.Size = New System.Drawing.Size(146, 13)
Me.Label9.TabIndex = 1
Me.Label9.Text = "RRC according to ISO 28580"
'
'Label10
'
Me.Label10.AutoSize = True
- Me.Label10.Location = New Point(223, 154)
+ Me.Label10.Location = New System.Drawing.Point(248, 89)
Me.Label10.Name = "Label10"
- Me.Label10.Size = New Size(167, 26)
+ Me.Label10.Size = New System.Drawing.Size(167, 26)
Me.Label10.TabIndex = 1
- Me.Label10.Text = "Test load according to ISO 28580" & ChrW(13) & ChrW(10) & "(85% of max. tyre load capacity)"
+ Me.Label10.Text = "Test load according to ISO 28580" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(85% of max. tyre load capacity)"
'
'CbTwinT
'
Me.CbTwinT.AutoSize = True
- Me.CbTwinT.Location = New Point(255, 19)
+ Me.CbTwinT.Location = New System.Drawing.Point(253, 12)
Me.CbTwinT.Name = "CbTwinT"
- Me.CbTwinT.Size = New Size(78, 17)
+ Me.CbTwinT.Size = New System.Drawing.Size(78, 17)
Me.CbTwinT.TabIndex = 1
Me.CbTwinT.Text = "Twin Tyres"
Me.CbTwinT.UseVisualStyleBackColor = True
@@ -205,61 +205,59 @@ Partial Class VehicleAxleDialog
Me.PnAxle.Controls.Add(Me.Label2)
Me.PnAxle.Controls.Add(Me.Label32)
Me.PnAxle.Controls.Add(Me.TbAxleShare)
- Me.PnAxle.Location = New Point(9, 49)
+ Me.PnAxle.Location = New System.Drawing.Point(7, 37)
Me.PnAxle.Name = "PnAxle"
- Me.PnAxle.Size = New Size(394, 39)
+ Me.PnAxle.Size = New System.Drawing.Size(450, 23)
Me.PnAxle.TabIndex = 5
'
'TbI_wheels
'
- Me.TbI_wheels.Location = New Point(292, 8)
+ Me.TbI_wheels.Location = New System.Drawing.Point(322, 0)
Me.TbI_wheels.Name = "TbI_wheels"
- Me.TbI_wheels.Size = New Size(57, 20)
+ Me.TbI_wheels.Size = New System.Drawing.Size(84, 20)
Me.TbI_wheels.TabIndex = 26
'
'Label7
'
Me.Label7.AutoSize = True
- Me.Label7.Location = New Point(211, 11)
+ Me.Label7.Location = New System.Drawing.Point(241, 3)
Me.Label7.Name = "Label7"
- Me.Label7.Size = New Size(75, 13)
+ Me.Label7.Size = New System.Drawing.Size(75, 13)
Me.Label7.TabIndex = 25
Me.Label7.Text = "Wheels Inertia"
'
'Label32
'
Me.Label32.AutoSize = True
- Me.Label32.Location = New Point(355, 11)
+ Me.Label32.Location = New System.Drawing.Point(412, 3)
Me.Label32.Name = "Label32"
- Me.Label32.Size = New Size(36, 13)
+ Me.Label32.Size = New System.Drawing.Size(36, 13)
Me.Label32.TabIndex = 27
Me.Label32.Text = "[kgm²]"
'
'Label8
'
Me.Label8.AutoSize = True
- Me.Label8.Location = New Point(6, 20)
+ Me.Label8.Location = New System.Drawing.Point(4, 13)
Me.Label8.Name = "Label8"
- Me.Label8.Size = New Size(43, 13)
+ Me.Label8.Size = New System.Drawing.Size(43, 13)
Me.Label8.TabIndex = 6
Me.Label8.Text = "Wheels"
'
'CbWheels
'
- Me.CbWheels.DropDownStyle = ComboBoxStyle.DropDownList
+ Me.CbWheels.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.CbWheels.FormattingEnabled = True
- Me.CbWheels.Location = New Point(55, 17)
+ Me.CbWheels.Location = New System.Drawing.Point(53, 10)
Me.CbWheels.Name = "CbWheels"
- Me.CbWheels.Size = New Size(176, 21)
+ Me.CbWheels.Size = New System.Drawing.Size(176, 21)
Me.CbWheels.TabIndex = 7
'
- 'F_VEH_Axle
+ 'VehicleAxleDialog
'
Me.AcceptButton = Me.OK_Button
- Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!)
- Me.AutoScaleMode = AutoScaleMode.Font
Me.CancelButton = Me.Cancel_Button
- Me.ClientSize = New Size(408, 258)
+ Me.ClientSize = New System.Drawing.Size(461, 165)
Me.Controls.Add(Me.CbWheels)
Me.Controls.Add(Me.Label8)
Me.Controls.Add(Me.PnAxle)
@@ -273,12 +271,12 @@ Partial Class VehicleAxleDialog
Me.Controls.Add(Me.Label9)
Me.Controls.Add(Me.Label3)
Me.Controls.Add(Me.TableLayoutPanel1)
- Me.FormBorderStyle = FormBorderStyle.FixedDialog
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
Me.MaximizeBox = False
Me.MinimizeBox = False
Me.Name = "VehicleAxleDialog"
Me.ShowInTaskbar = False
- Me.StartPosition = FormStartPosition.CenterParent
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
Me.Text = "Axle configuration"
Me.TableLayoutPanel1.ResumeLayout(False)
Me.PnAxle.ResumeLayout(False)
diff --git a/VECTO/GUI/VehicleForm.Designer.vb b/VECTO/GUI/VehicleForm.Designer.vb
index b37c7300de4d8a53fbcb3bb4c3351e77ae4979d3..f61e7d84b970e9a199ea6e17839a251678d9539d 100644
--- a/VECTO/GUI/VehicleForm.Designer.vb
+++ b/VECTO/GUI/VehicleForm.Designer.vb
@@ -796,18 +796,19 @@ Partial Class VehicleForm
'
Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
Me.CmOpenFile.Name = "CmOpenFile"
- Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
+ Me.CmOpenFile.ShowImageMargin = False
+ Me.CmOpenFile.Size = New System.Drawing.Size(128, 48)
'
'OpenWithToolStripMenuItem
'
Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
- Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+ Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(127, 22)
Me.OpenWithToolStripMenuItem.Text = "Open with ..."
'
'ShowInFolderToolStripMenuItem
'
Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
- Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+ Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(127, 22)
Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
'
'PnAll
diff --git a/VECTO/GUI/WelcomeDialog.Designer.vb b/VECTO/GUI/WelcomeDialog.Designer.vb
index 3ab236ad0073ef95346a8e60b9151d312b422690..44a365833eeb68d9807d249b4452239d937cbecc 100644
--- a/VECTO/GUI/WelcomeDialog.Designer.vb
+++ b/VECTO/GUI/WelcomeDialog.Designer.vb
@@ -36,67 +36,64 @@ Partial Class WelcomeDialog
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<DebuggerStepThrough()> _
Private Sub InitializeComponent()
- Me.Cancel_Button = New Button()
- Me.Label1 = New Label()
- Me.Button1 = New Button()
- Me.Button2 = New Button()
+ Me.Cancel_Button = New System.Windows.Forms.Button()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.Button1 = New System.Windows.Forms.Button()
+ Me.Button2 = New System.Windows.Forms.Button()
Me.SuspendLayout()
'
'Cancel_Button
'
- Me.Cancel_Button.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles)
- Me.Cancel_Button.DialogResult = DialogResult.Cancel
- Me.Cancel_Button.Location = New Point(239, 152)
+ Me.Cancel_Button.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
+ Me.Cancel_Button.Location = New System.Drawing.Point(239, 152)
Me.Cancel_Button.Name = "Cancel_Button"
- Me.Cancel_Button.Size = New Size(67, 23)
+ Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
Me.Cancel_Button.TabIndex = 1
Me.Cancel_Button.Text = "Close"
'
'Label1
'
Me.Label1.AutoSize = True
- Me.Label1.Font = New Font("Microsoft Sans Serif", 9.75!, FontStyle.Bold, GraphicsUnit.Point, CType(0, Byte))
- Me.Label1.Location = New Point(12, 18)
+ Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label1.Location = New System.Drawing.Point(12, 18)
Me.Label1.Name = "Label1"
- Me.Label1.Size = New Size(77, 16)
+ Me.Label1.Size = New System.Drawing.Size(77, 16)
Me.Label1.TabIndex = 1
Me.Label1.Text = "Welcome!"
'
'Button1
'
- Me.Button1.Location = New Point(12, 47)
+ Me.Button1.Location = New System.Drawing.Point(12, 47)
Me.Button1.Name = "Button1"
- Me.Button1.Size = New Size(294, 37)
+ Me.Button1.Size = New System.Drawing.Size(294, 37)
Me.Button1.TabIndex = 2
Me.Button1.Text = "Open Release Notes (pdf)"
Me.Button1.UseVisualStyleBackColor = True
'
'Button2
'
- Me.Button2.Location = New Point(12, 90)
+ Me.Button2.Location = New System.Drawing.Point(12, 90)
Me.Button2.Name = "Button2"
- Me.Button2.Size = New Size(294, 37)
+ Me.Button2.Size = New System.Drawing.Size(294, 37)
Me.Button2.TabIndex = 2
Me.Button2.Text = "Open User Manual (html)"
Me.Button2.UseVisualStyleBackColor = True
'
- 'F_Welcome
+ 'WelcomeDialog
'
- Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!)
- Me.AutoScaleMode = AutoScaleMode.Font
Me.CancelButton = Me.Cancel_Button
- Me.ClientSize = New Size(318, 187)
+ Me.ClientSize = New System.Drawing.Size(318, 187)
Me.Controls.Add(Me.Button2)
Me.Controls.Add(Me.Cancel_Button)
Me.Controls.Add(Me.Button1)
Me.Controls.Add(Me.Label1)
- Me.FormBorderStyle = FormBorderStyle.FixedDialog
Me.MaximizeBox = False
Me.MinimizeBox = False
Me.Name = "WelcomeDialog"
Me.ShowInTaskbar = False
- Me.StartPosition = FormStartPosition.CenterParent
- Me.Text = "F_Welcome"
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+ Me.Text = "Welcome"
Me.ResumeLayout(False)
Me.PerformLayout()