Skip to content

Commit

Permalink
New AB icons
Browse files Browse the repository at this point in the history
  • Loading branch information
farmerbriantee committed Nov 15, 2023
1 parent bfda962 commit 5945ef7
Show file tree
Hide file tree
Showing 27 changed files with 419 additions and 455 deletions.
5 changes: 5 additions & 0 deletions SourceCode/GPS/AgOpenGPS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -882,6 +882,11 @@
<None Include="btnImages\ResumeField.png" />
<None Include="btnImages\TrackOff.png" />
<None Include="btnImages\TrackOn.png" />
<None Include="btnImages\ABTrackAB.png" />
<None Include="btnImages\ABTrackCurve.png" />
<None Include="btnImages\ABLatLonHeading.png" />
<None Include="btnImages\ABLatLonLatLon.png" />
<None Include="btnImages\ABLoadFromKML.png" />
<Content Include="Nav.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Expand Down
1 change: 1 addition & 0 deletions SourceCode/GPS/Forms/Controls.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion SourceCode/GPS/Forms/FormFieldExisting.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

138 changes: 65 additions & 73 deletions SourceCode/GPS/Forms/FormGPS.Designer.cs

Large diffs are not rendered by default.

236 changes: 167 additions & 69 deletions SourceCode/GPS/Forms/Guidance/FormABCurve.Designer.cs

Large diffs are not rendered by default.

37 changes: 20 additions & 17 deletions SourceCode/GPS/Forms/Guidance/FormABCurve.cs
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ private void btnDuplicate_Click(object sender, EventArgs e)

panelPick.Visible = false;
panelAddName.Visible = true;
this.Size = new System.Drawing.Size(620,475);
this.Size = new System.Drawing.Size(270, 360);

panelABCurve.Visible = false;
panelAddName.Visible = true;
Expand All @@ -419,14 +419,13 @@ private void btnEditName_Click(object sender, EventArgs e)
{
if (selectedItem > -1)
{

int idx = selectedItem;

textBox2.Text = mf.trk.tracksArr[idx].name;

panelPick.Visible = false;
panelEditName.Visible = true;
this.Size = new System.Drawing.Size(620,475);
this.Size = new System.Drawing.Size(270, 360);
}
}

Expand Down Expand Up @@ -523,13 +522,9 @@ private void btnBPoint_Click(object sender, System.EventArgs e)
mf.trk.tracksArr[idx].trackPts.Add(item);
}



mf.FileSaveCurveLines();
mf.trk.desList?.Clear();
}


}
else
{
Expand Down Expand Up @@ -664,24 +659,28 @@ private void textBox2_HelpRequested(object sender, HelpEventArgs hlpevent)
#endregion

#region Add name
private void textBox_Click(object sender, EventArgs e)
private void textBox1_Click(object sender, EventArgs e)
{
if (mf.isKeyboardOn)
mf.KeyboardToText((TextBox)sender, this);

if (textBox1.Text.Trim() == "") textBox1.Text = "No Name " + DateTime.Now.ToString("hh:mm:ss", CultureInfo.InvariantCulture);
}

private void btnAdd_Click(object sender, EventArgs e)
{


panelPick.Visible = true;
panelABCurve.Visible = false;
panelAddName.Visible = false;

this.Size = new System.Drawing.Size(620,475);

mf.trk.tracksArr[mf.trk.idx].name = textBox1.Text;
mf.FileSaveCurveLines();
mf.trk.desList?.Clear();
UpdateTable();
mf.FileSaveCurveLines();
}

private void btnAddTime_Click(object sender, EventArgs e)
Expand All @@ -692,10 +691,10 @@ private void btnAddTime_Click(object sender, EventArgs e)
#endregion

#region Edit name

private void btnAddTimeEdit_Click(object sender, EventArgs e)
private void textBox2_Click(object sender, EventArgs e)
{
textBox2.Text += DateTime.Now.ToString(" hh:mm:ss", CultureInfo.InvariantCulture);
if (mf.isKeyboardOn)
mf.KeyboardToText((TextBox)sender, this);
}

private void btnSaveEditName_Click(object sender, EventArgs e)
Expand All @@ -704,13 +703,15 @@ private void btnSaveEditName_Click(object sender, EventArgs e)

int idx = selectedItem;

mf.trk.tracksArr[mf.trk.idx].name = textBox2.Text;

panelEditName.Visible = false;
panelPick.Visible = true;

mf.FileSaveCurveLines();
mf.trk.desList?.Clear();

this.Size = new System.Drawing.Size(700, 450);
textBox2.Text = "";
this.Size = new System.Drawing.Size(620, 475);

UpdateTable();
flp.Focus();
Expand Down Expand Up @@ -985,9 +986,6 @@ private void nudHeading_Click(object sender, EventArgs e)

private void btnEnter_AB_Click(object sender, EventArgs e)
{
panelABLine.Visible = false;
panelAddName.Visible = true;

mf.trk.tracksArr.Add(new CTrackPath());
mf.trk.idx = mf.trk.tracksArr.Count - 1;

Expand Down Expand Up @@ -1020,8 +1018,13 @@ private void btnEnter_AB_Click(object sender, EventArgs e)
mf.trk.tracksArr[mf.trk.idx].moveDistance = 0;

mf.trk.tracksArr[mf.trk.idx].mode = (int)TrackMode.AB;

mf.trk.desList?.Clear();
panelABLine.Visible = false;
panelAddName.Visible = true;
}
#endregion

}
}

2 changes: 1 addition & 1 deletion SourceCode/GPS/Forms/Guidance/FormABCurve.resx
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAC
EwAAAk1TRnQBSQFMAgEBAwEAAdABAgHQAQIBQgEAASwBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
EwAAAk1TRnQBSQFMAgEBAwEAASgBAwEoAQMBQgEAASwBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABCAEBAgABLAMAAQEBAAEIBQABYAEtGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHA
AdwBwAEAAfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANC
AQADOQEAAYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/
Expand Down
96 changes: 15 additions & 81 deletions SourceCode/GPS/Forms/Guidance/FormABDraw.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5945ef7

Please sign in to comment.