From 8aae503e35bcf39a39b9b04ed196d77004ea0b41 Mon Sep 17 00:00:00 2001
From: DYefremov <dmitriy.v.yefremov@gmail.com>
Date: Sat, 12 Jan 2019 18:10:04 +0300
Subject: [PATCH]  support of setting backup path

---
 app/properties.py                             |   2 +
 app/ui/backup.py                              |  22 ++++++--
 app/ui/backup_dialog.glade                    |   1 +
 app/ui/lang/ru/LC_MESSAGES/demon-editor.mo    | Bin 14663 -> 14775 bytes
 app/ui/main_app_window.py                     |   2 +-
 app/ui/settings_dialog.glade                  |  53 +++++++++++++-----
 app/ui/settings_dialog.py                     |  51 ++++++++---------
 .../locale/ru/LC_MESSAGES/demon-editor.mo     | Bin 14663 -> 14775 bytes
 po/ru/demon-editor.po                         |   6 ++
 9 files changed, 93 insertions(+), 44 deletions(-)

diff --git a/app/properties.py b/app/properties.py
index a6f3a1a9..b27984d2 100644
--- a/app/properties.py
+++ b/app/properties.py
@@ -45,6 +45,7 @@ def get_default_settings():
             "services_path": "/etc/enigma2/", "user_bouquet_path": "/etc/enigma2/",
             "satellites_xml_path": "/etc/tuxbox/", "data_dir_path": DATA_PATH + "enigma2/",
             "picons_path": "/usr/share/enigma2/picon", "picons_dir_path": DATA_PATH + "enigma2/picons/",
+            "backup_dir_path": DATA_PATH + "enigma2/backup/",
             "backup_before_save": True, "backup_before_downloading": True,
             "v5_support": False, "http_api_support": False,
             "use_colors": True, "new_color": "rgb(255,230,204)", "extra_color": "rgb(179,230,204)"},
@@ -55,6 +56,7 @@ def get_default_settings():
             "services_path": "/var/tuxbox/config/zapit/", "user_bouquet_path": "/var/tuxbox/config/zapit/",
             "satellites_xml_path": "/var/tuxbox/config/", "data_dir_path": DATA_PATH + "neutrino/",
             "picons_path": "/usr/share/tuxbox/neutrino/icons/logo/", "picons_dir_path": DATA_PATH + "neutrino/picons/",
+            "backup_dir_path": DATA_PATH + "neutrino/backup/",
             "backup_before_save": True, "backup_before_downloading": True},
         "profile": Profile.ENIGMA_2.value}
 
diff --git a/app/ui/backup.py b/app/ui/backup.py
index 09603d9d..6f611c11 100644
--- a/app/ui/backup.py
+++ b/app/ui/backup.py
@@ -7,7 +7,7 @@ from datetime import datetime
 from enum import Enum
 
 from app.commons import run_idle
-from app.properties import Profile
+from app.properties import Profile, get_default_settings
 from app.ui.dialogs import show_dialog, DialogType
 from app.ui.main_helper import append_text_to_tview
 from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH
@@ -19,22 +19,25 @@ class RestoreType(Enum):
 
 
 class BackupDialog:
-    def __init__(self, transient, data_path, profile, callback):
+    def __init__(self, transient, options, profile, callback):
         handlers = {"on_restore_bouquets": self.on_restore_bouquets,
                     "on_restore_all": self.on_restore_all,
                     "on_remove": self.on_remove,
                     "on_view_popup_menu": self.on_view_popup_menu,
                     "on_info_button_toggled": self.on_info_button_toggled,
                     "on_info_bar_close": self.on_info_bar_close,
-                    "on_cursor_changed": self.on_cursor_changed}
+                    "on_cursor_changed": self.on_cursor_changed,
+                    "on_resize": self.on_resize}
 
         builder = Gtk.Builder()
         builder.set_translation_domain("demon-editor")
         builder.add_from_file(UI_RESOURCES_PATH + "backup_dialog.glade")
         builder.connect_signals(handlers)
 
-        self._data_path = data_path
-        self._backup_path = data_path + "backup/"
+        def_settings = get_default_settings().get(profile.value)
+        self._options = options.get(profile.value)
+        self._data_path = options.get("data_dir_path", def_settings["data_dir_path"])
+        self._backup_path = options.get("backup_dir_path", def_settings["backup_dir_path"])
         self._profile = profile
         self._open_data_callback = callback
         self._dialog_window = builder.get_object("dialog_window")
@@ -46,6 +49,11 @@ class BackupDialog:
         self._info_check_button = builder.get_object("info_check_button")
         self._info_bar = builder.get_object("info_bar")
         self._message_label = builder.get_object("message_label")
+        # Setting the last size of the dialog window if it was saved
+        window_size = self._options.get("backup_tool_window_size", None)
+        if window_size:
+            self._dialog_window.resize(*window_size)
+            
         self.init_data()
 
     def show(self):
@@ -157,6 +165,10 @@ class BackupDialog:
             self.show_info_message("Done!", Gtk.MessageType.INFO)
             self._open_data_callback(self._data_path)
 
+    def on_resize(self, window):
+        if self._options:
+            self._options["backup_tool_window_size"] = window.get_size()
+
 
 def backup_data(path):
     """ Creating data backup from a folder at the specified path """
diff --git a/app/ui/backup_dialog.glade b/app/ui/backup_dialog.glade
index 94c95b86..87da6f06 100644
--- a/app/ui/backup_dialog.glade
+++ b/app/ui/backup_dialog.glade
@@ -50,6 +50,7 @@ Author: Dmitriy Yefremov
     <property name="destroy_with_parent">True</property>
     <property name="icon_name">document-revert</property>
     <property name="gravity">center</property>
+    <signal name="check-resize" handler="on_resize" swapped="no"/>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header_bar">
         <property name="visible">True</property>
diff --git a/app/ui/lang/ru/LC_MESSAGES/demon-editor.mo b/app/ui/lang/ru/LC_MESSAGES/demon-editor.mo
index 6f2022d407261ad1887a7b7a1b23bf6c05dd3131..0aff6bcd2f9a0f8558505ebb595b40fc8481c668 100644
GIT binary patch
delta 4434
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
AzyJUM

delta 4331
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
br<adOSQ%4Zm0S^79vduZP(Ht7X6^p~J>Qqb

diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py
index 8b1ea954..0788b666 100644
--- a/app/ui/main_app_window.py
+++ b/app/ui/main_app_window.py
@@ -1295,7 +1295,7 @@ class Application(Gtk.Application):
     def on_backup_tool_show(self, item):
         """ Shows backup tool dialog """
         BackupDialog(self._main_window,
-                     self._options.get(self._profile).get("data_dir_path", ""),
+                     self._options,
                      Profile(self._profile),
                      self.open_data).show()
 
diff --git a/app/ui/settings_dialog.glade b/app/ui/settings_dialog.glade
index 3a10729d..39a93854 100644
--- a/app/ui/settings_dialog.glade
+++ b/app/ui/settings_dialog.glade
@@ -727,7 +727,7 @@ Author: Dmitriy Yefremov
                             <property name="row_spacing">2</property>
                             <property name="column_homogeneous">True</property>
                             <child>
-                              <object class="GtkLabel" id="label5">
+                              <object class="GtkLabel" id="services_label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Services and Bouquets files:</property>
@@ -751,8 +751,7 @@ Author: Dmitriy Yefremov
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="label6">
-                                <property name="visible">True</property>
+                              <object class="GtkLabel" id="user_bouquet_label">
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">User bouquet files:</property>
                                 <property name="xalign">2.2351741291171123e-10</property>
@@ -764,8 +763,6 @@ Author: Dmitriy Yefremov
                             </child>
                             <child>
                               <object class="GtkEntry" id="user_bouquet_field">
-                                <property name="visible">True</property>
-                                <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
                                 <property name="text">/etc/enigma2/</property>
                                 <property name="primary_icon_stock">gtk-edit</property>
@@ -776,7 +773,7 @@ Author: Dmitriy Yefremov
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="label7">
+                              <object class="GtkLabel" id="satellites_xml_label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Satellites.xml file:</property>
@@ -800,7 +797,7 @@ Author: Dmitriy Yefremov
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="label20">
+                              <object class="GtkLabel" id="picons_label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Picons:</property>
@@ -855,7 +852,7 @@ Author: Dmitriy Yefremov
                             <property name="row_spacing">2</property>
                             <property name="column_homogeneous">True</property>
                             <child>
-                              <object class="GtkLabel" id="label18">
+                              <object class="GtkLabel" id="picons_dir_label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Picons path:</property>
@@ -872,8 +869,10 @@ Author: Dmitriy Yefremov
                                 <property name="can_focus">True</property>
                                 <property name="text">/data/picons</property>
                                 <property name="primary_icon_stock">gtk-edit</property>
-                                <property name="secondary_icon_name">folder-open-symbolic</property>
-                                <signal name="icon-press" handler="on_picons_dir_field_icon_press" swapped="no"/>
+                                <property name="secondary_icon_name">folder-open</property>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_tooltip_text" translatable="yes">Select</property>
+                                <signal name="icon-press" handler="on_field_icon_press" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -881,7 +880,7 @@ Author: Dmitriy Yefremov
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="label8">
+                              <object class="GtkLabel" id="data_dir_label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Data path:</property>
@@ -899,17 +898,45 @@ Author: Dmitriy Yefremov
                                 <property name="can_focus">True</property>
                                 <property name="text">/data</property>
                                 <property name="primary_icon_stock">gtk-edit</property>
-                                <property name="secondary_icon_name">folder-open-symbolic</property>
+                                <property name="secondary_icon_name">folder-open</property>
                                 <property name="primary_icon_activatable">False</property>
                                 <property name="secondary_icon_tooltip_text" translatable="yes">Select</property>
                                 <property name="secondary_icon_tooltip_markup" translatable="yes">Select</property>
-                                <signal name="icon-press" handler="on_data_dir_field_icon_press" swapped="no"/>
+                                <signal name="icon-press" handler="on_field_icon_press" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
                                 <property name="top_attach">1</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkLabel" id="backup_dir_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Backup path:</property>
+                                <property name="xalign">0.019999999552965164</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">4</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="backup_dir_field">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="text" translatable="yes">/data/backup</property>
+                                <property name="primary_icon_stock">gtk-edit</property>
+                                <property name="secondary_icon_name">folder-open</property>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_tooltip_text" translatable="yes">Select</property>
+                                <signal name="icon-press" handler="on_field_icon_press" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">5</property>
+                              </packing>
+                            </child>
                           </object>
                         </child>
                         <child type="label">
diff --git a/app/ui/settings_dialog.py b/app/ui/settings_dialog.py
index 44386504..4d1feaab 100644
--- a/app/ui/settings_dialog.py
+++ b/app/ui/settings_dialog.py
@@ -23,8 +23,7 @@ class Property(Enum):
 class SettingsDialog:
 
     def __init__(self, transient, options):
-        handlers = {"on_data_dir_field_icon_press": self.on_data_dir_field_icon_press,
-                    "on_picons_dir_field_icon_press": self.on_picons_dir_field_icon_press,
+        handlers = {"on_field_icon_press": self.on_field_icon_press,
                     "on_profile_changed": self.on_profile_changed,
                     "on_reset": self.on_reset,
                     "apply_settings": self.apply_settings,
@@ -60,6 +59,7 @@ class SettingsDialog:
         self._data_dir_field = builder.get_object("data_dir_field")
         self._picons_field = builder.get_object("picons_field")
         self._picons_dir_field = builder.get_object("picons_dir_field")
+        self._backup_dir_field = builder.get_object("backup_dir_field")
         # Info bar
         self._info_bar = builder.get_object("info_bar")
         self._message_label = builder.get_object("info_bar_message_label")
@@ -98,10 +98,7 @@ class SettingsDialog:
 
         return response
 
-    def on_data_dir_field_icon_press(self, entry, icon, event_button):
-        update_entry_data(entry, self._dialog, self._options.get(self._options.get("profile")))
-
-    def on_picons_dir_field_icon_press(self, entry, icon, event_button):
+    def on_field_icon_press(self, entry, icon, event_button):
         update_entry_data(entry, self._dialog, self._options.get(self._options.get("profile")))
 
     def on_profile_changed(self, item):
@@ -130,26 +127,29 @@ class SettingsDialog:
         self.set_settings()
 
     def set_settings(self):
+        def_settings = get_default_settings().get(self._active_profile)
         options = self._options.get(self._active_profile)
-        self._host_field.set_text(options.get("host", ""))
-        self._port_field.set_text(options.get("port", ""))
-        self._login_field.set_text(options.get("user", ""))
-        self._password_field.set_text(options.get("password", ""))
-        self._http_login_field.set_text(options.get("http_user", ""))
-        self._http_password_field.set_text(options.get("http_password", ""))
-        self._http_port_field.set_text(options.get("http_port", "80"))
-        self._telnet_login_field.set_text(options.get("telnet_user", ""))
-        self._telnet_password_field.set_text(options.get("telnet_password", ""))
-        self._telnet_port_field.set_text(options.get("telnet_port", ""))
-        self._telnet_timeout_spin_button.set_value(options.get("telnet_timeout", 5))
-        self._services_field.set_text(options.get("services_path", ""))
-        self._user_bouquet_field.set_text(options.get("user_bouquet_path", ""))
-        self._satellites_xml_field.set_text(options.get("satellites_xml_path", ""))
-        self._picons_field.set_text(options.get("picons_path", ""))
-        self._data_dir_field.set_text(options.get("data_dir_path", ""))
-        self._picons_dir_field.set_text(options.get("picons_dir_path", ""))
-        self._before_save_switch.set_active(options.get("backup_before_save", True))
-        self._before_downloading_switch.set_active(options.get("backup_before_downloading", True))
+        self._host_field.set_text(options.get("host", def_settings["host"]))
+        self._port_field.set_text(options.get("port", def_settings["port"]))
+        self._login_field.set_text(options.get("user", def_settings["user"]))
+        self._password_field.set_text(options.get("password", def_settings["password"]))
+        self._http_login_field.set_text(options.get("http_user", def_settings["http_user"]))
+        self._http_password_field.set_text(options.get("http_password", def_settings["http_password"]))
+        self._http_port_field.set_text(options.get("http_port", def_settings["http_port"]))
+        self._telnet_login_field.set_text(options.get("telnet_user", def_settings["telnet_user"]))
+        self._telnet_password_field.set_text(options.get("telnet_password", def_settings["telnet_password"]))
+        self._telnet_port_field.set_text(options.get("telnet_port", def_settings["telnet_port"]))
+        self._telnet_timeout_spin_button.set_value(options.get("telnet_timeout", def_settings["telnet_timeout"]))
+        self._services_field.set_text(options.get("services_path", def_settings["services_path"]))
+        self._user_bouquet_field.set_text(options.get("user_bouquet_path", def_settings["user_bouquet_path"]))
+        self._satellites_xml_field.set_text(options.get("satellites_xml_path", def_settings["satellites_xml_path"]))
+        self._picons_field.set_text(options.get("picons_path", def_settings["picons_path"]))
+        self._data_dir_field.set_text(options.get("data_dir_path", def_settings["data_dir_path"]))
+        self._picons_dir_field.set_text(options.get("picons_dir_path", def_settings["picons_dir_path"]))
+        self._backup_dir_field.set_text(options.get("backup_dir_path", def_settings["backup_dir_path"]))
+        self._before_save_switch.set_active(options.get("backup_before_save", def_settings["backup_before_save"]))
+        self._before_downloading_switch.set_active(options.get("backup_before_downloading",
+                                                               def_settings["backup_before_downloading"]))
 
         if Profile(self._active_profile) is Profile.ENIGMA_2:
             self._support_ver5_check_button.set_active(options.get("v5_support", False))
@@ -184,6 +184,7 @@ class SettingsDialog:
         options["picons_path"] = self._picons_field.get_text()
         options["data_dir_path"] = self._data_dir_field.get_text()
         options["picons_dir_path"] = self._picons_dir_field.get_text()
+        options["backup_dir_path"] = self._backup_dir_field.get_text()
         options["backup_before_save"] = self._before_save_switch.get_active()
         options["backup_before_downloading"] = self._before_downloading_switch.get_active()
 
diff --git a/deb/usr/share/locale/ru/LC_MESSAGES/demon-editor.mo b/deb/usr/share/locale/ru/LC_MESSAGES/demon-editor.mo
index 6f2022d407261ad1887a7b7a1b23bf6c05dd3131..0aff6bcd2f9a0f8558505ebb595b40fc8481c668 100644
GIT binary patch
delta 4434
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
AzyJUM

delta 4331
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
br<adOSQ%4Zm0S^79vduZP(Ht7X6^p~J>Qqb

diff --git a/po/ru/demon-editor.po b/po/ru/demon-editor.po
index b0dadaeb..5eace9a1 100644
--- a/po/ru/demon-editor.po
+++ b/po/ru/demon-editor.po
@@ -592,6 +592,9 @@ msgstr "Резервное копирование"
 msgid "Backups"
 msgstr "Резервные копии"
 
+msgid "Backup path:"
+msgstr "Путь к резервным копиям:"
+
 msgid "Restore bouquets"
 msgstr "Восстановить букеты"
 
@@ -613,6 +616,9 @@ msgstr "Помеченные как новые:"
 msgid "With an extra name in the bouquet:"
 msgstr "С пользовательским именем в букете:"
 
+msgid "Select"
+msgstr "Выбрать"
+
 msgid "About"
 msgstr "О программе"