Applications
/
ublexec
9
0
Fork 2
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Изменен метод загрузки иконок

Browse Source
pull/3/head^2
Igor Belitskiy 3 years ago
parent 6e47023aac
commit 6131614721
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File

2
source/CMakeLists.txt
Unescape View File

@ -10,7 +10,7 @@ add_definitions(${GTK_CFLAGS_OTHER})
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -std=c++2a -g") #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -std=c++2a -g")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wmissing-declarations -fdiagnostics-color=always -g") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wmissing-declarations -fdiagnostics-color=always")
set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)

11
source/ublexec.cc
Unescape View File

@ -400,13 +400,7 @@ void MainWindow::tempalte_row(string Name, string Exec, string path , Glib::Ref
Gtk::TreeModel::Row row = *(dtk_list->append()); Gtk::TreeModel::Row row = *(dtk_list->append());
row[m_Columns.m_col_filename] = path; row[m_Columns.m_col_filename] = path;
row[m_Columns.m_col_description] = Name; row[m_Columns.m_col_description] = Name;
if (std::ifstream(path)){ row[m_Columns.icon_name] = path;
row[m_Columns.m_col_pixbuf] = Gdk::Pixbuf::create_from_file(path);
}
else{
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.app_name_exec] = Exec;
row[m_Columns.float_h_align] = 0.5; row[m_Columns.float_h_align] = 0.5;
row[m_Columns.float_w_align] = 0.5; row[m_Columns.float_w_align] = 0.5;
@ -426,7 +420,8 @@ void MainWindow::open_list_app(){
string path = ""; string path = "";
for ( const auto &st_app : list_app){ for ( const auto &st_app : list_app){
for ( const auto &str_categor : st_app.Categories){ for ( const auto &str_categor : st_app.Categories){
path = "/usr/share/icons/hicolor/16x16/apps/" + st_app.Icon + ".png"; path = st_app.Icon;
//path = "/usr/share/icons/hicolor/16x16/apps/" + st_app.Icon + ".png";
if (str_categor=="Graphics"){ if (str_categor=="Graphics"){
this->tempalte_row(st_app.Name,st_app.Exec, path, list_Graphics); this->tempalte_row(st_app.Name,st_app.Exec, path, list_Graphics);
} }

2
source/ublexec.h
Unescape View File

@ -104,9 +104,11 @@ public:
add(app_name_exec); add(app_name_exec);
add(float_h_align); add(float_h_align);
add(float_w_align); add(float_w_align);
add(icon_name);
} }
Gtk::TreeModelColumn<std::string> m_col_filename; Gtk::TreeModelColumn<std::string> m_col_filename;
Gtk::TreeModelColumn<std::string> icon_name;
Gtk::TreeModelColumn<Glib::ustring> m_col_description; Gtk::TreeModelColumn<Glib::ustring> m_col_description;
Gtk::TreeModelColumn<Glib::ustring> app_name_exec; Gtk::TreeModelColumn<Glib::ustring> app_name_exec;
Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf> > m_col_pixbuf; Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf> > m_col_pixbuf;

2
style.css
Unescape View File

@ -67,4 +67,4 @@
border-left-width:1px; border-left-width:1px;
border-top-width:1px; border-top-width:1px;
border-right-width:1px; border-right-width:1px;
} }

10
ublexec.glade
Unescape View File

@ -142,6 +142,7 @@
<attributes> <attributes>
<attribute name="xalign">5</attribute> <attribute name="xalign">5</attribute>
<attribute name="yalign">5</attribute> <attribute name="yalign">5</attribute>
<attribute name="icon-name">6</attribute>
<attribute name="pixbuf">2</attribute> <attribute name="pixbuf">2</attribute>
</attributes> </attributes>
</child> </child>
@ -215,6 +216,7 @@
<attributes> <attributes>
<attribute name="xalign">5</attribute> <attribute name="xalign">5</attribute>
<attribute name="yalign">5</attribute> <attribute name="yalign">5</attribute>
<attribute name="icon-name">6</attribute>
<attribute name="pixbuf">2</attribute> <attribute name="pixbuf">2</attribute>
</attributes> </attributes>
</child> </child>
@ -292,6 +294,7 @@
<attributes> <attributes>
<attribute name="xalign">5</attribute> <attribute name="xalign">5</attribute>
<attribute name="yalign">5</attribute> <attribute name="yalign">5</attribute>
<attribute name="icon-name">6</attribute>
<attribute name="pixbuf">2</attribute> <attribute name="pixbuf">2</attribute>
</attributes> </attributes>
</child> </child>
@ -368,6 +371,7 @@
<attributes> <attributes>
<attribute name="xalign">5</attribute> <attribute name="xalign">5</attribute>
<attribute name="yalign">5</attribute> <attribute name="yalign">5</attribute>
<attribute name="icon-name">6</attribute>
<attribute name="pixbuf">2</attribute> <attribute name="pixbuf">2</attribute>
</attributes> </attributes>
</child> </child>
@ -444,6 +448,7 @@
<attributes> <attributes>
<attribute name="xalign">5</attribute> <attribute name="xalign">5</attribute>
<attribute name="yalign">5</attribute> <attribute name="yalign">5</attribute>
<attribute name="icon-name">6</attribute>
<attribute name="pixbuf">2</attribute> <attribute name="pixbuf">2</attribute>
</attributes> </attributes>
</child> </child>
@ -520,6 +525,7 @@
<attributes> <attributes>
<attribute name="xalign">5</attribute> <attribute name="xalign">5</attribute>
<attribute name="yalign">5</attribute> <attribute name="yalign">5</attribute>
<attribute name="icon-name">6</attribute>
<attribute name="pixbuf">2</attribute> <attribute name="pixbuf">2</attribute>
</attributes> </attributes>
</child> </child>
@ -596,6 +602,7 @@
<attributes> <attributes>
<attribute name="xalign">5</attribute> <attribute name="xalign">5</attribute>
<attribute name="yalign">5</attribute> <attribute name="yalign">5</attribute>
<attribute name="icon-name">6</attribute>
<attribute name="pixbuf">2</attribute> <attribute name="pixbuf">2</attribute>
</attributes> </attributes>
</child> </child>
@ -672,6 +679,7 @@
<attributes> <attributes>
<attribute name="xalign">5</attribute> <attribute name="xalign">5</attribute>
<attribute name="yalign">5</attribute> <attribute name="yalign">5</attribute>
<attribute name="icon-name">6</attribute>
<attribute name="pixbuf">2</attribute> <attribute name="pixbuf">2</attribute>
</attributes> </attributes>
</child> </child>
@ -748,6 +756,7 @@
<attributes> <attributes>
<attribute name="xalign">5</attribute> <attribute name="xalign">5</attribute>
<attribute name="yalign">5</attribute> <attribute name="yalign">5</attribute>
<attribute name="icon-name">6</attribute>
<attribute name="pixbuf">2</attribute> <attribute name="pixbuf">2</attribute>
</attributes> </attributes>
</child> </child>
@ -824,6 +833,7 @@
<attributes> <attributes>
<attribute name="xalign">5</attribute> <attribute name="xalign">5</attribute>
<attribute name="yalign">5</attribute> <attribute name="yalign">5</attribute>
<attribute name="icon-name">6</attribute>
<attribute name="pixbuf">2</attribute> <attribute name="pixbuf">2</attribute>
</attributes> </attributes>
</child> </child>

Write Preview
Loading…
Cancel
Save