From d64a525f3e7921b6bed735e4298e8e85f09c71c1 Mon Sep 17 00:00:00 2001
From: dail8859 <dail8859@yahoo.com>
Date: Mon, 26 Sep 2016 10:31:12 -0400
Subject: [PATCH] Sort plugin menu by plugin name

---
 PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp | 6 +++++-
 PowerEditor/src/MISC/PluginsManager/PluginsManager.h   | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
index 96e66058..663cce54 100644
--- a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
+++ b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
@@ -27,6 +27,7 @@
 
 
 #include <shlwapi.h>
+#include <algorithm>
 #include "PluginsManager.h"
 #include "resource.h"
 
@@ -116,6 +117,7 @@ int PluginsManager::loadPlugin(const TCHAR *pluginFilePath, vector<generic_strin
 		pi->_pFuncGetName = (PFUNCGETNAME)GetProcAddress(pi->_hLib, "getName");
 		if (!pi->_pFuncGetName)
 			throw generic_string(TEXT("Missing \"getName\" function"));
+		pi->_funcName = pi->_pFuncGetName();
 
 		pi->_pBeNotified = (PBENOTIFIED)GetProcAddress(pi->_hLib, "beNotified");
 		if (!pi->_pBeNotified)
@@ -300,6 +302,8 @@ bool PluginsManager::loadPlugins(const TCHAR *dir)
 	for (size_t j = 0, len = dll2Remove.size() ; j < len ; ++j)
 		::DeleteFile(dll2Remove[j].c_str());
 
+	std::sort(_pluginInfos.begin(), _pluginInfos.end(), [](const PluginInfo *a, const PluginInfo *b) { return a->_funcName < b->_funcName; });
+
 	return true;
 }
 
@@ -334,7 +338,7 @@ bool PluginsManager::getShortcutByCmdID(int cmdID, ShortcutKey *sk)
 void PluginsManager::addInMenuFromPMIndex(int i)
 {
     vector<PluginCmdShortcut> & pluginCmdSCList = (NppParameters::getInstance())->getPluginCommandList();
-	::InsertMenu(_hPluginsMenu, i, MF_BYPOSITION | MF_POPUP, (UINT_PTR)_pluginInfos[i]->_pluginMenu, _pluginInfos[i]->_pFuncGetName());
+	::InsertMenu(_hPluginsMenu, i, MF_BYPOSITION | MF_POPUP, (UINT_PTR)_pluginInfos[i]->_pluginMenu, _pluginInfos[i]->_funcName.c_str());
 
     unsigned short j = 0;
 	for ( ; j < _pluginInfos[i]->_nbFuncItem ; ++j)
diff --git a/PowerEditor/src/MISC/PluginsManager/PluginsManager.h b/PowerEditor/src/MISC/PluginsManager/PluginsManager.h
index 9eb95822..eb82b332 100644
--- a/PowerEditor/src/MISC/PluginsManager/PluginsManager.h
+++ b/PowerEditor/src/MISC/PluginsManager/PluginsManager.h
@@ -80,6 +80,7 @@ struct PluginInfo
 	FuncItem *_funcItems = NULL;
 	int _nbFuncItem = 0;
 	generic_string _moduleName;
+	generic_string _funcName;
 };
 
 class PluginsManager