codeallyadvanced 2.4.0__tar.gz → 2.4.2__tar.gz

{codeallyadvanced-2.4.0/src/codeallyadvanced.egg-info → codeallyadvanced-2.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeallyadvanced
-Version: 2.4.0
+Version: 2.4.2
 Summary: Humberto`s Common wxPython UI Stuff
 Author-email: "Humberto A. Sanchez II" <Humberto.A.Sanchez.II@gmail.com>
 Maintainer-email: "Humberto A. Sanchez II" <Humberto.A.Sanchez.II@gmail.com>

codeallyadvanced-2.4.2/src/codeallyadvanced/_version.py

@@ -0,0 +1 @@
+__version__: str = '2.4.2'

{codeallyadvanced-2.4.0 → codeallyadvanced-2.4.2}/src/codeallyadvanced/ui/mystic/Mystic.py

@@ -12,6 +12,7 @@ from wx import CANCEL
 from wx import ID_ANY
 from wx import CAPTION
 from wx import ID_CANCEL
+from wx import EVT_CLOSE
 from wx import CLOSE_BOX
 from wx import EVT_BUTTON
 from wx import STAY_ON_TOP
@@ -22,6 +23,8 @@ from wx import Bitmap
 from wx import Window
 from wx import CommandEvent
 from wx import StaticBitmap
+from wx import GUIEventLoop
+from wx import EventLoopActivator
 
 from wx import NewIdRef as wxNewIdRef
 
@@ -37,7 +40,6 @@ from codeallyadvanced.resources.mystic.back16 import embeddedImage as backButton
 
 from codeallyadvanced.resources.mystic.MageBitMap import embeddedImage as mageImage
 
-from codeallyadvanced.ui.mystic.MysticPanel import MysticPanel
 from codeallyadvanced.ui.mystic.MysticStepBase import MysticStepBase
 
 BUTTON_NEXT_TEXT:   str = 'Next'
@@ -57,6 +59,8 @@ MysticBaseSteps = NewType('MysticBaseSteps', List[MysticStepBase])
 ComputeNextStepCallback = Callable[[MysticStepBase], int]
 ComputeBackStepCallback = Callable[[MysticStepBase], int]
 
+NO_EVENT_LOOP: GUIEventLoop = cast(GUIEventLoop, None)      # noqa
+
 
 class Mystic(SizedDialog):
     """
@@ -97,9 +101,11 @@ class Mystic(SizedDialog):
         self._backStepCallback: ComputeBackStepCallback | None = backCallback
 
         self._steps:            MysticBaseSteps = MysticBaseSteps([])
-        self._stepNumber:       int       = 0
+        self._stepNumber:       int       = 0       # Used to control navigation
         self._wizardSuccessful: bool      = True
 
+        self._addedStepNumber: int = 0
+
         # Outer panel holds buttons and side by side panel
         sizedPanel: SizedPanel = self.GetContentsPane()
         sizedPanel.SetSizerType('vertical')
@@ -127,6 +133,9 @@ class Mystic(SizedDialog):
         )
         self._logo.SetSizerProps(proportion=1, halign='left', valign='center')
 
+        self._eventLoop: GUIEventLoop = NO_EVENT_LOOP
+        self.Bind(EVT_CLOSE, self._onClose)
+
     @property
     def pageContainer(self) -> SizedPanel:
         """
@@ -145,8 +154,11 @@ class Mystic(SizedDialog):
         Args:
             mysticStep:
         """
+        mysticStep.stepNumber = self._addedStepNumber
         self._steps.append(mysticStep)
 
+        self._addedStepNumber += 1
+
         mysticStep.Hide()
         self.Layout()
 
@@ -162,17 +174,34 @@ class Mystic(SizedDialog):
 
         self._btnBack.Disable()
 
-        ans = self.ShowModal()
-        if ans == CANCEL:
+        self.Show()
+        self._eventLoop = GUIEventLoop()
+        with EventLoopActivator(self._eventLoop):
+            self._eventLoop.Run()
+
+        self._eventLoop = NO_EVENT_LOOP
+
+        if self.GetReturnCode() == CANCEL:
             self.logger.info('Cancel pressed')
             return MYSTIC_CANCELLED
         else:
             return MYSTIC_FINISHED
 
+    # noinspection PyUnusedLocal
+    def _onClose(self, event: CommandEvent):
+        self._endMystic(CANCEL)
+
     # noinspection PyUnusedLocal
     def _onCancel(self, event: CommandEvent):
         self._wizardSuccessful = False
-        self.EndModal(CANCEL)
+        self._endMystic(CANCEL)
+
+    def _endMystic(self, returnCode: int):
+
+        self.SetReturnCode(returnCode)
+        if self._eventLoop is not None and self._eventLoop.IsRunning():
+            self._eventLoop.Exit()
+        self.Hide()
 
     # noinspection PyUnusedLocal
     def _onNext(self, event: CommandEvent):
@@ -198,7 +227,7 @@ class Mystic(SizedDialog):
         if pageCount - 1 == self._stepNumber:
             self._btnNext.SetLabel(BUTTON_FINISH_TEXT)
         elif pageCount == self._stepNumber:
-            self.EndModal(OK)
+            self._endMystic(OK)
             return                  # Ugh.  short cut out
 
         self._btnBack.SetLabel(BUTTON_BACK_TEXT)

{codeallyadvanced-2.4.0 → codeallyadvanced-2.4.2}/src/codeallyadvanced/ui/mystic/MysticStepBase.py

@@ -25,6 +25,16 @@ class MysticStepBase(MysticPanel):
 
         super().__init__(parent=parent)
 
+        self._stepNumber: int = 0
+
+    @property
+    def stepNumber(self) -> int:
+        return self._stepNumber
+
+    @stepNumber.setter
+    def stepNumber(self, stepNumber: int):
+        self._stepNumber = stepNumber
+
     def validate(self) -> bool:
         """
 

{codeallyadvanced-2.4.0 → codeallyadvanced-2.4.2/src/codeallyadvanced.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeallyadvanced
-Version: 2.4.0
+Version: 2.4.2
 Summary: Humberto`s Common wxPython UI Stuff
 Author-email: "Humberto A. Sanchez II" <Humberto.A.Sanchez.II@gmail.com>
 Maintainer-email: "Humberto A. Sanchez II" <Humberto.A.Sanchez.II@gmail.com>

codeallyadvanced-2.4.0/src/codeallyadvanced/_version.py

@@ -1 +0,0 @@
-__version__: str = '2.4.0'