Applications
/
ubl-settings-system
10
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Test move of commands calling to popen()' (#36) from YanTheKaller/ubl-settings-system:master into master

Browse Source 
Reviewed-on: #36
pull/69/head^2 v2.11
Dmitry Razumov 2 years ago
parent d9feca9ca6 1544fc2345
commit 5a518d35ec
1 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File

44
source/ubl-settings-system.c
Unescape View File

@ -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_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(); domain_info_window *dialog = yon_information_window_new();
gtk_window_set_title(GTK_WINDOW(dialog->Window),DOMAIN_CONNECTING_LABEL); gtk_window_set_title(GTK_WINDOW(dialog->Window),DOMAIN_CONNECTING_LABEL);
gtk_label_set_text(GTK_LABEL(dialog->HeadLabel),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); yon_debug_output(domain_connect_command(adress,login,password,final));
if (main_config.debug_mode){
printf("%s\n",domain_connect_command(adress,login,password,final));
int size_; int size_;
config_str test = yon_config_load(domain_connect_command(adress,login,password,final),&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); gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress);
gtk_widget_show(dialog->Window); 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(); domain_info_window *dialog = yon_information_window_new();
char *target = (char*)gtk_entry_get_text(GTK_ENTRY(window->AdressEntry)); char *target = (char*)gtk_entry_get_text(GTK_ENTRY(window->AdressEntry));
if (!yon_char_is_empty(target)){ if (!yon_char_is_empty(target)){
yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_info(target),NULL,NULL);
if (main_config.debug_mode){ yon_debug_output(domain_info(target));
printf("%s\n",domain_info(target));
int size_; int size_;
config_str test = yon_config_load(domain_info(target),&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); gtk_widget_show(dialog->Window);
} }
void on_find_domains_clicked(GtkWidget *self, connection_window *window){ void on_find_domains_clicked(GtkWidget *self, connection_window *window){
domain_info_window *dialog = yon_information_window_new(); domain_info_window *dialog = yon_information_window_new();
yon_terminal_integrated_start(dialog->ExecuteTerminal,domains_seek_command,NULL,NULL); yon_debug_output(domains_seek_command);
if (main_config.debug_mode){
printf("%s\n",domains_seek_command);
int size_; int size_;
config_str test = yon_config_load(domains_seek_command,&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); 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)){ if (!yon_char_is_empty(target)){
domain_info_window *window = yon_information_window_new(); domain_info_window *window = yon_information_window_new();
gtk_widget_show(window->Window); gtk_widget_show(window->Window);
yon_terminal_integrated_start(window->ExecuteTerminal,get_domain_info_command,NULL,NULL); yon_debug_output(get_domain_info_command);
if (main_config.debug_mode){
printf("%s\n",get_domain_info_command);
int size_; int size_;
config_str test = yon_config_load(get_domain_info_command,&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; return;
} }
int size; int size;
// config_str parsed = yon_config_load(domain_disconnect_command(adress,login,password),&size);
domain_info_window *dialog = yon_information_window_new(); domain_info_window *dialog = yon_information_window_new();
gtk_widget_show(dialog->Window); gtk_widget_show(dialog->Window);
yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_disconnect_command(adress,login,password),NULL,NULL); yon_debug_output(domain_disconnect_command(adress,login,password));
if (main_config.debug_mode){
printf("%s\n",domain_disconnect_command(adress,login,password));
int size_; int size_;
config_str test = yon_config_load(domain_disconnect_command(adress,login,password),&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); gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress);
on_subwindow_close(window->Window); 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); gtk_menu_shell_append(GTK_MENU_SHELL(menu),widgets->AboutMenuItem);
/* Widget registration for config monitoring | Регистрация виджетов для мониторинга конфига */ /* Widget registration for config monitoring | Регистрация виджетов для мониторинга конфига */
// yon_window_config_add_custom_parameter(widgets->HeadInfoLabel,"head-text","label",YON_TYPE_STRING);
/* Signal connection | Присоединение сигналов */ /* Signal connection | Присоединение сигналов */
g_signal_connect(G_OBJECT(widgets->DocumentationMenuItem),"activate",G_CALLBACK(on_open_documentation_confirmation),WIKI_LINK); g_signal_connect(G_OBJECT(widgets->DocumentationMenuItem),"activate",G_CALLBACK(on_open_documentation_confirmation),WIKI_LINK);
@ -783,8 +767,6 @@ main_window *yon_main_window_complete(main_window *widgets){
g_timeout_add(1000,(GSourceFunc)on_check_domain_connected,widgets); 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); main_config.localeslist = gtk_list_store_new(3,G_TYPE_STRING,G_TYPE_STRING,G_TYPE_BOOLEAN);
int size; int size;
config_str locales = yon_file_open(get_locales_command,&size); config_str locales = yon_file_open(get_locales_command,&size);

Write Preview
Loading…
Cancel
Save