diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c index 1a3bd02..ac02a32 100644 --- a/source/ubl-settings-system.c +++ b/source/ubl-settings-system.c @@ -192,7 +192,6 @@ void yon_config_global_local_save(){ yon_ubl_status_box_spawn_infinite(GTK_CONTAINER(window->StatusBox),"warning",SAVE_WARNING_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); } } - // yon_ubl_status_box_render(yon_char_unite(SAVE_SUCCESS,"\n", SAVE_WARNING_LABEL,NULL),BACKGROUND_IMAGE_SUCCESS_TYPE); } @@ -494,13 +493,10 @@ void on_domain_connect(GtkWidget *self, dictionary *dict){ domain_info_window *dialog = yon_information_window_new(); gtk_window_set_title(GTK_WINDOW(dialog->Window),DOMAIN_CONNECTING_LABEL); gtk_label_set_text(GTK_LABEL(dialog->HeadLabel),DOMAIN_CONNECTING_LABEL); - yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_connect_command(adress,login,password,final),NULL,NULL); - if (main_config.debug_mode){ - printf("%s\n",domain_connect_command(adress,login,password,final)); + yon_debug_output(domain_connect_command(adress,login,password,final)); int size_; - config_str test = yon_config_load(domain_connect_command(adress,login,password,final),&size_); - printf("%s\n",yon_char_parsed_to_string(test,size_,"\n")); - } + config_str test = yon_config_load(domain_disconnect_command(adress,login,password),&size_); + vte_terminal_feed(VTE_TERMINAL(dialog->ExecuteTerminal),yon_char_parsed_to_string(test,size_,""),-1); gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress); gtk_widget_show(dialog->Window); } @@ -509,26 +505,22 @@ void on_status_clicked(GtkWidget *self, connection_window *window){ domain_info_window *dialog = yon_information_window_new(); char *target = (char*)gtk_entry_get_text(GTK_ENTRY(window->AdressEntry)); if (!yon_char_is_empty(target)){ - yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_info(target),NULL,NULL); - if (main_config.debug_mode){ - printf("%s\n",domain_info(target)); + + yon_debug_output(domain_info(target)); int size_; config_str test = yon_config_load(domain_info(target),&size_); - printf("%s\n",yon_char_parsed_to_string(test,size_,"\n")); - } + vte_terminal_feed(VTE_TERMINAL(dialog->ExecuteTerminal),yon_char_parsed_to_string(test,size_,""),-1); + } gtk_widget_show(dialog->Window); } void on_find_domains_clicked(GtkWidget *self, connection_window *window){ domain_info_window *dialog = yon_information_window_new(); - yon_terminal_integrated_start(dialog->ExecuteTerminal,domains_seek_command,NULL,NULL); - if (main_config.debug_mode){ - printf("%s\n",domains_seek_command); + yon_debug_output(domains_seek_command); int size_; config_str test = yon_config_load(domains_seek_command,&size_); - printf("%s\n",yon_char_parsed_to_string(test,size_,"\n")); - } + vte_terminal_feed(VTE_TERMINAL(dialog->ExecuteTerminal),yon_char_parsed_to_string(test,size_,""),-1); gtk_widget_show(dialog->Window); } @@ -539,13 +531,10 @@ void on_main_window_domain_status_clicked(GtkWidget *self, GtkEntryIconPosition if (!yon_char_is_empty(target)){ domain_info_window *window = yon_information_window_new(); gtk_widget_show(window->Window); - yon_terminal_integrated_start(window->ExecuteTerminal,get_domain_info_command,NULL,NULL); - if (main_config.debug_mode){ - printf("%s\n",get_domain_info_command); + yon_debug_output(get_domain_info_command); int size_; config_str test = yon_config_load(get_domain_info_command,&size_); - printf("%s\n",yon_char_parsed_to_string(test,size_,"\n")); - } + vte_terminal_feed(VTE_TERMINAL(window->ExecuteTerminal),yon_char_parsed_to_string(test,size_,""),-1); } } } @@ -609,16 +598,12 @@ void on_domain_disconnect(GtkWidget *self, dictionary *dict){ return; } int size; - // config_str parsed = yon_config_load(domain_disconnect_command(adress,login,password),&size); domain_info_window *dialog = yon_information_window_new(); gtk_widget_show(dialog->Window); - yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_disconnect_command(adress,login,password),NULL,NULL); - if (main_config.debug_mode){ - printf("%s\n",domain_disconnect_command(adress,login,password)); + yon_debug_output(domain_disconnect_command(adress,login,password)); int size_; config_str test = yon_config_load(domain_disconnect_command(adress,login,password),&size_); - printf("%s\n",yon_char_parsed_to_string(test,size_,"\n")); - } + vte_terminal_feed(VTE_TERMINAL(dialog->ExecuteTerminal),yon_char_parsed_to_string(test,size_,""),-1); gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress); on_subwindow_close(window->Window); } @@ -752,7 +737,6 @@ main_window *yon_main_window_complete(main_window *widgets){ gtk_menu_shell_append(GTK_MENU_SHELL(menu),widgets->AboutMenuItem); /* Widget registration for config monitoring | Регистрация виджетов для мониторинга конфига */ - // yon_window_config_add_custom_parameter(widgets->HeadInfoLabel,"head-text","label",YON_TYPE_STRING); /* Signal connection | Присоединение сигналов */ g_signal_connect(G_OBJECT(widgets->DocumentationMenuItem),"activate",G_CALLBACK(on_open_documentation_confirmation),WIKI_LINK); @@ -782,8 +766,6 @@ main_window *yon_main_window_complete(main_window *widgets){ g_signal_connect(G_OBJECT(widgets->DomainEntry),"focus-out-event",G_CALLBACK(on_domain_address_save),NULL); g_timeout_add(1000,(GSourceFunc)on_check_domain_connected,widgets); - - gtk_widget_set_size_request(widgets->Window,800,-1); main_config.localeslist = gtk_list_store_new(3,G_TYPE_STRING,G_TYPE_STRING,G_TYPE_BOOLEAN); int size;