Direct from master

Direct from master

--- EDDiscovery/TravelHistoryControl.Designer.cs
+++ EDDiscovery/TravelHistoryControl.Designer.cs
@@ -42,67 +42,33 @@
             this.viewOnEDSMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.selectCorrectSystemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItemStartStop = new System.Windows.Forms.ToolStripMenuItem();
-            this.eDDNTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.label2 = new System.Windows.Forms.Label();
             this.labelclosests = new System.Windows.Forms.Label();
             this.panel_system = new System.Windows.Forms.Panel();
-            this.buttonEDSM = new ExtendedControls.DrawnPanel();
             this.label14 = new System.Windows.Forms.Label();
-            this.textBoxSolDist = new ExtendedControls.TextBoxBorder();
-            this.buttonRoss = new ExtendedControls.DrawnPanel();
-            this.buttonEDDB = new ExtendedControls.DrawnPanel();
-            this.textBoxState = new ExtendedControls.TextBoxBorder();
-            this.textBoxEconomy = new ExtendedControls.TextBoxBorder();
             this.label12 = new System.Windows.Forms.Label();
             this.label13 = new System.Windows.Forms.Label();
-            this.textBoxGovernment = new ExtendedControls.TextBoxBorder();
-            this.textBoxAllegiance = new ExtendedControls.TextBoxBorder();
             this.label11 = new System.Windows.Forms.Label();
             this.label10 = new System.Windows.Forms.Label();
             this.label9 = new System.Windows.Forms.Label();
-            this.textBoxVisits = new ExtendedControls.TextBoxBorder();
             this.label8 = new System.Windows.Forms.Label();
-            this.richTextBoxNote = new ExtendedControls.RichTextBoxScroll();
             this.label_Z = new System.Windows.Forms.Label();
-            this.textBoxZ = new ExtendedControls.TextBoxBorder();
             this.labelDistEnter = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
-            this.textBoxY = new ExtendedControls.TextBoxBorder();
-            this.textBoxX = new ExtendedControls.TextBoxBorder();
             this.label3 = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
-            this.textBoxTargetDist = new ExtendedControls.TextBoxBorder();
-            this.textBoxTarget = new ExtendedControls.AutoCompleteTextBox();
-            this.textBoxSystem = new ExtendedControls.TextBoxBorder();
             this.labelCMDR = new System.Windows.Forms.Label();
             this.toolTipEddb = new System.Windows.Forms.ToolTip(this.components);
-            this.buttonFilter = new ExtendedControls.ButtonExt();
-            this.textBoxFilter = new ExtendedControls.TextBoxBorder();
-            this.comboBoxHistoryWindow = new ExtendedControls.ComboBoxCustom();
-            this.button_RefreshHistory = new ExtendedControls.ButtonExt();
-            this.checkBoxEDSMSyncFrom = new ExtendedControls.CheckBoxCustom();
-            this.buttonMap2D = new ExtendedControls.ButtonExt();
-            this.checkBoxEDSMSyncTo = new ExtendedControls.CheckBoxCustom();
-            this.comboBoxCommander = new ExtendedControls.ComboBoxCustom();
-            this.buttonExtSummaryPopOut = new ExtendedControls.ButtonExt();
-            this.buttonMap = new ExtendedControls.ButtonExt();
-            this.buttonSync = new ExtendedControls.ButtonExt();
-            this.checkBoxEDDNSync = new ExtendedControls.CheckBoxCustom();
             this.panelRight = new System.Windows.Forms.Panel();
             this.panel_bottomright = new System.Windows.Forms.Panel();
-            this.dataViewScrollerPanel2 = new ExtendedControls.DataViewScrollerPanel();
-            this.vScrollBarCustom2 = new ExtendedControls.VScrollBarCustom();
-            this.dataGridViewNearest = new System.Windows.Forms.DataGridView();
-            this.Col1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Distance = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.closestContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.addToTrilaterationToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             this.viewOnEDSMToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             this.panel_topright = new System.Windows.Forms.Panel();
             this.label1 = new System.Windows.Forms.Label();
             this.panelBottom = new System.Windows.Forms.Panel();
-            this.richTextBox_History = new ExtendedControls.RichTextBoxScroll();
             this.panelMain = new System.Windows.Forms.Panel();
+            this.TopPanel = new System.Windows.Forms.Panel();
             this.dataViewScrollerPanel1 = new ExtendedControls.DataViewScrollerPanel();
             this.vScrollBarCustom1 = new ExtendedControls.VScrollBarCustom();
             this.dataGridViewTravel = new System.Windows.Forms.DataGridView();
@@ -111,20 +77,50 @@
             this.ColumnSystem = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ColumnDistance = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ColumnNote = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.TopPanel = new System.Windows.Forms.Panel();
+            this.buttonFilter = new ExtendedControls.ButtonExt();
+            this.textBoxFilter = new ExtendedControls.TextBoxBorder();
+            this.comboBoxHistoryWindow = new ExtendedControls.ComboBoxCustom();
+            this.richTextBox_History = new ExtendedControls.RichTextBoxScroll();
+            this.dataViewScrollerPanel2 = new ExtendedControls.DataViewScrollerPanel();
+            this.vScrollBarCustom2 = new ExtendedControls.VScrollBarCustom();
+            this.dataGridViewNearest = new System.Windows.Forms.DataGridView();
+            this.Col1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Distance = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.buttonEDSM = new ExtendedControls.DrawnPanel();
+            this.textBoxSolDist = new ExtendedControls.TextBoxBorder();
+            this.buttonRoss = new ExtendedControls.DrawnPanel();
+            this.buttonEDDB = new ExtendedControls.DrawnPanel();
+            this.textBoxState = new ExtendedControls.TextBoxBorder();
+            this.textBoxEconomy = new ExtendedControls.TextBoxBorder();
+            this.textBoxGovernment = new ExtendedControls.TextBoxBorder();
+            this.textBoxAllegiance = new ExtendedControls.TextBoxBorder();
+            this.textBoxVisits = new ExtendedControls.TextBoxBorder();
+            this.richTextBoxNote = new ExtendedControls.RichTextBoxScroll();
+            this.textBoxZ = new ExtendedControls.TextBoxBorder();
+            this.textBoxY = new ExtendedControls.TextBoxBorder();
+            this.textBoxX = new ExtendedControls.TextBoxBorder();
+            this.textBoxTargetDist = new ExtendedControls.TextBoxBorder();
+            this.textBoxTarget = new ExtendedControls.AutoCompleteTextBox();
+            this.textBoxSystem = new ExtendedControls.TextBoxBorder();
+            this.button_RefreshHistory = new ExtendedControls.ButtonExt();
+            this.buttonMap2D = new ExtendedControls.ButtonExt();
+            this.comboBoxCommander = new ExtendedControls.ComboBoxCustom();
+            this.buttonExtSummaryPopOut = new ExtendedControls.ButtonExt();
+            this.buttonMap = new ExtendedControls.ButtonExt();
+            this.buttonSync = new ExtendedControls.ButtonExt();
             this.historyContextMenu.SuspendLayout();
             this.panel_system.SuspendLayout();
             this.panelRight.SuspendLayout();
             this.panel_bottomright.SuspendLayout();
-            this.dataViewScrollerPanel2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridViewNearest)).BeginInit();
             this.closestContextMenu.SuspendLayout();
             this.panel_topright.SuspendLayout();
             this.panelBottom.SuspendLayout();
             this.panelMain.SuspendLayout();
+            this.TopPanel.SuspendLayout();
             this.dataViewScrollerPanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridViewTravel)).BeginInit();
-            this.TopPanel.SuspendLayout();
+            this.dataViewScrollerPanel2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridViewNearest)).BeginInit();
             this.SuspendLayout();
             //
             // historyContextMenu
@@ -137,8 +133,7 @@
             this.addToTrilaterationToolStripMenuItem,
             this.viewOnEDSMToolStripMenuItem,
             this.selectCorrectSystemToolStripMenuItem,
-            this.toolStripMenuItemStartStop,
-            this.eDDNTestToolStripMenuItem});
+            this.toolStripMenuItemStartStop});
             this.historyContextMenu.Name = "historyContextMenu";
             this.historyContextMenu.Size = new System.Drawing.Size(294, 202);
             this.historyContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.historyContextMenu_Opening);
@@ -230,13 +225,6 @@
             this.toolStripMenuItemStartStop.Size = new System.Drawing.Size(293, 22);
             this.toolStripMenuItemStartStop.Text = "Set Start/Stop point for travel calculations";
             this.toolStripMenuItemStartStop.Click += new System.EventHandler(this.toolStripMenuItemStartStop_Click);
-            //
-            // eDDNTestToolStripMenuItem
-            //
-            this.eDDNTestToolStripMenuItem.Name = "eDDNTestToolStripMenuItem";
-            this.eDDNTestToolStripMenuItem.Size = new System.Drawing.Size(293, 22);
-            this.eDDNTestToolStripMenuItem.Text = "EDDN test";
-            this.eDDNTestToolStripMenuItem.Click += new System.EventHandler(this.eDDNTestToolStripMenuItem_Click);
             //
             // label2
             //
@@ -293,21 +281,6 @@
             this.panel_system.Size = new System.Drawing.Size(297, 208);
             this.panel_system.TabIndex = 6;
             //
-            // buttonEDSM
-            //
-            this.buttonEDSM.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.buttonEDSM.Image = ExtendedControls.DrawnPanel.ImageType.Text;
-            this.buttonEDSM.ImageText = "EDSM";
-            this.buttonEDSM.Location = new System.Drawing.Point(208, 6);
-            this.buttonEDSM.MarginSize = 0;
-            this.buttonEDSM.MouseOverColor = System.Drawing.Color.White;
-            this.buttonEDSM.MouseSelectedColor = System.Drawing.Color.Green;
-            this.buttonEDSM.Name = "buttonEDSM";
-            this.buttonEDSM.Size = new System.Drawing.Size(44, 20);
-            this.buttonEDSM.TabIndex = 23;
-            this.toolTipEddb.SetToolTip(this.buttonEDSM, "Click to show system on EDSM");
-            this.buttonEDSM.Click += new System.EventHandler(this.buttonEDSM_Click);
-            //
             // label14
             //
             this.label14.AutoSize = true;
@@ -318,74 +291,6 @@
             this.label14.Text = "Sol";
             this.label14.TextAlign = System.Drawing.ContentAlignment.TopRight;
             //
-            // textBoxSolDist
-            //
-            this.textBoxSolDist.BorderColor = System.Drawing.Color.Transparent;
-            this.textBoxSolDist.BorderColorScaling = 0.5F;
-            this.textBoxSolDist.Location = new System.Drawing.Point(50, 84);
-            this.textBoxSolDist.Name = "textBoxSolDist";
-            this.textBoxSolDist.ReadOnly = true;
-            this.textBoxSolDist.Size = new System.Drawing.Size(67, 20);
-            this.textBoxSolDist.TabIndex = 42;
-            this.textBoxSolDist.TabStop = false;
-            this.toolTipEddb.SetToolTip(this.textBoxSolDist, "Distance to home planet");
-            //
-            // buttonRoss
-            //
-            this.buttonRoss.BackColor = System.Drawing.SystemColors.ControlText;
-            this.buttonRoss.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.buttonRoss.ForeColor = System.Drawing.SystemColors.Control;
-            this.buttonRoss.Image = ExtendedControls.DrawnPanel.ImageType.Ross;
-            this.buttonRoss.ImageText = null;
-            this.buttonRoss.Location = new System.Drawing.Point(275, 6);
-            this.buttonRoss.MarginSize = 0;
-            this.buttonRoss.MouseOverColor = System.Drawing.Color.White;
-            this.buttonRoss.MouseSelectedColor = System.Drawing.Color.Green;
-            this.buttonRoss.Name = "buttonRoss";
-            this.buttonRoss.Size = new System.Drawing.Size(20, 20);
-            this.buttonRoss.TabIndex = 40;
-            this.toolTipEddb.SetToolTip(this.buttonRoss, "Click to edit system in Ross");
-            this.buttonRoss.Click += new System.EventHandler(this.buttonRoss_Click);
-            //
-            // buttonEDDB
-            //
-            this.buttonEDDB.BackColor = System.Drawing.SystemColors.Control;
-            this.buttonEDDB.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.buttonEDDB.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.buttonEDDB.Image = ExtendedControls.DrawnPanel.ImageType.EDDB;
-            this.buttonEDDB.ImageText = null;
-            this.buttonEDDB.Location = new System.Drawing.Point(252, 6);
-            this.buttonEDDB.MarginSize = 0;
-            this.buttonEDDB.MouseOverColor = System.Drawing.Color.White;
-            this.buttonEDDB.MouseSelectedColor = System.Drawing.Color.Green;
-            this.buttonEDDB.Name = "buttonEDDB";
-            this.buttonEDDB.Size = new System.Drawing.Size(20, 20);
-            this.buttonEDDB.TabIndex = 39;
-            this.toolTipEddb.SetToolTip(this.buttonEDDB, "Click to show system in EDDB");
-            this.buttonEDDB.Click += new System.EventHandler(this.buttonEDDB_Click);
-            //
-            // textBoxState
-            //
-            this.textBoxState.BorderColor = System.Drawing.Color.Transparent;
-            this.textBoxState.BorderColorScaling = 0.5F;
-            this.textBoxState.Location = new System.Drawing.Point(186, 84);
-            this.textBoxState.Name = "textBoxState";
-            this.textBoxState.ReadOnly = true;
-            this.textBoxState.Size = new System.Drawing.Size(66, 20);
-            this.textBoxState.TabIndex = 37;
-            this.textBoxState.TabStop = false;
-            //
-            // textBoxEconomy
-            //
-            this.textBoxEconomy.BorderColor = System.Drawing.Color.Transparent;
-            this.textBoxEconomy.BorderColorScaling = 0.5F;
-            this.textBoxEconomy.Location = new System.Drawing.Point(186, 66);
-            this.textBoxEconomy.Name = "textBoxEconomy";
-            this.textBoxEconomy.ReadOnly = true;
-            this.textBoxEconomy.Size = new System.Drawing.Size(66, 20);
-            this.textBoxEconomy.TabIndex = 33;
-            this.textBoxEconomy.TabStop = false;
-            //
             // label12
             //
             this.label12.AutoSize = true;
@@ -406,28 +311,6 @@
             this.label13.Text = "Gov";
             this.label13.TextAlign = System.Drawing.ContentAlignment.TopRight;
             //
-            // textBoxGovernment
-            //
-            this.textBoxGovernment.BorderColor = System.Drawing.Color.Transparent;
-            this.textBoxGovernment.BorderColorScaling = 0.5F;
-            this.textBoxGovernment.Location = new System.Drawing.Point(186, 102);
-            this.textBoxGovernment.Name = "textBoxGovernment";
-            this.textBoxGovernment.ReadOnly = true;
-            this.textBoxGovernment.Size = new System.Drawing.Size(66, 20);
-            this.textBoxGovernment.TabIndex = 35;
-            this.textBoxGovernment.TabStop = false;
-            //
-            // textBoxAllegiance
-            //
-            this.textBoxAllegiance.BorderColor = System.Drawing.Color.Transparent;
-            this.textBoxAllegiance.BorderColorScaling = 0.5F;
-            this.textBoxAllegiance.Location = new System.Drawing.Point(186, 48);
-            this.textBoxAllegiance.Name = "textBoxAllegiance";
-            this.textBoxAllegiance.ReadOnly = true;
-            this.textBoxAllegiance.Size = new System.Drawing.Size(66, 20);
-            this.textBoxAllegiance.TabIndex = 31;
-            this.textBoxAllegiance.TabStop = false;
-            //
             // label11
             //
             this.label11.AutoSize = true;
@@ -458,17 +341,6 @@
             this.label9.Text = "Visits";
             this.label9.TextAlign = System.Drawing.ContentAlignment.TopRight;
             //
-            // textBoxVisits
-            //
-            this.textBoxVisits.BorderColor = System.Drawing.Color.Transparent;
-            this.textBoxVisits.BorderColorScaling = 0.5F;
-            this.textBoxVisits.Location = new System.Drawing.Point(186, 30);
-            this.textBoxVisits.Name = "textBoxVisits";
-            this.textBoxVisits.ReadOnly = true;
-            this.textBoxVisits.Size = new System.Drawing.Size(66, 20);
-            this.textBoxVisits.TabIndex = 29;
-            this.textBoxVisits.TabStop = false;
-            //
             // label8
             //
             this.label8.AutoSize = true;
@@ -477,20 +349,6 @@
             this.label8.Size = new System.Drawing.Size(30, 13);
             this.label8.TabIndex = 28;
             this.label8.Text = "Note";
-            //
-            // richTextBoxNote
-            //
-            this.richTextBoxNote.BorderColor = System.Drawing.Color.Transparent;
-            this.richTextBoxNote.BorderColorScaling = 0.5F;
-            this.richTextBoxNote.HideScrollBar = true;
-            this.richTextBoxNote.Location = new System.Drawing.Point(6, 126);
-            this.richTextBoxNote.Name = "richTextBoxNote";
-            this.richTextBoxNote.ScrollBarWidth = 20;
-            this.richTextBoxNote.ShowLineCount = false;
-            this.richTextBoxNote.Size = new System.Drawing.Size(246, 44);
-            this.richTextBoxNote.TabIndex = 0;
-            this.richTextBoxNote.TextChanged += new System.EventHandler(this.richTextBoxNote_TextChanged);
-            this.richTextBoxNote.Leave += new System.EventHandler(this.richTextBoxNote_Leave);
             //
             // label_Z
             //
@@ -501,17 +359,6 @@
             this.label_Z.TabIndex = 20;
             this.label_Z.Text = "Z";
             this.label_Z.TextAlign = System.Drawing.ContentAlignment.TopRight;
-            //
-            // textBoxZ
-            //
-            this.textBoxZ.BorderColor = System.Drawing.Color.Transparent;
-            this.textBoxZ.BorderColorScaling = 0.5F;
-            this.textBoxZ.Location = new System.Drawing.Point(50, 66);
-            this.textBoxZ.Name = "textBoxZ";
-            this.textBoxZ.ReadOnly = true;
-            this.textBoxZ.Size = new System.Drawing.Size(67, 20);
-            this.textBoxZ.TabIndex = 19;
-            this.textBoxZ.TabStop = false;
             //
             // labelDistEnter
             //
@@ -534,28 +381,6 @@
             this.label5.Text = "X";
             this.label5.TextAlign = System.Drawing.ContentAlignment.TopRight;
             //
-            // textBoxY
-            //
-            this.textBoxY.BorderColor = System.Drawing.Color.Transparent;
-            this.textBoxY.BorderColorScaling = 0.5F;
-            this.textBoxY.Location = new System.Drawing.Point(50, 48);
-            this.textBoxY.Name = "textBoxY";
-            this.textBoxY.ReadOnly = true;
-            this.textBoxY.Size = new System.Drawing.Size(67, 20);
-            this.textBoxY.TabIndex = 17;
-            this.textBoxY.TabStop = false;
-            //
-            // textBoxX
-            //
-            this.textBoxX.BorderColor = System.Drawing.Color.Transparent;
-            this.textBoxX.BorderColorScaling = 0.5F;
-            this.textBoxX.Location = new System.Drawing.Point(50, 30);
-            this.textBoxX.Name = "textBoxX";
-            this.textBoxX.ReadOnly = true;
-            this.textBoxX.Size = new System.Drawing.Size(67, 20);
-            this.textBoxX.TabIndex = 17;
-            this.textBoxX.TabStop = false;
-            //
             // label3
             //
             this.label3.AutoSize = true;
@@ -573,52 +398,6 @@
             this.label4.Size = new System.Drawing.Size(41, 13);
             this.label4.TabIndex = 16;
             this.label4.Text = "System";
-            //
-            // textBoxTargetDist
-            //
-            this.textBoxTargetDist.BorderColor = System.Drawing.Color.Transparent;
-            this.textBoxTargetDist.BorderColorScaling = 0.5F;
-            this.textBoxTargetDist.Location = new System.Drawing.Point(186, 180);
-            this.textBoxTargetDist.Name = "textBoxTargetDist";
-            this.textBoxTargetDist.ReadOnly = true;
-            this.textBoxTargetDist.Size = new System.Drawing.Size(62, 20);
-            this.textBoxTargetDist.TabIndex = 15;
-            this.textBoxTargetDist.TabStop = false;
-            this.toolTipEddb.SetToolTip(this.textBoxTargetDist, "Distance to target");
-            //
-            // textBoxTarget
-            //
-            this.textBoxTarget.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
-            this.textBoxTarget.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
-            this.textBoxTarget.BorderColor = System.Drawing.Color.Transparent;
-            this.textBoxTarget.BorderColorScaling = 0.5F;
-            this.textBoxTarget.DropDownBackgroundColor = System.Drawing.Color.Gray;
-            this.textBoxTarget.DropDownBorderColor = System.Drawing.Color.Green;
-            this.textBoxTarget.DropDownHeight = 200;
-            this.textBoxTarget.DropDownItemHeight = 20;
-            this.textBoxTarget.DropDownMouseOverBackgroundColor = System.Drawing.Color.Red;
-            this.textBoxTarget.DropDownScrollBarButtonColor = System.Drawing.Color.LightGray;
-            this.textBoxTarget.DropDownScrollBarColor = System.Drawing.Color.LightGray;
-            this.textBoxTarget.DropDownWidth = 0;
-            this.textBoxTarget.FlatStyle = System.Windows.Forms.FlatStyle.System;
-            this.textBoxTarget.Location = new System.Drawing.Point(47, 180);
-            this.textBoxTarget.Name = "textBoxTarget";
-            this.textBoxTarget.Size = new System.Drawing.Size(129, 20);
-            this.textBoxTarget.TabIndex = 15;
-            this.textBoxTarget.TabStop = false;
-            this.toolTipEddb.SetToolTip(this.textBoxTarget, "Sets the target");
-            this.textBoxTarget.KeyUp += new System.Windows.Forms.KeyEventHandler(this.textBoxTarget_KeyUp);
-            //
-            // textBoxSystem
-            //
-            this.textBoxSystem.BorderColor = System.Drawing.Color.Transparent;
-            this.textBoxSystem.BorderColorScaling = 0.5F;
-            this.textBoxSystem.Location = new System.Drawing.Point(50, 10);
-            this.textBoxSystem.Name = "textBoxSystem";
-            this.textBoxSystem.ReadOnly = true;
-            this.textBoxSystem.Size = new System.Drawing.Size(152, 20);
-            this.textBoxSystem.TabIndex = 15;
-            this.textBoxSystem.TabStop = false;
             //
             // labelCMDR
             //
@@ -629,6 +408,216 @@
             this.labelCMDR.Size = new System.Drawing.Size(31, 13);
             this.labelCMDR.TabIndex = 17;
             this.labelCMDR.Text = "Cmdr";
+            //
+            // panelRight
+            //
+            this.panelRight.Controls.Add(this.panel_bottomright);
+            this.panelRight.Controls.Add(this.panel_system);
+            this.panelRight.Controls.Add(this.panel_topright);
+            this.panelRight.Dock = System.Windows.Forms.DockStyle.Right;
+            this.panelRight.Location = new System.Drawing.Point(594, 0);
+            this.panelRight.Name = "panelRight";
+            this.panelRight.Size = new System.Drawing.Size(297, 650);
+            this.panelRight.TabIndex = 1;
+            //
+            // panel_bottomright
+            //
+            this.panel_bottomright.Controls.Add(this.dataViewScrollerPanel2);
+            this.panel_bottomright.Controls.Add(this.labelclosests);
+            this.panel_bottomright.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel_bottomright.Location = new System.Drawing.Point(0, 308);
+            this.panel_bottomright.Name = "panel_bottomright";
+            this.panel_bottomright.Size = new System.Drawing.Size(297, 342);
+            this.panel_bottomright.TabIndex = 25;
+            //
+            // closestContextMenu
+            //
+            this.closestContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.addToTrilaterationToolStripMenuItem1,
+            this.viewOnEDSMToolStripMenuItem1});
+            this.closestContextMenu.Name = "closestContextMenu";
+            this.closestContextMenu.Size = new System.Drawing.Size(177, 48);
+            //
+            // addToTrilaterationToolStripMenuItem1
+            //
+            this.addToTrilaterationToolStripMenuItem1.Name = "addToTrilaterationToolStripMenuItem1";
+            this.addToTrilaterationToolStripMenuItem1.Size = new System.Drawing.Size(176, 22);
+            this.addToTrilaterationToolStripMenuItem1.Text = "Add to Trilateration";
+            this.addToTrilaterationToolStripMenuItem1.Click += new System.EventHandler(this.addToTrilaterationToolStripMenuItem1_Click);
+            //
+            // viewOnEDSMToolStripMenuItem1
+            //
+            this.viewOnEDSMToolStripMenuItem1.Name = "viewOnEDSMToolStripMenuItem1";
+            this.viewOnEDSMToolStripMenuItem1.Size = new System.Drawing.Size(176, 22);
+            this.viewOnEDSMToolStripMenuItem1.Text = "View on EDSM";
+            this.viewOnEDSMToolStripMenuItem1.Click += new System.EventHandler(this.viewOnEDSMToolStripMenuItem1_Click);
+            //
+            // panel_topright
+            //
+            this.panel_topright.Controls.Add(this.button_RefreshHistory);
+            this.panel_topright.Controls.Add(this.buttonMap2D);
+            this.panel_topright.Controls.Add(this.comboBoxCommander);
+            this.panel_topright.Controls.Add(this.labelCMDR);
+            this.panel_topright.Controls.Add(this.buttonExtSummaryPopOut);
+            this.panel_topright.Controls.Add(this.buttonMap);
+            this.panel_topright.Controls.Add(this.buttonSync);
+            this.panel_topright.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel_topright.Location = new System.Drawing.Point(0, 0);
+            this.panel_topright.Name = "panel_topright";
+            this.panel_topright.Size = new System.Drawing.Size(297, 100);
+            this.panel_topright.TabIndex = 26;
+            //
+            // label1
+            //
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(220, 7);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(41, 13);
+            this.label1.TabIndex = 24;
+            this.label1.Text = "Search";
+            //
+            // panelBottom
+            //
+            this.panelBottom.Controls.Add(this.richTextBox_History);
+            this.panelBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panelBottom.Location = new System.Drawing.Point(0, 548);
+            this.panelBottom.Name = "panelBottom";
+            this.panelBottom.Size = new System.Drawing.Size(594, 102);
+            this.panelBottom.TabIndex = 2;
+            //
+            // panelMain
+            //
+            this.panelMain.Controls.Add(this.dataViewScrollerPanel1);
+            this.panelMain.Controls.Add(this.TopPanel);
+            this.panelMain.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panelMain.Location = new System.Drawing.Point(0, 0);
+            this.panelMain.Name = "panelMain";
+            this.panelMain.Size = new System.Drawing.Size(594, 548);
+            this.panelMain.TabIndex = 0;
+            //
+            // TopPanel
+            //
+            this.TopPanel.Controls.Add(this.buttonFilter);
+            this.TopPanel.Controls.Add(this.textBoxFilter);
+            this.TopPanel.Controls.Add(this.label1);
+            this.TopPanel.Controls.Add(this.comboBoxHistoryWindow);
+            this.TopPanel.Controls.Add(this.label2);
+            this.TopPanel.Dock = System.Windows.Forms.DockStyle.Top;
+            this.TopPanel.Location = new System.Drawing.Point(0, 0);
+            this.TopPanel.Name = "TopPanel";
+            this.TopPanel.Size = new System.Drawing.Size(594, 32);
+            this.TopPanel.TabIndex = 26;
+            //
+            // dataViewScrollerPanel1
+            //
+            this.dataViewScrollerPanel1.Controls.Add(this.vScrollBarCustom1);
+            this.dataViewScrollerPanel1.Controls.Add(this.dataGridViewTravel);
+            this.dataViewScrollerPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dataViewScrollerPanel1.InternalMargin = new System.Windows.Forms.Padding(0, 0, 3, 0);
+            this.dataViewScrollerPanel1.Location = new System.Drawing.Point(0, 32);
+            this.dataViewScrollerPanel1.Name = "dataViewScrollerPanel1";
+            this.dataViewScrollerPanel1.ScrollBarWidth = 20;
+            this.dataViewScrollerPanel1.Size = new System.Drawing.Size(594, 516);
+            this.dataViewScrollerPanel1.TabIndex = 25;
+            this.dataViewScrollerPanel1.VerticalScrollBarDockRight = true;
+            //
+            // vScrollBarCustom1
+            //
+            this.vScrollBarCustom1.ArrowBorderColor = System.Drawing.Color.LightBlue;
+            this.vScrollBarCustom1.ArrowButtonColor = System.Drawing.Color.LightGray;
+            this.vScrollBarCustom1.ArrowColorScaling = 0.5F;
+            this.vScrollBarCustom1.ArrowDownDrawAngle = 270F;
+            this.vScrollBarCustom1.ArrowUpDrawAngle = 90F;
+            this.vScrollBarCustom1.BorderColor = System.Drawing.Color.White;
+            this.vScrollBarCustom1.FlatStyle = System.Windows.Forms.FlatStyle.System;
+            this.vScrollBarCustom1.HideScrollBar = true;
+            this.vScrollBarCustom1.LargeChange = 0;
+            this.vScrollBarCustom1.Location = new System.Drawing.Point(571, 21);
+            this.vScrollBarCustom1.Maximum = -1;
+            this.vScrollBarCustom1.Minimum = 0;
+            this.vScrollBarCustom1.MouseOverButtonColor = System.Drawing.Color.Green;
+            this.vScrollBarCustom1.MousePressedButtonColor = System.Drawing.Color.Red;
+            this.vScrollBarCustom1.Name = "vScrollBarCustom1";
+            this.vScrollBarCustom1.Size = new System.Drawing.Size(20, 495);
+            this.vScrollBarCustom1.SliderColor = System.Drawing.Color.DarkGray;
+            this.vScrollBarCustom1.SmallChange = 1;
+            this.vScrollBarCustom1.TabIndex = 4;
+            this.vScrollBarCustom1.Text = "vScrollBarCustom1";
+            this.vScrollBarCustom1.ThumbBorderColor = System.Drawing.Color.Yellow;
+            this.vScrollBarCustom1.ThumbButtonColor = System.Drawing.Color.DarkBlue;
+            this.vScrollBarCustom1.ThumbColorScaling = 0.5F;
+            this.vScrollBarCustom1.ThumbDrawAngle = 0F;
+            this.vScrollBarCustom1.Value = -1;
+            this.vScrollBarCustom1.ValueLimited = -1;
+            //
+            // dataGridViewTravel
+            //
+            this.dataGridViewTravel.AllowUserToAddRows = false;
+            this.dataGridViewTravel.AllowUserToDeleteRows = false;
+            this.dataGridViewTravel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.dataGridViewTravel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridViewTravel.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.ColumnTime,
+            this.Icon,
+            this.ColumnSystem,
+            this.ColumnDistance,
+            this.ColumnNote});
+            this.dataGridViewTravel.ContextMenuStrip = this.historyContextMenu;
+            this.dataGridViewTravel.Location = new System.Drawing.Point(0, 0);
+            this.dataGridViewTravel.Name = "dataGridViewTravel";
+            this.dataGridViewTravel.RowHeadersWidth = 50;
+            this.dataGridViewTravel.ScrollBars = System.Windows.Forms.ScrollBars.None;
+            this.dataGridViewTravel.Size = new System.Drawing.Size(571, 516);
+            this.dataGridViewTravel.TabIndex = 3;
+            this.dataGridViewTravel.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewTravel_CellClick);
+            this.dataGridViewTravel.CellContentDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewTravel_CellContentDoubleClick);
+            this.dataGridViewTravel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewTravel_CellDoubleClick);
+            this.dataGridViewTravel.ColumnHeaderMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgv_ColumnHeaderMouseClick);
+            this.dataGridViewTravel.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.dataGridViewTravel_ColumnWidthChanged);
+            this.dataGridViewTravel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint);
+            this.dataGridViewTravel.MouseDown += new System.Windows.Forms.MouseEventHandler(this.dataGridViewTravel_MouseDown);
+            //
+            // ColumnTime
+            //
+            this.ColumnTime.HeaderText = "Time";
+            this.ColumnTime.MinimumWidth = 100;
+            this.ColumnTime.Name = "ColumnTime";
+            this.ColumnTime.ReadOnly = true;
+            this.ColumnTime.Width = 140;
+            //
+            // Icon
+            //
+            this.Icon.HeaderText = "Event";
+            this.Icon.MinimumWidth = 32;
+            this.Icon.Name = "Icon";
+            this.Icon.ReadOnly = true;
+            this.Icon.Width = 80;
+            //
+            // ColumnSystem
+            //
+            this.ColumnSystem.HeaderText = "Description";
+            this.ColumnSystem.MinimumWidth = 100;
+            this.ColumnSystem.Name = "ColumnSystem";
+            this.ColumnSystem.ReadOnly = true;
+            this.ColumnSystem.Width = 150;
+            //
+            // ColumnDistance
+            //
+            this.ColumnDistance.HeaderText = "Information";
+            this.ColumnDistance.MinimumWidth = 50;
+            this.ColumnDistance.Name = "ColumnDistance";
+            this.ColumnDistance.ReadOnly = true;
+            this.ColumnDistance.Width = 70;
+            //
+            // ColumnNote
+            //
+            this.ColumnNote.FillWeight = 150F;
+            this.ColumnNote.HeaderText = "Note";
+            this.ColumnNote.MinimumWidth = 10;
+            this.ColumnNote.Name = "ColumnNote";
+            this.ColumnNote.ReadOnly = true;
+            this.ColumnNote.Width = 137;
             //
             // buttonFilter
             //
@@ -682,179 +671,18 @@
             this.comboBoxHistoryWindow.ValueMember = "";
             this.comboBoxHistoryWindow.SelectedIndexChanged += new System.EventHandler(this.comboBoxHistoryWindow_SelectedIndexChanged);
             //
-            // button_RefreshHistory
-            //
-            this.button_RefreshHistory.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.button_RefreshHistory.BorderColorScaling = 1.25F;
-            this.button_RefreshHistory.ButtonColorScaling = 0.5F;
-            this.button_RefreshHistory.ButtonDisabledScaling = 0.5F;
-            this.button_RefreshHistory.Location = new System.Drawing.Point(6, 6);
-            this.button_RefreshHistory.Name = "button_RefreshHistory";
-            this.button_RefreshHistory.Size = new System.Drawing.Size(65, 23);
-            this.button_RefreshHistory.TabIndex = 2;
-            this.button_RefreshHistory.Text = "Refresh";
-            this.toolTipEddb.SetToolTip(this.button_RefreshHistory, "Perform an EDSM synchronisation then refresh the list");
-            this.button_RefreshHistory.UseVisualStyleBackColor = true;
-            this.button_RefreshHistory.Click += new System.EventHandler(this.button_RefreshHistory_Click);
-            //
-            // checkBoxEDSMSyncFrom
-            //
-            this.checkBoxEDSMSyncFrom.AutoSize = true;
-            this.checkBoxEDSMSyncFrom.CheckBoxColor = System.Drawing.Color.Gray;
-            this.checkBoxEDSMSyncFrom.CheckBoxInnerColor = System.Drawing.Color.White;
-            this.checkBoxEDSMSyncFrom.CheckColor = System.Drawing.Color.DarkBlue;
-            this.checkBoxEDSMSyncFrom.FontNerfReduction = 0.5F;
-            this.checkBoxEDSMSyncFrom.Location = new System.Drawing.Point(214, 51);
-            this.checkBoxEDSMSyncFrom.MouseOverColor = System.Drawing.Color.CornflowerBlue;
-            this.checkBoxEDSMSyncFrom.Name = "checkBoxEDSMSyncFrom";
-            this.checkBoxEDSMSyncFrom.Size = new System.Drawing.Size(83, 17);
-            this.checkBoxEDSMSyncFrom.TabIndex = 22;
-            this.checkBoxEDSMSyncFrom.Text = "From EDSM";
-            this.checkBoxEDSMSyncFrom.TickBoxReductionSize = 10;
-            this.toolTipEddb.SetToolTip(this.checkBoxEDSMSyncFrom, "Receive data from EDSM");
-            this.checkBoxEDSMSyncFrom.UseVisualStyleBackColor = true;
-            this.checkBoxEDSMSyncFrom.CheckedChanged += new System.EventHandler(this.checkBoxEDSMSyncFrom_CheckedChanged);
-            //
-            // buttonMap2D
-            //
-            this.buttonMap2D.BorderColorScaling = 1.25F;
-            this.buttonMap2D.ButtonColorScaling = 0.5F;
-            this.buttonMap2D.ButtonDisabledScaling = 0.5F;
-            this.buttonMap2D.Location = new System.Drawing.Point(6, 37);
-            this.buttonMap2D.Name = "buttonMap2D";
-            this.buttonMap2D.Size = new System.Drawing.Size(65, 23);
-            this.buttonMap2D.TabIndex = 3;
-            this.buttonMap2D.Text = "2D map";
-            this.toolTipEddb.SetToolTip(this.buttonMap2D, "Open the 2D Map");
-            this.buttonMap2D.UseVisualStyleBackColor = true;
-            this.buttonMap2D.Click += new System.EventHandler(this.button2DMap_Click);
-            //
-            // checkBoxEDSMSyncTo
-            //
-            this.checkBoxEDSMSyncTo.AutoSize = true;
-            this.checkBoxEDSMSyncTo.CheckBoxColor = System.Drawing.Color.Gray;
-            this.checkBoxEDSMSyncTo.CheckBoxInnerColor = System.Drawing.Color.White;
-            this.checkBoxEDSMSyncTo.CheckColor = System.Drawing.Color.DarkBlue;
-            this.checkBoxEDSMSyncTo.FontNerfReduction = 0.5F;
-            this.checkBoxEDSMSyncTo.Location = new System.Drawing.Point(214, 32);
-            this.checkBoxEDSMSyncTo.MouseOverColor = System.Drawing.Color.CornflowerBlue;
-            this.checkBoxEDSMSyncTo.Name = "checkBoxEDSMSyncTo";
-            this.checkBoxEDSMSyncTo.Size = new System.Drawing.Size(73, 17);
-            this.checkBoxEDSMSyncTo.TabIndex = 21;
-            this.checkBoxEDSMSyncTo.Text = "To EDSM";
-            this.checkBoxEDSMSyncTo.TickBoxReductionSize = 10;
-            this.toolTipEddb.SetToolTip(this.checkBoxEDSMSyncTo, "Send data to EDSM");
-            this.checkBoxEDSMSyncTo.UseVisualStyleBackColor = true;
-            this.checkBoxEDSMSyncTo.CheckedChanged += new System.EventHandler(this.checkBoxEDSMSyncTo_CheckedChanged);
-            //
-            // comboBoxCommander
-            //
-            this.comboBoxCommander.ArrowWidth = 1;
-            this.comboBoxCommander.BorderColor = System.Drawing.Color.Red;
-            this.comboBoxCommander.ButtonColorScaling = 0.5F;
-            this.comboBoxCommander.DataSource = null;
-            this.comboBoxCommander.DisplayMember = "";
-            this.comboBoxCommander.DropDownBackgroundColor = System.Drawing.Color.Gray;
-            this.comboBoxCommander.DropDownHeight = 200;
-            this.comboBoxCommander.DropDownWidth = 173;
-            this.comboBoxCommander.FlatStyle = System.Windows.Forms.FlatStyle.System;
-            this.comboBoxCommander.ItemHeight = 13;
-            this.comboBoxCommander.Location = new System.Drawing.Point(114, 6);
-            this.comboBoxCommander.MouseOverBackgroundColor = System.Drawing.Color.Silver;
-            this.comboBoxCommander.Name = "comboBoxCommander";
-            this.comboBoxCommander.ScrollBarButtonColor = System.Drawing.Color.LightGray;
-            this.comboBoxCommander.ScrollBarColor = System.Drawing.Color.LightGray;
-            this.comboBoxCommander.ScrollBarWidth = 16;
-            this.comboBoxCommander.SelectedIndex = -1;
-            this.comboBoxCommander.SelectedItem = null;
-            this.comboBoxCommander.SelectedValue = null;
-            this.comboBoxCommander.Size = new System.Drawing.Size(173, 23);
-            this.comboBoxCommander.TabIndex = 0;
-            this.toolTipEddb.SetToolTip(this.comboBoxCommander, "Select your commander. Use Settings page to configure and add additional commande" +
-        "rs");
-            this.comboBoxCommander.ValueMember = "";
-            this.comboBoxCommander.SelectedIndexChanged += new System.EventHandler(this.comboBoxCommander_SelectedIndexChanged);
-            //
-            // buttonExtSummaryPopOut
-            //
-            this.buttonExtSummaryPopOut.BorderColorScaling = 1.25F;
-            this.buttonExtSummaryPopOut.ButtonColorScaling = 0.5F;
-            this.buttonExtSummaryPopOut.ButtonDisabledScaling = 0.5F;
-            this.buttonExtSummaryPopOut.Location = new System.Drawing.Point(77, 71);
-            this.buttonExtSummaryPopOut.Name = "buttonExtSummaryPopOut";
-            this.buttonExtSummaryPopOut.Size = new System.Drawing.Size(65, 23);
-            this.buttonExtSummaryPopOut.TabIndex = 4;
-            this.buttonExtSummaryPopOut.Text = "S-Panel";
-            this.toolTipEddb.SetToolTip(this.buttonExtSummaryPopOut, "Turn on and off the Status Panel Pop Out. Right click on it to set its format. Dr" +
-        "ag this popout over your Elite Dangerous window");
-            this.buttonExtSummaryPopOut.UseVisualStyleBackColor = true;
-            this.buttonExtSummaryPopOut.Click += new System.EventHandler(this.buttonExtSummaryPopOut_Click);
-            //
-            // buttonMap
-            //
-            this.buttonMap.BorderColorScaling = 1.25F;
-            this.buttonMap.ButtonColorScaling = 0.5F;
-            this.buttonMap.ButtonDisabledScaling = 0.5F;
-            this.buttonMap.Location = new System.Drawing.Point(6, 71);
-            this.buttonMap.Name = "buttonMap";
-            this.buttonMap.Size = new System.Drawing.Size(65, 23);
-            this.buttonMap.TabIndex = 4;
-            this.buttonMap.Text = "3D map";
-            this.toolTipEddb.SetToolTip(this.buttonMap, "Open the 3D Map");
-            this.buttonMap.UseVisualStyleBackColor = true;
-            this.buttonMap.Click += new System.EventHandler(this.buttonMap_Click);
-            //
-            // buttonSync
-            //
-            this.buttonSync.BorderColorScaling = 1.25F;
-            this.buttonSync.ButtonColorScaling = 0.5F;
-            this.buttonSync.ButtonDisabledScaling = 0.5F;
-            this.buttonSync.Location = new System.Drawing.Point(116, 37);
-            this.buttonSync.Name = "buttonSync";
-            this.buttonSync.Size = new System.Drawing.Size(92, 23);
-            this.buttonSync.TabIndex = 4;
-            this.buttonSync.Text = "EDSM Sync";
-            this.toolTipEddb.SetToolTip(this.buttonSync, "Send history to your EDSM account (make sure the EDSM ID is set in settings)");
-            this.buttonSync.UseVisualStyleBackColor = true;
-            this.buttonSync.Click += new System.EventHandler(this.buttonSync_Click);
-            //
-            // checkBoxEDDNSync
-            //
-            this.checkBoxEDDNSync.AutoSize = true;
-            this.checkBoxEDDNSync.CheckBoxColor = System.Drawing.Color.Gray;
-            this.checkBoxEDDNSync.CheckBoxInnerColor = System.Drawing.Color.White;
-            this.checkBoxEDDNSync.CheckColor = System.Drawing.Color.DarkBlue;
-            this.checkBoxEDDNSync.FontNerfReduction = 0.5F;
-            this.checkBoxEDDNSync.Location = new System.Drawing.Point(214, 71);
-            this.checkBoxEDDNSync.MouseOverColor = System.Drawing.Color.CornflowerBlue;
-            this.checkBoxEDDNSync.Name = "checkBoxEDDNSync";
-            this.checkBoxEDDNSync.Size = new System.Drawing.Size(73, 17);
-            this.checkBoxEDDNSync.TabIndex = 23;
-            this.checkBoxEDDNSync.Text = "To EDDN";
-            this.checkBoxEDDNSync.TickBoxReductionSize = 10;
-            this.toolTipEddb.SetToolTip(this.checkBoxEDDNSync, "Send event data (jumps scan dock) to EDDN");
-            this.checkBoxEDDNSync.UseVisualStyleBackColor = true;
-            //
-            // panelRight
-            //
-            this.panelRight.Controls.Add(this.panel_bottomright);
-            this.panelRight.Controls.Add(this.panel_system);
-            this.panelRight.Controls.Add(this.panel_topright);
-            this.panelRight.Dock = System.Windows.Forms.DockStyle.Right;
-            this.panelRight.Location = new System.Drawing.Point(594, 0);
-            this.panelRight.Name = "panelRight";
-            this.panelRight.Size = new System.Drawing.Size(297, 650);
-            this.panelRight.TabIndex = 1;
-            //
-            // panel_bottomright
-            //
-            this.panel_bottomright.Controls.Add(this.dataViewScrollerPanel2);
-            this.panel_bottomright.Controls.Add(this.labelclosests);
-            this.panel_bottomright.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel_bottomright.Location = new System.Drawing.Point(0, 308);
-            this.panel_bottomright.Name = "panel_bottomright";
-            this.panel_bottomright.Size = new System.Drawing.Size(297, 342);
-            this.panel_bottomright.TabIndex = 25;
+            // richTextBox_History
+            //
+            this.richTextBox_History.BorderColor = System.Drawing.Color.Transparent;
+            this.richTextBox_History.BorderColorScaling = 0.5F;
+            this.richTextBox_History.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.richTextBox_History.HideScrollBar = true;
+            this.richTextBox_History.Location = new System.Drawing.Point(0, 0);
+            this.richTextBox_History.Name = "richTextBox_History";
+            this.richTextBox_History.ScrollBarWidth = 20;
+            this.richTextBox_History.ShowLineCount = false;
+            this.richTextBox_History.Size = new System.Drawing.Size(594, 102);
+            this.richTextBox_History.TabIndex = 0;
             //
             // dataViewScrollerPanel2
             //
@@ -928,210 +756,315 @@
             this.Distance.HeaderText = "Distance";
             this.Distance.Name = "Distance";
             //
-            // closestContextMenu
-            //
-            this.closestContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.addToTrilaterationToolStripMenuItem1,
-            this.viewOnEDSMToolStripMenuItem1});
-            this.closestContextMenu.Name = "closestContextMenu";
-            this.closestContextMenu.Size = new System.Drawing.Size(178, 48);
-            //
-            // addToTrilaterationToolStripMenuItem1
-            //
-            this.addToTrilaterationToolStripMenuItem1.Name = "addToTrilaterationToolStripMenuItem1";
-            this.addToTrilaterationToolStripMenuItem1.Size = new System.Drawing.Size(177, 22);
-            this.addToTrilaterationToolStripMenuItem1.Text = "Add to Trilateration";
-            this.addToTrilaterationToolStripMenuItem1.Click += new System.EventHandler(this.addToTrilaterationToolStripMenuItem1_Click);
-            //
-            // viewOnEDSMToolStripMenuItem1
-            //
-            this.viewOnEDSMToolStripMenuItem1.Name = "viewOnEDSMToolStripMenuItem1";
-            this.viewOnEDSMToolStripMenuItem1.Size = new System.Drawing.Size(177, 22);
-            this.viewOnEDSMToolStripMenuItem1.Text = "View on EDSM";
-            this.viewOnEDSMToolStripMenuItem1.Click += new System.EventHandler(this.viewOnEDSMToolStripMenuItem1_Click);
-            //
-            // panel_topright
-            //
-            this.panel_topright.Controls.Add(this.checkBoxEDDNSync);
-            this.panel_topright.Controls.Add(this.button_RefreshHistory);
-            this.panel_topright.Controls.Add(this.checkBoxEDSMSyncFrom);
-            this.panel_topright.Controls.Add(this.buttonMap2D);
-            this.panel_topright.Controls.Add(this.checkBoxEDSMSyncTo);
-            this.panel_topright.Controls.Add(this.comboBoxCommander);
-            this.panel_topright.Controls.Add(this.labelCMDR);
-            this.panel_topright.Controls.Add(this.buttonExtSummaryPopOut);
-            this.panel_topright.Controls.Add(this.buttonMap);
-            this.panel_topright.Controls.Add(this.buttonSync);
-            this.panel_topright.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel_topright.Location = new System.Drawing.Point(0, 0);
-            this.panel_topright.Name = "panel_topright";
-            this.panel_topright.Size = new System.Drawing.Size(297, 100);
-            this.panel_topright.TabIndex = 26;
-            //
-            // label1
-            //
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(220, 7);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(41, 13);
-            this.label1.TabIndex = 24;
-            this.label1.Text = "Search";
-            //
-            // panelBottom
-            //
-            this.panelBottom.Controls.Add(this.richTextBox_History);
-            this.panelBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panelBottom.Location = new System.Drawing.Point(0, 548);
-            this.panelBottom.Name = "panelBottom";
-            this.panelBottom.Size = new System.Drawing.Size(594, 102);
-            this.panelBottom.TabIndex = 2;
-            //
-            // richTextBox_History
-            //
-            this.richTextBox_History.BorderColor = System.Drawing.Color.Transparent;
-            this.richTextBox_History.BorderColorScaling = 0.5F;
-            this.richTextBox_History.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.richTextBox_History.HideScrollBar = true;
-            this.richTextBox_History.Location = new System.Drawing.Point(0, 0);
-            this.richTextBox_History.Name = "richTextBox_History";
-            this.richTextBox_History.ScrollBarWidth = 20;
-            this.richTextBox_History.ShowLineCount = false;
-            this.richTextBox_History.Size = new System.Drawing.Size(594, 102);
-            this.richTextBox_History.TabIndex = 0;
-            //
-            // panelMain
-            //
-            this.panelMain.Controls.Add(this.dataViewScrollerPanel1);
-            this.panelMain.Controls.Add(this.TopPanel);
-            this.panelMain.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panelMain.Location = new System.Drawing.Point(0, 0);
-            this.panelMain.Name = "panelMain";
-            this.panelMain.Size = new System.Drawing.Size(594, 548);
-            this.panelMain.TabIndex = 0;
-            //
-            // dataViewScrollerPanel1
-            //
-            this.dataViewScrollerPanel1.Controls.Add(this.vScrollBarCustom1);
-            this.dataViewScrollerPanel1.Controls.Add(this.dataGridViewTravel);
-            this.dataViewScrollerPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dataViewScrollerPanel1.InternalMargin = new System.Windows.Forms.Padding(0, 0, 3, 0);
-            this.dataViewScrollerPanel1.Location = new System.Drawing.Point(0, 32);
-            this.dataViewScrollerPanel1.Name = "dataViewScrollerPanel1";
-            this.dataViewScrollerPanel1.ScrollBarWidth = 20;
-            this.dataViewScrollerPanel1.Size = new System.Drawing.Size(594, 516);
-            this.dataViewScrollerPanel1.TabIndex = 25;
-            this.dataViewScrollerPanel1.VerticalScrollBarDockRight = true;
-            //
-            // vScrollBarCustom1
-            //
-            this.vScrollBarCustom1.ArrowBorderColor = System.Drawing.Color.LightBlue;
-            this.vScrollBarCustom1.ArrowButtonColor = System.Drawing.Color.LightGray;
-            this.vScrollBarCustom1.ArrowColorScaling = 0.5F;
-            this.vScrollBarCustom1.ArrowDownDrawAngle = 270F;
-            this.vScrollBarCustom1.ArrowUpDrawAngle = 90F;
-            this.vScrollBarCustom1.BorderColor = System.Drawing.Color.White;
-            this.vScrollBarCustom1.FlatStyle = System.Windows.Forms.FlatStyle.System;
-            this.vScrollBarCustom1.HideScrollBar = true;
-            this.vScrollBarCustom1.LargeChange = 0;
-            this.vScrollBarCustom1.Location = new System.Drawing.Point(571, 21);
-            this.vScrollBarCustom1.Maximum = -1;
-            this.vScrollBarCustom1.Minimum = 0;
-            this.vScrollBarCustom1.MouseOverButtonColor = System.Drawing.Color.Green;
-            this.vScrollBarCustom1.MousePressedButtonColor = System.Drawing.Color.Red;
-            this.vScrollBarCustom1.Name = "vScrollBarCustom1";
-            this.vScrollBarCustom1.Size = new System.Drawing.Size(20, 495);
-            this.vScrollBarCustom1.SliderColor = System.Drawing.Color.DarkGray;
-            this.vScrollBarCustom1.SmallChange = 1;
-            this.vScrollBarCustom1.TabIndex = 4;
-            this.vScrollBarCustom1.Text = "vScrollBarCustom1";
-            this.vScrollBarCustom1.ThumbBorderColor = System.Drawing.Color.Yellow;
-            this.vScrollBarCustom1.ThumbButtonColor = System.Drawing.Color.DarkBlue;
-            this.vScrollBarCustom1.ThumbColorScaling = 0.5F;
-            this.vScrollBarCustom1.ThumbDrawAngle = 0F;
-            this.vScrollBarCustom1.Value = -1;
-            this.vScrollBarCustom1.ValueLimited = -1;
-            //
-            // dataGridViewTravel
-            //
-            this.dataGridViewTravel.AllowUserToAddRows = false;
-            this.dataGridViewTravel.AllowUserToDeleteRows = false;
-            this.dataGridViewTravel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.dataGridViewTravel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridViewTravel.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.ColumnTime,
-            this.Icon,
-            this.ColumnSystem,
-            this.ColumnDistance,
-            this.ColumnNote});
-            this.dataGridViewTravel.ContextMenuStrip = this.historyContextMenu;
-            this.dataGridViewTravel.Location = new System.Drawing.Point(0, 0);
-            this.dataGridViewTravel.Name = "dataGridViewTravel";
-            this.dataGridViewTravel.RowHeadersWidth = 50;
-            this.dataGridViewTravel.ScrollBars = System.Windows.Forms.ScrollBars.None;
-            this.dataGridViewTravel.Size = new System.Drawing.Size(571, 516);
-            this.dataGridViewTravel.TabIndex = 3;
-            this.dataGridViewTravel.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewTravel_CellClick);
-            this.dataGridViewTravel.CellContentDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewTravel_CellContentDoubleClick);
-            this.dataGridViewTravel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewTravel_CellDoubleClick);
-            this.dataGridViewTravel.ColumnHeaderMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgv_ColumnHeaderMouseClick);
-            this.dataGridViewTravel.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.dataGridViewTravel_ColumnWidthChanged);
-            this.dataGridViewTravel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint);
-            this.dataGridViewTravel.MouseDown += new System.Windows.Forms.MouseEventHandler(this.dataGridViewTravel_MouseDown);
-            //
-            // ColumnTime
-            //
-            this.ColumnTime.HeaderText = "Time";
-            this.ColumnTime.MinimumWidth = 100;
-            this.ColumnTime.Name = "ColumnTime";
-            this.ColumnTime.ReadOnly = true;
-            this.ColumnTime.Width = 140;
-            //
-            // Icon
-            //
-            this.Icon.HeaderText = "Event";
-            this.Icon.MinimumWidth = 32;
-            this.Icon.Name = "Icon";
-            this.Icon.ReadOnly = true;
-            this.Icon.Width = 80;
-            //
-            // ColumnSystem
-            //
-            this.ColumnSystem.HeaderText = "Description";
-            this.ColumnSystem.MinimumWidth = 100;
-            this.ColumnSystem.Name = "ColumnSystem";
-            this.ColumnSystem.ReadOnly = true;
-            this.ColumnSystem.Width = 150;
-            //
-            // ColumnDistance
-            //
-            this.ColumnDistance.HeaderText = "Information";
-            this.ColumnDistance.MinimumWidth = 50;
-            this.ColumnDistance.Name = "ColumnDistance";
-            this.ColumnDistance.ReadOnly = true;
-            this.ColumnDistance.Width = 70;
-            //
-            // ColumnNote
-            //
-            this.ColumnNote.FillWeight = 150F;
-            this.ColumnNote.HeaderText = "Note";
-            this.ColumnNote.MinimumWidth = 10;
-            this.ColumnNote.Name = "ColumnNote";
-            this.ColumnNote.ReadOnly = true;
-            this.ColumnNote.Width = 137;
-            //
-            // TopPanel
-            //
-            this.TopPanel.Controls.Add(this.buttonFilter);
-            this.TopPanel.Controls.Add(this.textBoxFilter);
-            this.TopPanel.Controls.Add(this.label1);
-            this.TopPanel.Controls.Add(this.comboBoxHistoryWindow);
-            this.TopPanel.Controls.Add(this.label2);
-            this.TopPanel.Dock = System.Windows.Forms.DockStyle.Top;
-            this.TopPanel.Location = new System.Drawing.Point(0, 0);
-            this.TopPanel.Name = "TopPanel";
-            this.TopPanel.Size = new System.Drawing.Size(594, 32);
-            this.TopPanel.TabIndex = 26;
+            // buttonEDSM
+            //
+            this.buttonEDSM.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.buttonEDSM.Image = ExtendedControls.DrawnPanel.ImageType.Text;
+            this.buttonEDSM.ImageText = "EDSM";
+            this.buttonEDSM.Location = new System.Drawing.Point(208, 6);
+            this.buttonEDSM.MarginSize = 0;
+            this.buttonEDSM.MouseOverColor = System.Drawing.Color.White;
+            this.buttonEDSM.MouseSelectedColor = System.Drawing.Color.Green;
+            this.buttonEDSM.Name = "buttonEDSM";
+            this.buttonEDSM.Size = new System.Drawing.Size(44, 20);
+            this.buttonEDSM.TabIndex = 23;
+            this.toolTipEddb.SetToolTip(this.buttonEDSM, "Click to show system on EDSM");
+            this.buttonEDSM.Click += new System.EventHandler(this.buttonEDSM_Click);
+            //
+            // textBoxSolDist
+            //
+            this.textBoxSolDist.BorderColor = System.Drawing.Color.Transparent;
+            this.textBoxSolDist.BorderColorScaling = 0.5F;
+            this.textBoxSolDist.Location = new System.Drawing.Point(50, 84);
+            this.textBoxSolDist.Name = "textBoxSolDist";
+            this.textBoxSolDist.ReadOnly = true;
+            this.textBoxSolDist.Size = new System.Drawing.Size(67, 20);
+            this.textBoxSolDist.TabIndex = 42;
+            this.textBoxSolDist.TabStop = false;
+            this.toolTipEddb.SetToolTip(this.textBoxSolDist, "Distance to home planet");
+            //
+            // buttonRoss
+            //
+            this.buttonRoss.BackColor = System.Drawing.SystemColors.ControlText;
+            this.buttonRoss.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.buttonRoss.ForeColor = System.Drawing.SystemColors.Control;
+            this.buttonRoss.Image = ExtendedControls.DrawnPanel.ImageType.Ross;
+            this.buttonRoss.ImageText = null;
+            this.buttonRoss.Location = new System.Drawing.Point(275, 6);
+            this.buttonRoss.MarginSize = 0;
+            this.buttonRoss.MouseOverColor = System.Drawing.Color.White;
+            this.buttonRoss.MouseSelectedColor = System.Drawing.Color.Green;
+            this.buttonRoss.Name = "buttonRoss";
+            this.buttonRoss.Size = new System.Drawing.Size(20, 20);
+            this.buttonRoss.TabIndex = 40;
+            this.toolTipEddb.SetToolTip(this.buttonRoss, "Click to edit system in Ross");
+            this.buttonRoss.Click += new System.EventHandler(this.buttonRoss_Click);
+            //
+            // buttonEDDB
+            //
+            this.buttonEDDB.BackColor = System.Drawing.SystemColors.Control;
+            this.buttonEDDB.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.buttonEDDB.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.buttonEDDB.Image = ExtendedControls.DrawnPanel.ImageType.EDDB;
+            this.buttonEDDB.ImageText = null;
+            this.buttonEDDB.Location = new System.Drawing.Point(252, 6);
+            this.buttonEDDB.MarginSize = 0;
+            this.buttonEDDB.MouseOverColor = System.Drawing.Color.White;
+            this.buttonEDDB.MouseSelectedColor = System.Drawing.Color.Green;
+            this.buttonEDDB.Name = "buttonEDDB";
+            this.buttonEDDB.Size = new System.Drawing.Size(20, 20);
+            this.buttonEDDB.TabIndex = 39;
+            this.toolTipEddb.SetToolTip(this.buttonEDDB, "Click to show system in EDDB");
+            this.buttonEDDB.Click += new System.EventHandler(this.buttonEDDB_Click);
+            //
+            // textBoxState
+            //
+            this.textBoxState.BorderColor = System.Drawing.Color.Transparent;
+            this.textBoxState.BorderColorScaling = 0.5F;
+            this.textBoxState.Location = new System.Drawing.Point(186, 84);
+            this.textBoxState.Name = "textBoxState";
+            this.textBoxState.ReadOnly = true;
+            this.textBoxState.Size = new System.Drawing.Size(66, 20);
+            this.textBoxState.TabIndex = 37;
+            this.textBoxState.TabStop = false;
+            //
+            // textBoxEconomy
+            //
+            this.textBoxEconomy.BorderColor = System.Drawing.Color.Transparent;
+            this.textBoxEconomy.BorderColorScaling = 0.5F;
+            this.textBoxEconomy.Location = new System.Drawing.Point(186, 66);
+            this.textBoxEconomy.Name = "textBoxEconomy";
+            this.textBoxEconomy.ReadOnly = true;
+            this.textBoxEconomy.Size = new System.Drawing.Size(66, 20);
+            this.textBoxEconomy.TabIndex = 33;
+            this.textBoxEconomy.TabStop = false;
+            //
+            // textBoxGovernment
+            //
+            this.textBoxGovernment.BorderColor = System.Drawing.Color.Transparent;
+            this.textBoxGovernment.BorderColorScaling = 0.5F;
+            this.textBoxGovernment.Location = new System.Drawing.Point(186, 102);
+            this.textBoxGovernment.Name = "textBoxGovernment";
+            this.textBoxGovernment.ReadOnly = true;
+            this.textBoxGovernment.Size = new System.Drawing.Size(66, 20);
+            this.textBoxGovernment.TabIndex = 35;
+            this.textBoxGovernment.TabStop = false;
+            //
+            // textBoxAllegiance
+            //
+            this.textBoxAllegiance.BorderColor = System.Drawing.Color.Transparent;
+            this.textBoxAllegiance.BorderColorScaling = 0.5F;
+            this.textBoxAllegiance.Location = new System.Drawing.Point(186, 48);
+            this.textBoxAllegiance.Name = "textBoxAllegiance";
+            this.textBoxAllegiance.ReadOnly = true;
+            this.textBoxAllegiance.Size = new System.Drawing.Size(66, 20);
+            this.textBoxAllegiance.TabIndex = 31;
+            this.textBoxAllegiance.TabStop = false;
+            //
+            // textBoxVisits
+            //
+            this.textBoxVisits.BorderColor = System.Drawing.Color.Transparent;
+            this.textBoxVisits.BorderColorScaling = 0.5F;
+            this.textBoxVisits.Location = new System.Drawing.Point(186, 30);
+            this.textBoxVisits.Name = "textBoxVisits";
+            this.textBoxVisits.ReadOnly = true;
+            this.textBoxVisits.Size = new System.Drawing.Size(66, 20);
+            this.textBoxVisits.TabIndex = 29;
+            this.textBoxVisits.TabStop = false;
+            //
+            // richTextBoxNote
+            //
+            this.richTextBoxNote.BorderColor = System.Drawing.Color.Transparent;
+            this.richTextBoxNote.BorderColorScaling = 0.5F;
+            this.richTextBoxNote.HideScrollBar = true;
+            this.richTextBoxNote.Location = new System.Drawing.Point(6, 126);
+            this.richTextBoxNote.Name = "richTextBoxNote";
+            this.richTextBoxNote.ScrollBarWidth = 20;
+            this.richTextBoxNote.ShowLineCount = false;
+            this.richTextBoxNote.Size = new System.Drawing.Size(246, 44);
+            this.richTextBoxNote.TabIndex = 0;
+            this.richTextBoxNote.TextChanged += new System.EventHandler(this.richTextBoxNote_TextChanged);
+            this.richTextBoxNote.Leave += new System.EventHandler(this.richTextBoxNote_Leave);
+            //
+            // textBoxZ
+            //
+            this.textBoxZ.BorderColor = System.Drawing.Color.Transparent;
+            this.textBoxZ.BorderColorScaling = 0.5F;
+            this.textBoxZ.Location = new System.Drawing.Point(50, 66);
+            this.textBoxZ.Name = "textBoxZ";
+            this.textBoxZ.ReadOnly = true;
+            this.textBoxZ.Size = new System.Drawing.Size(67, 20);
+            this.textBoxZ.TabIndex = 19;
+            this.textBoxZ.TabStop = false;
+            //
+            // textBoxY
+            //
+            this.textBoxY.BorderColor = System.Drawing.Color.Transparent;
+            this.textBoxY.BorderColorScaling = 0.5F;
+            this.textBoxY.Location = new System.Drawing.Point(50, 48);
+            this.textBoxY.Name = "textBoxY";
+            this.textBoxY.ReadOnly = true;
+            this.textBoxY.Size = new System.Drawing.Size(67, 20);
+            this.textBoxY.TabIndex = 17;
+            this.textBoxY.TabStop = false;
+            //
+            // textBoxX
+            //
+            this.textBoxX.BorderColor = System.Drawing.Color.Transparent;
+            this.textBoxX.BorderColorScaling = 0.5F;
+            this.textBoxX.Location = new System.Drawing.Point(50, 30);
+            this.textBoxX.Name = "textBoxX";
+            this.textBoxX.ReadOnly = true;
+            this.textBoxX.Size = new System.Drawing.Size(67, 20);
+            this.textBoxX.TabIndex = 17;
+            this.textBoxX.TabStop = false;
+            //
+            // textBoxTargetDist
+            //
+            this.textBoxTargetDist.BorderColor = System.Drawing.Color.Transparent;
+            this.textBoxTargetDist.BorderColorScaling = 0.5F;
+            this.textBoxTargetDist.Location = new System.Drawing.Point(186, 180);
+            this.textBoxTargetDist.Name = "textBoxTargetDist";
+            this.textBoxTargetDist.ReadOnly = true;
+            this.textBoxTargetDist.Size = new System.Drawing.Size(62, 20);
+            this.textBoxTargetDist.TabIndex = 15;
+            this.textBoxTargetDist.TabStop = false;
+            this.toolTipEddb.SetToolTip(this.textBoxTargetDist, "Distance to target");
+            //
+            // textBoxTarget
+            //
+            this.textBoxTarget.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
+            this.textBoxTarget.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
+            this.textBoxTarget.BorderColor = System.Drawing.Color.Transparent;
+            this.textBoxTarget.BorderColorScaling = 0.5F;
+            this.textBoxTarget.DropDownBackgroundColor = System.Drawing.Color.Gray;
+            this.textBoxTarget.DropDownBorderColor = System.Drawing.Color.Green;
+            this.textBoxTarget.DropDownHeight = 200;
+            this.textBoxTarget.DropDownItemHeight = 20;
+            this.textBoxTarget.DropDownMouseOverBackgroundColor = System.Drawing.Color.Red;
+            this.textBoxTarget.DropDownScrollBarButtonColor = System.Drawing.Color.LightGray;
+            this.textBoxTarget.DropDownScrollBarColor = System.Drawing.Color.LightGray;
+            this.textBoxTarget.DropDownWidth = 0;
+            this.textBoxTarget.FlatStyle = System.Windows.Forms.FlatStyle.System;
+            this.textBoxTarget.Location = new System.Drawing.Point(47, 180);
+            this.textBoxTarget.Name = "textBoxTarget";
+            this.textBoxTarget.Size = new System.Drawing.Size(129, 20);
+            this.textBoxTarget.TabIndex = 15;
+            this.textBoxTarget.TabStop = false;
+            this.toolTipEddb.SetToolTip(this.textBoxTarget, "Sets the target");
+            this.textBoxTarget.KeyUp += new System.Windows.Forms.KeyEventHandler(this.textBoxTarget_KeyUp);
+            //
+            // textBoxSystem
+            //
+            this.textBoxSystem.BorderColor = System.Drawing.Color.Transparent;
+            this.textBoxSystem.BorderColorScaling = 0.5F;
+            this.textBoxSystem.Location = new System.Drawing.Point(50, 10);
+            this.textBoxSystem.Name = "textBoxSystem";
+            this.textBoxSystem.ReadOnly = true;
+            this.textBoxSystem.Size = new System.Drawing.Size(152, 20);
+            this.textBoxSystem.TabIndex = 15;
+            this.textBoxSystem.TabStop = false;
+            //
+            // button_RefreshHistory
+            //
+            this.button_RefreshHistory.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.button_RefreshHistory.BorderColorScaling = 1.25F;
+            this.button_RefreshHistory.ButtonColorScaling = 0.5F;
+            this.button_RefreshHistory.ButtonDisabledScaling = 0.5F;
+            this.button_RefreshHistory.Location = new System.Drawing.Point(6, 6);
+            this.button_RefreshHistory.Name = "button_RefreshHistory";
+            this.button_RefreshHistory.Size = new System.Drawing.Size(65, 23);
+            this.button_RefreshHistory.TabIndex = 2;
+            this.button_RefreshHistory.Text = "Refresh";
+            this.toolTipEddb.SetToolTip(this.button_RefreshHistory, "Perform an EDSM synchronisation then refresh the list");
+            this.button_RefreshHistory.UseVisualStyleBackColor = true;
+            this.button_RefreshHistory.Click += new System.EventHandler(this.button_RefreshHistory_Click);
+            //
+            // buttonMap2D
+            //
+            this.buttonMap2D.BorderColorScaling = 1.25F;
+            this.buttonMap2D.ButtonColorScaling = 0.5F;
+            this.buttonMap2D.ButtonDisabledScaling = 0.5F;
+            this.buttonMap2D.Location = new System.Drawing.Point(6, 37);
+            this.buttonMap2D.Name = "buttonMap2D";
+            this.buttonMap2D.Size = new System.Drawing.Size(65, 23);
+            this.buttonMap2D.TabIndex = 3;
+            this.buttonMap2D.Text = "2D map";
+            this.toolTipEddb.SetToolTip(this.buttonMap2D, "Open the 2D Map");
+            this.buttonMap2D.UseVisualStyleBackColor = true;
+            this.buttonMap2D.Click += new System.EventHandler(this.button2DMap_Click);
+            //
+            // comboBoxCommander
+            //
+            this.comboBoxCommander.ArrowWidth = 1;
+            this.comboBoxCommander.BorderColor = System.Drawing.Color.Red;
+            this.comboBoxCommander.ButtonColorScaling = 0.5F;
+            this.comboBoxCommander.DataSource = null;
+            this.comboBoxCommander.DisplayMember = "";
+            this.comboBoxCommander.DropDownBackgroundColor = System.Drawing.Color.Gray;
+            this.comboBoxCommander.DropDownHeight = 200;
+            this.comboBoxCommander.DropDownWidth = 173;
+            this.comboBoxCommander.FlatStyle = System.Windows.Forms.FlatStyle.System;
+            this.comboBoxCommander.ItemHeight = 13;
+            this.comboBoxCommander.Location = new System.Drawing.Point(114, 6);
+            this.comboBoxCommander.MouseOverBackgroundColor = System.Drawing.Color.Silver;
+            this.comboBoxCommander.Name = "comboBoxCommander";
+            this.comboBoxCommander.ScrollBarButtonColor = System.Drawing.Color.LightGray;
+            this.comboBoxCommander.ScrollBarColor = System.Drawing.Color.LightGray;
+            this.comboBoxCommander.ScrollBarWidth = 16;
+            this.comboBoxCommander.SelectedIndex = -1;
+            this.comboBoxCommander.SelectedItem = null;
+            this.comboBoxCommander.SelectedValue = null;
+            this.comboBoxCommander.Size = new System.Drawing.Size(173, 23);
+            this.comboBoxCommander.TabIndex = 0;
+            this.toolTipEddb.SetToolTip(this.comboBoxCommander, "Select your commander. Use Settings page to configure and add additional commande" +
+        "rs");
+            this.comboBoxCommander.ValueMember = "";
+            this.comboBoxCommander.SelectedIndexChanged += new System.EventHandler(this.comboBoxCommander_SelectedIndexChanged);
+            this.comboBoxCommander.Click += new System.EventHandler(this.comboBoxCommander_Click);
+            //
+            // buttonExtSummaryPopOut
+            //
+            this.buttonExtSummaryPopOut.BorderColorScaling = 1.25F;
+            this.buttonExtSummaryPopOut.ButtonColorScaling = 0.5F;
+            this.buttonExtSummaryPopOut.ButtonDisabledScaling = 0.5F;
+            this.buttonExtSummaryPopOut.Location = new System.Drawing.Point(77, 71);
+            this.buttonExtSummaryPopOut.Name = "buttonExtSummaryPopOut";
+            this.buttonExtSummaryPopOut.Size = new System.Drawing.Size(65, 23);
+            this.buttonExtSummaryPopOut.TabIndex = 4;
+            this.buttonExtSummaryPopOut.Text = "S-Panel";
+            this.toolTipEddb.SetToolTip(this.buttonExtSummaryPopOut, "Turn on and off the Status Panel Pop Out. Right click on it to set its format. Dr" +
+        "ag this popout over your Elite Dangerous window");
+            this.buttonExtSummaryPopOut.UseVisualStyleBackColor = true;
+            this.buttonExtSummaryPopOut.Click += new System.EventHandler(this.buttonExtSummaryPopOut_Click);
+            //
+            // buttonMap
+            //
+            this.buttonMap.BorderColorScaling = 1.25F;
+            this.buttonMap.ButtonColorScaling = 0.5F;
+            this.buttonMap.ButtonDisabledScaling = 0.5F;
+            this.buttonMap.Location = new System.Drawing.Point(6, 71);
+            this.buttonMap.Name = "buttonMap";
+            this.buttonMap.Size = new System.Drawing.Size(65, 23);
+            this.buttonMap.TabIndex = 4;
+            this.buttonMap.Text = "3D map";
+            this.toolTipEddb.SetToolTip(this.buttonMap, "Open the 3D Map");
+            this.buttonMap.UseVisualStyleBackColor = true;
+            this.buttonMap.Click += new System.EventHandler(this.buttonMap_Click);
+            //
+            // buttonSync
+            //
+            this.buttonSync.BorderColorScaling = 1.25F;
+            this.buttonSync.ButtonColorScaling = 0.5F;
+            this.buttonSync.ButtonDisabledScaling = 0.5F;
+            this.buttonSync.Location = new System.Drawing.Point(116, 37);
+            this.buttonSync.Name = "buttonSync";
+            this.buttonSync.Size = new System.Drawing.Size(92, 23);
+            this.buttonSync.TabIndex = 4;
+            this.buttonSync.Text = "EDSM Sync";
+            this.toolTipEddb.SetToolTip(this.buttonSync, "Send history to your EDSM account (make sure the EDSM ID is set in settings)");
+            this.buttonSync.UseVisualStyleBackColor = true;
+            this.buttonSync.Click += new System.EventHandler(this.buttonSync_Click);
             //
             // TravelHistoryControl
             //
@@ -1150,17 +1083,17 @@
             this.panelRight.ResumeLayout(false);
             this.panel_bottomright.ResumeLayout(false);
             this.panel_bottomright.PerformLayout();
-            this.dataViewScrollerPanel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridViewNearest)).EndInit();
             this.closestContextMenu.ResumeLayout(false);
             this.panel_topright.ResumeLayout(false);
             this.panel_topright.PerformLayout();
             this.panelBottom.ResumeLayout(false);
             this.panelMain.ResumeLayout(false);
+            this.TopPanel.ResumeLayout(false);
+            this.TopPanel.PerformLayout();
             this.dataViewScrollerPanel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dataGridViewTravel)).EndInit();
-            this.TopPanel.ResumeLayout(false);
-            this.TopPanel.PerformLayout();
+            this.dataViewScrollerPanel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridViewNearest)).EndInit();
             this.ResumeLayout(false);

         }
@@ -1213,8 +1146,6 @@
         private System.Windows.Forms.ToolStripMenuItem moveToAnotherCommanderToolStripMenuItem;
         private ExtendedControls.ComboBoxCustom comboBoxCommander;
         private System.Windows.Forms.ToolStripMenuItem addToTrilaterationToolStripMenuItem;
-        internal ExtendedControls.CheckBoxCustom checkBoxEDSMSyncFrom;
-        internal ExtendedControls.CheckBoxCustom checkBoxEDSMSyncTo;
         private System.Windows.Forms.DataGridView dataGridViewNearest;
         private System.Windows.Forms.DataGridViewTextBoxColumn Col1;
         private System.Windows.Forms.DataGridViewTextBoxColumn Distance;
@@ -1248,7 +1179,5 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn ColumnSystem;
         private System.Windows.Forms.DataGridViewTextBoxColumn ColumnDistance;
         private System.Windows.Forms.DataGridViewTextBoxColumn ColumnNote;
-        private System.Windows.Forms.ToolStripMenuItem eDDNTestToolStripMenuItem;
-        internal ExtendedControls.CheckBoxCustom checkBoxEDDNSync;
     }
 }


あ号作戦の進捗表示の詳細を、進捗の悪い要素順にしてみた

あ号作戦の進捗表示の詳細を、進捗の悪い要素順にしてみた

--- ElectronicObserver/Data/Quest/ProgressAGo.cs
+++ ElectronicObserver/Data/Quest/ProgressAGo.cs
@@ -6,6 +6,7 @@
 using System.Threading.Tasks;

 namespace ElectronicObserver.Data.Quest {
+	using DSPair = KeyValuePair<double, string>;

 	/// <summary>
 	/// 任務「あ号作戦」の進捗を管理します。
@@ -209,14 +210,13 @@

 		public override string ToString() {
-			return string.Format( "{0:p1} (出撃 {1}/{2}, S勝利 {3}/{4}, ボス {5}/{6}, ボス勝利 {7}/{8})",
-				ProgressPercentage,
-				sortieCount, sortieMax,
-				sWinCount, sWinMax,
-				bossCount, bossMax,
-				bossWinCount, bossWinMax );
-		}
-
+			var list = new List<DSPair>();
+			list.Add( new DSPair( Math.Min((double)sortieCount / sortieMax, 1.0 ), string.Format( "出撃 {0}/{1}", sortieCount, sortieMax ) ) );
+			list.Add( new DSPair( Math.Min((double)sWinCount / sWinMax, 1.0 ), string.Format( "S勝利 {0}/{1}", sWinCount, sWinMax ) ) );
+			list.Add( new DSPair( Math.Min((double)bossCount / bossMax, 1.0 ), string.Format( "ボス {0}/{1}", bossCount, bossMax ) ) );
+			list.Add( new DSPair( Math.Min((double)bossWinCount / bossWinMax, 1.0 ), string.Format( "ボス勝利 {0}/{1}", bossWinCount, bossWinMax ) ) );
+			return string.Format( "{0:p1} ({1})", ProgressPercentage, string.Join( ", ", list.OrderBy( elem => elem.Key ).Select( elem => elem.Value ) ) );
+		}
 	}

 }


Extra assertion (unit test IntersectIsAtCorrectPosition)

--- src/XLParser.Tests/FormulaAnalysisTest.cs
+++ src/XLParser.Tests/FormulaAnalysisTest.cs
@@ -134,7 +134,8 @@
         public void IntersectIsAtCorrectPosition()
         {
             var fa = new FormulaAnalyzer("SUM(A1:A3 A2:A3)");
-            var intersect = fa.AllNodes.FirstOrDefault(node => node.Token?.Terminal?.Name == "INTERSECT");
+            ParseTreeNode intersect = fa.AllNodes.FirstOrDefault(node => node.Token?.Terminal?.Name == "INTERSECT");
+            Assert.IsNotNull(intersect);
             Assert.AreEqual(9, intersect.Span.Location.Position);
         }
         #endregion


情報：未補給で遠征開始した際に警告を出すように

情報：未補給で遠征開始した際に警告を出すように

--- ElectronicObserver/Window/FormInformation.cs
+++ ElectronicObserver/Window/FormInformation.cs
@@ -512,12 +512,18 @@
 		{
 			var fleet = KCDatabase.Instance.Fleet[fleetID];
 			var result = MissionClearCondition.Check(missionID, fleet);
+			var mission = KCDatabase.Instance.Mission[missionID];

 			if (!result.IsSuceeded)
 			{
-				var mission = KCDatabase.Instance.Mission[missionID];
 				MessageBox.Show(
 					$"#{fleet.FleetID} {fleet.Name} の遠征 {mission.DisplayID}:{mission.Name} は、失敗する可能性があります。\r\n\r\n{string.Join("\r\n", result.FailureReason)}\r\n\r\n（この警告は 設定→動作 から無効化できます。）",
+					"遠征失敗警告", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+			}
+			if (fleet.MembersInstance.Any(s => s?.FuelRate < 1 || s?.AmmoRate < 1))
+			{
+				MessageBox.Show(
+					$"#{fleet.FleetID} {fleet.Name} の遠征 {mission.DisplayID}:{mission.Name} は、失敗する可能性があります。\r\n\r\n未補給\r\n\r\n（この警告は 設定→動作 から無効化できます。）",
 					"遠征失敗警告", MessageBoxButtons.OK, MessageBoxIcon.Warning);
 			}
 		}


Fix SubscriptionSynchronizer for universe selection with coarse data

Now UniverseSelectionRegressionAlgorithm regression test is passing

--- Engine/DataFeeds/SubscriptionSynchronizer.cs
+++ Engine/DataFeeds/SubscriptionSynchronizer.cs
@@ -110,21 +110,21 @@
                     // we have new universe data to select based on, store the subscription data until the end
                     if (subscription.IsUniverseSelectionSubscription && packet.Count > 0)
                     {
+                        // assume that if the first item is a base data collection then the enumerator handled the aggregation,
+                        // otherwise, load all the the data into a new collection instance
+                        var packetBaseDataCollection = packet.Data[0] as BaseDataCollection;
+                        var packetData = packetBaseDataCollection == null
+                            ? packet.Data
+                            : packetBaseDataCollection.Data;
+
                         BaseDataCollection collection;
                         if (!universeData.TryGetValue(subscription.Universe, out collection))
                         {
-                            collection = new BaseDataCollection(frontier, subscription.Configuration.Symbol, packet.Data);
+                            collection = new BaseDataCollection(frontier, subscription.Configuration.Symbol, packetData);
                             universeData[subscription.Universe] = collection;
                         }
                         else
                         {
-                            // assume that if the first item is a base data collection then the enumerator handled the aggregation,
-                            // otherwise, load all the the data into a new collection instance
-                            var packetBaseDataCollection = packet.Data[0] as BaseDataCollection;
-                            var packetData = packetBaseDataCollection == null
-                                ? packet.Data
-                                : packetBaseDataCollection.Data;
-
                             collection.Data.AddRange(packetData);
                         }
                     }


New test for beam grid

New test for beam grid

New beam grid test added.
Test for 8 beam 3D frame is inconclusive and now marked as such.

--- SharpFE.Core.Tests/Examples/Beam/Beam3DInFull3DModel.cs
+++ SharpFE.Core.Tests/Examples/Beam/Beam3DInFull3DModel.cs
@@ -213,13 +213,13 @@
             Console.WriteLine("\nNode3 reaction : \n" + node3Reaction);
             Console.WriteLine("\nNode4 reaction : \n" + node4Reaction);

+            Assert.Inconclusive("The below x, y and zz pass, but z, xx, yy fail");
             Assert.AreEqual(-0.000007109, node1Displacement.X, 0.00000001);
             Assert.AreEqual(-0.000010680, node1Displacement.Y, 0.00000001);
-//            Assert.AreEqual(-0.000014704, node1Displacement.Z, 0.00000001);
-//            Assert.AreEqual(0.000001147, node1Displacement.XX, 0.00000001);
-//            Assert.AreEqual(-0.000001068, node1Displacement.YY, 0.00000001);
+            Assert.AreEqual(-0.000014704, node1Displacement.Z, 0.00000001);
+            Assert.AreEqual(0.000001147, node1Displacement.XX, 0.00000001);
+            Assert.AreEqual(-0.000001068, node1Displacement.YY, 0.00000001);
             Assert.AreEqual(0.000000595, node1Displacement.ZZ, 0.000000001);
-            //TODO double check values
         }

@@ -284,11 +284,12 @@
             DisplacementVector node7Displacement = results.GetDisplacement(node7);
             DisplacementVector node8Displacement = results.GetDisplacement(node8);

-            Console.WriteLine("\nNode5 displacement : \n" + node5Displacement);
-            Console.WriteLine("\nNode6 displacement : \n" + node6Displacement);
-            Console.WriteLine("\nNode7 displacement : \n" + node7Displacement);
-            Console.WriteLine("\nNode8 displacement : \n" + node8Displacement);
-
+//            Console.WriteLine("\nNode5 displacement : \n" + node5Displacement);
+//            Console.WriteLine("\nNode6 displacement : \n" + node6Displacement);
+//            Console.WriteLine("\nNode7 displacement : \n" + node7Displacement);
+//            Console.WriteLine("\nNode8 displacement : \n" + node8Displacement);
+
+            Assert.Inconclusive("The below tests pass for y-displacements, but fail for x-displacements");
             Assert.AreEqual(-0.0026743, node5Displacement.X, 0.0001);
             Assert.AreEqual(0.0038697, node5Displacement.Y, 0.0001);
             Assert.AreEqual(-0.0107708, node6Displacement.X, 0.0001);
@@ -298,6 +299,55 @@
             Assert.AreEqual(-0.0026743, node8Displacement.X, 0.0001);
             Assert.AreEqual(-0.0038697, node8Displacement.Y, 0.0001);
         }
+
+        ///<summary>
+        /// Example problem and results are derived from:
+        /// MATLAB Codes for Finite Element Analysis, Solid Mechanics and its applications Volume 157, A.J.M. Ferreira, Springer 2010
+        /// Section 9.2 page 116
+        /// </summary>
+        [Test]
+        public void CalculateGridOf2BeamsAnd18Dof()
+        {
+            FiniteElementModel model = new FiniteElementModel(ModelType.Slab2D);
+            FiniteElementNode node1 = model.NodeFactory.Create(-3, 0);
+            model.ConstrainNode(node1, DegreeOfFreedom.Z);
+            model.ConstrainNode(node1, DegreeOfFreedom.XX);
+            model.ConstrainNode(node1, DegreeOfFreedom.YY);
+
+            FiniteElementNode node2 = model.NodeFactory.Create(0, 4);
+
+            FiniteElementNode node3 = model.NodeFactory.Create(3, 0);
+            model.ConstrainNode(node3, DegreeOfFreedom.Z);
+            model.ConstrainNode(node3, DegreeOfFreedom.XX);
+            model.ConstrainNode(node3, DegreeOfFreedom.YY);
+
+            IMaterial material = new GenericElasticMaterial(0, 210000000000, 0, 84000000000);
+            ICrossSection section = new GenericCrossSection(0.02, 0.0002, 0.0002, 0.00005);
+
+            model.ElementFactory.CreateLinear3DBeam(node1, node2, material, section);
+            model.ElementFactory.CreateLinear3DBeam(node2, node3, material, section);
+
+            ForceVector force = model.ForceFactory.Create(0, 0, -10000, 0, 0, 0);
+            model.ApplyForceToNode(force, node2);
+
+            IFiniteElementSolver solver = new LinearSolverSVD(model);
+            FiniteElementResults results = solver.Solve();
+
+            ReactionVector node1Reaction = results.GetReaction(node1);
+            ReactionVector node3Reaction = results.GetReaction(node3);
+            DisplacementVector node2Displacement = results.GetDisplacement(node2);
+
+            Assert.AreEqual(-0.0048, node2Displacement.Z, 0.0001);
+            Assert.AreEqual(-0.0018, node2Displacement.XX, 0.0001);
+
+            Assert.AreEqual(5000, node1Reaction.Z, 1);
+            Assert.AreEqual(20000, node1Reaction.XX, 1);
+            Assert.AreEqual(-13890, node1Reaction.YY, 1);
+
+            Assert.AreEqual(5000, node3Reaction.Z, 1);
+            Assert.AreEqual(20000, node3Reaction.XX, 1);
+            Assert.AreEqual(13890, node3Reaction.YY, 1);
+        }
     }
 }


fix BagPropertyToken error message

fix BagPropertyToken error message

--- Signum.Entities/DynamicQuery/Tokens/BagPropertyToken.cs
+++ Signum.Entities/DynamicQuery/Tokens/BagPropertyToken.cs
@@ -66,7 +66,7 @@
                 return Implementations.FromAttributes(cleanType, fi.GetCustomAttributes(true).Cast<Attribute>().ToArray(), null);

             if (cleanType.IsAbstract)
-                throw new InvalidOperationException("Impossible to determine implementations for {0}".Formato(fi.FieldName()));
+                throw new InvalidOperationException("Impossible to determine implementations for {0}".Formato(PropertyInfo.PropertyName()));

             return Implementations.By(cleanType);
         }


Change in feature 1 branch VS

Change in feature 1 branch VS

--- SimpleWebApi/SimpleWebApi/Controllers/PingController.cs
+++ SimpleWebApi/SimpleWebApi/Controllers/PingController.cs
@@ -14,6 +14,7 @@
         public IActionResult Ping()
         {
             // Change in Visual studio
+            // Change in feature 1 branch
             return Ok("pongChanged");
         }
     }


syncing get_ending_frame up with acclient (#2954)

--- Source/ACE.Server/Physics/Animation/AnimSequenceNode.cs
+++ Source/ACE.Server/Physics/Animation/AnimSequenceNode.cs
@@ -30,7 +30,7 @@

         public float get_ending_frame()
         {
-            if (Framerate > 0.0f)
+            if (Framerate >= 0.0f)
                 return HighFrame + 1 - PhysicsGlobals.EPSILON;
             else
                 return LowFrame;


re-adding missing .EnqueueAction() to EmoteType.CastSpell (#2583)

--- Source/ACE.Server/WorldObjects/Managers/EmoteManager.cs
+++ Source/ACE.Server/WorldObjects/Managers/EmoteManager.cs
@@ -201,6 +201,7 @@
                             creature.TryCastSpell(spell, targetObject, creature);
                             creature.PostCastMotion();
                         });
+                        castChain.EnqueueChain();
                     }
                     break;


bugid: 884

--- Source/Csla.test/DataPortal/AuthorizeDataPortalTests.cs
+++ Source/Csla.test/DataPortal/AuthorizeDataPortalTests.cs
@@ -11,9 +11,9 @@
 using Csla.Testing.Business.DataPortal;
 using Csla.Server;

-#if !NUNIT
+#if !NUNIT && !ANDROID
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-#else
+#elif !ANDROID
 using NUnit.Framework;
 using TestClass = NUnit.Framework.TestFixtureAttribute;
 using TestInitialize = NUnit.Framework.SetUpAttribute;


Fixed SSAO dispose

Fixed SSAO dispose

--- Fusion/Engine/Graphics/Effects/SsaoFilter.cs
+++ Fusion/Engine/Graphics/Effects/SsaoFilter.cs
@@ -151,8 +151,6 @@
 			SafeDispose( ref downsampledNormals );
 			SafeDispose( ref occlusionMap0 );
 			SafeDispose( ref occlusionMap1 );
-			SafeDispose( ref paramsCB );
-			SafeDispose( ref sampleDirectionsCB );

 			downsampledDepth	=	new RenderTarget2D( Game.GraphicsDevice, ColorFormat.R32F,  newWidth, newHeight, false, false );
 			downsampledNormals	=	new RenderTarget2D( Game.GraphicsDevice, ColorFormat.Rgba8, newWidth, newHeight, false, false );
@@ -187,6 +185,7 @@
 				SafeDispose( ref occlusionMap0 );
 				SafeDispose( ref occlusionMap1 );
 				SafeDispose( ref paramsCB	 );
+				SafeDispose( ref sampleDirectionsCB );
 				SafeDispose( ref randomDir );
 			}


Cleaning up.

Cleaning up.

--- GalleryMVC_With_Auth/Views/Home/About.cshtml
+++ GalleryMVC_With_Auth/Views/Home/About.cshtml
@@ -1,20 +1,19 @@
-
-
О нас.

+
О нас.

Лучше картины на планете, я гарантирую это!

Жанна Воробьева родилась 14 января 1974 г в г.Пинске.
-В 1989 г. закончила подготовительные курсы Пинской детской школы изобразительного искусства (преподаватели: Е.Шатохин, С.Хорошавцев).
-В том же году поступила в Минский художественный колледж при Белорусской Академии искусств, который окончила в 1993 г. (преподаватели: И.Власов, М.Нацевский).
-С 1994 года по настоящее время работает преподавателем в Пинской детской школе изобразительного искусства.
-Принимала участие в коллективных выставках:
-1995,1996,1998,2001,2004 г.г. – г.Пинск
-1995,2004,2005 г.г. – г.Брест
-1998 г. – г.Хунген-Утфе (Германия)
-2000, 2002 г.г. – Хунген-Виллинген (Германия)
-2004 г. – Варшава (Польша)
-2004,2005 г.г. – г.Минск
-Персональные выставки:
-2002 г. – г.Пинск
-2003 г. – г.Брест
-2005 г  - г.Брест «Полесская палитра» (художественная галерея «БелАрт»)
+    В 1989 г. закончила подготовительные курсы Пинской детской школы изобразительного искусства (преподаватели: Е.Шатохин, С.Хорошавцев).
+    В том же году поступила в Минский художественный колледж при Белорусской Академии искусств, который окончила в 1993 г. (преподаватели: И.Власов, М.Нацевский).
+    С 1994 года по настоящее время работает преподавателем в Пинской детской школе изобразительного искусства.
+    Принимала участие в коллективных выставках:
+    1995,1996,1998,2001,2004 г.г. – г.Пинск
+    1995,2004,2005 г.г. – г.Брест
+    1998 г. – г.Хунген-Утфе (Германия)
+    2000, 2002 г.г. – Хунген-Виллинген (Германия)
+    2004 г. – Варшава (Польша)
+    2004,2005 г.г. – г.Минск
+    Персональные выставки:
+    2002 г. – г.Пинск
+    2003 г. – г.Брест
+    2005 г - г.Брест «Полесская палитра» (художественная галерея «БелАрт»)


Refactoring: some changes in test page to work with pictures from album

--- GalleryMVC_With_Auth/Views/Home/tests.cshtml
+++ GalleryMVC_With_Auth/Views/Home/tests.cshtml
@@ -4,9 +4,16 @@
     ViewBag.Title = "Test";
 }

-

+

-
+
+
+

+
+
+
+     Up
+


Seprated InvalidateMeasure out from InvalidateFormattedText.
Whoever needs both the feature, calls then explicitly.
In this way TextPresenter's subscriber for SelectionStart/End doent invalidate measure,
since it should only focus on invalidate formatted text

Fixes #1448

--- src/Avalonia.Controls/TextBlock.cs
+++ src/Avalonia.Controls/TextBlock.cs
@@ -120,6 +120,7 @@
                 .Subscribe(_ =>
                 {
                     InvalidateFormattedText();
+                    InvalidateMeasure();
                 });
         }

@@ -370,8 +371,6 @@
                 _constraint = _formattedText.Constraint;
                 _formattedText = null;
             }
-
-            InvalidateMeasure();
         }

         /// <summary>
@@ -402,6 +401,7 @@
         {
             base.OnAttachedToLogicalTree(e);
             InvalidateFormattedText();
+            InvalidateMeasure();
         }
     }
 }


Correção overflow conversão nosso número para int32

Erro na validação do boleto quando o Nosso Número é maior que 2147483647
(Int32.MaxValue)

--- src/Boleto.Net/Banco/Banco_HSBC.cs
+++ src/Boleto.Net/Banco/Banco_HSBC.cs
@@ -320,7 +320,7 @@
                         boleto.NossoNumero = string.Format("{0}{1}", boleto.NossoNumero, _dacNossoNumero);
                         break;

-                    case "CNR": boleto.NossoNumero = string.Format("{0}{1}4{2}", boleto.NossoNumero, Mod11Base9(boleto.NossoNumero).ToString(), Mod11Base9((int.Parse(boleto.NossoNumero + Mod11Base9(boleto.NossoNumero).ToString() + "4") + int.Parse(boleto.Cedente.Codigo.ToString()) + int.Parse(boleto.DataVencimento.ToString("ddMMyy"))).ToString())); break;
+                    case "CNR": boleto.NossoNumero = string.Format("{0}{1}4{2}", boleto.NossoNumero, Mod11Base9(boleto.NossoNumero).ToString(), Mod11Base9((Int64.Parse(boleto.NossoNumero + Mod11Base9(boleto.NossoNumero).ToString() + "4") + int.Parse(boleto.Cedente.Codigo.ToString()) + int.Parse(boleto.DataVencimento.ToString("ddMMyy"))).ToString())); break;
                     default:
                         throw new NotImplementedException("Carteira não implementada.  Use CSB ou CNR");
                 }