Добален заполнитель иконок для меню выбора приложений

source/ublexec.cc

@@ -50,12 +50,16 @@ CmdArgParser::CmdArgParser(const std::string& p_name, const std::string& p_descr
 }
 MainWindow::MainWindow(BaseObjectType* obj, Glib::RefPtr<Gtk::Builder> const& builder)
     : Gtk::ApplicationWindow(obj), builder{builder} {
+        this->builder = builder;
         this->settings();  
     }
 MainWindow::MainWindow(Glib::RefPtr<Gtk::Builder> const& builder) {
     this->builder =  builder;
     this->settings();
 }
+
+
+
 void MainWindow::get_builder(){
     builder->get_widget("btnFilemaneg", btnFilemaneg);
     builder->get_widget("btnListApp", btnListApp);
@@ -107,22 +111,47 @@ void MainWindow::get_builder(){
     builder->get_widget("lblOther", lblOther);
     builder->get_widget("lblDevelopment", lblDevelopment);
     builder->get_widget("iconGraphics", iconGraphics);
-
+    builder->get_widget("iconTools", iconTools);
+    builder->get_widget("iconInternet", iconInternet);
+    builder->get_widget("iconMultimedia", iconMultimedia);
+    builder->get_widget("iconSettings", iconSettings);
+    builder->get_widget("iconEducation", iconEducation);
+    builder->get_widget("iconOffice", iconOffice);
+    builder->get_widget("iconOther", iconOther);
+    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);
+
+    /*
     list_Graphics = Gtk::ListStore::create( m_Columns );
     list_Graphics->set_sort_column( m_Columns.m_col_description, Gtk::SORT_ASCENDING );
-
     iconGraphics->set_model(list_Graphics);
     iconGraphics->set_markup_column(m_Columns.m_col_description);
     iconGraphics->set_pixbuf_column(m_Columns.m_col_pixbuf);
     
+    */
+}
 
-
+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);
+    icon->set_model(gtk_list_app);
+    icon->set_markup_column(m_Columns.m_col_description);
+    icon->set_pixbuf_column(m_Columns.m_col_pixbuf);
 }
 
+
 void MainWindow::add_CSS(){
     Glib::RefPtr<Gtk::CssProvider> cssProvider = Gtk::CssProvider::create();
     cssProvider->load_from_path(path_css);   
@@ -179,10 +208,17 @@ void MainWindow::event(){
     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));
+    iconGraphics->signal_item_activated().connect(sigc::mem_fun(*this,&MainWindow::on_item_activated) );
+
+}
+
+void MainWindow::on_item_activated(const Gtk::TreeModel::Path& path){
+    
 }
+
 void MainWindow::settings(){
     this->pars_apps();
-    this->builder = builder;
+    
     this->get_builder();
     this->event();
     this->localization();
@@ -238,6 +274,23 @@ void MainWindow::get_path_filemaneg(){
         this->close_filemaneg();
     }
 }
+
+void MainWindow::tempalte_row(string name, string path, Glib::RefPtr<Gtk::ListStore> &dtk_list){
+    Gtk::TreeModel::Row row = *(dtk_list->append());
+    row[m_Columns.m_col_filename] = path;
+    row[m_Columns.m_col_description] = name;
+    if (std::ifstream(path)){
+        row[m_Columns.m_col_pixbuf] = Gdk::Pixbuf::create_from_file(path);
+    }
+    else{
+        path = "/usr/share/icons/Faenza/emblems/32/emblem-danger.png";
+        row[m_Columns.m_col_pixbuf] = Gdk::Pixbuf::create_from_file(path);
+    }
+
+     
+
+}
+
 void MainWindow::open_list_app(){
 
     
@@ -245,38 +298,37 @@ void MainWindow::open_list_app(){
     string path = "";
     for ( const auto &str_app : list_app){
         for ( const auto &str_categor : str_app.Categories){
-            path = "/usr/share/applications/" + str_app.Icon + ".svg";
+            path = "/usr/share/icons/hicolor/32x32/apps/" + str_app.Icon + ".png";
+            cout << str_categor << endl; 
             if (str_categor=="Graphics"){
-                Gtk::TreeModel::Row row = *(list_Graphics->append());
+                this->tempalte_row(str_app.Name, path, list_Graphics);
-                row[m_Columns.m_col_filename] = path;
-                row[m_Columns.m_col_description] = str_app.Name;
             }
-            else if (str_categor=="Tools"){
+            else if (str_categor=="Utility"){
-                
+                this->tempalte_row(str_app.Name, path, list_Tools);
             }
-            else if (str_categor=="Internet"){
+            else if (str_categor=="Network"){
-                
+                this->tempalte_row(str_app.Name, path, list_Internet);
             }
-            else if (str_categor=="Multimedia"){
+            else if (str_categor=="Multimedia" || str_categor== "Video" || str_categor== "Player" || str_categor== "AudioVideo"){
-                
+                this->tempalte_row(str_app.Name, path, list_Multimedia);
             }
             else if (str_categor=="Settings"){
-                
+                this->tempalte_row(str_app.Name, path, list_Settings);
             }
             else if (str_categor=="Education"){
-                
+                this->tempalte_row(str_app.Name, path, list_Education);
             }
             else if (str_categor=="Office"){
-                
+                this->tempalte_row(str_app.Name, path, list_Office);
             }
             else if (str_categor=="Other"){
-                
+                this->tempalte_row(str_app.Name, path, list_Other);
             }
             else if (str_categor=="Development"){
-                cout << str_categor << endl;
+                this->tempalte_row(str_app.Name, path, list_Development);
             }
             else if (str_categor=="System"){
-                
+                this->tempalte_row(str_app.Name, path, list_System);
             }
 
         }
@@ -284,17 +336,7 @@ void MainWindow::open_list_app(){
     dialogStartMenu->show_all();
 
 }
-/*
+
-void MainWindow::tmp_desktop(string cmd_name){
-    string desktop = "";
-    desktop = "[Desktop Entry]\nEncoding=UTF-8\nName=test\nName[ru]=тест\nGenericName=test\nGenericName[ru]=тест\nComment=test\nComment[ru]=test\nType=Application\nExec=pkexec "+cmd_name +
-        "\nIcon=ublexec\nTerminal=false\nCategories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;";
-    string cmd = "";
-    cmd = "touch /tmp/" + cmd_name + ".desktop; echo \"" + desktop + "\" > /tmp/"+cmd_name+".desktop; chmod +x /tmp/"+cmd_name+".desktop";
-    cout << cmd << endl;
-    system(cmd.c_str());
-}
-*/
 
 void MainWindow::start_cmd(){
     //txtCmd->set_text("");
@@ -503,10 +545,9 @@ void MainWindow::pars_apps(){
             App.Name = Name;
             App.Type = Type;
             App.Exec = Exec;
-            App.Icon = Name;
+            App.Icon = Icon;
             if (Mime!=NULL){
                 App.MimeType = Mime;
-                cout << App.MimeType << endl;
             }
             else{
                 App.MimeType = ""; 

source/ublexec.h

@@ -62,6 +62,7 @@ class MainWindow : public Gtk::ApplicationWindow {
 public:
     MainWindow(BaseObjectType* obj, Glib::RefPtr<Gtk::Builder> const& builder);
     MainWindow(Glib::RefPtr<Gtk::Builder> const& builder);
+    void template_apps_obj(Gtk::IconView *icon, Glib::RefPtr<Gtk::ListStore> &gtk_list_app);
     void get_builder();
     void add_CSS();
     void localization();
@@ -86,6 +87,9 @@ public:
     void pars_users();
     void pars_apps();
     void tmp_desktop(string cmd_name);
+    void on_item_activated(const Gtk::TreeModel::Path& path);
+    void tempalte_row(string name, string path, Glib::RefPtr<Gtk::ListStore> &dtk_list);
+    
     vector<std::string> split(const std::string &s, char delim);
 
    public:
@@ -134,7 +138,7 @@ public:
     Gtk::Button *btnStartMenuOK;
     Gtk::Button *btnStartMenuExit;
     Gtk::Box *boxlistProgramm;
-    Gtk::Dialog *dialogStartMenu;
+    Gtk::Window *dialogStartMenu;
     Gtk::Box *boxColor;
     Gtk::Label *lblInfoHead;
     Gtk::Label *lblinfoCmd;
@@ -158,10 +162,28 @@ public:
     Gtk::Label *lblOther;
     Gtk::Label *lblDevelopment;
     Gtk::Label *lblSystem;
-    Gtk::IconView *iconGraphics;
 
+    Gtk::IconView *iconGraphics;
+    Gtk::IconView *iconTools;
+    Gtk::IconView *iconInternet;
+    Gtk::IconView *iconMultimedia;
+    Gtk::IconView *iconSettings;
+    Gtk::IconView *iconEducation;
+    Gtk::IconView *iconOffice;
+    Gtk::IconView *iconOther;
+    Gtk::IconView *iconDevelopment;
+    Gtk::IconView *iconSystem;
 
     Glib::RefPtr<Gtk::ListStore> list_Graphics;
+    Glib::RefPtr<Gtk::ListStore> list_Tools;
+    Glib::RefPtr<Gtk::ListStore> list_Internet;
+    Glib::RefPtr<Gtk::ListStore> list_Multimedia;
+    Glib::RefPtr<Gtk::ListStore> list_Settings;
+    Glib::RefPtr<Gtk::ListStore> list_Education;
+    Glib::RefPtr<Gtk::ListStore> list_Office;
+    Glib::RefPtr<Gtk::ListStore> list_Other;
+    Glib::RefPtr<Gtk::ListStore> list_Development;
+    Glib::RefPtr<Gtk::ListStore> list_System;
 
 
     

ublexec.glade

@@ -8,53 +8,8 @@
     <property name="step-increment">1</property>
     <property name="page-increment">10</property>
   </object>
-  <object class="GtkDialog" id="dialogStartMenu">
+  <object class="GtkWindow" id="dialogStartMenu">
-    <property name="width-request">250</property>
-    <property name="height-request">250</property>
     <property name="can-focus">False</property>
-    <property name="type-hint">dialog</property>
-    <child internal-child="vbox">
-      <object class="GtkBox">
-        <property name="can-focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox">
-            <property name="can-focus">False</property>
-            <property name="layout-style">end</property>
-            <child>
-              <object class="GtkButton" id="btnStartMenuOK">
-                <property name="label" translatable="yes">ОК</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="btnStartMenuExit">
-                <property name="label" translatable="yes">Выход</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
@@ -111,6 +66,10 @@
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="margin">6</property>
+                        <property name="item-width">75</property>
+                        <property name="row-spacing">1</property>
+                        <property name="column-spacing">1</property>
+                        <property name="activate-on-single-click">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -139,12 +98,12 @@
                       </packing>
                     </child>
                     <child>
-                          <object class="GtkTreeView">
+                      <object class="GtkIconView" id="iconTools">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
-                            <child internal-child="selection">
+                        <property name="margin">1</property>
-                              <object class="GtkTreeSelection"/>
+                        <property name="row-spacing">1</property>
-                            </child>
+                        <property name="column-spacing">1</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -173,12 +132,12 @@
                       </packing>
                     </child>
                     <child>
-                          <object class="GtkTreeView">
+                      <object class="GtkIconView" id="iconInternet">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
-                            <child internal-child="selection">
+                        <property name="margin">1</property>
-                              <object class="GtkTreeSelection"/>
+                        <property name="row-spacing">1</property>
-                            </child>
+                        <property name="column-spacing">1</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -207,12 +166,12 @@
                       </packing>
                     </child>
                     <child>
-                          <object class="GtkTreeView">
+                      <object class="GtkIconView" id="iconMultimedia">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
-                            <child internal-child="selection">
+                        <property name="margin">1</property>
-                              <object class="GtkTreeSelection"/>
+                        <property name="row-spacing">1</property>
-                            </child>
+                        <property name="column-spacing">1</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -241,12 +200,12 @@
                       </packing>
                     </child>
                     <child>
-                          <object class="GtkTreeView">
+                      <object class="GtkIconView" id="iconSettings">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
-                            <child internal-child="selection">
+                        <property name="margin">1</property>
-                              <object class="GtkTreeSelection"/>
+                        <property name="row-spacing">1</property>
-                            </child>
+                        <property name="column-spacing">1</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -275,12 +234,12 @@
                       </packing>
                     </child>
                     <child>
-                          <object class="GtkTreeView">
+                      <object class="GtkIconView" id="iconEducation">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
-                            <child internal-child="selection">
+                        <property name="margin">1</property>
-                              <object class="GtkTreeSelection"/>
+                        <property name="row-spacing">1</property>
-                            </child>
+                        <property name="column-spacing">1</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -309,12 +268,12 @@
                       </packing>
                     </child>
                     <child>
-                          <object class="GtkTreeView">
+                      <object class="GtkIconView" id="iconOffice">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
-                            <child internal-child="selection">
+                        <property name="margin">1</property>
-                              <object class="GtkTreeSelection"/>
+                        <property name="row-spacing">1</property>
-                            </child>
+                        <property name="column-spacing">1</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -343,12 +302,12 @@
                       </packing>
                     </child>
                     <child>
-                          <object class="GtkTreeView">
+                      <object class="GtkIconView" id="iconOther">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
-                            <child internal-child="selection">
+                        <property name="margin">1</property>
-                              <object class="GtkTreeSelection"/>
+                        <property name="row-spacing">1</property>
-                            </child>
+                        <property name="column-spacing">1</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -377,12 +336,12 @@
                       </packing>
                     </child>
                     <child>
-                          <object class="GtkTreeView">
+                      <object class="GtkIconView" id="iconDevelopment">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
-                            <child internal-child="selection">
+                        <property name="margin">1</property>
-                              <object class="GtkTreeSelection"/>
+                        <property name="row-spacing">1</property>
-                            </child>
+                        <property name="column-spacing">1</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -411,12 +370,12 @@
                       </packing>
                     </child>
                     <child>
-                          <object class="GtkTreeView">
+                      <object class="GtkIconView" id="iconSystem">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
-                            <child internal-child="selection">
+                        <property name="margin">1</property>
-                              <object class="GtkTreeSelection"/>
+                        <property name="row-spacing">1</property>
-                            </child>
+                        <property name="column-spacing">1</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -435,6 +394,31 @@
             <property name="position">1</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkButtonBox">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="halign">end</property>
+            <property name="layout-style">start</property>
+            <child>
+              <object class="GtkButton" id="btnStartMenuOK">
+                <property name="label" translatable="yes">ОК</property>
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="btnStartMenuExit">
+                <property name="label" translatable="yes">Выход</property>
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -443,6 +427,13 @@
               </packing>
             </child>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
     </child>
   </object>
   <object class="GtkImage" id="image1">
@@ -1218,86 +1209,6 @@
       </object>
     </child>
   </object>
-  <object class="GtkListStore" id="liststoreDevelopment">
-    <columns>
-      <!-- column-name GdkPixbuf1 -->
-      <column type="GdkPixbuf"/>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="liststoreEducation">
-    <columns>
-      <!-- column-name GdkPixbuf1 -->
-      <column type="GdkPixbuf"/>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="liststoreGraphics">
-    <columns>
-      <!-- column-name GdkPixbuf1 -->
-      <column type="GdkPixbuf"/>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="liststoreInternet">
-    <columns>
-      <!-- column-name GdkPixbuf1 -->
-      <column type="GdkPixbuf"/>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="liststoreMultimedia">
-    <columns>
-      <!-- column-name GdkPixbuf1 -->
-      <column type="GdkPixbuf"/>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="liststoreOffice">
-    <columns>
-      <!-- column-name GdkPixbuf1 -->
-      <column type="GdkPixbuf"/>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="liststoreOther">
-    <columns>
-      <!-- column-name GdkPixbuf1 -->
-      <column type="GdkPixbuf"/>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="liststoreSettings">
-    <columns>
-      <!-- column-name GdkPixbuf1 -->
-      <column type="GdkPixbuf"/>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="liststoreSystem">
-    <columns>
-      <!-- column-name GdkPixbuf1 -->
-      <column type="GdkPixbuf"/>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="liststoreTools">
-    <columns>
-      <!-- column-name GdkPixbuf1 -->
-      <column type="GdkPixbuf"/>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
   <object class="GtkMessageDialog" id="messageError">
     <property name="can-focus">False</property>
     <property name="title" translatable="yes">Внимание!</property>