diff --git a/README.md b/README.md
index 632309e0..25bb4572 100644
--- a/README.md
+++ b/README.md
@@ -5,13 +5,13 @@ Experimental support of Neutrino-MP or others on the same basis (BPanther, etc).
Focused on the convenience of working in lists from the keyboard. The mouse is also fully supported (Drag and Drop etc)
### Keyboard shortcuts:
-Ctrl + X, C, V, Up, Down, PageUp, PageDown, S, T, E, L, H, Space; Insert, Delete, F2.
-Insert - copies the selected channels from the main list to the bouquet or inserts (creates) a new bouquet.
+Ctrl + X, C, V, Up, Down, PageUp, PageDown, S, T, E, L, H, Space; Insert, Delete, F2.
+Insert - copies the selected channels from the main list to the bouquet or inserts (creates) a new bouquet.
Ctrl + X - only in bouquet list. Ctrl + C - only in services list.
Clipboard is "rubber". There is an accumulation before the insertion!
-Ctrl + E, F2 - edit.
-Ctrl + R - rename.
-Ctrl + S, T, E in Satellites edit tool for create and edit satellite or transponder.
+Ctrl + E - edit.
+Ctrl + R, F2 - rename.
+Ctrl + S, T in Satellites edit tool for create satellite or transponder.
Ctrl + L - parental lock.
Ctrl + H - hide/skip.
Left/Right - remove selection.
diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py
index c71947f5..b24995a3 100644
--- a/app/ui/main_app_window.py
+++ b/app/ui/main_app_window.py
@@ -14,7 +14,7 @@ from app.properties import get_config, write_config, Profile
from . import Gtk, Gdk, UI_RESOURCES_PATH, LOCKED_ICON, HIDE_ICON, IPTV_ICON
from .dialogs import show_dialog, DialogType, get_chooser_dialog
from .download_dialog import show_download_dialog
-from .main_helper import edit_marker, insert_marker, move_items, edit, ViewTarget, set_flags, locate_in_services, \
+from .main_helper import edit_marker, insert_marker, move_items, rename, ViewTarget, set_flags, locate_in_services, \
scroll_to, get_base_model, update_picons, copy_picon_reference, assign_picon, remove_picon, search
from .picons_dialog import PiconsDialog
from .satellites_dialog import show_satellites_dialog
@@ -76,7 +76,7 @@ class MainAppWindow:
"on_cut": self.on_cut,
"on_copy": self.on_copy,
"on_paste": self.on_paste,
- "on_edit": self.on_edit,
+ "on_edit": self.on_rename,
"on_delete": self.on_delete,
"on_new_bouquet": self.on_new_bouquet,
"on_bouquets_edit": self.on_bouquets_edit,
@@ -103,7 +103,7 @@ class MainAppWindow:
"on_filter_toggled": self.on_filter_toggled,
"on_search_toggled": self.on_search_toggled,
"on_search": self.on_search,
- "on_services_data_edit": self.on_services_data_edit}
+ "on_service_edit": self.on_service_edit}
self.__options = get_config()
self.__profile = self.__options.get("profile")
@@ -239,16 +239,17 @@ class MainAppWindow:
self.__rows_buffer.clear()
self.on_view_focus(view, None)
- def on_edit(self, view):
+ def on_rename(self, view):
model = get_base_model(view.get_model())
name = model.get_name()
if name == self._BOUQUETS_LIST_NAME:
self.on_bouquets_edit(view)
# edit(view, self.__main_window, ViewTarget.BOUQUET)
elif name == self._FAV_LIST_NAME:
- edit(view, self.__main_window, ViewTarget.FAV, service_view=self.__services_view, channels=self.__services)
+ rename(view, self.__main_window, ViewTarget.FAV, service_view=self.__services_view,
+ channels=self.__services)
elif name == self._SERVICE_LIST_NAME:
- edit(view, self.__main_window, ViewTarget.SERVICES, fav_view=self.__fav_view, channels=self.__services)
+ rename(view, self.__main_window, ViewTarget.SERVICES, fav_view=self.__fav_view, channels=self.__services)
def on_delete(self, item):
""" Delete selected items from views
@@ -361,11 +362,11 @@ class MainAppWindow:
def on_tool_edit(self, item):
""" Edit tool bar button """
if self.__services_view.is_focus():
- self.on_edit(self.__services_view)
+ self.on_rename(self.__services_view)
elif self.__fav_view.is_focus():
- self.on_edit(self.__fav_view)
+ self.on_rename(self.__fav_view)
elif self.__bouquets_view.is_focus():
- self.on_edit(self.__bouquets_view)
+ self.on_rename(self.__bouquets_view)
def on_bouquets_edit(self, view):
""" Rename bouquets """
@@ -708,15 +709,13 @@ class MainAppWindow:
self.on_locked(None)
elif ctrl and key == Gdk.KEY_h or key == Gdk.KEY_H:
self.on_hide(None)
- elif ctrl and key == Gdk.KEY_R or key == Gdk.KEY_r:
- self.on_edit(view)
- elif ctrl and key == Gdk.KEY_E or key == Gdk.KEY_e or key == Gdk.KEY_F2:
+ elif ctrl and key == Gdk.KEY_R or key == Gdk.KEY_r or key == Gdk.KEY_F2:
+ self.on_rename(view)
+ elif ctrl and key == Gdk.KEY_E or key == Gdk.KEY_e:
if model_name == self._BOUQUETS_LIST_NAME:
- self.on_edit(view)
+ self.on_rename(view)
return
- elif model_name == self._FAV_LIST_NAME:
- self.on_locate_in_services(view)
- self.on_services_data_edit(view)
+ self.on_service_edit(view)
elif key == Gdk.KEY_Left or key == Gdk.KEY_Right:
view.do_unselect_all(view)
@@ -897,7 +896,11 @@ class MainAppWindow:
self.__bouquets)
@run_idle
- def on_services_data_edit(self, item):
+ def on_service_edit(self, view):
+ model_name = get_base_model(view.get_model()).get_name()
+ if model_name == self._FAV_LIST_NAME:
+ self.on_locate_in_services(view)
+
dialog = ServiceDetailsDialog(self.__main_window, self.__options, self.__services_view)
dialog.show()
diff --git a/app/ui/main_helper.py b/app/ui/main_helper.py
index c4dd2546..67e62552 100644
--- a/app/ui/main_helper.py
+++ b/app/ui/main_helper.py
@@ -96,9 +96,9 @@ def move_items(key, view):
model.move_after(itr, down_itr)
-# ***************** Edit *******************#
+# ***************** Rename *******************#
-def edit(view, parent_window, target, fav_view=None, service_view=None, channels=None):
+def rename(view, parent_window, target, fav_view=None, service_view=None, channels=None):
model, paths = view.get_selection().get_selected_rows()
model = get_base_model(model)
diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade
index 4ee4efb4..f02e2f8d 100644
--- a/app/ui/main_window.glade
+++ b/app/ui/main_window.glade
@@ -117,11 +117,6 @@
False
gtk-copy
-
@@ -369,23 +364,7 @@
immediate
True
True
-
-
-
-
-
-
-
-