diff --git a/ChangeLog b/ChangeLog index 360346b452..edbe184a62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-10-10 Matthias Clasen + + * docs/tools/widgets.c: Create a toolbar, menubar and + messagedialog images. + + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_select_all): + Avoid a warning. + Sun Oct 10 11:24:56 2004 Jonathan Blandford * gtk/gtkcontainer.h (struct _GtkContainer): add /*< private >*/ diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 360346b452..edbe184a62 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2004-10-10 Matthias Clasen + + * docs/tools/widgets.c: Create a toolbar, menubar and + messagedialog images. + + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_select_all): + Avoid a warning. + Sun Oct 10 11:24:56 2004 Jonathan Blandford * gtk/gtkcontainer.h (struct _GtkContainer): add /*< private >*/ diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 360346b452..edbe184a62 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2004-10-10 Matthias Clasen + + * docs/tools/widgets.c: Create a toolbar, menubar and + messagedialog images. + + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_select_all): + Avoid a warning. + Sun Oct 10 11:24:56 2004 Jonathan Blandford * gtk/gtkcontainer.h (struct _GtkContainer): add /*< private >*/ diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 360346b452..edbe184a62 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2004-10-10 Matthias Clasen + + * docs/tools/widgets.c: Create a toolbar, menubar and + messagedialog images. + + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_select_all): + Avoid a warning. + Sun Oct 10 11:24:56 2004 Jonathan Blandford * gtk/gtkcontainer.h (struct _GtkContainer): add /*< private >*/ diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index efb2371092..0b88c26796 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,15 @@ +2004-10-10 Matthias Clasen + + * gtk/images/progressbar.png: + * gtk/images/notebook.png: + * gtk/images/toolbar.png: + * gtk/images/menubar.png: + * gtk/images/messagedialog.png: New images. + + * gtk/Makefile.am (HTML_IMAGES): + * gtk/visual_index.xml: Add toolbar, menubar, progressbar, + notebook and message dialog. + 2004-10-09 Matthias Clasen * gtk/visual_index.xml: Correct some linkends. diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index 918e44e271..58512a61af 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -219,7 +219,12 @@ HTML_IMAGES = \ $(srcdir)/images/window.png \ $(srcdir)/images/accel-label.png \ $(srcdir)/images/file-button.png \ - $(srcdir)/images/icon-view.png + $(srcdir)/images/icon-view.png \ + $(srcdir)/images/toolbar.png \ + $(srcdir)/images/menubar.png \ + $(srcdir)/images/notebook.png \ + $(srcdir)/images/progressbar.png \ + $(srcdir)/images/messagedialog.png # Extra options to supply to gtkdoc-fixref FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html diff --git a/docs/reference/gtk/images/accel-label.png b/docs/reference/gtk/images/accel-label.png index 2cd2363b78..2e7d315d94 100644 Binary files a/docs/reference/gtk/images/accel-label.png and b/docs/reference/gtk/images/accel-label.png differ diff --git a/docs/reference/gtk/images/button.png b/docs/reference/gtk/images/button.png index 78bf3cccf3..76e2f68f3a 100644 Binary files a/docs/reference/gtk/images/button.png and b/docs/reference/gtk/images/button.png differ diff --git a/docs/reference/gtk/images/check-button.png b/docs/reference/gtk/images/check-button.png index 64f008e526..a42487fc2e 100644 Binary files a/docs/reference/gtk/images/check-button.png and b/docs/reference/gtk/images/check-button.png differ diff --git a/docs/reference/gtk/images/color-button.png b/docs/reference/gtk/images/color-button.png index 6369cd54af..e48a5771a8 100644 Binary files a/docs/reference/gtk/images/color-button.png and b/docs/reference/gtk/images/color-button.png differ diff --git a/docs/reference/gtk/images/combo-box-entry.png b/docs/reference/gtk/images/combo-box-entry.png index 8f6f5167a9..edaacbf5da 100644 Binary files a/docs/reference/gtk/images/combo-box-entry.png and b/docs/reference/gtk/images/combo-box-entry.png differ diff --git a/docs/reference/gtk/images/entry.png b/docs/reference/gtk/images/entry.png index 4786ec7b11..708de64975 100644 Binary files a/docs/reference/gtk/images/entry.png and b/docs/reference/gtk/images/entry.png differ diff --git a/docs/reference/gtk/images/file-button.png b/docs/reference/gtk/images/file-button.png index 04e8ef7810..d0dc0d9698 100644 Binary files a/docs/reference/gtk/images/file-button.png and b/docs/reference/gtk/images/file-button.png differ diff --git a/docs/reference/gtk/images/font-button.png b/docs/reference/gtk/images/font-button.png index a3937da7de..e8ae8ad93e 100644 Binary files a/docs/reference/gtk/images/font-button.png and b/docs/reference/gtk/images/font-button.png differ diff --git a/docs/reference/gtk/images/frame.png b/docs/reference/gtk/images/frame.png index 18e4f97944..e67db869ed 100644 Binary files a/docs/reference/gtk/images/frame.png and b/docs/reference/gtk/images/frame.png differ diff --git a/docs/reference/gtk/images/icon-view.png b/docs/reference/gtk/images/icon-view.png index ce53787cbf..93eaff0863 100644 Binary files a/docs/reference/gtk/images/icon-view.png and b/docs/reference/gtk/images/icon-view.png differ diff --git a/docs/reference/gtk/images/label.png b/docs/reference/gtk/images/label.png index abb3f3cda5..b3cc70bf57 100644 Binary files a/docs/reference/gtk/images/label.png and b/docs/reference/gtk/images/label.png differ diff --git a/docs/reference/gtk/images/list-and-tree.png b/docs/reference/gtk/images/list-and-tree.png index 0c6d2ec8e8..cd4831df0c 100644 Binary files a/docs/reference/gtk/images/list-and-tree.png and b/docs/reference/gtk/images/list-and-tree.png differ diff --git a/docs/reference/gtk/images/menubar.png b/docs/reference/gtk/images/menubar.png new file mode 100644 index 0000000000..51f0f06a57 Binary files /dev/null and b/docs/reference/gtk/images/menubar.png differ diff --git a/docs/reference/gtk/images/messagedialog.png b/docs/reference/gtk/images/messagedialog.png new file mode 100644 index 0000000000..35c5f11731 Binary files /dev/null and b/docs/reference/gtk/images/messagedialog.png differ diff --git a/docs/reference/gtk/images/multiline-text.png b/docs/reference/gtk/images/multiline-text.png index 2e3229584f..8a0811abb2 100644 Binary files a/docs/reference/gtk/images/multiline-text.png and b/docs/reference/gtk/images/multiline-text.png differ diff --git a/docs/reference/gtk/images/notebook.png b/docs/reference/gtk/images/notebook.png new file mode 100644 index 0000000000..7c562e4db0 Binary files /dev/null and b/docs/reference/gtk/images/notebook.png differ diff --git a/docs/reference/gtk/images/panes.png b/docs/reference/gtk/images/panes.png index be3b150694..4214d9c615 100644 Binary files a/docs/reference/gtk/images/panes.png and b/docs/reference/gtk/images/panes.png differ diff --git a/docs/reference/gtk/images/progressbar.png b/docs/reference/gtk/images/progressbar.png new file mode 100644 index 0000000000..abe116a187 Binary files /dev/null and b/docs/reference/gtk/images/progressbar.png differ diff --git a/docs/reference/gtk/images/radio-group.png b/docs/reference/gtk/images/radio-group.png index 092a35db9c..87200d0f5b 100644 Binary files a/docs/reference/gtk/images/radio-group.png and b/docs/reference/gtk/images/radio-group.png differ diff --git a/docs/reference/gtk/images/separator.png b/docs/reference/gtk/images/separator.png index 9d2ae4d1a7..d769bb5354 100644 Binary files a/docs/reference/gtk/images/separator.png and b/docs/reference/gtk/images/separator.png differ diff --git a/docs/reference/gtk/images/toggle-button.png b/docs/reference/gtk/images/toggle-button.png index d147d0e7e0..a10fbd4e20 100644 Binary files a/docs/reference/gtk/images/toggle-button.png and b/docs/reference/gtk/images/toggle-button.png differ diff --git a/docs/reference/gtk/images/toolbar.png b/docs/reference/gtk/images/toolbar.png new file mode 100644 index 0000000000..55b11678d5 Binary files /dev/null and b/docs/reference/gtk/images/toolbar.png differ diff --git a/docs/reference/gtk/images/window.png b/docs/reference/gtk/images/window.png index 926a773022..a28c8dc584 100644 Binary files a/docs/reference/gtk/images/window.png and b/docs/reference/gtk/images/window.png differ diff --git a/docs/reference/gtk/visual_index.xml b/docs/reference/gtk/visual_index.xml index ff131046cb..00d61f98ef 100644 --- a/docs/reference/gtk/visual_index.xml +++ b/docs/reference/gtk/visual_index.xml @@ -1,20 +1,48 @@ - - - - - - - - - - - - - - - - - - + + +linkend="GtkProgressBar"> diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c index 891d919ee3..b7d0ade891 100644 --- a/docs/tools/widgets.c +++ b/docs/tools/widgets.c @@ -17,15 +17,23 @@ new_widget_info (const char *name, info = g_new0 (WidgetInfo, 1); info->name = g_strdup (name); - info->window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + if (GTK_IS_WINDOW (widget)) + { + info->window = widget; + info->include_decorations = TRUE; + } + else + { + info->window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + info->include_decorations = FALSE; + gtk_widget_show_all (widget); + gtk_container_add (GTK_CONTAINER (info->window), widget); + } info->no_focus = TRUE; - info->include_decorations = FALSE; gtk_widget_set_app_paintable (info->window, TRUE); g_signal_connect (info->window, "focus", G_CALLBACK (gtk_true), NULL); gtk_container_set_border_width (GTK_CONTAINER (info->window), 12); - gtk_widget_show_all (widget); - gtk_container_add (GTK_CONTAINER (info->window), widget); switch (size) { @@ -432,6 +440,118 @@ create_window (void) return info; } +static WidgetInfo * +create_toolbar (void) +{ + GtkWidget *widget, *menu, *vbox, *align; + GtkToolItem *item; + + widget = gtk_toolbar_new (); + + item = gtk_tool_button_new_from_stock (GTK_STOCK_NEW); + gtk_toolbar_insert (GTK_TOOLBAR (widget), item, -1); + + item = gtk_menu_tool_button_new_from_stock (GTK_STOCK_OPEN); + menu = gtk_menu_new (); + gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (item), menu); + gtk_toolbar_insert (GTK_TOOLBAR (widget), item, -1); + + item = gtk_tool_button_new_from_stock (GTK_STOCK_REFRESH); + gtk_toolbar_insert (GTK_TOOLBAR (widget), item, -1); + + 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); +} + +static WidgetInfo * +create_menubar (void) +{ + GtkWidget *widget, *vbox, *align, *item; + + widget = gtk_menu_bar_new (); + + item = gtk_menu_item_new_with_mnemonic ("_File"); + gtk_menu_shell_append (GTK_MENU_SHELL (widget), item); + + item = gtk_menu_item_new_with_mnemonic ("_Edit"); + gtk_menu_shell_append (GTK_MENU_SHELL (widget), item); + + item = gtk_menu_item_new_with_mnemonic ("_Help"); + gtk_menu_shell_append (GTK_MENU_SHELL (widget), item); + + 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 ("Menu Bar"), + FALSE, FALSE, 0); + + return new_widget_info ("menubar", vbox, SMALL); +} + +static WidgetInfo * +create_message_dialog (void) +{ + GtkWidget *widget; + + widget = gtk_message_dialog_new (NULL, + 0, + GTK_MESSAGE_INFO, + GTK_BUTTONS_OK, + NULL); + gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (widget), + "Message Dialog"); + return new_widget_info ("messagedialog", widget, MEDIUM); +} + +static WidgetInfo * +create_notebook (void) +{ + GtkWidget *widget; + + widget = gtk_notebook_new (); + + gtk_notebook_append_page (GTK_NOTEBOOK (widget), + gtk_label_new ("Notebook"), + NULL); + gtk_notebook_append_page (GTK_NOTEBOOK (widget), gtk_event_box_new (), NULL); + gtk_notebook_append_page (GTK_NOTEBOOK (widget), gtk_event_box_new (), NULL); + + return new_widget_info ("notebook", widget, MEDIUM); +} + +static WidgetInfo * +create_progressbar (void) +{ + GtkWidget *vbox; + 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); + 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 ("Progress Bar"), + FALSE, FALSE, 0); + + return new_widget_info ("progressbar", vbox, SMALL); +} + GList * get_all_widgets (void) { @@ -455,6 +575,11 @@ get_all_widgets (void) retval = g_list_prepend (retval, create_accel_label ()); retval = g_list_prepend (retval, create_file_button ()); retval = g_list_prepend (retval, create_icon_view ()); + retval = g_list_prepend (retval, create_toolbar ()); + retval = g_list_prepend (retval, create_menubar ()); + retval = g_list_prepend (retval, create_notebook ()); + retval = g_list_prepend (retval, create_message_dialog ()); + retval = g_list_prepend (retval, create_progressbar ()); return retval; }