diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c index afb0955..ad81c4f 100644 --- a/source/ubl-settings-services.c +++ b/source/ubl-settings-services.c @@ -1227,11 +1227,17 @@ void on_tree_selection_changed(GtkWidget *self, main_window *widgets){ model = GTK_TREE_MODEL(widgets->SystemList); Tree = widgets->SystemUnitsTree; if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(Tree)),&model,&iter)){ + char *name, *descr; + gtk_tree_model_get(model,&iter,5,&name,6,&descr,-1); + gtk_label_set_text(GTK_LABEL(widgets->SystemServiceLabel),name); + gtk_label_set_text(GTK_LABEL(widgets->SystemDescriptionLabel),descr); gtk_widget_set_sensitive(widgets->SystemEditButton,1); gtk_widget_set_sensitive(widgets->SystemLogButton,1); gtk_widget_set_sensitive(widgets->SystemStatusButton,1); gtk_widget_set_sensitive(widgets->SystemInfoButton,1); } else { + gtk_label_set_text(GTK_LABEL(widgets->SystemServiceLabel),""); + gtk_label_set_text(GTK_LABEL(widgets->SystemDescriptionLabel),""); gtk_widget_set_sensitive(widgets->SystemEditButton,0); gtk_widget_set_sensitive(widgets->SystemLogButton,0); gtk_widget_set_sensitive(widgets->SystemStatusButton,0); @@ -1241,11 +1247,17 @@ void on_tree_selection_changed(GtkWidget *self, main_window *widgets){ model = GTK_TREE_MODEL(widgets->UserList); Tree = widgets->UserUnitsTree; if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(Tree)),&model,&iter)){ + char *name, *descr; + gtk_tree_model_get(model,&iter,5,&name,6,&descr,-1); + gtk_label_set_text(GTK_LABEL(widgets->UserServiceLabel),name); + gtk_label_set_text(GTK_LABEL(widgets->UserDescriptionLabel),descr); gtk_widget_set_sensitive(widgets->UserEditButton,1); gtk_widget_set_sensitive(widgets->UserLogButton,1); gtk_widget_set_sensitive(widgets->UserStatusButton,1); gtk_widget_set_sensitive(widgets->UserInfoButton,1); } else { + gtk_label_set_text(GTK_LABEL(widgets->UserServiceLabel),""); + gtk_label_set_text(GTK_LABEL(widgets->UserDescriptionLabel),""); gtk_widget_set_sensitive(widgets->UserEditButton,0); gtk_widget_set_sensitive(widgets->UserLogButton,0); gtk_widget_set_sensitive(widgets->UserStatusButton,0); @@ -1407,7 +1419,11 @@ void yon_main_window_complete(main_window *widgets){ g_signal_connect(G_OBJECT(widgets->UnitsStatusListMenuItem),"activate",G_CALLBACK(on_units_list_status),widgets); g_signal_connect(G_OBJECT(widgets->SocketsStatusListMenuItem),"activate",G_CALLBACK(on_sockets_list_status),widgets); g_signal_connect(G_OBJECT(widgets->TimersStatusListMenuItem),"activate",G_CALLBACK(on_timers_list_status),widgets); - + yon_gtk_tree_view_minimal_fixed_size_set_full(GTK_TREE_VIEW(widgets->UserUnitsTree)); + yon_gtk_tree_view_minimal_fixed_size_set_full(GTK_TREE_VIEW(widgets->SystemUnitsTree)); + yon_gtk_tree_view_minimal_fixed_size_set_full(GTK_TREE_VIEW(widgets->ConfigMainTree)); + yon_gtk_tree_view_minimal_fixed_size_set_full(GTK_TREE_VIEW(widgets->SessionMainTree)); + yon_gtk_tree_view_minimal_fixed_size_set_full(GTK_TREE_VIEW(widgets->TimersMainTree)); g_signal_connect(G_OBJECT(widgets->SystemInactiveShowCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button),widgets->SystemUnloadedShowCheck); g_signal_connect(G_OBJECT(widgets->UserInactiveShowCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button),widgets->UserUnloadedShowCheck); // g_signal_connect(G_OBJECT(widgets->SystemUnitsTree),"button-press-event",G_CALLBACK(on_context_menu_open),widgets); @@ -1458,7 +1474,7 @@ void yon_main_window_complete(main_window *widgets){ g_signal_connect(G_OBJECT(widgets->UserUnitsTree),"cursor-changed",G_CALLBACK(on_tree_selection_changed),widgets); gtk_tree_model_filter_set_visible_func(widgets->UserFilter,(GtkTreeModelFilterVisibleFunc)yon_filter,widgets,NULL); gtk_tree_model_filter_set_visible_func(widgets->SystemFilter,(GtkTreeModelFilterVisibleFunc)yon_filter,widgets,NULL); - gtk_tree_view_set_search_entry(GTK_TREE_VIEW(widgets->SystemUnitsTree),GTK_ENTRY(widgets->SystemSearchEntry)); + gtk_tree_view_set_search_column(GTK_TREE_VIEW(widgets->UserUnitsTree),5); yon_load_proceed(YON_CONFIG_LOCAL); yon_ubl_status_box_render(LIST_LOAD_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); if (!main_config.update_thread_active){ diff --git a/ubl-settings-services.glade b/ubl-settings-services.glade index b1d3b9b..350f82e 100644 --- a/ubl-settings-services.glade +++ b/ubl-settings-services.glade @@ -239,6 +239,10 @@ + + True + False + True False @@ -333,6 +337,83 @@ 3 + + + True + False + 5 + + + True + True + True + + + True + True + False + True + menu2 + up + + + + + + + + + + False + True + 0 + + + + + True + True + True + + + True + True + False + True + menu2 + + + + + + + + + + False + True + 1 + + + + + False + True + 4 + + False @@ -891,6 +972,83 @@ 3 + + + True + False + 5 + + + True + True + True + + + True + True + False + True + menu2 + up + + + + + + + + + + False + True + 0 + + + + + True + True + True + + + True + True + False + True + menu2 + + + + + + + + + + False + True + 1 + + + + + False + True + 4 + + False