* grub-core/gfxmenu/gui_progress_bar.c (grub_gui_progress_bar): Remove

	unused show_text member.
	* docs/grub.texi: Document "text" property.

diff --git a/ChangeLog b/ChangeLog
index eb6117ee587f58f4b4fad1dbe8a5b6fd75bb2459..961d791c7cee485c44abc5e40209bd20f238f7ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * 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  <phcoder@gmail.com>
 
        * grub-core/loader/efi/chainloader.c (grub_cmd_chainloader): Fix format

diff --git a/docs/grub.texi b/docs/grub.texi
index 2dafec3dbc8217f75bee1cfb2628ff3cc180d559..86c9adc7e9131642c3c2ad1f02d5a9a42a786be7 100644 (file)
--- 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 adc07f2e465a4e8b34f6e043ee7d63eb0589fad9..7b005f4004edaeda392a54d80ec776260fde75bd 100644 (file)
--- 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;