Add more widget gallery images.

diff --git a/ChangeLog b/ChangeLog
index edbe184a62f60756b70e788c06ee5fc436d0bf86..24c0d64608864693597ae90371926fc6d66c6b6f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
+2004-10-11  Matthias Clasen  <matthias@localhost.localdomain>
+
+       * docs/tools/widgets.c: Create scrolledwindow and statusbar 
+       images.
+
 2004-10-10  Matthias Clasen  <matthias@localhost.localdomain>
 
-       * 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 edbe184a62f60756b70e788c06ee5fc436d0bf86..24c0d64608864693597ae90371926fc6d66c6b6f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,7 +1,12 @@
+2004-10-11  Matthias Clasen  <matthias@localhost.localdomain>
+
+       * docs/tools/widgets.c: Create scrolledwindow and statusbar 
+       images.
+
 2004-10-10  Matthias Clasen  <matthias@localhost.localdomain>
 
-       * 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 edbe184a62f60756b70e788c06ee5fc436d0bf86..24c0d64608864693597ae90371926fc6d66c6b6f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,7 +1,12 @@
+2004-10-11  Matthias Clasen  <matthias@localhost.localdomain>
+
+       * docs/tools/widgets.c: Create scrolledwindow and statusbar 
+       images.
+
 2004-10-10  Matthias Clasen  <matthias@localhost.localdomain>
 
-       * 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 edbe184a62f60756b70e788c06ee5fc436d0bf86..24c0d64608864693597ae90371926fc6d66c6b6f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,7 +1,12 @@
+2004-10-11  Matthias Clasen  <matthias@localhost.localdomain>
+
+       * docs/tools/widgets.c: Create scrolledwindow and statusbar 
+       images.
+
 2004-10-10  Matthias Clasen  <matthias@localhost.localdomain>
 
-       * 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 7192a70a85e06842dd7987c35e15dc06b966536d..9e8e81b9a70707d667696d0ff692f8f438983833 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-11  Matthias Clasen  <matthias@localhost.localdomain>
+
+       * gtk/images/statusbar.png: New image.
+
+       * gtk/visual_index.xml:
+       * gtk/Makefile.am (HTML_IMAGES): Add statusbar image.
+
 2004-10-11  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/migrating-GtkComboBox.sgml: Remove chapterinfo.
@@ -10,6 +17,12 @@
 
 2004-10-10  Matthias Clasen  <matthias@localhost.localdomain>
 
+       * 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 58512a61af6d579c57c8f34dad1e097a92e24308..fd8ab8e83f61ad1da02d9b11beca5846b3985f47 100644 (file)
--- 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 (file)
index 0000000..b19f54b
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 (file)
index 0000000..0f287d8
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 (file)
index 0000000..c4be963
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 00d61f98ef594a54122dee0dd5447d311d4f84c3..a57843ff42b57c163c3cf387b422419c82d585a8 100644 (file)
--- a/docs/reference/gtk/visual_index.xml
+++ b/docs/reference/gtk/visual_index.xml
@@ -1,48 +1,80 @@
 <para role="gallery">
-<link linkend="GtkAccelLabel"><inlinegraphic fileref="accel-label.png"
-format="PNG"></inlinegraphic></link> <link
-linkend="GtkButton"><inlinegraphic fileref="button.png"
-format="PNG"></inlinegraphic></link> <link
-linkend="GtkCheckButton"><inlinegraphic fileref="check-button.png"
-format="PNG"></inlinegraphic></link> <link
-linkend="GtkColorButton"><inlinegraphic fileref="color-button.png"
-format="PNG"></inlinegraphic></link> <link
-linkend="GtkComboBoxEntry"><inlinegraphic
-fileref="combo-box-entry.png" format="PNG"></inlinegraphic></link>
-<link linkend="GtkEntry"><inlinegraphic fileref="entry.png"
-format="PNG"></inlinegraphic></link> <link
-linkend="gtk-GtkFileChooserButton"><inlinegraphic
-fileref="file-button.png" format="PNG"></inlinegraphic></link> <link
-linkend="GtkFontButton"><inlinegraphic fileref="font-button.png"
-format="PNG"></inlinegraphic></link> <link
-linkend="GtkFrame"><inlinegraphic fileref="frame.png"
-format="PNG"></inlinegraphic></link> <link
-linkend="GtkIconView"><inlinegraphic fileref="icon-view.png"
-format="PNG"></inlinegraphic></link> <link
-linkend="GtkLabel"><inlinegraphic fileref="label.png"
-format="PNG"></inlinegraphic></link> <link
-linkend="GtkTreeView"><inlinegraphic fileref="list-and-tree.png"
-format="PNG"></inlinegraphic></link> <link
-linkend="GtkTextView"><inlinegraphic fileref="multiline-text.png"
-format="PNG"></inlinegraphic></link> <link
-linkend="GtkPaned"><inlinegraphic fileref="panes.png"
-format="PNG"></inlinegraphic></link> <link
-linkend="GtkRadioButton"><inlinegraphic fileref="radio-group.png"
-format="PNG"></inlinegraphic></link> <link
-linkend="GtkSeparator"><inlinegraphic fileref="separator.png"
-format="PNG"></inlinegraphic></link> <link
-linkend="GtkToggleButton"><inlinegraphic fileref="toggle-button.png"
-format="PNG"></inlinegraphic></link> <link
-linkend="GtkWindow"><inlinegraphic fileref="window.png"
-format="PNG"></inlinegraphic></link> <link
-linkend="GtkNotebook"><inlinegraphic fileref="notebook.png"
-format="PNG"></inlinegraphic></link> <link
-linkend="GtkMessageDialog"><inlinegraphic fileref="messagedialog.png"
-format="PNG"></inlinegraphic></link> <link
-linkend="GtkToolbar"><inlinegraphic fileref="toolbar.png"
-format="PNG"></inlinegraphic></link> <link
-linkend="GtkMenuBar"><inlinegraphic fileref="menubar.png"
-format="PNG"></inlinegraphic></link>
-linkend="GtkProgressBar"><inlinegraphic fileref="progressbar.png"
-format="PNG"></inlinegraphic></link>
+  <link linkend="GtkAccelLabel">
+    <inlinegraphic fileref="accel-label.png" format="PNG"></inlinegraphic>
+  </link> 
+  <link linkend="GtkButton">
+    <inlinegraphic fileref="button.png" format="PNG"></inlinegraphic>
+  </link>
+  <link linkend="GtkCheckButton">
+    <inlinegraphic fileref="check-button.png" format="PNG"></inlinegraphic>
+  </link>
+  <link linkend="GtkColorButton">
+    <inlinegraphic fileref="color-button.png" format="PNG"></inlinegraphic>
+  </link>
+  <link linkend="GtkComboBoxEntry">
+    <inlinegraphic fileref="combo-box-entry.png" format="PNG"></inlinegraphic>
+  </link>
+  <link linkend="GtkEntry">
+    <inlinegraphic fileref="entry.png" format="PNG"></inlinegraphic>
+  </link>
+  <link linkend="gtk-GtkFileChooserButton">
+    <inlinegraphic fileref="file-button.png" format="PNG"></inlinegraphic>
+  </link>
+  <link linkend="GtkFontButton">
+    <inlinegraphic fileref="font-button.png" format="PNG"></inlinegraphic>
+  </link>
+  <link linkend="GtkFrame">
+    <inlinegraphic fileref="frame.png" format="PNG"></inlinegraphic>
+  </link>
+  <link linkend="GtkIconView">
+    <inlinegraphic fileref="icon-view.png" format="PNG"></inlinegraphic>
+  </link>
+  <link linkend="GtkLabel">
+    <inlinegraphic fileref="label.png" format="PNG"></inlinegraphic>
+  </link>
+  <link linkend="GtkTreeView">
+    <inlinegraphic fileref="list-and-tree.png" format="PNG"></inlinegraphic>
+  </link>
+  <link linkend="GtkTextView">
+    <inlinegraphic fileref="multiline-text.png" format="PNG"></inlinegraphic>
+  </link>
+  <link linkend="GtkPaned">
+    <inlinegraphic fileref="panes.png" format="PNG"></inlinegraphic>
+  </link> 
+  <link linkend="GtkRadioButton">
+    <inlinegraphic fileref="radio-group.png" format="PNG"></inlinegraphic>
+  </link>
+  <link linkend="GtkSeparator">
+    <inlinegraphic fileref="separator.png" format="PNG"></inlinegraphic>
+  </link>
+  <link linkend="GtkToggleButton">
+    <inlinegraphic fileref="toggle-button.png" format="PNG"></inlinegraphic>
+  </link>
+  <link linkend="GtkWindow">
+    <inlinegraphic fileref="window.png" format="PNG"></inlinegraphic>
+  </link>
+  <link linkend="GtkNotebook">
+    <inlinegraphic fileref="notebook.png" format="PNG"></inlinegraphic>
+  </link>
+  <link linkend="GtkMessageDialog">
+    <inlinegraphic fileref="messagedialog.png" format="PNG"></inlinegraphic>
+  </link>
+  <link linkend="GtkToolbar">
+    <inlinegraphic fileref="toolbar.png" format="PNG"></inlinegraphic>
+  </link> 
+  <link linkend="GtkMenuBar">
+    <inlinegraphic fileref="menubar.png" format="PNG"></inlinegraphic>
+  </link>
+  <link linkend="GtkProgressBar">
+    <inlinegraphic fileref="progressbar.png" format="PNG"></inlinegraphic>
+  </link>
+  <link linkend="GtkScrolledWindow">
+    <inlinegraphic fileref="scrolledwindow.png" format="PNG"></inlinegraphic>
+  </link>
+  <link linkend="GtkSpinButton">
+    <inlinegraphic fileref="spinbutton.png" format="PNG"></inlinegraphic>
+  </link>
+  <link linkend="GtkStatusbar">
+    <inlinegraphic fileref="statusbar.png" format="PNG"></inlinegraphic>
+  </link>
 </para>

diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index b7d0ade89183d47e5df0d28b08e4a1a144f5d26c..c1db25e020b72ee5ab4ae936417299183591a3f1 100644 (file)
--- 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;
 }