From 3eee824160117c1c5daadb8537c9fd04827f5652 Mon Sep 17 00:00:00 2001
From: DYefremov <dmitry.v.yefremov@gmail.com>
Date: Sat, 13 Oct 2018 22:27:32 +0300
Subject: [PATCH] added copying from the main list to the bouquet end

---
 app/ui/dialogs.glade      |  2 +-
 app/ui/main_app_window.py | 50 +++++++++++++++++++++++++--------------
 app/ui/main_window.glade  | 14 +++++++++--
 3 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/app/ui/dialogs.glade b/app/ui/dialogs.glade
index a1346f4f..1814062b 100644
--- a/app/ui/dialogs.glade
+++ b/app/ui/dialogs.glade
@@ -40,7 +40,7 @@ Author: Dmitriy Yefremov
     <property name="icon_name">system-help</property>
     <property name="type_hint">normal</property>
     <property name="program_name">DemonEditor</property>
-    <property name="version">0.4.0 Pre-alpha</property>
+    <property name="version">0.4.1 Pre-alpha</property>
     <property name="copyright">2018 Dmitriy Yefremov
 </property>
     <property name="comments" translatable="yes">Enigma2 channel and satellites list editor for GNU/Linux</property>
diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py
index bbb66619..bedb5dc5 100644
--- a/app/ui/main_app_window.py
+++ b/app/ui/main_app_window.py
@@ -97,7 +97,8 @@ class MainAppWindow:
                     "on_services_add_new": self.on_services_add_new,
                     "on_delete": self.on_delete,
                     "on_tool_edit": self.on_tool_edit,
-                    "on_to_fav_move": self.on_to_fav_move,
+                    "on_to_fav_copy": self.on_to_fav_copy,
+                    "on_to_fav_end_copy": self.on_to_fav_end_copy,
                     "on_view_drag_begin": self.on_view_drag_begin,
                     "on_view_drag_data_get": self.on_view_drag_data_get,
                     "on_view_drag_data_received": self.on_view_drag_data_received,
@@ -506,13 +507,25 @@ class MainAppWindow:
         elif self._bouquets_view.is_focus():
             self.on_rename(self._bouquets_view)
 
-    def on_to_fav_move(self, view):
-        """ Move items from app to fav list """
+    def on_to_fav_copy(self, view):
+        """ Copy items from main to beginning of fav list """
         selection = self.get_selection(view)
-
         if selection:
             self.receive_selection(view=self._fav_view, drop_info=None, data=selection)
 
+    def on_to_fav_end_copy(self, view):
+        """  Copy items from main to end of fav list """
+        selection = self.get_selection(view)
+        if selection:
+            pos = Gtk.TreeViewDropPosition.AFTER
+            path = Gtk.TreePath.new()
+            mod_len = len(self._fav_model)
+            path.append_index(mod_len - 1 if mod_len > 0 else 1)
+            self.receive_selection(view=self._fav_view, drop_info=(path, pos), data=selection)
+            if mod_len > 0:
+
+                scroll_to(mod_len, self._fav_view)
+
     @run_with_delay(1)
     def update_fav_num_column(self, model):
         """ Iterate through model and updates values for Num column """
@@ -597,23 +610,22 @@ class MainAppWindow:
 
     def receive_selection(self, *, view, drop_info, data):
         """  Update fav view  after data received  """
-        model = get_base_model(view.get_model())
-        dest_index = 0
-        if drop_info:
-            path, position = drop_info
-            dest_iter = model.get_iter(path)
-            if dest_iter:
-                dest_index = model.get_value(dest_iter, 0)
-
-        itr_str, sep, source = data.partition("::::")
-        if source == self._BOUQUETS_LIST_NAME:
-            return
-
         try:
+            itr_str, sep, source = data.partition("::::")
+            if source == self._BOUQUETS_LIST_NAME:
+                return
+
             bq_selected = self.check_bouquet_selection()
             if not bq_selected:
                 return
 
+            model = get_base_model(view.get_model())
+            dest_index = 0
+            if drop_info:
+                path, position = drop_info
+                dest_iter = model.get_iter(path)
+                if dest_iter:
+                    dest_index = model.get_value(dest_iter, 0)
             fav_bouquet = self._bouquets[bq_selected]
             itrs = itr_str.split(",")
 
@@ -985,12 +997,14 @@ class MainAppWindow:
         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:
+        elif ctrl and key == Gdk.KEY_Insert:
             # Move items from app to fav list
             if model_name == self._SERVICE_LIST_NAME:
-                self.on_to_fav_move(view)
+                self.on_to_fav_copy(view)
             elif model_name == self._BOUQUETS_LIST_NAME:
                 self.on_new_bouquet(view)
+        elif ctrl and key == Gdk.KEY_BackSpace and model_name == self._SERVICE_LIST_NAME:
+                self.on_to_fav_end_copy(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_window.glade b/app/ui/main_window.glade
index bfba85bc..341b597f 100644
--- a/app/ui/main_window.glade
+++ b/app/ui/main_window.glade
@@ -2542,15 +2542,25 @@ Author: Dmitriy Yefremov
   <object class="GtkMenu" id="services_popup_menu">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <child>
+      <object class="GtkImageMenuItem" id="services_to_fav_end_move_popup_item">
+        <property name="label">gtk-goto-last</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_underline">True</property>
+        <property name="use_stock">True</property>
+        <signal name="activate" handler="on_to_fav_end_copy" object="services_tree_view" swapped="no"/>
+      </object>
+    </child>
     <child>
       <object class="GtkImageMenuItem" id="services_to_fav_move_popup_item">
-        <property name="label">gtk-go-forward</property>
+        <property name="label">gtk-goto-first</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>
-        <signal name="activate" handler="on_to_fav_move" object="services_tree_view" swapped="no"/>
+        <signal name="activate" handler="on_to_fav_copy" object="services_tree_view" swapped="no"/>
       </object>
     </child>
     <child>