Skip to content

Arrange code by moving notepad++ code under npp folder #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 13, 2022
Merged

Arrange code by moving notepad++ code under npp folder #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 16 additions & 22 deletions NppJSONViewer/NPPJSONViewer.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,27 +107,26 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IncludePath>$(SolutionDir)external\rapidjson\include;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)external\npp;$(SolutionDir)external\rapidjson\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IncludePath>$(SolutionDir)external\rapidjson\include;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)external\npp;$(SolutionDir)external\rapidjson\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IncludePath>$(SolutionDir)external\rapidjson\include;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)external\npp;$(SolutionDir)external\rapidjson\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<IncludePath>$(SolutionDir)external\rapidjson\include;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)external\npp;$(SolutionDir)external\rapidjson\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IncludePath>$(SolutionDir)external\rapidjson\include;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)external\npp;$(SolutionDir)external\rapidjson\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<IncludePath>$(SolutionDir)external\rapidjson\include;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)external\npp;$(SolutionDir)external\rapidjson\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;_USRDLL;NPPJSONVIEWER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
Expand All @@ -148,7 +147,6 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;_USRDLL;NPPJSONVIEWER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
Expand All @@ -167,7 +165,6 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;NPPJSONVIEWER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<WarningLevel>Level4</WarningLevel>
Expand All @@ -187,7 +184,6 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<ClCompile>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;NPPJSONVIEWER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<WarningLevel>Level4</WarningLevel>
Expand All @@ -206,7 +202,6 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;NPPJSONVIEWER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<WarningLevel>Level4</WarningLevel>
Expand All @@ -227,7 +222,6 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;_USRDLL;NPPJSONVIEWER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
Expand All @@ -246,33 +240,33 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="external\npp\StaticDialog.cpp" />
<ClCompile Include="Hyperlinks.cpp" />
<ClCompile Include="json.c" />
<ClCompile Include="JSONDialog.cpp" />
<ClCompile Include="NppPlugin.cpp" />
<ClCompile Include="PluginDefinition.cpp" />
<ClCompile Include="TreeBuilder.cpp" />
<ClCompile Include="StaticDialog.cpp" />
<ClCompile Include="utils.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="Docking.h" />
<ClInclude Include="DockingDlgInterface.h" />
<ClInclude Include="dockingResource.h" />
<ClInclude Include="external\npp\Docking.h" />
<ClInclude Include="external\npp\DockingDlgInterface.h" />
<ClInclude Include="external\npp\dockingResource.h" />
<ClInclude Include="external\npp\menuCmdID.h" />
<ClInclude Include="external\npp\Notepad_plus_msgs.h" />
<ClInclude Include="external\npp\PluginInterface.h" />
<ClInclude Include="external\npp\Scintilla.h" />
<ClInclude Include="external\npp\StaticDialog.h" />
<ClInclude Include="external\npp\Window.h" />
<ClInclude Include="Hyperlinks.h" />
<ClInclude Include="json.h" />
<ClInclude Include="JSONDialog.h" />
<ClInclude Include="menuCmdID.h" />
<ClInclude Include="Notepad_plus_msgs.h" />
<ClInclude Include="PluginDefinition.h" />
<ClInclude Include="PluginInterface.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="TreeBuilder.h" />
<ClInclude Include="Scintilla.h" />
<ClInclude Include="StaticDialog.h" />
<ClInclude Include="StopWatch.h" />
<ClInclude Include="utils.h" />
<ClInclude Include="Window.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="resource.rc" />
Expand Down
64 changes: 35 additions & 29 deletions NppJSONViewer/NPPJSONViewer.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
</Filter>
<Filter Include="ThirdParty">
<UniqueIdentifier>{3a31aa3c-9f15-4a33-bf5c-b9153d1e757a}</UniqueIdentifier>
</Filter>
<Filter Include="ThirdParty\npp">
<UniqueIdentifier>{5b794f9e-baf6-4faf-98a6-741b4918d410}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Hyperlinks.cpp">
Expand All @@ -30,26 +36,17 @@
<ClCompile Include="PluginDefinition.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="StaticDialog.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="TreeBuilder.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="external\npp\StaticDialog.cpp">
<Filter>ThirdParty\npp</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Docking.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="DockingDlgInterface.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="dockingResource.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Hyperlinks.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand All @@ -59,38 +56,47 @@
<ClInclude Include="JSONDialog.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="menuCmdID.h">
<ClInclude Include="PluginDefinition.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Notepad_plus_msgs.h">
<ClInclude Include="resource.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="PluginDefinition.h">
<ClInclude Include="StopWatch.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="PluginInterface.h">
<ClInclude Include="utils.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Scintilla.h">
<ClInclude Include="TreeBuilder.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="StaticDialog.h">
<Filter>Header Files</Filter>
<ClInclude Include="external\npp\Docking.h">
<Filter>ThirdParty\npp</Filter>
</ClInclude>
<ClInclude Include="Window.h">
<Filter>Header Files</Filter>
<ClInclude Include="external\npp\DockingDlgInterface.h">
<Filter>ThirdParty\npp</Filter>
</ClInclude>
<ClInclude Include="resource.h">
<Filter>Header Files</Filter>
<ClInclude Include="external\npp\dockingResource.h">
<Filter>ThirdParty\npp</Filter>
</ClInclude>
<ClInclude Include="StopWatch.h">
<Filter>Header Files</Filter>
<ClInclude Include="external\npp\menuCmdID.h">
<Filter>ThirdParty\npp</Filter>
</ClInclude>
<ClInclude Include="utils.h">
<Filter>Header Files</Filter>
<ClInclude Include="external\npp\Notepad_plus_msgs.h">
<Filter>ThirdParty\npp</Filter>
</ClInclude>
<ClInclude Include="TreeBuilder.h">
<Filter>Header Files</Filter>
<ClInclude Include="external\npp\PluginInterface.h">
<Filter>ThirdParty\npp</Filter>
</ClInclude>
<ClInclude Include="external\npp\Scintilla.h">
<Filter>ThirdParty\npp</Filter>
</ClInclude>
<ClInclude Include="external\npp\StaticDialog.h">
<Filter>ThirdParty\npp</Filter>
</ClInclude>
<ClInclude Include="external\npp\Window.h">
<Filter>ThirdParty\npp</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
Expand Down
154 changes: 77 additions & 77 deletions NppJSONViewer/Docking.h → NppJSONViewer/external/npp/Docking.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,77 +1,77 @@
/*
this file is part of Function List Plugin for Notepad++
Copyright (C)2005 Jens Lorenz <jens.plugin.npp@gmx.de>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef DOCKING_H
#define DOCKING_H
// ATTENTION : It's a part of interface header, so don't include the others header here
// styles for containers
#define CAPTION_TOP TRUE
#define CAPTION_BOTTOM FALSE
// defines for docking manager
#define CONT_LEFT 0
#define CONT_RIGHT 1
#define CONT_TOP 2
#define CONT_BOTTOM 3
#define DOCKCONT_MAX 4
// mask params for plugins of internal dialogs
#define DWS_ICONTAB 0x00000001 // Icon for tabs are available
#define DWS_ICONBAR 0x00000002 // Icon for icon bar are available (currently not supported)
#define DWS_ADDINFO 0x00000004 // Additional information are in use
#define DWS_PARAMSALL (DWS_ICONTAB|DWS_ICONBAR|DWS_ADDINFO)
// default docking values for first call of plugin
#define DWS_DF_CONT_LEFT (CONT_LEFT << 28) // default docking on left
#define DWS_DF_CONT_RIGHT (CONT_RIGHT << 28) // default docking on right
#define DWS_DF_CONT_TOP (CONT_TOP << 28) // default docking on top
#define DWS_DF_CONT_BOTTOM (CONT_BOTTOM << 28) // default docking on bottom
#define DWS_DF_FLOATING 0x80000000 // default state is floating
typedef struct {
HWND hClient; // client Window Handle
TCHAR *pszName; // name of plugin (shown in window)
int dlgID; // a funcItem provides the function pointer to start a dialog. Please parse here these ID
// user modifications
UINT uMask; // mask params: look to above defines
HICON hIconTab; // icon for tabs
TCHAR *pszAddInfo; // for plugin to display additional informations
// internal data, do not use !!!
RECT rcFloat; // floating position
int iPrevCont; // stores the privious container (toggling between float and dock)
const TCHAR* pszModuleName; // it's the plugin file name. It's used to identify the plugin
} tTbData;
typedef struct {
HWND hWnd; // the docking manager wnd
RECT rcRegion[DOCKCONT_MAX]; // position of docked dialogs
} tDockMgr;
#define HIT_TEST_THICKNESS 20
#define SPLITTER_WIDTH 4
#endif // DOCKING_H
/*
this file is part of Function List Plugin for Notepad++
Copyright (C)2005 Jens Lorenz <jens.plugin.npp@gmx.de>

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/

#ifndef DOCKING_H
#define DOCKING_H

// ATTENTION : It's a part of interface header, so don't include the others header here

// styles for containers
#define CAPTION_TOP TRUE
#define CAPTION_BOTTOM FALSE

// defines for docking manager
#define CONT_LEFT 0
#define CONT_RIGHT 1
#define CONT_TOP 2
#define CONT_BOTTOM 3
#define DOCKCONT_MAX 4

// mask params for plugins of internal dialogs
#define DWS_ICONTAB 0x00000001 // Icon for tabs are available
#define DWS_ICONBAR 0x00000002 // Icon for icon bar are available (currently not supported)
#define DWS_ADDINFO 0x00000004 // Additional information are in use
#define DWS_PARAMSALL (DWS_ICONTAB|DWS_ICONBAR|DWS_ADDINFO)

// default docking values for first call of plugin
#define DWS_DF_CONT_LEFT (CONT_LEFT << 28) // default docking on left
#define DWS_DF_CONT_RIGHT (CONT_RIGHT << 28) // default docking on right
#define DWS_DF_CONT_TOP (CONT_TOP << 28) // default docking on top
#define DWS_DF_CONT_BOTTOM (CONT_BOTTOM << 28) // default docking on bottom
#define DWS_DF_FLOATING 0x80000000 // default state is floating


typedef struct {
HWND hClient; // client Window Handle
TCHAR *pszName; // name of plugin (shown in window)
int dlgID; // a funcItem provides the function pointer to start a dialog. Please parse here these ID

// user modifications
UINT uMask; // mask params: look to above defines
HICON hIconTab; // icon for tabs
TCHAR *pszAddInfo; // for plugin to display additional informations

// internal data, do not use !!!
RECT rcFloat; // floating position
int iPrevCont; // stores the privious container (toggling between float and dock)
const TCHAR* pszModuleName; // it's the plugin file name. It's used to identify the plugin
} tTbData;


typedef struct {
HWND hWnd; // the docking manager wnd
RECT rcRegion[DOCKCONT_MAX]; // position of docked dialogs
} tDockMgr;


#define HIT_TEST_THICKNESS 20
#define SPLITTER_WIDTH 4


#endif // DOCKING_H
Loading