diff --git a/source/ubl-settings-logging.c b/source/ubl-settings-logging.c index c363917..baf29b5 100644 --- a/source/ubl-settings-logging.c +++ b/source/ubl-settings-logging.c @@ -94,6 +94,16 @@ void update_loaded_logrotate(){ } } +void yon_journald_size_update(journald_window *window){ + int sz; + config_str logsize = yon_config_load(journald_size_command,&sz); + if (logsize){ + if (logsize[0][strlen(logsize[0])-1]=='\n') + logsize[0][strlen(logsize[0])-1]='\0'; + } + gtk_label_set_text(GTK_LABEL(window->LogSizeLabel),logsize[0]); +} + int yon_load_proceed(YON_CONFIG_TYPE type){ if (type!=YON_CONFIG_CUSTOM){ yon_config_clean(); @@ -2132,6 +2142,7 @@ void on_journald_size_lower_size(GtkWidget *, journald_window *window){ yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_SUCCESS_TYPE); yon_ubl_status_highlight_incorrect(window->LowerSizeEntry); } + yon_journald_size_update(window); } void on_journald_size_lower_time(GtkWidget *, journald_window *window){ @@ -2149,6 +2160,7 @@ void on_journald_size_lower_time(GtkWidget *, journald_window *window){ yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_SUCCESS_TYPE); yon_ubl_status_highlight_incorrect(window->LowerTimeEntry); } + yon_journald_size_update(window); } journald_window *yon_journald_open(GtkWidget *, main_window *widgets){ @@ -2194,15 +2206,9 @@ journald_window *yon_journald_open(GtkWidget *, main_window *widgets){ yon_window_config_custom_window_setup(GTK_WINDOW(window->MainWindow),"JournaldWindow"); gtk_window_set_transient_for(GTK_WINDOW(window->MainWindow),GTK_WINDOW(widgets->Window)); - { - int sz; - config_str logsize = yon_config_load(journald_size_command,&sz); - if (logsize){ - if (logsize[0][strlen(logsize[0])-1]=='\n') - logsize[0][strlen(logsize[0])-1]='\0'; - } - gtk_label_set_text(GTK_LABEL(window->LogSizeLabel),logsize[0]); - } + + yon_journald_size_update(window); + gtk_window_set_title(GTK_WINDOW(window->MainWindow),JOURNALD_TITLE_LABEL); g_signal_connect(G_OBJECT(window->LowerSizeButton),"clicked",G_CALLBACK(on_journald_size_lower_size),window); @@ -2419,6 +2425,7 @@ add_log_window *on_add_open(main_window *widgets){ window->StatusBox=yon_gtk_builder_get_widget(builder,"StatusBox"); gtk_window_set_title(GTK_WINDOW(window->MainWindow),MONITOR_TITLE_LABEL); gtk_window_set_transient_for(GTK_WINDOW(window->MainWindow),GTK_WINDOW(widgets->Window)); + window->log_name=NULL; dictionary *dict = NULL; yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets); yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); diff --git a/source/ubl-settings-logging.h b/source/ubl-settings-logging.h index fb44f89..cce5896 100644 --- a/source/ubl-settings-logging.h +++ b/source/ubl-settings-logging.h @@ -295,6 +295,8 @@ typedef struct { GtkWidget *LowerTimeCombo; GtkWidget *LowerTimeButton; GtkWidget *headerTopic; + + char *paths; } journald_window; typedef struct { @@ -466,4 +468,5 @@ void on_logrotate_edit_activate(GtkWidget*,GtkTreePath*,GtkTreeViewColumn*, logr void on_logrotate_closed(GtkWidget *,logrotate_window *window); void on_rules_changed(GtkEditable *editable, const gchar *text, gint length, gint *position); void on_service_manage(GtkWidget *,main_window *widgets); +void yon_journald_size_update(journald_window *window); int main(int argc, char *argv[]); \ No newline at end of file diff --git a/ubl-settings-logging-journald.glade b/ubl-settings-logging-journald.glade index abf1442..b126026 100644 --- a/ubl-settings-logging-journald.glade +++ b/ubl-settings-logging-journald.glade @@ -104,6 +104,7 @@ True False + vertical @@ -983,7 +984,6 @@ True False - True True