Fix progress bar text

Ensure progress bar text is shown in GTK3

diff --git a/src/bar_gps.c b/src/bar_gps.c
index 8bc1c93..a112be6 100644 (file)
--- a/src/bar_gps.c
+++ b/src/bar_gps.c
@@ -761,6 +761,10 @@ GtkWidget *bar_pane_gps_new(const gchar *id, const gchar *title, const gchar *ma
        gtk_scale_button_set_value(GTK_SCALE_BUTTON(slider), (gdouble)zoom);
 
        progress = gtk_progress_bar_new();
+#if GTK_CHECK_VERSION(3,0,0)
+       gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), "");
+       gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(progress), TRUE);
+#endif
        state = gtk_label_new("");
        gtk_label_set_justify(GTK_LABEL(state), GTK_JUSTIFY_CENTER);
 

diff --git a/src/cache_maint.c b/src/cache_maint.c
index 8e3ca76..230ce10 100644 (file)
--- a/src/cache_maint.c
+++ b/src/cache_maint.c
@@ -950,6 +950,9 @@ static void cache_manager_standard_process(GtkWidget *widget, gboolean clear)
 
        cd->progress = gtk_progress_bar_new();
        gtk_progress_bar_set_text(GTK_PROGRESS_BAR(cd->progress), _("click start to begin"));
+#if GTK_CHECK_VERSION(3,0,0)
+       gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(cd->progress), TRUE);
+#endif
        gtk_box_pack_start(GTK_BOX(cd->gd->vbox), cd->progress, FALSE, FALSE, 0);
        gtk_widget_show(cd->progress);
 

diff --git a/src/collect.c b/src/collect.c
index 2287d12..28879cc 100644 (file)
--- a/src/collect.c
+++ b/src/collect.c
@@ -1219,6 +1219,10 @@ CollectWindow *collection_window_new(const gchar *path)
 
        extra_label = gtk_progress_bar_new();
        gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(extra_label), 0.0);
+#if GTK_CHECK_VERSION(3,0,0)
+       gtk_progress_bar_set_text(GTK_PROGRESS_BAR(extra_label), "");
+       gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(extra_label), TRUE);
+#endif
        gtk_box_pack_start(GTK_BOX(cw->status_box), extra_label, TRUE, TRUE, 0);
        gtk_widget_show(extra_label);
 

diff --git a/src/editors.c b/src/editors.c
index 059df73..6b9d764 100644 (file)
--- a/src/editors.c
+++ b/src/editors.c
@@ -566,6 +566,10 @@ static EditorVerboseData *editor_verbose_window(EditorData *ed, const gchar *tex
        vd->progress = gtk_progress_bar_new();
        gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(vd->progress), 0.0);
        gtk_box_pack_start(GTK_BOX(hbox), vd->progress, TRUE, TRUE, 0);
+#if GTK_CHECK_VERSION(3,0,0)
+       gtk_progress_bar_set_text(GTK_PROGRESS_BAR(vd->progress), "");
+       gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(vd->progress), TRUE);
+#endif
        gtk_widget_show(vd->progress);
 
        vd->spinner = spinner_new(NULL, SPINNER_SPEED);

diff --git a/src/layout.c b/src/layout.c
index d1dbaa9..5a858cb 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -607,6 +607,10 @@ static void layout_status_setup(LayoutWindow *lw, GtkWidget *box, gboolean small
                }
        lw->info_progress_bar = gtk_progress_bar_new();
        gtk_widget_set_size_request(lw->info_progress_bar, PROGRESS_WIDTH, -1);
+#if GTK_CHECK_VERSION(3,0,0)
+       gtk_progress_bar_set_text(GTK_PROGRESS_BAR(lw->info_progress_bar), "");
+       gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(lw->info_progress_bar), TRUE);
+#endif
        gtk_box_pack_start(GTK_BOX(hbox), lw->info_progress_bar, FALSE, FALSE, 0);
        gtk_widget_show(lw->info_progress_bar);
 

diff --git a/src/search.c b/src/search.c
index 02c301b..a858ac7 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -2848,6 +2848,10 @@ void search_new(FileData *dir_fd, FileData *example_file)
 
        sd->label_progress = gtk_progress_bar_new();
        gtk_widget_set_size_request(sd->label_progress, 50, -1);
+#if GTK_CHECK_VERSION(3,0,0)
+       gtk_progress_bar_set_text(GTK_PROGRESS_BAR(sd->label_progress), "");
+       gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(sd->label_progress), TRUE);
+#endif
        gtk_box_pack_start(GTK_BOX(hbox), sd->label_progress, TRUE, TRUE, 0);
        gtk_widget_show(sd->label_progress);