Fix for #62

- Added blocking loading screen that doesn't freeze the UI when blocking is required.

- Before closing #62, be sure to test on macOS that the multithreading isn't a problem

Author: macarooni-man

source/locales.json

@@ -13088,5 +13088,65 @@
   "pt": "Revis\u00e3o do CreateServer",
   "sv": "CreateServerReview",
   "fi": "CreateServerReview"
+ },
+ "error: failed to set dpi context": {
+  "fr": "Erreur\u00a0: \u00e9chec de la d\u00e9finition du contexte DPI",
+  "it": "Errore: impossibile impostare il contesto DPI",
+  "es": "Error: no se pudo establecer el contexto DPI",
+  "de": "Fehler: DPI-Kontext konnte nicht festgelegt werden",
+  "nl": "Fout: kan de DPI-context niet instellen",
+  "pt": "Erro: falha ao definir o contexto de DPI",
+  "sv": "Fel: Det gick inte att st\u00e4lla in DPI-kontext",
+  "fi": "Virhe: DPI-kontekstin asettaminen ep\u00e4onnistui"
+ },
+ "broadcast()": {
+  "es": "transmisi\u00f3n()",
+  "fr": "diffuser()",
+  "it": "trasmissione()",
+  "de": "\u00fcbertragen()",
+  "nl": "uitzending()",
+  "pt": "transmiss\u00e3o()",
+  "sv": "uts\u00e4nda()",
+  "fi": "l\u00e4hett\u00e4\u00e4()"
+ },
+ "error deleting file/folder during restore:": {
+  "es": "Error al eliminar el archivo/carpeta durante la restauraci\u00f3n:",
+  "fr": "Erreur lors de la suppression du fichier/dossier lors de la restauration\u00a0:",
+  "it": "Errore durante l'eliminazione di file/cartelle durante il ripristino:",
+  "de": "Fehler beim L\u00f6schen der Datei/des Ordners w\u00e4hrend der Wiederherstellung:",
+  "nl": "Fout bij verwijderen van bestand/map tijdens herstel:",
+  "pt": "Erro ao excluir arquivo/pasta durante a restaura\u00e7\u00e3o:",
+  "sv": "Fel vid borttagning av fil/mapp under \u00e5terst\u00e4llning:",
+  "fi": "Virhe poistettaessa tiedostoa/kansiota palautuksen aikana:"
+ },
+ "auto-mcs was updated to v\\$\\$ successfully!": {
+  "es": "\u00a1auto-mcs se actualiz\u00f3 a v\\$\\$ exitosamente!",
+  "fr": "auto-mcs a \u00e9t\u00e9 mis \u00e0 jour vers v\\$\\$ avec succ\u00e8s !",
+  "it": "auto-mcs \u00e8 stato aggiornato con successo a v\\$\\$!",
+  "de": "auto-mcs wurde erfolgreich auf v\\$\\$ aktualisiert!",
+  "nl": "auto-mcs is succesvol bijgewerkt naar v\\$\\$!",
+  "pt": "auto-mcs foi atualizado para v\\$\\$ com sucesso!",
+  "sv": "auto-mcs uppdaterades till v\\$\\$ framg\u00e5ngsrikt!",
+  "fi": "auto-mcs p\u00e4ivitettiin muotoon v\\$\\$ onnistuneesti!"
+ },
+ "success": {
+  "es": "\u00e9xito",
+  "fr": "succ\u00e8s",
+  "it": "successo",
+  "de": "Erfolg",
+  "nl": "succes",
+  "pt": "sucesso",
+  "sv": "Framg\u00e5ng",
+  "fi": "menestys"
+ },
+ "initialized ngrok connection '": {
+  "es": "Conexi\u00f3n ngrok inicializada '",
+  "fr": "Connexion ngrok initialis\u00e9e '",
+  "it": "Connessione ngrok inizializzata '",
+  "de": "Ngrok-Verbindung initialisiert '",
+  "nl": "Ge\u00efnitialiseerde ngrok-verbinding '",
+  "pt": "Conex\u00e3o ngrok inicializada '",
+  "sv": "Initialiserad ngrok-anslutning '",
+  "fi": "Aloitettu ngrok-yhteys '"
  }
 }

source/menu.py

@@ -7790,6 +7790,9 @@ def show_search(self):
         if "ProgressScreen" in self.__class__.__name__:
             return
 
+        if "BlurredLoadingScreen" in self.__class__.__name__:
+            return
+
         if self.context_menu:
             self.context_menu.hide()
 
@@ -8485,6 +8488,101 @@ def __init__(self, **kwargs):
         self.timer = threading.Timer(0, self.execute_steps)
         self.timer.start()
 
+# Blurred loading screen for blocking operations
+class BlurredLoadingScreen(MenuBackground):
+
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        self.name = self.__class__.__name__
+        self.menu = 'init'
+        self._ignore_tree = True
+
+        self.generating_background = False
+        self.blur_background = None
+        self.load_icon = None
+        self.load_label = None
+
+    def generate_blur_background(self, *args):
+        image_path = os.path.join(constants.gui_assets, 'live', 'blur_background.png')
+        constants.folder_check(os.path.join(constants.gui_assets, 'live'))
+
+        if not self.generating_background:
+            self.generating_background = True
+            self.blur_background.opacity = 0
+
+            screen_manager.get_screen(constants.screen_tree[-1]).export_to_png(image_path)
+            im = PILImage.open(image_path)
+            im = ImageEnhance.Brightness(im)
+            im = im.enhance(popup_blur_darkness)
+            im1 = im.filter(GaussianBlur(popup_blur_amount))
+            im1.save(image_path)
+            self.blur_background.reload()
+
+            self.blur_background.opacity = 1
+
+    def on_pre_enter(self, *args):
+        super().on_pre_enter()
+        constants.ignore_close = True
+
+    def on_leave(self, *args):
+        super().on_leave()
+        constants.ignore_close = False
+
+    def resize_self(self, *args):
+        self.load_label.x = (Window.width / 2) - 75
+        self.load_icon.x = (Window.width / 2) - 160
+
+
+    def generate_menu(self, **kwargs):
+        # Generate buttons on page load
+
+        float_layout = FloatLayout()
+        float_layout.id = 'content'
+
+        # Blurred background
+        self.blur_background = Image()
+        self.blur_background.opacity = 0
+        self.blur_background.id = "blur_background"
+        self.blur_background.source = os.path.join(constants.gui_assets, 'live', 'blur_background.png')
+        self.blur_background.allow_stretch = True
+        self.blur_background.keep_ratio = False
+        self.generating_background = False
+        float_layout.add_widget(self.blur_background)
+        Clock.schedule_once(self.generate_blur_background, -1)
+
+
+        # Loading icon to swap button
+        self.load_icon = AsyncImage()
+        self.load_icon.id = "load_icon"
+        self.load_icon.source = os.path.join(constants.gui_assets, 'animations', 'loading_pickaxe.gif')
+        self.load_icon.size_hint_max = (65, 65)
+        self.load_icon.color = (0.8, 0.8, 1, 1)
+        self.load_icon.pos_hint = {"center_y": 0.5}
+        self.load_icon.allow_stretch = True
+        self.load_icon.anim_delay = constants.anim_speed * 0.02
+        float_layout.add_widget(self.load_icon)
+
+
+        # Loading label
+        self.load_label = AlignLabel()
+        self.load_label.halign = 'left'
+        self.load_label.valign = 'center'
+        self.load_label.id = 'label'
+        self.load_label.size_hint_max = (300, 50)
+        self.load_label.pos_hint = {"center_y": 0.5}
+        self.load_label.text = 'please wait...'
+        self.load_label.font_size = sp(35)
+        self.load_label.font_name = os.path.join(constants.gui_assets, 'fonts', f'{constants.fonts["bold"]}.ttf')
+        self.load_label.color = (0.8, 0.8, 1, 1)
+        float_layout.add_widget(self.load_label)
+
+
+        self.blur_background.size_hint_min = Window.size
+        float_layout.bind(pos=self.resize_self, size=self.resize_self)
+
+        self.add_widget(float_layout)
+
+
 # </editor-fold> ///////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
@@ -21791,37 +21889,54 @@ def migrate_server(*a):
         transilience_layout = GridLayout(cols=1, spacing=10, size_hint_max_x=1050, size_hint_y=None, padding=[0, 0, 0, 0])
 
         def rename_server(name, *args):
+            def loading_screen(*a):
+                screen_manager.current = 'BlurredLoadingScreen'
+            Clock.schedule_once(loading_screen, 0)
 
             # Actually rename the server files
             server_obj.rename(name)
 
             # Change header and footer text to reflect change
-            self.remove_widget(self.title_widget)
-            self.remove_widget(self.footer_widget)
-            del self.title_widget
-            del self.footer_widget
-            self.title_widget = generate_title(f"Server Settings: '{name}'")
-            self.footer_widget = generate_footer(f"{name}, Settings", color='EFD49E')
-            self.add_widget(self.title_widget)
-            self.add_widget(self.footer_widget)
-
-            # Display banner to show success
-            Clock.schedule_once(
-                functools.partial(
-                    screen_manager.current_screen.show_banner,
-                    (0.553, 0.902, 0.675, 1),
-                    f"Server renamed to '${name}$' successfully!",
-                    "rename.png",
-                    2.5,
-                    {"center_x": 0.5, "center_y": 0.965}
-                ), 0
-            )
+            def change_data(*a):
+                def go_back(*a):
+                    screen_manager.current = 'ServerSettingsScreen'
+                    effect_y = screen_manager.current_screen.scroll_widget.effect_y
+                    screen_manager.current_screen.scroll_widget.effect_y = None
+                    screen_manager.current_screen.scroll_widget.scroll_y = 0
+                    def reset_effect(*a):
+                        screen_manager.current_screen.scroll_widget.effect_y = effect_y
+                    Clock.schedule_once(reset_effect, 0)
+                Clock.schedule_once(go_back, 0)
+
+                self.remove_widget(self.title_widget)
+                self.remove_widget(self.footer_widget)
+                del self.title_widget
+                del self.footer_widget
+                self.title_widget = generate_title(f"Server Settings: '{name}'")
+                self.footer_widget = generate_footer(f"{name}, Settings", color='EFD49E')
+                self.add_widget(self.title_widget)
+                self.add_widget(self.footer_widget)
+
+                # Display banner to show success
+                Clock.schedule_once(
+                    functools.partial(
+                        screen_manager.current_screen.show_banner,
+                        (0.553, 0.902, 0.675, 1),
+                        f"Server renamed to '${name}$' successfully!",
+                        "rename.png",
+                        2.5,
+                        {"center_x": 0.5, "center_y": 0.965}
+                    ), 0
+                )
+            Clock.schedule_once(change_data, 0)
+        def rename_thread(name, *a):
+            threading.Timer(0, functools.partial(rename_server, name)).start()
 
         # Rename server input
         sub_layout = ScrollItem()
         input_label = InputLabel(pos_hint={"center_x": 0.5, "center_y": 1.2})
         sub_layout.add_widget(input_label)
-        self.rename_input = ServerRenameInput(pos_hint={'center_x': 0.5, 'center_y': 0.5}, text=server_obj.name, on_validate=rename_server, disabled=server_obj.running)
+        self.rename_input = ServerRenameInput(pos_hint={'center_x': 0.5, 'center_y': 0.5}, text=server_obj.name, on_validate=rename_thread, disabled=server_obj.running)
         self.rename_input.size_hint_max_x = 435
         sub_layout.add_widget(self.rename_input)
         transilience_layout.add_widget(sub_layout)
@@ -21843,6 +21958,10 @@ def change_world(*a):
 
         # Delete server button
         def delete_server(*args):
+            def loading_screen(*a):
+                screen_manager.current = 'BlurredLoadingScreen'
+            Clock.schedule_once(loading_screen, 0)
+
             server_name = server_obj.name
             server_obj.delete()
             constants.server_manager.current_server = None
@@ -21866,14 +21985,16 @@ def switch_screens(*a):
                     ), 0.1
                 )
             Clock.schedule_once(switch_screens, 0.5)
+        def timer_delete(*a):
+            threading.Timer(0, delete_server).start()
         def prompt_delete(*args):
             Clock.schedule_once(
                 functools.partial(
                     screen_manager.current_screen.show_popup,
                     "warning_query",
                     f"Delete '${server_obj.name}$'",
                     "Do you want to permanently delete this server?\n\nThis action cannot be undone\n(Your server can be re-imported from a back-up later)",
-                    (None, functools.partial(Clock.schedule_once, delete_server, 0.5))
+                    (None, functools.partial(Clock.schedule_once, timer_delete, 0.5))
                 ),
                 0
             )