Skip to content

Commit c0b89d3

Browse files
committed
Added tablet mode
- Added tablet mode: when music score is maximized - Right click on score panel toggles full screen mode (Shift-Alt-F) - Left click on right quarter of the screen turns to next page - Left click on left quarter of the screen turns to previous page
1 parent 3028249 commit c0b89d3

File tree

2 files changed

+41
-2
lines changed

2 files changed

+41
-2
lines changed

Diff for: CHANGES

+5-1
Original file line numberDiff line numberDiff line change
@@ -601,4 +601,8 @@ different panes. Tie/untie option added for notes. Broken rhythm
601601

602602
1.3.8.5
603603
- Export MIDI no longer includes the markers which are used for follow score
604-
- Double click on score panel toggles full screen mode (Shift-Alt-F)
604+
- Added tablet mode: when music score is maximized
605+
- Right click on score panel toggles full screen mode (Shift-Alt-F)
606+
- Left click on right quarter of the screen turns to next page
607+
- Left click on left quarter of the screen turns to previous page
608+
- Fixed: follow score stopped working when screen in portrait mode

Diff for: easy_abc.py

+36-1
Original file line numberDiff line numberDiff line change
@@ -3935,6 +3935,7 @@ def __init__(self, parent, ID, app_dir, settings, options):
39353935
self.find_data.SetFlags(wx.FR_DOWN)
39363936
self.execmessage_time = datetime.now() # 1.3.6 [SS] 2014-12-11
39373937
self.is_fullscreen = False
3938+
self.score_is_maximized = False
39383939

39393940
self.load_settings()
39403941
settings = self.settings
@@ -4045,6 +4046,8 @@ def __init__(self, parent, ID, app_dir, settings, options):
40454046
#self.manager.AddPane(self.error_msg, self.error_pane)
40464047
self.manager.AddPane(self.abc_assist_panel, self.assist_pane)
40474048
self.manager.Bind(aui.EVT_AUI_PANE_CLOSE, self.__onPaneClose)
4049+
self.manager.Bind(aui.EVT_AUI_PANE_MAXIMIZE, self.__onPaneMaximize)
4050+
self.manager.Bind(aui.EVT_AUI_PANE_RESTORE, self.__onPaneRestore)
40484051

40494052
self.manager.Update()
40504053

@@ -4089,6 +4092,9 @@ def __init__(self, parent, ID, app_dir, settings, options):
40894092
self.editor.CmdKeyAssign(ord('+'), stc.STC_SCMOD_CTRL, stc.STC_CMD_ZOOMIN)
40904093
self.editor.CmdKeyAssign(ord('-'), stc.STC_SCMOD_CTRL, stc.STC_CMD_ZOOMOUT)
40914094
self.music_pane.Bind(wx.EVT_LEFT_DCLICK, self.OnMusicPaneDoubleClick)
4095+
self.music_pane.Bind(wx.EVT_LEFT_DOWN, self.OnMusicPaneClick)
4096+
self.music_pane.Bind(wx.EVT_RIGHT_DOWN, self.OnRightClickMusicPane)
4097+
40924098
#self.music_pane.Bind(wx.EVT_KEY_DOWN, self.OnMusicPaneKeyDown)
40934099

40944100
self.load_and_apply_settings(load_window_size_pos=True)
@@ -5572,8 +5578,29 @@ def OnMoveTuneDown(self, evt):
55725578
self.tune_list.DeselectAll()
55735579
self.MoveTune(selected_index, selected_index + 1)
55745580

5581+
def OnMusicPaneClick(self, evt):
5582+
if self.score_is_maximized:
5583+
width, height = self.music_pane.Size
5584+
x, y = evt.Position
5585+
threshold = width / 4
5586+
new_page = -1
5587+
5588+
if x < threshold:
5589+
new_page = self.current_page_index - 1
5590+
elif x > (width - threshold):
5591+
new_page = self.current_page_index + 1
5592+
5593+
if 0 <= new_page < self.current_svg_tune.page_count and new_page != self.current_page_index:
5594+
self.select_page(new_page)
5595+
return
5596+
5597+
evt.Skip()
5598+
5599+
def OnRightClickMusicPane(self, evt):
5600+
if self.score_is_maximized:
5601+
self.toggle_fullscreen(evt)
5602+
55755603
def OnMusicPaneDoubleClick(self, evt):
5576-
self.toggle_fullscreen(evt)
55775604
self.editor.SetFocus()
55785605

55795606
def toggle_fullscreen(self, evt):
@@ -5724,6 +5751,14 @@ def __onPaneClose(self, evt):
57245751
self.search_files_panel.focus_find_what()
57255752
self.search_files_panel.clear_results()
57265753

5754+
def __onPaneMaximize(self, evt):
5755+
if evt.pane.window == self.music_pane:
5756+
self.score_is_maximized = True
5757+
5758+
def __onPaneRestore(self, evt):
5759+
if evt.pane.window == self.music_pane:
5760+
self.score_is_maximized = False
5761+
57275762
# def OnToolDynamics(self, evt):
57285763
# try: self.toolbar.PopupMenu(self.popup_dynamics)
57295764
# except wx._core.PyAssertionError: pass

0 commit comments

Comments
 (0)