Sort the man pages. Add capinfos and reordercap. Should we also any others (i.e., asn2deb, dftest, idl2deb, idl2wrs, randpkt)?

svn path=/trunk/; revision=50107

3 files changed, 48 insertions, 24 deletions

diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index bf19afe3d8..a968920c62 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -871,21 +871,21 @@ help_menu_wireshark_flt_cb(GtkAction *action _U_, gpointer user_data _U_)
 }
 
 static void
-help_menu_TShark_cb(GtkAction *action _U_, gpointer user_data _U_)
+help_menu_Capinfos_cb(GtkAction *action _U_, gpointer user_data _U_)
 {
-    topic_menu_cb(NULL/*widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_TSHARK));
+    topic_menu_cb(NULL/*widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_CAPINFOS));
 }
 
 static void
-help_menu_RawShark_cb(GtkAction *action _U_, gpointer user_data _U_)
+help_menu_Dumpcap_cb(GtkAction *action _U_, gpointer user_data _U_)
 {
-    topic_menu_cb(NULL/*widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_RAWSHARK));
+    topic_menu_cb(NULL/*widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_DUMPCAP));
 }
 
 static void
-help_menu_Dumpcap_cb(GtkAction *action _U_, gpointer user_data _U_)
+help_menu_Editcap_cb(GtkAction *action _U_, gpointer user_data _U_)
 {
-    topic_menu_cb(NULL/*widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_DUMPCAP));
+    topic_menu_cb(NULL/* widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_EDITCAP));
 }
 
 static void
@@ -895,9 +895,15 @@ help_menu_Mergecap_cb(GtkAction *action _U_, gpointer user_data _U_)
 }
 
 static void
-help_menu_Editcap_cb(GtkAction *action _U_, gpointer user_data _U_)
+help_menu_RawShark_cb(GtkAction *action _U_, gpointer user_data _U_)
 {
-    topic_menu_cb(NULL/* widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_EDITCAP));
+    topic_menu_cb(NULL/*widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_RAWSHARK));
+}
+
+static void
+help_menu_Reorder_cb(GtkAction *action _U_, gpointer user_data _U_)
+{
+    topic_menu_cb(NULL/*widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_REORDERCAP));
 }
 
 static void
@@ -907,6 +913,12 @@ help_menu_Text2pcap_cb(GtkAction *action _U_, gpointer user_data _U_)
 }
 
 static void
+help_menu_TShark_cb(GtkAction *action _U_, gpointer user_data _U_)
+{
+    topic_menu_cb(NULL/*widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_TSHARK));
+}
+
+static void
 help_menu_Website_cb(GtkAction *action _U_, gpointer user_data _U_)
 {
     topic_menu_cb(NULL/* widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(ONLINEPAGE_HOME));
@@ -1293,12 +1305,14 @@ static const char *ui_desc_menubar =
 "        <menuitem name='Wireshark' action='/Help/ManualPages/Wireshark'/>\n"
 "        <menuitem name='WiresharkFilter' action='/Help/ManualPages/WiresharkFilter'/>\n"
 "        <separator/>\n"
-"        <menuitem name='TShark' action='/Help/ManualPages/TShark'/>\n"
-"        <menuitem name='RawShark' action='/Help/ManualPages/RawShark'/>\n"
+"        <menuitem name='Capinfos' action='/Help/ManualPages/Capinfos'/>\n"
 "        <menuitem name='Dumpcap' action='/Help/ManualPages/Dumpcap'/>\n"
-"        <menuitem name='Mergecap' action='/Help/ManualPages/Mergecap'/>\n"
 "        <menuitem name='Editcap' action='/Help/ManualPages/Editcap'/>\n"
+"        <menuitem name='Mergecap' action='/Help/ManualPages/Mergecap'/>\n"
+"        <menuitem name='RawShark' action='/Help/ManualPages/RawShark'/>\n"
+"        <menuitem name='Reordercap' action='/Help/ManualPages/Reordercap'/>\n"
 "        <menuitem name='Text2pcap' action='/Help/ManualPages/Text2pcap'/>\n"
+"        <menuitem name='TShark' action='/Help/ManualPages/TShark'/>\n"
 "      </menu>\n"
 "      <separator/>\n"
 "      <menuitem name='Website' action='/Help/Website'/>\n"
@@ -1732,12 +1746,14 @@ static const GtkActionEntry main_menu_bar_entries[] = {
    { "/Help/ManualPages",           NULL,                           "ManualPages",          NULL,                           NULL,               NULL },
    { "/Help/ManualPages/Wireshark", NULL,                           "Wireshark",            NULL,                           NULL,               G_CALLBACK(help_menu_wireshark_cb) },
    { "/Help/ManualPages/WiresharkFilter", NULL,                     "Wireshark Filter",     NULL,                           NULL,               G_CALLBACK(help_menu_wireshark_flt_cb) },
-   { "/Help/ManualPages/TShark",    NULL,                           "TShark",            NULL,                           NULL,               G_CALLBACK(help_menu_TShark_cb) },
-   { "/Help/ManualPages/RawShark",  NULL,                           "RawShark",             NULL,                           NULL,               G_CALLBACK(help_menu_RawShark_cb) },
+   { "/Help/ManualPages/Capinfos",  NULL,                           "Capinfos",              NULL,                          NULL,               G_CALLBACK(help_menu_Capinfos_cb) },
    { "/Help/ManualPages/Dumpcap",   NULL,                           "Dumpcap",              NULL,                           NULL,               G_CALLBACK(help_menu_Dumpcap_cb) },
-   { "/Help/ManualPages/Mergecap",  NULL,                           "Mergecap",             NULL,                           NULL,               G_CALLBACK(help_menu_Mergecap_cb) },
    { "/Help/ManualPages/Editcap",   NULL,                           "Editcap",              NULL,                           NULL,               G_CALLBACK(help_menu_Editcap_cb) },
+   { "/Help/ManualPages/Mergecap",  NULL,                           "Mergecap",             NULL,                           NULL,               G_CALLBACK(help_menu_Mergecap_cb) },
+   { "/Help/ManualPages/RawShark",  NULL,                           "RawShark",             NULL,                           NULL,               G_CALLBACK(help_menu_RawShark_cb) },
+   { "/Help/ManualPages/Reordercap",  NULL,                         "Reordercap",             NULL,                         NULL,               G_CALLBACK(help_menu_Reorder_cb) },
    { "/Help/ManualPages/Text2pcap", NULL,                           "Text2pcap",            NULL,                           NULL,               G_CALLBACK(help_menu_Text2pcap_cb) },
+   { "/Help/ManualPages/TShark",    NULL,                           "TShark",            NULL,                           NULL,               G_CALLBACK(help_menu_TShark_cb) },
 
    { "/Help/Website",               GTK_STOCK_HOME,                 "Website",              NULL,                           NULL,               G_CALLBACK(help_menu_Website_cb) },
    { "/Help/FAQs",                  NULL,                           "FAQ's",                NULL,                           NULL,               G_CALLBACK(help_menu_faq_cb) },
diff --git a/ui/help_url.c b/ui/help_url.c
index 9a30f93a38..c2ffa70f99 100644
--- a/ui/help_url.c
+++ b/ui/help_url.c
@@ -179,24 +179,30 @@ topic_action_url(topic_action_e action)
     case(LOCALPAGE_MAN_WIRESHARK_FILTER):
         url = data_file_url("wireshark-filter.html");
         break;
-    case(LOCALPAGE_MAN_TSHARK):
-        url = data_file_url("tshark.html");
-        break;
-    case(LOCALPAGE_MAN_RAWSHARK):
-        url = data_file_url("rawshark.html");
+    case(LOCALPAGE_MAN_CAPINFOS):
+        url = data_file_url("capinfos.html");
         break;
     case(LOCALPAGE_MAN_DUMPCAP):
         url = data_file_url("dumpcap.html");
         break;
+    case(LOCALPAGE_MAN_EDITCAP):
+        url = data_file_url("editcap.html");
+        break;
     case(LOCALPAGE_MAN_MERGECAP):
         url = data_file_url("mergecap.html");
         break;
-    case(LOCALPAGE_MAN_EDITCAP):
-        url = data_file_url("editcap.html");
+    case(LOCALPAGE_MAN_RAWSHARK):
+        url = data_file_url("rawshark.html");
+        break;
+    case(LOCALPAGE_MAN_REORDERCAP):
+        url = data_file_url("reordercap.html");
         break;
     case(LOCALPAGE_MAN_TEXT2PCAP):
         url = data_file_url("text2pcap.html");
         break;
+    case(LOCALPAGE_MAN_TSHARK):
+        url = data_file_url("tshark.html");
+        break;
 
     /* local help pages (User's Guide) */
     case(HELP_CONTENT):
diff --git a/ui/help_url.h b/ui/help_url.h
index 3dbb8e69df..5ea82e112b 100644
--- a/ui/help_url.h
+++ b/ui/help_url.h
@@ -55,12 +55,14 @@ typedef enum {
     /* local manual pages */
     LOCALPAGE_MAN_WIRESHARK = 100,
     LOCALPAGE_MAN_WIRESHARK_FILTER,
-    LOCALPAGE_MAN_TSHARK,
-    LOCALPAGE_MAN_RAWSHARK,
+    LOCALPAGE_MAN_CAPINFOS,
     LOCALPAGE_MAN_DUMPCAP,
-    LOCALPAGE_MAN_MERGECAP,
     LOCALPAGE_MAN_EDITCAP,
+    LOCALPAGE_MAN_MERGECAP,
+    LOCALPAGE_MAN_RAWSHARK,
+    LOCALPAGE_MAN_REORDERCAP,
     LOCALPAGE_MAN_TEXT2PCAP,
+    LOCALPAGE_MAN_TSHARK,
 
     /* help pages (textfiles or local HTML User's Guide) */
     HELP_CONTENT = 200,