diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index b8dcd86..021f9cf 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -628,6 +628,8 @@ yon_confirmation_window *yon_delete_confirmation_new(){ window->DeletionTree = yon_gtk_builder_get_widget(builder,"DeletionTree"); window->DeleteCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"DeleteCell")); window->DeleteHomeCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"DeleteHomeCell")); + window->UserCell = GTK_TREE_VIEW_COLUMN(gtk_builder_get_object(builder,"UserCell")); + window->TitleLabel = yon_gtk_builder_get_widget(builder,"TitleLabel"); window->list = GTK_LIST_STORE(gtk_builder_get_object(builder,"liststore1")); gtk_window_set_title(GTK_WINDOW(window->Window),DELETE_CONFIRMATION_TITLE_LABEL); g_signal_connect(G_OBJECT(window->CancelButton),"clicked",G_CALLBACK(on_subwindow_close),NULL); @@ -685,6 +687,8 @@ void yon_group_delete_confirmation_open(main_window *widgets){ gtk_window_set_transient_for(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window)); GtkTreeIter iter,itar; dictionary *dict = NULL; + gtk_label_set_text(GTK_LABEL(window->TitleLabel),DELETE_GROUP_CONFIRMATION_CONFIRM_LABEL); + gtk_tree_view_column_set_title(window->UserCell,GROUP_LABEL); gtk_tree_view_column_set_visible(gtk_tree_view_get_column(GTK_TREE_VIEW(window->DeletionTree),2),0); gtk_tree_view_column_set_visible(gtk_tree_view_get_column(GTK_TREE_VIEW(window->DeletionTree),3),0); gtk_tree_view_column_set_visible(gtk_tree_view_get_column(GTK_TREE_VIEW(window->DeletionTree),4),0); diff --git a/source/ubl-settings-usergroups.h b/source/ubl-settings-usergroups.h index 42b166f..191a419 100644 --- a/source/ubl-settings-usergroups.h +++ b/source/ubl-settings-usergroups.h @@ -315,9 +315,11 @@ typedef struct{ GtkWidget *CancelButton; GtkWidget *AcceptButton; GtkWidget *DeletionTree; + GtkWidget *TitleLabel; GtkListStore *list; GtkCellRenderer *DeleteCell; GtkCellRenderer *DeleteHomeCell; + GtkTreeViewColumn *UserCell; } yon_confirmation_window; ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_additional_settings_new(); diff --git a/source/ubl-strings.h b/source/ubl-strings.h index e65f06f..b9eeb41 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -51,7 +51,6 @@ #define UPDATE_LABEL _("Update users and groups") #define SAVING_CONFIGURATION_LABEL _("Additional saving configuration") -#define DELETE_CONFIRMATION_LABEL(type,target) yon_char_unite(_(yon_char_append("Are you sure want to delete ",type)), " '",target,"'?",NULL) //ubl-settings-usergroups-additional-settings.glade #define ADDITIONAL_SETTINGS_TITLE_LABEL _("Additional settings") diff --git a/ubl-settings-usergroups-confirmation.glade b/ubl-settings-usergroups-confirmation.glade index 8e05972..a28ec6b 100644 --- a/ubl-settings-usergroups-confirmation.glade +++ b/ubl-settings-usergroups-confirmation.glade @@ -86,7 +86,7 @@ - + True False Confirm user(-s) deletion: @@ -130,7 +130,7 @@ - + User diff --git a/ubl-settings-usergroups_ru.po b/ubl-settings-usergroups_ru.po index e8e1910..07a3222 100644 --- a/ubl-settings-usergroups_ru.po +++ b/ubl-settings-usergroups_ru.po @@ -742,9 +742,3 @@ msgstr "Домашний каталог" #: source/ubl-strings.h:207 msgid "Delete home directory" msgstr "Удалить домашний каталог" - -msgid "Are you sure want to delete group" -msgstr "Вы уверены, что хотите удалить группу" - -msgid "Are you sure want to delete user" -msgstr "Вы уверены, что хотите удалить пользователя"