plugins: Be more descriptive in "about wireshark"->"folders"

Display separate entries for binary plugins and lua scripts.

This is explained in the user guide, that the binary folder is
a subfolder of the lua folder, but it's probably a good idea to be more
explicit about it, at the risk of cluttering the interface a bit.

Move GeoIP information down because it seems the least important.

Add helper functions to provide plugin version subdir.

Change some #ifdefs while at it for legibility.

Change-Id: Ieb8665df029b3c14de19e2c973bd9b1cc4ec4621
Reviewed-on: https://code.wireshark.org/review/23609
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>

1 files changed, 24 insertions, 16 deletions

diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp
index ed48c66a75..c48d727ab5 100644
--- a/ui/qt/about_dialog.cpp
+++ b/ui/qt/about_dialog.cpp
@@ -224,12 +224,33 @@ AboutDialog::AboutDialog(QWidget *parent) :
     /* program */
     message += about_folders_row("Program", get_progfile_dir(), "program files");
 
-#if defined(HAVE_PLUGINS) || defined(HAVE_LUA)
+#ifdef HAVE_PLUGINS
     /* pers plugins */
-    message += about_folders_row("Personal Plugins", get_plugins_pers_dir(), "dissector plugins");
+    message += about_folders_row("Personal Plugins", get_plugins_pers_dir_with_version(), "binary plugins");
 
     /* global plugins */
-    message += about_folders_row("Global Plugins", get_plugins_dir(), "dissector plugins");
+    message += about_folders_row("Global Plugins", get_plugins_dir_with_version(), "binary plugins");
+#endif
+
+#ifdef HAVE_LUA
+    /* pers plugins */
+    message += about_folders_row("Personal Lua Plugins", get_plugins_pers_dir(), "lua scripts");
+
+    /* global plugins */
+    message += about_folders_row("Global Lua Plugins", get_plugins_dir(), "lua scripts");
+#endif
+
+#ifdef HAVE_EXTCAP
+    /* Extcap */
+    constpath = get_extcap_dir();
+
+    resultArray = g_strsplit(constpath, G_SEARCHPATH_SEPARATOR_S, 10);
+
+    for(i = 0; resultArray[i]; i++) {
+        message += about_folders_row("Extcap path", g_strstrip(resultArray[i]),
+                                     "Extcap Plugins search path");
+    }
+    g_strfreev(resultArray);
 #endif
 
 #ifdef HAVE_GEOIP
@@ -260,19 +281,6 @@ AboutDialog::AboutDialog(QWidget *parent) :
     g_free(path);
 #endif
 
-#ifdef HAVE_EXTCAP
-    /* Extcap */
-    constpath = get_extcap_dir();
-
-    resultArray = g_strsplit(constpath, G_SEARCHPATH_SEPARATOR_S, 10);
-
-    for(i = 0; resultArray[i]; i++) {
-        message += about_folders_row("Extcap path", g_strstrip(resultArray[i]),
-                                     "Extcap Plugins search path");
-    }
-    g_strfreev(resultArray);
-#endif
-
     message += "</table>";
     ui->label_folders->setText(message);