disobedience uses disorder_short_version_string instead of VERSION

[disorder] / disobedience / menu.c

diff --git a/disobedience/menu.c b/disobedience/menu.c
index 843f45148565ea7a20c61ebc07496d356ae3a543..2b0cd2f1348b2ea201630e08bf9efc1825b972c6 100644 (file)
--- a/disobedience/menu.c
+++ b/disobedience/menu.c
@@ -111,26 +111,71 @@ static void about_popup(gpointer attribute((unused)) callback_data,
                            0);
 }
 
+static void manual_popup(gpointer attribute((unused)) callback_data,
+                       guint attribute((unused)) callback_action,
+                       GtkWidget attribute((unused)) *menu_item) {
+  D(("manual_popup"));
+
+  popup_help();
+}
+
 /** @brief Callde when version arrives, displays about... popup */
 static void about_popup_got_version(void attribute((unused)) *v,
                                     const char *value) {
   GtkWidget *w;
   char *server_version_string;
+  char *short_version_string;
+  GtkWidget *hbox, *vbox, *title;
 
   byte_xasprintf(&server_version_string, "Server version %s", value);
-  w = gtk_dialog_new_with_buttons("About DisOrder",
+  byte_xasprintf(&short_version_string, "Disobedience %s",
+                 disorder_short_version_string);
+  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(short_version_string),
+                     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));
   gtk_widget_destroy(w);
@@ -138,6 +183,8 @@ static void about_popup_got_version(void attribute((unused)) *v,
 
 /** @brief Create the menu bar widget */
 GtkWidget *menubar(GtkWidget *w) {
+  GtkWidget *m;
+
   static const GtkItemFactoryEntry entries[] = {
     {
       (char *)"/File",                  /* path */
@@ -238,6 +285,14 @@ GtkWidget *menubar(GtkWidget *w) {
       (char *)"<Branch>",               /* item_type */
       0                                 /* extra_data */
     },
+    {
+      (char *)"/Help/Manual page",      /* path */
+      0,                                /* accelerator */
+      manual_popup,                     /* callback */
+      0,                                /* callback_action */
+      0,                                /* item_type */
+      0                                 /* extra_data */
+    },
     {
       (char *)"/Help/About DisOrder",   /* path */
       0,                                /* accelerator */
@@ -265,9 +320,10 @@ GtkWidget *menubar(GtkWidget *w) {
                                                  "<GdisorderMain>/Edit/Track properties");
   assert(selectall_widget != 0);
   assert(properties_widget != 0);
-  return gtk_item_factory_get_widget(mainmenufactory,
-                                     "<GdisorderMain>");
-  /* menu bar had better not expand vertically if the window is too big */
+  m = gtk_item_factory_get_widget(mainmenufactory,
+                                  "<GdisorderMain>");
+  set_tool_colors(m);
+  return m;
 }
 
 /*