From b38ffcb1de5478adb14b1d828c1adbbba51a9062 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Thu, 2 Feb 2023 13:34:28 +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=B1=D0=B0=D0=B3=20=D1=81=20=D0=B4=D1=83=D0=B1?=
 =?UTF-8?q?=D0=BB=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=D0=BC=20?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=BD=D0=BE=D0=BA=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 | 43 +++++++++++++++++++++++++++++++------------
 source/ublexec.h  |  6 ++++--
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/source/ublexec.cc b/source/ublexec.cc
index d60a60a..0782862 100644
--- a/source/ublexec.cc
+++ b/source/ublexec.cc
@@ -120,20 +120,12 @@ void MainWindow::get_builder(){
     builder->get_widget("iconDevelopment", iconDevelopment);
     builder->get_widget("iconSystem", iconSystem);
     builder->get_widget("lblSystem", lblSystem);
-    this->template_apps_obj(iconGraphics, list_Graphics);
     
-    this->template_apps_obj(iconTools, list_Tools);
-    this->template_apps_obj(iconInternet, list_Internet);
-    this->template_apps_obj(iconMultimedia, list_Multimedia);
-    this->template_apps_obj(iconSettings, list_Settings);
-    this->template_apps_obj(iconEducation, list_Education);
-    this->template_apps_obj(iconOffice, list_Office);
-    this->template_apps_obj(iconOther, list_Other);
-    this->template_apps_obj(iconDevelopment, list_Development);
-    this->template_apps_obj(iconSystem, list_System);
 
 }
 
+
+
 void MainWindow::template_apps_obj(Gtk::IconView *icon, Glib::RefPtr<Gtk::ListStore> &gtk_list_app){
     gtk_list_app = Gtk::ListStore::create(m_Columns);
     gtk_list_app->set_sort_column(m_Columns.m_col_description, Gtk::SORT_ASCENDING);
@@ -199,7 +191,7 @@ void MainWindow::event(){
     cbxExecuteEpriority->signal_toggled().connect(sigc::mem_fun(*this, &MainWindow::activ_or_block_execute_epriority));
     btnMessageErrorOk->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::message_gui_close));
     btnStartMenuOK->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::start_menu_entry_app));
-    btnStartMenuExit->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::close_start_menu));
+    btnStartMenuExit->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::close_entry_app));
     btnStartMenuOK->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::ok_close_entry_app));
     iconGraphics->signal_selection_changed().connect(sigc::mem_fun(*this,&MainWindow::select_Graphics));
     iconTools->signal_selection_changed().connect(sigc::mem_fun(*this,&MainWindow::select_Tools));
@@ -215,7 +207,22 @@ void MainWindow::event(){
     
 }
 
+void MainWindow::icon_clear(){
+    list_Graphics->clear();
+    list_Tools->clear();
+    list_Internet->clear();
+    list_Multimedia->clear();
+    list_Settings->clear();
+    list_Education->clear();
+    list_Graphics->clear();
+    list_Office->clear();
+    list_Other->clear();
+    list_Development->clear();
+    list_System->clear();
+}
+
 void MainWindow::ok_close_entry_app(){
+    this->icon_clear();
     dialogStartMenu->hide();
 }
 
@@ -291,7 +298,8 @@ void MainWindow::settings(){
     rbSudo->set_sensitive(false);
 
 }
-void MainWindow::close_start_menu(){
+void MainWindow::close_entry_app(){
+    this->icon_clear();
     dialogStartMenu->hide();
 }
 
@@ -340,6 +348,17 @@ void MainWindow::tempalte_row(string Name, string Exec,  string path , Glib::Ref
 }
 
 void MainWindow::open_list_app(){
+    this->template_apps_obj(iconGraphics, list_Graphics);
+    
+    this->template_apps_obj(iconTools, list_Tools);
+    this->template_apps_obj(iconInternet, list_Internet);
+    this->template_apps_obj(iconMultimedia, list_Multimedia);
+    this->template_apps_obj(iconSettings, list_Settings);
+    this->template_apps_obj(iconEducation, list_Education);
+    this->template_apps_obj(iconOffice, list_Office);
+    this->template_apps_obj(iconOther, list_Other);
+    this->template_apps_obj(iconDevelopment, list_Development);
+    this->template_apps_obj(iconSystem, list_System);
     string path = "";
     for ( const auto &st_app : list_app){
         for ( const auto &str_categor : st_app.Categories){
diff --git a/source/ublexec.h b/source/ublexec.h
index 4b89d16..8abbcf9 100644
--- a/source/ublexec.h
+++ b/source/ublexec.h
@@ -68,7 +68,7 @@ public:
     void localization();
     void event();
     void settings();
-    void close_start_menu();
+    void close_entry_app();
     void start_menu_entry_app();
     void message_gui_close();
     void activ_or_block_execute_epriority();
@@ -101,6 +101,7 @@ public:
     void select_Other();
     void select_Development();
     void select_System();
+    void icon_clear();
     vector<std::string> split(const std::string &s, char delim);
 
    public:
@@ -220,7 +221,8 @@ public:
                     vector<std::string> Categories;
         };  
         list <struct_App> list_app;
-        set <string> set_categories; 
+        set <string> set_categories;
+        int index_exec_gui_apps = 0; 
 
     
 };