From 312383bde6bc7c6783de1a8ed8d14365757bc144 Mon Sep 17 00:00:00 2001 From: Steffen Liersch Date: Thu, 25 Oct 2018 19:37:22 +0200 Subject: [PATCH 1/4] Bug fixed --- EsPy/Dialogs/ProgressDialog.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EsPy/Dialogs/ProgressDialog.cs b/EsPy/Dialogs/ProgressDialog.cs index 84bd05a..fdc0c97 100644 --- a/EsPy/Dialogs/ProgressDialog.cs +++ b/EsPy/Dialogs/ProgressDialog.cs @@ -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 From 98bccc1bf0f2d8100d8a9a513ce6a59a09e07c47 Mon Sep 17 00:00:00 2001 From: Steffen Liersch Date: Thu, 25 Oct 2018 19:39:38 +0200 Subject: [PATCH 2/4] Warnings fixed --- EsPy/Components/Terminal.cs | 12 +++++------- EsPy/MainForm.cs | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/EsPy/Components/Terminal.cs b/EsPy/Components/Terminal.cs index 702a7e6..098e9a7 100644 --- a/EsPy/Components/Terminal.cs +++ b/EsPy/Components/Terminal.cs @@ -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) { @@ -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; diff --git a/EsPy/MainForm.cs b/EsPy/MainForm.cs index acaa40c..9df3ab6 100644 --- a/EsPy/MainForm.cs +++ b/EsPy/MainForm.cs @@ -563,7 +563,7 @@ public IDocument[] OpenFromFile(FileFormats file_formats) } } - catch(Exception ex) + catch//(Exception ex) { if (item != null && item is IDisposable) { From 343f17726a934f98713dfcb3a2f9e1a0f7d68f3e Mon Sep 17 00:00:00 2001 From: Steffen Liersch Date: Sat, 27 Oct 2018 09:47:24 +0200 Subject: [PATCH 3/4] Texts improved --- EsPy/Forms/EditorForm.Designer.cs | 4 ++-- EsPy/Forms/TerminalForm.Designer.cs | 4 ++-- EsPy/MainForm.Designer.cs | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/EsPy/Forms/EditorForm.Designer.cs b/EsPy/Forms/EditorForm.Designer.cs index 5d6e0a8..4af35d8 100644 --- a/EsPy/Forms/EditorForm.Designer.cs +++ b/EsPy/Forms/EditorForm.Designer.cs @@ -142,7 +142,7 @@ private void InitializeComponent() this.mnSaveAs.MergeIndex = 4; this.mnSaveAs.Name = "mnSaveAs"; this.mnSaveAs.Size = new System.Drawing.Size(138, 22); - this.mnSaveAs.Text = "Save as..."; + this.mnSaveAs.Text = "Save As..."; this.mnSaveAs.Click += new System.EventHandler(this.mnSaveAs_Click); // // mnEdit @@ -394,7 +394,7 @@ private void InitializeComponent() this.mnInterrupt.Name = "mnInterrupt"; this.mnInterrupt.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I))); this.mnInterrupt.Size = new System.Drawing.Size(247, 22); - this.mnInterrupt.Text = "Interrupt current program"; + this.mnInterrupt.Text = "Interrupt"; this.mnInterrupt.Click += new System.EventHandler(this.mnInterrupt_Click); // // mnUpload diff --git a/EsPy/Forms/TerminalForm.Designer.cs b/EsPy/Forms/TerminalForm.Designer.cs index 1ddfd0e..f40d306 100644 --- a/EsPy/Forms/TerminalForm.Designer.cs +++ b/EsPy/Forms/TerminalForm.Designer.cs @@ -283,7 +283,7 @@ private void InitializeComponent() this.cmSoftReset.Enabled = false; this.cmSoftReset.Name = "cmSoftReset"; this.cmSoftReset.Size = new System.Drawing.Size(152, 22); - this.cmSoftReset.Text = "Soft reset"; + this.cmSoftReset.Text = "Soft Reset"; // // toolStripSeparator5 // @@ -373,7 +373,7 @@ private void InitializeComponent() this.cmClean.Image = global::EsPy.Properties.Resources.editclear; this.cmClean.Name = "cmClean"; this.cmClean.Size = new System.Drawing.Size(152, 22); - this.cmClean.Text = "Clean"; + this.cmClean.Text = "Clear Terminal"; this.cmClean.Click += new System.EventHandler(this.mnClean_Click); // // toolStripSeparator1 diff --git a/EsPy/MainForm.Designer.cs b/EsPy/MainForm.Designer.cs index 6a8d546..d86505f 100644 --- a/EsPy/MainForm.Designer.cs +++ b/EsPy/MainForm.Designer.cs @@ -176,7 +176,7 @@ private void InitializeComponent() this.mnNewCss.Name = "mnNewCss"; this.mnNewCss.Size = new System.Drawing.Size(164, 22); this.mnNewCss.Tag = ".css"; - this.mnNewCss.Text = "Css..."; + this.mnNewCss.Text = "CSS..."; this.mnNewCss.Click += new System.EventHandler(this.mnNewCss_Click); // // mnNewJs @@ -237,7 +237,7 @@ private void InitializeComponent() this.mnSaveAs.Enabled = false; this.mnSaveAs.Name = "mnSaveAs"; this.mnSaveAs.Size = new System.Drawing.Size(185, 22); - this.mnSaveAs.Text = "Save as..."; + this.mnSaveAs.Text = "Save As..."; this.mnSaveAs.Click += new System.EventHandler(this.mnSaveAs_Click); // // mnSaveAll @@ -247,7 +247,7 @@ private void InitializeComponent() this.mnSaveAll.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.S))); this.mnSaveAll.Size = new System.Drawing.Size(185, 22); - this.mnSaveAll.Text = "Save all"; + this.mnSaveAll.Text = "Save All"; this.mnSaveAll.Click += new System.EventHandler(this.mnSaveAll_Click); // // toolStripMenuItem2 @@ -320,7 +320,7 @@ private void InitializeComponent() this.mnFileManager.Image = global::EsPy.Properties.Resources.filemanager; this.mnFileManager.Name = "mnFileManager"; this.mnFileManager.Size = new System.Drawing.Size(152, 22); - this.mnFileManager.Text = "Filemanager..."; + this.mnFileManager.Text = "File Manager..."; this.mnFileManager.Click += new System.EventHandler(this.mnFileManager_Click); // // mnEspTool @@ -427,7 +427,7 @@ private void InitializeComponent() this.btnNew.ImageTransparentColor = System.Drawing.Color.Magenta; this.btnNew.Name = "btnNew"; this.btnNew.Size = new System.Drawing.Size(37, 28); - this.btnNew.Text = "New File"; + this.btnNew.Text = "New"; // // btnNewPython // @@ -450,7 +450,7 @@ private void InitializeComponent() this.btnNewCss.Name = "btnNewCss"; this.btnNewCss.Size = new System.Drawing.Size(134, 22); this.btnNewCss.Tag = ".css"; - this.btnNewCss.Text = "Css..."; + this.btnNewCss.Text = "CSS..."; this.btnNewCss.Click += new System.EventHandler(this.mnNewCss_Click); // // btnNewJs @@ -491,7 +491,7 @@ private void InitializeComponent() this.btnOpen.Name = "btnOpen"; this.btnOpen.Size = new System.Drawing.Size(28, 28); this.btnOpen.Text = "Open..."; - this.btnOpen.ToolTipText = "Open a File..."; + this.btnOpen.ToolTipText = "Open..."; this.btnOpen.Click += new System.EventHandler(this.mnOpen_Click); // // btnSave @@ -614,7 +614,7 @@ private void InitializeComponent() this.btnReset.ImageTransparentColor = System.Drawing.Color.Magenta; this.btnReset.Name = "btnReset"; this.btnReset.Size = new System.Drawing.Size(28, 28); - this.btnReset.Text = "Soft reset"; + this.btnReset.Text = "Soft Reset"; this.btnReset.Click += new System.EventHandler(this.btnReset_Click); // // toolStripSeparator7 @@ -645,7 +645,7 @@ private void InitializeComponent() this.btnTerminalClear.ImageTransparentColor = System.Drawing.Color.Magenta; this.btnTerminalClear.Name = "btnTerminalClear"; this.btnTerminalClear.Size = new System.Drawing.Size(28, 28); - this.btnTerminalClear.Text = "toolStripButton1"; + this.btnTerminalClear.Text = "Clear Terminal"; this.btnTerminalClear.Click += new System.EventHandler(this.btnTerminalClear_Click); // // statusStrip1 From 171d5f1fe4f99057258e33f539488a249eccfe71 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 20:38:28 +0000 Subject: [PATCH 4/4] Bump Newtonsoft.Json from 10.0.3 to 13.0.2 in /EsPy Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 10.0.3 to 13.0.2. - [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases) - [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/10.0.3...13.0.2) --- updated-dependencies: - dependency-name: Newtonsoft.Json dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- EsPy/packages.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EsPy/packages.config b/EsPy/packages.config index 2ec92b9..e7018cd 100644 --- a/EsPy/packages.config +++ b/EsPy/packages.config @@ -3,5 +3,5 @@ - + \ No newline at end of file