Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some minor changes #10

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Some minor changes #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
312383b
Bug fixed
steffen-liersch Oct 25, 2018
98bccc1
Warnings fixed
steffen-liersch Oct 25, 2018
343f177
Texts improved
steffen-liersch Oct 27, 2018
171d5f1
Bump Newtonsoft.Json from 10.0.3 to 13.0.2 in /EsPy
dependabot[bot] Dec 7, 2022
9621384
Merge pull request #2 from steffen-liersch/dependabot/nuget/EsPy/Newt…
steffen-liersch Feb 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions EsPy/Components/Terminal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,15 +126,15 @@ private void FPort_ErrorReceived(object sender, string data)

const int LineLength = 180;
char[] Buffer = new char[LineLength]; // new StringBuilder(" ", LineLength);
int Cp = 0;
//int Cp = 0;
char LastChar = (char)0;
char LastMode = (char)0;
public bool Locked = false;

private char C0 = '\0';
private char C1 = '\0';
private char C2 = '\0';
private char C3 = '\0';
//private char C0 = '\0';
//private char C1 = '\0';
//private char C2 = '\0';
//private char C3 = '\0';
private delegate void UpdateTerminalEvent(string data, string message);
public void UpdateTerminal(string data, string message)
{
Expand Down Expand Up @@ -372,8 +372,6 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
}
return true;

break;

case Keys.Control | Keys.A:
this.Port.EnterRawMode();
return true;
Expand Down
2 changes: 1 addition & 1 deletion EsPy/Dialogs/ProgressDialog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ private void ProgressDialog_Shown(object sender, EventArgs e)
if (this.Mode == Modes.Upload)
{
res = this.Port.Upload(this.FileName, this.Buffer);
if (res.Result == ResultStatus.Statuses.Success) ;
if (res.Result == ResultStatus.Statuses.Success)
dres = DialogResult.OK;
}
else
Expand Down
4 changes: 2 additions & 2 deletions EsPy/Forms/EditorForm.Designer.cs
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions EsPy/Forms/TerminalForm.Designer.cs
View file
Open in desktop

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

18 changes: 9 additions & 9 deletions EsPy/MainForm.Designer.cs
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion EsPy/MainForm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ public IDocument[] OpenFromFile(FileFormats file_formats)
}

}
catch(Exception ex)
catch//(Exception ex)
{
if (item != null && item is IDisposable)
{
Expand Down
2 changes: 1 addition & 1 deletion EsPy/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<package id="DockPanelSuite" version="3.0.3" targetFramework="net46" />
<package id="DockPanelSuite.ThemeVS2015" version="3.0.3" targetFramework="net46" />
<package id="jacobslusser.ScintillaNET" version="3.6.3" targetFramework="net46" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" />
<package id="Newtonsoft.Json" version="13.0.2" targetFramework="net46" />
</packages>