X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/ac6bf2bad50653d84388269a6629d121b8c37b8f..13affe66e42887bf256d91a719d8e25f51600136:/disobedience/menu.c

diff --git a/disobedience/menu.c b/disobedience/menu.c
index 5085be2..c5ace02 100644
--- a/disobedience/menu.c
+++ b/disobedience/menu.c
@@ -111,6 +111,14 @@ 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) {
@@ -139,24 +147,121 @@ static void about_popup_got_version(void attribute((unused)) *v,
 /** @brief Create the menu bar widget */
 GtkWidget *menubar(GtkWidget *w) {
   static const GtkItemFactoryEntry entries[] = {
-    { (char *)"/File", 0,  0, 0, (char *)"<Branch>", 0 },
-    { (char *)"/File/Login", (char *)"<CTRL>L", login, 0,
-      0, 0 },
-    { (char *)"/File/Quit Disobedience", (char *)"<CTRL>Q", quit_program, 0,
-      (char *)"<StockItem>", GTK_STOCK_QUIT },
-
-    { (char *)"/Edit", 0,  0, 0, (char *)"<Branch>", 0 },
-    { (char *)"/Edit/Select all tracks", (char *)"<CTRL>A", select_all, 0,
-      0, 0 },
-    { (char *)"/Edit/Track properties", 0, properties_item, 0,
-      0, 0 },
-
-    { (char *)"/Control", 0, 0, 0, (char *)"<Branch>", 0 },
-    { (char *)"/Control/Scratch", (char *)"<CTRL>S", 0, 0, 0, 0 },
+    {
+      (char *)"/File",                  /* path */
+      0,                                /* accelerator */
+      0,                                /* callback */
+      0,                                /* callback_action */
+      (char *)"<Branch>",               /* item_type */
+      0                                 /* extra_data */
+    },
+    { 
+      (char *)"/File/Login",            /* path */
+      (char *)"<CTRL>L",                /* accelerator */
+      login,                            /* callback */
+      0,                                /* callback_action */
+      0,                                /* item_type */
+      0                                 /* extra_data */
+    },
+    {
+      (char *)"/File/Quit Disobedience", /* path */
+      (char *)"<CTRL>Q",                /* accelerator */
+      quit_program,                     /* callback */
+      0,                                /* callback_action */
+      (char *)"<StockItem>",            /* item_type */
+      GTK_STOCK_QUIT                    /* extra_data */
+    },
+    
+    {
+      (char *)"/Edit",                  /* path */
+      0,                                /* accelerator */
+      0,                                /* callback */
+      0,                                /* callback_action */
+      (char *)"<Branch>",               /* item_type */
+      0                                 /* extra_data */
+    },
+    {
+      (char *)"/Edit/Select all tracks", /* path */
+      (char *)"<CTRL>A",                /* accelerator */
+      select_all,                       /* callback */
+      0,                                /* callback_action */
+      0,                                /* item_type */
+      0                                 /* extra_data */
+    },
+    {
+      (char *)"/Edit/Track properties", /* path */
+      0,                                /* accelerator */
+      properties_item,                  /* callback */
+      0,                                /* callback_action */
+      0,                                /* item_type */
+      0                                 /* extra_data */
+    },
+    
+    {
+      (char *)"/Control",               /* path */
+      0,                                /* accelerator */
+      0,                                /* callback */
+      0,                                /* callback_action */
+      (char *)"<Branch>",               /* item_type */
+      0                                 /* extra_data */
+    },
+    {
+      (char *)"/Control/Scratch",       /* path */
+      (char *)"<CTRL>S",                /* accelerator */
+      0,                                /* callback */
+      0,                                /* callback_action */
+      0,                                /* item_type */
+      0                                 /* extra_data */
+    },
+    {
+      (char *)"/Control/Playing",       /* path */
+      (char *)"<CTRL>P",                /* accelerator */
+      0,                                /* callback */
+      0,                                /* callback_action */
+      (char *)"<CheckItem>",            /* item_type */
+      0                                 /* extra_data */
+    },
+    {
+      (char *)"/Control/Random play",   /* path */
+      (char *)"<CTRL>R",                /* accelerator */
+      0,                                /* callback */
+      0,                                /* callback_action */
+      (char *)"<CheckItem>",            /* item_type */
+      0                                 /* extra_data */
+    },
+    {
+      (char *)"/Control/Network player", /* path */
+      (char *)"<CTRL>N",                /* accelerator */
+      0,                                /* callback */
+      0,                                /* callback_action */
+      (char *)"<CheckItem>",            /* item_type */
+      0                                 /* extra_data */
+    },
     
-    { (char *)"/Help", 0,  0, 0, (char *)"<Branch>", 0 },
-    { (char *)"/Help/About DisOrder", 0,  about_popup, 0,
-      (char *)"<StockItem>", GTK_STOCK_ABOUT },
+    {
+      (char *)"/Help",                  /* path */
+      0,                                /* accelerator */
+      0,                                /* callback */
+      0,                                /* callback_action */
+      (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 */
+      about_popup,                      /* callback */
+      0,                                /* callback_action */
+      (char *)"<StockItem>",            /* item_type */
+      GTK_STOCK_ABOUT                   /* extra_data */
+    },
   };
 
   GtkAccelGroup *accel = gtk_accel_group_new();