1.3.8.6

- The installer now removes old files from a previous installation (1.3.8 or older)
  This fixes the 'ImportError: DLL load failed while importing _html' error some users experienced.
- Updated FluidSynth Windows binaries to latest version (2.2.4)
- Fixed tab order in ABC settings menu
- Escape key exits full screen mode

Author: jwdj

CHANGES

@@ -608,3 +608,10 @@ different panes. Tie/untie option added for notes. Broken rhythm
     - Left click on bottom third of the screen turns to next tune
     - Left click on top third of the screen turns to previous tune
 - Fixed: follow score stopped working when screen in portrait mode
+
+1.3.8.6
+- The installer now removes old files from a previous installation (1.3.8 or older)
+  This fixes the 'ImportError: DLL load failed while importing _html' error some users experienced.
+- Updated FluidSynth Windows binaries to latest version (2.2.4)
+- Fixed tab order in ABC settings menu
+- Escape key exits full screen mode

build.bat

@@ -1,2 +1,2 @@
-python setup.py build
-"C:\Program Files (x86)\Inno Setup 5\iscc.exe" setupEasyABC.iss
+C:\Python38-32\python.exe setup.py build
+"C:\Program Files (x86)\Inno Setup 6\iscc.exe" setupEasyABC.iss

creating_an_executable.txt

@@ -4,8 +4,8 @@ EasyABC comes with setup.py to create easy_abc.exe and setupEasyABC.iss to creat
 You first need to be able to run easy_abc.py using Python.
 See using_EasyABC_in_Windows.txt for that.
 
-Then you will also need to install on your computer the program Inno Setup 5 and the python package cx_Freeze:
-Inno Setup 5 can be downloaded here: https://jrsoftware.org/
+Then you will also need to install on your computer the program Inno Setup 6 and the python package cx_Freeze:
+Inno Setup 6 can be downloaded here: https://jrsoftware.org/
 
 And cx_Freeze can be installed using:
 python -m pip install --upgrade cx_Freeze

easy_abc.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-program_version = '1.3.8.5'
+program_version = '1.3.8.6'
 program_name = 'EasyABC ' + program_version
 
 # Copyright (C) 2011-2014 Nils Liberg (mail: kotorinl at yahoo.co.uk)
@@ -2013,10 +2013,10 @@ def __init__(self, parent, settings, statusbar):
         nb = wx.Notebook(p)
         # 1.3.6.4 [SS] 2015-05-26 added statusbar
         abcsettings = AbcFileSettingsFrame(nb, settings, statusbar, parent.mc)
+        abcm2pspage = MyAbcm2psPage(nb, settings, abcsettings)
         self.chordpage = MyChordPlayPage(nb, settings)
         self.voicepage = MyVoicePage(nb, settings)
         # 1.3.6.1 [SS] 2015-02-02
-        abcm2pspage = MyAbcm2psPage(nb, settings, abcsettings)
         xmlpage    = MusicXmlPage(nb, settings)
         colorsettings = ColorSettingsFrame(nb, settings)
         nb.AddPage(abcm2pspage, _("Abcm2ps"))
@@ -2073,14 +2073,6 @@ def __init__(self, parent, settings, statusbar, mc):
         else:
             self.exe_file_mask = '*'
 
-        self.restore_settings = wx.Button(self, wx.ID_ANY, _('Restore settings')) # 1.3.6.3 [JWDJ] 2015-04-25 renamed
-        check_toolTip = _('Restore default file paths to abcm2ps, abc2midi, abc2abc, ghostscript when blank')
-        self.restore_settings.SetToolTip(wx.ToolTip(check_toolTip))
-
-        # 1.3.6.3 [SS] 2015-04-29
-        extraplayerparam = wx.StaticText(self, wx.ID_ANY, _("Extra MIDI player parameters"))
-        self.extras = wx.TextCtrl(self, wx.ID_ANY, size=(200, 22))
-
         sizer = rcs.RowColSizer()
         if wx.Platform == "__WXMAC__":
             sizer.Add(wx.StaticText(self, wx.ID_ANY, _('File paths to required executables') + ':'), row=0, col=0, colspan=2, flag=wx.ALL, border=border)
@@ -2133,11 +2125,19 @@ def __init__(self, parent, settings, statusbar, mc):
 
         self.chkIncludeHeader = wx.CheckBox(self, wx.ID_ANY, _('Include file header when rendering tunes'))
 
+        # 1.3.6.3 [SS] 2015-04-29
+        extraplayerparam = wx.StaticText(self, wx.ID_ANY, _("Extra MIDI player parameters"))
+        self.extras = wx.TextCtrl(self, wx.ID_ANY, size=(200, 22))
+
         midiplayer_params_sizer = rcs.RowColSizer()
         midiplayer_params_sizer.Add(self.chkIncludeHeader, row=0, col=0, colspan=2, flag=wx.ALL, border=border)
         midiplayer_params_sizer.Add(extraplayerparam, row=1, col=0, flag=wx.ALL | wx.ALIGN_CENTER_VERTICAL, border=border)
         midiplayer_params_sizer.Add(self.extras, row=1, col=1, flag=wx.ALL | wx.ALIGN_CENTER_VERTICAL, border=border)
 
+        self.restore_settings = wx.Button(self, wx.ID_ANY, _('Restore settings')) # 1.3.6.3 [JWDJ] 2015-04-25 renamed
+        check_toolTip = _('Restore default file paths to abcm2ps, abc2midi, abc2abc, ghostscript when blank')
+        self.restore_settings.SetToolTip(wx.ToolTip(check_toolTip))
+
         # build settings dialog with the previously defined box
         self.sizer = wx.BoxSizer(wx.VERTICAL)
         self.sizer.Add(box2, flag=wx.ALL | wx.EXPAND, border=10)
@@ -2274,11 +2274,22 @@ def __init__(self, parent, settings):
         self.settings = settings
 
         # 1.3.6.4 [SS] 2015-05-28 shrunk width from 250 to 200
-        self.chkPlayChords = wx.CheckBox(self, wx.ID_ANY, _('Play chords'))
         self.cmbMidiProgram = wx.ComboBox(self, wx.ID_ANY, choices=[], size=(200, 26), style=wx.CB_DROPDOWN | wx.CB_READONLY)
+        #1.3.6.4 [SS] 2015-07-08
+        self.sliderVol = wx.Slider(self, value=default_midi_volume, minValue=0, maxValue=127,
+                                size=(128, -1), style=wx.SL_HORIZONTAL)
+        self.Voltxt = wx.StaticText(self, wx.ID_ANY, " ")
+
         self.cmbMidiChordProgram = wx.ComboBox(self, wx.ID_ANY, choices=[], size=(200, 26), style=wx.CB_DROPDOWN | wx.CB_READONLY)
+        #1.3.6.4 [SS] 2015-06-07
+        self.sliderChordVol = wx.Slider(self, value=default_midi_volume, minValue=0, maxValue=127,
+                                size=(128, -1), style=wx.SL_HORIZONTAL)
+        self.ChordVoltxt = wx.StaticText(self, wx.ID_ANY, " ")
+
         self.cmbMidiBassProgram = wx.ComboBox(self, wx.ID_ANY, choices=[], size=(200, 26), style=wx.CB_DROPDOWN | wx.CB_READONLY)
-        #1.3.6 [SS] 2014-11-15
+        self.sliderBassVol = wx.Slider(self, value=default_midi_volume, minValue=0, maxValue=127,
+                                size=(128, -1), style=wx.SL_HORIZONTAL)
+        self.BassVoltxt = wx.StaticText(self, wx.ID_ANY, " ")
 
         #1.3.6.4 [SS] 2015-06-10
         self.sliderbeatsperminute = wx.Slider(self, value=120, minValue=60, maxValue=240,
@@ -2291,19 +2302,8 @@ def __init__(self, parent, settings):
         self.transposetxt      = wx.StaticText(self, wx.ID_ANY, " ")
         self.tuningtxt         = wx.StaticText(self, wx.ID_ANY, " ")
 
-        #1.3.6.4 [SS] 2015-07-08
-        self.sliderVol = wx.Slider(self, value=default_midi_volume, minValue=0, maxValue=127,
-                                size=(128, -1), style=wx.SL_HORIZONTAL)
-        self.Voltxt = wx.StaticText(self, wx.ID_ANY, " ")
-        #1.3.6.4 [SS] 2015-06-07
-        self.sliderChordVol = wx.Slider(self, value=default_midi_volume, minValue=0, maxValue=127,
-                                size=(128, -1), style=wx.SL_HORIZONTAL)
-        self.ChordVoltxt = wx.StaticText(self, wx.ID_ANY, " ")
-        self.sliderBassVol = wx.Slider(self, value=default_midi_volume, minValue=0, maxValue=127,
-                                size=(128, -1), style=wx.SL_HORIZONTAL)
-        self.BassVoltxt = wx.StaticText(self, wx.ID_ANY, " ")
-
         #1.3.6 [SS] 2014-11-21
+        self.chkPlayChords = wx.CheckBox(self, wx.ID_ANY, _('Play chords'))
         self.nodynamics = wx.CheckBox(self, wx.ID_ANY, _('Ignore Dynamics'))
         self.nofermatas = wx.CheckBox(self, wx.ID_ANY, _('Ignore Fermatas'))
         self.nograce    = wx.CheckBox(self, wx.ID_ANY, _('No Grace Notes'))
@@ -2801,7 +2801,6 @@ def __init__(self, parent, settings, abcsettingspage):
         headingtxt = _('The options in this page controls how the music score is displayed.\n\n')
         heading = wx.StaticText(self, wx.ID_ANY, headingtxt)
 
-
         clean      = wx.StaticText(self, wx.ID_ANY, _("No page settings"))
         defaults   = wx.StaticText(self, wx.ID_ANY, _("EasyABC defaults"))
         numberbars = wx.StaticText(self, wx.ID_ANY, _("Include bar numbers"))
@@ -2816,6 +2815,14 @@ def __init__(self, parent, settings, abcsettingspage):
         pagewidth = wx.StaticText(self, wx.ID_ANY, _("Page width (cm)"))
         pageheight = wx.StaticText(self, wx.ID_ANY, _("Page height (cm)"))
 
+        scalefact  = wx.StaticText(self, wx.ID_ANY, _("Scale factor (eg. 0.8)"))
+        self.chkm2psclean = wx.CheckBox(self, wx.ID_ANY, '')
+        self.chkm2psdef   = wx.CheckBox(self, wx.ID_ANY, '')
+        self.chkm2psbar = wx.CheckBox(self, wx.ID_ANY, '')
+        self.chkm2psref = wx.CheckBox(self, wx.ID_ANY, '')
+        self.chkm2pslyr = wx.CheckBox(self, wx.ID_ANY, '')
+        self.chkm2psend = wx.CheckBox(self, wx.ID_ANY, '')
+
         extras = wx.StaticText(self, wx.ID_ANY, _("Extra parameters"))
         self.extras = wx.TextCtrl(self, wx.ID_ANY, size=(350, 22))
         formatf = wx.StaticText(self, wx.ID_ANY, _("Format file"))
@@ -2829,13 +2836,6 @@ def __init__(self, parent, settings, abcsettingspage):
 
         self.browsef = wx.Button(self, wx.ID_ANY, _('Browse...'), size = (-1, 22))
 
-        scalefact  = wx.StaticText(self, wx.ID_ANY, _("Scale factor (eg. 0.8)"))
-        self.chkm2psclean = wx.CheckBox(self, wx.ID_ANY, '')
-        self.chkm2psdef   = wx.CheckBox(self, wx.ID_ANY, '')
-        self.chkm2psbar = wx.CheckBox(self, wx.ID_ANY, '')
-        self.chkm2psref = wx.CheckBox(self, wx.ID_ANY, '')
-        self.chkm2pslyr = wx.CheckBox(self, wx.ID_ANY, '')
-        self.chkm2psend = wx.CheckBox(self, wx.ID_ANY, '')
         self.leftmargin  = wx.TextCtrl(self, wx.ID_ANY, size=(55, 22))
         self.rightmargin = wx.TextCtrl(self, wx.ID_ANY, size=(55, 22))
         self.topmargin = wx.TextCtrl(self, wx.ID_ANY, size=(55, 22))
@@ -3175,25 +3175,25 @@ def __init__(self, parent, settings):
         heading    = wx.StaticText(self, wx.ID_ANY, headingtxt)
         abc2xml    = wx.StaticText(self, wx.ID_ANY, _("abc2xml options"))
         compressed = wx.StaticText(self, wx.ID_ANY, _('Compressed xml'))
-        xmlpage    = wx.StaticText(self, wx.ID_ANY, _('Page settings'))
+        xml2abc    = wx.StaticText(self, wx.ID_ANY, _('xml2abc option'))
         unfold     = wx.StaticText(self, wx.ID_ANY, _('Unfold Repeats'))
         mididata   = wx.StaticText(self, wx.ID_ANY, _('Midi Data'))
         volta      = wx.StaticText(self, wx.ID_ANY, _('Volta type setting'))
-        xml2abc    = wx.StaticText(self, wx.ID_ANY, _('xml2abc option'))
         numchar    = wx.StaticText(self, wx.ID_ANY, _('characters/line'))
         numbars    = wx.StaticText(self, wx.ID_ANY, _('bars per line'))
         credit     = wx.StaticText(self, wx.ID_ANY, _('credit filter'))
         ulength    = wx.StaticText(self, wx.ID_ANY, _('unit length'))
+        xmlpage    = wx.StaticText(self, wx.ID_ANY, _('Page settings'))
 
-        self.XmlPage = wx.TextCtrl(self, wx.ID_ANY)
+        self.chkXmlCompressed = wx.CheckBox(self, wx.ID_ANY, '')
+        self.chkXmlUnfold = wx.CheckBox(self, wx.ID_ANY, '')
+        self.chkXmlMidi = wx.CheckBox(self, wx.ID_ANY, '')
+        self.voltaval = wx.TextCtrl(self, wx.ID_ANY)
         self.maxchars = wx.TextCtrl(self, wx.ID_ANY)
         self.maxbars  = wx.TextCtrl(self, wx.ID_ANY)
-        self.voltaval = wx.TextCtrl(self, wx.ID_ANY)
         self.creditval = wx.TextCtrl(self, wx.ID_ANY)
         self.unitval  = wx.TextCtrl(self, wx.ID_ANY)
-        self.chkXmlCompressed = wx.CheckBox(self, wx.ID_ANY, '')
-        self.chkXmlUnfold = wx.CheckBox(self, wx.ID_ANY, '')
-        self.chkXmlMidi = wx.CheckBox(self, wx.ID_ANY, '')
+        self.XmlPage = wx.TextCtrl(self, wx.ID_ANY)
 
         self.chkXmlCompressed.SetValue(self.settings.get('xmlcompressed',False))
         self.chkXmlUnfold.SetValue(self.settings.get('xmlunfold',False))
@@ -4094,8 +4094,7 @@ def __init__(self, parent, ID, app_dir, settings, options):
         self.music_pane.Bind(wx.EVT_LEFT_DCLICK, self.OnMusicPaneDoubleClick)
         self.music_pane.Bind(wx.EVT_LEFT_DOWN, self.OnMusicPaneClick)
         self.music_pane.Bind(wx.EVT_RIGHT_DOWN, self.OnRightClickMusicPane)
-
-        #self.music_pane.Bind(wx.EVT_KEY_DOWN, self.OnMusicPaneKeyDown)
+        # self.music_pane.Bind(wx.EVT_KEY_DOWN, self.OnMusicPaneKeyDown)
 
         self.load_and_apply_settings(load_window_size_pos=True)
         self.restore_settings()
@@ -5648,6 +5647,8 @@ def OnMusicPaneKeyDown(self, evt):
             self.transpose_selected_note(1)
         elif c == wx.WXK_DOWN and evt.CmdDown():
             self.transpose_selected_note(-1)
+        else:
+            evt.Skip()
 
     def OnRightClickList(self, evt):
         self.selected_tune = self.tunes[evt.Index]
@@ -7274,12 +7275,15 @@ def GrayUngray(self, evt=None):
             mni.Enable(self.mni_TA_active.IsChecked())
 
     def OnUpdate(self, evt):
-        if evt.GetKeyCode() == 344: #F5
+        c = evt.GetKeyCode()
+        if c == wx.WXK_ESCAPE and self.is_fullscreen:
+            self.toggle_fullscreen(evt)
+        elif c == 344: #F5
             self.refresh_tunes()
-        elif evt.GetKeyCode() == 345: #F6
+        elif c == 345: #F6
             self.OnToolPlay(evt)
             self.play_button.Refresh()
-        elif evt.GetKeyCode() == 346: #F7
+        elif c == 346: #F7
             self.OnToolStop(evt)
         else:
             evt.Skip()

setupEasyABC.iss

@@ -9,7 +9,7 @@
 ; Seymour Shlien
 
 #define MyAppName "EasyABC"
-#define MyAppVersion "1.3.8.5"
+#define MyAppVersion "1.3.8.6"
 #define MyAppPublisher "Seymour Shlien"
 #define MyAppURL "ifdo.ca/~seymour/easy/"
 #define MyAppExeName "easy_abc.exe"
@@ -28,7 +28,7 @@ AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\{#MyAppName}
+DefaultDirName={commonpf}\{#MyAppName}
 DefaultGroupName={#MyAppName}
 LicenseFile={#MyBuildFolder}\gpl-license.txt
 OutputBaseFilename=EasyABC-{#MyAppVersion}
@@ -42,6 +42,18 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
+[InstallDelete]
+Type: files; Name: "{app}\easy_abc.exe"
+Type: files; Name: "{app}\easy_abc.zip"
+Type: files; Name: "{app}\wx*.dll"
+Type: files; Name: "{app}\*.pyd"
+Type: files; Name: "{app}\easy_abc.exe.manifest"
+Type: files; Name: "{app}\python27.dll"
+Type: files; Name: "{app}\pywintypes27.dll"
+Type: files; Name: "{app}\sqlite3.dll"
+Type: files; Name: "{app}\library.zip"
+Type: filesandordirs; Name: "{app}\Microsoft.VC90.CRT"
+
 [Files]
 Source: "{#MyBuildFolder}\easy_abc.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#MyBuildFolder}\gpl-license.txt"; DestDir: "{app}"; Flags: ignoreversion
@@ -52,12 +64,7 @@ Source: "{#MyBuildFolder}\VCRUNTIME140.dll"; DestDir: "{app}"; Flags: ignorevers
 Source: "{#MyBuildFolder}\lib\*"; DestDir: "{app}\lib"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "{#MyBuildFolder}\bin\*"; DestDir: "{app}\bin\"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "{#MyBuildFolder}\img\*"; DestDir: "{app}\img\"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "{#MyBuildFolder}\locale\da\*"; DestDir: "{app}\locale\da\"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "{#MyBuildFolder}\locale\fr\*"; DestDir: "{app}\locale\fr\"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "{#MyBuildFolder}\locale\it\*"; DestDir: "{app}\locale\it\"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "{#MyBuildFolder}\locale\nl\*"; DestDir: "{app}\locale\nl\"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "{#MyBuildFolder}\locale\ja\*"; DestDir: "{app}\locale\ja\"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "{#MyBuildFolder}\locale\sv\*"; DestDir: "{app}\locale\sv\"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#MyBuildFolder}\locale\*"; DestDir: "{app}\locale\"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "{#MyBuildFolder}\sound\*"; DestDir: "{app}\sound\"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files