From d9e3af03a352a1ceb84eb4512397dd3beeb4649b Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 20 Nov 2024 11:23:23 +0600 Subject: [PATCH] Fixes --- source/ubl-settings-kernel.c | 29 ++++++++++++++++++- source/ubl-settings-kernel.h | 4 +++ source/ubl-strings.h | 2 ++ ubl-settings-kernel-additions-table-row.glade | 5 +++- ubl-settings-kernel-table-row.glade | 12 ++++++-- ubl-settings-kernel.glade | 3 +- 6 files changed, 49 insertions(+), 6 deletions(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index ab9f8f6..cb5532d 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -133,6 +133,7 @@ gboolean yon_tab_create_tags(kernels_tab *tab){ gtk_widget_show(tab->remove_package_button); gtk_widget_show(tab->update_module_button); gtk_widget_show(tab->update_package_button); + gtk_widget_hide(tab->install_module_button); gtk_widget_hide(tab->install_package_button); } @@ -144,6 +145,17 @@ gboolean yon_tab_create_tags(kernels_tab *tab){ gtk_widget_show(tab->remove_package_button); gtk_widget_show(tab->update_package_button); } + } + if (tab->package_installed||tab->module_installed){ + if (tab->launch_button){ + char *launched = config(KERNEL_BOOT_parameter); + if (launched&&strcmp(tab->package,launched)){ + gtk_widget_show(tab->changelog_button); + } else gtk_widget_hide(tab->changelog_button); + } + if (tab->changelog_button){ + gtk_widget_show(tab->changelog_button); + } } gtk_widget_set_sensitive(tab->update_module_button,!tab->module_updated); gtk_widget_set_sensitive(tab->update_package_button,!tab->package_updated); @@ -193,6 +205,7 @@ void *yon_tab_set_installed(kernels_tab *tab){ } void *yon_interface_update(main_window *widgets){ + yon_ubl_status_box_render(LOADING_LABEL,BACKGROUND_IMAGE_INFO_TYPE); if (!main_config.kernel_tabs){ GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->KernelsPackageBox)); for (guint i=0;imain_box),0); } + textdomain(template_ui_LocaleName); + switch (main_config.load_mode){ + case 0: yon_ubl_status_box_render(GLOBAL_LOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); + break; + case 1: yon_ubl_status_box_render(LOCAL_LOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); + break; + case 3: yon_ubl_status_box_render(LOCAL_LOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); + break; + } + textdomain(LocaleName); return NULL; } @@ -325,7 +348,7 @@ gboolean on_command_execute_success(GtkWidget *,gint status,main_window *widgets gboolean yon_terminal_get_progress(main_window *widgets){ char *text = vte_terminal_get_text_format(VTE_TERMINAL(widgets->InstallTerminal),VTE_FORMAT_TEXT); - GRegex *regex = g_regex_new("\\d?\\d?\\d%",0,0,NULL); + GRegex *regex = g_regex_new("\\d?\\d%",0,0,NULL); GMatchInfo *match = NULL; g_regex_match(regex,text,0,&match); @@ -770,6 +793,10 @@ additions_kernels_tab *yon_additions_tab_row_new(GtkListBox *target, char *targe tab->install_package_button = yon_gtk_builder_get_widget(builder,"InstallPackageButton"); tab->update_module_button = yon_gtk_builder_get_widget(builder,"ModuleUpdateButton"); tab->update_package_button = yon_gtk_builder_get_widget(builder,"PackageUpdateButton"); + tab->changelog_button = NULL; + tab->launch_button = NULL; + tab->run_tags_box = NULL; + tab->tags_box = NULL; dictionary *dict = NULL; yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets); diff --git a/source/ubl-settings-kernel.h b/source/ubl-settings-kernel.h index cb9f76a..85bb6c5 100644 --- a/source/ubl-settings-kernel.h +++ b/source/ubl-settings-kernel.h @@ -194,6 +194,10 @@ typedef struct { GtkWidget *update_package_button; GtkWidget *install_module_button; GtkWidget *install_package_button; + GtkWidget *changelog_button; + GtkWidget *launch_button; + GtkWidget *run_tags_box; + GtkWidget *tags_box; } additions_kernels_tab; diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 4f48900..ceb7e3f 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -53,6 +53,8 @@ #define PACKAGE_TAB_LABEL _("Package") #define DESCTIPTION_TAB_LABEL _("Description") +#define LOADING_LABEL _("Kernel and additions listst are loading") + #define OPERATION_SUCCESS_LABEL _("Terminal operation success") #define OPERATION_ERROR_LABEL _("Terminal operation failed") #define OPERATION_IN_PROGRESS_LABEL _("Terminal operation in process") diff --git a/ubl-settings-kernel-additions-table-row.glade b/ubl-settings-kernel-additions-table-row.glade index 14a339a..15291d6 100644 --- a/ubl-settings-kernel-additions-table-row.glade +++ b/ubl-settings-kernel-additions-table-row.glade @@ -169,13 +169,13 @@ center 5 vertical - 5 Install module True True True + 5 @@ -195,6 +195,7 @@ True True + 5 image1 @@ -236,6 +238,7 @@ True True True + 5 diff --git a/ubl-settings-kernel-table-row.glade b/ubl-settings-kernel-table-row.glade index 96ae99f..8b463d5 100644 --- a/ubl-settings-kernel-table-row.glade +++ b/ubl-settings-kernel-table-row.glade @@ -203,13 +203,13 @@ 3 5 vertical - 5 Install module True True True + 5 @@ -221,7 +221,7 @@ - + True False 5 @@ -229,6 +229,7 @@ True True + 5 image1 @@ -270,6 +272,7 @@ True True True + 5 @@ -281,7 +284,7 @@ - + True False 5 @@ -289,6 +292,7 @@ True True + 5 image2 @@ -329,6 +334,7 @@ Changelog True True + 5 diff --git a/ubl-settings-kernel.glade b/ubl-settings-kernel.glade index b435b95..42b159d 100644 --- a/ubl-settings-kernel.glade +++ b/ubl-settings-kernel.glade @@ -1,5 +1,5 @@ - + @@ -114,6 +114,7 @@ True False vertical + 5 True