Merge branch 'restart-after-import-settings'

theotime2005 · Dec 23, 2024 · 8db2d25 · 8db2d25
2 parents 9cc2475 + 5737cc7
commit 8db2d25
Show file tree

Hide file tree

Showing 55 changed files with 146,602 additions and 144,219 deletions.
diff --git a/bnote/apps/fman/file_manager_app.py b/bnote/apps/fman/file_manager_app.py
@@ -2733,7 +2733,7 @@ def __activate_child(self, read_only=False):
                     self._current_dialog = ui.UiMessageDialogBox(
                         name=_("warning"),
                         message=_(
-                            "this file will be replace the existing settings file, do you want to continue?"
+                            "this file will be replace the existing settings file, do you want to continue? B;note will be restarted."
                         ),
                         buttons=[
                             ui.UiButton(name=_("&yes"), action=self.__import_settings),
@@ -2821,12 +2821,10 @@ def __import_settings(self):
                 action=self._exec_cancel_dialog,
             )
             return
-        self._current_dialog = ui.UiInfoDialogBox(
-            message=_("imported settings."), action=self._exec_cancel_dialog
-        )
-        # for section, section_data in Settings().data.items():
-        #     for key in section_data:
-        #         self._put_in_function_queue(FunctionId.FUNCTION_SETTINGS_CHANGE, **{'section': section, 'key': key})
+        # Restart bnote
+        self._current_dialog = ui.UiInfoDialogBox(message=_("restarting..."))
+        time.sleep(1.0)
+        self._put_in_function_queue(FunctionId.ASK_TERMINATE_BNOTE_AND_RESTART_SERVICE)
 
     def __activate_parent(self, *args, **kwargs):
         # User must stay in his user space.

diff --git a/bnote/apps/settings/settings_app.py b/bnote/apps/settings/settings_app.py
@@ -3539,7 +3539,9 @@ def _exec_valid_import_settings(self):
             path = ui_files.get_extra_parameters()[ui_files.get_index()]
             self._current_dialog = ui.UiMessageDialogBox(
                 name=_("warning"),
-                message=_("this file will be replace the existing settings file. Do you want to continue?"),
+                message=_(
+                    "this file will be replace the existing settings file, do you want to continue? B;note will be restarted."
+                ),
                 buttons=[
                     ui.UiButton(name=_("&yes"), action=self._exec_yes_import, action_param={'path': path}),
                     ui.UiButton(name=_("&no"), action=self._exec_cancel_dialog),
@@ -3555,9 +3557,7 @@ def _exec_yes_import(self, path):
                 message=_("failed to import the file, check the source and try again."),
                 action=self._exec_cancel_dialog)
             return
-        for section, section_data in Settings().data.items():
-            for key in section_data:
-                self._put_in_function_queue(
-                    FunctionId.FUNCTION_SETTINGS_CHANGE,
-                    **{"section": section, "key": key},
-                )
+        # Restart bnote
+        self._current_dialog = ui.UiInfoDialogBox(message=_("restarting..."))
+        time.sleep(1.0)
+        self._put_in_function_queue(FunctionId.ASK_TERMINATE_BNOTE_AND_RESTART_SERVICE)
diff --git a/bnote/translation/bnote.pot b/bnote/translation/bnote.pot
diff --git a/bnote/translation/bnote_af_ZA.po b/bnote/translation/bnote_af_ZA.po
diff --git a/bnote/translation/bnote_af_ZA.po~ b/bnote/translation/bnote_af_ZA.po~
diff --git a/bnote/translation/bnote_ar_LB.po b/bnote/translation/bnote_ar_LB.po
diff --git a/bnote/translation/bnote_ar_LB.po~ b/bnote/translation/bnote_ar_LB.po~
diff --git a/bnote/translation/bnote_bg_BG.po b/bnote/translation/bnote_bg_BG.po
diff --git a/bnote/translation/bnote_bg_BG.po~ b/bnote/translation/bnote_bg_BG.po~
diff --git a/bnote/translation/bnote_cs_CZ.po b/bnote/translation/bnote_cs_CZ.po
diff --git a/bnote/translation/bnote_cs_CZ.po~ b/bnote/translation/bnote_cs_CZ.po~
diff --git a/bnote/translation/bnote_de_DE.po b/bnote/translation/bnote_de_DE.po
diff --git a/bnote/translation/bnote_de_DE.po~ b/bnote/translation/bnote_de_DE.po~
diff --git a/bnote/translation/bnote_el_GR.po b/bnote/translation/bnote_el_GR.po
diff --git a/bnote/translation/bnote_el_GR.po~ b/bnote/translation/bnote_el_GR.po~
diff --git a/bnote/translation/bnote_en_GB.po b/bnote/translation/bnote_en_GB.po
diff --git a/bnote/translation/bnote_en_GB.po~ b/bnote/translation/bnote_en_GB.po~
diff --git a/bnote/translation/bnote_en_US.po b/bnote/translation/bnote_en_US.po
diff --git a/bnote/translation/bnote_en_US.po~ b/bnote/translation/bnote_en_US.po~
diff --git a/bnote/translation/bnote_es_ES.po b/bnote/translation/bnote_es_ES.po
diff --git a/bnote/translation/bnote_es_ES.po~ b/bnote/translation/bnote_es_ES.po~
diff --git a/bnote/translation/bnote_fr_FR.po b/bnote/translation/bnote_fr_FR.po
diff --git a/bnote/translation/bnote_fr_FR.po~ b/bnote/translation/bnote_fr_FR.po~
diff --git a/bnote/translation/bnote_he_IL.po b/bnote/translation/bnote_he_IL.po
diff --git a/bnote/translation/bnote_he_IL.po~ b/bnote/translation/bnote_he_IL.po~
diff --git a/bnote/translation/bnote_hr_HR.po b/bnote/translation/bnote_hr_HR.po
diff --git a/bnote/translation/bnote_hr_HR.po~ b/bnote/translation/bnote_hr_HR.po~
diff --git a/bnote/translation/bnote_is_IS.po b/bnote/translation/bnote_is_IS.po
diff --git a/bnote/translation/bnote_is_IS.po~ b/bnote/translation/bnote_is_IS.po~
diff --git a/bnote/translation/bnote_it_IT.po b/bnote/translation/bnote_it_IT.po
diff --git a/bnote/translation/bnote_it_IT.po~ b/bnote/translation/bnote_it_IT.po~
diff --git a/bnote/translation/bnote_nb_NO.po b/bnote/translation/bnote_nb_NO.po
diff --git a/bnote/translation/bnote_nb_NO.po~ b/bnote/translation/bnote_nb_NO.po~
diff --git a/bnote/translation/bnote_nl_BE.po b/bnote/translation/bnote_nl_BE.po
diff --git a/bnote/translation/bnote_nl_BE.po~ b/bnote/translation/bnote_nl_BE.po~
diff --git a/bnote/translation/bnote_nl_NL.po b/bnote/translation/bnote_nl_NL.po
diff --git a/bnote/translation/bnote_nl_NL.po~ b/bnote/translation/bnote_nl_NL.po~
diff --git a/bnote/translation/bnote_pl_PL.po b/bnote/translation/bnote_pl_PL.po
diff --git a/bnote/translation/bnote_pl_PL.po~ b/bnote/translation/bnote_pl_PL.po~
diff --git a/bnote/translation/bnote_pt_PT.po b/bnote/translation/bnote_pt_PT.po
diff --git a/bnote/translation/bnote_pt_PT.po~ b/bnote/translation/bnote_pt_PT.po~
diff --git a/bnote/translation/bnote_sk_SK.po b/bnote/translation/bnote_sk_SK.po
diff --git a/bnote/translation/bnote_sk_SK.po~ b/bnote/translation/bnote_sk_SK.po~
diff --git a/bnote/translation/bnote_sl_SI.po b/bnote/translation/bnote_sl_SI.po
diff --git a/bnote/translation/bnote_sl_SI.po~ b/bnote/translation/bnote_sl_SI.po~
diff --git a/bnote/translation/bnote_sv_SE.po b/bnote/translation/bnote_sv_SE.po
diff --git a/bnote/translation/bnote_sv_SE.po~ b/bnote/translation/bnote_sv_SE.po~
diff --git a/bnote/translation/bnote_sw_KE.po b/bnote/translation/bnote_sw_KE.po
diff --git a/bnote/translation/bnote_sw_KE.po~ b/bnote/translation/bnote_sw_KE.po~
diff --git a/bnote/translation/bnote_xh_ZA.po b/bnote/translation/bnote_xh_ZA.po
diff --git a/bnote/translation/bnote_xh_ZA.po~ b/bnote/translation/bnote_xh_ZA.po~
diff --git a/bnote/translation/bnote_zh_TW.po b/bnote/translation/bnote_zh_TW.po
diff --git a/bnote/translation/bnote_zh_TW.po~ b/bnote/translation/bnote_zh_TW.po~
diff --git a/bnote/translation/bnote_zu_ZA.po b/bnote/translation/bnote_zu_ZA.po
diff --git a/bnote/translation/bnote_zu_ZA.po~ b/bnote/translation/bnote_zu_ZA.po~