From 84c2b472a947bcb195d59abe525ea9b526426fe6 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 14 Aug 2025 10:03:45 +0600 Subject: [PATCH 1/6] Fixed terminal minimum size --- source/ubl-settings-kernel.c | 8 ++++---- ubl-settings-kernel-install.glade | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 9f5d189..040f64d 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -1565,10 +1565,9 @@ void on_terminal_revealer_open(GtkWidget *, main_window *widgets){ } void on_paned_position_changed(GtkWidget *, GdkEvent*,main_window *widgets){ - int size = (int)(gtk_widget_get_allocated_height(widgets->InterfaceBox)*0.8); - if (size<20) size=20; - if (gtk_paned_get_position(GTK_PANED(widgets->TerminalPaned))>size) - gtk_paned_set_position(GTK_PANED(widgets->TerminalPaned),size); + int size = (int)(gtk_widget_get_allocated_height(widgets->InterfaceBox)*0.7); + if (gtk_paned_get_position(GTK_PANED(widgets->TerminalPaned))>size-40) + gtk_paned_set_position(GTK_PANED(widgets->TerminalPaned),size-40); } /**yon_main_window_complete(main_window *widgets) @@ -1615,6 +1614,7 @@ void yon_main_window_complete(main_window *widgets){ widgets->ButtonsSizeGroup = GTK_SIZE_GROUP(gtk_builder_get_object(builder,"ButtonsSizeGroup")); g_signal_connect(G_OBJECT(widgets->TerminalPaned),"notify::position",G_CALLBACK(on_paned_position_changed),widgets); + g_signal_connect(G_OBJECT(widgets->TerminalPaned),"notify::max-position",G_CALLBACK(on_paned_position_changed),widgets); g_signal_connect(G_OBJECT(widgets->UpdateButton),"clicked",G_CALLBACK(on_update_clicked),widgets); g_signal_connect(G_OBJECT(widgets->BuildingButton),"clicked",G_CALLBACK(on_building_clicked),widgets); g_signal_connect(G_OBJECT(widgets->UnlockPacmanButton),"clicked",G_CALLBACK(on_pacman_db_unlock),NULL); diff --git a/ubl-settings-kernel-install.glade b/ubl-settings-kernel-install.glade index cd2ae24..7b7245e 100644 --- a/ubl-settings-kernel-install.glade +++ b/ubl-settings-kernel-install.glade @@ -157,6 +157,7 @@ True False True + up -- 2.35.1 From b3f583f4af65b6c6ceda5ae6d290a71ca7563ad8 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 14 Aug 2025 10:32:38 +0600 Subject: [PATCH 2/6] Added pacman update fail message --- source/ubl-settings-kernel.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 040f64d..2b948b5 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -535,6 +535,7 @@ gboolean on_command_execute_success(GtkWidget *,gint status,main_window *widgets main_config.action=ACTION_TERMINAL_EXECUTE_SUCCESS; } else { main_config.action=ACTION_TERMINAL_EXECUTE_FAIL; + yon_ubl_status_box_render(yon_char_get_localised_from_lib(FAIL_LABEL),BACKGROUND_IMAGE_FAIL_TYPE); } gtk_widget_set_sensitive(widgets->UpdateButton,1); dictionary *dict = NULL; @@ -576,7 +577,8 @@ gboolean on_command_execute_success(GtkWidget *,gint status,main_window *widgets gtk_box_pack_start(GTK_BOX(gtk_widget_get_parent(widgets->TerminalPaned)),widgets->MainNotebook,1,1,0); gtk_box_reorder_child(GTK_BOX(gtk_widget_get_parent(widgets->MainNotebook)),widgets->MainNotebook,0); - gtk_widget_hide(widgets->TerminalPaned); + if (!status) + on_terminal_revealer_open(NULL,widgets); } return G_SOURCE_REMOVE; } @@ -1659,8 +1661,8 @@ void yon_main_window_complete(main_window *widgets){ on_update_clicked(NULL,widgets); yon_save_window_set_postsave_function(on_save_done,widgets); - yon_terminal_integrated_start(widgets->InstallTerminal,pacman_update_command); on_terminal_revealer_open(NULL,widgets); + yon_terminal_integrated_start(widgets->InstallTerminal,pacman_update_command); } yon_load_proceed(YON_CONFIG_LOCAL); } -- 2.35.1 From bc99def2c92d83f57b33aab7fbbd99655660e0be Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 14 Aug 2025 12:00:13 +0600 Subject: [PATCH 3/6] Test fix for module removing --- source/ubl-settings-kernel.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 2b948b5..e6b291c 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -580,6 +580,7 @@ gboolean on_command_execute_success(GtkWidget *,gint status,main_window *widgets if (!status) on_terminal_revealer_open(NULL,widgets); } + yon_packages_update(); return G_SOURCE_REMOVE; } @@ -1390,6 +1391,7 @@ void config_init(){ } void on_update_clicked(GtkWidget *self, main_window *widgets){ + yon_packages_update(); if (self) main_config.action=ACTION_LOAD; int lock=0; @@ -1654,7 +1656,6 @@ void yon_main_window_complete(main_window *widgets){ glong columns = vte_terminal_get_column_count(VTE_TERMINAL(widgets->InstallTerminal)); vte_terminal_set_size(VTE_TERMINAL(widgets->InstallTerminal),columns,20); - yon_gtk_widget_set_scroll_window_for_scroll(widgets->InstallTerminal,GTK_SCROLLBAR(widgets->TerminalScroll)); gtk_paned_add2(GTK_PANED(widgets->TerminalPaned),widgets->TerminalRevealer); @@ -1663,6 +1664,7 @@ void yon_main_window_complete(main_window *widgets){ on_terminal_revealer_open(NULL,widgets); yon_terminal_integrated_start(widgets->InstallTerminal,pacman_update_command); + yon_gtk_widget_set_scroll_window_for_scroll(gtk_widget_get_parent(widgets->InstallTerminal),GTK_SCROLLBAR(widgets->TerminalScroll)); } yon_load_proceed(YON_CONFIG_LOCAL); } -- 2.35.1 From 48fa980c6348ad5635a261fe6ffd07d8ecf25daa Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 19 Aug 2025 09:24:49 +0600 Subject: [PATCH 4/6] Fixed build terminal size --- source/ubl-settings-kernel.c | 1 + 1 file changed, 1 insertion(+) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index e6b291c..dcfe3c1 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -143,6 +143,7 @@ void on_pacman_db_unlock(void){ GtkWidget *terminal_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,5); GtkWidget *scroll = gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL,gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(terminal))); + gtk_widget_set_size_request(window,800,500); gtk_window_set_titlebar(GTK_WINDOW(window),header); gtk_container_add(GTK_CONTAINER(window),box); gtk_box_pack_start(GTK_BOX(box),status_box,0,0,0); -- 2.35.1 From a74f4cf93e707070ecd0af8b6c63268c288df5fd Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 19 Aug 2025 10:06:53 +0600 Subject: [PATCH 5/6] Fixed terminal opening --- source/ubl-settings-kernel.c | 32 ++++++++++++++++---------------- ubl-settings-kernel.glade | 12 ++++++------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index dcfe3c1..243632f 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -563,23 +563,24 @@ gboolean on_command_execute_success(GtkWidget *,gint status,main_window *widgets } } { - gtk_button_set_label(GTK_BUTTON(widgets->MoreButton),MORE_LABEL); + // gtk_button_set_label(GTK_BUTTON(widgets->MoreButton),MORE_LABEL); - int pos = gtk_paned_get_position(GTK_PANED(widgets->TerminalPaned)); - yon_window_config_add_instant_parameter("paned_pos","settings",&pos,YON_TYPE_INT); + // int pos = gtk_paned_get_position(GTK_PANED(widgets->TerminalPaned)); + // yon_window_config_add_instant_parameter("paned_pos","settings",&pos,YON_TYPE_INT); - GValue val = G_VALUE_INIT; - g_object_get_property(G_OBJECT(widgets->TerminalPaned),"max-position",&val); - gtk_paned_set_position(GTK_PANED(widgets->TerminalPaned),g_value_get_int(&val)); - g_value_unset(&val); + // GValue val = G_VALUE_INIT; + // g_object_get_property(G_OBJECT(widgets->TerminalPaned),"max-position",&val); + // gtk_paned_set_position(GTK_PANED(widgets->TerminalPaned),g_value_get_int(&val)); + // g_value_unset(&val); - g_object_ref(widgets->MainNotebook); - gtk_container_remove(GTK_CONTAINER(widgets->TerminalPaned),widgets->MainNotebook); - gtk_box_pack_start(GTK_BOX(gtk_widget_get_parent(widgets->TerminalPaned)),widgets->MainNotebook,1,1,0); + // g_object_ref(widgets->MainNotebook); + // gtk_container_remove(GTK_CONTAINER(widgets->TerminalPaned),widgets->MainNotebook); + // gtk_box_pack_start(GTK_BOX(gtk_widget_get_parent(widgets->TerminalPaned)),widgets->MainNotebook,1,1,0); - gtk_box_reorder_child(GTK_BOX(gtk_widget_get_parent(widgets->MainNotebook)),widgets->MainNotebook,0); + // gtk_box_reorder_child(GTK_BOX(gtk_widget_get_parent(widgets->MainNotebook)),widgets->MainNotebook,0); if (!status) - on_terminal_revealer_open(NULL,widgets); + // on_terminal_revealer_open(NULL,widgets); + gtk_button_clicked(GTK_BUTTON(widgets->MoreButton)); } yon_packages_update(); return G_SOURCE_REMOVE; @@ -661,7 +662,7 @@ void *yon_command_execute_async(char *command,main_window *widgets){ gtk_widget_set_sensitive(((kernels_tab*)dict->data)->remove_package_button,0); } } - on_terminal_revealer_open(NULL,widgets); + gtk_button_clicked(GTK_BUTTON(widgets->MoreButton)); return NULL; } @@ -1545,8 +1546,6 @@ void on_terminal_revealer_open(GtkWidget *, main_window *widgets){ gtk_widget_show(widgets->TerminalPaned); gtk_widget_show(widgets->MainNotebook); - - } break; case 1: { //closes gtk_button_set_label(GTK_BUTTON(widgets->MoreButton),MORE_LABEL); @@ -1663,7 +1662,8 @@ void yon_main_window_complete(main_window *widgets){ on_update_clicked(NULL,widgets); yon_save_window_set_postsave_function(on_save_done,widgets); - on_terminal_revealer_open(NULL,widgets); + gtk_button_clicked(GTK_BUTTON(widgets->MoreButton)); + // on_terminal_revealer_open(NULL,widgets); yon_terminal_integrated_start(widgets->InstallTerminal,pacman_update_command); yon_gtk_widget_set_scroll_window_for_scroll(gtk_widget_get_parent(widgets->InstallTerminal),GTK_SCROLLBAR(widgets->TerminalScroll)); } diff --git a/ubl-settings-kernel.glade b/ubl-settings-kernel.glade index 5270099..d3cab41 100644 --- a/ubl-settings-kernel.glade +++ b/ubl-settings-kernel.glade @@ -126,6 +126,11 @@ False com.ublinux.libublsettingsui-gtk3.settings-symbolic + + True + False + com.ublinux.libublsettingsui-gtk3.changes-allow-symbolic + True False @@ -339,7 +344,7 @@ - False + True True 0 @@ -488,9 +493,4 @@ - - True - False - com.ublinux.libublsettingsui-gtk3.changes-allow-symbolic - -- 2.35.1 From 3f9a6fd1f5dcc498bbd93722d6889f8cf2f6645f Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 19 Aug 2025 15:56:16 +0600 Subject: [PATCH 6/6] fixed kernel/kernel addition deletion window loading --- source/ubl-settings-kernel.c | 34 +++++++++----------------------- ubl-settings-kernel-dialog.glade | 2 +- 2 files changed, 10 insertions(+), 26 deletions(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 243632f..66936c2 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -199,12 +199,7 @@ char *yon_package_dependent_get(char *target){ config_str recurs = NULL; for (int i=0;iMoreButton),MORE_LABEL); - - // int pos = gtk_paned_get_position(GTK_PANED(widgets->TerminalPaned)); - // yon_window_config_add_instant_parameter("paned_pos","settings",&pos,YON_TYPE_INT); - - // GValue val = G_VALUE_INIT; - // g_object_get_property(G_OBJECT(widgets->TerminalPaned),"max-position",&val); - // gtk_paned_set_position(GTK_PANED(widgets->TerminalPaned),g_value_get_int(&val)); - // g_value_unset(&val); - - // g_object_ref(widgets->MainNotebook); - // gtk_container_remove(GTK_CONTAINER(widgets->TerminalPaned),widgets->MainNotebook); - // gtk_box_pack_start(GTK_BOX(gtk_widget_get_parent(widgets->TerminalPaned)),widgets->MainNotebook,1,1,0); - - // gtk_box_reorder_child(GTK_BOX(gtk_widget_get_parent(widgets->MainNotebook)),widgets->MainNotebook,0); if (!status) - // on_terminal_revealer_open(NULL,widgets); gtk_button_clicked(GTK_BUTTON(widgets->MoreButton)); } yon_packages_update(); @@ -835,6 +814,7 @@ void on_module_install_clicked(GtkWidget *self,dictionary *dict){ kernels_tab *tab = yon_dictionary_get_data(dict->first->next,kernels_tab*); char *action_text = NULL; dialog_window *window = yon_dialog_window_new(); + gtk_window_set_transient_for(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window)); g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_module_install_accept),dict); if (self == tab->update_module_button){ @@ -896,6 +876,7 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){ kernels_tab *tab = yon_dictionary_get_data(dict->first->next,kernels_tab*); char *action_text = NULL; dialog_window *window = yon_dialog_window_new(); + gtk_window_set_transient_for(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window)); g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_package_install_accept),dict); gtk_tree_view_column_set_title(GTK_TREE_VIEW_COLUMN(gtk_tree_view_get_column(GTK_TREE_VIEW(window->DependencesTree),1)),PACKAGE_TAB_LABEL); if (self == tab->update_package_button){ @@ -999,6 +980,7 @@ void on_module_remove_clicked(GtkWidget *self,dictionary *dict){ } char *action_text = NULL; dialog_window *window = yon_dialog_window_new(); + gtk_window_set_transient_for(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window)); if (dict->first->next->next){ dict=dict->first; free(dict->first->next->next); @@ -1036,7 +1018,7 @@ void on_module_remove_clicked(GtkWidget *self,dictionary *dict){ free(final); } for (int i=0;imodule_requirements_size;i++){ - if (!system(get_package_is_installed_command(tab->module_requirements[i]))){ + if (yon_packages_check_installed(tab->module_requirements[i])){ for (int j=1;jWindow),GTK_WINDOW(widgets->Window)); gtk_tree_view_column_set_title(GTK_TREE_VIEW_COLUMN(gtk_tree_view_get_column(GTK_TREE_VIEW(window->DependencesTree),1)),PACKAGE_TAB_LABEL); if (dict->first->next->next){ dict=dict->first; @@ -1122,7 +1105,7 @@ void on_package_remove_clicked(GtkWidget *self,dictionary *dict){ GtkTreeIter itar; char *target_depends = yon_package_dependent_get(tab->package); if (target_depends&&strcmp(target_depends,tab->package)){ - free(yon_char_divide_search(target_depends," ",-1)); + // free(yon_char_divide_search(target_depends," ",-1)); char *final = yon_char_replace(target_depends," ","\n"); gtk_list_store_append(window->liststore1,&itar); gtk_list_store_set(window->liststore1,&itar,0,1,1,final,-1); @@ -1130,13 +1113,14 @@ void on_package_remove_clicked(GtkWidget *self,dictionary *dict){ } config_str additions = yon_resource_open_file(kernels_addon_path,&size); for (int i=0;imodule_requirements_size;i++){ - if (!system(get_package_is_installed_command(tab->package_requirements[i]))){ + if (yon_packages_check_installed(tab->module_requirements[i])){ for (int j=1;jmodule_requirements[i])){ char *target = parsed[2]; char *depends = yon_package_dependent_get(target); + if (yon_char_is_empty(depends)) continue; if (strcmp(depends,target)){ gtk_list_store_append(window->liststore1,&itar); gtk_list_store_set(window->liststore1,&itar,0,1,1,depends,2, parsed[3],-1); diff --git a/ubl-settings-kernel-dialog.glade b/ubl-settings-kernel-dialog.glade index e91565c..4f04095 100644 --- a/ubl-settings-kernel-dialog.glade +++ b/ubl-settings-kernel-dialog.glade @@ -23,7 +23,7 @@ False True 1 - com.ublinux.ubl-settings-repomanager + com.ublinux.ubl-settings-kernel True -- 2.35.1