diff --git a/ChangeLog b/ChangeLog index edbe184a62..24c0d64608 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,12 @@ +2004-10-11 Matthias Clasen + + * docs/tools/widgets.c: Create scrolledwindow and statusbar + images. + 2004-10-10 Matthias Clasen - * docs/tools/widgets.c: Create a toolbar, menubar and - messagedialog images. + * docs/tools/widgets.c: Create a toolbar, menubar, progressbar, + notebook and messagedialog images. * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_select_all): Avoid a warning. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index edbe184a62..24c0d64608 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,7 +1,12 @@ +2004-10-11 Matthias Clasen + + * docs/tools/widgets.c: Create scrolledwindow and statusbar + images. + 2004-10-10 Matthias Clasen - * docs/tools/widgets.c: Create a toolbar, menubar and - messagedialog images. + * docs/tools/widgets.c: Create a toolbar, menubar, progressbar, + notebook and messagedialog images. * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_select_all): Avoid a warning. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index edbe184a62..24c0d64608 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,7 +1,12 @@ +2004-10-11 Matthias Clasen + + * docs/tools/widgets.c: Create scrolledwindow and statusbar + images. + 2004-10-10 Matthias Clasen - * docs/tools/widgets.c: Create a toolbar, menubar and - messagedialog images. + * docs/tools/widgets.c: Create a toolbar, menubar, progressbar, + notebook and messagedialog images. * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_select_all): Avoid a warning. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index edbe184a62..24c0d64608 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,7 +1,12 @@ +2004-10-11 Matthias Clasen + + * docs/tools/widgets.c: Create scrolledwindow and statusbar + images. + 2004-10-10 Matthias Clasen - * docs/tools/widgets.c: Create a toolbar, menubar and - messagedialog images. + * docs/tools/widgets.c: Create a toolbar, menubar, progressbar, + notebook and messagedialog images. * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_select_all): Avoid a warning. diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 7192a70a85..9e8e81b9a7 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,10 @@ +2004-10-11 Matthias Clasen + + * gtk/images/statusbar.png: New image. + + * gtk/visual_index.xml: + * gtk/Makefile.am (HTML_IMAGES): Add statusbar image. + 2004-10-11 Matthias Clasen * gtk/migrating-GtkComboBox.sgml: Remove chapterinfo. @@ -10,6 +17,12 @@ 2004-10-10 Matthias Clasen + * gtk/images/spinbutton.png: + * gtk/images/scrolledwindow.png: New images. + + * gtk/Makefile.am (HTML_IMAGES): + * gtk/visual_index.xml: Add scrolled window and spinbutton. + * gtk/images/progressbar.png: * gtk/images/notebook.png: * gtk/images/toolbar.png: diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index 58512a61af..fd8ab8e83f 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -224,6 +224,9 @@ HTML_IMAGES = \ $(srcdir)/images/menubar.png \ $(srcdir)/images/notebook.png \ $(srcdir)/images/progressbar.png \ + $(srcdir)/images/scrolledwindow.png \ + $(srcdir)/images/spinbutton.png \ + $(srcdir)/images/statusbar.png \ $(srcdir)/images/messagedialog.png # Extra options to supply to gtkdoc-fixref diff --git a/docs/reference/gtk/images/scrolledwindow.png b/docs/reference/gtk/images/scrolledwindow.png new file mode 100644 index 0000000000..b19f54b420 Binary files /dev/null and b/docs/reference/gtk/images/scrolledwindow.png differ diff --git a/docs/reference/gtk/images/spinbutton.png b/docs/reference/gtk/images/spinbutton.png new file mode 100644 index 0000000000..0f287d85e0 Binary files /dev/null and b/docs/reference/gtk/images/spinbutton.png differ diff --git a/docs/reference/gtk/images/statusbar.png b/docs/reference/gtk/images/statusbar.png new file mode 100644 index 0000000000..c4be9639ec Binary files /dev/null and b/docs/reference/gtk/images/statusbar.png differ diff --git a/docs/reference/gtk/visual_index.xml b/docs/reference/gtk/visual_index.xml index 00d61f98ef..a57843ff42 100644 --- a/docs/reference/gtk/visual_index.xml +++ b/docs/reference/gtk/visual_index.xml @@ -1,48 +1,80 @@ - - -linkend="GtkProgressBar"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c index b7d0ade891..c1db25e020 100644 --- a/docs/tools/widgets.c +++ b/docs/tools/widgets.c @@ -443,7 +443,7 @@ create_window (void) static WidgetInfo * create_toolbar (void) { - GtkWidget *widget, *menu, *vbox, *align; + GtkWidget *widget, *menu; GtkToolItem *item; widget = gtk_toolbar_new (); @@ -461,16 +461,6 @@ create_toolbar (void) gtk_toolbar_set_show_arrow (GTK_TOOLBAR (widget), FALSE); -#if 0 - vbox = gtk_vbox_new (FALSE, 3); - align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); - gtk_container_add (GTK_CONTAINER (align), widget); - gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), - gtk_label_new ("Toolbar"), - FALSE, FALSE, 0); - -#endif return new_widget_info ("toolbar", widget, SMALL); } @@ -539,10 +529,11 @@ create_progressbar (void) GtkWidget *widget; GtkWidget *align; - vbox = gtk_vbox_new (FALSE, 3); - align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); widget = gtk_progress_bar_new (); gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (widget), 0.5); + + vbox = gtk_vbox_new (FALSE, 3); + align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); gtk_container_add (GTK_CONTAINER (align), widget); gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), @@ -552,11 +543,66 @@ create_progressbar (void) return new_widget_info ("progressbar", vbox, SMALL); } +static WidgetInfo * +create_scrolledwindow (void) +{ + GtkWidget *scrolledwin, *label; + + scrolledwin = gtk_scrolled_window_new (NULL, NULL); + label = gtk_label_new ("Scrolled Window"); + + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwin), + label); + + return new_widget_info ("scrolledwindow", scrolledwin, MEDIUM); +} + +static WidgetInfo * +create_spinbutton (void) +{ + GtkWidget *widget; + GtkWidget *vbox, *align; + + widget = gtk_spin_button_new_with_range (0.0, 100.0, 1.0); + + vbox = gtk_vbox_new (FALSE, 3); + align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); + gtk_container_add (GTK_CONTAINER (align), widget); + gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), + gtk_label_new ("Spin Button"), + FALSE, FALSE, 0); + + return new_widget_info ("spinbutton", vbox, SMALL); +} + +static WidgetInfo * +create_statusbar (void) +{ + GtkWidget *widget; + GtkWidget *vbox, *align; + + widget = gtk_statusbar_new (); + gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (widget), TRUE); + gtk_statusbar_push (GTK_STATUSBAR (widget), 0, "Hold on..."); + gtk_widget_set_size_request (widget, 220, -1); + + vbox = gtk_vbox_new (FALSE, 3); + align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); + gtk_container_add (GTK_CONTAINER (align), widget); + gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), + gtk_label_new ("Status Bar"), + FALSE, FALSE, 0); + + return new_widget_info ("statusbar", vbox, SMALL); +} + GList * get_all_widgets (void) { GList *retval = NULL; - +#if 0 retval = g_list_prepend (retval, create_button ()); retval = g_list_prepend (retval, create_toggle_button ()); retval = g_list_prepend (retval, create_check_button ()); @@ -580,6 +626,10 @@ get_all_widgets (void) retval = g_list_prepend (retval, create_notebook ()); retval = g_list_prepend (retval, create_message_dialog ()); retval = g_list_prepend (retval, create_progressbar ()); + retval = g_list_prepend (retval, create_scrolledwindow ()); + retval = g_list_prepend (retval, create_spinbutton ()); +#endif + retval = g_list_prepend (retval, create_statusbar ()); return retval; }