From 3e3d0ed8d3e26b3544e16c13c5952853b3f9439b Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 27 Mar 2023 15:53:55 +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=BF=D1=83=D1=82=D0=B8=20=D0=B8=D0=BA?= =?UTF-8?q?=D0=BE=D0=BD=D0=BE=D0=BA=20=D0=BD=D0=B0=20=D0=BD=D0=B0=D0=B7?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20imgInfo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 4 ++-- ...blinux.ubl-settings-bootloader.checked.svg | 0 ...blinux.ubl-settings-bootloader.warning.svg | 0 source/ubl-settings-bootloader.cc | 24 +++++++++---------- ubl-settings-bootloader.glade | 3 ++- 5 files changed, 16 insertions(+), 15 deletions(-) rename ru.ublinux.ubl-settings-bootloader.checked.svg => com.ublinux.ubl-settings-bootloader.checked.svg (100%) rename ru.ublinux.ubl-settings-bootloader.warning.svg => com.ublinux.ubl-settings-bootloader.warning.svg (100%) diff --git a/Makefile b/Makefile index fe35571..a1d91ca 100644 --- a/Makefile +++ b/Makefile @@ -114,8 +114,8 @@ install: check uninstall @install -Dm644 -t /usr/share/${PKGNAME}/ boot-options.csv @install -Dm644 -t /usr/share/${PKGNAME}/ input-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/" "ru.ublinux.ubl-settings-bootloader.warning.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/" "com.ublinux.ubl-settings-bootloader.warning.svg" @gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ @update-desktop-database --quiet 2>/dev/null @touch /usr/share/applications diff --git a/ru.ublinux.ubl-settings-bootloader.checked.svg b/com.ublinux.ubl-settings-bootloader.checked.svg similarity index 100% rename from ru.ublinux.ubl-settings-bootloader.checked.svg rename to com.ublinux.ubl-settings-bootloader.checked.svg diff --git a/ru.ublinux.ubl-settings-bootloader.warning.svg b/com.ublinux.ubl-settings-bootloader.warning.svg similarity index 100% rename from ru.ublinux.ubl-settings-bootloader.warning.svg rename to com.ublinux.ubl-settings-bootloader.warning.svg diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc index 6eced2d..afcb1a9 100644 --- a/source/ubl-settings-bootloader.cc +++ b/source/ubl-settings-bootloader.cc @@ -85,13 +85,13 @@ void MainWindow::settings(){ } else{ - this->event(); boxWidgetAll->set_sensitive(false); btnLoad->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"); 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();}); btnSaveLocal->signal_activate().connect([&]() {save_local_cfg();}); btnSaveGlob->signal_activate().connect([&]() {save_global_cfg();}); - //TreeView_TreeSelection = treeViewKernel->get_selection(); - //TreeView_TreeSelection->signal_changed().connect(sigc::mem_fun(treeViewKernel, &MainWindow::item_selected) ); - Glib::RefPtr treeViewKernelModel = treeViewKernel->get_model(); - treeViewKernelModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::item_selected_kernel)); - Glib::RefPtr treeViewIPTModel = treeViewIPT->get_model(); - treeViewIPTModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::item_selected_IPT)); - Glib::RefPtr treeViewOTTModel = treeViewOTT->get_model(); - treeViewOTTModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::item_selected_OTT)); + if (this->check_root() == 0) { + Glib::RefPtr treeViewKernelModel = treeViewKernel->get_model(); + treeViewKernelModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::item_selected_kernel)); + Glib::RefPtr treeViewIPTModel = treeViewIPT->get_model(); + treeViewIPTModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::item_selected_IPT)); + Glib::RefPtr treeViewOTTModel = treeViewOTT->get_model(); + treeViewOTTModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::item_selected_OTT)); + } } void MainWindow::save_global_local_cfg() { @@ -424,7 +424,7 @@ void MainWindow::info_status_app(string stule) { void MainWindow::info_warning_error(int mess) { if (index_error > 0) { 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; string mess_error = ""; if (mess == 0) { @@ -451,7 +451,7 @@ void MainWindow::info_warning_error(int mess) { } else { 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) { lblWarning->set_text(gettext("Local configuration downloaded successfully")); } diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index 6efc9f5..090b261 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -211,7 +211,8 @@ specified priority 5 6 6 - checked + 25 + 1 False