diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index e8deee5..43fdec0 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -2212,7 +2212,7 @@ void on_main_delete(GtkWidget *, main_window *widgets){ if (config(GROUPADD(target))){ system_remove_confirmation_window *window = yon_system_remove_confirmation_window_new(); yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),DELETE_CONFIRMATION_TITLE_LABEL,icon_path,"group-deletion-window"); - gtk_label_set_markup(GTK_LABEL(window->TitleLabel),SYSTEM_GROUP_SYSTEM_REMOVE_CONFIRMATION_LABEL(target)); + gtk_label_set_markup(GTK_LABEL(window->TitleLabel),SYSTEM_GROUP_CONFIG_REMOVE_CONFIRMATION_LABEL(target)); dictionary *dict = NULL; yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets); yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); @@ -2485,13 +2485,13 @@ main_window *yon_main_window_complete(main_window *widgets){ yon_window_config_add_listener((GtkWidget*)g_list_nth_data(list,i),yon_char_append("GroupColumn",yon_char_from_int(i)),"fixed-width",YON_TYPE_INT); } g_list_free(list); - yon_window_config_load(config_path); yon_gtk_tree_view_set_fixed_size(GTK_TREE_VIEW(widgets->UsersTree),1,2,3,-1); yon_gtk_tree_view_set_fixed_size(GTK_TREE_VIEW(widgets->GroupsTree),1,2,-1); yon_gtk_tree_view_set_fixed_size(GTK_TREE_VIEW(widgets->SystemTree),1,2,3,-1); yon_gtk_tree_view_set_fixed_size(GTK_TREE_VIEW(widgets->SystemGroupsTree),1,2,-1); + yon_window_config_load(config_path); yon_save_window_set_postsave_function(on_save_done,widgets); yon_save_window_set_postsave_failure_function(on_save_failed,widgets); diff --git a/source/ubl-strings.h b/source/ubl-strings.h index b862035..0bc7e12 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -229,4 +229,7 @@ #define SYSTEM_USERS_TAB_LABEL _("System users") #define SYSTEM_GROUPS_TAB_LABEL _("System groups") #define SYSTEM_REMOVE_FROM_CONFIG_LABEL _("Remove from system") -#define SYSTEM_REMOVE_FROM_SYSTEM_LABEL _("Remove from configuration") \ No newline at end of file +#define SYSTEM_REMOVE_FROM_SYSTEM_LABEL _("Remove from configuration") + +#define GROUP_REMOVE_ERROR _("Group deletion has failed") +#define USER_REMOVE_ERROR _("User deletion has failed") \ No newline at end of file