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

Test fix for freeze #35

Merged
asmeron merged 3 commits from YanTheKaller/ubl-settings-system:master into master 2 years ago
Conversation 0 Commits 3 Files Changed 2
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File

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

@ -43,7 +43,7 @@ void yon_config_local_load(GtkWidget *self, main_window *widgets){
gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),DEFAULT_LABEL); gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),DEFAULT_LABEL);
int size; int size;
GtkTreeIter iter; GtkTreeIter iter;
config_str rtn = yon_config_load(get_id_command,&size); config_str rtn = yon_file_open(get_id_command,&size);
rtn[0]=yon_char_divide_search(rtn[0],"\n",-1); rtn[0]=yon_char_divide_search(rtn[0],"\n",-1);
gtk_entry_set_text(GTK_ENTRY(widgets->IDEntry),*rtn); gtk_entry_set_text(GTK_ENTRY(widgets->IDEntry),*rtn);
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ConsoleFontCombo),0); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ConsoleFontCombo),0);
@ -117,7 +117,7 @@ void yon_config_global_load(GtkWidget *self, main_window *widgets){
gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),DEFAULT_LABEL); gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),DEFAULT_LABEL);
int size; int size;
GtkTreeIter iter; GtkTreeIter iter;
config_str rtn = yon_config_load(get_id_command,&size); config_str rtn = yon_file_open(get_id_command,&size);
rtn[0]=yon_char_divide_search(rtn[0],"\n",-1); rtn[0]=yon_char_divide_search(rtn[0],"\n",-1);
gtk_entry_set_text(GTK_ENTRY(widgets->IDEntry),*rtn); gtk_entry_set_text(GTK_ENTRY(widgets->IDEntry),*rtn);
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ConsoleFontCombo),0); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ConsoleFontCombo),0);
@ -203,7 +203,7 @@ void yon_config_custom_load(GtkWidget *self, main_window *widgets){
gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),DEFAULT_LABEL); gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),DEFAULT_LABEL);
int size; int size;
GtkTreeIter iter; GtkTreeIter iter;
config_str rtn = yon_config_load(get_id_command,&size); config_str rtn = yon_file_open(get_id_command,&size);
rtn[0]=yon_char_divide_search(rtn[0],"\n",-1); rtn[0]=yon_char_divide_search(rtn[0],"\n",-1);
gtk_entry_set_text(GTK_ENTRY(widgets->IDEntry),*rtn); gtk_entry_set_text(GTK_ENTRY(widgets->IDEntry),*rtn);
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ConsoleFontCombo),0); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ConsoleFontCombo),0);
@ -497,10 +497,12 @@ void on_domain_connect(GtkWidget *self, dictionary *dict){
yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_connect_command(adress,login,password,final),NULL,NULL); yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_connect_command(adress,login,password,final),NULL,NULL);
if (main_config.debug_mode){ if (main_config.debug_mode){
printf("%s\n",domain_connect_command(adress,login,password,final)); printf("%s\n",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"));
} }
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);
on_subwindow_close(window->Window);
} }
void on_status_clicked(GtkWidget *self, connection_window *window){ void on_status_clicked(GtkWidget *self, connection_window *window){
@ -510,6 +512,9 @@ void on_status_clicked(GtkWidget *self, connection_window *window){
yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_info(target),NULL,NULL); yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_info(target),NULL,NULL);
if (main_config.debug_mode){ if (main_config.debug_mode){
printf("%s\n",domain_info(target)); printf("%s\n",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"));
} }
} }
gtk_widget_show(dialog->Window); gtk_widget_show(dialog->Window);
@ -520,6 +525,9 @@ void on_find_domains_clicked(GtkWidget *self, connection_window *window){
yon_terminal_integrated_start(dialog->ExecuteTerminal,domains_seek_command,NULL,NULL); yon_terminal_integrated_start(dialog->ExecuteTerminal,domains_seek_command,NULL,NULL);
if (main_config.debug_mode){ if (main_config.debug_mode){
printf("%s\n",domains_seek_command); printf("%s\n",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"));
} }
gtk_widget_show(dialog->Window); gtk_widget_show(dialog->Window);
} }
@ -534,6 +542,9 @@ void on_main_window_domain_status_clicked(GtkWidget *self, GtkEntryIconPosition
yon_terminal_integrated_start(window->ExecuteTerminal,get_domain_info_command,NULL,NULL); yon_terminal_integrated_start(window->ExecuteTerminal,get_domain_info_command,NULL,NULL);
if (main_config.debug_mode){ if (main_config.debug_mode){
printf("%s\n",get_domain_info_command); printf("%s\n",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"));
} }
} }
} }
@ -581,7 +592,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);
window->timer_id = g_timeout_add(1000,(GSourceFunc)on_main_window_domain_status_update,window); window->timer_id = g_timeout_add(1000,(GSourceFunc)yon_update_thread,window);
return window; return window;
} }
@ -604,6 +615,9 @@ void on_domain_disconnect(GtkWidget *self, dictionary *dict){
yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_disconnect_command(adress,login,password),NULL,NULL); yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_disconnect_command(adress,login,password),NULL,NULL);
if (main_config.debug_mode){ if (main_config.debug_mode){
printf("%s\n",domain_disconnect_command(adress,login,password)); printf("%s\n",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"));
} }
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);
@ -773,7 +787,7 @@ main_window *yon_main_window_complete(main_window *widgets){
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_config_load(get_locales_command,&size); config_str locales = yon_file_open(get_locales_command,&size);
GtkTreeIter iter; GtkTreeIter iter;
for (int i=0;i<size;i++){ for (int i=0;i<size;i++){
int locsize; int locsize;
@ -782,7 +796,7 @@ main_window *yon_main_window_complete(main_window *widgets){
gtk_list_store_append(widgets->languagelist,&iter); gtk_list_store_append(widgets->languagelist,&iter);
gtk_list_store_set(widgets->languagelist,&iter,0,_(loc_parsed[1]),1,loc_parsed[0],2,0,-1); gtk_list_store_set(widgets->languagelist,&iter,0,_(loc_parsed[1]),1,loc_parsed[0],2,0,-1);
} }
config_str fonts = yon_config_load(get_fonts_command,&size); config_str fonts = yon_file_open(get_fonts_command,&size);
for (int i=0;i<size;i++){ for (int i=0;i<size;i++){
fonts[i]=yon_char_divide_search(fonts[i],"\n",-1); fonts[i]=yon_char_divide_search(fonts[i],"\n",-1);
gtk_list_store_append(widgets->fontlist,&iter); gtk_list_store_append(widgets->fontlist,&iter);

7
source/ubl-settings-system.h
Unescape View File

@ -36,10 +36,9 @@
#define config_global_load_command "ubconfig --source global get " #define config_global_load_command "ubconfig --source global get "
#define config_local_load_command "ubconfig --source system get " #define config_local_load_command "ubconfig --source system get "
#define get_locales_command "grep '' /usr/share/ubl-settings-system/csv/locales.csv" #define get_locales_command "/usr/share/ubl-settings-system/csv/locales.csv"
#define get_fonts_command "grep '' /usr/share/ubl-settings-system/csv/fonts.csv" #define get_fonts_command "/usr/share/ubl-settings-system/csv/fonts.csv"
#define get_id_command "grep '' /etc/machine-id" #define get_id_command "/etc/machine-id"
// #define get_fonts_command "ls /usr/share/kbd/consolefonts/ |grep -v \"README\"|grep -oE \"^[-a-zA-Z0-9_]{3,}.psf\"|sed -e 's/\\.psf//g'"
#define config_get_command(source) yon_char_unite("ubconfig --source ", source, " get system HOSTNAME MACHINEID",NULL), yon_char_unite("ubconfig --source ", source, " get locale CONSOLE_FONT LOCALE LANG",NULL), yon_char_unite("ubconfig --source ", source, " get [network] DOMAIN DOMAIN[admanger] DOMAIN[server] DOMAIN[dns] DOMAIN[client]",NULL) #define config_get_command(source) yon_char_unite("ubconfig --source ", source, " get system HOSTNAME MACHINEID",NULL), yon_char_unite("ubconfig --source ", source, " get locale CONSOLE_FONT LOCALE LANG",NULL), yon_char_unite("ubconfig --source ", source, " get [network] DOMAIN DOMAIN[admanger] DOMAIN[server] DOMAIN[dns] DOMAIN[client]",NULL)
#define config_get_default_command "" #define config_get_default_command ""

Write Preview
Loading…
Cancel
Save