mwxlib 0.95.3__py3-none-any.whl → 0.95.5__py3-none-any.whl

mwx/controls.py

@@ -896,6 +896,20 @@ class Icon(wx.Bitmap):
             bmp = _getBitmap2(*args, **kwargs)
         wx.Bitmap.__init__(self, bmp)
 
+    @staticmethod
+    def bullet(colour, ec=None, size=None, radius=4):
+        if not size:
+            size = (16,16)
+        bmp = wx.Bitmap(size)
+        with wx.MemoryDC(bmp) as dc:
+            dc.SetBackground(wx.Brush('black'))
+            dc.Clear()
+            dc.SetPen(wx.Pen(ec, style=wx.PENSTYLE_SOLID))
+            dc.SetBrush(wx.Brush(colour, style=wx.BRUSHSTYLE_SOLID))
+            dc.DrawCircle(size[0]//2, size[0]//2, radius)
+        bmp.SetMaskColour('black')
+        return bmp
+
     @staticmethod
     def iconify(icon, w, h):
         ## if wx.VERSION >= (4,1,0):
@@ -930,15 +944,14 @@ def _getBitmap1(key, size=None):
         return bmp
     
     ## Note: null (0-shaped) bitmap fails with AssertionError from 4.1.1
-    if key == '':
+    elif key == '':
         bmp = wx.Bitmap(size or (16,16))
-        if 1:
-            dc = wx.MemoryDC(bmp)
+        with wx.MemoryDC(bmp) as dc:
             dc.SetBackground(wx.Brush('black'))
             dc.Clear()
-            del dc
         bmp.SetMaskColour('black') # return dummy-sized blank bitmap
         return bmp
+    
     return wx.NullBitmap # The standard wx controls accept this,
 
 
@@ -951,9 +964,8 @@ def _getBitmap2(back, fore, size=None, subsize=3/4):
     fore = _getBitmap1(fore, subsize)
     x = size[0] - subsize[0]
     y = size[1] - subsize[1]
-    dc = wx.MemoryDC(back)
-    dc.DrawBitmap(fore, x, y, useMask=True)
-    del dc
+    with wx.MemoryDC(back) as dc:
+        dc.DrawBitmap(fore, x, y, useMask=True)
     return back
 
 

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.95.3"
+__version__ = "0.95.5"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -1116,6 +1116,10 @@ class ShellFrame(MiniFrame):
         self.Log = EditorBook(self, name="Log")
         self.Help = EditorBook(self, name="Help")
         
+        self.Bookshelf = EditorTreeCtrl(self, name="Bookshelf",
+                                        style=wx.TR_DEFAULT_STYLE|wx.TR_HIDE_ROOT)
+        wx.CallAfter(self.Bookshelf.attach, self)
+        
         from .wxpdb import Debugger
         from .wxwit import Inspector
         from .wxmon import EventMonitor
@@ -1147,15 +1151,11 @@ class ShellFrame(MiniFrame):
         self.console.Bind(aui.EVT_AUINOTEBOOK_PAGE_CHANGED, self.OnConsolePageChanged)
         
         self.ghost = AuiNotebook(self, size=(600,400))
-        self.ghost.AddPage(self.Scratch, "Scratch")
+        self.ghost.AddPage(self.Scratch, "Scratch", bitmap=Icon('ghost'))
         self.ghost.AddPage(self.Log, "Log")
         self.ghost.AddPage(self.Help, "Help")
         self.ghost.Name = "ghost"
         
-        self.Bookshelf = EditorTreeCtrl(self, name="Bookshelf",
-                                        style=wx.TR_DEFAULT_STYLE|wx.TR_HIDE_ROOT)
-        self.Bookshelf.attach(self)
-        
         self.ghost.AddPage(self.Bookshelf, "Bookshelf", bitmap=Icon('book'))
         
         self.ghost.SetDropTarget(FileDropLoader(self.Scratch))
@@ -1163,7 +1163,7 @@ class ShellFrame(MiniFrame):
         self.watcher = AuiNotebook(self, size=(300,200))
         self.watcher.AddPage(self.ginfo, "globals")
         self.watcher.AddPage(self.linfo, "locals")
-        self.watcher.AddPage(self.monitor, "Monitor", bitmap=Icon('ghost'))
+        self.watcher.AddPage(self.monitor, "Monitor", bitmap=Icon('tv'))
         self.watcher.AddPage(self.inspector, "Inspector", bitmap=Icon('inspect'))
         self.watcher.Name = "watcher"
         
@@ -1273,14 +1273,17 @@ class ShellFrame(MiniFrame):
         self.set_hookable(self.Log)
         
         @self.Scratch.define_key('C-j')
-        def eval_line():
+        def eval_line(evt):
             shell = self.current_shell
             self.Scratch.buffer.py_eval_line(shell.globals, shell.locals)
+            evt.Skip(False)
         
         @self.Scratch.define_key('C-S-j')
-        def eval_buffer():
+        @self.Scratch.define_key('M-j')
+        def eval_buffer(evt):
             shell = self.current_shell
             self.Scratch.buffer.py_exec_region(shell.globals, shell.locals)
+            evt.Skip(False)
         
         ## Session
         self.SESSION_FILE = get_rootpath(".debrc")

mwx/graphman.py

@@ -594,7 +594,7 @@ class MyFileDropLoader(wx.FileDropTarget):
             elif ext == '.jssn':
                 self.loader.load_session(fn)
             elif ext == '.index':
-                self.loader.import_index(fn, self.view)
+                self.loader.load_index(fn, self.view)
             else:
                 paths.append(fn) # image file just stacks to be loaded
         if paths:
@@ -697,10 +697,10 @@ class Frame(mwx.Frame):
             (),
             ## ("Index", (
             ##     (mwx.ID_(11), "&Import index\tCtrl+Shift+o", "Import index file", Icon('open'),
-            ##         lambda v: self.import_index()),
+            ##         lambda v: self.load_index()),
             ##         
             ##     (mwx.ID_(12), "&Export index\tCtrl+Shift+s", "Export index file", Icon('saveas'),
-            ##         lambda v: self.export_index(),
+            ##         lambda v: self.save_index(),
             ##         lambda v: v.Enable(self.__view.frame is not None)),
             ##     )),
             ("Session", (
@@ -1401,7 +1401,7 @@ class Frame(mwx.Frame):
     ## --------------------------------
     ATTRIBUTESFILE = "results.index"
     
-    def import_index(self, filename=None, view=None):
+    def load_index(self, filename=None, view=None):
         """Load frames :ref to the Index file.
         """
         if not view:
@@ -1433,7 +1433,7 @@ class Frame(mwx.Frame):
         print(self.message.read())
         return frames
     
-    def export_index(self, filename=None, frames=None):
+    def save_index(self, filename=None, frames=None):
         """Save frames :ref to the Index file.
         """
         if not frames:
@@ -1481,6 +1481,9 @@ class Frame(mwx.Frame):
         print(self.message.read())
         return frames
     
+    import_index = load_index # for backward compatibility
+    export_index = save_index # for backward compatibility
+    
     ## --------------------------------
     ## load/save frames and attributes 
     ## --------------------------------

mwx/images.py

@@ -104,21 +104,6 @@ camera = PyEmbeddedImage(
     b'vhvJZFLusf54PC5lMYHI5XKPqa/P6EP3+XyCry4T8E/2BHDoEIdv6fmH92/9Vvz31/gHd9iU'
     b'VZFEDKoAAAAASUVORK5CYII=')
 
-#----------------------------------------------------------------------
-card = PyEmbeddedImage(
-    b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlw'
-    b'SFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoA'
-    b'AAHcSURBVDiNhZM7a5RBGIWf+W4r0SiGKJgIq7ExsfEChiBCLBQECwsbC3vxH9iLIBbqv9Ay'
-    b'CIKFPyAsFkG8rWA0RmOCQTeb3f32S+Y9Fns3H/GFmWbmPDNzzjtOEmemZ+aAq4Dx/wqAt2Y2'
-    b'u1Car0QAkq5cujgTBwEECJxaW6UBpXCIgPKnxanlldU5YDbqXz458pzJsa84BoWt1dZc/nkc'
-    b'768lS99XLgB0ATJjcuwzM9cfErp1ALIsI02bpGmTZrOJOIRKj3mz6rvgLsBkOBxhPEpa/UDa'
-    b'aFCvV6lt/mDjzzeyrMb4sVsEQTjwtN4NBDhHtbLIr+VX1Gp1Go0MFwyzd3icg4WIfftH2w+x'
-    b'HIAJSVQqm2ScIxraZuQAJJERxyKJIQnWkDze5wEkFr4cBT0CtzO7Tr1bOoL3vQ1Rx2OT8aJ0'
-    b'ipevp3BOqD8JdXwCb45iMccDUwtiviNwba0GICDU1269PjAhE6adJ/eDHGDWizHo6Y3V9Q2S'
-    b'OKAQh62R9MaeJKKQhKz93sTbvyYK5I3QbXP78uE877p171kVKScFM2PLQs7euL8rwD+9ieXE'
-    b'qC1vnJiY4GP5fe5faF3UUSwW8SZo/1wnidPnpx8g7giG2LUL2hxoAncXSvNP/gJOse/PFpzV'
-    b'hQAAAABJRU5ErkJggg==')
-
 #----------------------------------------------------------------------
 clip = PyEmbeddedImage(
     b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAAK/INwWK6QAAABl0'
@@ -150,26 +135,6 @@ clock = PyEmbeddedImage(
     b'vqHBv3R3pmbxzgwz4Z+EaTXtwqIogrzjxIJ4QVVV1UyihxgjFv3/K09Bu/lEkBgg5rLZH+fT'
     b'5dvfn7iFAAAAAElFTkSuQmCC')
 
-#----------------------------------------------------------------------
-code = PyEmbeddedImage(
-    b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0'
-    b'RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAL2SURBVDjLVdNNaBx1GMfx78zO'
-    b'7Lu765qQWIPteqiH+IKCjTmkClIVPHi0pVDSXBT0sGhLUOvJl0OL4AuVBC+CLXpoD1KqweBB'
-    b'WFFajOChSTU20q2h6e66nX2Znfm/ejCJ8Qff6+fy8DjWWgCmz9f3AR/cV0pPhtIQSoM0hoEy'
-    b'AdAFmoAG2kAL+Bz41mNzRqmJh0fzk689MczO9YUphsIU25EeExK6sebPZo9v/ugfAKo7gZFC'
-    b'0gGgflvjOw6eAwkPUr7LvSmXhOviJ+CRsQy7irnyp5fW33e3AC1loWQilIGucAgkdDoRQQRB'
-    b'BK0B3OppAF4/e53JSo4HhvzhbSAfBiP7v5pHHZ2mH2kqJ2cZ+uxjwqBPNzb0IstAgAEc3eGn'
-    b'a22WrgfrLoA4Ol2eXfrimZw3QDoeYWyRePh0GZ0/RdTu0o8NfWnAwkYn5sPF1Y4WYtoVR44c'
-    b'NGH01+iwXzT1FvVj76CApUNVxI2ApNNn77EZUrXviZSDsaB9jRKicv7lxxZdM4jm433jabO0'
-    b'Asdn6eTLOC7oQpnfX3gFfrmKnBjnnrmTuFJiLag4RotYA7gmHLyY+LoWmcounBNvYm81cLEk'
-    b'gyaVuXdRe+7GuVijPlPFSfpIren1Q6WE6AC42YsXvjy9e//EtdXbyHyKyqszYOH+946TKHiE'
-    b'bcOVuXMEUwfI+NDqxahYbCy89awFcAEWhvaKj6YO48WQaDTAcXGbDcIA1k6cQuaKYCHruTTa'
-    b'A7SI17eu501Vzw4Bbz84OU6veobvlgW5rubHTy6Q9i2+B8nEvxWysFoPUUJsbANaiKeA535e'
-    b'XqM98OjFFqktsXQQyqC0wVhLuVjkpadHudkK0UI0/gOkfPT5Jx/KvHH48f/9gLYgtUUowMLp'
-    b'hXWyPnR7IVrK1k5g7WYz4MziMqV8hlIhTSmXophLcUc2SSrpkvJcDk2NkPKg8XcXLeWNbcAo'
-    b'da52eWWsdnllN3DXZnduVkwnfT+d9inkMpQKWX69Wv8N+GEL+AdfSH+n2ppttwAAAABJRU5E'
-    b'rkJggg==')
-
 #----------------------------------------------------------------------
 colour = PyEmbeddedImage(
     b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0'
@@ -244,41 +209,6 @@ core = PyEmbeddedImage(
     b'AQgglIQEcp6GhgaDtrY22JmgAAT5HRQOnz9/BqsB5Y2dO3eCNHOAYh8ggOAGgJyKbhgygAUa'
     b'VDMjTBwggMAGTJ48+flvIJCWlpYjlH2RNYMAQIABANLKHICUilYLAAAAAElFTkSuQmCC')
 
-#----------------------------------------------------------------------
-edit = PyEmbeddedImage(
-    b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0'
-    b'RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAH8SURBVDjLjZPfS1NhGMdXf0VE'
-    b'QhDUhdCN4X0IYT8ghIJQM0KoC4vushZddLELKyRhQQkSFIKEGEkUCI2oxVhepG5zi1xbc0u3'
-    b'cDs7Z+ec/ezT+x62scmmHvhwDrzP93Pe57znsQE2cR0SdAm6d+GwYL/M1LBVBV35fF4plUqV'
-    b'crlMK8Q6TqdzYrukJuiW4Vwuh67rdbLZLJlMhmQyaUnigVlC05f4+dbB0tQplp92DsnwPimQ'
-    b'BaZpUigUrLtE0zQURSGVSqHF37DhGkVZeQdagszKLJ7HvZtNAhmuIQWGYaCqKps/ZkivPqCw'
-    b'Ps/Gp0cYvjnKUTe+F9fMJoFoo96zfJZ9K+sLpP33qRhujPANtr7dJPhqmO/PBxX3+PljTYLt'
-    b'qImPpH13qZge9LUrmLEB1FU7sZd9jJw5MljNthYk/KLnxdFqeAjzdz9Z/z3Ck2fRE36qx9pa'
-    b'kAjME1y4Lbb9GTMyTD52GUXsZO3ZadTkL6umrSD4ZZrAezvLH54Q915EjwywtXSH8FQf+t+I'
-    b'9V12FLwe6wE1SmjyAi77Qb6Kt3rGe9H+hKzwrgLH9eMUPE4K3gm8jpPMjRwlHfNTLBbr7Cjo'
-    b'7znA2NVOXA/PsThzi2wyah1pI+0E/9rNQQsqMtM4CyfE36fLhb2ERa0mB7BR0CElexjnGnL0'
-    b'O2T2PyFunSz8jchwAAAAAElFTkSuQmCC')
-
-#----------------------------------------------------------------------
-erase = PyEmbeddedImage(
-    b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0'
-    b'RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAMOSURBVHjaYjx66tobAT4e9n//'
-    b'/zPAwD8g88ePnwy/f/1mePPuI9Of3//ef/78xYOZheUKExMTw+1bNxkaqjPAagECiIWdjY1b'
-    b'U02GgwEJ/Aca9uPXP4a/fxgY7t5/zMDDzcl198Hz/U+evQxlZ2c/gKwWIICYGLAARkZGBqBF'
-    b'DIxM/xiYmJkYJCRFGBysdUXUVeV3srKwhPxDOJYBIIBYsBkAkmcEYjY2Fob7Dx4zvHr5koGL'
-    b'm4Phz++/bJ8+flj979+/IqB0P0gtQABhdQHYFUxAVwBNERURYvj1j5Hh5YuPDHfuPmZg42Bj'
-    b'+PLlQxtMHUAAYXUByHYmoDf+/P7DoGugwfDrBzAwP/9kePf8OQMrKxvDqRNH4WoBAgjhgn9/'
-    b'GRiun2JguHmW4R+Q+wfojz+srAxf7t1jYOoqYmDdu46BlYsb6C1WBmZmZrg2gABCuODJLQaG'
-    b'4zsYGL5+YPj/6B7DV5sQhv8PbzIITqpiYN+7g4FT7hjDb20zBiYxaWAgI1wLEEAIAySVGRjk'
-    b'1RkY9qxjYL45n4H7zFEGpjt3GFgPH2T4LaXE8D6nkYFZRJyBlfEf1JMQABBALDD2DyYg0y6E'
-    b'gfHbTwbWFTMY2K9uZmB49Z7ht5YBw7u6qQy/FTUYmL98YQAmJnA0wwBAALHAAuEPMAgYWZkZ'
-    b'WJg4GBifvmJgePaageHzDwaGp28ZGIGxwAjyO1AfMyMsoiEAIICY/sFC/vcvBrbFkxnYOysY'
-    b'GF5/ZPhrZMHwj1uYgfXsDQZhH1cG9m1AF3FyQW1HuAAggOCxwHJkBwPr1A4GhhdvGH5FJjN8'
-    b'XriT4WvvLIb/fPwMzK9eMQgU5zIwvXrB8B8YjcgAIIAQXjBzYmB08mP4L6PC8CulEJwffvv6'
-    b'MnxYvZGBq6yA4Wt6FsM/XqBhwLSB7AWAAGKBpWtuQT4GhvbpYClWIP77F5SpgLSLHcOv8+eA'
-    b'XvzPwP31FwMLCytKIAIEEMvHT5++tnVO/sPExALNB/+APmQCav4HNuA/NGf8B3P+AzUzMXz5'
-    b'BEyWUAAQYABehgBuH0rveAAAAABJRU5ErkJggg==')
-
 #----------------------------------------------------------------------
 exit = PyEmbeddedImage(
     b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0'
@@ -437,20 +367,6 @@ load = PyEmbeddedImage(
     b'n78wcHADSx8ulhsMHEDMzAiK1m+4qiaAAEINij9/GcAuAcUWKHYYwRmFC1g1tQmIcGd8/f33'
     b'ye/ff7WAEr/AsQjLoWAnQipdWFAABBgAhGIfg4WD5MwAAAAASUVORK5CYII=')
 
-#----------------------------------------------------------------------
-memo = PyEmbeddedImage(
-    b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACEElEQVR4AY2TA5BbUQBFs5mO'
-    b'2kFt2xrVtm2bw9pGWNu2ubZt24y+cZtX//X9xjnPKhK9UbNOZzhrOaM5iaoO+z9Z9msvVWXR'
-    b'6s9YC4sKIMsyqoqjoyOuXb/KntWeWmJcrFYrBKQEAtsoK8yWMpSZS1FaVozi0iIUlRSgoCgP'
-    b'3t5eCAsLw6M9G/gXzRvIjxqqI+80d6j3V0BCBBaruVLJh4/vkR74DW/at0b28ePwGDYYdzo4'
-    b'fFIIKNqG0LBQUt0Kx2XtTrzTTEPyzYPwnz8bHm3b4mFdlaQQMAxNJP/VxARSk6QIF3zQTkOB'
-    b'2xFIrmvhOq4VHtVR4WZ3h3UKAcuxCAsPU5T84ekVvDs7BfmuhyF+X4iY871xfX1D6LcvBWEV'
-    b'Ap7nQCQMS2pCISPeF+81dtjlIETHRYgwdMf1DY1QlBkFwlQQCKKA8PDwXyU/v443pyYi12k/'
-    b'gRGs6YJrGxojIyEIgFy5QJIkIgHPcXh9fDRyHPcRGP6nO+P21lbISY+EyWwCgMoFZC5ERETg'
-    b'7X0NnC7Mgei8Ep7HOuDaxhb4/O4pomOiYbZWLfibA5sn4u6ugbi9sSGe7h2A0sIM0AwFG2WD'
-    b'1WapXsBSJsyf2BOanbORmxQIXuDB/exYhkhAUbaaBGUQWOpvn4ii+FfC2iUsx5CmKgX2lWg1'
-    b'mUyoTQhcVFwIrf6slbC1Xc6Kg/xLGML+APJWxIkWy8dWAAAAAElFTkSuQmCC')
-
 #----------------------------------------------------------------------
 paste = PyEmbeddedImage(
     b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwY'
@@ -578,6 +494,23 @@ saveall = PyEmbeddedImage(
     b'lD3/b0B6tPf2byempRFO127T095JQ6wJFBTcJk7VhCRjYItUT/mgrgxOvWtrPtLdEG8gYdcT'
     b'6gDRGjERWsosrS2TKwbMP78rcth3/gX/0SEvLZFG1QAAAABJRU5ErkJggg==')
 
+#----------------------------------------------------------------------
+script = PyEmbeddedImage(
+    b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0'
+    b'RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJ+SURBVBgZBcExbFRlAADg7//f'
+    b'u7teC3elQEoMgeDkYDQ6oMQQTYyGxMHZuDA6Ypw0cWI20cHJUdl0cJLIiomR6OACGhUCpqGW'
+    b'tlzbu/b97/3v9/tCKQVc/e7RRXz+7OrSpUXbW7S9tu8ddv0M+3iCjF1s42v8WAP0XffKi2eO'
+    b'Xfro9dMAYJ766SL1092jfDa17DfZgycHfvh7/hau1QB9161PhgE8epoNQlAHqprRIDo3iqoY'
+    b'DSpeOjv2zHRl7atfNj6LALltJys1Xc9+CmYtTxtmR8yO2D7kv4MMPr7x0KULK54/NThdA+S2'
+    b'XTs+jOYN86MsxqBGVRErKkEV6BHynp//2fXbw9lGDZBTWp+OK7PDzqIpYiyqSMxBFakUVYVS'
+    b'2dxrfHHrrz1crQG6lM6vTwZmR0UHhSoHsSBTKeoS9YU8yLrUXfj+w9d2IkBOzfkz05F5KkKk'
+    b'CkFERACEQil0TSOnJkMNV67fHNdVHI4GUcpZVFAUZAEExEibs4P5osMeROiadHoUiIEeCgFR'
+    b'EAoRBOMB2weNrkmbNz+9UiBCTs1yrVdHqhgIkRL0EOj7QGG5jrZ2D+XUbADEy9dunOpSun7x'
+    b'uXMe7xUPNrOd/WyeyKUIoRgOGS8xWWZ7b6FLaROgzim9iXd+vXvf7mHtoCnaXDRtkLpel3t9'
+    b'KdamUx+8fcbj7YWc0hZAndv25XffeGH8yfuvAoBcaHOROhS+vLlhecD+wUJu222AOrft/cdP'
+    b'Zr65ddfqsbHVyZLVlZHpysjx5aHRMBrV0XuX141qtnb25bb9F6Duu+7b23funb195955nMRJ'
+    b'nMAJTJeGg8HS0sBkZWx1suz3Px79iZ8A/gd7ijssEaZF9QAAAABJRU5ErkJggg==')
+
 #----------------------------------------------------------------------
 tag = PyEmbeddedImage(
     b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0'

mwx/nutshell.py

@@ -48,8 +48,8 @@ py_where_re = r'> +([^*?"<>|\r\n]+?):([0-9]+)'
 py_break_re = r'at ([^*?"<>|\r\n]+?):([0-9]+)'
 
 
-def skip(v):
-    v.Skip()
+def skip(evt):
+    evt.Skip()
 
 
 def can_edit(f):
@@ -2214,8 +2214,8 @@ class Nautilus(Shell, EditorInterface):
     
         C-up        : [0] retrieve previous history
         C-down      : [0] retrieve next history
-        C-j, C-S-j  : [0] call tooltip of eval (for the word selected or focused)
-        C-h, C-S-h  : [0] call tooltip of help (for the func selected or focused)
+        C-j(J), M-j : [0] call tooltip of eval (for the word selected or focused)
+        C-h(H), M-h : [0] call tooltip of help (for the func selected or focused)
         TAB         : [1] history-comp-mode
         M-p         : [1] retrieve previous history in comp-mode
         M-n         : [1] retrieve next history in comp-mode
@@ -2453,8 +2453,10 @@ class Nautilus(Shell, EditorInterface):
              '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-S-j pressed' : (0, self.exec_region),
                   'C-h pressed' : (0, self.call_helpTip),
+                  'M-h pressed' : (0, self.call_helpTip2),
                 'C-S-h pressed' : (0, self.call_helpTip2),
                     '. pressed' : (2, self.OnEnterDot),
                   'tab pressed' : (1, self.call_history_comp),
@@ -2512,8 +2514,10 @@ class Nautilus(Shell, EditorInterface):
           '*backspace released' : (2, self.call_word_autocomp),
         'C-S-backspace pressed' : (2, ),
                   'C-j pressed' : (2, self.eval_line),
+                  'M-j pressed' : (2, self.exec_region),
                 'C-S-j pressed' : (2, self.exec_region),
                   'C-h pressed' : (2, self.call_helpTip),
+                  'M-h pressed' : (2, self.call_helpTip2),
                 'C-S-h pressed' : (2, self.call_helpTip2),
                  '*alt pressed' : (2, ),
                 '*ctrl pressed' : (2, ),
@@ -2543,8 +2547,10 @@ class Nautilus(Shell, EditorInterface):
           '*backspace released' : (3, self.call_apropos_autocomp),
         'C-S-backspace pressed' : (3, ),
                   'C-j pressed' : (3, self.eval_line),
+                  'M-j pressed' : (3, self.exec_region),
                 'C-S-j pressed' : (3, self.exec_region),
                   'C-h pressed' : (3, self.call_helpTip),
+                  'M-h pressed' : (3, self.call_helpTip2),
                 'C-S-h pressed' : (3, self.call_helpTip2),
                  '*alt pressed' : (3, ),
                 '*ctrl pressed' : (3, ),
@@ -2574,8 +2580,10 @@ class Nautilus(Shell, EditorInterface):
           '*backspace released' : (4, self.call_text_autocomp),
         'C-S-backspace pressed' : (4, ),
                   'C-j pressed' : (4, self.eval_line),
+                  'M-j pressed' : (4, self.exec_region),
                 'C-S-j pressed' : (4, self.exec_region),
                   'C-h pressed' : (4, self.call_helpTip),
+                  'M-h pressed' : (4, self.call_helpTip2),
                 'C-S-h pressed' : (4, self.call_helpTip2),
                  '*alt pressed' : (4, ),
                 '*ctrl pressed' : (4, ),

mwx/plugins/fft_view.py

@@ -40,7 +40,7 @@ class Plugin(Layer):
         self.parent.define_key('C-S-f', None)
         return Layer.Destroy(self)
     
-    def newfft(self, evt):
+    def newfft(self):
         """New FFT of graph to output."""
         frame = self.graph.frame
         if frame:
@@ -58,7 +58,7 @@ class Plugin(Layer):
                                   localunit=u)
             self.message("\b done")
     
-    def newifft(self, evt):
+    def newifft(self):
         """New inverse FFT of output to graph."""
         frame = self.output.frame
         if frame:

mwx/plugins/frame_listview.py

@@ -180,14 +180,14 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
             self.Select(j)
     
     def OnLoadItems(self, evt):
-        self.parent.parent.import_index(view=self.Target)
+        self.parent.parent.load_index(view=self.Target)
     
     def OnSaveItems(self, evt):
         frames = self.Target.all_frames
         selected_frames = [frames[j] for j in self.selected_items]
         if selected_frames:
             self.parent.message("Exporting {} frames.".format(len(selected_frames)))
-            self.parent.parent.export_index(frames=selected_frames)
+            self.parent.parent.save_index(frames=selected_frames)
         else:
             self.parent.message("No frame selected.")
     

mwx/wxwit.py

@@ -157,19 +157,10 @@ class Inspector(it.InspectionTree, CtrlInterface):
             self.SetFocus()
         obj = self.target
         Menu.Popup(self, [
-            (1, "&Dive into the shell", Icon('core'),
-                lambda v: dive(obj),
-                lambda v: v.Enable(obj is not None)),
-                
-            (2, "&Watch the event", Icon('ghost'),
-                lambda v: watch(obj),
-                lambda v: v.Enable(obj is not None)),
-                
-            (),
             (8, "&Filling View", miniIcon('ShowFilling'),
                 lambda v: filling(obj),
                 lambda v: v.Enable(obj is not None)),
-                
+            
             (10, "&Inspection Tool", Icon('inspect'),
                 lambda v: watchit(obj),
                 lambda v: v.Enable(obj is not None)),
@@ -180,6 +171,14 @@ class Inspector(it.InspectionTree, CtrlInterface):
                 
             (12, "Refresh\tf5", miniIcon('Refresh'),
                 lambda v: self.BuildTree(obj)),
+            (),
+            (2, "&Watch event", Icon('tv'),
+                lambda v: watch(obj),
+                lambda v: v.Enable(obj is not None)),
+                
+            (1, "&Dive into {!r}".format(obj), Icon('core'),
+                lambda v: dive(obj),
+                lambda v: v.Enable(obj is not None)),
         ])
 
 

{mwxlib-0.95.3.dist-info → mwxlib-0.95.5.dist-info}/METADATA

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

{mwxlib-0.95.3.dist-info → mwxlib-0.95.5.dist-info}/RECORD

@@ -1,28 +1,28 @@
 mwx/__init__.py,sha256=SNSLQc0IGuE6LDT5mzaAxXRgcH_k6cRVS3gXzFQqdZM,814
 mwx/bookshelf.py,sha256=DAhMQk3_J4rdE50adBMFu5wNz3WdMh_zzJ37O9ncceo,5103
-mwx/controls.py,sha256=JBMUbDgHFf4Dx0PofCdnoQExBnGjxiAeSGkdS_0Qgo4,47673
-mwx/framework.py,sha256=t-d8fgYP_fJ9vTxJ9ZZ7POWK7RNds_-q-iGhEI6IVHU,75531
-mwx/graphman.py,sha256=PacQF1Of6oaqw26uFoXaAK9IrwggGRwoJe9uCP5JZ28,70373
-mwx/images.py,sha256=mrnUYH12I3XLVSZcEXlpVltX0XMxufbl2yRvDIQJZqc,49957
+mwx/controls.py,sha256=mNSDNuIB6BPZxgd2lZXHBFQz7QaIBLy6bZSrD4dp0LI,48161
+mwx/framework.py,sha256=ygT0sB2hCEDB4ObmJCBYka7pWJrGpINmJ3zqopyleWk,75669
+mwx/graphman.py,sha256=OMO2HQGfeCCGON8MwabmhLYsA-YHKueKaepsJkTDP0c,70489
+mwx/images.py,sha256=gyvqW4TLWdJMKmsaWiPiV_PuHJM1GbHgeELERLwGzg8,45291
 mwx/matplot2.py,sha256=nA7RLW1tf5kQfrenFnrAF900DbrpOUldc3SGaJgJKi0,32794
 mwx/matplot2g.py,sha256=faKpuBdp4H_g-HKfRdxV17AwHtXcfRi2F0myE3cjM04,65393
 mwx/matplot2lg.py,sha256=gI_L_GofQrg5TIgZFMgYu8-7IRoe6VCRG3Ub35ChSpQ,27177
 mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
-mwx/nutshell.py,sha256=mGWw2biIKyunTMyrRbLHNdmFLpxVCIP5UTsaeS2m4gw,136594
+mwx/nutshell.py,sha256=ENxoeqSfVaogh2dz43fk3MQaCePKyoz1YzucwiCojxI,137070
 mwx/utilus.py,sha256=Uwj6vbNUUztwOswPG75xtsT2y_PZqh3QiJraxmA9iT0,37401
 mwx/wxmon.py,sha256=6es-jVz9Ht7vZnG7VBJcaNYLHY0PnZtij60SXcZRTeY,12727
 mwx/wxpdb.py,sha256=lLowkkAgMhPFHAfklD7wZHq0qbSMjRxnBFtSajmVgME,19133
 mwx/wxwil.py,sha256=zP1-5Fpi1wpDQU977229zIH6QRuSkkyfuAlNKWjGoGg,5588
-mwx/wxwit.py,sha256=7jR7WPu0-ZxTA6F_SQc7ZjlR9mNO21GFfriTZqV6Ly0,7344
+mwx/wxwit.py,sha256=yU6XeCCWRBP7CLmpphjT072PfXAL30DNaxoChDX2p0I,7322
 mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
 mwx/plugins/ffmpeg_view.py,sha256=vUYNybIJsF1JGkDzjBgDyBQvDh8e1oKHlEMY5Fwc8L4,9399
-mwx/plugins/fft_view.py,sha256=evj2kCe6N10JQczW8IajgLVrUWOihQaHQ2xiBzAsAl4,2675
-mwx/plugins/frame_listview.py,sha256=fY27r_8ttf2hi-T0CPgY_LGbH9xKkQmSIqgaALMyVCM,10112
+mwx/plugins/fft_view.py,sha256=HcnBr-y_yFdSfASPRzMLANta4SwSDShd65QWnCU3XhM,2665
+mwx/plugins/frame_listview.py,sha256=RaYOj-YKrpLqhT8TkBRDX1TQnSPv90V185j8OjrWJTs,10108
 mwx/plugins/line_profile.py,sha256=--9NIc3x5EfRB3L59JvD7rzENQHyiYfu7wWJo6AuMkA,820
 mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=KaHooM32hrGGgqw75Cbt8lAvACwC6RXadob9LGgNnEc,16806
-mwxlib-0.95.3.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.95.3.dist-info/METADATA,sha256=zRgIwaO-S04HK4GufhqvHET5KYJTKeyIfct8i36pHXw,1925
-mwxlib-0.95.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mwxlib-0.95.3.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.95.3.dist-info/RECORD,,
+mwxlib-0.95.5.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.95.5.dist-info/METADATA,sha256=VSx9T74u5-4ID0njjolKRXbZSsbYe_UP8HQ9AzCfTQA,1925
+mwxlib-0.95.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mwxlib-0.95.5.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.95.5.dist-info/RECORD,,