Skip to content

Commit 4f9bdab

Browse files
committed
Back in menu: Insert musical symbol
Insert musical symbol is back for the people who got used to it.
1 parent 36a1526 commit 4f9bdab

File tree

2 files changed

+21
-20
lines changed

2 files changed

+21
-20
lines changed

CHANGES

+3
Original file line numberDiff line numberDiff line change
@@ -623,3 +623,6 @@ different panes. Tie/untie option added for notes. Broken rhythm
623623
- Fixed: Some users could not export a PDF because the ghostscript path was a byte string instead of a unicode string. Now the path is coverted to unicode.
624624
- Fixed: Printing caused a black page.
625625
- Fixed: Render issue with Python 3.10 (cast to int was needed, thanks robertmuth) https://github.com/jwdj/EasyABC/issues/53
626+
- Fixed: Removed loading of NONEXISTANT_FILE for all players except wxmediaplayer
627+
- Added 'Insert musical symbol' again to the menu again which was removed in 1.3.8.4. Although ABC Assist can insert musical with less hassle, some users really like the old
628+
menu version. For Linux (Gnome) users these menus are still empty but that is caused by Gnome, not EasyABC.

easy_abc.py

+18-20
Original file line numberDiff line numberDiff line change
@@ -4480,7 +4480,6 @@ def play(self):
44804480

44814481
def stop_playing(self):
44824482
self.mc.Stop()
4483-
self.mc.Load('NONEXISTANT_FILE____.mid') # be sure the midi file is released 2014-10-25 [SS]
44844483
self.play_button.SetBitmap(self.play_bitmap)
44854484
self.play_button.Refresh()
44864485
self.progress_slider.SetValue(0)
@@ -5797,17 +5796,17 @@ def __onPaneRestore(self, evt):
57975796
if evt.pane.window == self.music_pane:
57985797
self.score_is_maximized = False
57995798

5800-
# def OnToolDynamics(self, evt):
5801-
# try: self.toolbar.PopupMenu(self.popup_dynamics)
5802-
# except wx._core.PyAssertionError: pass
5799+
def OnToolDynamics(self, evt):
5800+
try: self.toolbar.PopupMenu(self.popup_dynamics)
5801+
except wx._core.PyAssertionError: pass
58035802

5804-
# def OnToolOrnamentation(self, evt):
5805-
# try: self.toolbar.PopupMenu(self.popup_ornaments)
5806-
# except wx._core.PyAssertionError: pass
5803+
def OnToolOrnamentation(self, evt):
5804+
try: self.toolbar.PopupMenu(self.popup_ornaments)
5805+
except wx._core.PyAssertionError: pass
58075806

5808-
# def OnToolDirections(self, evt):
5809-
# try: self.toolbar.PopupMenu(self.popup_directions)
5810-
# except wx._core.PyAssertionError: pass
5807+
def OnToolDirections(self, evt):
5808+
try: self.toolbar.PopupMenu(self.popup_directions)
5809+
except wx._core.PyAssertionError: pass
58115810

58125811
def CanClose(self, dont_ask = False):
58135812
if self.editor.GetModify():
@@ -6167,9 +6166,9 @@ def setup_menus(self):
61676166
directions = 'coda segno D.C. D.S. fine barline repeat_left repeat_right repeat_both repeat1 repeat2'.split()
61686167

61696168
self.multi_tunes_menu_items = []
6170-
# self.popup_ornaments = self.create_symbols_popup_menu(ornaments)
6171-
# self.popup_dynamics = self.create_symbols_popup_menu(dynamics)
6172-
# self.popup_directions = self.create_symbols_popup_menu(directions)
6169+
self.popup_ornaments = self.create_symbols_popup_menu(ornaments)
6170+
self.popup_dynamics = self.create_symbols_popup_menu(dynamics)
6171+
self.popup_directions = self.create_symbols_popup_menu(directions)
61736172

61746173
transpose_menu = create_menu([], parent=self)
61756174
for i in reversed(range(-12, 12+1)):
@@ -6242,11 +6241,11 @@ def setup_menus(self):
62426241
(_("&Paste") + "\tCtrl+V", _("Paste clipboard contents"), self.OnPaste),
62436242
(_("&Delete"), _("Delete the selection"), self.OnDelete),
62446243
(),
6245-
# (_("&Insert musical symbol"), [
6246-
# (_('Note ornaments'), self.popup_ornaments),
6247-
# (_('Directions'), self.popup_directions), # 1.3.6.1 [SS] 2015-01-22
6248-
# (_('Dynamics'), self.popup_dynamics)]),
6249-
# (),
6244+
(_("&Insert musical symbol"), [
6245+
(_('Note ornaments'), self.popup_ornaments),
6246+
(_('Directions'), self.popup_directions), # 1.3.6.1 [SS] 2015-01-22
6247+
(_('Dynamics'), self.popup_dynamics)]),
6248+
(),
62506249
(_("&Transpose"), transpose_menu),
62516250
(_("&Change note length"), [
62526251
(_('Double note lengths') + '\tCtrl+Shift++', '', self.OnDoubleL),
@@ -7277,8 +7276,7 @@ def OnChangeText(self, event):
72777276

72787277
def GrayUngray(self, evt=None):
72797278
editMenu = self.GetMenuBar().GetMenu(1)
7280-
# undo, redo, _, cut, copy, paste, delete, _, insert_symbol, _, transpose, note_length, align_bars, _, find, _, findnext, replace, _, selectall = editMenu.GetMenuItems()
7281-
undo, redo, _, cut, copy, paste, delete, _, transpose, note_length, align_bars, _, find, _, findnext, replace, _, selectall = editMenu.GetMenuItems()
7279+
undo, redo, _, cut, copy, paste, delete, _, insert_symbol, _, transpose, note_length, align_bars, _, find, _, findnext, replace, _, selectall = editMenu.GetMenuItems()
72827280
undo.Enable(self.editor.CanUndo())
72837281
redo.Enable(self.editor.CanRedo())
72847282

0 commit comments

Comments
 (0)