From af616e4452cd56ba7d7cd9eb7310da8cfc4f388b Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 8 Nov 2024 14:41:15 +0600 Subject: [PATCH] fixes --- source/ubl-settings-kernel.c | 26 ++++++++++++++++++--- source/ubl-settings-kernel.h | 3 +++ source/ubl-strings.h | 15 ++++++++---- ubl-settings-kernel.pot | 44 ++++++++++++++++++++++++++++++++++++ ubl-settings-kernel_ru.po | 44 ++++++++++++++++++++++++++++++++++++ 5 files changed, 124 insertions(+), 8 deletions(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index fb69000..76ba255 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -115,15 +115,32 @@ void *yon_interface_update(main_window *widgets){ int kernels_size; config_str kernels = yon_resource_open_file(kernels_path, &kernels_size); - char *boot_run = config(KERNEL_BOOT_parameter); + char *boot_config_run = config(KERNEL_BOOT_parameter); + + // int installed_kernels_size; + // config_str installed_kernels = yon_config_load(get_active_kernel_command,&installed_kernels_size); + int boot_size; + config_str boot_run = yon_config_load(get_active_kernel_command,&boot_size); + yon_char_remove_last_symbol(boot_run[0],'\n'); + for (int i=1;iKernelsPackageBox),kernels[i],widgets); - if (!yon_char_is_empty(boot_run)&&!strcmp(tab->package,boot_run)){ + { + GList *list = gtk_container_get_children(GTK_CONTAINER(tab->run_tags_box)); + for (guint i=0;ipackage)){ + yon_tag_add(GTK_BOX(tab->run_tags_box),RUNNING_LABEL,"tag_green",NULL); + gtk_widget_hide(tab->remove_module_button); + gtk_widget_hide(tab->remove_package_button); + } else if (!yon_char_is_empty(boot_config_run)&&!strcmp(boot_config_run,tab->package)){ yon_tag_add(GTK_BOX(tab->run_tags_box),BOOT_RUN_LABEL,"tag_orange",NULL); gtk_widget_hide(tab->launch_button); gtk_widget_hide(tab->remove_module_button); gtk_widget_hide(tab->remove_package_button); - } + } gtk_widget_set_can_focus(gtk_widget_get_parent(tab->main_box),0); } yon_char_parsed_free(kernels,kernels_size); @@ -190,9 +207,11 @@ int yon_tag_add(GtkBox *target,char *tag_label, char *tag_style, char *icon_name gboolean on_command_execute_success(GtkWidget *,gint,main_window *widgets){ gtk_revealer_set_transition_type(GTK_REVEALER(widgets->MainRevealer),GTK_REVEALER_TRANSITION_TYPE_SLIDE_DOWN); gtk_revealer_set_reveal_child(GTK_REVEALER(widgets->MainRevealer),0); + gtk_widget_hide(widgets->MainRevealer); yon_interface_update(widgets); return G_SOURCE_REMOVE; } + 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); @@ -219,6 +238,7 @@ void *yon_command_execute_async(char *command,main_window *widgets){ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(widgets->InstallationProgress),0); vte_terminal_reset(VTE_TERMINAL(widgets->InstallTerminal),0,1); gtk_revealer_set_transition_type(GTK_REVEALER(widgets->MainRevealer),GTK_REVEALER_TRANSITION_TYPE_SLIDE_UP); + gtk_widget_show(widgets->MainRevealer); gtk_revealer_set_reveal_child(GTK_REVEALER(widgets->MainRevealer),1); gtk_revealer_set_reveal_child(GTK_REVEALER(widgets->TerminalRevealer),0); yon_terminal_integrated_start(widgets->InstallTerminal,command); diff --git a/source/ubl-settings-kernel.h b/source/ubl-settings-kernel.h index 5fcadda..d6c7a4f 100644 --- a/source/ubl-settings-kernel.h +++ b/source/ubl-settings-kernel.h @@ -50,6 +50,9 @@ #define install_command(target) yon_char_append("pacman -S --noconfirm ",target) #define remove_command(target) yon_char_append("pacman -R --noconfirm ",target) +#define get_active_kernel_command "cat /usr/lib/modules/$(uname -r)/pkgbase" +#define get_installed_package "cat /usr/lib/modules/*/pkgbase" + #define build_command(target,filename,debug_bool,drivers_bool) yon_char_unite("ubmkuird -l -n ",filename," -k ",(debug_bool)?"--addon ":"",(drivers_bool)?"-H ":"",target,NULL) #define yon_config_get_custom_command(target) yon_char_unite("ubconfig --source ",target," get boot KERNEL_BOOT",NULL) diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 78ef180..3142d41 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -15,6 +15,7 @@ #define PACKAGE_INSTALLED_LABEL _("Package installed") #define MODULE_INSTALLED_LABEL _("Module installed") #define BOOT_RUN_LABEL _("Startup boot") +#define RUNNING_LABEL _("Running") #define INITRAMFS_TITLE_LABEL _("Initramfs building") @@ -46,8 +47,12 @@ #define WARNING_TITLE_LABEL _("Warning") #define DEPENDENCES_LABEL _("Dependences") -#define MODULE_INSTALL_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to install kernel "),target,"?",NULL) -#define PACKAGE_INSTALL_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to install package "),target,"?",NULL) -#define MODULE_REMOVE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to remove module "),target,"?",NULL) -#define PACKAGE_REMOVE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to remove package "),target,"?",NULL) -#define LAUNCH_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to launch "),target,"?",NULL) \ No newline at end of file +#define MODULE_TAB_LABEL _("Module") +#define PACKAGE_TAB_LABEL _("Package") +#define DESCTIPTION_TAB_LABEL _("Description") + +#define MODULE_INSTALL_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to install kernel")," ",target,"?",NULL) +#define PACKAGE_INSTALL_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to install package")," ",target,"?",NULL) +#define MODULE_REMOVE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to remove module")," ",target,"?",NULL) +#define PACKAGE_REMOVE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to remove package")," ",target,"?",NULL) +#define LAUNCH_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to launch")," ",target," ",_("for boot?\n\nChanges will be applied after system restart"),NULL) \ No newline at end of file diff --git a/ubl-settings-kernel.pot b/ubl-settings-kernel.pot index e7453b2..7af7539 100644 --- a/ubl-settings-kernel.pot +++ b/ubl-settings-kernel.pot @@ -152,3 +152,47 @@ msgstr "" #: source/ubl-strings.h:43 msgid "More" msgstr "" + +#: source/ubl-strings.h:43 +msgid "Running" +msgstr "" + +#: source/ubl-strings.h:43 +msgid "Are you sure want to install kernel" +msgstr "" + +#: source/ubl-strings.h:43 +msgid "Are you sure want to install package" +msgstr "" + +#: source/ubl-strings.h:43 +msgid "Are you sure want to remove module" +msgstr "" + +#: source/ubl-strings.h:43 +msgid "Are you sure want to remove package" +msgstr "" + +#: source/ubl-strings.h:43 +msgid "Are you sure want to launch" +msgstr "" + +#: source/ubl-strings.h:7 +msgid "Module" +msgstr "" + +#: source/ubl-strings.h:7 +msgid "Package" +msgstr "" + +#: source/ubl-strings.h:7 +msgid "Description" +msgstr "" + +#: source/ubl-strings.h:7 +msgid "Accept" +msgstr "" + +#: source/ubl-strings.h:7 +msgid "for boot?\n\nChanges will be applied after system restart" +msgstr "" diff --git a/ubl-settings-kernel_ru.po b/ubl-settings-kernel_ru.po index 3bdb82d..4b4e16f 100644 --- a/ubl-settings-kernel_ru.po +++ b/ubl-settings-kernel_ru.po @@ -33,6 +33,26 @@ msgstr "Информация" msgid "Module:" msgstr "Модуль:" +#: source/ubl-strings.h:7 +msgid "Module" +msgstr "Модуль" + +#: source/ubl-strings.h:7 +msgid "Package" +msgstr "Пакет" + +#: source/ubl-strings.h:7 +msgid "Description" +msgstr "Описание" + +#: source/ubl-strings.h:7 +msgid "Accept" +msgstr "Принять" + +#: source/ubl-strings.h:7 +msgid "for boot?\n\nChanges will be applied after system restart" +msgstr "загрузочным?\n\nИзменения вступят в силу после перезагрузки." + #: source/ubl-strings.h:8 msgid "Package:" msgstr "Пакет:" @@ -148,3 +168,27 @@ msgstr "Открыть информацию о пакете" #: source/ubl-strings.h:43 msgid "More" msgstr "Подробнее" + +#: source/ubl-strings.h:43 +msgid "Running" +msgstr "Запущено" + +#: source/ubl-strings.h:43 +msgid "Are you sure want to install kernel" +msgstr "Вы хотитее установить в систему ядро" + +#: source/ubl-strings.h:43 +msgid "Are you sure want to install package" +msgstr "Вы хотите установить в систему пакет с ядром" + +#: source/ubl-strings.h:43 +msgid "Are you sure want to remove module" +msgstr "Вы действительно хотите удалить из системы пакет с модулем ядра" + +#: source/ubl-strings.h:43 +msgid "Are you sure want to remove package" +msgstr "Вы действительно хотите удалить из системы пакет с ядром" + +#: source/ubl-strings.h:43 +msgid "Are you sure want to launch" +msgstr "Выбрать ядро"