diff --git a/source/ubl-settings-usergroups-settings.c b/source/ubl-settings-usergroups-settings.c index f4991de..f402ce8 100644 --- a/source/ubl-settings-usergroups-settings.c +++ b/source/ubl-settings-usergroups-settings.c @@ -85,6 +85,7 @@ void on_additional_settings_changed(GtkWidget *self, ubl_settings_usergroups_add // if (window->user_boot>-1||window->user_boot>-1) // yon_config_register(USERADD_SYNC_parameter,USERADD_SYNC_parameter_command,sync); // } + on_useradd_sync_changed(window); } void on_additional_settings_user_sync_add(GtkWidget *self, ubl_settings_usergroups_additional_settings_window *window){ @@ -121,8 +122,8 @@ void on_additional_settings_changed(GtkWidget *self, ubl_settings_usergroups_add } } - void on_additional_settings_group_sync_add(GtkWidget *, ubl_settings_usergroups_additional_settings_window *window){ - on_useradd_sync_changed(window); + void on_additional_settings_group_sync_add(GtkWidget *, ubl_settings_usergroups_additional_settings_window *){ + // on_useradd_sync_changed(window); } void on_additional_settings_group_sync_remove(GtkWidget *, ubl_settings_usergroups_additional_settings_window *window){ @@ -135,7 +136,7 @@ void on_additional_settings_changed(GtkWidget *self, ubl_settings_usergroups_add gtk_list_store_remove(window->GroupsShutdownList,&iter); } } - on_useradd_sync_changed(window); + // on_useradd_sync_changed(window); } void on_additional_settings_cell_toggled(GtkCellRenderer *self, char *path, ubl_settings_usergroups_additional_settings_window *window){ @@ -163,7 +164,7 @@ void on_additional_settings_cell_toggled(GtkCellRenderer *self, char *path, ubl_ i++; } } - on_useradd_sync_changed(window); + // on_useradd_sync_changed(window); } void on_additional_settings_cell_edited(GtkCellRenderer *self, char *path, char *new_text, ubl_settings_usergroups_additional_settings_window *window){ @@ -202,7 +203,7 @@ GtkTreeIter iter; } } gtk_list_store_set(GTK_LIST_STORE(model),&iter,place_to_set,new_text,place_to_set==2?3:2,old_val,-1); - on_useradd_sync_changed(window); + // on_useradd_sync_changed(window); } void on_adiitional_settings_tree_selection_changed(GtkWidget *self, ubl_settings_usergroups_additional_settings_window *window){ @@ -235,16 +236,22 @@ void on_useradd_sync_changed(ubl_settings_usergroups_additional_settings_window if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->UsersBootCheck))){ useradd_sync = yon_char_new("boot"); } - if (gtk_switch_get_active(GTK_SWITCH(window->UsersShutdownSwitch))){ + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->UsersShutdownCheck))){ + char *temp = yon_char_unite(useradd_sync,!yon_char_is_empty(useradd_sync)?",":"","shutdown",NULL); + if(!yon_char_is_empty(useradd_sync)) free(useradd_sync); + useradd_sync = temp; + + } GtkTreeIter iter; for_iter(window->UsersShutdownList,&iter){ int active; - char *min_str, max_str; + char *min_str, *max_str; int sensitive; char *parameter; gtk_tree_model_get(GTK_TREE_MODEL(window->UsersShutdownList),&iter,0,&active,2,&min_str,3,&max_str,6,&sensitive,9,¶meter,-1); + if (active&&sensitive){ if (!strcmp(parameter,"shutdown@all")){ char *temp = yon_char_unite(useradd_sync,!yon_char_is_empty(useradd_sync)?",":"",parameter,NULL); @@ -273,7 +280,6 @@ void on_useradd_sync_changed(ubl_settings_usergroups_additional_settings_window } } } - } if (!yon_char_is_empty(useradd_sync)){ yon_config_register(USERADD_SYNC_parameter,USERADD_SYNC_get_command,useradd_sync); } else { @@ -284,15 +290,18 @@ void on_useradd_sync_changed(ubl_settings_usergroups_additional_settings_window if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->UsersBootCheck))){ groupadd_sync = yon_char_new("boot"); } - if (gtk_switch_get_active(GTK_SWITCH(window->UsersShutdownSwitch))){ - GtkTreeIter iter; - for_iter(window->UsersShutdownList,&iter){ + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->UsersShutdownCheck))){ + char *temp = yon_char_unite(groupadd_sync,!yon_char_is_empty(groupadd_sync)?",":"","shutdown",NULL); + if(!yon_char_is_empty(groupadd_sync)) free(groupadd_sync); + groupadd_sync = temp; + } + for_iter(window->GroupsShutdownList,&iter){ int active; - char *min_str, max_str; + char *min_str, *max_str; int sensitive; char *parameter; - gtk_tree_model_get(GTK_TREE_MODEL(window->UsersShutdownList),&iter,0,&active,2,&min_str,3,&max_str,6,&sensitive,9,¶meter,-1); + gtk_tree_model_get(GTK_TREE_MODEL(window->GroupsShutdownList),&iter,0,&active,2,&min_str,3,&max_str,6,&sensitive,9,¶meter,-1); if (active&&sensitive){ if (!strcmp(parameter,"shutdown@all")){ char *temp = yon_char_unite(groupadd_sync,!yon_char_is_empty(groupadd_sync)?",":"",parameter,NULL); @@ -321,12 +330,12 @@ void on_useradd_sync_changed(ubl_settings_usergroups_additional_settings_window } } } - } if (!yon_char_is_empty(useradd_sync)){ yon_config_register(GROUPADD_SYNC_parameter,GROUPADD_SYNC_parameter_command,groupadd_sync); } else { yon_config_remove_by_key(GROUPADD_SYNC_parameter); } + on_subwindow_close(window->Window); } ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_additional_settings_new(){ @@ -347,13 +356,15 @@ ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_ window->CancelButton=yon_gtk_builder_get_widget(builder,"CancelButton"); window->AcceptButton=yon_gtk_builder_get_widget(builder,"AcceptButton"); window->UsersBootCheck=yon_gtk_builder_get_widget(builder,"UsersBootCheck"); - window->UsersShutdownSwitch=yon_gtk_builder_get_widget(builder,"UsersShutdownSwitch"); + window->UsersShutdownCheck=yon_gtk_builder_get_widget(builder,"UsersShutdownCheck"); + window->UsersShutdownExpander=yon_gtk_builder_get_widget(builder,"UsersShutdownExpander"); window->UserShutdownRevealer=yon_gtk_builder_get_widget(builder,"UserShutdownRevealer"); window->UsersTree=yon_gtk_builder_get_widget(builder,"UsersTree"); window->UserAddButton=yon_gtk_builder_get_widget(builder,"UserAddButton"); window->UserRemoveButton=yon_gtk_builder_get_widget(builder,"UserRemoveButton"); window->GroupsBootCheck=yon_gtk_builder_get_widget(builder,"GroupsBootCheck"); - window->GroupsShutdownSwitch=yon_gtk_builder_get_widget(builder,"GroupsShutdownSwitch"); + window->GroupsShutdownCheck=yon_gtk_builder_get_widget(builder,"GroupsShutdownCheck"); + window->GroupsShutdownExpander=yon_gtk_builder_get_widget(builder,"GroupShutdownExpander"); window->GroupShutdownRevealer=yon_gtk_builder_get_widget(builder,"GroupShutdownRevealer"); window->GroupsTree=yon_gtk_builder_get_widget(builder,"GroupsTree"); window->GroupAddButton=yon_gtk_builder_get_widget(builder,"GroupAddButton"); @@ -367,6 +378,9 @@ ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_ window->GroupMinCell=GTK_CELL_RENDERER(gtk_builder_get_object(builder,"GroupMinCell")); window->GroupMaxCell=GTK_CELL_RENDERER(gtk_builder_get_object(builder,"GroupMaxCell")); + yon_gtk_revealer_set_from_expander(GTK_REVEALER(window->UserShutdownRevealer),GTK_EXPANDER(window->UsersShutdownExpander)); + yon_gtk_revealer_set_from_expander(GTK_REVEALER(window->GroupShutdownRevealer),GTK_EXPANDER(window->GroupsShutdownExpander)); + window->default_password=NULL; window->default_root_password=NULL; window->default_user_name=NULL; @@ -396,22 +410,26 @@ ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_ } int uid_set=0, maxmin_set=0; for (int i=0;iUsersShutdownExpander),1); + gtk_revealer_set_reveal_child(GTK_REVEALER(window->UserShutdownRevealer),1); if (!strcmp(parsed[i],"boot")){ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->UsersBootCheck),1); } else if (!strcmp(parsed[i],"shutdown@all")){ gtk_tree_model_get_iter_first(model,&iter); gtk_list_store_set(window->UsersShutdownList,&iter,0,1,-1); + gtk_expander_set_expanded(GTK_EXPANDER(window->UsersShutdownExpander),0); + gtk_revealer_set_reveal_child(GTK_REVEALER(window->UserShutdownRevealer),0); } else if (!strcmp(parsed[i],"shutdown@users")){ gtk_tree_model_get_iter_first(model,&iter); gtk_list_store_set(window->UsersShutdownList,&iter,0,0,5,0,6,0,-1); gtk_tree_model_get_iter_from_string(model,&iter,"1"); - gtk_list_store_set(window->UsersShutdownList,&iter,0,1,5,1,6,1,-1); + gtk_list_store_set(window->UsersShutdownList,&iter,0,1,5,1,6,1,7,1,8,1,-1); } else if (!strcmp(parsed[i],"shutdown@systems")){ gtk_tree_model_get_iter_first(model,&iter); gtk_list_store_set(window->UsersShutdownList,&iter,0,0,5,0,6,0,-1); gtk_tree_model_get_iter_from_string(model,&iter,"2"); - gtk_list_store_set(window->UsersShutdownList,&iter,0,1,5,1,6,1,-1); + gtk_list_store_set(window->UsersShutdownList,&iter,0,1,5,1,6,1,7,1,8,1,-1); } else if (strstr(parsed[i],"-")){ on_additional_settings_cell_toggled(window->UserActiveCell,"0",window); @@ -427,7 +445,7 @@ ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_ free(yon_char_divide_search(temp,"@",-1)); char *min = yon_char_divide_search(temp,"-",-1); - gtk_list_store_set(window->UsersShutdownList,&iter,0,1,2,min,3,temp,-1); + gtk_list_store_set(window->UsersShutdownList,&iter,0,1,2,min,3,temp,6,1,7,1,8,1,-1); } else if (strstr(parsed[i],"shutdown@")) { gtk_tree_model_get_iter_first(model,&iter); @@ -442,14 +460,14 @@ ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_ } char *temp = yon_char_new(parsed[i]); free(yon_char_divide_search(temp,"@",-1)); - gtk_list_store_set(window->UsersShutdownList,&iter,0,1,2,temp,-1); + gtk_list_store_set(window->UsersShutdownList,&iter,0,1,2,temp,6,1,7,1,8,1,-1); } else if (!strcmp(parsed[i],"shutdown")){ gtk_tree_model_get_iter_first(model,&iter); gtk_list_store_set(window->UsersShutdownList,&iter,0,0,-1); gtk_tree_model_get_iter_from_string(model,&iter,"1"); - gtk_list_store_set(window->UsersShutdownList,&iter,0,1,5,1,6,1,-1); + gtk_list_store_set(window->UsersShutdownList,&iter,0,1,5,1,6,1,7,1,8,1,-1); gtk_tree_model_get_iter_from_string(model,&iter,"2"); - gtk_list_store_set(window->UsersShutdownList,&iter,0,1,5,1,6,1,-1); + gtk_list_store_set(window->UsersShutdownList,&iter,0,1,5,1,6,1,7,1,8,1,-1); } } @@ -471,6 +489,8 @@ ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_ } } } + gtk_expander_set_expanded(GTK_EXPANDER(window->GroupsShutdownExpander),1); + gtk_revealer_set_reveal_child(GTK_REVEALER(window->GroupShutdownRevealer),1); int uid_set=0, maxmin_set=0; for (int i=0;iGroupsShutdownList,&iter,0,1,-1); + gtk_expander_set_expanded(GTK_EXPANDER(window->GroupsShutdownExpander),0); + gtk_revealer_set_reveal_child(GTK_REVEALER(window->GroupShutdownRevealer),0); } else if (!strcmp(parsed[i],"shutdown@users")){ gtk_tree_model_get_iter_first(model,&iter); gtk_list_store_set(window->GroupsShutdownList,&iter,0,0,-1); gtk_tree_model_get_iter_from_string(model,&iter,"1"); - gtk_list_store_set(window->UsersShutdownList,&iter,0,1,5,1,6,1,-1); + gtk_list_store_set(window->UsersShutdownList,&iter,0,1,5,1,6,1,7,1,8,1,-1); } else if (!strcmp(parsed[i],"shutdown@systems")){ gtk_tree_model_get_iter_first(model,&iter); gtk_list_store_set(window->GroupsShutdownList,&iter,0,0,-1); gtk_tree_model_get_iter_from_string(model,&iter,"2"); - gtk_list_store_set(window->UsersShutdownList,&iter,0,1,5,1,6,1,-1); + gtk_list_store_set(window->GroupsShutdownList,&iter,0,1,5,1,6,1,7,1,8,1,-1); - } else if (!strstr(parsed[i],"-")){ + } else if (strstr(parsed[i],"-")){ gtk_tree_model_get_iter_first(model,&iter); gtk_list_store_set(window->GroupsShutdownList,&iter,0,0,-1); if (!maxmin_set){ @@ -505,7 +527,7 @@ ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_ free(yon_char_divide_search(temp,"@",-1)); char *min = yon_char_divide_search(temp,"-",-1); - gtk_list_store_set(window->GroupsShutdownList,&iter,0,1,2,min,3,temp,-1); + gtk_list_store_set(window->GroupsShutdownList,&iter,0,1,2,min,3,temp,6,1,7,1,8,1,-1); } else if (strstr(parsed[i],"shutdown@")){ gtk_tree_model_get_iter_first(model,&iter); @@ -525,9 +547,9 @@ ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_ gtk_tree_model_get_iter_first(model,&iter); gtk_list_store_set(window->GroupsShutdownList,&iter,0,0,-1); gtk_tree_model_get_iter_from_string(model,&iter,"1"); - gtk_list_store_set(window->UsersShutdownList,&iter,0,1,-1); + gtk_list_store_set(window->UsersShutdownList,&iter,0,1,6,1,7,1,8,1,-1); gtk_tree_model_get_iter_from_string(model,&iter,"2"); - gtk_list_store_set(window->UsersShutdownList,&iter,0,1,-1); + gtk_list_store_set(window->UsersShutdownList,&iter,0,1,6,1,7,1,8,1,-1); } } @@ -545,23 +567,40 @@ ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_ g_signal_connect(G_OBJECT(window->GroupMinCell),"edited",G_CALLBACK(on_additional_settings_cell_edited),window); g_signal_connect(G_OBJECT(window->GroupMaxCell),"edited",G_CALLBACK(on_additional_settings_cell_edited),window); - g_signal_connect(G_OBJECT(window->UsersShutdownSwitch),"activate",G_CALLBACK(on_additional_settings_changed),window); - g_signal_connect(G_OBJECT(window->GroupsShutdownSwitch),"activate",G_CALLBACK(on_additional_settings_changed),window); + g_signal_connect(G_OBJECT(window->UsersShutdownExpander),"activate",G_CALLBACK(on_additional_settings_changed),window); + g_signal_connect(G_OBJECT(window->GroupsShutdownExpander),"activate",G_CALLBACK(on_additional_settings_changed),window); + + g_signal_connect(G_OBJECT(window->UsersShutdownCheck),"toggled",G_CALLBACK(on_additional_settings_changed),window); + g_signal_connect(G_OBJECT(window->GroupsShutdownCheck),"toggled",G_CALLBACK(on_additional_settings_changed),window); g_signal_connect(G_OBJECT(window->UsersTree),"cursor-changed",G_CALLBACK(on_adiitional_settings_tree_selection_changed),window); g_signal_connect(G_OBJECT(window->GroupsTree),"cursor-changed",G_CALLBACK(on_adiitional_settings_tree_selection_changed),window); - yon_gtk_revealer_set_from_switch(GTK_REVEALER(window->UserShutdownRevealer),GTK_SWITCH(window->UsersShutdownSwitch)); - yon_gtk_revealer_set_from_switch(GTK_REVEALER(window->GroupShutdownRevealer),GTK_SWITCH(window->GroupsShutdownSwitch)); - yon_window_config_custom_window_setup(GTK_WINDOW(window->Window),"AdditionalSettingsWindow"); gtk_window_set_title(GTK_WINDOW(window->Window),ADDITIONAL_SETTINGS_TITLE_LABEL); - char *sync_parameters = yon_config_get_by_key(USERADD_SYNC_parameter); - if (sync_parameters){ - if (strstr(sync_parameters,"boot")){ - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->UsersBootCheck),1); + { + char *sync_parameters = yon_config_get_by_key(USERADD_SYNC_parameter); + int size; + config_str parsed = yon_char_parse(sync_parameters,&size,","); + if (sync_parameters){ + if (strstr(sync_parameters,"boot")){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->UsersBootCheck),1); + } + if (yon_char_parsed_check_exist(parsed,size,"shutdown")!=-1){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->UsersShutdownCheck),1); + } } - if (strstr(sync_parameters,"shutdown")){ - gtk_switch_set_active(GTK_SWITCH(window->UsersShutdownSwitch),1); + } + { + char *sync_parameters = yon_config_get_by_key(GROUPADD_SYNC_parameter); + int size; + config_str parsed = yon_char_parse(sync_parameters,&size,","); + if (sync_parameters){ + if (strstr(sync_parameters,"boot")){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->GroupsBootCheck),1); + } + if (yon_char_parsed_check_exist(parsed,size,"shutdown")!=-1){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->GroupsShutdownCheck),1); + } } } int hash_size=0; @@ -627,32 +666,32 @@ ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_ gtk_combo_box_set_active_id(GTK_COMBO_BOX(window->PasswordHashCombo),hash); } - char *parameter = config(USERADD_SYNC_parameter); - { - int size; - config_str parsed = yon_char_parse(parameter,&size,","); - int sync_parameters_size; - config_str sync_parameters = yon_resource_open_file(sync_parameters_path,&sync_parameters_size); - for(int i=0;iUsersShutdownList,&iter); - gtk_list_store_set(window->UsersShutdownList,&iter,1,sync_parsed[0],2,cur[0],3,cur_size>1?cur[1]:"",-1); - }; - } - yon_char_parsed_free(sync_parsed,sync_parsed_size); - } + // char *parameter = config(USERADD_SYNC_parameter); + // { + // int size; + // config_str parsed = yon_char_parse(parameter,&size,","); + // int sync_parameters_size; + // config_str sync_parameters = yon_resource_open_file(sync_parameters_path,&sync_parameters_size); + // for(int i=0;iUsersShutdownList,&iter); + // gtk_list_store_set(window->UsersShutdownList,&iter,1,sync_parsed[0],2,cur[0],3,cur_size>1?cur[1]:"",-1); + // }; + // } + // yon_char_parsed_free(sync_parsed,sync_parsed_size); + // } - } + // } - } + // } g_signal_connect(G_OBJECT(window->CancelButton),"clicked",G_CALLBACK(on_subwindow_close),NULL); g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_additional_settings_save),window); @@ -689,11 +728,8 @@ return window; void on_ubl_settings_usergroups_additional_settings_open(GtkWidget *, main_window *widgets){ ubl_settings_usergroups_additional_settings_window *window = yon_ubl_settings_usergroups_additional_settings_new(); - g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_subwindow_close),NULL); gtk_window_set_transient_for(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window)); - g_signal_connect(G_OBJECT(window->UsersBootCheck),"toggled",G_CALLBACK(on_additional_settings_changed),window); - g_signal_connect(G_OBJECT(window->UsersShutdownSwitch),"activate",G_CALLBACK(on_additional_settings_changed),window); gtk_widget_show(window->Window); } diff --git a/source/ubl-settings-usergroups.h b/source/ubl-settings-usergroups.h index 812bd3d..1a7edfc 100644 --- a/source/ubl-settings-usergroups.h +++ b/source/ubl-settings-usergroups.h @@ -246,14 +246,16 @@ typedef struct{ GtkWidget *AcceptButton; GtkWidget *EncryptAllPasswordsButton; GtkWidget *UsersBootCheck; - GtkWidget *UsersShutdownSwitch; + GtkWidget *UsersShutdownCheck; + GtkWidget *UsersShutdownExpander; GtkWidget *UserShutdownRevealer; GtkWidget *UsersTree; GtkWidget *UserAddButton; GtkWidget *UserRemoveButton; GtkWidget *GroupsBootCheck; - GtkWidget *GroupsShutdownSwitch; + GtkWidget *GroupsShutdownCheck; + GtkWidget *GroupsShutdownExpander; GtkWidget *GroupShutdownRevealer; GtkWidget *GroupsTree; GtkWidget *GroupAddButton; diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 0e5b44d..6db4ae7 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -252,3 +252,19 @@ #define SHUTDOWN_UID_LABEL _("User UID in system") #define SHUTDOWN_GID_RANGE_LABEL _("Users GID range") #define SHUTDOWN_GID_LABEL _("User GID in system") + +#define SHUTDOWN_SAVE_USERS_LABEL _("While shutdown, save the settings of all users to configuration") +#define SHUTDOWN_SAVE_GROUPS_LABEL _("While shutdown, save the settings of all groups to the configuration") +#define SHUTDOWN_ALL_USERS_LABEL _("All groups in system") +#define SHUTDOWN_SYSTEM_GROUPS_USERS_LABEL _("System groups") +#define SHUTDOWN_GROUP_GID_RANGE_LABEL _("Group GID range") +#define SHUTDOWN_GID_IN_SYSTEM_LABEL _("Group GID in system") +#define SHUTDOWNALL_SYSTEM_USERS_LABEL _("All system users") +#define SHUTDOWN_SYSTEM_USERS_LABEL _("System users") +#define SHUTDOWN_UID_USERS_LABEL _("Users UID range") +#define SHUTDOWN_SYSTEM_ID_USERS_LABEL _("User UID in system") +#define SHUTDOWN_SYNC_TYPE_LABEL _("Syncronization type") +#define SHUTDOWN_MINIMUM_UID_LABEL _("Minimum UID") +#define SHUTDOWN_MAXIMUM_UID_LABEL _("Maximum UID") +#define SHUTDOWN_MINIMUM_GID_LABEL _("Minimum GID") +#define SHUTDOWN_MAXIMUM_GID_LABEL _("Maximum GID") diff --git a/ubl-settings-usergroups-additional-settings.glade b/ubl-settings-usergroups-additional-settings.glade index c962d1a..cf63c30 100644 --- a/ubl-settings-usergroups-additional-settings.glade +++ b/ubl-settings-usergroups-additional-settings.glade @@ -1,5 +1,5 @@ - + @@ -639,10 +639,12 @@ False 5 - - True - False + While shutdown, save the settings of all users to configuration + True + True + False + True False @@ -651,15 +653,21 @@ - + True True + + + + + + False True end - 1 + 2 @@ -864,28 +872,37 @@ True False + 5 - + True - False - While shutdown, save the settings of all groups to the configuration + True + + + + + + False True - 0 + end + 1 - + + While shutdown, save the settings of all groups to the configuration True True + False + True False True - end - 1 + 2 @@ -1130,4 +1147,8 @@ + + True + False + diff --git a/ubl-settings-usergroups.pot b/ubl-settings-usergroups.pot index dbd0619..f80ee21 100644 --- a/ubl-settings-usergroups.pot +++ b/ubl-settings-usergroups.pot @@ -139,7 +139,7 @@ msgid "" "status" msgstr "" -#: source/ubl-strings.h:36 +#: source/ubl-strings.h:36 source/ubl-strings.h:249 msgid "Users" msgstr "" @@ -159,7 +159,7 @@ msgid "" "users" msgstr "" -#: source/ubl-strings.h:40 +#: source/ubl-strings.h:40 source/ubl-strings.h:259 msgid "Groups" msgstr "" @@ -756,7 +756,7 @@ msgid "Do not encrypt password" msgstr "" #: source/ubl-strings.h:215 -msgid "Password contain restricted symbols" +msgid "Password contain special symbols" msgstr "" #: source/ubl-strings.h:218 @@ -813,11 +813,11 @@ msgstr "" msgid "Configuration groups" msgstr "" -#: source/ubl-strings.h:235 +#: source/ubl-strings.h:235 source/ubl-strings.h:250 source/ubl-strings.h:264 msgid "System users" msgstr "" -#: source/ubl-strings.h:236 +#: source/ubl-strings.h:236 source/ubl-strings.h:260 msgid "System groups" msgstr "" @@ -844,3 +844,63 @@ msgstr "" #: source/ubl-strings.h:245 msgid "Add to system" msgstr "" + +#: source/ubl-strings.h:248 source/ubl-strings.h:263 +msgid "All system users" +msgstr "" + +#: source/ubl-strings.h:251 source/ubl-strings.h:265 +msgid "Users UID range" +msgstr "" + +#: source/ubl-strings.h:252 source/ubl-strings.h:266 +msgid "User UID in system" +msgstr "" + +#: source/ubl-strings.h:253 +msgid "Users GID range" +msgstr "" + +#: source/ubl-strings.h:254 +msgid "User GID in system" +msgstr "" + +#: source/ubl-strings.h:256 +msgid "While shutdown, save the settings of all users to configuration" +msgstr "" + +#: source/ubl-strings.h:257 +msgid "While shutdown, save the settings of all groups to the configuration" +msgstr "" + +#: source/ubl-strings.h:258 +msgid "All groups in system" +msgstr "" + +#: source/ubl-strings.h:261 +msgid "Group GID range" +msgstr "" + +#: source/ubl-strings.h:262 +msgid "Group GID in system" +msgstr "" + +#: source/ubl-strings.h:267 +msgid "Syncronization type" +msgstr "" + +#: source/ubl-strings.h:268 +msgid "Minimum UID" +msgstr "" + +#: source/ubl-strings.h:269 +msgid "Maximum UID" +msgstr "" + +#: source/ubl-strings.h:270 +msgid "Minimum GID" +msgstr "" + +#: source/ubl-strings.h:271 +msgid "Maximum GID" +msgstr "" diff --git a/ubl-settings-usergroups_ru.po b/ubl-settings-usergroups_ru.po index fa2e510..d3fb4ec 100644 --- a/ubl-settings-usergroups_ru.po +++ b/ubl-settings-usergroups_ru.po @@ -149,7 +149,7 @@ msgstr "" "Статус\n" "пароля" -#: source/ubl-strings.h:36 +#: source/ubl-strings.h:36 source/ubl-strings.h:249 msgid "Users" msgstr "Пользователи" @@ -173,7 +173,7 @@ msgstr "" "Пользователи\n" "группы" -#: source/ubl-strings.h:40 +#: source/ubl-strings.h:40 source/ubl-strings.h:259 msgid "Groups" msgstr "Группы" @@ -417,8 +417,7 @@ msgid "" "While shutdown, save the settings of all groups with GID>=1000 to the " "configuration" msgstr "" -"При завершении работы сохранить настройки групп с GID>=1000 в " -"конфигурацию" +"При завершении работы сохранить настройки групп с GID>=1000 в конфигурацию" #: source/ubl-strings.h:112 msgid "Configure group" @@ -876,11 +875,11 @@ msgstr "Пользователи конфигурации" msgid "Configuration groups" msgstr "Группы конфигурации" -#: source/ubl-strings.h:235 +#: source/ubl-strings.h:235 source/ubl-strings.h:250 source/ubl-strings.h:264 msgid "System users" msgstr "Пользователи системы" -#: source/ubl-strings.h:236 +#: source/ubl-strings.h:236 source/ubl-strings.h:260 msgid "System groups" msgstr "Группы системы" @@ -909,3 +908,61 @@ msgstr "в конфигурацию?" #, fuzzy msgid "Add to system" msgstr "Добавить в новую:" + +#: source/ubl-strings.h:248 source/ubl-strings.h:263 +msgid "All system users" +msgstr "Все пользователи в системе" + +#: source/ubl-strings.h:251 source/ubl-strings.h:265 +msgid "Users UID range" +msgstr "Диапазон UID пользователей в системе" + +#: source/ubl-strings.h:253 +msgid "Users GID range" +msgstr "Диапазон UID пользователей в системе" + +#: source/ubl-strings.h:254 +msgid "User UID in system" +msgstr "Пользователь в системе с UID" + +#: source/ubl-strings.h:256 +msgid "While shutdown, save the settings of all users to configuration" +msgstr "" +"При завершении работы сохранить настройки пользователей" + +#: source/ubl-strings.h:257 +msgid "While shutdown, save the settings of all groups to the configuration" +msgstr "" +"При завершении работы сохранить настройки групп пользователей" + +#: source/ubl-strings.h:258 +msgid "All groups in system" +msgstr "Все группы в системе" + +#: source/ubl-strings.h:261 +msgid "Group GID range" +msgstr "Диапазон GID групп" + +#: source/ubl-strings.h:262 +msgid "Group GID in system" +msgstr "Группы в системе с GID" + +#: source/ubl-strings.h:267 +msgid "Syncronization type" +msgstr "Тип синхронизации с глобальной конфигурацией" + +#: source/ubl-strings.h:268 +msgid "Minimum UID" +msgstr "Минимальный UID" + +#: source/ubl-strings.h:269 +msgid "Maximum UID" +msgstr "Максимальный UID" + +#: source/ubl-strings.h:270 +msgid "Minimum GID" +msgstr "Минимальный GID" + +#: source/ubl-strings.h:271 +msgid "Maximum GID" +msgstr "Максимальный GID"