From 4a9086614543208c1860e4dc3316d9afb43587cf Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Thu, 2 Mar 2023 12:15:06 +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=D1=8B=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=8B?=
 =?UTF-8?q?=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B0,=20=D0=B8=D1=81?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=B4=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=B9=D0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/ublexec.cc |   9 +-
 ublexec.glade     | 683 ++++++++++++++++++++++++++++++++--------------
 2 files changed, 485 insertions(+), 207 deletions(-)

diff --git a/source/ublexec.cc b/source/ublexec.cc
index 6f681cb..01d53a3 100644
--- a/source/ublexec.cc
+++ b/source/ublexec.cc
@@ -278,6 +278,7 @@ void MainWindow::unselect_icon(Gtk::IconView *icon_entry){
 }
 
 void MainWindow::settings(){
+    system("nohup xhost + local:  > /dev/null 2>&1 &");
     this->pars_apps();
     this->get_builder();
     this->event();
@@ -451,7 +452,12 @@ void MainWindow::start_cmd(){
         }
         else if (rbSudo->get_active()){
             chbTerminal->set_active(true);
-            str_variants_root="sudo -u " + cmbUser->get_active_text() + " ";
+            if (getlogin()==cmbUser->get_active_text()){
+                str_variants_root="sudo ";
+            }
+            else{
+                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()) + " ";
             }
@@ -508,6 +514,7 @@ void MainWindow::start_cmd(){
     path_file_name = "";
     path_file = "";
     name_app = "";
+    
 }
 
 void me_thread(string cmd){
diff --git a/ublexec.glade b/ublexec.glade
index ddd1e1f..3eff964 100644
--- a/ublexec.glade
+++ b/ublexec.glade
@@ -108,27 +108,54 @@
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
                                 <child>
-                                  <object class="GtkIconView" id="iconGraphics">
+                                  <object class="GtkBox">
                                     <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>
+                                    <property name="can-focus">False</property>
                                     <child>
-                                      <object class="GtkCellRendererPixbuf"/>
-                                      <attributes>
-                                        <attribute name="xalign">5</attribute>
-                                        <attribute name="yalign">5</attribute>
-                                        <attribute name="pixbuf">2</attribute>
-                                      </attributes>
+                                      <object class="GtkLabel">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="margin-left">7</property>
+                                        <property name="margin-right">7</property>
+                                        <property name="margin-start">7</property>
+                                        <property name="margin-end">7</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkCellRendererText"/>
-                                      <attributes>
-                                        <attribute name="xalign">4</attribute>
-                                        <attribute name="yalign">5</attribute>
-                                      </attributes>
+                                      <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="columns">1</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>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
                                     </child>
                                   </object>
                                 </child>
@@ -151,32 +178,59 @@
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
                                 <child>
-                                  <object class="GtkIconView" id="iconTools">
+                                  <object class="GtkBox">
                                     <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>
+                                    <property name="can-focus">False</property>
                                     <child>
-                                      <object class="GtkCellRendererPixbuf"/>
-                                      <attributes>
-                                        <attribute name="xalign">5</attribute>
-                                        <attribute name="yalign">5</attribute>
-                                        <attribute name="pixbuf">2</attribute>
-                                      </attributes>
+                                      <object class="GtkLabel">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="margin-left">7</property>
+                                        <property name="margin-right">7</property>
+                                        <property name="margin-start">7</property>
+                                        <property name="margin-end">7</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkCellRendererText"/>
-                                      <attributes>
-                                        <attribute name="xalign">5</attribute>
-                                        <attribute name="yalign">4</attribute>
-                                      </attributes>
+                                      <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="columns">1</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>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
                                     </child>
-                                    <style>
-                                      <class name="fgnb"/>
-                                    </style>
                                   </object>
                                 </child>
                                 <child type="label">
@@ -197,33 +251,61 @@
                               <object class="GtkExpander">
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
+                                <property name="margin-bottom">1</property>
                                 <child>
-                                  <object class="GtkIconView" id="iconInternet">
+                                  <object class="GtkBox">
                                     <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>
+                                    <property name="can-focus">False</property>
                                     <child>
-                                      <object class="GtkCellRendererPixbuf"/>
-                                      <attributes>
-                                        <attribute name="xalign">5</attribute>
-                                        <attribute name="yalign">5</attribute>
-                                        <attribute name="pixbuf">2</attribute>
-                                      </attributes>
+                                      <object class="GtkLabel">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="margin-left">7</property>
+                                        <property name="margin-right">7</property>
+                                        <property name="margin-start">7</property>
+                                        <property name="margin-end">7</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkCellRendererText"/>
-                                      <attributes>
-                                        <attribute name="xalign">5</attribute>
-                                        <attribute name="yalign">4</attribute>
-                                      </attributes>
+                                      <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="columns">1</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>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
                                     </child>
-                                    <style>
-                                      <class name="fgnb"/>
-                                    </style>
                                   </object>
                                 </child>
                                 <child type="label">
@@ -245,32 +327,59 @@
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
                                 <child>
-                                  <object class="GtkIconView" id="iconMultimedia">
+                                  <object class="GtkBox">
                                     <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>
+                                    <property name="can-focus">False</property>
                                     <child>
-                                      <object class="GtkCellRendererPixbuf"/>
-                                      <attributes>
-                                        <attribute name="xalign">5</attribute>
-                                        <attribute name="yalign">5</attribute>
-                                        <attribute name="pixbuf">2</attribute>
-                                      </attributes>
+                                      <object class="GtkLabel">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="margin-left">7</property>
+                                        <property name="margin-right">7</property>
+                                        <property name="margin-start">7</property>
+                                        <property name="margin-end">7</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkCellRendererText"/>
-                                      <attributes>
-                                        <attribute name="xalign">5</attribute>
-                                        <attribute name="yalign">4</attribute>
-                                      </attributes>
+                                      <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="columns">1</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>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
                                     </child>
-                                    <style>
-                                      <class name="fgnb"/>
-                                    </style>
                                   </object>
                                 </child>
                                 <child type="label">
@@ -292,32 +401,59 @@
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
                                 <child>
-                                  <object class="GtkIconView" id="iconSettings">
+                                  <object class="GtkBox">
                                     <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>
+                                    <property name="can-focus">False</property>
                                     <child>
-                                      <object class="GtkCellRendererPixbuf"/>
-                                      <attributes>
-                                        <attribute name="xalign">5</attribute>
-                                        <attribute name="yalign">5</attribute>
-                                        <attribute name="pixbuf">2</attribute>
-                                      </attributes>
+                                      <object class="GtkLabel">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="margin-left">7</property>
+                                        <property name="margin-right">7</property>
+                                        <property name="margin-start">7</property>
+                                        <property name="margin-end">7</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkCellRendererText"/>
-                                      <attributes>
-                                        <attribute name="xalign">5</attribute>
-                                        <attribute name="yalign">4</attribute>
-                                      </attributes>
+                                      <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="columns">1</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>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
                                     </child>
-                                    <style>
-                                      <class name="fgnb"/>
-                                    </style>
                                   </object>
                                 </child>
                                 <child type="label">
@@ -339,32 +475,59 @@
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
                                 <child>
-                                  <object class="GtkIconView" id="iconEducation">
+                                  <object class="GtkBox">
                                     <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>
+                                    <property name="can-focus">False</property>
                                     <child>
-                                      <object class="GtkCellRendererPixbuf"/>
-                                      <attributes>
-                                        <attribute name="xalign">5</attribute>
-                                        <attribute name="yalign">5</attribute>
-                                        <attribute name="pixbuf">2</attribute>
-                                      </attributes>
+                                      <object class="GtkLabel">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="margin-left">7</property>
+                                        <property name="margin-right">7</property>
+                                        <property name="margin-start">7</property>
+                                        <property name="margin-end">7</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkCellRendererText"/>
-                                      <attributes>
-                                        <attribute name="xalign">5</attribute>
-                                        <attribute name="yalign">4</attribute>
-                                      </attributes>
+                                      <object class="GtkIconView" id="iconEducation">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">True</property>
+                                        <property name="margin">6</property>
+                                        <property name="resize-mode">queue</property>
+                                        <property name="item-orientation">horizontal</property>
+                                        <property name="columns">1</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>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
                                     </child>
-                                    <style>
-                                      <class name="fgnb"/>
-                                    </style>
                                   </object>
                                 </child>
                                 <child type="label">
@@ -386,32 +549,59 @@
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
                                 <child>
-                                  <object class="GtkIconView" id="iconOffice">
+                                  <object class="GtkBox">
                                     <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>
+                                    <property name="can-focus">False</property>
                                     <child>
-                                      <object class="GtkCellRendererPixbuf"/>
-                                      <attributes>
-                                        <attribute name="xalign">5</attribute>
-                                        <attribute name="yalign">5</attribute>
-                                        <attribute name="pixbuf">2</attribute>
-                                      </attributes>
+                                      <object class="GtkLabel">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="margin-left">7</property>
+                                        <property name="margin-right">7</property>
+                                        <property name="margin-start">7</property>
+                                        <property name="margin-end">7</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkCellRendererText"/>
-                                      <attributes>
-                                        <attribute name="xalign">5</attribute>
-                                        <attribute name="yalign">4</attribute>
-                                      </attributes>
+                                      <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="columns">1</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>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
                                     </child>
-                                    <style>
-                                      <class name="fgnb"/>
-                                    </style>
                                   </object>
                                 </child>
                                 <child type="label">
@@ -433,32 +623,59 @@
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
                                 <child>
-                                  <object class="GtkIconView" id="iconOther">
+                                  <object class="GtkBox">
                                     <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>
+                                    <property name="can-focus">False</property>
                                     <child>
-                                      <object class="GtkCellRendererPixbuf"/>
-                                      <attributes>
-                                        <attribute name="xalign">5</attribute>
-                                        <attribute name="yalign">5</attribute>
-                                        <attribute name="pixbuf">2</attribute>
-                                      </attributes>
+                                      <object class="GtkLabel">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="margin-left">7</property>
+                                        <property name="margin-right">7</property>
+                                        <property name="margin-start">7</property>
+                                        <property name="margin-end">7</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkCellRendererText"/>
-                                      <attributes>
-                                        <attribute name="xalign">5</attribute>
-                                        <attribute name="yalign">4</attribute>
-                                      </attributes>
+                                      <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="columns">1</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>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
                                     </child>
-                                    <style>
-                                      <class name="fgnb"/>
-                                    </style>
                                   </object>
                                 </child>
                                 <child type="label">
@@ -480,32 +697,59 @@
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
                                 <child>
-                                  <object class="GtkIconView" id="iconDevelopment">
+                                  <object class="GtkBox">
                                     <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>
+                                    <property name="can-focus">False</property>
                                     <child>
-                                      <object class="GtkCellRendererPixbuf"/>
-                                      <attributes>
-                                        <attribute name="xalign">5</attribute>
-                                        <attribute name="yalign">5</attribute>
-                                        <attribute name="pixbuf">2</attribute>
-                                      </attributes>
+                                      <object class="GtkLabel">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="margin-left">7</property>
+                                        <property name="margin-right">7</property>
+                                        <property name="margin-start">7</property>
+                                        <property name="margin-end">7</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkCellRendererText"/>
-                                      <attributes>
-                                        <attribute name="xalign">5</attribute>
-                                        <attribute name="yalign">4</attribute>
-                                      </attributes>
+                                      <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="columns">1</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>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
                                     </child>
-                                    <style>
-                                      <class name="fgnb"/>
-                                    </style>
                                   </object>
                                 </child>
                                 <child type="label">
@@ -527,32 +771,59 @@
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
                                 <child>
-                                  <object class="GtkIconView" id="iconSystem">
+                                  <object class="GtkBox">
                                     <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>
+                                    <property name="can-focus">False</property>
                                     <child>
-                                      <object class="GtkCellRendererPixbuf"/>
-                                      <attributes>
-                                        <attribute name="xalign">5</attribute>
-                                        <attribute name="yalign">5</attribute>
-                                        <attribute name="pixbuf">2</attribute>
-                                      </attributes>
+                                      <object class="GtkLabel">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="margin-left">7</property>
+                                        <property name="margin-right">7</property>
+                                        <property name="margin-start">7</property>
+                                        <property name="margin-end">7</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkCellRendererText"/>
-                                      <attributes>
-                                        <attribute name="xalign">5</attribute>
-                                        <attribute name="yalign">4</attribute>
-                                      </attributes>
+                                      <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="columns">1</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>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
                                     </child>
-                                    <style>
-                                      <class name="fgnb"/>
-                                    </style>
                                   </object>
                                 </child>
                                 <child type="label">