diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c index 7785791..b5778e0 100644 --- a/source/ubl-settings-services.c +++ b/source/ubl-settings-services.c @@ -614,6 +614,8 @@ void on_system_info_clicked(GtkWidget *self, main_window *widgets){ char *name; gtk_tree_model_get(model,&iter,5,&name,-1); log_window *window = yon_log_window_new(); + gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SERVICE_STATE_TITLE_LABEL(name)); + gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_STATE_TITLE_LABEL(name)); window->target = service_info_command(name); yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); gtk_widget_show(window->Window); @@ -631,6 +633,8 @@ void on_system_log_clicked(GtkWidget *self, main_window *widgets){ char *name; gtk_tree_model_get(model,&iter,5,&name,-1); log_window *window = yon_log_window_new(); + gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SERVICE_LOG_TITLE_LABEL(name)); + gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_LOG_TITLE_LABEL(name)); window->target = get_log_command(name); yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); gtk_widget_show(window->Window); @@ -670,6 +674,8 @@ void on_system_edit_clicked(GtkWidget *self, main_window *widgets){ char *name; gtk_tree_model_get(model,&iter,5,&name,-1); log_window *window = yon_log_window_new(); + gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SERVICE_UNIT_EDIT_TITLE_LABEL); + gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_UNIT_EDIT_TITLE_LABEL); gtk_widget_show(window->SaveButton); window->target=show_source_command(name); yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); @@ -695,6 +701,8 @@ void on_system_status_clicked(GtkWidget *self, main_window *widgets){ char *name; gtk_tree_model_get(model,&iter,5,&name,-1); log_window *window = yon_log_window_new(); + gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),PROPERTIES_LABEL); + gtk_window_set_title(GTK_WINDOW(window->Window),PROPERTIES_LABEL); window->target = properties_command(name); yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); gtk_widget_show(window->Window); @@ -738,6 +746,8 @@ void on_user_info_clicked(GtkWidget *self, main_window *widgets){ char *name; gtk_tree_model_get(model,&iter,5,&name,-1); log_window *window = yon_log_window_new(); + gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SERVICE_STATE_TITLE_LABEL(name)); + gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_STATE_TITLE_LABEL(name)); window->target = user_service_info_command(name); yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); gtk_widget_show(window->Window); @@ -755,6 +765,8 @@ void on_user_log_clicked(GtkWidget *self, main_window *widgets){ char *name; gtk_tree_model_get(model,&iter,5,&name,-1); log_window *window = yon_log_window_new(); + gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SERVICE_LOG_TITLE_LABEL(name)); + gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_LOG_TITLE_LABEL(name)); window->target = user_get_log_command(name); yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); gtk_widget_show(window->Window); @@ -772,6 +784,8 @@ void on_user_edit_clicked(GtkWidget *self, main_window *widgets){ char *name; gtk_tree_model_get(model,&iter,5,&name,-1); log_window *window = yon_log_window_new(); + gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SERVICE_UNIT_EDIT_TITLE_LABEL); + gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_UNIT_EDIT_TITLE_LABEL); gtk_widget_show(window->SaveButton); window->target=user_show_source_command(name); yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); @@ -797,6 +811,8 @@ void on_user_status_clicked(GtkWidget *self, main_window *widgets){ char *name; gtk_tree_model_get(model,&iter,5,&name,-1); log_window *window = yon_log_window_new(); + gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),PROPERTIES_LABEL); + gtk_window_set_title(GTK_WINDOW(window->Window),PROPERTIES_LABEL); window->target = user_properties_command(name); yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); gtk_widget_show(window->Window); @@ -829,6 +845,8 @@ void on_config_edit_clicked(GtkWidget *self, main_window *widgets){ GtkTreeModel *model = GTK_TREE_MODEL(widgets->ConfigList); if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->ConfigMainTree)),&model,&iter)){ log_window *window = yon_log_window_new(); + gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),EDIT_CONFIG_LABEL); + gtk_window_set_title(GTK_WINDOW(window->Window),EDIT_CONFIG_LABEL); gtk_widget_hide(gtk_widget_get_parent(window->SystemTerminal)); gtk_widget_show(gtk_widget_get_parent(window->TextEditor)); gtk_widget_show(window->SaveButton); @@ -851,6 +869,8 @@ void on_system_services_status(GtkWidget *self, main_window *widgets){ if (self){} if (widgets){ log_window *window = yon_log_window_new(); + gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SYSTEM_STATUS_LABEL); + gtk_window_set_title(GTK_WINDOW(window->Window),SYSTEM_STATUS_LABEL); window->target = system_services_status_command; yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); gtk_widget_show(window->Window); @@ -863,6 +883,8 @@ void on_user_services_status(GtkWidget *self, main_window *widgets){ if (self){} if (widgets){ log_window *window = yon_log_window_new(); + gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),USER_STATUS_LABEL); + gtk_window_set_title(GTK_WINDOW(window->Window),USER_STATUS_LABEL); window->target = user_services_status_command; yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); gtk_widget_show(window->Window); @@ -875,6 +897,8 @@ void on_units_status(GtkWidget *self, main_window *widgets){ if (self){} if (widgets){ log_window *window = yon_log_window_new(); + gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),INSTALLED_UNIT_LABEL); + gtk_window_set_title(GTK_WINDOW(window->Window),INSTALLED_UNIT_LABEL); window->target = installed_units_states_command; yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); gtk_widget_show(window->Window); @@ -887,6 +911,8 @@ void on_units_list_status(GtkWidget *self, main_window *widgets){ if (self){} if (widgets){ log_window *window = yon_log_window_new(); + gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),UNITS_LIST_LABEL); + gtk_window_set_title(GTK_WINDOW(window->Window),UNITS_LIST_LABEL); window->target = list_of_units_states_command; yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); gtk_widget_show(window->Window); @@ -899,6 +925,8 @@ void on_sockets_list_status(GtkWidget *self, main_window *widgets){ if (self){} if (widgets){ log_window *window = yon_log_window_new(); + gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SOCKETS_LIST_LABEL); + gtk_window_set_title(GTK_WINDOW(window->Window),SOCKETS_LIST_LABEL); window->target = list_of_sockets_states_command; yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); gtk_widget_show(window->Window); @@ -911,6 +939,8 @@ void on_timers_list_status(GtkWidget *self, main_window *widgets){ if (self){} if (widgets){ log_window *window = yon_log_window_new(); + gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),TIMERS_LIST_LABEL); + gtk_window_set_title(GTK_WINDOW(window->Window),TIMERS_LIST_LABEL); window->target = list_of_timers_states_command; yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); gtk_widget_show(window->Window); diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 5abf24c..66ca25b 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -92,6 +92,8 @@ #define SHOW_SERVICE_PROPERTIES_LABEL _("Show service properties") #define SHOW_LABEL _("Show...") +#define EDIT_CONFIG_LABEL _("Edit configuration file") + #define SHOW_INACTIVE_LABEL _("Show inactive") #define SHOW_UNLOADED_LABEL _("Show unloaded") @@ -126,4 +128,8 @@ #define STATE_PLUGGED_LABEL _("plugged") #define STATE_ABANDONED_LABEL _("abandoned") -#define ROOT_CHECK_LABEL _("Upgrade to root") \ No newline at end of file +#define ROOT_CHECK_LABEL _("Upgrade to root") + +#define SERVICE_STATE_TITLE_LABEL(target) yon_char_append(_("State of "),target) +#define SERVICE_LOG_TITLE_LABEL(target) yon_char_unite(_("View")," ",target," ",_("log"),NULL) +#define SERVICE_UNIT_EDIT_TITLE_LABEL _("Edit unit file") \ No newline at end of file diff --git a/ubl-settings-services.glade b/ubl-settings-services.glade index d8fba84..5d0fa4e 100644 --- a/ubl-settings-services.glade +++ b/ubl-settings-services.glade @@ -1345,6 +1345,7 @@ True True True + Edit configuration file image12