Skip to content

Commit 12b40c1

Browse files
author
Nada Al Tayan
committed
Add visual studio solution, bump version, change some texts
1 parent 38e35f5 commit 12b40c1

File tree

7 files changed

+203
-14
lines changed

7 files changed

+203
-14
lines changed

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.vs/
2+
Debug/
3+
PyNPP.vcxproj.filters
4+
PyNPP.vcxproj.user
5+
*.aps
6+
Release/

DockingFeature/GoToLineDlg.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
//Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
1717

1818
#include "GoToLineDlg.h"
19-
#include "PluginDefinition.h"
19+
#include "..\PluginDefinition.h"
2020

2121
extern NppData nppData;
2222

DockingFeature/StaticDialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
//#include "resource.h"
2222
#include "Window.h"
23-
#include "Notepad_plus_msgs.h"
23+
#include "..\Notepad_plus_msgs.h"
2424

2525
enum PosAlign{ALIGNPOS_LEFT, ALIGNPOS_RIGHT, ALIGNPOS_TOP, ALIGNPOS_BOTTOM};
2626

PyNPP.sln

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.24720.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PyNPP", "PyNPP.vcxproj", "{CFAA244D-7561-44CD-A3FB-2A5843850A89}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|x64 = Debug|x64
11+
Debug|x86 = Debug|x86
12+
Release|x64 = Release|x64
13+
Release|x86 = Release|x86
14+
EndGlobalSection
15+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16+
{CFAA244D-7561-44CD-A3FB-2A5843850A89}.Debug|x64.ActiveCfg = Debug|x64
17+
{CFAA244D-7561-44CD-A3FB-2A5843850A89}.Debug|x64.Build.0 = Debug|x64
18+
{CFAA244D-7561-44CD-A3FB-2A5843850A89}.Debug|x86.ActiveCfg = Debug|Win32
19+
{CFAA244D-7561-44CD-A3FB-2A5843850A89}.Debug|x86.Build.0 = Debug|Win32
20+
{CFAA244D-7561-44CD-A3FB-2A5843850A89}.Release|x64.ActiveCfg = Release|x64
21+
{CFAA244D-7561-44CD-A3FB-2A5843850A89}.Release|x64.Build.0 = Release|x64
22+
{CFAA244D-7561-44CD-A3FB-2A5843850A89}.Release|x86.ActiveCfg = Release|Win32
23+
{CFAA244D-7561-44CD-A3FB-2A5843850A89}.Release|x86.Build.0 = Release|Win32
24+
EndGlobalSection
25+
GlobalSection(SolutionProperties) = preSolution
26+
HideSolutionNode = FALSE
27+
EndGlobalSection
28+
EndGlobal

PyNPP.vcxproj

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|Win32">
9+
<Configuration>Release</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Debug|x64">
13+
<Configuration>Debug</Configuration>
14+
<Platform>x64</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<PropertyGroup Label="Globals">
22+
<ProjectGuid>{CFAA244D-7561-44CD-A3FB-2A5843850A89}</ProjectGuid>
23+
<Keyword>Win32Proj</Keyword>
24+
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
25+
</PropertyGroup>
26+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
27+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
28+
<ConfigurationType>DynamicLibrary</ConfigurationType>
29+
<UseDebugLibraries>true</UseDebugLibraries>
30+
<PlatformToolset>v140</PlatformToolset>
31+
</PropertyGroup>
32+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
33+
<ConfigurationType>DynamicLibrary</ConfigurationType>
34+
<UseDebugLibraries>false</UseDebugLibraries>
35+
<PlatformToolset>v140</PlatformToolset>
36+
<CharacterSet>Unicode</CharacterSet>
37+
</PropertyGroup>
38+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
39+
<ConfigurationType>Application</ConfigurationType>
40+
<UseDebugLibraries>true</UseDebugLibraries>
41+
<PlatformToolset>v140</PlatformToolset>
42+
</PropertyGroup>
43+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
44+
<ConfigurationType>Application</ConfigurationType>
45+
<UseDebugLibraries>false</UseDebugLibraries>
46+
<PlatformToolset>v140</PlatformToolset>
47+
</PropertyGroup>
48+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
49+
<ImportGroup Label="ExtensionSettings">
50+
</ImportGroup>
51+
<ImportGroup Label="Shared">
52+
</ImportGroup>
53+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
54+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
55+
</ImportGroup>
56+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
57+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
58+
</ImportGroup>
59+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
60+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
61+
</ImportGroup>
62+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
63+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
64+
</ImportGroup>
65+
<PropertyGroup Label="UserMacros" />
66+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
67+
<LinkIncremental>true</LinkIncremental>
68+
</PropertyGroup>
69+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
70+
<LinkIncremental>true</LinkIncremental>
71+
</PropertyGroup>
72+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
73+
<ClCompile>
74+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PYNPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
75+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
76+
<WarningLevel>Level3</WarningLevel>
77+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
78+
<Optimization>Disabled</Optimization>
79+
</ClCompile>
80+
<Link>
81+
<TargetMachine>MachineX86</TargetMachine>
82+
<GenerateDebugInformation>true</GenerateDebugInformation>
83+
<SubSystem>Windows</SubSystem>
84+
</Link>
85+
</ItemDefinitionGroup>
86+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
87+
<ClCompile>
88+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PYNPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
89+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
90+
<WarningLevel>Level3</WarningLevel>
91+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
92+
</ClCompile>
93+
<Link>
94+
<TargetMachine>MachineX86</TargetMachine>
95+
<GenerateDebugInformation>true</GenerateDebugInformation>
96+
<SubSystem>Windows</SubSystem>
97+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
98+
<OptimizeReferences>true</OptimizeReferences>
99+
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
100+
</Link>
101+
</ItemDefinitionGroup>
102+
<ItemGroup>
103+
<ClCompile Include="AboutDlg.cpp" />
104+
<ClCompile Include="dockingfeature\GoToLineDlg.cpp" />
105+
<ClCompile Include="dockingfeature\StaticDialog.cpp" />
106+
<ClCompile Include="globals.cpp" />
107+
<ClCompile Include="IniFileProcessor.cpp" />
108+
<ClCompile Include="IniProcessor.cpp" />
109+
<ClCompile Include="IniValue.cpp" />
110+
<ClCompile Include="OptionsDlg.cpp" />
111+
<ClCompile Include="PluginDefinition.cpp" />
112+
<ClCompile Include="PyNPP.cpp" />
113+
<ClCompile Include="strconvert.cpp" />
114+
<ClCompile Include="utility.cpp" />
115+
</ItemGroup>
116+
<ItemGroup>
117+
<ClInclude Include="AboutDlg.h" />
118+
<ClInclude Include="dockingfeature\Docking.h" />
119+
<ClInclude Include="dockingfeature\DockingDlgInterface.h" />
120+
<ClInclude Include="dockingfeature\dockingResource.h" />
121+
<ClInclude Include="dockingfeature\GoToLineDlg.h" />
122+
<ClInclude Include="dockingfeature\resource.h" />
123+
<ClInclude Include="dockingfeature\StaticDialog.h" />
124+
<ClInclude Include="dockingfeature\Window.h" />
125+
<ClInclude Include="globals.h" />
126+
<ClInclude Include="IniFileProcessor.h" />
127+
<ClInclude Include="IniProcessor.h" />
128+
<ClInclude Include="IniValue.h" />
129+
<ClInclude Include="menuCmdID.h" />
130+
<ClInclude Include="Notepad_plus_msgs.h" />
131+
<ClInclude Include="OptionsDlg.h" />
132+
<ClInclude Include="PluginDefinition.h" />
133+
<ClInclude Include="PluginInterface.h" />
134+
<ClInclude Include="resource.h" />
135+
<ClInclude Include="Scintilla.h" />
136+
<ClInclude Include="strconvert.h" />
137+
<ClInclude Include="utility.h" />
138+
</ItemGroup>
139+
<ItemGroup>
140+
<ResourceCompile Include="dockingfeature\goLine.rc" />
141+
<ResourceCompile Include="PyNPP_RES.rc" />
142+
<ResourceCompile Include="versionRC.rc" />
143+
</ItemGroup>
144+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
145+
<ImportGroup Label="ExtensionTargets">
146+
</ImportGroup>
147+
</Project>

PyNPP_RES.rc

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
//
88
// Generated from the TEXTINCLUDE 2 resource.
99
//
10-
#include "WinResrc.h"
11-
#define IDC_STATIC -1
10+
#include "afxres.h"
1211

1312
/////////////////////////////////////////////////////////////////////////////
1413
#undef APSTUDIO_READONLY_SYMBOLS
@@ -17,10 +16,8 @@
1716
// Arabic (Syria) resources
1817

1918
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ARS)
20-
#ifdef _WIN32
2119
LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SYRIA
2220
#pragma code_page(1256)
23-
#endif //_WIN32
2421

2522
#ifdef APSTUDIO_INVOKED
2623
/////////////////////////////////////////////////////////////////////////////
@@ -65,13 +62,13 @@ BEGIN
6562
LTEXT "Python Folder",IDC_STATIC_PATH,7,9,46,8
6663
END
6764

68-
IDD_ABOUT_DIALOG DIALOGEX 0, 0, 150, 103
65+
IDD_ABOUT_DIALOG DIALOGEX 0, 0, 151, 132
6966
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
7067
CAPTION "About PyNPP"
7168
FONT 8, "MS Shell Dlg", 400, 0, 0x1
7269
BEGIN
73-
DEFPUSHBUTTON "OK",IDOK,51,82,50,14
74-
CTEXT "PyNPP\nA Notepad++ plugin to run Python scripts from inside Notepad++.\n\nCreated by\nAbdullah Diab\[email protected]\nhttp://mpcabd.igeex.biz",IDC_STATIC,7,7,135,72
70+
DEFPUSHBUTTON "OK",IDOK,51,111,50,14
71+
CTEXT "PyNPP v.1.2.1\n\nA Notepad++ plugin to run Python scripts from inside Notepad++.\n\nCreated by\n\nAbdullah Diab\[email protected]\nhttp://mpcabd.xyz\n\nhttps://github.com/mpcabd/PyNPP",IDC_STATIC,7,7,135,103
7572
END
7673

7774

@@ -81,7 +78,7 @@ END
8178
//
8279

8380
#ifdef APSTUDIO_INVOKED
84-
GUIDELINES DESIGNINFO
81+
GUIDELINES DESIGNINFO
8582
BEGIN
8683
IDD_OPTIONS_DIALOG, DIALOG
8784
BEGIN
@@ -94,13 +91,24 @@ BEGIN
9491
IDD_ABOUT_DIALOG, DIALOG
9592
BEGIN
9693
LEFTMARGIN, 7
97-
RIGHTMARGIN, 143
94+
RIGHTMARGIN, 144
9895
TOPMARGIN, 7
99-
BOTTOMMARGIN, 96
96+
BOTTOMMARGIN, 125
10097
END
10198
END
10299
#endif // APSTUDIO_INVOKED
103100

101+
102+
/////////////////////////////////////////////////////////////////////////////
103+
//
104+
// AFX_DIALOG_LAYOUT
105+
//
106+
107+
IDD_ABOUT_DIALOG AFX_DIALOG_LAYOUT
108+
BEGIN
109+
0
110+
END
111+
104112
#endif // Arabic (Syria) resources
105113
/////////////////////////////////////////////////////////////////////////////
106114

versionRC.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#include <windows.h>
22

3-
#define VER_FILEVERSION 1,2,0,0
3+
#define VER_FILEVERSION 1,2,1,0
44
#define VER_FILEVERSION_STR "1.2\0"
55

6-
#define VER_PRODUCTVERSION 1,2,0,0
6+
#define VER_PRODUCTVERSION 1,2,1,0
77
#define VER_PRODUCTVERSION_STR "1.2\0"
88

99
#ifndef DEBUG

0 commit comments

Comments
 (0)