Improve restart dialogs

Author: HelioGuilherme66

src/robotide/application/application.py

@@ -15,6 +15,8 @@
 
 import builtins
 import os
+from csv import excel
+
 import wx
 from contextlib import contextmanager
 from pathlib import Path
@@ -332,24 +334,25 @@ def change_locale(self, message):
         self._locale.AddCatalog('RIDE')
         if len(message.keys) > 1:  # Avoid initial setting
             from multiprocessing import shared_memory
-            from .restartutil import restart_dialog
+            from .restartutil import do_restart
             new_locale = self._locale.GetName()
             # print(f"DEBUG: application.py RIDE change_locale from {initial_locale} to {new_locale}")
             if initial_locale != new_locale:
-                if restart_dialog():  # DEBUG: See the in implementation why we don't restart
-                    # print("DEBUG: application.py RIDE change_locale Restart accepted.")
-                    # Shared memory to store language definition
+                #if restart_dialog():  # DEBUG: See the in implementation why we don't restart
+                # print("DEBUG: application.py RIDE change_locale Restart accepted.")
+                # Shared memory to store language definition
+                try:
+                    sharemem = shared_memory.ShareableList(['en'], name="language")
+                except FileExistsError:  # Other instance created file
+                    sharemem = shared_memory.ShareableList(name="language")
+                result = do_restart()
+                if result:
                     try:
-                        sharemem = shared_memory.ShareableList(['en'], name="language")
-                    except FileExistsError:  # Other instance created file
-                        sharemem = shared_memory.ShareableList(name="language")
-                    finally:
                         sharemem.shm.close()
                         sharemem.shm.unlink()
-                    # wx.CallAfter(self.ExitMainLoop)
-                    # wx.CallLater(1000, self.Destroy)
-                    wx.CallLater(1000, self.ExitMainLoop)
-                    # self.DeletePendingEvents()
+                    except FileNotFoundError:
+                        pass
+
 
     @staticmethod
     def update_excludes(message):

src/robotide/application/restartutil.py

@@ -27,8 +27,7 @@
 
 
 def restart_dialog():
-    if not _askyesno(
-           _("Re-open RIDE for Language Change"),
+    if not _askyesno(_("Re-open RIDE for Language Change"),
             f"{SPC}{_('Language change will only be correct after re-opening RIDE.')}"
             f"{SPC}\n{SPC}{_('Do you want to CLOSE RIDE now?')}\n{SPC}"
             # f"{_('After restarting RIDE you will see another dialog informing to close this RIDE instance.')}"
@@ -41,16 +40,15 @@ def restart_dialog():
 
 def do_restart():
     my_pid = psutil.Process()
-    command = sys.executable + " -m robotide.__init__ --noupdatecheck"
     # DEBUG: The starting of new RIDE instance with subsequent closing of this instance,
     # makes problems in editing the current file, and even opening new file. Because of
-    # this, the restarting is disabled, until someone finds a good way to clean-up memory.
-    # wx.CallLater(100, subprocess.Popen, command.split(' '), start_new_session=True)
-    # Wait 10 seconds before trying to kill this process
-    """ Not working well:
-    wx.CallLater(10000, psutil.Process.kill, my_pid.pid)
-    """
-    wx.CallLater(5000, _askyesno, _("Completed Language Change"),
-                 f"\n{SPC}{_('You should close this RIDE (Process ID = ')}{my_pid.pid}){SPC}",
-                 wx.GetActiveWindow())
-
+    # this, the restarting was disabled, until someone finds a good way to clean-up memory.
+    command = sys.executable + " -m robotide.__init__ --noupdatecheck"
+    wx.CallLater(500, subprocess.Popen, command.split(' '), start_new_session=True)
+    result = _askyesno(_("Completed Language Change"),
+                       f"\n{SPC}{_('You should close this RIDE (Process ID = ')}{my_pid.pid}){SPC}"
+                       f"\n{SPC}{_('Do you want to CLOSE RIDE now?')}\n{SPC}",
+                       wx.GetActiveWindow())
+    if result:
+        wx.CallLater(1000, wx.App.Get().GetTopWindow().Close)
+        return True

src/robotide/application/updatenotifier.py

@@ -175,14 +175,14 @@ def start_upgraded(message):
     __ = message
     command = sys.executable + " -m robotide.__init__ --noupdatecheck"
     wx.CallLater(500, subprocess.Popen, command.split(' '), start_new_session=True)
-    pid = psutil.Process
-    result = _askyesno(_("Completed Upgrade"), f"\n{SPC}{_('You should close this RIDE (Process ID = ')}{pid}){SPC}",
+    p = psutil.Process()
+    result = _askyesno(_("Completed Upgrade"), f"\n{SPC}{_('You should close this RIDE (Process ID = ')}{p.pid}){SPC}"
+                                               f"\n{SPC}{_('Do you want to CLOSE RIDE now?')}\n{SPC}",
                        wx.GetActiveWindow())
     PUBLISHER.unsubscribe(start_upgraded, RideRunnerStopped)
     if result:
-        time.sleep(10)
-        wx.CallAfter(wx.App.Get().Close)
-        # wx.App.Get().OnExit()
+        wx.CallAfter(wx.App.Get().GetTopWindow().Close)
+        # wx.CallAfter(p.terminate)
 
 
 class LocalHtmlWindow(HtmlWindow):