From 27bdac7b4f663aa229ae095673fe30bb3f43afb7 Mon Sep 17 00:00:00 2001
From: DYefremov <dmitriy.v.yefremov@gmail.com>
Date: Tue, 18 Sep 2018 14:40:24 +0300
Subject: [PATCH] Changes in handling keystrokes.

---
 app/ui/main_app_window.py | 54 ++++++++++++++++++++++++---------------
 app/ui/main_helper.py     |  2 ++
 app/ui/main_window.glade  |  4 +++
 3 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py
index 3f364210..27e945b2 100644
--- a/app/ui/main_app_window.py
+++ b/app/ui/main_app_window.py
@@ -48,7 +48,7 @@ class MainAppWindow:
 
     _FAV_ELEMENTS = ("fav_cut_popup_item", "fav_paste_popup_item", "fav_locate_popup_item", "fav_iptv_popup_item",
                      "fav_insert_marker_popup_item", "fav_edit_sub_menu_popup_item", "fav_edit_popup_item",
-                     "fav_picon_popup_item")
+                     "fav_picon_popup_item", "fav_copy_popup_item")
 
     _FAV_ENIGMA_ELEMENTS = ("fav_insert_marker_popup_item",)
 
@@ -63,7 +63,8 @@ class MainAppWindow:
                          "bouquets_remove_popup_item", "fav_remove_popup_item", "hide_tool_button",
                          "fav_insert_marker_popup_item", "fav_edit_popup_item", "fav_edit_sub_menu_popup_item",
                          "fav_locate_popup_item", "services_copy_popup_item", "services_picon_popup_item",
-                         "fav_picon_popup_item", "services_add_new_popup_item", "fav_iptv_popup_item")
+                         "fav_picon_popup_item", "services_add_new_popup_item", "fav_iptv_popup_item",
+                         "fav_copy_popup_item")
 
     def __init__(self):
         handlers = {"on_close_app": self.on_close_app,
@@ -73,6 +74,7 @@ class MainAppWindow:
                     "on_download": self.on_download,
                     "on_data_open": self.on_data_open,
                     "on_data_save": self.on_data_save,
+                    "on_tree_view_key_press": self.on_tree_view_key_press,
                     "on_tree_view_key_release": self.on_tree_view_key_release,
                     "on_bouquets_selection": self.on_bouquets_selection,
                     "on_satellite_editor_show": self.on_satellite_editor_show,
@@ -276,6 +278,8 @@ class MainAppWindow:
             rows = [(0, *model[path][2, 3, 4, 5, 7, 16, 18, 8]) for path in paths]
         elif target is ViewTarget.SERVICES:
             rows = [model[path][:] for path in paths]
+        elif target is ViewTarget.BOUQUET:
+            return
 
         self._rows_buffer.extend(rows)
 
@@ -789,28 +793,14 @@ class MainAppWindow:
 
             self.update_profile_label()
 
-    def on_tree_view_key_release(self, view, event):
-        """  Handling  keystrokes  """
+    def on_tree_view_key_press(self, view, event):
+        """  Handling  keystrokes on press """
         key = event.keyval
         ctrl = event.state & Gdk.ModifierType.CONTROL_MASK
-        alt = event.state & Gdk.ModifierType.MOD1_MASK
         model = get_base_model(view.get_model())
         model_name = model.get_name()
 
-        if key == Gdk.KEY_Delete:
-            self.on_delete(view)
-        elif ctrl and key in MOVE_KEYS:
-            self.move_items(key)
-        elif model_name == self._FAV_LIST_NAME and key == Gdk.KEY_Control_L or key == Gdk.KEY_Control_R:
-            self.update_fav_num_column(model)
-            self.update_bouquet_list()
-        elif key == Gdk.KEY_Insert:
-            # Move items from app to fav list
-            if model_name == self._SERVICE_LIST_NAME:
-                self.on_to_fav_move(view)
-            elif model_name == self._BOUQUETS_LIST_NAME:
-                self.on_new_bouquet(view)
-        elif ctrl and (key == Gdk.KEY_c or key == Gdk.KEY_C):
+        if ctrl and key == Gdk.KEY_c or key == Gdk.KEY_C:
             if model_name == self._SERVICE_LIST_NAME:
                 self.on_copy(view, ViewTarget.FAV)
             elif model_name == self._FAV_LIST_NAME:
@@ -821,7 +811,31 @@ class MainAppWindow:
             if model_name == self._FAV_LIST_NAME:
                 self.on_cut(view)
         elif ctrl and key == Gdk.KEY_v or key == Gdk.KEY_V:
-            self.on_paste(view)
+            if model_name == self._FAV_LIST_NAME:
+                self.on_paste(view)
+        elif key == Gdk.KEY_Delete:
+            self.on_delete(view)
+
+    def on_tree_view_key_release(self, view, event):
+        """  Handling  keystrokes on release """
+        key = event.keyval
+        ctrl = event.state & Gdk.ModifierType.CONTROL_MASK
+        alt = event.state & Gdk.ModifierType.MOD1_MASK
+        model = get_base_model(view.get_model())
+        model_name = model.get_name()
+
+
+        if ctrl and key in MOVE_KEYS:
+            self.move_items(key)
+        elif model_name == self._FAV_LIST_NAME and key == Gdk.KEY_Control_L or key == Gdk.KEY_Control_R:
+            self.update_fav_num_column(model)
+            self.update_bouquet_list()
+        elif key == Gdk.KEY_Insert:
+            # Move items from app to fav list
+            if model_name == self._SERVICE_LIST_NAME:
+                self.on_to_fav_move(view)
+            elif model_name == self._BOUQUETS_LIST_NAME:
+                self.on_new_bouquet(view)
         elif ctrl and key == Gdk.KEY_s or key == Gdk.KEY_S:
             self.on_data_save()
         elif ctrl and key == Gdk.KEY_l or key == Gdk.KEY_L:
diff --git a/app/ui/main_helper.py b/app/ui/main_helper.py
index 01c8f7ba..662cae16 100644
--- a/app/ui/main_helper.py
+++ b/app/ui/main_helper.py
@@ -65,6 +65,8 @@ def move_items(key, view: Gtk.TreeView):
 
     if paths:
         mod_length = len(model)
+        if mod_length == len(paths):
+            return
         cursor_path = view.get_cursor()[0]
         max_path = Gtk.TreePath.new_from_indices((mod_length,))
         min_path = Gtk.TreePath.new_from_indices((0,))
diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade
index b058187f..a6bdf94a 100644
--- a/app/ui/main_window.glade
+++ b/app/ui/main_window.glade
@@ -358,6 +358,7 @@ Author: Dmitriy Yefremov
       <object class="GtkImageMenuItem" id="fav_copy_popup_item">
         <property name="label">gtk-copy</property>
         <property name="visible">True</property>
+        <property name="sensitive">False</property>
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
@@ -1366,6 +1367,7 @@ Author: Dmitriy Yefremov
                         <signal name="button-press-event" handler="on_view_popup_menu" object="services_popup_menu" swapped="no"/>
                         <signal name="drag-data-get" handler="on_services_tree_view_drag_data_get" swapped="no"/>
                         <signal name="focus-in-event" handler="on_view_focus" swapped="no"/>
+                        <signal name="key-press-event" handler="on_tree_view_key_press" swapped="no"/>
                         <signal name="key-release-event" handler="on_tree_view_key_release" swapped="no"/>
                         <signal name="row-activated" handler="on_services_selection" object="services_list_store" swapped="no"/>
                         <child internal-child="selection">
@@ -1995,6 +1997,7 @@ Author: Dmitriy Yefremov
                                 <signal name="drag-data-get" handler="on_fav_tree_view_drag_data_get" swapped="no"/>
                                 <signal name="drag-data-received" handler="on_fav_tree_view_drag_data_received" swapped="no"/>
                                 <signal name="focus-in-event" handler="on_view_focus" swapped="no"/>
+                                <signal name="key-press-event" handler="on_tree_view_key_press" swapped="no"/>
                                 <signal name="key-release-event" handler="on_tree_view_key_release" swapped="no"/>
                                 <signal name="row-activated" handler="on_fav_selection" object="fav_list_store" swapped="no"/>
                                 <child internal-child="selection">
@@ -2236,6 +2239,7 @@ Author: Dmitriy Yefremov
                             <property name="activate_on_single_click">True</property>
                             <signal name="button-press-event" handler="on_view_popup_menu" object="bouquets_popup_menu" swapped="no"/>
                             <signal name="focus-in-event" handler="on_view_focus" swapped="no"/>
+                            <signal name="key-press-event" handler="on_tree_view_key_press" swapped="no"/>
                             <signal name="key-release-event" handler="on_tree_view_key_release" swapped="no"/>
                             <signal name="row-activated" handler="on_bouquets_selection" object="bouquets_tree_store" swapped="no"/>
                             <child internal-child="selection">