From e27c47eb062d54f15846ce95bbcd3f6218ca4ab7 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 2 Mar 2013 16:32:01 +0000 Subject: projects cleanup added version info git-svn-id: http://svn.miranda-ng.org/main/trunk@3842 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/New_GPG/new_gpg_10.vcxproj | 915 ++--------------------------- plugins/New_GPG/new_gpg_10.vcxproj.filters | 12 +- plugins/New_GPG/new_gpg_11.vcxproj | 915 ++--------------------------- plugins/New_GPG/new_gpg_11.vcxproj.filters | 12 +- plugins/New_GPG/res/Version.rc | 38 ++ plugins/New_GPG/res/icons/secured.ico | Bin 1150 -> 0 bytes plugins/New_GPG/res/icons/unsecured.ico | Bin 1150 -> 0 bytes plugins/New_GPG/res/new_gpg.rc | 203 +++---- plugins/New_GPG/res/secured.ico | Bin 0 -> 1150 bytes plugins/New_GPG/res/unsecured.ico | Bin 0 -> 1150 bytes plugins/New_GPG/src/Version.h | 14 + plugins/New_GPG/src/commonheaders.h | 13 +- plugins/New_GPG/src/init.cpp | 20 +- 13 files changed, 238 insertions(+), 1904 deletions(-) create mode 100644 plugins/New_GPG/res/Version.rc delete mode 100755 plugins/New_GPG/res/icons/secured.ico delete mode 100755 plugins/New_GPG/res/icons/unsecured.ico create mode 100644 plugins/New_GPG/res/secured.ico create mode 100644 plugins/New_GPG/res/unsecured.ico create mode 100644 plugins/New_GPG/src/Version.h (limited to 'plugins') diff --git a/plugins/New_GPG/new_gpg_10.vcxproj b/plugins/New_GPG/new_gpg_10.vcxproj index 1c25796b0c..739db9387a 100755 --- a/plugins/New_GPG/new_gpg_10.vcxproj +++ b/plugins/New_GPG/new_gpg_10.vcxproj @@ -18,127 +18,26 @@ X64 - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - {F29D0C8D-141A-43CF-86B2-34A04653F8D4} - new_gpg New_GPG - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - DynamicLibrary - false Unicode DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false Unicode DynamicLibrary - false Unicode true DynamicLibrary - false Unicode true @@ -148,884 +47,162 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\Plugins\ $(SolutionDir)$(Configuration)64\Plugins\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - false - false - false - .\Debug\ - $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)\Plugins\ $(SolutionDir)$(Configuration)64\Plugins\ - .\Debug\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - true - true - true - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - false - false - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ - false - false - false - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ - false - false - false - $(Configuration)\ - $(Configuration)\ - true - AllRules.ruleset - - - AllRules.ruleset - AllRules.ruleset - AllRules.ruleset - AllRules.ruleset - - - - - - - - - AllRules.ruleset - AllRules.ruleset - AllRules.ruleset - - - - - - - AllRules.ruleset - AllRules.ruleset - AllRules.ruleset - - - - - - - AllRules.ruleset - AllRules.ruleset - - - - - AllRules.ruleset - AllRules.ruleset - AllRules.ruleset - - - - - - + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + true - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release Unicode/testplug.tlb - - - - - Full - OnlyExplicitInline - Size - true - true - X:\install\git\miranda\mim_plugs;X:\install\git\miranda\miranda-im\miranda\include;../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - StreamingSIMDExtensions - Precise - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - true - X:\install\git\miranda\mim_plugs\lib;%(AdditionalLibraryDirectories) - true - true - true - UseLinkTimeCodeGeneration - false - - - .\Release Unicode/testplug.lib - - - true - .\Release Unicode/testplug.bsc - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release Unicode/testplug.tlb - - - Full OnlyExplicitInline Size true - true - .\src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - MultiThreadedDLL true Fast Level3 - true Use commonheaders.h NDEBUG;%(PreprocessorDefinitions) - 0x0809 ..\..\include\msapi shlwapi.lib;%(AdditionalDependencies) - true $(ProfileDir)..\..\bin10\lib;..\..\..\boost\stage\lib true true true - UseLinkTimeCodeGeneration false - - $(IntDir)$(TargetName).lib Windows /PDBALTPATH:%_PDB% - - true - .\Release Unicode/testplug.bsc - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release Unicode/testplug.tlb - - - Full OnlyExplicitInline Size true - true - .\src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - MultiThreadedDLL true Fast Level3 - true Use commonheaders.h NDEBUG;%(PreprocessorDefinitions) - 0x0809 ..\..\include\msapi shlwapi.lib;%(AdditionalDependencies) - true $(ProfileDir)..\..\bin10\lib;..\..\..\boost\stage64\lib true true true - UseLinkTimeCodeGeneration false - - $(IntDir)$(TargetName).lib Windows /PDBALTPATH:%_PDB% - - true - .\Release Unicode/testplug.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/testplug.tlb - - - - - Disabled - x:\temp\windows\libs\utf8cpp\include;x:\temp\windows\libs\boost;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Use - commonheaders.h - - - true - Level3 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0809 - - - shlwapi.lib;%(AdditionalDependencies) - true - x:\temp\windows\libs\boost\lib;%(AdditionalLibraryDirectories) - true - false - - - .\Debug/testplug.lib - - - true - .\Debug/testplug.bsc - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/testplug.tlb - - - Disabled - .\src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;%(PreprocessorDefinitions) + src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use commonheaders.h - true Level3 - true - true - true - CompileAsCpp + EditAndContinue _DEBUG;%(PreprocessorDefinitions) - 0x0809 ..\..\include\msapi shlwapi.lib;%(AdditionalDependencies) - true $(ProfileDir)..\..\bin10\lib;..\..\..\boost\stage\lib true false - - $(IntDir)$(TargetName).lib - $(TargetDir)$(TargetName).pdb Windows - - true - .\Debug/testplug.bsc - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/testplug.tlb - - - Disabled - .\src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;%(PreprocessorDefinitions) + src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use commonheaders.h - true Level3 - true - true - true - CompileAsCpp _DEBUG;%(PreprocessorDefinitions) - 0x0809 ..\..\include\msapi shlwapi.lib;%(AdditionalDependencies) - true $(ProfileDir)..\..\bin10\lib;..\..\..\boost\stage64\lib true false - - $(IntDir)$(TargetName).lib - $(TargetDir)$(TargetName).pdb Windows - - true - .\Debug/testplug.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/testplug.tlb - - - - - Disabled - x:\temp\windows\libs\utf8cpp\include;X:\temp\windows\libs\Boost\include;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Use - commonheaders.h - c:\temp\new_gpg.pch - - - .\Debug/ - .\Debug/ - .\Debug/ - true - Level3 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0809 - - - shlwapi.lib;%(AdditionalDependencies) - true - X:\temp\windows\libs\Boost\lib64;%(AdditionalLibraryDirectories) - true - true - false - false - false - - - .\Debug/testplug.lib - c:\debug\$(TargetName).pdb - - - true - .\Debug/testplug.bsc - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release Unicode (static)/testplug.tlb - - - - - MinSpace - OnlyExplicitInline - Size - true - true - x:\temp\windows\libs\utf8cpp\include;C:\Boost\include\boost-1_45;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE;%(PreprocessorDefinitions) - true - MultiThreaded - true - StreamingSIMDExtensions - Precise - Use - commonheaders.h - c:\temp\new_gpg.pch - .\Release Unicode (static)/ - .\Release Unicode (static)/ - .\Release Unicode (static)/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - shlwapi.lib;%(AdditionalDependencies) - true - x:\temp\windows\libs\boost\lib;%(AdditionalLibraryDirectories) - false - NotSet - true - true - UseLinkTimeCodeGeneration - false - - - .\Release Unicode (static)/testplug.lib - - - true - .\Release Unicode (static)/testplug.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release Unicode (static)/testplug.tlb - - - - - MinSpace - OnlyExplicitInline - Size - true - true - x:\temp\windows\libs\utf8cpp\include;x:\temp\windows\libs\Boost\include;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE;%(PreprocessorDefinitions) - true - MultiThreaded - true - StreamingSIMDExtensions - Precise - Use - commonheaders.h - c:\temp\new_gpg.pch - .\Release Unicode (static)/ - .\Release Unicode (static)/ - .\Release Unicode (static)/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - shlwapi.lib;%(AdditionalDependencies) - true - x:\temp\windows\libs\Boost\lib64;%(AdditionalLibraryDirectories) - true - NotSet - true - true - UseLinkTimeCodeGeneration - false - - - .\Release Unicode (static)/testplug.lib - c:\debug\$(TargetName).pdb - - - true - .\Release Unicode (static)/testplug.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release Unicode (static)/testplug.tlb - - - - - Full - OnlyExplicitInline - Size - true - true - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreaded - true - StreamingSIMDExtensions - Precise - .\Release Unicode (static)/testplug.pch - .\Release Unicode (static)/ - .\Release Unicode (static)/ - .\Release Unicode (static)/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - true - true - true - true - UseLinkTimeCodeGeneration - false - - - .\Release Unicode (static)/testplug.lib - - - true - .\Release Unicode (static)/testplug.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release Unicode (static)/testplug.tlb - - - - - Full - OnlyExplicitInline - Size - true - true - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreaded - true - StreamingSIMDExtensions - Precise - .\Release Unicode (static)/testplug.pch - .\Release Unicode (static)/ - .\Release Unicode (static)/ - .\Release Unicode (static)/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - true - true - true - true - UseLinkTimeCodeGeneration - false - - - .\Release Unicode (static)/testplug.lib - - - true - .\Release Unicode (static)/testplug.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release Unicode (static)/testplug.tlb - - - - - Full - OnlyExplicitInline - Size - true - true - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreaded - true - StreamingSIMDExtensions - Precise - .\Release Unicode (static)/testplug.pch - .\Release Unicode (static)/ - .\Release Unicode (static)/ - .\Release Unicode (static)/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - true - true - true - true - UseLinkTimeCodeGeneration - false - - - .\Release Unicode (static)/testplug.lib - - - true - .\Release Unicode (static)/testplug.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release Unicode (static)/testplug.tlb - - - - - Full - OnlyExplicitInline - Size - true - true - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - StreamingSIMDExtensions - Precise - .\Release Unicode (static)/testplug.pch - .\Release Unicode (static)/ - .\Release Unicode (static)/ - .\Release Unicode (static)/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - true - true - true - true - UseLinkTimeCodeGeneration - false - - - .\Release Unicode (static)/testplug.lib - - - true - .\Release Unicode (static)/testplug.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release Unicode (static)/testplug.tlb - - - - - Full - OnlyExplicitInline - Size - true - true - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - StreamingSIMDExtensions - Precise - .\Release Unicode (static)/testplug.pch - .\Release Unicode (static)/ - .\Release Unicode (static)/ - .\Release Unicode (static)/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - true - true - true - true - UseLinkTimeCodeGeneration - false - - - .\Release Unicode (static)/testplug.lib - - - true - .\Release Unicode (static)/testplug.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release Unicode (static)/testplug.tlb - - - - - Full - OnlyExplicitInline - Size - true - true - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - StreamingSIMDExtensions - Precise - .\Release Unicode (static)/testplug.pch - .\Release Unicode (static)/ - .\Release Unicode (static)/ - .\Release Unicode (static)/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - true - true - true - true - UseLinkTimeCodeGeneration - false - - - .\Release Unicode (static)/testplug.lib - - - true - .\Release Unicode (static)/testplug.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/testplug.tlb - - - - - Disabled - ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - .\Debug/testplug.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - ProgramDatabase + + + + + + + + + Create - - _DEBUG;%(PreprocessorDefinitions) - 0x0809 - - - true - true - false - - - .\Debug/testplug.lib - - - true - .\Debug/testplug.bsc - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - \ No newline at end of file diff --git a/plugins/New_GPG/new_gpg_10.vcxproj.filters b/plugins/New_GPG/new_gpg_10.vcxproj.filters index 692179cf66..1634a25bfe 100755 --- a/plugins/New_GPG/new_gpg_10.vcxproj.filters +++ b/plugins/New_GPG/new_gpg_10.vcxproj.filters @@ -83,18 +83,16 @@ Headers + + Headers + Resources - - - - Resources - - + Resources - + \ No newline at end of file diff --git a/plugins/New_GPG/new_gpg_11.vcxproj b/plugins/New_GPG/new_gpg_11.vcxproj index e1c1e8c36a..5dc23424b4 100644 --- a/plugins/New_GPG/new_gpg_11.vcxproj +++ b/plugins/New_GPG/new_gpg_11.vcxproj @@ -18,130 +18,29 @@ X64 - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - {F29D0C8D-141A-43CF-86B2-34A04653F8D4} - new_gpg New_GPG - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - DynamicLibrary - false Unicode v110_xp DynamicLibrary - false Unicode v110_xp - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - DynamicLibrary - false Unicode true v110_xp DynamicLibrary - false Unicode true v110_xp @@ -152,884 +51,162 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\Plugins\ $(SolutionDir)$(Configuration)64\Plugins\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - false - false - false - .\Debug\ - $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)\Plugins\ $(SolutionDir)$(Configuration)64\Plugins\ - .\Debug\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - true - true - true - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - false - false - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ - false - false - false - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ - false - false - false - $(Configuration)\ - $(Configuration)\ - true - AllRules.ruleset - - - AllRules.ruleset - AllRules.ruleset - AllRules.ruleset - AllRules.ruleset - - - - - - - - - AllRules.ruleset - AllRules.ruleset - AllRules.ruleset - - - - - - - AllRules.ruleset - AllRules.ruleset - AllRules.ruleset - - - - - - - AllRules.ruleset - AllRules.ruleset - - - - - AllRules.ruleset - AllRules.ruleset - AllRules.ruleset - - - - - - + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + true - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release Unicode/testplug.tlb - - - - - Full - OnlyExplicitInline - Size - true - true - X:\install\git\miranda\mim_plugs;X:\install\git\miranda\miranda-im\miranda\include;../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - StreamingSIMDExtensions - Precise - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - true - X:\install\git\miranda\mim_plugs\lib;%(AdditionalLibraryDirectories) - true - true - true - UseLinkTimeCodeGeneration - false - - - .\Release Unicode/testplug.lib - - - true - .\Release Unicode/testplug.bsc - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release Unicode/testplug.tlb - - - Full OnlyExplicitInline Size true - true - .\src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - MultiThreadedDLL true Fast Level3 - true Use commonheaders.h NDEBUG;%(PreprocessorDefinitions) - 0x0809 ..\..\include\msapi shlwapi.lib;%(AdditionalDependencies) - true $(ProfileDir)..\..\bin11\lib;..\..\..\boost\stage\lib true true true - UseLinkTimeCodeGeneration false - - $(IntDir)$(TargetName).lib Windows /PDBALTPATH:%_PDB% - - true - .\Release Unicode/testplug.bsc - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release Unicode/testplug.tlb - - - Full OnlyExplicitInline Size true - true - .\src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - MultiThreadedDLL true Fast Level3 - true Use commonheaders.h NDEBUG;%(PreprocessorDefinitions) - 0x0809 ..\..\include\msapi shlwapi.lib;%(AdditionalDependencies) - true $(ProfileDir)..\..\bin11\lib;..\..\..\boost\stage64\lib true true true - UseLinkTimeCodeGeneration false - - $(IntDir)$(TargetName).lib Windows /PDBALTPATH:%_PDB% - - true - .\Release Unicode/testplug.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/testplug.tlb - - - - - Disabled - x:\temp\windows\libs\utf8cpp\include;x:\temp\windows\libs\boost;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Use - commonheaders.h - - - true - Level3 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0809 - - - shlwapi.lib;%(AdditionalDependencies) - true - x:\temp\windows\libs\boost\lib;%(AdditionalLibraryDirectories) - true - false - - - .\Debug/testplug.lib - - - true - .\Debug/testplug.bsc - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/testplug.tlb - - - Disabled - .\src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;%(PreprocessorDefinitions) + src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use commonheaders.h - true Level3 - true - true - true - CompileAsCpp + EditAndContinue _DEBUG;%(PreprocessorDefinitions) - 0x0809 ..\..\include\msapi shlwapi.lib;%(AdditionalDependencies) - true $(ProfileDir)..\..\bin11\lib;..\..\..\boost\stage\lib true false - - $(IntDir)$(TargetName).lib - $(TargetDir)$(TargetName).pdb Windows - - true - .\Debug/testplug.bsc - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/testplug.tlb - - - Disabled - .\src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;%(PreprocessorDefinitions) + src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use commonheaders.h - true Level3 - true - true - true - CompileAsCpp _DEBUG;%(PreprocessorDefinitions) - 0x0809 ..\..\include\msapi shlwapi.lib;%(AdditionalDependencies) - true $(ProfileDir)..\..\bin11\lib;..\..\..\boost\stage64\lib true false - - $(IntDir)$(TargetName).lib - $(TargetDir)$(TargetName).pdb Windows - - true - .\Debug/testplug.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/testplug.tlb - - - - - Disabled - x:\temp\windows\libs\utf8cpp\include;X:\temp\windows\libs\Boost\include;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Use - commonheaders.h - c:\temp\new_gpg.pch - - - .\Debug/ - .\Debug/ - .\Debug/ - true - Level3 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0809 - - - shlwapi.lib;%(AdditionalDependencies) - true - X:\temp\windows\libs\Boost\lib64;%(AdditionalLibraryDirectories) - true - true - false - false - false - - - .\Debug/testplug.lib - c:\debug\$(TargetName).pdb - - - true - .\Debug/testplug.bsc - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release Unicode (static)/testplug.tlb - - - - - MinSpace - OnlyExplicitInline - Size - true - true - x:\temp\windows\libs\utf8cpp\include;C:\Boost\include\boost-1_45;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE;%(PreprocessorDefinitions) - true - MultiThreaded - true - StreamingSIMDExtensions - Precise - Use - commonheaders.h - c:\temp\new_gpg.pch - .\Release Unicode (static)/ - .\Release Unicode (static)/ - .\Release Unicode (static)/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - shlwapi.lib;%(AdditionalDependencies) - true - x:\temp\windows\libs\boost\lib;%(AdditionalLibraryDirectories) - false - NotSet - true - true - UseLinkTimeCodeGeneration - false - - - .\Release Unicode (static)/testplug.lib - - - true - .\Release Unicode (static)/testplug.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release Unicode (static)/testplug.tlb - - - - - MinSpace - OnlyExplicitInline - Size - true - true - x:\temp\windows\libs\utf8cpp\include;x:\temp\windows\libs\Boost\include;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE;%(PreprocessorDefinitions) - true - MultiThreaded - true - StreamingSIMDExtensions - Precise - Use - commonheaders.h - c:\temp\new_gpg.pch - .\Release Unicode (static)/ - .\Release Unicode (static)/ - .\Release Unicode (static)/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - shlwapi.lib;%(AdditionalDependencies) - true - x:\temp\windows\libs\Boost\lib64;%(AdditionalLibraryDirectories) - true - NotSet - true - true - UseLinkTimeCodeGeneration - false - - - .\Release Unicode (static)/testplug.lib - c:\debug\$(TargetName).pdb - - - true - .\Release Unicode (static)/testplug.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release Unicode (static)/testplug.tlb - - - - - Full - OnlyExplicitInline - Size - true - true - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreaded - true - StreamingSIMDExtensions - Precise - .\Release Unicode (static)/testplug.pch - .\Release Unicode (static)/ - .\Release Unicode (static)/ - .\Release Unicode (static)/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - true - true - true - true - UseLinkTimeCodeGeneration - false - - - .\Release Unicode (static)/testplug.lib - - - true - .\Release Unicode (static)/testplug.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release Unicode (static)/testplug.tlb - - - - - Full - OnlyExplicitInline - Size - true - true - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreaded - true - StreamingSIMDExtensions - Precise - .\Release Unicode (static)/testplug.pch - .\Release Unicode (static)/ - .\Release Unicode (static)/ - .\Release Unicode (static)/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - true - true - true - true - UseLinkTimeCodeGeneration - false - - - .\Release Unicode (static)/testplug.lib - - - true - .\Release Unicode (static)/testplug.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release Unicode (static)/testplug.tlb - - - - - Full - OnlyExplicitInline - Size - true - true - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreaded - true - StreamingSIMDExtensions - Precise - .\Release Unicode (static)/testplug.pch - .\Release Unicode (static)/ - .\Release Unicode (static)/ - .\Release Unicode (static)/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - true - true - true - true - UseLinkTimeCodeGeneration - false - - - .\Release Unicode (static)/testplug.lib - - - true - .\Release Unicode (static)/testplug.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release Unicode (static)/testplug.tlb - - - - - Full - OnlyExplicitInline - Size - true - true - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - StreamingSIMDExtensions - Precise - .\Release Unicode (static)/testplug.pch - .\Release Unicode (static)/ - .\Release Unicode (static)/ - .\Release Unicode (static)/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - true - true - true - true - UseLinkTimeCodeGeneration - false - - - .\Release Unicode (static)/testplug.lib - - - true - .\Release Unicode (static)/testplug.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release Unicode (static)/testplug.tlb - - - - - Full - OnlyExplicitInline - Size - true - true - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - StreamingSIMDExtensions - Precise - .\Release Unicode (static)/testplug.pch - .\Release Unicode (static)/ - .\Release Unicode (static)/ - .\Release Unicode (static)/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - true - true - true - true - UseLinkTimeCodeGeneration - false - - - .\Release Unicode (static)/testplug.lib - - - true - .\Release Unicode (static)/testplug.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release Unicode (static)/testplug.tlb - - - - - Full - OnlyExplicitInline - Size - true - true - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - StreamingSIMDExtensions - Precise - .\Release Unicode (static)/testplug.pch - .\Release Unicode (static)/ - .\Release Unicode (static)/ - .\Release Unicode (static)/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - true - true - true - true - UseLinkTimeCodeGeneration - false - - - .\Release Unicode (static)/testplug.lib - - - true - .\Release Unicode (static)/testplug.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/testplug.tlb - - - - - Disabled - ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - .\Debug/testplug.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - ProgramDatabase + + + + + + + + + Create - - _DEBUG;%(PreprocessorDefinitions) - 0x0809 - - - true - true - false - - - .\Debug/testplug.lib - - - true - .\Debug/testplug.bsc - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - \ No newline at end of file diff --git a/plugins/New_GPG/new_gpg_11.vcxproj.filters b/plugins/New_GPG/new_gpg_11.vcxproj.filters index 692179cf66..1634a25bfe 100644 --- a/plugins/New_GPG/new_gpg_11.vcxproj.filters +++ b/plugins/New_GPG/new_gpg_11.vcxproj.filters @@ -83,18 +83,16 @@ Headers + + Headers + Resources - - - - Resources - - + Resources - + \ No newline at end of file diff --git a/plugins/New_GPG/res/Version.rc b/plugins/New_GPG/res/Version.rc new file mode 100644 index 0000000000..5bfbab4754 --- /dev/null +++ b/plugins/New_GPG/res/Version.rc @@ -0,0 +1,38 @@ +// Microsoft Visual C++ generated resource script. +// +#ifdef APSTUDIO_INVOKED +#error this file is not editable by Microsoft Visual C++ +#endif //APSTUDIO_INVOKED + +#include "afxres.h" +#include "..\src\version.h" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION __FILEVERSION_STRING + PRODUCTVERSION __FILEVERSION_STRING + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x0L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "FileDescription", __DESCRIPTION + VALUE "InternalName", __PLUGIN_NAME + VALUE "LegalCopyright", __COPYRIGHT + VALUE "OriginalFilename", __FILENAME + VALUE "ProductName", __PLUGIN_NAME + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END diff --git a/plugins/New_GPG/res/icons/secured.ico b/plugins/New_GPG/res/icons/secured.ico deleted file mode 100755 index 2e1ac4aa9c..0000000000 Binary files a/plugins/New_GPG/res/icons/secured.ico and /dev/null differ diff --git a/plugins/New_GPG/res/icons/unsecured.ico b/plugins/New_GPG/res/icons/unsecured.ico deleted file mode 100755 index 081b3607db..0000000000 Binary files a/plugins/New_GPG/res/icons/unsecured.ico and /dev/null differ diff --git a/plugins/New_GPG/res/new_gpg.rc b/plugins/New_GPG/res/new_gpg.rc index 872a7fd394..452c9aff7a 100755 --- a/plugins/New_GPG/res/new_gpg.rc +++ b/plugins/New_GPG/res/new_gpg.rc @@ -213,6 +213,68 @@ BEGIN PUSHBUTTON "Ok",IDC_OK,7,55,50,14 END +IDD_OPT_GPG DIALOGEX 0, 0, 286, 214 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + CONTROL "",IDC_USERLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,17,272,112 + CTEXT "Userlist:",IDC_STATIC,25,7,201,8 + PUSHBUTTON "Export PubKey",IDC_SAVE_KEY_BUTTON,8,135,75,14 + PUSHBUTTON "Delete key",IDC_DELETE_KEY_BUTTON,90,135,70,14 + PUSHBUTTON "Select own key",IDC_SELECT_KEY,205,193,74,14 + CONTROL "Turn on debug log",IDC_DEBUG_LOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,181,159,89,10 + EDITTEXT IDC_LOG_FILE_EDIT,11,157,98,14,ES_AUTOHSCROLL + PUSHBUTTON "Browse",IDC_LOG_FILE_SET,119,156,50,14 + CONTROL "Use jabber api on Miranda NG (recomended)",IDC_JABBER_API, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,175,251,10 + LTEXT "Default key",IDC_CURRENT_KEY,12,196,110,8 + CONTROL "Encrypt file transfers",IDC_FILE_TRANSFERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,185,137,10 + CONTROL "Automatic key exchange",IDC_AUTO_EXCHANGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,137,111,10 + PUSHBUTTON "Copy own key",IDC_COPY_KEY,127,193,74,14 +END + +IDD_OPT_GPG_BIN DIALOGEX 0, 0, 282, 71 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + PUSHBUTTON "Browse",IDC_SET_BIN_PATH,216,17,60,14 + PUSHBUTTON "Browse",IDC_SET_HOME_DIR,217,44,57,14 + EDITTEXT IDC_BIN_PATH,7,17,195,14,ES_AUTOHSCROLL + EDITTEXT IDC_HOME_DIR,7,44,195,14,ES_AUTOHSCROLL + LTEXT "GnuPG binary:",IDC_STATIC,10,7,147,8 + LTEXT "Home directory:",IDC_STATIC,9,34,144,8 +END + +IDD_OPT_GPG_MESSAGES DIALOGEX 0, 0, 302, 100 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + CONTROL "Add tags to encoded and decoded messages",IDC_APPEND_TAGS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,65,243,10 + EDITTEXT IDC_IN_OPEN_TAG,39,20,88,14,ES_AUTOHSCROLL + EDITTEXT IDC_IN_CLOSE_TAG,151,20,90,14,ES_AUTOHSCROLL + LTEXT "Incomming message tags:",IDC_STATIC,15,10,84,8 + LTEXT "Outgoing message tags:",IDC_STATIC,13,36,79,8 + RTEXT "Open:",IDC_STATIC,13,23,26,8 + RTEXT "Close:",IDC_STATIC,127,23,23,8 + EDITTEXT IDC_OUT_OPEN_TAG,39,46,88,14,ES_AUTOHSCROLL + EDITTEXT IDC_OUT_CLOSE_TAG,151,46,90,14,ES_AUTOHSCROLL + RTEXT "Open:",IDC_STATIC,13,49,26,8 + RTEXT "Close:",IDC_STATIC,127,49,23,8 + CONTROL "Strip all tags in outgoing messages",IDC_STRIP_TAGS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,76,233,10 +END + +IDD_OPT_GPG_ADVANCED DIALOGEX 0, 0, 286, 50 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + CONTROL "Turn on presence signing (Jabber) (required by xep 0-27)",IDC_PRESCENSE_SUBSCRIPTION, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,9,268,10 + PUSHBUTTON "Export keys",IDC_EXPORT,12,26,60,14 + PUSHBUTTON "Import keys",IDC_IMPORT,82,26,68,14 +END + ///////////////////////////////////////////////////////////////////////////// // @@ -316,6 +378,12 @@ BEGIN TOPMARGIN, 7 BOTTOMMARGIN, 69 END + + IDD_OPT_GPG_ADVANCED, DIALOG + BEGIN + VERTGUIDE, 12 + BOTTOMMARGIN, 40 + END END #endif // APSTUDIO_INVOKED @@ -327,145 +395,14 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_SECURED ICON "icons\\secured.ico" -IDI_UNSECURED ICON "icons\\unsecured.ico" +IDI_SECURED ICON "secured.ico" +IDI_UNSECURED ICON "unsecured.ico" -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,0,0,11 - PRODUCTVERSION 0,9,0,0 - FILEFLAGSMASK 0x17L -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x0L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "041904b0" - BEGIN - VALUE "FileDescription", "new_gpg" - VALUE "FileVersion", "0.0.0.11" - VALUE "InternalName", "new_gpg" - VALUE "LegalCopyright", "Copyright (C) 2010-2011 sss" - VALUE "OriginalFilename", "new_gpg" - VALUE "ProductName", "new_gpg" - VALUE "ProductVersion", "0.9.0.0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x419, 1200 - END -END #endif // Русский (Россия) resources ///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -// Английский (США) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_OPT_GPG DIALOGEX 0, 0, 286, 214 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -FONT 8, "MS Shell Dlg", 400, 0, 0x0 -BEGIN - CONTROL "",IDC_USERLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,17,272,112 - CTEXT "Userlist:",IDC_STATIC,25,7,201,8 - PUSHBUTTON "Export PubKey",IDC_SAVE_KEY_BUTTON,8,135,75,14 - PUSHBUTTON "Delete key",IDC_DELETE_KEY_BUTTON,90,135,70,14 - PUSHBUTTON "Select own key",IDC_SELECT_KEY,205,193,74,14 - CONTROL "Turn on debug log",IDC_DEBUG_LOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,181,159,89,10 - EDITTEXT IDC_LOG_FILE_EDIT,11,157,98,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse",IDC_LOG_FILE_SET,119,156,50,14 - CONTROL "Use jabber api on Miranda NG (recomended)",IDC_JABBER_API, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,175,251,10 - LTEXT "Default key",IDC_CURRENT_KEY,12,196,110,8 - CONTROL "Encrypt file transfers",IDC_FILE_TRANSFERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,185,137,10 - CONTROL "Automatic key exchange",IDC_AUTO_EXCHANGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,137,111,10 - PUSHBUTTON "Copy own key",IDC_COPY_KEY,127,193,74,14 -END - -IDD_OPT_GPG_BIN DIALOGEX 0, 0, 282, 71 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -FONT 8, "MS Shell Dlg", 400, 0, 0x0 -BEGIN - PUSHBUTTON "Browse",IDC_SET_BIN_PATH,216,17,60,14 - PUSHBUTTON "Browse",IDC_SET_HOME_DIR,217,44,57,14 - EDITTEXT IDC_BIN_PATH,7,17,195,14,ES_AUTOHSCROLL - EDITTEXT IDC_HOME_DIR,7,44,195,14,ES_AUTOHSCROLL - LTEXT "GnuPG binary:",IDC_STATIC,10,7,147,8 - LTEXT "Home directory:",IDC_STATIC,9,34,144,8 -END - -IDD_OPT_GPG_MESSAGES DIALOGEX 0, 0, 302, 100 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -FONT 8, "MS Shell Dlg", 400, 0, 0x0 -BEGIN - CONTROL "Add tags to encoded and decoded messages",IDC_APPEND_TAGS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,65,243,10 - EDITTEXT IDC_IN_OPEN_TAG,39,20,88,14,ES_AUTOHSCROLL - EDITTEXT IDC_IN_CLOSE_TAG,151,20,90,14,ES_AUTOHSCROLL - LTEXT "Incomming message tags:",IDC_STATIC,15,10,84,8 - LTEXT "Outgoing message tags:",IDC_STATIC,13,36,79,8 - RTEXT "Open:",IDC_STATIC,13,23,26,8 - RTEXT "Close:",IDC_STATIC,127,23,23,8 - EDITTEXT IDC_OUT_OPEN_TAG,39,46,88,14,ES_AUTOHSCROLL - EDITTEXT IDC_OUT_CLOSE_TAG,151,46,90,14,ES_AUTOHSCROLL - RTEXT "Open:",IDC_STATIC,13,49,26,8 - RTEXT "Close:",IDC_STATIC,127,49,23,8 - CONTROL "Strip all tags in outgoing messages",IDC_STRIP_TAGS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,76,233,10 -END - -IDD_OPT_GPG_ADVANCED DIALOGEX 0, 0, 286, 50 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -FONT 8, "MS Shell Dlg", 400, 0, 0x0 -BEGIN - CONTROL "Turn on presence signing (Jabber) (required by xep 0-27)",IDC_PRESCENSE_SUBSCRIPTION, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,9,268,10 - PUSHBUTTON "Export keys",IDC_EXPORT,12,26,60,14 - PUSHBUTTON "Import keys",IDC_IMPORT,82,26,68,14 -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_OPT_GPG_ADVANCED, DIALOG - BEGIN - VERTGUIDE, 12 - BOTTOMMARGIN, 40 - END -END -#endif // APSTUDIO_INVOKED - -#endif // Английский (США) resources -///////////////////////////////////////////////////////////////////////////// - - #ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/New_GPG/res/secured.ico b/plugins/New_GPG/res/secured.ico new file mode 100644 index 0000000000..2e1ac4aa9c Binary files /dev/null and b/plugins/New_GPG/res/secured.ico differ diff --git a/plugins/New_GPG/res/unsecured.ico b/plugins/New_GPG/res/unsecured.ico new file mode 100644 index 0000000000..081b3607db Binary files /dev/null and b/plugins/New_GPG/res/unsecured.ico differ diff --git a/plugins/New_GPG/src/Version.h b/plugins/New_GPG/src/Version.h new file mode 100644 index 0000000000..86774f7ace --- /dev/null +++ b/plugins/New_GPG/src/Version.h @@ -0,0 +1,14 @@ +#define __MAJOR_VERSION 0 +#define __MINOR_VERSION 0 +#define __RELEASE_NUM 0 +#define __BUILD_NUM 11 + +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM + +#define __PLUGIN_NAME "GPG" +#define __FILENAME "New_GPG.dll" +#define __DESCRIPTION "New GPG encryption support plugin, based on code from old GPG plugin and SecureIM." +#define __AUTHOR "sss" +#define __AUTHOREMAIL "sss123next@list.ru" +#define __AUTHORWEB "http://miranda-ng.org/" +#define __COPYRIGHT "© 2010-2012 sss" diff --git a/plugins/New_GPG/src/commonheaders.h b/plugins/New_GPG/src/commonheaders.h index eb5f6d2a64..54f8c4303a 100755 --- a/plugins/New_GPG/src/commonheaders.h +++ b/plugins/New_GPG/src/commonheaders.h @@ -13,12 +13,12 @@ // 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #ifndef COMMONHEADERS_H #define COMMONHEADERS_H #define _CRT_SECURE_NO_WARNINGS - -#define MIRANDA_VER 0x0A00 +#define _SCL_SECURE_NO_WARNINGS //windows #include @@ -46,9 +46,7 @@ using std::wstring; using std::wfstream; using std::fstream; - //boost - #include #include #include @@ -59,11 +57,9 @@ using std::fstream; //boost process #include - //utf8cpp #include - //miranda #include #include @@ -84,10 +80,10 @@ using std::fstream; #include "m_extraicons.h" #include "m_metacontacts.h" #include "win2k.h" -#include "resource.h" - //internal +#include "resource.h" +#include "Version.h" #include "constants.h" #include "log.h" #include "globals.h" @@ -96,4 +92,5 @@ using std::fstream; #include "gpg_wrapper.h" #include "jabber_account.h" #include "metacontacts.h" + #endif diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp index de1f3144f9..ef28840c60 100755 --- a/plugins/New_GPG/src/init.cpp +++ b/plugins/New_GPG/src/init.cpp @@ -32,25 +32,23 @@ logtofile debuglog; bool gpg_valid = false, gpg_keyexist = false; std::map hcontact_data; - - PLUGININFOEX pluginInfo={ sizeof(PLUGININFOEX), - "GPG", - PLUGIN_MAKE_VERSION(0,0,0,11), - "New GPG encryption support plugin, based on code from old GPG plugin and SecureIM.", - "sss", - "sss123next@list.ru", - "© 2010-2012 sss", - "http://sss.chaoslab.ru/tracker/mim_plugs/", + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, UNICODE_AWARE, // {4227c050-8d97-48d2-91ec-6a952b3dab94} { 0x4227c050, 0x8d97, 0x48d2, { 0x91, 0xec, 0x6a, 0x95, 0x2b, 0x3d, 0xab, 0x94 } } }; -BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - hInst=hinstDLL; + hInst = hinstDLL; return TRUE; } -- cgit v1.2.3