From 14a2eb7884ab32eeb8b47392ac8e0c3b4e8552a6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 26 Feb 2002 00:44:36 +0000 Subject: [PATCH] Fix typos in pkg-config invokations. (#72476) * docs/tutorial/gtk-tut.sgml: Fix typos in pkg-config invokations. (#72476) Fixes for #72478: * gtk/tmpl/gtkprogressbar.sgml: Add note about new GtkProgressBar API to introduction. * gtk/gtk-sections.txt: Reorder GtkProgressBar functions to move undeprecated API to top. --- ChangeLog | 5 + ChangeLog.pre-2-0 | 5 + ChangeLog.pre-2-10 | 5 + ChangeLog.pre-2-2 | 5 + ChangeLog.pre-2-4 | 5 + ChangeLog.pre-2-6 | 5 + ChangeLog.pre-2-8 | 5 + docs/reference/ChangeLog | 10 ++ docs/reference/gtk/gtk-sections.txt | 10 +- docs/reference/gtk/tmpl/gtkprogressbar.sgml | 188 +++++++++++--------- docs/tutorial/gtk-tut.sgml | 10 +- 11 files changed, 156 insertions(+), 97 deletions(-) diff --git a/ChangeLog b/ChangeLog index 47d98a41bc..872d1ff31d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-02-25 Matthias Clasen + + * docs/tutorial/gtk-tut.sgml: Fix typos in pkg-config + invokations. (#72476) + Mon Feb 25 18:59:27 2002 Owen Taylor * gtk/gtktooltips.c (start_keyboard_mode): Set the keyboard-mode diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 47d98a41bc..872d1ff31d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2002-02-25 Matthias Clasen + + * docs/tutorial/gtk-tut.sgml: Fix typos in pkg-config + invokations. (#72476) + Mon Feb 25 18:59:27 2002 Owen Taylor * gtk/gtktooltips.c (start_keyboard_mode): Set the keyboard-mode diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 47d98a41bc..872d1ff31d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2002-02-25 Matthias Clasen + + * docs/tutorial/gtk-tut.sgml: Fix typos in pkg-config + invokations. (#72476) + Mon Feb 25 18:59:27 2002 Owen Taylor * gtk/gtktooltips.c (start_keyboard_mode): Set the keyboard-mode diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 47d98a41bc..872d1ff31d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2002-02-25 Matthias Clasen + + * docs/tutorial/gtk-tut.sgml: Fix typos in pkg-config + invokations. (#72476) + Mon Feb 25 18:59:27 2002 Owen Taylor * gtk/gtktooltips.c (start_keyboard_mode): Set the keyboard-mode diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 47d98a41bc..872d1ff31d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2002-02-25 Matthias Clasen + + * docs/tutorial/gtk-tut.sgml: Fix typos in pkg-config + invokations. (#72476) + Mon Feb 25 18:59:27 2002 Owen Taylor * gtk/gtktooltips.c (start_keyboard_mode): Set the keyboard-mode diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 47d98a41bc..872d1ff31d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2002-02-25 Matthias Clasen + + * docs/tutorial/gtk-tut.sgml: Fix typos in pkg-config + invokations. (#72476) + Mon Feb 25 18:59:27 2002 Owen Taylor * gtk/gtktooltips.c (start_keyboard_mode): Set the keyboard-mode diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 47d98a41bc..872d1ff31d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2002-02-25 Matthias Clasen + + * docs/tutorial/gtk-tut.sgml: Fix typos in pkg-config + invokations. (#72476) + Mon Feb 25 18:59:27 2002 Owen Taylor * gtk/gtktooltips.c (start_keyboard_mode): Set the keyboard-mode diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index b7e4adcd95..3ccf8db271 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,13 @@ +2002-02-26 Matthias Clasen + + Fixes for #72478: + + * gtk/tmpl/gtkprogressbar.sgml: Add note about new GtkProgressBar + API to introduction. + + * gtk/gtk-sections.txt: Reorder GtkProgressBar functions to move + undeprecated API to top. + Sat Feb 23 23:39:14 2002 Owen Taylor * gtk/tmpl/gtktreemodel.sgml: Document gtk_tree_path_new_root(), diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index 113572c7c4..91d4b63a20 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -1878,23 +1878,23 @@ gtk_progress_get_type gtkprogressbar GtkProgressBar GtkProgressBar -GtkProgressBarStyle -GtkProgressBarOrientation gtk_progress_bar_new gtk_progress_bar_pulse gtk_progress_bar_set_text gtk_progress_bar_set_fraction gtk_progress_bar_set_pulse_step +gtk_progress_bar_set_orientation +GtkProgressBarOrientation +gtk_progress_bar_get_text gtk_progress_bar_get_fraction gtk_progress_bar_get_pulse_step -gtk_progress_bar_get_text +gtk_progress_bar_get_orientation gtk_progress_bar_new_with_adjustment gtk_progress_bar_set_bar_style +GtkProgressBarStyle gtk_progress_bar_set_discrete_blocks gtk_progress_bar_set_activity_step gtk_progress_bar_set_activity_blocks -gtk_progress_bar_set_orientation -gtk_progress_bar_get_orientation gtk_progress_bar_update GTK_PROGRESS_BAR diff --git a/docs/reference/gtk/tmpl/gtkprogressbar.sgml b/docs/reference/gtk/tmpl/gtkprogressbar.sgml index d7138ac17f..1441ce2963 100644 --- a/docs/reference/gtk/tmpl/gtkprogressbar.sgml +++ b/docs/reference/gtk/tmpl/gtkprogressbar.sgml @@ -18,24 +18,38 @@ When an application can determine how much work needs to take place progress, it can use the #GtkProgressBar in percentage mode and the user sees a growing bar indicating the percentage of the work that has been completed. In this mode, the application is required to call -either the gtk_progress_set_percentage() or gtk_progress_set_value() -functions periodically to update the progress bar. +gtk_progress_bar_set_fraction() periodically to update the progress bar. When an application has no accurate way of knowing the amount of work -to do, it can use the #GtkProgressBar in activity mode. In this mode -the progress bar shows activity by a block moving back and forth within -the progress area. +to do, it can use the #GtkProgressBar in activity mode, which shows activity +by a block moving back and forth within the progress area. In this mode, +the application is required to call gtk_progress_bar_pulse() perodically +to update the progress bar. There is quite a bit of flexibility provided to control the appearance of the #GtkProgressBar. Functions are provided to control the -orientation of the bar, optional text which can be displayed along with -the bar, and the style in which the bar grows. +orientation of the bar, optional text can be displayed along with +the bar, and the step size used in activity mode can be set. + + +The #GtkProgressBar/#GtkProgress API in GTK 1.2 was bloated, needlessly complex +and hard to use properly. Therefore #GtkProgress has been deprecated +completely and the #GtkProgressBar API has been reduced to the following 9 +functions: gtk_progress_bar_new(), gtk_progress_bar_pulse(), gtk_progress_bar_set_text(), +gtk_progress_bar_set_fraction(), gtk_progress_bar_set_pulse_step(), +gtk_progress_bar_set_orientation(), gtk_progress_bar_get_text(), +gtk_progress_bar_get_fraction(), gtk_progress_bar_get_pulse_step(). These have +been grouped at the beginning of this section, followed by a large chunk of +deprecated 1.2 compatibility functions. + + + @@ -48,67 +62,6 @@ and should be accessed using the functions below. - - -An enumeration representing the styles for drawing the progress bar. - - - - - - -GTK_PROGRESS_CONTINUOUS -The progress bar grows in a smooth, continuous manner. - - - -GTK_PROGRESS_DISCRETE -The progress bar grows in discrete, visible blocks. - - - - - -@GTK_PROGRESS_CONTINUOUS: -@GTK_PROGRESS_DISCRETE: - - - -An enumeration representing possible orientations and growth -directions for the visible progress bar. - - - - - - -GTK_PROGRESS_LEFT_TO_RIGHT -A horizontal progress bar growing from left to right. - - - -GTK_PROGRESS_RIGHT_TO_LEFT -A horizontal progress bar growing from right to left. - - - -GTK_PROGRESS_BOTTOM_TO_TOP -A vertical progress bar growing from bottom to top. - - - -GTK_PROGRESS_TOP_TO_BOTTOM -A vertical progress bar growing from top to bottom. - - - - - -@GTK_PROGRESS_LEFT_TO_RIGHT: -@GTK_PROGRESS_RIGHT_TO_LEFT: -@GTK_PROGRESS_BOTTOM_TO_TOP: -@GTK_PROGRESS_TOP_TO_BOTTOM: - Creates a new #GtkProgressBar. @@ -152,6 +105,61 @@ Creates a new #GtkProgressBar. @fraction: + + + + + +@pbar: +@orientation: + + + + +An enumeration representing possible orientations and growth +directions for the visible progress bar. + + + + + + +GTK_PROGRESS_LEFT_TO_RIGHT +A horizontal progress bar growing from left to right. + + + +GTK_PROGRESS_RIGHT_TO_LEFT +A horizontal progress bar growing from right to left. + + + +GTK_PROGRESS_BOTTOM_TO_TOP +A vertical progress bar growing from bottom to top. + + + +GTK_PROGRESS_TOP_TO_BOTTOM +A vertical progress bar growing from top to bottom. + + + + + +@GTK_PROGRESS_LEFT_TO_RIGHT: +@GTK_PROGRESS_RIGHT_TO_LEFT: +@GTK_PROGRESS_BOTTOM_TO_TOP: +@GTK_PROGRESS_TOP_TO_BOTTOM: + + + + + + +@pbar: +@Returns: + + @@ -170,7 +178,7 @@ Creates a new #GtkProgressBar. @Returns: - + @@ -198,6 +206,30 @@ Sets the style of the #GtkProgressBar. The default style is @style: a #GtkProgressBarStyle value indicating the desired style. + + +An enumeration representing the styles for drawing the progress bar. + + + + + + +GTK_PROGRESS_CONTINUOUS +The progress bar grows in a smooth, continuous manner. + + + +GTK_PROGRESS_DISCRETE +The progress bar grows in discrete, visible blocks. + + + + + +@GTK_PROGRESS_CONTINUOUS: +@GTK_PROGRESS_DISCRETE: + Sets the number of blocks that the progress bar is divided into @@ -230,24 +262,6 @@ mode. Larger numbers make the visible block smaller. @blocks: number of blocks which can fit within the progress bar area. - - - - - -@pbar: -@orientation: - - - - - - - -@pbar: -@Returns: - - This function is deprecated. Please use gtk_progress_set_value() or diff --git a/docs/tutorial/gtk-tut.sgml b/docs/tutorial/gtk-tut.sgml index 7b4a4305a6..3d0e1fb238 100755 --- a/docs/tutorial/gtk-tut.sgml +++ b/docs/tutorial/gtk-tut.sgml @@ -5,7 +5,7 @@ - February 20, 2002 + February 25, 2002 GTK+ 2.0 Tutorial @@ -191,7 +191,7 @@ int main( int argc, You can compile the above program with gcc using: -gcc base.c -o base `pkg-config --cflags --libs gtk-2.0` +gcc base.c -o base `pkg-config --cflags --libs gtk+-2.0` The meaning of the unusual compilation options is explained below in @@ -395,8 +395,8 @@ int main( int argc, To compile use: -gcc -Wall -g helloworld.c -o helloworld `pkg-config --cflags gtk-2.0` \ - `pkg-config --libs gtk-2.0` +gcc -Wall -g helloworld.c -o helloworld `pkg-config --cflags gtk+-2.0` \ + `pkg-config --libs gtk+-2.0` This uses the program pkg-config, which can be obtained from @@ -2682,7 +2682,7 @@ struct _GtkAdjustment If you don't like to poke directly at struct internals like a real C programmer, you can use the following accessor to -inspect the value of an adjustment: +inspect the value of an adjustment: gdouble gtk_adjustment_get_value( GtkAdjustment *adjustment);