From 562c1a595547dd0ca760185adf47a9e8ece00e52 Mon Sep 17 00:00:00 2001
From: DYefremov <dmitry.v.yefremov@gmail.com>
Date: Mon, 1 Nov 2021 11:09:45 +0300
Subject: [PATCH] modifiers correction

---
 app/ui/epg.glade        |  2 +-
 app/ui/ftp.glade        |  2 +-
 app/ui/main.glade       | 29 +++++++++++++++--------------
 app/ui/main.py          |  1 +
 app/ui/satellites.glade | 10 +++++-----
 5 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/app/ui/epg.glade b/app/ui/epg.glade
index 8c4108f7..d8a8decf 100644
--- a/app/ui/epg.glade
+++ b/app/ui/epg.glade
@@ -673,7 +673,7 @@ Author: Dmitriy Yefremov
                         <property name="image">filter_image</property>
                         <property name="always_show_image">True</property>
                         <signal name="toggled" handler="on_filter_toggled" swapped="no"/>
-                        <accelerator key="f" signal="clicked" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
+                        <accelerator key="f" signal="clicked" modifiers="GDK_SHIFT_MASK | Primary"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
diff --git a/app/ui/ftp.glade b/app/ui/ftp.glade
index 734a98a3..5f7409ae 100644
--- a/app/ui/ftp.glade
+++ b/app/ui/ftp.glade
@@ -632,7 +632,7 @@ Author: Dmitriy Yefremov
         <property name="image">rename_image_2</property>
         <property name="use_stock">False</property>
         <signal name="activate" handler="on_file_edit" object="file_name_column_renderer" swapped="no"/>
-        <accelerator key="r" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+        <accelerator key="r" signal="activate" modifiers="Primary"/>
         <accelerator key="F2" signal="activate"/>
       </object>
     </child>
diff --git a/app/ui/main.glade b/app/ui/main.glade
index e3d8fe30..722b91c8 100644
--- a/app/ui/main.glade
+++ b/app/ui/main.glade
@@ -344,7 +344,7 @@ Author: Dmitriy Yefremov
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_new_bouquet" object="bouquets_tree_view" swapped="no"/>
-        <accelerator key="Insert" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+        <accelerator key="Insert" signal="activate" modifiers="Primary"/>
       </object>
     </child>
     <child>
@@ -355,7 +355,8 @@ Author: Dmitriy Yefremov
         <property name="can_focus">False</property>
         <property name="image">import_bouquet_image</property>
         <property name="use_stock">False</property>
-        <accelerator key="i" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+        <signal name="activate" handler="on_import_bouquet" swapped="no"/>
+        <accelerator key="i" signal="activate" modifiers="Primary"/>
       </object>
     </child>
     <child>
@@ -383,7 +384,7 @@ Author: Dmitriy Yefremov
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_bouquets_cut" object="bouquets_tree_view" swapped="no"/>
-        <accelerator key="x" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+        <accelerator key="x" signal="activate" modifiers="Primary"/>
       </object>
     </child>
     <child>
@@ -395,7 +396,7 @@ Author: Dmitriy Yefremov
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_bouquets_copy" object="bouquets_tree_view" swapped="no"/>
-        <accelerator key="c" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+        <accelerator key="c" signal="activate" modifiers="Primary"/>
       </object>
     </child>
     <child>
@@ -407,7 +408,7 @@ Author: Dmitriy Yefremov
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_bouquets_paste" object="bouquets_tree_view" swapped="no"/>
-        <accelerator key="v" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+        <accelerator key="v" signal="activate" modifiers="Primary"/>
       </object>
     </child>
     <child>
@@ -425,7 +426,7 @@ Author: Dmitriy Yefremov
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_edit" swapped="no"/>
-        <accelerator key="e" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+        <accelerator key="e" signal="activate" modifiers="Primary"/>
       </object>
     </child>
     <child>
@@ -918,7 +919,7 @@ Author: Dmitriy Yefremov
         <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"/>
-        <accelerator key="BackSpace" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+        <accelerator key="BackSpace" signal="activate" modifiers="Primary"/>
       </object>
     </child>
     <child>
@@ -929,7 +930,7 @@ Author: Dmitriy Yefremov
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_to_fav_copy" object="services_tree_view" swapped="no"/>
-        <accelerator key="Insert" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+        <accelerator key="Insert" signal="activate" modifiers="Primary"/>
       </object>
     </child>
     <child>
@@ -1033,7 +1034,7 @@ Author: Dmitriy Yefremov
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_services_copy" object="services_tree_view" swapped="no"/>
-        <accelerator key="c" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+        <accelerator key="c" signal="activate" modifiers="Primary"/>
       </object>
     </child>
     <child>
@@ -1044,7 +1045,7 @@ Author: Dmitriy Yefremov
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_edit" swapped="no"/>
-        <accelerator key="e" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+        <accelerator key="e" signal="activate" modifiers="Primary"/>
       </object>
     </child>
     <child>
@@ -3690,7 +3691,7 @@ Author: Dmitriy Yefremov
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_fav_cut" object="fav_tree_view" swapped="no"/>
-        <accelerator key="x" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+        <accelerator key="x" signal="activate" modifiers="Primary"/>
       </object>
     </child>
     <child>
@@ -3702,7 +3703,7 @@ Author: Dmitriy Yefremov
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_fav_copy" object="fav_tree_view" swapped="no"/>
-        <accelerator key="c" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+        <accelerator key="c" signal="activate" modifiers="Primary"/>
       </object>
     </child>
     <child>
@@ -3714,7 +3715,7 @@ Author: Dmitriy Yefremov
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_fav_paste" object="fav_tree_view" swapped="no"/>
-        <accelerator key="v" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+        <accelerator key="v" signal="activate" modifiers="Primary"/>
       </object>
     </child>
     <child>
@@ -3731,7 +3732,7 @@ Author: Dmitriy Yefremov
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_edit" swapped="no"/>
-        <accelerator key="e" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+        <accelerator key="e" signal="activate" modifiers="Primary"/>
       </object>
     </child>
     <child>
diff --git a/app/ui/main.py b/app/ui/main.py
index 23561685..3e32bb4b 100644
--- a/app/ui/main.py
+++ b/app/ui/main.py
@@ -159,6 +159,7 @@ class Application(Gtk.Application):
                     "on_import_m3u": self.on_import_m3u,
                     "on_bouquet_export": self.on_bouquet_export,
                     "on_export_to_m3u": self.on_export_to_m3u,
+                    "on_import_bouquet": self.on_import_bouquet,
                     "on_insert_marker": self.on_insert_marker,
                     "on_insert_space": self.on_insert_space,
                     "on_fav_press": self.on_fav_press,
diff --git a/app/ui/satellites.glade b/app/ui/satellites.glade
index c64872d0..fb137880 100644
--- a/app/ui/satellites.glade
+++ b/app/ui/satellites.glade
@@ -166,7 +166,7 @@ Author: Dmitriy Yefremov
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_edit" object="satellite_view" swapped="no"/>
-        <accelerator key="e" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+        <accelerator key="e" signal="activate" modifiers="Primary"/>
       </object>
     </child>
     <child>
@@ -220,7 +220,7 @@ Author: Dmitriy Yefremov
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_edit" object="transponder_view" swapped="no"/>
-        <accelerator key="e" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+        <accelerator key="e" signal="activate" modifiers="Primary"/>
       </object>
     </child>
     <child>
@@ -1482,7 +1482,7 @@ Author: Dmitriy Yefremov
                         <property name="image">sat_update_cancel_image</property>
                         <property name="always_show_image">True</property>
                         <signal name="clicked" handler="on_cancel_receive" swapped="no"/>
-                        <accelerator key="z" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
+                        <accelerator key="z" signal="clicked" modifiers="Primary"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -1518,7 +1518,7 @@ Author: Dmitriy Yefremov
                             <property name="icon_size">1</property>
                           </object>
                         </child>
-                        <accelerator key="f" signal="clicked" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
+                        <accelerator key="f" signal="clicked" modifiers="GDK_SHIFT_MASK | Primary"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -1542,7 +1542,7 @@ Author: Dmitriy Yefremov
                             <property name="icon_size">1</property>
                           </object>
                         </child>
-                        <accelerator key="f" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
+                        <accelerator key="f" signal="clicked" modifiers="Primary"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>