From 79834cb3d8759fbcc6e8ebef76edb30496189d7f Mon Sep 17 00:00:00 2001
From: "Silas S. Brown" <ssb22@cam.ac.uk>
Date: Mon, 5 Oct 2020 09:40:15 +0100
Subject: [PATCH] remove unnecessary use of a text editor that may be unsafe in
 China (ZDNet 19th August 2020)

---
 gradint-build/Makefile          | 2 +-
 gradint-build/src/booktime.py   | 2 +-
 gradint-build/src/filescan.py   | 2 +-
 gradint-build/src/frontend.py   | 7 ++-----
 gradint-build/src/lessonplan.py | 2 +-
 gradint-build/src/loop.py       | 2 +-
 gradint-build/src/makeevent.py  | 2 +-
 gradint-build/src/play.py       | 2 +-
 gradint-build/src/recording.py  | 2 +-
 gradint-build/src/sequence.py   | 2 +-
 gradint-build/src/synth.py      | 2 +-
 gradint-build/src/system.py     | 2 +-
 gradint-build/src/top.py        | 2 +-
 gradint-build/src/users.py      | 2 +-
 gradint-build/thindown.py       | 2 +-
 15 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/gradint-build/Makefile b/gradint-build/Makefile
index 0bbe023..793ef0d 100644
--- a/gradint-build/Makefile
+++ b/gradint-build/Makefile
@@ -1,5 +1,5 @@
 # This file is part of the source code of
-# gradint v3.05 (c) 2002-20 Silas S. Brown. GPL v3+.
+# gradint v3.06 (c) 2002-20 Silas S. Brown. GPL v3+.
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 3 of the License, or
diff --git a/gradint-build/src/booktime.py b/gradint-build/src/booktime.py
index f0907d7..4733867 100644
--- a/gradint-build/src/booktime.py
+++ b/gradint-build/src/booktime.py
@@ -1,5 +1,5 @@
 # This file is part of the source code of
-# gradint v3.05 (c) 2002-20 Silas S. Brown. GPL v3+.
+# gradint v3.06 (c) 2002-20 Silas S. Brown. GPL v3+.
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 3 of the License, or
diff --git a/gradint-build/src/filescan.py b/gradint-build/src/filescan.py
index 1923d49..58cfcde 100644
--- a/gradint-build/src/filescan.py
+++ b/gradint-build/src/filescan.py
@@ -1,5 +1,5 @@
 # This file is part of the source code of
-# gradint v3.05 (c) 2002-20 Silas S. Brown. GPL v3+.
+# gradint v3.06 (c) 2002-20 Silas S. Brown. GPL v3+.
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 3 of the License, or
diff --git a/gradint-build/src/frontend.py b/gradint-build/src/frontend.py
index ce7a25a..464d1fb 100644
--- a/gradint-build/src/frontend.py
+++ b/gradint-build/src/frontend.py
@@ -1,5 +1,5 @@
 # This file is part of the source code of
-# gradint v3.05 (c) 2002-20 Silas S. Brown. GPL v3+.
+# gradint v3.06 (c) 2002-20 Silas S. Brown. GPL v3+.
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 3 of the License, or
@@ -1215,10 +1215,7 @@ if useTK:
     textEditorCommand=explorerCommand=None
     if winsound or mingw32 or cygwin:
         textEditorName="Notepad" ; textEditorWaits=1
-        # Try Notepad++ first, otherwise plain notepad
-        textEditorCommand = programFiles+os.sep+"Notepad++"+os.sep+"notepad++.exe"
-        if fileExists(textEditorCommand): textEditorCommand='"'+textEditorCommand+'" -multiInst -notabbar -nosession'
-        else: textEditorCommand="notepad"
+        textEditorCommand="notepad"
         explorerCommand="explorer"
     elif macsound:
         textEditorName="TextEdit"
diff --git a/gradint-build/src/lessonplan.py b/gradint-build/src/lessonplan.py
index 4570320..5dedc64 100644
--- a/gradint-build/src/lessonplan.py
+++ b/gradint-build/src/lessonplan.py
@@ -1,5 +1,5 @@
 # This file is part of the source code of
-# gradint v3.05 (c) 2002-20 Silas S. Brown. GPL v3+.
+# gradint v3.06 (c) 2002-20 Silas S. Brown. GPL v3+.
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 3 of the License, or
diff --git a/gradint-build/src/loop.py b/gradint-build/src/loop.py
index 8d6d01f..10c16a1 100644
--- a/gradint-build/src/loop.py
+++ b/gradint-build/src/loop.py
@@ -1,5 +1,5 @@
 # This file is part of the source code of
-# gradint v3.05 (c) 2002-20 Silas S. Brown. GPL v3+.
+# gradint v3.06 (c) 2002-20 Silas S. Brown. GPL v3+.
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 3 of the License, or
diff --git a/gradint-build/src/makeevent.py b/gradint-build/src/makeevent.py
index fa9fa20..88617d3 100644
--- a/gradint-build/src/makeevent.py
+++ b/gradint-build/src/makeevent.py
@@ -1,5 +1,5 @@
 # This file is part of the source code of
-# gradint v3.05 (c) 2002-20 Silas S. Brown. GPL v3+.
+# gradint v3.06 (c) 2002-20 Silas S. Brown. GPL v3+.
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 3 of the License, or
diff --git a/gradint-build/src/play.py b/gradint-build/src/play.py
index 2d5c4f8..cf44019 100644
--- a/gradint-build/src/play.py
+++ b/gradint-build/src/play.py
@@ -1,5 +1,5 @@
 # This file is part of the source code of
-# gradint v3.05 (c) 2002-20 Silas S. Brown. GPL v3+.
+# gradint v3.06 (c) 2002-20 Silas S. Brown. GPL v3+.
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 3 of the License, or
diff --git a/gradint-build/src/recording.py b/gradint-build/src/recording.py
index 19f42f6..7205734 100644
--- a/gradint-build/src/recording.py
+++ b/gradint-build/src/recording.py
@@ -1,5 +1,5 @@
 # This file is part of the source code of
-# gradint v3.05 (c) 2002-20 Silas S. Brown. GPL v3+.
+# gradint v3.06 (c) 2002-20 Silas S. Brown. GPL v3+.
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 3 of the License, or
diff --git a/gradint-build/src/sequence.py b/gradint-build/src/sequence.py
index e58f5c1..f1345dd 100644
--- a/gradint-build/src/sequence.py
+++ b/gradint-build/src/sequence.py
@@ -1,5 +1,5 @@
 # This file is part of the source code of
-# gradint v3.05 (c) 2002-20 Silas S. Brown. GPL v3+.
+# gradint v3.06 (c) 2002-20 Silas S. Brown. GPL v3+.
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 3 of the License, or
diff --git a/gradint-build/src/synth.py b/gradint-build/src/synth.py
index 98b0654..e8874f2 100644
--- a/gradint-build/src/synth.py
+++ b/gradint-build/src/synth.py
@@ -1,5 +1,5 @@
 # This file is part of the source code of
-# gradint v3.05 (c) 2002-20 Silas S. Brown. GPL v3+.
+# gradint v3.06 (c) 2002-20 Silas S. Brown. GPL v3+.
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 3 of the License, or
diff --git a/gradint-build/src/system.py b/gradint-build/src/system.py
index f9ad43a..e34d21c 100644
--- a/gradint-build/src/system.py
+++ b/gradint-build/src/system.py
@@ -1,5 +1,5 @@
 # This file is part of the source code of
-# gradint v3.05 (c) 2002-20 Silas S. Brown. GPL v3+.
+# gradint v3.06 (c) 2002-20 Silas S. Brown. GPL v3+.
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 3 of the License, or
diff --git a/gradint-build/src/top.py b/gradint-build/src/top.py
index 5eb5f8c..c3c7a17 100644
--- a/gradint-build/src/top.py
+++ b/gradint-build/src/top.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #   (Python 2 or Python 3, but more fully tested on 2)
 
-program_name = "gradint v3.05 (c) 2002-20 Silas S. Brown. GPL v3+."
+program_name = "gradint v3.06 (c) 2002-20 Silas S. Brown. GPL v3+."
 
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
diff --git a/gradint-build/src/users.py b/gradint-build/src/users.py
index 1539079..cfdedeb 100644
--- a/gradint-build/src/users.py
+++ b/gradint-build/src/users.py
@@ -1,5 +1,5 @@
 # This file is part of the source code of
-# gradint v3.05 (c) 2002-20 Silas S. Brown. GPL v3+.
+# gradint v3.06 (c) 2002-20 Silas S. Brown. GPL v3+.
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 3 of the License, or
diff --git a/gradint-build/thindown.py b/gradint-build/thindown.py
index b12eb56..c0c02b5 100644
--- a/gradint-build/thindown.py
+++ b/gradint-build/thindown.py
@@ -1,5 +1,5 @@
 # This file is part of the source code of
-# gradint v3.05 (c) 2002-20 Silas S. Brown. GPL v3+.
+# gradint v3.06 (c) 2002-20 Silas S. Brown. GPL v3+.
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 3 of the License, or
-- 
GitLab