From 057650b9ab2c1237f4204d28e3b51f799540d6af Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 26 Nov 2024 17:59:23 +0600 Subject: [PATCH] Fixed showing empty module and package labels; Kernel lists changes --- kernel-list-addon.csv | 6 ++--- kernel-list.csv | 6 ++--- source/ubl-settings-kernel.c | 22 +++++++++---------- ubl-settings-kernel-additions-table-row.glade | 4 ++++ ubl-settings-kernel-table-row.glade | 4 ++++ ubl-settings-kernel.glade | 10 ++++++++- 6 files changed, 34 insertions(+), 18 deletions(-) diff --git a/kernel-list-addon.csv b/kernel-list-addon.csv index 7337cdf..ef9f6f4 100644 --- a/kernel-list-addon.csv +++ b/kernel-list-addon.csv @@ -1,10 +1,10 @@ NAME;PAСKAGE_UBM;PAСKAGE;DESCRIPTION Linux 5.15 headers;ubm-002-linux515-headers;linux515-headers;The Linux kernel headers v5.15 Linux 5.15 Docs;ubm-003-linux515-docs;linux515-docs;The Linux kernel docs v5.15 -Linux 5.15 DKMS modules;ubm-linux515-dkms;v4l2loopback-dkms,rtl88x2bu-dkms-git,r8125-dkms,rtl8192eu-dkms,rtl8821cu-dkms-git;The Linux kernel DKMS modules v5.15 : v4l2loopback, r8168-8136, rtl88x2bu, r8125, rtl8192eu +Linux 5.15 DKMS modules;ubm-linux515-dkms;;The Linux kernel DKMS modules v5.15 : v4l2loopback, r8168-8136, rtl88x2bu, r8125, rtl8192eu Linux 6.1 headers;ubm-002-linux61-headers;linux61-headers;The Linux kernel headers v6.1 Linux 6.1 Docs;ubm-003-linux61-docs;linux61-docs;The Linux kernel docs v6.1 -Linux 6.1 DKMS modules;ubm-linux61-dkms;v4l2loopback-dkms,rtl88x2bu-dkms-git,r8125-dkms,rtl8192eu-dkms,rtl8821cu-dkms-git;The Linux kernel DKMS modules v6.1 : v4l2loopback, r8168-8136, rtl88x2bu, r8125, rtl8192eu +Linux 6.1 DKMS modules;ubm-linux61-dkms;;The Linux kernel DKMS modules v6.1 : v4l2loopback, r8168-8136, rtl88x2bu, r8125, rtl8192eu Linux 6.6 headers;ubm-002-linux66-headers;linux66-headers;The Linux kernel headers v6.6 Linux 6.6 Docs;ubm-003-linux66-docs;linux66-docs;The Linux kernel docs v6.6 -Linux 6.6 DKMS modules;ubm-linux66-dkms;v4l2loopback-dkms,rtl88x2bu-dkms-git,r8125-dkms,rtl8192eu-dkms,rtl8821cu-dkms-git;The Linux kernel DKMS modules v6.6 : v4l2loopback, r8168-8136, rtl88x2bu, r8125, rtl8192eu \ No newline at end of file +Linux 6.6 DKMS modules;ubm-linux66-dkms;;The Linux kernel DKMS modules v6.6 : v4l2loopback, r8168-8136, rtl88x2bu, r8125, rtl8192eu \ No newline at end of file diff --git a/kernel-list.csv b/kernel-list.csv index eb5ba2f..06d5c91 100644 --- a/kernel-list.csv +++ b/kernel-list.csv @@ -1,4 +1,4 @@ NAME;PAСKAGE_UBM;PAСKAGE;PAСKAGE_UBM_REQUIRED;PAСKAGE_REQUIRED;TAG;DESCRIPTION -Linux 5.15;ubm-001-linux515;linux515;ubm-002-linux515-headers;linux515-headers;LTS, Stable, RealTime, Hardened, Recomended;The Linux kernel v5.15 and modules, headers. Manual modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs -Linux 6.1;ubm-001-linux61;linux61;ubm-002-linux61-headers;linux61-headers;LTS, Stable, RealTime, Hardened, Recomended;The Linux kernel v6.1 and modules, headers. Manual modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs -Linux 6.6;ubm-001-linux66;linux66;ubm-002-linux66-headers;linux66-headers;LTS, Stable, RealTime, Hardened, Recomended;The Linux kernel v6.6 and modules, headers. Manual modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs \ No newline at end of file +Linux 5.15;ubm-001-linux515;linux515;ubm-001-linux515-headers;linux515-headers;LTS, Stable, RealTime, Hardened, Recomended;The Linux kernel v5.15 and modules, headers. Manual modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs +Linux 6.1;ubm-001-linux61;linux61;ubm-001-linux61-headers;linux61-headers;LTS, Stable, RealTime, Hardened, Recomended;The Linux kernel v6.1 and modules, headers. Manual modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs +Linux 6.6;ubm-001-linux66;linux66;ubm-001-linux66-headers;linux66-headers;LTS, Stable, RealTime, Hardened, Recomended;The Linux kernel v6.6 and modules, headers. Manual modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs \ No newline at end of file diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 04b73ec..6e1bd07 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -130,21 +130,20 @@ gboolean yon_tab_create_tags(kernels_tab *tab){ yon_tag_add(GTK_BOX(tab->install_tags_box),MODULE_INSTALLED_LABEL,"tag_green",NULL); gtk_image_set_from_icon_name(GTK_IMAGE(tab->module_icon),module_icon_path,GTK_ICON_SIZE_BUTTON); - gtk_widget_show(tab->remove_module_button); - gtk_widget_show(tab->update_module_button); - - gtk_widget_hide(tab->install_module_button); + gtk_widget_show(tab->remove_module_button); + gtk_widget_show(tab->update_module_button); + gtk_widget_hide(tab->install_module_button); } break; case 0:{ - gtk_widget_hide(tab->remove_module_button); - gtk_widget_hide(tab->update_module_button); - - gtk_widget_show(tab->install_module_button); + gtk_widget_hide(tab->remove_module_button); + gtk_widget_hide(tab->update_module_button); + gtk_widget_show(tab->install_module_button); } break; case -1: { - gtk_widget_hide(tab->remove_module_button); - gtk_widget_hide(tab->update_module_button); - gtk_widget_hide(tab->install_module_button); + gtk_widget_hide(tab->remove_module_button); + gtk_widget_hide(tab->update_module_button); + gtk_widget_hide(tab->install_module_button); + gtk_widget_hide(tab->module_label); } break; } switch (tab->package_installed){ @@ -164,6 +163,7 @@ gboolean yon_tab_create_tags(kernels_tab *tab){ gtk_widget_hide(tab->remove_package_button); gtk_widget_hide(tab->update_package_button); gtk_widget_hide(tab->install_package_button); + gtk_widget_hide(tab->package_label); } } if (tab->package_installed||tab->module_installed){ diff --git a/ubl-settings-kernel-additions-table-row.glade b/ubl-settings-kernel-additions-table-row.glade index f38075f..8a12943 100644 --- a/ubl-settings-kernel-additions-table-row.glade +++ b/ubl-settings-kernel-additions-table-row.glade @@ -79,6 +79,7 @@ True False + Module installed @@ -119,6 +120,7 @@ True False + Package installed @@ -210,6 +212,7 @@ True True + Update 5 image1 @@ -119,6 +120,7 @@ True False + Package installed @@ -246,6 +248,7 @@ True True + Update 5 image1