From c5ebcbc846edc921dabe0c40a55e3a4a4515f372 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 5 Feb 2024 11:10:37 +0600 Subject: [PATCH] changed service parameters and sections --- source/ubl-settings-services.c | 52 +++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c index 957bedf..50a3d17 100644 --- a/source/ubl-settings-services.c +++ b/source/ubl-settings-services.c @@ -5,7 +5,7 @@ config main_config; //functions void yon_load_proceed(YON_CONFIG_TYPE type){ - if (yon_config_load_register(type,"config","SERVICESSTART SERVICESNOSTART SERVICESMASK",NULL)){ + if (yon_config_load_register(type,"system","SERVICES_ENABLE SERVICES_DISABLE SERVICES_MASK",NULL)){ } @@ -35,16 +35,16 @@ void on_config_global_load(GtkWidget *self,main_window *widgets){ } void on_config_global_local_save(){ - yon_save_proceed(NULL,YON_CONFIG_BOTH,"config","SERVICESSTART SERVICESNOSTART SERVICESMASK",NULL); + yon_save_proceed(NULL,YON_CONFIG_BOTH,"system","SERVICES_ENABLE SERVICES_DISABLE SERVICES_MASK",NULL); } void on_config_local_save(){ - yon_save_proceed("local",YON_CONFIG_LOCAL,"config","SERVICESSTART SERVICESNOSTART SERVICESMASK",NULL); + yon_save_proceed("local",YON_CONFIG_LOCAL,"system","SERVICES_ENABLE SERVICES_DISABLE SERVICES_MASK",NULL); } void on_config_global_save(){ - yon_save_proceed("global",YON_CONFIG_GLOBAL,"config","SERVICESSTART SERVICESNOSTART SERVICESMASK",NULL); + yon_save_proceed("global",YON_CONFIG_GLOBAL,"system","SERVICES_ENABLE SERVICES_DISABLE SERVICES_MASK",NULL); } @@ -114,22 +114,22 @@ void on_config_autostart_clicked(GtkWidget *self, main_window *widgets){ free(name); name=parsed_name; gtk_list_store_set(GTK_LIST_STORE(widgets->liststore2),&iter,0,!status,-1); - char *config_sting = yon_config_get_by_key("SERVICESSTART"); + char *config_sting = yon_config_get_by_key("SERVICES_ENABLE"); int size; config_str parsed = yon_char_parse(config_sting,&size,","); int place = yon_char_parsed_check_exist(parsed,size,name); if (status==0){ if (place ==-1){ - if (!yon_config_append("SERVICESSTART",name,",")){ - yon_config_register("SERVICESSTART","[config]",name); + if (!yon_config_append("SERVICES_ENABLE",name,",")){ + yon_config_register("SERVICES_ENABLE","[system]",name); } } } else { if (place !=-1){ parsed = yon_char_parsed_rip(parsed,&size,place); if (parsed) - yon_config_set("SERVICESSTART",yon_char_parsed_to_string(parsed,size,",")); - else yon_config_remove_by_key("SERVICESSTART"); + yon_config_set("SERVICES_ENABLE",yon_char_parsed_to_string(parsed,size,",")); + else yon_config_remove_by_key("SERVICES_ENABLE"); } } yon_char_parsed_free(parsed,size); @@ -148,22 +148,22 @@ void on_config_autostop_clicked(GtkWidget *self, main_window *widgets){ free(name); name=parsed_name; gtk_list_store_set(GTK_LIST_STORE(widgets->liststore2),&iter,1,!status,-1); - char *config_sting = yon_config_get_by_key("SERVICESNOSTART"); + char *config_sting = yon_config_get_by_key("SERVICES_DISABLE"); int size; config_str parsed = yon_char_parse(config_sting,&size,","); int place = yon_char_parsed_check_exist(parsed,size,name); if (status==0){ if (place ==-1){ - if (!yon_config_append("SERVICESNOSTART",name,",")){ - yon_config_register("SERVICESNOSTART","[config]",name); + if (!yon_config_append("SERVICES_DISABLE",name,",")){ + yon_config_register("SERVICES_DISABLE","[system]",name); } } } else { if (place !=-1){ parsed = yon_char_parsed_rip(parsed,&size,place); if (parsed) - yon_config_set("SERVICESNOSTART",yon_char_parsed_to_string(parsed,size,",")); - else yon_config_remove_by_key("SERVICESNOSTART"); + yon_config_set("SERVICES_DISABLE",yon_char_parsed_to_string(parsed,size,",")); + else yon_config_remove_by_key("SERVICES_DISABLE"); } } yon_char_parsed_free(parsed,size); @@ -183,22 +183,22 @@ void on_config_block_clicked(GtkWidget *self, main_window *widgets){ free(name); name=parsed_name; gtk_list_store_set(GTK_LIST_STORE(widgets->liststore2),&iter,2,!status,-1); - char *config_sting = yon_config_get_by_key("SERVICESMASK"); + char *config_sting = yon_config_get_by_key("SERVICES_MASK"); int size; config_str parsed = yon_char_parse(config_sting,&size,","); int place = yon_char_parsed_check_exist(parsed,size,name); if (status==0){ if (place ==-1){ - if (!yon_config_append("SERVICESMASK",name,",")){ - yon_config_register("SERVICESMASK","[config]",name); + if (!yon_config_append("SERVICES_MASK",name,",")){ + yon_config_register("SERVICES_MASK","[system]",name); } } } else { if (place !=-1){ parsed = yon_char_parsed_rip(parsed,&size,place); if (parsed) - yon_config_set("SERVICESMASK",yon_char_parsed_to_string(parsed,size,",")); - else yon_config_remove_by_key("SERVICESMASK"); + yon_config_set("SERVICES_MASK",yon_char_parsed_to_string(parsed,size,",")); + else yon_config_remove_by_key("SERVICES_MASK"); } } yon_char_parsed_free(parsed,size); @@ -419,9 +419,9 @@ void *yon_interface_update(main_window *widgets){ yon_char_parsed_divide_search_full(enabled_parsed,enabled_size,"\n",-1); char *launched = yon_char_parsed_to_string(launched_parsed,launched_size,","); char *enabled = yon_char_parsed_to_string(enabled_parsed,enabled_size,","); - char *start = yon_config_get_by_key("SERVICESSTART"); - char *stop = yon_config_get_by_key("SERVICESSROP"); - char *block = yon_config_get_by_key("SERVICESMASK"); + char *start = yon_config_get_by_key("SERVICES_ENABLE"); + char *stop = yon_config_get_by_key("SERVICES_DISABLE"); + char *block = yon_config_get_by_key("SERVICES_MASK"); if (!yon_char_is_empty(launched)&&launched[strlen(launched)-1]=='\n') launched[strlen(launched)-1]='\0'; if (!yon_char_is_empty(enabled)&&enabled[strlen(enabled)-1]=='\n') enabled[strlen(enabled)-1]='\0'; if (!yon_char_is_empty(start)&&start[strlen(start)-1]=='\n') start[strlen(start)-1]='\0'; @@ -474,7 +474,13 @@ void *yon_interface_update(main_window *widgets){ textdomain(LocaleName); gtk_tree_view_set_model(GTK_TREE_VIEW(widgets->MainTree),GTK_TREE_MODEL(widgets->liststore2)); g_thread_new("",(GThreadFunc)update_delay,NULL); - + int type_active=0; + if (!(type_active=gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->ServiceTypeCombo)))){ + gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ServiceTypeCombo),type_active); + } if (!(type_active=gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->ServiceTypeCombo)))){ + gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ServiceTypeCombo),type_active); + } + // gdk_threads_add_idle() return NULL; }