Merge pull request 'master' (#270) from YanTheKaller/ubl-settings-usergroups:master into master

Reviewed-on: #270

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 ""

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"
@@ -1056,6 +1056,10 @@ msgstr ""
 "Остальные методы входа разрешены (аутентификация на основе ключей, "
 "переключение на пользователя и т.д.)"
 
+#: source/ubl-strings.h:183
+msgid "User information"
+msgstr "Информация о пользователе"
+
 #~ msgid "User(-s)"
 #~ msgstr "Пользователь(-ли)"
 

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);
 
 }

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

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).")
+#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")

ubl-settings-usergroups.glade

@@ -308,7 +308,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             <child>
               <object class="GtkButton" id="EditButton">
                 <property name="visible">True</property>
-                <property name="sensitive">False</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">True</property>
                 <property name="tooltip-text" translatable="yes">Edit</property>
@@ -342,7 +341,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </child>
             <child>
               <object class="GtkButton" id="UserInfoButton">
-                <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">True</property>
                 <property name="tooltip-text" translatable="yes">User information</property>