From 9cf126db389ce5e4a8016b4bf924cbd79cc9ea8a Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 27 Aug 2025 11:09:55 +0600 Subject: [PATCH 1/4] Localisation fix --- locale/ubl-settings-usergroups_ru.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/ubl-settings-usergroups_ru.po b/locale/ubl-settings-usergroups_ru.po index 8d5947f..5584e9b 100644 --- a/locale/ubl-settings-usergroups_ru.po +++ b/locale/ubl-settings-usergroups_ru.po @@ -901,7 +901,7 @@ msgstr "Системные пользователи" #: source/ubl-strings.h:239 source/ubl-strings.h:262 msgid "System groups" -msgstr "Системные Группы" +msgstr "Системные группы" #: source/ubl-strings.h:240 source/ubl-strings.h:249 msgid "Remove from system" From 588c904166196c3abfb5c0fd9bf74620fde8210f Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 27 Aug 2025 11:35:09 +0600 Subject: [PATCH 2/4] Removed tree row unselecting --- source/ubl-settings-usergroups.c | 15 ++++++++++++++- source/ubl-settings-usergroups.h | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index 5483012..b2ecc3b 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -80,7 +80,15 @@ int yon_load_proceed(YON_CONFIG_TYPE type){ } return 1; } - + +void yon_gtk_tree_view_select_first(GtkTreeView *target){ + GtkTreeIter iter; + GtkTreeModel *model = gtk_tree_view_get_model(target); + if (gtk_tree_model_get_iter_first(model,&iter)){ + gtk_tree_selection_select_iter(gtk_tree_view_get_selection(target),&iter); + } +} + void yon_interface_update(main_window *widgets){ on_system_update(NULL,widgets); int size; @@ -236,6 +244,10 @@ void yon_interface_update(main_window *widgets){ gtk_tree_model_filter_refilter(GTK_TREE_MODEL_FILTER(widgets->ConfigGroupsFilter)); gtk_tree_model_filter_refilter(GTK_TREE_MODEL_FILTER(widgets->SystemUsersFilter)); gtk_tree_model_filter_refilter(GTK_TREE_MODEL_FILTER(widgets->SystemGroupsFilter)); + yon_gtk_tree_view_select_first(GTK_TREE_VIEW(widgets->UsersTree)); + yon_gtk_tree_view_select_first(GTK_TREE_VIEW(widgets->GroupsTree)); + yon_gtk_tree_view_select_first(GTK_TREE_VIEW(widgets->SystemTree)); + yon_gtk_tree_view_select_first(GTK_TREE_VIEW(widgets->SystemGroupsTree)); } @@ -1953,6 +1965,7 @@ void on_config_update(GtkWidget *, main_window *widgets){ } else { on_config_local_load(NULL,widgets); } + // on_system_update(NULL,widgets); } diff --git a/source/ubl-settings-usergroups.h b/source/ubl-settings-usergroups.h index afc4406..f743ddc 100644 --- a/source/ubl-settings-usergroups.h +++ b/source/ubl-settings-usergroups.h @@ -618,4 +618,5 @@ yon_user_info_window *yon_user_info_window_new(); void on_user_info_save(GtkWidget *,yon_user_info_window *window); void on_user_info_print(GtkWidget *,yon_user_info_window *window); void yon_shutdown_toggled(GtkWidget *self,ubl_settings_usergroups_additional_settings_window *window); +void yon_gtk_tree_view_select_first(GtkTreeView *target); #endif \ No newline at end of file From e68ebc5d175dc850e3c61a5e0fdd03793dca75a5 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 27 Aug 2025 11:54:25 +0600 Subject: [PATCH 3/4] Localisation update --- locale/ubl-settings-usergroups.pot | 4 ++++ locale/ubl-settings-usergroups_ru.po | 4 ++++ source/ubl-strings.h | 3 ++- ubl-settings-usergroups.glade | 1 - 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/locale/ubl-settings-usergroups.pot b/locale/ubl-settings-usergroups.pot index 071a401..856d760 100644 --- a/locale/ubl-settings-usergroups.pot +++ b/locale/ubl-settings-usergroups.pot @@ -981,3 +981,7 @@ msgid "" "User auth with password is blocked for user.\n" "Other access methods are allowed (key auth, user switching etc)." msgstr "" + +#: source/ubl-strings.h:183 +msgid "User information" +msgstr "" \ No newline at end of file diff --git a/locale/ubl-settings-usergroups_ru.po b/locale/ubl-settings-usergroups_ru.po index 5584e9b..ddfab9a 100644 --- a/locale/ubl-settings-usergroups_ru.po +++ b/locale/ubl-settings-usergroups_ru.po @@ -1056,6 +1056,10 @@ msgstr "" "Остальные методы входа разрешены (аутентификация на основе ключей, " "переключение на пользователя и т.д.)" +#: source/ubl-strings.h:183 +msgid "User information" +msgstr "Информация о пользователе" + #~ msgid "User(-s)" #~ msgstr "Пользователь(-ли)" diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 5926e3f..61da712 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -288,4 +288,5 @@ #define AUTH_ALLOWED_LABEL _("User auth with password is allowed") #define AUTH_FORBIDDEN_LABEL _("User auth is forbidden") -#define AUTH_PASSWORD_LOCKED_LABEL _("User auth with password is blocked for user.\nOther access methods are allowed (key auth, user switching etc).") \ No newline at end of file +#define AUTH_PASSWORD_LOCKED_LABEL _("User auth with password is blocked for user.\nOther access methods are allowed (key auth, user switching etc).") +#define USER_INFORMATION_TOOLTIP_LABEL _("User information") \ No newline at end of file diff --git a/ubl-settings-usergroups.glade b/ubl-settings-usergroups.glade index 3af9b16..c67fe24 100644 --- a/ubl-settings-usergroups.glade +++ b/ubl-settings-usergroups.glade @@ -342,7 +342,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - True True True User information From b90f19762a5c3b5e6b75ecdc86d9544987cf1ac5 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 27 Aug 2025 16:56:22 +0600 Subject: [PATCH 4/4] Fixed sensitivity --- ubl-settings-usergroups.glade | 1 - 1 file changed, 1 deletion(-) diff --git a/ubl-settings-usergroups.glade b/ubl-settings-usergroups.glade index c67fe24..73937c1 100644 --- a/ubl-settings-usergroups.glade +++ b/ubl-settings-usergroups.glade @@ -308,7 +308,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True - False True True Edit