From 8e1f12c2fe5a1517a3404f937773a92f3a9c5ee4 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 27 Dec 2024 09:07:16 +0600 Subject: [PATCH] Added boldness to some dialog window labels --- source/ubl-settings-usergroups.c | 34 ++++++++++++++++++-------------- source/ubl-strings.h | 8 ++++---- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index 0b677cb..2ff116e 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -2823,25 +2823,29 @@ void on_user_sync_with_config(GtkWidget *,main_window *widgets){ if (yon_confirmation_dialog_call(widgets->Window,&data)!=GTK_RESPONSE_ACCEPT){ return; } - int user_size; - int shadow_size; - config_str user = yon_config_load(yon_debug_output("%s\n",get_system_user_command(target)),&user_size); - if (user_size>0){ - yon_char_remove_last_symbol(user[0],'\n'); - free(yon_char_divide_search(user[0],"=",-1)); - yon_char_remove_brackets(user[0]); + + char *user = yon_char_parsed_check_exist_begins_with(main_config.groups,main_config.groups_size,target); + char *shadow = yon_char_parsed_check_exist_begins_with(main_config.group_shadow,main_config.group_shadow_size,target); + yon_char_remove_last_symbol(user,'\n'); + yon_char_remove_last_symbol(shadow,'\n'); + int user_size=0; + int shadow_size=0; + config_str parsed = yon_char_parse(user,&user_size,":"); + config_str parsed_shadow = yon_char_parse(shadow,&shadow_size,":"); + + char *optionals = yon_char_unite(user_size>5? parsed[5]:"",user_size>5?" ":"",user_size>6?parsed[6]:"",NULL); + char *config_user = yon_char_unite(parsed[0],":",parsed[4],":",parsed[2],":",parsed[3],":",optionals,":",strcmp(parsed[1],"x")?parsed[1]:parsed_shadow[1],NULL); + char *config_shadow = yon_char_unite(parsed[2],":",parsed[3],":",parsed[4],":",parsed[5],":",parsed[6],":",parsed[7],":",NULL); + + if (!yon_char_is_empty(config_user)){ char *user_command = yon_config_parameter_prepare_command(dull_parameter_get_command,NULL,"users",USERADD(target)); - yon_config_register(USERADD(target),user_command,user[0]); + yon_config_register(USERADD(target),user_command,config_user); } - config_str shadow = yon_config_load(yon_debug_output("%s\n",get_system_shadow_command(target)),&shadow_size); - if (shadow_size>0){ - yon_char_remove_last_symbol(shadow[0],'\n'); - free(yon_char_divide_search(shadow[0],"=",-1)); - yon_char_remove_brackets(shadow[0]); + if (!yon_char_is_empty(config_shadow)){ char *shadow_command = yon_config_parameter_prepare_command(dull_parameter_get_command,NULL,"users",USERSHADOW(target)); - yon_config_register(USERSHADOW(target),shadow_command,shadow[0]); - + yon_config_register(USERSHADOW(target),shadow_command,config_shadow); } + yon_interface_update(widgets); } yon_interface_update((main_window*)widgets); }break; diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 3f25dd8..2e81067 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -51,10 +51,10 @@ #define UPDATE_LABEL _("Update users and groups") #define SAVING_CONFIGURATION_LABEL _("Additional saving configuration") -#define SYSTEM_USER_ADD_CONFIRMATION_LABEL(target) yon_char_unite(_("This user doesn't exist in configuration. Are you sure want to add user")," ",target," ", _("to configuration?"),NULL) -#define SYSTEM_USER_SYNC_CONFIRMATION_LABEL(target) yon_char_unite(_("This user exists in configuration. Are you sure want to update user")," ",target," ", _("data at configuration?"),NULL) -#define SYSTEM_GROUP_SYNC_CONFIRMATION_LABEL(target) yon_char_unite(_("This group doesn't exist in configuration. Are you sure want to add group")," ",target," ", _("to configuration?"),NULL) -#define SYSTEM_GROUP_ADD_CONFIRMATION_LABEL(target) yon_char_unite(_("This group exists in configuration. Are you sure want to update group")," ",target," ", _("data at configuration?"),NULL) +#define SYSTEM_USER_ADD_CONFIRMATION_LABEL(target) yon_char_unite(_("This user doesn't exist in configuration. Are you sure want to add user")," ",target," ", _("to configuration?"),NULL) +#define SYSTEM_USER_SYNC_CONFIRMATION_LABEL(target) yon_char_unite(_("This user exists in configuration. Are you sure want to update user")," ",target," ", _("data at configuration?"),NULL) +#define SYSTEM_GROUP_SYNC_CONFIRMATION_LABEL(target) yon_char_unite(_("This group doesn't exist in configuration. Are you sure want to add group")," ",target," ", _("to configuration?"),NULL) +#define SYSTEM_GROUP_ADD_CONFIRMATION_LABEL(target) yon_char_unite(_("This group exists in configuration. Are you sure want to update group")," ",target," ", _("data at configuration?"),NULL) //ubl-settings-usergroups-additional-settings.glade