diff --git a/source/ubinstall-gtk-log.c b/source/ubinstall-gtk-log.c index f0bd3a6..e95831b 100644 --- a/source/ubinstall-gtk-log.c +++ b/source/ubinstall-gtk-log.c @@ -25,7 +25,7 @@ log_window *yon_log_window_new(){ window->Window = yon_gtk_builder_get_widget(builder,"MainWindow"); window->ScrollWindow = yon_gtk_builder_get_widget(builder,"ScrollWindow"); window->HeadLabel = yon_gtk_builder_get_widget(builder,"headerTopic"); - window->LogLabel = yon_gtk_builder_get_widget(builder,"LogLabel"); + window->LogTextView = yon_gtk_builder_get_widget(builder,"LogTextView"); window->StatusBox = yon_gtk_builder_get_widget(builder,"StatusBox"); window->ScrollToEndCheck = yon_gtk_builder_get_widget(builder,"ScrollToEndCheck"); window->monitor = NULL; @@ -53,7 +53,12 @@ void yon_read_log(GFileMonitor *,GFile *,GFile *,GFileMonitorEvent ,log_window * g_mutex_unlock(&main_config.progress_mutex); if (size){ char *final = yon_char_parsed_to_string(parsed,size,""); - gtk_label_set_text(GTK_LABEL(window->LogLabel),final); + GtkTextIter start_iter, end_iter; + gtk_text_buffer_get_start_iter(gtk_text_view_get_buffer(GTK_TEXT_VIEW(window->LogTextView)),&start_iter); + gtk_text_buffer_get_end_iter(gtk_text_view_get_buffer(GTK_TEXT_VIEW(window->LogTextView)),&end_iter); + gtk_text_buffer_delete(gtk_text_view_get_buffer(GTK_TEXT_VIEW(window->LogTextView)),&start_iter,&end_iter); + gtk_text_buffer_set_text(gtk_text_view_get_buffer(GTK_TEXT_VIEW(window->LogTextView)),final,strlen(final)); + // gtk_label_set_text(GTK_LABEL(window->LogTextView),final); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->ScrollToEndCheck))){ if (!window->timer_id){ window->timer_id = g_idle_add((GSourceFunc)yon_log_scroll,window); diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index a4b7e56..d50b76c 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -905,7 +905,7 @@ typedef struct GtkWidget *ScrollWindow; GtkWidget *StatusBox; GtkWidget *HeadLabel; - GtkWidget *LogLabel; + GtkWidget *LogTextView; GtkWidget *ScrollToEndCheck; GFileMonitor *monitor; diff --git a/ubinstall-gtk-log-view.glade b/ubinstall-gtk-log-view.glade index 3c9904e..cc26655 100644 --- a/ubinstall-gtk-log-view.glade +++ b/ubinstall-gtk-log-view.glade @@ -1,8 +1,15 @@ - + + + True + False + True + 0 + 0 + 200 400 @@ -66,12 +73,9 @@ True False - + True - False - True - 0 - 0 + True