mwxlib 1.4.20__py3-none-any.whl → 1.5.9__py3-none-any.whl

mwx/bookshelf.py

@@ -35,7 +35,7 @@ class MyDropTarget(wx.DropTarget):
     def OnData(self, x, y, result):
         item = self.tree.Selection
         name = self.tree.GetItemText(item)
-        editor = self.tree.Parent.FindWindow(name) # window.Name
+        editor = self.tree._find_editor(name)
         self.GetData()
         if self.datado.Data:
             fn = self.datado.Data.tobytes().decode()
@@ -95,7 +95,7 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
             '*button* released' : [ None, dispatch ],
             },
             0 : {
-               'delete pressed' : (0, self._delete),
+               'delete pressed' : (0, self.on_delete_buffer),
             },
         })
         self.context = { # DNA<EditorBook>
@@ -109,6 +109,7 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
        'buffer_caption_updated' : [ None, self.on_buffer_filename ],
             },
         }
+        
         def _attach():
             if self and self.parent:
                 for editor in self.parent.get_all_editors():
@@ -123,16 +124,8 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
                 editor.handler.remove(self.context)
         evt.Skip()
     
-    def _delete(self, evt):
-        item = self.Selection
-        if item:
-            data = self.GetItemData(item)
-            if data:
-                data.parent.kill_buffer(data) # the focus moves
-                wx.CallAfter(self.SetFocus)
-    
     ## --------------------------------
-    ## TreeList/Ctrl wrapper interface 
+    ## TreeList/Ctrl wrapper interface
     ## --------------------------------
     
     def build_tree(self, clear=True):
@@ -200,6 +193,18 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
         if self and buf:
             self.SetItemText(buf.__itemId, buf.caption_prefix + buf.name)
     
+    def on_delete_buffer(self, evt):
+        item = self.Selection
+        if item:
+            data = self.GetItemData(item)
+            if data:
+                data.parent.kill_buffer(data)  # the focus moves
+                wx.CallAfter(self.SetFocus)
+    
+    def _find_editor(self, name):
+        ## return self.Parent.FindWindow(name) # window.Name (not page.caption)
+        return next(editor for editor in self.parent.get_all_editors() if editor.Name == name)
+    
     def OnSelChanged(self, evt):
         if self and self.HasFocus():
             data = self.GetItemData(evt.Item)
@@ -207,9 +212,10 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
                 data.SetFocus()
             else:
                 name = self.GetItemText(evt.Item)
-                editor = self.Parent.FindWindow(name) # window.Name (not page.caption)
+                editor = self._find_editor(name)
                 if not editor.IsShown():
-                    self.Parent.Selection = self.Parent.FindPage(editor)
+                    nb = self.Parent
+                    nb.Selection = nb.FindPage(editor)
             wx.CallAfter(self.SetFocus)
         evt.Skip()
     

mwx/controls.py

@@ -283,7 +283,7 @@ class LParam(Param):
 
 
 ## --------------------------------
-## Knob unit for Parameter Control 
+## Knob unit for Parameter Control
 ## --------------------------------
 
 class Knob(wx.Panel):
@@ -390,7 +390,7 @@ class Knob(wx.Panel):
             self._ctrl.Bind(wx.EVT_KEY_DOWN, self.OnCtrlKeyDown)
             self._ctrl.Bind(wx.EVT_MOUSEWHEEL, self.OnMouseWheel)
             
-        elif type == 'spin' or type =='hspin':
+        elif type == 'spin' or type == 'hspin':
             self._ctrl = wx.SpinButton(self, size=(cw,h), style=wx.SP_HORIZONTAL)
             self._ctrl.Bind(wx.EVT_SPIN, self.OnScroll)
             self._ctrl.Bind(wx.EVT_MOUSEWHEEL, self.OnMouseWheel)
@@ -503,7 +503,7 @@ class Knob(wx.Panel):
         evt.Skip()
     
     def OnMouseWheel(self, evt): #<wx._core.MouseEvent>
-        self.shift_ctrl(evt, 1 if evt.WheelRotation>0 else -1)
+        self.shift_ctrl(evt, (1 if evt.WheelRotation > 0 else -1))
         evt.Skip(False)
     
     def OnCtrlKeyDown(self, evt): #<wx._core.KeyEvent>
@@ -859,7 +859,7 @@ class Clipboard:
 
 
 ## --------------------------------
-## Wx custom controls and bitmaps 
+## Wx custom controls and bitmaps
 ## --------------------------------
 
 class Icon(wx.Bitmap):
@@ -906,8 +906,8 @@ class Icon(wx.Bitmap):
             '->|' : wx.ART_GOTO_LAST,
     }
     custom_images = {
-        k:v for k, v in vars(images).items()
-            if isinstance(v, wx.lib.embeddedimage.PyEmbeddedImage)
+        k: v for k, v in vars(images).items()
+             if isinstance(v, wx.lib.embeddedimage.PyEmbeddedImage)
     }
     
     def __init__(self, *args, **kwargs):
@@ -1085,7 +1085,7 @@ class TextBox(wx.Control):
     """
     Value = property(
         lambda self: self._ctrl.GetValue(),
-        lambda self,v: self._ctrl.SetValue(v),
+        lambda self, v: self._ctrl.SetValue(v),
         doc="textctrl value:str")
     
     value = Value #: internal use only
@@ -1154,19 +1154,19 @@ class Choice(wx.Control):
     """
     Value = property(
         lambda self: self._ctrl.GetValue(),
-        lambda self,v: self._ctrl.SetValue(v),
+        lambda self, v: self._ctrl.SetValue(v),
         doc="combobox value:str")
     
     value = Value #: internal use only
     
     Selection = property(
         lambda self: self._ctrl.GetSelection(),
-        lambda self,v: self._ctrl.SetSelection(v), # int or NOT_FOUND(-1)
+        lambda self, v: self._ctrl.SetSelection(v),  # int or NOT_FOUND(-1)
         doc="combobox selection:int")
     
     Items = property(
         lambda self: self._ctrl.GetItems(),
-        lambda self,v: self._ctrl.SetItems(v),
+        lambda self, v: self._ctrl.SetItems(v),
         doc="combobox items:list")
     
     button = property(lambda self: self._btn)

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.4.20"
+__version__ = "1.5.9"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -36,7 +36,7 @@ def deb(target=None, loop=True, locals=None, **kwargs):
         **kwargs: ShellFrame and Nautilus arguments
         
             - session           : file name of the session. Defaults to None.
-            - ensureClose       : True => EVT_CLOSE will close the window.
+            - standalone        : True => EVT_CLOSE will close the window.
                                   False => EVT_CLOSE will hide the window.
             - introText         : introductory of the shell
             - startupScript     : startup script file (default None)
@@ -47,7 +47,7 @@ def deb(target=None, loop=True, locals=None, **kwargs):
     """
     kwargs.setdefault("introText", f"mwx {__version__}\n")
     kwargs.setdefault("execStartupScript", True)
-    kwargs.setdefault("ensureClose", True)
+    kwargs.setdefault("standalone", True)
     
     if "debrc" in kwargs:  # for backward compatibility
         warn("Deprecated keyword: 'debrc'. Use 'session' instead.", DeprecationWarning)
@@ -243,7 +243,7 @@ class KeyCtrlInterfaceMixin:
         
         def _Pass(evt):
             self.message("{} {}".format(keymap, evt.key))
-        _Pass.__name__ = str('pass')
+        _Pass.__name__ = str("pass")
         
         state = self.handler.default_state
         event = keymap + ' pressed'
@@ -264,9 +264,6 @@ class KeyCtrlInterfaceMixin:
             },
         })
     
-    builtins.enter = "Enter extension mode."
-    builtins.exit = "Exit extension mode."
-    
     def pre_command_hook(self, evt):
         ## """Called when entering extension mode (internal use only)."""
         ## Check text selection for [C-c/C-x].
@@ -277,7 +274,7 @@ class KeyCtrlInterfaceMixin:
         else:
             self.message(evt.key + '-')
         evt.Skip()
-    pre_command_hook.__name__ = str('enter')
+    pre_command_hook.__name__ = str("enter")
     
     def post_command_hook(self, evt):
         ## """Called when exiting extension mode (internal use only)."""
@@ -290,7 +287,7 @@ class KeyCtrlInterfaceMixin:
         else:
             self.message(evt.key)
         evt.Skip()
-    post_command_hook.__name__ = str('exit')
+    post_command_hook.__name__ = str("exit")
     
     def define_key(self, keymap, action=None, /, *args, **kwargs):
         """Define [map key (pressed)] action.
@@ -325,6 +322,7 @@ class KeyCtrlInterfaceMixin:
             return lambda f: self.define_key(keymap, f, *args, **kwargs)
         
         F = _F(action, *args, **kwargs)
+        
         @wraps(F)
         def f(*v, **kw):
             self.message(f.__name__)
@@ -468,7 +466,7 @@ class CtrlInterface(KeyCtrlInterfaceMixin):
                 kbtn = self.__key + self.__button
                 self.handler('{}drag end'.format(kbtn), evt)
         
-        k = evt.GetButton() #{1:L, 2:M, 3:R, 4:X1, 5:X2}
+        k = evt.GetButton() # {1:L, 2:M, 3:R, 4:X1, 5:X2}
         if action == 'pressed' and k in (1,2,3):
             self.__button = 'LMR'[k-1]
         else:
@@ -582,7 +580,7 @@ class Menu(wx.Menu):
                 continue
             id = item[0]
             handlers = [x for x in item if callable(x)]
-            icons =  [x for x in item if isinstance(x, wx.Bitmap)]
+            icons = [x for x in item if isinstance(x, wx.Bitmap)]
             argv = [x for x in item if x not in handlers and x not in icons]
             if isinstance(id, int):
                 menu_item = wx.MenuItem(self, *argv) # <- menu_item.Id
@@ -1062,7 +1060,7 @@ class ShellFrame(MiniFrame):
         session : file name of the session. Defaults to None.
                   If None, no session will be created or saved.
                   If `''`, the default session (.debrc) will be loaded.
-        ensureClose : flag for the shell standalone.
+        standalone  : flag for the shell standalone.
                       If True, EVT_CLOSE will close the window.
                       Otherwise the window will be only hidden.
         **kwargs    : Nautilus arguments
@@ -1098,17 +1096,17 @@ class ShellFrame(MiniFrame):
     """
     rootshell = property(lambda self: self.__shell) #: the root shell
     
-    def __init__(self, parent, target=None, session=None, ensureClose=False, **kwargs):
+    def __init__(self, parent, target=None, session=None, standalone=False, **kwargs):
         MiniFrame.__init__(self, parent, size=(1280,720), style=wx.DEFAULT_FRAME_STYLE)
         
         self.statusbar.resize((-1,120))
         self.statusbar.Show(1)
         
-        self.__standalone = bool(ensureClose)
+        self.__standalone = bool(standalone)
         
         self.Init()
         
-        from .nutshell import Nautilus, EditorBook
+        from .nutshell import Nautilus, EditorBook, Stylus
         from .bookshelf import EditorTreeCtrl
         
         self.__shell = Nautilus(self,
@@ -1123,6 +1121,28 @@ class ShellFrame(MiniFrame):
         self.Bookshelf = EditorTreeCtrl(self, name="Bookshelf",
                                         style=wx.TR_DEFAULT_STYLE|wx.TR_HIDE_ROOT)
         
+        ## Set shell and editor styles.
+        self.Scratch.set_attributes(Style=Stylus.py_shell_mode)
+        
+        self.Log.set_attributes(ReadOnly=True,
+                                Style=Stylus.py_log_mode)
+        
+        self.Help.set_attributes(ReadOnly=False,
+                                 Style=Stylus.py_log_mode)
+        
+        self.set_hookable(self.Scratch)
+        self.set_hookable(self.Log)
+        
+        @self.Scratch.define_key('C-j')
+        def eval_line(evt):
+            self.Scratch.buffer.eval_line()
+            evt.Skip(False) # Don't skip explicitly.
+        
+        @self.Scratch.define_key('M-j')
+        def eval_buffer(evt):
+            self.Scratch.buffer.exec_region()
+            evt.Skip(False) # Don't skip explicitly.
+        
         from .wxpdb import Debugger
         from .wxwit import Inspector
         from .wxmon import EventMonitor
@@ -1203,6 +1223,8 @@ class ShellFrame(MiniFrame):
         
         self.Bind(wx.EVT_FIND, self.OnFindNext)
         self.Bind(wx.EVT_FIND_NEXT, self.OnFindNext)
+        self.Bind(wx.EVT_FIND_REPLACE, self.OnFindNext)
+        self.Bind(wx.EVT_FIND_REPLACE_ALL, self.OnFindNext)
         self.Bind(wx.EVT_FIND_CLOSE, self.OnFindClose)
         
         self.indicator = Indicator(self.statusbar, value=1)
@@ -1255,6 +1277,7 @@ class ShellFrame(MiniFrame):
                   'C-g pressed' : (0, self.Quit, fork_debugger),
                    'f1 pressed' : (0, self.About),
                   'C-f pressed' : (0, self.on_search_dialog),
+                'C-S-f pressed' : (0, self.on_replace_dialog),
                    'f3 pressed' : (0, self.repeat_forward_search),
                  'S-f3 pressed' : (0, self.repeat_backward_search),
                   'f11 pressed' : (0, _F(self.toggle_window, win=self.ghost, alias='toggle_ghost')),
@@ -1273,8 +1296,6 @@ class ShellFrame(MiniFrame):
             self.load_session(session or self.SESSION_FILE)
         else:
             self.SESSION_FILE = None
-        
-        self.postInit()
     
     def load_session(self, filename):
         """Load session from file.
@@ -1299,6 +1320,8 @@ class ShellFrame(MiniFrame):
                 exec(i.read())
         except FileNotFoundError:
             pass
+        except Exception as e:
+            print("- Failed to load session:", e)
         self.SESSION_FILE = session
         
         ## Reposition the window if it is not on the desktop.
@@ -1342,34 +1365,6 @@ class ShellFrame(MiniFrame):
                 "self._mgr.Update()\n",
             )))
     
-    def postInit(self):
-        """Set shell and editor styles.
-        Note:
-            This is called after loading session.
-        """
-        from .nutshell import Stylus
-        
-        self.Scratch.set_attributes(Style=Stylus.py_shell_mode)
-        
-        self.Log.set_attributes(ReadOnly=True,
-                                Style=Stylus.py_log_mode)
-        
-        self.Help.set_attributes(ReadOnly=False,
-                                 Style=Stylus.py_log_mode)
-        
-        self.set_hookable(self.Scratch)
-        self.set_hookable(self.Log)
-        
-        @self.Scratch.define_key('C-j')
-        def eval_line(evt):
-            self.Scratch.buffer.eval_line()
-            evt.Skip(False) # Don't skip explicitly.
-        
-        @self.Scratch.define_key('M-j')
-        def eval_buffer(evt):
-            self.Scratch.buffer.exec_region()
-            evt.Skip(False) # Don't skip explicitly.
-    
     def Init(self):
         """Initialize self-specific builtins.
         Note:
@@ -1418,6 +1413,12 @@ class ShellFrame(MiniFrame):
         self._mgr.UnInit()
         return MiniFrame.Destroy(self)
     
+    def Close(self):
+        if self.__standalone:
+            MiniFrame.Close(self)
+        else:
+            self.Show(not self.Shown)
+    
     def OnClose(self, evt):
         if self.debugger.busy:
             if wx.MessageBox( # Confirm closing the debugger.
@@ -1428,7 +1429,7 @@ class ShellFrame(MiniFrame):
                 self.message("The close has been canceled.")
                 evt.Veto()
                 return
-            #? RuntimeError('wrapped C/C++ object ... has been deleted')
+            ## RuntimeError('wrapped C/C++ object ... has been deleted')
             self.Quit()
         
         if self.debugger.tracing:
@@ -1671,7 +1672,7 @@ class ShellFrame(MiniFrame):
             except Exception as e:
                 print(e)
         else:
-            print("- obj is neither a string nor callable")
+            print("- obj must be either a string or a callable.")
     
     def profile(self, obj, *args, **kwargs):
         """Profile a single function call."""
@@ -1692,7 +1693,7 @@ class ShellFrame(MiniFrame):
             except TypeError as e:
                 print(e)
         else:
-            print("- obj must be callable or be a string, bytes or code object")
+            print("- obj must be callable, or a string, bytes, or code object.")
     
     ## Note: history に余計な文字列が入らないようにする
     @postcall
@@ -1869,7 +1870,7 @@ class ShellFrame(MiniFrame):
             shell = next(self.get_all_shells(target))
         except StopIteration:
             shell = self.rootshell.__class__(self, target, name="clone",
-                        style=wx.CLIP_CHILDREN|wx.BORDER_NONE)
+                                             style=wx.CLIP_CHILDREN|wx.BORDER_NONE)
             self.console.AddPage(shell, typename(shell.target))
             self.handler('shell_new', shell)
         self.popup_window(shell)
@@ -1948,7 +1949,7 @@ class ShellFrame(MiniFrame):
     
     __find_target = None
     
-    def on_search_dialog(self, evt):
+    def on_search_dialog(self, evt, flags=0):
         if self.findDlg is not None:
             self.findDlg.SetFocus()
             return
@@ -1957,39 +1958,52 @@ class ShellFrame(MiniFrame):
         if not isinstance(wnd, stc.StyledTextCtrl):
             return
         self.__find_target = wnd
-        self.findData.FindString = wnd.topic_at_caret
+        topic = wnd.topic_at_caret
+        if topic:
+            self.findData.FindString = topic
         self.findData.Flags |= wx.FR_DOWN
-        self.findDlg = wx.FindReplaceDialog(wnd, self.findData, "Find")
+        self.findDlg = wx.FindReplaceDialog(wnd, self.findData, "Find", flags)
         self.findDlg.Show()
     
+    def on_replace_dialog(self, evt):
+        self.on_search_dialog(evt, flags=wx.FR_REPLACEDIALOG)
+    
     def repeat_forward_search(self, evt):
-        self.OnFindNext(evt, direction=True)
+        self.OnFindNext(evt, backward=False)
     
     def repeat_backward_search(self, evt):
-        self.OnFindNext(evt, direction=False)
+        self.OnFindNext(evt, backward=True)
     
-    def OnFindNext(self, evt, direction=None): #<wx._core.FindDialogEvent>
+    def OnFindNext(self, evt, backward=None): #<wx._core.FindDialogEvent>
         if not self.findData.FindString:
             self.message("No last search.")
             return
-        
-        if direction is not None:
-            ## dir = self.findData.Flags & wx.FR_DOWN  # 0:up, 1:down
-            ## if direction != dir:
-            ##     self.findData.Flags ^= wx.FR_DOWN  # toggle up/down flag
-            if direction:
-                self.findData.Flags |= wx.FR_DOWN
-            else:
+        if isinstance(evt, wx.FindDialogEvent):
+            wnd = self.findDlg.Parent
+        else:
+            wnd = evt.EventObject
+            if not isinstance(wnd, stc.StyledTextCtrl):
+                wnd = self.__find_target
+            if backward:
                 self.findData.Flags &= ~wx.FR_DOWN
+            else:
+                self.findData.Flags |= wx.FR_DOWN
         
-        wnd = wx.Window.FindFocus()
-        if not isinstance(wnd, stc.StyledTextCtrl):
-            wnd = self.__find_target
-            if not wnd:
-                return
-        wnd.DoFindNext(self.findData, self.findDlg or wnd)
-        if self.findDlg:
-            self.OnFindClose(None)
+        if evt.EventType == wx.EVT_FIND_REPLACE_ALL.typeId:  # replace-all
+            n = wnd.DoReplaceAll(self.findData)
+            self.message(f"Replaced {n} strings.")
+            if self.findDlg:
+                self.OnFindClose(None)
+            return
+        elif evt.EventType == wx.EVT_FIND_REPLACE.typeId:  # replace
+            loc = wnd.DoReplaceNext(self.findData)
+        else:
+            loc = wnd.DoFindNext(self.findData)
+            if self.findDlg:
+                if not (self.findDlg.WindowStyle & wx.FR_REPLACEDIALOG):  # for search-dialog
+                    self.OnFindClose(None)
+        if loc < 0:
+            self.message("Unable to find the search text.")
     
     def OnFindClose(self, evt): #<wx._core.FindDialogEvent>
         self.findDlg.Destroy()