mwxlib 1.3.11__py3-none-any.whl → 1.4.0__py3-none-any.whl

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.3.11"
+__version__ = "1.4.0"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -1420,7 +1420,7 @@ class ShellFrame(MiniFrame):
     
     def OnClose(self, evt):
         if self.debugger.busy:
-            if wx.MessageBox( # Confirm debugger close.
+            if wx.MessageBox( # Confirm closing the debugger.
                     "The debugger is running.\n\n"
                     "Enter [q]uit to exit before closing.\n"
                     "Continue closing?",
@@ -1441,7 +1441,7 @@ class ShellFrame(MiniFrame):
                 if buf.need_buffer_save:
                     self.popup_window(book)
                     buf.SetFocus()
-                    if wx.MessageBox( # Confirm close.
+                    if wx.MessageBox( # Confirm closing the buffer.
                             "You are closing unsaved content.\n\n"
                             "Changes to the content will be discarded.\n"
                             "Continue closing?",

mwx/graphman.py

@@ -152,32 +152,38 @@ class Thread:
             raise KeyboardInterrupt("terminated by user")
         return True
     
-    def pause(self, msg="Pausing..."):
+    def pause(self, msg=None, caption=wx.MessageBoxCaptionStr):
         """Pause the thread.
+        Confirm whether to terminate the thread.
         
-        Use ``check`` method where you want to pause.
+        Returns:
+            True  : [OK] if terminating.
+            False : [CANCEL] otherwise.
         
         Note:
+            Use ``check`` method where you want to pause.
             Even after the message dialog is displayed, the thread
             does not suspend until check (or event.wait) is called.
         """
         if not self.running:
             return None
-        if '\n\n' not in msg:
-            msg += '\n\n'
+        if not msg:
+            msg = ("The thread is running.\n\n"
+                   "Do you want to terminate the thread?")
         try:
             self.event.clear() # suspend
-            if wx.MessageBox(  # Confirm terminatation.
-                    msg + "Do you want to terminate the process?",
+            if wx.MessageBox(  # Confirm closing the thread.
+                    msg, caption,
                     style=wx.OK|wx.CANCEL|wx.ICON_WARNING) == wx.OK:
                 self.Stop()
-                return False
-            return True
+                return True
+            return False
         finally:
             self.event.set() # resume
     
     def Start(self, f, *args, **kwargs):
-        """Start the thread to run the specified function."""
+        """Start the thread to run the specified function.
+        """
         @wraps(f)
         def _f(*v, **kw):
             try:
@@ -213,7 +219,10 @@ class Thread:
     def Stop(self):
         """Stop the thread.
         
-        Use ``check`` method where you want to quit.
+        Note:
+            Use ``check`` method where you want to stop.
+            Even after the message dialog is displayed, the thread
+            does not suspend until check (or event.wait) is called.
         """
         def _stop():
             with wx.BusyInfo("One moment please, "
@@ -876,20 +885,17 @@ class Frame(mwx.Frame):
         for name in self.plugins:
             plug = self.get_plug(name)
             if plug.thread and plug.thread.active:
-                if wx.MessageBox( # Confirm thread close.
+                if not plug.thread.pause( # Confirm closing the thread.
                         "The thread is running.\n\n"
-                        "Enter [q]uit to exit before closing.\n"
                         "Continue closing?",
-                        "Close {!r}".format(plug.Name),
-                        style=wx.YES_NO|wx.ICON_INFORMATION) != wx.YES:
+                        "Close {!r}".format(plug.Name)):
                     self.message("The close has been canceled.")
                     evt.Veto()
                     return
-                self.Quit()
-                break
+        ## self.Quit()
         for frame in self.graph.get_all_frames():
             if frame.pathname is None:
-                if wx.MessageBox( # Confirm close.
+                if wx.MessageBox( # Confirm closing the frame.
                         "You are closing unsaved frame.\n\n"
                         "Continue closing?",
                         "Close {!r}".format(frame.name),

mwx/nutshell.py

@@ -2216,7 +2216,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
     def OnPageClose(self, evt): #<wx._aui.AuiNotebookEvent>
         buf = self.GetPage(evt.Selection)
         if buf.need_buffer_save:
-            if wx.MessageBox( # Confirm close.
+            if wx.MessageBox( # Confirm closing the buffer.
                     "You are closing unsaved content.\n\n"
                     "The changes will be discarded.\n"
                     "Continue closing?",
@@ -2414,7 +2414,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
         if not buf:
             buf = self.create_buffer("*temp file*")
         elif buf.need_buffer_save and verbose:
-            if wx.MessageBox( # Confirm load.
+            if wx.MessageBox( # Confirm loading the buffer.
                     "You are leaving unsaved content.\n\n"
                     "The changes will be discarded.\n"
                     "Continue loading?",
@@ -2468,7 +2468,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
         buf = buf or self.buffer
         if buf.need_buffer_load and verbose:
             self.swap_buffer(buf)
-            if wx.MessageBox( # Confirm save.
+            if wx.MessageBox( # Confirm saving the buffer.
                     "The file has been modified externally.\n\n"
                     "The contents of the file will be overwritten.\n"
                     "Continue saving?",
@@ -2532,7 +2532,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
         """Confirm the close with the dialog."""
         buf = buf or self.buffer
         if buf.need_buffer_save:
-            if wx.MessageBox( # Confirm close.
+            if wx.MessageBox( # Confirm closing the buffer.
                     "You are closing unsaved content.\n\n"
                     "The changes will be discarded.\n"
                     "Continue closing?",
@@ -2545,7 +2545,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
     def kill_all_buffers(self):
         for buf in self.get_all_buffers():
             if buf.need_buffer_save:
-                if wx.MessageBox( # Confirm close.
+                if wx.MessageBox( # Confirm closing the buffer.
                         "You are closing unsaved content.\n\n"
                         "The changes will be discarded.\n"
                         "Continue closing?",

{mwxlib-1.3.11.dist-info → mwxlib-1.4.0.dist-info}/METADATA

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

{mwxlib-1.3.11.dist-info → mwxlib-1.4.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
 mwx/__init__.py,sha256=pS7ZG8QKRypiFFiaWAq_opBB6I_1viZ0zUMk2TbjzE0,667
 mwx/bookshelf.py,sha256=MXjrm_ryRGHvOFKu8wb10qz_oka70xW2yFbYjBMYfns,8140
 mwx/controls.py,sha256=RssTROprNfgnRMiWVOoSSd8Fy0qwZ8DCrYM2f5Wgr4E,48610
-mwx/framework.py,sha256=9H26L5rF3rxpBm0wInvt3oNhB9si6xNR-K5PbIoVx5c,76778
-mwx/graphman.py,sha256=qA_tNq_9A5eNuujzmxha8ponAIQxZmMtJQkRkojuVYo,70398
+mwx/framework.py,sha256=X7zjAxKXIYMbaXU7g1q2rfRFsnCh2bNiA8sMzEJN_8M,76796
+mwx/graphman.py,sha256=ICZ-3jtGEGcPR0zoHYgIVW3FM3UgIVHJslGjvlhAlqI,70648
 mwx/images.py,sha256=oxCn0P-emiWujSS2gUgU5TUnr5cPjix2jBcjOBDr24I,48701
 mwx/matplot2.py,sha256=Htwegq6N5G7oKSRCuajik5Dixd93i8PKVbkL7Azy99M,33150
 mwx/matplot2g.py,sha256=H1PeLJk5P0KKMT6tmocpli5RSPNjnteA5GhbJTKEqIg,64869
 mwx/matplot2lg.py,sha256=cb0EZXivccDQu4oFj5ddSUF9pEE4f5UuFJJK2ELItww,27404
 mwx/mgplt.py,sha256=8mXbHpCmm7lz3XbAxOg7IVC7DaSGBEby1UfTlMl9kjk,5604
-mwx/nutshell.py,sha256=XrPBcOCeUbnKi5-JjlpmZinkIJINimNsS82SXRxfv_s,142391
+mwx/nutshell.py,sha256=OWCSRtghve7-95HmITPqVQSIhZ8ynn-ogT3x1ArF4-M,142457
 mwx/testsuite.py,sha256=Zk75onPSEn2tf0swS3l-vIn6yTXGB7allIyvJsPHj20,1229
 mwx/utilus.py,sha256=bDeooo2bOcZwvkIdi0ElkT-qoblqzHNFsIveb72NFOo,37528
 mwx/wxmon.py,sha256=yzWqrbY6LzpfRwQeytYUeqFhFuLVm_XEvrVAL_k0HBQ,12756
@@ -22,7 +22,7 @@ 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.3.11.dist-info/METADATA,sha256=q5aFmjTSmVGQcb9lCf1xvhagruldOzi0LgMAJi3yClI,7434
-mwxlib-1.3.11.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-mwxlib-1.3.11.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.3.11.dist-info/RECORD,,
+mwxlib-1.4.0.dist-info/METADATA,sha256=F1uYpz9nBr7BREiBeITTadez9ugPpmwrw9L1S6Cdz_c,7433
+mwxlib-1.4.0.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mwxlib-1.4.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.4.0.dist-info/RECORD,,