From dbef66d7b81215880eddebd01c60ee303049c31a Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 24 Apr 2024 15:41:21 +0600 Subject: [PATCH] Temporarily back vte terminal calls --- source/ubl-settings-system.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c index 47abbb5..607a28d 100644 --- a/source/ubl-settings-system.c +++ b/source/ubl-settings-system.c @@ -490,7 +490,10 @@ void on_domain_connect(GtkWidget *self, dictionary *dict){ char *final = yon_char_unite(!yon_char_is_empty(kerberos)?kerberos_addition_command(kerberos):"",!yon_char_is_empty(kerberos)?" ":"",!yon_char_is_empty(dns)?dns_addition_command(dns):"",!yon_char_is_empty(dns)?" ":"",!yon_char_is_empty(client)?client_addition_command(client):"",!yon_char_is_empty(client)?" ":"",NULL); yon_debug_output(domain_connect_command(adress,login,password,final)); yon_debug_output(terminal_command_start(TITLE_LABEL,domain_connect_command(adress,login,password,final))); - yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_connect_command(adress,login,password,final)),""); + domain_info_window *dialog = yon_information_window_new(); + yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_connect_command(adress,login,password,final)); + gtk_widget_show(dialog->Window); + // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_connect_command(adress,login,password,final)),""); gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress); } @@ -498,14 +501,20 @@ void on_status_clicked(GtkWidget *self, connection_window *window){ char *target = (char*)gtk_entry_get_text(GTK_ENTRY(window->AdressEntry)); if (!yon_char_is_empty(target)){ yon_debug_output(domain_info(target)); - yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_info(target)),""); + domain_info_window *dialog = yon_information_window_new(); + yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_info(target)); + gtk_widget_show(dialog->Window); + // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_info(target)),""); } } void on_find_domains_clicked(GtkWidget *self, connection_window *window){ yon_debug_output(domains_seek_command); - yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domains_seek_command),""); + domain_info_window *dialog = yon_information_window_new(); + yon_terminal_integrated_start(dialog->ExecuteTerminal,domains_seek_command); + gtk_widget_show(dialog->Window); + // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domains_seek_command),""); } @@ -514,7 +523,10 @@ void on_main_window_domain_status_clicked(GtkWidget *self, GtkEntryIconPosition char *target = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->DomainEntry)); if (!yon_char_is_empty(target)){ yon_debug_output(get_domain_info_command); - yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,get_domain_info_command),""); + domain_info_window *dialog = yon_information_window_new(); + yon_terminal_integrated_start(dialog->ExecuteTerminal,get_domain_info_command); + gtk_widget_show(dialog->Window); + // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,get_domain_info_command),""); } } } @@ -578,7 +590,10 @@ void on_domain_disconnect(GtkWidget *self, dictionary *dict){ return; } yon_debug_output(domain_disconnect_command(adress,login,password)); - yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_disconnect_command(adress,login,password)),""); + domain_info_window *dialog = yon_information_window_new(); + yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_disconnect_command(adress,login,password)); + gtk_widget_show(dialog->Window); + // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_disconnect_command(adress,login,password)),""); gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress); }