Mercurial > hg > forks > geeqie
changeset 2439:f48a3335c672
Fix progress bar text
Ensure progress bar text is shown in GTK3
| author | Colin Clark <cclark@mcb.net> |
|---|---|
| date | Fri, 03 Feb 2017 09:52:26 +0000 |
| parents | e133f99b6331 |
| children | cb9f25cb54f3 |
| files | src/bar_gps.c src/cache_maint.c src/collect.c src/editors.c src/layout.c src/search.c |
| diffstat | 6 files changed, 23 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/bar_gps.c Sat Jan 28 19:58:06 2017 +0000 +++ b/src/bar_gps.c Fri Feb 03 09:52:26 2017 +0000 @@ -761,6 +761,10 @@ 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);
--- a/src/cache_maint.c Sat Jan 28 19:58:06 2017 +0000 +++ b/src/cache_maint.c Fri Feb 03 09:52:26 2017 +0000 @@ -950,6 +950,9 @@ 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);
--- a/src/collect.c Sat Jan 28 19:58:06 2017 +0000 +++ b/src/collect.c Fri Feb 03 09:52:26 2017 +0000 @@ -1219,6 +1219,10 @@ 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);
--- a/src/editors.c Sat Jan 28 19:58:06 2017 +0000 +++ b/src/editors.c Fri Feb 03 09:52:26 2017 +0000 @@ -566,6 +566,10 @@ 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);
--- a/src/layout.c Sat Jan 28 19:58:06 2017 +0000 +++ b/src/layout.c Fri Feb 03 09:52:26 2017 +0000 @@ -607,6 +607,10 @@ } 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);
--- a/src/search.c Sat Jan 28 19:58:06 2017 +0000 +++ b/src/search.c Fri Feb 03 09:52:26 2017 +0000 @@ -2848,6 +2848,10 @@ 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);