mwxlib 0.94.6__py3-none-any.whl → 0.94.8__py3-none-any.whl

mwx/bookshelf.py

@@ -27,8 +27,7 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
                'buffer_deleted' : [ None, self.on_buffer_deleted ],
              'buffer_activated' : [ None, self.on_buffer_selected ],
            'buffer_inactivated' : [ None, ],
-         'buffer_caption_reset' : [ None, self.on_buffer_filename ],
-        'buffer_filename_reset' : [ None, self.on_buffer_filename ],
+       'buffer_caption_updated' : [ None, self.on_buffer_filename ],
             },
         }
         

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.94.6"
+__version__ = "0.94.8"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -1252,7 +1252,7 @@ class ShellFrame(MiniFrame):
                       'add_log' : [ None, self.add_log ],
                      'add_help' : [ None, self.add_help ],
                  'title_window' : [ None, self.on_title_window ],
-         'buffer_caption_reset' : [ None, self.on_buffer_caption ], # => self.OnActivate
+       'buffer_caption_updated' : [ None, self.on_buffer_caption ], # => self.OnActivate
             },
             0 : {
                     '* pressed' : (0, fork_debugger),
@@ -1262,9 +1262,9 @@ class ShellFrame(MiniFrame):
                   'C-f pressed' : (0, self.OnFindText),
                    'f3 pressed' : (0, self.OnFindNext),
                  'S-f3 pressed' : (0, self.OnFindPrev),
-                  'f11 pressed' : (0, _F(self.toggle_window, self.ghost, doc="Toggle ghost")),
-                'S-f11 pressed' : (0, _F(self.toggle_window, self.watcher, doc="Toggle watcher")),
-                  'f12 pressed' : (0, _F(self.Close, alias="close", doc="Close the window")),
+                  'f11 pressed' : (0, _F(self.toggle_window, self.ghost, alias='toggle_ghost')),
+                'S-f11 pressed' : (0, _F(self.toggle_window, self.watcher, alias='toggle_watcher')),
+                  'f12 pressed' : (0, _F(self.Close, alias="close")),
              '*f[0-9]* pressed' : (0, ),
             },
         })
@@ -1291,8 +1291,8 @@ class ShellFrame(MiniFrame):
         self.SCRATCH_FILE = get_rootpath("scratch.py")
         self.LOGGING_FILE = get_rootpath("deb-logging.log")
         
-        wx.CallAfter(self.load_session,
-                     os.path.abspath(debrc) if debrc else self.SESSION_FILE)
+        self.load_session(
+            os.path.abspath(debrc) if debrc else self.SESSION_FILE)
     
     def load_session(self, filename):
         """Load session from file."""
@@ -1348,9 +1348,9 @@ class ShellFrame(MiniFrame):
                 "self.ghost.SetSelection({})".format(self.ghost.Selection),
                 "self.watcher.SetSelection({})".format(self.watcher.Selection),
                 ## Note: Perspectives should be called after all pages have been added.
-                "self._mgr.LoadPerspective({!r})".format(self._mgr.SavePerspective()),
-                "self.ghost.loadPerspective({!r})".format(self.ghost.savePerspective()),
-                "self.watcher.loadPerspective({!r})".format(self.watcher.savePerspective()),
+                "wx.CallAfter(self._mgr.LoadPerspective, {!r})".format(self._mgr.SavePerspective()),
+                "wx.CallAfter(self.ghost.loadPerspective, {!r})".format(self.ghost.savePerspective()),
+                "wx.CallAfter(self.watcher.loadPerspective, {!r})".format(self.watcher.savePerspective()),
                 "self._mgr.Update()\n",
             )))
     
@@ -1544,17 +1544,17 @@ class ShellFrame(MiniFrame):
                 ))
             )
     
-    def toggle_window(self, win, focus=False):
-        self.popup_window(win, show=None, focus=focus)
+    def toggle_window(self, win):
+        pane = self._mgr.GetPane(win)
+        if pane.IsDocked():
+            if not self.console.IsShown():
+                self._mgr.RestoreMaximizedPane()
+                self._mgr.Update()
+                return
+        self.popup_window(win, not pane.IsShown())
     
-    def popup_window(self, win, show=True, focus=True):
-        """Show the notebook page and move the focus.
-        
-        Args:
-            win  : window to popup
-            show : True, False, otherwise None:toggle
-                   The pane window will be hidden if no show.
-        """
+    def popup_window(self, win, show=True):
+        """Show the notebook page and keep the focus."""
         wnd = wx.Window.FindFocus() # original focus
         
         for pane in self._mgr.GetAllPanes():
@@ -1569,12 +1569,7 @@ class ShellFrame(MiniFrame):
         else:
             return # no such pane.window
         
-        if show is None:
-            show = not pane.IsShown() # toggle show
-        
-        if focus and win.IsShown():
-            win.SetFocus() # move focus
-        elif wnd:
+        if wnd:
             wnd.SetFocus() # restore focus
         
         ## Modify the floating position of the pane when displayed.
@@ -1605,14 +1600,14 @@ class ShellFrame(MiniFrame):
         self.indicator.Value = 1
         self.message("Quit")
     
-    def _load(self, filename, lineno, editor, verbose=False):
+    def _load(self, filename, lineno, editor):
         """Load file in the session (internal use only)."""
         if isinstance(editor, str):
             editor = getattr(self, editor, None)
         if editor:
-            return editor.load_file(filename, lineno, verbose)
+            return editor.load_file(filename, lineno, verbose=0)
     
-    def load(self, filename, lineno=0, show=True, focus=False):
+    def load(self, filename, lineno=0, show=True):
         """Load file @where the object is defined.
         
         Args:
@@ -1620,7 +1615,6 @@ class ShellFrame(MiniFrame):
                        It also supports <'filename:lineno'> format.
             lineno   : Set mark to lineno on load.
             show     : Show the page.
-            focus    : Focus the window if visible.
         """
         if not isinstance(filename, str):
             filename = where(filename)
@@ -1634,7 +1628,7 @@ class ShellFrame(MiniFrame):
         editor = self.find_editor(filename) or self.Log
         ret = editor.load_file(filename, lineno, verbose=1)
         if ret:
-            self.popup_window(editor, show, focus)
+            self.popup_window(editor, show)
         return ret
     
     def info(self, obj):
@@ -1646,11 +1640,11 @@ class ShellFrame(MiniFrame):
     def watch(self, obj):
         if isinstance(obj, wx.Object):
             self.monitor.watch(obj)
-            self.popup_window(self.monitor, focus=0)
+            self.popup_window(self.monitor)
         elif hasattr(obj, '__dict__'):
             self.linfo.watch(obj.__dict__)
             self.ginfo.watch({})
-            self.popup_window(self.linfo, focus=0)
+            self.popup_window(self.linfo)
     
     def highlight(self, obj, *args, **kwargs):
         self.inspector.highlight(obj, *args, **kwargs)
@@ -1732,8 +1726,8 @@ class ShellFrame(MiniFrame):
         shell.prompt()
         shell.SetFocus()
         self.Show()
-        self.popup_window(self.ghost, focus=0)
-        self.popup_window(self.linfo, focus=0)
+        self.popup_window(self.ghost)
+        self.popup_window(self.linfo)
         self.add_log("<-- Beginning of debugger\r\n")
         self.indicator.Value = 2
     
@@ -1749,7 +1743,7 @@ class ShellFrame(MiniFrame):
         if self.linfo.target is not ls:
             self.linfo.watch(ls)
         self.on_title_window(frame)
-        self.popup_window(self.debugger.editor, focus=0)
+        self.popup_window(self.debugger.editor)
         dispatcher.send(signal='Interpreter.push',
                         sender=shell, command=None, more=False)
         command = shell.cmdline
@@ -1855,7 +1849,7 @@ class ShellFrame(MiniFrame):
         with buf.off_readonly():
             buf.SetText(text)
         ## Overwrite text and popup the window.
-        self.popup_window(self.Help, focus=0)
+        self.popup_window(self.Help)
     
     def clone_shell(self, target):
         if not hasattr(target, '__dict__'):
@@ -1865,8 +1859,8 @@ class ShellFrame(MiniFrame):
                     style=wx.CLIP_CHILDREN|wx.BORDER_NONE)
         self.handler('shell_new', shell)
         self.console.AddPage(shell, typename(shell.target))
-        self.Show()
-        self.popup_window(shell, focus=1)
+        self.popup_window(shell)
+        shell.SetFocus()
         return shell
     
     def delete_shell(self, shell):

mwx/nutshell.py

@@ -1386,15 +1386,13 @@ class Buffer(EditWindow, EditorInterface):
     def filename(self):
         return self.__filename
     
-    @filename.setter
-    def filename(self, fn):
+    def update_filestamp(self, fn):
         if fn and os.path.isfile(fn):
-            self.__mtime = os.path.getmtime(fn)
+            self.__mtime = os.path.getmtime(fn) # update timestamp (modified time)
         else:
             self.__mtime = None
         if self.__filename != fn:
             self.__filename = fn
-            self.parent.handler('buffer_filename_reset', self)
             self.update_caption()
     
     @property
@@ -1408,10 +1406,12 @@ class Buffer(EditWindow, EditorInterface):
             < 0  : a url file
         """
         fn = self.filename
-        if fn and os.path.isfile(fn):
-            return os.path.getmtime(fn) - self.__mtime
-        if fn and re.match(url_re, fn):
-            return -1
+        if fn:
+            if os.path.isfile(fn):
+                return os.path.getmtime(fn) - self.__mtime
+            if re.match(url_re, fn):
+                return -1
+        return None
     
     @property
     def caption_prefix(self):
@@ -1429,9 +1429,10 @@ class Buffer(EditWindow, EditorInterface):
         return prefix
     
     def update_caption(self):
+        caption = self.caption_prefix + self.name
         try:
-            if self.parent.set_caption(self, self.caption_prefix + self.name):
-                self.parent.handler('buffer_caption_reset', self)
+            if self.parent.set_caption(self, caption):
+                self.parent.handler('buffer_caption_updated', self)
         except AttributeError:
             pass
     
@@ -1465,7 +1466,7 @@ class Buffer(EditWindow, EditorInterface):
         
         self.parent = parent
         self.__filename = filename
-        self.filename = filename
+        self.update_filestamp(filename)
         self.code = None
         
         self.Bind(stc.EVT_STC_UPDATEUI, self.OnUpdate) # skip to brace matching
@@ -1590,13 +1591,13 @@ class Buffer(EditWindow, EditorInterface):
             self.Text = text
             self.EmptyUndoBuffer()
             self.SetSavePoint()
-        self.filename = filename
+        self.update_filestamp(filename)
         self.handler('buffer_loaded', self)
     
     def _load_file(self, filename):
         """Wrapped method of LoadFile."""
         if self.LoadFile(filename):
-            self.filename = filename
+            self.update_filestamp(filename)
             self.EmptyUndoBuffer()
             self.SetSavePoint()
             self.handler('buffer_loaded', self)
@@ -1606,7 +1607,7 @@ class Buffer(EditWindow, EditorInterface):
     def _save_file(self, filename):
         """Wrapped method of SaveFile."""
         if self.SaveFile(filename):
-            self.filename = filename
+            self.update_filestamp(filename)
             self.SetSavePoint()
             self.handler('buffer_saved', self)
             return True
@@ -1769,8 +1770,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
               'buffer_modified' : [ None, dispatch ],
              'buffer_activated' : [ None, dispatch, self.on_activated ],
            'buffer_inactivated' : [ None, dispatch, self.on_inactivated ],
-         'buffer_caption_reset' : [ None, dispatch ],
-        'buffer_filename_reset' : [ None, dispatch ],
+       'buffer_caption_updated' : [ None, dispatch ],
              '*button* pressed' : [ None, dispatch, skip ],
             '*button* released' : [ None, dispatch, skip ],
             },
@@ -2884,7 +2884,7 @@ class Nautilus(Shell, EditorInterface):
         wx.CallAfter(_del)
     
     def on_activated(self, shell):
-        """Called when shell:self is activated.
+        """Called when the shell:self is activated.
         Reset localvars assigned for the shell target.
         """
         self.trace_position()

{mwxlib-0.94.6.dist-info → mwxlib-0.94.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 0.94.6
+Version: 0.94.8
 Summary: A wrapper of matplotlib and wxPython (phoenix)
 Home-page: https://github.com/komoto48g/mwxlib
 Author: Kazuya O'moto

{mwxlib-0.94.6.dist-info → mwxlib-0.94.8.dist-info}/RECORD

@@ -1,14 +1,14 @@
 mwx/__init__.py,sha256=zLsXDgqyC5NsPCjRxjS2huvZ3uDyeOJ1vapotqe2ULM,834
-mwx/bookshelf.py,sha256=UVVIwHaGO4aEHwZ8x5SKjpL-3MmQ1s6kkyuyRZqKWvU,5070
+mwx/bookshelf.py,sha256=WEILqqxzGtdNUiUvn8oa4aTCSnzO11_MrV2L8sXKjXI,5000
 mwx/controls.py,sha256=prp1NhZqv1XANhi2PPxW9jtrgwj_02XMOOyyzZ48klM,47185
-mwx/framework.py,sha256=Wxpr9WDshKkKG4x91POCHgU2TZoFhW9X4U8O6Lbxnck,75581
+mwx/framework.py,sha256=9ZWmc31eMBdtFPqTTd21dtyiYsiBA8U0MRuLzIMMVoI,75272
 mwx/graphman.py,sha256=9MG0BzQh5lDDadyPPXps2M0hf6mPN3G0MQbBGdplY_I,70027
 mwx/images.py,sha256=mrnUYH12I3XLVSZcEXlpVltX0XMxufbl2yRvDIQJZqc,49957
 mwx/matplot2.py,sha256=qaF_gvLoLn-TimLbRR59KUavNr1ZpZQdSMqjzJk47rk,32682
 mwx/matplot2g.py,sha256=mDaD367wjq6xsyIDX9ot8jLwYYGayoavWMhqsQVBHac,65442
 mwx/matplot2lg.py,sha256=tg8u7w4DxiJdPN-E197NOmbQpc_1gZkgDHYv_xUhbFA,27224
 mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
-mwx/nutshell.py,sha256=qz4qnEuGm5vEUtltux6caBLAoth92qc1zAyEmL6nbCg,135625
+mwx/nutshell.py,sha256=SWlACsEHGtsLxw3l16TnNALNAB2_ObE7IO0eqo1s4eQ,135627
 mwx/utilus.py,sha256=FTJhVFmx6TAE5rvZ_nfxZgyyaW4zMpXEz74v72X6m7Y,37399
 mwx/wxmon.py,sha256=Qk86VbuuW2rR46pqEYLur13G_aloWz5SVv6sib30YY0,12717
 mwx/wxpdb.py,sha256=2z3ZD9Oo1H-ONBHlaprkB9hrTmAI7o03sqO46ppEFE4,19129
@@ -21,8 +21,8 @@ mwx/plugins/frame_listview.py,sha256=T-2xSv_D2bk9fJ64aiSEe1rJRTeqaIpLVAYEUXW5vz8
 mwx/plugins/line_profile.py,sha256=WJB5z7F53yg4dII2R36IFZvtkSOGWT669b1HmAAXSnQ,816
 mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=KaHooM32hrGGgqw75Cbt8lAvACwC6RXadob9LGgNnEc,16806
-mwxlib-0.94.6.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.94.6.dist-info/METADATA,sha256=jTXP1YrO9TOtK_CcgwIuZpoMNSKJ8H-VGmRfiqYoJgY,1925
-mwxlib-0.94.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mwxlib-0.94.6.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.94.6.dist-info/RECORD,,
+mwxlib-0.94.8.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.94.8.dist-info/METADATA,sha256=fHCSJqHLZhgT8iK4xUBbA2apLus3rSQMqMh0w-O7DxU,1925
+mwxlib-0.94.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mwxlib-0.94.8.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.94.8.dist-info/RECORD,,