Skip to content

Commit 81edbd4

Browse files
AntonDevilAntonDevil
committed
Replace copies from plugintemplate with .gitmodules dependency
1 parent 28c07a4 commit 81edbd4

19 files changed

Lines changed: 117 additions & 79 deletions

‎src/NppJsonViewer/AboutDlg.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#pragma once
2-
#include "StaticDialog.h"
2+
#include "DockingFeature/StaticDialog.h"
33

44
class AboutDlg : public StaticDialog
55
{

‎src/NppJsonViewer/JsonViewDlg.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <vector>
66
#include <optional>
77

8-
#include "DockingDlgInterface.h"
8+
#include "DockingFeature/DockingDlgInterface.h"
99
#include "PluginInterface.h"
1010
#include "resource.h"
1111
#include "TreeViewCtrl.h"

‎src/NppJsonViewer/NPPJSONViewer.vcxproj‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
116116
</ClCompile>
117117
<Link>
118-
<AdditionalDependencies>shlwapi.lib;comctl32.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
118+
<AdditionalDependencies>shlwapi.lib;comctl32.lib;Version.lib;uxtheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
119119
<GenerateDebugInformation>true</GenerateDebugInformation>
120120
<SubSystem>Windows</SubSystem>
121121
<TargetMachine>MachineX64</TargetMachine>
@@ -130,7 +130,7 @@
130130
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
131131
</ClCompile>
132132
<Link>
133-
<AdditionalDependencies>shlwapi.lib;comctl32.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
133+
<AdditionalDependencies>shlwapi.lib;comctl32.lib;Version.lib;uxtheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
134134
<GenerateDebugInformation>true</GenerateDebugInformation>
135135
<SubSystem>Windows</SubSystem>
136136
</Link>
@@ -141,7 +141,7 @@
141141
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
142142
</ClCompile>
143143
<Link>
144-
<AdditionalDependencies>shlwapi.lib;comctl32.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
144+
<AdditionalDependencies>shlwapi.lib;comctl32.lib;Version.lib;uxtheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
145145
<GenerateDebugInformation>DebugFull</GenerateDebugInformation>
146146
<SubSystem>Windows</SubSystem>
147147
<TargetMachine>MachineX64</TargetMachine>
@@ -153,7 +153,7 @@
153153
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
154154
</ClCompile>
155155
<Link>
156-
<AdditionalDependencies>shlwapi.lib;comctl32.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
156+
<AdditionalDependencies>shlwapi.lib;comctl32.lib;Version.lib;uxtheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
157157
<GenerateDebugInformation>DebugFull</GenerateDebugInformation>
158158
<SubSystem>Windows</SubSystem>
159159
</Link>
@@ -164,7 +164,7 @@
164164
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
165165
</ClCompile>
166166
<Link>
167-
<AdditionalDependencies>shlwapi.lib;comctl32.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
167+
<AdditionalDependencies>shlwapi.lib;comctl32.lib;Version.lib;uxtheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
168168
<GenerateDebugInformation>DebugFull</GenerateDebugInformation>
169169
<SubSystem>Windows</SubSystem>
170170
<TargetMachine>MachineX86</TargetMachine>
@@ -179,14 +179,14 @@
179179
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
180180
</ClCompile>
181181
<Link>
182-
<AdditionalDependencies>shlwapi.lib;comctl32.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
182+
<AdditionalDependencies>shlwapi.lib;comctl32.lib;Version.lib;uxtheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
183183
<GenerateDebugInformation>true</GenerateDebugInformation>
184184
<SubSystem>Windows</SubSystem>
185185
<TargetMachine>MachineX86</TargetMachine>
186186
</Link>
187187
</ItemDefinitionGroup>
188188
<ItemGroup>
189-
<ClCompile Include="..\..\external\npp\StaticDialog.cpp" />
189+
<ClCompile Include="plugintemplate\DockingFeature\StaticDialog.cpp" />
190190
<ClCompile Include="AboutDlg.cpp" />
191191
<ClCompile Include="DllMain.cpp" />
192192
<ClCompile Include="JsonHandler.cpp" />
@@ -201,20 +201,20 @@
201201
<ClCompile Include="TreeViewCtrl.cpp" />
202202
</ItemGroup>
203203
<ItemGroup>
204-
<ClInclude Include="..\..\external\npp\Docking.h" />
205-
<ClInclude Include="..\..\external\npp\DockingDlgInterface.h" />
206-
<ClInclude Include="..\..\external\npp\dockingResource.h" />
207-
<ClInclude Include="..\..\external\npp\menuCmdID.h" />
208-
<ClInclude Include="..\..\external\npp\Notepad_plus_msgs.h" />
209-
<ClInclude Include="..\..\external\npp\PluginInterface.h" />
210-
<ClInclude Include="..\..\external\npp\Scintilla.h" />
211-
<ClInclude Include="..\..\external\npp\StaticDialog.h" />
212-
<ClInclude Include="..\..\external\npp\Window.h" />
213204
<ClInclude Include="AboutDlg.h" />
214205
<ClInclude Include="Define.h" />
215206
<ClInclude Include="JsonHandler.h" />
216207
<ClInclude Include="JsonNode.h" />
217208
<ClInclude Include="JsonViewDlg.h" />
209+
<ClInclude Include="plugintemplate\DockingFeature\Docking.h" />
210+
<ClInclude Include="plugintemplate\DockingFeature\DockingDlgInterface.h" />
211+
<ClInclude Include="plugintemplate\DockingFeature\dockingResource.h" />
212+
<ClInclude Include="plugintemplate\DockingFeature\StaticDialog.h" />
213+
<ClInclude Include="plugintemplate\DockingFeature\Window.h" />
214+
<ClInclude Include="plugintemplate\menuCmdID.h" />
215+
<ClInclude Include="plugintemplate\Notepad_plus_msgs.h" />
216+
<ClInclude Include="plugintemplate\PluginInterface.h" />
217+
<ClInclude Include="plugintemplate\Scintilla.h" />
218218
<ClInclude Include="NppJsonPlugin.h" />
219219
<ClInclude Include="Profile.h" />
220220
<ClInclude Include="RapidJsonHandler.h" />
@@ -224,8 +224,8 @@
224224
<ClInclude Include="ShortcutCommand.h" />
225225
<ClInclude Include="SliderCtrl.h" />
226226
<ClInclude Include="StopWatch.h" />
227-
<ClCompile Include="TreeHandler.h" />
228227
<ClInclude Include="TrackingStream.h" />
228+
<ClInclude Include="TreeHandler.h" />
229229
<ClInclude Include="TreeViewCtrl.h" />
230230
</ItemGroup>
231231
<ItemGroup>

‎src/NppJsonViewer/NPPJSONViewer.vcxproj.filters‎

Lines changed: 59 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -16,129 +16,135 @@
1616
<Filter Include="ThirdParty">
1717
<UniqueIdentifier>{3a31aa3c-9f15-4a33-bf5c-b9153d1e757a}</UniqueIdentifier>
1818
</Filter>
19-
<Filter Include="ThirdParty\npp">
19+
<Filter Include="ThirdParty\plugintemplate">
2020
<UniqueIdentifier>{5b794f9e-baf6-4faf-98a6-741b4918d410}</UniqueIdentifier>
2121
</Filter>
22+
<Filter Include="ThirdParty\plugintemplate\DockingFeature">
23+
<UniqueIdentifier>{072ab05e-efec-4d68-9a86-dbdf2bdaec4d}</UniqueIdentifier>
24+
</Filter>
2225
</ItemGroup>
2326
<ItemGroup>
24-
<ClCompile Include="DllMain.cpp">
27+
<ClCompile Include="AboutDlg.cpp">
2528
<Filter>Source Files</Filter>
2629
</ClCompile>
27-
<ClCompile Include="NppJsonPlugin.cpp">
30+
<ClCompile Include="dllmain.cpp">
2831
<Filter>Source Files</Filter>
2932
</ClCompile>
30-
<ClCompile Include="ShortcutCommand.cpp">
33+
<ClCompile Include="JsonHandler.cpp">
3134
<Filter>Source Files</Filter>
3235
</ClCompile>
3336
<ClCompile Include="JsonViewDlg.cpp">
3437
<Filter>Source Files</Filter>
3538
</ClCompile>
36-
<ClCompile Include="ScintillaEditor.cpp">
37-
<Filter>Source Files</Filter>
38-
</ClCompile>
39-
<ClCompile Include="TreeViewCtrl.cpp">
39+
<ClCompile Include="NppJsonPlugin.cpp">
4040
<Filter>Source Files</Filter>
4141
</ClCompile>
42-
<ClCompile Include="AboutDlg.cpp">
42+
<ClCompile Include="Profile.cpp">
4343
<Filter>Source Files</Filter>
4444
</ClCompile>
45-
<ClCompile Include="JsonHandler.cpp">
45+
<ClCompile Include="RapidJsonHandler.cpp">
4646
<Filter>Source Files</Filter>
4747
</ClCompile>
48-
<ClCompile Include="RapidJsonHandler.cpp">
48+
<ClCompile Include="ScintillaEditor.cpp">
4949
<Filter>Source Files</Filter>
5050
</ClCompile>
5151
<ClCompile Include="SettingsDlg.cpp">
5252
<Filter>Source Files</Filter>
5353
</ClCompile>
54-
<ClCompile Include="Profile.cpp">
54+
<ClCompile Include="ShortcutCommand.cpp">
5555
<Filter>Source Files</Filter>
5656
</ClCompile>
57-
<ClCompile Include="..\..\external\npp\StaticDialog.cpp">
58-
<Filter>ThirdParty\npp</Filter>
59-
</ClCompile>
60-
<ClCompile Include="TreeHandler.h">
61-
<Filter>Header Files</Filter>
62-
</ClCompile>
6357
<ClCompile Include="SliderCtrl.cpp">
6458
<Filter>Source Files</Filter>
6559
</ClCompile>
60+
<ClCompile Include="TreeViewCtrl.cpp">
61+
<Filter>Source Files</Filter>
62+
</ClCompile>
63+
<ClCompile Include="plugintemplate\DockingFeature\StaticDialog.cpp">
64+
<Filter>ThirdParty\plugintemplate\DockingFeature</Filter>
65+
</ClCompile>
6666
</ItemGroup>
6767
<ItemGroup>
68-
<ClInclude Include="resource.h">
68+
<ClInclude Include="AboutDlg.h">
6969
<Filter>Header Files</Filter>
7070
</ClInclude>
71-
<ClInclude Include="StopWatch.h">
71+
<ClInclude Include="Define.h">
7272
<Filter>Header Files</Filter>
7373
</ClInclude>
74-
<ClInclude Include="NppJsonPlugin.h">
74+
<ClInclude Include="JsonHandler.h">
7575
<Filter>Header Files</Filter>
7676
</ClInclude>
77-
<ClInclude Include="ShortcutCommand.h">
77+
<ClInclude Include="JsonNode.h">
7878
<Filter>Header Files</Filter>
7979
</ClInclude>
8080
<ClInclude Include="JsonViewDlg.h">
8181
<Filter>Header Files</Filter>
8282
</ClInclude>
83-
<ClInclude Include="ScintillaEditor.h">
83+
<ClInclude Include="NppJsonPlugin.h">
8484
<Filter>Header Files</Filter>
8585
</ClInclude>
86-
<ClInclude Include="TreeViewCtrl.h">
86+
<ClInclude Include="Profile.h">
8787
<Filter>Header Files</Filter>
8888
</ClInclude>
89-
<ClInclude Include="AboutDlg.h">
89+
<ClInclude Include="RapidJsonHandler.h">
9090
<Filter>Header Files</Filter>
9191
</ClInclude>
92-
<ClInclude Include="Define.h">
92+
<ClInclude Include="resource.h">
9393
<Filter>Header Files</Filter>
9494
</ClInclude>
95-
<ClInclude Include="JsonHandler.h">
95+
<ClInclude Include="ScintillaEditor.h">
9696
<Filter>Header Files</Filter>
9797
</ClInclude>
98-
<ClInclude Include="JsonNode.h">
98+
<ClInclude Include="SettingsDlg.h">
9999
<Filter>Header Files</Filter>
100100
</ClInclude>
101-
<ClInclude Include="RapidJsonHandler.h">
101+
<ClInclude Include="ShortcutCommand.h">
102102
<Filter>Header Files</Filter>
103103
</ClInclude>
104-
<ClInclude Include="SettingsDlg.h">
104+
<ClInclude Include="SliderCtrl.h">
105105
<Filter>Header Files</Filter>
106106
</ClInclude>
107-
<ClInclude Include="Profile.h">
107+
<ClInclude Include="StopWatch.h">
108108
<Filter>Header Files</Filter>
109109
</ClInclude>
110-
<ClInclude Include="..\..\external\npp\Docking.h">
111-
<Filter>ThirdParty\npp</Filter>
110+
<ClInclude Include="TrackingStream.h">
111+
<Filter>Header Files</Filter>
112112
</ClInclude>
113-
<ClInclude Include="..\..\external\npp\DockingDlgInterface.h">
114-
<Filter>ThirdParty\npp</Filter>
113+
<ClInclude Include="TreeHandler.h">
114+
<Filter>Header Files</Filter>
115115
</ClInclude>
116-
<ClInclude Include="..\..\external\npp\dockingResource.h">
117-
<Filter>ThirdParty\npp</Filter>
116+
<ClInclude Include="TreeViewCtrl.h">
117+
<Filter>Header Files</Filter>
118118
</ClInclude>
119-
<ClInclude Include="..\..\external\npp\menuCmdID.h">
120-
<Filter>ThirdParty\npp</Filter>
119+
<ClInclude Include="plugintemplate\DockingFeature\Docking.h">
120+
<Filter>ThirdParty\plugintemplate\DockingFeature</Filter>
121121
</ClInclude>
122-
<ClInclude Include="..\..\external\npp\Notepad_plus_msgs.h">
123-
<Filter>ThirdParty\npp</Filter>
122+
<ClInclude Include="plugintemplate\DockingFeature\DockingDlgInterface.h">
123+
<Filter>ThirdParty\plugintemplate\DockingFeature</Filter>
124124
</ClInclude>
125-
<ClInclude Include="..\..\external\npp\PluginInterface.h">
126-
<Filter>ThirdParty\npp</Filter>
125+
<ClInclude Include="plugintemplate\DockingFeature\dockingResource.h">
126+
<Filter>ThirdParty\plugintemplate\DockingFeature</Filter>
127127
</ClInclude>
128-
<ClInclude Include="..\..\external\npp\Scintilla.h">
129-
<Filter>ThirdParty\npp</Filter>
128+
<ClInclude Include="plugintemplate\DockingFeature\StaticDialog.h">
129+
<Filter>ThirdParty\plugintemplate\DockingFeature</Filter>
130130
</ClInclude>
131-
<ClInclude Include="..\..\external\npp\StaticDialog.h">
132-
<Filter>ThirdParty\npp</Filter>
131+
<ClInclude Include="plugintemplate\DockingFeature\Window.h">
132+
<Filter>ThirdParty\plugintemplate\DockingFeature</Filter>
133133
</ClInclude>
134-
<ClInclude Include="..\..\external\npp\Window.h">
135-
<Filter>ThirdParty\npp</Filter>
134+
<ClInclude Include="plugintemplate\menuCmdID.h">
135+
<Filter>ThirdParty\plugintemplate</Filter>
136136
</ClInclude>
137-
<ClInclude Include="TrackingStream.h">
138-
<Filter>Header Files</Filter>
137+
<ClInclude Include="plugintemplate\Notepad_plus_msgs.h">
138+
<Filter>ThirdParty\plugintemplate</Filter>
139139
</ClInclude>
140-
<ClInclude Include="SliderCtrl.h">
141-
<Filter>Header Files</Filter>
140+
<ClInclude Include="plugintemplate\PluginInterface.h">
141+
<Filter>ThirdParty\plugintemplate</Filter>
142+
</ClInclude>
143+
<ClInclude Include="plugintemplate\Sci_Position.h">
144+
<Filter>ThirdParty\plugintemplate</Filter>
145+
</ClInclude>
146+
<ClInclude Include="plugintemplate\Scintilla.h">
147+
<Filter>ThirdParty\plugintemplate</Filter>
142148
</ClInclude>
143149
</ItemGroup>
144150
<ItemGroup>

‎src/NppJsonViewer/NppJsonPlugin.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,12 @@ void NppJsonPlugin::SetMenuIcon()
103103
{
104104
if (m_hMenuIcon.hToolbarIcon || m_hMenuIcon.hToolbarBmp)
105105
{
106-
toolbarIcons tbIcon {};
106+
toolbarIconsWithDarkMode tbIcon {};
107107
tbIcon.hToolbarBmp = m_hMenuIcon.hToolbarBmp;
108108
tbIcon.hToolbarIcon = m_hMenuIcon.hToolbarIcon;
109+
tbIcon.hToolbarIconDarkMode = m_hMenuIcon.hToolbarIcon;
109110
auto nCommandId = m_shortcutCommands.GetCommandID(CallBackID::SHOW_DOC_PANEL);
110-
::SendMessage(m_NppData._nppHandle, NPPM_ADDTOOLBARICON, reinterpret_cast<WPARAM&>(nCommandId), reinterpret_cast<LPARAM>(&tbIcon));
111+
::SendMessage(m_NppData._nppHandle, NPPM_ADDTOOLBARICON_FORDARKMODE, reinterpret_cast<WPARAM&>(nCommandId), reinterpret_cast<LPARAM>(&tbIcon));
111112
}
112113
}
113114

‎src/NppJsonViewer/SettingsDlg.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ INT_PTR SettingsDlg::run_dlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
4242
{
4343
::SetWindowLongPtr(_hSelf, DWLP_USER, lParam);
4444

45-
auto enable_dlg_theme = reinterpret_cast<ETDTProc>(::SendMessage(_hParent, NPPM_GETENABLETHEMETEXTUREFUNC, 0, 0));
46-
if (enable_dlg_theme != nullptr)
47-
enable_dlg_theme(_hSelf, ETDT_ENABLETAB);
45+
EnableThemeDialogTexture(_hSelf, ETDT_ENABLETAB);
4846

4947
InitDlg();
5048

‎src/NppJsonViewer/SettingsDlg.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#pragma once
2-
#include "StaticDialog.h"
2+
#include "DockingFeature/StaticDialog.h"
33
#include "Define.h"
44
#include <string>
55
#include <memory>

‎src/NppJsonViewer/plugintemplate/DockingFeature/Docking.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#pragma once
2+
// Forwarding header for ease of use
3+
#include "../../../../external/plugintemplate/src/DockingFeature/Docking.h" // IWYU pragma: export

‎src/NppJsonViewer/plugintemplate/DockingFeature/DockingDlgInterface.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#pragma once
2+
// Forwarding header for ease of use
3+
#include "../../../../external/plugintemplate/src/DockingFeature/DockingDlgInterface.h" // IWYU pragma: export

‎src/NppJsonViewer/plugintemplate/DockingFeature/StaticDialog.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#pragma once
2+
// Forwarding header for ease of use
3+
#include "../../../../external/plugintemplate/src/DockingFeature/StaticDialog.cpp" // IWYU pragma: export

0 commit comments

Comments
 (0)