diff --git a/app/properties.py b/app/properties.py
index f0503c47..bb2f8eb5 100644
--- a/app/properties.py
+++ b/app/properties.py
@@ -41,6 +41,8 @@ def get_default_settings():
Profile.ENIGMA_2.value: {
"host": "127.0.0.1", "port": "21",
"user": "root", "password": "root",
+ "telnet_user": "", "telnet_password": "",
+ "telnet_port": "21", "telnet_timeout": 5,
"services_path": "/etc/enigma2/",
"user_bouquet_path": "/etc/enigma2/",
"satellites_xml_path": "/etc/tuxbox/",
@@ -50,6 +52,8 @@ def get_default_settings():
Profile.NEUTRINO_MP.value: {
"host": "127.0.0.1", "port": "21",
"user": "root", "password": "root",
+ "telnet_user": "root", "telnet_password": "",
+ "telnet_port": "21", "telnet_timeout": 1,
"services_path": "/var/tuxbox/config/zapit/",
"user_bouquet_path": "/var/tuxbox/config/zapit/",
"satellites_xml_path": "/var/tuxbox/config/",
diff --git a/app/ui/dialogs.glade b/app/ui/dialogs.glade
index ac674061..df7d4672 100644
--- a/app/ui/dialogs.glade
+++ b/app/ui/dialogs.glade
@@ -9,7 +9,7 @@
system-help
normal
DemonEditor
- 0.2.0 Pre-alpha
+ 0.2.1 Pre-alpha
2018 Dmitriy Yefremov
dmitry.v.yefremov@gmail.com
@@ -116,6 +116,7 @@ dmitry.v.yefremov@gmail.com
10
127.0.0.1
False
+ network-transmit-receive-symbolic
0
@@ -603,6 +604,11 @@ dmitry.v.yefremov@gmail.com
+
0
@@ -718,6 +744,7 @@ dmitry.v.yefremov@gmail.com
True
True
21
+ network-workgroup-symbolic
1
@@ -843,6 +870,7 @@ dmitry.v.yefremov@gmail.com
True
True
23
+ network-workgroup-symbolic
0
@@ -861,9 +889,11 @@ dmitry.v.yefremov@gmail.com
-
False
diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade
index e34a33d7..3ac9f80c 100644
--- a/app/ui/main_window.glade
+++ b/app/ui/main_window.glade
@@ -1740,7 +1740,7 @@
diff --git a/app/ui/picons_dialog.glade b/app/ui/picons_dialog.glade
index e526b4d1..329867fe 100644
--- a/app/ui/picons_dialog.glade
+++ b/app/ui/picons_dialog.glade
@@ -64,6 +64,7 @@
0
@@ -137,7 +138,7 @@
diff --git a/app/ui/settings_dialog.py b/app/ui/settings_dialog.py
index ec4d4cdf..8bf43db3 100644
--- a/app/ui/settings_dialog.py
+++ b/app/ui/settings_dialog.py
@@ -11,9 +11,12 @@ class SettingsDialog:
def __init__(self, transient, options):
handlers = {"on_data_dir_field_icon_press": self.on_data_dir_field_icon_press,
"on_profile_changed": self.on_profile_changed,
- "on_reset": self.on_reset}
+ "on_reset": self.on_reset,
+ "apply_settings": self.apply_settings}
+
builder = Gtk.Builder()
- builder.add_objects_from_file(UI_RESOURCES_PATH + "dialogs.glade", ("settings_dialog",))
+ builder.add_objects_from_file(UI_RESOURCES_PATH + "dialogs.glade",
+ ("settings_dialog", "telnet_timeout_adjustment"))
builder.connect_signals(handlers)
self._dialog = builder.get_object("settings_dialog")
@@ -22,6 +25,10 @@ class SettingsDialog:
self._port_field = builder.get_object("port_field")
self._login_field = builder.get_object("login_field")
self._password_field = builder.get_object("password_field")
+ self._telnet_login_field = builder.get_object("telnet_login_field")
+ self._telnet_password_field = builder.get_object("telnet_password_field")
+ self._telnet_port_field = builder.get_object("telnet_port_field")
+ self._telnet_timeout_spin_button = builder.get_object("telnet_timeout_spin_button")
self._services_field = builder.get_object("services_field")
self._user_bouquet_field = builder.get_object("user_bouquet_field")
self._satellites_xml_field = builder.get_object("satellites_xml_field")
@@ -75,6 +82,10 @@ class SettingsDialog:
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._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", ""))
@@ -82,7 +93,7 @@ class SettingsDialog:
self._data_dir_field.set_text(options.get("data_dir_path", ""))
self._picons_dir_field.set_text(options.get("picons_dir_path", ""))
- def apply_settings(self):
+ def apply_settings(self, item=None):
profile = Profile.ENIGMA_2.value if self._enigma_radio_button.get_active() else Profile.NEUTRINO_MP.value
self._active_profile = profile
self._options["profile"] = profile
@@ -91,6 +102,10 @@ class SettingsDialog:
options["port"] = self._port_field.get_text()
options["user"] = self._login_field.get_text()
options["password"] = self._password_field.get_text()
+ options["telnet_user"] = self._telnet_login_field.get_text()
+ options["telnet_password"] = self._telnet_password_field.get_text()
+ options["telnet_port"] = self._telnet_port_field.get_text()
+ options["telnet_timeout"] = self._telnet_timeout_spin_button.get_value()
options["services_path"] = self._services_field.get_text()
options["user_bouquet_path"] = self._user_bouquet_field.get_text()
options["satellites_xml_path"] = self._satellites_xml_field.get_text()
diff --git a/deb/DEBIAN/control b/deb/DEBIAN/control
index 17dbecfd..39845ff6 100644
--- a/deb/DEBIAN/control
+++ b/deb/DEBIAN/control
@@ -1,9 +1,9 @@
Package: DemonEditor
-Version: 0.2.0-Pre-alpha
+Version: 0.2.1-Pre-alpha
Section: utils
Priority: optional
Architecture: all
Essential: no
Depends: python3 (>= 3.5)
Maintainer: Dmitriy Yefremov
-Description: Enigma2 channels and satellites editor
+Description: Enigma2 channels and satellites list editor