From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Mon, 29 Oct 2007 23:37:58 +0000 (+0000)
Subject: shiner about... box
X-Git-Tag: debian-1_5_99dev8~74
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/413b30a4f714981cad20eb906593d519c05ac98c

shiner about... box
---

diff --git a/disobedience/menu.c b/disobedience/menu.c
index 3ebba2f..216b5de 100644
--- a/disobedience/menu.c
+++ b/disobedience/menu.c
@@ -124,21 +124,54 @@ static void about_popup_got_version(void attribute((unused)) *v,
                                     const char *value) {
   GtkWidget *w;
   char *server_version_string;
+  GtkWidget *hbox, *vbox, *title;
 
   byte_xasprintf(&server_version_string, "Server version %s", value);
-  w = gtk_dialog_new_with_buttons("About DisOrder",
+  w = gtk_dialog_new_with_buttons("About Disobedience",
                                   GTK_WINDOW(toplevel),
                                   (GTK_DIALOG_MODAL
                                    |GTK_DIALOG_DESTROY_WITH_PARENT),
                                   GTK_STOCK_OK,
                                   GTK_RESPONSE_ACCEPT,
                                   (char *)NULL);
-  gtk_container_add(GTK_CONTAINER(GTK_DIALOG(w)->vbox),
-                    gtk_label_new("DisOrder client " VERSION));
-  gtk_container_add(GTK_CONTAINER(GTK_DIALOG(w)->vbox),
-                    gtk_label_new(server_version_string));
-  gtk_container_add(GTK_CONTAINER(GTK_DIALOG(w)->vbox),
-                    gtk_label_new("(c) 2004-2007 Richard Kettlewell"));
+  hbox = gtk_hbox_new(FALSE/*homogeneous*/, 1/*padding*/);
+  vbox = gtk_vbox_new(FALSE/*homogeneous*/, 1/*padding*/);
+  gtk_box_pack_start(GTK_BOX(hbox),
+                     gtk_image_new_from_pixbuf(find_image("duck.png")),
+                     FALSE/*expand*/,
+                     FALSE/*fill*/,
+                     4/*padding*/);
+  gtk_box_pack_start(GTK_BOX(vbox),
+                     gtk_label_new("Disobedience " VERSION),
+                     FALSE/*expand*/,
+                     FALSE/*fill*/,
+                     1/*padding*/);
+  gtk_box_pack_start(GTK_BOX(vbox),
+                     gtk_label_new(server_version_string),
+                     FALSE/*expand*/,
+                     FALSE/*fill*/,
+                     1/*padding*/);
+  gtk_box_pack_start(GTK_BOX(vbox),
+                     gtk_label_new("(c) 2004-2007 Richard Kettlewell"),
+                     FALSE/*expand*/,
+                     FALSE/*fill*/,
+                     1/*padding*/);
+  gtk_box_pack_end(GTK_BOX(hbox),
+                   vbox,
+                   FALSE/*expand*/,
+                   FALSE/*fill*/,
+                   0/*padding*/);
+  title = gtk_label_new(0);
+  gtk_label_set_markup(GTK_LABEL(title),
+                       "<span font_desc=\"Sans 36\">Disobedience</span>");
+  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(w)->vbox), title,
+                     FALSE/*expand*/,
+                     FALSE/*fill*/,
+                     0/*padding*/);
+  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(w)->vbox), hbox,
+                     FALSE/*expand*/,
+                     FALSE/*fill*/,
+                     0/*padding*/);
   set_tool_colors(w);
   gtk_widget_show_all(w);
   gtk_dialog_run(GTK_DIALOG(w));
diff --git a/images/Makefile.am b/images/Makefile.am
index b346420..50759ed 100644
--- a/images/Makefile.am
+++ b/images/Makefile.am
@@ -25,6 +25,6 @@ propagate.png speaker.png speakercross.png
 
 staticdir=${pkgdatadir}/static
 
-EXTRA_DIST=$(static_DATA)
+EXTRA_DIST=$(static_DATA) duck.png
 
 CLEANFILES=$(SEDFILES)
diff --git a/images/duck.png b/images/duck.png
new file mode 100644
index 0000000..38022b9
Binary files /dev/null and b/images/duck.png differ