gtk+ r22427 - in trunk: . demos/gtk-demo docs/reference docs/reference/gtk docs/reference/gtk/images docs/tools

[matthiasc svn gnome org]

Author: matthiasc
Date: Sun Mar  1 05:19:42 2009
New Revision: 22427
URL: http://svn.gnome.org/viewvc/gtk+?rev=22427&view=rev

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

        * docs/tools/widgets.c: Add GtkAboutDialog



Added:
   trunk/docs/reference/gtk/images/aboutdialog.png   (contents, props changed)
Modified:
   trunk/ChangeLog
   trunk/demos/gtk-demo/appwindow.c
   trunk/docs/reference/ChangeLog
   trunk/docs/reference/gtk/Makefile.am
   trunk/docs/reference/gtk/images/messagedialog.png
   trunk/docs/tools/widgets.c

Modified: trunk/demos/gtk-demo/appwindow.c
==============================================================================
--- trunk/demos/gtk-demo/appwindow.c	(original)
+++ trunk/demos/gtk-demo/appwindow.c	Sun Mar  1 05:19:42 2009
@@ -132,9 +132,9 @@
   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.",

Modified: trunk/docs/reference/gtk/Makefile.am
==============================================================================
--- trunk/docs/reference/gtk/Makefile.am	(original)
+++ trunk/docs/reference/gtk/Makefile.am	Sun Mar  1 05:19:42 2009
@@ -295,6 +295,7 @@
 	$(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					\

Added: trunk/docs/reference/gtk/images/aboutdialog.png
==============================================================================
Binary file. No diff available.

Modified: trunk/docs/reference/gtk/images/messagedialog.png
==============================================================================
Binary files. No diff available.

Modified: trunk/docs/tools/widgets.c
==============================================================================
--- trunk/docs/tools/widgets.c	(original)
+++ trunk/docs/tools/widgets.c	Sun Mar  1 05:19:42 2009
@@ -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 @@
 				   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 @@
 {
   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 ());