|
|
|
@ -464,7 +464,7 @@ domain_info_window *yon_information_window_new(){
|
|
|
|
yon_gtk_widget_set_scroll_window_for_scroll(window->Window,GTK_SCROLLBAR(window->TerminalScroll));
|
|
|
|
yon_gtk_widget_set_scroll_window_for_scroll(window->Window,GTK_SCROLLBAR(window->TerminalScroll));
|
|
|
|
GdkRGBA rgba;
|
|
|
|
GdkRGBA rgba;
|
|
|
|
vte_terminal_get_color_background_for_draw(VTE_TERMINAL(window->ExecuteTerminal),&rgba);
|
|
|
|
vte_terminal_get_color_background_for_draw(VTE_TERMINAL(window->ExecuteTerminal),&rgba);
|
|
|
|
vte_terminal_set_color_cursor(VTE_TERMINAL(window->ExecuteTerminal),&rgba);
|
|
|
|
// vte_terminal_set_color_cursor(VTE_TERMINAL(window->ExecuteTerminal),&rgba);
|
|
|
|
yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,TITLE_LABEL,"com.ublinux.ubl-settings-system","InfoWindow");
|
|
|
|
yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,TITLE_LABEL,"com.ublinux.ubl-settings-system","InfoWindow");
|
|
|
|
|
|
|
|
|
|
|
|
return window;
|
|
|
|
return window;
|
|
|
|
@ -488,38 +488,24 @@ void on_domain_connect(GtkWidget *self, dictionary *dict){
|
|
|
|
client = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->ClientCombo));
|
|
|
|
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);
|
|
|
|
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_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));
|
|
|
|
yon_debug_output(domain_connect_command(adress,login,password,final));
|
|
|
|
int size_;
|
|
|
|
yon_debug_output(terminal_command_start(TITLE_LABEL,domain_connect_command(adress,login,password,final)));
|
|
|
|
yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_connect_command(adress,login,password,final),NULL,NULL);
|
|
|
|
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_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress);
|
|
|
|
gtk_widget_show(dialog->Window);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void on_status_clicked(GtkWidget *self, connection_window *window){
|
|
|
|
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));
|
|
|
|
char *target = (char*)gtk_entry_get_text(GTK_ENTRY(window->AdressEntry));
|
|
|
|
if (!yon_char_is_empty(target)){
|
|
|
|
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));
|
|
|
|
yon_debug_output(domain_info(target));
|
|
|
|
int size_;
|
|
|
|
yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_info(target)),"");
|
|
|
|
yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_info(target),NULL,NULL);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
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();
|
|
|
|
|
|
|
|
yon_ubl_status_box_spawn(GTK_CONTAINER(dialog->StatusBox),LOADING_LABEL,10,BACKGROUND_IMAGE_INFO_TYPE);
|
|
|
|
|
|
|
|
yon_debug_output(domains_seek_command);
|
|
|
|
yon_debug_output(domains_seek_command);
|
|
|
|
int size_;
|
|
|
|
yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domains_seek_command),"");
|
|
|
|
yon_terminal_integrated_start(dialog->ExecuteTerminal,domains_seek_command,NULL,NULL);
|
|
|
|
|
|
|
|
gtk_widget_show(dialog->Window);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -527,11 +513,8 @@ void on_main_window_domain_status_clicked(GtkWidget *self, GtkEntryIconPosition
|
|
|
|
if (icon_pos==GTK_ENTRY_ICON_SECONDARY){
|
|
|
|
if (icon_pos==GTK_ENTRY_ICON_SECONDARY){
|
|
|
|
char *target = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->DomainEntry));
|
|
|
|
char *target = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->DomainEntry));
|
|
|
|
if (!yon_char_is_empty(target)){
|
|
|
|
if (!yon_char_is_empty(target)){
|
|
|
|
domain_info_window *window = yon_information_window_new();
|
|
|
|
|
|
|
|
gtk_widget_show(window->Window);
|
|
|
|
|
|
|
|
yon_debug_output(get_domain_info_command);
|
|
|
|
yon_debug_output(get_domain_info_command);
|
|
|
|
int size_;
|
|
|
|
yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,get_domain_info_command),"");
|
|
|
|
yon_terminal_integrated_start(window->ExecuteTerminal,get_domain_info_command,NULL,NULL);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -551,7 +534,7 @@ gboolean on_main_window_domain_status_update(connection_window *window){
|
|
|
|
return 1;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
gboolean yon_update_thread(GtkWidget *self, GdkEventFocus *event, connection_window *window){
|
|
|
|
gboolean yon_update_thread(connection_window *window){
|
|
|
|
pthread_t thread_id;
|
|
|
|
pthread_t thread_id;
|
|
|
|
pthread_create(&thread_id, NULL, (void *)on_main_window_domain_status_update,window);
|
|
|
|
pthread_create(&thread_id, NULL, (void *)on_main_window_domain_status_update,window);
|
|
|
|
return 1;
|
|
|
|
return 1;
|
|
|
|
@ -578,10 +561,7 @@ connection_window *yon_connection_window_new(){
|
|
|
|
g_signal_connect(G_OBJECT(window->CancelButton),"clicked",G_CALLBACK(on_subwindow_close),NULL);
|
|
|
|
g_signal_connect(G_OBJECT(window->CancelButton),"clicked",G_CALLBACK(on_subwindow_close),NULL);
|
|
|
|
g_signal_connect(G_OBJECT(window->StatusEntry),"clicked",G_CALLBACK(on_status_clicked),window);
|
|
|
|
g_signal_connect(G_OBJECT(window->StatusEntry),"clicked",G_CALLBACK(on_status_clicked),window);
|
|
|
|
g_signal_connect(G_OBJECT(window->FindEntry),"clicked",G_CALLBACK(on_find_domains_clicked),window);
|
|
|
|
g_signal_connect(G_OBJECT(window->FindEntry),"clicked",G_CALLBACK(on_find_domains_clicked),window);
|
|
|
|
g_signal_connect(G_OBJECT(window->AdressEntry),"focus-out-event",G_CALLBACK(yon_update_thread),window);
|
|
|
|
window->timer_id = g_timeout_add(1000,(GSourceFunc)yon_update_thread,window);
|
|
|
|
if (!yon_char_is_empty((char*)gtk_entry_get_text(GTK_ENTRY(window->AdressEntry)))){
|
|
|
|
|
|
|
|
yon_update_thread(NULL,NULL,window);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return window;
|
|
|
|
return window;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -597,13 +577,10 @@ void on_domain_disconnect(GtkWidget *self, dictionary *dict){
|
|
|
|
yon_ubl_status_highlight_incorrect(window->AdressEntry);
|
|
|
|
yon_ubl_status_highlight_incorrect(window->AdressEntry);
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
int size;
|
|
|
|
|
|
|
|
domain_info_window *dialog = yon_information_window_new();
|
|
|
|
|
|
|
|
gtk_widget_show(dialog->Window);
|
|
|
|
|
|
|
|
yon_debug_output(domain_disconnect_command(adress,login,password));
|
|
|
|
yon_debug_output(domain_disconnect_command(adress,login,password));
|
|
|
|
int size_;
|
|
|
|
yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_disconnect_command(adress,login,password)),"");
|
|
|
|
yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_disconnect_command(adress,login,password),NULL,NULL);
|
|
|
|
|
|
|
|
gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress);
|
|
|
|
gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress);
|
|
|
|
|
|
|
|
on_subwindow_close(window->Window);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
domain_window *yon_domain_window_new(){
|
|
|
|
domain_window *yon_domain_window_new(){
|
|
|
|
@ -643,7 +620,6 @@ void on_domain_opened(GtkWidget *self, main_window *widgets){
|
|
|
|
yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets);
|
|
|
|
yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets);
|
|
|
|
yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window);
|
|
|
|
yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window);
|
|
|
|
g_signal_connect(G_OBJECT(window->SaveButton),"clicked",G_CALLBACK(on_domain_disconnect),dict);
|
|
|
|
g_signal_connect(G_OBJECT(window->SaveButton),"clicked",G_CALLBACK(on_domain_disconnect),dict);
|
|
|
|
g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_check_domain_connected),widgets);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gtk_widget_show(window->Window);
|
|
|
|
gtk_widget_show(window->Window);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
@ -770,7 +746,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_signal_connect(G_OBJECT(widgets->DomainEntry),"focus-out-event",G_CALLBACK(on_domain_address_save),NULL);
|
|
|
|
|
|
|
|
|
|
|
|
gtk_widget_set_size_request(widgets->Window,800,440);
|
|
|
|
gtk_widget_set_size_request(widgets->Window,800,440);
|
|
|
|
on_check_domain_connected(NULL,widgets);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// g_timeout_add(1000,(GSourceFunc)on_check_domain_connected,widgets);
|
|
|
|
// g_timeout_add(1000,(GSourceFunc)on_check_domain_connected,widgets);
|
|
|
|
|
|
|
|
|
|
|
|
|