Исправлены пути иконок на названия для imgInfo

pull/11/head
Igor Belitskiy 3 years ago
parent 2378345009
commit 3e3d0ed8d3

@ -114,8 +114,8 @@ install: check uninstall
@install -Dm644 -t /usr/share/${PKGNAME}/ boot-options.csv @install -Dm644 -t /usr/share/${PKGNAME}/ boot-options.csv
@install -Dm644 -t /usr/share/${PKGNAME}/ input-options.csv @install -Dm644 -t /usr/share/${PKGNAME}/ input-options.csv
@install -Dm644 -t /usr/share/${PKGNAME}/ output-options.csv @install -Dm644 -t /usr/share/${PKGNAME}/ output-options.csv
@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ru.ublinux.ubl-settings-bootloader.checked.svg" @install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.ubl-settings-bootloader.checked.svg"
@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ru.ublinux.ubl-settings-bootloader.warning.svg" @install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.ubl-settings-bootloader.warning.svg"
@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ @gtk-update-icon-cache -fiq /usr/share/icons/hicolor/
@update-desktop-database --quiet 2>/dev/null @update-desktop-database --quiet 2>/dev/null
@touch /usr/share/applications @touch /usr/share/applications

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

@ -85,13 +85,13 @@ void MainWindow::settings(){
} }
else{ else{
this->event();
boxWidgetAll->set_sensitive(false); boxWidgetAll->set_sensitive(false);
btnLoad->set_sensitive(false); btnLoad->set_sensitive(false);
boxSave->set_sensitive(false); boxSave->set_sensitive(false);
imgInfo->set("/usr/share/icons/hicolor/scalable/status/ru.ublinux.ubl-settings-bootloader.warning.svg"); imgInfo->set_from_icon_name("com.ublinux.ubl-settings-bootloader.warning", Gtk::ICON_SIZE_MENU);
info_status_app("boxInfoMessError"); info_status_app("boxInfoMessError");
lblWarning->set_text(gettext("The program must be run as root")); lblWarning->set_text(gettext("The program must be run as root"));
this->event();
} }
} }
@ -319,14 +319,14 @@ void MainWindow::event(){
btnSaveLocalGlob->signal_activate().connect([&]() {save_global_local_cfg();}); btnSaveLocalGlob->signal_activate().connect([&]() {save_global_local_cfg();});
btnSaveLocal->signal_activate().connect([&]() {save_local_cfg();}); btnSaveLocal->signal_activate().connect([&]() {save_local_cfg();});
btnSaveGlob->signal_activate().connect([&]() {save_global_cfg();}); btnSaveGlob->signal_activate().connect([&]() {save_global_cfg();});
//TreeView_TreeSelection = treeViewKernel->get_selection(); if (this->check_root() == 0) {
//TreeView_TreeSelection->signal_changed().connect(sigc::mem_fun(treeViewKernel, &MainWindow::item_selected) ); Glib::RefPtr<Gtk::TreeModel> treeViewKernelModel = treeViewKernel->get_model();
Glib::RefPtr<Gtk::TreeModel> treeViewKernelModel = treeViewKernel->get_model(); treeViewKernelModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::item_selected_kernel));
treeViewKernelModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::item_selected_kernel)); Glib::RefPtr<Gtk::TreeModel> treeViewIPTModel = treeViewIPT->get_model();
Glib::RefPtr<Gtk::TreeModel> treeViewIPTModel = treeViewIPT->get_model(); treeViewIPTModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::item_selected_IPT));
treeViewIPTModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::item_selected_IPT)); Glib::RefPtr<Gtk::TreeModel> treeViewOTTModel = treeViewOTT->get_model();
Glib::RefPtr<Gtk::TreeModel> treeViewOTTModel = treeViewOTT->get_model(); treeViewOTTModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::item_selected_OTT));
treeViewOTTModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::item_selected_OTT)); }
} }
void MainWindow::save_global_local_cfg() { void MainWindow::save_global_local_cfg() {
@ -424,7 +424,7 @@ void MainWindow::info_status_app(string stule) {
void MainWindow::info_warning_error(int mess) { void MainWindow::info_warning_error(int mess) {
if (index_error > 0) { if (index_error > 0) {
info_status_app("boxInfoMessError"); info_status_app("boxInfoMessError");
imgInfo->set("/usr/share/icons/hicolor/scalable/status/ru.ublinux.ubl-settings-bootloader.warning.svg"); imgInfo->set_from_icon_name("com.ublinux.ubl-settings-bootloader.warning", Gtk::ICON_SIZE_MENU);
index_error = 0; index_error = 0;
string mess_error = ""; string mess_error = "";
if (mess == 0) { if (mess == 0) {
@ -451,7 +451,7 @@ void MainWindow::info_warning_error(int mess) {
} }
else { else {
info_status_app("boxInfoMessOK"); info_status_app("boxInfoMessOK");
imgInfo->set("/usr/share/icons/hicolor/scalable/status/ru.ublinux.ubl-settings-bootloader.checked.svg"); imgInfo->set_from_icon_name("com.ublinux.ubl-settings-bootloader.checked", Gtk::ICON_SIZE_MENU);
if (mess == 0) { if (mess == 0) {
lblWarning->set_text(gettext("Local configuration downloaded successfully")); lblWarning->set_text(gettext("Local configuration downloaded successfully"));
} }

@ -211,7 +211,8 @@ specified priority</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-top">6</property>
<property name="margin-bottom">6</property> <property name="margin-bottom">6</property>
<property name="stock">checked</property> <property name="pixel-size">25</property>
<property name="icon_size">1</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>

Loading…
Cancel
Save