diff options
author | Matthias Clasen <matthiasc@src.gnome.org> | 2009-03-01 05:19:42 +0000 |
---|---|---|
committer | Matthias Clasen <matthiasc@src.gnome.org> | 2009-03-01 05:19:42 +0000 |
commit | f3f4fec8db1742ed54aa8217b19f77a3771bf1a3 (patch) | |
tree | 93a0e4ce66bf7194bc60a137793fb3fb073ee30d | |
parent | 7ab372c6cafd2cac572128d389a1b732f540b6bb (diff) | |
download | gdk-pixbuf-f3f4fec8db1742ed54aa8217b19f77a3771bf1a3.tar.gz |
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
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | demos/gtk-demo/appwindow.c | 4 | ||||
-rw-r--r-- | docs/reference/ChangeLog | 8 | ||||
-rw-r--r-- | docs/reference/gtk/Makefile.am | 1 | ||||
-rw-r--r-- | docs/reference/gtk/images/aboutdialog.png | bin | 0 -> 24772 bytes | |||
-rw-r--r-- | docs/reference/gtk/images/messagedialog.png | bin | 2629 -> 9767 bytes | |||
-rw-r--r-- | docs/tools/widgets.c | 34 |
7 files changed, 50 insertions, 4 deletions
@@ -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 ee819f757..43870d43e 100644 --- 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 879ee8c0c..b9566ada1 100644 --- 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 7f5b9b3c1..2e2b9f84f 100644 --- 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 Binary files differnew file mode 100644 index 000000000..2ef2fedd8 --- /dev/null +++ b/docs/reference/gtk/images/aboutdialog.png diff --git a/docs/reference/gtk/images/messagedialog.png b/docs/reference/gtk/images/messagedialog.png Binary files differindex fe3885849..251845ed7 100644 --- a/docs/reference/gtk/images/messagedialog.png +++ b/docs/reference/gtk/images/messagedialog.png diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c index ae75f3104..3f512fb69 100644 --- 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 ()); |