From 14361ee8aa8e142700508a85a0ff5d3b20ba4c1f Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Sat, 10 Mar 2012 19:46:46 +0100 Subject: [PATCH] * grub-core/gfxmenu/gui_progress_bar.c (grub_gui_progress_bar): Remove unused show_text member. * docs/grub.texi: Document "text" property. --- ChangeLog | 6 ++++++ docs/grub.texi | 11 ++++++----- grub-core/gfxmenu/gui_progress_bar.c | 1 - 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index eb6117ee5..961d791c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-03-10 Vladimir Serbinenko + + * grub-core/gfxmenu/gui_progress_bar.c (grub_gui_progress_bar): Remove + unused show_text member. + * docs/grub.texi: Document "text" property. + 2012-03-10 Vladimir Serbinenko * grub-core/loader/efi/chainloader.c (grub_cmd_chainloader): Fix format diff --git a/docs/grub.texi b/docs/grub.texi index 2dafec3db..86c9adc7e 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -1595,11 +1595,12 @@ the id ``__timeout__''. This indicates to GRUB that the progress bar should be updated as time passes, and it should be made invisible if the countdown to automatic boot is interrupted by the user. -Progress bars may optionally have text displayed on them. This is controlled -through the ``show_text'' property, which can be set to either ``true'' or -``false'' to control whether text is displayed. When GRUB is counting down to -automatic boot, the text informs the user of the number of seconds remaining. - +Progress bars may optionally have text displayed on them. This text is +controlled by variable ``text'' which contains a printf template with the +only argument %d is the number of seconds remaining. Additionally special +values ``@@TIMEOUT_NOTIFICATION_SHORT@@'', ``@@TIMEOUT_NOTIFICATION_MIDDLE@@'', +``@@TIMEOUT_NOTIFICATION_LONG@@'' are replaced with standard and translated +templates. @subsection Circular Progress Indicator diff --git a/grub-core/gfxmenu/gui_progress_bar.c b/grub-core/gfxmenu/gui_progress_bar.c index adc07f2e4..7b005f400 100644 --- a/grub-core/gfxmenu/gui_progress_bar.c +++ b/grub-core/gfxmenu/gui_progress_bar.c @@ -37,7 +37,6 @@ struct grub_gui_progress_bar int start; int end; int value; - int show_text; char *template; grub_font_t font; grub_video_rgba_color_t text_color; -- 2.47.2