From a175f415b29d14e41ee0e24fadd30e8926e176d8 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 23 Apr 2024 09:57:45 +0600 Subject: [PATCH] Test temporary fix for commands --- source/ubl-settings-system.c | 38 ++++++------------------------------ source/ubl-settings-system.h | 3 +++ 2 files changed, 9 insertions(+), 32 deletions(-) diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c index bb092cd..06986b0 100644 --- a/source/ubl-settings-system.c +++ b/source/ubl-settings-system.c @@ -488,41 +488,24 @@ void on_domain_connect(GtkWidget *self, dictionary *dict){ client = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->ClientCombo)); } 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); - - int size; - domain_info_window *dialog = yon_information_window_new(); - gtk_window_set_transient_for(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->Window)); - gtk_window_set_title(GTK_WINDOW(dialog->Window),DOMAIN_CONNECTING_LABEL); - gtk_label_set_text(GTK_LABEL(dialog->HeadLabel),DOMAIN_CONNECTING_LABEL); yon_debug_output(domain_connect_command(adress,login,password,final)); - int size_; - yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_connect_command(adress,login,password,final),NULL,NULL); + 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)),""); gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress); - gtk_widget_show(dialog->Window); } void on_status_clicked(GtkWidget *self, connection_window *window){ - domain_info_window *dialog = yon_information_window_new(); - gtk_window_set_transient_for(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->Window)); char *target = (char*)gtk_entry_get_text(GTK_ENTRY(window->AdressEntry)); if (!yon_char_is_empty(target)){ - yon_ubl_status_box_spawn(GTK_CONTAINER(dialog->StatusBox),LOADING_LABEL,10,BACKGROUND_IMAGE_INFO_TYPE); yon_debug_output(domain_info(target)); - int size_; - yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_info(target),NULL,NULL); + yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_info(target)),""); } - gtk_widget_show(dialog->Window); } void on_find_domains_clicked(GtkWidget *self, connection_window *window){ - domain_info_window *dialog = yon_information_window_new(); - gtk_window_set_transient_for(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->Window)); - yon_ubl_status_box_spawn(GTK_CONTAINER(dialog->StatusBox),LOADING_LABEL,10,BACKGROUND_IMAGE_INFO_TYPE); yon_debug_output(domains_seek_command); - int size_; - yon_terminal_integrated_start(dialog->ExecuteTerminal,domains_seek_command,NULL,NULL); - gtk_widget_show(dialog->Window); + yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domains_seek_command),""); } @@ -530,12 +513,8 @@ void on_main_window_domain_status_clicked(GtkWidget *self, GtkEntryIconPosition if (icon_pos==GTK_ENTRY_ICON_SECONDARY){ char *target = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->DomainEntry)); if (!yon_char_is_empty(target)){ - domain_info_window *window = yon_information_window_new(); - gtk_window_set_transient_for(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window)); - gtk_widget_show(window->Window); yon_debug_output(get_domain_info_command); - int size_; - yon_terminal_integrated_start(window->ExecuteTerminal,get_domain_info_command,NULL,NULL); + yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,get_domain_info_command),""); } } } @@ -598,13 +577,8 @@ void on_domain_disconnect(GtkWidget *self, dictionary *dict){ yon_ubl_status_highlight_incorrect(window->AdressEntry); return; } - int size; - domain_info_window *dialog = yon_information_window_new(); - gtk_window_set_transient_for(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->Window)); - gtk_widget_show(dialog->Window); yon_debug_output(domain_disconnect_command(adress,login,password)); - int size_; - yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_disconnect_command(adress,login,password),NULL,NULL); + 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); on_subwindow_close(window->Window); } diff --git a/source/ubl-settings-system.h b/source/ubl-settings-system.h index 60a9018..38638f3 100644 --- a/source/ubl-settings-system.h +++ b/source/ubl-settings-system.h @@ -80,12 +80,15 @@ #define domain_check_alive(target) yon_char_unite("timeout --kill-after=0.1 2 dig +time=1 +tries=1 +noall -t SRV _ldap._tcp.",target," @",target," &>/dev/null",NULL) +#define terminal_command_start(title,command) yon_char_unite("vte-2.91 --name=vte --cursor-shape=ibeam --cursor-blink=off --keep --no-pty --title=\"",title,"\" --no-shell --icon-title --no-context-menu --use-theme-colors --whole-window-transparent --no-geometry-hints -- ", command, NULL) + #define DOMAIN "DOMAIN" #define DOMAIN_ADMANGER "DOMAIN[admanger]" #define DOMAIN_SERVER "DOMAIN[server]" #define DOMAIN_DNS "DOMAIN[dns]" #define DOMAIN_CLIENT "DOMAIN[client]" + typedef char* string; string version_application;