mwxlib 1.0.1__py3-none-any.whl → 1.0.4__py3-none-any.whl

mwx/controls.py

@@ -465,7 +465,13 @@ class Knob(wx.Panel):
             self.text.BackgroundColour = c
             self.text.Refresh()
     
-    def shift(self, evt, bit):
+    def shift_ctrl(self, evt, bit):
+        """Called when a key/mouse wheel is pressed/scrolled.
+        
+        In addition to direct key input to the textctrl,
+        [up][down][wheelup][wheeldown] keys can be used,
+        with modifiers S- 2x, C- 16x, and M- 256x steps.
+        """
         if bit:
             if evt.ShiftDown():   bit *= 2
             if evt.ControlDown(): bit *= 16
@@ -485,13 +491,13 @@ class Knob(wx.Panel):
         evt.Skip()
     
     def OnMouseWheel(self, evt): #<wx._core.MouseEvent>
-        self.shift(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>
         key = evt.GetKeyCode()
-        if key == wx.WXK_LEFT: return self.shift(evt, -1)
-        if key == wx.WXK_RIGHT: return self.shift(evt, 1)
+        if key == wx.WXK_LEFT: return self.shift_ctrl(evt, -1)
+        if key == wx.WXK_RIGHT: return self.shift_ctrl(evt, 1)
         
         def _focus(c):
             if isinstance(c, Knob) and c.ctrl.IsEnabled():
@@ -508,8 +514,8 @@ class Knob(wx.Panel):
     
     def OnTextKeyDown(self, evt): #<wx._core.KeyEvent>
         key = evt.GetKeyCode()
-        if key == wx.WXK_DOWN: return self.shift(evt, -1)
-        if key == wx.WXK_UP: return self.shift(evt, 1)
+        if key == wx.WXK_DOWN: return self.shift_ctrl(evt, -1)
+        if key == wx.WXK_UP: return self.shift_ctrl(evt, 1)
         if key == wx.WXK_ESCAPE:
             self.__par.reset(self.__par.value, internal_callback=None) # restore value
         evt.Skip()
@@ -957,7 +963,7 @@ class Icon(wx.Bitmap):
 
 
 class ClassicButton(wx.Button):
-    """Flat button
+    """Classic button
     
     Args:
         label   : button label
@@ -1035,7 +1041,7 @@ class ToggleButton(wx.ToggleButton):
 
 
 class TextCtrl(wx.Control):
-    """Text panel
+    """Text control
     
     Args:
         label   : button label
@@ -1089,7 +1095,7 @@ class TextCtrl(wx.Control):
 
 
 class Choice(wx.Control):
-    """Editable Choice (ComboBox) panel
+    """Editable Choice (ComboBox) control
     
     Args:
         label   : button label

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.0.1"
+__version__ = "1.0.4"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager

mwx/graphman.py

@@ -964,11 +964,6 @@ class Frame(mwx.Frame):
             else:
                 win.handler('page_closed', win)
         
-        if pane.dock_direction:
-            pane.Dock()
-        else:
-            pane.Float()
-        
         ## Modify the floating position of the pane when displayed.
         ## Note: This is a known bug in wxWidgets 3.17 -- 3.20,
         ##       and will be fixed in wxPython 4.2.1.
@@ -1000,6 +995,11 @@ class Frame(mwx.Frame):
                 pane.CaptionVisible(False)       # no caption bar
                 pane.Gripper(dock not in (0, 5)) # show a grip when docked
             pane.Dockable(dock)
+        
+        if pane.dock_direction:
+            pane.Dock()
+        else:
+            pane.Float()
     
     def OnPaneClose(self, evt): #<wx.aui.AuiManagerEvent>
         pane = evt.GetPane()

mwx/nutshell.py

@@ -147,10 +147,14 @@ def can_edit(f):
 def ask(f, prompt="Enter value", type=str):
     """Get response from the user using a dialog box."""
     @wraps(f)
-    def _f(*v):
-        with wx.TextEntryDialog(None, prompt, f.__name__) as dlg:
+    def _f(evt, value=''):
+        with wx.TextEntryDialog(None, prompt, f.__name__, value) as dlg:
             if dlg.ShowModal() == wx.ID_OK:
-                return f(type(dlg.Value))
+                value = dlg.Value
+                try:
+                    return f(type(value))
+                except ValueError:
+                    return _f(evt, value) # show the prompt again
     return _f
 
 
@@ -499,9 +503,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
                   ## 'C-/ pressed' : (0, ), # cf. C-a home
                   ## 'C-\ pressed' : (0, ), # cf. C-e end
                   'C-; pressed' : (0, _F(self.comment_out_line)),
-                'C-S-; pressed' : (0, _F(self.comment_out_line)),
                   'C-: pressed' : (0, _F(self.uncomment_line)),
-                'C-S-: pressed' : (0, _F(self.uncomment_line)),
                   'select_line' : (11, self.on_linesel_begin),
                  'select_lines' : (11, self.on_linesel_next),
             },
@@ -633,10 +635,10 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         self.IndicatorSetForeground(10, "red")
         
         self.IndicatorSetStyle(11, stc.STC_INDIC_STRAIGHTBOX)
+        self.IndicatorSetForeground(11, "yellow")
         self.IndicatorSetUnder(11, True)
-        self.IndicatorSetAlpha(11, 60)
-        self.IndicatorSetOutlineAlpha(11, 60)
-        self.IndicatorSetForeground(11, "light gray")
+        self.IndicatorSetAlpha(11, 0xe8)
+        self.IndicatorSetOutlineAlpha(11, 0)
         
         self.IndicatorSetStyle(2, stc.STC_INDIC_DOTS)
         self.IndicatorSetForeground(2, "light gray")
@@ -2433,10 +2435,14 @@ class EditorBook(AuiNotebook, CtrlInterface):
                 self.swap_buffer(buf, lineno)
                 return True
             return False
+        except FileNotFoundError:
+            self.post_message(f"New file: {filename!r}.")
+            self.delete_buffer(buf)
+            return False
         except Exception as e:
             self.post_message(f"Failed to load {filename!r}.", e)
             self.delete_buffer(buf)
-            return False
+            raise
     
     def find_file(self, filename=None):
         """Open the specified file."""
@@ -2449,7 +2455,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
                     for fn in dlg.Paths:
                         self.find_file(fn)
             return
-        if not self.load_file(filename):
+        if self.load_file(filename) == False:
             buf = self.create_buffer(filename)
             buf._Buffer__mtime = 0 # => need_buffer_save
             self.swap_buffer(buf)

{mwxlib-1.0.1.dist-info → mwxlib-1.0.4.dist-info}/METADATA

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

{mwxlib-1.0.1.dist-info → mwxlib-1.0.4.dist-info}/RECORD

@@ -1,14 +1,14 @@
 mwx/__init__.py,sha256=psabnAMei5VzB2TsB2qBNLrIZMX0LiqjlXCpNGmDejk,668
 mwx/bookshelf.py,sha256=so-xSLq08sMlJBErTxOaDoKUAMa_g1CkIP2pNnff68c,5607
-mwx/controls.py,sha256=LZqee9K8uPxs-Iqcp1zMMNBjFpGPrHbcMaIBuBOL7oo,47647
-mwx/framework.py,sha256=arqDZTKqvvqydF1aNWER1QzJMs5VqHa4B5Bb8x-QPwk,75809
-mwx/graphman.py,sha256=1GGBk4kJYRQ7zkvO2rvHxHoINrIfHSB7cabQKWhTyaI,69669
+mwx/controls.py,sha256=iXNTk4ge6sHStenjxC7bFKgQHvqxMwfb82IbgiDmtEk,47944
+mwx/framework.py,sha256=PZwNHchv_Z1sDUaPTR1d90Bt0UV6mNx_X53Nnekd0tA,75809
+mwx/graphman.py,sha256=mDnhy3jAzZCo8_p6ZcA-NDPMuOyW_R2r_fuxUIAM7D8,69669
 mwx/images.py,sha256=oxCn0P-emiWujSS2gUgU5TUnr5cPjix2jBcjOBDr24I,48701
 mwx/matplot2.py,sha256=zA56jIdRUdzu-wrmPai1PSOjzqV2Erqw2yFKW-jwdA8,32901
 mwx/matplot2g.py,sha256=diwWNxzyy-c8KBDaolHaMqWdFXSYhEumgwXIZ9wAEYk,64467
 mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
 mwx/mgplt.py,sha256=M5rt-H7Uq1OHnlFvMA4a3945UBvppbR9L_mw8NL_YZ0,5602
-mwx/nutshell.py,sha256=pNGLBlVYz6D4LNjosCjXaopcITkQ2-qGVQ6zGmVJJYQ,141850
+mwx/nutshell.py,sha256=blsRL7RDJ3C4Dkiq6Jg09INF1ROfEdWi274IohR2Lpk,142048
 mwx/utilus.py,sha256=Yyw8L1f-ikhyd7wtFXYtsOswofWxmB4GAmLOZnhUXeU,37388
 mwx/wxmon.py,sha256=yzWqrbY6LzpfRwQeytYUeqFhFuLVm_XEvrVAL_k0HBQ,12756
 mwx/wxpdb.py,sha256=--TQr-_zs9dWPYV2V4s3Zr4abvN14o5wD8anT9frHUg,18875
@@ -21,8 +21,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.0.1.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-1.0.1.dist-info/METADATA,sha256=wAEdiChVsOWS6L8ggO5JeupCCFlHu-AkEfpd1dPq4PU,7259
-mwxlib-1.0.1.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-mwxlib-1.0.1.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.0.1.dist-info/RECORD,,
+mwxlib-1.0.4.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-1.0.4.dist-info/METADATA,sha256=xUi5IB8tDvqX39GOIY2xmz-W765moTc-xpV_9G9eGLs,7259
+mwxlib-1.0.4.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+mwxlib-1.0.4.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.0.4.dist-info/RECORD,,

{mwxlib-1.0.1.dist-info → mwxlib-1.0.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any