Make Resource file open-able and editable in visual studio directly.

Author: SinghRajenM

NppJSONViewer/JSONDialog.cpp

@@ -34,9 +34,9 @@ Delete all items from the tree and creates the root node
 HTREEITEM JSONDialog::initTree(HWND hWndDlg)
 {
 
-	int TreeCount=TreeView_GetCount(GetDlgItem(this->getHSelf(),IDC_TREE1));
+	int TreeCount=TreeView_GetCount(GetDlgItem(this->getHSelf(),IDC_TREE));
 	if(TreeCount>0)
-		TreeView_DeleteAllItems(GetDlgItem(this->getHSelf(),IDC_TREE1));
+		TreeView_DeleteAllItems(GetDlgItem(this->getHSelf(),IDC_TREE));
 
 	TV_INSERTSTRUCT tvinsert;    
 
@@ -45,7 +45,7 @@ HTREEITEM JSONDialog::initTree(HWND hWndDlg)
 	tvinsert.item.mask=TVIF_TEXT;
 
 	tvinsert.item.pszText=L"JSON";
-	HTREEITEM item=(HTREEITEM)SendDlgItemMessage(hWndDlg,IDC_TREE1,TVM_INSERTITEM,0,(LPARAM)&tvinsert);
+	HTREEITEM item=(HTREEITEM)SendDlgItemMessage(hWndDlg,IDC_TREE,TVM_INSERTITEM,0,(LPARAM)&tvinsert);
 
 	return item;		
 }
@@ -69,7 +69,7 @@ HTREEITEM JSONDialog::insertToTree(HWND hWndDlg,HTREEITEM parent, const char *te
 		MultiByteToWideChar(CP_UTF8, NULL, text, -1, w_msg, len);
 
 		tvinsert.item.pszText = w_msg;
-		item = (HTREEITEM)SendDlgItemMessage(hWndDlg, IDC_TREE1, TVM_INSERTITEM, 0, (LPARAM)&tvinsert);
+		item = (HTREEITEM)SendDlgItemMessage(hWndDlg, IDC_TREE, TVM_INSERTITEM, 0, (LPARAM)&tvinsert);
 		delete[] w_msg; // fix memory leak
 	}
 
@@ -343,12 +343,12 @@ void JSONDialog::drawTreeSaxParse()
 
 	if (strlen(curJSON) == 0) {
 		insertToTree(this->getHSelf(), tree_root, "Error:Please select a JSON String.");
-		TreeView_Expand(GetDlgItem(this->getHSelf(), IDC_TREE1), tree_root, TVE_EXPAND);
+		TreeView_Expand(GetDlgItem(this->getHSelf(), IDC_TREE), tree_root, TVE_EXPAND);
 		return;
 	}
 
 	populateTreeUsingSax(this->getHSelf(), tree_root, curJSON);
-	TreeView_Expand(GetDlgItem(this->getHSelf(), IDC_TREE1), tree_root, TVE_EXPAND);
+	TreeView_Expand(GetDlgItem(this->getHSelf(), IDC_TREE), tree_root, TVE_EXPAND);
 }
 
 
@@ -428,14 +428,14 @@ INT_PTR CALLBACK JSONDialog::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPa
 	switch (message) 
 	{
 	case WM_INITDIALOG:
-		hTree=GetDlgItem(this->getHSelf(),IDC_TREE1);// tree control
+		hTree=GetDlgItem(this->getHSelf(),IDC_TREE);// tree control
 		drawTreeSaxParse();
 		return TRUE;
 
 	case WM_SIZE:
 		width=LOWORD(lParam);
 		height=HIWORD(lParam);
-		SetWindowPos(GetDlgItem(this->getHSelf(),IDC_TREE1),HWND_TOP,0,0,width,height,SWP_SHOWWINDOW);
+		SetWindowPos(GetDlgItem(this->getHSelf(),IDC_TREE),HWND_TOP,0,0,width,height,SWP_SHOWWINDOW);
 		return TRUE;
 
 	default :

NppJSONViewer/JSONDialog.h

@@ -37,7 +37,7 @@ class JSONDialog : public DockingDlgInterface
 	//void populateTree (HWND hWndDlg, HTREEITEM tree_root, json_t * json_root, int level);
 	void populateTreeUsingSax(HWND hWndDlg, HTREEITEM tree_root, char * json);
 public :
-	JSONDialog() : DockingDlgInterface(IDD_TREE){};
+	JSONDialog() : DockingDlgInterface(IDD_TREEDLG){};
 
 	HTREEITEM insertToTree(HTREEITEM parent, const char *text);
 

NppJSONViewer/NPPJSONViewer.vcxproj

@@ -100,7 +100,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>shlwapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>shlwapi.lib;comctl32.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(TargetName).lib</ImportLibrary>
@@ -118,7 +118,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>shlwapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>shlwapi.lib;comctl32.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -138,7 +138,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>shlwapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>shlwapi.lib;comctl32.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -161,7 +161,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>shlwapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>shlwapi.lib;comctl32.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(TargetName).lib</ImportLibrary>
@@ -176,6 +176,7 @@
     <ClCompile Include="PluginDefinition.cpp" />
     <ClCompile Include="TreeBuilder.cpp" />
     <ClCompile Include="StaticDialog.cpp" />
+    <ClCompile Include="utils.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Docking.h" />

NppJSONViewer/NPPJSONViewer.vcxproj.filters

@@ -36,6 +36,9 @@
     <ClCompile Include="TreeBuilder.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="utils.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Docking.h">

NppJSONViewer/PluginDefinition.cpp

@@ -19,6 +19,7 @@
 #include "menuCmdID.h"
 #include "JSONDialog.h"
 #include "Hyperlinks.h"
+#include "utils.h"
 #include "rapidjson/prettywriter.h"
 #include "rapidjson/stringbuffer.h"
 #include "rapidjson/reader.h"
@@ -81,11 +82,24 @@ void commandMenuInit()
 	setCommand(2, TEXT("&About"), openAboutDlg, NULL, false);
 }
 
+void setVersion(HWND hwndDlg)
+{
+	std::wstring version;
+
+	// Get module path
+	wchar_t moduleFileName[MAX_PATH + 1] = {};
+	::GetModuleFileName((HINSTANCE)&__ImageBase, moduleFileName, _MAX_PATH);
+
+	version = getVersion(moduleFileName);
+	::SetWindowText(::GetDlgItem(hwndDlg, IDC_VERSION), version.c_str());
+}
+
 INT_PTR CALLBACK abtDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM /*lParam*/)
 {
 	switch (uMsg)
 	{
 	case WM_INITDIALOG:
+		setVersion(hwndDlg);
 		ConvertStaticToHyperlink(hwndDlg, IDC_WEB);
 		return TRUE;
 	case WM_COMMAND:

NppJSONViewer/resource.h

@@ -1,8 +1,20 @@
-#ifndef IDC_STATIC
-#define IDC_STATIC (-1)
-#endif
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by resource.rc
+//
+#define IDD_TREEDLG                     101
+#define IDD_ABOUTDLG                    102
+#define IDC_TREE                        1001
+#define IDC_WEB                         1002
+#define IDC_VERSION                     1003
 
-#define IDD_TREE                                101
-#define IDD_ABOUTDLG                            103
-#define IDC_TREE1                               1002
-#define IDC_WEB                                 1002
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        103
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1004
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif