saketh / notalon (http://notalon.org/)
Notalon is note-taking, simplified. It is a note-taking software for students, lifting the burden of formatting so that you can focus on taking notes.
| commit 157: | 81126fd9de2c |
| parent 156: | bbf27eab96b9 |
| branch: | default |
(mac) added Esc shortcut to get out of fullscreen mode
Saketh Bhamidipati
7 months ago
Changed (Δ2.7 KB):
raw changeset »
notalonlib/window.py (23 lines added, 0 lines removed)
res/default.neme (binary file changed)
Up to file-list notalonlib/window.py:
| … | … | @@ -383,6 +383,10 @@ class NotalonWindow(wx.Frame): |
383 |
383 |
viewfullscreen = FM.FlatMenuItem(viewmenu, wx.NewId(), _("&Fullscreen \tCtrl+Shift+J"), _(" View fullscreen"), wx.ITEM_NORMAL, None, self.resin.getImage("viewfullscreen")) |
384 |
384 |
viewmenu.AppendItem(viewfullscreen) |
385 |
385 |
|
386 |
if MAC: |
|
387 |
viewwindowed = FM.FlatMenuItem(viewmenu, wx.NewId(), _("&Normal \tEscape"), _(" View windowed"), wx.ITEM_NORMAL, None, self.resin.getImage("viewwindowed")) |
|
388 |
viewmenu.AppendItem(viewwindowed) |
|
389 |
||
386 |
390 |
inserttab = FM.FlatMenuItem(insertmenu, wx.NewId(), _("&Tab\tTab"), _("Insert tab"), wx.ITEM_NORMAL, None, self.resin.getImage("indent")) |
387 |
391 |
insertmenu.AppendItem(inserttab) |
388 |
392 |
|
| … | … | @@ -471,6 +475,8 @@ class NotalonWindow(wx.Frame): |
471 |
475 |
self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateItalicize, formatitalicize) |
472 |
476 |
|
473 |
477 |
self.Bind(FM.EVT_FLAT_MENU_SELECTED, self.OnFullscreen, viewfullscreen) |
478 |
if MAC: |
|
479 |
self.Bind(FM.EVT_FLAT_MENU_SELECTED, self.OnWindowed, viewwindowed) |
|
474 |
480 |
|
475 |
481 |
self.Bind(FM.EVT_FLAT_MENU_SELECTED, self.tree.OnAddNode, editaddnode) |
476 |
482 |
self.Bind(FM.EVT_FLAT_MENU_SELECTED, self.tree.OnDeleteNode, editdeletenode) |
| … | … | @@ -576,6 +582,10 @@ class NotalonWindow(wx.Frame): |
576 |
582 |
viewfullscreen = viewmenu.Append(wx.NewId(), _("&Fullscreen \tCtrl+Shift+J"), _(" View fullscreen")) |
577 |
583 |
viewfullscreen.SetBitmap(self.resin.getImage("viewfullscreen")) |
578 |
584 |
|
585 |
if MAC: |
|
586 |
viewwindowed = viewmenu.Append(wx.NewId(), _("&Normal \tEscape"), _(" View windowed")) |
|
587 |
viewwindowed.SetBitmap(self.resin.getImage("viewwindowed")) |
|
588 |
||
579 |
589 |
inserttab = insertmenu.Append(wx.NewId(), _("&Tab\tTab"), _("Insert tab")) |
580 |
590 |
inserttab.SetBitmap(self.resin.getImage("indent")) |
581 |
591 |
|
| … | … | @@ -641,6 +651,8 @@ class NotalonWindow(wx.Frame): |
641 |
651 |
self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateItalicize, formatitalicize) |
642 |
652 |
|
643 |
653 |
self.Bind(wx.EVT_MENU, self.OnFullscreen, viewfullscreen) |
654 |
if MAC: |
|
655 |
self.Bind(wx.EVT_MENU, self.OnWindowed, viewwindowed) |
|
644 |
656 |
|
645 |
657 |
self.Bind(wx.EVT_MENU, self.tree.OnAddNode, editaddnode) |
646 |
658 |
self.Bind(wx.EVT_MENU, self.tree.OnDeleteNode, editdeletenode) |
| … | … | @@ -929,10 +941,21 @@ class NotalonWindow(wx.Frame): |
929 |
941 |
log.debug('Cleared file history') |
930 |
942 |
|
931 |
943 |
def OnFullscreen(self, e): |
944 |
"""Toggle fullscreen.""" |
|
932 |
945 |
log.debug('Fullscreen mode: %s' % str(self.fullscreen)) |
933 |
946 |
self.fullscreen = not self.fullscreen |
934 |
947 |
self.ShowFullScreen(self.fullscreen) |
935 |
948 |
|
949 |
def OnWindowed(self, e): |
|
950 |
"""Like :meth:`OnFullscreen`, but only switches out of fullscreen, |
|
951 |
doesn't toggle back into it. |
|
952 |
||
953 |
""" |
|
954 |
print 'lol' |
|
955 |
||
956 |
if self.fullscreen: |
|
957 |
self.OnFullscreen(e) |
|
958 |
||
936 |
959 |
def ShowTips(self): |
937 |
960 |
"""Shows the tips window on startup; returns False if the option to |
938 |
961 |
turn off tips is checked. |
Up to file-list res/default.neme: