Сделан первый уровень меню со списком ос

source/CMakeLists.txt

@@ -28,7 +28,7 @@ configure_file(ubl-settings-bootloader.h.in ubl-settings-bootloader-cm.h)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
 	-O2 -pipe -fno-plt -fexceptions \
         -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
-        -fstack-clash-protection -fcf-protection")
+        -fstack-clash-protection -fcf-protection -g")
 
 set(SOURCE_FILES
         menu_os.h

source/menu_os.cc

@@ -9,12 +9,16 @@ Menu_os::~Menu_os()
 {
 }
 
-void Menu_os::set_builder(Glib::RefPtr<Gtk::Builder> const& builder) {
+void Menu_os::set_builder(Glib::RefPtr<Gtk::Builder>& builder, string path_glade) {
     this->builder = builder;
+    this->path_glade = path_glade;
     builder->get_widget("popoverMenuOS", popoverMenuOS);
     builder->get_widget("revealerL1", revealerL1);
     builder->get_widget("revealerL2", revealerL2);
     builder->get_widget("boxALLL3", boxALLL3);
+    builder->get_widget("boxLevel1", boxLevel1);
+    
+    revealerL1->set_reveal_child(true);
 }
 
 void Menu_os::set_map(std::map <string, vector<string>> &map_list_os) {
@@ -22,63 +26,72 @@ void Menu_os::set_map(std::map <string, vector<string>> &map_list_os) {
 }
 
 void Menu_os::init() {
-    Gtk::Box *box_L1 = new Gtk::Box();
-    vector<stuct_all_reviler> vec_stuct_all_reviler;
-    for (auto& [key, value]: map_list_os) {
-        size_t len_data = value.size();
-        struct map_reviler_L1 obj_map_reviler_L1;
-        struct map_reviler_L3 obj_map_reviler_L3;
-        vector<Gtk::Button*> vec_buttons;
-        vector<Gtk::Label*> vec_labels;
-        vector<string> vec_names;
-        Gtk::Revealer* revealerL3;
-        Gtk::Box *box_L3 = new Gtk::Box();
-        builder->get_widget("boxL1", obj_map_reviler_L1.boxL1);
-        builder->get_widget("lblRevL1", obj_map_reviler_L1.lblRevL1);
-        builder->get_widget("btnToL2AndLv3", obj_map_reviler_L1.btnToL2AndLv3);
-        builder->get_widget("revealerL3", revealerL3);
-        box_L1->pack_start(*obj_map_reviler_L1.btnToL2AndLv3, Gtk::PACK_SHRINK);
-        obj_map_reviler_L1.lblRevL1->set_text(key);
-        this->event_template(obj_map_reviler_L1.btnToL2AndLv3, obj_map_reviler_L1.lblRevL1, name_level_1);
-        // Todo : open level 3
-        for (string& str_level_2: value) {
-            Gtk::Button* btn1;
-            Gtk::Label* lbl1;
-            builder->get_widget("btnToL3", btn1);
-            builder->get_widget("lblToL3", lbl1);
-            this->event_template(btn1, lbl1, name_level_3);
-            box_L3->pack_start(*btn1, Gtk::PACK_SHRINK);
-            lbl1->set_text(str_level_2);
-            vec_buttons.push_back(btn1);
-            vec_labels.push_back(lbl1);
-            vec_names.push_back(str_level_2);
-        }
-        boxALLL3->pack_start(*box_L3, Gtk::PACK_SHRINK);
-        revealerL3->set_reveal_child(true);
-        obj_map_reviler_L3.revealerL3 = revealerL3;
-        obj_map_reviler_L3.vec_buttons = vec_buttons;
-        obj_map_reviler_L3.vec_labels = vec_labels;
-        obj_map_reviler_L3.len_data = len_data;
-        obj_map_reviler_L3.box_L3 = box_L3;
-        obj_stuct_all_reviler.obj_map_reviler_L1 = obj_map_reviler_L1;
-        obj_stuct_all_reviler.obj_map_reviler_L3 = obj_map_reviler_L3;
-        vec_stuct_all_reviler.push_back(obj_stuct_all_reviler);
-        GtkWidget* rev_widget = GTK_WIDGET(revealerL1->gobj());
-        gtk_container_add(GTK_CONTAINER(rev_widget), GTK_WIDGET(box_L1->gobj()));
+    revealerL1->set_reveal_child(true);
+    revealerL2->set_reveal_child(true);
+    size_t index_l1 = 0;
+    for (auto& [key, vec_value]: map_list_os) {
+        map_menu_level_1[key] = new struct_menu_level1;
+        Glib::RefPtr<Gtk::Builder> builder_level_1 = Gtk::Builder::create_from_file(path_glade);
+        builder_level_1->get_widget("lblRevL1", map_menu_level_1[key]->lblRevL1);
+        builder_level_1->get_widget("btnToL2AndLv3", map_menu_level_1[key]->btnToL2AndLv3);
+        builder_level_1->get_widget("boxMenuLevel1", map_menu_level_1[key]->boxMenuLevel1);
+        map_menu_level_1[key]->builder = builder_level_1;
+        map_menu_level_1[key]->lblRevL1->set_text(key);
+        boxLevel1->pack_end(*(map_menu_level_1[key]->boxMenuLevel1));
+        map_menu_level_1[key]->btnToL2AndLv3->signal_clicked().connect( 
+        sigc::bind<Gtk::Label*, string&> (sigc::mem_fun( *this, 
+        &Menu_os::event_template), map_menu_level_1[key]->lblRevL1,
+        name_level_1));
+        map_menu_level_1[key]->name = key;
         
+        if (vec_value.size()!= 0) {
+            builder_level_1->get_widget("revealerL3", map_menu_level_1[key]->revealer);
+            builder_level_1->get_widget("boxLevel3", map_menu_level_1[key]->boxLevel3);
+        }
+        else {
+            map_menu_level_1[key]->revealer = NULL;
+            map_menu_level_1[key]->boxLevel3 = NULL;
         }
+        size_t index_l3 = 0;
+        for (string& str_level_2: vec_value) {
+            auto builder_level_3 = Gtk::Builder::create_from_file(path_glade);
+            map_menu_level_1[key]->vec_menu_level_3.push_back(new struct_menu_level_3);
+            builder_level_3->get_widget("btnToL3",
+                map_menu_level_1[key]->vec_menu_level_3[index_l3]->btnToL3);
+            builder_level_3->get_widget("lblToL3",
+                map_menu_level_1[key]->vec_menu_level_3[index_l3]->lblToL3);
+            map_menu_level_1[key]->vec_menu_level_3[index_l3]->lblToL3->set_text(str_level_2);
+            map_menu_level_1[key]->boxLevel3->pack_start(
+                *(map_menu_level_1[key]->vec_menu_level_3[index_l3]->btnToL3));
+            map_menu_level_1[key]->vec_menu_level_3[index_l3]->btnToL3->signal_clicked().connect( 
+                sigc::bind<Gtk::Label*, string&> (sigc::mem_fun(*this, 
+                &Menu_os::event_template), map_menu_level_1[key]->vec_menu_level_3[index_l3]->lblToL3,
+                name_level_3));
+            map_menu_level_1[key]->vec_menu_level_3[index_l3]->builder = builder_level_3;
+            boxALLL3->pack_start(
+                *(map_menu_level_1[key]->revealer));
+            index_l3 += 1;
             
+        }
         
+        index_l1 += 1;
     }
+}
+    
 void Menu_os::show() {
+    revealerL1->set_reveal_child(true);
+    revealerL2->set_reveal_child(false);
     popoverMenuOS->show_all();
 }
 void Menu_os::event() {
     btnToLev1->signal_clicked().connect(sigc::mem_fun(*this, &Menu_os::to_l1));
 }
-
-void Menu_os::event_template(Gtk::Button* button, Gtk::Label* label, string& name_level) {
-    button->signal_clicked().connect([&]() {name_level = label->get_label();});
+void Menu_os::set_entry(Gtk::Entry *entry) {
+    this->entry = entry;
+}
+void Menu_os::event_template(Gtk::Label* label, string& name_level) {
+    name_level = label->get_label();
+    entry->set_text(name_level_1 + name_level_3);
 }
 void Menu_os::to_l1() {
     revealerL1->set_reveal_child(true);

source/menu_os.h

@@ -2,47 +2,58 @@
 #define Menu_os_H
 #include <gtkmm.h>
 #include <map>
+#include <iostream>
 #include <vector>
 using namespace std;
 
 class Menu_os
 {
 private:
-    struct map_reviler_L1 {
-        Gtk::Box *boxL1;
-        Gtk::Label *lblRevL1;
-        Gtk::Button *btnToL2AndLv3;
-    };
-    struct map_reviler_L3 {
-        Gtk::Revealer *revealerL3;
-        Gtk::Box *box_L3;
-        vector<Gtk::Button*> vec_buttons;
-        vector<Gtk::Label*> vec_labels;
-        vector<string> vec_names;
-        size_t len_data;
-    };
-    struct stuct_all_reviler {
-        struct map_reviler_L1 obj_map_reviler_L1;
-        struct map_reviler_L3 obj_map_reviler_L3;
-    }; 
-    struct stuct_all_reviler obj_stuct_all_reviler;
-    vector<map_reviler_L1> vec_map_reviler_L1;
     Glib::RefPtr<Gtk::Builder> builder;
     std::map <string, vector<string>> map_list_os;
-    Gtk::Box *boxALLL3;
+    
     Gtk::Popover *popoverMenuOS;
     Gtk::Revealer *revealerL1;
     Gtk::Revealer *revealerL2;
     Gtk::Button *btnToLev1;
+    
+
+    private:
         string name_level_1 = "";
         string name_level_3 = "";
+        Gtk::Entry *entry;
+        string path_glade = "";
+        Gtk::Box *boxALLL3;
+        Gtk::Box *boxLevel1;
+        struct struct_menu_level_3 {
+            Gtk::Button *btnToL3;
+            Gtk::Label *lblToL3;
+            Glib::RefPtr<Gtk::Builder> builder;
+        };
+        struct struct_menu_level1 {
+            Gtk::Label *lblRevL1;
+            Gtk::Button *btnToL2AndLv3;
+            Gtk::Revealer *revealer;
+            Gtk::Box *boxLevel3;
+            Gtk::Box *boxMenuLevel1;
+            string name;
+            Glib::RefPtr<Gtk::Builder> builder;
+            vector<struct struct_menu_level_3*> vec_menu_level_3;
+        };
+        
+        struct struct_menu_level1 *obj_struct_menu_level1;
+        std::map<string, struct struct_menu_level1*> map_menu_level_1;
+        
+
 public:
     Menu_os(/* args */);
-    void set_builder(Glib::RefPtr<Gtk::Builder> const& builder);
+    void set_builder(Glib::RefPtr<Gtk::Builder>& builder, string path_glade);
     void set_map(std::map <string, vector<string>> &map_list_os);
     void init();
     void show();
-    void event_template(Gtk::Button* button, Gtk::Label* label, string& name_level);
+    void settings();
+    void set_entry(Gtk::Entry *entry);
+    void event_template(Gtk::Label* label, string& name_level);
     void event();
     void to_l1();
     ~Menu_os();

source/ubl-settings-bootloader.cc

@@ -100,9 +100,10 @@ void MainWindow::settings(){
         vector<string> os_control_list;
         this->pars_os(os_control_list);
         std::map<string, vector<string>> map_list_os = format_os_list(os_control_list);
-        obj_menu_os.set_builder(builder);
+        obj_menu_os.set_builder(builder, path_glade);
         obj_menu_os.set_map(map_list_os);
-        obj_menu_os.show();
+        obj_menu_os.set_entry(entrListOS);
+        obj_menu_os.init();
         this->write_list_entry_os(os_control_list);
         this->download_local_cfg();
         this->download_globl_cfg();
@@ -124,12 +125,13 @@ map<string, vector<string>> MainWindow::format_os_list(vector<string> &os_contro
     std::map<string, vector<string>> map_list_os;
     set<string> set_key;
     for (string& name_os : os_control_list) {
+        
         if (name_os.find(">") != string::npos) {
             set_key.insert(name_os.substr(0,name_os.find(">")+1));
         }
         else {
             vector<string> vec_os;
-            vec_os.push_back(" ");
+            //vec_os.push_back(" ");
             map_list_os[name_os] = vec_os; 
         }
     }
@@ -142,7 +144,7 @@ map<string, vector<string>> MainWindow::format_os_list(vector<string> &os_contro
             if (name_os.find(*it) != string::npos) {
                 flag = true;
                 vec_os_values.push_back(name_os.substr(name_os.find(">")+1, name_os.length() - 1));
-                name_os_buff = name_os;
+                name_os_buff = *it;
             }
         }
         if (flag) {
@@ -498,7 +500,8 @@ void MainWindow::get_builder() {
     builder->get_widget("btnReadHelp", btnReadHelp);
     builder->get_widget("btnCancelHelp", btnCancelHelp);
     builder->get_widget("wndShowWeb", wndShowWeb);
-    
+    builder->get_widget("btnOpenMenuOS", btnOpenMenuOS);
+    builder->get_widget("entrListOS", entrListOS);
 }
 
 void MainWindow::localization(){
@@ -695,6 +698,7 @@ void MainWindow::cmd_entry_all(Gtk::Entry &entry, string cmd_settings, string cm
 }
 
 void MainWindow::event(){
+    btnOpenMenuOS->signal_clicked().connect([&]() {obj_menu_os.show();});
     btnCancelHelp->signal_clicked().connect([&]() {wndShowWeb->hide();});
     chkAlwaysOpenHelp->signal_toggled().connect([&]() {flag_open_browser = true;});
     btnReadHelp->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::open_browser));

source/ubl-settings-bootloader.h

@@ -68,7 +68,8 @@ void me_thread(string cmd);
 #define boot_menu_user_password _("Boot menu user password:")
 #define last_successful_upload _("Last successful upload")
 #define read_documentation_web _("Would you like to read documentation in the Web?")
-#define redirected_documentation _("You will be redirected to documentation site, where user help pages are ""translated and supported by community.")
+#define redirected_documentation _("You will be redirected to documentation site, where user help pages are " \
+                                   "translated and supported by community.")
 #define user_name_configuration_editing_code _("User name to enter boot configuration editing mode")
 #define user_password_configuration_edit_mode _("User password to enter boot configuration edit mode")
 #define loading_animation_with _("Loading animation with the magazine")
@@ -93,10 +94,19 @@ void me_thread(string cmd);
 #define str_active _("Active")
 #define str_option _("Option")
 #define str_description _("Description")
-#define str_help_h _("GTK settings bootloader for UBLinux\n""\n""Usage:  ubl-settings-bootloader [OPTIONS...]\n""Options:\n""  -h, --help\t Show this help\n""  -V, --version\t         Show package version\n""    --lock-help         Lock utility help\n""    --lock-save         Lock saving local and global configuration\n""    --lock-save-local   Lock save global configuration\n""    --lock-save-global  Lock load global configuration\n""    --lock-load-global  Lock load global configuration\n")
+#define str_help_h _("GTK settings bootloader for UBLinux\n"                                \
+                     "\n"                                                                   \
+                     "Usage:  ubl-settings-bootloader [OPTIONS...]\n"                       \
+                     "Options:\n"                                                           \
+                     "  -h, --help\t Show this help\n"                                      \
+                     "  -V, --version\t         Show package version\n"                     \
+                     "    --lock-help         Lock utility help\n"                          \
+                     "    --lock-save         Lock saving local and global configuration\n" \
+                     "    --lock-save-local   Lock save global configuration\n"             \
+                     "    --lock-save-global  Lock load global configuration\n"             \
+                     "    --lock-load-global  Lock load global configuration\n")
 #define no_recognized _("Argument not recognized\n")
 
-
 #define global_load "ubconfig --default --source global get boot"
 #define system_load "ubconfig --default --source system get boot"
 #define global_save "ubconfig --target global set boot "
@@ -130,14 +140,19 @@ public:
 
 private:
     int m_socketID = 0;
-
 };
 
-class MainWindow : public Gtk::ApplicationWindow {
+class MainWindow : public Gtk::ApplicationWindow
+{
 public:
-        class ModelColumns : public Gtk::TreeModel::ColumnRecord {
+    class ModelColumns : public Gtk::TreeModel::ColumnRecord
+    {
     public:
-                ModelColumns() {add(check_button), add(name); add(description); }
+        ModelColumns()
+        {
+            add(check_button), add(name);
+            add(description);
+        }
         // Gtk::TreeModelColumn<Gtk::CheckButton> check_button;
         Gtk::TreeModelColumn<bool> check_button;
         Gtk::TreeModelColumn<Glib::ustring> name;
@@ -201,6 +216,8 @@ class MainWindow : public Gtk::ApplicationWindow {
     Gtk::Button *btnReadHelp;
     Gtk::Button *btnCancelHelp;
     Gtk::Window *wndShowWeb;
+    Gtk::Button *btnOpenMenuOS;
+    Gtk::Entry *entrListOS;
 
     std::vector<std::string> vec_Option_kernel;
     std::vector<std::string> vec_Option_IPT;
@@ -244,7 +261,8 @@ class MainWindow : public Gtk::ApplicationWindow {
     Glib::RefPtr<Gtk::StyleContext> boxInfo;
     string str_cmd_error = "";
     template <typename Type>
-        struct Result{
+    struct Result
+    {
         Type response;
         int error;
     };
@@ -319,7 +337,8 @@ class MainWindow : public Gtk::ApplicationWindow {
     string template_item_selected(int size, Glib::RefPtr<Gtk::ListStore> &list_store, string key);
 };
 
-class SettingsPlug : public Gtk::Plug{
+class SettingsPlug : public Gtk::Plug
+{
 public:
     Gtk::Window *window;
     SettingsPlug(::Window p_socketID, Glib::RefPtr<Gtk::Builder> builder);
@@ -330,5 +349,3 @@ private:
 };
 
 void help();
-
-

ubl-settings-bootloader.glade

@@ -125,7 +125,7 @@ specified priority</property>
       </packing>
     </child>
   </object>
-  <object class="GtkBox" id="boxL1">
+  <object class="GtkBox" id="boxMenuLevel1">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
     <child>
@@ -133,6 +133,7 @@ specified priority</property>
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="label" translatable="yes">****</property>
+        <property name="xalign">0</property>
       </object>
       <packing>
         <property name="expand">True</property>
@@ -164,6 +165,12 @@ specified priority</property>
     <property name="visible">True</property>
     <property name="can-focus">True</property>
     <property name="receives-default">True</property>
+    <property name="margin-left">4</property>
+    <property name="margin-right">5</property>
+    <property name="margin-start">5</property>
+    <property name="margin-end">5</property>
+    <property name="margin-top">6</property>
+    <property name="margin-bottom">6</property>
     <child>
       <object class="GtkLabel" id="lblToL3">
         <property name="visible">True</property>
@@ -266,159 +273,6 @@ specified priority</property>
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="mess_sudo">
-    <property name="can-focus">False</property>
-    <property name="title" translatable="yes">Внимание!</property>
-    <property name="window-position">center</property>
-    <property name="type-hint">dialog</property>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="margin-left">5</property>
-            <property name="margin-right">5</property>
-            <property name="margin-start">5</property>
-            <property name="margin-end">5</property>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="margin-left">5</property>
-                <property name="margin-right">5</property>
-                <property name="margin-start">5</property>
-                <property name="margin-end">5</property>
-                <property name="margin-top">6</property>
-                <property name="margin-bottom">6</property>
-                <property name="pixel-size">50</property>
-                <property name="icon-name">gtk-dialog-warning</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="lblMessageSudo">
-                <property name="width-request">160</property>
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="halign">start</property>
-                <property name="valign">center</property>
-                <property name="margin-left">5</property>
-                <property name="margin-right">5</property>
-                <property name="margin-start">5</property>
-                <property name="margin-end">5</property>
-                <property name="margin-top">6</property>
-                <property name="margin-bottom">6</property>
-                <property name="label" translatable="yes">Warning!</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="btnMessCloseSudo">
-            <property name="label" translatable="yes">OK</property>
-            <property name="visible">True</property>
-            <property name="can-focus">True</property>
-            <property name="receives-default">True</property>
-            <property name="margin-left">5</property>
-            <property name="margin-right">5</property>
-            <property name="margin-start">5</property>
-            <property name="margin-end">5</property>
-            <property name="margin-top">3</property>
-            <property name="margin-bottom">3</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkPopover" id="popoverMenuOS">
-    <property name="can-focus">False</property>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <child>
-          <object class="GtkRevealer" id="revealerL1">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="transition-type">none</property>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkRevealer" id="revealerL2">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="transition-type">none</property>
-            <property name="reveal-child">True</property>
-            <child>
-              <object class="GtkBox" id="boxALLL3">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkButton" id="btnToLev1">
-                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="receives-default">True</property>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <property name="stock">gtk-missing-image</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
   <object class="GtkWindow" id="window">
     <property name="width-request">750</property>
     <property name="height-request">550</property>
@@ -647,10 +501,26 @@ specified priority</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkMenuButton">
+                                          <object class="GtkEntry" id="entrListOS">
+                                            <property name="visible">True</property>
+                                            <property name="can-focus">True</property>
+                                            <property name="margin-left">5</property>
+                                            <property name="margin-right">5</property>
+                                            <property name="margin-start">5</property>
+                                            <property name="margin-end">5</property>
+                                            <property name="margin-top">6</property>
+                                            <property name="margin-bottom">6</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkButton" id="btnOpenMenuOS">
                                             <property name="visible">True</property>
                                             <property name="can-focus">True</property>
-                                            <property name="focus-on-click">False</property>
                                             <property name="receives-default">True</property>
                                             <property name="margin-left">5</property>
                                             <property name="margin-right">5</property>
@@ -658,7 +528,6 @@ specified priority</property>
                                             <property name="margin-end">5</property>
                                             <property name="margin-top">6</property>
                                             <property name="margin-bottom">6</property>
-                                            <property name="align-widget">popoverMenuOS</property>
                                             <child>
                                               <object class="GtkImage">
                                                 <property name="visible">True</property>
@@ -670,7 +539,7 @@ specified priority</property>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">True</property>
-                                            <property name="position">2</property>
+                                            <property name="position">3</property>
                                           </packing>
                                         </child>
                                       </object>
@@ -1432,14 +1301,195 @@ specified priority</property>
       <widget name="chbPasswordProtecc"/>
     </widgets>
   </object>
+  <object class="GtkPopover" id="popoverMenuOS">
+    <property name="can-focus">False</property>
+    <property name="relative-to">btnOpenMenuOS</property>
+    <property name="position">bottom</property>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <child>
+          <object class="GtkRevealer" id="revealerL1">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="transition-type">none</property>
+            <child>
+              <object class="GtkBox" id="boxLevel1">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkRevealer" id="revealerL2">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="transition-type">none</property>
+            <property name="reveal-child">True</property>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkButton" id="btnToLev1">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="stock">gtk-missing-image</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="boxALLL3">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="mess_sudo">
+    <property name="can-focus">False</property>
+    <property name="title" translatable="yes">Внимание!</property>
+    <property name="window-position">center</property>
+    <property name="type-hint">dialog</property>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="margin-left">5</property>
+            <property name="margin-right">5</property>
+            <property name="margin-start">5</property>
+            <property name="margin-end">5</property>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="margin-left">5</property>
+                <property name="margin-right">5</property>
+                <property name="margin-start">5</property>
+                <property name="margin-end">5</property>
+                <property name="margin-top">6</property>
+                <property name="margin-bottom">6</property>
+                <property name="pixel-size">50</property>
+                <property name="icon-name">gtk-dialog-warning</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="lblMessageSudo">
+                <property name="width-request">160</property>
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
+                <property name="margin-left">5</property>
+                <property name="margin-right">5</property>
+                <property name="margin-start">5</property>
+                <property name="margin-end">5</property>
+                <property name="margin-top">6</property>
+                <property name="margin-bottom">6</property>
+                <property name="label" translatable="yes">Warning!</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="btnMessCloseSudo">
+            <property name="label" translatable="yes">OK</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <property name="margin-left">5</property>
+            <property name="margin-right">5</property>
+            <property name="margin-start">5</property>
+            <property name="margin-end">5</property>
+            <property name="margin-top">3</property>
+            <property name="margin-bottom">3</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
   <object class="GtkRevealer" id="revealerL3">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
     <property name="transition-type">none</property>
+    <child>
+      <object class="GtkBox" id="boxLevel3">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="orientation">vertical</property>
         <child>
           <placeholder/>
         </child>
       </object>
+    </child>
+  </object>
   <object class="GtkApplicationWindow" id="wndShowWeb">
     <property name="can-focus">False</property>
     <property name="halign">start</property>