diff --git a/libublsettingsui-gtk3-users-window.glade b/libublsettingsui-gtk3-users-window.glade index 8698736..d3580fd 100644 --- a/libublsettingsui-gtk3-users-window.glade +++ b/libublsettingsui-gtk3-users-window.glade @@ -1,7 +1,8 @@ - + + True False diff --git a/libublsettingsui-gtk3.pot b/libublsettingsui-gtk3.pot index f2a9619..5551ef1 100644 --- a/libublsettingsui-gtk3.pot +++ b/libublsettingsui-gtk3.pot @@ -455,3 +455,35 @@ msgstr "" #: source/libublsettingsui-gtk3.h:728 msgid "The password does not meet the password policy requirements" msgstr "" + +#: source/libublsettingsui-gtk3.h:728 +msgid "Choose groups" +msgstr "" + +#: source/libublsettingsui-gtk3.h:728 +msgid "Choose group" +msgstr "" + +#: source/libublsettingsui-gtk3.h:728 +msgid "Choose users" +msgstr "" + +#: source/libublsettingsui-gtk3.h:728 +msgid "Choose user" +msgstr "" + +#: source/libublsettingsui-gtk3.h:728 +msgid "Chosen" +msgstr "" + +#: source/libublsettingsui-gtk3.h:728 +msgid "ID" +msgstr "" + +#: source/libublsettingsui-gtk3.h:728 +msgid "Group" +msgstr "" + +#: source/libublsettingsui-gtk3.h:728 +msgid "User" +msgstr "" diff --git a/libublsettingsui-gtk3_ru.po b/libublsettingsui-gtk3_ru.po index 33f6468..0290bd7 100644 --- a/libublsettingsui-gtk3_ru.po +++ b/libublsettingsui-gtk3_ru.po @@ -464,3 +464,35 @@ msgstr "ММ-ДД-ГГГГ" #: source/libublsettingsui-gtk3.h:728 msgid "The password does not meet the password policy requirements" msgstr "Пароль не соответствует требованиям политики паролей" + +#: source/libublsettingsui-gtk3.h:728 +msgid "Choose groups" +msgstr "Выбор групп" + +#: source/libublsettingsui-gtk3.h:728 +msgid "Choose group" +msgstr "Выбор группы" + +#: source/libublsettingsui-gtk3.h:728 +msgid "Choose users" +msgstr "Выбор пользователей" + +#: source/libublsettingsui-gtk3.h:728 +msgid "Choose user" +msgstr "Выбор пользователя" + +#: source/libublsettingsui-gtk3.h:728 +msgid "Chosen" +msgstr "Выбрано" + +#: source/libublsettingsui-gtk3.h:728 +msgid "ID" +msgstr "ID" + +#: source/libublsettingsui-gtk3.h:728 +msgid "Group" +msgstr "Группа" + +#: source/libublsettingsui-gtk3.h:728 +msgid "User" +msgstr "Пользователь" diff --git a/source/libublsettingsui-gtk3-users-window.c b/source/libublsettingsui-gtk3-users-window.c index 134537c..fe80e04 100644 --- a/source/libublsettingsui-gtk3-users-window.c +++ b/source/libublsettingsui-gtk3-users-window.c @@ -73,18 +73,20 @@ yon_user_window *yon_user_window_new(enum YON_USER_WINDOW_MODE_TYPE mode){ window->list = gtk_list_store_new(3,G_TYPE_BOOLEAN,G_TYPE_STRING,G_TYPE_INT); gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(window->list),2,GTK_SORT_ASCENDING); - yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,NULL,NULL,"GroupWindow"); - g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_user_window_closed),window); 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_users_window_accept),window); g_signal_connect(G_OBJECT(window->StatusCell),"toggled",G_CALLBACK(on_group_clicked),window); GtkTreeIter iter; + int multiple = 0; switch (mode){ case YON_USER_WINDOW_USERS_MULTIPLE: gtk_cell_renderer_toggle_set_radio(GTK_CELL_RENDERER_TOGGLE(window->StatusCell),0); + multiple = 1; [[fallthrough]]; case YON_USER_WINDOW_USERS:{ + yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,!multiple?_CHOOSE_USER_LABEL:_CHOOSE_USERS_LABEL,yon_dull_icon_path,"GroupWindow"); + gtk_tree_view_column_set_title(gtk_tree_view_get_column(GTK_TREE_VIEW(window->UsersTree),2),_USER_LABEL); int size; config_str system_param = yon_file_open("/etc/passwd",&size); for (int i=0;iStatusCell),0); + multiple = 1; [[fallthrough]]; case YON_USER_WINDOW_GROUPS:{ + yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,!multiple?_CHOOSE_GROUP_LABEL:_CHOOSE_GROUPS_LABEL, yon_dull_icon_path,"GroupWindow"); + gtk_tree_view_column_set_title(gtk_tree_view_get_column(GTK_TREE_VIEW(window->UsersTree),2),_GROUP_LABEL); int size; config_str system_param = yon_file_open("/etc/group",&size); for (int i=0;i