" + Environment.NewLine);
- string spaces = " ";
- string indent = "";
- TreeGridNode t = node.Parent.Parent;
- while(t!=null)
- {
- indent = indent + spaces;
- t = t.Parent;
- }
- for (int i = 0; i < node.Cells.Count; i++)
- {
- if (i == 0)
- {
- sb.Append(@"| ");
- sb.Append(indent);
- if (node.Nodes.Count>0)
- {
- sb.Append(@"" + node.Cells[i].Value.ToString() + @"");
- }
- else
- {
- sb.Append(node.Cells[i].Value.ToString());
- }
- sb.Append(@" | " + Environment.NewLine);
- }
- else
- {
- sb.Append("");
- sb.Append(node.Cells[i].Value.ToString());
- sb.Append(@"");
- sb.Append(Environment.NewLine);
- }
- }
- sb.Append(@"
" + Environment.NewLine);
-
- for (int i = 0; i < node.Nodes.Count; i++)
- {
- sb.Append(GenerateRowHtml(id,i,node.Nodes[i]));
- }
-
- return sb.ToString();
- }
- #endregion
-
- #region Public properties
- [Category("Data"),
- Description("The collection of root nodes in the treelist."),
- DesignerSerializationVisibility(DesignerSerializationVisibility.Content),
- Editor(typeof(CollectionEditor), typeof(UITypeEditor))]
- public TreeGridNodeCollection Nodes
- {
- get
- {
- return this._root.Nodes;
- }
- }
-
- public new TreeGridNode CurrentRow
- {
- get
- {
- return base.CurrentRow as TreeGridNode;
- }
- }
-
- [DefaultValue(false),
- Description("Causes nodes to always show as expandable. Use the NodeExpanding event to add nodes.")]
- public bool VirtualNodes
- {
- get { return _virtualNodes; }
- set { _virtualNodes = value; }
- }
-
- public TreeGridNode CurrentNode
- {
- get
- {
- return this.CurrentRow;
- }
- }
-
- [DefaultValue(true)]
- public bool ShowLines
- {
- get { return this._showLines; }
- set {
- if (value != this._showLines) {
- this._showLines = value;
- this.Invalidate();
- }
- }
- }
-
- public ImageList ImageList
- {
- get { return this._imageList; }
- set {
- this._imageList = value;
- //TODO: should we invalidate cell styles when setting the image list?
-
- }
- }
-
- public new int RowCount
- {
- get { return this.Nodes.Count; }
- set
- {
- for (int i = 0; i < value; i++)
- this.Nodes.Add(new TreeGridNode());
-
- }
- }
-
- #endregion
-
- #region Site nodes and collapse/expand support
- protected override void OnRowsAdded(DataGridViewRowsAddedEventArgs e)
- {
- base.OnRowsAdded(e);
- // Notify the row when it is added to the base grid
- int count = e.RowCount - 1;
- TreeGridNode row;
- while (count >= 0)
- {
- row = base.Rows[e.RowIndex + count] as TreeGridNode;
- if (row != null)
- {
- row.Sited();
- }
- count--;
- }
- }
-
- internal protected void UnSiteAll()
- {
- this.UnSiteNode(this._root);
- }
-
- internal protected virtual void UnSiteNode(TreeGridNode node)
- {
- if (node.IsSited || node.IsRoot)
- {
- // remove child rows first
- foreach (TreeGridNode childNode in node.Nodes)
- {
- this.UnSiteNode(childNode);
- }
-
- // now remove this row except for the root
- if (!node.IsRoot)
- {
- base.Rows.Remove(node);
- // Row isn't sited in the grid anymore after remove. Note that we cannot
- // Use the RowRemoved event since we cannot map from the row index to
- // the index of the expandable row/node.
- node.UnSited();
- }
- }
- }
-
- internal protected virtual bool CollapseNode(TreeGridNode node)
- {
- if (node.IsExpanded)
- {
- CollapsingEventArgs exp = new CollapsingEventArgs(node);
- this.OnNodeCollapsing(exp);
-
- if (!exp.Cancel)
- {
- this.LockVerticalScrollBarUpdate(true);
- this.SuspendLayout();
- _inExpandCollapse = true;
- node.IsExpanded = false;
-
- foreach (TreeGridNode childNode in node.Nodes)
- {
- Debug.Assert(childNode.RowIndex != -1, "Row is NOT in the grid.");
- this.UnSiteNode(childNode);
- }
-
- CollapsedEventArgs exped = new CollapsedEventArgs(node);
- this.OnNodeCollapsed(exped);
- //TODO: Convert this to a specific NodeCell property
- _inExpandCollapse = false;
- this.LockVerticalScrollBarUpdate(false);
- this.ResumeLayout(true);
- this.InvalidateCell(node.Cells[0]);
-
- }
-
- return !exp.Cancel;
- }
- else
- {
- // row isn't expanded, so we didn't do anything.
- return false;
- }
- }
-
- internal protected virtual void SiteNode(TreeGridNode node)
- {
- //TODO: Raise exception if parent node is not the root or is not sited.
- int rowIndex = -1;
- TreeGridNode currentRow;
- node._grid = this;
-
- if (node.Parent != null && node.Parent.IsRoot == false)
- {
- // row is a child
- Debug.Assert(node.Parent != null && node.Parent.IsExpanded == true);
-
- if (node.Index > 0)
- {
- currentRow = node.Parent.Nodes[node.Index - 1];
- }
- else
- {
- currentRow = node.Parent;
- }
- }
- else
- {
- // row is being added to the root
- if (node.Index > 0)
- {
- currentRow = node.Parent.Nodes[node.Index - 1];
- }
- else
- {
- currentRow = null;
- }
-
- }
-
- if (currentRow != null)
- {
- while (currentRow.Level >= node.Level)
- {
- if (currentRow.RowIndex < base.Rows.Count - 1)
- {
- currentRow = base.Rows[currentRow.RowIndex + 1] as TreeGridNode;
- Debug.Assert(currentRow != null);
- }
- else
- // no more rows, site this node at the end.
- break;
-
- }
- if (currentRow == node.Parent)
- rowIndex = currentRow.RowIndex + 1;
- else if (currentRow.Level < node.Level)
- rowIndex = currentRow.RowIndex;
- else
- rowIndex = currentRow.RowIndex + 1;
- }
- else
- rowIndex = 0;
-
-
- Debug.Assert(rowIndex != -1);
- this.SiteNode(node, rowIndex);
-
- Debug.Assert(node.IsSited);
- if (node.IsExpanded)
- {
- // add all child rows to display
- foreach (TreeGridNode childNode in node.Nodes)
- {
- //TODO: could use the more efficient SiteRow with index.
- this.SiteNode(childNode);
- }
- }
- }
-
-
- internal protected virtual void SiteNode(TreeGridNode node, int index)
- {
- if (index < base.Rows.Count)
- {
- base.Rows.Insert(index, node);
- }
- else
- {
- // for the last item.
- base.Rows.Add(node);
- }
- }
-
- internal protected virtual bool ExpandNode(TreeGridNode node)
- {
- if (!node.IsExpanded || this._virtualNodes)
- {
- ExpandingEventArgs exp = new ExpandingEventArgs(node);
- this.OnNodeExpanding(exp);
-
- if (!exp.Cancel)
- {
- this.LockVerticalScrollBarUpdate(true);
- this.SuspendLayout();
- _inExpandCollapse = true;
- node.IsExpanded = true;
-
- //TODO Convert this to a InsertRange
- foreach (TreeGridNode childNode in node.Nodes)
- {
- Debug.Assert(childNode.RowIndex == -1, "Row is already in the grid.");
-
- this.SiteNode(childNode);
- //this.BaseRows.Insert(rowIndex + 1, childRow);
- //TODO : remove -- just a test.
- //childNode.Cells[0].Value = "child";
- }
-
- ExpandedEventArgs exped = new ExpandedEventArgs(node);
- this.OnNodeExpanded(exped);
- //TODO: Convert this to a specific NodeCell property
- _inExpandCollapse = false;
- this.LockVerticalScrollBarUpdate(false);
- this.ResumeLayout(true);
- this.InvalidateCell(node.Cells[0]);
- }
-
- return !exp.Cancel;
- }
- else
- {
- // row is already expanded, so we didn't do anything.
- return false;
- }
- }
-
- protected override void OnMouseUp(MouseEventArgs e)
- {
- // used to keep extra mouse moves from selecting more rows when collapsing
- base.OnMouseUp(e);
- this._inExpandCollapseMouseCapture = false;
- }
- protected override void OnMouseMove(MouseEventArgs e)
- {
- // while we are expanding and collapsing a node mouse moves are
- // supressed to keep selections from being messed up.
- if (!this._inExpandCollapseMouseCapture)
- base.OnMouseMove(e);
-
- }
- #endregion
-
- #region Collapse/Expand events
- public event ExpandingEventHandler NodeExpanding;
- public event ExpandedEventHandler NodeExpanded;
- public event CollapsingEventHandler NodeCollapsing;
- public event CollapsedEventHandler NodeCollapsed;
-
- protected virtual void OnNodeExpanding(ExpandingEventArgs e)
- {
- if (this.NodeExpanding != null)
- {
- NodeExpanding(this, e);
- }
- }
- protected virtual void OnNodeExpanded(ExpandedEventArgs e)
- {
- if (this.NodeExpanded != null)
- {
- NodeExpanded(this, e);
- }
- }
- protected virtual void OnNodeCollapsing(CollapsingEventArgs e)
- {
- if (this.NodeCollapsing != null)
- {
- NodeCollapsing(this, e);
- }
-
- }
- protected virtual void OnNodeCollapsed(CollapsedEventArgs e)
- {
- if (this.NodeCollapsed != null)
- {
- NodeCollapsed(this, e);
- }
- }
- #endregion
-
- #region Helper methods
- protected override void Dispose(bool disposing)
- {
- //this._disposing = true;
- base.Dispose(Disposing);
- this.UnSiteAll();
- }
-
- protected override void OnHandleCreated(EventArgs e)
- {
- base.OnHandleCreated(e);
-
- // this control is used to temporarly hide the vertical scroll bar
- hideScrollBarControl = new Control();
- hideScrollBarControl.Visible = false;
- hideScrollBarControl.Enabled = false;
- hideScrollBarControl.TabStop = false;
- // control is disposed automatically when the grid is disposed
- this.Controls.Add(hideScrollBarControl);
- }
-
- protected override void OnRowEnter(DataGridViewCellEventArgs e)
- {
- // ensure full row select
- base.OnRowEnter(e);
- //if (this.SelectionMode == DataGridViewSelectionMode.CellSelect ||
- // (this.SelectionMode == DataGridViewSelectionMode.FullRowSelect &&
- // base.Rows[e.RowIndex].Selected == false))
- //{
- // this.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
- // base.Rows[e.RowIndex].Selected = true;
- //}
- }
- protected override void OnRowHeaderMouseClick(DataGridViewCellMouseEventArgs e)
- {
- this.SelectionMode = DataGridViewSelectionMode.ColumnHeaderSelect;
- base.OnRowHeaderMouseClick(e);
- }
- protected override void OnCellClick(DataGridViewCellEventArgs e)
- {
- this.SelectionMode = DataGridViewSelectionMode.CellSelect;
- base.OnCellClick(e);
- }
-
-
- private void LockVerticalScrollBarUpdate(bool lockUpdate/*, bool delayed*/)
- {
- // Temporarly hide/show the vertical scroll bar by changing its parent
- if (!this._inExpandCollapse)
- {
- if (lockUpdate)
- {
- this.VerticalScrollBar.Parent = hideScrollBarControl;
- }
- else
- {
- this.VerticalScrollBar.Parent = this;
- }
- }
- }
-
- protected override void OnColumnAdded(DataGridViewColumnEventArgs e)
- {
- if (typeof(TreeGridColumn).IsAssignableFrom(e.Column.GetType()))
- {
- if (_expandableColumn == null)
- {
- // identify the expanding column.
- _expandableColumn = (TreeGridColumn)e.Column;
- }
- else
- {
- // this.Columns.Remove(e.Column);
- //throw new InvalidOperationException("Only one TreeGridColumn per TreeGridView is supported.");
- }
- }
-
- // Expandable Grid doesn't support sorting. This is just a limitation of the sample.
- e.Column.SortMode = DataGridViewColumnSortMode.NotSortable;
-
- base.OnColumnAdded(e);
- }
-
- private static class Win32Helper
- {
- public const int WM_SYSKEYDOWN = 0x0104,
- WM_KEYDOWN = 0x0100,
- WM_SETREDRAW = 0x000B;
-
- [System.Runtime.InteropServices.DllImport("USER32.DLL", CharSet = System.Runtime.InteropServices.CharSet.Auto)]
- public static extern IntPtr SendMessage(System.Runtime.InteropServices.HandleRef hWnd, int msg, IntPtr wParam, IntPtr lParam);
-
- [System.Runtime.InteropServices.DllImport("USER32.DLL", CharSet = System.Runtime.InteropServices.CharSet.Auto)]
- public static extern IntPtr SendMessage(System.Runtime.InteropServices.HandleRef hWnd, int msg, int wParam, int lParam);
-
- [System.Runtime.InteropServices.DllImport("USER32.DLL", CharSet = System.Runtime.InteropServices.CharSet.Auto)]
- public static extern bool PostMessage(System.Runtime.InteropServices.HandleRef hwnd, int msg, IntPtr wparam, IntPtr lparam);
-
- }
- #endregion
-
-
- }
-}
diff --git a/src/VisualSail/UI/EditBoat.Designer.cs b/src/VisualSail/UI/EditBoat.Designer.cs
index 1817148..f5aceaf 100644
--- a/src/VisualSail/UI/EditBoat.Designer.cs
+++ b/src/VisualSail/UI/EditBoat.Designer.cs
@@ -117,7 +117,7 @@ private void InitializeComponent()
// okBTN
//
this.okBTN.Enabled = false;
- this.okBTN.Image = global::AmphibianSoftware.VisualSail.Properties.Resources.accept;
+ this.okBTN.Image = AmphibianSoftware.VisualSail.Library.EmbeddedResourceHelper.LoadImage("accept.png");
this.okBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.okBTN.Location = new System.Drawing.Point(160, 107);
this.okBTN.Name = "okBTN";
@@ -129,7 +129,7 @@ private void InitializeComponent()
//
// cancelBTN
//
- this.cancelBTN.Image = global::AmphibianSoftware.VisualSail.Properties.Resources.cancel;
+ this.cancelBTN.Image = AmphibianSoftware.VisualSail.Library.EmbeddedResourceHelper.LoadImage("cancel.png");
this.cancelBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.cancelBTN.Location = new System.Drawing.Point(266, 107);
this.cancelBTN.Name = "cancelBTN";
diff --git a/src/VisualSail/UI/EditCourses.Designer.cs b/src/VisualSail/UI/EditCourses.Designer.cs
index 1dcbf0d..7a8d45d 100644
--- a/src/VisualSail/UI/EditCourses.Designer.cs
+++ b/src/VisualSail/UI/EditCourses.Designer.cs
@@ -505,7 +505,7 @@ private void InitializeComponent()
//
// addBTN
//
- this.addBTN.Image = global::AmphibianSoftware.VisualSail.Properties.Resources.add;
+ this.addBTN.Image = AmphibianSoftware.VisualSail.Library.EmbeddedResourceHelper.LoadImage("add.png");
this.addBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.addBTN.Location = new System.Drawing.Point(6, 211);
this.addBTN.Name = "addBTN";
@@ -518,7 +518,7 @@ private void InitializeComponent()
// removeBTN
//
this.removeBTN.Enabled = false;
- this.removeBTN.Image = global::AmphibianSoftware.VisualSail.Properties.Resources.delete;
+ this.removeBTN.Image = AmphibianSoftware.VisualSail.Library.EmbeddedResourceHelper.LoadImage("delete.png");
this.removeBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.removeBTN.Location = new System.Drawing.Point(112, 211);
this.removeBTN.Name = "removeBTN";
@@ -531,7 +531,7 @@ private void InitializeComponent()
// removeOrderBTN
//
this.removeOrderBTN.Enabled = false;
- this.removeOrderBTN.Image = global::AmphibianSoftware.VisualSail.Properties.Resources.arrow_left;
+ this.removeOrderBTN.Image = AmphibianSoftware.VisualSail.Library.EmbeddedResourceHelper.LoadImage("arrow_left.png");
this.removeOrderBTN.Location = new System.Drawing.Point(111, 143);
this.removeOrderBTN.Name = "removeOrderBTN";
this.removeOrderBTN.Size = new System.Drawing.Size(32, 23);
@@ -542,7 +542,7 @@ private void InitializeComponent()
// addOrderBTN
//
this.addOrderBTN.Enabled = false;
- this.addOrderBTN.Image = global::AmphibianSoftware.VisualSail.Properties.Resources.arrow_right;
+ this.addOrderBTN.Image = AmphibianSoftware.VisualSail.Library.EmbeddedResourceHelper.LoadImage("arrow_right.png");
this.addOrderBTN.Location = new System.Drawing.Point(111, 114);
this.addOrderBTN.Name = "addOrderBTN";
this.addOrderBTN.Size = new System.Drawing.Size(32, 23);
@@ -553,7 +553,7 @@ private void InitializeComponent()
// okBTN
//
this.okBTN.Dock = System.Windows.Forms.DockStyle.Right;
- this.okBTN.Image = global::AmphibianSoftware.VisualSail.Properties.Resources.accept;
+ this.okBTN.Image = AmphibianSoftware.VisualSail.Library.EmbeddedResourceHelper.LoadImage("accept.png");
this.okBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.okBTN.Location = new System.Drawing.Point(432, 0);
this.okBTN.Name = "okBTN";
@@ -566,7 +566,7 @@ private void InitializeComponent()
// cancelBTN
//
this.cancelBTN.Dock = System.Windows.Forms.DockStyle.Right;
- this.cancelBTN.Image = global::AmphibianSoftware.VisualSail.Properties.Resources.cancel;
+ this.cancelBTN.Image = AmphibianSoftware.VisualSail.Library.EmbeddedResourceHelper.LoadImage("cancel.png");
this.cancelBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.cancelBTN.Location = new System.Drawing.Point(532, 0);
this.cancelBTN.Name = "cancelBTN";
@@ -587,7 +587,7 @@ private void InitializeComponent()
this.Controls.Add(this.panel1);
this.Controls.Add(this.editCourseGB);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ //this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "EditCourses";
diff --git a/src/VisualSail/UI/EditRace.Designer.cs b/src/VisualSail/UI/EditRace.Designer.cs
index c887d02..61ab030 100644
--- a/src/VisualSail/UI/EditRace.Designer.cs
+++ b/src/VisualSail/UI/EditRace.Designer.cs
@@ -244,7 +244,7 @@ private void InitializeComponent()
// newBoatBTN
//
this.newBoatBTN.Dock = System.Windows.Forms.DockStyle.Left;
- this.newBoatBTN.Image = global::AmphibianSoftware.VisualSail.Properties.Resources.add;
+ this.newBoatBTN.Image = AmphibianSoftware.VisualSail.Library.EmbeddedResourceHelper.LoadImage("add.png");
this.newBoatBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.newBoatBTN.Location = new System.Drawing.Point(0, 0);
this.newBoatBTN.Name = "newBoatBTN";
@@ -258,7 +258,7 @@ private void InitializeComponent()
//
this.gpsDataBTN.Dock = System.Windows.Forms.DockStyle.Right;
this.gpsDataBTN.Enabled = false;
- this.gpsDataBTN.Image = global::AmphibianSoftware.VisualSail.Properties.Resources.chart_line;
+ this.gpsDataBTN.Image = AmphibianSoftware.VisualSail.Library.EmbeddedResourceHelper.LoadImage("chart_line.png");
this.gpsDataBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.gpsDataBTN.Location = new System.Drawing.Point(424, 0);
this.gpsDataBTN.Name = "gpsDataBTN";
@@ -272,7 +272,7 @@ private void InitializeComponent()
//
this.boatEditBTN.Dock = System.Windows.Forms.DockStyle.Right;
this.boatEditBTN.Enabled = false;
- this.boatEditBTN.Image = global::AmphibianSoftware.VisualSail.Properties.Resources.pencil;
+ this.boatEditBTN.Image = AmphibianSoftware.VisualSail.Library.EmbeddedResourceHelper.LoadImage("pencil.png");
this.boatEditBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.boatEditBTN.Location = new System.Drawing.Point(524, 0);
this.boatEditBTN.Name = "boatEditBTN";
@@ -456,7 +456,7 @@ private void InitializeComponent()
// existingBTN
//
this.existingBTN.Dock = System.Windows.Forms.DockStyle.Right;
- this.existingBTN.Image = global::AmphibianSoftware.VisualSail.Properties.Resources.map;
+ this.existingBTN.Image = AmphibianSoftware.VisualSail.Library.EmbeddedResourceHelper.LoadImage("map.png");
this.existingBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.existingBTN.Location = new System.Drawing.Point(512, 0);
this.existingBTN.Name = "existingBTN";
@@ -483,7 +483,7 @@ private void InitializeComponent()
// editCourseBTN
//
this.editCourseBTN.Dock = System.Windows.Forms.DockStyle.Right;
- this.editCourseBTN.Image = global::AmphibianSoftware.VisualSail.Properties.Resources.map_edit;
+ this.editCourseBTN.Image = AmphibianSoftware.VisualSail.Library.EmbeddedResourceHelper.LoadImage("map_edit.png");
this.editCourseBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.editCourseBTN.Location = new System.Drawing.Point(415, 16);
this.editCourseBTN.Name = "editCourseBTN";
@@ -496,7 +496,7 @@ private void InitializeComponent()
// newCourseBTN
//
this.newCourseBTN.Dock = System.Windows.Forms.DockStyle.Right;
- this.newCourseBTN.Image = global::AmphibianSoftware.VisualSail.Properties.Resources.map_add;
+ this.newCourseBTN.Image = AmphibianSoftware.VisualSail.Library.EmbeddedResourceHelper.LoadImage("map_add.png");
this.newCourseBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.newCourseBTN.Location = new System.Drawing.Point(515, 16);
this.newCourseBTN.Name = "newCourseBTN";
@@ -520,7 +520,7 @@ private void InitializeComponent()
// playBTN
//
this.playBTN.Dock = System.Windows.Forms.DockStyle.Right;
- this.playBTN.Image = global::AmphibianSoftware.VisualSail.Properties.Resources.resultset_next;
+ this.playBTN.Image = AmphibianSoftware.VisualSail.Library.EmbeddedResourceHelper.LoadImage("resultset_next.png");
this.playBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.playBTN.Location = new System.Drawing.Point(332, 0);
this.playBTN.Name = "playBTN";
@@ -533,7 +533,7 @@ private void InitializeComponent()
// okBTN
//
this.okBTN.Dock = System.Windows.Forms.DockStyle.Right;
- this.okBTN.Image = global::AmphibianSoftware.VisualSail.Properties.Resources.accept;
+ this.okBTN.Image = AmphibianSoftware.VisualSail.Library.EmbeddedResourceHelper.LoadImage("accept.png");
this.okBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.okBTN.Location = new System.Drawing.Point(432, 0);
this.okBTN.Name = "okBTN";
@@ -546,7 +546,7 @@ private void InitializeComponent()
// cancelBTN
//
this.cancelBTN.Dock = System.Windows.Forms.DockStyle.Right;
- this.cancelBTN.Image = global::AmphibianSoftware.VisualSail.Properties.Resources.cancel;
+ this.cancelBTN.Image = AmphibianSoftware.VisualSail.Library.EmbeddedResourceHelper.LoadImage("cancel.png");
this.cancelBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.cancelBTN.Location = new System.Drawing.Point(532, 0);
this.cancelBTN.Name = "cancelBTN";
@@ -565,7 +565,7 @@ private void InitializeComponent()
this.Controls.Add(this.editTC);
this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ //this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(640, 480);
diff --git a/src/VisualSail/UI/ExistingImageSelect.Designer.cs b/src/VisualSail/UI/ExistingImageSelect.Designer.cs
index a6f50ac..87fdcc1 100644
--- a/src/VisualSail/UI/ExistingImageSelect.Designer.cs
+++ b/src/VisualSail/UI/ExistingImageSelect.Designer.cs
@@ -51,7 +51,7 @@ private void InitializeComponent()
// okBTN
//
this.okBTN.Dock = System.Windows.Forms.DockStyle.Right;
- this.okBTN.Image = global::AmphibianSoftware.VisualSail.Properties.Resources.accept;
+ this.okBTN.Image = AmphibianSoftware.VisualSail.Library.EmbeddedResourceHelper.LoadImage("accept.png");
this.okBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.okBTN.Location = new System.Drawing.Point(120, 0);
this.okBTN.Name = "okBTN";
@@ -64,7 +64,7 @@ private void InitializeComponent()
// cancelBTN
//
this.cancelBTN.Dock = System.Windows.Forms.DockStyle.Right;
- this.cancelBTN.Image = global::AmphibianSoftware.VisualSail.Properties.Resources.cancel;
+ this.cancelBTN.Image = AmphibianSoftware.VisualSail.Library.EmbeddedResourceHelper.LoadImage("cancel.png");
this.cancelBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.cancelBTN.Location = new System.Drawing.Point(220, 0);
this.cancelBTN.Name = "cancelBTN";
@@ -114,7 +114,7 @@ private void InitializeComponent()
this.Controls.Add(this.imageGV);
this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ //this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "ExistingImageSelect";
diff --git a/src/VisualSail/UI/GdiCameraMan.cs b/src/VisualSail/UI/GdiCameraMan.cs
index d2283c2..267ce9e 100644
--- a/src/VisualSail/UI/GdiCameraMan.cs
+++ b/src/VisualSail/UI/GdiCameraMan.cs
@@ -4,7 +4,6 @@
using System.Text;
using AmphibianSoftware.VisualSail.Data;
-using AmphibianSoftware.VisualSail.PostBuild;
using Microsoft.Xna.Framework;
//using Microsoft.Xna.Framework.Content;
diff --git a/src/VisualSail/UI/GdiRenderer.cs b/src/VisualSail/UI/GdiRenderer.cs
index a48630b..74ebfec 100644
--- a/src/VisualSail/UI/GdiRenderer.cs
+++ b/src/VisualSail/UI/GdiRenderer.cs
@@ -12,7 +12,6 @@
using Microsoft.Xna.Framework;
using AmphibianSoftware.VisualSail.Data;
-using AmphibianSoftware.Video;
using AmphibianSoftware.VisualSail.Library;
using AmphibianSoftware.VisualSail.Data.Statistics;
@@ -395,7 +394,7 @@ private void Render(IViewPort target)
_graphics[target].Transform = new System.Drawing.Drawing2D.Matrix();
//clear the buffer to black
- _graphics[target].Clear(Color.Black);
+ _graphics[target].Clear(System.Drawing.Color.Black);
//_graphics[target].FillRectangle(Brushes.Black, 0, 0, _buffers[target].Width, _buffers[target].Height);
int xOffset = target.RenderTarget.Width / 2;
diff --git a/src/VisualSail/UI/GettingStarted.Designer.cs b/src/VisualSail/UI/GettingStarted.Designer.cs
index 2d56ecc..1c8c1ac 100644
--- a/src/VisualSail/UI/GettingStarted.Designer.cs
+++ b/src/VisualSail/UI/GettingStarted.Designer.cs
@@ -137,13 +137,13 @@ private void InitializeComponent()
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White;
- this.BackgroundImage = global::AmphibianSoftware.VisualSail.Properties.Resources.backdrop;
+ this.BackgroundImage = AmphibianSoftware.VisualSail.Library.EmbeddedResourceHelper.LoadImage("backdrop.png");
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.ClientSize = new System.Drawing.Size(492, 349);
this.Controls.Add(this.panel1);
this.DoubleBuffered = true;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ //this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(500, 375);
diff --git a/src/VisualSail/UI/GraphForm.cs b/src/VisualSail/UI/GraphForm.cs
index 2c42244..3dfa294 100644
--- a/src/VisualSail/UI/GraphForm.cs
+++ b/src/VisualSail/UI/GraphForm.cs
@@ -9,7 +9,6 @@
using System.Threading;
using AmphibianSoftware.VisualSail.Data.Statistics;
-using AmphibianSoftware.VisualSail.PostBuild;
using ZedGraph;
using WeifenLuo.WinFormsUI.Docking;
@@ -25,7 +24,6 @@ public partial class GraphForm : DockContent
private static int _defaultAutoScrollSize = 120;
private int? _autoScrollSize = _defaultAutoScrollSize;
private Thread _painter;
- [DoNotObfuscate()]
private enum StatisticGroupType { Boat, Leg, Tack };
private Replay _replay;
private string _statisticName;
diff --git a/src/VisualSail/UI/Import/.svn/entries b/src/VisualSail/UI/Import/.svn/entries
deleted file mode 100644
index 21275a2..0000000
--- a/src/VisualSail/UI/Import/.svn/entries
+++ /dev/null
@@ -1,34 +0,0 @@
-9
-
-dir
-1212
-svn://coruscant.universe/projects/visualsail/visualsail/VisualSail/UI/Import
-svn://coruscant.universe
-
-
-
-2009-01-27T06:00:51.513271Z
-1109
-brook
-
-
-svn:special svn:externals svn:needs-lock
-
-
-
-
-
-
-
-
-
-
-
-c2fb2e58-5b16-0410-a9db-ebc6cca997dd
-
-NMEA
-dir
-
-CSV
-dir
-
diff --git a/src/VisualSail/UI/Import/.svn/format b/src/VisualSail/UI/Import/.svn/format
deleted file mode 100644
index ec63514..0000000
--- a/src/VisualSail/UI/Import/.svn/format
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/src/VisualSail/UI/Import/CSV/.svn/entries b/src/VisualSail/UI/Import/CSV/.svn/entries
deleted file mode 100644
index 62c42bd..0000000
--- a/src/VisualSail/UI/Import/CSV/.svn/entries
+++ /dev/null
@@ -1,232 +0,0 @@
-9
-
-dir
-1212
-svn://coruscant.universe/projects/visualsail/visualsail/VisualSail/UI/Import/CSV
-svn://coruscant.universe
-
-
-
-2009-01-27T06:00:51.513271Z
-1109
-brook
-
-
-svn:special svn:externals svn:needs-lock
-
-
-
-
-
-
-
-
-
-
-
-c2fb2e58-5b16-0410-a9db-ebc6cca997dd
-
-ColumnFilter.resx
-file
-
-
-
-
-2010-03-07T17:45:43.344046Z
-32a9f8db6987c2d0d6bb55fc487be5e8
-2008-03-14T03:56:57.324251Z
-741
-brook
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5814
-
-ColumnAssignment.resx
-file
-
-
-
-
-2010-03-07T17:45:43.346000Z
-32a9f8db6987c2d0d6bb55fc487be5e8
-2008-03-12T06:21:07.534413Z
-737
-brook
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5814
-
-ColumnFilter.Designer.cs
-file
-
-
-
-
-2010-03-07T17:45:43.349906Z
-1db25c4eb84f508f5da58b46b3e8960e
-2009-01-27T06:00:51.513271Z
-1109
-brook
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4633
-
-ColumnFilter.cs
-file
-
-
-
-
-2010-03-07T17:45:43.358695Z
-72fdc64f63bde37e3ec6faf816f6d187
-2008-06-15T05:46:20.993507Z
-830
-brook
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5364
-
-ColumnAssignment.Designer.cs
-file
-
-
-
-
-2010-03-07T17:45:43.359671Z
-7228da594e13b20f014b837e5757012a
-2008-09-27T01:42:33.923746Z
-979
-brook
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7039
-
-ColumnAssignment.cs
-file
-
-
-
-
-2010-03-07T17:45:43.361625Z
-7a70fd571aed7f67d62def8d7215a4bb
-2009-01-27T06:00:51.513271Z
-1109
-brook
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4796
-
diff --git a/src/VisualSail/UI/Import/CSV/.svn/format b/src/VisualSail/UI/Import/CSV/.svn/format
deleted file mode 100644
index ec63514..0000000
--- a/src/VisualSail/UI/Import/CSV/.svn/format
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/src/VisualSail/UI/Import/CSV/.svn/text-base/ColumnAssignment.Designer.cs.svn-base b/src/VisualSail/UI/Import/CSV/.svn/text-base/ColumnAssignment.Designer.cs.svn-base
deleted file mode 100644
index d9be5e0..0000000
--- a/src/VisualSail/UI/Import/CSV/.svn/text-base/ColumnAssignment.Designer.cs.svn-base
+++ /dev/null
@@ -1,145 +0,0 @@
-namespace AmphibianSoftware.VisualSail.UI.Import.CSV
-{
- partial class ColumnAssignment
- {
- ///