Исправлен метод загрузки иконок

pull/76/head
Igor Belitskiy 3 years ago
parent 3468ec22d0
commit 3591d60e35

@ -118,7 +118,7 @@ install: check uninstall
@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/emblems/" "bg_top.png" @install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/emblems/" "bg_top.png"
@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ubl-datetime-checked.svg" @install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ubl-datetime-checked.svg"
@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ubl-datetime-warning.svg" @install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ubl-datetime-warning.svg"
@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ @gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null
@update-desktop-database --quiet 2>/dev/null @update-desktop-database --quiet 2>/dev/null
@touch /usr/share/applications @touch /usr/share/applications
@echo "Install: OK" @echo "Install: OK"

@ -125,7 +125,7 @@ void MainWindow::settings() {
lblDateTimeSetting->set_sensitive(false); lblDateTimeSetting->set_sensitive(false);
btnBoxAboutDialog->set_visible(false); btnBoxAboutDialog->set_visible(false);
this->event(); this->event();
imgInfo->set("ubl-datetime-warning"); imgInfo->set_from_icon_name("ubl-datetime-warning", Gtk::ICON_SIZE_MENU);
info_status_app("boxInfoMessError"); info_status_app("boxInfoMessError");
lblWarning->set_text(_("The program must be run as root")); lblWarning->set_text(_("The program must be run as root"));
} }
@ -416,7 +416,7 @@ void MainWindow::save_global_local_cfg() {
void MainWindow::info_warning_error(int mess) { void MainWindow::info_warning_error(int mess) {
if (error_info > 0 || warning_info > 0) { if (error_info > 0 || warning_info > 0) {
info_status_app("boxInfoMessError"); info_status_app("boxInfoMessError");
imgInfo->set("ubl-datetime-warning"); imgInfo->set_from_icon_name("ubl-datetime-warning", Gtk::ICON_SIZE_MENU);
error_info = 0; error_info = 0;
warning_info = 0; warning_info = 0;
string mess_error = ""; string mess_error = "";
@ -444,7 +444,7 @@ void MainWindow::info_warning_error(int mess) {
} }
else { else {
info_status_app("boxInfoMessOK"); info_status_app("boxInfoMessOK");
imgInfo->set("ubl-datetime-checked"); imgInfo->set_from_icon_name("ubl-datetime-checked", Gtk::ICON_SIZE_MENU);//Gtk::IconSize::INHERIT);
if (mess == 0) { if (mess == 0) {
lblWarning->set_text(_("Local configuration downloaded successfully")); lblWarning->set_text(_("Local configuration downloaded successfully"));
} }

@ -166,7 +166,8 @@
<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