Set the program-name property of the about dialog.

        * demos/gtk-demo/appwindow.c: Set the program-name property
        of the about dialog.

        * docs/tools/widgets.c: Add GtkAboutDialog

svn path=/trunk/; revision=22427

diff --git a/ChangeLog b/ChangeLog
index 1cb791e25cc38c88c61e24e0b560264a0fe6607d..d1bd1b2d0e8d2ae8499fe269e240195fe79f9c95 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-01  Matthias Clasen  <mclasen@redhat.com>
+
+       * demos/gtk-demo/appwindow.c: Set the program-name property
+       of the about dialog.
+
+       * docs/tools/widgets.c: Add GtkAboutDialog
+
 2009-02-28  Matthias Clasen  <mclasen@redhat.com>
 
        Bug 572273 – No replacement documented for gtk_action_connect_proxy()

diff --git a/demos/gtk-demo/appwindow.c b/demos/gtk-demo/appwindow.c
index ee819f757b07f2ea5b137cc0db923203e385e25b..43870d43e62a0a28a9ba2f3453b307059d8842de 100644 (file)
--- a/demos/gtk-demo/appwindow.c
+++ b/demos/gtk-demo/appwindow.c
@@ -132,9 +132,9 @@ about_cb (GtkAction *action,
   gtk_about_dialog_set_email_hook (activate_email, NULL, NULL);
   gtk_about_dialog_set_url_hook (activate_url, NULL, NULL);
   gtk_show_about_dialog (GTK_WINDOW (window),
-                        "name", "GTK+ Code Demos",
+                        "program-name", "GTK+ Code Demos",
                         "version", PACKAGE_VERSION,
-                        "copyright", "(C) 1997-2005 The GTK+ Team",
+                        "copyright", "(C) 1997-2009 The GTK+ Team",
                         "license", license,
                         "website", "http://www.gtk.org",
                         "comments", "Program to demonstrate GTK+ functions.",

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 879ee8c0cf7f49cba63d0ec6bf22270740b0b996..b9566ada16703cf343991af238d5b2121cf3653f 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,11 @@
+2009-03-01  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/images/messagedialog.png: Fix this image
+
+       * gtk/images/aboutdialog.png: New image
+       * gtk/Makefile.am: Add it here.
+       * gtk/visual_index.xml: And here.
+
 2009-02-20  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtk-sections.txt: Add gtk_window_get_default_icon_name

diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 7f5b9b3c139ba517efaa479e37006f248dbad585..2e2b9f84f3a72e1571c4856b19ea856876565054 100644 (file)
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -295,6 +295,7 @@ HTML_IMAGES = \
        $(top_srcdir)/gtk/stock-icons/24/gtk-fullscreen.png             \
        $(top_srcdir)/gtk/stock-icons/24/gtk-leave-fullscreen.png       \
        $(top_srcdir)/gtk/stock-icons/24/gtk-info.png                   \
+       $(srcdir)/images/aboutdialog.png                                \
        $(srcdir)/images/accel-label.png                                \
        $(srcdir)/images/assistant.png                                  \
        $(srcdir)/images/button.png                                     \

diff --git a/docs/reference/gtk/images/aboutdialog.png b/docs/reference/gtk/images/aboutdialog.png
new file mode 100644 (file)
index 0000000..2ef2fed
Binary files /dev/null and b/docs/reference/gtk/images/aboutdialog.png differ

diff --git a/docs/reference/gtk/images/messagedialog.png b/docs/reference/gtk/images/messagedialog.png
index fe38858496a57cd1aec31b5c0fdb6b89ec82056d..251845ed7f61feb880a6aad5eb33392cb354d0ce 100644 (file)
Binary files a/docs/reference/gtk/images/messagedialog.png and b/docs/reference/gtk/images/messagedialog.png differ

diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index ae75f3104b2feb59b9b2ca6706d0647862b043d1..3f512fb69b2dc7776e00ec434ba6344908476c7d 100644 (file)
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -1,10 +1,11 @@
+#include "config.h"
+
 #include <gtk/gtkunixprint.h>
 #include <gdk/gdkkeysyms.h>
 #include <X11/Xatom.h>
 #include <gdkx.h>
 #include "widgets.h"
 
-
 #define SMALL_WIDTH  240
 #define SMALL_HEIGHT 75
 #define MEDIUM_WIDTH 240
@@ -765,9 +766,37 @@ create_message_dialog (void)
                                   GTK_MESSAGE_INFO,
                                   GTK_BUTTONS_OK,
                                   NULL);
+  gtk_window_set_icon_name (GTK_WINDOW (widget), "gtk-copy");
   gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (widget),
                                 "<b>Message Dialog</b>\n\nWith secondary text");
-  return new_widget_info ("messagedialog", widget, MEDIUM);
+  return new_widget_info ("messagedialog", widget, ASIS);
+}
+
+static WidgetInfo *
+create_about_dialog (void)
+{
+  GtkWidget *widget;
+  const gchar *authors[] = {
+    "Peter Mattis",
+    "Spencer Kimball",
+    "Josh MacDonald",
+    "and many more...",
+    NULL
+  };
+
+  widget = gtk_about_dialog_new ();
+  g_object_set (widget,
+                "program-name", "GTK+ Code Demos",
+                "version", PACKAGE_VERSION,
+                "copyright", "(C) 1997-2009 The GTK+ Team",
+                "website", "http://www.gtk.org",
+                "comments", "Program to demonstrate GTK+ functions.",
+                "logo-icon-name", "gtk-about",
+                "title", "About GTK+ Code Demos",
+                "authors", authors,
+               NULL);
+  gtk_window_set_icon_name (GTK_WINDOW (widget), "gtk-about");
+  return new_widget_info ("aboutdialog", widget, ASIS);
 }
 
 static WidgetInfo *
@@ -956,6 +985,7 @@ get_all_widgets (void)
 {
   GList *retval = NULL;
 
+  retval = g_list_prepend (retval, create_about_dialog ());
   retval = g_list_prepend (retval, create_accel_label ());
   retval = g_list_prepend (retval, create_button ());
   retval = g_list_prepend (retval, create_check_button ());