From d9e3af03a352a1ceb84eb4512397dd3beeb4649b Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 20 Nov 2024 11:23:23 +0600 Subject: [PATCH 1/9] 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 From 0272f208fd69630c124a325e9e63b6c147bd4e90 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 20 Nov 2024 13:57:39 +0600 Subject: [PATCH 2/9] Changed selection for listboxes --- ubl-settings-kernel-additions-table-row.glade | 402 ++++++++------- ubl-settings-kernel-table-row.glade | 474 +++++++++--------- ubl-settings-kernel.css | 11 + 3 files changed, 468 insertions(+), 419 deletions(-) diff --git a/ubl-settings-kernel-additions-table-row.glade b/ubl-settings-kernel-additions-table-row.glade index 15291d6..3cded03 100644 --- a/ubl-settings-kernel-additions-table-row.glade +++ b/ubl-settings-kernel-additions-table-row.glade @@ -15,27 +15,53 @@ False - 5 - 5 - 5 - 15 + vertical True False - center 5 - vertical - 1 + 15 True False - 5 + center + 5 + 5 + 5 + vertical + 1 - + True False + 5 + + + True + False + + + False + True + 0 + + + + + True + False + Name + False + 0 + + + True + True + 1 + + False @@ -44,54 +70,77 @@ - + True False - Name - False - 0 + 5 + + + True + False + + + False + True + 0 + + + + + True + False + Module + True + 0 + + + True + True + 1 + + - True + False True 1 - - - False - True - 0 - - - - - True - False - 5 - + True False + 5 + + + True + False + + + False + True + 0 + + + + + True + False + Package + True + 0 + + + True + True + 1 + + False True - 0 - - - - - True - False - Module - True - 0 - - - True - True - 1 + 2 @@ -102,104 +151,40 @@ - + True False - 5 - - - True - False - - - False - True - 0 - - + 5 + 5 + vertical + 2 - - True - False - Package - True - 0 - - - True - True - 1 - + False True - 2 - - - - - False - True - 1 - - - - - True - False - 5 - vertical - 2 - - - - - - False - True - 3 - - - - - True - False - center - 5 - vertical - - - Install module - True - True - True - 5 - - - - False - True - 0 + 3 True False - 5 + center + 5 + 5 + 5 + vertical - + + Install module + True True True 5 - image1 @@ -210,109 +195,144 @@ - - Remove module - True - True - 5 - + + True + False + 5 + + + True + True + 5 + image1 + + + + False + True + 0 + + + + + Remove module + True + True + 5 + + + + True + True + 2 + + - True + False True - 2 + 1 - - - False - True - 1 - - - - - Install package - True - True - True - 5 - - - - False - True - 2 - - - - - True - False - 5 - + + Install package + True True True - image2 + 5 False True - 0 + 2 - - Remove package - True - True - + + True + False + 5 + + + True + True + image2 + + + + False + True + 0 + + + + + Remove package + True + True + + + + True + True + 2 + + - True + False True - 2 + 3 False True - 3 + end + 4 + + + True + False + 5 + 5 + True + 0 + + + True + True + end + 6 + + + False True - end - 4 - - - - - True - False - True - 0 - - - True - True - end - 6 + 0 + vertical + 2 + + + False True - 0 + 4 - + True False - 5 + center + 5 + 5 + 5 + vertical - + + Install module + True True True 5 - image1 @@ -244,8 +229,55 @@ - - Remove module + + True + False + 5 + + + True + True + 5 + image1 + + + + False + True + 0 + + + + + Remove module + True + True + 5 + + + + True + True + 2 + + + + + False + True + 1 + + + + + Install package + True True True 5 @@ -254,133 +286,119 @@ - True + False True 2 - - - False - True - 1 - - - - - Install package - True - True - True - 5 - - - - False - True - 2 - - - - - True - False - 5 - + + True + False + 5 + + + True + True + 5 + image2 + + + + False + True + 0 + + + + + Remove package + True + True + 5 + + + + True + True + 2 + + + + + False + True + 3 + + + + + Changelog True True 5 - image2 False True - 0 + 4 - - Remove package + + Launch True True - 5 - True + False True - 2 + 5 False True - 3 - - - - - Changelog - True - True - 5 - - - - False - True + end 4 - - Launch - True - True - + + True + False + 5 + True + 0 - False + True True - 5 + end + 6 + False True - end - 4 - - - - - True - False - 5 - True - 0 - - - True - True - end - 6 + 0 diff --git a/ubl-settings-kernel-table-row.glade b/ubl-settings-kernel-table-row.glade index d467a7b..5a40f41 100644 --- a/ubl-settings-kernel-table-row.glade +++ b/ubl-settings-kernel-table-row.glade @@ -1,5 +1,5 @@ - + @@ -209,7 +209,6 @@ center 5 5 - 5 vertical @@ -358,6 +357,7 @@ Launch True True + 5 From b8b46adcbadb692ef80064bd26ba5c464ce70c4e Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 20 Nov 2024 15:44:51 +0600 Subject: [PATCH 4/9] Added 1 pixel for tab top padding --- ubl-settings-kernel-table-row.glade | 1 + 1 file changed, 1 insertion(+) diff --git a/ubl-settings-kernel-table-row.glade b/ubl-settings-kernel-table-row.glade index 5a40f41..0ecb479 100644 --- a/ubl-settings-kernel-table-row.glade +++ b/ubl-settings-kernel-table-row.glade @@ -15,6 +15,7 @@ False + 1 vertical From c247d7a16a9b49d5814ef37de495bac79d274bc4 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 20 Nov 2024 15:46:32 +0600 Subject: [PATCH 5/9] Added 1 pixel for tab top padding --- ubl-settings-kernel-additions-table-row.glade | 1 + 1 file changed, 1 insertion(+) diff --git a/ubl-settings-kernel-additions-table-row.glade b/ubl-settings-kernel-additions-table-row.glade index bc1eb6b..8e99e5f 100644 --- a/ubl-settings-kernel-additions-table-row.glade +++ b/ubl-settings-kernel-additions-table-row.glade @@ -15,6 +15,7 @@ False + 1 vertical From 57e92da88a56856f40f6ee97f59585651c53a0b7 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 20 Nov 2024 16:33:56 +0600 Subject: [PATCH 6/9] style fixes --- source/ubl-settings-kernel.c | 10 ++++-- ubl-settings-kernel-additions-table-row.glade | 6 ++++ ubl-settings-kernel-table-row.glade | 6 ++++ ubl-settings-kernel.css | 31 ++++++++++--------- 4 files changed, 36 insertions(+), 17 deletions(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index cb5532d..fdb24b3 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -149,9 +149,13 @@ gboolean yon_tab_create_tags(kernels_tab *tab){ 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); + 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'); + + if ((launched&&strcmp(tab->package,launched))||(strcmp(tab->package,boot_run[0]))){ + gtk_widget_show(tab->launch_button); + } else gtk_widget_hide(tab->launch_button); } if (tab->changelog_button){ gtk_widget_show(tab->changelog_button); diff --git a/ubl-settings-kernel-additions-table-row.glade b/ubl-settings-kernel-additions-table-row.glade index 8e99e5f..050cd4e 100644 --- a/ubl-settings-kernel-additions-table-row.glade +++ b/ubl-settings-kernel-additions-table-row.glade @@ -79,6 +79,9 @@ True False + False @@ -116,6 +119,9 @@ True False + False diff --git a/ubl-settings-kernel-table-row.glade b/ubl-settings-kernel-table-row.glade index 0ecb479..35ee1ab 100644 --- a/ubl-settings-kernel-table-row.glade +++ b/ubl-settings-kernel-table-row.glade @@ -79,6 +79,9 @@ True False + False @@ -115,6 +118,9 @@ True False + False diff --git a/ubl-settings-kernel.css b/ubl-settings-kernel.css index a6b47e1..641275f 100644 --- a/ubl-settings-kernel.css +++ b/ubl-settings-kernel.css @@ -166,8 +166,8 @@ background:transparent; border-width: 0.5px; border-style: solid; padding:2px 5px; - color:#a25757; - border-color: #d8504e; + color:#660000; + border-color: #cf2a27; background-color:#ea9999 } @@ -176,8 +176,8 @@ background:transparent; border-width: 0.5px; border-style: solid; padding:2px 5px; - color:#4973a1; - border-color: #3e85e7; + color:#073763; + border-color: #2b78e4; background-color:#9fc5f8 } @@ -186,8 +186,8 @@ background:transparent; border-width: 0.5px; border-style: solid; padding:2px 5px; - color:#41346a; - border-color: #9d17f9; + color:#073763; + border-color: #9900ff; background-color:#b4a7d6 } @@ -196,8 +196,8 @@ background:transparent; border-width: 0.5px; border-style: solid; padding:2px 5px; - color:#a87644; - border-color: #fea11a; + color:#783f04; + border-color: #ff9900; background-color:#f9cb9c } @@ -206,8 +206,8 @@ background:transparent; border-width: 0.5px; border-style: solid; padding:2px 5px; - color:#866715; - border-color: #cca11f; + color:#7f6000; + border-color: #bf9000; background-color:#ffe599 } @@ -216,10 +216,9 @@ background:transparent; border-width: 0.5px; border-style: solid; padding:2px 5px; - color:#61815a; - border-color: #2aab37; - - background-color:#c8e1be + border-color: #009e0f; + background-color:#b6d7a8; + color:#274e13; } .tag_grey{ border-radius: 2px; @@ -257,4 +256,8 @@ background:transparent; .updatebutton *:disabled { background-color: transparent; color: @insensitive_fg_color; +} + +.install_icon { + color:#073763; } \ No newline at end of file From 7d48e392c9e3830effffc3f1fdd911517db96001 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 20 Nov 2024 17:06:05 +0600 Subject: [PATCH 7/9] Launch button fixes --- source/ubl-settings-kernel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index fdb24b3..b1b2c71 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -153,7 +153,7 @@ gboolean yon_tab_create_tags(kernels_tab *tab){ config_str boot_run = yon_config_load(get_active_kernel_command,&boot_size); yon_char_remove_last_symbol(boot_run[0],'\n'); - if ((launched&&strcmp(tab->package,launched))||(strcmp(tab->package,boot_run[0]))){ + if ((launched&&strcmp(tab->package,launched))&&(strcmp(tab->package,boot_run[0]))){ gtk_widget_show(tab->launch_button); } else gtk_widget_hide(tab->launch_button); } From e7fafda2b6a03ce2aa8748e85d1ee1fd1d271719 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 20 Nov 2024 17:37:29 +0600 Subject: [PATCH 8/9] Fixed launch button --- source/ubl-settings-kernel.c | 45 ++++++++++++++--------------- ubl-settings-kernel-table-row.glade | 3 +- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index b1b2c71..e05e166 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -153,9 +153,28 @@ gboolean yon_tab_create_tags(kernels_tab *tab){ config_str boot_run = yon_config_load(get_active_kernel_command,&boot_size); yon_char_remove_last_symbol(boot_run[0],'\n'); - if ((launched&&strcmp(tab->package,launched))&&(strcmp(tab->package,boot_run[0]))){ + if ((!(launched&&!strcmp(tab->package,launched))&&(strcmp(tab->package,boot_run[0])))){ gtk_widget_show(tab->launch_button); - } else gtk_widget_hide(tab->launch_button); + } else { + gtk_widget_hide(tab->launch_button); + if(!getuid()){ + if (boot_run&&!strcmp(boot_run[0],tab->package)){ + yon_tag_add(GTK_BOX(tab->install_tags_box),RUNNING_LABEL,"tag_green",NULL); + gtk_widget_hide(tab->remove_module_button); + gtk_widget_hide(tab->remove_package_button); + gtk_widget_hide(tab->update_module_button); + gtk_widget_hide(tab->update_package_button); + gtk_widget_hide(tab->launch_button); + } else if (!yon_char_is_empty(launched)&&!strcmp(launched,tab->package)){ + yon_tag_add(GTK_BOX(tab->install_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_hide(tab->update_module_button); + gtk_widget_hide(tab->update_package_button); + } + } + } } if (tab->changelog_button){ gtk_widget_show(tab->changelog_button); @@ -227,15 +246,6 @@ void *yon_interface_update(main_window *widgets){ int kernels_size; config_str kernels = yon_resource_open_file(kernels_path, &kernels_size); - char *boot_config_run=NULL; - int boot_size; - config_str boot_run=NULL; - if(!getuid()){ - boot_config_run = config(KERNEL_BOOT_parameter); - - 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); @@ -246,19 +256,6 @@ void *yon_interface_update(main_window *widgets){ gtk_widget_destroy(g_list_nth_data(list,i)); } g_list_free(list);} - if(!getuid()){ - if (boot_run&&!strcmp(boot_run[0],tab->package)){ - 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); - gtk_widget_hide(tab->launch_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); diff --git a/ubl-settings-kernel-table-row.glade b/ubl-settings-kernel-table-row.glade index 35ee1ab..466d954 100644 --- a/ubl-settings-kernel-table-row.glade +++ b/ubl-settings-kernel-table-row.glade @@ -1,5 +1,5 @@ - + @@ -193,7 +193,6 @@ - True False 5 5 From e34c1f32be396c8207e181fbc0bb4fe4a48da448 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 20 Nov 2024 17:55:02 +0600 Subject: [PATCH 9/9] fixed button visibility --- source/ubl-settings-kernel.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index e05e166..9de6081 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -130,12 +130,9 @@ gboolean yon_tab_create_tags(kernels_tab *tab){ 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->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); } { if (tab->package_installed){