CollectionInterface: update NppMetaClass and global instance to require plugin name at instantiation

Author: pryrt

src/Classes/NppMetaClass.cpp

@@ -1,12 +1,10 @@
 #include "NppMetaClass.h"
 #include <pathcch.h>
 #include <shlwapi.h>
+#include "Version.h"
 
-// Global NppMetaInfo object
-NppMetaInfo gNppMetaInfo;
-
-NppMetaInfo::NppMetaInfo(void)
-	: hwnd(nppData)
+NppMetaInfo::NppMetaInfo(std::wstring wsPluginName)
+	: hwnd(nppData), _wsPluginName(wsPluginName)
 {
 	_isInitialized = false;
 	dir = { L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"" };
@@ -49,7 +47,7 @@ void NppMetaInfo::populate(void)
 	::SendMessage(hwnd._nppHandle, NPPM_GETPLUGINSCONFIGDIR, sz, reinterpret_cast<LPARAM>(pluginCfgDir.data()));
 	pcjHelper::delNull(pluginCfgDir);
 	dir.cfgPluginConfig = pluginCfgDir;
-	dir.cfgPluginConfigMyDir = pluginCfgDir + L"\\ConfigUpdater";
+	dir.cfgPluginConfigMyDir = pluginCfgDir + L"\\" + _wsPluginName;
 
 	// %AppData%\Notepad++\Plugins or equiv
 	//		since it's removing the tail, it will never be longer than pluginCfgDir; since it's in-place, initialize with the first

src/Classes/NppMetaClass.h

@@ -7,7 +7,7 @@
 class NppMetaInfo {
 public:
 	// constructor
-	NppMetaInfo(void);
+	NppMetaInfo(std::wstring wsPluginName);
 
 	// Run this in the constructor for any class that uses it
 	// (internally tracks whether it's been populated already, and doesn't duplicate effort)
@@ -17,17 +17,17 @@ class NppMetaInfo {
 
 	struct {
 		std::wstring
-			app,
-			appDataEquiv,
-			appThemes,
-			appExePath,
-			cfg,
-			cfgPluginConfig,
-			cfgPluginConfigMyDir,
-			cfgUdl,
-			cfgFunctionList,
-			cfgAutoCompletion,
-			cfgThemes;
+			app,						// directory where the executable is found
+			appDataEquiv,				// %AppData% or .app, ignoring Cloud or -settingsDir
+			appThemes,					// .app\Themes\ subfolder (alternate themes always under .app\ directory)
+			appExePath,					// .app\notepad++.exe == "path\to\notepad++.exe" (includes .exe file)
+			cfg,						// SettingsDir >> CloudDir >> AppData(equiv)
+			cfgPluginConfig,			// .appDataEquiv\plugins\Config
+			cfgPluginConfigMyDir,		// .appDataEquiv\plugins\Config\wsPluginName
+			cfgUdl,						// .cfg\userDefinedLangs\ subdir (SettingsDir >> Cloud Dir >> Portable >> AppData(equiv))
+			cfgFunctionList,			// .appDataEquiv\functionList\ subdir (skip Cloud or -settingsDir)
+			cfgAutoCompletion,			// .app\autoCompletion\ subdir
+			cfgThemes;					// .cfg\Themes\ subfoloder (SettingsDir >> Cloud Dir >> Portable >> AppData(equiv))
 	} dir;
 
 	////////////////////////////////
@@ -53,6 +53,7 @@ class NppMetaInfo {
 private:
 	bool _isInitialized;
 	std::wstring _askSettingsDir(void);
+	std::wstring _wsPluginName;
 };
 
 // make sure everyone who can see this class can see the global instance

src/PluginDefinition.cpp

@@ -20,8 +20,11 @@
 #include "PluginDefinition.h"
 #include "menuCmdID.h"
 #include "resource.h"
+#include "Version.h"
 #include "AboutDialog.h"
 #include "CollectionInterfaceDialog.h"
+#include "NppMetaClass.h"
+#include "OverrideMapUpdaterClass.h"
 
 static HANDLE _hModule;
 
@@ -35,6 +38,11 @@ FuncItem funcItem[nbFunc];
 //
 NppData nppData;
 
+//
+// Instantiate global NppMetaInfo object, passing in name of plugin
+//
+NppMetaInfo gNppMetaInfo(VERSION_NAME_WS);
+
 //
 // Initialize your plugin data here
 // It will be called while plugin loading   
@@ -67,12 +75,10 @@ void commandMenuInit()
     //            bool check0nInit                // optional. Make this menu item be checked visually
     //            );
     setCommand(0, TEXT("Collection Interface: Download"), showCollectionInterface, NULL, false);
-    setCommand(1, TEXT("Help: Download"), showCIDownloadHelp, NULL, false);
-    setCommand(2, TEXT(""), NULL, NULL, false);
-    //setCommand(3, TEXT("About (NonModal)"), showAbout, NULL, false);
-    setCommand(3, TEXT("About"), showAboutModal, NULL, false);
-    //setCommand(5, TEXT("Hello Notepad++"), hello, NULL, false);
-    //setCommand(6, TEXT("Hello (with dialog)"), helloDlg, NULL, false);
+    setCommand(1, TEXT("Collection Interface:: Experiment"), hello, NULL, false);
+    setCommand(2, TEXT("Help: Download"), showCIDownloadHelp, NULL, false);
+    setCommand(3, TEXT(""), NULL, NULL, false);
+    setCommand(4, TEXT("About"), showAboutModal, NULL, false);
 }
 
 //
@@ -108,19 +114,8 @@ bool setCommand(size_t index, TCHAR *cmdName, PFUNCPLUGINCMD pFunc, ShortcutKey
 //----------------------------------------------//
 void hello()
 {
-    // Open a new document
-    ::SendMessage(nppData._nppHandle, NPPM_MENUCOMMAND, 0, IDM_FILE_NEW);
-
-    // Get the current scintilla
-    int which = -1;
-    ::SendMessage(nppData._nppHandle, NPPM_GETCURRENTSCINTILLA, 0, (LPARAM)&which);
-    if (which == -1)
-        return;
-    HWND curScintilla = (which == 0)?nppData._scintillaMainHandle:nppData._scintillaSecondHandle;
-
-    // Say hello now :
-    // Scintilla control has no Unicode mode, so we use (char *) here
-    ::SendMessage(curScintilla, SCI_SETTEXT, 0, (LPARAM)"Hello, Notepad++!");
+    OverrideMapUpdater overMapUpdater;
+    overMapUpdater.experiment();
 }
 
 void helloDlg()

src/PluginDefinition.h

@@ -38,7 +38,7 @@ const TCHAR NPP_PLUGIN_NAME[] = TEXT("CollectionInterface");
 //
 // Here define the number of your plugin commands
 //
-const int nbFunc = 4;
+const int nbFunc = 5;
 
 
 //