added elems to profiles edit

app/ui/main_app_window.py

@@ -315,7 +315,6 @@ class Application(Gtk.Application):
         self.activate()
         return 0
 
-    @run_idle
     def init_profiles(self):
         self.update_profiles()
         self._profile_combo_box.set_active_id(self._settings.default_profile)
@@ -1193,12 +1192,12 @@ class Application(Gtk.Application):
         gen = self.init_http_api()
         yield from gen
 
-    def on_profile_changed(self, box):
+    def on_profile_changed(self, entry):
         if self._app_info_box.get_visible():
             self.update_profile_label()
             return
 
-        active = box.get_active_text()
+        active = self._profile_combo_box.get_active_text()
         if active in self._settings.profiles:
             self._settings.current_profile = active
             self._s_type = self._settings.setting_type
@@ -1208,6 +1207,8 @@ class Application(Gtk.Application):
             if self._http_api and self._settings.http_api_support:
                 self._http_api.init()
 
+            self.open_data()
+
     def update_profiles(self):
         self._profile_combo_box.remove_all()
         for p in self._settings.profiles:

app/ui/main_window.glade

@@ -2852,7 +2852,6 @@ Author: Dmitriy Yefremov
                 <property name="margin_bottom">1</property>
                 <property name="active">0</property>
                 <property name="has_entry">True</property>
-                <signal name="changed" handler="on_profile_changed" swapped="no"/>
                 <child internal-child="entry">
                   <object class="GtkEntry" id="profile_entry">
                     <property name="can_focus">False</property>
@@ -2867,6 +2866,7 @@ Author: Dmitriy Yefremov
                     <property name="overwrite_mode">True</property>
                     <property name="caps_lock_warning">False</property>
                     <property name="primary_icon_stock">gtk-connect</property>
+                    <signal name="changed" handler="on_profile_changed" swapped="no"/>
                   </object>
                 </child>
               </object>

app/ui/settings_dialog.glade

@@ -43,6 +43,71 @@ Author: Dmitriy Yefremov
     <signal name="row-deleted" handler="on_profile_deleted" swapped="no"/>
     <signal name="row-inserted" handler="on_profile_inserted" swapped="no"/>
   </object>
+  <object class="GtkImage" id="set_default_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">emblem-default</property>
+  </object>
+  <object class="GtkMenu" id="profiles_popup_menu">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkImageMenuItem" id="add_profile_menu_item">
+        <property name="label">gtk-add</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_profile_add" swapped="no"/>
+        <accelerator key="Insert" signal="activate"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="edit_menu_item">
+        <property name="label">gtk-edit</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_profile_edit" swapped="no"/>
+        <accelerator key="F2" signal="activate"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="set_default_menu_item">
+        <property name="label" translatable="yes">Set default</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="image">set_default_image</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="on_profile_set_default" swapped="no"/>
+        <accelerator key="d" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="remove_menu_item">
+        <property name="label">gtk-remove</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_profile_remove" swapped="no"/>
+        <accelerator key="Delete" signal="activate"/>
+      </object>
+    </child>
+  </object>
   <object class="GtkAdjustment" id="telnet_timeout_adjustment">
     <property name="lower">1</property>
     <property name="upper">10</property>
@@ -85,7 +150,7 @@ Author: Dmitriy Yefremov
               <object class="GtkImage" id="ok_button_image">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="stock">gtk-apply</property>
+                <property name="stock">gtk-ok</property>
               </object>
             </child>
           </object>
@@ -110,6 +175,37 @@ Author: Dmitriy Yefremov
             <property name="position">2</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkSeparator" id="header_separator">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_left">1</property>
+            <property name="margin_right">1</property>
+          </object>
+          <packing>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="apply_profile_button">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="tooltip_text" translatable="yes">Apply profile settings</property>
+            <signal name="clicked" handler="on_apply_profile_settings" swapped="no"/>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="stock">gtk-apply</property>
+              </object>
+            </child>
+            <accelerator key="s" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
+          </object>
+          <packing>
+            <property name="position">4</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkButton" id="reset_button">
             <property name="visible">True</property>
@@ -179,6 +275,7 @@ Author: Dmitriy Yefremov
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="margin_bottom">5</property>
+                <signal name="notify::visible-child" handler="on_main_settings_visible" swapped="no"/>
                 <child>
                   <object class="GtkPaned" id="profile_paned">
                     <property name="visible">True</property>
@@ -213,6 +310,7 @@ Author: Dmitriy Yefremov
                                     <property name="model">profile_lists_tore</property>
                                     <property name="headers_visible">False</property>
                                     <property name="search_column">0</property>
+                                    <signal name="button-press-event" handler="on_view_popup_menu" object="profiles_popup_menu" swapped="no"/>
                                     <signal name="cursor-changed" handler="on_profile_selected" swapped="no"/>
                                     <child internal-child="selection">
                                       <object class="GtkTreeSelection"/>
@@ -273,6 +371,7 @@ Author: Dmitriy Yefremov
                                     <property name="use_underline">True</property>
                                     <property name="stock_id">gtk-add</property>
                                     <signal name="clicked" handler="on_profile_add" swapped="no"/>
+                                    <accelerator key="Insert" signal="clicked"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -281,12 +380,14 @@ Author: Dmitriy Yefremov
                                 </child>
                                 <child>
                                   <object class="GtkToolButton" id="profile_edit_button">
+                                    <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="tooltip_text" translatable="yes">Edit</property>
                                     <property name="label" translatable="yes">Edit</property>
                                     <property name="use_underline">True</property>
                                     <property name="stock_id">gtk-edit</property>
                                     <signal name="clicked" handler="on_profile_edit" swapped="no"/>
+                                    <accelerator key="F2" signal="clicked"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -302,6 +403,7 @@ Author: Dmitriy Yefremov
                                     <property name="use_underline">True</property>
                                     <property name="stock_id">gtk-remove</property>
                                     <signal name="clicked" handler="on_profile_remove" swapped="no"/>
+                                    <accelerator key="Delete" signal="clicked"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -330,6 +432,7 @@ Author: Dmitriy Yefremov
                                     <property name="use_underline">True</property>
                                     <property name="icon_name">emblem-default</property>
                                     <signal name="clicked" handler="on_profile_set_default" swapped="no"/>
+                                    <accelerator key="d" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -537,7 +640,7 @@ Author: Dmitriy Yefremov
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="margin_bottom">5</property>
-                                    <signal name="notify::visible-child" handler="on_current_settings_visible" swapped="no"/>
+                                    <signal name="notify::visible-child" handler="on_network_settings_visible" swapped="no"/>
                                     <child>
                                       <object class="GtkGrid" id="ftp_grid">
                                         <property name="visible">True</property>

app/ui/settings_dialog.py

@@ -28,6 +28,7 @@ class SettingsDialog:
                     "on_reset": self.on_reset,
                     "on_response": self.on_response,
                     "apply_settings": self.apply_settings,
+                    "on_apply_profile_settings": self.on_apply_profile_settings,
                     "on_connection_test": self.on_connection_test,
                     "on_info_bar_close": self.on_info_bar_close,
                     "on_set_color_switch_state": self.on_set_color_switch_state,
@@ -43,8 +44,10 @@ class SettingsDialog:
                     "on_profile_selected": self.on_profile_selected,
                     "on_profile_set_default": self.on_profile_set_default,
                     "on_lang_changed": self.on_lang_changed,
-                    "on_current_settings_visible": self.on_current_settings_visible,
-                    "on_http_use_ssl_toggled": self.on_http_use_ssl_toggled}
+                    "on_main_settings_visible": self.on_main_settings_visible,
+                    "on_network_settings_visible": self.on_network_settings_visible,
+                    "on_http_use_ssl_toggled": self.on_http_use_ssl_toggled,
+                    "on_view_popup_menu": self.on_view_popup_menu}
 
         builder = Gtk.Builder()
         builder.add_from_file(UI_RESOURCES_PATH + "settings_dialog.glade")
@@ -108,10 +111,13 @@ class SettingsDialog:
         self._profile_view = builder.get_object("profile_tree_view")
         self._profile_add_button = builder.get_object("profile_add_button")
         self._profile_remove_button = builder.get_object("profile_remove_button")
+        self._apply_profile_button = builder.get_object("apply_profile_button")
+        self._apply_profile_button.bind_property("visible", builder.get_object("header_separator"), "visible")
         # Language
         self._lang_combo_box = builder.get_object("lang_combo_box")
         # Settings
-        self._settings = settings
+        self._ext_settings = settings
+        self._settings = Settings(settings.settings)
         self._profiles = self._settings.profiles
         self._s_type = self._settings.setting_type
         self.set_settings()
@@ -169,7 +175,6 @@ class SettingsDialog:
         self._settings.reset()
         self.set_settings()
 
-    @run_idle
     def set_settings(self):
         self._host_field.set_text(self._settings.host)
         self._port_field.set_text(self._settings.port)
@@ -207,10 +212,7 @@ class SettingsDialog:
             self._new_color_button.set_rgba(new_rgb)
             self._extra_color_button.set_rgba(extra_rgb)
 
-    def apply_settings(self, item=None):
-        if show_dialog(DialogType.QUESTION, self._dialog) == Gtk.ResponseType.CANCEL:
-            return
-
+    def on_apply_profile_settings(self, item):
         self._s_type = SettingsType.ENIGMA_2 if self._enigma_radio_button.get_active() else SettingsType.NEUTRINO_MP
         self._settings.setting_type = self._s_type
         self._settings.host = self._host_field.get_text()
@@ -232,22 +234,28 @@ class SettingsDialog:
         self._settings.data_local_path = self._data_dir_field.get_text()
         self._settings.picons_local_path = self._picons_dir_field.get_text()
         self._settings.backup_local_path = self._backup_dir_field.get_text()
-        self._settings.backup_before_save = self._before_save_switch.get_active()
-        self._settings.backup_before_downloading = self._before_downloading_switch.get_active()
-        self._settings.fav_click_mode = self.get_fav_click_mode()
-        self._settings.language = self._lang_combo_box.get_active_id()
+
+    def apply_settings(self, item=None):
+        if show_dialog(DialogType.QUESTION, self._dialog) == Gtk.ResponseType.CANCEL:
+            return
+
+        self._ext_settings.profiles = self._settings.profiles
+        self._ext_settings.backup_before_save = self._before_save_switch.get_active()
+        self._ext_settings.backup_before_downloading = self._before_downloading_switch.get_active()
+        self._ext_settings.fav_click_mode = self.get_fav_click_mode()
+        self._ext_settings.language = self._lang_combo_box.get_active_id()
 
         if self._s_type is SettingsType.ENIGMA_2:
-            self._settings.use_colors = self._set_color_switch.get_active()
-            self._settings.new_color = self._new_color_button.get_rgba().to_string()
-            self._settings.extra_color = self._extra_color_button.get_rgba().to_string()
-            self._settings.v5_support = self._support_ver5_switch.get_active()
-            self._settings.http_api_support = self._support_http_api_switch.get_active()
-            self._settings.enable_yt_dl = self._enable_y_dl_switch.get_active()
-            self._settings.enable_send_to = self._enable_send_to_switch.get_active()
+            self._ext_settings.use_colors = self._set_color_switch.get_active()
+            self._ext_settings.new_color = self._new_color_button.get_rgba().to_string()
+            self._ext_settings.extra_color = self._extra_color_button.get_rgba().to_string()
+            self._ext_settings.v5_support = self._support_ver5_switch.get_active()
+            self._ext_settings.http_api_support = self._support_http_api_switch.get_active()
+            self._ext_settings.enable_yt_dl = self._enable_y_dl_switch.get_active()
+            self._ext_settings.enable_send_to = self._enable_send_to_switch.get_active()
 
-        self._settings.default_profile = list(filter(lambda r: r[1], self._profile_view.get_model()))[0][0]
-        self._settings.save()
+        self._ext_settings.default_profile = list(filter(lambda r: r[1], self._profile_view.get_model()))[0][0]
+        self._ext_settings.save()
         return True
 
     @run_task
@@ -342,8 +350,9 @@ class SettingsDialog:
         self._settings.picons_local_path += p
         self._settings.backup_local_path += p
 
-    def on_profile_edit(self, item):
-        self.show_info_message("Not implemented yet!", Gtk.MessageType.WARNING)
+    def on_profile_edit(self, item=None):
+        model, paths = self._profile_view.get_selection().get_selected_rows()
+        self._profile_view.set_cursor(paths, self._profile_view.get_column(0), True)
 
     def on_profile_remove(self, item):
         model, paths = self._profile_view.get_selection().get_selected_rows()
@@ -366,33 +375,30 @@ class SettingsDialog:
             row = self._profile_view.get_model()[path]
             row[0] = new_value
             self._profiles[new_value] = p_name
-            if p_name == self._settings.current_profile:
-                self._settings.current_profile = new_value
-            if p_name == self._settings.default_profile:
-                self._settings.default_profile = new_value
 
         if p_name != new_value:
             self.update_local_paths(new_value)
         self.on_profile_selected(self._profile_view)
 
-    def update_local_paths(self, p_name):
+    def update_local_paths(self, p_name, force_rename=False):
         data_path = self._settings.data_local_path
         picons_path = self._settings.picons_local_path
         backup_path = self._settings.backup_local_path
 
-        try:
-            if os.path.isdir(picons_path):
-                os.rename(picons_path, self._settings.picons_local_path)
-            if os.path.isdir(data_path):
-                os.rename(data_path, self._settings.data_local_path)
-            if os.path.isdir(backup_path):
-                os.rename(backup_path, self._settings.backup_local_path)
-        except OSError as e:
-            self.show_info_message(str(e), Gtk.MessageType.ERROR)
-        else:
-            self._settings.data_local_path = "{}/{}/".format(Path(data_path).parent, p_name)
-            self._settings.picons_local_path = "{}/{}/".format(Path(picons_path).parent, p_name)
-            self._settings.backup_local_path = "{}/{}/".format(Path(self._settings.backup_local_path).parent, p_name)
+        self._settings.data_local_path = "{}/{}/".format(Path(data_path).parent, p_name)
+        self._settings.picons_local_path = "{}/{}/".format(Path(picons_path).parent, p_name)
+        self._settings.backup_local_path = "{}/{}/".format(Path(backup_path).parent, p_name)
+
+        if force_rename:
+            try:
+                if os.path.isdir(picons_path):
+                    os.rename(picons_path, self._settings.picons_local_path)
+                if os.path.isdir(data_path):
+                    os.rename(data_path, self._settings.data_local_path)
+                if os.path.isdir(backup_path):
+                    os.rename(backup_path, self._settings.backup_local_path)
+            except OSError as e:
+                self.show_info_message(str(e), Gtk.MessageType.ERROR)
 
     def on_profile_selected(self, view):
         model, paths = self._profile_view.get_selection().get_selected_rows()
@@ -416,7 +422,10 @@ class SettingsDialog:
         if box.get_active_id() != self._settings.language:
             self.show_info_message("Save and restart the program to apply the settings.", Gtk.MessageType.WARNING)
 
-    def on_current_settings_visible(self, stack: Gtk.Stack, param):
+    def on_main_settings_visible(self, stack, param):
+        self._apply_profile_button.set_visible(stack.get_visible_child_name() == "profiles")
+
+    def on_network_settings_visible(self, stack, param):
         self._http_use_ssl_check_button.set_visible(Property(stack.get_visible_child_name()) is Property.HTTP)
 
     def on_http_use_ssl_toggled(self, button):
@@ -444,6 +453,10 @@ class SettingsDialog:
 
         return FavClickMode.DISABLED
 
+    def on_view_popup_menu(self, menu, event):
+        if event.get_event_type() == Gdk.EventType.BUTTON_PRESS and event.button == Gdk.BUTTON_SECONDARY:
+            menu.popup(None, None, None, None, event.button, event.time)
+
 
 if __name__ == "__main__":
     pass