From 146b314d2f776b51819ed9f2ed0552c1daeb89ab Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Wed, 1 Mar 2023 12:22:15 +0600
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=B4=D0=B8=D0=B7=D0=B0=D0=B9=D0=BD=20=D0=BE?=
 =?UTF-8?q?=D0=BA=D0=BD=D0=B0=20=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2=D0=B0=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8=D0=B9,?=
 =?UTF-8?q?=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20?=
 =?UTF-8?q?=D0=B1=D0=B0=D0=B3=20=D1=81=20=D0=BF=D0=BE=D0=B2=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC=20=D1=8D=D0=BB=D0=B5=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=82=D0=BE=D0=B2=20=D0=BE=D0=BA=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2=D0=B0=20=D0=BF=D1=80=D0=B8=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/ublexec.cc |  45 ++--
 source/ublexec.h  |   5 +-
 ublexec.glade     | 640 ++++++++++++++++++++++++++++------------------
 3 files changed, 422 insertions(+), 268 deletions(-)

diff --git a/source/ublexec.cc b/source/ublexec.cc
index 0795d13..a54e101 100644
--- a/source/ublexec.cc
+++ b/source/ublexec.cc
@@ -65,7 +65,6 @@ void MainWindow::get_builder(){
     builder->get_widget("lblInfoNooPriority", lblInfoNooPriority);
     builder->get_widget("lblInfoExec", lblInfoExec);
     builder->get_widget("lblInfoPriority", lblInfoPriority);
-    builder->get_widget("lblInfoEnterProg", lblInfoEnterProg);
     builder->get_widget("boxColor", boxColor);
     builder->get_widget("lblGraphics", lblGraphics);
     builder->get_widget("lblTools", lblTools);
@@ -113,8 +112,8 @@ void MainWindow::template_apps_obj(Gtk::IconView *icon, Glib::RefPtr<Gtk::ListSt
     gtk_list_app = Gtk::ListStore::create(m_Columns);
     gtk_list_app->set_sort_column(m_Columns.m_col_description, Gtk::SORT_ASCENDING);
     icon->set_model(gtk_list_app);
-    icon->set_markup_column(m_Columns.m_col_description);
-    icon->set_pixbuf_column(m_Columns.m_col_pixbuf);
+    icon->set_text_column(m_Columns.m_col_description);
+    //icon->set_pixbuf_column(m_Columns.m_col_pixbuf);
 }
 
 void MainWindow::add_CSS(){
@@ -150,7 +149,6 @@ void MainWindow::localization(){
     lblInfoExec->set_text(_("Change startup priority"));
     lblInfoPriority->set_text(_("Priority"));
     lblMessageError->set_text(_("Select an executable file or program"));
-    lblInfoEnterProg->set_text(_("Selecting Programs"));
     lblGraphics->set_text(_("Graphics"));
     lblTools->set_text(_("Tools"));
     lblInternet->set_text(_("Internet"));
@@ -205,7 +203,6 @@ void MainWindow::icon_clear(){
     list_Multimedia->clear();
     list_Settings->clear();
     list_Education->clear();
-    list_Graphics->clear();
     list_Office->clear();
     list_Other->clear();
     list_Development->clear();
@@ -356,7 +353,6 @@ void MainWindow::tempalte_row(string Name, string Exec,  string path , Glib::Ref
     Gtk::TreeModel::Row row = *(dtk_list->append());
     row[m_Columns.m_col_filename] = path;
     row[m_Columns.m_col_description] = Name;
-    row[m_Columns.app_name_exec] = Exec;
     if (std::ifstream(path)){
         row[m_Columns.m_col_pixbuf] = Gdk::Pixbuf::create_from_file(path);
     }
@@ -364,6 +360,9 @@ void MainWindow::tempalte_row(string Name, string Exec,  string path , Glib::Ref
         path = "/usr/share/icons/Faenza/emblems/16/emblem-danger.png";
         row[m_Columns.m_col_pixbuf] = Gdk::Pixbuf::create_from_file(path);
     }
+    row[m_Columns.app_name_exec] = Exec;
+    row[m_Columns.float_h_align] = 0.5;
+    row[m_Columns.float_w_align] = 0.5;
 }
 
 void MainWindow::open_list_app(){
@@ -430,29 +429,31 @@ void MainWindow::start_cmd(){
             //chbTerminal->set_active(true);
         }
         if (rbPkexec->get_active()){
-            if ((chbAnotherUser->get_active()) && (cmbUser->get_active_text().length()==0)) {
-                str_variants_root = " pkexec --user ${USER} env PATH=$PATH DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY ";
-            }
-            else  if (chbAnotherUser->get_active()){
-                str_variants_root = " pkexec --user " + cmbUser->get_active_text() + " env PATH=$PATH DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY ";
-            }    
-            else{
-                str_variants_root = " pkexec --user ${USER} env PATH=$PATH DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY ";
+            str_variants_root = " pkexec --user " + cmbUser->get_active_text();
+            if (cbxExecuteEpriority->get_active()){
+                str_variants_root += " nice -n " + to_string(spinPriority->get_value_as_int());
             }
+            str_variants_root += " env PATH=$PATH DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY ";    
         }
         else if (rbSu->get_active()){
             chbTerminal->set_active(true);
-            str_variants_root="su -l " + cmbUser->get_active_text() + " -c \" DISPLAY=$DISPLAY ";
+            str_variants_root="su -l " + cmbUser->get_active_text();
+            if (cbxExecuteEpriority->get_active()){
+                str_variants_root += " nice -n " + to_string(spinPriority->get_value_as_int());
+            }
+            str_variants_root += + " -c \" DISPLAY=$DISPLAY ";
         }
         else if (rbSudo->get_active()){
             chbTerminal->set_active(true);
             str_variants_root="sudo -u " + cmbUser->get_active_text() + " ";
+            if (cbxExecuteEpriority->get_active()){
+                str_variants_root += " nice -n " + to_string(spinPriority->get_value_as_int()) + " ";
+            }
         }
     }
-    if (cbxExecuteEpriority->get_active()){
-        str_nice_cmd = "nice -n " + to_string(spinPriority->get_value_as_int());
+    if ((cbxExecuteEpriority->get_active()) && (chbAnotherUser->get_active()==false)){
+        str_nice_cmd = " nice -n " + to_string(spinPriority->get_value_as_int()) + " ";
     }
-    
     if (user_cmd.length()==0 && name_app.length()==0 && path_file.length()==0){
         messageError->show();
         return;
@@ -466,10 +467,10 @@ void MainWindow::start_cmd(){
     }
     string cmd = "";
     if (path_file != ""){
-        cmd =  str_nice_cmd + " nohup " + str_cmd_terminal + str_variants_root  + " xdg-open '" + path_file + "' ";
+        cmd = "nohup " + str_nice_cmd + str_cmd_terminal + str_variants_root + " xdg-open '" + path_file + "' ";
     }
     else if (name_app!=""){
-        cmd =  str_nice_cmd + " nohup " + str_cmd_terminal + str_variants_root  + name_app;
+        cmd = "nohup " + str_nice_cmd + str_cmd_terminal + str_variants_root  + name_app;
     }
     else{
         bool flag_xdg = false;
@@ -484,13 +485,13 @@ void MainWindow::start_cmd(){
         size_t vec_len = vec_user_cmd.size();
         user_cmd = vec_user_cmd[vec_len-1];
         if (flag_xdg==false){
-            cmd =  str_nice_cmd + " nohup " + str_cmd_terminal + str_variants_root  + user_cmd;
+            cmd = "nohup " + str_nice_cmd + str_cmd_terminal + str_variants_root + user_cmd;
             if (str_variants_root.find("su -l") != string::npos){
                 cmd += "\"";
             }
         }
         else{
-            cmd =  str_nice_cmd + " nohup " + str_cmd_terminal + str_variants_root + " xdg-open " + user_cmd ;
+            cmd = "nohup " + str_nice_cmd + str_cmd_terminal + str_variants_root + " xdg-open " + user_cmd ;
         }
     }
     
diff --git a/source/ublexec.h b/source/ublexec.h
index d4a1e0e..cda2475 100644
--- a/source/ublexec.h
+++ b/source/ublexec.h
@@ -94,12 +94,16 @@ public:
       add(m_col_description);
       add(m_col_pixbuf);
       add(app_name_exec);
+      add(float_h_align);
+      add(float_w_align);
       
     }
     Gtk::TreeModelColumn<std::string> m_col_filename;
     Gtk::TreeModelColumn<Glib::ustring>  m_col_description;
     Gtk::TreeModelColumn<Glib::ustring>  app_name_exec;
     Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf> > m_col_pixbuf;
+    Gtk::TreeModelColumn<float> float_h_align;
+    Gtk::TreeModelColumn<float> float_w_align;
   };
   ModelColumns m_Columns;
   public:
@@ -141,7 +145,6 @@ public:
     Gtk::Label *lblInfoNooPriority;
     Gtk::Label *lblInfoExec;
     Gtk::Label *lblInfoPriority;
-    Gtk::Label *lblInfoEnterProg;
 
     Gtk::Label *lblGraphics;
     Gtk::Label *lblTools;
diff --git a/ublexec.glade b/ublexec.glade
index 21c9d66..298e5e8 100644
--- a/ublexec.glade
+++ b/ublexec.glade
@@ -12,7 +12,7 @@
     <property name="type-hint">dialog</property>
     <property name="urgency-hint">True</property>
     <property name="program-name">ublexec</property>
-    <property name="version">1.2</property>
+    <property name="version">1.0</property>
     <property name="copyright" translatable="yes">Copyright © 2023 - UBSoft Software LLC</property>
     <property name="comments" translatable="yes">Setting the date and time</property>
     <property name="website">https://ublinux.ru/</property>
@@ -56,26 +56,14 @@
     <property name="page-increment">10</property>
   </object>
   <object class="GtkWindow" id="dialogStartMenu">
-    <property name="width-request">500</property>
-    <property name="height-request">400</property>
+    <property name="width-request">450</property>
+    <property name="height-request">240</property>
     <property name="can-focus">False</property>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkLabel" id="lblInfoEnterProg">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="label" translatable="yes">Selecting Programs</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkScrolledWindow">
             <property name="visible">True</property>
@@ -83,6 +71,7 @@
             <property name="shadow-type">in</property>
             <child>
               <object class="GtkViewport" id="f2">
+                <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="margin-left">5</property>
                 <property name="margin-right">5</property>
@@ -110,321 +99,466 @@
                             <property name="can-focus">False</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="GtkLabel" id="lblGraphics">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="halign">start</property>
-                                <property name="label" translatable="yes">Graphics</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkIconView" id="iconGraphics">
+                              <object class="GtkExpander">
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
-                                <property name="margin">1</property>
-                                <property name="resize-mode">queue</property>
-                                <property name="row-spacing">1</property>
-                                <property name="column-spacing">1</property>
-                                <property name="item-padding">1</property>
-                                <style>
-                                  <class name="fgnb"/>
-                                </style>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="lblTools">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="halign">start</property>
-                                <property name="label" translatable="yes">Tools</property>
+                                <child>
+                                  <object class="GtkIconView" id="iconGraphics">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="margin">1</property>
+                                    <property name="item-orientation">horizontal</property>
+                                    <property name="item-width">120</property>
+                                    <property name="item-padding">1</property>
+                                    <child>
+                                      <object class="GtkCellRendererPixbuf"/>
+                                      <attributes>
+                                        <attribute name="xalign">5</attribute>
+                                        <attribute name="yalign">5</attribute>
+                                        <attribute name="pixbuf">2</attribute>
+                                      </attributes>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCellRendererText"/>
+                                      <attributes>
+                                        <attribute name="xalign">4</attribute>
+                                        <attribute name="yalign">5</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="lblGraphics">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="label" translatable="yes">Graphics</property>
+                                  </object>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">2</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkIconView" id="iconTools">
+                              <object class="GtkExpander">
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
-                                <property name="margin">1</property>
-                                <property name="resize-mode">queue</property>
-                                <property name="row-spacing">1</property>
-                                <property name="column-spacing">1</property>
-                                <property name="item-padding">1</property>
-                                <style>
-                                  <class name="fgnb"/>
-                                </style>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">3</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="lblInternet">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="halign">start</property>
-                                <property name="label" translatable="yes">Internet</property>
+                                <child>
+                                  <object class="GtkIconView" id="iconTools">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="margin">1</property>
+                                    <property name="resize-mode">queue</property>
+                                    <property name="item-orientation">horizontal</property>
+                                    <property name="item-width">120</property>
+                                    <property name="item-padding">1</property>
+                                    <child>
+                                      <object class="GtkCellRendererPixbuf"/>
+                                      <attributes>
+                                        <attribute name="xalign">5</attribute>
+                                        <attribute name="yalign">5</attribute>
+                                        <attribute name="pixbuf">2</attribute>
+                                      </attributes>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCellRendererText"/>
+                                      <attributes>
+                                        <attribute name="xalign">5</attribute>
+                                        <attribute name="yalign">4</attribute>
+                                      </attributes>
+                                    </child>
+                                    <style>
+                                      <class name="fgnb"/>
+                                    </style>
+                                  </object>
+                                </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="lblTools">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="label" translatable="yes">Tools</property>
+                                  </object>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">4</property>
+                                <property name="position">3</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkIconView" id="iconInternet">
+                              <object class="GtkExpander">
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
-                                <property name="margin">1</property>
-                                <property name="resize-mode">queue</property>
-                                <property name="row-spacing">1</property>
-                                <property name="column-spacing">1</property>
-                                <property name="item-padding">1</property>
-                                <style>
-                                  <class name="fgnb"/>
-                                </style>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">5</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="lblMultimedia">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="halign">start</property>
-                                <property name="label" translatable="yes">Multimedia</property>
+                                <child>
+                                  <object class="GtkIconView" id="iconInternet">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="margin">1</property>
+                                    <property name="resize-mode">queue</property>
+                                    <property name="item-orientation">horizontal</property>
+                                    <property name="item-width">120</property>
+                                    <property name="item-padding">1</property>
+                                    <child>
+                                      <object class="GtkCellRendererPixbuf"/>
+                                      <attributes>
+                                        <attribute name="xalign">5</attribute>
+                                        <attribute name="yalign">5</attribute>
+                                        <attribute name="pixbuf">2</attribute>
+                                      </attributes>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCellRendererText"/>
+                                      <attributes>
+                                        <attribute name="xalign">5</attribute>
+                                        <attribute name="yalign">4</attribute>
+                                      </attributes>
+                                    </child>
+                                    <style>
+                                      <class name="fgnb"/>
+                                    </style>
+                                  </object>
+                                </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="lblInternet">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="label" translatable="yes">Internet</property>
+                                  </object>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">6</property>
+                                <property name="position">5</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkIconView" id="iconMultimedia">
+                              <object class="GtkExpander">
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
-                                <property name="margin">1</property>
-                                <property name="resize-mode">queue</property>
-                                <property name="row-spacing">1</property>
-                                <property name="column-spacing">1</property>
-                                <property name="item-padding">1</property>
-                                <style>
-                                  <class name="fgnb"/>
-                                </style>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">7</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="lblSettings">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="halign">start</property>
-                                <property name="label" translatable="yes">Settings</property>
+                                <child>
+                                  <object class="GtkIconView" id="iconMultimedia">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="margin">1</property>
+                                    <property name="resize-mode">queue</property>
+                                    <property name="item-orientation">horizontal</property>
+                                    <property name="item-width">120</property>
+                                    <property name="item-padding">1</property>
+                                    <child>
+                                      <object class="GtkCellRendererPixbuf"/>
+                                      <attributes>
+                                        <attribute name="xalign">5</attribute>
+                                        <attribute name="yalign">5</attribute>
+                                        <attribute name="pixbuf">2</attribute>
+                                      </attributes>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCellRendererText"/>
+                                      <attributes>
+                                        <attribute name="xalign">5</attribute>
+                                        <attribute name="yalign">4</attribute>
+                                      </attributes>
+                                    </child>
+                                    <style>
+                                      <class name="fgnb"/>
+                                    </style>
+                                  </object>
+                                </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="lblMultimedia">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="label" translatable="yes">Multimedia</property>
+                                  </object>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">8</property>
+                                <property name="position">7</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkIconView" id="iconSettings">
+                              <object class="GtkExpander">
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
-                                <property name="margin">1</property>
-                                <property name="resize-mode">queue</property>
-                                <property name="row-spacing">1</property>
-                                <property name="column-spacing">1</property>
-                                <property name="item-padding">1</property>
-                                <style>
-                                  <class name="fgnb"/>
-                                </style>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">9</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="lblEducation">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="halign">start</property>
-                                <property name="label" translatable="yes">Education</property>
+                                <child>
+                                  <object class="GtkIconView" id="iconSettings">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="margin">1</property>
+                                    <property name="resize-mode">queue</property>
+                                    <property name="item-orientation">horizontal</property>
+                                    <property name="item-width">120</property>
+                                    <property name="item-padding">1</property>
+                                    <child>
+                                      <object class="GtkCellRendererPixbuf"/>
+                                      <attributes>
+                                        <attribute name="xalign">5</attribute>
+                                        <attribute name="yalign">5</attribute>
+                                        <attribute name="pixbuf">2</attribute>
+                                      </attributes>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCellRendererText"/>
+                                      <attributes>
+                                        <attribute name="xalign">5</attribute>
+                                        <attribute name="yalign">4</attribute>
+                                      </attributes>
+                                    </child>
+                                    <style>
+                                      <class name="fgnb"/>
+                                    </style>
+                                  </object>
+                                </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="lblSettings">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="label" translatable="yes">Settings</property>
+                                  </object>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">10</property>
+                                <property name="position">9</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkIconView" id="iconEducation">
+                              <object class="GtkExpander">
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
-                                <property name="margin">1</property>
-                                <property name="resize-mode">queue</property>
-                                <property name="row-spacing">1</property>
-                                <property name="column-spacing">1</property>
-                                <property name="item-padding">1</property>
-                                <style>
-                                  <class name="fgnb"/>
-                                </style>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">11</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="lblOffice">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="halign">start</property>
-                                <property name="label" translatable="yes">Office</property>
+                                <child>
+                                  <object class="GtkIconView" id="iconEducation">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="margin">0</property>
+                                    <property name="resize-mode">queue</property>
+                                    <property name="item-orientation">horizontal</property>
+                                    <property name="item-width">120</property>
+                                    <property name="item-padding">1</property>
+                                    <child>
+                                      <object class="GtkCellRendererPixbuf"/>
+                                      <attributes>
+                                        <attribute name="xalign">5</attribute>
+                                        <attribute name="yalign">5</attribute>
+                                        <attribute name="pixbuf">2</attribute>
+                                      </attributes>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCellRendererText"/>
+                                      <attributes>
+                                        <attribute name="xalign">5</attribute>
+                                        <attribute name="yalign">4</attribute>
+                                      </attributes>
+                                    </child>
+                                    <style>
+                                      <class name="fgnb"/>
+                                    </style>
+                                  </object>
+                                </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="lblEducation">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="label" translatable="yes">Education</property>
+                                  </object>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">12</property>
+                                <property name="position">11</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkIconView" id="iconOffice">
+                              <object class="GtkExpander">
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
-                                <property name="margin">1</property>
-                                <property name="resize-mode">queue</property>
-                                <property name="spacing">1</property>
-                                <property name="row-spacing">1</property>
-                                <property name="column-spacing">1</property>
-                                <style>
-                                  <class name="fgnb"/>
-                                </style>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">13</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="lblOther">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="halign">start</property>
-                                <property name="label" translatable="yes">Other</property>
+                                <child>
+                                  <object class="GtkIconView" id="iconOffice">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="margin">1</property>
+                                    <property name="resize-mode">queue</property>
+                                    <property name="item-orientation">horizontal</property>
+                                    <property name="item-width">120</property>
+                                    <property name="item-padding">1</property>
+                                    <child>
+                                      <object class="GtkCellRendererPixbuf"/>
+                                      <attributes>
+                                        <attribute name="xalign">5</attribute>
+                                        <attribute name="yalign">5</attribute>
+                                        <attribute name="pixbuf">2</attribute>
+                                      </attributes>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCellRendererText"/>
+                                      <attributes>
+                                        <attribute name="xalign">5</attribute>
+                                        <attribute name="yalign">4</attribute>
+                                      </attributes>
+                                    </child>
+                                    <style>
+                                      <class name="fgnb"/>
+                                    </style>
+                                  </object>
+                                </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="lblOffice">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="label" translatable="yes">Office</property>
+                                  </object>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">14</property>
+                                <property name="position">13</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkIconView" id="iconOther">
+                              <object class="GtkExpander">
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
-                                <property name="margin">1</property>
-                                <property name="resize-mode">queue</property>
-                                <property name="row-spacing">1</property>
-                                <property name="column-spacing">1</property>
-                                <property name="item-padding">1</property>
-                                <style>
-                                  <class name="fgnb"/>
-                                </style>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">15</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="lblDevelopment">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="halign">start</property>
-                                <property name="label" translatable="yes">Development</property>
+                                <child>
+                                  <object class="GtkIconView" id="iconOther">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="margin">1</property>
+                                    <property name="resize-mode">queue</property>
+                                    <property name="item-orientation">horizontal</property>
+                                    <property name="item-width">120</property>
+                                    <property name="item-padding">1</property>
+                                    <child>
+                                      <object class="GtkCellRendererPixbuf"/>
+                                      <attributes>
+                                        <attribute name="xalign">5</attribute>
+                                        <attribute name="yalign">5</attribute>
+                                        <attribute name="pixbuf">2</attribute>
+                                      </attributes>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCellRendererText"/>
+                                      <attributes>
+                                        <attribute name="xalign">5</attribute>
+                                        <attribute name="yalign">4</attribute>
+                                      </attributes>
+                                    </child>
+                                    <style>
+                                      <class name="fgnb"/>
+                                    </style>
+                                  </object>
+                                </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="lblOther">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="label" translatable="yes">Other</property>
+                                  </object>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">16</property>
+                                <property name="position">15</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkIconView" id="iconDevelopment">
+                              <object class="GtkExpander">
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
-                                <property name="margin">1</property>
-                                <property name="resize-mode">queue</property>
-                                <property name="row-spacing">1</property>
-                                <property name="column-spacing">1</property>
-                                <property name="item-padding">1</property>
-                                <style>
-                                  <class name="fgnb"/>
-                                </style>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">17</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="lblSystem">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="halign">start</property>
-                                <property name="label" translatable="yes">System</property>
+                                <child>
+                                  <object class="GtkIconView" id="iconDevelopment">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="margin">1</property>
+                                    <property name="resize-mode">queue</property>
+                                    <property name="item-orientation">horizontal</property>
+                                    <property name="item-width">120</property>
+                                    <property name="item-padding">1</property>
+                                    <child>
+                                      <object class="GtkCellRendererPixbuf"/>
+                                      <attributes>
+                                        <attribute name="xalign">5</attribute>
+                                        <attribute name="yalign">5</attribute>
+                                        <attribute name="pixbuf">2</attribute>
+                                      </attributes>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCellRendererText"/>
+                                      <attributes>
+                                        <attribute name="xalign">5</attribute>
+                                        <attribute name="yalign">4</attribute>
+                                      </attributes>
+                                    </child>
+                                    <style>
+                                      <class name="fgnb"/>
+                                    </style>
+                                  </object>
+                                </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="lblDevelopment">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="label" translatable="yes">Development</property>
+                                  </object>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">18</property>
+                                <property name="position">17</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkIconView" id="iconSystem">
+                              <object class="GtkExpander">
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
-                                <property name="margin">1</property>
-                                <property name="resize-mode">queue</property>
-                                <property name="row-spacing">1</property>
-                                <property name="column-spacing">1</property>
-                                <property name="item-padding">1</property>
-                                <style>
-                                  <class name="fgnb"/>
-                                </style>
+                                <child>
+                                  <object class="GtkIconView" id="iconSystem">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="margin">1</property>
+                                    <property name="resize-mode">queue</property>
+                                    <property name="item-orientation">horizontal</property>
+                                    <property name="item-padding">1</property>
+                                    <child>
+                                      <object class="GtkCellRendererPixbuf"/>
+                                      <attributes>
+                                        <attribute name="xalign">5</attribute>
+                                        <attribute name="yalign">5</attribute>
+                                        <attribute name="pixbuf">2</attribute>
+                                      </attributes>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCellRendererText"/>
+                                      <attributes>
+                                        <attribute name="xalign">5</attribute>
+                                        <attribute name="yalign">4</attribute>
+                                      </attributes>
+                                    </child>
+                                    <style>
+                                      <class name="fgnb"/>
+                                    </style>
+                                  </object>
+                                </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="lblSystem">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="label" translatable="yes">System</property>
+                                  </object>
+                                </child>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
+                                <property name="expand">False</property>
                                 <property name="fill">True</property>
                                 <property name="position">19</property>
                               </packing>
@@ -517,6 +651,22 @@
     <property name="margin-bottom">6</property>
     <property name="stock">gtk-media-play</property>
   </object>
+  <object class="GtkListStore" id="list_Other">
+    <columns>
+      <!-- column-name gchararray1 -->
+      <column type="gchararray"/>
+      <!-- column-name gchararray2 -->
+      <column type="gchararray"/>
+      <!-- column-name GdkPixbuf1 -->
+      <column type="GdkPixbuf"/>
+      <!-- column-name gchararray3 -->
+      <column type="gchararray"/>
+      <!-- column-name gfloat1 -->
+      <column type="gfloat"/>
+      <!-- column-name gfloat2 -->
+      <column type="gfloat"/>
+    </columns>
+  </object>
   <object class="GtkMessageDialog" id="messageError">
     <property name="can-focus">False</property>
     <property name="title" translatable="yes">Внимание!</property>