mwxlib 1.2.9__py3-none-any.whl → 1.3.0__py3-none-any.whl

mwx/bookshelf.py

@@ -99,14 +99,14 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
         }
         def _attach():
             if self and self.parent:
-                for editor in self.parent.all_editors:
+                for editor in self.parent.get_all_editors():
                     editor.handler.append(self.context)
                 self.build_tree()
         wx.CallAfter(_attach)
     
     def OnDestroy(self, evt):
         if self and self.parent:
-            for editor in self.parent.all_editors:
+            for editor in self.parent.get_all_editors():
                 editor.handler.remove(self.context)
         evt.Skip()
     
@@ -129,8 +129,8 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
         if clear:
             self.DeleteAllItems()
             self.AddRoot(self.Name)
-        for editor in self.parent.all_editors:
-            self._set_item(self.RootItem, editor.Name, editor.all_buffers)
+        for editor in self.parent.get_all_editors():
+            self._set_item(self.RootItem, editor.Name, editor.get_all_buffers())
         self.Refresh()
     
     def _gen_items(self, root, key=None):

mwx/controls.py

@@ -591,6 +591,7 @@ class KnobCtrlPanel(scrolled.ScrolledPanel):
                         for cc in obj.Children: # child of child <wx._core.SizerItem>
                             cc.Show(not cc.IsShown())
                         self.Layout()
+                        self.SendSizeEvent()
                         break
         evt.Skip()
     

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.2.9"
+__version__ = "1.3.0"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -1337,8 +1337,8 @@ class ShellFrame(MiniFrame):
             o.write("self.SetSize({})\n".format(self.Size))
             o.write("self.SetPosition({})\n".format(self.Position))
             
-            for book in self.all_editors:
-                for buf in book.all_buffers:
+            for book in self.get_all_editors():
+                for buf in book.get_all_buffers():
                     if buf.mtdelta is not None:
                         o.write("self.{}.load_file({!r}, {})\n"
                                 .format(book.Name, buf.filename, buf.markline+1))
@@ -1446,8 +1446,8 @@ class ShellFrame(MiniFrame):
                           "The trace pointer will be cleared.")
             self.debugger.unwatch() # cf. [pointer_unset] stop_trace
         
-        for book in self.all_editors:
-            for buf in book.all_buffers:
+        for book in self.get_all_editors():
+            for buf in book.get_all_buffers():
                 if buf.need_buffer_save:
                     self.popup_window(book)
                     buf.SetFocus()
@@ -1473,8 +1473,8 @@ class ShellFrame(MiniFrame):
         elif evt.GetActivationReason() == evt.Reason_Mouse\
           and self.__autoload:
             ## Check all buffers that need to be loaded.
-            for book in self.all_editors:
-                for buf in book.all_buffers:
+            for book in self.get_all_editors():
+                for buf in book.get_all_buffers():
                     if buf.need_buffer_load:
                         if wx.MessageBox( # Confirm load.
                                 "The file has been modified externally.\n\n"
@@ -1874,12 +1874,14 @@ class ShellFrame(MiniFrame):
         if not hasattr(target, '__dict__'):
             raise TypeError("primitive objects cannot be targeted")
         
-        shell = self.rootshell.__class__(self, target, name="clone",
-                    style=wx.CLIP_CHILDREN|wx.BORDER_NONE)
-        self.handler('shell_new', shell)
-        self.Show()
-        self.console.AddPage(shell, typename(shell.target))
+        shell = self.find_shell(target)
+        if not shell:
+            shell = self.rootshell.__class__(self, target, name="clone",
+                        style=wx.CLIP_CHILDREN|wx.BORDER_NONE)
+            self.console.AddPage(shell, typename(shell.target))
+            self.handler('shell_new', shell)
         self.popup_window(shell)
+        self.Show()
         shell.SetFocus()
         return shell
     
@@ -1905,8 +1907,16 @@ class ShellFrame(MiniFrame):
         yield from self.console.get_pages(type)
         yield from self.ghost.get_pages(type)
     
+    def get_all_shells(self):
+        """Yields all shells in the notebooks."""
+        yield from self.console.get_pages(type(self.rootshell))
+    
+    def get_all_editors(self):
+        """Yields all editors in the notebooks."""
+        yield from self.ghost.get_pages(type(self.Log))
+    
     @property
-    def all_shells(self):
+    def all_shells(self): # (deprecated) for backward compatibility
         """Yields all books in the notebooks."""
         return self.console.get_pages(type(self.rootshell))
     
@@ -1915,8 +1925,17 @@ class ShellFrame(MiniFrame):
         """Currently selected shell or rootshell."""
         return self.console.CurrentPage
     
+    def find_shell(self, target):
+        """Find a shell targeting the specified object.
+        If found, switch to the corresponding page.
+        """
+        for shell in self.get_all_shells():
+            if shell.target is target:
+                self.console.swap_page(shell)
+                return shell
+    
     @property
-    def all_editors(self):
+    def all_editors(self): # (deprecated) for backward compatibility
         """Yields all editors in the notebooks."""
         return self.ghost.get_pages(type(self.Log))
     
@@ -1926,22 +1945,17 @@ class ShellFrame(MiniFrame):
         editor = self.ghost.CurrentPage
         if isinstance(editor, type(self.Log)):
             return editor
-        return next((x for x in self.all_editors if x.IsShown()), self.Scratch)
+        return next((x for x in self.get_all_editors() if x.IsShown()), self.Scratch)
     
     def find_editor(self, fn):
-        """Find an editor with the specified fn:filename or code.
-        If found, switch to the buffer page.
+        """Find an editor containing the specified fn:filename or code.
+        If found, switch to the corresponding page.
         """
-        return next(self.find_editors(fn), None)
-    
-    def find_editors(self, fn):
-        """Yields all editors with the specified fn:filename or code."""
-        def _f(book):
+        for book in self.get_all_editors():
             buf = book.find_buffer(fn)
             if buf:
                 book.swap_page(buf)
-            return buf
-        return filter(_f, self.all_editors)
+                return book
     
     ## --------------------------------
     ## Find text dialog

mwx/graphman.py

@@ -1328,7 +1328,7 @@ class Frame(mwx.Frame):
         self.load_plug(plug.__module__, force=1, session=session)
         
         ## Update shell.target --> new plug
-        for shell in self.shellframe.all_shells:
+        for shell in self.shellframe.get_all_shells():
             if shell.target is plug:
                 shell.handler('shell_activated', shell)
     
@@ -1492,7 +1492,7 @@ class Frame(mwx.Frame):
                 else:
                     fn = attr.get('pathname') # if not found, try pathname
                     if fn.startswith(r'\\'):
-                        warn(f"The pathnme of {fn!r} contains network path, "
+                        warn(f"The pathname of {fn!r} contains network path, "
                              f"so the search may take long time.", stacklevel=3)
                     if not os.path.exists(fn):
                         mis[name] = res.pop(name) # pop missing items

mwx/nutshell.py

@@ -629,7 +629,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         self.MarkerDefine(stc.STC_MARKNUM_FOLDEROPENMID, stc.STC_MARK_VLINE, *v)
         self.MarkerDefine(stc.STC_MARKNUM_FOLDERMIDTAIL, stc.STC_MARK_VLINE, *v)
         
-        ## Custom indicators ([BUG] indicator=1 is reset when the buffer is udpated.)
+        ## Custom indicators ([BUG] indicator=1 is reset when the buffer is updated.)
         ## [10-11] filter_text
         ## [2] URL
         ## [3] match_paren
@@ -2214,7 +2214,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
     
     def OnPageClose(self, evt): #<wx._aui.AuiNotebookEvent>
         nb = evt.EventObject
-        buf = nb.all_buffers[evt.Selection]
+        buf = nb.all_pages[evt.Selection]
         if buf.need_buffer_save:
             if wx.MessageBox( # Confirm close.
                     "You are closing unsaved content.\n\n"
@@ -2258,7 +2258,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
             _setattribute(buf, kwargs)
         else:
             self.defaultBufferStyle.update(kwargs)
-            for buf in self.all_buffers:
+            for buf in self.get_all_buffers():
                 _setattribute(buf, self.defaultBufferStyle)
     
     def on_activated(self, buf):
@@ -2275,12 +2275,26 @@ class EditorBook(AuiNotebook, CtrlInterface):
     ## --------------------------------
     
     @property
-    def all_buffers(self):
+    def all_buffers(self): # (deprecated) for backward compatibility
         """Returns all buffer pages.
-        cf. equiv. AuiNotebook.all_pages
+        cf. equiv. AuiNotebook.all_pages or get_pages()
         """
         return [self.GetPage(j) for j in range(self.PageCount)]
     
+    def get_all_buffers(self, fn=None):
+        """Yields all buffers with specified fn:filename or code."""
+        if fn is None:
+            yield from self.get_pages(Buffer)
+        elif isinstance(fn, str):
+            g = os.path.realpath(fn)
+            for buf in self.get_pages(Buffer):
+                if fn == buf.filename or g == os.path.realpath(buf.filename):
+                    yield buf
+        else:
+            for buf in self.get_pages(Buffer):
+                if fn is buf or fn in buf: # check code
+                    yield buf
+    
     @property
     def menu(self):
         """Yields context menu."""
@@ -2290,7 +2304,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
                 lambda v: buf.SetFocus(),
                 lambda v: v.Check(buf is self.buffer))
         
-        return (_menu(j+1, x) for j, x in enumerate(self.all_buffers))
+        return (_menu(j+1, x) for j, x in enumerate(self.get_all_buffers()))
     
     @property
     def buffer(self):
@@ -2298,16 +2312,8 @@ class EditorBook(AuiNotebook, CtrlInterface):
         return self.CurrentPage
     
     def find_buffer(self, fn):
-        """Find buffer with specified fn:filename or code."""
-        if isinstance(fn, str):
-            g = os.path.realpath(fn)
-            for buf in self.all_buffers:
-                if fn == buf.filename or g == os.path.realpath(buf.filename):
-                    return buf
-        else:
-            for buf in self.all_buffers:
-                if fn is buf or fn in buf: # check code
-                    return buf
+        """Find a buffer with specified fn:filename or code."""
+        return next(self.get_all_buffers(fn), None)
     
     def swap_buffer(self, buf, lineno=0):
         self.swap_page(buf)
@@ -2436,13 +2442,14 @@ class EditorBook(AuiNotebook, CtrlInterface):
                     wildcard='|'.join(self.wildcards),
                     style=wx.FD_OPEN|wx.FD_MULTIPLE) as dlg:
                 if dlg.ShowModal() == wx.ID_OK:
-                    for fn in dlg.Paths:
-                        self.find_file(fn)
-            return
-        if self.load_file(filename) == False: # noqa: not None
+                    return all([self.find_file(fn) for fn in dlg.Paths])
+            return None
+        retval = self.load_file(filename)
+        if retval == False: # noqa: not None
             buf = self.create_buffer(filename)
             self.swap_buffer(buf)
             self.post_message("New file.")
+        return retval
     
     def save_file(self, filename, buf=None, verbose=True):
         """Save the current buffer to a file.
@@ -2506,7 +2513,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
                 return self.save_file(dlg.Path, buf)
     
     def save_all_buffers(self):
-        for buf in self.all_buffers:
+        for buf in self.get_all_buffers():
             if buf.need_buffer_save:
                 self.save_buffer(buf)
     
@@ -2525,7 +2532,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
         wx.CallAfter(self.delete_buffer, buf)
     
     def kill_all_buffers(self):
-        for buf in self.all_buffers:
+        for buf in self.get_all_buffers():
             if buf.need_buffer_save:
                 if wx.MessageBox( # Confirm close.
                         "You are closing unsaved content.\n\n"
@@ -2839,8 +2846,8 @@ class Nautilus(EditorInterface, Shell):
                 'C-S-v pressed' : (0, _F(self.Paste, rectangle=1)),
              'S-insert pressed' : (0, _F(self.Paste)),
            'C-S-insert pressed' : (0, _F(self.Paste, rectangle=1)),
-                  'C-j pressed' : (0, self.eval_line),
-                  'M-j pressed' : (0, self.exec_region),
+                  'C-j pressed' : (0, _F(self.eval_line)),
+                  'M-j pressed' : (0, _F(self.exec_region)),
                   'C-h pressed' : (0, self.call_helpTip),
                   'M-h pressed' : (0, self.call_helpDoc),
                     '. pressed' : (2, self.OnEnterDot),
@@ -2898,7 +2905,7 @@ class Nautilus(EditorInterface, Shell):
            '*backspace pressed' : (2, self.OnBackspace),
           '*backspace released' : (2, self.call_word_autocomp),
         'C-S-backspace pressed' : (2, ),
-                  'C-j pressed' : (2, self.eval_line),
+                  'C-j pressed' : (2, _F(self.eval_line)),
                  '*alt pressed' : (2, ),
                 '*ctrl pressed' : (2, ),
                '*shift pressed' : (2, ),
@@ -2926,7 +2933,7 @@ class Nautilus(EditorInterface, Shell):
            '*backspace pressed' : (3, self.OnBackspace),
           '*backspace released' : (3, self.call_apropos_autocomp),
         'C-S-backspace pressed' : (3, ),
-                  'C-j pressed' : (3, self.eval_line),
+                  'C-j pressed' : (3, _F(self.eval_line)),
                  '*alt pressed' : (3, ),
                 '*ctrl pressed' : (3, ),
                '*shift pressed' : (3, ),
@@ -2954,7 +2961,7 @@ class Nautilus(EditorInterface, Shell):
            '*backspace pressed' : (4, self.OnBackspace),
           '*backspace released' : (4, self.call_text_autocomp),
         'C-S-backspace pressed' : (4, ),
-                  'C-j pressed' : (4, self.eval_line),
+                  'C-j pressed' : (4, _F(self.eval_line)),
                  '*alt pressed' : (4, ),
                 '*ctrl pressed' : (4, ),
                '*shift pressed' : (4, ),
@@ -3594,7 +3601,7 @@ class Nautilus(EditorInterface, Shell):
         self.cpos, self.anchor = self.anchor, self.cpos
         self.EnsureCaretVisible()
     
-    def eval_line(self, evt):
+    def eval_line(self):
         """Evaluate the selected word or line."""
         if self.CallTipActive():
             self.CallTipCancel()
@@ -3614,7 +3621,7 @@ class Nautilus(EditorInterface, Shell):
         else:
             self.message("No words")
     
-    def exec_region(self, evt):
+    def exec_region(self):
         """Execute the the selected region."""
         if self.CallTipActive():
             self.CallTipCancel()

mwx/testsuite.py

@@ -8,7 +8,7 @@ Usage:
         frm = wx.Frame(None)
         frm.Show()
 
-Is equivlent to:
+Is equivalent to:
     app = wx.App()
     frm = wx.Frame(None)
     frm.Show()

{mwxlib-1.2.9.dist-info → mwxlib-1.3.0.dist-info}/METADATA

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

{mwxlib-1.2.9.dist-info → mwxlib-1.3.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
 mwx/__init__.py,sha256=pS7ZG8QKRypiFFiaWAq_opBB6I_1viZ0zUMk2TbjzE0,667
-mwx/bookshelf.py,sha256=b_TMDaNIzLHoL0xbbqb3tt0BnRvhLAqaCn_pBdrigZw,7523
-mwx/controls.py,sha256=iSevLKxgB3vdGJr3Wv8nccbFNSw1Voazt_HYjp3RrmM,48044
-mwx/framework.py,sha256=FU5XzSPNg-vWZPvG8lMi7u5htB3aUkdKgpbXlSqIFEU,76141
-mwx/graphman.py,sha256=sKwPy31H4lwtShTAui_6upe_Ys2-MwBHhdFq-3onBNE,70328
+mwx/bookshelf.py,sha256=REBMiiC2IE4MUtoDu5T8klFizBr4G0tdFrZinR2yVUg,7547
+mwx/controls.py,sha256=ojMUTl-1YRVVEH32WBIK_NUED6UWAil6EGAYigqh5ak,48090
+mwx/framework.py,sha256=TOKFx4epSTgHClbKtL--K_8gRSc7OwAHjl6tZpSDtlo,76805
+mwx/graphman.py,sha256=knoleskaSdwu65jHNfzrnaCEaN1wHtr3ouQg4tM2doE,70335
 mwx/images.py,sha256=oxCn0P-emiWujSS2gUgU5TUnr5cPjix2jBcjOBDr24I,48701
 mwx/matplot2.py,sha256=Zwte-wwzCg_OHzsBniVgKdaNLzsvJaa1gc0n7VdAqxw,33150
 mwx/matplot2g.py,sha256=ceeAjFkrDz49aSLo_9dIWZZd4HhnSjxe8u9G_ipBHek,64195
 mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
 mwx/mgplt.py,sha256=8mXbHpCmm7lz3XbAxOg7IVC7DaSGBEby1UfTlMl9kjk,5604
-mwx/nutshell.py,sha256=Cy2P4XZ0Wife66oXv3I0dRztlBmlSAlUkVhOq2tWPgs,141187
-mwx/testsuite.py,sha256=kiM3-BVhr42LRRN7xG7pYl3at8o2vnypWSxD8KRvA7c,1228
+mwx/nutshell.py,sha256=PUVlIac1HMIoaHj2m8ZUmiOIE_xcsWlTJifm9GRPAjM,141572
+mwx/testsuite.py,sha256=Zk75onPSEn2tf0swS3l-vIn6yTXGB7allIyvJsPHj20,1229
 mwx/utilus.py,sha256=bDeooo2bOcZwvkIdi0ElkT-qoblqzHNFsIveb72NFOo,37528
 mwx/wxmon.py,sha256=yzWqrbY6LzpfRwQeytYUeqFhFuLVm_XEvrVAL_k0HBQ,12756
 mwx/wxpdb.py,sha256=ge4hNfeigHGcpnioU1B_BJX_QZjNdtnokUrcZOxcEcI,18814
@@ -22,8 +22,8 @@ mwx/plugins/frame_listview.py,sha256=gowjQ-ARNonMkDSXkQgPKq4U9YBJ-vQ0jK2krBVOdCs
 mwx/plugins/line_profile.py,sha256=zzm6_7lnAnNepLbh07ordp3nRWDFQJtu719ZVjrVf8s,819
 mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=fumUG1F5M9TL-Dfqni4G85uk7TmvnUunTbdcPDV0vfo,16857
-mwxlib-1.2.9.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-1.2.9.dist-info/METADATA,sha256=zDuA9RxTUziGyT-aTZFZhLSh2fN1_USrpr6lpoTLuT0,7456
-mwxlib-1.2.9.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-mwxlib-1.2.9.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.2.9.dist-info/RECORD,,
+mwxlib-1.3.0.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-1.3.0.dist-info/METADATA,sha256=0Q6nnQK4gPzt6Kgg98OVyzhNbMDIN9xwfy9tL3xYlY0,7456
+mwxlib-1.3.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+mwxlib-1.3.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.3.0.dist-info/RECORD,,